From 97fb61d23cf04a909145ecb28946d1297d947ef4 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Mon, 27 May 2024 15:28:58 +0200
Subject: [PATCH 01/23] Made representation of multi-intervals deterministic

Splitting states into certain components if possible to factor out uncertainties into the state space

Ignore indexed variables with negative index

Created the infrastructure for static scanning for relevant variables
---
 src/col/vct/col/ast/Deserialize.scala         |    7 +-
 src/col/vct/col/ast/Node.scala                | 4602 +++++++++++++----
 src/col/vct/col/ast/Serialize.scala           |    9 +-
 .../col/ast/declaration/DeclarationImpl.scala |   42 +-
 .../ast/declaration/adt/ADTAxiomImpl.scala    |   17 +-
 .../declaration/adt/ADTDeclarationImpl.scala  |    3 +-
 .../ast/declaration/adt/ADTFunctionImpl.scala |   25 +-
 .../category/AbstractFunctionImpl.scala       |    3 +-
 .../category/AbstractMethodImpl.scala         |   13 +-
 .../category/AbstractPredicateImpl.scala      |    3 +-
 .../declaration/category/ApplicableImpl.scala |    7 +-
 .../category/ContractApplicableImpl.scala     |   10 +-
 .../ast/declaration/category/FieldImpl.scala  |    3 +-
 .../category/InlineableApplicableImpl.scala   |    3 +-
 .../declaration/cls/BipComponentImpl.scala    |    3 +-
 .../declaration/cls/BipConstructorImpl.scala  |    3 +-
 .../col/ast/declaration/cls/BipDataImpl.scala |    3 +-
 .../ast/declaration/cls/BipGuardImpl.scala    |   10 +-
 .../col/ast/declaration/cls/BipPortImpl.scala |   11 +-
 .../cls/BipStatePredicateImpl.scala           |    7 +-
 .../declaration/cls/BipTransitionImpl.scala   |   30 +-
 .../cls/ClassDeclarationImpl.scala            |    5 +-
 .../declaration/cls/InstanceFieldImpl.scala   |    5 +-
 .../cls/InstanceFunctionImpl.scala            |   21 +-
 .../declaration/cls/InstanceMethodImpl.scala  |   86 +-
 .../cls/InstanceOperatorFunctionImpl.scala    |   15 +-
 .../cls/InstanceOperatorMethodImpl.scala      |   16 +-
 .../cls/InstancePredicateImpl.scala           |   25 +-
 .../ast/declaration/cls/RunMethodImpl.scala   |    3 +-
 .../declaration/cls/VeSUVMainMethodImpl.scala |    6 +-
 .../global/AxiomaticDataTypeImpl.scala        |   39 +-
 .../global/BipPortSynchronizationImpl.scala   |   25 +-
 .../BipTransitionSynchronizationImpl.scala    |   26 +-
 .../declaration/global/ChoreographyImpl.scala |   35 +-
 .../ast/declaration/global/ClassImpl.scala    |   46 +-
 .../ast/declaration/global/FunctionImpl.scala |   46 +-
 .../global/GlobalDeclarationImpl.scala        |    5 +-
 .../declaration/global/HeapVariableImpl.scala |   17 +-
 .../global/JavaBipGlueContainerImpl.scala     |    6 +-
 .../ast/declaration/global/ModelImpl.scala    |    8 +-
 .../global/PVLChoreographyImpl.scala          |    9 +-
 .../declaration/global/PredicateImpl.scala    |   36 +-
 .../declaration/global/ProcedureImpl.scala    |   62 +-
 .../global/ProverFunctionImpl.scala           |    3 +-
 .../declaration/global/ProverTypeImpl.scala   |    3 +-
 .../global/SimplificationRuleImpl.scala       |    9 +-
 .../declaration/model/ModelActionImpl.scala   |   18 +-
 .../model/ModelDeclarationImpl.scala          |    3 +-
 .../declaration/model/ModelFieldImpl.scala    |    8 +-
 .../declaration/model/ModelProcessImpl.scala  |   26 +-
 .../singular/BipTransitionSignatureImpl.scala |   17 +-
 .../declaration/singular/EndpointImpl.scala   |   11 +-
 .../declaration/singular/LabelDeclImpl.scala  |    5 +-
 .../singular/ParBlockDeclImpl.scala           |    6 +-
 .../singular/ParInvariantDeclImpl.scala       |    6 +-
 .../declaration/singular/SendDeclImpl.scala   |    3 +-
 .../declaration/singular/VariableImpl.scala   |   20 +-
 src/col/vct/col/ast/expr/ExprImpl.scala       |   34 +-
 .../AmbiguousComputationalAndImpl.scala       |    5 +-
 .../AmbiguousComputationalOrImpl.scala        |    5 +-
 .../AmbiguousComputationalXorImpl.scala       |    5 +-
 .../expr/ambiguous/AmbiguousMemberImpl.scala  |   33 +-
 .../expr/ambiguous/AmbiguousMinusImpl.scala   |   12 +-
 .../expr/ambiguous/AmbiguousMultImpl.scala    |   14 +-
 .../ast/expr/ambiguous/AmbiguousOrImpl.scala  |   11 +-
 .../expr/ambiguous/AmbiguousPlusImpl.scala    |   56 +-
 .../ambiguous/AmbiguousSubscriptImpl.scala    |   46 +-
 .../apply/ADTFunctionInvocationImpl.scala     |   37 +-
 .../col/ast/expr/apply/ActionApplyImpl.scala  |    5 +-
 .../apply/AnyFunctionInvocationImpl.scala     |    5 +-
 .../expr/apply/AnyMethodInvocationImpl.scala  |    5 +-
 .../expr/apply/ApplyAnyPredicateImpl.scala    |    5 +-
 .../vct/col/ast/expr/apply/ApplyImpl.scala    |    5 +-
 .../ast/expr/apply/ApplyInlineableImpl.scala  |    5 +-
 .../CoalesceInstancePredicateApplyImpl.scala  |    9 +-
 .../expr/apply/FunctionInvocationImpl.scala   |   21 +-
 .../ast/expr/apply/InstanceApplyImpl.scala    |    3 +-
 .../InstanceFunctionInvocationImpl.scala      |   10 +-
 .../apply/InstancePredicateApplyImpl.scala    |    8 +-
 .../col/ast/expr/apply/InvocationImpl.scala   |    5 +-
 .../ast/expr/apply/MethodInvocationImpl.scala |   22 +-
 .../ast/expr/apply/PredicateApplyImpl.scala   |   21 +-
 .../expr/apply/ProcedureInvocationImpl.scala  |   17 +-
 .../col/ast/expr/apply/ProcessApplyImpl.scala |    5 +-
 .../apply/ProverFunctionInvocationImpl.scala  |    8 +-
 .../vct/col/ast/expr/binder/BinderImpl.scala  |    5 +-
 .../vct/col/ast/expr/binder/ExistsImpl.scala  |   24 +-
 .../vct/col/ast/expr/binder/ForPermImpl.scala |   22 +-
 .../expr/binder/ForPermWithValueImpl.scala    |    3 +-
 .../vct/col/ast/expr/binder/ForallImpl.scala  |   22 +-
 src/col/vct/col/ast/expr/binder/LetImpl.scala |   23 +-
 .../vct/col/ast/expr/binder/ProductImpl.scala |    3 +-
 .../vct/col/ast/expr/binder/StarallImpl.scala |   22 +-
 src/col/vct/col/ast/expr/binder/SumImpl.scala |    3 +-
 .../ast/expr/bip/BipGuardInvocationImpl.scala |    3 +-
 .../expr/bip/BipLocalIncomingDataImpl.scala   |    3 +-
 .../col/ast/expr/bip/JavaBipGlueImpl.scala    |    6 +-
 .../expr/context/AmbiguousResultImpl.scala    |   74 +-
 .../ast/expr/context/AmbiguousThisImpl.scala  |   17 +-
 .../expr/context/CurrentThreadIdImpl.scala    |    5 +-
 .../ast/expr/context/GlobalThreadIdImpl.scala |    3 +-
 .../ast/expr/context/LocalThreadIdImpl.scala  |    3 +-
 .../vct/col/ast/expr/context/ResultImpl.scala |   20 +-
 .../expr/context/ThisChoreographyImpl.scala   |    6 +-
 .../expr/context/ThisDeclarationImpl.scala    |    9 +-
 .../col/ast/expr/context/ThisModelImpl.scala  |    5 +-
 .../col/ast/expr/context/ThisObjectImpl.scala |   18 +-
 .../vct/col/ast/expr/heap/SizeOfImpl.scala    |    8 +-
 .../ast/expr/heap/alloc/FreePointerImpl.scala |    5 +-
 .../ast/expr/heap/alloc/NewArrayImpl.scala    |   11 +-
 .../ast/expr/heap/alloc/NewObjectImpl.scala   |    5 +-
 .../expr/heap/alloc/NewPointerArrayImpl.scala |    5 +-
 .../col/ast/expr/heap/read/AddrOfImpl.scala   |    8 +-
 .../expr/heap/read/ArraySubscriptImpl.scala   |    5 +-
 .../heap/read/DerefHeapVariableImpl.scala     |    3 +-
 .../col/ast/expr/heap/read/DerefImpl.scala    |    8 +-
 .../ast/expr/heap/read/DerefPointerImpl.scala |    8 +-
 .../ast/expr/heap/read/EndpointNameImpl.scala |    3 +-
 .../ast/expr/heap/read/FunctionOfImpl.scala   |    6 +-
 .../ast/expr/heap/read/HeapDerefImpl.scala    |    5 +-
 .../col/ast/expr/heap/read/LengthImpl.scala   |    8 +-
 .../ast/expr/heap/read/ModelDerefImpl.scala   |    5 +-
 .../col/ast/expr/heap/read/NdIndexImpl.scala  |    7 +-
 .../col/ast/expr/heap/read/NdLengthImpl.scala |    3 +-
 .../expr/heap/read/NdPartialIndexImpl.scala   |    8 +-
 .../ast/expr/heap/read/PointerAddImpl.scala   |    8 +-
 .../heap/read/PointerBlockLengthImpl.scala    |    5 +-
 .../heap/read/PointerBlockOffsetImpl.scala    |    3 +-
 .../expr/heap/read/PointerLengthImpl.scala    |    3 +-
 .../expr/heap/read/PointerSubscriptImpl.scala |    5 +-
 .../col/ast/expr/heap/read/ValuesImpl.scala   |    5 +-
 .../expr/literal/build/EitherLeftImpl.scala   |    8 +-
 .../expr/literal/build/EitherRightImpl.scala  |    8 +-
 .../expr/literal/build/LiteralBagImpl.scala   |    5 +-
 .../expr/literal/build/LiteralMapImpl.scala   |    9 +-
 .../expr/literal/build/LiteralSeqImpl.scala   |    5 +-
 .../expr/literal/build/LiteralSetImpl.scala   |    5 +-
 .../expr/literal/build/LiteralTupleImpl.scala |   12 +-
 .../literal/build/LiteralVectorImpl.scala     |    8 +-
 .../expr/literal/build/OptNoneTypedImpl.scala |    5 +-
 .../ast/expr/literal/build/OptSomeImpl.scala  |    5 +-
 .../expr/literal/build/OptSomeTypedImpl.scala |    5 +-
 .../ast/expr/literal/build/RangeImpl.scala    |    8 +-
 .../literal/build/UntypedLiteralBagImpl.scala |    5 +-
 .../literal/build/UntypedLiteralSeqImpl.scala |    5 +-
 .../literal/build/UntypedLiteralSetImpl.scala |    5 +-
 .../expr/literal/constant/AutoValueImpl.scala |    3 +-
 .../literal/constant/BooleanValueImpl.scala   |   37 +-
 .../expr/literal/constant/ConstantImpl.scala  |   12 +-
 .../literal/constant/ConstantIntImpl.scala    |    3 +-
 .../literal/constant/EmptyProcessImpl.scala   |    5 +-
 .../literal/constant/FloatValueImpl.scala     |    6 +-
 .../expr/literal/constant/NoPermImpl.scala    |    5 +-
 .../ast/expr/literal/constant/NullImpl.scala  |    5 +-
 .../expr/literal/constant/OptNoneImpl.scala   |    5 +-
 .../expr/literal/constant/ReadPermImpl.scala  |   14 +-
 .../ast/expr/literal/constant/VoidImpl.scala  |    5 +-
 .../expr/literal/constant/WritePermImpl.scala |    5 +-
 .../vct/col/ast/expr/lock/CommittedImpl.scala |    3 +-
 src/col/vct/col/ast/expr/lock/HeldImpl.scala  |    5 +-
 .../vct/col/ast/expr/lock/IdleTokenImpl.scala |    5 +-
 .../vct/col/ast/expr/lock/JoinTokenImpl.scala |    5 +-
 src/col/vct/col/ast/expr/misc/AnyImpl.scala   |    5 +-
 .../col/ast/expr/misc/ApplyCoercionImpl.scala |    3 +-
 .../vct/col/ast/expr/misc/CharValueImpl.scala |    3 +-
 src/col/vct/col/ast/expr/misc/EnumImpl.scala  |   14 +-
 .../vct/col/ast/expr/misc/EnumUseImpl.scala   |    3 +-
 .../col/ast/expr/misc/InlinePatternImpl.scala |   19 +-
 src/col/vct/col/ast/expr/misc/LocalImpl.scala |    5 +-
 src/col/vct/col/ast/expr/misc/OldImpl.scala   |   20 +-
 .../col/ast/expr/misc/StringValueImpl.scala   |    6 +-
 .../expr/model/ModelAbstractStateImpl.scala   |   10 +-
 .../col/ast/expr/model/ModelChooseImpl.scala  |   10 +-
 .../col/ast/expr/model/ModelCreateImpl.scala  |    5 +-
 .../col/ast/expr/model/ModelDestroyImpl.scala |    5 +-
 .../col/ast/expr/model/ModelMergeImpl.scala   |   10 +-
 .../vct/col/ast/expr/model/ModelNewImpl.scala |    5 +-
 .../col/ast/expr/model/ModelSplitImpl.scala   |   10 +-
 .../col/ast/expr/model/ModelStateImpl.scala   |    9 +-
 src/col/vct/col/ast/expr/op/BinExprImpl.scala |  104 +-
 src/col/vct/col/ast/expr/op/UnExprImpl.scala  |    5 +-
 .../vct/col/ast/expr/op/bit/BitAndImpl.scala  |    5 +-
 .../vct/col/ast/expr/op/bit/BitNotImpl.scala  |   11 +-
 .../vct/col/ast/expr/op/bit/BitOpImpl.scala   |   13 +-
 .../vct/col/ast/expr/op/bit/BitOrImpl.scala   |    5 +-
 .../vct/col/ast/expr/op/bit/BitShlImpl.scala  |    5 +-
 .../vct/col/ast/expr/op/bit/BitShrImpl.scala  |    5 +-
 .../vct/col/ast/expr/op/bit/BitUShrImpl.scala |    5 +-
 .../vct/col/ast/expr/op/bit/BitXorImpl.scala  |    5 +-
 .../vct/col/ast/expr/op/bool/AndImpl.scala    |    7 +-
 .../expr/op/bool/ComputationalAndImpl.scala   |    5 +-
 .../expr/op/bool/ComputationalOrImpl.scala    |    5 +-
 .../expr/op/bool/ComputationalXorImpl.scala   |    5 +-
 .../vct/col/ast/expr/op/bool/NotImpl.scala    |    5 +-
 src/col/vct/col/ast/expr/op/bool/OrImpl.scala |    5 +-
 .../vct/col/ast/expr/op/bool/SelectImpl.scala |   13 +-
 .../expr/op/cmp/AmbiguousComparisonImpl.scala |    9 +-
 .../col/ast/expr/op/cmp/AmbiguousEqImpl.scala |    3 +-
 .../expr/op/cmp/AmbiguousGreaterEqImpl.scala  |    5 +-
 .../expr/op/cmp/AmbiguousGreaterImpl.scala    |    5 +-
 .../ast/expr/op/cmp/AmbiguousLessEqImpl.scala |    5 +-
 .../ast/expr/op/cmp/AmbiguousLessImpl.scala   |    5 +-
 .../ast/expr/op/cmp/AmbiguousNeqImpl.scala    |    3 +-
 .../expr/op/cmp/AmbiguousOrderOpImpl.scala    |    3 +-
 .../col/ast/expr/op/cmp/ComparisonImpl.scala  |    5 +-
 src/col/vct/col/ast/expr/op/cmp/EqImpl.scala  |    5 +-
 .../col/ast/expr/op/cmp/GreaterEqImpl.scala   |    3 +-
 .../vct/col/ast/expr/op/cmp/GreaterImpl.scala |    3 +-
 .../vct/col/ast/expr/op/cmp/LessEqImpl.scala  |    3 +-
 .../vct/col/ast/expr/op/cmp/LessImpl.scala    |    3 +-
 .../vct/col/ast/expr/op/cmp/MapCmpImpl.scala  |    8 +-
 .../col/ast/expr/op/cmp/MapDisjointImpl.scala |    3 +-
 .../vct/col/ast/expr/op/cmp/MapEqImpl.scala   |    3 +-
 src/col/vct/col/ast/expr/op/cmp/NeqImpl.scala |    5 +-
 .../vct/col/ast/expr/op/cmp/OrderOpImpl.scala |    5 +-
 .../ast/expr/op/cmp/SetComparisonImpl.scala   |    5 +-
 .../col/ast/expr/op/cmp/SubBagEqImpl.scala    |    3 +-
 .../vct/col/ast/expr/op/cmp/SubBagImpl.scala  |    3 +-
 .../col/ast/expr/op/cmp/SubSetEqImpl.scala    |    5 +-
 .../vct/col/ast/expr/op/cmp/SubSetImpl.scala  |    5 +-
 .../col/ast/expr/op/cmp/VectorEqImpl.scala    |    3 +-
 .../col/ast/expr/op/cmp/VectorNeqImpl.scala   |    3 +-
 .../ast/expr/op/collection/BagAddImpl.scala   |    7 +-
 .../op/collection/BagLargestCommonImpl.scala  |    7 +-
 .../op/collection/BagMemberCountImpl.scala    |    5 +-
 .../ast/expr/op/collection/BagMinusImpl.scala |    7 +-
 .../ast/expr/op/collection/ConcatImpl.scala   |    9 +-
 .../col/ast/expr/op/collection/ConsImpl.scala |    9 +-
 .../col/ast/expr/op/collection/DropImpl.scala |    8 +-
 .../ast/expr/op/collection/EmptyImpl.scala    |    5 +-
 .../col/ast/expr/op/collection/HeadImpl.scala |    5 +-
 .../expr/op/collection/PermutationImpl.scala  |    5 +-
 .../ast/expr/op/collection/RemoveAtImpl.scala |    8 +-
 .../expr/op/collection/SeqMemberImpl.scala    |   15 +-
 .../expr/op/collection/SeqSubscriptImpl.scala |    8 +-
 .../expr/op/collection/SeqUpdateImpl.scala    |    9 +-
 .../op/collection/SetIntersectionImpl.scala   |    7 +-
 .../expr/op/collection/SetMemberImpl.scala    |   15 +-
 .../ast/expr/op/collection/SetMinusImpl.scala |    7 +-
 .../ast/expr/op/collection/SetUnionImpl.scala |    7 +-
 .../col/ast/expr/op/collection/SizeImpl.scala |    5 +-
 .../ast/expr/op/collection/SliceImpl.scala    |    8 +-
 .../expr/op/collection/StringConcatImpl.scala |    3 +-
 .../col/ast/expr/op/collection/TailImpl.scala |    5 +-
 .../col/ast/expr/op/collection/TakeImpl.scala |    8 +-
 .../op/collection/VectorSubscriptImpl.scala   |    8 +-
 .../col/ast/expr/op/either/EitherOpImpl.scala |    5 +-
 .../col/ast/expr/op/either/GetLeftImpl.scala  |    5 +-
 .../col/ast/expr/op/either/GetRightImpl.scala |    5 +-
 .../col/ast/expr/op/either/IsLeftImpl.scala   |    5 +-
 .../col/ast/expr/op/either/IsRightImpl.scala  |    5 +-
 .../vct/col/ast/expr/op/map/MapConsImpl.scala |    5 +-
 .../vct/col/ast/expr/op/map/MapGetImpl.scala  |    8 +-
 .../col/ast/expr/op/map/MapItemSetImpl.scala  |    5 +-
 .../col/ast/expr/op/map/MapKeySetImpl.scala   |    5 +-
 .../col/ast/expr/op/map/MapMemberImpl.scala   |   15 +-
 .../vct/col/ast/expr/op/map/MapOpImpl.scala   |    5 +-
 .../col/ast/expr/op/map/MapRemoveImpl.scala   |    5 +-
 .../col/ast/expr/op/map/MapValueSetImpl.scala |    5 +-
 .../ast/expr/op/num/AmbiguousDivImpl.scala    |    3 +-
 .../op/num/AmbiguousDividingExprImpl.scala    |    9 +-
 .../ast/expr/op/num/AmbiguousModImpl.scala    |    3 +-
 .../expr/op/num/AmbiguousTruncDivImpl.scala   |    3 +-
 .../col/ast/expr/op/num/CastFloatImpl.scala   |    3 +-
 .../ast/expr/op/num/DividingExprImpl.scala    |    5 +-
 src/col/vct/col/ast/expr/op/num/ExpImpl.scala |    5 +-
 .../col/ast/expr/op/num/FloatDivImpl.scala    |    5 +-
 .../col/ast/expr/op/num/FloorDivImpl.scala    |    5 +-
 .../vct/col/ast/expr/op/num/MinusImpl.scala   |    5 +-
 src/col/vct/col/ast/expr/op/num/ModImpl.scala |    5 +-
 .../vct/col/ast/expr/op/num/MultImpl.scala    |    5 +-
 .../ast/expr/op/num/NumericBinExprImpl.scala  |    5 +-
 .../vct/col/ast/expr/op/num/PlusImpl.scala    |    5 +-
 .../vct/col/ast/expr/op/num/RatDivImpl.scala  |    5 +-
 .../col/ast/expr/op/num/TruncDivImpl.scala    |    5 +-
 .../col/ast/expr/op/num/TruncModImpl.scala    |    5 +-
 .../vct/col/ast/expr/op/num/UMinusImpl.scala  |   20 +-
 .../ast/expr/op/num/VectorBinExprImpl.scala   |    5 +-
 .../ast/expr/op/num/VectorFloatDivImpl.scala  |    3 +-
 .../ast/expr/op/num/VectorFloorDivImpl.scala  |    3 +-
 .../col/ast/expr/op/num/VectorMinusImpl.scala |    3 +-
 .../col/ast/expr/op/num/VectorModImpl.scala   |    3 +-
 .../col/ast/expr/op/num/VectorMultImpl.scala  |    3 +-
 .../col/ast/expr/op/num/VectorPlusImpl.scala  |    3 +-
 .../ast/expr/op/num/VectorTruncDivImpl.scala  |    3 +-
 .../ast/expr/op/num/VectorTruncModImpl.scala  |    3 +-
 .../col/ast/expr/op/option/OptEmptyImpl.scala |    5 +-
 .../col/ast/expr/op/option/OptGetImpl.scala   |    5 +-
 .../ast/expr/op/option/OptGetOrElseImpl.scala |   11 +-
 .../expr/op/process/ProcessChoiceImpl.scala   |    5 +-
 .../ast/expr/op/process/ProcessParImpl.scala  |    5 +-
 .../expr/op/process/ProcessSelectImpl.scala   |    9 +-
 .../ast/expr/op/process/ProcessSeqImpl.scala  |    5 +-
 .../col/ast/expr/op/tuple/TupGetImpl.scala    |   25 +-
 .../ast/expr/op/vec/MatrixCompareImpl.scala   |    5 +-
 .../ast/expr/op/vec/MatrixRepeatImpl.scala    |    5 +-
 .../col/ast/expr/op/vec/MatrixSumImpl.scala   |    5 +-
 .../ast/expr/op/vec/VectorCompareImpl.scala   |    8 +-
 .../ast/expr/op/vec/VectorRepeatImpl.scala    |    5 +-
 .../col/ast/expr/op/vec/VectorSumImpl.scala   |    5 +-
 .../ast/expr/resource/ActionPermImpl.scala    |    3 +-
 .../col/ast/expr/resource/CurPermImpl.scala   |    5 +-
 .../col/ast/expr/resource/ImpliesImpl.scala   |    5 +-
 .../col/ast/expr/resource/ModelPermImpl.scala |    5 +-
 .../vct/col/ast/expr/resource/PermImpl.scala  |    5 +-
 .../ast/expr/resource/PermPointerImpl.scala   |    5 +-
 .../expr/resource/PermPointerIndexImpl.scala  |    5 +-
 .../col/ast/expr/resource/PointsToImpl.scala  |    5 +-
 .../expr/resource/PolarityDependentImpl.scala |   10 +-
 .../ResourceOfResourceValueImpl.scala         |    3 +-
 .../ast/expr/resource/ResourceValueImpl.scala |    3 +-
 .../expr/resource/ScaleByParBlockImpl.scala   |    3 +-
 .../vct/col/ast/expr/resource/ScaleImpl.scala |    5 +-
 .../vct/col/ast/expr/resource/StarImpl.scala  |   15 +-
 .../col/ast/expr/resource/UnfoldingImpl.scala |   21 +-
 .../ast/expr/resource/ValidArrayImpl.scala    |    5 +-
 .../ast/expr/resource/ValidMatrixImpl.scala   |    5 +-
 .../vct/col/ast/expr/resource/ValueImpl.scala |    3 +-
 .../vct/col/ast/expr/resource/WandImpl.scala  |   15 +-
 .../sideeffect/AssignExpressionImpl.scala     |   15 +-
 .../sideeffect/PostAssignExpressionImpl.scala |   13 +-
 .../sideeffect/PreAssignExpressionImpl.scala  |   13 +-
 .../ast/expr/sideeffect/ScopedExprImpl.scala  |    3 +-
 .../col/ast/expr/sideeffect/ThenImpl.scala    |    5 +-
 .../col/ast/expr/sideeffect/WithImpl.scala    |    5 +-
 src/col/vct/col/ast/expr/type/CastImpl.scala  |   15 +-
 .../col/ast/expr/type/InstanceOfImpl.scala    |    8 +-
 .../vct/col/ast/expr/type/SubTypeImpl.scala   |    5 +-
 .../vct/col/ast/expr/type/SuperTypeImpl.scala |    5 +-
 .../ast/expr/type/TypeComparisonImpl.scala    |    5 +-
 .../vct/col/ast/expr/type/TypeOfImpl.scala    |    5 +-
 .../vct/col/ast/expr/type/TypeValueImpl.scala |    5 +-
 .../AccountedPredicateImpl.scala              |   19 +-
 .../SplitAccountedPredicateImpl.scala         |    3 +-
 .../UnitAccountedPredicateImpl.scala          |    3 +-
 .../family/bipdata/BipIncomingDataImpl.scala  |    3 +-
 .../family/bipdata/BipOutgoingDataImpl.scala  |    8 +-
 .../JavaBipGlueAcceptsImpl.scala              |    7 +-
 .../JavaBipGlueDataWireImpl.scala             |    3 +-
 .../JavaBipGlueRequiresImpl.scala             |    3 +-
 .../JavaBipGlueSynchronImpl.scala             |    9 +-
 .../bipporttype/BipEnforceableImpl.scala      |    3 +-
 .../family/bipporttype/BipInternalImpl.scala  |    3 +-
 .../bipporttype/BipSpontaneousImpl.scala      |    3 +-
 .../family/catchclause/CatchClauseImpl.scala  |    6 +-
 .../coercion/CoerceBoolResourceImpl.scala     |    3 +-
 .../coercion/CoerceBoundIntFloatImpl.scala    |    3 +-
 .../coercion/CoerceBoundIntFracImpl.scala     |    3 +-
 .../coercion/CoerceBoundIntZFracImpl.scala    |    3 +-
 .../coercion/CoerceCArrayPointerImpl.scala    |    3 +-
 .../coercion/CoerceCFloatCIntImpl.scala       |    3 +-
 .../coercion/CoerceCFloatFloatImpl.scala      |    5 +-
 .../coercion/CoerceCIntCFloatImpl.scala       |    5 +-
 .../family/coercion/CoerceCIntIntImpl.scala   |    5 +-
 .../coercion/CoerceCPPArrayPointerImpl.scala  |    5 +-
 .../CoerceCPPPrimitiveToColImpl.scala         |    7 +-
 .../coercion/CoerceCPrimitiveToColImpl.scala  |    5 +-
 .../coercion/CoerceCVectorVectorImpl.scala    |    3 +-
 .../coercion/CoerceClassAnyClassImpl.scala    |    3 +-
 .../CoerceColToCPPPrimitiveImpl.scala         |    7 +-
 .../coercion/CoerceColToCPrimitiveImpl.scala  |    5 +-
 .../family/coercion/CoerceFloatRatImpl.scala  |    3 +-
 .../family/coercion/CoerceFracZFracImpl.scala |    3 +-
 .../family/coercion/CoerceIdentityImpl.scala  |    3 +-
 .../family/coercion/CoerceIntRatImpl.scala    |    3 +-
 .../CoerceJavaClassAnyClassImpl.scala         |    3 +-
 .../coercion/CoerceJavaSupportsImpl.scala     |    3 +-
 .../family/coercion/CoerceJoinUnionImpl.scala |    5 +-
 .../family/coercion/CoerceMapBagImpl.scala    |    3 +-
 .../family/coercion/CoerceMapEitherImpl.scala |    3 +-
 .../family/coercion/CoerceMapMapImpl.scala    |    3 +-
 .../family/coercion/CoerceMapMatrixImpl.scala |    3 +-
 .../family/coercion/CoerceMapOptionImpl.scala |    3 +-
 .../family/coercion/CoerceMapSeqImpl.scala    |    3 +-
 .../family/coercion/CoerceMapSetImpl.scala    |    3 +-
 .../family/coercion/CoerceMapTupleImpl.scala  |    3 +-
 .../family/coercion/CoerceMapTypeImpl.scala   |    3 +-
 .../family/coercion/CoerceMapVectorImpl.scala |    3 +-
 .../coercion/CoerceNothingSomethingImpl.scala |    3 +-
 .../coercion/CoerceNullAnyClassImpl.scala     |    3 +-
 .../family/coercion/CoerceNullArrayImpl.scala |    3 +-
 .../family/coercion/CoerceNullClassImpl.scala |    3 +-
 .../family/coercion/CoerceNullEnumImpl.scala  |    3 +-
 .../coercion/CoerceNullJavaClassImpl.scala    |    3 +-
 .../coercion/CoerceNullPointerImpl.scala      |    3 +-
 .../family/coercion/CoerceNullRefImpl.scala   |    3 +-
 .../family/coercion/CoerceRatZFracImpl.scala  |    3 +-
 .../CoerceResourceResourceValImpl.scala       |    3 +-
 .../CoerceResourceValResourceImpl.scala       |    3 +-
 .../coercion/CoerceSelectUnionImpl.scala      |    3 +-
 .../coercion/CoerceSomethingAnyImpl.scala     |    3 +-
 .../CoerceSomethingAnyValueImpl.scala         |    3 +-
 .../family/coercion/CoerceSupportsImpl.scala  |    6 +-
 .../coercion/CoerceUnboundIntImpl.scala       |    3 +-
 .../coercion/CoerceWidenBoundImpl.scala       |    5 +-
 .../family/coercion/CoerceZFracFracImpl.scala |    3 +-
 .../family/coercion/CoerceZFracRatImpl.scala  |    3 +-
 .../ast/family/coercion/CoercionImpl.scala    |  159 +-
 .../coercion/CoercionSequenceImpl.scala       |    5 +-
 .../contract/ApplicableContractImpl.scala     |   71 +-
 .../ast/family/data/BipGlueAcceptsImpl.scala  |    7 +-
 .../ast/family/data/BipGlueDataWireImpl.scala |    4 +-
 .../ast/family/data/BipGlueRequiresImpl.scala |    7 +-
 .../ast/family/data/JavaBipGlueNameImpl.scala |    7 +-
 .../decreases/DecreasesClauseAssumeImpl.scala |    6 +-
 .../decreases/DecreasesClauseImpl.scala       |    3 +-
 .../DecreasesClauseNoRecursionImpl.scala      |    7 +-
 .../decreases/DecreasesClauseTupleImpl.scala  |    3 +-
 .../ast/family/fieldflag/FieldFlagImpl.scala  |    6 +-
 .../col/ast/family/fieldflag/FinalImpl.scala  |    5 +-
 .../family/invoking/InvokingNodeImpl.scala    |    3 +-
 .../itervariable/IterVariableImpl.scala       |    6 +-
 .../javavar/JavaVariableDeclarationImpl.scala |   16 +-
 .../location/AmbiguousLocationImpl.scala      |    3 +-
 .../family/location/ArrayLocationImpl.scala   |    3 +-
 .../family/location/FieldLocationImpl.scala   |    9 +-
 .../location/HeapVariableLocationImpl.scala   |    3 +-
 .../location/InLinePatternLocationImpl.scala  |    6 +-
 .../InstancePredicateLocationImpl.scala       |    8 +-
 .../ast/family/location/LocationImpl.scala    |   21 +-
 .../family/location/ModelLocationImpl.scala   |    3 +-
 .../family/location/PointerLocationImpl.scala |    3 +-
 .../location/PredicateLocationImpl.scala      |    3 +-
 .../location/SilverFieldLocationImpl.scala    |    3 +-
 .../loopcontract/IterationContractImpl.scala  |    5 +-
 .../loopcontract/LoopContractImpl.scala       |    3 +-
 .../loopcontract/LoopInvariantImpl.scala      |   13 +-
 .../ast/family/parregion/ParBlockImpl.scala   |   37 +-
 .../family/parregion/ParParallelImpl.scala    |    5 +-
 .../ast/family/parregion/ParRegionImpl.scala  |    8 +-
 .../family/parregion/ParSequentialImpl.scala  |    5 +-
 .../pvlcommunicate/PVLCommunicateImpl.scala   |    3 +-
 .../pvlcommunicate/PVLEndpointNameImpl.scala  |    4 +-
 .../ast/family/seqguard/ChorGuardImpl.scala   |    3 +-
 .../family/seqguard/EndpointGuardImpl.scala   |    3 +-
 .../family/seqguard/UnpointedGuardImpl.scala  |    3 +-
 .../col/ast/family/seqrun/ChorRunImpl.scala   |    3 +-
 .../family/signals/SignalsClauseImpl.scala    |    8 +-
 .../ast/lang/c/AmbiguousTruncModImpl.scala    |    3 +-
 .../ast/lang/c/CAbstractDeclarationImpl.scala |    5 +-
 .../ast/lang/c/CAlignmentSpecifierImpl.scala  |    5 +-
 .../c/CAnonymousFunctionDeclaratorImpl.scala  |    6 +-
 .../col/ast/lang/c/CArrayDeclaratorImpl.scala |    9 +-
 src/col/vct/col/ast/lang/c/CAtomicImpl.scala  |    5 +-
 src/col/vct/col/ast/lang/c/CBoolImpl.scala    |    5 +-
 src/col/vct/col/ast/lang/c/CCastImpl.scala    |    8 +-
 src/col/vct/col/ast/lang/c/CCharImpl.scala    |    5 +-
 src/col/vct/col/ast/lang/c/CConstImpl.scala   |    5 +-
 .../vct/col/ast/lang/c/CDeclarationImpl.scala |   16 +-
 .../lang/c/CDeclarationSpecifierImpl.scala    |    5 +-
 .../lang/c/CDeclarationStatementImpl.scala    |    5 +-
 .../vct/col/ast/lang/c/CDeclaratorImpl.scala  |    5 +-
 src/col/vct/col/ast/lang/c/CDoubleImpl.scala  |    7 +-
 src/col/vct/col/ast/lang/c/CExprImpl.scala    |    5 +-
 src/col/vct/col/ast/lang/c/CExternImpl.scala  |    5 +-
 .../vct/col/ast/lang/c/CFieldAccessImpl.scala |   82 +-
 src/col/vct/col/ast/lang/c/CFloatImpl.scala   |    7 +-
 .../ast/lang/c/CFunctionDefinitionImpl.scala  |    9 +-
 .../ast/lang/c/CFunctionSpecifierImpl.scala   |    5 +-
 .../ast/lang/c/CGlobalDeclarationImpl.scala   |    8 +-
 src/col/vct/col/ast/lang/c/CGotoImpl.scala    |    8 +-
 .../lang/c/CGpgpuKernelSpecifierImpl.scala    |    5 +-
 src/col/vct/col/ast/lang/c/CInitImpl.scala    |   10 +-
 src/col/vct/col/ast/lang/c/CInlineImpl.scala  |    5 +-
 src/col/vct/col/ast/lang/c/CIntImpl.scala     |    5 +-
 .../vct/col/ast/lang/c/CInvocationImpl.scala  |   57 +-
 .../col/ast/lang/c/CLiteralArrayImpl.scala    |    8 +-
 .../ast/lang/c/CLocalDeclarationImpl.scala    |    4 +-
 src/col/vct/col/ast/lang/c/CLocalImpl.scala   |   68 +-
 src/col/vct/col/ast/lang/c/CLongImpl.scala    |    5 +-
 src/col/vct/col/ast/lang/c/CNameImpl.scala    |    5 +-
 src/col/vct/col/ast/lang/c/CParamImpl.scala   |    5 +-
 .../ast/lang/c/CPointerDeclaratorImpl.scala   |    5 +-
 src/col/vct/col/ast/lang/c/CPointerImpl.scala |    5 +-
 .../col/ast/lang/c/CPrimitiveTypeImpl.scala   |    5 +-
 src/col/vct/col/ast/lang/c/CPureImpl.scala    |    5 +-
 .../vct/col/ast/lang/c/CRestrictImpl.scala    |    5 +-
 src/col/vct/col/ast/lang/c/CShortImpl.scala   |    5 +-
 src/col/vct/col/ast/lang/c/CSignedImpl.scala  |    5 +-
 .../lang/c/CSpecificationModifierImpl.scala   |    5 +-
 .../ast/lang/c/CSpecificationTypeImpl.scala   |    5 +-
 .../vct/col/ast/lang/c/CStatementImpl.scala   |    5 +-
 src/col/vct/col/ast/lang/c/CStaticImpl.scala  |    5 +-
 .../lang/c/CStorageClassSpecifierImpl.scala   |    5 +-
 .../ast/lang/c/CStructDeclarationImpl.scala   |   11 +-
 .../vct/col/ast/lang/c/CStructDerefImpl.scala |   47 +-
 .../lang/c/CStructMemberDeclaratorImpl.scala  |   20 +-
 .../col/ast/lang/c/CStructSpecifierImpl.scala |    5 +-
 src/col/vct/col/ast/lang/c/CTArrayImpl.scala  |    4 +-
 .../vct/col/ast/lang/c/CTCudaVecImpl.scala    |    3 +-
 .../vct/col/ast/lang/c/CTPointerImpl.scala    |    3 +-
 src/col/vct/col/ast/lang/c/CTStructImpl.scala |    8 +-
 src/col/vct/col/ast/lang/c/CTVectorImpl.scala |   26 +-
 .../col/ast/lang/c/CTranslationUnitImpl.scala |    3 +-
 .../col/ast/lang/c/CTypeAttributeImpl.scala   |    8 +-
 .../lang/c/CTypeExtensionDeclaratorImpl.scala |    5 +-
 .../col/ast/lang/c/CTypeExtensionsImpl.scala  |    3 +-
 src/col/vct/col/ast/lang/c/CTypeImpl.scala    |    5 +-
 ...ypeQualifierDeclarationSpecifierImpl.scala |    6 +-
 .../col/ast/lang/c/CTypeQualifierImpl.scala   |    5 +-
 .../col/ast/lang/c/CTypeSpecifierImpl.scala   |    5 +-
 .../lang/c/CTypedFunctionDeclaratorImpl.scala |   15 +-
 src/col/vct/col/ast/lang/c/CTypedefImpl.scala |    5 +-
 .../vct/col/ast/lang/c/CTypedefNameImpl.scala |    5 +-
 .../vct/col/ast/lang/c/CUDAKernelImpl.scala   |    5 +-
 .../vct/col/ast/lang/c/CUnsignedImpl.scala    |    5 +-
 src/col/vct/col/ast/lang/c/CVoidImpl.scala    |    5 +-
 .../vct/col/ast/lang/c/CVolatileImpl.scala    |    5 +-
 .../col/ast/lang/c/TOpenCLVectorImpl.scala    |    3 +-
 .../lang/cpp/CPPAbstractDeclarationImpl.scala |    5 +-
 .../cpp/CPPAddressingDeclaratorImpl.scala     |    5 +-
 .../col/ast/lang/cpp/CPPAddressingImpl.scala  |    5 +-
 .../ast/lang/cpp/CPPArrayDeclaratorImpl.scala |    5 +-
 .../vct/col/ast/lang/cpp/CPPBoolImpl.scala    |    5 +-
 .../vct/col/ast/lang/cpp/CPPCharImpl.scala    |    5 +-
 .../cpp/CPPClassMethodOrFieldAccessImpl.scala |   41 +-
 .../col/ast/lang/cpp/CPPDeclarationImpl.scala |   13 +-
 .../cpp/CPPDeclarationSpecifierImpl.scala     |    6 +-
 .../cpp/CPPDeclarationStatementImpl.scala     |    5 +-
 .../col/ast/lang/cpp/CPPDeclaratorImpl.scala  |    5 +-
 .../vct/col/ast/lang/cpp/CPPExprImpl.scala    |    5 +-
 .../lang/cpp/CPPExprOrTypeSpecifierImpl.scala |   12 +-
 .../lang/cpp/CPPFunctionDefinitionImpl.scala  |    9 +-
 .../lang/cpp/CPPGlobalDeclarationImpl.scala   |    8 +-
 .../vct/col/ast/lang/cpp/CPPInitImpl.scala    |   10 +-
 .../vct/col/ast/lang/cpp/CPPInlineImpl.scala  |    5 +-
 src/col/vct/col/ast/lang/cpp/CPPIntImpl.scala |    5 +-
 .../col/ast/lang/cpp/CPPInvocationImpl.scala  |   56 +-
 .../lang/cpp/CPPLambdaDeclaratorImpl.scala    |    5 +-
 .../lang/cpp/CPPLambdaDefinitionImpl.scala    |    9 +-
 .../col/ast/lang/cpp/CPPLambdaRefImpl.scala   |    5 +-
 .../ast/lang/cpp/CPPLifetimeScopeImpl.scala   |    5 +-
 .../ast/lang/cpp/CPPLiteralArrayImpl.scala    |    8 +-
 .../lang/cpp/CPPLocalDeclarationImpl.scala    |    4 +-
 .../vct/col/ast/lang/cpp/CPPLocalImpl.scala   |   78 +-
 .../vct/col/ast/lang/cpp/CPPLongImpl.scala    |    5 +-
 .../vct/col/ast/lang/cpp/CPPNameImpl.scala    |    5 +-
 .../vct/col/ast/lang/cpp/CPPParamImpl.scala   |    5 +-
 .../vct/col/ast/lang/cpp/CPPPointerImpl.scala |    5 +-
 .../ast/lang/cpp/CPPPrimitiveTypeImpl.scala   |    5 +-
 .../vct/col/ast/lang/cpp/CPPPureImpl.scala    |    5 +-
 .../col/ast/lang/cpp/CPPReferenceImpl.scala   |    5 +-
 .../vct/col/ast/lang/cpp/CPPShortImpl.scala   |    5 +-
 .../vct/col/ast/lang/cpp/CPPSignedImpl.scala  |    5 +-
 .../cpp/CPPSpecificationModifierImpl.scala    |    5 +-
 .../lang/cpp/CPPSpecificationTypeImpl.scala   |    5 +-
 .../col/ast/lang/cpp/CPPStatementImpl.scala   |    5 +-
 .../vct/col/ast/lang/cpp/CPPTArrayImpl.scala  |    4 +-
 .../vct/col/ast/lang/cpp/CPPTLambdaImpl.scala |    5 +-
 .../ast/lang/cpp/CPPTranslationUnitImpl.scala |    3 +-
 .../vct/col/ast/lang/cpp/CPPTypeImpl.scala    |    5 +-
 .../ast/lang/cpp/CPPTypeSpecifierImpl.scala   |    5 +-
 .../cpp/CPPTypedFunctionDeclaratorImpl.scala  |   16 +-
 .../col/ast/lang/cpp/CPPTypedefNameImpl.scala |   15 +-
 .../col/ast/lang/cpp/CPPUnsignedImpl.scala    |    5 +-
 .../vct/col/ast/lang/cpp/CPPVoidImpl.scala    |    5 +-
 .../col/ast/lang/gpgpu/GPUGlobalImpl.scala    |    6 +-
 .../vct/col/ast/lang/gpgpu/GPULocalImpl.scala |    5 +-
 .../col/ast/lang/gpgpu/GpgpuAtomicImpl.scala  |   21 +-
 .../col/ast/lang/gpgpu/GpgpuBarrierImpl.scala |    8 +-
 .../gpgpu/GpgpuCudaKernelInvocationImpl.scala |   49 +-
 .../lang/gpgpu/GpuGlobalMemoryFenceImpl.scala |    6 +-
 .../lang/gpgpu/GpuLocalMemoryFenceImpl.scala  |    6 +-
 .../ast/lang/gpgpu/GpuMemoryFenceImpl.scala   |    5 +-
 .../lang/gpgpu/GpuZeroMemoryFenceImpl.scala   |    3 +-
 .../col/ast/lang/gpgpu/OpenCLKernelImpl.scala |    5 +-
 .../ast/lang/gpgpu/SharedMemSizeImpl.scala    |    5 +-
 .../col/ast/lang/java/JavaAbstractImpl.scala  |    5 +-
 .../ast/lang/java/JavaAnnotationImpl.scala    |   28 +-
 .../java/JavaAnnotationInterfaceImpl.scala    |    5 +-
 .../lang/java/JavaAnnotationMethodImpl.scala  |    4 +-
 .../lang/java/JavaClassDeclarationImpl.scala  |    5 +-
 .../vct/col/ast/lang/java/JavaClassImpl.scala |   62 +-
 .../lang/java/JavaClassOrInterfaceImpl.scala  |   46 +-
 .../ast/lang/java/JavaConstructorImpl.scala   |   23 +-
 .../vct/col/ast/lang/java/JavaDerefImpl.scala |   36 +-
 .../vct/col/ast/lang/java/JavaExprImpl.scala  |    5 +-
 .../col/ast/lang/java/JavaFieldsImpl.scala    |    5 +-
 .../vct/col/ast/lang/java/JavaFinalImpl.scala |    5 +-
 .../lang/java/JavaGlobalDeclarationImpl.scala |    5 +-
 .../col/ast/lang/java/JavaImportImpl.scala    |   17 +-
 .../col/ast/lang/java/JavaInlineImpl.scala    |    5 +-
 .../col/ast/lang/java/JavaInterfaceImpl.scala |   20 +-
 .../ast/lang/java/JavaInvocationImpl.scala    |   46 +-
 .../ast/lang/java/JavaLiteralArrayImpl.scala  |    5 +-
 .../lang/java/JavaLocalDeclarationImpl.scala  |    6 +-
 .../JavaLocalDeclarationStatementImpl.scala   |    6 +-
 .../vct/col/ast/lang/java/JavaLocalImpl.scala |   36 +-
 .../col/ast/lang/java/JavaMethodImpl.scala    |   30 +-
 .../col/ast/lang/java/JavaModifierImpl.scala  |    5 +-
 .../vct/col/ast/lang/java/JavaNameImpl.scala  |    8 +-
 .../col/ast/lang/java/JavaNamedTypeImpl.scala |    8 +-
 .../col/ast/lang/java/JavaNamespaceImpl.scala |   19 +-
 .../col/ast/lang/java/JavaNativeImpl.scala    |    5 +-
 .../col/ast/lang/java/JavaNewClassImpl.scala  |   15 +-
 .../lang/java/JavaNewDefaultArrayImpl.scala   |   12 +-
 .../lang/java/JavaNewLiteralArrayImpl.scala   |    8 +-
 .../vct/col/ast/lang/java/JavaParamImpl.scala |    3 +-
 .../col/ast/lang/java/JavaPrivateImpl.scala   |    5 +-
 .../col/ast/lang/java/JavaProtectedImpl.scala |    5 +-
 .../col/ast/lang/java/JavaPublicImpl.scala    |    5 +-
 .../vct/col/ast/lang/java/JavaPureImpl.scala  |    5 +-
 .../java/JavaSharedInitializationImpl.scala   |   10 +-
 .../col/ast/lang/java/JavaStatementImpl.scala |    5 +-
 .../col/ast/lang/java/JavaStaticImpl.scala    |    5 +-
 .../col/ast/lang/java/JavaStrictFPImpl.scala  |    5 +-
 .../ast/lang/java/JavaStringValueImpl.scala   |   14 +-
 .../ast/lang/java/JavaSynchronizedImpl.scala  |    5 +-
 .../col/ast/lang/java/JavaTClassImpl.scala    |   10 +-
 .../col/ast/lang/java/JavaTransientImpl.scala |    5 +-
 .../vct/col/ast/lang/java/JavaTypeImpl.scala  |    5 +-
 .../col/ast/lang/java/JavaVolatileImpl.scala  |    5 +-
 .../col/ast/lang/java/JavaWildcardImpl.scala  |    3 +-
 .../LlvmAmbiguousFunctionInvocationImpl.scala |   24 +-
 .../vct/col/ast/lang/llvm/LlvmExprImpl.scala  |    4 +-
 .../lang/llvm/LlvmFunctionContractImpl.scala  |    4 +-
 .../llvm/LlvmFunctionDefinitionImpl.scala     |    6 +-
 .../llvm/LlvmFunctionInvocationImpl.scala     |    7 +-
 .../col/ast/lang/llvm/LlvmGlobalImpl.scala    |    3 +-
 .../vct/col/ast/lang/llvm/LlvmLocalImpl.scala |    3 +-
 .../ast/lang/llvm/LlvmLoopContractImpl.scala  |    3 +-
 .../vct/col/ast/lang/llvm/LlvmLoopImpl.scala  |    4 +-
 .../ast/lang/llvm/LlvmLoopInvariantImpl.scala |    3 +-
 .../ast/lang/llvm/LlvmSpecFunctionImpl.scala  |   27 +-
 .../lang/pvl/PVLClassDeclarationImpl.scala    |    5 +-
 .../col/ast/lang/pvl/PVLConstructorImpl.scala |   11 +-
 .../vct/col/ast/lang/pvl/PVLDerefImpl.scala   |   23 +-
 .../vct/col/ast/lang/pvl/PVLExprImpl.scala    |    5 +-
 .../col/ast/lang/pvl/PVLInvocationImpl.scala  |   65 +-
 .../vct/col/ast/lang/pvl/PVLLocalImpl.scala   |   28 +-
 .../col/ast/lang/pvl/PVLNamedTypeImpl.scala   |   14 +-
 src/col/vct/col/ast/lang/pvl/PVLNewImpl.scala |   10 +-
 .../vct/col/ast/lang/pvl/PVLTypeImpl.scala    |    5 +-
 .../ast/lang/silver/SilverAssignImpl.scala    |    5 +-
 .../ast/lang/silver/SilverBagSizeImpl.scala   |    6 +-
 .../lang/silver/SilverCurFieldPermImpl.scala  |    8 +-
 .../lang/silver/SilverCurPredPermImpl.scala   |    5 +-
 .../lang/silver/SilverDeclarationImpl.scala   |    5 +-
 .../col/ast/lang/silver/SilverDerefImpl.scala |    5 +-
 .../col/ast/lang/silver/SilverExprImpl.scala  |    5 +-
 .../lang/silver/SilverFieldAssignImpl.scala   |    5 +-
 .../col/ast/lang/silver/SilverFieldImpl.scala |    5 +-
 .../ast/lang/silver/SilverIntToRatImpl.scala  |    3 +-
 .../lang/silver/SilverLocalAssignImpl.scala   |    5 +-
 .../ast/lang/silver/SilverMapSizeImpl.scala   |    6 +-
 .../ast/lang/silver/SilverNewRefImpl.scala    |   10 +-
 .../col/ast/lang/silver/SilverNullImpl.scala  |    3 +-
 ...lverPartialADTFunctionInvocationImpl.scala |   19 +-
 .../silver/SilverPartialTAxiomaticImpl.scala  |    3 +-
 .../ast/lang/silver/SilverSeqSizeImpl.scala   |    6 +-
 .../ast/lang/silver/SilverSetSizeImpl.scala   |    6 +-
 .../ast/lang/silver/SilverStatementImpl.scala |    5 +-
 .../col/ast/lang/silver/SilverTypeImpl.scala  |    5 +-
 .../SilverUntypedNonemptyLiteralMapImpl.scala |    8 +-
 src/col/vct/col/ast/lang/smt/BoogieImpl.scala |    3 +-
 .../col/ast/lang/smt/ProverLanguageImpl.scala |    3 +-
 src/col/vct/col/ast/lang/smt/SmtLibImpl.scala |    3 +-
 .../smt/SmtlibADTFunctionSymbolImpl.scala     |    3 +-
 .../lang/smt/SmtlibBitvecLiteralImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibBvAddImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibBvAndImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibBvMulImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibBvNegImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibBvNotImpl.scala    |    3 +-
 .../vct/col/ast/lang/smt/SmtlibBvOrImpl.scala |    3 +-
 .../col/ast/lang/smt/SmtlibBvShlImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibBvShrImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibBvUDivImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibBvULtImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibBvURemImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibConcatImpl.scala   |    7 +-
 .../col/ast/lang/smt/SmtlibExtractImpl.scala  |    6 +-
 .../col/ast/lang/smt/SmtlibFpAbsImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibFpAddImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibFpCastImpl.scala   |    6 +-
 .../col/ast/lang/smt/SmtlibFpDivImpl.scala    |    3 +-
 .../vct/col/ast/lang/smt/SmtlibFpEqImpl.scala |    3 +-
 .../col/ast/lang/smt/SmtlibFpFmaImpl.scala    |    3 +-
 .../ast/lang/smt/SmtlibFpFromRealImpl.scala   |    6 +-
 .../ast/lang/smt/SmtlibFpFromSIntImpl.scala   |    6 +-
 .../ast/lang/smt/SmtlibFpFromUIntImpl.scala   |    6 +-
 .../col/ast/lang/smt/SmtlibFpGeqImpl.scala    |    3 +-
 .../vct/col/ast/lang/smt/SmtlibFpGtImpl.scala |    3 +-
 .../vct/col/ast/lang/smt/SmtlibFpImpl.scala   |    9 +-
 .../ast/lang/smt/SmtlibFpIsInfiniteImpl.scala |    3 +-
 .../col/ast/lang/smt/SmtlibFpIsNaNImpl.scala  |    3 +-
 .../ast/lang/smt/SmtlibFpIsNegativeImpl.scala |    3 +-
 .../ast/lang/smt/SmtlibFpIsNormalImpl.scala   |    3 +-
 .../ast/lang/smt/SmtlibFpIsPositiveImpl.scala |    3 +-
 .../lang/smt/SmtlibFpIsSubnormalImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibFpIsZeroImpl.scala |    3 +-
 .../col/ast/lang/smt/SmtlibFpLeqImpl.scala    |    3 +-
 .../vct/col/ast/lang/smt/SmtlibFpLtImpl.scala |    3 +-
 .../col/ast/lang/smt/SmtlibFpMaxImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibFpMinImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibFpMulImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibFpNegImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibFpRemImpl.scala    |    3 +-
 .../smt/SmtlibFpRoundToIntegralImpl.scala     |    3 +-
 .../col/ast/lang/smt/SmtlibFpSqrtImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibFpSubImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibFpToRealImpl.scala |    3 +-
 .../col/ast/lang/smt/SmtlibFpToSIntImpl.scala |    3 +-
 .../col/ast/lang/smt/SmtlibFpToUIntImpl.scala |    3 +-
 .../lang/smt/SmtlibFunctionSymbolImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibIsIntImpl.scala    |    3 +-
 .../lang/smt/SmtlibLiteralStringImpl.scala    |    3 +-
 .../vct/col/ast/lang/smt/SmtlibPowImpl.scala  |    3 +-
 .../smt/SmtlibProverFunctionSymbolImpl.scala  |    4 +-
 .../vct/col/ast/lang/smt/SmtlibRNAImpl.scala  |    3 +-
 .../vct/col/ast/lang/smt/SmtlibRNEImpl.scala  |    3 +-
 .../vct/col/ast/lang/smt/SmtlibRTNImpl.scala  |    3 +-
 .../vct/col/ast/lang/smt/SmtlibRTPImpl.scala  |    3 +-
 .../vct/col/ast/lang/smt/SmtlibRTZImpl.scala  |    3 +-
 .../ast/lang/smt/SmtlibReAllCharImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibReAllImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibReCompImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibReConcatImpl.scala |    3 +-
 .../ast/lang/smt/SmtlibReContainsImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibReDiffImpl.scala   |    3 +-
 .../ast/lang/smt/SmtlibReFromStrImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibReInterImpl.scala  |    3 +-
 .../col/ast/lang/smt/SmtlibReNoneImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibReOptImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibRePlusImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibReRangeImpl.scala  |    3 +-
 .../col/ast/lang/smt/SmtlibReRepeatImpl.scala |    3 +-
 .../lang/smt/SmtlibReRepeatRangeImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibReStarImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibReUnionImpl.scala  |    3 +-
 .../col/ast/lang/smt/SmtlibSelectImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibStoreImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibStrAtImpl.scala    |    3 +-
 .../ast/lang/smt/SmtlibStrConcatImpl.scala    |    3 +-
 .../ast/lang/smt/SmtlibStrContainsImpl.scala  |    3 +-
 .../ast/lang/smt/SmtlibStrFromCodeImpl.scala  |    3 +-
 .../ast/lang/smt/SmtlibStrFromIntImpl.scala   |    3 +-
 .../ast/lang/smt/SmtlibStrIndexOfImpl.scala   |    3 +-
 .../ast/lang/smt/SmtlibStrIsDigitImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibStrLenImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibStrLeqImpl.scala   |    3 +-
 .../col/ast/lang/smt/SmtlibStrLtImpl.scala    |    3 +-
 .../ast/lang/smt/SmtlibStrPrefixOfImpl.scala  |    3 +-
 .../lang/smt/SmtlibStrReplaceAllImpl.scala    |    3 +-
 .../ast/lang/smt/SmtlibStrReplaceImpl.scala   |    3 +-
 .../lang/smt/SmtlibStrReplaceReAllImpl.scala  |    3 +-
 .../ast/lang/smt/SmtlibStrReplaceReImpl.scala |    3 +-
 .../ast/lang/smt/SmtlibStrSuffixOfImpl.scala  |    3 +-
 .../ast/lang/smt/SmtlibStrToCodeImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibStrToIntImpl.scala |    3 +-
 .../col/ast/lang/smt/SmtlibSubstrImpl.scala   |    3 +-
 .../vct/col/ast/lang/smt/SmtlibToFpImpl.scala |    6 +-
 .../col/ast/lang/smt/SmtlibToIntImpl.scala    |    3 +-
 .../col/ast/lang/smt/SmtlibToRealImpl.scala   |    3 +-
 .../col/ast/lang/smt/TSmtlibArrayImpl.scala   |    3 +-
 .../ast/lang/smt/TSmtlibBitVectorImpl.scala   |    3 +-
 .../lang/smt/TSmtlibFloatingPointImpl.scala   |    3 +-
 .../col/ast/lang/smt/TSmtlibRegLanImpl.scala  |    3 +-
 .../lang/smt/TSmtlibRoundingModeImpl.scala    |    3 +-
 .../vct/col/ast/lang/smt/TSmtlibSeqImpl.scala |    3 +-
 .../col/ast/lang/smt/TSmtlibStringImpl.scala  |    3 +-
 .../col/ast/lang/smt/Z3ArrayConstImpl.scala   |    3 +-
 .../vct/col/ast/lang/smt/Z3ArrayMapImpl.scala |    3 +-
 .../ast/lang/smt/Z3ArrayOfFunctionImpl.scala  |    8 +-
 .../vct/col/ast/lang/smt/Z3BvNandImpl.scala   |    3 +-
 .../vct/col/ast/lang/smt/Z3BvNorImpl.scala    |    3 +-
 .../vct/col/ast/lang/smt/Z3BvSModImpl.scala   |    3 +-
 .../vct/col/ast/lang/smt/Z3BvSRemImpl.scala   |    3 +-
 .../vct/col/ast/lang/smt/Z3BvSShrImpl.scala   |    3 +-
 .../vct/col/ast/lang/smt/Z3BvSubImpl.scala    |    3 +-
 .../vct/col/ast/lang/smt/Z3BvXnorImpl.scala   |    3 +-
 .../vct/col/ast/lang/smt/Z3SeqAtImpl.scala    |    3 +-
 .../col/ast/lang/smt/Z3SeqConcatImpl.scala    |    3 +-
 .../col/ast/lang/smt/Z3SeqContainsImpl.scala  |    3 +-
 .../vct/col/ast/lang/smt/Z3SeqEmptyImpl.scala |    3 +-
 .../col/ast/lang/smt/Z3SeqExtractImpl.scala   |    3 +-
 .../col/ast/lang/smt/Z3SeqFoldlIImpl.scala    |    3 +-
 .../vct/col/ast/lang/smt/Z3SeqFoldlImpl.scala |    3 +-
 .../vct/col/ast/lang/smt/Z3SeqLenImpl.scala   |    3 +-
 .../vct/col/ast/lang/smt/Z3SeqMapIImpl.scala  |    3 +-
 .../vct/col/ast/lang/smt/Z3SeqMapImpl.scala   |    3 +-
 .../vct/col/ast/lang/smt/Z3SeqNthImpl.scala   |    3 +-
 .../col/ast/lang/smt/Z3SeqPrefixOfImpl.scala  |    3 +-
 .../col/ast/lang/smt/Z3SeqReplaceImpl.scala   |    3 +-
 .../col/ast/lang/smt/Z3SeqSuffixOfImpl.scala  |    3 +-
 .../vct/col/ast/lang/smt/Z3SeqUnitImpl.scala  |    3 +-
 .../lang/smt/Z3TransitiveClosureImpl.scala    |    3 +-
 .../ast/lang/sycl/SYCLAccessModeImpl.scala    |    5 +-
 .../ast/lang/sycl/SYCLClassDefNameImpl.scala  |   14 +-
 .../col/ast/lang/sycl/SYCLNDRangeImpl.scala   |   21 +-
 .../vct/col/ast/lang/sycl/SYCLRangeImpl.scala |   11 +-
 .../lang/sycl/SYCLReadOnlyAccessImpl.scala    |    5 +-
 .../lang/sycl/SYCLReadWriteAccessImpl.scala   |    5 +-
 .../ast/lang/sycl/SYCLTAccessModeImpl.scala   |    8 +-
 .../col/ast/lang/sycl/SYCLTAccessorImpl.scala |  137 +-
 .../col/ast/lang/sycl/SYCLTBufferImpl.scala   |  319 +-
 .../col/ast/lang/sycl/SYCLTClassImpl.scala    |    5 +-
 .../sycl/SYCLTConstructableClassImpl.scala    |   10 +-
 .../col/ast/lang/sycl/SYCLTEventImpl.scala    |    5 +-
 .../col/ast/lang/sycl/SYCLTHandlerImpl.scala  |    5 +-
 .../vct/col/ast/lang/sycl/SYCLTItemImpl.scala |    5 +-
 .../lang/sycl/SYCLTLocalAccessorImpl.scala    |   41 +-
 .../col/ast/lang/sycl/SYCLTNDItemImpl.scala   |    5 +-
 .../col/ast/lang/sycl/SYCLTNDRangeImpl.scala  |   34 +-
 .../col/ast/lang/sycl/SYCLTQueueImpl.scala    |    5 +-
 .../col/ast/lang/sycl/SYCLTRangeImpl.scala    |   32 +-
 src/col/vct/col/ast/node/NodeFamilyImpl.scala |    9 +-
 src/col/vct/col/ast/node/NodeImpl.scala       |  205 +-
 src/col/vct/col/ast/node/ProgramImpl.scala    |   14 +-
 .../ast/node/VerificationContextImpl.scala    |    4 +-
 .../vct/col/ast/node/VerificationImpl.scala   |   14 +-
 .../vct/col/ast/statement/StatementImpl.scala |    3 +-
 .../ExpressionContainerStatementImpl.scala    |    3 +-
 .../ast/statement/composite/BlockImpl.scala   |    8 +-
 .../ast/statement/composite/BranchImpl.scala  |    7 +-
 .../composite/CompositeStatementImpl.scala    |    3 +-
 .../statement/composite/IndetBranchImpl.scala |    9 +-
 .../ast/statement/composite/LoopImpl.scala    |  154 +-
 .../ast/statement/composite/ModelDoImpl.scala |    9 +-
 .../statement/composite/ParAtomicImpl.scala   |    8 +-
 .../statement/composite/ParBarrierImpl.scala  |   11 +-
 .../composite/ParInvariantImpl.scala          |    9 +-
 .../composite/ParStatementImpl.scala          |    5 +-
 .../statement/composite/RangedForImpl.scala   |   10 +-
 .../ast/statement/composite/ScopeImpl.scala   |   21 +-
 .../ast/statement/composite/SwitchImpl.scala  |   17 +-
 .../composite/SynchronizedImpl.scala          |    8 +-
 .../composite/TryCatchFinallyImpl.scala       |   22 +-
 .../statement/composite/VecBlockImpl.scala    |    5 +-
 .../statement/composite/WandPackageImpl.scala |    5 +-
 .../ast/statement/exceptional/BreakImpl.scala |   11 +-
 .../statement/exceptional/ContinueImpl.scala  |   11 +-
 .../ast/statement/exceptional/EvalImpl.scala  |   19 +-
 .../ExceptionalStatementImpl.scala            |    3 +-
 .../exceptional/InvocationStatementImpl.scala |    3 +-
 .../exceptional/InvokeMethodImpl.scala        |   15 +-
 .../exceptional/InvokeProcedureImpl.scala     |   34 +-
 .../statement/exceptional/ReturnImpl.scala    |   23 +-
 .../ast/statement/exceptional/ThrowImpl.scala |    8 +-
 .../nonexecutable/LocalDeclImpl.scala         |   14 +-
 .../NonExecutableStatementImpl.scala          |    3 +-
 .../nonexecutable/SpecIgnoreEndImpl.scala     |    5 +-
 .../nonexecutable/SpecIgnoreStartImpl.scala   |    5 +-
 .../ast/statement/terminal/AssertImpl.scala   |   20 +-
 .../ast/statement/terminal/AssignImpl.scala   |   33 +-
 .../ast/statement/terminal/AssumeImpl.scala   |   20 +-
 .../col/ast/statement/terminal/CaseImpl.scala |    8 +-
 .../ast/statement/terminal/CommitImpl.scala   |   11 +-
 .../statement/terminal/DefaultCaseImpl.scala  |    5 +-
 .../ast/statement/terminal/ExhaleImpl.scala   |   20 +-
 .../ast/statement/terminal/ExtractImpl.scala  |    6 +-
 .../col/ast/statement/terminal/FoldImpl.scala |   21 +-
 .../col/ast/statement/terminal/ForkImpl.scala |   11 +-
 .../statement/terminal/FramedProofImpl.scala  |   12 +-
 .../col/ast/statement/terminal/GotoImpl.scala |   14 +-
 .../ast/statement/terminal/HavocImpl.scala    |   11 +-
 .../ast/statement/terminal/InhaleImpl.scala   |   20 +-
 .../col/ast/statement/terminal/JoinImpl.scala |   11 +-
 .../ast/statement/terminal/LabelImpl.scala    |   36 +-
 .../col/ast/statement/terminal/LockImpl.scala |   11 +-
 .../NormallyCompletingStatementImpl.scala     |    3 +-
 .../ast/statement/terminal/NotifyImpl.scala   |   11 +-
 .../col/ast/statement/terminal/RecvImpl.scala |    8 +-
 .../ast/statement/terminal/RefuteImpl.scala   |   20 +-
 .../col/ast/statement/terminal/SendImpl.scala |   10 +-
 .../statement/terminal/SwitchCaseImpl.scala   |    3 +-
 .../ast/statement/terminal/UnfoldImpl.scala   |   21 +-
 .../ast/statement/terminal/UnlockImpl.scala   |   11 +-
 .../col/ast/statement/terminal/WaitImpl.scala |   11 +-
 .../statement/terminal/WandApplyImpl.scala    |   17 +-
 .../statement/veymont/ChorBranchImpl.scala    |   47 +-
 .../ast/statement/veymont/ChorLoopImpl.scala  |   48 +-
 .../statement/veymont/ChorStatementImpl.scala |  181 +-
 .../statement/veymont/CommunicateImpl.scala   |   39 +-
 .../statement/veymont/CommunicateXImpl.scala  |    3 +-
 .../veymont/VeyMontAssignExpressionImpl.scala |    3 +-
 src/col/vct/col/ast/type/TAnyClassImpl.scala  |    3 +-
 src/col/vct/col/ast/type/TAnyImpl.scala       |    5 +-
 src/col/vct/col/ast/type/TAnyValueImpl.scala  |    3 +-
 src/col/vct/col/ast/type/TArrayImpl.scala     |    5 +-
 src/col/vct/col/ast/type/TAxiomaticImpl.scala |   13 +-
 src/col/vct/col/ast/type/TBagImpl.scala       |    5 +-
 src/col/vct/col/ast/type/TBoolImpl.scala      |   18 +-
 .../vct/col/ast/type/TBoundedIntImpl.scala    |    5 +-
 src/col/vct/col/ast/type/TCFloatImpl.scala    |    8 +-
 src/col/vct/col/ast/type/TCIntImpl.scala      |    5 +-
 src/col/vct/col/ast/type/TCharImpl.scala      |    5 +-
 .../vct/col/ast/type/TChoreographyImpl.scala  |    3 +-
 src/col/vct/col/ast/type/TClassImpl.scala     |   42 +-
 src/col/vct/col/ast/type/TEitherImpl.scala    |    5 +-
 src/col/vct/col/ast/type/TEndpointImpl.scala  |    3 +-
 src/col/vct/col/ast/type/TFloatImpl.scala     |    5 +-
 src/col/vct/col/ast/type/TFractionImpl.scala  |    5 +-
 src/col/vct/col/ast/type/TIntImpl.scala       |    5 +-
 src/col/vct/col/ast/type/TMapImpl.scala       |    5 +-
 src/col/vct/col/ast/type/TMatrixImpl.scala    |    5 +-
 src/col/vct/col/ast/type/TModelImpl.scala     |    8 +-
 src/col/vct/col/ast/type/TNotAValueImpl.scala |    3 +-
 src/col/vct/col/ast/type/TNothingImpl.scala   |    5 +-
 src/col/vct/col/ast/type/TNullImpl.scala      |    5 +-
 src/col/vct/col/ast/type/TOptionImpl.scala    |    5 +-
 src/col/vct/col/ast/type/TPointerImpl.scala   |    5 +-
 src/col/vct/col/ast/type/TProcessImpl.scala   |    5 +-
 .../vct/col/ast/type/TProverTypeImpl.scala    |    3 +-
 src/col/vct/col/ast/type/TRationalImpl.scala  |    5 +-
 src/col/vct/col/ast/type/TRefImpl.scala       |    5 +-
 src/col/vct/col/ast/type/TResourceImpl.scala  |    5 +-
 .../vct/col/ast/type/TResourceValImpl.scala   |    3 +-
 src/col/vct/col/ast/type/TSeqImpl.scala       |    5 +-
 src/col/vct/col/ast/type/TSetImpl.scala       |    5 +-
 src/col/vct/col/ast/type/TStringImpl.scala    |   16 +-
 src/col/vct/col/ast/type/TTupleImpl.scala     |    5 +-
 src/col/vct/col/ast/type/TTypeImpl.scala      |    5 +-
 src/col/vct/col/ast/type/TUnionImpl.scala     |    7 +-
 src/col/vct/col/ast/type/TVarImpl.scala       |   11 +-
 src/col/vct/col/ast/type/TVectorImpl.scala    |   10 +-
 .../col/ast/type/TVeyMontChannelImpl.scala    |    8 +-
 src/col/vct/col/ast/type/TVoidImpl.scala      |    5 +-
 src/col/vct/col/ast/type/TZFractionImpl.scala |    5 +-
 .../type/typeclass/CompositeTypeImpl.scala    |    3 +-
 .../ast/type/typeclass/DeclaredTypeImpl.scala |    3 +-
 .../ast/type/typeclass/FloatTypeImpl.scala    |   93 +-
 .../col/ast/type/typeclass/IntTypeImpl.scala  |    3 +-
 .../ast/type/typeclass/NumericTypeImpl.scala  |    3 +-
 .../type/typeclass/PrimitiveTypeImpl.scala    |    3 +-
 .../ast/type/typeclass/SizedTypeImpl.scala    |    3 +-
 .../vct/col/ast/type/typeclass/TypeImpl.scala |   87 +-
 .../vct/col/ast/unsorted/BipGlueImpl.scala    |    3 +-
 .../col/ast/unsorted/BipPortTypeImpl.scala    |    3 +-
 .../CFunctionTypeExtensionModifierImpl.scala  |    7 +-
 .../col/ast/unsorted/ChooseFreshImpl.scala    |    6 +-
 src/col/vct/col/ast/unsorted/ChooseImpl.scala |    6 +-
 .../vct/col/ast/unsorted/ChorPermImpl.scala   |    6 +-
 .../CoerceDecreasePrecisionImpl.scala         |    3 +-
 .../CoerceIncreasePrecisionImpl.scala         |    3 +-
 .../unsorted/CommunicateStatementImpl.scala   |    6 +-
 .../col/ast/unsorted/ConstructorImpl.scala    |   22 +-
 .../unsorted/ConstructorInvocationImpl.scala  |   22 +-
 .../col/ast/unsorted/EnumConstantImpl.scala   |    4 +-
 .../col/ast/unsorted/InstantiateImpl.scala    |    3 +-
 .../ast/unsorted/InvokeConstructorImpl.scala  |    3 +-
 .../ast/unsorted/JavaBipAnnotationImpl.scala  |    3 +-
 .../ast/unsorted/JavaBipGlueElementImpl.scala |    3 +-
 .../vct/col/ast/unsorted/MessageImpl.scala    |    3 +-
 .../vct/col/ast/unsorted/OperatorImpl.scala   |    3 +-
 .../ast/unsorted/OperatorLeftPlusImpl.scala   |    3 +-
 .../ast/unsorted/OperatorRightPlusImpl.scala  |    3 +-
 .../vct/col/ast/unsorted/PVLBranchImpl.scala  |    3 +-
 .../unsorted/PVLChannelInvariantImpl.scala    |    3 +-
 .../col/ast/unsorted/PVLChorPermImpl.scala    |    3 +-
 .../vct/col/ast/unsorted/PVLChorRunImpl.scala |    3 +-
 .../ast/unsorted/PVLChorStatementImpl.scala   |   36 +-
 .../col/ast/unsorted/PVLEndpointImpl.scala    |    3 +-
 .../vct/col/ast/unsorted/PVLLoopImpl.scala    |    3 +-
 .../vct/col/ast/unsorted/PVLMessageImpl.scala |    3 +-
 .../col/ast/unsorted/PVLReceiverImpl.scala    |    3 +-
 .../vct/col/ast/unsorted/PVLSenderImpl.scala  |    3 +-
 .../vct/col/ast/unsorted/RangeSetImpl.scala   |    6 +-
 .../vct/col/ast/unsorted/ReceiverImpl.scala   |    3 +-
 src/col/vct/col/ast/unsorted/SenderImpl.scala |    3 +-
 src/col/vct/col/ast/unsorted/TEnumImpl.scala  |    3 +-
 .../ast/unsorted/TPVLChoreographyImpl.scala   |    3 +-
 .../unsorted/UnresolvedChorBranchImpl.scala   |    3 +-
 .../ast/unsorted/UnresolvedChorLoopImpl.scala |    3 +-
 .../col/ast/util/CheckFoldUnfoldTarget.scala  |   67 +-
 src/col/vct/col/ast/util/Declarator.scala     |   14 +-
 .../ast/util/ExpressionEqualityCheck.scala    |  661 ++-
 src/col/vct/col/check/Check.scala             |  247 +-
 src/col/vct/col/compare/Compare.scala         |   50 +-
 src/col/vct/col/compare/CompareResult.scala   |   11 +-
 src/col/vct/col/debug/DebugRewriteState.scala |    2 +-
 src/col/vct/col/err/ASTStateError.scala       |    2 +-
 .../err/ContextSensitiveNodeNotResolved.scala |    3 +-
 .../col/err/InconsistentSuccessionTypes.scala |   11 +-
 src/col/vct/col/err/MistypedRef.scala         |    3 +-
 src/col/vct/col/err/NotResolved.scala         |    5 +-
 src/col/vct/col/feature/Feature.scala         |   14 +-
 src/col/vct/col/feature/FeatureRainbow.scala  | 1461 +++---
 src/col/vct/col/origin/Blame.scala            | 1309 +++--
 src/col/vct/col/origin/ExpectedError.scala    |   21 +-
 .../origin/HideDuringTriggerGeneration.scala  |    9 +-
 src/col/vct/col/origin/Name.scala             |    9 +-
 src/col/vct/col/origin/Origin.scala           |  423 +-
 src/col/vct/col/print/Ctx.scala               |   21 +-
 src/col/vct/col/print/Doc.scala               |  272 +-
 src/col/vct/col/print/DocUtil.scala           |   91 +-
 src/col/vct/col/print/Keywords.scala          |  321 +-
 src/col/vct/col/print/Namer.scala             |  179 +-
 src/col/vct/col/ref/DirectRef.scala           |   13 +-
 src/col/vct/col/ref/LazyRef.scala             |   21 +-
 src/col/vct/col/ref/Ref.scala                 |   71 +-
 src/col/vct/col/ref/UnresolvedRef.scala       |   19 +-
 src/col/vct/col/resolve/ResolutionError.scala |   97 +-
 src/col/vct/col/resolve/Resolve.scala         | 1677 +++---
 .../ctx/ReferenceResolutionContext.scala      |   79 +-
 src/col/vct/col/resolve/ctx/Referrable.scala  |  702 ++-
 .../resolve/ctx/TypeResolutionContext.scala   |   16 +-
 src/col/vct/col/resolve/lang/C.scala          |  419 +-
 src/col/vct/col/resolve/lang/CPP.scala        |  354 +-
 src/col/vct/col/resolve/lang/Java.scala       | 1037 ++--
 src/col/vct/col/resolve/lang/LLVM.scala       |   23 +-
 src/col/vct/col/resolve/lang/PVL.scala        |  174 +-
 src/col/vct/col/resolve/lang/Spec.scala       |  365 +-
 src/col/vct/col/resolve/lang/Util.scala       |   58 +-
 .../vct/col/rewrite/NonLatchingRewriter.scala |    5 +-
 src/col/vct/col/rewrite/Rewriter.scala        |    3 +-
 src/col/vct/col/rewrite/RewriterBuilder.scala |   41 +-
 .../vct/col/rewrite/RewriterBuilderArg.scala  |   64 +-
 .../vct/col/rewrite/SuccessorProvider.scala   |    9 +-
 .../vct/col/serialize/NodeMessageView.scala   |    3 +-
 .../vct/col/serialize/SerializeBlame.scala    |    7 +-
 .../vct/col/serialize/SerializeOrigin.scala   |   60 +-
 src/col/vct/col/structure/family.scala        |    2 +-
 .../vct/col/typerules/CoercingRewriter.scala  | 2489 +++++----
 src/col/vct/col/typerules/CoercionUtils.scala |  717 ++-
 src/col/vct/col/typerules/Types.scala         |  143 +-
 src/col/vct/col/util/AstBuildHelpers.scala    | 1112 ++--
 .../util/ConstructingSuccessorOfContext.scala |    8 +-
 .../col/util/CurrentCheckNodeContext.scala    |    8 +-
 .../col/util/CurrentCheckProgramContext.scala |    3 +-
 .../col/util/CurrentRewriteNodeContext.scala  |    8 +-
 .../util/CurrentRewriteProgramContext.scala   |    3 +-
 src/col/vct/col/util/DeclarationBox.scala     |    4 +-
 src/col/vct/col/util/EqualityMeasure.scala    |   26 +-
 src/col/vct/col/util/FrozenScopes.scala       |   39 +-
 src/col/vct/col/util/Scopes.scala             |   83 +-
 src/col/vct/col/util/Substitute.scala         |   60 +-
 src/col/vct/col/util/SuccessionMap.scala      |   93 +-
 src/helpers/scala/meta/ResultStream.scala     |   48 +-
 .../vct/col/ast/helpers/defn/Constants.scala  |   12 +-
 .../vct/col/ast/helpers/defn/Naming.scala     |  126 +-
 .../vct/col/ast/helpers/defn/Proto.scala      |  165 +-
 .../col/ast/helpers/defn/ProtoNaming.scala    |  236 +-
 .../vct/col/ast/helpers/defn/Simplify.scala   |  166 +-
 .../helpers/generator/AbstractRewriter.scala  |   16 +-
 .../helpers/generator/AllFrozenScopes.scala   |   15 +-
 .../col/ast/helpers/generator/AllScopes.scala |   24 +-
 .../generator/BaseCoercingRewriter.scala      |   24 +-
 .../generator/BaseNonLatchingRewriter.scala   |   16 +-
 .../col/ast/helpers/generator/Compare.scala   |  115 +-
 .../ast/helpers/generator/DeclareFamily.scala |   14 +-
 .../ast/helpers/generator/Deserialize.scala   |   96 +-
 .../helpers/generator/DeserializeFamily.scala |   27 +-
 .../col/ast/helpers/generator/ImplTrait.scala |  108 +-
 .../col/ast/helpers/generator/MegaCol.scala   |   13 +-
 .../vct/col/ast/helpers/generator/Ops.scala   |    5 +-
 .../col/ast/helpers/generator/OpsFamily.scala |   32 +-
 .../ast/helpers/generator/ProtoAuxTypes.scala |   27 +-
 .../ast/helpers/generator/ProtoFamily.scala   |   41 +-
 .../col/ast/helpers/generator/ProtoNode.scala |   41 +-
 .../col/ast/helpers/generator/Rewrite.scala   |   67 +-
 .../helpers/generator/RewriteHelpers.scala    |    9 +-
 .../col/ast/helpers/generator/Serialize.scala |  116 +-
 .../col/ast/helpers/generator/Subnodes.scala  |   32 +-
 .../generator/SuccessorsProvider.scala        |   21 +-
 src/hre/hre/cache/Cache.scala                 |   40 +-
 src/hre/hre/data/BitString.scala              |   87 +-
 src/hre/hre/debug/TimeTravel.scala            |   37 +-
 src/hre/hre/io/InMemoryCachedReadable.scala   |   11 +-
 src/hre/hre/io/InterruptibleInputStream.scala |  116 +-
 src/hre/hre/io/LiteralReadable.scala          |    3 +-
 src/hre/hre/io/RWFile.scala                   |    6 +-
 src/hre/hre/io/Readable.scala                 |   29 +-
 src/hre/hre/io/ReaderReadable.scala           |    8 +-
 src/hre/hre/io/Watch.scala                    |  208 +-
 src/hre/hre/io/Writeable.scala                |    7 +-
 src/hre/hre/log/LogHistory.scala              |    8 +-
 src/hre/hre/perf/Profile.scala                |   72 +-
 src/hre/hre/perf/ProfileBuilder.scala         |   25 +-
 src/hre/hre/perf/ResourceUsage.scala          |   43 +-
 src/hre/hre/platform/Platform.scala           |   18 +-
 src/hre/hre/progress/Layout.scala             |  131 +-
 src/hre/hre/progress/Progress.scala           |  124 +-
 .../progress/ProgressAwareLogbackLayout.scala |   10 +-
 src/hre/hre/progress/ProgressLogicError.scala |    7 +-
 src/hre/hre/progress/ProgressRender.scala     |   39 +-
 src/hre/hre/progress/TaskRegistry.scala       |   63 +-
 src/hre/hre/progress/task/AbstractTask.scala  |  151 +-
 .../hre/progress/task/NameSequenceTask.scala  |   19 +-
 src/hre/hre/progress/task/RootTask.scala      |    4 +-
 .../hre/progress/task/SimpleNamedTask.scala   |    6 +-
 .../hre/progress/task/UpdateableTask.scala    |   22 +-
 src/hre/hre/resource/ResourceUtil.scala       |   38 +-
 src/hre/hre/stages/Stages.scala               |  121 +-
 src/hre/hre/util/FuncTools.scala              |   10 +-
 src/hre/hre/util/Interrupt.scala              |    4 +-
 src/hre/hre/util/Notifier.scala               |   34 +-
 src/hre/hre/util/ScopedStack.scala            |   10 +-
 src/hre/hre/util/Time.scala                   |    3 +-
 src/hre/vct/result/HasContext.scala           |    8 +-
 src/hre/vct/result/Message.scala              |    8 +-
 src/hre/vct/result/VerificationError.scala    |   24 +-
 src/main/vct/cache/Caches.scala               |   22 +-
 src/main/vct/debug/CrashReport.scala          |   42 +-
 src/main/vct/importer/JavaLibraryLoader.scala |   29 +-
 src/main/vct/importer/PathAdtImporter.scala   |    6 +-
 src/main/vct/importer/Util.scala              |   53 +-
 src/main/vct/main/Main.scala                  |  150 +-
 src/main/vct/main/modes/CFG.scala             |    5 +-
 src/main/vct/main/modes/VeSUV.scala           |    5 +-
 src/main/vct/main/modes/Verify.scala          |   96 +-
 src/main/vct/main/modes/VeyMont.scala         |   16 +-
 src/main/vct/main/stages/Backend.scala        |  182 +-
 src/main/vct/main/stages/ExpectedErrors.scala |    6 +-
 src/main/vct/main/stages/GenerateRASI.scala   |   67 +-
 src/main/vct/main/stages/Output.scala         |   85 +-
 src/main/vct/main/stages/Parsing.scala        |  105 +-
 src/main/vct/main/stages/PrintCFG.scala       |    7 +-
 src/main/vct/main/stages/Resolution.scala     |  108 +-
 src/main/vct/main/stages/Stages.scala         |  127 +-
 src/main/vct/main/stages/Transformation.scala |  581 ++-
 src/main/vct/options/BashCompletion.scala     |   11 +-
 src/main/vct/options/Options.scala            |  569 +-
 src/main/vct/options/types/Backend.scala      |    2 +-
 .../vct/options/types/ClassPathEntry.scala    |    2 +-
 src/main/vct/options/types/PathOrStd.scala    |   57 +-
 src/main/vct/options/types/ReadEnum.scala     |    3 +-
 src/main/vct/options/types/Verbosity.scala    |    2 +-
 src/parsers/vct/parsers/AntlrParser.scala     |  151 +-
 .../vct/parsers/CollectingErrorListener.scala |   86 +-
 src/parsers/vct/parsers/ParseResult.scala     |   18 +-
 src/parsers/vct/parsers/Parser.scala          |   25 +-
 .../vct/parsers/ProgressTokenStream.scala     |   34 +-
 src/parsers/vct/parsers/debug/ATNTools.scala  |  143 +-
 .../vct/parsers/debug/DebugOptions.scala      |   13 +-
 src/parsers/vct/parsers/debug/Grammar.scala   |  139 +-
 .../vct/parsers/debug/ParseAllExamples.scala  |  102 +-
 .../ProfilingPredictionContextCache.scala     |    4 +-
 src/parsers/vct/parsers/err/ParseError.scala  |   16 +-
 .../vct/parsers/parser/ColCPPParser.scala     |   73 +-
 .../vct/parsers/parser/ColCParser.scala       |   73 +-
 .../vct/parsers/parser/ColIPPParser.scala     |   30 +-
 .../vct/parsers/parser/ColIParser.scala       |   31 +-
 .../vct/parsers/parser/ColJavaParser.scala    |   29 +-
 .../parser/ColLLVMContractParser.scala        |   45 +-
 .../vct/parsers/parser/ColLLVMParser.scala    |   50 +-
 .../vct/parsers/parser/ColPVLParser.scala     |   24 +-
 .../vct/parsers/transform/BlameProvider.scala |   34 +-
 .../vct/parsers/transform/CPPToCol.scala      | 3192 +++++++-----
 .../vct/parsers/transform/CToCol.scala        | 2878 +++++++----
 .../vct/parsers/transform/JavaToCol.scala     | 3635 ++++++++-----
 .../parsers/transform/LLVMContractToCol.scala |  782 +--
 .../vct/parsers/transform/PVLToCol.scala      | 2830 ++++++----
 src/parsers/vct/parsers/transform/ToCol.scala |  234 +-
 .../transform/systemctocol/util/Seqs.scala    |    3 +-
 .../vct/rewrite/ApplyTermRewriter.scala       |  400 +-
 src/rewrite/vct/rewrite/BranchToIfElse.scala  |   29 +-
 .../vct/rewrite/CFloatIntCoercion.scala       |   69 +-
 .../rewrite/CheckContractSatisfiability.scala |  123 +-
 .../vct/rewrite/CheckProcessAlgebra.scala     |  325 +-
 src/rewrite/vct/rewrite/ClassToRef.scala      |  655 ++-
 .../rewrite/CollectLocalDeclarations.scala    |   35 +-
 .../vct/rewrite/ConstantifyFinalFields.scala  |  195 +-
 .../rewrite/DesugarCoalescingOperators.scala  |   15 +-
 .../rewrite/DesugarCollectionOperators.scala  |   20 +-
 .../rewrite/DesugarPermissionOperators.scala  |  154 +-
 src/rewrite/vct/rewrite/Disambiguate.scala    |  410 +-
 .../vct/rewrite/DisambiguateLocation.scala    |   87 +-
 .../vct/rewrite/EncodeArrayValues.scala       |  625 ++-
 src/rewrite/vct/rewrite/EncodeAutoValue.scala |  301 +-
 src/rewrite/vct/rewrite/EncodeChar.scala      |   19 +-
 .../vct/rewrite/EncodeCurrentThread.scala     |  164 +-
 src/rewrite/vct/rewrite/EncodeExtract.scala   |  190 +-
 .../vct/rewrite/EncodeForPermWithValue.scala  |   41 +-
 src/rewrite/vct/rewrite/EncodeForkJoin.scala  |  326 +-
 .../vct/rewrite/EncodeIntrinsicLock.scala     |  224 +-
 src/rewrite/vct/rewrite/EncodeNdIndex.scala   |  383 +-
 .../vct/rewrite/EncodeProofHelpers.scala      |  148 +-
 src/rewrite/vct/rewrite/EncodeRange.scala     |   15 +-
 src/rewrite/vct/rewrite/EncodeRangedFor.scala |  119 +-
 .../vct/rewrite/EncodeResourceValues.scala    |  556 +-
 src/rewrite/vct/rewrite/EncodeSendRecv.scala  |  142 +-
 src/rewrite/vct/rewrite/EncodeString.scala    |   39 +-
 src/rewrite/vct/rewrite/EnumToDomain.scala    |  241 +-
 .../vct/rewrite/EvaluationTargetDummy.scala   |   94 +-
 .../vct/rewrite/ExplicitADTTypeArgs.scala     |   77 +-
 .../vct/rewrite/ExplicitResourceValues.scala  |   28 +-
 src/rewrite/vct/rewrite/Explode.scala         |  116 +-
 .../ExtractInlineQuantifierPatterns.scala     |  198 +-
 .../vct/rewrite/FilterSpecIgnore.scala        |   98 +-
 .../vct/rewrite/FinalizeArguments.scala       |   91 +-
 src/rewrite/vct/rewrite/FloatToRat.scala      |  114 +-
 .../vct/rewrite/ForLoopToWhileLoop.scala      |   34 +-
 .../vct/rewrite/GivenYieldsToArgs.scala       |  216 +-
 .../vct/rewrite/HeapVariableToRef.scala       |   69 +-
 .../vct/rewrite/InlineApplicables.scala       |  429 +-
 .../rewrite/IterationContractToParBlock.scala |  115 +-
 .../vct/rewrite/MonomorphizeClass.scala       |  254 +-
 .../MonomorphizeContractApplicables.scala     |  142 +-
 src/rewrite/vct/rewrite/ParBlockEncoder.scala |  556 +-
 .../vct/rewrite/PinCollectionTypes.scala      |   32 +-
 src/rewrite/vct/rewrite/PinSilverNodes.scala  |   78 +-
 src/rewrite/vct/rewrite/PrettifyBlocks.scala  |  114 +-
 .../rewrite/PropagateContextEverywhere.scala  |  206 +-
 .../vct/rewrite/PureMethodsToFunctions.scala  |  243 +-
 .../vct/rewrite/QuantifySubscriptAny.scala    |   37 +-
 src/rewrite/vct/rewrite/ReadToValue.scala     |   22 +-
 .../vct/rewrite/RefuteToInvertedAssert.scala  |   75 +-
 .../rewrite/ResolveExpressionSideChecks.scala |   93 +-
 .../ResolveExpressionSideEffects.scala        |  854 +--
 src/rewrite/vct/rewrite/ResolveScale.scala    |   83 +-
 .../rewrite/RewriteTriggerADTFunctions.scala  |   29 +-
 .../vct/rewrite/SilverIntRatCoercion.scala    |   20 +-
 .../rewrite/SimplifyNestedQuantifiers.scala   | 1462 +++---
 .../rewrite/SimplifyQuantifiedRelations.scala |  300 +-
 .../vct/rewrite/SmtlibToProverTypes.scala     |  447 +-
 src/rewrite/vct/rewrite/TrivialAddrOf.scala   |  105 +-
 src/rewrite/vct/rewrite/TruncDivMod.scala     |  124 +-
 .../vct/rewrite/TupledQuantifiers.scala       |   35 +-
 src/rewrite/vct/rewrite/TypeValues.scala      |   19 +-
 .../vct/rewrite/UntupledQuantifiers.scala     |   80 +-
 src/rewrite/vct/rewrite/adt/ImportADT.scala   |  161 +-
 src/rewrite/vct/rewrite/adt/ImportAny.scala   |   54 +-
 src/rewrite/vct/rewrite/adt/ImportArray.scala |  139 +-
 src/rewrite/vct/rewrite/adt/ImportBag.scala   |  200 +-
 .../vct/rewrite/adt/ImportEither.scala        |  142 +-
 src/rewrite/vct/rewrite/adt/ImportFrac.scala  |  126 +-
 src/rewrite/vct/rewrite/adt/ImportMap.scala   |  171 +-
 .../vct/rewrite/adt/ImportMapCompat.scala     |   67 +-
 .../vct/rewrite/adt/ImportNothing.scala       |   36 +-
 src/rewrite/vct/rewrite/adt/ImportNull.scala  |   42 +-
 .../vct/rewrite/adt/ImportOption.scala        |  101 +-
 .../vct/rewrite/adt/ImportPointer.scala       |  227 +-
 src/rewrite/vct/rewrite/adt/ImportSeq.scala   |  226 +-
 src/rewrite/vct/rewrite/adt/ImportSet.scala   |  191 +-
 .../vct/rewrite/adt/ImportSetCompat.scala     |   64 +-
 src/rewrite/vct/rewrite/adt/ImportTuple.scala |   62 +-
 .../vct/rewrite/adt/ImportVector.scala        |  502 +-
 .../vct/rewrite/adt/ImportViperOrder.scala    |   21 +-
 src/rewrite/vct/rewrite/adt/ImportVoid.scala  |   47 +-
 .../rewrite/bip/BipVerificationResults.scala  |  224 +-
 .../vct/rewrite/bip/ComputeBipGlue.scala      |  329 +-
 src/rewrite/vct/rewrite/bip/EncodeBip.scala   |  866 ++--
 .../rewrite/bip/EncodeBipPermissions.scala    |   58 +-
 .../bip/InstantiateBipSynchronizations.scala  |   79 +-
 .../vct/rewrite/bip/IsolateBipGlue.scala      |   39 +-
 .../vct/rewrite/cfg/CFGGenerator.scala        |  254 +-
 src/rewrite/vct/rewrite/cfg/CFGNode.scala     |    5 +-
 src/rewrite/vct/rewrite/cfg/CFGPrinter.scala  |   25 +-
 src/rewrite/vct/rewrite/cfg/Index.scala       | 1102 ++--
 src/rewrite/vct/rewrite/cfg/Utils.scala       |  295 +-
 .../rewrite/error/ExcludedByPassOrder.scala   |   16 +-
 .../vct/rewrite/exc/ContinueToBreak.scala     |   62 +-
 .../vct/rewrite/exc/EncodeBreakReturn.scala   |  231 +-
 .../rewrite/exc/EncodeTryThrowSignals.scala   |  438 +-
 .../rewrite/exc/SpecifyImplicitLabels.scala   |   54 +-
 .../vct/rewrite/exc/SwitchToGoto.scala        |   88 +-
 .../vct/rewrite/lang/LangBipToCol.scala       |  407 +-
 .../vct/rewrite/lang/LangCPPToCol.scala       | 2857 +++++++---
 src/rewrite/vct/rewrite/lang/LangCToCol.scala | 1784 ++++---
 .../vct/rewrite/lang/LangJavaToCol.scala      |  707 ++-
 .../vct/rewrite/lang/LangLLVMToCol.scala      |  205 +-
 .../vct/rewrite/lang/LangPVLToCol.scala       |  245 +-
 .../vct/rewrite/lang/LangSilverToCol.scala    |   22 +-
 .../vct/rewrite/lang/LangSpecificToCol.scala  |  565 +-
 .../vct/rewrite/lang/LangTypesToCol.scala     |  384 +-
 .../vct/rewrite/lang/LangVeyMontToCol.scala   |  171 +-
 .../vct/rewrite/lang/NoSupportSelfLoop.scala  |   20 +-
 .../vct/rewrite/lang/ReplaceSYCLTypes.scala   |   12 +-
 .../vct/rewrite/rasi/AbstractProcess.scala    |  497 +-
 .../vct/rewrite/rasi/AbstractState.scala      | 1169 +++--
 .../vct/rewrite/rasi/ConcreteVariable.scala   |  348 +-
 .../vct/rewrite/rasi/ConstraintMap.scala      |  111 +-
 .../vct/rewrite/rasi/ConstraintSolver.scala   |  513 +-
 src/rewrite/vct/rewrite/rasi/Interval.scala   |  783 +--
 .../vct/rewrite/rasi/RASIConnection.scala     |   19 +-
 .../vct/rewrite/rasi/RASIGenerator.scala      |  143 +-
 .../vct/rewrite/rasi/StaticScanner.scala      |   93 +-
 .../vct/rewrite/rasi/UncertainValue.scala     |  459 +-
 src/rewrite/vct/rewrite/rasi/Utils.scala      |  329 +-
 .../vct/rewrite/rasi/VariableSelector.scala   |  201 +-
 src/rewrite/vct/rewrite/util/Comparison.scala |   72 +-
 src/rewrite/vct/rewrite/util/Extract.scala    |  121 +-
 .../vct/rewrite/util/FreeVariables.scala      |   72 +-
 .../vct/rewrite/veymont/ChannelInfo.scala     |    8 +-
 .../veymont/DeduplicateChorGuards.scala       |   48 +-
 .../vct/rewrite/veymont/EncodeChannels.scala  |  280 +-
 .../veymont/EncodeChorBranchUnanimity.scala   |  169 +-
 .../rewrite/veymont/EncodeChoreography.scala  |  545 +-
 .../EncodeChoreographyParameters.scala        |  131 +-
 .../veymont/EncodeEndpointInequalities.scala  |  133 +-
 .../veymont/EncodeUnpointedGuard.scala        |   76 +-
 .../GenerateChoreographyPermissions.scala     |  340 +-
 .../veymont/GenerateImplementation.scala      | 1079 ++--
 .../veymont/InferEndpointContexts.scala       |  199 +-
 .../ParallelCommExprBuildingBlocks.scala      |   10 +-
 .../veymont/SpecializeEndpointClasses.scala   |  199 +-
 .../vct/rewrite/veymont/SplitChorGuards.scala |   96 +-
 .../vct/rewrite/veymont/StructureCheck.scala  |  117 +-
 .../veymont/ThreadBuildingBlocks.scala        |   27 +-
 .../vct/rewrite/veymont/VeymontContext.scala  |   58 +-
 .../protobuf/ForwardingByteString.scala       |   55 +-
 .../google/protobuf/StreamingByteString.scala |   12 +-
 .../serialize/LiteralOpaqueMessageBytes.scala |    6 +-
 .../vct/serialize/OpaqueMessageBytes.scala    |   13 +-
 .../StreamingOpaqueMessageBytes.scala         |    5 +-
 src/viper/viper/api/SilverTreeCompare.scala   |  123 +-
 .../viper/api/backend/SilverBackend.scala     |  594 ++-
 .../viper/api/backend/carbon/Carbon.scala     |   59 +-
 .../backend/silicon/BranchRecordTask.scala    |   21 +-
 .../api/backend/silicon/CachedExpRender.scala |    6 +-
 .../api/backend/silicon/DataRecordTask.scala  |   85 +-
 .../viper/api/backend/silicon/Silicon.scala   |  164 +-
 .../backend/silicon/SiliconLogListener.scala  |  275 +-
 .../viper/api/backend/silicon/Util.scala      |    9 +-
 .../viper/api/transform/ColSilverParser.scala |   16 +-
 .../viper/api/transform/ColToSilver.scala     | 1063 ++--
 .../transform/SilverParserDummyFrontend.scala |   23 +-
 .../viper/api/transform/SilverToCol.scala     |  547 +-
 1309 files changed, 56723 insertions(+), 31472 deletions(-)

diff --git a/src/col/vct/col/ast/Deserialize.scala b/src/col/vct/col/ast/Deserialize.scala
index dfeb4d3626..f9dcb4f35c 100644
--- a/src/col/vct/col/ast/Deserialize.scala
+++ b/src/col/vct/col/ast/Deserialize.scala
@@ -5,7 +5,8 @@ import vct.col.ast.ops.deserialize.DeserializeProgram
 import scala.collection.mutable
 
 object Deserialize {
-  def deserializeProgram[G](program: vct.col.ast.serialize.Program, y: scala.Any): Program[G] = {
-    DeserializeProgram.deserialize(program, mutable.HashMap())
-  }
+  def deserializeProgram[G](
+      program: vct.col.ast.serialize.Program,
+      y: scala.Any,
+  ): Program[G] = { DeserializeProgram.deserialize(program, mutable.HashMap()) }
 }
diff --git a/src/col/vct/col/ast/Node.scala b/src/col/vct/col/ast/Node.scala
index a477eb8720..838740745f 100644
--- a/src/col/vct/col/ast/Node.scala
+++ b/src/col/vct/col/ast/Node.scala
@@ -84,1362 +84,3746 @@ import vct.col.resolve.ctx._
 import vct.col.resolve.lang.JavaAnnotationData
 import vct.col.structure.{family, scopes}
 
-/** @inheritdoc */ sealed trait Node[G] extends NodeImpl[G]
+/** @inheritdoc */
+sealed trait Node[G] extends NodeImpl[G]
 
 sealed trait NodeFamily[G] extends Node[G] with NodeFamilyImpl[G]
 sealed trait Declaration[G] extends Node[G] with DeclarationImpl[G]
 
-@family final case class Verification[G](tasks: Seq[VerificationContext[G]], expectedErrors: Seq[ExpectedError])(implicit val o: Origin) extends NodeFamily[G] with VerificationImpl[G]
-@family final case class VerificationContext[G](program: Program[G])(implicit val o: Origin) extends NodeFamily[G] with VerificationContextImpl[G]
-
 @family
-@scopes[GlobalDeclaration]
+final case class Verification[G](
+    tasks: Seq[VerificationContext[G]],
+    expectedErrors: Seq[ExpectedError],
+)(implicit val o: Origin)
+    extends NodeFamily[G] with VerificationImpl[G]
+@family
+final case class VerificationContext[G](program: Program[G])(
+    implicit val o: Origin
+) extends NodeFamily[G] with VerificationContextImpl[G]
+
+@family @scopes[GlobalDeclaration]
 @scopes[ClassDeclaration]
 @scopes[ADTDeclaration]
 @scopes[ModelDeclaration]
 @scopes[EnumConstant]
 @scopes[Variable]
-final case class Program[G](declarations: Seq[GlobalDeclaration[G]])(val blame: Blame[UnsafeCoercion])(implicit val o: Origin) extends NodeFamily[G] with ProgramImpl[G]
+final case class Program[G](declarations: Seq[GlobalDeclaration[G]])(
+    val blame: Blame[UnsafeCoercion]
+)(implicit val o: Origin)
+    extends NodeFamily[G] with ProgramImpl[G]
 
-@family sealed trait Type[G] extends NodeFamily[G] with TypeImpl[G]
+@family
+sealed trait Type[G] extends NodeFamily[G] with TypeImpl[G]
 
 object TNotAValue {
   def unapply[G](t: TNotAValue[G]): Some[Referrable[G]] = Some(t.decl.get)
 }
 
-
-final class TNotAValue[G]()(implicit val o: Origin = DiagnosticOrigin) extends Type[G] with TNotAValueImpl[G] {
+final class TNotAValue[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends Type[G] with TNotAValueImpl[G] {
   var decl: Option[Referrable[G]] = None
 }
-final case class TUnion[G](types: Seq[Type[G]])(implicit val o: Origin = DiagnosticOrigin) extends Type[G] with TUnionImpl[G]
-final case class TArray[G](element: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends Type[G] with TArrayImpl[G]
-final case class TPointer[G](element: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends Type[G] with TPointerImpl[G]
-final case class TType[G](t: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends Type[G] with TTypeImpl[G]
-final case class TVar[G](ref: Ref[G, Variable[G]])(implicit val o: Origin = DiagnosticOrigin) extends Type[G] with TVarImpl[G]
+final case class TUnion[G](types: Seq[Type[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends Type[G] with TUnionImpl[G]
+final case class TArray[G](element: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends Type[G] with TArrayImpl[G]
+final case class TPointer[G](element: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends Type[G] with TPointerImpl[G]
+final case class TType[G](t: Type[G])(implicit val o: Origin = DiagnosticOrigin)
+    extends Type[G] with TTypeImpl[G]
+final case class TVar[G](ref: Ref[G, Variable[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends Type[G] with TVarImpl[G]
 
 sealed trait CompositeType[G] extends Type[G] with CompositeTypeImpl[G]
 sealed trait SizedType[G] extends CompositeType[G] with SizedTypeImpl[G]
-final case class TSeq[G](element: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends SizedType[G] with TSeqImpl[G]
-final case class TSet[G](element: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends SizedType[G] with TSetImpl[G]
-final case class TBag[G](element: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends SizedType[G] with TBagImpl[G]
-final case class TMap[G](key: Type[G], value: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends SizedType[G] with TMapImpl[G]
-
-final case class TOption[G](element: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends CompositeType[G] with TOptionImpl[G]
-final case class TTuple[G](elements: Seq[Type[G]])(implicit val o: Origin = DiagnosticOrigin) extends CompositeType[G] with TTupleImpl[G]
-final case class TEither[G](left: Type[G], right: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends CompositeType[G] with TEitherImpl[G]
-final case class TMatrix[G](element: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends CompositeType[G] with TMatrixImpl[G]
-final case class TVector[G](size: BigInt, element: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends CompositeType[G] with TVectorImpl[G]
+final case class TSeq[G](element: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends SizedType[G] with TSeqImpl[G]
+final case class TSet[G](element: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends SizedType[G] with TSetImpl[G]
+final case class TBag[G](element: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends SizedType[G] with TBagImpl[G]
+final case class TMap[G](key: Type[G], value: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends SizedType[G] with TMapImpl[G]
+
+final case class TOption[G](element: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends CompositeType[G] with TOptionImpl[G]
+final case class TTuple[G](elements: Seq[Type[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends CompositeType[G] with TTupleImpl[G]
+final case class TEither[G](left: Type[G], right: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends CompositeType[G] with TEitherImpl[G]
+final case class TMatrix[G](element: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends CompositeType[G] with TMatrixImpl[G]
+final case class TVector[G](size: BigInt, element: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends CompositeType[G] with TVectorImpl[G]
 
 sealed trait PrimitiveType[G] extends Type[G] with PrimitiveTypeImpl[G]
-final case class TAny[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TAnyImpl[G]
-final case class TNothing[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TNothingImpl[G]
-final case class TAnyValue[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TAnyValueImpl[G]
-final case class TVoid[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TVoidImpl[G]
-final case class TNull[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TNullImpl[G]
-final case class TBool[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TBoolImpl[G]
-final case class TResource[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TResourceImpl[G]
-final case class TResourceVal[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TResourceValImpl[G]
-final case class TChar[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TCharImpl[G]
-final case class TString[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TStringImpl[G]
-final case class TRef[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TRefImpl[G]
-final case class TProcess[G]()(implicit val o: Origin = DiagnosticOrigin) extends PrimitiveType[G] with TProcessImpl[G]
+final case class TAny[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TAnyImpl[G]
+final case class TNothing[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TNothingImpl[G]
+final case class TAnyValue[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TAnyValueImpl[G]
+final case class TVoid[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TVoidImpl[G]
+final case class TNull[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TNullImpl[G]
+final case class TBool[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TBoolImpl[G]
+final case class TResource[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TResourceImpl[G]
+final case class TResourceVal[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TResourceValImpl[G]
+final case class TChar[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TCharImpl[G]
+final case class TString[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TStringImpl[G]
+final case class TRef[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TRefImpl[G]
+final case class TProcess[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends PrimitiveType[G] with TProcessImpl[G]
 
 sealed trait NumericType[G] extends PrimitiveType[G] with NumericTypeImpl[G]
 sealed trait FloatType[G] extends NumericType[G] with FloatTypeImpl[G]
 sealed trait IntType[G] extends NumericType[G] with IntTypeImpl[G]
 
-final case class TInt[G]()(implicit val o: Origin = DiagnosticOrigin) extends IntType[G] with TIntImpl[G]
-final case class TBoundedInt[G](gte: BigInt, lt: BigInt)(implicit val o: Origin = DiagnosticOrigin) extends IntType[G] with TBoundedIntImpl[G]
-final case class TFloat[G](exponent: Int, mantissa: Int)(implicit val o: Origin = DiagnosticOrigin) extends FloatType[G] with TFloatImpl[G]
-final case class TRational[G]()(implicit val o: Origin = DiagnosticOrigin) extends NumericType[G] with TRationalImpl[G]
-final case class TFraction[G]()(implicit val o: Origin = DiagnosticOrigin) extends NumericType[G] with TFractionImpl[G]
-final case class TZFraction[G]()(implicit val o: Origin = DiagnosticOrigin) extends NumericType[G] with TZFractionImpl[G]
+final case class TInt[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends IntType[G] with TIntImpl[G]
+final case class TBoundedInt[G](gte: BigInt, lt: BigInt)(
+    implicit val o: Origin = DiagnosticOrigin
+) extends IntType[G] with TBoundedIntImpl[G]
+final case class TFloat[G](exponent: Int, mantissa: Int)(
+    implicit val o: Origin = DiagnosticOrigin
+) extends FloatType[G] with TFloatImpl[G]
+final case class TRational[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends NumericType[G] with TRationalImpl[G]
+final case class TFraction[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends NumericType[G] with TFractionImpl[G]
+final case class TZFraction[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends NumericType[G] with TZFractionImpl[G]
 
 sealed trait DeclaredType[G] extends Type[G] with DeclaredTypeImpl[G]
-final case class TModel[G](model: Ref[G, Model[G]])(implicit val o: Origin = DiagnosticOrigin) extends DeclaredType[G] with TModelImpl[G]
-final case class TClass[G](cls: Ref[G, Class[G]], typeArgs: Seq[Type[G]])(implicit val o: Origin = DiagnosticOrigin) extends DeclaredType[G] with TClassImpl[G]
-final case class TAnyClass[G]()(implicit val o: Origin = DiagnosticOrigin) extends DeclaredType[G] with TAnyClassImpl[G]
-final case class TAxiomatic[G](adt: Ref[G, AxiomaticDataType[G]], args: Seq[Type[G]])(implicit val o: Origin = DiagnosticOrigin) extends DeclaredType[G] with TAxiomaticImpl[G]
-final case class TEnum[G](enum: Ref[G, Enum[G]])(implicit val o: Origin = DiagnosticOrigin) extends DeclaredType[G] with TEnumImpl[G]
-final case class TProverType[G](ref: Ref[G, ProverType[G]])(implicit val o: Origin = DiagnosticOrigin) extends DeclaredType[G] with TProverTypeImpl[G]
-final case class TVeyMontChannel[G](channelType: String)(implicit val o: Origin = DiagnosticOrigin) extends DeclaredType[G] with TVeyMontChannelImpl[G]
-
-@family sealed trait ParRegion[G] extends NodeFamily[G] with ParRegionImpl[G]
-final case class ParParallel[G](regions: Seq[ParRegion[G]])(val blame: Blame[ParPreconditionFailed])(implicit val o: Origin) extends ParRegion[G] with ParParallelImpl[G]
-final case class ParSequential[G](regions: Seq[ParRegion[G]])(val blame: Blame[ParPreconditionFailed])(implicit val o: Origin) extends ParRegion[G] with ParSequentialImpl[G]
-@scopes[Variable] @scopes[SendDecl] @scopes[ParBlockDecl] final case class ParBlock[G](decl: ParBlockDecl[G], iters: Seq[IterVariable[G]], context_everywhere: Expr[G], requires: Expr[G], ensures: Expr[G], content: Statement[G])(val blame: Blame[ParBlockFailure])(implicit val o: Origin) extends ParRegion[G] with ParBlockImpl[G]
+final case class TModel[G](model: Ref[G, Model[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends DeclaredType[G] with TModelImpl[G]
+final case class TClass[G](cls: Ref[G, Class[G]], typeArgs: Seq[Type[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends DeclaredType[G] with TClassImpl[G]
+final case class TAnyClass[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends DeclaredType[G] with TAnyClassImpl[G]
+final case class TAxiomatic[G](
+    adt: Ref[G, AxiomaticDataType[G]],
+    args: Seq[Type[G]],
+)(implicit val o: Origin = DiagnosticOrigin)
+    extends DeclaredType[G] with TAxiomaticImpl[G]
+final case class TEnum[G](enum: Ref[G, Enum[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends DeclaredType[G] with TEnumImpl[G]
+final case class TProverType[G](ref: Ref[G, ProverType[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends DeclaredType[G] with TProverTypeImpl[G]
+final case class TVeyMontChannel[G](channelType: String)(
+    implicit val o: Origin = DiagnosticOrigin
+) extends DeclaredType[G] with TVeyMontChannelImpl[G]
 
-@family sealed trait LoopContract[G] extends NodeFamily[G] with LoopContractImpl[G]
-final case class LoopInvariant[G](invariant: Expr[G], decreases: Option[DecreasesClause[G]])(val blame: Blame[LoopInvariantFailure])(implicit val o: Origin) extends LoopContract[G] with LoopInvariantImpl[G]
-final case class IterationContract[G](requires: Expr[G], ensures: Expr[G], context_everywhere: Expr[G])(val blame: Blame[ParBlockFailure])(implicit val o: Origin) extends LoopContract[G] with IterationContractImpl[G]
+@family
+sealed trait ParRegion[G] extends NodeFamily[G] with ParRegionImpl[G]
+final case class ParParallel[G](regions: Seq[ParRegion[G]])(
+    val blame: Blame[ParPreconditionFailed]
+)(implicit val o: Origin)
+    extends ParRegion[G] with ParParallelImpl[G]
+final case class ParSequential[G](regions: Seq[ParRegion[G]])(
+    val blame: Blame[ParPreconditionFailed]
+)(implicit val o: Origin)
+    extends ParRegion[G] with ParSequentialImpl[G]
+@scopes[Variable]
+@scopes[SendDecl]
+@scopes[ParBlockDecl]
+final case class ParBlock[G](
+    decl: ParBlockDecl[G],
+    iters: Seq[IterVariable[G]],
+    context_everywhere: Expr[G],
+    requires: Expr[G],
+    ensures: Expr[G],
+    content: Statement[G],
+)(val blame: Blame[ParBlockFailure])(implicit val o: Origin)
+    extends ParRegion[G] with ParBlockImpl[G]
 
-@family @scopes[Variable] final case class CatchClause[G](decl: Variable[G], body: Statement[G])(implicit val o: Origin) extends NodeFamily[G] with CatchClauseImpl[G]
+@family
+sealed trait LoopContract[G] extends NodeFamily[G] with LoopContractImpl[G]
+final case class LoopInvariant[G](
+    invariant: Expr[G],
+    decreases: Option[DecreasesClause[G]],
+)(val blame: Blame[LoopInvariantFailure])(implicit val o: Origin)
+    extends LoopContract[G] with LoopInvariantImpl[G]
+final case class IterationContract[G](
+    requires: Expr[G],
+    ensures: Expr[G],
+    context_everywhere: Expr[G],
+)(val blame: Blame[ParBlockFailure])(implicit val o: Origin)
+    extends LoopContract[G] with IterationContractImpl[G]
+
+@family @scopes[Variable]
+final case class CatchClause[G](decl: Variable[G], body: Statement[G])(
+    implicit val o: Origin
+) extends NodeFamily[G] with CatchClauseImpl[G]
 
-@family final case class IterVariable[G](variable: Variable[G], from: Expr[G], to: Expr[G])(implicit val o: Origin) extends NodeFamily[G] with IterVariableImpl[G]
+@family
+final case class IterVariable[G](
+    variable: Variable[G],
+    from: Expr[G],
+    to: Expr[G],
+)(implicit val o: Origin)
+    extends NodeFamily[G] with IterVariableImpl[G]
 
-@family sealed trait Statement[G] extends NodeFamily[G] with StatementImpl[G]
+@family
+sealed trait Statement[G] extends NodeFamily[G] with StatementImpl[G]
 sealed trait PurelySequentialStatement[G] extends Statement[G]
 sealed trait ControlContainerStatement[G] extends Statement[G]
-sealed trait ExpressionContainerStatement[G] extends Statement[G] with ExpressionContainerStatementImpl[G]
-
-final case class PVLBranch[G](branches: Seq[(Expr[G], Statement[G])])(val blame: Blame[FrontendIfFailure])(implicit val o: Origin) extends Statement[G] with ControlContainerStatement[G] with PVLBranchImpl[G]
-final case class PVLLoop[G](init: Statement[G], cond: Expr[G], update: Statement[G], contract: LoopContract[G], body: Statement[G])(val blame: Blame[FrontEndLoopFailure])(implicit val o: Origin) extends Statement[G] with ControlContainerStatement[G] with PVLLoopImpl[G]
-
-sealed trait NonExecutableStatement[G] extends Statement[G] with NonExecutableStatementImpl[G]
-final case class LocalDecl[G](local: Variable[G])(implicit val o: Origin) extends NonExecutableStatement[G] with PurelySequentialStatement[G] with LocalDeclImpl[G]
-final case class SpecIgnoreStart[G]()(implicit val o: Origin) extends NonExecutableStatement[G] with PurelySequentialStatement[G] with SpecIgnoreStartImpl[G]
-final case class SpecIgnoreEnd[G]()(implicit val o: Origin) extends NonExecutableStatement[G] with PurelySequentialStatement[G] with SpecIgnoreEndImpl[G]
-
-sealed trait NormallyCompletingStatement[G] extends Statement[G] with NormallyCompletingStatementImpl[G]
-final case class Assign[G](target: Expr[G], value: Expr[G])(val blame: Blame[AssignFailed])(implicit val o: Origin) extends NormallyCompletingStatement[G] with AssignImpl[G]
-final case class Send[G](decl: SendDecl[G], delta: BigInt, res: Expr[G])(val blame: Blame[SendFailed])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with SendImpl[G]
-final case class Recv[G](ref: Ref[G, SendDecl[G]])(implicit val o: Origin) extends NormallyCompletingStatement[G] with PurelySequentialStatement[G] with RecvImpl[G]
-sealed trait SwitchCase[G] extends NormallyCompletingStatement[G] with SwitchCaseImpl[G]
-final case class DefaultCase[G]()(implicit val o: Origin) extends SwitchCase[G] with PurelySequentialStatement[G] with DefaultCaseImpl[G]
-final case class Case[G](pattern: Expr[G])(implicit val o: Origin) extends SwitchCase[G] with PurelySequentialStatement[G] with CaseImpl[G]
-final case class Label[G](decl: LabelDecl[G], stat: Statement[G])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ControlContainerStatement[G] with LabelImpl[G]
-final case class Goto[G](lbl: Ref[G, LabelDecl[G]])(implicit val o: Origin) extends NormallyCompletingStatement[G] with GotoImpl[G]
-final case class Exhale[G](res: Expr[G])(val blame: Blame[ExhaleFailed])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with ExhaleImpl[G]
-final case class Assert[G](res: Expr[G])(val blame: Blame[AssertFailed])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with AssertImpl[G]
-final case class Refute[G](assn: Expr[G])(val blame: Blame[RefuteFailed])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with RefuteImpl[G]
-final case class Inhale[G](res: Expr[G])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with InhaleImpl[G]
-final case class Assume[G](assn: Expr[G])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with AssumeImpl[G]
-final case class Instantiate[G](cls: Ref[G, Class[G]], out: Expr[G])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with InstantiateImpl[G]
-final case class Wait[G](obj: Expr[G])(val blame: Blame[UnlockFailure])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with WaitImpl[G]
-final case class Notify[G](obj: Expr[G])(val blame: Blame[NotifyFailed])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with NotifyImpl[G]
-final case class Fork[G](obj: Expr[G])(val blame: Blame[ForkFailure])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with ForkImpl[G]
-final case class Join[G](obj: Expr[G])(val blame: Blame[JoinFailure])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with JoinImpl[G]
-final case class Lock[G](obj: Expr[G])(val blame: Blame[LockFailure])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with LockImpl[G]
-final case class Unlock[G](obj: Expr[G])(val blame: Blame[UnlockFailure])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with UnlockImpl[G]
-final case class Commit[G](obj: Expr[G])(val blame: Blame[CommitFailed])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with CommitImpl[G]
-final case class Fold[G](res: Expr[G])(val blame: Blame[FoldFailed])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with FoldImpl[G]
-final case class Unfold[G](res: Expr[G])(val blame: Blame[UnfoldFailed])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with UnfoldImpl[G]
-final case class WandApply[G](res: Expr[G])(val blame: Blame[WandApplyFailed])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with WandApplyImpl[G]
-final case class Havoc[G](loc: Expr[G])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ExpressionContainerStatement[G] with HavocImpl[G]
-final case class FramedProof[G](pre: Expr[G], body: Statement[G], post: Expr[G])(val blame: Blame[FramedProofFailure])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ControlContainerStatement[G] with FramedProofImpl[G]
-final case class Extract[G](contractedStatement: Statement[G])(implicit val o: Origin) extends NormallyCompletingStatement[G] with ControlContainerStatement[G] with ExtractImpl[G]
-
-sealed trait ExceptionalStatement[G] extends Statement[G] with ExceptionalStatementImpl[G]
-final case class Eval[G](expr: Expr[G])(implicit val o: Origin) extends ExceptionalStatement[G] with ControlContainerStatement[G] with EvalImpl[G]
-sealed trait InvocationStatement[G] extends ExceptionalStatement[G] with InvokingNode[G] with InvocationStatementImpl[G]
-final case class InvokeProcedure[G](ref: Ref[G, Procedure[G]], args: Seq[Expr[G]], outArgs: Seq[Expr[G]], typeArgs: Seq[Type[G]], givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[InvocationFailure])(implicit val o: Origin) extends InvocationStatement[G] with ControlContainerStatement[G] with InvokeProcedureImpl[G]
-final case class InvokeConstructor[G](ref: Ref[G, Constructor[G]], classTypeArgs: Seq[Type[G]], out: Expr[G], args: Seq[Expr[G]], outArgs: Seq[Expr[G]], typeArgs: Seq[Type[G]], givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[InvocationFailure])(implicit val o: Origin) extends InvocationStatement[G] with ControlContainerStatement[G] with InvokeConstructorImpl[G]
-final case class InvokeMethod[G](obj: Expr[G], ref: Ref[G, InstanceMethod[G]], args: Seq[Expr[G]], outArgs: Seq[Expr[G]], typeArgs: Seq[Type[G]], givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[InstanceInvocationFailure])(implicit val o: Origin) extends InvocationStatement[G] with InstanceApply[G] with ControlContainerStatement[G] with InvokeMethodImpl[G]
-final case class Return[G](result: Expr[G])(implicit val o: Origin) extends ExceptionalStatement[G] with ExpressionContainerStatement[G] with ReturnImpl[G]
-final case class Throw[G](obj: Expr[G])(val blame: Blame[ThrowNull])(implicit val o: Origin) extends ExceptionalStatement[G] with ExpressionContainerStatement[G] with ThrowImpl[G]
-final case class Break[G](label: Option[Ref[G, LabelDecl[G]]])(implicit val o: Origin) extends ExceptionalStatement[G] with BreakImpl[G]
-final case class Continue[G](label: Option[Ref[G, LabelDecl[G]]])(implicit val o: Origin) extends ExceptionalStatement[G] with ContinueImpl[G]
-
-sealed trait CompositeStatement[G] extends Statement[G] with CompositeStatementImpl[G]
-final case class Block[G](statements: Seq[Statement[G]])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with BlockImpl[G]
-@scopes[Variable] @scopes[CLocalDeclaration] @scopes[CPPLocalDeclaration] @scopes[JavaLocalDeclaration] final case class Scope[G](locals: Seq[Variable[G]], body: Statement[G])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with ScopeImpl[G]
-final case class Branch[G](branches: Seq[(Expr[G], Statement[G])])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with BranchImpl[G]
-final case class IndetBranch[G](branches: Seq[Statement[G]])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with IndetBranchImpl[G]
-final case class Switch[G](expr: Expr[G], body: Statement[G])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with SwitchImpl[G]
-@scopes[SendDecl] final case class Loop[G](init: Statement[G], cond: Expr[G], update: Statement[G], contract: LoopContract[G], body: Statement[G])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with LoopImpl[G]
-@scopes[Variable] final case class RangedFor[G](iter: IterVariable[G], contract: LoopContract[G], body: Statement[G])(implicit val o: Origin) extends CompositeStatement[G] with Declarator[G] with ControlContainerStatement[G] with RangedForImpl[G]
-final case class TryCatchFinally[G](body: Statement[G], after: Statement[G], catches: Seq[CatchClause[G]])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with TryCatchFinallyImpl[G]
-final case class Synchronized[G](obj: Expr[G], body: Statement[G])(val blame: Blame[LockRegionFailure])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with SynchronizedImpl[G]
-@scopes[ParInvariantDecl] final case class ParInvariant[G](decl: ParInvariantDecl[G], inv: Expr[G], content: Statement[G])(val blame: Blame[ParInvariantNotEstablished])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with ParInvariantImpl[G]
-final case class ParAtomic[G](inv: Seq[Ref[G, ParInvariantDecl[G]]], content: Statement[G])(val blame: Blame[ParInvariantNotMaintained])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with ParAtomicImpl[G]
-final case class ParBarrier[G](block: Ref[G, ParBlockDecl[G]], invs: Seq[Ref[G, ParInvariantDecl[G]]], requires: Expr[G], ensures: Expr[G], content: Statement[G])(val blame: Blame[ParBarrierFailure])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with ParBarrierImpl[G]
-final case class ParStatement[G](impl: ParRegion[G])(implicit val o: Origin) extends CompositeStatement[G] with PurelySequentialStatement[G] with ParStatementImpl[G]
-@scopes[Variable] final case class VecBlock[G](iters: Seq[IterVariable[G]], requires: Expr[G], ensures: Expr[G], content: Statement[G])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with VecBlockImpl[G]
-final case class WandPackage[G](res: Expr[G], proof: Statement[G])(val blame: Blame[PackageFailure])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with WandPackageImpl[G]
-final case class ModelDo[G](model: Expr[G], perm: Expr[G], after: Expr[G], action: Expr[G], impl: Statement[G])(implicit val o: Origin) extends CompositeStatement[G] with ControlContainerStatement[G] with ModelDoImpl[G]
-
-@family sealed trait GlobalDeclaration[G] extends Declaration[G] with GlobalDeclarationImpl[G]
-final class HeapVariable[G](val t: Type[G])(implicit val o: Origin) extends GlobalDeclaration[G] with HeapVariableImpl[G]
-final class SimplificationRule[G](val axiom: Expr[G])(implicit val o: Origin) extends GlobalDeclaration[G] with SimplificationRuleImpl[G]
-@scopes[Variable] final class AxiomaticDataType[G](val decls: Seq[ADTDeclaration[G]], val typeArgs: Seq[Variable[G]])(implicit val o: Origin) extends GlobalDeclaration[G] with AxiomaticDataTypeImpl[G]
-final class Class[G](val typeArgs: Seq[Variable[G]], val decls: Seq[ClassDeclaration[G]], val supports: Seq[Type[G]], val intrinsicLockInvariant: Expr[G])(implicit val o: Origin) extends GlobalDeclaration[G] with ClassImpl[G]
-final class Model[G](val declarations: Seq[ModelDeclaration[G]])(implicit val o: Origin) extends GlobalDeclaration[G] with Declarator[G] with ModelImpl[G]
-@scopes[LabelDecl] final class Function[G](val returnType: Type[G], val args: Seq[Variable[G]], val typeArgs: Seq[Variable[G]],
-               val body: Option[Expr[G]], val contract: ApplicableContract[G], val inline: Boolean = false, val threadLocal: Boolean = false)
-              (val blame: Blame[ContractedFailure])(implicit val o: Origin)
-  extends GlobalDeclaration[G] with AbstractFunction[G] with FunctionImpl[G]
-@scopes[LabelDecl] final class Procedure[G](val returnType: Type[G],
-                val args: Seq[Variable[G]], val outArgs: Seq[Variable[G]], val typeArgs: Seq[Variable[G]],
-                val body: Option[Statement[G]],
-                val contract: ApplicableContract[G],
-                val inline: Boolean = false, val pure: Boolean = false, val vesuv_entry: Boolean = false)
-                        (val blame: Blame[CallableFailure])(implicit val o: Origin)
-  extends GlobalDeclaration[G] with AbstractMethod[G] with ProcedureImpl[G]
-final class VeSUVMainMethod[G](val body: Option[Statement[G]])(val blame: Blame[CallableFailure])(implicit val o: Origin) extends GlobalDeclaration[G] with VeSUVMainMethodImpl[G]
-@scopes[Variable] final class Predicate[G](val args: Seq[Variable[G]], val body: Option[Expr[G]],
-                val threadLocal: Boolean = false, val inline: Boolean = false)(implicit val o: Origin)
-  extends GlobalDeclaration[G] with AbstractPredicate[G] with PredicateImpl[G]
-final class Enum[G](val constants: Seq[EnumConstant[G]])(implicit val o: Origin) extends GlobalDeclaration[G] with EnumImpl[G]
-@family final class EnumConstant[G]()(implicit val o: Origin) extends Declaration[G] with EnumConstantImpl[G]
-
-final class ProverType[G](val interpretation: Seq[(ProverLanguage[G], String)])(implicit val o: Origin) extends GlobalDeclaration[G] with ProverTypeImpl[G]
-final class ProverFunction[G](val interpretation: Seq[(ProverLanguage[G], String)], val args: Seq[Variable[G]], val returnType: Type[G])(implicit val o: Origin) extends GlobalDeclaration[G] with Applicable[G] with ProverFunctionImpl[G]
-
-@family sealed trait ProverLanguage[G] extends NodeFamily[G] with ProverLanguageImpl[G]
-case class SmtLib[G]()(implicit val o: Origin) extends ProverLanguage[G] with SmtLibImpl[G]
-case class Boogie[G]()(implicit val o: Origin) extends ProverLanguage[G] with BoogieImpl[G]
-
-@family sealed trait ClassDeclaration[G] extends Declaration[G] with ClassDeclarationImpl[G]
-@scopes[LabelDecl] final class InstanceFunction[G](val returnType: Type[G], val args: Seq[Variable[G]], val typeArgs: Seq[Variable[G]],
-                       val body: Option[Expr[G]], val contract: ApplicableContract[G], val inline: Boolean, val threadLocal: Boolean = false)
-                      (val blame: Blame[ContractedFailure])(implicit val o: Origin)
-  extends ClassDeclaration[G] with AbstractFunction[G] with InstanceFunctionImpl[G]
-@scopes[LabelDecl] final class Constructor[G](val cls: Ref[G, Class[G]], val args: Seq[Variable[G]], val outArgs: Seq[Variable[G]], val typeArgs: Seq[Variable[G]], val body: Option[Statement[G]], val contract: ApplicableContract[G], val inline: Boolean = false)(val blame: Blame[CallableFailure])(implicit val o: Origin) extends ClassDeclaration[G] with AbstractMethod[G] with ConstructorImpl[G]
-@scopes[LabelDecl] final class InstanceMethod[G](val returnType: Type[G],
-                              val args: Seq[Variable[G]], val outArgs: Seq[Variable[G]], val typeArgs: Seq[Variable[G]],
-                              val body: Option[Statement[G]],
-                              val contract: ApplicableContract[G],
-                              val inline: Boolean = false, val pure: Boolean = false)
-                             (val blame: Blame[CallableFailure])(implicit val o: Origin)
-  extends ClassDeclaration[G] with AbstractMethod[G] with InstanceMethodImpl[G]
-@scopes[Variable] final class InstancePredicate[G](val args: Seq[Variable[G]], val body: Option[Expr[G]],
-                        val threadLocal: Boolean = false, val inline: Boolean = false)(implicit val o: Origin)
-  extends ClassDeclaration[G] with AbstractPredicate[G] with InstancePredicateImpl[G]
-final class InstanceField[G](val t: Type[G], val flags: Seq[FieldFlag[G]])(implicit val o: Origin) extends ClassDeclaration[G] with Field[G] with InstanceFieldImpl[G]
-final class RunMethod[G](val body: Option[Statement[G]], val contract: ApplicableContract[G])(val blame: Blame[CallableFailure])(implicit val o: Origin) extends ClassDeclaration[G] with RunMethodImpl[G]
-final class InstanceOperatorFunction[G](val returnType: Type[G], val operator: Operator[G], val args: Seq[Variable[G]],
-                                        val body: Option[Expr[G]], val contract: ApplicableContract[G],
-                                        val inline: Boolean, val threadLocal: Boolean = false)
-                                       (val blame: Blame[ContractedFailure])(implicit val o: Origin)
-  extends ClassDeclaration[G] with AbstractFunction[G] with InstanceOperatorFunctionImpl[G]
-final class InstanceOperatorMethod[G](val returnType: Type[G],
-                                      val operator: Operator[G],
-                                      val args: Seq[Variable[G]],
-                                      val body: Option[Statement[G]],
-                                      val contract: ApplicableContract[G],
-                                      val inline: Boolean = false, val pure: Boolean = false)
-                                     (val blame: Blame[CallableFailure])(implicit val o: Origin)
-  extends ClassDeclaration[G] with AbstractMethod[G] with InstanceOperatorMethodImpl[G]
-
-@family sealed trait Operator[G] extends NodeFamily[G] with OperatorImpl[G]
-case class OperatorLeftPlus[G]()(implicit val o: Origin = DiagnosticOrigin) extends Operator[G] with OperatorLeftPlusImpl[G]
-case class OperatorRightPlus[G]()(implicit val o: Origin = DiagnosticOrigin) extends Operator[G] with OperatorRightPlusImpl[G]
-
-@family sealed trait ModelDeclaration[G] extends Declaration[G] with ModelDeclarationImpl[G]
-final class ModelField[G](val t: Type[G])(implicit val o: Origin) extends ModelDeclaration[G] with Field[G] with ModelFieldImpl[G]
-@scopes[Variable] final class ModelProcess[G](val args: Seq[Variable[G]], val impl: Expr[G],
-                   val requires: Expr[G], val ensures: Expr[G],
-                   val modifies: Seq[Ref[G, ModelField[G]]], val accessible: Seq[Ref[G, ModelField[G]]])
-                  (val blame: Blame[PostconditionFailed])
-                  (implicit val o: Origin) extends ModelDeclaration[G] with Applicable[G] with ModelProcessImpl[G]
-@scopes[Variable] final class ModelAction[G](val args: Seq[Variable[G]],
-                  val requires: Expr[G], val ensures: Expr[G],
-                  val modifies: Seq[Ref[G, ModelField[G]]], val accessible: Seq[Ref[G, ModelField[G]]])
-                 (implicit val o: Origin) extends ModelDeclaration[G] with Applicable[G] with ModelActionImpl[G]
-
-@family sealed trait ADTDeclaration[G] extends Declaration[G] with ADTDeclarationImpl[G]
-final class ADTAxiom[G](val axiom: Expr[G])(implicit val o: Origin) extends ADTDeclaration[G] with ADTAxiomImpl[G]
-@scopes[Variable] final class ADTFunction[G](val args: Seq[Variable[G]], val returnType: Type[G])(implicit val o: Origin) extends Applicable[G] with ADTDeclaration[G] with ADTFunctionImpl[G]
-
-@family final class Variable[G](val t: Type[G])(implicit val o: Origin) extends Declaration[G] with VariableImpl[G]
-@family final class LabelDecl[G]()(implicit val o: Origin) extends Declaration[G] with LabelDeclImpl[G]
-@family final class SendDecl[G]()(implicit val o: Origin) extends Declaration[G] with SendDeclImpl[G]
-@family final class ParBlockDecl[G]()(implicit val o: Origin) extends Declaration[G] with ParBlockDeclImpl[G]
-@family final class ParInvariantDecl[G]()(implicit val o: Origin) extends Declaration[G] with ParInvariantDeclImpl[G]
+sealed trait ExpressionContainerStatement[G]
+    extends Statement[G] with ExpressionContainerStatementImpl[G]
+
+final case class PVLBranch[G](branches: Seq[(Expr[G], Statement[G])])(
+    val blame: Blame[FrontendIfFailure]
+)(implicit val o: Origin)
+    extends Statement[G] with ControlContainerStatement[G] with PVLBranchImpl[G]
+final case class PVLLoop[G](
+    init: Statement[G],
+    cond: Expr[G],
+    update: Statement[G],
+    contract: LoopContract[G],
+    body: Statement[G],
+)(val blame: Blame[FrontEndLoopFailure])(implicit val o: Origin)
+    extends Statement[G] with ControlContainerStatement[G] with PVLLoopImpl[G]
+
+sealed trait NonExecutableStatement[G]
+    extends Statement[G] with NonExecutableStatementImpl[G]
+final case class LocalDecl[G](local: Variable[G])(implicit val o: Origin)
+    extends NonExecutableStatement[G]
+    with PurelySequentialStatement[G]
+    with LocalDeclImpl[G]
+final case class SpecIgnoreStart[G]()(implicit val o: Origin)
+    extends NonExecutableStatement[G]
+    with PurelySequentialStatement[G]
+    with SpecIgnoreStartImpl[G]
+final case class SpecIgnoreEnd[G]()(implicit val o: Origin)
+    extends NonExecutableStatement[G]
+    with PurelySequentialStatement[G]
+    with SpecIgnoreEndImpl[G]
+
+sealed trait NormallyCompletingStatement[G]
+    extends Statement[G] with NormallyCompletingStatementImpl[G]
+final case class Assign[G](target: Expr[G], value: Expr[G])(
+    val blame: Blame[AssignFailed]
+)(implicit val o: Origin)
+    extends NormallyCompletingStatement[G] with AssignImpl[G]
+final case class Send[G](decl: SendDecl[G], delta: BigInt, res: Expr[G])(
+    val blame: Blame[SendFailed]
+)(implicit val o: Origin)
+    extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with SendImpl[G]
+final case class Recv[G](ref: Ref[G, SendDecl[G]])(implicit val o: Origin)
+    extends NormallyCompletingStatement[G]
+    with PurelySequentialStatement[G]
+    with RecvImpl[G]
+sealed trait SwitchCase[G]
+    extends NormallyCompletingStatement[G] with SwitchCaseImpl[G]
+final case class DefaultCase[G]()(implicit val o: Origin)
+    extends SwitchCase[G]
+    with PurelySequentialStatement[G]
+    with DefaultCaseImpl[G]
+final case class Case[G](pattern: Expr[G])(implicit val o: Origin)
+    extends SwitchCase[G] with PurelySequentialStatement[G] with CaseImpl[G]
+final case class Label[G](decl: LabelDecl[G], stat: Statement[G])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ControlContainerStatement[G]
+    with LabelImpl[G]
+final case class Goto[G](lbl: Ref[G, LabelDecl[G]])(implicit val o: Origin)
+    extends NormallyCompletingStatement[G] with GotoImpl[G]
+final case class Exhale[G](res: Expr[G])(val blame: Blame[ExhaleFailed])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with ExhaleImpl[G]
+final case class Assert[G](res: Expr[G])(val blame: Blame[AssertFailed])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with AssertImpl[G]
+final case class Refute[G](assn: Expr[G])(val blame: Blame[RefuteFailed])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with RefuteImpl[G]
+final case class Inhale[G](res: Expr[G])(implicit val o: Origin)
+    extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with InhaleImpl[G]
+final case class Assume[G](assn: Expr[G])(implicit val o: Origin)
+    extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with AssumeImpl[G]
+final case class Instantiate[G](cls: Ref[G, Class[G]], out: Expr[G])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with InstantiateImpl[G]
+final case class Wait[G](obj: Expr[G])(val blame: Blame[UnlockFailure])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with WaitImpl[G]
+final case class Notify[G](obj: Expr[G])(val blame: Blame[NotifyFailed])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with NotifyImpl[G]
+final case class Fork[G](obj: Expr[G])(val blame: Blame[ForkFailure])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with ForkImpl[G]
+final case class Join[G](obj: Expr[G])(val blame: Blame[JoinFailure])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with JoinImpl[G]
+final case class Lock[G](obj: Expr[G])(val blame: Blame[LockFailure])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with LockImpl[G]
+final case class Unlock[G](obj: Expr[G])(val blame: Blame[UnlockFailure])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with UnlockImpl[G]
+final case class Commit[G](obj: Expr[G])(val blame: Blame[CommitFailed])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with CommitImpl[G]
+final case class Fold[G](res: Expr[G])(val blame: Blame[FoldFailed])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with FoldImpl[G]
+final case class Unfold[G](res: Expr[G])(val blame: Blame[UnfoldFailed])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with UnfoldImpl[G]
+final case class WandApply[G](res: Expr[G])(val blame: Blame[WandApplyFailed])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with WandApplyImpl[G]
+final case class Havoc[G](loc: Expr[G])(implicit val o: Origin)
+    extends NormallyCompletingStatement[G]
+    with ExpressionContainerStatement[G]
+    with HavocImpl[G]
+final case class FramedProof[G](
+    pre: Expr[G],
+    body: Statement[G],
+    post: Expr[G],
+)(val blame: Blame[FramedProofFailure])(implicit val o: Origin)
+    extends NormallyCompletingStatement[G]
+    with ControlContainerStatement[G]
+    with FramedProofImpl[G]
+final case class Extract[G](contractedStatement: Statement[G])(
+    implicit val o: Origin
+) extends NormallyCompletingStatement[G]
+    with ControlContainerStatement[G]
+    with ExtractImpl[G]
+
+sealed trait ExceptionalStatement[G]
+    extends Statement[G] with ExceptionalStatementImpl[G]
+final case class Eval[G](expr: Expr[G])(implicit val o: Origin)
+    extends ExceptionalStatement[G]
+    with ControlContainerStatement[G]
+    with EvalImpl[G]
+sealed trait InvocationStatement[G]
+    extends ExceptionalStatement[G]
+    with InvokingNode[G]
+    with InvocationStatementImpl[G]
+final case class InvokeProcedure[G](
+    ref: Ref[G, Procedure[G]],
+    args: Seq[Expr[G]],
+    outArgs: Seq[Expr[G]],
+    typeArgs: Seq[Type[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InvocationFailure])(implicit val o: Origin)
+    extends InvocationStatement[G]
+    with ControlContainerStatement[G]
+    with InvokeProcedureImpl[G]
+final case class InvokeConstructor[G](
+    ref: Ref[G, Constructor[G]],
+    classTypeArgs: Seq[Type[G]],
+    out: Expr[G],
+    args: Seq[Expr[G]],
+    outArgs: Seq[Expr[G]],
+    typeArgs: Seq[Type[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InvocationFailure])(implicit val o: Origin)
+    extends InvocationStatement[G]
+    with ControlContainerStatement[G]
+    with InvokeConstructorImpl[G]
+final case class InvokeMethod[G](
+    obj: Expr[G],
+    ref: Ref[G, InstanceMethod[G]],
+    args: Seq[Expr[G]],
+    outArgs: Seq[Expr[G]],
+    typeArgs: Seq[Type[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InstanceInvocationFailure])(implicit val o: Origin)
+    extends InvocationStatement[G]
+    with InstanceApply[G]
+    with ControlContainerStatement[G]
+    with InvokeMethodImpl[G]
+final case class Return[G](result: Expr[G])(implicit val o: Origin)
+    extends ExceptionalStatement[G]
+    with ExpressionContainerStatement[G]
+    with ReturnImpl[G]
+final case class Throw[G](obj: Expr[G])(val blame: Blame[ThrowNull])(
+    implicit val o: Origin
+) extends ExceptionalStatement[G]
+    with ExpressionContainerStatement[G]
+    with ThrowImpl[G]
+final case class Break[G](label: Option[Ref[G, LabelDecl[G]]])(
+    implicit val o: Origin
+) extends ExceptionalStatement[G] with BreakImpl[G]
+final case class Continue[G](label: Option[Ref[G, LabelDecl[G]]])(
+    implicit val o: Origin
+) extends ExceptionalStatement[G] with ContinueImpl[G]
+
+sealed trait CompositeStatement[G]
+    extends Statement[G] with CompositeStatementImpl[G]
+final case class Block[G](statements: Seq[Statement[G]])(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with BlockImpl[G]
+@scopes[Variable]
+@scopes[CLocalDeclaration]
+@scopes[CPPLocalDeclaration]
+@scopes[JavaLocalDeclaration]
+final case class Scope[G](locals: Seq[Variable[G]], body: Statement[G])(
+    implicit val o: Origin
+) extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with ScopeImpl[G]
+final case class Branch[G](branches: Seq[(Expr[G], Statement[G])])(
+    implicit val o: Origin
+) extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with BranchImpl[G]
+final case class IndetBranch[G](branches: Seq[Statement[G]])(
+    implicit val o: Origin
+) extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with IndetBranchImpl[G]
+final case class Switch[G](expr: Expr[G], body: Statement[G])(
+    implicit val o: Origin
+) extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with SwitchImpl[G]
+@scopes[SendDecl]
+final case class Loop[G](
+    init: Statement[G],
+    cond: Expr[G],
+    update: Statement[G],
+    contract: LoopContract[G],
+    body: Statement[G],
+)(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with LoopImpl[G]
+@scopes[Variable]
+final case class RangedFor[G](
+    iter: IterVariable[G],
+    contract: LoopContract[G],
+    body: Statement[G],
+)(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with Declarator[G]
+    with ControlContainerStatement[G]
+    with RangedForImpl[G]
+final case class TryCatchFinally[G](
+    body: Statement[G],
+    after: Statement[G],
+    catches: Seq[CatchClause[G]],
+)(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with TryCatchFinallyImpl[G]
+final case class Synchronized[G](obj: Expr[G], body: Statement[G])(
+    val blame: Blame[LockRegionFailure]
+)(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with SynchronizedImpl[G]
+@scopes[ParInvariantDecl]
+final case class ParInvariant[G](
+    decl: ParInvariantDecl[G],
+    inv: Expr[G],
+    content: Statement[G],
+)(val blame: Blame[ParInvariantNotEstablished])(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with ParInvariantImpl[G]
+final case class ParAtomic[G](
+    inv: Seq[Ref[G, ParInvariantDecl[G]]],
+    content: Statement[G],
+)(val blame: Blame[ParInvariantNotMaintained])(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with ParAtomicImpl[G]
+final case class ParBarrier[G](
+    block: Ref[G, ParBlockDecl[G]],
+    invs: Seq[Ref[G, ParInvariantDecl[G]]],
+    requires: Expr[G],
+    ensures: Expr[G],
+    content: Statement[G],
+)(val blame: Blame[ParBarrierFailure])(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with ParBarrierImpl[G]
+final case class ParStatement[G](impl: ParRegion[G])(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with PurelySequentialStatement[G]
+    with ParStatementImpl[G]
+@scopes[Variable]
+final case class VecBlock[G](
+    iters: Seq[IterVariable[G]],
+    requires: Expr[G],
+    ensures: Expr[G],
+    content: Statement[G],
+)(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with VecBlockImpl[G]
+final case class WandPackage[G](res: Expr[G], proof: Statement[G])(
+    val blame: Blame[PackageFailure]
+)(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with WandPackageImpl[G]
+final case class ModelDo[G](
+    model: Expr[G],
+    perm: Expr[G],
+    after: Expr[G],
+    action: Expr[G],
+    impl: Statement[G],
+)(implicit val o: Origin)
+    extends CompositeStatement[G]
+    with ControlContainerStatement[G]
+    with ModelDoImpl[G]
+
+@family
+sealed trait GlobalDeclaration[G]
+    extends Declaration[G] with GlobalDeclarationImpl[G]
+final class HeapVariable[G](val t: Type[G])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with HeapVariableImpl[G]
+final class SimplificationRule[G](val axiom: Expr[G])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with SimplificationRuleImpl[G]
+@scopes[Variable]
+final class AxiomaticDataType[G](
+    val decls: Seq[ADTDeclaration[G]],
+    val typeArgs: Seq[Variable[G]],
+)(implicit val o: Origin)
+    extends GlobalDeclaration[G] with AxiomaticDataTypeImpl[G]
+final class Class[G](
+    val typeArgs: Seq[Variable[G]],
+    val decls: Seq[ClassDeclaration[G]],
+    val supports: Seq[Type[G]],
+    val intrinsicLockInvariant: Expr[G],
+)(implicit val o: Origin)
+    extends GlobalDeclaration[G] with ClassImpl[G]
+final class Model[G](val declarations: Seq[ModelDeclaration[G]])(
+    implicit val o: Origin
+) extends GlobalDeclaration[G] with Declarator[G] with ModelImpl[G]
+@scopes[LabelDecl]
+final class Function[G](
+    val returnType: Type[G],
+    val args: Seq[Variable[G]],
+    val typeArgs: Seq[Variable[G]],
+    val body: Option[Expr[G]],
+    val contract: ApplicableContract[G],
+    val inline: Boolean = false,
+    val threadLocal: Boolean = false,
+)(val blame: Blame[ContractedFailure])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with AbstractFunction[G] with FunctionImpl[G]
+@scopes[LabelDecl]
+final class Procedure[G](
+    val returnType: Type[G],
+    val args: Seq[Variable[G]],
+    val outArgs: Seq[Variable[G]],
+    val typeArgs: Seq[Variable[G]],
+    val body: Option[Statement[G]],
+    val contract: ApplicableContract[G],
+    val inline: Boolean = false,
+    val pure: Boolean = false,
+    val vesuv_entry: Boolean = false,
+)(val blame: Blame[CallableFailure])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with AbstractMethod[G] with ProcedureImpl[G]
+final class VeSUVMainMethod[G](val body: Option[Statement[G]])(
+    val blame: Blame[CallableFailure]
+)(implicit val o: Origin)
+    extends GlobalDeclaration[G] with VeSUVMainMethodImpl[G]
+@scopes[Variable]
+final class Predicate[G](
+    val args: Seq[Variable[G]],
+    val body: Option[Expr[G]],
+    val threadLocal: Boolean = false,
+    val inline: Boolean = false,
+)(implicit val o: Origin)
+    extends GlobalDeclaration[G] with AbstractPredicate[G] with PredicateImpl[G]
+final class Enum[G](val constants: Seq[EnumConstant[G]])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with EnumImpl[G]
+@family
+final class EnumConstant[G]()(implicit val o: Origin)
+    extends Declaration[G] with EnumConstantImpl[G]
+
+final class ProverType[G](val interpretation: Seq[(ProverLanguage[G], String)])(
+    implicit val o: Origin
+) extends GlobalDeclaration[G] with ProverTypeImpl[G]
+final class ProverFunction[G](
+    val interpretation: Seq[(ProverLanguage[G], String)],
+    val args: Seq[Variable[G]],
+    val returnType: Type[G],
+)(implicit val o: Origin)
+    extends GlobalDeclaration[G] with Applicable[G] with ProverFunctionImpl[G]
+
+@family
+sealed trait ProverLanguage[G] extends NodeFamily[G] with ProverLanguageImpl[G]
+case class SmtLib[G]()(implicit val o: Origin)
+    extends ProverLanguage[G] with SmtLibImpl[G]
+case class Boogie[G]()(implicit val o: Origin)
+    extends ProverLanguage[G] with BoogieImpl[G]
+
+@family
+sealed trait ClassDeclaration[G]
+    extends Declaration[G] with ClassDeclarationImpl[G]
+@scopes[LabelDecl]
+final class InstanceFunction[G](
+    val returnType: Type[G],
+    val args: Seq[Variable[G]],
+    val typeArgs: Seq[Variable[G]],
+    val body: Option[Expr[G]],
+    val contract: ApplicableContract[G],
+    val inline: Boolean,
+    val threadLocal: Boolean = false,
+)(val blame: Blame[ContractedFailure])(implicit val o: Origin)
+    extends ClassDeclaration[G]
+    with AbstractFunction[G]
+    with InstanceFunctionImpl[G]
+@scopes[LabelDecl]
+final class Constructor[G](
+    val cls: Ref[G, Class[G]],
+    val args: Seq[Variable[G]],
+    val outArgs: Seq[Variable[G]],
+    val typeArgs: Seq[Variable[G]],
+    val body: Option[Statement[G]],
+    val contract: ApplicableContract[G],
+    val inline: Boolean = false,
+)(val blame: Blame[CallableFailure])(implicit val o: Origin)
+    extends ClassDeclaration[G] with AbstractMethod[G] with ConstructorImpl[G]
+@scopes[LabelDecl]
+final class InstanceMethod[G](
+    val returnType: Type[G],
+    val args: Seq[Variable[G]],
+    val outArgs: Seq[Variable[G]],
+    val typeArgs: Seq[Variable[G]],
+    val body: Option[Statement[G]],
+    val contract: ApplicableContract[G],
+    val inline: Boolean = false,
+    val pure: Boolean = false,
+)(val blame: Blame[CallableFailure])(implicit val o: Origin)
+    extends ClassDeclaration[G]
+    with AbstractMethod[G]
+    with InstanceMethodImpl[G]
+@scopes[Variable]
+final class InstancePredicate[G](
+    val args: Seq[Variable[G]],
+    val body: Option[Expr[G]],
+    val threadLocal: Boolean = false,
+    val inline: Boolean = false,
+)(implicit val o: Origin)
+    extends ClassDeclaration[G]
+    with AbstractPredicate[G]
+    with InstancePredicateImpl[G]
+final class InstanceField[G](val t: Type[G], val flags: Seq[FieldFlag[G]])(
+    implicit val o: Origin
+) extends ClassDeclaration[G] with Field[G] with InstanceFieldImpl[G]
+final class RunMethod[G](
+    val body: Option[Statement[G]],
+    val contract: ApplicableContract[G],
+)(val blame: Blame[CallableFailure])(implicit val o: Origin)
+    extends ClassDeclaration[G] with RunMethodImpl[G]
+final class InstanceOperatorFunction[G](
+    val returnType: Type[G],
+    val operator: Operator[G],
+    val args: Seq[Variable[G]],
+    val body: Option[Expr[G]],
+    val contract: ApplicableContract[G],
+    val inline: Boolean,
+    val threadLocal: Boolean = false,
+)(val blame: Blame[ContractedFailure])(implicit val o: Origin)
+    extends ClassDeclaration[G]
+    with AbstractFunction[G]
+    with InstanceOperatorFunctionImpl[G]
+final class InstanceOperatorMethod[G](
+    val returnType: Type[G],
+    val operator: Operator[G],
+    val args: Seq[Variable[G]],
+    val body: Option[Statement[G]],
+    val contract: ApplicableContract[G],
+    val inline: Boolean = false,
+    val pure: Boolean = false,
+)(val blame: Blame[CallableFailure])(implicit val o: Origin)
+    extends ClassDeclaration[G]
+    with AbstractMethod[G]
+    with InstanceOperatorMethodImpl[G]
+
+@family
+sealed trait Operator[G] extends NodeFamily[G] with OperatorImpl[G]
+case class OperatorLeftPlus[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends Operator[G] with OperatorLeftPlusImpl[G]
+case class OperatorRightPlus[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends Operator[G] with OperatorRightPlusImpl[G]
+
+@family
+sealed trait ModelDeclaration[G]
+    extends Declaration[G] with ModelDeclarationImpl[G]
+final class ModelField[G](val t: Type[G])(implicit val o: Origin)
+    extends ModelDeclaration[G] with Field[G] with ModelFieldImpl[G]
+@scopes[Variable]
+final class ModelProcess[G](
+    val args: Seq[Variable[G]],
+    val impl: Expr[G],
+    val requires: Expr[G],
+    val ensures: Expr[G],
+    val modifies: Seq[Ref[G, ModelField[G]]],
+    val accessible: Seq[Ref[G, ModelField[G]]],
+)(val blame: Blame[PostconditionFailed])(implicit val o: Origin)
+    extends ModelDeclaration[G] with Applicable[G] with ModelProcessImpl[G]
+@scopes[Variable]
+final class ModelAction[G](
+    val args: Seq[Variable[G]],
+    val requires: Expr[G],
+    val ensures: Expr[G],
+    val modifies: Seq[Ref[G, ModelField[G]]],
+    val accessible: Seq[Ref[G, ModelField[G]]],
+)(implicit val o: Origin)
+    extends ModelDeclaration[G] with Applicable[G] with ModelActionImpl[G]
+
+@family
+sealed trait ADTDeclaration[G] extends Declaration[G] with ADTDeclarationImpl[G]
+final class ADTAxiom[G](val axiom: Expr[G])(implicit val o: Origin)
+    extends ADTDeclaration[G] with ADTAxiomImpl[G]
+@scopes[Variable]
+final class ADTFunction[G](val args: Seq[Variable[G]], val returnType: Type[G])(
+    implicit val o: Origin
+) extends Applicable[G] with ADTDeclaration[G] with ADTFunctionImpl[G]
+
+@family
+final class Variable[G](val t: Type[G])(implicit val o: Origin)
+    extends Declaration[G] with VariableImpl[G]
+@family
+final class LabelDecl[G]()(implicit val o: Origin)
+    extends Declaration[G] with LabelDeclImpl[G]
+@family
+final class SendDecl[G]()(implicit val o: Origin)
+    extends Declaration[G] with SendDeclImpl[G]
+@family
+final class ParBlockDecl[G]()(implicit val o: Origin)
+    extends Declaration[G] with ParBlockDeclImpl[G]
+@family
+final class ParInvariantDecl[G]()(implicit val o: Origin)
+    extends Declaration[G] with ParInvariantDeclImpl[G]
 
 sealed trait Applicable[G] extends ApplicableImpl[G] with Declaration[G]
-sealed trait InlineableApplicable[G] extends Applicable[G] with InlineableApplicableImpl[G]
-sealed trait AbstractPredicate[G] extends InlineableApplicable[G] with AbstractPredicateImpl[G]
-sealed trait ContractApplicable[G] extends InlineableApplicable[G] with ContractApplicableImpl[G]
-sealed trait AbstractFunction[G] extends ContractApplicable[G] with AbstractFunctionImpl[G]
-sealed trait AbstractMethod[G] extends ContractApplicable[G] with AbstractMethodImpl[G]
+sealed trait InlineableApplicable[G]
+    extends Applicable[G] with InlineableApplicableImpl[G]
+sealed trait AbstractPredicate[G]
+    extends InlineableApplicable[G] with AbstractPredicateImpl[G]
+sealed trait ContractApplicable[G]
+    extends InlineableApplicable[G] with ContractApplicableImpl[G]
+sealed trait AbstractFunction[G]
+    extends ContractApplicable[G] with AbstractFunctionImpl[G]
+sealed trait AbstractMethod[G]
+    extends ContractApplicable[G] with AbstractMethodImpl[G]
 sealed trait Field[G] extends FieldImpl[G]
 
-@family @scopes[Variable] final case class SignalsClause[G](binding: Variable[G], assn: Expr[G])(implicit val o: Origin) extends NodeFamily[G] with SignalsClauseImpl[G]
-
-@family sealed trait DecreasesClause[G] extends NodeFamily[G] with DecreasesClauseImpl[G]
-final case class DecreasesClauseAssume[G]()(implicit val o: Origin) extends DecreasesClause[G] with DecreasesClauseAssumeImpl[G]
-final case class DecreasesClauseNoRecursion[G]()(implicit val o: Origin) extends DecreasesClause[G] with DecreasesClauseNoRecursionImpl[G]
-final case class DecreasesClauseTuple[G](exprs: Seq[Expr[G]])(implicit val o: Origin) extends DecreasesClause[G] with DecreasesClauseTupleImpl[G]
-
-@family final case class ApplicableContract[G](requires: AccountedPredicate[G], ensures: AccountedPredicate[G], contextEverywhere: Expr[G],
-                                       signals: Seq[SignalsClause[G]], givenArgs: Seq[Variable[G]], yieldsArgs: Seq[Variable[G]], decreases: Option[DecreasesClause[G]])
-                                      (val blame: Blame[NontrivialUnsatisfiable])(implicit val o: Origin) extends NodeFamily[G] with ApplicableContractImpl[G]
-
-/** @inheritdoc */ @family sealed trait AccountedPredicate[G] extends NodeFamily[G] with AccountedPredicateImpl[G]
-case class UnitAccountedPredicate[G](pred: Expr[G])(implicit val o: Origin) extends AccountedPredicate[G] with UnitAccountedPredicateImpl[G]
-case class SplitAccountedPredicate[G](left: AccountedPredicate[G], right: AccountedPredicate[G])(implicit val o: Origin) extends AccountedPredicate[G] with SplitAccountedPredicateImpl[G]
-
-@family sealed trait FieldFlag[G] extends NodeFamily[G] with FieldFlagImpl[G]
-final case class Final[G]()(implicit val o: Origin) extends FieldFlag[G] with FinalImpl[G]
-
-@family sealed trait Coercion[G] extends NodeFamily[G] with CoercionImpl[G]
-final case class CoerceIdentity[G](source: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceIdentityImpl[G]
-final case class CoercionSequence[G](coercions: Seq[Coercion[G]])(implicit val o: Origin) extends Coercion[G] with CoercionSequenceImpl[G]
-
-final case class CoerceNothingSomething[G](target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceNothingSomethingImpl[G]
-final case class CoerceSomethingAny[G](source: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceSomethingAnyImpl[G]
-final case class CoerceSomethingAnyValue[G](source: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceSomethingAnyValueImpl[G]
-
-final case class CoerceJoinUnion[G](inner: Seq[Coercion[G]], source: Seq[Type[G]], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceJoinUnionImpl[G]
-final case class CoerceSelectUnion[G](inner: Coercion[G], source: Type[G], targetAlts: Seq[Type[G]], index: Int)(implicit val o: Origin) extends Coercion[G] with CoerceSelectUnionImpl[G]
-
-final case class CoerceBoolResource[G]()(implicit val o: Origin) extends Coercion[G] with CoerceBoolResourceImpl[G]
-final case class CoerceResourceResourceVal[G]()(implicit val o: Origin) extends Coercion[G] with CoerceResourceResourceValImpl[G]
-final case class CoerceResourceValResource[G]()(implicit val o: Origin) extends Coercion[G] with CoerceResourceValResourceImpl[G]
-
-final case class CoerceNullRef[G]()(implicit val o: Origin) extends Coercion[G] with CoerceNullRefImpl[G]
-final case class CoerceNullArray[G](arrayElementType: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceNullArrayImpl[G]
-final case class CoerceNullClass[G](targetClass: Ref[G, Class[G]], typeArgs: Seq[Type[G]])(implicit val o: Origin) extends Coercion[G] with CoerceNullClassImpl[G]
-final case class CoerceNullJavaClass[G](targetClass: Ref[G, JavaClassOrInterface[G]])(implicit val o: Origin) extends Coercion[G] with CoerceNullJavaClassImpl[G]
-final case class CoerceNullAnyClass[G]()(implicit val o: Origin) extends Coercion[G] with CoerceNullAnyClassImpl[G]
-final case class CoerceNullPointer[G](pointerElementType: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceNullPointerImpl[G]
-final case class CoerceNullEnum[G](targetEnum: Ref[G, Enum[G]])(implicit val o: Origin) extends Coercion[G] with CoerceNullEnumImpl[G]
-
-final case class CoerceCArrayPointer[G](elementType: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceCArrayPointerImpl[G]
-final case class CoerceCPPArrayPointer[G](elementType: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceCPPArrayPointerImpl[G]
-final case class CoerceCVectorVector[G](size: BigInt, elementType: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceCVectorVectorImpl[G]
-
-final case class CoerceFracZFrac[G]()(implicit val o: Origin) extends Coercion[G] with CoerceFracZFracImpl[G]
-final case class CoerceZFracRat[G]()(implicit val o: Origin) extends Coercion[G] with CoerceZFracRatImpl[G]
-final case class CoerceFloatRat[G](source: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceFloatRatImpl[G]
-final case class CoerceCFloatCInt[G](source: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceCFloatCIntImpl[G]
-final case class CoerceCIntCFloat[G](target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceCIntCFloatImpl[G]
-final case class CoerceCIntInt[G]()(implicit val o: Origin) extends Coercion[G] with CoerceCIntIntImpl[G]
-final case class CoerceCFloatFloat[G](source: Type[G], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceCFloatFloatImpl[G]
-final case class CoerceIntRat[G]()(implicit val o: Origin) extends Coercion[G] with CoerceIntRatImpl[G]
-
-final case class CoerceIncreasePrecision[G](source: Type[G], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceIncreasePrecisionImpl[G]
-final case class CoerceDecreasePrecision[G](source: Type[G], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceDecreasePrecisionImpl[G]
-
-final case class CoerceWidenBound[G](source: Type[G], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceWidenBoundImpl[G]
-final case class CoerceUnboundInt[G](source: Type[G], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceUnboundIntImpl[G]
-
-final case class CoerceBoundIntFrac[G]()(implicit val o: Origin) extends Coercion[G] with CoerceBoundIntFracImpl[G]
-final case class CoerceBoundIntZFrac[G](source: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceBoundIntZFracImpl[G]
-final case class CoerceBoundIntFloat[G](source: Type[G], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceBoundIntFloatImpl[G]
-
-final case class CoerceSupports[G](sourceClass: Ref[G, Class[G]], targetClass: Ref[G, Class[G]])(implicit val o: Origin) extends Coercion[G] with CoerceSupportsImpl[G]
-final case class CoerceJavaSupports[G](sourceClass: Ref[G, JavaClassOrInterface[G]], targetClass: Ref[G, JavaClassOrInterface[G]])(implicit val o: Origin) extends Coercion[G] with CoerceJavaSupportsImpl[G]
-final case class CoerceClassAnyClass[G](sourceClass: Ref[G, Class[G]], typeArgs: Seq[Type[G]])(implicit val o: Origin) extends Coercion[G] with CoerceClassAnyClassImpl[G]
-final case class CoerceJavaClassAnyClass[G](sourceClass: Ref[G, JavaClassOrInterface[G]])(implicit val o: Origin) extends Coercion[G] with CoerceJavaClassAnyClassImpl[G]
-
-final case class CoerceCPrimitiveToCol[G](source: Type[G], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceCPrimitiveToColImpl[G]
-final case class CoerceColToCPrimitive[G](source: Type[G], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceColToCPrimitiveImpl[G]
-
-final case class CoerceCPPPrimitiveToCol[G](source: Type[G], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceCPPPrimitiveToColImpl[G]
-final case class CoerceColToCPPPrimitive[G](source: Type[G], target: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceColToCPPPrimitiveImpl[G]
-
-final case class CoerceMapOption[G](inner: Coercion[G], sourceOptionElement: Type[G], targetOptionElement: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceMapOptionImpl[G]
-final case class CoerceMapTuple[G](inner: Seq[Coercion[G]], sourceTypes: Seq[Type[G]], targetTypes: Seq[Type[G]])(implicit val o: Origin) extends Coercion[G] with CoerceMapTupleImpl[G]
-final case class CoerceMapEither[G](inner: (Coercion[G], Coercion[G]), sourceTypes: (Type[G], Type[G]), targetTypes: (Type[G], Type[G]))(implicit val o: Origin) extends Coercion[G] with CoerceMapEitherImpl[G]
-final case class CoerceMapSeq[G](inner: Coercion[G], sourceSeqElement: Type[G], targetSeqElement: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceMapSeqImpl[G]
-final case class CoerceMapSet[G](inner: Coercion[G], sourceSetElement: Type[G], targetSetElement: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceMapSetImpl[G]
-final case class CoerceMapVector[G](inner: Coercion[G], sourceVectorElement: Type[G], targetVectorElement: Type[G], size: BigInt)(implicit val o: Origin) extends Coercion[G] with CoerceMapVectorImpl[G]
-final case class CoerceMapBag[G](inner: Coercion[G], sourceBagElement: Type[G], targetBagElement: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceMapBagImpl[G]
-final case class CoerceMapMatrix[G](inner: Coercion[G], sourceMatrixElement: Type[G], targetMatrixElement: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceMapMatrixImpl[G]
-final case class CoerceMapMap[G](inner: Coercion[G], sourceTypes: (Type[G], Type[G]), targetTypes: (Type[G], Type[G]))(implicit val o: Origin) extends Coercion[G] with CoerceMapMapImpl[G]
-final case class CoerceMapType[G](inner: Coercion[G], sourceBound: Type[G], targetBound: Type[G])(implicit val o: Origin) extends Coercion[G] with CoerceMapTypeImpl[G]
-
-final case class CoerceRatZFrac[G]()(implicit val o: Origin) extends Coercion[G] with CoerceRatZFracImpl[G]
-final case class CoerceZFracFrac[G]()(implicit val o: Origin) extends Coercion[G] with CoerceZFracFracImpl[G]
-
-@family sealed trait Expr[G] extends NodeFamily[G] with ExprImpl[G]
+@family @scopes[Variable]
+final case class SignalsClause[G](binding: Variable[G], assn: Expr[G])(
+    implicit val o: Origin
+) extends NodeFamily[G] with SignalsClauseImpl[G]
+
+@family
+sealed trait DecreasesClause[G]
+    extends NodeFamily[G] with DecreasesClauseImpl[G]
+final case class DecreasesClauseAssume[G]()(implicit val o: Origin)
+    extends DecreasesClause[G] with DecreasesClauseAssumeImpl[G]
+final case class DecreasesClauseNoRecursion[G]()(implicit val o: Origin)
+    extends DecreasesClause[G] with DecreasesClauseNoRecursionImpl[G]
+final case class DecreasesClauseTuple[G](exprs: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends DecreasesClause[G] with DecreasesClauseTupleImpl[G]
+
+@family
+final case class ApplicableContract[G](
+    requires: AccountedPredicate[G],
+    ensures: AccountedPredicate[G],
+    contextEverywhere: Expr[G],
+    signals: Seq[SignalsClause[G]],
+    givenArgs: Seq[Variable[G]],
+    yieldsArgs: Seq[Variable[G]],
+    decreases: Option[DecreasesClause[G]],
+)(val blame: Blame[NontrivialUnsatisfiable])(implicit val o: Origin)
+    extends NodeFamily[G] with ApplicableContractImpl[G]
+
+/** @inheritdoc */
+@family
+sealed trait AccountedPredicate[G]
+    extends NodeFamily[G] with AccountedPredicateImpl[G]
+case class UnitAccountedPredicate[G](pred: Expr[G])(implicit val o: Origin)
+    extends AccountedPredicate[G] with UnitAccountedPredicateImpl[G]
+case class SplitAccountedPredicate[G](
+    left: AccountedPredicate[G],
+    right: AccountedPredicate[G],
+)(implicit val o: Origin)
+    extends AccountedPredicate[G] with SplitAccountedPredicateImpl[G]
+
+@family
+sealed trait FieldFlag[G] extends NodeFamily[G] with FieldFlagImpl[G]
+final case class Final[G]()(implicit val o: Origin)
+    extends FieldFlag[G] with FinalImpl[G]
+
+@family
+sealed trait Coercion[G] extends NodeFamily[G] with CoercionImpl[G]
+final case class CoerceIdentity[G](source: Type[G])(implicit val o: Origin)
+    extends Coercion[G] with CoerceIdentityImpl[G]
+final case class CoercionSequence[G](coercions: Seq[Coercion[G]])(
+    implicit val o: Origin
+) extends Coercion[G] with CoercionSequenceImpl[G]
+
+final case class CoerceNothingSomething[G](target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceNothingSomethingImpl[G]
+final case class CoerceSomethingAny[G](source: Type[G])(implicit val o: Origin)
+    extends Coercion[G] with CoerceSomethingAnyImpl[G]
+final case class CoerceSomethingAnyValue[G](source: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceSomethingAnyValueImpl[G]
+
+final case class CoerceJoinUnion[G](
+    inner: Seq[Coercion[G]],
+    source: Seq[Type[G]],
+    target: Type[G],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceJoinUnionImpl[G]
+final case class CoerceSelectUnion[G](
+    inner: Coercion[G],
+    source: Type[G],
+    targetAlts: Seq[Type[G]],
+    index: Int,
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceSelectUnionImpl[G]
+
+final case class CoerceBoolResource[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceBoolResourceImpl[G]
+final case class CoerceResourceResourceVal[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceResourceResourceValImpl[G]
+final case class CoerceResourceValResource[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceResourceValResourceImpl[G]
+
+final case class CoerceNullRef[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceNullRefImpl[G]
+final case class CoerceNullArray[G](arrayElementType: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceNullArrayImpl[G]
+final case class CoerceNullClass[G](
+    targetClass: Ref[G, Class[G]],
+    typeArgs: Seq[Type[G]],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceNullClassImpl[G]
+final case class CoerceNullJavaClass[G](
+    targetClass: Ref[G, JavaClassOrInterface[G]]
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceNullJavaClassImpl[G]
+final case class CoerceNullAnyClass[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceNullAnyClassImpl[G]
+final case class CoerceNullPointer[G](pointerElementType: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceNullPointerImpl[G]
+final case class CoerceNullEnum[G](targetEnum: Ref[G, Enum[G]])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceNullEnumImpl[G]
+
+final case class CoerceCArrayPointer[G](elementType: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceCArrayPointerImpl[G]
+final case class CoerceCPPArrayPointer[G](elementType: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceCPPArrayPointerImpl[G]
+final case class CoerceCVectorVector[G](size: BigInt, elementType: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceCVectorVectorImpl[G]
+
+final case class CoerceFracZFrac[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceFracZFracImpl[G]
+final case class CoerceZFracRat[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceZFracRatImpl[G]
+final case class CoerceFloatRat[G](source: Type[G])(implicit val o: Origin)
+    extends Coercion[G] with CoerceFloatRatImpl[G]
+final case class CoerceCFloatCInt[G](source: Type[G])(implicit val o: Origin)
+    extends Coercion[G] with CoerceCFloatCIntImpl[G]
+final case class CoerceCIntCFloat[G](target: Type[G])(implicit val o: Origin)
+    extends Coercion[G] with CoerceCIntCFloatImpl[G]
+final case class CoerceCIntInt[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceCIntIntImpl[G]
+final case class CoerceCFloatFloat[G](source: Type[G], target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceCFloatFloatImpl[G]
+final case class CoerceIntRat[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceIntRatImpl[G]
+
+final case class CoerceIncreasePrecision[G](source: Type[G], target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceIncreasePrecisionImpl[G]
+final case class CoerceDecreasePrecision[G](source: Type[G], target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceDecreasePrecisionImpl[G]
+
+final case class CoerceWidenBound[G](source: Type[G], target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceWidenBoundImpl[G]
+final case class CoerceUnboundInt[G](source: Type[G], target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceUnboundIntImpl[G]
+
+final case class CoerceBoundIntFrac[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceBoundIntFracImpl[G]
+final case class CoerceBoundIntZFrac[G](source: Type[G])(implicit val o: Origin)
+    extends Coercion[G] with CoerceBoundIntZFracImpl[G]
+final case class CoerceBoundIntFloat[G](source: Type[G], target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceBoundIntFloatImpl[G]
+
+final case class CoerceSupports[G](
+    sourceClass: Ref[G, Class[G]],
+    targetClass: Ref[G, Class[G]],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceSupportsImpl[G]
+final case class CoerceJavaSupports[G](
+    sourceClass: Ref[G, JavaClassOrInterface[G]],
+    targetClass: Ref[G, JavaClassOrInterface[G]],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceJavaSupportsImpl[G]
+final case class CoerceClassAnyClass[G](
+    sourceClass: Ref[G, Class[G]],
+    typeArgs: Seq[Type[G]],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceClassAnyClassImpl[G]
+final case class CoerceJavaClassAnyClass[G](
+    sourceClass: Ref[G, JavaClassOrInterface[G]]
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceJavaClassAnyClassImpl[G]
+
+final case class CoerceCPrimitiveToCol[G](source: Type[G], target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceCPrimitiveToColImpl[G]
+final case class CoerceColToCPrimitive[G](source: Type[G], target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceColToCPrimitiveImpl[G]
+
+final case class CoerceCPPPrimitiveToCol[G](source: Type[G], target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceCPPPrimitiveToColImpl[G]
+final case class CoerceColToCPPPrimitive[G](source: Type[G], target: Type[G])(
+    implicit val o: Origin
+) extends Coercion[G] with CoerceColToCPPPrimitiveImpl[G]
+
+final case class CoerceMapOption[G](
+    inner: Coercion[G],
+    sourceOptionElement: Type[G],
+    targetOptionElement: Type[G],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceMapOptionImpl[G]
+final case class CoerceMapTuple[G](
+    inner: Seq[Coercion[G]],
+    sourceTypes: Seq[Type[G]],
+    targetTypes: Seq[Type[G]],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceMapTupleImpl[G]
+final case class CoerceMapEither[G](
+    inner: (Coercion[G], Coercion[G]),
+    sourceTypes: (Type[G], Type[G]),
+    targetTypes: (Type[G], Type[G]),
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceMapEitherImpl[G]
+final case class CoerceMapSeq[G](
+    inner: Coercion[G],
+    sourceSeqElement: Type[G],
+    targetSeqElement: Type[G],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceMapSeqImpl[G]
+final case class CoerceMapSet[G](
+    inner: Coercion[G],
+    sourceSetElement: Type[G],
+    targetSetElement: Type[G],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceMapSetImpl[G]
+final case class CoerceMapVector[G](
+    inner: Coercion[G],
+    sourceVectorElement: Type[G],
+    targetVectorElement: Type[G],
+    size: BigInt,
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceMapVectorImpl[G]
+final case class CoerceMapBag[G](
+    inner: Coercion[G],
+    sourceBagElement: Type[G],
+    targetBagElement: Type[G],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceMapBagImpl[G]
+final case class CoerceMapMatrix[G](
+    inner: Coercion[G],
+    sourceMatrixElement: Type[G],
+    targetMatrixElement: Type[G],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceMapMatrixImpl[G]
+final case class CoerceMapMap[G](
+    inner: Coercion[G],
+    sourceTypes: (Type[G], Type[G]),
+    targetTypes: (Type[G], Type[G]),
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceMapMapImpl[G]
+final case class CoerceMapType[G](
+    inner: Coercion[G],
+    sourceBound: Type[G],
+    targetBound: Type[G],
+)(implicit val o: Origin)
+    extends Coercion[G] with CoerceMapTypeImpl[G]
+
+final case class CoerceRatZFrac[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceRatZFracImpl[G]
+final case class CoerceZFracFrac[G]()(implicit val o: Origin)
+    extends Coercion[G] with CoerceZFracFracImpl[G]
+
+@family
+sealed trait Expr[G] extends NodeFamily[G] with ExprImpl[G]
 
 sealed trait Constant[G] extends Expr[G] with ConstantImpl[G]
 sealed trait ConstantInt[G] extends Constant[G] with ConstantIntImpl[G]
-final case class CIntegerValue[G](value: BigInt)(implicit val o: Origin) extends ConstantInt[G] with Expr[G] with CIntegerValueImpl[G]
-final case class IntegerValue[G](value: BigInt)(implicit val o: Origin) extends ConstantInt[G] with Expr[G] with IntegerValueImpl[G]
-final case class BooleanValue[G](value: Boolean)(implicit val o: Origin) extends Constant[G] with BooleanValueImpl[G]
-final case class FloatValue[G](value: BigDecimal, t: Type[G] /* TFloat */)(implicit val o: Origin) extends Constant[G] with FloatValueImpl[G]
-final case class StringValue[G](value: String)(implicit val o: Origin) extends Constant[G] with StringValueImpl[G]
-final case class CharValue[G](value: Int)(implicit val o: Origin) extends Constant[G] with CharValueImpl[G]
-final case class LiteralSeq[G](element: Type[G], values: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with LiteralSeqImpl[G]
-final case class LiteralSet[G](element: Type[G], values: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with LiteralSetImpl[G]
-final case class LiteralBag[G](element: Type[G], values: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with LiteralBagImpl[G]
-final case class LiteralTuple[G](ts: Seq[Type[G]], values: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with LiteralTupleImpl[G]
-final case class LiteralMap[G](k: Type[G], v: Type[G], values: Seq[(Expr[G], Expr[G])])(implicit val o: Origin) extends Expr[G] with LiteralMapImpl[G]
-final case class LiteralVector[G](element: Type[G], values: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with LiteralVectorImpl[G]
-final case class UntypedLiteralSeq[G](values: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with UntypedLiteralSeqImpl[G]
-final case class UntypedLiteralSet[G](values: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with UntypedLiteralSetImpl[G]
-final case class UntypedLiteralBag[G](values: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with UntypedLiteralBagImpl[G]
-final case class Void[G]()(implicit val o: Origin) extends Expr[G] with VoidImpl[G]
-final case class Null[G]()(implicit val o: Origin) extends Expr[G] with NullImpl[G]
-final case class NoPerm[G]()(implicit val o: Origin) extends Expr[G] with NoPermImpl[G]
-final case class WritePerm[G]()(implicit val o: Origin) extends Expr[G] with WritePermImpl[G]
-final case class OptSome[G](e: Expr[G])(implicit val o: Origin) extends Expr[G] with OptSomeImpl[G]
-final case class OptSomeTyped[G](element: Type[G], e: Expr[G])(implicit val o: Origin) extends Expr[G] with OptSomeTypedImpl[G]
-final case class OptNone[G]()(implicit val o: Origin) extends Expr[G] with OptNoneImpl[G]
-final case class OptNoneTyped[G](element: Type[G])(implicit val o: Origin) extends Expr[G] with OptNoneTypedImpl[G]
-final case class Range[G](from: Expr[G], to: Expr[G])(implicit val o: Origin) extends Expr[G] with RangeImpl[G]
-final case class RangeSet[G](from: Expr[G], to: Expr[G])(implicit val o: Origin) extends Expr[G] with RangeSetImpl[G]
-final case class EitherLeft[G](e: Expr[G])(implicit val o: Origin) extends Expr[G] with EitherLeftImpl[G]
-final case class EitherRight[G](e: Expr[G])(implicit val o: Origin) extends Expr[G] with EitherRightImpl[G]
-final case class MapCons[G](map: Expr[G], k: Expr[G], v: Expr[G])(implicit val o: Origin) extends Expr[G] with MapConsImpl[G]
-
-final case class AmbiguousThis[G]()(implicit val o: Origin) extends Expr[G] with AmbiguousThisImpl[G] {
+final case class CIntegerValue[G](value: BigInt)(implicit val o: Origin)
+    extends ConstantInt[G] with Expr[G] with CIntegerValueImpl[G]
+final case class IntegerValue[G](value: BigInt)(implicit val o: Origin)
+    extends ConstantInt[G] with Expr[G] with IntegerValueImpl[G]
+final case class BooleanValue[G](value: Boolean)(implicit val o: Origin)
+    extends Constant[G] with BooleanValueImpl[G]
+final case class FloatValue[G](value: BigDecimal, t: Type[G] /* TFloat */ )(
+    implicit val o: Origin
+) extends Constant[G] with FloatValueImpl[G]
+final case class StringValue[G](value: String)(implicit val o: Origin)
+    extends Constant[G] with StringValueImpl[G]
+final case class CharValue[G](value: Int)(implicit val o: Origin)
+    extends Constant[G] with CharValueImpl[G]
+final case class LiteralSeq[G](element: Type[G], values: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends Expr[G] with LiteralSeqImpl[G]
+final case class LiteralSet[G](element: Type[G], values: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends Expr[G] with LiteralSetImpl[G]
+final case class LiteralBag[G](element: Type[G], values: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends Expr[G] with LiteralBagImpl[G]
+final case class LiteralTuple[G](ts: Seq[Type[G]], values: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends Expr[G] with LiteralTupleImpl[G]
+final case class LiteralMap[G](
+    k: Type[G],
+    v: Type[G],
+    values: Seq[(Expr[G], Expr[G])],
+)(implicit val o: Origin)
+    extends Expr[G] with LiteralMapImpl[G]
+final case class LiteralVector[G](element: Type[G], values: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends Expr[G] with LiteralVectorImpl[G]
+final case class UntypedLiteralSeq[G](values: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends Expr[G] with UntypedLiteralSeqImpl[G]
+final case class UntypedLiteralSet[G](values: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends Expr[G] with UntypedLiteralSetImpl[G]
+final case class UntypedLiteralBag[G](values: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends Expr[G] with UntypedLiteralBagImpl[G]
+final case class Void[G]()(implicit val o: Origin)
+    extends Expr[G] with VoidImpl[G]
+final case class Null[G]()(implicit val o: Origin)
+    extends Expr[G] with NullImpl[G]
+final case class NoPerm[G]()(implicit val o: Origin)
+    extends Expr[G] with NoPermImpl[G]
+final case class WritePerm[G]()(implicit val o: Origin)
+    extends Expr[G] with WritePermImpl[G]
+final case class OptSome[G](e: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with OptSomeImpl[G]
+final case class OptSomeTyped[G](element: Type[G], e: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with OptSomeTypedImpl[G]
+final case class OptNone[G]()(implicit val o: Origin)
+    extends Expr[G] with OptNoneImpl[G]
+final case class OptNoneTyped[G](element: Type[G])(implicit val o: Origin)
+    extends Expr[G] with OptNoneTypedImpl[G]
+final case class Range[G](from: Expr[G], to: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with RangeImpl[G]
+final case class RangeSet[G](from: Expr[G], to: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with RangeSetImpl[G]
+final case class EitherLeft[G](e: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with EitherLeftImpl[G]
+final case class EitherRight[G](e: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with EitherRightImpl[G]
+final case class MapCons[G](map: Expr[G], k: Expr[G], v: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with MapConsImpl[G]
+
+final case class AmbiguousThis[G]()(implicit val o: Origin)
+    extends Expr[G] with AmbiguousThisImpl[G] {
   var ref: Option[ThisTarget[G]] = None
 }
 
 sealed trait ThisDeclaration[G] extends Expr[G] with ThisDeclarationImpl[G]
-final case class ThisObject[G](cls: Ref[G, Class[G]])(implicit val o: Origin) extends ThisDeclaration[G] with ThisObjectImpl[G]
-final case class ThisModel[G](cls: Ref[G, Model[G]])(implicit val o: Origin) extends ThisDeclaration[G] with ThisModelImpl[G]
-final case class ThisChoreography[G](cls: Ref[G, Choreography[G]])(implicit val o: Origin) extends ThisDeclaration[G] with ThisChoreographyImpl[G]
-
-final case class AmbiguousResult[G]()(implicit val o: Origin) extends Expr[G] with AmbiguousResultImpl[G] {
+final case class ThisObject[G](cls: Ref[G, Class[G]])(implicit val o: Origin)
+    extends ThisDeclaration[G] with ThisObjectImpl[G]
+final case class ThisModel[G](cls: Ref[G, Model[G]])(implicit val o: Origin)
+    extends ThisDeclaration[G] with ThisModelImpl[G]
+final case class ThisChoreography[G](cls: Ref[G, Choreography[G]])(
+    implicit val o: Origin
+) extends ThisDeclaration[G] with ThisChoreographyImpl[G]
+
+final case class AmbiguousResult[G]()(implicit val o: Origin)
+    extends Expr[G] with AmbiguousResultImpl[G] {
   var ref: Option[ResultTarget[G]] = None
 }
 
-final case class Result[G](applicable: Ref[G, ContractApplicable[G]])(implicit val o: Origin) extends Expr[G] with ResultImpl[G]
-final case class CurrentThreadId[G]()(implicit val o: Origin) extends Expr[G] with CurrentThreadIdImpl[G]
-final case class LocalThreadId[G]()(implicit val o: Origin) extends Expr[G] with LocalThreadIdImpl[G]
-final case class GlobalThreadId[G]()(implicit val o: Origin) extends Expr[G] with GlobalThreadIdImpl[G]
-final case class Any[G]()(val blame: Blame[AnyStarError])(implicit val o: Origin) extends Expr[G] with AnyImpl[G]
-final case class ReadPerm[G]()(implicit val o: Origin) extends Expr[G] with ReadPermImpl[G]
-final case class Values[G](arr: Expr[G], from: Expr[G], to: Expr[G])(val blame: Blame[ArrayValuesError])(implicit val o: Origin) extends Expr[G] with ValuesImpl[G]
+final case class Result[G](applicable: Ref[G, ContractApplicable[G]])(
+    implicit val o: Origin
+) extends Expr[G] with ResultImpl[G]
+final case class CurrentThreadId[G]()(implicit val o: Origin)
+    extends Expr[G] with CurrentThreadIdImpl[G]
+final case class LocalThreadId[G]()(implicit val o: Origin)
+    extends Expr[G] with LocalThreadIdImpl[G]
+final case class GlobalThreadId[G]()(implicit val o: Origin)
+    extends Expr[G] with GlobalThreadIdImpl[G]
+final case class Any[G]()(val blame: Blame[AnyStarError])(
+    implicit val o: Origin
+) extends Expr[G] with AnyImpl[G]
+final case class ReadPerm[G]()(implicit val o: Origin)
+    extends Expr[G] with ReadPermImpl[G]
+final case class Values[G](arr: Expr[G], from: Expr[G], to: Expr[G])(
+    val blame: Blame[ArrayValuesError]
+)(implicit val o: Origin)
+    extends Expr[G] with ValuesImpl[G]
 sealed trait MapCmp[G] extends Expr[G] with MapCmpImpl[G]
-final case class MapEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends MapCmp[G] with MapEqImpl[G]
-final case class MapDisjoint[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends MapCmp[G] with MapDisjointImpl[G]
+final case class MapEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends MapCmp[G] with MapEqImpl[G]
+final case class MapDisjoint[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends MapCmp[G] with MapDisjointImpl[G]
 sealed trait MapOp[G] extends Expr[G] with MapOpImpl[G]
-final case class MapKeySet[G](map: Expr[G])(implicit val o: Origin) extends MapOp[G] with MapKeySetImpl[G]
-final case class MapValueSet[G](map: Expr[G])(implicit val o: Origin) extends MapOp[G] with MapValueSetImpl[G]
-final case class MapItemSet[G](map: Expr[G])(implicit val o: Origin) extends MapOp[G] with MapItemSetImpl[G]
-final case class MapRemove[G](map: Expr[G], k: Expr[G])(implicit val o: Origin) extends Expr[G] with MapRemoveImpl[G]
+final case class MapKeySet[G](map: Expr[G])(implicit val o: Origin)
+    extends MapOp[G] with MapKeySetImpl[G]
+final case class MapValueSet[G](map: Expr[G])(implicit val o: Origin)
+    extends MapOp[G] with MapValueSetImpl[G]
+final case class MapItemSet[G](map: Expr[G])(implicit val o: Origin)
+    extends MapOp[G] with MapItemSetImpl[G]
+final case class MapRemove[G](map: Expr[G], k: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with MapRemoveImpl[G]
 
 sealed trait Binder[G] extends Expr[G] with BinderImpl[G]
-@scopes[Variable] final case class Forall[G](bindings: Seq[Variable[G]], triggers: Seq[Seq[Expr[G]]], body: Expr[G])(implicit val o: Origin) extends Binder[G] with ForallImpl[G]
-@scopes[Variable] final case class Starall[G](bindings: Seq[Variable[G]], triggers: Seq[Seq[Expr[G]]], body: Expr[G])(val blame: Blame[ReceiverNotInjective])(implicit val o: Origin) extends Binder[G] with StarallImpl[G]
-@scopes[Variable] final case class Exists[G](bindings: Seq[Variable[G]], triggers: Seq[Seq[Expr[G]]], body: Expr[G])(implicit val o: Origin) extends Binder[G] with ExistsImpl[G]
-@scopes[Variable] final case class Sum[G](bindings: Seq[Variable[G]], condition: Expr[G], main: Expr[G])(implicit val o: Origin) extends Binder[G] with SumImpl[G]
-@scopes[Variable] final case class Product[G](bindings: Seq[Variable[G]], condition: Expr[G], main: Expr[G])(implicit val o: Origin) extends Binder[G] with ProductImpl[G]
-@scopes[Variable] final case class ForPerm[G](bindings: Seq[Variable[G]], loc: Location[G], body: Expr[G])(implicit val o: Origin) extends Binder[G] with ForPermImpl[G]
-@scopes[Variable] final case class ForPermWithValue[G](binding: Variable[G], body: Expr[G])(implicit val o: Origin) extends Binder[G] with ForPermWithValueImpl[G]
-@scopes[Variable] final case class Let[G](binding: Variable[G], value: Expr[G], main: Expr[G])(implicit val o: Origin) extends Binder[G] with LetImpl[G]
-final case class InlinePattern[G](inner: Expr[G], parent: Int = 0, group: Int = 0)(implicit val o: Origin) extends Expr[G] with InlinePatternImpl[G]
-
-@scopes[Variable] final case class ScopedExpr[G](declarations: Seq[Variable[G]], body: Expr[G])(implicit val o: Origin) extends Declarator[G] with Expr[G] with ScopedExprImpl[G]
-
-final case class Local[G](ref: Ref[G, Variable[G]])(implicit val o: Origin) extends Expr[G] with LocalImpl[G]
-final case class EnumUse[G](enum: Ref[G, Enum[G]], const: Ref[G, EnumConstant[G]])(implicit val o: Origin) extends Expr[G] with EnumUseImpl[G]
+@scopes[Variable]
+final case class Forall[G](
+    bindings: Seq[Variable[G]],
+    triggers: Seq[Seq[Expr[G]]],
+    body: Expr[G],
+)(implicit val o: Origin)
+    extends Binder[G] with ForallImpl[G]
+@scopes[Variable]
+final case class Starall[G](
+    bindings: Seq[Variable[G]],
+    triggers: Seq[Seq[Expr[G]]],
+    body: Expr[G],
+)(val blame: Blame[ReceiverNotInjective])(implicit val o: Origin)
+    extends Binder[G] with StarallImpl[G]
+@scopes[Variable]
+final case class Exists[G](
+    bindings: Seq[Variable[G]],
+    triggers: Seq[Seq[Expr[G]]],
+    body: Expr[G],
+)(implicit val o: Origin)
+    extends Binder[G] with ExistsImpl[G]
+@scopes[Variable]
+final case class Sum[G](
+    bindings: Seq[Variable[G]],
+    condition: Expr[G],
+    main: Expr[G],
+)(implicit val o: Origin)
+    extends Binder[G] with SumImpl[G]
+@scopes[Variable]
+final case class Product[G](
+    bindings: Seq[Variable[G]],
+    condition: Expr[G],
+    main: Expr[G],
+)(implicit val o: Origin)
+    extends Binder[G] with ProductImpl[G]
+@scopes[Variable]
+final case class ForPerm[G](
+    bindings: Seq[Variable[G]],
+    loc: Location[G],
+    body: Expr[G],
+)(implicit val o: Origin)
+    extends Binder[G] with ForPermImpl[G]
+@scopes[Variable]
+final case class ForPermWithValue[G](binding: Variable[G], body: Expr[G])(
+    implicit val o: Origin
+) extends Binder[G] with ForPermWithValueImpl[G]
+@scopes[Variable]
+final case class Let[G](binding: Variable[G], value: Expr[G], main: Expr[G])(
+    implicit val o: Origin
+) extends Binder[G] with LetImpl[G]
+final case class InlinePattern[G](
+    inner: Expr[G],
+    parent: Int = 0,
+    group: Int = 0,
+)(implicit val o: Origin)
+    extends Expr[G] with InlinePatternImpl[G]
+
+@scopes[Variable]
+final case class ScopedExpr[G](declarations: Seq[Variable[G]], body: Expr[G])(
+    implicit val o: Origin
+) extends Declarator[G] with Expr[G] with ScopedExprImpl[G]
+
+final case class Local[G](ref: Ref[G, Variable[G]])(implicit val o: Origin)
+    extends Expr[G] with LocalImpl[G]
+final case class EnumUse[G](
+    enum: Ref[G, Enum[G]],
+    const: Ref[G, EnumConstant[G]],
+)(implicit val o: Origin)
+    extends Expr[G] with EnumUseImpl[G]
 sealed trait HeapDeref[G] extends Expr[G] with HeapDerefImpl[G]
-final case class DerefHeapVariable[G](ref: Ref[G, HeapVariable[G]])(val blame: Blame[InsufficientPermission])(implicit val o: Origin) extends Expr[G] with HeapDeref[G] with DerefHeapVariableImpl[G]
-final case class Deref[G](obj: Expr[G], ref: Ref[G, InstanceField[G]])(val blame: Blame[InsufficientPermission])(implicit val o: Origin) extends Expr[G] with HeapDeref[G] with DerefImpl[G]
-final case class ModelDeref[G](obj: Expr[G], ref: Ref[G, ModelField[G]])(val blame: Blame[ModelInsufficientPermission])(implicit val o: Origin) extends Expr[G] with ModelDerefImpl[G]
-final case class DerefPointer[G](pointer: Expr[G])(val blame: Blame[PointerDerefError])(implicit val o: Origin) extends Expr[G] with DerefPointerImpl[G]
-final case class PointerAdd[G](pointer: Expr[G], offset: Expr[G])(val blame: Blame[PointerAddError])(implicit val o: Origin) extends Expr[G] with PointerAddImpl[G]
-final case class AddrOf[G](e: Expr[G])(implicit val o: Origin) extends Expr[G] with AddrOfImpl[G]
-final case class FunctionOf[G](binding: Ref[G, Variable[G]], vars: Seq[Ref[G, Variable[G]]])(implicit val o: Origin) extends Expr[G] with FunctionOfImpl[G]
-final case class ApplyCoercion[G](e: Expr[G], coercion: Coercion[G])(implicit val o: Origin) extends Expr[G] with ApplyCoercionImpl[G]
-final case class SizeOf[G](tname: Type[G])(implicit val o: Origin) extends Expr[G] with SizeOfImpl[G]
+final case class DerefHeapVariable[G](ref: Ref[G, HeapVariable[G]])(
+    val blame: Blame[InsufficientPermission]
+)(implicit val o: Origin)
+    extends Expr[G] with HeapDeref[G] with DerefHeapVariableImpl[G]
+final case class Deref[G](obj: Expr[G], ref: Ref[G, InstanceField[G]])(
+    val blame: Blame[InsufficientPermission]
+)(implicit val o: Origin)
+    extends Expr[G] with HeapDeref[G] with DerefImpl[G]
+final case class ModelDeref[G](obj: Expr[G], ref: Ref[G, ModelField[G]])(
+    val blame: Blame[ModelInsufficientPermission]
+)(implicit val o: Origin)
+    extends Expr[G] with ModelDerefImpl[G]
+final case class DerefPointer[G](pointer: Expr[G])(
+    val blame: Blame[PointerDerefError]
+)(implicit val o: Origin)
+    extends Expr[G] with DerefPointerImpl[G]
+final case class PointerAdd[G](pointer: Expr[G], offset: Expr[G])(
+    val blame: Blame[PointerAddError]
+)(implicit val o: Origin)
+    extends Expr[G] with PointerAddImpl[G]
+final case class AddrOf[G](e: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with AddrOfImpl[G]
+final case class FunctionOf[G](
+    binding: Ref[G, Variable[G]],
+    vars: Seq[Ref[G, Variable[G]]],
+)(implicit val o: Origin)
+    extends Expr[G] with FunctionOfImpl[G]
+final case class ApplyCoercion[G](e: Expr[G], coercion: Coercion[G])(
+    implicit val o: Origin
+) extends Expr[G] with ApplyCoercionImpl[G]
+final case class SizeOf[G](tname: Type[G])(implicit val o: Origin)
+    extends Expr[G] with SizeOfImpl[G]
 
 sealed trait Apply[G] extends Expr[G] with ApplyImpl[G]
-final case class ADTFunctionInvocation[G](typeArgs: Option[(Ref[G, AxiomaticDataType[G]], Seq[Type[G]])], ref: Ref[G, ADTFunction[G]], args: Seq[Expr[G]])(implicit val o: Origin) extends Apply[G] with ADTFunctionInvocationImpl[G]
-final case class ProverFunctionInvocation[G](ref: Ref[G, ProverFunction[G]], args: Seq[Expr[G]])(implicit val o: Origin) extends Apply[G] with ProverFunctionInvocationImpl[G]
+final case class ADTFunctionInvocation[G](
+    typeArgs: Option[(Ref[G, AxiomaticDataType[G]], Seq[Type[G]])],
+    ref: Ref[G, ADTFunction[G]],
+    args: Seq[Expr[G]],
+)(implicit val o: Origin)
+    extends Apply[G] with ADTFunctionInvocationImpl[G]
+final case class ProverFunctionInvocation[G](
+    ref: Ref[G, ProverFunction[G]],
+    args: Seq[Expr[G]],
+)(implicit val o: Origin)
+    extends Apply[G] with ProverFunctionInvocationImpl[G]
 
 sealed trait ApplyInlineable[G] extends Apply[G] with ApplyInlineableImpl[G]
 sealed trait InstanceApply[G] extends Node[G] with InstanceApplyImpl[G]
 
-sealed trait ApplyAnyPredicate[G] extends ApplyInlineable[G] with ApplyAnyPredicateImpl[G]
-final case class PredicateApply[G](ref: Ref[G, Predicate[G]], args: Seq[Expr[G]], perm: Expr[G])(implicit val o: Origin) extends ApplyAnyPredicate[G] with PredicateApplyImpl[G]
-final case class InstancePredicateApply[G](obj: Expr[G], ref: Ref[G, InstancePredicate[G]], args: Seq[Expr[G]], perm: Expr[G])(implicit val o: Origin) extends ApplyAnyPredicate[G] with InstanceApply[G] with InstancePredicateApplyImpl[G]
-final case class CoalesceInstancePredicateApply[G](obj: Expr[G], ref: Ref[G, InstancePredicate[G]], args: Seq[Expr[G]], perm: Expr[G])(implicit val o: Origin) extends ApplyAnyPredicate[G] with InstanceApply[G] with CoalesceInstancePredicateApplyImpl[G]
+sealed trait ApplyAnyPredicate[G]
+    extends ApplyInlineable[G] with ApplyAnyPredicateImpl[G]
+final case class PredicateApply[G](
+    ref: Ref[G, Predicate[G]],
+    args: Seq[Expr[G]],
+    perm: Expr[G],
+)(implicit val o: Origin)
+    extends ApplyAnyPredicate[G] with PredicateApplyImpl[G]
+final case class InstancePredicateApply[G](
+    obj: Expr[G],
+    ref: Ref[G, InstancePredicate[G]],
+    args: Seq[Expr[G]],
+    perm: Expr[G],
+)(implicit val o: Origin)
+    extends ApplyAnyPredicate[G]
+    with InstanceApply[G]
+    with InstancePredicateApplyImpl[G]
+final case class CoalesceInstancePredicateApply[G](
+    obj: Expr[G],
+    ref: Ref[G, InstancePredicate[G]],
+    args: Seq[Expr[G]],
+    perm: Expr[G],
+)(implicit val o: Origin)
+    extends ApplyAnyPredicate[G]
+    with InstanceApply[G]
+    with CoalesceInstancePredicateApplyImpl[G]
 
 sealed trait InvokingNode[G] extends Node[G] with InvokingNodeImpl[G]
-sealed trait Invocation[G] extends ApplyInlineable[G] with InvokingNode[G] with InvocationImpl[G]
-
-sealed trait AnyMethodInvocation[G] extends Invocation[G] with AnyMethodInvocationImpl[G]
-final case class ProcedureInvocation[G](ref: Ref[G, Procedure[G]], args: Seq[Expr[G]], outArgs: Seq[Expr[G]], typeArgs: Seq[Type[G]], givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[InvocationFailure])(implicit val o: Origin) extends AnyMethodInvocation[G] with ProcedureInvocationImpl[G]
-final case class MethodInvocation[G](obj: Expr[G], ref: Ref[G, InstanceMethod[G]], args: Seq[Expr[G]], outArgs: Seq[Expr[G]], typeArgs: Seq[Type[G]], givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[InstanceInvocationFailure])(implicit val o: Origin) extends AnyMethodInvocation[G] with InstanceApply[G] with MethodInvocationImpl[G]
-final case class ConstructorInvocation[G](ref: Ref[G, Constructor[G]], classTypeArgs: Seq[Type[G]], args: Seq[Expr[G]], outArgs: Seq[Expr[G]], typeArgs: Seq[Type[G]], givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[InvocationFailure])(implicit val o: Origin) extends AnyMethodInvocation[G] with ConstructorInvocationImpl[G]
-
-sealed trait AnyFunctionInvocation[G] extends Invocation[G] with AnyFunctionInvocationImpl[G]
-final case class FunctionInvocation[G](ref: Ref[G, Function[G]], args: Seq[Expr[G]], typeArgs: Seq[Type[G]], givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[InvocationFailure])(implicit val o: Origin) extends AnyFunctionInvocation[G] with FunctionInvocationImpl[G]
-final case class InstanceFunctionInvocation[G](obj: Expr[G], ref: Ref[G, InstanceFunction[G]], args: Seq[Expr[G]], typeArgs: Seq[Type[G]], givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[InstanceInvocationFailure])(implicit val o: Origin) extends AnyFunctionInvocation[G] with InstanceApply[G] with InstanceFunctionInvocationImpl[G]
+sealed trait Invocation[G]
+    extends ApplyInlineable[G] with InvokingNode[G] with InvocationImpl[G]
+
+sealed trait AnyMethodInvocation[G]
+    extends Invocation[G] with AnyMethodInvocationImpl[G]
+final case class ProcedureInvocation[G](
+    ref: Ref[G, Procedure[G]],
+    args: Seq[Expr[G]],
+    outArgs: Seq[Expr[G]],
+    typeArgs: Seq[Type[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InvocationFailure])(implicit val o: Origin)
+    extends AnyMethodInvocation[G] with ProcedureInvocationImpl[G]
+final case class MethodInvocation[G](
+    obj: Expr[G],
+    ref: Ref[G, InstanceMethod[G]],
+    args: Seq[Expr[G]],
+    outArgs: Seq[Expr[G]],
+    typeArgs: Seq[Type[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InstanceInvocationFailure])(implicit val o: Origin)
+    extends AnyMethodInvocation[G]
+    with InstanceApply[G]
+    with MethodInvocationImpl[G]
+final case class ConstructorInvocation[G](
+    ref: Ref[G, Constructor[G]],
+    classTypeArgs: Seq[Type[G]],
+    args: Seq[Expr[G]],
+    outArgs: Seq[Expr[G]],
+    typeArgs: Seq[Type[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InvocationFailure])(implicit val o: Origin)
+    extends AnyMethodInvocation[G] with ConstructorInvocationImpl[G]
+
+sealed trait AnyFunctionInvocation[G]
+    extends Invocation[G] with AnyFunctionInvocationImpl[G]
+final case class FunctionInvocation[G](
+    ref: Ref[G, Function[G]],
+    args: Seq[Expr[G]],
+    typeArgs: Seq[Type[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InvocationFailure])(implicit val o: Origin)
+    extends AnyFunctionInvocation[G] with FunctionInvocationImpl[G]
+final case class InstanceFunctionInvocation[G](
+    obj: Expr[G],
+    ref: Ref[G, InstanceFunction[G]],
+    args: Seq[Expr[G]],
+    typeArgs: Seq[Type[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InstanceInvocationFailure])(implicit val o: Origin)
+    extends AnyFunctionInvocation[G]
+    with InstanceApply[G]
+    with InstanceFunctionInvocationImpl[G]
 
 sealed trait UnExpr[G] extends Expr[G] with UnExprImpl[G]
 
-final case class UMinus[G](arg: Expr[G])(implicit val o: Origin) extends UnExpr[G] with UMinusImpl[G]
-final case class BitNot[G](arg: Expr[G])(implicit val o: Origin) extends UnExpr[G] with BitNotImpl[G]
-final case class Not[G](arg: Expr[G])(implicit val o: Origin) extends UnExpr[G] with NotImpl[G]
+final case class UMinus[G](arg: Expr[G])(implicit val o: Origin)
+    extends UnExpr[G] with UMinusImpl[G]
+final case class BitNot[G](arg: Expr[G])(implicit val o: Origin)
+    extends UnExpr[G] with BitNotImpl[G]
+final case class Not[G](arg: Expr[G])(implicit val o: Origin)
+    extends UnExpr[G] with NotImpl[G]
 
 sealed trait BinExpr[G] extends Expr[G] with BinExprImpl[G]
 sealed trait NumericBinExpr[G] extends BinExpr[G] with NumericBinExprImpl[G]
 
 sealed trait DividingExpr[G] extends Expr[G] with DividingExprImpl[G]
 
-final case class AmbiguousMult[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with AmbiguousMultImpl[G]
-final case class AmbiguousPlus[G](left: Expr[G], right: Expr[G])(val blame: Blame[FrontendAdditiveError])(implicit val o: Origin) extends BinExpr[G] with AmbiguousPlusImpl[G]
-final case class AmbiguousMinus[G](left: Expr[G], right: Expr[G])(val blame: Blame[FrontendAdditiveError])(implicit val o: Origin) extends BinExpr[G] with AmbiguousMinusImpl[G]
-final case class AmbiguousOr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with AmbiguousOrImpl[G]
-
-sealed trait AmbiguousDividingExpr[G] extends DividingExpr[G] with BinExpr[G] with AmbiguousDividingExprImpl[G]
-final case class AmbiguousDiv[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends BinExpr[G] with AmbiguousDividingExpr[G] with AmbiguousDivImpl[G]
-final case class AmbiguousMod[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends BinExpr[G] with AmbiguousDividingExpr[G] with AmbiguousModImpl[G]
-final case class AmbiguousTruncDiv[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends BinExpr[G] with AmbiguousDividingExpr[G] with AmbiguousTruncDivImpl[G]
-final case class AmbiguousTruncMod[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends BinExpr[G] with AmbiguousDividingExpr[G] with AmbiguousTruncModImpl[G]
+final case class AmbiguousMult[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with AmbiguousMultImpl[G]
+final case class AmbiguousPlus[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[FrontendAdditiveError]
+)(implicit val o: Origin)
+    extends BinExpr[G] with AmbiguousPlusImpl[G]
+final case class AmbiguousMinus[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[FrontendAdditiveError]
+)(implicit val o: Origin)
+    extends BinExpr[G] with AmbiguousMinusImpl[G]
+final case class AmbiguousOr[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with AmbiguousOrImpl[G]
+
+sealed trait AmbiguousDividingExpr[G]
+    extends DividingExpr[G] with BinExpr[G] with AmbiguousDividingExprImpl[G]
+final case class AmbiguousDiv[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends BinExpr[G] with AmbiguousDividingExpr[G] with AmbiguousDivImpl[G]
+final case class AmbiguousMod[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends BinExpr[G] with AmbiguousDividingExpr[G] with AmbiguousModImpl[G]
+final case class AmbiguousTruncDiv[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends BinExpr[G]
+    with AmbiguousDividingExpr[G]
+    with AmbiguousTruncDivImpl[G]
+final case class AmbiguousTruncMod[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends BinExpr[G]
+    with AmbiguousDividingExpr[G]
+    with AmbiguousTruncModImpl[G]
 
 sealed trait BitOp[G] extends BinExpr[G] with BitOpImpl[G]
-final case class AmbiguousComputationalOr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BitOp[G] with AmbiguousComputationalOrImpl[G]
-final case class AmbiguousComputationalXor[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BitOp[G] with AmbiguousComputationalXorImpl[G]
-final case class AmbiguousComputationalAnd[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BitOp[G] with AmbiguousComputationalAndImpl[G]
-
-final case class ComputationalOr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with ComputationalOrImpl[G]
-final case class ComputationalXor[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with ComputationalXorImpl[G]
-final case class ComputationalAnd[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with ComputationalAndImpl[G]
-
-final case class Exp[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends NumericBinExpr[G] with ExpImpl[G]
-final case class Plus[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends NumericBinExpr[G] with PlusImpl[G]
-final case class Minus[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends NumericBinExpr[G] with MinusImpl[G]
-final case class Mult[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends NumericBinExpr[G] with MultImpl[G]
-final case class RatDiv[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends BinExpr[G] with DividingExpr[G] with RatDivImpl[G]
-final case class FloatDiv[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends BinExpr[G] with DividingExpr[G] with FloatDivImpl[G]
-final case class FloorDiv[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends BinExpr[G] with DividingExpr[G] with FloorDivImpl[G]
-final case class Mod[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends BinExpr[G] with DividingExpr[G] with ModImpl[G]
-final case class TruncDiv[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends BinExpr[G] with DividingExpr[G] with TruncDivImpl[G]
-final case class TruncMod[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends BinExpr[G] with DividingExpr[G] with TruncModImpl[G]
+final case class AmbiguousComputationalOr[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BitOp[G] with AmbiguousComputationalOrImpl[G]
+final case class AmbiguousComputationalXor[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BitOp[G] with AmbiguousComputationalXorImpl[G]
+final case class AmbiguousComputationalAnd[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BitOp[G] with AmbiguousComputationalAndImpl[G]
+
+final case class ComputationalOr[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with ComputationalOrImpl[G]
+final case class ComputationalXor[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with ComputationalXorImpl[G]
+final case class ComputationalAnd[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with ComputationalAndImpl[G]
+
+final case class Exp[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends NumericBinExpr[G] with ExpImpl[G]
+final case class Plus[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends NumericBinExpr[G] with PlusImpl[G]
+final case class Minus[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends NumericBinExpr[G] with MinusImpl[G]
+final case class Mult[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends NumericBinExpr[G] with MultImpl[G]
+final case class RatDiv[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends BinExpr[G] with DividingExpr[G] with RatDivImpl[G]
+final case class FloatDiv[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends BinExpr[G] with DividingExpr[G] with FloatDivImpl[G]
+final case class FloorDiv[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends BinExpr[G] with DividingExpr[G] with FloorDivImpl[G]
+final case class Mod[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends BinExpr[G] with DividingExpr[G] with ModImpl[G]
+final case class TruncDiv[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends BinExpr[G] with DividingExpr[G] with TruncDivImpl[G]
+final case class TruncMod[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends BinExpr[G] with DividingExpr[G] with TruncModImpl[G]
 
 sealed trait VectorBinExpr[G] extends BinExpr[G] with VectorBinExprImpl[G]
-final case class VectorPlus[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends VectorBinExpr[G] with VectorPlusImpl[G]
-final case class VectorMinus[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends VectorBinExpr[G] with VectorMinusImpl[G]
-final case class VectorMult[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends VectorBinExpr[G] with VectorMultImpl[G]
-final case class VectorEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends VectorBinExpr[G] with VectorEqImpl[G]
-final case class VectorNeq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends VectorBinExpr[G] with VectorNeqImpl[G]
-
-sealed trait DividingVectorBinExpr[G] extends VectorBinExpr[G] with DividingExpr[G]
-final case class VectorFloorDiv[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends DividingVectorBinExpr[G] with VectorFloorDivImpl[G]
-final case class VectorFloatDiv[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends DividingVectorBinExpr[G] with VectorFloatDivImpl[G]
-final case class VectorTruncDiv[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends DividingVectorBinExpr[G] with VectorTruncDivImpl[G]
-final case class VectorMod[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends DividingVectorBinExpr[G] with VectorModImpl[G]
-final case class VectorTruncMod[G](left: Expr[G], right: Expr[G])(val blame: Blame[DivByZero])(implicit val o: Origin) extends DividingVectorBinExpr[G] with VectorTruncModImpl[G]
-
-final case class StringConcat[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with StringConcatImpl[G]
-
-final case class BitAnd[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with BitAndImpl[G]
-final case class BitOr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with BitOrImpl[G]
-final case class BitXor[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with BitXorImpl[G]
-final case class BitShl[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with BitShlImpl[G]
-final case class BitShr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with BitShrImpl[G]
-final case class BitUShr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with BitUShrImpl[G]
-
-final case class And[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with AndImpl[G]
-final case class Or[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with OrImpl[G]
-final case class Implies[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with ImpliesImpl[G]
-final case class Star[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends Expr[G] with StarImpl[G]
-final case class Wand[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends Expr[G] with WandImpl[G]
-final case class Scale[G](scale: Expr[G], res: Expr[G])(val blame: Blame[ScaleNegative])(implicit val o: Origin) extends Expr[G] with ScaleImpl[G]
-final case class ScaleByParBlock[G](block: Ref[G, ParBlockDecl[G]], res: Expr[G])(implicit val o: Origin) extends Expr[G] with ScaleByParBlockImpl[G]
-final case class PolarityDependent[G](onInhale: Expr[G], onExhale: Expr[G])(implicit val o: Origin) extends Expr[G] with PolarityDependentImpl[G]
-
-final case class Unfolding[G](res: Expr[G], body: Expr[G])(val blame: Blame[UnfoldFailed])(implicit val o: Origin) extends Expr[G] with UnfoldingImpl[G]
-
-@family sealed trait Location[G] extends NodeFamily[G] with LocationImpl[G]
-final case class HeapVariableLocation[G](ref: Ref[G, HeapVariable[G]])(implicit val o: Origin) extends Location[G] with HeapVariableLocationImpl[G]
-final case class FieldLocation[G](obj: Expr[G], field: Ref[G, InstanceField[G]])(implicit val o: Origin) extends Location[G] with FieldLocationImpl[G]
-final case class ModelLocation[G](obj: Expr[G], field: Ref[G, ModelField[G]])(implicit val o: Origin) extends Location[G] with ModelLocationImpl[G]
-final case class SilverFieldLocation[G](obj: Expr[G], field: Ref[G, SilverField[G]])(implicit val o: Origin) extends Location[G] with SilverFieldLocationImpl[G]
-final case class ArrayLocation[G](array: Expr[G], subscript: Expr[G])(val blame: Blame[ArrayLocationError])(implicit val o: Origin) extends Location[G] with ArrayLocationImpl[G]
-final case class PointerLocation[G](pointer: Expr[G])(val blame: Blame[PointerLocationError])(implicit val o: Origin) extends Location[G] with PointerLocationImpl[G]
-final case class PredicateLocation[G](predicate: Ref[G, Predicate[G]], args: Seq[Expr[G]])(implicit val o: Origin) extends Location[G] with PredicateLocationImpl[G]
-final case class InstancePredicateLocation[G](predicate: Ref[G, InstancePredicate[G]], obj: Expr[G], args: Seq[Expr[G]])(implicit val o: Origin) extends Location[G] with InstancePredicateLocationImpl[G]
-final case class AmbiguousLocation[G](expr: Expr[G])(val blame: Blame[PointerLocationError])(implicit val o: Origin) extends Location[G] with AmbiguousLocationImpl[G]
-final case class InLinePatternLocation[G](loc: Location[G], pattern: Expr[G])(implicit val o: Origin) extends Location[G] with InLinePatternLocationImpl[G]
-
-final case class Perm[G](loc: Location[G], perm: Expr[G])(implicit val o: Origin) extends Expr[G] with PermImpl[G]
-final case class PointsTo[G](loc: Location[G], perm: Expr[G], value: Expr[G])(implicit val o: Origin) extends Expr[G] with PointsToImpl[G]
-final case class CurPerm[G](loc: Location[G])(implicit val o: Origin) extends Expr[G] with CurPermImpl[G]
-
-final case class Value[G](loc: Location[G])(implicit val o: Origin) extends Expr[G] with ValueImpl[G]
-final case class AutoValue[G](loc: Location[G])(implicit val o: Origin) extends Expr[G] with AutoValueImpl[G]
-
-final case class ValidArray[G](arr: Expr[G], len: Expr[G])(implicit val o: Origin) extends Expr[G] with ValidArrayImpl[G]
-final case class ValidMatrix[G](mat: Expr[G], w: Expr[G], h: Expr[G])(implicit val o: Origin) extends Expr[G] with ValidMatrixImpl[G]
-
-final case class PermPointer[G](p: Expr[G], len: Expr[G], perm: Expr[G])(implicit val o: Origin) extends Expr[G] with PermPointerImpl[G]
-final case class PermPointerIndex[G](p: Expr[G], idx: Expr[G], perm: Expr[G])(implicit val o: Origin) extends Expr[G] with PermPointerIndexImpl[G]
-
-final case class ResourceOfResourceValue[G](res: Expr[G])(implicit val o: Origin) extends Expr[G] with ResourceOfResourceValueImpl[G]
-final case class ResourceValue[G](res: Expr[G])(implicit val o: Origin) extends Expr[G] with ResourceValueImpl[G]
+final case class VectorPlus[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends VectorBinExpr[G] with VectorPlusImpl[G]
+final case class VectorMinus[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends VectorBinExpr[G] with VectorMinusImpl[G]
+final case class VectorMult[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends VectorBinExpr[G] with VectorMultImpl[G]
+final case class VectorEq[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends VectorBinExpr[G] with VectorEqImpl[G]
+final case class VectorNeq[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends VectorBinExpr[G] with VectorNeqImpl[G]
+
+sealed trait DividingVectorBinExpr[G]
+    extends VectorBinExpr[G] with DividingExpr[G]
+final case class VectorFloorDiv[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends DividingVectorBinExpr[G] with VectorFloorDivImpl[G]
+final case class VectorFloatDiv[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends DividingVectorBinExpr[G] with VectorFloatDivImpl[G]
+final case class VectorTruncDiv[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends DividingVectorBinExpr[G] with VectorTruncDivImpl[G]
+final case class VectorMod[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends DividingVectorBinExpr[G] with VectorModImpl[G]
+final case class VectorTruncMod[G](left: Expr[G], right: Expr[G])(
+    val blame: Blame[DivByZero]
+)(implicit val o: Origin)
+    extends DividingVectorBinExpr[G] with VectorTruncModImpl[G]
+
+final case class StringConcat[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with StringConcatImpl[G]
+
+final case class BitAnd[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with BitAndImpl[G]
+final case class BitOr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends BinExpr[G] with BitOrImpl[G]
+final case class BitXor[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with BitXorImpl[G]
+final case class BitShl[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with BitShlImpl[G]
+final case class BitShr[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with BitShrImpl[G]
+final case class BitUShr[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with BitUShrImpl[G]
+
+final case class And[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends BinExpr[G] with AndImpl[G]
+final case class Or[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends BinExpr[G] with OrImpl[G]
+final case class Implies[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with ImpliesImpl[G]
+final case class Star[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with StarImpl[G]
+final case class Wand[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with WandImpl[G]
+final case class Scale[G](scale: Expr[G], res: Expr[G])(
+    val blame: Blame[ScaleNegative]
+)(implicit val o: Origin)
+    extends Expr[G] with ScaleImpl[G]
+final case class ScaleByParBlock[G](
+    block: Ref[G, ParBlockDecl[G]],
+    res: Expr[G],
+)(implicit val o: Origin)
+    extends Expr[G] with ScaleByParBlockImpl[G]
+final case class PolarityDependent[G](onInhale: Expr[G], onExhale: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with PolarityDependentImpl[G]
+
+final case class Unfolding[G](res: Expr[G], body: Expr[G])(
+    val blame: Blame[UnfoldFailed]
+)(implicit val o: Origin)
+    extends Expr[G] with UnfoldingImpl[G]
 
-sealed trait Comparison[G] extends BinExpr[G] with ComparisonImpl[G]
-sealed trait AmbiguousComparison[G] extends Comparison[G] with AmbiguousComparisonImpl[G]
-final case class AmbiguousEq[G](left: Expr[G], right: Expr[G], vectorInnerType: Type[G])(implicit val o: Origin) extends AmbiguousComparison[G] with AmbiguousEqImpl[G]
-final case class AmbiguousNeq[G](left: Expr[G], right: Expr[G], vectorInnerType: Type[G])(implicit val o: Origin) extends AmbiguousComparison[G] with AmbiguousNeqImpl[G]
+@family
+sealed trait Location[G] extends NodeFamily[G] with LocationImpl[G]
+final case class HeapVariableLocation[G](ref: Ref[G, HeapVariable[G]])(
+    implicit val o: Origin
+) extends Location[G] with HeapVariableLocationImpl[G]
+final case class FieldLocation[G](
+    obj: Expr[G],
+    field: Ref[G, InstanceField[G]],
+)(implicit val o: Origin)
+    extends Location[G] with FieldLocationImpl[G]
+final case class ModelLocation[G](obj: Expr[G], field: Ref[G, ModelField[G]])(
+    implicit val o: Origin
+) extends Location[G] with ModelLocationImpl[G]
+final case class SilverFieldLocation[G](
+    obj: Expr[G],
+    field: Ref[G, SilverField[G]],
+)(implicit val o: Origin)
+    extends Location[G] with SilverFieldLocationImpl[G]
+final case class ArrayLocation[G](array: Expr[G], subscript: Expr[G])(
+    val blame: Blame[ArrayLocationError]
+)(implicit val o: Origin)
+    extends Location[G] with ArrayLocationImpl[G]
+final case class PointerLocation[G](pointer: Expr[G])(
+    val blame: Blame[PointerLocationError]
+)(implicit val o: Origin)
+    extends Location[G] with PointerLocationImpl[G]
+final case class PredicateLocation[G](
+    predicate: Ref[G, Predicate[G]],
+    args: Seq[Expr[G]],
+)(implicit val o: Origin)
+    extends Location[G] with PredicateLocationImpl[G]
+final case class InstancePredicateLocation[G](
+    predicate: Ref[G, InstancePredicate[G]],
+    obj: Expr[G],
+    args: Seq[Expr[G]],
+)(implicit val o: Origin)
+    extends Location[G] with InstancePredicateLocationImpl[G]
+final case class AmbiguousLocation[G](expr: Expr[G])(
+    val blame: Blame[PointerLocationError]
+)(implicit val o: Origin)
+    extends Location[G] with AmbiguousLocationImpl[G]
+final case class InLinePatternLocation[G](loc: Location[G], pattern: Expr[G])(
+    implicit val o: Origin
+) extends Location[G] with InLinePatternLocationImpl[G]
+
+final case class Perm[G](loc: Location[G], perm: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with PermImpl[G]
+final case class PointsTo[G](loc: Location[G], perm: Expr[G], value: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with PointsToImpl[G]
+final case class CurPerm[G](loc: Location[G])(implicit val o: Origin)
+    extends Expr[G] with CurPermImpl[G]
+
+final case class Value[G](loc: Location[G])(implicit val o: Origin)
+    extends Expr[G] with ValueImpl[G]
+final case class AutoValue[G](loc: Location[G])(implicit val o: Origin)
+    extends Expr[G] with AutoValueImpl[G]
+
+final case class ValidArray[G](arr: Expr[G], len: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ValidArrayImpl[G]
+final case class ValidMatrix[G](mat: Expr[G], w: Expr[G], h: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ValidMatrixImpl[G]
+
+final case class PermPointer[G](p: Expr[G], len: Expr[G], perm: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with PermPointerImpl[G]
+final case class PermPointerIndex[G](p: Expr[G], idx: Expr[G], perm: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with PermPointerIndexImpl[G]
+
+final case class ResourceOfResourceValue[G](res: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ResourceOfResourceValueImpl[G]
+final case class ResourceValue[G](res: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with ResourceValueImpl[G]
 
-final case class Eq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends Comparison[G] with EqImpl[G]
-final case class Neq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends Comparison[G] with NeqImpl[G]
+sealed trait Comparison[G] extends BinExpr[G] with ComparisonImpl[G]
+sealed trait AmbiguousComparison[G]
+    extends Comparison[G] with AmbiguousComparisonImpl[G]
+final case class AmbiguousEq[G](
+    left: Expr[G],
+    right: Expr[G],
+    vectorInnerType: Type[G],
+)(implicit val o: Origin)
+    extends AmbiguousComparison[G] with AmbiguousEqImpl[G]
+final case class AmbiguousNeq[G](
+    left: Expr[G],
+    right: Expr[G],
+    vectorInnerType: Type[G],
+)(implicit val o: Origin)
+    extends AmbiguousComparison[G] with AmbiguousNeqImpl[G]
+
+final case class Eq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends Comparison[G] with EqImpl[G]
+final case class Neq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends Comparison[G] with NeqImpl[G]
 
 sealed trait OrderOp[G] extends Comparison[G] with OrderOpImpl[G]
 sealed trait AmbiguousOrderOp[G] extends OrderOp[G] with AmbiguousOrderOpImpl[G]
-final case class AmbiguousGreater[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends AmbiguousOrderOp[G] with AmbiguousGreaterImpl[G]
-final case class AmbiguousLess[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends AmbiguousOrderOp[G] with AmbiguousLessImpl[G]
-final case class AmbiguousGreaterEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends AmbiguousOrderOp[G] with AmbiguousGreaterEqImpl[G]
-final case class AmbiguousLessEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends AmbiguousOrderOp[G] with AmbiguousLessEqImpl[G]
-
-final case class Greater[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends OrderOp[G] with GreaterImpl[G]
-final case class Less[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends OrderOp[G] with LessImpl[G]
-final case class GreaterEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends OrderOp[G] with GreaterEqImpl[G]
-final case class LessEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends OrderOp[G] with LessEqImpl[G]
+final case class AmbiguousGreater[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends AmbiguousOrderOp[G] with AmbiguousGreaterImpl[G]
+final case class AmbiguousLess[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends AmbiguousOrderOp[G] with AmbiguousLessImpl[G]
+final case class AmbiguousGreaterEq[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends AmbiguousOrderOp[G] with AmbiguousGreaterEqImpl[G]
+final case class AmbiguousLessEq[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends AmbiguousOrderOp[G] with AmbiguousLessEqImpl[G]
+
+final case class Greater[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends OrderOp[G] with GreaterImpl[G]
+final case class Less[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends OrderOp[G] with LessImpl[G]
+final case class GreaterEq[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends OrderOp[G] with GreaterEqImpl[G]
+final case class LessEq[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends OrderOp[G] with LessEqImpl[G]
 
 sealed trait SetComparison[G] extends OrderOp[G] with SetComparisonImpl[G]
-final case class SubSet[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SetComparison[G] with SubSetImpl[G]
-final case class SubSetEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SetComparison[G] with SubSetEqImpl[G]
-final case class SubBag[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SetComparison[G] with SubBagImpl[G]
-final case class SubBagEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SetComparison[G] with SubBagEqImpl[G]
-
-final case class Select[G](condition: Expr[G], whenTrue: Expr[G], whenFalse: Expr[G])(implicit val o: Origin) extends Expr[G] with SelectImpl[G]
-final case class NewObject[G](cls: Ref[G, Class[G]])(implicit val o: Origin) extends Expr[G] with NewObjectImpl[G]
-final case class NewArray[G](element: Type[G], dims: Seq[Expr[G]], moreDims: Int, initialize: Boolean)(val blame: Blame[ArraySizeError])(implicit val o: Origin) extends Expr[G] with NewArrayImpl[G]
-final case class NewPointerArray[G](element: Type[G], size: Expr[G])(val blame: Blame[ArraySizeError])(implicit val o: Origin) extends Expr[G] with NewPointerArrayImpl[G]
-final case class FreePointer[G](pointer: Expr[G])(val blame: Blame[PointerFreeError])(implicit val o: Origin) extends Expr[G] with FreePointerImpl[G]
-final case class Old[G](expr: Expr[G], at: Option[Ref[G, LabelDecl[G]]])(val blame: Blame[LabelNotReached])(implicit val o: Origin) extends Expr[G] with OldImpl[G]
-final case class AmbiguousSubscript[G](collection: Expr[G], index: Expr[G])(val blame: Blame[FrontendSubscriptError])(implicit val o: Origin) extends Expr[G] with AmbiguousSubscriptImpl[G]
-final case class SeqSubscript[G](seq: Expr[G], index: Expr[G])(val blame: Blame[SeqBoundFailure])(implicit val o: Origin) extends Expr[G] with SeqSubscriptImpl[G]
-final case class VectorSubscript[G](seq: Expr[G], index: Expr[G])(val blame: Blame[VectorBoundFailure])(implicit val o: Origin) extends Expr[G] with VectorSubscriptImpl[G]
-final case class ArraySubscript[G](arr: Expr[G], index: Expr[G])(val blame: Blame[ArraySubscriptError])(implicit val o: Origin) extends Expr[G] with ArraySubscriptImpl[G]
-final case class PointerSubscript[G](pointer: Expr[G], index: Expr[G])(val blame: Blame[PointerSubscriptError])(implicit val o: Origin) extends Expr[G] with PointerSubscriptImpl[G]
-final case class Length[G](arr: Expr[G])(val blame: Blame[ArrayNull])(implicit val o: Origin) extends Expr[G] with LengthImpl[G]
-final case class Size[G](obj: Expr[G])(implicit val o: Origin) extends Expr[G] with SizeImpl[G]
-final case class PointerBlockLength[G](pointer: Expr[G])(val blame: Blame[PointerNull])(implicit val o: Origin) extends Expr[G] with PointerBlockLengthImpl[G]
-final case class PointerBlockOffset[G](pointer: Expr[G])(val blame: Blame[PointerNull])(implicit val o: Origin) extends Expr[G] with PointerBlockOffsetImpl[G]
-final case class PointerLength[G](pointer: Expr[G])(val blame: Blame[PointerNull])(implicit val o: Origin) extends Expr[G] with PointerLengthImpl[G]
-final case class SharedMemSize[G](pointer: Expr[G])(implicit val o: Origin) extends Expr[G] with SharedMemSizeImpl[G]
-final case class NdIndex[G](indices: Seq[Expr[G]], dimensions: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with NdIndexImpl[G]
-final case class NdPartialIndex[G](indices: Seq[Expr[G]], linearIndex: Expr[G], dimensions: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with NdPartialIndexImpl[G]
-final case class NdLength[G](dimensions: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with NdLengthImpl[G]
-
-final case class Cons[G](x: Expr[G], xs: Expr[G])(implicit val o: Origin) extends Expr[G] with ConsImpl[G]
-final case class Head[G](xs: Expr[G])(val blame: Blame[SeqBoundFailure])(implicit val o: Origin) extends Expr[G] with HeadImpl[G]
-final case class Tail[G](xs: Expr[G])(implicit val o: Origin) extends Expr[G] with TailImpl[G]
-final case class Drop[G](xs: Expr[G], count: Expr[G])(implicit val o: Origin) extends Expr[G] with DropImpl[G]
-final case class Take[G](xs: Expr[G], count: Expr[G])(implicit val o: Origin) extends Expr[G] with TakeImpl[G]
-final case class Slice[G](xs: Expr[G], from: Expr[G], to: Expr[G])(implicit val o: Origin) extends Expr[G] with SliceImpl[G]
-final case class SeqUpdate[G](xs: Expr[G], i: Expr[G], x: Expr[G])(implicit val o: Origin) extends Expr[G] with SeqUpdateImpl[G]
-final case class Concat[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin) extends Expr[G] with ConcatImpl[G]
-final case class RemoveAt[G](xs: Expr[G], i: Expr[G])(implicit val o: Origin) extends Expr[G] with RemoveAtImpl[G]
-final case class Empty[G](obj: Expr[G])(implicit val o: Origin) extends Expr[G] with EmptyImpl[G]
-
-final case class SetIntersection[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin) extends Expr[G] with SetIntersectionImpl[G]
-final case class BagLargestCommon[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin) extends Expr[G] with BagLargestCommonImpl[G]
-final case class SetMinus[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin) extends Expr[G] with SetMinusImpl[G]
-final case class BagMinus[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin) extends Expr[G] with BagMinusImpl[G]
-final case class SetUnion[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin) extends Expr[G] with SetUnionImpl[G]
-final case class BagAdd[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin) extends Expr[G] with BagAddImpl[G]
-final case class Choose[G](xs: Expr[G])(val blame: Blame[SetEmpty])(implicit val o: Origin) extends Expr[G] with ChooseImpl[G]
-final case class ChooseFresh[G](xs: Expr[G])(val blame: Blame[SetEmpty])(implicit val o: Origin) extends Expr[G] with ChooseFreshImpl[G]
-
-final case class AmbiguousMember[G](x: Expr[G], xs: Expr[G])(implicit val o: Origin) extends Expr[G] with AmbiguousMemberImpl[G]
-final case class SetMember[G](x: Expr[G], xs: Expr[G])(implicit val o: Origin) extends Expr[G] with SetMemberImpl[G]
-final case class SeqMember[G](x: Expr[G], xs: Expr[G])(implicit val o: Origin) extends Expr[G] with SeqMemberImpl[G]
-final case class MapMember[G](x: Expr[G], xs: Expr[G])(implicit val o: Origin) extends Expr[G] with MapMemberImpl[G]
-final case class BagMemberCount[G](x: Expr[G], xs: Expr[G])(implicit val o: Origin) extends Expr[G] with BagMemberCountImpl[G]
-
-final case class Permutation[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin) extends Expr[G] with PermutationImpl[G]
-final case class OptEmpty[G](opt: Expr[G])(implicit val o: Origin) extends Expr[G] with OptEmptyImpl[G]
-final case class OptGet[G](opt: Expr[G])(val blame: Blame[OptionNone])(implicit val o: Origin) extends Expr[G] with OptGetImpl[G]
-final case class OptGetOrElse[G](opt: Expr[G], alt: Expr[G])(implicit val o: Origin) extends Expr[G] with OptGetOrElseImpl[G]
-final case class MapGet[G](map: Expr[G], k: Expr[G])(val blame: Blame[MapKeyError])(implicit val o: Origin) extends Expr[G] with MapGetImpl[G]
-final case class TupGet[G](tup: Expr[G], index: Int)(implicit val o: Origin) extends Expr[G] with TupGetImpl[G]
+final case class SubSet[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SetComparison[G] with SubSetImpl[G]
+final case class SubSetEq[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SetComparison[G] with SubSetEqImpl[G]
+final case class SubBag[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SetComparison[G] with SubBagImpl[G]
+final case class SubBagEq[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SetComparison[G] with SubBagEqImpl[G]
+
+final case class Select[G](
+    condition: Expr[G],
+    whenTrue: Expr[G],
+    whenFalse: Expr[G],
+)(implicit val o: Origin)
+    extends Expr[G] with SelectImpl[G]
+final case class NewObject[G](cls: Ref[G, Class[G]])(implicit val o: Origin)
+    extends Expr[G] with NewObjectImpl[G]
+final case class NewArray[G](
+    element: Type[G],
+    dims: Seq[Expr[G]],
+    moreDims: Int,
+    initialize: Boolean,
+)(val blame: Blame[ArraySizeError])(implicit val o: Origin)
+    extends Expr[G] with NewArrayImpl[G]
+final case class NewPointerArray[G](element: Type[G], size: Expr[G])(
+    val blame: Blame[ArraySizeError]
+)(implicit val o: Origin)
+    extends Expr[G] with NewPointerArrayImpl[G]
+final case class FreePointer[G](pointer: Expr[G])(
+    val blame: Blame[PointerFreeError]
+)(implicit val o: Origin)
+    extends Expr[G] with FreePointerImpl[G]
+final case class Old[G](expr: Expr[G], at: Option[Ref[G, LabelDecl[G]]])(
+    val blame: Blame[LabelNotReached]
+)(implicit val o: Origin)
+    extends Expr[G] with OldImpl[G]
+final case class AmbiguousSubscript[G](collection: Expr[G], index: Expr[G])(
+    val blame: Blame[FrontendSubscriptError]
+)(implicit val o: Origin)
+    extends Expr[G] with AmbiguousSubscriptImpl[G]
+final case class SeqSubscript[G](seq: Expr[G], index: Expr[G])(
+    val blame: Blame[SeqBoundFailure]
+)(implicit val o: Origin)
+    extends Expr[G] with SeqSubscriptImpl[G]
+final case class VectorSubscript[G](seq: Expr[G], index: Expr[G])(
+    val blame: Blame[VectorBoundFailure]
+)(implicit val o: Origin)
+    extends Expr[G] with VectorSubscriptImpl[G]
+final case class ArraySubscript[G](arr: Expr[G], index: Expr[G])(
+    val blame: Blame[ArraySubscriptError]
+)(implicit val o: Origin)
+    extends Expr[G] with ArraySubscriptImpl[G]
+final case class PointerSubscript[G](pointer: Expr[G], index: Expr[G])(
+    val blame: Blame[PointerSubscriptError]
+)(implicit val o: Origin)
+    extends Expr[G] with PointerSubscriptImpl[G]
+final case class Length[G](arr: Expr[G])(val blame: Blame[ArrayNull])(
+    implicit val o: Origin
+) extends Expr[G] with LengthImpl[G]
+final case class Size[G](obj: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with SizeImpl[G]
+final case class PointerBlockLength[G](pointer: Expr[G])(
+    val blame: Blame[PointerNull]
+)(implicit val o: Origin)
+    extends Expr[G] with PointerBlockLengthImpl[G]
+final case class PointerBlockOffset[G](pointer: Expr[G])(
+    val blame: Blame[PointerNull]
+)(implicit val o: Origin)
+    extends Expr[G] with PointerBlockOffsetImpl[G]
+final case class PointerLength[G](pointer: Expr[G])(
+    val blame: Blame[PointerNull]
+)(implicit val o: Origin)
+    extends Expr[G] with PointerLengthImpl[G]
+final case class SharedMemSize[G](pointer: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with SharedMemSizeImpl[G]
+final case class NdIndex[G](indices: Seq[Expr[G]], dimensions: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends Expr[G] with NdIndexImpl[G]
+final case class NdPartialIndex[G](
+    indices: Seq[Expr[G]],
+    linearIndex: Expr[G],
+    dimensions: Seq[Expr[G]],
+)(implicit val o: Origin)
+    extends Expr[G] with NdPartialIndexImpl[G]
+final case class NdLength[G](dimensions: Seq[Expr[G]])(implicit val o: Origin)
+    extends Expr[G] with NdLengthImpl[G]
+
+final case class Cons[G](x: Expr[G], xs: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with ConsImpl[G]
+final case class Head[G](xs: Expr[G])(val blame: Blame[SeqBoundFailure])(
+    implicit val o: Origin
+) extends Expr[G] with HeadImpl[G]
+final case class Tail[G](xs: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with TailImpl[G]
+final case class Drop[G](xs: Expr[G], count: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with DropImpl[G]
+final case class Take[G](xs: Expr[G], count: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with TakeImpl[G]
+final case class Slice[G](xs: Expr[G], from: Expr[G], to: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with SliceImpl[G]
+final case class SeqUpdate[G](xs: Expr[G], i: Expr[G], x: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with SeqUpdateImpl[G]
+final case class Concat[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with ConcatImpl[G]
+final case class RemoveAt[G](xs: Expr[G], i: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with RemoveAtImpl[G]
+final case class Empty[G](obj: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with EmptyImpl[G]
+
+final case class SetIntersection[G](xs: Expr[G], ys: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with SetIntersectionImpl[G]
+final case class BagLargestCommon[G](xs: Expr[G], ys: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with BagLargestCommonImpl[G]
+final case class SetMinus[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with SetMinusImpl[G]
+final case class BagMinus[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with BagMinusImpl[G]
+final case class SetUnion[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with SetUnionImpl[G]
+final case class BagAdd[G](xs: Expr[G], ys: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with BagAddImpl[G]
+final case class Choose[G](xs: Expr[G])(val blame: Blame[SetEmpty])(
+    implicit val o: Origin
+) extends Expr[G] with ChooseImpl[G]
+final case class ChooseFresh[G](xs: Expr[G])(val blame: Blame[SetEmpty])(
+    implicit val o: Origin
+) extends Expr[G] with ChooseFreshImpl[G]
+
+final case class AmbiguousMember[G](x: Expr[G], xs: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with AmbiguousMemberImpl[G]
+final case class SetMember[G](x: Expr[G], xs: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with SetMemberImpl[G]
+final case class SeqMember[G](x: Expr[G], xs: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with SeqMemberImpl[G]
+final case class MapMember[G](x: Expr[G], xs: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with MapMemberImpl[G]
+final case class BagMemberCount[G](x: Expr[G], xs: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with BagMemberCountImpl[G]
+
+final case class Permutation[G](xs: Expr[G], ys: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with PermutationImpl[G]
+final case class OptEmpty[G](opt: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with OptEmptyImpl[G]
+final case class OptGet[G](opt: Expr[G])(val blame: Blame[OptionNone])(
+    implicit val o: Origin
+) extends Expr[G] with OptGetImpl[G]
+final case class OptGetOrElse[G](opt: Expr[G], alt: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with OptGetOrElseImpl[G]
+final case class MapGet[G](map: Expr[G], k: Expr[G])(
+    val blame: Blame[MapKeyError]
+)(implicit val o: Origin)
+    extends Expr[G] with MapGetImpl[G]
+final case class TupGet[G](tup: Expr[G], index: Int)(implicit val o: Origin)
+    extends Expr[G] with TupGetImpl[G]
 
 sealed trait EitherOp[G] extends Expr[G] with EitherOpImpl[G]
-final case class GetLeft[G](either: Expr[G])(val blame: Blame[NotLeft])(implicit val o: Origin) extends EitherOp[G] with GetLeftImpl[G]
-final case class GetRight[G](either: Expr[G])(val blame: Blame[NotRight])(implicit val o: Origin) extends EitherOp[G] with GetRightImpl[G]
-final case class IsLeft[G](either: Expr[G])(implicit val o: Origin) extends EitherOp[G] with Expr[G] with IsLeftImpl[G]
-final case class IsRight[G](either: Expr[G])(implicit val o: Origin) extends EitherOp[G] with Expr[G] with IsRightImpl[G]
-
-final case class VectorSum[G](indices: Expr[G], vec: Expr[G])(implicit val o: Origin) extends Expr[G] with VectorSumImpl[G]
-final case class VectorCompare[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with VectorCompareImpl[G]
-final case class VectorRepeat[G](e: Expr[G])(implicit val o: Origin) extends Expr[G] with VectorRepeatImpl[G]
-final case class MatrixSum[G](indices: Expr[G], mat: Expr[G])(implicit val o: Origin) extends Expr[G] with MatrixSumImpl[G]
-final case class MatrixCompare[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends BinExpr[G] with MatrixCompareImpl[G]
-final case class MatrixRepeat[G](e: Expr[G])(implicit val o: Origin) extends Expr[G] with MatrixRepeatImpl[G]
-
-final case class CastFloat[G](e: Expr[G], t: Type[G] /* TFloat or TInt */)(implicit val o: Origin) extends Expr[G] with CastFloatImpl[G]
-
-final case class TypeValue[G](value: Type[G])(implicit val o: Origin) extends Expr[G] with TypeValueImpl[G]
-final case class TypeOf[G](expr: Expr[G])(implicit val o: Origin) extends Expr[G] with TypeOfImpl[G]
-final case class InstanceOf[G](value: Expr[G], typeValue: Expr[G])(implicit val o: Origin) extends Expr[G] with InstanceOfImpl[G]
-final case class Cast[G](value: Expr[G], typeValue: Expr[G])(implicit val o: Origin) extends Expr[G] with CastImpl[G]
+final case class GetLeft[G](either: Expr[G])(val blame: Blame[NotLeft])(
+    implicit val o: Origin
+) extends EitherOp[G] with GetLeftImpl[G]
+final case class GetRight[G](either: Expr[G])(val blame: Blame[NotRight])(
+    implicit val o: Origin
+) extends EitherOp[G] with GetRightImpl[G]
+final case class IsLeft[G](either: Expr[G])(implicit val o: Origin)
+    extends EitherOp[G] with Expr[G] with IsLeftImpl[G]
+final case class IsRight[G](either: Expr[G])(implicit val o: Origin)
+    extends EitherOp[G] with Expr[G] with IsRightImpl[G]
+
+final case class VectorSum[G](indices: Expr[G], vec: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with VectorSumImpl[G]
+final case class VectorCompare[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with VectorCompareImpl[G]
+final case class VectorRepeat[G](e: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with VectorRepeatImpl[G]
+final case class MatrixSum[G](indices: Expr[G], mat: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with MatrixSumImpl[G]
+final case class MatrixCompare[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends BinExpr[G] with MatrixCompareImpl[G]
+final case class MatrixRepeat[G](e: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with MatrixRepeatImpl[G]
+
+final case class CastFloat[G](e: Expr[G], t: Type[G] /* TFloat or TInt */ )(
+    implicit val o: Origin
+) extends Expr[G] with CastFloatImpl[G]
+
+final case class TypeValue[G](value: Type[G])(implicit val o: Origin)
+    extends Expr[G] with TypeValueImpl[G]
+final case class TypeOf[G](expr: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with TypeOfImpl[G]
+final case class InstanceOf[G](value: Expr[G], typeValue: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with InstanceOfImpl[G]
+final case class Cast[G](value: Expr[G], typeValue: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with CastImpl[G]
 
 sealed trait TypeComparison[G] extends Comparison[G] with TypeComparisonImpl[G]
-final case class SubType[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends TypeComparison[G] with SubTypeImpl[G]
-final case class SuperType[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends TypeComparison[G] with SuperTypeImpl[G]
+final case class SubType[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends TypeComparison[G] with SubTypeImpl[G]
+final case class SuperType[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends TypeComparison[G] with SuperTypeImpl[G]
 
 sealed trait AssignExpression[G] extends Expr[G] with AssignExpressionImpl[G]
-final case class PreAssignExpression[G](target: Expr[G], value: Expr[G])(val blame: Blame[AssignFailed])(implicit val o: Origin) extends AssignExpression[G] with PreAssignExpressionImpl[G]
-final case class PostAssignExpression[G](target: Expr[G], value: Expr[G])(val blame: Blame[AssignFailed])(implicit val o: Origin) extends AssignExpression[G] with PostAssignExpressionImpl[G]
-
-final case class With[G](pre: Statement[G], value: Expr[G])(implicit val o: Origin) extends Expr[G] with WithImpl[G]
-final case class Then[G](value: Expr[G], post: Statement[G])(implicit val o: Origin) extends Expr[G] with ThenImpl[G]
-
-final case class Held[G](obj: Expr[G])(implicit val o: Origin) extends Expr[G] with HeldImpl[G]
-final case class Committed[G](obj: Expr[G])(val blame: Blame[LockObjectNull])(implicit val o: Origin) extends Expr[G] with CommittedImpl[G]
-final case class IdleToken[G](thread: Expr[G])(implicit val o: Origin) extends Expr[G] with IdleTokenImpl[G]
-final case class JoinToken[G](thread: Expr[G])(implicit val o: Origin) extends Expr[G] with JoinTokenImpl[G]
-
-final case class EmptyProcess[G]()(implicit val o: Origin) extends Expr[G] with EmptyProcessImpl[G]
-final case class ActionApply[G](action: Ref[G, ModelAction[G]], args: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with ActionApplyImpl[G]
-final case class ProcessApply[G](process: Ref[G, ModelProcess[G]], args: Seq[Expr[G]])(implicit val o: Origin) extends Expr[G] with ProcessApplyImpl[G]
-final case class ProcessSeq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends Expr[G] with ProcessSeqImpl[G]
-final case class ProcessChoice[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends Expr[G] with ProcessChoiceImpl[G]
-final case class ProcessPar[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends Expr[G] with ProcessParImpl[G]
-final case class ProcessSelect[G](cond: Expr[G], whenTrue: Expr[G], whenFalse: Expr[G])(implicit val o: Origin) extends Expr[G] with ProcessSelectImpl[G]
-
-final case class ModelNew[G](ref: Ref[G, Model[G]])(implicit val o: Origin) extends Expr[G] with ModelNewImpl[G]
-
-final case class ModelState[G](model: Expr[G], perm: Expr[G], state: Expr[G])(implicit val o: Origin) extends Expr[G] with ModelStateImpl[G]
-final case class ModelAbstractState[G](model: Expr[G], state: Expr[G])(implicit val o: Origin) extends Expr[G] with ModelAbstractStateImpl[G]
-final case class ModelCreate[G](model: Expr[G], init: Expr[G])(implicit val o: Origin) extends Expr[G] with ModelCreateImpl[G]
-final case class ModelDestroy[G](model: Expr[G])(implicit val o: Origin) extends Expr[G] with ModelDestroyImpl[G]
-final case class ModelSplit[G](model: Expr[G], leftPerm: Expr[G], leftProcess: Expr[G], rightPerm: Expr[G], rightProcess: Expr[G])(implicit val o: Origin) extends Expr[G] with ModelSplitImpl[G]
-final case class ModelMerge[G](model: Expr[G], leftPerm: Expr[G], leftProcess: Expr[G], rightPerm: Expr[G], rightProcess: Expr[G])(implicit val o: Origin) extends Expr[G] with ModelMergeImpl[G]
-final case class ModelChoose[G](model: Expr[G], perm: Expr[G], totalProcess: Expr[G], choice: Expr[G])(implicit val o: Origin) extends Expr[G] with ModelChooseImpl[G]
-
-final case class ModelPerm[G](loc: Expr[G], perm: Expr[G])(implicit val o: Origin) extends Expr[G] with ModelPermImpl[G]
-final case class ActionPerm[G](loc: Expr[G], perm: Expr[G])(implicit val o: Origin) extends Expr[G] with ActionPermImpl[G]
+final case class PreAssignExpression[G](target: Expr[G], value: Expr[G])(
+    val blame: Blame[AssignFailed]
+)(implicit val o: Origin)
+    extends AssignExpression[G] with PreAssignExpressionImpl[G]
+final case class PostAssignExpression[G](target: Expr[G], value: Expr[G])(
+    val blame: Blame[AssignFailed]
+)(implicit val o: Origin)
+    extends AssignExpression[G] with PostAssignExpressionImpl[G]
+
+final case class With[G](pre: Statement[G], value: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with WithImpl[G]
+final case class Then[G](value: Expr[G], post: Statement[G])(
+    implicit val o: Origin
+) extends Expr[G] with ThenImpl[G]
+
+final case class Held[G](obj: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with HeldImpl[G]
+final case class Committed[G](obj: Expr[G])(val blame: Blame[LockObjectNull])(
+    implicit val o: Origin
+) extends Expr[G] with CommittedImpl[G]
+final case class IdleToken[G](thread: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with IdleTokenImpl[G]
+final case class JoinToken[G](thread: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with JoinTokenImpl[G]
+
+final case class EmptyProcess[G]()(implicit val o: Origin)
+    extends Expr[G] with EmptyProcessImpl[G]
+final case class ActionApply[G](
+    action: Ref[G, ModelAction[G]],
+    args: Seq[Expr[G]],
+)(implicit val o: Origin)
+    extends Expr[G] with ActionApplyImpl[G]
+final case class ProcessApply[G](
+    process: Ref[G, ModelProcess[G]],
+    args: Seq[Expr[G]],
+)(implicit val o: Origin)
+    extends Expr[G] with ProcessApplyImpl[G]
+final case class ProcessSeq[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ProcessSeqImpl[G]
+final case class ProcessChoice[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ProcessChoiceImpl[G]
+final case class ProcessPar[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ProcessParImpl[G]
+final case class ProcessSelect[G](
+    cond: Expr[G],
+    whenTrue: Expr[G],
+    whenFalse: Expr[G],
+)(implicit val o: Origin)
+    extends Expr[G] with ProcessSelectImpl[G]
+
+final case class ModelNew[G](ref: Ref[G, Model[G]])(implicit val o: Origin)
+    extends Expr[G] with ModelNewImpl[G]
+
+final case class ModelState[G](model: Expr[G], perm: Expr[G], state: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ModelStateImpl[G]
+final case class ModelAbstractState[G](model: Expr[G], state: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ModelAbstractStateImpl[G]
+final case class ModelCreate[G](model: Expr[G], init: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ModelCreateImpl[G]
+final case class ModelDestroy[G](model: Expr[G])(implicit val o: Origin)
+    extends Expr[G] with ModelDestroyImpl[G]
+final case class ModelSplit[G](
+    model: Expr[G],
+    leftPerm: Expr[G],
+    leftProcess: Expr[G],
+    rightPerm: Expr[G],
+    rightProcess: Expr[G],
+)(implicit val o: Origin)
+    extends Expr[G] with ModelSplitImpl[G]
+final case class ModelMerge[G](
+    model: Expr[G],
+    leftPerm: Expr[G],
+    leftProcess: Expr[G],
+    rightPerm: Expr[G],
+    rightProcess: Expr[G],
+)(implicit val o: Origin)
+    extends Expr[G] with ModelMergeImpl[G]
+final case class ModelChoose[G](
+    model: Expr[G],
+    perm: Expr[G],
+    totalProcess: Expr[G],
+    choice: Expr[G],
+)(implicit val o: Origin)
+    extends Expr[G] with ModelChooseImpl[G]
+
+final case class ModelPerm[G](loc: Expr[G], perm: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ModelPermImpl[G]
+final case class ActionPerm[G](loc: Expr[G], perm: Expr[G])(
+    implicit val o: Origin
+) extends Expr[G] with ActionPermImpl[G]
 
 sealed trait SmtlibType[G] extends Type[G]
-case class TSmtlibArray[G](index: Seq[Type[G]], value: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends SmtlibType[G] with TSmtlibArrayImpl[G]
-case class TSmtlibBitVector[G](size: Int)(implicit val o: Origin = DiagnosticOrigin) extends SmtlibType[G] with TSmtlibBitVectorImpl[G]
-case class TSmtlibRoundingMode[G]()(implicit val o: Origin = DiagnosticOrigin) extends SmtlibType[G] with TSmtlibRoundingModeImpl[G]
-case class TSmtlibFloatingPoint[G](exponentBits: Int, mantissaAndSignBits: Int)(implicit val o: Origin = DiagnosticOrigin) extends SmtlibType[G] with TSmtlibFloatingPointImpl[G]
-case class TSmtlibString[G]()(implicit val o: Origin = DiagnosticOrigin) extends SmtlibType[G] with TSmtlibStringImpl[G]
-case class TSmtlibRegLan[G]()(implicit val o: Origin = DiagnosticOrigin) extends SmtlibType[G] with TSmtlibRegLanImpl[G]
+case class TSmtlibArray[G](index: Seq[Type[G]], value: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends SmtlibType[G] with TSmtlibArrayImpl[G]
+case class TSmtlibBitVector[G](size: Int)(
+    implicit val o: Origin = DiagnosticOrigin
+) extends SmtlibType[G] with TSmtlibBitVectorImpl[G]
+case class TSmtlibRoundingMode[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends SmtlibType[G] with TSmtlibRoundingModeImpl[G]
+case class TSmtlibFloatingPoint[G](exponentBits: Int, mantissaAndSignBits: Int)(
+    implicit val o: Origin = DiagnosticOrigin
+) extends SmtlibType[G] with TSmtlibFloatingPointImpl[G]
+case class TSmtlibString[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends SmtlibType[G] with TSmtlibStringImpl[G]
+case class TSmtlibRegLan[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends SmtlibType[G] with TSmtlibRegLanImpl[G]
 // Non-standard Z3 extensions
-case class TSmtlibSeq[G](element: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends SmtlibType[G] with TSmtlibSeqImpl[G]
+case class TSmtlibSeq[G](element: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends SmtlibType[G] with TSmtlibSeqImpl[G]
 
-@family sealed trait SmtlibFunctionSymbol[G] extends NodeFamily[G] with SmtlibFunctionSymbolImpl[G]
-case class SmtlibADTFunctionSymbol[G](ref: Ref[G, ADTFunction[G]])(implicit val o: Origin) extends SmtlibFunctionSymbol[G] with SmtlibADTFunctionSymbolImpl[G]
-case class SmtlibProverFunctionSymbol[G](ref: Ref[G, ProverFunction[G]])(implicit val o: Origin) extends SmtlibFunctionSymbol[G] with SmtlibProverFunctionSymbolImpl[G]
+@family
+sealed trait SmtlibFunctionSymbol[G]
+    extends NodeFamily[G] with SmtlibFunctionSymbolImpl[G]
+case class SmtlibADTFunctionSymbol[G](ref: Ref[G, ADTFunction[G]])(
+    implicit val o: Origin
+) extends SmtlibFunctionSymbol[G] with SmtlibADTFunctionSymbolImpl[G]
+case class SmtlibProverFunctionSymbol[G](ref: Ref[G, ProverFunction[G]])(
+    implicit val o: Origin
+) extends SmtlibFunctionSymbol[G] with SmtlibProverFunctionSymbolImpl[G]
 
 sealed trait SmtlibExpr[G] extends Expr[G]
-case class SmtlibSelect[G](arr: Expr[G], is: Seq[Expr[G]])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibSelectImpl[G]
-case class SmtlibStore[G](arr: Expr[G], is: Seq[Expr[G]], x: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStoreImpl[G]
-
-case class SmtlibBitvecLiteral[G](data: BitString)(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBitvecLiteralImpl[G]
-case class SmtlibConcat[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibConcatImpl[G]
-case class SmtlibExtract[G](inclusiveEndIndexFromRight: Int, startIndexFromRight: Int, bv: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibExtractImpl[G]
-case class SmtlibBvNot[G](bv: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvNotImpl[G]
-case class SmtlibBvAnd[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvAndImpl[G]
-case class SmtlibBvOr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvOrImpl[G]
-case class SmtlibBvNeg[G](bv: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvNegImpl[G]
-case class SmtlibBvAdd[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvAddImpl[G]
-case class SmtlibBvMul[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvMulImpl[G]
-case class SmtlibBvUDiv[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvUDivImpl[G]
-case class SmtlibBvURem[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvURemImpl[G]
-case class SmtlibBvShl[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvShlImpl[G]
-case class SmtlibBvShr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvShrImpl[G]
-case class SmtlibBvULt[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibBvULtImpl[G]
-
-case class SmtlibRNE[G]()(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibRNEImpl[G]
-case class SmtlibRNA[G]()(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibRNAImpl[G]
-case class SmtlibRTP[G]()(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibRTPImpl[G]
-case class SmtlibRTN[G]()(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibRTNImpl[G]
-case class SmtlibRTZ[G]()(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibRTZImpl[G]
-
-case class SmtlibFp[G](sign: Expr[G], exponent: Expr[G], mantissa: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpImpl[G]
-case class SmtlibFpAbs[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpAbsImpl[G]
-case class SmtlibFpNeg[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpNegImpl[G]
-case class SmtlibFpAdd[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpAddImpl[G]
-case class SmtlibFpSub[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpSubImpl[G]
-case class SmtlibFpMul[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpMulImpl[G]
-case class SmtlibFpDiv[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpDivImpl[G]
-case class SmtlibFpFma[G](left: Expr[G], right: Expr[G], addend: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpFmaImpl[G]
-case class SmtlibFpSqrt[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpSqrtImpl[G]
-case class SmtlibFpRem[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpRemImpl[G]
-case class SmtlibFpRoundToIntegral[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpRoundToIntegralImpl[G]
-case class SmtlibFpMin[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpMinImpl[G]
-case class SmtlibFpMax[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpMaxImpl[G]
-case class SmtlibFpLeq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpLeqImpl[G]
-case class SmtlibFpLt[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpLtImpl[G]
-case class SmtlibFpGeq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpGeqImpl[G]
-case class SmtlibFpGt[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpGtImpl[G]
-case class SmtlibFpEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpEqImpl[G]
-case class SmtlibFpIsNormal[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpIsNormalImpl[G]
-case class SmtlibFpIsSubnormal[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpIsSubnormalImpl[G]
-case class SmtlibFpIsZero[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpIsZeroImpl[G]
-case class SmtlibFpIsInfinite[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpIsInfiniteImpl[G]
-case class SmtlibFpIsNaN[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpIsNaNImpl[G]
-case class SmtlibFpIsNegative[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpIsNegativeImpl[G]
-case class SmtlibFpIsPositive[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpIsPositiveImpl[G]
-case class SmtlibToFp[G](bv: Expr[G], exponentBits: Int, mantissaAndSignBits: Int)(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibToFpImpl[G]
-case class SmtlibFpCast[G](arg: Expr[G], exponentBits: Int, mantissaAndSignBits: Int)(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpCastImpl[G]
-case class SmtlibFpFromReal[G](arg: Expr[G], exponentBits: Int, mantissaAndSignBits: Int)(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpFromRealImpl[G]
-case class SmtlibFpFromSInt[G](bv: Expr[G], exponentBits: Int, mantissaAndSignBits: Int)(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpFromSIntImpl[G]
-case class SmtlibFpFromUInt[G](bv: Expr[G], exponentBits: Int, mantissaAndSignBits: Int)(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpFromUIntImpl[G]
-case class SmtlibFpToReal[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpToRealImpl[G]
-case class SmtlibFpToSInt[G](arg: Expr[G], bits: Int)(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpToSIntImpl[G]
-case class SmtlibFpToUInt[G](arg: Expr[G], bits: Int)(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibFpToUIntImpl[G]
-
-case class SmtlibIsInt[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibIsIntImpl[G]
-case class SmtlibToInt[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibToIntImpl[G]
-case class SmtlibToReal[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibToRealImpl[G]
-case class SmtlibPow[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with BinExpr[G] with SmtlibPowImpl[G]
-
-case class SmtlibLiteralString[G](data: String)(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibLiteralStringImpl[G]
-case class SmtlibStrConcat[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrConcatImpl[G]
-case class SmtlibStrLen[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrLenImpl[G]
-case class SmtlibStrLt[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrLtImpl[G]
-case class SmtlibStrLeq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrLeqImpl[G]
-case class SmtlibStrAt[G](str: Expr[G], i: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrAtImpl[G]
-case class SmtlibSubstr[G](str: Expr[G], i: Expr[G], n: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibSubstrImpl[G]
-case class SmtlibStrPrefixOf[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrPrefixOfImpl[G]
-case class SmtlibStrSuffixOf[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrSuffixOfImpl[G]
-case class SmtlibStrContains[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrContainsImpl[G]
-case class SmtlibStrIndexOf[G](haystack: Expr[G], needle: Expr[G], fromIndex: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrIndexOfImpl[G]
-case class SmtlibStrReplace[G](haystack: Expr[G], needle: Expr[G], replacement: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrReplaceImpl[G]
-case class SmtlibStrReplaceAll[G](haystack: Expr[G], needle: Expr[G], replacement: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrReplaceAllImpl[G]
-case class SmtlibStrReplaceRe[G](haystack: Expr[G], re: Expr[G], replacement: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrReplaceReImpl[G]
-case class SmtlibStrReplaceReAll[G](haystack: Expr[G], re: Expr[G], replacement: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrReplaceReAllImpl[G]
-case class SmtlibStrIsDigit[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrIsDigitImpl[G]
-case class SmtlibStrToCode[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrToCodeImpl[G]
-case class SmtlibStrFromCode[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrFromCodeImpl[G]
-case class SmtlibStrToInt[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrToIntImpl[G]
-case class SmtlibStrFromInt[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibStrFromIntImpl[G]
-
-case class SmtlibReFromStr[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReFromStrImpl[G]
-case class SmtlibReContains[G](re: Expr[G], str: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReContainsImpl[G]
-case class SmtlibReNone[G]()(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReNoneImpl[G]
-case class SmtlibReAll[G]()(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReAllImpl[G]
-case class SmtlibReAllChar[G]()(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReAllCharImpl[G]
-case class SmtlibReConcat[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReConcatImpl[G]
-case class SmtlibReUnion[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReUnionImpl[G]
-case class SmtlibReInter[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReInterImpl[G]
-case class SmtlibReStar[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReStarImpl[G]
-case class SmtlibReComp[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReCompImpl[G]
-case class SmtlibReDiff[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReDiffImpl[G]
-case class SmtlibRePlus[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibRePlusImpl[G]
-case class SmtlibReOpt[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReOptImpl[G]
-case class SmtlibReRange[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReRangeImpl[G]
-case class SmtlibReRepeat[G](count: Int, arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReRepeatImpl[G]
-case class SmtlibReRepeatRange[G](from: Int, to: Int, arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with SmtlibReRepeatRangeImpl[G]
+case class SmtlibSelect[G](arr: Expr[G], is: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibSelectImpl[G]
+case class SmtlibStore[G](arr: Expr[G], is: Seq[Expr[G]], x: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibStoreImpl[G]
+
+case class SmtlibBitvecLiteral[G](data: BitString)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibBitvecLiteralImpl[G]
+case class SmtlibConcat[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibConcatImpl[G]
+case class SmtlibExtract[G](
+    inclusiveEndIndexFromRight: Int,
+    startIndexFromRight: Int,
+    bv: Expr[G],
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibExtractImpl[G]
+case class SmtlibBvNot[G](bv: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibBvNotImpl[G]
+case class SmtlibBvAnd[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibBvAndImpl[G]
+case class SmtlibBvOr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibBvOrImpl[G]
+case class SmtlibBvNeg[G](bv: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibBvNegImpl[G]
+case class SmtlibBvAdd[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibBvAddImpl[G]
+case class SmtlibBvMul[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibBvMulImpl[G]
+case class SmtlibBvUDiv[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibBvUDivImpl[G]
+case class SmtlibBvURem[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibBvURemImpl[G]
+case class SmtlibBvShl[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibBvShlImpl[G]
+case class SmtlibBvShr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibBvShrImpl[G]
+case class SmtlibBvULt[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibBvULtImpl[G]
+
+case class SmtlibRNE[G]()(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibRNEImpl[G]
+case class SmtlibRNA[G]()(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibRNAImpl[G]
+case class SmtlibRTP[G]()(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibRTPImpl[G]
+case class SmtlibRTN[G]()(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibRTNImpl[G]
+case class SmtlibRTZ[G]()(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibRTZImpl[G]
+
+case class SmtlibFp[G](sign: Expr[G], exponent: Expr[G], mantissa: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibFpImpl[G]
+case class SmtlibFpAbs[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpAbsImpl[G]
+case class SmtlibFpNeg[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpNegImpl[G]
+case class SmtlibFpAdd[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpAddImpl[G]
+case class SmtlibFpSub[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpSubImpl[G]
+case class SmtlibFpMul[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpMulImpl[G]
+case class SmtlibFpDiv[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpDivImpl[G]
+case class SmtlibFpFma[G](left: Expr[G], right: Expr[G], addend: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibFpFmaImpl[G]
+case class SmtlibFpSqrt[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpSqrtImpl[G]
+case class SmtlibFpRem[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpRemImpl[G]
+case class SmtlibFpRoundToIntegral[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpRoundToIntegralImpl[G]
+case class SmtlibFpMin[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpMinImpl[G]
+case class SmtlibFpMax[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpMaxImpl[G]
+case class SmtlibFpLeq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpLeqImpl[G]
+case class SmtlibFpLt[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpLtImpl[G]
+case class SmtlibFpGeq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpGeqImpl[G]
+case class SmtlibFpGt[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpGtImpl[G]
+case class SmtlibFpEq[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpEqImpl[G]
+case class SmtlibFpIsNormal[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpIsNormalImpl[G]
+case class SmtlibFpIsSubnormal[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpIsSubnormalImpl[G]
+case class SmtlibFpIsZero[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpIsZeroImpl[G]
+case class SmtlibFpIsInfinite[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpIsInfiniteImpl[G]
+case class SmtlibFpIsNaN[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpIsNaNImpl[G]
+case class SmtlibFpIsNegative[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpIsNegativeImpl[G]
+case class SmtlibFpIsPositive[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpIsPositiveImpl[G]
+case class SmtlibToFp[G](
+    bv: Expr[G],
+    exponentBits: Int,
+    mantissaAndSignBits: Int,
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibToFpImpl[G]
+case class SmtlibFpCast[G](
+    arg: Expr[G],
+    exponentBits: Int,
+    mantissaAndSignBits: Int,
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpCastImpl[G]
+case class SmtlibFpFromReal[G](
+    arg: Expr[G],
+    exponentBits: Int,
+    mantissaAndSignBits: Int,
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpFromRealImpl[G]
+case class SmtlibFpFromSInt[G](
+    bv: Expr[G],
+    exponentBits: Int,
+    mantissaAndSignBits: Int,
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpFromSIntImpl[G]
+case class SmtlibFpFromUInt[G](
+    bv: Expr[G],
+    exponentBits: Int,
+    mantissaAndSignBits: Int,
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpFromUIntImpl[G]
+case class SmtlibFpToReal[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpToRealImpl[G]
+case class SmtlibFpToSInt[G](arg: Expr[G], bits: Int)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpToSIntImpl[G]
+case class SmtlibFpToUInt[G](arg: Expr[G], bits: Int)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibFpToUIntImpl[G]
+
+case class SmtlibIsInt[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibIsIntImpl[G]
+case class SmtlibToInt[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibToIntImpl[G]
+case class SmtlibToReal[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibToRealImpl[G]
+case class SmtlibPow[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with BinExpr[G] with SmtlibPowImpl[G]
+
+case class SmtlibLiteralString[G](data: String)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibLiteralStringImpl[G]
+case class SmtlibStrConcat[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibStrConcatImpl[G]
+case class SmtlibStrLen[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrLenImpl[G]
+case class SmtlibStrLt[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrLtImpl[G]
+case class SmtlibStrLeq[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibStrLeqImpl[G]
+case class SmtlibStrAt[G](str: Expr[G], i: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrAtImpl[G]
+case class SmtlibSubstr[G](str: Expr[G], i: Expr[G], n: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibSubstrImpl[G]
+case class SmtlibStrPrefixOf[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibStrPrefixOfImpl[G]
+case class SmtlibStrSuffixOf[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibStrSuffixOfImpl[G]
+case class SmtlibStrContains[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibStrContainsImpl[G]
+case class SmtlibStrIndexOf[G](
+    haystack: Expr[G],
+    needle: Expr[G],
+    fromIndex: Expr[G],
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrIndexOfImpl[G]
+case class SmtlibStrReplace[G](
+    haystack: Expr[G],
+    needle: Expr[G],
+    replacement: Expr[G],
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrReplaceImpl[G]
+case class SmtlibStrReplaceAll[G](
+    haystack: Expr[G],
+    needle: Expr[G],
+    replacement: Expr[G],
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrReplaceAllImpl[G]
+case class SmtlibStrReplaceRe[G](
+    haystack: Expr[G],
+    re: Expr[G],
+    replacement: Expr[G],
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrReplaceReImpl[G]
+case class SmtlibStrReplaceReAll[G](
+    haystack: Expr[G],
+    re: Expr[G],
+    replacement: Expr[G],
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrReplaceReAllImpl[G]
+case class SmtlibStrIsDigit[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrIsDigitImpl[G]
+case class SmtlibStrToCode[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrToCodeImpl[G]
+case class SmtlibStrFromCode[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrFromCodeImpl[G]
+case class SmtlibStrToInt[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrToIntImpl[G]
+case class SmtlibStrFromInt[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibStrFromIntImpl[G]
+
+case class SmtlibReFromStr[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibReFromStrImpl[G]
+case class SmtlibReContains[G](re: Expr[G], str: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibReContainsImpl[G]
+case class SmtlibReNone[G]()(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibReNoneImpl[G]
+case class SmtlibReAll[G]()(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibReAllImpl[G]
+case class SmtlibReAllChar[G]()(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibReAllCharImpl[G]
+case class SmtlibReConcat[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibReConcatImpl[G]
+case class SmtlibReUnion[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibReUnionImpl[G]
+case class SmtlibReInter[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibReInterImpl[G]
+case class SmtlibReStar[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibReStarImpl[G]
+case class SmtlibReComp[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibReCompImpl[G]
+case class SmtlibReDiff[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibReDiffImpl[G]
+case class SmtlibRePlus[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibRePlusImpl[G]
+case class SmtlibReOpt[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibReOptImpl[G]
+case class SmtlibReRange[G](left: Expr[G], right: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibReRangeImpl[G]
+case class SmtlibReRepeat[G](count: Int, arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with SmtlibReRepeatImpl[G]
+case class SmtlibReRepeatRange[G](from: Int, to: Int, arg: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with SmtlibReRepeatRangeImpl[G]
 
 // Non-standard Z3 extensions
-case class Z3BvSub[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3BvSubImpl[G]
-case class Z3BvSRem[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3BvSRemImpl[G]
-case class Z3BvSMod[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3BvSModImpl[G]
-case class Z3BvSShr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3BvSShrImpl[G]
-case class Z3BvNand[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3BvNandImpl[G]
-case class Z3BvNor[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3BvNorImpl[G]
-case class Z3BvXnor[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3BvXnorImpl[G]
-
-case class Z3ArrayConst[G](domain: Seq[Type[G]], codomain: Type[G], value: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3ArrayConstImpl[G]
-case class Z3ArrayOfFunction[G](ref: SmtlibFunctionSymbol[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3ArrayOfFunctionImpl[G]
-case class Z3ArrayMap[G](ref: SmtlibFunctionSymbol[G], args: Seq[Expr[G]])(implicit val o: Origin) extends SmtlibExpr[G] with Z3ArrayMapImpl[G]
-
-case class Z3SeqEmpty[G](elementType: Type[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqEmptyImpl[G]
-case class Z3SeqUnit[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqUnitImpl[G]
-case class Z3SeqConcat[G](left: Expr[G], right: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqConcatImpl[G]
-case class Z3SeqLen[G](arg: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqLenImpl[G]
-case class Z3SeqExtract[G](seq: Expr[G], offset: Expr[G], len: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqExtractImpl[G]
-case class Z3SeqAt[G](seq: Expr[G], offset: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqAtImpl[G]
-case class Z3SeqNth[G](seq: Expr[G], offset: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqNthImpl[G]
-case class Z3SeqContains[G](seq: Expr[G], subseq: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqContainsImpl[G]
-case class Z3SeqPrefixOf[G](pre: Expr[G], subseq: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqPrefixOfImpl[G]
-case class Z3SeqSuffixOf[G](post: Expr[G], seq: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqSuffixOfImpl[G]
-case class Z3SeqReplace[G](haystack: Expr[G], needle: Expr[G], replacement: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqReplaceImpl[G]
-case class Z3SeqMap[G](f: Expr[G], seq: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqMapImpl[G]
-case class Z3SeqMapI[G](f: Expr[G], offset: Expr[G], seq: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqMapIImpl[G]
-case class Z3SeqFoldl[G](f: Expr[G], base: Expr[G], seq: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqFoldlImpl[G]
-case class Z3SeqFoldlI[G](f: Expr[G], offset: Expr[G], base: Expr[G], seq: Expr[G])(implicit val o: Origin) extends SmtlibExpr[G] with Z3SeqFoldlIImpl[G]
-
-case class Z3TransitiveClosure[G](ref: SmtlibFunctionSymbol[G], args: Seq[Expr[G]])(implicit val o: Origin) extends SmtlibExpr[G] with Z3TransitiveClosureImpl[G]
-
-@family sealed trait CDeclarationSpecifier[G] extends NodeFamily[G] with CDeclarationSpecifierImpl[G]
-
-sealed trait CSpecificationModifier[G] extends CDeclarationSpecifier[G] with CSpecificationModifierImpl[G]
-final case class CPure[G]()(implicit val o: Origin) extends CSpecificationModifier[G] with CPureImpl[G]
-final case class CInline[G]()(implicit val o: Origin) extends CSpecificationModifier[G] with CInlineImpl[G]
-
-sealed trait CStorageClassSpecifier[G] extends CDeclarationSpecifier[G] with CStorageClassSpecifierImpl[G]
-final case class CTypedef[G]()(implicit val o: Origin) extends CStorageClassSpecifier[G] with CTypedefImpl[G]
-final case class CExtern[G]()(implicit val o: Origin) extends CStorageClassSpecifier[G] with CExternImpl[G]
-final case class CStatic[G]()(implicit val o: Origin) extends CStorageClassSpecifier[G] with CStaticImpl[G]
-final case class GPULocal[G]()(implicit val o: Origin) extends CStorageClassSpecifier[G] with GPULocalImpl[G]
-final case class GPUGlobal[G]()(implicit val o: Origin) extends CStorageClassSpecifier[G] with GPUGlobalImpl[G]
-
-sealed trait CTypeSpecifier[G] extends CDeclarationSpecifier[G] with CTypeSpecifierImpl[G]
-final case class CVoid[G]()(implicit val o: Origin) extends CTypeSpecifier[G] with CVoidImpl[G]
-final case class CChar[G]()(implicit val o: Origin) extends CTypeSpecifier[G] with CCharImpl[G]
-final case class CShort[G]()(implicit val o: Origin) extends CTypeSpecifier[G] with CShortImpl[G]
-final case class CInt[G]()(implicit val o: Origin) extends CTypeSpecifier[G] with CIntImpl[G]
-final case class CLong[G]()(implicit val o: Origin) extends CTypeSpecifier[G] with CLongImpl[G]
-final case class CFloat[G]()(implicit val o: Origin) extends CTypeSpecifier[G] with CFloatImpl[G]
-final case class CDouble[G]()(implicit val o: Origin) extends CTypeSpecifier[G] with CDoubleImpl[G]
-final case class CSigned[G]()(implicit val o: Origin) extends CTypeSpecifier[G] with CSignedImpl[G]
-final case class CUnsigned[G]()(implicit val o: Origin) extends CTypeSpecifier[G] with CUnsignedImpl[G]
-final case class CBool[G]()(implicit val o: Origin) extends CTypeSpecifier[G] with CBoolImpl[G]
-final case class CTypedefName[G](name: String)(implicit val o: Origin) extends CTypeSpecifier[G] with CTypedefNameImpl[G] {
+case class Z3BvSub[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3BvSubImpl[G]
+case class Z3BvSRem[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3BvSRemImpl[G]
+case class Z3BvSMod[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3BvSModImpl[G]
+case class Z3BvSShr[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3BvSShrImpl[G]
+case class Z3BvNand[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3BvNandImpl[G]
+case class Z3BvNor[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3BvNorImpl[G]
+case class Z3BvXnor[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3BvXnorImpl[G]
+
+case class Z3ArrayConst[G](
+    domain: Seq[Type[G]],
+    codomain: Type[G],
+    value: Expr[G],
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3ArrayConstImpl[G]
+case class Z3ArrayOfFunction[G](ref: SmtlibFunctionSymbol[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with Z3ArrayOfFunctionImpl[G]
+case class Z3ArrayMap[G](ref: SmtlibFunctionSymbol[G], args: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with Z3ArrayMapImpl[G]
+
+case class Z3SeqEmpty[G](elementType: Type[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3SeqEmptyImpl[G]
+case class Z3SeqUnit[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3SeqUnitImpl[G]
+case class Z3SeqConcat[G](left: Expr[G], right: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3SeqConcatImpl[G]
+case class Z3SeqLen[G](arg: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3SeqLenImpl[G]
+case class Z3SeqExtract[G](seq: Expr[G], offset: Expr[G], len: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with Z3SeqExtractImpl[G]
+case class Z3SeqAt[G](seq: Expr[G], offset: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3SeqAtImpl[G]
+case class Z3SeqNth[G](seq: Expr[G], offset: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3SeqNthImpl[G]
+case class Z3SeqContains[G](seq: Expr[G], subseq: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with Z3SeqContainsImpl[G]
+case class Z3SeqPrefixOf[G](pre: Expr[G], subseq: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with Z3SeqPrefixOfImpl[G]
+case class Z3SeqSuffixOf[G](post: Expr[G], seq: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3SeqSuffixOfImpl[G]
+case class Z3SeqReplace[G](
+    haystack: Expr[G],
+    needle: Expr[G],
+    replacement: Expr[G],
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3SeqReplaceImpl[G]
+case class Z3SeqMap[G](f: Expr[G], seq: Expr[G])(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3SeqMapImpl[G]
+case class Z3SeqMapI[G](f: Expr[G], offset: Expr[G], seq: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with Z3SeqMapIImpl[G]
+case class Z3SeqFoldl[G](f: Expr[G], base: Expr[G], seq: Expr[G])(
+    implicit val o: Origin
+) extends SmtlibExpr[G] with Z3SeqFoldlImpl[G]
+case class Z3SeqFoldlI[G](
+    f: Expr[G],
+    offset: Expr[G],
+    base: Expr[G],
+    seq: Expr[G],
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3SeqFoldlIImpl[G]
+
+case class Z3TransitiveClosure[G](
+    ref: SmtlibFunctionSymbol[G],
+    args: Seq[Expr[G]],
+)(implicit val o: Origin)
+    extends SmtlibExpr[G] with Z3TransitiveClosureImpl[G]
+
+@family
+sealed trait CDeclarationSpecifier[G]
+    extends NodeFamily[G] with CDeclarationSpecifierImpl[G]
+
+sealed trait CSpecificationModifier[G]
+    extends CDeclarationSpecifier[G] with CSpecificationModifierImpl[G]
+final case class CPure[G]()(implicit val o: Origin)
+    extends CSpecificationModifier[G] with CPureImpl[G]
+final case class CInline[G]()(implicit val o: Origin)
+    extends CSpecificationModifier[G] with CInlineImpl[G]
+
+sealed trait CStorageClassSpecifier[G]
+    extends CDeclarationSpecifier[G] with CStorageClassSpecifierImpl[G]
+final case class CTypedef[G]()(implicit val o: Origin)
+    extends CStorageClassSpecifier[G] with CTypedefImpl[G]
+final case class CExtern[G]()(implicit val o: Origin)
+    extends CStorageClassSpecifier[G] with CExternImpl[G]
+final case class CStatic[G]()(implicit val o: Origin)
+    extends CStorageClassSpecifier[G] with CStaticImpl[G]
+final case class GPULocal[G]()(implicit val o: Origin)
+    extends CStorageClassSpecifier[G] with GPULocalImpl[G]
+final case class GPUGlobal[G]()(implicit val o: Origin)
+    extends CStorageClassSpecifier[G] with GPUGlobalImpl[G]
+
+sealed trait CTypeSpecifier[G]
+    extends CDeclarationSpecifier[G] with CTypeSpecifierImpl[G]
+final case class CVoid[G]()(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CVoidImpl[G]
+final case class CChar[G]()(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CCharImpl[G]
+final case class CShort[G]()(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CShortImpl[G]
+final case class CInt[G]()(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CIntImpl[G]
+final case class CLong[G]()(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CLongImpl[G]
+final case class CFloat[G]()(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CFloatImpl[G]
+final case class CDouble[G]()(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CDoubleImpl[G]
+final case class CSigned[G]()(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CSignedImpl[G]
+final case class CUnsigned[G]()(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CUnsignedImpl[G]
+final case class CBool[G]()(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CBoolImpl[G]
+final case class CTypedefName[G](name: String)(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CTypedefNameImpl[G] {
   var ref: Option[CTypeNameTarget[G]] = None
 }
-final case class CSpecificationType[G](t: Type[G])(implicit val o: Origin) extends CTypeSpecifier[G] with CSpecificationTypeImpl[G]
-final case class CFunctionTypeExtensionModifier[G](extensions: Seq[CTypeExtensions[G]])(implicit val o: Origin) extends CTypeSpecifier[G] with CFunctionTypeExtensionModifierImpl[G]
-
-final case class CStructDeclaration[G](name: Option[String], decl: Seq[CStructMemberDeclarator[G]])(implicit val o: Origin) extends CTypeSpecifier[G] with CStructDeclarationImpl[G]
-final case class CStructSpecifier[G](name: String)(implicit val o: Origin) extends CTypeSpecifier[G] with CStructSpecifierImpl[G] {
+final case class CSpecificationType[G](t: Type[G])(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CSpecificationTypeImpl[G]
+final case class CFunctionTypeExtensionModifier[G](
+    extensions: Seq[CTypeExtensions[G]]
+)(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CFunctionTypeExtensionModifierImpl[G]
+
+final case class CStructDeclaration[G](
+    name: Option[String],
+    decl: Seq[CStructMemberDeclarator[G]],
+)(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CStructDeclarationImpl[G]
+final case class CStructSpecifier[G](name: String)(implicit val o: Origin)
+    extends CTypeSpecifier[G] with CStructSpecifierImpl[G] {
   var ref: Option[RefCStruct[G]] = None
 }
-@family final case class CStructMemberDeclarator[G](specs: Seq[CDeclarationSpecifier[G]], decls: Seq[CDeclarator[G]])(implicit val o: Origin) extends Declaration[G] with CStructMemberDeclaratorImpl[G]
-
-final case class CTypeQualifierDeclarationSpecifier[G](typeQual: CTypeQualifier[G])(implicit val o: Origin) extends CDeclarationSpecifier[G] with CTypeQualifierDeclarationSpecifierImpl[G]
-
-@family sealed trait CTypeQualifier[G] extends NodeFamily[G] with CTypeQualifierImpl[G]
-final case class CConst[G]()(implicit val o: Origin) extends CTypeQualifier[G] with CConstImpl[G]
-final case class CRestrict[G]()(implicit val o: Origin) extends CTypeQualifier[G] with CRestrictImpl[G]
-final case class CVolatile[G]()(implicit val o: Origin) extends CTypeQualifier[G] with CVolatileImpl[G]
-final case class CAtomic[G]()(implicit val o: Origin) extends CTypeQualifier[G] with CAtomicImpl[G]
-
-sealed trait CFunctionSpecifier[G] extends CDeclarationSpecifier[G] with CFunctionSpecifierImpl[G]
-sealed trait CAlignmentSpecifier[G] extends CDeclarationSpecifier[G] with CAlignmentSpecifierImpl[G]
+@family
+final case class CStructMemberDeclarator[G](
+    specs: Seq[CDeclarationSpecifier[G]],
+    decls: Seq[CDeclarator[G]],
+)(implicit val o: Origin)
+    extends Declaration[G] with CStructMemberDeclaratorImpl[G]
+
+final case class CTypeQualifierDeclarationSpecifier[G](
+    typeQual: CTypeQualifier[G]
+)(implicit val o: Origin)
+    extends CDeclarationSpecifier[G]
+    with CTypeQualifierDeclarationSpecifierImpl[G]
 
-sealed trait CGpgpuKernelSpecifier[G] extends CDeclarationSpecifier[G] with CGpgpuKernelSpecifierImpl[G]
-final case class CUDAKernel[G]()(val blame: Blame[KernelFailure])(implicit val o: Origin) extends CGpgpuKernelSpecifier[G] with CUDAKernelImpl[G]
-final case class OpenCLKernel[G]()(val blame: Blame[KernelFailure])(implicit val o: Origin) extends CGpgpuKernelSpecifier[G] with OpenCLKernelImpl[G]
+@family
+sealed trait CTypeQualifier[G] extends NodeFamily[G] with CTypeQualifierImpl[G]
+final case class CConst[G]()(implicit val o: Origin)
+    extends CTypeQualifier[G] with CConstImpl[G]
+final case class CRestrict[G]()(implicit val o: Origin)
+    extends CTypeQualifier[G] with CRestrictImpl[G]
+final case class CVolatile[G]()(implicit val o: Origin)
+    extends CTypeQualifier[G] with CVolatileImpl[G]
+final case class CAtomic[G]()(implicit val o: Origin)
+    extends CTypeQualifier[G] with CAtomicImpl[G]
+
+sealed trait CFunctionSpecifier[G]
+    extends CDeclarationSpecifier[G] with CFunctionSpecifierImpl[G]
+sealed trait CAlignmentSpecifier[G]
+    extends CDeclarationSpecifier[G] with CAlignmentSpecifierImpl[G]
+
+sealed trait CGpgpuKernelSpecifier[G]
+    extends CDeclarationSpecifier[G] with CGpgpuKernelSpecifierImpl[G]
+final case class CUDAKernel[G]()(val blame: Blame[KernelFailure])(
+    implicit val o: Origin
+) extends CGpgpuKernelSpecifier[G] with CUDAKernelImpl[G]
+final case class OpenCLKernel[G]()(val blame: Blame[KernelFailure])(
+    implicit val o: Origin
+) extends CGpgpuKernelSpecifier[G] with OpenCLKernelImpl[G]
 
-@family final case class CPointer[G](qualifiers: Seq[CTypeQualifier[G]])(implicit val o: Origin) extends NodeFamily[G] with CPointerImpl[G]
+@family
+final case class CPointer[G](qualifiers: Seq[CTypeQualifier[G]])(
+    implicit val o: Origin
+) extends NodeFamily[G] with CPointerImpl[G]
 
-@family final class CParam[G](val specifiers: Seq[CDeclarationSpecifier[G]], val declarator: CDeclarator[G])(implicit val o: Origin) extends Declaration[G] with CParamImpl[G]
+@family
+final class CParam[G](
+    val specifiers: Seq[CDeclarationSpecifier[G]],
+    val declarator: CDeclarator[G],
+)(implicit val o: Origin)
+    extends Declaration[G] with CParamImpl[G]
 
-@family sealed trait CDeclarator[G] extends NodeFamily[G] with CDeclaratorImpl[G]
-final case class CPointerDeclarator[G](pointers: Seq[CPointer[G]], inner: CDeclarator[G])(implicit val o: Origin) extends CDeclarator[G] with CPointerDeclaratorImpl[G]
-final case class CArrayDeclarator[G](qualifiers: Seq[CTypeQualifier[G]], size: Option[Expr[G]], inner: CDeclarator[G])(val blame: Blame[ArraySizeError])(implicit val o: Origin) extends CDeclarator[G] with CArrayDeclaratorImpl[G]
-final case class CTypeExtensionDeclarator[G](extensions: Seq[CTypeExtensions[G]], inner: CDeclarator[G])(implicit val o: Origin) extends CDeclarator[G] with CTypeExtensionDeclaratorImpl[G]
-final case class CTypedFunctionDeclarator[G](params: Seq[CParam[G]], varargs: Boolean, inner: CDeclarator[G])(implicit val o: Origin) extends CDeclarator[G] with CTypedFunctionDeclaratorImpl[G]
-final case class CAnonymousFunctionDeclarator[G](params: Seq[String], inner: CDeclarator[G])(implicit val o: Origin) extends CDeclarator[G] with CAnonymousFunctionDeclaratorImpl[G]
-final case class CName[G](name: String)(implicit val o: Origin) extends CDeclarator[G] with CNameImpl[G]
+@family
+sealed trait CDeclarator[G] extends NodeFamily[G] with CDeclaratorImpl[G]
+final case class CPointerDeclarator[G](
+    pointers: Seq[CPointer[G]],
+    inner: CDeclarator[G],
+)(implicit val o: Origin)
+    extends CDeclarator[G] with CPointerDeclaratorImpl[G]
+final case class CArrayDeclarator[G](
+    qualifiers: Seq[CTypeQualifier[G]],
+    size: Option[Expr[G]],
+    inner: CDeclarator[G],
+)(val blame: Blame[ArraySizeError])(implicit val o: Origin)
+    extends CDeclarator[G] with CArrayDeclaratorImpl[G]
+final case class CTypeExtensionDeclarator[G](
+    extensions: Seq[CTypeExtensions[G]],
+    inner: CDeclarator[G],
+)(implicit val o: Origin)
+    extends CDeclarator[G] with CTypeExtensionDeclaratorImpl[G]
+final case class CTypedFunctionDeclarator[G](
+    params: Seq[CParam[G]],
+    varargs: Boolean,
+    inner: CDeclarator[G],
+)(implicit val o: Origin)
+    extends CDeclarator[G] with CTypedFunctionDeclaratorImpl[G]
+final case class CAnonymousFunctionDeclarator[G](
+    params: Seq[String],
+    inner: CDeclarator[G],
+)(implicit val o: Origin)
+    extends CDeclarator[G] with CAnonymousFunctionDeclaratorImpl[G]
+final case class CName[G](name: String)(implicit val o: Origin)
+    extends CDeclarator[G] with CNameImpl[G]
 
-@family sealed trait CTypeExtensions[G] extends NodeFamily[G] with CTypeExtensionsImpl[G]
-final case class CTypeAttribute[G](name: String, args: Seq[Expr[G]])(implicit val o: Origin) extends CTypeExtensions[G] with CTypeAttributeImpl[G]
+@family
+sealed trait CTypeExtensions[G]
+    extends NodeFamily[G] with CTypeExtensionsImpl[G]
+final case class CTypeAttribute[G](name: String, args: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends CTypeExtensions[G] with CTypeAttributeImpl[G]
 
-@family final case class CInit[G](decl: CDeclarator[G], init: Option[Expr[G]])(implicit val o: Origin) extends NodeFamily[G] with CInitImpl[G] {
+@family
+final case class CInit[G](decl: CDeclarator[G], init: Option[Expr[G]])(
+    implicit val o: Origin
+) extends NodeFamily[G] with CInitImpl[G] {
   var ref: Option[RefCFunctionDefinition[G]] = None
 }
 
-@family final case class CDeclaration[G](contract: ApplicableContract[G], kernelInvariant: Expr[G], specs: Seq[CDeclarationSpecifier[G]], inits: Seq[CInit[G]])(implicit val o: Origin) extends NodeFamily[G] with CDeclarationImpl[G]
-
-final class CTranslationUnit[G](val declarations: Seq[GlobalDeclaration[G]])(implicit val o: Origin) extends GlobalDeclaration[G] with Declarator[G] with CTranslationUnitImpl[G]
-
-sealed trait CAbstractDeclaration[G] extends GlobalDeclaration[G] with CAbstractDeclarationImpl[G]
-
-@scopes[CLocalDeclaration] @scopes[CParam] final class CGlobalDeclaration[G](val decl: CDeclaration[G])(implicit val o: Origin) extends CAbstractDeclaration[G] with CGlobalDeclarationImpl[G]
-@family final class CLocalDeclaration[G](val decl: CDeclaration[G])(implicit val o: Origin) extends Declaration[G] with CLocalDeclarationImpl[G]
-@scopes[LabelDecl] @scopes[CLocalDeclaration] @scopes[CParam] final class CFunctionDefinition[G](val contract: ApplicableContract[G], val specs: Seq[CDeclarationSpecifier[G]], val declarator: CDeclarator[G], val body: Statement[G])(val blame: Blame[CallableFailure])(implicit val o: Origin) extends CAbstractDeclaration[G] with CFunctionDefinitionImpl[G] {
+@family
+final case class CDeclaration[G](
+    contract: ApplicableContract[G],
+    kernelInvariant: Expr[G],
+    specs: Seq[CDeclarationSpecifier[G]],
+    inits: Seq[CInit[G]],
+)(implicit val o: Origin)
+    extends NodeFamily[G] with CDeclarationImpl[G]
+
+final class CTranslationUnit[G](val declarations: Seq[GlobalDeclaration[G]])(
+    implicit val o: Origin
+) extends GlobalDeclaration[G] with Declarator[G] with CTranslationUnitImpl[G]
+
+sealed trait CAbstractDeclaration[G]
+    extends GlobalDeclaration[G] with CAbstractDeclarationImpl[G]
+
+@scopes[CLocalDeclaration]
+@scopes[CParam]
+final class CGlobalDeclaration[G](val decl: CDeclaration[G])(
+    implicit val o: Origin
+) extends CAbstractDeclaration[G] with CGlobalDeclarationImpl[G]
+@family
+final class CLocalDeclaration[G](val decl: CDeclaration[G])(
+    implicit val o: Origin
+) extends Declaration[G] with CLocalDeclarationImpl[G]
+@scopes[LabelDecl]
+@scopes[CLocalDeclaration]
+@scopes[CParam]
+final class CFunctionDefinition[G](
+    val contract: ApplicableContract[G],
+    val specs: Seq[CDeclarationSpecifier[G]],
+    val declarator: CDeclarator[G],
+    val body: Statement[G],
+)(val blame: Blame[CallableFailure])(implicit val o: Origin)
+    extends CAbstractDeclaration[G] with CFunctionDefinitionImpl[G] {
   var ref: Option[RefCGlobalDeclaration[G]] = None
 }
 
 sealed trait CStatement[G] extends Statement[G] with CStatementImpl[G]
-final case class CDeclarationStatement[G](decl: CLocalDeclaration[G])(implicit val o: Origin) extends CStatement[G] with PurelySequentialStatement[G] with CDeclarationStatementImpl[G]
-final case class CGoto[G](label: String)(implicit val o: Origin) extends CStatement[G] with CGotoImpl[G] {
+final case class CDeclarationStatement[G](decl: CLocalDeclaration[G])(
+    implicit val o: Origin
+) extends CStatement[G]
+    with PurelySequentialStatement[G]
+    with CDeclarationStatementImpl[G]
+final case class CGoto[G](label: String)(implicit val o: Origin)
+    extends CStatement[G] with CGotoImpl[G] {
   var ref: Option[LabelDecl[G]] = None
 }
 
-@family sealed trait GpuMemoryFence[G] extends NodeFamily[G] with GpuMemoryFenceImpl[G]
-final case class GpuLocalMemoryFence[G]()(implicit val o: Origin) extends GpuMemoryFence[G] with GpuLocalMemoryFenceImpl[G]
-final case class GpuGlobalMemoryFence[G]()(implicit val o: Origin) extends GpuMemoryFence[G] with GpuGlobalMemoryFenceImpl[G]
-final case class GpuZeroMemoryFence[G](value: BigInt)(implicit val o: Origin) extends GpuMemoryFence[G] with GpuZeroMemoryFenceImpl[G]
-
-final case class GpgpuBarrier[G](requires: Expr[G], ensures: Expr[G], specifiers: Seq[GpuMemoryFence[G]])(val blame: Blame[KernelBarrierFailure])(implicit val o: Origin) extends CStatement[G] with GpgpuBarrierImpl[G]
-final case class GpgpuAtomic[G](impl: Statement[G], before: Statement[G], after: Statement[G])(implicit val o: Origin) extends CStatement[G] with GpgpuAtomicImpl[G]
+@family
+sealed trait GpuMemoryFence[G] extends NodeFamily[G] with GpuMemoryFenceImpl[G]
+final case class GpuLocalMemoryFence[G]()(implicit val o: Origin)
+    extends GpuMemoryFence[G] with GpuLocalMemoryFenceImpl[G]
+final case class GpuGlobalMemoryFence[G]()(implicit val o: Origin)
+    extends GpuMemoryFence[G] with GpuGlobalMemoryFenceImpl[G]
+final case class GpuZeroMemoryFence[G](value: BigInt)(implicit val o: Origin)
+    extends GpuMemoryFence[G] with GpuZeroMemoryFenceImpl[G]
+
+final case class GpgpuBarrier[G](
+    requires: Expr[G],
+    ensures: Expr[G],
+    specifiers: Seq[GpuMemoryFence[G]],
+)(val blame: Blame[KernelBarrierFailure])(implicit val o: Origin)
+    extends CStatement[G] with GpgpuBarrierImpl[G]
+final case class GpgpuAtomic[G](
+    impl: Statement[G],
+    before: Statement[G],
+    after: Statement[G],
+)(implicit val o: Origin)
+    extends CStatement[G] with GpgpuAtomicImpl[G]
 
 sealed trait CExpr[G] extends Expr[G] with CExprImpl[G]
-final case class CLocal[G](name: String)(val blame: Blame[DerefInsufficientPermission])(implicit val o: Origin) extends CExpr[G] with CLocalImpl[G] {
+final case class CLocal[G](name: String)(
+    val blame: Blame[DerefInsufficientPermission]
+)(implicit val o: Origin)
+    extends CExpr[G] with CLocalImpl[G] {
   var ref: Option[CNameTarget[G]] = None
 }
-final case class CInvocation[G](applicable: Expr[G], args: Seq[Expr[G]], givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[FrontendInvocationError])(implicit val o: Origin) extends CExpr[G] with CInvocationImpl[G] {
+final case class CInvocation[G](
+    applicable: Expr[G],
+    args: Seq[Expr[G]],
+    givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[FrontendInvocationError])(implicit val o: Origin)
+    extends CExpr[G] with CInvocationImpl[G] {
   var ref: Option[CInvocationTarget[G]] = None
 }
-final case class CFieldAccess[G](obj: Expr[G], field: String)(val blame: Blame[FrontendDerefError])(implicit val o: Origin) extends CExpr[G] with CFieldAccessImpl[G] {
+final case class CFieldAccess[G](obj: Expr[G], field: String)(
+    val blame: Blame[FrontendDerefError]
+)(implicit val o: Origin)
+    extends CExpr[G] with CFieldAccessImpl[G] {
   var ref: Option[CDerefTarget[G]] = None
 }
-final case class CStructDeref[G](struct: Expr[G], field: String)(val blame: Blame[FrontendDerefError])(implicit val o: Origin) extends CExpr[G] with CStructDerefImpl[G] {
+final case class CStructDeref[G](struct: Expr[G], field: String)(
+    val blame: Blame[FrontendDerefError]
+)(implicit val o: Origin)
+    extends CExpr[G] with CStructDerefImpl[G] {
   var ref: Option[CDerefTarget[G]] = None
 }
 //TODO: Define real blame for a kernel invocation
-final case class GpgpuCudaKernelInvocation[G](kernel: String, blocks: Expr[G], threads: Expr[G], args: Seq[Expr[G]], givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[FrontendInvocationError])(implicit val o: Origin) extends CExpr[G] with GpgpuCudaKernelInvocationImpl[G] {
+final case class GpgpuCudaKernelInvocation[G](
+    kernel: String,
+    blocks: Expr[G],
+    threads: Expr[G],
+    args: Seq[Expr[G]],
+    givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[FrontendInvocationError])(implicit val o: Origin)
+    extends CExpr[G] with GpgpuCudaKernelInvocationImpl[G] {
   var ref: Option[CInvocationTarget[G]] = None
 }
 
-final case class CCast[G](expr: Expr[G], castType: Type[G])(implicit val o: Origin) extends CExpr[G] with CCastImpl[G]
+final case class CCast[G](expr: Expr[G], castType: Type[G])(
+    implicit val o: Origin
+) extends CExpr[G] with CCastImpl[G]
 
-final case class CLiteralArray[G](exprs: Seq[Expr[G]])(implicit val o: Origin) extends CExpr[G] with CLiteralArrayImpl[G]
+final case class CLiteralArray[G](exprs: Seq[Expr[G]])(implicit val o: Origin)
+    extends CExpr[G] with CLiteralArrayImpl[G]
 
 sealed trait CType[G] extends Type[G] with CTypeImpl[G]
-final case class TCInt[G]()(implicit val o: Origin = DiagnosticOrigin) extends IntType[G] with CType[G] with TCIntImpl[G]
-final case class TCFloat[G](exponent: Int, mantissa: Int)(implicit val o: Origin = DiagnosticOrigin) extends FloatType[G] with CType[G] with TCFloatImpl[G]
-final case class CPrimitiveType[G](specifiers: Seq[CDeclarationSpecifier[G]])(implicit val o: Origin = DiagnosticOrigin) extends CType[G] with CPrimitiveTypeImpl[G]
-final case class CTPointer[G](innerType: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends CType[G] with CTPointerImpl[G]
-final case class CTArray[G](size: Option[Expr[G]], innerType: Type[G])(val blame: Blame[ArraySizeError])(implicit val o: Origin = DiagnosticOrigin) extends CType[G] with CTArrayImpl[G]
-final case class CTStruct[G](ref: Ref[G, CGlobalDeclaration[G]])(implicit val o: Origin = DiagnosticOrigin) extends CType[G] with CTStructImpl[G]
-final case class CTVector[G](size: Expr[G], innerType: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends CType[G] with CTVectorImpl[G]
-final case class TOpenCLVector[G](size: BigInt, innerType: Type[G])(implicit val o: Origin = DiagnosticOrigin) extends CType[G]  with TOpenCLVectorImpl[G]
-final case class CTCudaVec[G]()(implicit val o: Origin = DiagnosticOrigin) extends CType[G] with CTCudaVecImpl[G]
-
-@family sealed trait CPPDeclarationSpecifier[G] extends NodeFamily[G] with CPPDeclarationSpecifierImpl[G]
-
-sealed trait CPPSpecificationModifier[G] extends CPPDeclarationSpecifier[G] with CPPSpecificationModifierImpl[G]
-final case class CPPPure[G]()(implicit val o: Origin) extends CPPSpecificationModifier[G] with CPPPureImpl[G]
-final case class CPPInline[G]()(implicit val o: Origin) extends CPPSpecificationModifier[G] with CPPInlineImpl[G]
-
-sealed trait CPPTypeSpecifier[G] extends CPPDeclarationSpecifier[G] with CPPTypeSpecifierImpl[G]
-final case class CPPVoid[G]()(implicit val o: Origin) extends CPPTypeSpecifier[G] with CPPVoidImpl[G]
-final case class CPPChar[G]()(implicit val o: Origin) extends CPPTypeSpecifier[G] with CPPCharImpl[G]
-final case class CPPShort[G]()(implicit val o: Origin) extends CPPTypeSpecifier[G] with CPPShortImpl[G]
-final case class CPPInt[G]()(implicit val o: Origin) extends CPPTypeSpecifier[G] with CPPIntImpl[G]
-final case class CPPLong[G]()(implicit val o: Origin) extends CPPTypeSpecifier[G] with CPPLongImpl[G]
-final case class CPPSigned[G]()(implicit val o: Origin) extends CPPTypeSpecifier[G] with CPPSignedImpl[G]
-final case class CPPUnsigned[G]()(implicit val o: Origin) extends CPPTypeSpecifier[G] with CPPUnsignedImpl[G]
-final case class CPPBool[G]()(implicit val o: Origin) extends CPPTypeSpecifier[G] with CPPBoolImpl[G]
-final case class CPPTypedefName[G](var nestedName: String, genericArgs: Seq[CPPExprOrTypeSpecifier[G]])(implicit val o: Origin) extends CPPTypeSpecifier[G] with CPPTypedefNameImpl[G] {
+final case class TCInt[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends IntType[G] with CType[G] with TCIntImpl[G]
+final case class TCFloat[G](exponent: Int, mantissa: Int)(
+    implicit val o: Origin = DiagnosticOrigin
+) extends FloatType[G] with CType[G] with TCFloatImpl[G]
+final case class CPrimitiveType[G](specifiers: Seq[CDeclarationSpecifier[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends CType[G] with CPrimitiveTypeImpl[G]
+final case class CTPointer[G](innerType: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends CType[G] with CTPointerImpl[G]
+final case class CTArray[G](size: Option[Expr[G]], innerType: Type[G])(
+    val blame: Blame[ArraySizeError]
+)(implicit val o: Origin = DiagnosticOrigin)
+    extends CType[G] with CTArrayImpl[G]
+final case class CTStruct[G](ref: Ref[G, CGlobalDeclaration[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends CType[G] with CTStructImpl[G]
+final case class CTVector[G](size: Expr[G], innerType: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends CType[G] with CTVectorImpl[G]
+final case class TOpenCLVector[G](size: BigInt, innerType: Type[G])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends CType[G] with TOpenCLVectorImpl[G]
+final case class CTCudaVec[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends CType[G] with CTCudaVecImpl[G]
+
+@family
+sealed trait CPPDeclarationSpecifier[G]
+    extends NodeFamily[G] with CPPDeclarationSpecifierImpl[G]
+
+sealed trait CPPSpecificationModifier[G]
+    extends CPPDeclarationSpecifier[G] with CPPSpecificationModifierImpl[G]
+final case class CPPPure[G]()(implicit val o: Origin)
+    extends CPPSpecificationModifier[G] with CPPPureImpl[G]
+final case class CPPInline[G]()(implicit val o: Origin)
+    extends CPPSpecificationModifier[G] with CPPInlineImpl[G]
+
+sealed trait CPPTypeSpecifier[G]
+    extends CPPDeclarationSpecifier[G] with CPPTypeSpecifierImpl[G]
+final case class CPPVoid[G]()(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with CPPVoidImpl[G]
+final case class CPPChar[G]()(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with CPPCharImpl[G]
+final case class CPPShort[G]()(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with CPPShortImpl[G]
+final case class CPPInt[G]()(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with CPPIntImpl[G]
+final case class CPPLong[G]()(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with CPPLongImpl[G]
+final case class CPPSigned[G]()(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with CPPSignedImpl[G]
+final case class CPPUnsigned[G]()(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with CPPUnsignedImpl[G]
+final case class CPPBool[G]()(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with CPPBoolImpl[G]
+final case class CPPTypedefName[G](
+    var nestedName: String,
+    genericArgs: Seq[CPPExprOrTypeSpecifier[G]],
+)(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with CPPTypedefNameImpl[G] {
   var ref: Option[CPPTypeNameTarget[G]] = None
 }
-final case class CPPSpecificationType[G](t: Type[G])(implicit val o: Origin) extends CPPTypeSpecifier[G] with CPPSpecificationTypeImpl[G]
+final case class CPPSpecificationType[G](t: Type[G])(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with CPPSpecificationTypeImpl[G]
 
-@family sealed trait CPPAddressing[G] extends NodeFamily[G] with CPPAddressingImpl[G]
-final case class CPPPointer[G]()(implicit val o: Origin) extends CPPAddressing[G] with CPPPointerImpl[G]
-final case class CPPReference[G]()(implicit val o: Origin) extends CPPAddressing[G] with CPPReferenceImpl[G]
+@family
+sealed trait CPPAddressing[G] extends NodeFamily[G] with CPPAddressingImpl[G]
+final case class CPPPointer[G]()(implicit val o: Origin)
+    extends CPPAddressing[G] with CPPPointerImpl[G]
+final case class CPPReference[G]()(implicit val o: Origin)
+    extends CPPAddressing[G] with CPPReferenceImpl[G]
 
-@family final class CPPParam[G](val specifiers: Seq[CPPDeclarationSpecifier[G]], val declarator: CPPDeclarator[G])(implicit val o: Origin) extends Declaration[G] with CPPParamImpl[G]
+@family
+final class CPPParam[G](
+    val specifiers: Seq[CPPDeclarationSpecifier[G]],
+    val declarator: CPPDeclarator[G],
+)(implicit val o: Origin)
+    extends Declaration[G] with CPPParamImpl[G]
 
-@family sealed trait CPPDeclarator[G] extends NodeFamily[G] with CPPDeclaratorImpl[G]
-final case class CPPAddressingDeclarator[G](operators: Seq[CPPAddressing[G]], inner: CPPDeclarator[G])(implicit val o: Origin) extends CPPDeclarator[G] with CPPAddressingDeclaratorImpl[G]
-final case class CPPArrayDeclarator[G](size: Option[Expr[G]], inner: CPPDeclarator[G])(val blame: Blame[ArraySizeError])(implicit val o: Origin) extends CPPDeclarator[G] with CPPArrayDeclaratorImpl[G]
-final case class CPPTypedFunctionDeclarator[G](params: Seq[CPPParam[G]], varargs: Boolean, inner: CPPDeclarator[G])(implicit val o: Origin) extends CPPDeclarator[G] with CPPTypedFunctionDeclaratorImpl[G]
-final case class CPPLambdaDeclarator[G](params: Seq[CPPParam[G]])(implicit val o: Origin) extends CPPDeclarator[G] with CPPLambdaDeclaratorImpl[G]
-final case class CPPName[G](name: String)(implicit val o: Origin) extends CPPDeclarator[G] with CPPNameImpl[G]
+@family
+sealed trait CPPDeclarator[G] extends NodeFamily[G] with CPPDeclaratorImpl[G]
+final case class CPPAddressingDeclarator[G](
+    operators: Seq[CPPAddressing[G]],
+    inner: CPPDeclarator[G],
+)(implicit val o: Origin)
+    extends CPPDeclarator[G] with CPPAddressingDeclaratorImpl[G]
+final case class CPPArrayDeclarator[G](
+    size: Option[Expr[G]],
+    inner: CPPDeclarator[G],
+)(val blame: Blame[ArraySizeError])(implicit val o: Origin)
+    extends CPPDeclarator[G] with CPPArrayDeclaratorImpl[G]
+final case class CPPTypedFunctionDeclarator[G](
+    params: Seq[CPPParam[G]],
+    varargs: Boolean,
+    inner: CPPDeclarator[G],
+)(implicit val o: Origin)
+    extends CPPDeclarator[G] with CPPTypedFunctionDeclaratorImpl[G]
+final case class CPPLambdaDeclarator[G](params: Seq[CPPParam[G]])(
+    implicit val o: Origin
+) extends CPPDeclarator[G] with CPPLambdaDeclaratorImpl[G]
+final case class CPPName[G](name: String)(implicit val o: Origin)
+    extends CPPDeclarator[G] with CPPNameImpl[G]
 
-@family final case class CPPInit[G](decl: CPPDeclarator[G], init: Option[Expr[G]])(implicit val o: Origin) extends NodeFamily[G] with CPPInitImpl[G] {
+@family
+final case class CPPInit[G](decl: CPPDeclarator[G], init: Option[Expr[G]])(
+    implicit val o: Origin
+) extends NodeFamily[G] with CPPInitImpl[G] {
   var ref: Option[RefCPPFunctionDefinition[G]] = None
 }
 
-@family final case class CPPDeclaration[G](contract: ApplicableContract[G], specs: Seq[CPPDeclarationSpecifier[G]], inits: Seq[CPPInit[G]])(implicit val o: Origin) extends NodeFamily[G] with CPPDeclarationImpl[G]
-
-final class CPPTranslationUnit[G](val declarations: Seq[GlobalDeclaration[G]])(implicit val o: Origin) extends GlobalDeclaration[G] with Declarator[G] with CPPTranslationUnitImpl[G]
-
-sealed trait CPPAbstractDeclaration[G] extends GlobalDeclaration[G] with CPPAbstractDeclarationImpl[G]
-
-@scopes[CPPLocalDeclaration] @scopes[CPPParam] final class CPPGlobalDeclaration[G](val decl: CPPDeclaration[G])(implicit val o: Origin) extends CPPAbstractDeclaration[G] with CPPGlobalDeclarationImpl[G]
-@family final class CPPLocalDeclaration[G](val decl: CPPDeclaration[G])(implicit val o: Origin) extends Declaration[G] with CPPLocalDeclarationImpl[G]
-@scopes[LabelDecl] @scopes[CPPLocalDeclaration] @scopes[CPPParam] final class CPPFunctionDefinition[G](val contract: ApplicableContract[G], val specs: Seq[CPPDeclarationSpecifier[G]], val declarator: CPPDeclarator[G], val body: Statement[G])(val blame: Blame[CallableFailure])(implicit val o: Origin) extends GlobalDeclaration[G] with CPPFunctionDefinitionImpl[G] {
+@family
+final case class CPPDeclaration[G](
+    contract: ApplicableContract[G],
+    specs: Seq[CPPDeclarationSpecifier[G]],
+    inits: Seq[CPPInit[G]],
+)(implicit val o: Origin)
+    extends NodeFamily[G] with CPPDeclarationImpl[G]
+
+final class CPPTranslationUnit[G](val declarations: Seq[GlobalDeclaration[G]])(
+    implicit val o: Origin
+) extends GlobalDeclaration[G] with Declarator[G] with CPPTranslationUnitImpl[G]
+
+sealed trait CPPAbstractDeclaration[G]
+    extends GlobalDeclaration[G] with CPPAbstractDeclarationImpl[G]
+
+@scopes[CPPLocalDeclaration]
+@scopes[CPPParam]
+final class CPPGlobalDeclaration[G](val decl: CPPDeclaration[G])(
+    implicit val o: Origin
+) extends CPPAbstractDeclaration[G] with CPPGlobalDeclarationImpl[G]
+@family
+final class CPPLocalDeclaration[G](val decl: CPPDeclaration[G])(
+    implicit val o: Origin
+) extends Declaration[G] with CPPLocalDeclarationImpl[G]
+@scopes[LabelDecl]
+@scopes[CPPLocalDeclaration]
+@scopes[CPPParam]
+final class CPPFunctionDefinition[G](
+    val contract: ApplicableContract[G],
+    val specs: Seq[CPPDeclarationSpecifier[G]],
+    val declarator: CPPDeclarator[G],
+    val body: Statement[G],
+)(val blame: Blame[CallableFailure])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with CPPFunctionDefinitionImpl[G] {
   var ref: Option[RefCPPGlobalDeclaration[G]] = None
 }
 
 sealed trait CPPStatement[G] extends Statement[G] with CPPStatementImpl[G]
-final case class CPPDeclarationStatement[G](decl: CPPLocalDeclaration[G])(implicit val o: Origin) extends CPPStatement[G] with PurelySequentialStatement[G] with CPPDeclarationStatementImpl[G]
-final case class CPPLifetimeScope[G](body: Statement[G])(implicit val o: Origin) extends CPPStatement[G] with ControlContainerStatement[G] with CPPLifetimeScopeImpl[G]
+final case class CPPDeclarationStatement[G](decl: CPPLocalDeclaration[G])(
+    implicit val o: Origin
+) extends CPPStatement[G]
+    with PurelySequentialStatement[G]
+    with CPPDeclarationStatementImpl[G]
+final case class CPPLifetimeScope[G](body: Statement[G])(implicit val o: Origin)
+    extends CPPStatement[G]
+    with ControlContainerStatement[G]
+    with CPPLifetimeScopeImpl[G]
 
 sealed trait CPPExpr[G] extends Expr[G] with CPPExprImpl[G]
-final case class CPPLocal[G](name: String, genericArgs: Seq[CPPExprOrTypeSpecifier[G]])(val blame: Blame[DerefInsufficientPermission])(implicit val o: Origin) extends CPPExpr[G] with CPPLocalImpl[G] {
+final case class CPPLocal[G](
+    name: String,
+    genericArgs: Seq[CPPExprOrTypeSpecifier[G]],
+)(val blame: Blame[DerefInsufficientPermission])(implicit val o: Origin)
+    extends CPPExpr[G] with CPPLocalImpl[G] {
   var ref: Option[CPPNameTarget[G]] = None
 }
-final case class CPPClassMethodOrFieldAccess[G](classInstance: Expr[G], methodOrFieldName: String)(val blame: Blame[FrontendDerefError])(implicit val o: Origin) extends CPPExpr[G] with CPPClassMethodOrFieldAccessImpl[G] {
+final case class CPPClassMethodOrFieldAccess[G](
+    classInstance: Expr[G],
+    methodOrFieldName: String,
+)(val blame: Blame[FrontendDerefError])(implicit val o: Origin)
+    extends CPPExpr[G] with CPPClassMethodOrFieldAccessImpl[G] {
   var ref: Option[CPPDerefTarget[G]] = None
 }
-final case class CPPInvocation[G](applicable: Expr[G], args: Seq[Expr[G]], givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[FrontendInvocationError])(implicit val o: Origin) extends CPPExpr[G] with CPPInvocationImpl[G] {
+final case class CPPInvocation[G](
+    applicable: Expr[G],
+    args: Seq[Expr[G]],
+    givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[FrontendInvocationError])(implicit val o: Origin)
+    extends CPPExpr[G] with CPPInvocationImpl[G] {
   var ref: Option[CPPInvocationTarget[G]] = None
 }
-final case class CPPLambdaRef[G]()(implicit val o: Origin) extends CPPExpr[G] with CPPLambdaRefImpl[G]
-final case class CPPLambdaDefinition[G](contract: ApplicableContract[G], declarator: CPPDeclarator[G], body: Statement[G])(val blame: Blame[SYCLKernelLambdaFailure])(implicit val o: Origin) extends CPPExpr[G] with CPPLambdaDefinitionImpl[G]
-
-final case class CPPLiteralArray[G](exprs: Seq[Expr[G]])(implicit val o: Origin) extends CPPExpr[G] with CPPLiteralArrayImpl[G]
+final case class CPPLambdaRef[G]()(implicit val o: Origin)
+    extends CPPExpr[G] with CPPLambdaRefImpl[G]
+final case class CPPLambdaDefinition[G](
+    contract: ApplicableContract[G],
+    declarator: CPPDeclarator[G],
+    body: Statement[G],
+)(val blame: Blame[SYCLKernelLambdaFailure])(implicit val o: Origin)
+    extends CPPExpr[G] with CPPLambdaDefinitionImpl[G]
+
+final case class CPPLiteralArray[G](exprs: Seq[Expr[G]])(implicit val o: Origin)
+    extends CPPExpr[G] with CPPLiteralArrayImpl[G]
 
 sealed trait CPPType[G] extends Type[G] with CPPTypeImpl[G]
-final case class CPPPrimitiveType[G](specifiers: Seq[CPPDeclarationSpecifier[G]])(implicit val o: Origin = DiagnosticOrigin) extends CPPType[G] with CPPPrimitiveTypeImpl[G]
-final case class CPPTArray[G](size: Option[Expr[G]], innerType: Type[G])(val blame: Blame[ArraySizeError])(implicit val o: Origin = DiagnosticOrigin) extends CPPType[G] with CPPTArrayImpl[G]
-final case class CPPTLambda[G]()(implicit val o: Origin) extends CPPType[G] with CPPTLambdaImpl[G]
+final case class CPPPrimitiveType[G](
+    specifiers: Seq[CPPDeclarationSpecifier[G]]
+)(implicit val o: Origin = DiagnosticOrigin)
+    extends CPPType[G] with CPPPrimitiveTypeImpl[G]
+final case class CPPTArray[G](size: Option[Expr[G]], innerType: Type[G])(
+    val blame: Blame[ArraySizeError]
+)(implicit val o: Origin = DiagnosticOrigin)
+    extends CPPType[G] with CPPTArrayImpl[G]
+final case class CPPTLambda[G]()(implicit val o: Origin)
+    extends CPPType[G] with CPPTLambdaImpl[G]
 
-@family final case class CPPExprOrTypeSpecifier[G](expr: Option[Expr[G]], typeSpec: Option[CPPDeclarationSpecifier[G]])(implicit val o: Origin) extends NodeFamily[G] with CPPExprOrTypeSpecifierImpl[G]
-
-final case class SYCLClassDefName[G](name: String, genericArgs: Seq[CPPExprOrTypeSpecifier[G]])(implicit val o: Origin) extends CPPTypeSpecifier[G] with SYCLClassDefNameImpl[G]
+@family
+final case class CPPExprOrTypeSpecifier[G](
+    expr: Option[Expr[G]],
+    typeSpec: Option[CPPDeclarationSpecifier[G]],
+)(implicit val o: Origin)
+    extends NodeFamily[G] with CPPExprOrTypeSpecifierImpl[G]
+
+final case class SYCLClassDefName[G](
+    name: String,
+    genericArgs: Seq[CPPExprOrTypeSpecifier[G]],
+)(implicit val o: Origin)
+    extends CPPTypeSpecifier[G] with SYCLClassDefNameImpl[G]
 
 sealed trait SYCLTClass[G] extends Type[G] with SYCLTClassImpl[G]
-sealed trait SYCLTConstructableClass[G] extends SYCLTClass[G] with SYCLTConstructableClassImpl[G]
-final case class SYCLTEvent[G]()(implicit val o: Origin) extends SYCLTClass[G] with SYCLTEventImpl[G]
-final case class SYCLTHandler[G]()(implicit val o: Origin) extends SYCLTClass[G] with SYCLTHandlerImpl[G]
-final case class SYCLTQueue[G]()(implicit val o: Origin) extends SYCLTClass[G] with SYCLTQueueImpl[G]
-final case class SYCLTItem[G](dimCount: Int = 1)(implicit val o: Origin) extends SYCLTClass[G] with SYCLTItemImpl[G]
-final case class SYCLTNDItem[G](dimCount: Int = 1)(implicit val o: Origin) extends SYCLTClass[G] with SYCLTNDItemImpl[G]
-final case class SYCLTRange[G](dimCount: Int = 1)(implicit val o: Origin) extends SYCLTConstructableClass[G] with SYCLTRangeImpl[G]
-final case class SYCLTNDRange[G](dimCount: Int = 1)(implicit val o: Origin) extends SYCLTConstructableClass[G] with SYCLTNDRangeImpl[G]
-final case class SYCLTBuffer[G](typ: Type[G] = TBool[G](), dimCount: Int = 1)(implicit val o: Origin) extends SYCLTConstructableClass[G] with SYCLTBufferImpl[G]
-final case class SYCLTAccessor[G](typ: Type[G] = TBool[G](), dimCount: Int = 1, readOnly: Boolean = false)(implicit val o: Origin) extends SYCLTConstructableClass[G] with SYCLTAccessorImpl[G]
-final case class SYCLTLocalAccessor[G](typ: Type[G] = TBool[G](), dimCount: Int = 1)(implicit val o: Origin) extends SYCLTConstructableClass[G] with SYCLTLocalAccessorImpl[G]
-final case class SYCLTAccessMode[G]()(implicit val o: Origin) extends SYCLTClass[G] with SYCLTAccessModeImpl[G]
+sealed trait SYCLTConstructableClass[G]
+    extends SYCLTClass[G] with SYCLTConstructableClassImpl[G]
+final case class SYCLTEvent[G]()(implicit val o: Origin)
+    extends SYCLTClass[G] with SYCLTEventImpl[G]
+final case class SYCLTHandler[G]()(implicit val o: Origin)
+    extends SYCLTClass[G] with SYCLTHandlerImpl[G]
+final case class SYCLTQueue[G]()(implicit val o: Origin)
+    extends SYCLTClass[G] with SYCLTQueueImpl[G]
+final case class SYCLTItem[G](dimCount: Int = 1)(implicit val o: Origin)
+    extends SYCLTClass[G] with SYCLTItemImpl[G]
+final case class SYCLTNDItem[G](dimCount: Int = 1)(implicit val o: Origin)
+    extends SYCLTClass[G] with SYCLTNDItemImpl[G]
+final case class SYCLTRange[G](dimCount: Int = 1)(implicit val o: Origin)
+    extends SYCLTConstructableClass[G] with SYCLTRangeImpl[G]
+final case class SYCLTNDRange[G](dimCount: Int = 1)(implicit val o: Origin)
+    extends SYCLTConstructableClass[G] with SYCLTNDRangeImpl[G]
+final case class SYCLTBuffer[G](typ: Type[G] = TBool[G](), dimCount: Int = 1)(
+    implicit val o: Origin
+) extends SYCLTConstructableClass[G] with SYCLTBufferImpl[G]
+final case class SYCLTAccessor[G](
+    typ: Type[G] = TBool[G](),
+    dimCount: Int = 1,
+    readOnly: Boolean = false,
+)(implicit val o: Origin)
+    extends SYCLTConstructableClass[G] with SYCLTAccessorImpl[G]
+final case class SYCLTLocalAccessor[G](
+    typ: Type[G] = TBool[G](),
+    dimCount: Int = 1,
+)(implicit val o: Origin)
+    extends SYCLTConstructableClass[G] with SYCLTLocalAccessorImpl[G]
+final case class SYCLTAccessMode[G]()(implicit val o: Origin)
+    extends SYCLTClass[G] with SYCLTAccessModeImpl[G]
 
 sealed trait SYCLClassObject[G] extends CPPExpr[G]
-final case class SYCLRange[G](dimensions: Seq[Expr[G]])(implicit val o: Origin) extends SYCLClassObject[G] with SYCLRangeImpl[G]
-final case class SYCLNDRange[G](globalSize: Expr[G], localSize: Expr[G])(implicit val o: Origin) extends SYCLClassObject[G] with SYCLNDRangeImpl[G]
+final case class SYCLRange[G](dimensions: Seq[Expr[G]])(implicit val o: Origin)
+    extends SYCLClassObject[G] with SYCLRangeImpl[G]
+final case class SYCLNDRange[G](globalSize: Expr[G], localSize: Expr[G])(
+    implicit val o: Origin
+) extends SYCLClassObject[G] with SYCLNDRangeImpl[G]
+
+sealed trait SYCLAccessMode[G]
+    extends SYCLClassObject[G] with SYCLAccessModeImpl[G]
+final case class SYCLReadWriteAccess[G]()(implicit val o: Origin)
+    extends SYCLAccessMode[G] with SYCLReadWriteAccessImpl[G]
+final case class SYCLReadOnlyAccess[G]()(implicit val o: Origin)
+    extends SYCLAccessMode[G] with SYCLReadOnlyAccessImpl[G]
 
-sealed trait SYCLAccessMode[G] extends SYCLClassObject[G] with SYCLAccessModeImpl[G]
-final case class SYCLReadWriteAccess[G]()(implicit val o: Origin) extends SYCLAccessMode[G] with SYCLReadWriteAccessImpl[G]
-final case class SYCLReadOnlyAccess[G]()(implicit val o: Origin) extends SYCLAccessMode[G] with SYCLReadOnlyAccessImpl[G]
-
-@family final case class JavaName[G](names: Seq[String])(implicit val o: Origin) extends NodeFamily[G] with JavaNameImpl[G] {
+@family
+final case class JavaName[G](names: Seq[String])(implicit val o: Origin)
+    extends NodeFamily[G] with JavaNameImpl[G] {
   var ref: Option[JavaTypeNameTarget[G]] = None
 }
-@family final case class JavaImport[G](isStatic: Boolean, name: JavaName[G], star: Boolean)(implicit val o: Origin) extends NodeFamily[G] with JavaImportImpl[G]
-
-@family sealed trait JavaModifier[G] extends NodeFamily[G] with JavaModifierImpl[G]
-final case class JavaPublic[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaPublicImpl[G]
-final case class JavaProtected[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaProtectedImpl[G]
-final case class JavaPrivate[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaPrivateImpl[G]
-final case class JavaStatic[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaStaticImpl[G]
-final case class JavaAbstract[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaAbstractImpl[G]
-final case class JavaFinal[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaFinalImpl[G]
-final case class JavaStrictFP[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaStrictFPImpl[G]
-final case class JavaNative[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaNativeImpl[G]
-final case class JavaSynchronized[G]()(val blame: Blame[LockRegionFailure])(implicit val o: Origin) extends JavaModifier[G] with JavaSynchronizedImpl[G]
-final case class JavaTransient[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaTransientImpl[G]
-final case class JavaVolatile[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaVolatileImpl[G]
-final case class JavaAnnotation[G](name: Type[G], args: Seq[(String, Expr[G])]
-                                  )(val blame: Blame[JavaAnnotationFailure]
-                                  )(implicit val o: Origin) extends JavaModifier[G] with JavaAnnotationImpl[G] {
+@family
+final case class JavaImport[G](
+    isStatic: Boolean,
+    name: JavaName[G],
+    star: Boolean,
+)(implicit val o: Origin)
+    extends NodeFamily[G] with JavaImportImpl[G]
+
+@family
+sealed trait JavaModifier[G] extends NodeFamily[G] with JavaModifierImpl[G]
+final case class JavaPublic[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaPublicImpl[G]
+final case class JavaProtected[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaProtectedImpl[G]
+final case class JavaPrivate[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaPrivateImpl[G]
+final case class JavaStatic[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaStaticImpl[G]
+final case class JavaAbstract[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaAbstractImpl[G]
+final case class JavaFinal[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaFinalImpl[G]
+final case class JavaStrictFP[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaStrictFPImpl[G]
+final case class JavaNative[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaNativeImpl[G]
+final case class JavaSynchronized[G]()(val blame: Blame[LockRegionFailure])(
+    implicit val o: Origin
+) extends JavaModifier[G] with JavaSynchronizedImpl[G]
+final case class JavaTransient[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaTransientImpl[G]
+final case class JavaVolatile[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaVolatileImpl[G]
+final case class JavaAnnotation[G](name: Type[G], args: Seq[(String, Expr[G])])(
+    val blame: Blame[JavaAnnotationFailure]
+)(implicit val o: Origin)
+    extends JavaModifier[G] with JavaAnnotationImpl[G] {
   var data: Option[JavaAnnotationData[G]] = None
 }
 
-final case class JavaPure[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaPureImpl[G]
-final case class JavaInline[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaInlineImpl[G]
-final case class JavaBipAnnotation[G]()(implicit val o: Origin) extends JavaModifier[G] with JavaBipAnnotationImpl[G]
-
-@family final case class JavaVariableDeclaration[G](name: String, moreDims: Int, init: Option[Expr[G]])(implicit val o: Origin) extends NodeFamily[G] with JavaVariableDeclarationImpl[G]
-
-sealed trait JavaGlobalDeclaration[G] extends GlobalDeclaration[G] with JavaGlobalDeclarationImpl[G]
-final class JavaNamespace[G](val pkg: Option[JavaName[G]], val imports: Seq[JavaImport[G]], val declarations: Seq[GlobalDeclaration[G]])(implicit val o: Origin) extends JavaGlobalDeclaration[G] with Declarator[G] with JavaNamespaceImpl[G]
-
-sealed trait JavaClassOrInterface[G] extends JavaGlobalDeclaration[G] with Declarator[G] with JavaClassOrInterfaceImpl[G]
-@scopes[Variable] final class JavaClass[G](val name: String, val modifiers: Seq[JavaModifier[G]], val typeParams: Seq[Variable[G]], val intrinsicLockInvariant: Expr[G], val ext: Type[G], val imp: Seq[Type[G]], val decls: Seq[ClassDeclaration[G]])(val blame: Blame[JavaImplicitConstructorFailure])(implicit val o: Origin) extends JavaClassOrInterface[G] with JavaClassImpl[G]
-@scopes[Variable] final class JavaInterface[G](val name: String, val modifiers: Seq[JavaModifier[G]], val typeParams: Seq[Variable[G]], val ext: Seq[Type[G]], val decls: Seq[ClassDeclaration[G]])(implicit val o: Origin) extends JavaClassOrInterface[G] with JavaInterfaceImpl[G]
-final class JavaAnnotationInterface[G](val name: String, val modifiers: Seq[JavaModifier[G]], val ext: Type[G], val decls: Seq[ClassDeclaration[G]])(implicit val o: Origin) extends JavaClassOrInterface[G] with JavaAnnotationInterfaceImpl[G]
-
-sealed trait JavaClassDeclaration[G] extends ClassDeclaration[G] with JavaClassDeclarationImpl[G]
-final class JavaSharedInitialization[G](val isStatic: Boolean, val initialization: Statement[G])(implicit val o: Origin) extends JavaClassDeclaration[G] with JavaSharedInitializationImpl[G]
-final class JavaFields[G](val modifiers: Seq[JavaModifier[G]], val t: Type[G], val decls: Seq[JavaVariableDeclaration[G]])(implicit val o: Origin) extends JavaClassDeclaration[G] with JavaFieldsImpl[G]
-@scopes[LabelDecl] @scopes[JavaLocalDeclaration] @scopes[JavaParam] final class JavaConstructor[G](val modifiers: Seq[JavaModifier[G]], val name: String, val parameters: Seq[JavaParam[G]], val typeParameters: Seq[Variable[G]], val signals: Seq[Type[G]], val body: Statement[G], val contract: ApplicableContract[G])(val blame: Blame[JavaConstructorFailure])(implicit val o: Origin) extends JavaClassDeclaration[G] with JavaConstructorImpl[G]
-@family final class JavaParam[G](val modifiers: Seq[JavaModifier[G]], val name: String, val t: Type[G])(implicit val o: Origin) extends Declaration[G] with JavaParamImpl[G]
+final case class JavaPure[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaPureImpl[G]
+final case class JavaInline[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaInlineImpl[G]
+final case class JavaBipAnnotation[G]()(implicit val o: Origin)
+    extends JavaModifier[G] with JavaBipAnnotationImpl[G]
 
-@scopes[LabelDecl] @scopes[JavaLocalDeclaration] @scopes[JavaParam] final class JavaMethod[G](val modifiers: Seq[JavaModifier[G]], val returnType: Type[G], val dims: Int, val name: String, val parameters: Seq[JavaParam[G]], val typeParameters: Seq[Variable[G]], val signals: Seq[Type[G]], val body: Option[Statement[G]], val contract: ApplicableContract[G])(val blame: Blame[CallableFailure])(implicit val o: Origin) extends JavaClassDeclaration[G] with JavaMethodImpl[G]
-@scopes[JavaParam] final class JavaAnnotationMethod[G](val returnType: Type[G], val name: String, val default: Option[Expr[G]])(implicit val o: Origin) extends JavaClassDeclaration[G] with JavaAnnotationMethodImpl[G]
+@family
+final case class JavaVariableDeclaration[G](
+    name: String,
+    moreDims: Int,
+    init: Option[Expr[G]],
+)(implicit val o: Origin)
+    extends NodeFamily[G] with JavaVariableDeclarationImpl[G]
+
+sealed trait JavaGlobalDeclaration[G]
+    extends GlobalDeclaration[G] with JavaGlobalDeclarationImpl[G]
+final class JavaNamespace[G](
+    val pkg: Option[JavaName[G]],
+    val imports: Seq[JavaImport[G]],
+    val declarations: Seq[GlobalDeclaration[G]],
+)(implicit val o: Origin)
+    extends JavaGlobalDeclaration[G]
+    with Declarator[G]
+    with JavaNamespaceImpl[G]
+
+sealed trait JavaClassOrInterface[G]
+    extends JavaGlobalDeclaration[G]
+    with Declarator[G]
+    with JavaClassOrInterfaceImpl[G]
+@scopes[Variable]
+final class JavaClass[G](
+    val name: String,
+    val modifiers: Seq[JavaModifier[G]],
+    val typeParams: Seq[Variable[G]],
+    val intrinsicLockInvariant: Expr[G],
+    val ext: Type[G],
+    val imp: Seq[Type[G]],
+    val decls: Seq[ClassDeclaration[G]],
+)(val blame: Blame[JavaImplicitConstructorFailure])(implicit val o: Origin)
+    extends JavaClassOrInterface[G] with JavaClassImpl[G]
+@scopes[Variable]
+final class JavaInterface[G](
+    val name: String,
+    val modifiers: Seq[JavaModifier[G]],
+    val typeParams: Seq[Variable[G]],
+    val ext: Seq[Type[G]],
+    val decls: Seq[ClassDeclaration[G]],
+)(implicit val o: Origin)
+    extends JavaClassOrInterface[G] with JavaInterfaceImpl[G]
+final class JavaAnnotationInterface[G](
+    val name: String,
+    val modifiers: Seq[JavaModifier[G]],
+    val ext: Type[G],
+    val decls: Seq[ClassDeclaration[G]],
+)(implicit val o: Origin)
+    extends JavaClassOrInterface[G] with JavaAnnotationInterfaceImpl[G]
+
+sealed trait JavaClassDeclaration[G]
+    extends ClassDeclaration[G] with JavaClassDeclarationImpl[G]
+final class JavaSharedInitialization[G](
+    val isStatic: Boolean,
+    val initialization: Statement[G],
+)(implicit val o: Origin)
+    extends JavaClassDeclaration[G] with JavaSharedInitializationImpl[G]
+final class JavaFields[G](
+    val modifiers: Seq[JavaModifier[G]],
+    val t: Type[G],
+    val decls: Seq[JavaVariableDeclaration[G]],
+)(implicit val o: Origin)
+    extends JavaClassDeclaration[G] with JavaFieldsImpl[G]
+@scopes[LabelDecl]
+@scopes[JavaLocalDeclaration]
+@scopes[JavaParam]
+final class JavaConstructor[G](
+    val modifiers: Seq[JavaModifier[G]],
+    val name: String,
+    val parameters: Seq[JavaParam[G]],
+    val typeParameters: Seq[Variable[G]],
+    val signals: Seq[Type[G]],
+    val body: Statement[G],
+    val contract: ApplicableContract[G],
+)(val blame: Blame[JavaConstructorFailure])(implicit val o: Origin)
+    extends JavaClassDeclaration[G] with JavaConstructorImpl[G]
+@family
+final class JavaParam[G](
+    val modifiers: Seq[JavaModifier[G]],
+    val name: String,
+    val t: Type[G],
+)(implicit val o: Origin)
+    extends Declaration[G] with JavaParamImpl[G]
+
+@scopes[LabelDecl]
+@scopes[JavaLocalDeclaration]
+@scopes[JavaParam]
+final class JavaMethod[G](
+    val modifiers: Seq[JavaModifier[G]],
+    val returnType: Type[G],
+    val dims: Int,
+    val name: String,
+    val parameters: Seq[JavaParam[G]],
+    val typeParameters: Seq[Variable[G]],
+    val signals: Seq[Type[G]],
+    val body: Option[Statement[G]],
+    val contract: ApplicableContract[G],
+)(val blame: Blame[CallableFailure])(implicit val o: Origin)
+    extends JavaClassDeclaration[G] with JavaMethodImpl[G]
+@scopes[JavaParam]
+final class JavaAnnotationMethod[G](
+    val returnType: Type[G],
+    val name: String,
+    val default: Option[Expr[G]],
+)(implicit val o: Origin)
+    extends JavaClassDeclaration[G] with JavaAnnotationMethodImpl[G]
 
-@family final class JavaLocalDeclaration[G](val modifiers: Seq[JavaModifier[G]], val t: Type[G], val decls: Seq[JavaVariableDeclaration[G]])(implicit val o: Origin) extends Declaration[G] with JavaLocalDeclarationImpl[G]
+@family
+final class JavaLocalDeclaration[G](
+    val modifiers: Seq[JavaModifier[G]],
+    val t: Type[G],
+    val decls: Seq[JavaVariableDeclaration[G]],
+)(implicit val o: Origin)
+    extends Declaration[G] with JavaLocalDeclarationImpl[G]
 
 sealed trait JavaStatement[G] extends Statement[G] with JavaStatementImpl[G]
-final case class JavaLocalDeclarationStatement[G](decl: JavaLocalDeclaration[G])(implicit val o: Origin) extends JavaStatement[G] with PurelySequentialStatement[G] with JavaLocalDeclarationStatementImpl[G]
+final case class JavaLocalDeclarationStatement[G](
+    decl: JavaLocalDeclaration[G]
+)(implicit val o: Origin)
+    extends JavaStatement[G]
+    with PurelySequentialStatement[G]
+    with JavaLocalDeclarationStatementImpl[G]
 
 sealed trait JavaType[G] extends Type[G] with JavaTypeImpl[G]
-final case class JavaNamedType[G](names: Seq[(String, Option[Seq[Type[G]]])])(implicit val o: Origin) extends JavaType[G] with JavaNamedTypeImpl[G] {
+final case class JavaNamedType[G](names: Seq[(String, Option[Seq[Type[G]]])])(
+    implicit val o: Origin
+) extends JavaType[G] with JavaNamedTypeImpl[G] {
   var ref: Option[JavaTypeNameTarget[G]] = None
 }
-final case class JavaTClass[G](ref: Ref[G, JavaClassOrInterface[G]], typeArgs: Seq[Type[G]])(implicit val o: Origin = DiagnosticOrigin) extends JavaType[G] with JavaTClassImpl[G]
+final case class JavaTClass[G](
+    ref: Ref[G, JavaClassOrInterface[G]],
+    typeArgs: Seq[Type[G]],
+)(implicit val o: Origin = DiagnosticOrigin)
+    extends JavaType[G] with JavaTClassImpl[G]
 
-final case class JavaWildcard[G]()(implicit val o: Origin = DiagnosticOrigin) extends JavaType[G] with JavaWildcardImpl[G]
+final case class JavaWildcard[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends JavaType[G] with JavaWildcardImpl[G]
 
 sealed trait JavaExpr[G] extends Expr[G] with JavaExprImpl[G]
-final case class JavaLocal[G](name: String)(val blame: Blame[DerefInsufficientPermission])(implicit val o: Origin) extends JavaExpr[G] with JavaLocalImpl[G] {
+final case class JavaLocal[G](name: String)(
+    val blame: Blame[DerefInsufficientPermission]
+)(implicit val o: Origin)
+    extends JavaExpr[G] with JavaLocalImpl[G] {
   var ref: Option[JavaNameTarget[G]] = None
 }
-final case class JavaDeref[G](obj: Expr[G], field: String)(val blame: Blame[FrontendDerefError])(implicit val o: Origin) extends JavaExpr[G] with JavaDerefImpl[G] {
+final case class JavaDeref[G](obj: Expr[G], field: String)(
+    val blame: Blame[FrontendDerefError]
+)(implicit val o: Origin)
+    extends JavaExpr[G] with JavaDerefImpl[G] {
   var ref: Option[JavaDerefTarget[G]] = None
 }
-final case class JavaLiteralArray[G](exprs: Seq[Expr[G]])(implicit val o: Origin) extends JavaExpr[G] with JavaLiteralArrayImpl[G] {
+final case class JavaLiteralArray[G](exprs: Seq[Expr[G]])(
+    implicit val o: Origin
+) extends JavaExpr[G] with JavaLiteralArrayImpl[G] {
   var typeContext: Option[TArray[G]] = None
 }
-final case class JavaInvocation[G](obj: Option[Expr[G]], typeParams: Seq[Type[G]], method: String, arguments: Seq[Expr[G]], givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[FrontendInvocationError])(implicit val o: Origin) extends JavaExpr[G] with JavaInvocationImpl[G] {
+final case class JavaInvocation[G](
+    obj: Option[Expr[G]],
+    typeParams: Seq[Type[G]],
+    method: String,
+    arguments: Seq[Expr[G]],
+    givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[FrontendInvocationError])(implicit val o: Origin)
+    extends JavaExpr[G] with JavaInvocationImpl[G] {
   var ref: Option[JavaInvocationTarget[G]] = None
 }
-final case class JavaNewClass[G](args: Seq[Expr[G]], typeArgs: Seq[Type[G]], name: Type[G], givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[InvocationFailure])(implicit val o: Origin) extends JavaExpr[G] with JavaNewClassImpl[G] {
+final case class JavaNewClass[G](
+    args: Seq[Expr[G]],
+    typeArgs: Seq[Type[G]],
+    name: Type[G],
+    givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InvocationFailure])(implicit val o: Origin)
+    extends JavaExpr[G] with JavaNewClassImpl[G] {
   var ref: Option[JavaConstructorTarget[G]] = None
 }
-final case class JavaNewLiteralArray[G](baseType: Type[G], dims: Int, initializer: Expr[G])(val blame: Blame[ArraySizeError])(implicit val o: Origin) extends JavaExpr[G] with JavaNewLiteralArrayImpl[G]
-final case class JavaNewDefaultArray[G](baseType: Type[G], specifiedDims: Seq[Expr[G]], moreDims: Int)(val blame: Blame[ArraySizeError])(implicit val o: Origin) extends JavaExpr[G] with JavaNewDefaultArrayImpl[G]
-final case class JavaStringValue[G](data: String, t: Type[G])(implicit val o: Origin) extends JavaExpr[G] with JavaStringValueImpl[G]
+final case class JavaNewLiteralArray[G](
+    baseType: Type[G],
+    dims: Int,
+    initializer: Expr[G],
+)(val blame: Blame[ArraySizeError])(implicit val o: Origin)
+    extends JavaExpr[G] with JavaNewLiteralArrayImpl[G]
+final case class JavaNewDefaultArray[G](
+    baseType: Type[G],
+    specifiedDims: Seq[Expr[G]],
+    moreDims: Int,
+)(val blame: Blame[ArraySizeError])(implicit val o: Origin)
+    extends JavaExpr[G] with JavaNewDefaultArrayImpl[G]
+final case class JavaStringValue[G](data: String, t: Type[G])(
+    implicit val o: Origin
+) extends JavaExpr[G] with JavaStringValueImpl[G]
+
+final class JavaBipGlueContainer[G](val job: Expr[G])(implicit val o: Origin)
+    extends JavaGlobalDeclaration[G] with JavaBipGlueContainerImpl[G]
+
+final case class JavaBipGlue[G](elems: Seq[JavaBipGlueElement[G]])(
+    val blame: Blame[BipGlueFailure]
+)(implicit val o: Origin)
+    extends JavaExpr[G] with JavaBipGlueImpl[G]
 
-final class JavaBipGlueContainer[G](val job: Expr[G])(implicit val o: Origin) extends JavaGlobalDeclaration[G] with JavaBipGlueContainerImpl[G]
-
-final case class JavaBipGlue[G](elems: Seq[JavaBipGlueElement[G]])(val blame: Blame[BipGlueFailure])(implicit val o: Origin) extends JavaExpr[G] with JavaBipGlueImpl[G]
-
-@family final case class JavaBipGlueName[G](t: Type[G], e: Expr[G])(implicit val o: Origin) extends NodeFamily[G] with JavaBipGlueNameImpl[G] {
+@family
+final case class JavaBipGlueName[G](t: Type[G], e: Expr[G])(
+    implicit val o: Origin
+) extends NodeFamily[G] with JavaBipGlueNameImpl[G] {
   var data: Option[(JavaClass[G], String)] = None
 }
-@family sealed trait JavaBipGlueElement[G] extends NodeFamily[G] with JavaBipGlueElementImpl[G]
-final case class JavaBipGlueRequires[G](port: JavaBipGlueName[G], others: Seq[JavaBipGlueName[G]])(implicit val o: Origin) extends JavaBipGlueElement[G] with JavaBipGlueRequiresImpl[G]
-final case class JavaBipGlueAccepts[G](port: JavaBipGlueName[G], others: Seq[JavaBipGlueName[G]])(implicit val o: Origin) extends JavaBipGlueElement[G] with JavaBipGlueAcceptsImpl[G]
-final case class JavaBipGlueSynchron[G](port0: JavaBipGlueName[G], port1: JavaBipGlueName[G])(implicit val o: Origin) extends JavaBipGlueElement[G] with JavaBipGlueSynchronImpl[G]
-final case class JavaBipGlueDataWire[G](dataOut: JavaBipGlueName[G], dataIn: JavaBipGlueName[G])(implicit val o: Origin) extends JavaBipGlueElement[G] with JavaBipGlueDataWireImpl[G]
-
-final class BipGlue[G](val requires: Seq[BipGlueRequires[G]], val accepts: Seq[BipGlueAccepts[G]], val dataWires: Seq[BipGlueDataWire[G]])(val blame: Blame[BipGlueFailure])(implicit val o: Origin) extends GlobalDeclaration[G] with BipGlueImpl[G]
-@family final case class BipGlueRequires[G](port: Ref[G, BipPort[G]], others: Seq[Ref[G, BipPort[G]]])(implicit val o: Origin) extends NodeFamily[G] with BipGlueRequiresImpl[G]
-@family final case class BipGlueAccepts[G](port: Ref[G, BipPort[G]], others: Seq[Ref[G, BipPort[G]]])(implicit val o: Origin) extends NodeFamily[G] with BipGlueAcceptsImpl[G]
-@family final case class BipGlueDataWire[G](dataOut: Ref[G, BipOutgoingData[G]], dataIn: Ref[G, BipIncomingData[G]])(implicit val o: Origin) extends NodeFamily[G] with BipGlueDataWireImpl[G]
+@family
+sealed trait JavaBipGlueElement[G]
+    extends NodeFamily[G] with JavaBipGlueElementImpl[G]
+final case class JavaBipGlueRequires[G](
+    port: JavaBipGlueName[G],
+    others: Seq[JavaBipGlueName[G]],
+)(implicit val o: Origin)
+    extends JavaBipGlueElement[G] with JavaBipGlueRequiresImpl[G]
+final case class JavaBipGlueAccepts[G](
+    port: JavaBipGlueName[G],
+    others: Seq[JavaBipGlueName[G]],
+)(implicit val o: Origin)
+    extends JavaBipGlueElement[G] with JavaBipGlueAcceptsImpl[G]
+final case class JavaBipGlueSynchron[G](
+    port0: JavaBipGlueName[G],
+    port1: JavaBipGlueName[G],
+)(implicit val o: Origin)
+    extends JavaBipGlueElement[G] with JavaBipGlueSynchronImpl[G]
+final case class JavaBipGlueDataWire[G](
+    dataOut: JavaBipGlueName[G],
+    dataIn: JavaBipGlueName[G],
+)(implicit val o: Origin)
+    extends JavaBipGlueElement[G] with JavaBipGlueDataWireImpl[G]
+
+final class BipGlue[G](
+    val requires: Seq[BipGlueRequires[G]],
+    val accepts: Seq[BipGlueAccepts[G]],
+    val dataWires: Seq[BipGlueDataWire[G]],
+)(val blame: Blame[BipGlueFailure])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with BipGlueImpl[G]
+@family
+final case class BipGlueRequires[G](
+    port: Ref[G, BipPort[G]],
+    others: Seq[Ref[G, BipPort[G]]],
+)(implicit val o: Origin)
+    extends NodeFamily[G] with BipGlueRequiresImpl[G]
+@family
+final case class BipGlueAccepts[G](
+    port: Ref[G, BipPort[G]],
+    others: Seq[Ref[G, BipPort[G]]],
+)(implicit val o: Origin)
+    extends NodeFamily[G] with BipGlueAcceptsImpl[G]
+@family
+final case class BipGlueDataWire[G](
+    dataOut: Ref[G, BipOutgoingData[G]],
+    dataIn: Ref[G, BipIncomingData[G]],
+)(implicit val o: Origin)
+    extends NodeFamily[G] with BipGlueDataWireImpl[G]
 
 sealed trait BipData[G] extends ClassDeclaration[G] with BipDataImpl[G]
-final class BipIncomingData[G](val t: Type[G])(implicit val o: Origin) extends BipData[G] with BipIncomingDataImpl[G]
-final class BipOutgoingData[G](val t: Type[G], val body: Statement[G], val pure: Boolean)(val blame: Blame[BipOutgoingDataPreconditionUnsatisfiable])(implicit val o: Origin) extends BipData[G] with BipOutgoingDataImpl[G]
-final case class BipLocalIncomingData[G](ref: Ref[G, BipIncomingData[G]])(implicit val o: Origin) extends Expr[G] with BipLocalIncomingDataImpl[G]
-
-final class BipStatePredicate[G](val expr: Expr[G])(implicit val o: Origin) extends ClassDeclaration[G] with BipStatePredicateImpl[G]
-@family final case class BipTransitionSignature[G](portName: String, sourceStateName: String, targetStateName: String, textualGuard: Option[String])(implicit val o: Origin) extends NodeFamily[G] with BipTransitionSignatureImpl[G]
-final class BipTransition[G](val signature: BipTransitionSignature[G],
-                             val port: Ref[G, BipPort[G]],
-                             val source: Ref[G, BipStatePredicate[G]], val target: Ref[G, BipStatePredicate[G]],
-                             val data: Seq[Ref[G, BipIncomingData[G]]], val guard: Expr[G],
-                             val requires: Expr[G], val ensures: Expr[G], val body: Statement[G]
-                            )(val blame: Blame[BipTransitionFailure])(implicit val o: Origin) extends ClassDeclaration[G] with BipTransitionImpl[G]
-final class BipGuard[G](val data: Seq[Ref[G, BipIncomingData[G]]], val body: Statement[G], val pure: Boolean)(val blame: Blame[BipGuardPreconditionUnsatisfiable])(implicit val o: Origin) extends ClassDeclaration[G] with BipGuardImpl[G]
-final case class BipGuardInvocation[G](obj: Expr[G], guard: Ref[G, BipGuard[G]])(implicit val o: Origin) extends Expr[G] with BipGuardInvocationImpl[G]
-final class BipComponent[G](val fqn: Seq[String], val invariant: Expr[G], val initial: Ref[G, BipStatePredicate[G]])(implicit val o: Origin) extends ClassDeclaration[G] with BipComponentImpl[G]
-final class BipConstructor[G](val args: Seq[Variable[G]], val body: Statement[G], val requires: Expr[G])(val blame: Blame[BipConstructorFailure])(implicit val o: Origin) extends ClassDeclaration[G] with Declarator[G] with BipConstructorImpl[G]
-
-final class BipPort[G](val t: BipPortType[G])(implicit val o: Origin) extends ClassDeclaration[G] with BipPortImpl[G]
-@family sealed trait BipPortType[G] extends NodeFamily[G] with BipPortTypeImpl[G]
-final case class BipEnforceable[G]()(implicit val o: Origin = DiagnosticOrigin) extends BipPortType[G] with BipEnforceableImpl[G]
-final case class BipSpontaneous[G]()(implicit val o: Origin = DiagnosticOrigin) extends BipPortType[G] with BipSpontaneousImpl[G]
-final case class BipInternal[G]()(implicit val o: Origin = DiagnosticOrigin) extends BipPortType[G] with BipInternalImpl[G]
-
-final case class BipPortSynchronization[G](ports: Seq[Ref[G, BipPort[G]]], wires: Seq[BipGlueDataWire[G]])(val blame: Blame[BipSynchronizationFailure])(implicit val o: Origin) extends GlobalDeclaration[G] with BipPortSynchronizationImpl[G]
-final case class BipTransitionSynchronization[G](transitions: Seq[Ref[G, BipTransition[G]]], wires: Seq[BipGlueDataWire[G]])(val blame: Blame[BipSynchronizationFailure])(implicit val o: Origin) extends GlobalDeclaration[G] with BipTransitionSynchronizationImpl[G]
-
-@family final class LlvmFunctionContract[G](val value:String, val variableRefs:Seq[(String, Ref[G, Variable[G]])], val invokableRefs:Seq[(String, Ref[G, LlvmCallable[G]])])
-                                   (val blame: Blame[NontrivialUnsatisfiable])
-                                   (implicit val o: Origin) extends NodeFamily[G] with LlvmFunctionContractImpl[G] {
+final class BipIncomingData[G](val t: Type[G])(implicit val o: Origin)
+    extends BipData[G] with BipIncomingDataImpl[G]
+final class BipOutgoingData[G](
+    val t: Type[G],
+    val body: Statement[G],
+    val pure: Boolean,
+)(val blame: Blame[BipOutgoingDataPreconditionUnsatisfiable])(
+    implicit val o: Origin
+) extends BipData[G] with BipOutgoingDataImpl[G]
+final case class BipLocalIncomingData[G](ref: Ref[G, BipIncomingData[G]])(
+    implicit val o: Origin
+) extends Expr[G] with BipLocalIncomingDataImpl[G]
+
+final class BipStatePredicate[G](val expr: Expr[G])(implicit val o: Origin)
+    extends ClassDeclaration[G] with BipStatePredicateImpl[G]
+@family
+final case class BipTransitionSignature[G](
+    portName: String,
+    sourceStateName: String,
+    targetStateName: String,
+    textualGuard: Option[String],
+)(implicit val o: Origin)
+    extends NodeFamily[G] with BipTransitionSignatureImpl[G]
+final class BipTransition[G](
+    val signature: BipTransitionSignature[G],
+    val port: Ref[G, BipPort[G]],
+    val source: Ref[G, BipStatePredicate[G]],
+    val target: Ref[G, BipStatePredicate[G]],
+    val data: Seq[Ref[G, BipIncomingData[G]]],
+    val guard: Expr[G],
+    val requires: Expr[G],
+    val ensures: Expr[G],
+    val body: Statement[G],
+)(val blame: Blame[BipTransitionFailure])(implicit val o: Origin)
+    extends ClassDeclaration[G] with BipTransitionImpl[G]
+final class BipGuard[G](
+    val data: Seq[Ref[G, BipIncomingData[G]]],
+    val body: Statement[G],
+    val pure: Boolean,
+)(val blame: Blame[BipGuardPreconditionUnsatisfiable])(implicit val o: Origin)
+    extends ClassDeclaration[G] with BipGuardImpl[G]
+final case class BipGuardInvocation[G](
+    obj: Expr[G],
+    guard: Ref[G, BipGuard[G]],
+)(implicit val o: Origin)
+    extends Expr[G] with BipGuardInvocationImpl[G]
+final class BipComponent[G](
+    val fqn: Seq[String],
+    val invariant: Expr[G],
+    val initial: Ref[G, BipStatePredicate[G]],
+)(implicit val o: Origin)
+    extends ClassDeclaration[G] with BipComponentImpl[G]
+final class BipConstructor[G](
+    val args: Seq[Variable[G]],
+    val body: Statement[G],
+    val requires: Expr[G],
+)(val blame: Blame[BipConstructorFailure])(implicit val o: Origin)
+    extends ClassDeclaration[G] with Declarator[G] with BipConstructorImpl[G]
+
+final class BipPort[G](val t: BipPortType[G])(implicit val o: Origin)
+    extends ClassDeclaration[G] with BipPortImpl[G]
+@family
+sealed trait BipPortType[G] extends NodeFamily[G] with BipPortTypeImpl[G]
+final case class BipEnforceable[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends BipPortType[G] with BipEnforceableImpl[G]
+final case class BipSpontaneous[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends BipPortType[G] with BipSpontaneousImpl[G]
+final case class BipInternal[G]()(implicit val o: Origin = DiagnosticOrigin)
+    extends BipPortType[G] with BipInternalImpl[G]
+
+final case class BipPortSynchronization[G](
+    ports: Seq[Ref[G, BipPort[G]]],
+    wires: Seq[BipGlueDataWire[G]],
+)(val blame: Blame[BipSynchronizationFailure])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with BipPortSynchronizationImpl[G]
+final case class BipTransitionSynchronization[G](
+    transitions: Seq[Ref[G, BipTransition[G]]],
+    wires: Seq[BipGlueDataWire[G]],
+)(val blame: Blame[BipSynchronizationFailure])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with BipTransitionSynchronizationImpl[G]
+
+@family
+final class LlvmFunctionContract[G](
+    val value: String,
+    val variableRefs: Seq[(String, Ref[G, Variable[G]])],
+    val invokableRefs: Seq[(String, Ref[G, LlvmCallable[G]])],
+)(val blame: Blame[NontrivialUnsatisfiable])(implicit val o: Origin)
+    extends NodeFamily[G] with LlvmFunctionContractImpl[G] {
   var data: Option[ApplicableContract[G]] = None
 }
 sealed trait LlvmCallable[G] extends GlobalDeclaration[G]
-@scopes[LabelDecl] final class LlvmFunctionDefinition[G](val returnType: Type[G],
-                                      val args: Seq[Variable[G]],
-                                      val functionBody: Statement[G],
-                                      val contract: LlvmFunctionContract[G],
-                                      val pure: Boolean = false)
-                                     (val blame: Blame[CallableFailure])(implicit val o: Origin)
-  extends LlvmCallable[G] with Applicable[G] with LlvmFunctionDefinitionImpl[G]
-@scopes[LabelDecl] final class LlvmSpecFunction[G](val name: String, val returnType: Type[G], val args: Seq[Variable[G]], val typeArgs: Seq[Variable[G]],
-                                val body: Option[Expr[G]], val contract: ApplicableContract[G], val inline: Boolean = false, val threadLocal: Boolean = false)
-                               (val blame: Blame[ContractedFailure])(implicit val o: Origin)
-  extends LlvmCallable[G] with AbstractFunction[G] with LlvmSpecFunctionImpl[G]
-final case class LlvmFunctionInvocation[G](ref: Ref[G, LlvmFunctionDefinition[G]],
-                                     args: Seq[Expr[G]],
-                                     givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
-                                     yields: Seq[(Expr[G], Ref[G, Variable[G]])])
-                                    (val blame: Blame[InvocationFailure])(implicit val o: Origin) extends Apply[G] with LlvmFunctionInvocationImpl[G]
-final case class LlvmLoop[G](cond:Expr[G], contract:LlvmLoopContract[G], body:Statement[G])
-                       (implicit val o: Origin) extends CompositeStatement[G] with LlvmLoopImpl[G]
-@family sealed trait LlvmLoopContract[G] extends NodeFamily[G] with LlvmLoopContractImpl[G]
-final case class LlvmLoopInvariant[G](value:String, references:Seq[(String, Ref[G, Declaration[G]])])
-                                     (val blame: Blame[LoopInvariantFailure])
-                                     (implicit val o: Origin) extends LlvmLoopContract[G] with LlvmLoopInvariantImpl[G]
+@scopes[LabelDecl]
+final class LlvmFunctionDefinition[G](
+    val returnType: Type[G],
+    val args: Seq[Variable[G]],
+    val functionBody: Statement[G],
+    val contract: LlvmFunctionContract[G],
+    val pure: Boolean = false,
+)(val blame: Blame[CallableFailure])(implicit val o: Origin)
+    extends LlvmCallable[G]
+    with Applicable[G]
+    with LlvmFunctionDefinitionImpl[G]
+@scopes[LabelDecl]
+final class LlvmSpecFunction[G](
+    val name: String,
+    val returnType: Type[G],
+    val args: Seq[Variable[G]],
+    val typeArgs: Seq[Variable[G]],
+    val body: Option[Expr[G]],
+    val contract: ApplicableContract[G],
+    val inline: Boolean = false,
+    val threadLocal: Boolean = false,
+)(val blame: Blame[ContractedFailure])(implicit val o: Origin)
+    extends LlvmCallable[G]
+    with AbstractFunction[G]
+    with LlvmSpecFunctionImpl[G]
+final case class LlvmFunctionInvocation[G](
+    ref: Ref[G, LlvmFunctionDefinition[G]],
+    args: Seq[Expr[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InvocationFailure])(implicit val o: Origin)
+    extends Apply[G] with LlvmFunctionInvocationImpl[G]
+final case class LlvmLoop[G](
+    cond: Expr[G],
+    contract: LlvmLoopContract[G],
+    body: Statement[G],
+)(implicit val o: Origin)
+    extends CompositeStatement[G] with LlvmLoopImpl[G]
+@family
+sealed trait LlvmLoopContract[G]
+    extends NodeFamily[G] with LlvmLoopContractImpl[G]
+final case class LlvmLoopInvariant[G](
+    value: String,
+    references: Seq[(String, Ref[G, Declaration[G]])],
+)(val blame: Blame[LoopInvariantFailure])(implicit val o: Origin)
+    extends LlvmLoopContract[G] with LlvmLoopInvariantImpl[G]
 sealed trait LlvmExpr[G] extends Expr[G] with LlvmExprImpl[G]
-final case class LlvmLocal[G](name: String)(val blame: Blame[DerefInsufficientPermission])(implicit val o: Origin) extends LlvmExpr[G] with LlvmLocalImpl[G] {
+final case class LlvmLocal[G](name: String)(
+    val blame: Blame[DerefInsufficientPermission]
+)(implicit val o: Origin)
+    extends LlvmExpr[G] with LlvmLocalImpl[G] {
   var ref: Option[Ref[G, Variable[G]]] = None
 }
-final case class LlvmAmbiguousFunctionInvocation[G](name: String,
-                                                    args: Seq[Expr[G]],
-                                                    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
-                                                    yields: Seq[(Expr[G], Ref[G, Variable[G]])])
-                                                   (val blame: Blame[InvocationFailure])(implicit val o: Origin) extends LlvmExpr[G] with LlvmAmbiguousFunctionInvocationImpl[G] {
+final case class LlvmAmbiguousFunctionInvocation[G](
+    name: String,
+    args: Seq[Expr[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InvocationFailure])(implicit val o: Origin)
+    extends LlvmExpr[G] with LlvmAmbiguousFunctionInvocationImpl[G] {
   var ref: Option[Ref[G, LlvmCallable[G]]] = None
 }
 
-final class LlvmGlobal[G](val value: String)(implicit val o: Origin) extends GlobalDeclaration[G] with LlvmGlobalImpl[G] {
+final class LlvmGlobal[G](val value: String)(implicit val o: Origin)
+    extends GlobalDeclaration[G] with LlvmGlobalImpl[G] {
   var data: Option[Seq[GlobalDeclaration[G]]] = None
 }
 sealed trait PVLType[G] extends Type[G] with PVLTypeImpl[G]
-final case class PVLNamedType[G](name: String, typeArgs: Seq[Type[G]])(implicit val o: Origin = DiagnosticOrigin) extends PVLType[G] with PVLNamedTypeImpl[G] {
+final case class PVLNamedType[G](name: String, typeArgs: Seq[Type[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends PVLType[G] with PVLNamedTypeImpl[G] {
   var ref: Option[PVLTypeNameTarget[G]] = None
 }
 
 sealed trait PVLExpr[G] extends Expr[G] with PVLExprImpl[G]
-final case class PVLLocal[G](name: String)(val blame: Blame[DerefInsufficientPermission])(implicit val o: Origin) extends PVLExpr[G] with PVLLocalImpl[G] {
+final case class PVLLocal[G](name: String)(
+    val blame: Blame[DerefInsufficientPermission]
+)(implicit val o: Origin)
+    extends PVLExpr[G] with PVLLocalImpl[G] {
   var ref: Option[PVLNameTarget[G]] = None
 }
-final case class PVLDeref[G](obj: Expr[G], field: String)(val blame: Blame[FrontendDerefError])(implicit val o: Origin) extends PVLExpr[G] with PVLDerefImpl[G] {
+final case class PVLDeref[G](obj: Expr[G], field: String)(
+    val blame: Blame[FrontendDerefError]
+)(implicit val o: Origin)
+    extends PVLExpr[G] with PVLDerefImpl[G] {
   var ref: Option[PVLDerefTarget[G]] = None
 }
-final case class PVLInvocation[G](obj: Option[Expr[G]], method: String, args: Seq[Expr[G]], typeArgs: Seq[Type[G]], givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[FrontendInvocationError])(implicit val o: Origin) extends PVLExpr[G] with PVLInvocationImpl[G] {
+final case class PVLInvocation[G](
+    obj: Option[Expr[G]],
+    method: String,
+    args: Seq[Expr[G]],
+    typeArgs: Seq[Type[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[FrontendInvocationError])(implicit val o: Origin)
+    extends PVLExpr[G] with PVLInvocationImpl[G] {
   var ref: Option[PVLInvocationTarget[G]] = None
 }
 
-final case class PVLNew[G](t: Type[G], typeArgs: Seq[Type[G]], args: Seq[Expr[G]], givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(val blame: Blame[InvocationFailure])(implicit val o: Origin) extends PVLExpr[G] with PVLNewImpl[G] {
+final case class PVLNew[G](
+    t: Type[G],
+    typeArgs: Seq[Type[G]],
+    args: Seq[Expr[G]],
+    givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+    yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+)(val blame: Blame[InvocationFailure])(implicit val o: Origin)
+    extends PVLExpr[G] with PVLNewImpl[G] {
   var ref: Option[PVLConstructorTarget[G]] = None
 }
 
-sealed trait PVLClassDeclaration[G] extends ClassDeclaration[G] with PVLClassDeclarationImpl[G]
-@scopes[LabelDecl] final class PVLConstructor[G](val contract: ApplicableContract[G], val typeArgs: Seq[Variable[G]], val args: Seq[Variable[G]], val body: Option[Statement[G]])(val blame: Blame[ConstructorFailure])(implicit val o: Origin) extends PVLClassDeclaration[G] with PVLConstructorImpl[G]
-
-final case class TChoreography[G](cls: Ref[G, Choreography[G]])(implicit val o: Origin = DiagnosticOrigin) extends DeclaredType[G] with TChoreographyImpl[G]
-final case class TPVLChoreography[G](cls: Ref[G, PVLChoreography[G]])(implicit val o: Origin = DiagnosticOrigin) extends DeclaredType[G] with TPVLChoreographyImpl[G]
-final case class TEndpoint[G](cls: Ref[G, Endpoint[G]])(implicit val o: Origin = DiagnosticOrigin) extends DeclaredType[G] with TEndpointImpl[G]
-
-final class PVLEndpoint[G](val name: String, val cls: Ref[G, Class[G]], val typeArgs: Seq[Type[G]], val args: Seq[Expr[G]])(val blame: Blame[EndpointFailure])(implicit val o: Origin) extends ClassDeclaration[G] with PVLEndpointImpl[G] {
+sealed trait PVLClassDeclaration[G]
+    extends ClassDeclaration[G] with PVLClassDeclarationImpl[G]
+@scopes[LabelDecl]
+final class PVLConstructor[G](
+    val contract: ApplicableContract[G],
+    val typeArgs: Seq[Variable[G]],
+    val args: Seq[Variable[G]],
+    val body: Option[Statement[G]],
+)(val blame: Blame[ConstructorFailure])(implicit val o: Origin)
+    extends PVLClassDeclaration[G] with PVLConstructorImpl[G]
+
+final case class TChoreography[G](cls: Ref[G, Choreography[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends DeclaredType[G] with TChoreographyImpl[G]
+final case class TPVLChoreography[G](cls: Ref[G, PVLChoreography[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends DeclaredType[G] with TPVLChoreographyImpl[G]
+final case class TEndpoint[G](cls: Ref[G, Endpoint[G]])(
+    implicit val o: Origin = DiagnosticOrigin
+) extends DeclaredType[G] with TEndpointImpl[G]
+
+final class PVLEndpoint[G](
+    val name: String,
+    val cls: Ref[G, Class[G]],
+    val typeArgs: Seq[Type[G]],
+    val args: Seq[Expr[G]],
+)(val blame: Blame[EndpointFailure])(implicit val o: Origin)
+    extends ClassDeclaration[G] with PVLEndpointImpl[G] {
   var ref: Option[PVLConstructorTarget[G]] = None
 }
-final class PVLChoreography[G](val name: String, val declarations: Seq[ClassDeclaration[G]], val contract: ApplicableContract[G], val args: Seq[Variable[G]])(val blame: Blame[SeqCallableFailure])(implicit val o: Origin) extends GlobalDeclaration[G] with PVLChoreographyImpl[G] with Declarator[G]
-final case class PVLChorRun[G](body: Statement[G], contract: ApplicableContract[G])(val blame: Blame[SeqCallableFailure])(implicit val o: Origin) extends ClassDeclaration[G] with PVLChorRunImpl[G]
+final class PVLChoreography[G](
+    val name: String,
+    val declarations: Seq[ClassDeclaration[G]],
+    val contract: ApplicableContract[G],
+    val args: Seq[Variable[G]],
+)(val blame: Blame[SeqCallableFailure])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with PVLChoreographyImpl[G] with Declarator[G]
+final case class PVLChorRun[G](
+    body: Statement[G],
+    contract: ApplicableContract[G],
+)(val blame: Blame[SeqCallableFailure])(implicit val o: Origin)
+    extends ClassDeclaration[G] with PVLChorRunImpl[G]
 
-@family case class PVLEndpointName[G](name: String)(implicit val o: Origin) extends PVLEndpointNameImpl[G] with NodeFamily[G] {
+@family
+case class PVLEndpointName[G](name: String)(implicit val o: Origin)
+    extends PVLEndpointNameImpl[G] with NodeFamily[G] {
   var ref: Option[RefPVLEndpoint[G]] = None
 }
 
 // Resolution of invariant can depend on communicate's target/msg through \sender, \receiver, \msg. Therefore, definitions are nested like this,
 // to ensure that PVLCommunicate is fully resolved before the invariant is typechecked.
-final case class PVLChannelInvariant[G](comm: Statement[G], inv: Expr[G])(implicit val o: Origin) extends Statement[G] with PVLChannelInvariantImpl[G]
-final case class PVLCommunicate[G](receiver: Option[PVLEndpointName[G]], target: Expr[G], sender: Option[PVLEndpointName[G]], msg: Expr[G])(val blame: Blame[PVLCommunicateFailure])(implicit val o: Origin) extends Statement[G] with PurelySequentialStatement[G] with PVLCommunicateImpl[G] {
+final case class PVLChannelInvariant[G](comm: Statement[G], inv: Expr[G])(
+    implicit val o: Origin
+) extends Statement[G] with PVLChannelInvariantImpl[G]
+final case class PVLCommunicate[G](
+    receiver: Option[PVLEndpointName[G]],
+    target: Expr[G],
+    sender: Option[PVLEndpointName[G]],
+    msg: Expr[G],
+)(val blame: Blame[PVLCommunicateFailure])(implicit val o: Origin)
+    extends Statement[G]
+    with PurelySequentialStatement[G]
+    with PVLCommunicateImpl[G] {
   var inferredSender: Option[PVLEndpoint[G]] = None
   var inferredReceiver: Option[PVLEndpoint[G]] = None
 }
-final case class PVLChorStatement[G](endpoint: Option[PVLEndpointName[G]], inner: Statement[G])(val blame: Blame[ChorStatementFailure])(implicit val o: Origin) extends Statement[G] with PVLChorStatementImpl[G]
-final case class PVLChorPerm[G](endpoint: PVLEndpointName[G], loc: Location[G], perm: Expr[G])(implicit val o: Origin) extends PVLExpr[G] with PVLChorPermImpl[G]
-final case class PVLSender[G]()(implicit val o: Origin) extends Expr[G] with PVLSenderImpl[G] {
+final case class PVLChorStatement[G](
+    endpoint: Option[PVLEndpointName[G]],
+    inner: Statement[G],
+)(val blame: Blame[ChorStatementFailure])(implicit val o: Origin)
+    extends Statement[G] with PVLChorStatementImpl[G]
+final case class PVLChorPerm[G](
+    endpoint: PVLEndpointName[G],
+    loc: Location[G],
+    perm: Expr[G],
+)(implicit val o: Origin)
+    extends PVLExpr[G] with PVLChorPermImpl[G]
+final case class PVLSender[G]()(implicit val o: Origin)
+    extends Expr[G] with PVLSenderImpl[G] {
   var ref: Option[PVLCommunicate[G]] = None
 }
-final case class PVLReceiver[G]()(implicit val o: Origin) extends Expr[G] with PVLReceiverImpl[G] {
+final case class PVLReceiver[G]()(implicit val o: Origin)
+    extends Expr[G] with PVLReceiverImpl[G] {
   var ref: Option[PVLCommunicate[G]] = None
 }
-final case class PVLMessage[G]()(implicit val o: Origin) extends Expr[G] with PVLMessageImpl[G] {
+final case class PVLMessage[G]()(implicit val o: Origin)
+    extends Expr[G] with PVLMessageImpl[G] {
   var ref: Option[PVLCommunicate[G]] = None
 }
 
+@family
+final class Endpoint[G](
+    val cls: Ref[G, Class[G]],
+    val typeArgs: Seq[Type[G]],
+    val constructor: Ref[G, Constructor[G]],
+    val args: Seq[Expr[G]],
+)(val blame: Blame[EndpointFailure])(implicit val o: Origin)
+    extends Declaration[G] with EndpointImpl[G]
+@scopes[Endpoint]
+final class Choreography[G](
+    val contract: ApplicableContract[G],
+    val params: Seq[Variable[G]],
+    val endpoints: Seq[Endpoint[G]],
+    val preRun: Option[Statement[G]],
+    val run: ChorRun[G],
+    val decls: Seq[ClassDeclaration[G]],
+)(val blame: Blame[SeqCallableFailure])(implicit val o: Origin)
+    extends GlobalDeclaration[G] with ChoreographyImpl[G]
+@family
+final case class ChorRun[G](
+    body: Statement[G],
+    contract: ApplicableContract[G],
+)(val blame: Blame[SeqCallableFailure])(implicit val o: Origin)
+    extends NodeFamily[G] with ChorRunImpl[G]
 
-@family final class Endpoint[G](val cls: Ref[G, Class[G]], val typeArgs: Seq[Type[G]], val constructor: Ref[G, Constructor[G]], val args: Seq[Expr[G]])(val blame: Blame[EndpointFailure])(implicit val o: Origin) extends Declaration[G] with EndpointImpl[G]
-@scopes[Endpoint] final class Choreography[G](val contract: ApplicableContract[G], val params : Seq[Variable[G]], val endpoints: Seq[Endpoint[G]], val preRun: Option[Statement[G]], val run: ChorRun[G], val decls: Seq[ClassDeclaration[G]])(val blame: Blame[SeqCallableFailure])(implicit val o: Origin) extends GlobalDeclaration[G] with ChoreographyImpl[G]
-@family final case class ChorRun[G](body: Statement[G], contract: ApplicableContract[G])(val blame: Blame[SeqCallableFailure])(implicit val o: Origin) extends NodeFamily[G] with ChorRunImpl[G]
-
-@family final class Communicate[G](val invariant: Expr[G], val receiver: Option[Ref[G, Endpoint[G]]], val target: Expr[G], val sender: Option[Ref[G, Endpoint[G]]], val msg: Expr[G])(val blame: Blame[CommunicateFailure])(implicit val o: Origin) extends Declaration[G] with CommunicateImpl[G]
-@scopes[Communicate] final case class CommunicateStatement[G](inner: Communicate[G])(implicit val o: Origin) extends PurelySequentialStatement[G] with CommunicateStatementImpl[G]
-
-final case class EndpointName[G](ref: Ref[G, Endpoint[G]])(implicit val o: Origin) extends Expr[G] with EndpointNameImpl[G]
-final case class ChorPerm[G](endpoint: Ref[G, Endpoint[G]], loc: Location[G], perm: Expr[G])(implicit val o: Origin) extends Expr[G] with ChorPermImpl[G]
-final case class Sender[G](ref: Ref[G, Communicate[G]])(implicit val o: Origin) extends Expr[G] with SenderImpl[G]
-final case class Receiver[G](ref: Ref[G, Communicate[G]])(implicit val o: Origin) extends Expr[G] with ReceiverImpl[G]
-final case class Message[G](ref: Ref[G, Communicate[G]])(implicit val o: Origin) extends Expr[G] with MessageImpl[G]
-
-final case class UnresolvedChorBranch[G](branches: Seq[(Expr[G], Statement[G])])(val blame: Blame[SeqBranchFailure])(implicit val o: Origin) extends Statement[G] with ControlContainerStatement[G] with UnresolvedChorBranchImpl[G]
-final case class UnresolvedChorLoop[G](cond: Expr[G], contract: LoopContract[G], body: Statement[G])(val blame: Blame[SeqLoopFailure])(implicit val o: Origin) extends Statement[G] with ControlContainerStatement[G] with UnresolvedChorLoopImpl[G]
-
-final case class ChorStatement[G](endpoint: Option[Ref[G, Endpoint[G]]], inner: Statement[G])(val blame: Blame[ChorStatementFailure])(implicit val o: Origin) extends Statement[G] with ChorStatementImpl[G]
-
-@family sealed trait ChorGuard[G] extends NodeFamily[G] with ChorGuardImpl[G]
-final case class EndpointGuard[G](endpoint: Ref[G, Endpoint[G]], condition: Expr[G])(implicit val o: Origin) extends ChorGuard[G] with EndpointGuardImpl[G]
-final case class UnpointedGuard[G](condition: Expr[G])(implicit val o: Origin) extends ChorGuard[G] with UnpointedGuardImpl[G]
-
-final case class ChorBranch[G](guards: Seq[ChorGuard[G]], yes: Statement[G], no:  Option[Statement[G]])(val blame: Blame[SeqBranchFailure])(implicit val o: Origin) extends Statement[G] with ControlContainerStatement[G] with ChorBranchImpl[G]
-final case class ChorLoop[G](guards: Seq[ChorGuard[G]], contract: LoopContract[G], body: Statement[G])(val blame: Blame[SeqLoopFailure])(implicit val o: Origin) extends Statement[G] with ControlContainerStatement[G] with ChorLoopImpl[G]
+@family
+final class Communicate[G](
+    val invariant: Expr[G],
+    val receiver: Option[Ref[G, Endpoint[G]]],
+    val target: Expr[G],
+    val sender: Option[Ref[G, Endpoint[G]]],
+    val msg: Expr[G],
+)(val blame: Blame[CommunicateFailure])(implicit val o: Origin)
+    extends Declaration[G] with CommunicateImpl[G]
+@scopes[Communicate]
+final case class CommunicateStatement[G](inner: Communicate[G])(
+    implicit val o: Origin
+) extends PurelySequentialStatement[G] with CommunicateStatementImpl[G]
+
+final case class EndpointName[G](ref: Ref[G, Endpoint[G]])(
+    implicit val o: Origin
+) extends Expr[G] with EndpointNameImpl[G]
+final case class ChorPerm[G](
+    endpoint: Ref[G, Endpoint[G]],
+    loc: Location[G],
+    perm: Expr[G],
+)(implicit val o: Origin)
+    extends Expr[G] with ChorPermImpl[G]
+final case class Sender[G](ref: Ref[G, Communicate[G]])(implicit val o: Origin)
+    extends Expr[G] with SenderImpl[G]
+final case class Receiver[G](ref: Ref[G, Communicate[G]])(
+    implicit val o: Origin
+) extends Expr[G] with ReceiverImpl[G]
+final case class Message[G](ref: Ref[G, Communicate[G]])(implicit val o: Origin)
+    extends Expr[G] with MessageImpl[G]
+
+final case class UnresolvedChorBranch[G](
+    branches: Seq[(Expr[G], Statement[G])]
+)(val blame: Blame[SeqBranchFailure])(implicit val o: Origin)
+    extends Statement[G]
+    with ControlContainerStatement[G]
+    with UnresolvedChorBranchImpl[G]
+final case class UnresolvedChorLoop[G](
+    cond: Expr[G],
+    contract: LoopContract[G],
+    body: Statement[G],
+)(val blame: Blame[SeqLoopFailure])(implicit val o: Origin)
+    extends Statement[G]
+    with ControlContainerStatement[G]
+    with UnresolvedChorLoopImpl[G]
+
+final case class ChorStatement[G](
+    endpoint: Option[Ref[G, Endpoint[G]]],
+    inner: Statement[G],
+)(val blame: Blame[ChorStatementFailure])(implicit val o: Origin)
+    extends Statement[G] with ChorStatementImpl[G]
 
-final case class VeyMontAssignExpression[G](endpoint: Ref[G, Endpoint[G]], assign: Statement[G])(implicit val o: Origin) extends Statement[G] with ControlContainerStatement[G] with VeyMontAssignExpressionImpl[G]
-final case class CommunicateX[G](receiver: Ref[G, Endpoint[G]], sender: Ref[G, Endpoint[G]], chanType: Type[G], assign: Statement[G])(implicit val o: Origin) extends Statement[G] with ControlContainerStatement[G] with CommunicateXImpl[G]
+@family
+sealed trait ChorGuard[G] extends NodeFamily[G] with ChorGuardImpl[G]
+final case class EndpointGuard[G](
+    endpoint: Ref[G, Endpoint[G]],
+    condition: Expr[G],
+)(implicit val o: Origin)
+    extends ChorGuard[G] with EndpointGuardImpl[G]
+final case class UnpointedGuard[G](condition: Expr[G])(implicit val o: Origin)
+    extends ChorGuard[G] with UnpointedGuardImpl[G]
+
+final case class ChorBranch[G](
+    guards: Seq[ChorGuard[G]],
+    yes: Statement[G],
+    no: Option[Statement[G]],
+)(val blame: Blame[SeqBranchFailure])(implicit val o: Origin)
+    extends Statement[G]
+    with ControlContainerStatement[G]
+    with ChorBranchImpl[G]
+final case class ChorLoop[G](
+    guards: Seq[ChorGuard[G]],
+    contract: LoopContract[G],
+    body: Statement[G],
+)(val blame: Blame[SeqLoopFailure])(implicit val o: Origin)
+    extends Statement[G] with ControlContainerStatement[G] with ChorLoopImpl[G]
+
+final case class VeyMontAssignExpression[G](
+    endpoint: Ref[G, Endpoint[G]],
+    assign: Statement[G],
+)(implicit val o: Origin)
+    extends Statement[G]
+    with ControlContainerStatement[G]
+    with VeyMontAssignExpressionImpl[G]
+final case class CommunicateX[G](
+    receiver: Ref[G, Endpoint[G]],
+    sender: Ref[G, Endpoint[G]],
+    chanType: Type[G],
+    assign: Statement[G],
+)(implicit val o: Origin)
+    extends Statement[G]
+    with ControlContainerStatement[G]
+    with CommunicateXImpl[G]
 
 sealed trait SilverExpr[G] extends Expr[G] with SilverExprImpl[G]
-final case class SilverDeref[G](obj: Expr[G], field: Ref[G, SilverField[G]])(val blame: Blame[InsufficientPermission])(implicit val o: Origin) extends SilverExpr[G] with HeapDeref[G] with SilverDerefImpl[G]
-final case class SilverIntToRat[G](perm: Expr[G])(implicit val o: Origin) extends SilverExpr[G] with SilverIntToRatImpl[G]
-final case class SilverNull[G]()(implicit val o: Origin) extends SilverExpr[G] with SilverNullImpl[G]
-final case class SilverSeqSize[G](seq: Expr[G])(implicit val o: Origin) extends SilverExpr[G] with SilverSeqSizeImpl[G]
-final case class SilverSetSize[G](set: Expr[G])(implicit val o: Origin) extends SilverExpr[G] with SilverSetSizeImpl[G]
-final case class SilverBagSize[G](bag: Expr[G])(implicit val o: Origin) extends SilverExpr[G] with SilverBagSizeImpl[G]
-final case class SilverMapSize[G](map: Expr[G])(implicit val o: Origin) extends SilverExpr[G] with SilverMapSizeImpl[G]
-
-final case class SilverCurFieldPerm[G](obj: Expr[G], field: Ref[G, SilverField[G]])(implicit val o: Origin) extends SilverExpr[G] with SilverCurFieldPermImpl[G]
-final case class SilverCurPredPerm[G](ref: Ref[G, Predicate[G]], args: Seq[Expr[G]])(implicit val o: Origin) extends SilverExpr[G] with SilverCurPredPermImpl[G]
-
-final case class SilverPartialADTFunctionInvocation[G](name: String, args: Seq[Expr[G]], partialTypeArgs: Seq[(Ref[G, Variable[G]], Type[G])])(implicit val o: Origin) extends SilverExpr[G] with SilverPartialADTFunctionInvocationImpl[G] {
+final case class SilverDeref[G](obj: Expr[G], field: Ref[G, SilverField[G]])(
+    val blame: Blame[InsufficientPermission]
+)(implicit val o: Origin)
+    extends SilverExpr[G] with HeapDeref[G] with SilverDerefImpl[G]
+final case class SilverIntToRat[G](perm: Expr[G])(implicit val o: Origin)
+    extends SilverExpr[G] with SilverIntToRatImpl[G]
+final case class SilverNull[G]()(implicit val o: Origin)
+    extends SilverExpr[G] with SilverNullImpl[G]
+final case class SilverSeqSize[G](seq: Expr[G])(implicit val o: Origin)
+    extends SilverExpr[G] with SilverSeqSizeImpl[G]
+final case class SilverSetSize[G](set: Expr[G])(implicit val o: Origin)
+    extends SilverExpr[G] with SilverSetSizeImpl[G]
+final case class SilverBagSize[G](bag: Expr[G])(implicit val o: Origin)
+    extends SilverExpr[G] with SilverBagSizeImpl[G]
+final case class SilverMapSize[G](map: Expr[G])(implicit val o: Origin)
+    extends SilverExpr[G] with SilverMapSizeImpl[G]
+
+final case class SilverCurFieldPerm[G](
+    obj: Expr[G],
+    field: Ref[G, SilverField[G]],
+)(implicit val o: Origin)
+    extends SilverExpr[G] with SilverCurFieldPermImpl[G]
+final case class SilverCurPredPerm[G](
+    ref: Ref[G, Predicate[G]],
+    args: Seq[Expr[G]],
+)(implicit val o: Origin)
+    extends SilverExpr[G] with SilverCurPredPermImpl[G]
+
+final case class SilverPartialADTFunctionInvocation[G](
+    name: String,
+    args: Seq[Expr[G]],
+    partialTypeArgs: Seq[(Ref[G, Variable[G]], Type[G])],
+)(implicit val o: Origin)
+    extends SilverExpr[G] with SilverPartialADTFunctionInvocationImpl[G] {
   var ref: Option[(AxiomaticDataType[G], ADTFunction[G])] = None
 }
-final case class SilverUntypedNonemptyLiteralMap[G](values: Seq[(Expr[G], Expr[G])])(implicit val o: Origin) extends SilverExpr[G] with SilverUntypedNonemptyLiteralMapImpl[G]
+final case class SilverUntypedNonemptyLiteralMap[G](
+    values: Seq[(Expr[G], Expr[G])]
+)(implicit val o: Origin)
+    extends SilverExpr[G] with SilverUntypedNonemptyLiteralMapImpl[G]
 
 sealed trait SilverStatement[G] extends Statement[G] with SilverStatementImpl[G]
-final case class SilverNewRef[G](v: Ref[G, Variable[G]], fields: Seq[Ref[G, SilverField[G]]])(implicit val o: Origin) extends SilverStatement[G] with PurelySequentialStatement[G] with SilverNewRefImpl[G]
+final case class SilverNewRef[G](
+    v: Ref[G, Variable[G]],
+    fields: Seq[Ref[G, SilverField[G]]],
+)(implicit val o: Origin)
+    extends SilverStatement[G]
+    with PurelySequentialStatement[G]
+    with SilverNewRefImpl[G]
 
 sealed trait SilverAssign[G] extends SilverStatement[G] with SilverAssignImpl[G]
-final case class SilverFieldAssign[G](obj: Expr[G], field: Ref[G, SilverField[G]], value: Expr[G])(val blame: Blame[AssignFailed])(implicit val o: Origin) extends SilverAssign[G] with ExpressionContainerStatement[G] with SilverFieldAssignImpl[G]
-final case class SilverLocalAssign[G](v: Ref[G, Variable[G]], value: Expr[G])(implicit val o: Origin) extends SilverAssign[G] with ExpressionContainerStatement[G] with SilverLocalAssignImpl[G]
-
-sealed trait SilverDeclaration[G] extends GlobalDeclaration[G] with SilverDeclarationImpl[G]
-final class SilverField[G](val t: Type[G])(implicit val o: Origin) extends SilverDeclaration[G] with SilverFieldImpl[G]
+final case class SilverFieldAssign[G](
+    obj: Expr[G],
+    field: Ref[G, SilverField[G]],
+    value: Expr[G],
+)(val blame: Blame[AssignFailed])(implicit val o: Origin)
+    extends SilverAssign[G]
+    with ExpressionContainerStatement[G]
+    with SilverFieldAssignImpl[G]
+final case class SilverLocalAssign[G](v: Ref[G, Variable[G]], value: Expr[G])(
+    implicit val o: Origin
+) extends SilverAssign[G]
+    with ExpressionContainerStatement[G]
+    with SilverLocalAssignImpl[G]
+
+sealed trait SilverDeclaration[G]
+    extends GlobalDeclaration[G] with SilverDeclarationImpl[G]
+final class SilverField[G](val t: Type[G])(implicit val o: Origin)
+    extends SilverDeclaration[G] with SilverFieldImpl[G]
 
 sealed trait SilverType[G] extends Type[G] with SilverTypeImpl[G]
-case class SilverPartialTAxiomatic[G](ref: Ref[G, AxiomaticDataType[G]], partialTypeArgs: Seq[(Ref[G, Variable[G]], Type[G])])(implicit val o: Origin = DiagnosticOrigin) extends SilverType[G] with SilverPartialTAxiomaticImpl[G]
\ No newline at end of file
+case class SilverPartialTAxiomatic[G](
+    ref: Ref[G, AxiomaticDataType[G]],
+    partialTypeArgs: Seq[(Ref[G, Variable[G]], Type[G])],
+)(implicit val o: Origin = DiagnosticOrigin)
+    extends SilverType[G] with SilverPartialTAxiomaticImpl[G]
diff --git a/src/col/vct/col/ast/Serialize.scala b/src/col/vct/col/ast/Serialize.scala
index eb0fc14897..3e907c0e3b 100644
--- a/src/col/vct/col/ast/Serialize.scala
+++ b/src/col/vct/col/ast/Serialize.scala
@@ -2,11 +2,10 @@ package vct.col.ast
 
 object Serialize {
   def serialize[G](x: Program[G]): vct.col.ast.serialize.Program = {
-    val declarations = x.collect {
-      case decl: Declaration[G] => decl
-    }.zipWithIndex.map {
-      case (decl, id) => decl -> id.toLong
-    }.toMap
+    val declarations =
+      x.collect { case decl: Declaration[G] => decl }.zipWithIndex.map {
+        case (decl, id) => decl -> id.toLong
+      }.toMap
 
     x.serializeFamily(declarations)
   }
diff --git a/src/col/vct/col/ast/declaration/DeclarationImpl.scala b/src/col/vct/col/ast/declaration/DeclarationImpl.scala
index 0a93d649de..1e1ac5f73c 100644
--- a/src/col/vct/col/ast/declaration/DeclarationImpl.scala
+++ b/src/col/vct/col/ast/declaration/DeclarationImpl.scala
@@ -2,7 +2,13 @@ package vct.col.ast.declaration
 
 import vct.col.ast.node.NodeImpl
 import vct.col.ast.{AbstractRewriter, Declaration}
-import vct.col.check.{CheckContext, CheckError, TypeError, TypeErrorExplanation, TypeErrorText}
+import vct.col.check.{
+  CheckContext,
+  CheckError,
+  TypeError,
+  TypeErrorExplanation,
+  TypeErrorText,
+}
 import vct.col.debug.{DebugRewriteState, Dropped, NotProcessed}
 import vct.col.ref.{DirectRef, Ref}
 import vct.col.rewrite.InitialGeneration
@@ -10,30 +16,40 @@ import vct.col.typerules.{CoercingRewriter, NopCoercingRewriter}
 
 import scala.reflect.ClassTag
 
-trait DeclarationImpl[G] extends NodeImpl[G] { this: Declaration[G] =>
+trait DeclarationImpl[G] extends NodeImpl[G] {
+  this: Declaration[G] =>
   var debugRewriteState: DebugRewriteState = NotProcessed
 
   def drop(): Unit = debugRewriteState = Dropped
 
-  def rewriteDefault[G1]()(implicit rw: AbstractRewriter[G, G1]): Declaration[G1]
+  def rewriteDefault[G1]()(
+      implicit rw: AbstractRewriter[G, G1]
+  ): Declaration[G1]
 
-  /**
-    * Create a Ref to this declaration. This is often useful in a place where the type of the ref can be directly
-    * inferred, e.g. `FunctionInvocation(func.ref, ...)`. The witness to `this.type <:< T` demands that the
-    * inferred T at least supports the type of this declaration.
+  /** Create a Ref to this declaration. This is often useful in a place where
+    * the type of the ref can be directly inferred, e.g.
+    * `FunctionInvocation(func.ref, ...)`. The witness to `this.type <:< T`
+    * demands that the inferred T at least supports the type of this
+    * declaration.
     */
-  def ref[Decl <: Declaration[G]](implicit tag: ClassTag[Decl], witness: this.type <:< Decl): Ref[G, Decl] = new DirectRef[G, Decl](this)
+  def ref[Decl <: Declaration[G]](
+      implicit tag: ClassTag[Decl],
+      witness: this.type <:< Decl,
+  ): Ref[G, Decl] = new DirectRef[G, Decl](this)
 
   override def check(context: CheckContext[G]): Seq[CheckError] =
     try {
-      NopCoercingRewriter().coerce(this.asInstanceOf[Declaration[InitialGeneration]])
+      NopCoercingRewriter()
+        .coerce(this.asInstanceOf[Declaration[InitialGeneration]])
       Nil
     } catch {
       case CoercingRewriter.Incoercible(e, t) => Seq(TypeError(e, t))
       case CoercingRewriter.IncoercibleText(e, m) => Seq(TypeErrorText(e, m))
-      case CoercingRewriter.IncoercibleExplanation(e, m) => Seq(TypeErrorExplanation(e, m))
+      case CoercingRewriter.IncoercibleExplanation(e, m) =>
+        Seq(TypeErrorExplanation(e, m))
     }
 
-  override def enterCheckContextDeclarationStack(context: CheckContext[G]): Seq[Declaration[G]] =
-    this +: context.declarationStack
-}
\ No newline at end of file
+  override def enterCheckContextDeclarationStack(
+      context: CheckContext[G]
+  ): Seq[Declaration[G]] = this +: context.declarationStack
+}
diff --git a/src/col/vct/col/ast/declaration/adt/ADTAxiomImpl.scala b/src/col/vct/col/ast/declaration/adt/ADTAxiomImpl.scala
index 0d92951f3b..51bd429bb7 100644
--- a/src/col/vct/col/ast/declaration/adt/ADTAxiomImpl.scala
+++ b/src/col/vct/col/ast/declaration/adt/ADTAxiomImpl.scala
@@ -5,11 +5,14 @@ import vct.col.check.{CheckContext, CheckError}
 import vct.col.print._
 import vct.col.ast.ops.ADTAxiomOps
 
-trait ADTAxiomImpl[G] extends ADTAxiomOps[G] { this: ADTAxiom[G] =>
-  override def check(context: CheckContext[G]): Seq[CheckError] = axiom.checkSubType(TBool())
+trait ADTAxiomImpl[G] extends ADTAxiomOps[G] {
+  this: ADTAxiom[G] =>
+  override def check(context: CheckContext[G]): Seq[CheckError] =
+    axiom.checkSubType(TBool())
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => Group(Text("axiom") <+> "{" <>> axiom.show <+/> "}")
-    case _ => Text("axiom") <+> axiom <> ";"
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => Group(Text("axiom") <+> "{" <>> axiom.show <+/> "}")
+      case _ => Text("axiom") <+> axiom <> ";"
+    }
+}
diff --git a/src/col/vct/col/ast/declaration/adt/ADTDeclarationImpl.scala b/src/col/vct/col/ast/declaration/adt/ADTDeclarationImpl.scala
index f8d69f2320..ff40cb5b46 100644
--- a/src/col/vct/col/ast/declaration/adt/ADTDeclarationImpl.scala
+++ b/src/col/vct/col/ast/declaration/adt/ADTDeclarationImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.declaration.adt
 import vct.col.ast.ADTDeclaration
 import vct.col.ast.ops.ADTDeclarationFamilyOps
 
-trait ADTDeclarationImpl[G] extends ADTDeclarationFamilyOps[G] { this: ADTDeclaration[G] =>
+trait ADTDeclarationImpl[G] extends ADTDeclarationFamilyOps[G] {
+  this: ADTDeclaration[G] =>
 
 }
diff --git a/src/col/vct/col/ast/declaration/adt/ADTFunctionImpl.scala b/src/col/vct/col/ast/declaration/adt/ADTFunctionImpl.scala
index 4eae9a2ccf..4cb1e0273b 100644
--- a/src/col/vct/col/ast/declaration/adt/ADTFunctionImpl.scala
+++ b/src/col/vct/col/ast/declaration/adt/ADTFunctionImpl.scala
@@ -5,11 +5,24 @@ import vct.col.ast.{ADTFunction, Node}
 import vct.col.print._
 import vct.col.ast.ops.ADTFunctionOps
 
-trait ADTFunctionImpl[G] extends ApplicableImpl[G] with ADTDeclarationImpl[G] with ADTFunctionOps[G] { this: ADTFunction[G] =>
+trait ADTFunctionImpl[G]
+    extends ApplicableImpl[G]
+    with ADTDeclarationImpl[G]
+    with ADTFunctionOps[G] {
+  this: ADTFunction[G] =>
   override def body: Option[Node[G]] = None
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => Group(Text("function") <+> ctx.name(this) <> "(" <> Doc.args(args) <> "):" <+> returnType)
-    case _ => Group(Text("pure") <+> returnType <+> ctx.name (this) <> "(" <> Doc.args(args) <> ");")
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver =>
+        Group(
+          Text("function") <+> ctx.name(this) <> "(" <> Doc.args(args) <>
+            "):" <+> returnType
+        )
+      case _ =>
+        Group(
+          Text("pure") <+> returnType <+> ctx.name(this) <> "(" <>
+            Doc.args(args) <> ");"
+        )
+    }
+}
diff --git a/src/col/vct/col/ast/declaration/category/AbstractFunctionImpl.scala b/src/col/vct/col/ast/declaration/category/AbstractFunctionImpl.scala
index f1084e30e3..80e7dc8aca 100644
--- a/src/col/vct/col/ast/declaration/category/AbstractFunctionImpl.scala
+++ b/src/col/vct/col/ast/declaration/category/AbstractFunctionImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{AbstractFunction, Expr}
 import vct.col.check.{CheckContext, CheckError}
 import vct.col.origin.{Blame, ContractedFailure}
 
-trait AbstractFunctionImpl[G] extends ContractApplicableImpl[G] { this: AbstractFunction[G] =>
+trait AbstractFunctionImpl[G] extends ContractApplicableImpl[G] {
+  this: AbstractFunction[G] =>
   override def body: Option[Expr[G]]
   def threadLocal: Boolean
   override def check(context: CheckContext[G]): Seq[CheckError] =
diff --git a/src/col/vct/col/ast/declaration/category/AbstractMethodImpl.scala b/src/col/vct/col/ast/declaration/category/AbstractMethodImpl.scala
index b81c8238da..63b7b6fa9f 100644
--- a/src/col/vct/col/ast/declaration/category/AbstractMethodImpl.scala
+++ b/src/col/vct/col/ast/declaration/category/AbstractMethodImpl.scala
@@ -1,10 +1,19 @@
 package vct.col.ast.declaration.category
 
-import vct.col.ast.{AbstractMethod, Declaration, LabelDecl, LocalDecl, Return, Statement, Variable}
+import vct.col.ast.{
+  AbstractMethod,
+  Declaration,
+  LabelDecl,
+  LocalDecl,
+  Return,
+  Statement,
+  Variable,
+}
 import vct.col.check.{CheckContext, CheckError}
 import vct.col.origin.{Blame, CallableFailure}
 
-trait AbstractMethodImpl[G] extends ContractApplicableImpl[G] { this: AbstractMethod[G] =>
+trait AbstractMethodImpl[G] extends ContractApplicableImpl[G] {
+  this: AbstractMethod[G] =>
   override def body: Option[Statement[G]]
   override def blame: Blame[CallableFailure]
   def outArgs: Seq[Variable[G]]
diff --git a/src/col/vct/col/ast/declaration/category/AbstractPredicateImpl.scala b/src/col/vct/col/ast/declaration/category/AbstractPredicateImpl.scala
index ff8322c406..0aa92c8b1f 100644
--- a/src/col/vct/col/ast/declaration/category/AbstractPredicateImpl.scala
+++ b/src/col/vct/col/ast/declaration/category/AbstractPredicateImpl.scala
@@ -2,7 +2,8 @@ package vct.col.ast.declaration.category
 
 import vct.col.ast.{AbstractPredicate, TResource, Type}
 
-trait AbstractPredicateImpl[G] extends InlineableApplicableImpl[G] { this: AbstractPredicate[G] =>
+trait AbstractPredicateImpl[G] extends InlineableApplicableImpl[G] {
+  this: AbstractPredicate[G] =>
   def threadLocal: Boolean
   override def returnType: Type[G] = TResource()
 }
diff --git a/src/col/vct/col/ast/declaration/category/ApplicableImpl.scala b/src/col/vct/col/ast/declaration/category/ApplicableImpl.scala
index adee5539de..f526d451b9 100644
--- a/src/col/vct/col/ast/declaration/category/ApplicableImpl.scala
+++ b/src/col/vct/col/ast/declaration/category/ApplicableImpl.scala
@@ -5,12 +5,15 @@ import vct.col.ast.util.Declarator
 import vct.col.ast.{Applicable, Declaration, Node, Type, Variable}
 import vct.col.check.CheckContext
 
-trait ApplicableImpl[G] extends DeclarationImpl[G] with Declarator[G] { this: Applicable[G] =>
+trait ApplicableImpl[G] extends DeclarationImpl[G] with Declarator[G] {
+  this: Applicable[G] =>
   def args: Seq[Variable[G]]
   def returnType: Type[G]
   def body: Option[Node[G]]
 
   override def declarations: Seq[Declaration[G]] = args
 
-  override def enterCheckContextCurrentApplicable(context: CheckContext[G]): Option[Applicable[G]] = Some(this)
+  override def enterCheckContextCurrentApplicable(
+      context: CheckContext[G]
+  ): Option[Applicable[G]] = Some(this)
 }
diff --git a/src/col/vct/col/ast/declaration/category/ContractApplicableImpl.scala b/src/col/vct/col/ast/declaration/category/ContractApplicableImpl.scala
index 694a4255af..d7c31d2747 100644
--- a/src/col/vct/col/ast/declaration/category/ContractApplicableImpl.scala
+++ b/src/col/vct/col/ast/declaration/category/ContractApplicableImpl.scala
@@ -1,10 +1,16 @@
 package vct.col.ast.declaration.category
 
 import vct.col.ast.util.Declarator
-import vct.col.ast.{ApplicableContract, ContractApplicable, Declaration, Variable}
+import vct.col.ast.{
+  ApplicableContract,
+  ContractApplicable,
+  Declaration,
+  Variable,
+}
 import vct.col.origin.{Blame, ContractedFailure, PostconditionFailed}
 
-trait ContractApplicableImpl[G] extends InlineableApplicableImpl[G] { this: ContractApplicable[G] =>
+trait ContractApplicableImpl[G] extends InlineableApplicableImpl[G] {
+  this: ContractApplicable[G] =>
   def contract: ApplicableContract[G]
   def blame: Blame[ContractedFailure]
   override def declarations: Seq[Declaration[G]] =
diff --git a/src/col/vct/col/ast/declaration/category/FieldImpl.scala b/src/col/vct/col/ast/declaration/category/FieldImpl.scala
index 72de022c81..fc0809bef0 100644
--- a/src/col/vct/col/ast/declaration/category/FieldImpl.scala
+++ b/src/col/vct/col/ast/declaration/category/FieldImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.declaration.category
 
 import vct.col.ast.{Field, Type}
 
-trait FieldImpl[G] { this: Field[G] =>
+trait FieldImpl[G] {
+  this: Field[G] =>
   def t: Type[G]
 }
diff --git a/src/col/vct/col/ast/declaration/category/InlineableApplicableImpl.scala b/src/col/vct/col/ast/declaration/category/InlineableApplicableImpl.scala
index 40a80b42eb..6109259ffe 100644
--- a/src/col/vct/col/ast/declaration/category/InlineableApplicableImpl.scala
+++ b/src/col/vct/col/ast/declaration/category/InlineableApplicableImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.declaration.category
 
 import vct.col.ast.InlineableApplicable
 
-trait InlineableApplicableImpl[G] extends ApplicableImpl[G] { this: InlineableApplicable[G] =>
+trait InlineableApplicableImpl[G] extends ApplicableImpl[G] {
+  this: InlineableApplicable[G] =>
   def inline: Boolean
 }
diff --git a/src/col/vct/col/ast/declaration/cls/BipComponentImpl.scala b/src/col/vct/col/ast/declaration/cls/BipComponentImpl.scala
index 3d96e6502f..8b3bb83ed1 100644
--- a/src/col/vct/col/ast/declaration/cls/BipComponentImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/BipComponentImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.BipComponent
 import vct.col.print._
 import vct.col.ast.ops.BipComponentOps
 
-trait BipComponentImpl[G] extends BipComponentOps[G] { this: BipComponent[G] =>
+trait BipComponentImpl[G] extends BipComponentOps[G] {
+  this: BipComponent[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       Text("/*"),
diff --git a/src/col/vct/col/ast/declaration/cls/BipConstructorImpl.scala b/src/col/vct/col/ast/declaration/cls/BipConstructorImpl.scala
index d823a7b585..16486a91c4 100644
--- a/src/col/vct/col/ast/declaration/cls/BipConstructorImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/BipConstructorImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.declaration.cls
 import vct.col.ast.{BipConstructor, Declaration, Type, Variable}
 import vct.col.ast.ops.BipConstructorOps
 
-trait BipConstructorImpl[G] extends BipConstructorOps[G] { this: BipConstructor[G] =>
+trait BipConstructorImpl[G] extends BipConstructorOps[G] {
+  this: BipConstructor[G] =>
   override def declarations: Seq[Declaration[G]] = args
 }
diff --git a/src/col/vct/col/ast/declaration/cls/BipDataImpl.scala b/src/col/vct/col/ast/declaration/cls/BipDataImpl.scala
index 67d069e9af..e725faf46b 100644
--- a/src/col/vct/col/ast/declaration/cls/BipDataImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/BipDataImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.declaration.cls
 
 import vct.col.ast.{BipData, Type}
 
-trait BipDataImpl[G] { this: BipData[G] =>
+trait BipDataImpl[G] {
+  this: BipData[G] =>
   def t: Type[G]
 }
diff --git a/src/col/vct/col/ast/declaration/cls/BipGuardImpl.scala b/src/col/vct/col/ast/declaration/cls/BipGuardImpl.scala
index 3d05d99a01..c3ce93c216 100644
--- a/src/col/vct/col/ast/declaration/cls/BipGuardImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/BipGuardImpl.scala
@@ -4,11 +4,15 @@ import vct.col.ast.BipGuard
 import vct.col.print.{Ctx, Doc, Group, Text, Empty}
 import vct.col.ast.ops.BipGuardOps
 
-trait BipGuardImpl[G] extends BipGuardOps[G] { this: BipGuard[G] =>
+trait BipGuardImpl[G] extends BipGuardOps[G] {
+  this: BipGuard[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
-      if(pure) Text("@Pure") else Empty,
+      if (pure)
+        Text("@Pure")
+      else
+        Empty,
       Text("@Guard(name =") <+> ctx.name(this) <> ")",
-      Text("public boolean") <+> ctx.name(this) <> "()" <+> body.layoutAsBlock
+      Text("public boolean") <+> ctx.name(this) <> "()" <+> body.layoutAsBlock,
     ))
 }
diff --git a/src/col/vct/col/ast/declaration/cls/BipPortImpl.scala b/src/col/vct/col/ast/declaration/cls/BipPortImpl.scala
index c683edbd59..8e15fc18a8 100644
--- a/src/col/vct/col/ast/declaration/cls/BipPortImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/BipPortImpl.scala
@@ -4,11 +4,10 @@ import vct.col.ast.BipPort
 import vct.col.print._
 import vct.col.ast.ops.BipPortOps
 
-trait BipPortImpl[G] extends BipPortOps[G] { this: BipPort[G] =>
+trait BipPortImpl[G] extends BipPortOps[G] {
+  this: BipPort[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Doc.stack(Seq(
-      Text("/*"),
-      t.show <+> "javaBipPort" <+> ctx.name(this),
-      Text("*/"),
-    ))
+    Doc.stack(
+      Seq(Text("/*"), t.show <+> "javaBipPort" <+> ctx.name(this), Text("*/"))
+    )
 }
diff --git a/src/col/vct/col/ast/declaration/cls/BipStatePredicateImpl.scala b/src/col/vct/col/ast/declaration/cls/BipStatePredicateImpl.scala
index 050361b6f2..47a3049902 100644
--- a/src/col/vct/col/ast/declaration/cls/BipStatePredicateImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/BipStatePredicateImpl.scala
@@ -4,7 +4,10 @@ import vct.col.ast.BipStatePredicate
 import vct.col.print.{Ctx, Doc, Text, Group}
 import vct.col.ast.ops.BipStatePredicateOps
 
-trait BipStatePredicateImpl[G] extends BipStatePredicateOps[G] { this: BipStatePredicate[G] =>
+trait BipStatePredicateImpl[G] extends BipStatePredicateOps[G] {
+  this: BipStatePredicate[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("javaBipStatePredicate") <+> ctx.name(this) <+> "{" <>> expr <+/> "}")
+    Group(
+      Text("javaBipStatePredicate") <+> ctx.name(this) <+> "{" <>> expr <+/> "}"
+    )
 }
diff --git a/src/col/vct/col/ast/declaration/cls/BipTransitionImpl.scala b/src/col/vct/col/ast/declaration/cls/BipTransitionImpl.scala
index 8c5320ed5b..a89f79b557 100644
--- a/src/col/vct/col/ast/declaration/cls/BipTransitionImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/BipTransitionImpl.scala
@@ -7,21 +7,29 @@ import vct.col.util.AstBuildHelpers.tt
 import scala.util.Try
 import vct.col.ast.ops.BipTransitionOps
 
-trait BipTransitionImpl[G] extends BipTransitionOps[G] { this: BipTransition[G] =>
+trait BipTransitionImpl[G] extends BipTransitionOps[G] {
+  this: BipTransition[G] =>
   def layoutAnnotation(implicit ctx: Ctx): Doc =
-    Group(Text("@Transition(") <> Doc.args(Seq(
-      Text("name =") <+> ctx.name(this),
-      Text("source =") <+> ctx.name(source),
-      Text("target =") <+> ctx.name(target),
-      if (requires == tt[G]) Empty else Text("requires =") <+> requires,
-    )) <> ")")
+    Group(
+      Text("@Transition(") <> Doc.args(Seq(
+        Text("name =") <+> ctx.name(this),
+        Text("source =") <+> ctx.name(source),
+        Text("target =") <+> ctx.name(target),
+        if (requires == tt[G])
+          Empty
+        else
+          Text("requires =") <+> requires,
+      )) <> ")"
+    )
 
   def layoutArgs(implicit ctx: Ctx): Doc =
     Doc.args(data.map { name =>
-      Text("@Data(name =") <+> ctx.name(name) <> ")" <+> Try(name.decl.t).getOrElse(Text("?brokenref?")) <+> ctx.name(name)
+      Text("@Data(name =") <+> ctx.name(name) <> ")" <+> Try(name.decl.t)
+        .getOrElse(Text("?brokenref?")) <+> ctx.name(name)
     })
 
   override def layout(implicit ctx: Ctx): Doc =
-    layoutAnnotation </>
-      Group(Text("public void") <+> ctx.name(this) <> "(" <> layoutArgs <> ")") <+> body.layoutAsBlock
-}
\ No newline at end of file
+    layoutAnnotation </> Group(
+      Text("public void") <+> ctx.name(this) <> "(" <> layoutArgs <> ")"
+    ) <+> body.layoutAsBlock
+}
diff --git a/src/col/vct/col/ast/declaration/cls/ClassDeclarationImpl.scala b/src/col/vct/col/ast/declaration/cls/ClassDeclarationImpl.scala
index 50fafba2b7..62e939ee09 100644
--- a/src/col/vct/col/ast/declaration/cls/ClassDeclarationImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/ClassDeclarationImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.declaration.cls
 import vct.col.ast.ClassDeclaration
 import vct.col.ast.ops.ClassDeclarationFamilyOps
 
-trait ClassDeclarationImpl[G] extends ClassDeclarationFamilyOps[G] { this: ClassDeclaration[G] =>
+trait ClassDeclarationImpl[G] extends ClassDeclarationFamilyOps[G] {
+  this: ClassDeclaration[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/declaration/cls/InstanceFieldImpl.scala b/src/col/vct/col/ast/declaration/cls/InstanceFieldImpl.scala
index c09a274a08..81fb5ac61d 100644
--- a/src/col/vct/col/ast/declaration/cls/InstanceFieldImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/InstanceFieldImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Final, InstanceField}
 import vct.col.print._
 import vct.col.ast.ops.InstanceFieldOps
 
-trait InstanceFieldImpl[G] extends InstanceFieldOps[G] { this: InstanceField[G] =>
+trait InstanceFieldImpl[G] extends InstanceFieldOps[G] {
+  this: InstanceField[G] =>
   def isFinal = flags.collectFirst { case _: Final[G] => () }.isDefined
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.rspread(flags) <> t.show <+> ctx.name(this) <> ";"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/declaration/cls/InstanceFunctionImpl.scala b/src/col/vct/col/ast/declaration/cls/InstanceFunctionImpl.scala
index aba49e9d52..049cd380ad 100644
--- a/src/col/vct/col/ast/declaration/cls/InstanceFunctionImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/InstanceFunctionImpl.scala
@@ -6,20 +6,23 @@ import vct.col.print._
 import scala.collection.immutable.ListMap
 import vct.col.ast.ops.InstanceFunctionOps
 
-trait InstanceFunctionImpl[G] extends InstanceFunctionOps[G] { this: InstanceFunction[G] =>
-  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] = ListMap(
-    inline -> "inline",
-    threadLocal -> "thread_local",
-  ).filter(_._1).values.map(Text).map(Doc.inlineSpec).toSeq
+trait InstanceFunctionImpl[G] extends InstanceFunctionOps[G] {
+  this: InstanceFunction[G] =>
+  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] =
+    ListMap(inline -> "inline", threadLocal -> "thread_local").filter(_._1)
+      .values.map(Text).map(Doc.inlineSpec).toSeq
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
       Group(
-        Doc.rspread(layoutModifiers) <> Text("pure") <+> returnType <+> ctx.name(this) <>
-          (if(typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ">" else Empty) <>
-          "(" <> Doc.args(args) <> ")" <>
+        Doc.rspread(layoutModifiers) <> Text("pure") <+> returnType <+>
+          ctx.name(this) <>
+          (if (typeArgs.nonEmpty)
+             Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ">"
+           else
+             Empty) <> "(" <> Doc.args(args) <> ")" <>
           body.map(Text(" =") <>> _ <> ";").getOrElse(Text(";"))
       ),
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/declaration/cls/InstanceMethodImpl.scala b/src/col/vct/col/ast/declaration/cls/InstanceMethodImpl.scala
index d7d944982b..378d7d7600 100644
--- a/src/col/vct/col/ast/declaration/cls/InstanceMethodImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/InstanceMethodImpl.scala
@@ -2,40 +2,76 @@ package vct.col.ast.declaration.cls
 
 import vct.col.ast.{InstanceMethod, TVoid}
 import vct.col.ast.declaration.category.AbstractMethodImpl
-import vct.col.check.{CheckContext, CheckError, SeqProgInstanceMethodArgs, SeqProgInstanceMethodBody, SeqProgInstanceMethodNonVoid, SeqProgInstanceMethodPure}
+import vct.col.check.{
+  CheckContext,
+  CheckError,
+  SeqProgInstanceMethodArgs,
+  SeqProgInstanceMethodBody,
+  SeqProgInstanceMethodNonVoid,
+  SeqProgInstanceMethodPure,
+}
 import vct.col.print._
 
 import scala.collection.immutable.ListMap
 import vct.col.ast.ops.InstanceMethodOps
 
-trait InstanceMethodImpl[G] extends ClassDeclarationImpl[G] with AbstractMethodImpl[G] with InstanceMethodOps[G] { this: InstanceMethod[G] =>
-  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] = ListMap(
-    pure -> "pure",
-    inline -> "inline",
-  ).filter(_._1).values.map(Text).map(Doc.inlineSpec).toSeq
+trait InstanceMethodImpl[G]
+    extends ClassDeclarationImpl[G]
+    with AbstractMethodImpl[G]
+    with InstanceMethodOps[G] {
+  this: InstanceMethod[G] =>
+  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] =
+    ListMap(pure -> "pure", inline -> "inline").filter(_._1).values.map(Text)
+      .map(Doc.inlineSpec).toSeq
 
-  private def layoutNameAndArgs(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Java =>
-      (if(typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <+> Empty else Empty) <>
-        ctx.name(this)
-    case _ =>
-      Text(ctx.name(this)) <> (if(typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) else Empty)
-  }
+  private def layoutNameAndArgs(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Java =>
+        (if (typeArgs.nonEmpty)
+           Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <+> Empty
+         else
+           Empty) <> ctx.name(this)
+      case _ =>
+        Text(ctx.name(this)) <>
+          (if (typeArgs.nonEmpty)
+             Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text))
+           else
+             Empty)
+    }
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(Group(Doc.rspread(layoutModifiers) <> returnType <+> layoutNameAndArgs) <>
-        "(" <> Doc.args(args) <> ")") <>
-        (if(outArgs.nonEmpty) Text(" returns") <+> "(" <> Doc.args(outArgs) <> ")" else Empty) <>
-        body.map(Text(" ") <> _.layoutAsBlock).getOrElse(Text(";")),
+      Group(
+        Group(
+          Doc.rspread(layoutModifiers) <> returnType <+> layoutNameAndArgs
+        ) <> "(" <> Doc.args(args) <> ")"
+      ) <>
+        (if (outArgs.nonEmpty)
+           Text(" returns") <+> "(" <> Doc.args(outArgs) <> ")"
+         else
+           Empty) <> body.map(Text(" ") <> _.layoutAsBlock).getOrElse(Text(";")),
     ))
 
-  override def check(context: CheckContext[G]): Seq[CheckError] = context.currentChoreography match {
-    case None => Seq()
-    case Some(_) => (if(returnType != TVoid[G]()) Seq(SeqProgInstanceMethodNonVoid(this)) else Seq()) ++
-        (if(args.nonEmpty) Seq(SeqProgInstanceMethodArgs(this)) else Seq()) ++
-      (if(this.body.isEmpty) Seq(SeqProgInstanceMethodBody(this)) else Seq()) ++
-      (if(this.pure) Seq(SeqProgInstanceMethodPure(this)) else Seq())
-  }
-}
\ No newline at end of file
+  override def check(context: CheckContext[G]): Seq[CheckError] =
+    context.currentChoreography match {
+      case None => Seq()
+      case Some(_) =>
+        (if (returnType != TVoid[G]())
+           Seq(SeqProgInstanceMethodNonVoid(this))
+         else
+           Seq()) ++
+          (if (args.nonEmpty)
+             Seq(SeqProgInstanceMethodArgs(this))
+           else
+             Seq()) ++
+          (if (this.body.isEmpty)
+             Seq(SeqProgInstanceMethodBody(this))
+           else
+             Seq()) ++
+          (if (this.pure)
+             Seq(SeqProgInstanceMethodPure(this))
+           else
+             Seq())
+    }
+}
diff --git a/src/col/vct/col/ast/declaration/cls/InstanceOperatorFunctionImpl.scala b/src/col/vct/col/ast/declaration/cls/InstanceOperatorFunctionImpl.scala
index da565d7b13..4a782f1b66 100644
--- a/src/col/vct/col/ast/declaration/cls/InstanceOperatorFunctionImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/InstanceOperatorFunctionImpl.scala
@@ -6,20 +6,21 @@ import vct.col.print._
 import scala.collection.immutable.ListMap
 import vct.col.ast.ops.InstanceOperatorFunctionOps
 
-trait InstanceOperatorFunctionImpl[G] extends InstanceOperatorFunctionOps[G] { this: InstanceOperatorFunction[G] =>
+trait InstanceOperatorFunctionImpl[G] extends InstanceOperatorFunctionOps[G] {
+  this: InstanceOperatorFunction[G] =>
   def typeArgs: Seq[Variable[G]] = Nil
 
-  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] = ListMap(
-    inline -> "inline",
-    threadLocal -> "thread_local",
-  ).filter(_._1).values.map(Text).map(Doc.inlineSpec).toSeq
+  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] =
+    ListMap(inline -> "inline", threadLocal -> "thread_local").filter(_._1)
+      .values.map(Text).map(Doc.inlineSpec).toSeq
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
       Group(
-        Doc.rspread(layoutModifiers) <> "pure" <+> returnType <+> operator <> "(" <> Doc.args(args) <> ")" <>
-          body.map(Text(" =") <>> _ <> ";").getOrElse(Text(";"))
+        Doc.rspread(layoutModifiers) <> "pure" <+> returnType <+> operator <>
+          "(" <> Doc.args(args) <> ")" <> body.map(Text(" =") <>> _ <> ";")
+            .getOrElse(Text(";"))
       ),
     ))
 }
diff --git a/src/col/vct/col/ast/declaration/cls/InstanceOperatorMethodImpl.scala b/src/col/vct/col/ast/declaration/cls/InstanceOperatorMethodImpl.scala
index bcb3990b9f..54a7dcf80a 100644
--- a/src/col/vct/col/ast/declaration/cls/InstanceOperatorMethodImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/InstanceOperatorMethodImpl.scala
@@ -6,19 +6,21 @@ import vct.col.print._
 import scala.collection.immutable.ListMap
 import vct.col.ast.ops.InstanceOperatorMethodOps
 
-trait InstanceOperatorMethodImpl[G] extends InstanceOperatorMethodOps[G] { this: InstanceOperatorMethod[G] =>
+trait InstanceOperatorMethodImpl[G] extends InstanceOperatorMethodOps[G] {
+  this: InstanceOperatorMethod[G] =>
   def typeArgs: Seq[Variable[G]] = Nil
   def outArgs: Seq[Variable[G]] = Nil
 
-  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] = ListMap(
-    pure -> "pure",
-    inline -> "inline",
-  ).filter(_._1).values.map(Text).map(Doc.inlineSpec).toSeq
+  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] =
+    ListMap(pure -> "pure", inline -> "inline").filter(_._1).values.map(Text)
+      .map(Doc.inlineSpec).toSeq
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(Doc.rspread(layoutModifiers) <> returnType.show <+> operator <> "(" <> Doc.args(args) <> ")") <>
-        body.map(Text(" ") <> _.layoutAsBlock).getOrElse(Text(";")),
+      Group(
+        Doc.rspread(layoutModifiers) <> returnType.show <+> operator <> "(" <>
+          Doc.args(args) <> ")"
+      ) <> body.map(Text(" ") <> _.layoutAsBlock).getOrElse(Text(";")),
     ))
 }
diff --git a/src/col/vct/col/ast/declaration/cls/InstancePredicateImpl.scala b/src/col/vct/col/ast/declaration/cls/InstancePredicateImpl.scala
index 8452b3c796..61d407826f 100644
--- a/src/col/vct/col/ast/declaration/cls/InstancePredicateImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/InstancePredicateImpl.scala
@@ -7,14 +7,19 @@ import vct.col.print._
 import scala.collection.immutable.ListMap
 import vct.col.ast.ops.InstancePredicateOps
 
-trait InstancePredicateImpl[G] extends ClassDeclarationImpl[G] with AbstractPredicateImpl[G] with InstancePredicateOps[G] { this: InstancePredicate[G] =>
-  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] = ListMap(
-    inline -> "inline",
-    threadLocal -> "thread_local",
-  ).filter(_._1).values.map(Text).map(Doc.inlineSpec).toSeq
+trait InstancePredicateImpl[G]
+    extends ClassDeclarationImpl[G]
+    with AbstractPredicateImpl[G]
+    with InstancePredicateOps[G] {
+  this: InstancePredicate[G] =>
+  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] =
+    ListMap(inline -> "inline", threadLocal -> "thread_local").filter(_._1)
+      .values.map(Text).map(Doc.inlineSpec).toSeq
 
-  override def layout(implicit ctx: Ctx): Doc = Group(
-    Doc.rspread(layoutModifiers) <> "resource" <+> ctx.name(this) <> "(" <> Doc.args(args) <> ")" <>
-      body.map(Text(" =") <>> _ <> ";").getOrElse(Text(";"))
-  )
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Group(
+      Doc.rspread(layoutModifiers) <> "resource" <+> ctx.name(this) <> "(" <>
+        Doc.args(args) <> ")" <> body.map(Text(" =") <>> _ <> ";")
+          .getOrElse(Text(";"))
+    )
+}
diff --git a/src/col/vct/col/ast/declaration/cls/RunMethodImpl.scala b/src/col/vct/col/ast/declaration/cls/RunMethodImpl.scala
index 52503fb5f2..1171331f45 100644
--- a/src/col/vct/col/ast/declaration/cls/RunMethodImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/RunMethodImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.RunMethod
 import vct.col.print._
 import vct.col.ast.ops.RunMethodOps
 
-trait RunMethodImpl[G] extends RunMethodOps[G] { this: RunMethod[G] =>
+trait RunMethodImpl[G] extends RunMethodOps[G] {
+  this: RunMethod[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract.show,
diff --git a/src/col/vct/col/ast/declaration/cls/VeSUVMainMethodImpl.scala b/src/col/vct/col/ast/declaration/cls/VeSUVMainMethodImpl.scala
index e918f0b10f..8bc52ab87e 100644
--- a/src/col/vct/col/ast/declaration/cls/VeSUVMainMethodImpl.scala
+++ b/src/col/vct/col/ast/declaration/cls/VeSUVMainMethodImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.VeSUVMainMethod
 import vct.col.print.{Ctx, Doc, Empty, Text}
 import vct.col.ast.ops.VeSUVMainMethodOps
 
-trait VeSUVMainMethodImpl[G] extends VeSUVMainMethodOps[G] { this: VeSUVMainMethod[G] =>
+trait VeSUVMainMethodImpl[G] extends VeSUVMainMethodOps[G] {
+  this: VeSUVMainMethod[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
-      Text("vesuv_entry") <> body.map(Empty <+> _.layoutAsBlock).getOrElse(Text(";")),
+      Text("vesuv_entry") <> body.map(Empty <+> _.layoutAsBlock)
+        .getOrElse(Text(";"))
     ))
 }
diff --git a/src/col/vct/col/ast/declaration/global/AxiomaticDataTypeImpl.scala b/src/col/vct/col/ast/declaration/global/AxiomaticDataTypeImpl.scala
index 169393393d..760496bb83 100644
--- a/src/col/vct/col/ast/declaration/global/AxiomaticDataTypeImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/AxiomaticDataTypeImpl.scala
@@ -5,25 +5,32 @@ import vct.col.ast.{AxiomaticDataType, Declaration}
 import vct.col.print._
 import vct.col.ast.ops.AxiomaticDataTypeOps
 
-trait AxiomaticDataTypeImpl[G] extends Declarator[G] with AxiomaticDataTypeOps[G] { this: AxiomaticDataType[G] =>
+trait AxiomaticDataTypeImpl[G]
+    extends Declarator[G] with AxiomaticDataTypeOps[G] {
+  this: AxiomaticDataType[G] =>
   override def declarations: Seq[Declaration[G]] = decls ++ typeArgs
 
   def layoutSilver(implicit ctx: Ctx): Doc =
-    Group(Text("domain") <+> ctx.name(this) <>
-      (if(typeArgs.nonEmpty) Text("[") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> "]" else Empty) <+>
-      "{") <>>
-      { Doc.stack(decls) } <+/>
-    "}"
+    Group(
+      Text("domain") <+> ctx.name(this) <>
+        (if (typeArgs.nonEmpty)
+           Text("[") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> "]"
+         else
+           Empty) <+> "{"
+    ) <>> { Doc.stack(decls) } <+/> "}"
 
   def layoutSpec(implicit ctx: Ctx): Doc =
-    Group(Text("adt") <+> ctx.name(this) <>
-      (if(typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ">" else Empty) <+>
-      "{") <>>
-      { Doc.stack(decls) } <+/>
-    "}"
+    Group(
+      Text("adt") <+> ctx.name(this) <>
+        (if (typeArgs.nonEmpty)
+           Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ">"
+         else
+           Empty) <+> "{"
+    ) <>> { Doc.stack(decls) } <+/> "}"
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.spec(Show.lazily(layoutSpec(_)))
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.spec(Show.lazily(layoutSpec(_)))
+    }
+}
diff --git a/src/col/vct/col/ast/declaration/global/BipPortSynchronizationImpl.scala b/src/col/vct/col/ast/declaration/global/BipPortSynchronizationImpl.scala
index f7e8a1dbf1..d03ed204a7 100644
--- a/src/col/vct/col/ast/declaration/global/BipPortSynchronizationImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/BipPortSynchronizationImpl.scala
@@ -4,10 +4,19 @@ import vct.col.ast.BipPortSynchronization
 import vct.col.print._
 import vct.col.ast.ops.BipPortSynchronizationOps
 
-trait BipPortSynchronizationImpl[G] extends BipPortSynchronizationOps[G] { this: BipPortSynchronization[G] =>
+trait BipPortSynchronizationImpl[G] extends BipPortSynchronizationOps[G] {
+  this: BipPortSynchronization[G] =>
   def summarize: String = {
-    val portsTxt = if (ports.isEmpty) "No ports" else ports.map("- " + _.decl.o.getPreferredNameOrElse().camel).mkString("\n")
-    val wiresTxt = if (wires.isEmpty) "No wires" else wires.map("- " + _.o.getPreferredNameOrElse().camel).mkString("\n")
+    val portsTxt =
+      if (ports.isEmpty)
+        "No ports"
+      else
+        ports.map("- " + _.decl.o.getPreferredNameOrElse().camel).mkString("\n")
+    val wiresTxt =
+      if (wires.isEmpty)
+        "No wires"
+      else
+        wires.map("- " + _.o.getPreferredNameOrElse().camel).mkString("\n")
 
     s"""=== Port synchronization ===
        |Ports:
@@ -17,9 +26,11 @@ trait BipPortSynchronizationImpl[G] extends BipPortSynchronizationOps[G] { this:
   }
 
   override def layout(implicit ctx: Ctx): Doc =
-    Text("/*") <+/>
-    Text("javaBipPortSynchronization {") <>> {
-      Text("ports:") <>> Doc.stack(ports.map(ctx.name).map(Text("-") <+> _)) <+/>
-        Text("wires:") <>> Doc.stack(wires.map(wire => Text(ctx.name(wire.dataOut)) <+> "->" <+> ctx.name(wire.dataIn)))
+    Text("/*") <+/> Text("javaBipPortSynchronization {") <>> {
+      Text("ports:") <>>
+        Doc.stack(ports.map(ctx.name).map(Text("-") <+> _)) <+/>
+        Text("wires:") <>> Doc.stack(wires.map(wire =>
+          Text(ctx.name(wire.dataOut)) <+> "->" <+> ctx.name(wire.dataIn)
+        ))
     } <+/> "*/"
 }
diff --git a/src/col/vct/col/ast/declaration/global/BipTransitionSynchronizationImpl.scala b/src/col/vct/col/ast/declaration/global/BipTransitionSynchronizationImpl.scala
index f6d62971d8..541e88f25b 100644
--- a/src/col/vct/col/ast/declaration/global/BipTransitionSynchronizationImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/BipTransitionSynchronizationImpl.scala
@@ -4,10 +4,20 @@ import vct.col.ast.BipTransitionSynchronization
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.BipTransitionSynchronizationOps
 
-trait BipTransitionSynchronizationImpl[G] extends BipTransitionSynchronizationOps[G] { this: BipTransitionSynchronization[G] =>
+trait BipTransitionSynchronizationImpl[G]
+    extends BipTransitionSynchronizationOps[G] {
+  this: BipTransitionSynchronization[G] =>
   def summarize: String = {
-    val portsTxt = if (transitions.isEmpty) "No transitions" else transitions.map("- " + _.decl.signature.shortSignature).mkString("\n")
-    val wiresTxt = if (wires.isEmpty) "No wires" else wires.map("- " + _.o.getPreferredNameOrElse().camel).mkString("\n")
+    val portsTxt =
+      if (transitions.isEmpty)
+        "No transitions"
+      else
+        transitions.map("- " + _.decl.signature.shortSignature).mkString("\n")
+    val wiresTxt =
+      if (wires.isEmpty)
+        "No wires"
+      else
+        wires.map("- " + _.o.getPreferredNameOrElse().camel).mkString("\n")
 
     s"""=== Transition synchronization ===
        |Transition:
@@ -17,9 +27,11 @@ trait BipTransitionSynchronizationImpl[G] extends BipTransitionSynchronizationOp
   }
 
   override def layout(implicit ctx: Ctx): Doc =
-    Text("/*") <+/>
-      Text("javaBipTransitionSynchronization {") <>> {
-      Text("transitions:") <>> Doc.stack(transitions.map(ctx.name).map(Text("-") <+> _)) <+/>
-        Text("wires:") <>> Doc.stack(wires.map(wire => Text(ctx.name(wire.dataOut)) <+> "->" <+> ctx.name(wire.dataIn)))
+    Text("/*") <+/> Text("javaBipTransitionSynchronization {") <>> {
+      Text("transitions:") <>>
+        Doc.stack(transitions.map(ctx.name).map(Text("-") <+> _)) <+/>
+        Text("wires:") <>> Doc.stack(wires.map(wire =>
+          Text(ctx.name(wire.dataOut)) <+> "->" <+> ctx.name(wire.dataIn)
+        ))
     } <+/> "*/"
 }
diff --git a/src/col/vct/col/ast/declaration/global/ChoreographyImpl.scala b/src/col/vct/col/ast/declaration/global/ChoreographyImpl.scala
index a80ee15947..6d0e26a1bc 100644
--- a/src/col/vct/col/ast/declaration/global/ChoreographyImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/ChoreographyImpl.scala
@@ -1,7 +1,17 @@
 package vct.col.ast.declaration.global
 
 import vct.col.ast.declaration.DeclarationImpl
-import vct.col.ast.{Assign, ChorStatement, Class, Declaration, Endpoint, EndpointGuard, EndpointName, Node, Choreography}
+import vct.col.ast.{
+  Assign,
+  ChorStatement,
+  Class,
+  Declaration,
+  Endpoint,
+  EndpointGuard,
+  EndpointName,
+  Node,
+  Choreography,
+}
 import vct.col.ast.util.Declarator
 import vct.col.check.{CheckContext, CheckError}
 import vct.col.origin.Origin
@@ -20,20 +30,29 @@ object ChoreographyImpl {
     })
 }
 
-trait ChoreographyImpl[G] extends DeclarationImpl[G] with Declarator[G] with ChoreographyOps[G] { this: Choreography[G] =>
+trait ChoreographyImpl[G]
+    extends DeclarationImpl[G] with Declarator[G] with ChoreographyOps[G] {
+  this: Choreography[G] =>
   override def declarations: Seq[Declaration[G]] = params ++ endpoints ++ decls
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(Text("seq_program") <+> ctx.name(this) <> "(" <> Doc.args(params) <> ")") <+> "{" <>>
-        Doc.stack(endpoints ++ decls :+ preRun.map(preRun => Text("/* preRun */") <+> preRun.show).getOrElse(Empty) :+ run) <+/>
-      "}"
+      Group(
+        Text("seq_program") <+> ctx.name(this) <> "(" <> Doc.args(params) <> ")"
+      ) <+> "{" <>> Doc.stack(
+        endpoints ++ decls :+
+          preRun.map(preRun => Text("/* preRun */") <+> preRun.show)
+            .getOrElse(Empty) :+ run
+      ) <+/> "}",
     ))
 
-  override def enterCheckContextCurrentParticipatingEndpoints(context: CheckContext[G]): Option[Set[Endpoint[G]]] =
+  override def enterCheckContextCurrentParticipatingEndpoints(
+      context: CheckContext[G]
+  ): Option[Set[Endpoint[G]]] =
     context.withCurrentParticipatingEndpoints(endpoints)
 
-  override def enterCheckContextCurrentChoreography(context: CheckContext[G]): Option[Choreography[G]] =
-    Some(this)
+  override def enterCheckContextCurrentChoreography(
+      context: CheckContext[G]
+  ): Option[Choreography[G]] = Some(this)
 }
diff --git a/src/col/vct/col/ast/declaration/global/ClassImpl.scala b/src/col/vct/col/ast/declaration/global/ClassImpl.scala
index 33ae5dfaba..6b26f4e42b 100644
--- a/src/col/vct/col/ast/declaration/global/ClassImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/ClassImpl.scala
@@ -7,15 +7,21 @@ import vct.col.util.AstBuildHelpers.tt
 import vct.result.VerificationError.Unreachable
 import vct.col.ast.ops.ClassOps
 
-trait ClassImpl[G] extends Declarator[G] with ClassOps[G] { this: Class[G] =>
-  def transSupportArrowsHelper(seen: Set[TClass[G]]): Seq[(TClass[G], TClass[G])] = {
+trait ClassImpl[G] extends Declarator[G] with ClassOps[G] {
+  this: Class[G] =>
+  def transSupportArrowsHelper(
+      seen: Set[TClass[G]]
+  ): Seq[(TClass[G], TClass[G])] = {
     val t: TClass[G] = TClass(this.ref, typeArgs.map(v => TVar(v.ref)))
-    if(seen.contains(t)) Nil
-    else supers.map(sup => (t, sup)) ++
-      supers.flatMap(sup => sup.transSupportArrowsHelper(Set(t) ++ seen))
+    if (seen.contains(t))
+      Nil
+    else
+      supers.map(sup => (t, sup)) ++
+        supers.flatMap(sup => sup.transSupportArrowsHelper(Set(t) ++ seen))
   }
 
-  def transSupportArrows: Seq[(TClass[G], TClass[G])] = transSupportArrowsHelper(Set.empty)
+  def transSupportArrows: Seq[(TClass[G], TClass[G])] =
+    transSupportArrowsHelper(Set.empty)
 
   def supers: Seq[TClass[G]] = supports.map(_.asClass.get)
 
@@ -25,14 +31,20 @@ trait ClassImpl[G] extends Declarator[G] with ClassOps[G] { this: Class[G] =>
     Text("lock_invariant") <+> intrinsicLockInvariant <> ";" <+/> Empty
 
   override def layout(implicit ctx: Ctx): Doc =
-    (if(intrinsicLockInvariant == tt[G]) Empty else Doc.spec(Show.lazily(layoutLockInvariant(_)))) <>
-      Group(
-        Text("class") <+> ctx.name(this) <>
-          (if (typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs) <> ">" else Empty) <>
-        (if(supports.isEmpty) Empty else Text(" implements") <+>
-          Doc.args(supports.map(supp => ctx.name(supp.asClass.get.cls)).map(Text))) <+>
-        "{"
-      ) <>>
-      Doc.stack(decls) <+/>
-    "}"
-}
\ No newline at end of file
+    (if (intrinsicLockInvariant == tt[G])
+       Empty
+     else
+       Doc.spec(Show.lazily(layoutLockInvariant(_)))) <> Group(
+      Text("class") <+> ctx.name(this) <>
+        (if (typeArgs.nonEmpty)
+           Text("<") <> Doc.args(typeArgs) <> ">"
+         else
+           Empty) <>
+        (if (supports.isEmpty)
+           Empty
+         else
+           Text(" implements") <+> Doc.args(
+             supports.map(supp => ctx.name(supp.asClass.get.cls)).map(Text)
+           )) <+> "{"
+    ) <>> Doc.stack(decls) <+/> "}"
+}
diff --git a/src/col/vct/col/ast/declaration/global/FunctionImpl.scala b/src/col/vct/col/ast/declaration/global/FunctionImpl.scala
index 5650fbef2b..0539ef1366 100644
--- a/src/col/vct/col/ast/declaration/global/FunctionImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/FunctionImpl.scala
@@ -7,31 +7,43 @@ import vct.col.print._
 import scala.collection.immutable.ListMap
 import vct.col.ast.ops.FunctionOps
 
-trait FunctionImpl[G] extends GlobalDeclarationImpl[G] with AbstractFunctionImpl[G] with FunctionOps[G] { this: Function[G] =>
+trait FunctionImpl[G]
+    extends GlobalDeclarationImpl[G]
+    with AbstractFunctionImpl[G]
+    with FunctionOps[G] {
+  this: Function[G] =>
   def layoutSilver(implicit ctx: Ctx): Doc =
-    Group(Text("function") <+> ctx.name(this) <>
-      "(" <> Doc.args(args) <> "):" <+> returnType) <+/>
-      contract <+/>
-      (if(body.nonEmpty) Text("{") <>> body.get <+/> "}" else Empty)
+    Group(
+      Text("function") <+> ctx.name(this) <> "(" <> Doc.args(args) <> "):" <+>
+        returnType
+    ) <+/> contract <+/>
+      (if (body.nonEmpty)
+         Text("{") <>> body.get <+/> "}"
+       else
+         Empty)
 
-  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] = ListMap(
-    inline -> "inline",
-    threadLocal -> "thread_local",
-  ).filter(_._1).values.map(Text).map(Doc.inlineSpec).toSeq
+  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] =
+    ListMap(inline -> "inline", threadLocal -> "thread_local").filter(_._1)
+      .values.map(Text).map(Doc.inlineSpec).toSeq
 
   def layoutSpec(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
       Group(
-        Group(Doc.rspread(layoutModifiers) <> "pure" <+> returnType <+> ctx.name(this) <>
-          (if(typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ">" else Empty) <>
-          "(" <> Doc.args(args) <> ")") <>
-        body.map(Text(" =") <>> _ <> ";").getOrElse(Text(";"))
+        Group(
+          Doc.rspread(layoutModifiers) <> "pure" <+> returnType <+>
+            ctx.name(this) <>
+            (if (typeArgs.nonEmpty)
+               Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ">"
+             else
+               Empty) <> "(" <> Doc.args(args) <> ")"
+        ) <> body.map(Text(" =") <>> _ <> ";").getOrElse(Text(";"))
       ),
     ))
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.spec(Show.lazily(layoutSpec(_)))
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.spec(Show.lazily(layoutSpec(_)))
+    }
 }
diff --git a/src/col/vct/col/ast/declaration/global/GlobalDeclarationImpl.scala b/src/col/vct/col/ast/declaration/global/GlobalDeclarationImpl.scala
index 350df87362..aba131df19 100644
--- a/src/col/vct/col/ast/declaration/global/GlobalDeclarationImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/GlobalDeclarationImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.declaration.global
 import vct.col.ast.GlobalDeclaration
 import vct.col.ast.ops.GlobalDeclarationFamilyOps
 
-trait GlobalDeclarationImpl[G] extends GlobalDeclarationFamilyOps[G] { this: GlobalDeclaration[G] =>
+trait GlobalDeclarationImpl[G] extends GlobalDeclarationFamilyOps[G] {
+  this: GlobalDeclaration[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/declaration/global/HeapVariableImpl.scala b/src/col/vct/col/ast/declaration/global/HeapVariableImpl.scala
index 3075d20bd9..a61021641a 100644
--- a/src/col/vct/col/ast/declaration/global/HeapVariableImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/HeapVariableImpl.scala
@@ -4,12 +4,13 @@ import vct.col.ast.HeapVariable
 import vct.col.print._
 import vct.col.ast.ops.HeapVariableOps
 
-trait HeapVariableImpl[G] extends HeapVariableOps[G] { this: HeapVariable[G] =>
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP =>
-      val (spec, decl) = t.layoutSplitDeclarator
-      spec <+> decl <> ctx.name(this) <> ";"
-    case _ =>
-      t.show <+> ctx.name(this) <> ";"
-  }
+trait HeapVariableImpl[G] extends HeapVariableOps[G] {
+  this: HeapVariable[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP =>
+        val (spec, decl) = t.layoutSplitDeclarator
+        spec <+> decl <> ctx.name(this) <> ";"
+      case _ => t.show <+> ctx.name(this) <> ";"
+    }
 }
diff --git a/src/col/vct/col/ast/declaration/global/JavaBipGlueContainerImpl.scala b/src/col/vct/col/ast/declaration/global/JavaBipGlueContainerImpl.scala
index 7d60c1c448..5b2aeb8f45 100644
--- a/src/col/vct/col/ast/declaration/global/JavaBipGlueContainerImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/JavaBipGlueContainerImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.JavaBipGlueContainer
 import vct.col.print._
 import vct.col.ast.ops.JavaBipGlueContainerOps
 
-trait JavaBipGlueContainerImpl[G] extends JavaBipGlueContainerOps[G] { this: JavaBipGlueContainer[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    job.show
+trait JavaBipGlueContainerImpl[G] extends JavaBipGlueContainerOps[G] {
+  this: JavaBipGlueContainer[G] =>
+  override def layout(implicit ctx: Ctx): Doc = job.show
 }
diff --git a/src/col/vct/col/ast/declaration/global/ModelImpl.scala b/src/col/vct/col/ast/declaration/global/ModelImpl.scala
index ec47fc4a69..45de4d2b64 100644
--- a/src/col/vct/col/ast/declaration/global/ModelImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/ModelImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.Model
 import vct.col.print._
 import vct.col.ast.ops.ModelOps
 
-trait ModelImpl[G] extends ModelOps[G] { this: Model[G] =>
+trait ModelImpl[G] extends ModelOps[G] {
+  this: Model[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Text("model") <+> ctx.name(this) <+> "{" <+/> Doc.stack(declarations) <+/> "}"
-}
\ No newline at end of file
+    Text("model") <+> ctx.name(this) <+> "{" <+/> Doc.stack(declarations) <+/>
+      "}"
+}
diff --git a/src/col/vct/col/ast/declaration/global/PVLChoreographyImpl.scala b/src/col/vct/col/ast/declaration/global/PVLChoreographyImpl.scala
index 5b440598bb..3ccccd1be3 100644
--- a/src/col/vct/col/ast/declaration/global/PVLChoreographyImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/PVLChoreographyImpl.scala
@@ -4,12 +4,13 @@ import vct.col.ast.PVLChoreography
 import vct.col.print._
 import vct.col.ast.ops.PVLChoreographyOps
 
-trait PVLChoreographyImpl[G] extends PVLChoreographyOps[G] { this: PVLChoreography[G] =>
+trait PVLChoreographyImpl[G] extends PVLChoreographyOps[G] {
+  this: PVLChoreography[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(Text("seq_program") <+> ctx.name(this) <> "(" <> Doc.args(args) <> ")") <+> "{" <>>
-        Doc.stack(declarations) <+/>
-        "}"
+      Group(
+        Text("seq_program") <+> ctx.name(this) <> "(" <> Doc.args(args) <> ")"
+      ) <+> "{" <>> Doc.stack(declarations) <+/> "}",
     ))
 }
diff --git a/src/col/vct/col/ast/declaration/global/PredicateImpl.scala b/src/col/vct/col/ast/declaration/global/PredicateImpl.scala
index ee146c6740..f104760c31 100644
--- a/src/col/vct/col/ast/declaration/global/PredicateImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/PredicateImpl.scala
@@ -7,22 +7,32 @@ import vct.col.print._
 import scala.collection.immutable.ListMap
 import vct.col.ast.ops.PredicateOps
 
-trait PredicateImpl[G] extends GlobalDeclarationImpl[G] with AbstractPredicateImpl[G] with PredicateOps[G] { this: Predicate[G] =>
+trait PredicateImpl[G]
+    extends GlobalDeclarationImpl[G]
+    with AbstractPredicateImpl[G]
+    with PredicateOps[G] {
+  this: Predicate[G] =>
   def layoutSilver(implicit ctx: Ctx): Doc =
     Text("predicate") <+> ctx.name(this) <> "(" <> Doc.args(args) <> ")" <>
-      (if(body.nonEmpty) Text(" {") <>> body.get <+/> "}" else Empty)
+      (if (body.nonEmpty)
+         Text(" {") <>> body.get <+/> "}"
+       else
+         Empty)
 
-  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] = ListMap(
-    inline -> "inline",
-    threadLocal -> "thread_local",
-  ).filter(_._1).values.map(Text).map(Doc.inlineSpec).toSeq
+  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] =
+    ListMap(inline -> "inline", threadLocal -> "thread_local").filter(_._1)
+      .values.map(Text).map(Doc.inlineSpec).toSeq
 
   def layoutSpec(implicit ctx: Ctx): Doc =
-    Group(Doc.rspread(layoutModifiers) <> "resource" <+> ctx.name(this) <> "(" <> Doc.args(args) <> ")" <>
-      body.map(Text(" =") <>> _.show).getOrElse(Empty))
+    Group(
+      Doc.rspread(layoutModifiers) <> "resource" <+> ctx.name(this) <> "(" <>
+        Doc.args(args) <> ")" <> body.map(Text(" =") <>> _.show)
+          .getOrElse(Empty)
+    )
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.spec(Show.lazily(layoutSpec(_)))
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.spec(Show.lazily(layoutSpec(_)))
+    }
+}
diff --git a/src/col/vct/col/ast/declaration/global/ProcedureImpl.scala b/src/col/vct/col/ast/declaration/global/ProcedureImpl.scala
index 15aaff64cd..f76194e61a 100644
--- a/src/col/vct/col/ast/declaration/global/ProcedureImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/ProcedureImpl.scala
@@ -6,37 +6,57 @@ import vct.col.print._
 import scala.collection.immutable.ListMap
 import vct.col.ast.ops.ProcedureOps
 
-trait ProcedureImpl[G] extends ProcedureOps[G] { this: Procedure[G] =>
+trait ProcedureImpl[G] extends ProcedureOps[G] {
+  this: Procedure[G] =>
   def layoutSilver(implicit ctx: Ctx): Doc =
-    Group(Text("method") <+> ctx.name(this) <> "(" <> Doc.args(args) <> ")" <>
-      (if(outArgs.nonEmpty) Text(" returns (") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ")" else Empty)) <+/>
-      contract <>
-      (if(body.nonEmpty) Line <> body.get.layoutAsBlock else Empty)
+    Group(
+      Text("method") <+> ctx.name(this) <> "(" <> Doc.args(args) <> ")" <>
+        (if (outArgs.nonEmpty)
+           Text(" returns (") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <>
+             ")"
+         else
+           Empty)
+    ) <+/> contract <>
+      (if (body.nonEmpty)
+         Line <> body.get.layoutAsBlock
+       else
+         Empty)
 
   def layoutC(implicit ctx: Ctx): Doc = {
     val (spec, decl) = returnType.layoutSplitDeclarator
     Group(spec <+> decl <> ctx.name(this) <> "(" <> Doc.args(args) <> ")") <>
-      (if(body.nonEmpty) Text(" ") <> body.get.layoutAsBlock else Text(";"))
+      (if (body.nonEmpty)
+         Text(" ") <> body.get.layoutAsBlock
+       else
+         Text(";"))
   }
 
-  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] = ListMap(
-    pure -> "pure",
-    inline -> "inline",
-  ).filter(_._1).values.map(Text).map(Doc.inlineSpec).toSeq
+  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] =
+    ListMap(pure -> "pure", inline -> "inline").filter(_._1).values.map(Text)
+      .map(Doc.inlineSpec).toSeq
 
   def layoutSpec(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(Group(Doc.rspread(layoutModifiers) <> returnType <+> ctx.name(this) <>
-        (if (typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ">" else Empty)) <>
-        "(" <> Doc.args(args) <> ")" <>
-        (if (outArgs.nonEmpty) Text(" returns") <+> "(" <> Doc.args(outArgs) <> ")" else Empty)) <>
-        body.map(Text(" ") <> _.layoutAsBlock).getOrElse(Text(";")),
+      Group(
+        Group(
+          Doc.rspread(layoutModifiers) <> returnType <+> ctx.name(this) <>
+            (if (typeArgs.nonEmpty)
+               Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ">"
+             else
+               Empty)
+        ) <> "(" <> Doc.args(args) <> ")" <>
+          (if (outArgs.nonEmpty)
+             Text(" returns") <+> "(" <> Doc.args(outArgs) <> ")"
+           else
+             Empty)
+      ) <> body.map(Text(" ") <> _.layoutAsBlock).getOrElse(Text(";")),
     ))
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP => layoutC
-    case Ctx.PVL | Ctx.Java => Doc.spec(Show.lazily(layoutSpec(_)))
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP => layoutC
+      case Ctx.PVL | Ctx.Java => Doc.spec(Show.lazily(layoutSpec(_)))
+    }
+}
diff --git a/src/col/vct/col/ast/declaration/global/ProverFunctionImpl.scala b/src/col/vct/col/ast/declaration/global/ProverFunctionImpl.scala
index 685f24e1f2..6dfe2266e5 100644
--- a/src/col/vct/col/ast/declaration/global/ProverFunctionImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/ProverFunctionImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.declaration.global
 import vct.col.ast.{Node, ProverFunction}
 import vct.col.ast.ops.ProverFunctionOps
 
-trait ProverFunctionImpl[G] extends ProverFunctionOps[G] { this: ProverFunction[G] =>
+trait ProverFunctionImpl[G] extends ProverFunctionOps[G] {
+  this: ProverFunction[G] =>
   override def body: None.type = None
 }
diff --git a/src/col/vct/col/ast/declaration/global/ProverTypeImpl.scala b/src/col/vct/col/ast/declaration/global/ProverTypeImpl.scala
index 5f91f54bbd..35f6e05da8 100644
--- a/src/col/vct/col/ast/declaration/global/ProverTypeImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/ProverTypeImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.declaration.global
 import vct.col.ast.ProverType
 import vct.col.ast.ops.ProverTypeOps
 
-trait ProverTypeImpl[G] extends ProverTypeOps[G] { this: ProverType[G] =>
+trait ProverTypeImpl[G] extends ProverTypeOps[G] {
+  this: ProverType[G] =>
 
 }
diff --git a/src/col/vct/col/ast/declaration/global/SimplificationRuleImpl.scala b/src/col/vct/col/ast/declaration/global/SimplificationRuleImpl.scala
index 3a5d26bed0..86db148822 100644
--- a/src/col/vct/col/ast/declaration/global/SimplificationRuleImpl.scala
+++ b/src/col/vct/col/ast/declaration/global/SimplificationRuleImpl.scala
@@ -4,9 +4,8 @@ import vct.col.ast.SimplificationRule
 import vct.col.print._
 import vct.col.ast.ops.SimplificationRuleOps
 
-trait SimplificationRuleImpl[G] extends SimplificationRuleOps[G] { this: SimplificationRule[G] =>
+trait SimplificationRuleImpl[G] extends SimplificationRuleOps[G] {
+  this: SimplificationRule[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("axiom") <+> ctx.name(this) <+> "{" <>>
-      { axiom.show } <+/>
-    "}")
-}
\ No newline at end of file
+    Group(Text("axiom") <+> ctx.name(this) <+> "{" <>> { axiom.show } <+/> "}")
+}
diff --git a/src/col/vct/col/ast/declaration/model/ModelActionImpl.scala b/src/col/vct/col/ast/declaration/model/ModelActionImpl.scala
index cf4cde99a5..17aed92eea 100644
--- a/src/col/vct/col/ast/declaration/model/ModelActionImpl.scala
+++ b/src/col/vct/col/ast/declaration/model/ModelActionImpl.scala
@@ -5,7 +5,8 @@ import vct.col.check.{CheckContext, CheckError}
 import vct.col.print._
 import vct.col.ast.ops.ModelActionOps
 
-trait ModelActionImpl[G] extends ModelActionOps[G] { this: ModelAction[G] =>
+trait ModelActionImpl[G] extends ModelActionOps[G] {
+  this: ModelAction[G] =>
   override def returnType: Type[G] = TProcess()
   override def body: Option[Node[G]] = None
 
@@ -14,8 +15,15 @@ trait ModelActionImpl[G] extends ModelActionOps[G] { this: ModelAction[G] =>
 
   override def layout(implicit ctx: Ctx): Doc =
     DocUtil.clauses("requires", requires) <+/>
-      (if(modifies.nonEmpty) Text("modifies") <+> Doc.args(modifies.map(ctx.name).map(Text)) <> ";" <> Line else Empty) <>
-      (if(accessible.nonEmpty) Text("accessible") <+> Doc.args(accessible.map(ctx.name).map(Text)) <> ";" <> Line else Empty) <>
-      DocUtil.clauses("ensures", ensures) <+/>
+      (if (modifies.nonEmpty)
+         Text("modifies") <+> Doc.args(modifies.map(ctx.name).map(Text)) <>
+           ";" <> Line
+       else
+         Empty) <>
+      (if (accessible.nonEmpty)
+         Text("accessible") <+> Doc.args(accessible.map(ctx.name).map(Text)) <>
+           ";" <> Line
+       else
+         Empty) <> DocUtil.clauses("ensures", ensures) <+/>
       Group(Text("action") <+> ctx.name(this) <> "(" <> Doc.args(args) <> ");")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/declaration/model/ModelDeclarationImpl.scala b/src/col/vct/col/ast/declaration/model/ModelDeclarationImpl.scala
index d286fa6f8d..cd899f0239 100644
--- a/src/col/vct/col/ast/declaration/model/ModelDeclarationImpl.scala
+++ b/src/col/vct/col/ast/declaration/model/ModelDeclarationImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.declaration.model
 import vct.col.ast.ModelDeclaration
 import vct.col.ast.ops.ModelDeclarationFamilyOps
 
-trait ModelDeclarationImpl[G] extends ModelDeclarationFamilyOps[G] { this: ModelDeclaration[G] =>
+trait ModelDeclarationImpl[G] extends ModelDeclarationFamilyOps[G] {
+  this: ModelDeclaration[G] =>
 
 }
diff --git a/src/col/vct/col/ast/declaration/model/ModelFieldImpl.scala b/src/col/vct/col/ast/declaration/model/ModelFieldImpl.scala
index 067537c2c6..0bbe23c23d 100644
--- a/src/col/vct/col/ast/declaration/model/ModelFieldImpl.scala
+++ b/src/col/vct/col/ast/declaration/model/ModelFieldImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.ModelField
 import vct.col.print._
 import vct.col.ast.ops.ModelFieldOps
 
-trait ModelFieldImpl[G] extends ModelFieldOps[G] { this: ModelField[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    t.show <+> ctx.name(this) <> ";"
-}
\ No newline at end of file
+trait ModelFieldImpl[G] extends ModelFieldOps[G] {
+  this: ModelField[G] =>
+  override def layout(implicit ctx: Ctx): Doc = t.show <+> ctx.name(this) <> ";"
+}
diff --git a/src/col/vct/col/ast/declaration/model/ModelProcessImpl.scala b/src/col/vct/col/ast/declaration/model/ModelProcessImpl.scala
index ac093465b9..ab813a41e3 100644
--- a/src/col/vct/col/ast/declaration/model/ModelProcessImpl.scala
+++ b/src/col/vct/col/ast/declaration/model/ModelProcessImpl.scala
@@ -5,16 +5,28 @@ import vct.col.check.{CheckContext, CheckError}
 import vct.col.print._
 import vct.col.ast.ops.ModelProcessOps
 
-trait ModelProcessImpl[G] extends ModelProcessOps[G] { this: ModelProcess[G] =>
+trait ModelProcessImpl[G] extends ModelProcessOps[G] {
+  this: ModelProcess[G] =>
   override def returnType: Type[G] = TProcess()
   override def body: Option[Node[G]] = Some(impl)
   override def check(context: CheckContext[G]): Seq[CheckError] =
-    impl.checkSubType(TProcess()) ++ requires.checkSubType(TBool()) ++ ensures.checkSubType(TBool())
+    impl.checkSubType(TProcess()) ++ requires.checkSubType(TBool()) ++
+      ensures.checkSubType(TBool())
 
   override def layout(implicit ctx: Ctx): Doc =
     DocUtil.clauses("requires", requires) <+/>
-      (if (modifies.nonEmpty) Text("modifies") <+> Doc.args(modifies.map(ctx.name).map(Text)) <> ";" <> Line else Empty) <>
-      (if (accessible.nonEmpty) Text("accessible") <+> Doc.args(accessible.map(ctx.name).map(Text)) <> ";" <> Line else Empty) <>
-      DocUtil.clauses("ensures", ensures) <+/>
-      Group(Group(Text("process") <+> ctx.name(this) <> "(" <> Doc.args(args) <> ") =") <+> impl)
-}
\ No newline at end of file
+      (if (modifies.nonEmpty)
+         Text("modifies") <+> Doc.args(modifies.map(ctx.name).map(Text)) <>
+           ";" <> Line
+       else
+         Empty) <>
+      (if (accessible.nonEmpty)
+         Text("accessible") <+> Doc.args(accessible.map(ctx.name).map(Text)) <>
+           ";" <> Line
+       else
+         Empty) <> DocUtil.clauses("ensures", ensures) <+/> Group(
+        Group(
+          Text("process") <+> ctx.name(this) <> "(" <> Doc.args(args) <> ") ="
+        ) <+> impl
+      )
+}
diff --git a/src/col/vct/col/ast/declaration/singular/BipTransitionSignatureImpl.scala b/src/col/vct/col/ast/declaration/singular/BipTransitionSignatureImpl.scala
index ef5885e220..49ca33f1ca 100644
--- a/src/col/vct/col/ast/declaration/singular/BipTransitionSignatureImpl.scala
+++ b/src/col/vct/col/ast/declaration/singular/BipTransitionSignatureImpl.scala
@@ -1,9 +1,18 @@
 package vct.col.ast.declaration.singular
 
 import vct.col.ast.BipTransitionSignature
-import vct.col.ast.ops.{BipTransitionSignatureOps, BipTransitionSignatureFamilyOps}
+import vct.col.ast.ops.{
+  BipTransitionSignatureOps,
+  BipTransitionSignatureFamilyOps,
+}
 
-trait BipTransitionSignatureImpl[G] extends BipTransitionSignatureOps[G] with BipTransitionSignatureFamilyOps[G] { this: BipTransitionSignature[G] =>
-  def shortSignature: String = s"($portName, $sourceStateName, $targetStateName${", " + textualGuard.getOrElse("no guard")})"
-  def asciiSignature: String = s"port_${portName}_from_${sourceStateName}_to_$targetStateName${textualGuard.map(g => s"_if_guard").getOrElse("")}"
+trait BipTransitionSignatureImpl[G]
+    extends BipTransitionSignatureOps[G]
+    with BipTransitionSignatureFamilyOps[G] {
+  this: BipTransitionSignature[G] =>
+  def shortSignature: String =
+    s"($portName, $sourceStateName, $targetStateName${", " + textualGuard.getOrElse("no guard")})"
+  def asciiSignature: String =
+    s"port_${portName}_from_${sourceStateName}_to_$targetStateName${textualGuard
+        .map(g => s"_if_guard").getOrElse("")}"
 }
diff --git a/src/col/vct/col/ast/declaration/singular/EndpointImpl.scala b/src/col/vct/col/ast/declaration/singular/EndpointImpl.scala
index daa413560e..1d2c5b607f 100644
--- a/src/col/vct/col/ast/declaration/singular/EndpointImpl.scala
+++ b/src/col/vct/col/ast/declaration/singular/EndpointImpl.scala
@@ -6,12 +6,17 @@ import vct.col.print._
 import vct.col.ast.ops.{EndpointFamilyOps, EndpointOps}
 import vct.col.check.{CheckContext, CheckError}
 
-trait EndpointImpl[G] extends EndpointOps[G] with EndpointFamilyOps[G] with DeclarationImpl[G] { this: Endpoint[G] =>
+trait EndpointImpl[G]
+    extends EndpointOps[G] with EndpointFamilyOps[G] with DeclarationImpl[G] {
+  this: Endpoint[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("endpoint") <+> ctx.name(this) <+> "=" <>> { Group(t.show <> "(" <> Doc.args(args) <> ");") })
+    Group(Text("endpoint") <+> ctx.name(this) <+> "=" <>> {
+      Group(t.show <> "(" <> Doc.args(args) <> ");")
+    })
 
   def t: TClass[G] = TClass(cls, typeArgs)
 
-  override def check(ctx: CheckContext[G]): Seq[CheckError] = super.check(ctx) ++ ctx.checkInScope(this, cls)
+  override def check(ctx: CheckContext[G]): Seq[CheckError] =
+    super.check(ctx) ++ ctx.checkInScope(this, cls)
 
 }
diff --git a/src/col/vct/col/ast/declaration/singular/LabelDeclImpl.scala b/src/col/vct/col/ast/declaration/singular/LabelDeclImpl.scala
index accae7b3e7..d55861dfd2 100644
--- a/src/col/vct/col/ast/declaration/singular/LabelDeclImpl.scala
+++ b/src/col/vct/col/ast/declaration/singular/LabelDeclImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.LabelDecl
 import vct.col.print._
 import vct.col.ast.ops.{LabelDeclOps, LabelDeclFamilyOps}
 
-trait LabelDeclImpl[G] extends LabelDeclOps[G] with LabelDeclFamilyOps[G] { this: LabelDecl[G] =>
+trait LabelDeclImpl[G] extends LabelDeclOps[G] with LabelDeclFamilyOps[G] {
+  this: LabelDecl[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text(ctx.name(this))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/declaration/singular/ParBlockDeclImpl.scala b/src/col/vct/col/ast/declaration/singular/ParBlockDeclImpl.scala
index 1cd52f9ba1..6fe58a1448 100644
--- a/src/col/vct/col/ast/declaration/singular/ParBlockDeclImpl.scala
+++ b/src/col/vct/col/ast/declaration/singular/ParBlockDeclImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.ParBlockDecl
 import vct.col.print._
 import vct.col.ast.ops.{ParBlockDeclOps, ParBlockDeclFamilyOps}
 
-trait ParBlockDeclImpl[G] extends ParBlockDeclOps[G] with ParBlockDeclFamilyOps[G] { this: ParBlockDecl[G] =>
+trait ParBlockDeclImpl[G]
+    extends ParBlockDeclOps[G] with ParBlockDeclFamilyOps[G] {
+  this: ParBlockDecl[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text(ctx.name(this))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/declaration/singular/ParInvariantDeclImpl.scala b/src/col/vct/col/ast/declaration/singular/ParInvariantDeclImpl.scala
index 6b14813606..ca31281794 100644
--- a/src/col/vct/col/ast/declaration/singular/ParInvariantDeclImpl.scala
+++ b/src/col/vct/col/ast/declaration/singular/ParInvariantDeclImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.ParInvariantDecl
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.{ParInvariantDeclOps, ParInvariantDeclFamilyOps}
 
-trait ParInvariantDeclImpl[G] extends ParInvariantDeclOps[G] with ParInvariantDeclFamilyOps[G] { this: ParInvariantDecl[G] =>
+trait ParInvariantDeclImpl[G]
+    extends ParInvariantDeclOps[G] with ParInvariantDeclFamilyOps[G] {
+  this: ParInvariantDecl[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text(ctx.name(this))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/declaration/singular/SendDeclImpl.scala b/src/col/vct/col/ast/declaration/singular/SendDeclImpl.scala
index 57a1b64d00..273aee6de9 100644
--- a/src/col/vct/col/ast/declaration/singular/SendDeclImpl.scala
+++ b/src/col/vct/col/ast/declaration/singular/SendDeclImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.SendDecl
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.{SendDeclOps, SendDeclFamilyOps}
 
-trait SendDeclImpl[G] extends SendDeclOps[G] with SendDeclFamilyOps[G] { this: SendDecl[G] =>
+trait SendDeclImpl[G] extends SendDeclOps[G] with SendDeclFamilyOps[G] {
+  this: SendDecl[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text(ctx.name(this))
 }
diff --git a/src/col/vct/col/ast/declaration/singular/VariableImpl.scala b/src/col/vct/col/ast/declaration/singular/VariableImpl.scala
index 81fb5d6417..de51f9efe6 100644
--- a/src/col/vct/col/ast/declaration/singular/VariableImpl.scala
+++ b/src/col/vct/col/ast/declaration/singular/VariableImpl.scala
@@ -4,12 +4,14 @@ import vct.col.ast.Variable
 import vct.col.print._
 import vct.col.ast.ops.{VariableOps, VariableFamilyOps}
 
-trait VariableImpl[G] extends VariableOps[G] with VariableFamilyOps[G] { this: Variable[G] =>
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP =>
-      val (spec, decl) = t.layoutSplitDeclarator
-      spec <+> decl <> ctx.name(this)
-    case Ctx.PVL | Ctx.Java => t.show <+> ctx.name(this)
-    case Ctx.Silver => Text(ctx.name(this)) <> ":" <+> t
-  }
-}
\ No newline at end of file
+trait VariableImpl[G] extends VariableOps[G] with VariableFamilyOps[G] {
+  this: Variable[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP =>
+        val (spec, decl) = t.layoutSplitDeclarator
+        spec <+> decl <> ctx.name(this)
+      case Ctx.PVL | Ctx.Java => t.show <+> ctx.name(this)
+      case Ctx.Silver => Text(ctx.name(this)) <> ":" <+> t
+    }
+}
diff --git a/src/col/vct/col/ast/expr/ExprImpl.scala b/src/col/vct/col/ast/expr/ExprImpl.scala
index ef7494c9b3..a7d670d791 100644
--- a/src/col/vct/col/ast/expr/ExprImpl.scala
+++ b/src/col/vct/col/ast/expr/ExprImpl.scala
@@ -7,7 +7,8 @@ import vct.col.print._
 import vct.col.typerules.CoercionUtils
 import vct.col.ast.ops.ExprFamilyOps
 
-trait ExprImpl[G] extends NodeFamilyImpl[G] with ExprFamilyOps[G] { this: Expr[G] =>
+trait ExprImpl[G] extends NodeFamilyImpl[G] with ExprFamilyOps[G] {
+  this: Expr[G] =>
   def checkSubType(other: Type[G]): Seq[CheckError] =
     CoercionUtils.getCoercion(t, other) match {
       case Some(_) => Nil
@@ -16,27 +17,36 @@ trait ExprImpl[G] extends NodeFamilyImpl[G] with ExprFamilyOps[G] { this: Expr[G
 
   def t: Type[G]
 
-  private def unfold(node: Expr[G])(matchFunc: PartialFunction[Expr[G], Seq[Expr[G]]]): Seq[Expr[G]] =
+  private def unfold(
+      node: Expr[G]
+  )(matchFunc: PartialFunction[Expr[G], Seq[Expr[G]]]): Seq[Expr[G]] =
     matchFunc.lift(node) match {
       case Some(value) => value.flatMap(unfold(_)(matchFunc))
       case None => Seq(node)
     }
 
-  def unfoldStar: Seq[Expr[G]] = unfold(this) { case Star(left, right) => Seq(left, right) }
-  def unfoldProcessPar: Seq[Expr[G]] = unfold(this) { case ProcessPar(l, r) => Seq(l, r) }
+  def unfoldStar: Seq[Expr[G]] =
+    unfold(this) { case Star(left, right) => Seq(left, right) }
+  def unfoldProcessPar: Seq[Expr[G]] =
+    unfold(this) { case ProcessPar(l, r) => Seq(l, r) }
 
   def precedence: Int = Precedence.UNKNOWN
 
   def bind(precedence: Int)(implicit ctx: Ctx): Doc =
-    if(this.precedence >= precedence) show
-    else Text("(") <> show <> ")"
+    if (this.precedence >= precedence)
+      show
+    else
+      Text("(") <> show <> ")"
 
   def assoc(other: Expr[_])(implicit ctx: Ctx): Doc = other.bind(precedence)
-  def nassoc(other: Expr[_])(implicit ctx: Ctx): Doc = other.bind(precedence-1)
+  def nassoc(other: Expr[_])(implicit ctx: Ctx): Doc =
+    other.bind(precedence - 1)
 
-  def lassoc(left: Expr[_], op: String, right: Expr[_])(implicit ctx: Ctx): Doc =
-    Group(assoc(left) <+> op <+/> nassoc(right))
+  def lassoc(left: Expr[_], op: String, right: Expr[_])(
+      implicit ctx: Ctx
+  ): Doc = Group(assoc(left) <+> op <+/> nassoc(right))
 
-  def rassoc(left: Expr[_], op: String, right: Expr[_])(implicit ctx: Ctx): Doc =
-    Group(nassoc(left) <+> op <+/> assoc(right))
-}
\ No newline at end of file
+  def rassoc(left: Expr[_], op: String, right: Expr[_])(
+      implicit ctx: Ctx
+  ): Doc = Group(nassoc(left) <+> op <+/> assoc(right))
+}
diff --git a/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalAndImpl.scala b/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalAndImpl.scala
index fda25becfa..02d3a1f62c 100644
--- a/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalAndImpl.scala
+++ b/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalAndImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousComputationalAnd
 import vct.col.print._
 import vct.col.ast.ops.AmbiguousComputationalAndOps
 
-trait AmbiguousComputationalAndImpl[G] extends AmbiguousComputationalAndOps[G] { this: AmbiguousComputationalAnd[G] =>
+trait AmbiguousComputationalAndImpl[G] extends AmbiguousComputationalAndOps[G] {
+  this: AmbiguousComputationalAnd[G] =>
   override def precedence: Int = Precedence.BIT_AND
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "&", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalOrImpl.scala b/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalOrImpl.scala
index f390dc13ad..b8e88ab440 100644
--- a/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalOrImpl.scala
+++ b/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalOrImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousComputationalOr
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.AmbiguousComputationalOrOps
 
-trait AmbiguousComputationalOrImpl[G] extends AmbiguousComputationalOrOps[G] { this: AmbiguousComputationalOr[G] =>
+trait AmbiguousComputationalOrImpl[G] extends AmbiguousComputationalOrOps[G] {
+  this: AmbiguousComputationalOr[G] =>
   override def precedence: Int = Precedence.BIT_OR
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "|", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalXorImpl.scala b/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalXorImpl.scala
index bb45d900f5..5456b8fb23 100644
--- a/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalXorImpl.scala
+++ b/src/col/vct/col/ast/expr/ambiguous/AmbiguousComputationalXorImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousComputationalXor
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.AmbiguousComputationalXorOps
 
-trait AmbiguousComputationalXorImpl[G] extends AmbiguousComputationalXorOps[G] { this: AmbiguousComputationalXor[G] =>
+trait AmbiguousComputationalXorImpl[G] extends AmbiguousComputationalXorOps[G] {
+  this: AmbiguousComputationalXor[G] =>
   override def precedence: Int = Precedence.BIT_XOR
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "^", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/ambiguous/AmbiguousMemberImpl.scala b/src/col/vct/col/ast/expr/ambiguous/AmbiguousMemberImpl.scala
index 63d681dc62..8e6394f706 100644
--- a/src/col/vct/col/ast/expr/ambiguous/AmbiguousMemberImpl.scala
+++ b/src/col/vct/col/ast/expr/ambiguous/AmbiguousMemberImpl.scala
@@ -5,20 +5,37 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.typerules.CoercionUtils
 import vct.col.ast.ops.AmbiguousMemberOps
 
-trait AmbiguousMemberImpl[G] extends AmbiguousMemberOps[G] { this: AmbiguousMember[G] =>
+trait AmbiguousMemberImpl[G] extends AmbiguousMemberOps[G] {
+  this: AmbiguousMember[G] =>
   def isSeqOp: Boolean = CoercionUtils.getAnySeqCoercion(xs.t).isDefined
   def isSetOp: Boolean = CoercionUtils.getAnySetCoercion(xs.t).isDefined
   def isMapOp: Boolean = CoercionUtils.getAnyMapCoercion(xs.t).isDefined
   def isBagOp: Boolean = CoercionUtils.getAnyBagCoercion(xs.t).isDefined
 
   def collectionElementType: Type[G] =
-    if(isSeqOp) xs.t.asSeq.get.element
-    else if(isSetOp) xs.t.asSet.get.element
-    else if(isBagOp) xs.t.asBag.get.element
-    else xs.t.asMap.get.key
+    if (isSeqOp)
+      xs.t.asSeq.get.element
+    else if (isSetOp)
+      xs.t.asSet.get.element
+    else if (isBagOp)
+      xs.t.asBag.get.element
+    else
+      xs.t.asMap.get.key
 
-  override lazy val t: Type[G] = if(isBagOp) TInt() else TBool()
+  override lazy val t: Type[G] =
+    if (isBagOp)
+      TInt()
+    else
+      TBool()
 
   override def precedence: Int = Precedence.PVL_CONTAINS
-  override def layout(implicit ctx: Ctx): Doc = lassoc(x, if(ctx.syntax == Ctx.Silver) "in" else "\\in", xs)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    lassoc(
+      x,
+      if (ctx.syntax == Ctx.Silver)
+        "in"
+      else
+        "\\in",
+      xs,
+    )
+}
diff --git a/src/col/vct/col/ast/expr/ambiguous/AmbiguousMinusImpl.scala b/src/col/vct/col/ast/expr/ambiguous/AmbiguousMinusImpl.scala
index 567e0dbd64..b025bb5638 100644
--- a/src/col/vct/col/ast/expr/ambiguous/AmbiguousMinusImpl.scala
+++ b/src/col/vct/col/ast/expr/ambiguous/AmbiguousMinusImpl.scala
@@ -5,12 +5,16 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.typerules.{CoercionUtils, Types}
 import vct.col.ast.ops.AmbiguousMinusOps
 
-trait AmbiguousMinusImpl[G] extends AmbiguousMinusOps[G] { this: AmbiguousMinus[G] =>
+trait AmbiguousMinusImpl[G] extends AmbiguousMinusOps[G] {
+  this: AmbiguousMinus[G] =>
 
   override lazy val t: Type[G] = {
-    if(isSetOp || isBagOp || isVectorOp) Types.leastCommonSuperType(left.t, right.t)
-    else if(isPointerOp) left.t
-    else getNumericType
+    if (isSetOp || isBagOp || isVectorOp)
+      Types.leastCommonSuperType(left.t, right.t)
+    else if (isPointerOp)
+      left.t
+    else
+      getNumericType
   }
 
   override def precedence: Int = Precedence.ADDITIVE
diff --git a/src/col/vct/col/ast/expr/ambiguous/AmbiguousMultImpl.scala b/src/col/vct/col/ast/expr/ambiguous/AmbiguousMultImpl.scala
index f4d924a9dc..9b5911fba6 100644
--- a/src/col/vct/col/ast/expr/ambiguous/AmbiguousMultImpl.scala
+++ b/src/col/vct/col/ast/expr/ambiguous/AmbiguousMultImpl.scala
@@ -5,12 +5,16 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.typerules.{CoercionUtils, Types}
 import vct.col.ast.ops.AmbiguousMultOps
 
-trait AmbiguousMultImpl[G] extends AmbiguousMultOps[G] { this: AmbiguousMult[G] =>
+trait AmbiguousMultImpl[G] extends AmbiguousMultOps[G] {
+  this: AmbiguousMult[G] =>
   override lazy val t: Type[G] =
-    if (isVectorOp) Types.leastCommonSuperType(left.t, right.t)
-    else if(isProcessOp) TProcess()
-    else getNumericType
+    if (isVectorOp)
+      Types.leastCommonSuperType(left.t, right.t)
+    else if (isProcessOp)
+      TProcess()
+    else
+      getNumericType
 
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "*", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/ambiguous/AmbiguousOrImpl.scala b/src/col/vct/col/ast/expr/ambiguous/AmbiguousOrImpl.scala
index 6ac94ecc56..b60df088b8 100644
--- a/src/col/vct/col/ast/expr/ambiguous/AmbiguousOrImpl.scala
+++ b/src/col/vct/col/ast/expr/ambiguous/AmbiguousOrImpl.scala
@@ -5,9 +5,14 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.typerules.CoercionUtils
 import vct.col.ast.ops.AmbiguousOrOps
 
-trait AmbiguousOrImpl[G] extends AmbiguousOrOps[G] { this: AmbiguousOr[G] =>
-  override lazy val t: Type[G] = if(isProcessOp) TProcess() else TBool()
+trait AmbiguousOrImpl[G] extends AmbiguousOrOps[G] {
+  this: AmbiguousOr[G] =>
+  override lazy val t: Type[G] =
+    if (isProcessOp)
+      TProcess()
+    else
+      TBool()
 
   override def precedence: Int = Precedence.OR
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "||", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/ambiguous/AmbiguousPlusImpl.scala b/src/col/vct/col/ast/expr/ambiguous/AmbiguousPlusImpl.scala
index ba7daae607..8a227e7898 100644
--- a/src/col/vct/col/ast/expr/ambiguous/AmbiguousPlusImpl.scala
+++ b/src/col/vct/col/ast/expr/ambiguous/AmbiguousPlusImpl.scala
@@ -7,20 +7,32 @@ import vct.col.typerules.{CoercionUtils, Types}
 import vct.result.VerificationError.Unreachable
 import vct.col.ast.ops.AmbiguousPlusOps
 
-trait AmbiguousPlusImpl[G] extends AmbiguousPlusOps[G] { this: AmbiguousPlus[G] =>
+trait AmbiguousPlusImpl[G] extends AmbiguousPlusOps[G] {
+  this: AmbiguousPlus[G] =>
 
-  def getValidOperatorsOf(operator: Operator[G]): Option[Seq[ContractApplicable[G]]] = {
-    val subject = if(operator == OperatorLeftPlus[G]()) left else right
-    val decls = subject.t match {
-      case TClass(Ref(cls), _) => cls.decls
-      case JavaTClass(Ref(cls), _) => cls.decls
-      case _ => return None
-    }
+  def getValidOperatorsOf(
+      operator: Operator[G]
+  ): Option[Seq[ContractApplicable[G]]] = {
+    val subject =
+      if (operator == OperatorLeftPlus[G]())
+        left
+      else
+        right
+    val decls =
+      subject.t match {
+        case TClass(Ref(cls), _) => cls.decls
+        case JavaTClass(Ref(cls), _) => cls.decls
+        case _ => return None
+      }
     Some(decls.collect {
-      case m: InstanceOperatorMethod[G] if m.operator == operator
-        && CoercionUtils.getCoercion(right.t, m.args.head.t).isDefined => m
-      case f: InstanceOperatorFunction[G] if f.operator == operator
-        && CoercionUtils.getCoercion(right.t, f.args.head.t).isDefined => f
+      case m: InstanceOperatorMethod[G]
+          if m.operator == operator &&
+            CoercionUtils.getCoercion(right.t, m.args.head.t).isDefined =>
+        m
+      case f: InstanceOperatorFunction[G]
+          if f.operator == operator &&
+            CoercionUtils.getCoercion(right.t, f.args.head.t).isDefined =>
+        f
     })
   }
 
@@ -38,14 +50,20 @@ trait AmbiguousPlusImpl[G] extends AmbiguousPlusOps[G] { this: AmbiguousPlus[G]
       .orElse(getCustomPlusType(OperatorRightPlus[G]()))
 
   override lazy val t: Type[G] = {
-    if(isProcessOp) TProcess()
-    else if(isSeqOp || isBagOp || isSetOp || isVectorOp) Types.leastCommonSuperType(left.t, right.t)
-    else if(isPointerOp) left.t
-    else if(isStringOp) TString()
-    else if(getCustomPlusOpType().isDefined) getCustomPlusOpType().get
-    else getNumericType
+    if (isProcessOp)
+      TProcess()
+    else if (isSeqOp || isBagOp || isSetOp || isVectorOp)
+      Types.leastCommonSuperType(left.t, right.t)
+    else if (isPointerOp)
+      left.t
+    else if (isStringOp)
+      TString()
+    else if (getCustomPlusOpType().isDefined)
+      getCustomPlusOpType().get
+    else
+      getNumericType
   }
 
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "+", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/ambiguous/AmbiguousSubscriptImpl.scala b/src/col/vct/col/ast/expr/ambiguous/AmbiguousSubscriptImpl.scala
index fa37731f0b..b74c29e42c 100644
--- a/src/col/vct/col/ast/expr/ambiguous/AmbiguousSubscriptImpl.scala
+++ b/src/col/vct/col/ast/expr/ambiguous/AmbiguousSubscriptImpl.scala
@@ -6,26 +6,42 @@ import vct.col.typerules.CoercionUtils
 import vct.result.VerificationError.Unreachable
 import vct.col.ast.ops.AmbiguousSubscriptOps
 
-trait AmbiguousSubscriptImpl[G] extends AmbiguousSubscriptOps[G] { this: AmbiguousSubscript[G] =>
+trait AmbiguousSubscriptImpl[G] extends AmbiguousSubscriptOps[G] {
+  this: AmbiguousSubscript[G] =>
   def isSeqOp: Boolean = CoercionUtils.getAnySeqCoercion(collection.t).isDefined
-  def isVectorOp: Boolean = CoercionUtils.getAnyVectorCoercion(collection.t).isDefined
-  def isArrayOp: Boolean = CoercionUtils.getAnyArrayCoercion(collection.t).isDefined
-  def isCArrayOp: Boolean = CoercionUtils.getAnyCArrayCoercion(collection.t).isDefined
-  def isCPPArrayOp: Boolean = CoercionUtils.getAnyCPPArrayCoercion(collection.t).isDefined
-  def isPointerOp: Boolean = CoercionUtils.getAnyPointerCoercion(collection.t).isDefined
+  def isVectorOp: Boolean =
+    CoercionUtils.getAnyVectorCoercion(collection.t).isDefined
+  def isArrayOp: Boolean =
+    CoercionUtils.getAnyArrayCoercion(collection.t).isDefined
+  def isCArrayOp: Boolean =
+    CoercionUtils.getAnyCArrayCoercion(collection.t).isDefined
+  def isCPPArrayOp: Boolean =
+    CoercionUtils.getAnyCPPArrayCoercion(collection.t).isDefined
+  def isPointerOp: Boolean =
+    CoercionUtils.getAnyPointerCoercion(collection.t).isDefined
   def isMapOp: Boolean = CoercionUtils.getAnyMapCoercion(collection.t).isDefined
 
   override lazy val t: Type[G] =
-    if (isSeqOp) collection.t.asSeq.get.element
-    else if (isVectorOp) collection.t.asVector.get.element
-    else if (isArrayOp) collection.t.asArray.get.element
-    else if (isCArrayOp) collection.t.asCArray.get.innerType
-    else if (isCPPArrayOp) collection.t.asCPPArray.get.innerType
-    else if (isPointerOp) collection.t.asPointer.get.element
-    else if (isMapOp) collection.t.asMap.get.value
-    else throw Unreachable(s"Trying to subscript ($this) a non subscriptable variable with type ${collection.t}")
+    if (isSeqOp)
+      collection.t.asSeq.get.element
+    else if (isVectorOp)
+      collection.t.asVector.get.element
+    else if (isArrayOp)
+      collection.t.asArray.get.element
+    else if (isCArrayOp)
+      collection.t.asCArray.get.innerType
+    else if (isCPPArrayOp)
+      collection.t.asCPPArray.get.innerType
+    else if (isPointerOp)
+      collection.t.asPointer.get.element
+    else if (isMapOp)
+      collection.t.asMap.get.value
+    else
+      throw Unreachable(
+        s"Trying to subscript ($this) a non subscriptable variable with type ${collection.t}"
+      )
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(assoc(collection) <> "[" <> Doc.arg(index) <> "]")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/apply/ADTFunctionInvocationImpl.scala b/src/col/vct/col/ast/expr/apply/ADTFunctionInvocationImpl.scala
index b22c9f2198..917bae2def 100644
--- a/src/col/vct/col/ast/expr/apply/ADTFunctionInvocationImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/ADTFunctionInvocationImpl.scala
@@ -5,7 +5,8 @@ import vct.col.print._
 import vct.col.ref.Ref
 import vct.col.ast.ops.ADTFunctionInvocationOps
 
-trait ADTFunctionInvocationImpl[G] extends ADTFunctionInvocationOps[G] { this: ADTFunctionInvocation[G] =>
+trait ADTFunctionInvocationImpl[G] extends ADTFunctionInvocationOps[G] {
+  this: ADTFunctionInvocation[G] =>
   override def ref: Ref[G, _ <: ADTFunction[G]]
   override lazy val t: Type[G] =
     typeArgs match {
@@ -14,24 +15,28 @@ trait ADTFunctionInvocationImpl[G] extends ADTFunctionInvocationOps[G] { this: A
       case None => ref.decl.returnType
     }
 
-  def layoutSpec(implicit ctx: Ctx): Doc = typeArgs match {
-    case None => layoutSilver // will not be resolvable anyway
-    case Some((adt, typeArgs)) =>
-      Group(
+  def layoutSpec(implicit ctx: Ctx): Doc =
+    typeArgs match {
+      case None => layoutSilver // will not be resolvable anyway
+      case Some((adt, typeArgs)) =>
         Group(
-          Text(ctx.name(adt)) <>
-          (if(typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs) <> ">" else Empty) <>
-          "." <> ctx.name(ref) <> "("
-        ) <> Doc.args(args) <> ")"
-      )
-  }
+          Group(
+            Text(ctx.name(adt)) <>
+              (if (typeArgs.nonEmpty)
+                 Text("<") <> Doc.args(typeArgs) <> ">"
+               else
+                 Empty) <> "." <> ctx.name(ref) <> "("
+          ) <> Doc.args(args) <> ")"
+        )
+    }
 
   def layoutSilver(implicit ctx: Ctx): Doc =
     Group(Text(ctx.name(ref)) <> "(" <> Doc.args(args) <> ")")
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => layoutSpec
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => layoutSpec
+    }
+}
diff --git a/src/col/vct/col/ast/expr/apply/ActionApplyImpl.scala b/src/col/vct/col/ast/expr/apply/ActionApplyImpl.scala
index 1d98b32f01..31b8e912e3 100644
--- a/src/col/vct/col/ast/expr/apply/ActionApplyImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/ActionApplyImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{ActionApply, TProcess, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text, Group}
 import vct.col.ast.ops.ActionApplyOps
 
-trait ActionApplyImpl[G] extends ActionApplyOps[G] { this: ActionApply[G] =>
+trait ActionApplyImpl[G] extends ActionApplyOps[G] {
+  this: ActionApply[G] =>
   override def t: Type[G] = TProcess()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text(ctx.name(action)) <> "(" <> Doc.args(args) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/apply/AnyFunctionInvocationImpl.scala b/src/col/vct/col/ast/expr/apply/AnyFunctionInvocationImpl.scala
index fd0d481cba..8f15ab4867 100644
--- a/src/col/vct/col/ast/expr/apply/AnyFunctionInvocationImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/AnyFunctionInvocationImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.apply
 import vct.col.ast.{AbstractFunction, AnyFunctionInvocation}
 import vct.col.ref.Ref
 
-trait AnyFunctionInvocationImpl[G] { this: AnyFunctionInvocation[G] =>
+trait AnyFunctionInvocationImpl[G] {
+  this: AnyFunctionInvocation[G] =>
   override def ref: Ref[G, _ <: AbstractFunction[G]]
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/apply/AnyMethodInvocationImpl.scala b/src/col/vct/col/ast/expr/apply/AnyMethodInvocationImpl.scala
index d6307d9c0f..63bce7b4f0 100644
--- a/src/col/vct/col/ast/expr/apply/AnyMethodInvocationImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/AnyMethodInvocationImpl.scala
@@ -3,7 +3,8 @@ package vct.col.ast.expr.apply
 import vct.col.ast.{AbstractMethod, AnyMethodInvocation, Expr}
 import vct.col.ref.Ref
 
-trait AnyMethodInvocationImpl[G] { this: AnyMethodInvocation[G] =>
+trait AnyMethodInvocationImpl[G] {
+  this: AnyMethodInvocation[G] =>
   override def ref: Ref[G, _ <: AbstractMethod[G]]
   def outArgs: Seq[Expr[G]]
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/apply/ApplyAnyPredicateImpl.scala b/src/col/vct/col/ast/expr/apply/ApplyAnyPredicateImpl.scala
index 99063b0708..6a2478e367 100644
--- a/src/col/vct/col/ast/expr/apply/ApplyAnyPredicateImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/ApplyAnyPredicateImpl.scala
@@ -3,7 +3,8 @@ package vct.col.ast.expr.apply
 import vct.col.ast.{AbstractPredicate, ApplyAnyPredicate, Expr}
 import vct.col.ref.Ref
 
-trait ApplyAnyPredicateImpl[G] { this: ApplyAnyPredicate[G] =>
+trait ApplyAnyPredicateImpl[G] {
+  this: ApplyAnyPredicate[G] =>
   override def ref: Ref[G, _ <: AbstractPredicate[G]]
   def perm: Expr[G]
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/apply/ApplyImpl.scala b/src/col/vct/col/ast/expr/apply/ApplyImpl.scala
index e4a68f19aa..ba9d78a3fa 100644
--- a/src/col/vct/col/ast/expr/apply/ApplyImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/ApplyImpl.scala
@@ -3,9 +3,10 @@ package vct.col.ast.expr.apply
 import vct.col.ast.{Applicable, Apply, Expr, Type}
 import vct.col.ref.Ref
 
-trait ApplyImpl[G] { this: Apply[G] =>
+trait ApplyImpl[G] {
+  this: Apply[G] =>
   def ref: Ref[G, _ <: Applicable[G]]
   def args: Seq[Expr[G]]
 
   override def t: Type[G] = ref.decl.returnType
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/apply/ApplyInlineableImpl.scala b/src/col/vct/col/ast/expr/apply/ApplyInlineableImpl.scala
index 1156bc07d3..974fe8e047 100644
--- a/src/col/vct/col/ast/expr/apply/ApplyInlineableImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/ApplyInlineableImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.apply
 import vct.col.ast.{ApplyInlineable, InlineableApplicable}
 import vct.col.ref.Ref
 
-trait ApplyInlineableImpl[G] { this: ApplyInlineable[G] =>
+trait ApplyInlineableImpl[G] {
+  this: ApplyInlineable[G] =>
   override def ref: Ref[G, _ <: InlineableApplicable[G]]
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/apply/CoalesceInstancePredicateApplyImpl.scala b/src/col/vct/col/ast/expr/apply/CoalesceInstancePredicateApplyImpl.scala
index caf7530b63..b0c5c62df1 100644
--- a/src/col/vct/col/ast/expr/apply/CoalesceInstancePredicateApplyImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/CoalesceInstancePredicateApplyImpl.scala
@@ -4,8 +4,13 @@ import vct.col.ast.CoalesceInstancePredicateApply
 import vct.col.print._
 import vct.col.ast.ops.CoalesceInstancePredicateApplyOps
 
-trait CoalesceInstancePredicateApplyImpl[G] extends CoalesceInstancePredicateApplyOps[G] { this: CoalesceInstancePredicateApply[G] =>
+trait CoalesceInstancePredicateApplyImpl[G]
+    extends CoalesceInstancePredicateApplyOps[G] {
+  this: CoalesceInstancePredicateApply[G] =>
   override def precedence: Int = Precedence.PREFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("[") <> perm <> "]" <> obj.bind(Precedence.POSTFIX) <> "?." <> ctx.name(ref) <> "(" <> Doc.args(args) <> ")")
+    Group(
+      Text("[") <> perm <> "]" <> obj.bind(Precedence.POSTFIX) <> "?." <>
+        ctx.name(ref) <> "(" <> Doc.args(args) <> ")"
+    )
 }
diff --git a/src/col/vct/col/ast/expr/apply/FunctionInvocationImpl.scala b/src/col/vct/col/ast/expr/apply/FunctionInvocationImpl.scala
index f0aeef2478..58c8364c52 100644
--- a/src/col/vct/col/ast/expr/apply/FunctionInvocationImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/FunctionInvocationImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{FunctionInvocation, Variable, Type}
 import vct.col.print._
 import vct.col.ast.ops.FunctionInvocationOps
 
-trait FunctionInvocationImpl[G] extends FunctionInvocationOps[G] { this: FunctionInvocation[G] =>
+trait FunctionInvocationImpl[G] extends FunctionInvocationOps[G] {
+  this: FunctionInvocation[G] =>
   def layoutSilver(implicit ctx: Ctx): Doc =
     Group(Text(ctx.name(ref)) <> "(" <> Doc.args(args) <> ")")
 
@@ -12,16 +13,20 @@ trait FunctionInvocationImpl[G] extends FunctionInvocationOps[G] { this: Functio
     Group(
       Group(
         Text(ctx.name(ref)) <>
-          (if(typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs) <> ">" else Empty) <>
-          "("
+          (if (typeArgs.nonEmpty)
+             Text("<") <> Doc.args(typeArgs) <> ">"
+           else
+             Empty) <> "("
       ) <> Doc.args(args) <> ")" <> DocUtil.givenYields(givenMap, yields)
     )
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => layoutSpec
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => layoutSpec
+    }
 
-  override def typeEnv: Map[Variable[G], Type[G]] = ref.decl.typeArgs.zip(typeArgs).toMap
+  override def typeEnv: Map[Variable[G], Type[G]] =
+    ref.decl.typeArgs.zip(typeArgs).toMap
 }
diff --git a/src/col/vct/col/ast/expr/apply/InstanceApplyImpl.scala b/src/col/vct/col/ast/expr/apply/InstanceApplyImpl.scala
index 1069eff2f3..b54da17ac6 100644
--- a/src/col/vct/col/ast/expr/apply/InstanceApplyImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/InstanceApplyImpl.scala
@@ -3,7 +3,8 @@ package vct.col.ast.expr.apply
 import vct.col.ast.{ClassDeclaration, Expr, InstanceApply}
 import vct.col.ref.Ref
 
-trait InstanceApplyImpl[G] { this: InstanceApply[G] =>
+trait InstanceApplyImpl[G] {
+  this: InstanceApply[G] =>
   def ref: Ref[G, _ <: ClassDeclaration[G]]
   def obj: Expr[G]
 }
diff --git a/src/col/vct/col/ast/expr/apply/InstanceFunctionInvocationImpl.scala b/src/col/vct/col/ast/expr/apply/InstanceFunctionInvocationImpl.scala
index 9cb8e81e06..c200d872c6 100644
--- a/src/col/vct/col/ast/expr/apply/InstanceFunctionInvocationImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/InstanceFunctionInvocationImpl.scala
@@ -4,14 +4,18 @@ import vct.col.ast.{InstanceFunctionInvocation, Variable, Type}
 import vct.col.print.{Ctx, Doc, DocUtil, Empty, Group, Precedence, Text}
 import vct.col.ast.ops.InstanceFunctionInvocationOps
 
-trait InstanceFunctionInvocationImpl[G] extends InstanceFunctionInvocationOps[G] { this: InstanceFunctionInvocation[G] =>
+trait InstanceFunctionInvocationImpl[G]
+    extends InstanceFunctionInvocationOps[G] {
+  this: InstanceFunctionInvocation[G] =>
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(
       Group(
         assoc(obj) <> "." <> ctx.name(ref) <>
-          (if (typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs) <> ">" else Empty) <>
-          "("
+          (if (typeArgs.nonEmpty)
+             Text("<") <> Doc.args(typeArgs) <> ">"
+           else
+             Empty) <> "("
       ) <> Doc.args(args) <> ")" <> DocUtil.givenYields(givenMap, yields)
     )
 
diff --git a/src/col/vct/col/ast/expr/apply/InstancePredicateApplyImpl.scala b/src/col/vct/col/ast/expr/apply/InstancePredicateApplyImpl.scala
index 9108c285e0..0af2b57712 100644
--- a/src/col/vct/col/ast/expr/apply/InstancePredicateApplyImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/InstancePredicateApplyImpl.scala
@@ -4,8 +4,12 @@ import vct.col.ast.InstancePredicateApply
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.InstancePredicateApplyOps
 
-trait InstancePredicateApplyImpl[G] extends InstancePredicateApplyOps[G] { this: InstancePredicateApply[G] =>
+trait InstancePredicateApplyImpl[G] extends InstancePredicateApplyOps[G] {
+  this: InstancePredicateApply[G] =>
   override def precedence: Int = Precedence.PREFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("[") <> perm <> "]" <> obj.bind(Precedence.POSTFIX) <> "." <> ctx.name(ref) <> "(" <> Doc.args(args) <> ")")
+    Group(
+      Text("[") <> perm <> "]" <> obj.bind(Precedence.POSTFIX) <> "." <>
+        ctx.name(ref) <> "(" <> Doc.args(args) <> ")"
+    )
 }
diff --git a/src/col/vct/col/ast/expr/apply/InvocationImpl.scala b/src/col/vct/col/ast/expr/apply/InvocationImpl.scala
index 66ce34916b..98b9beada9 100644
--- a/src/col/vct/col/ast/expr/apply/InvocationImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/InvocationImpl.scala
@@ -2,7 +2,8 @@ package vct.col.ast.expr.apply
 
 import vct.col.ast.{Invocation, Type, Variable}
 
-trait InvocationImpl[G] extends ApplyImpl[G] { this: Invocation[G] =>
+trait InvocationImpl[G] extends ApplyImpl[G] {
+  this: Invocation[G] =>
   override def t: Type[G] = super.t.particularize(typeEnv)
   def typeEnv: Map[Variable[G], Type[G]]
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/apply/MethodInvocationImpl.scala b/src/col/vct/col/ast/expr/apply/MethodInvocationImpl.scala
index 4b9c90cf07..1dee19db49 100644
--- a/src/col/vct/col/ast/expr/apply/MethodInvocationImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/MethodInvocationImpl.scala
@@ -5,20 +5,26 @@ import vct.col.print.{Ctx, Doc, DocUtil, Empty, Group, Precedence, Text}
 import vct.col.ast.ops.MethodInvocationOps
 import vct.col.ref.Ref
 
-trait MethodInvocationImpl[G] extends MethodInvocationOps[G] with InvocationImpl[G] { this: MethodInvocation[G] =>
+trait MethodInvocationImpl[G]
+    extends MethodInvocationOps[G] with InvocationImpl[G] {
+  this: MethodInvocation[G] =>
   override def precedence: Int = Precedence.POSTFIX
 
   override def layout(implicit ctx: Ctx): Doc =
     Group(
       Group(
         assoc(obj) <> "." <> ctx.name(ref) <>
-          (if (typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs) <> ">" else Empty) <>
-          "("
-      ) <> Doc.args(args ++ outArgs) <> ")" <> DocUtil.givenYields(givenMap, yields)
+          (if (typeArgs.nonEmpty)
+             Text("<") <> Doc.args(typeArgs) <> ">"
+           else
+             Empty) <> "("
+      ) <> Doc.args(args ++ outArgs) <> ")" <>
+        DocUtil.givenYields(givenMap, yields)
     )
 
-  override def typeEnv: Map[Variable[G], Type[G]] = ref.decl.typeArgs.zip(typeArgs).toMap ++
-    // Optionally, if the obj is a class, include its typeenv. Optionality is required because in choreographies method invocations are also
-    // used, and choreographies do not have a typeenv (yet). This will be refactored into a separate node in the short term.
-    obj.t.asClass.map(_.typeEnv).getOrElse(Map.empty)
+  override def typeEnv: Map[Variable[G], Type[G]] =
+    ref.decl.typeArgs.zip(typeArgs).toMap ++
+      // Optionally, if the obj is a class, include its typeenv. Optionality is required because in choreographies method invocations are also
+      // used, and choreographies do not have a typeenv (yet). This will be refactored into a separate node in the short term.
+      obj.t.asClass.map(_.typeEnv).getOrElse(Map.empty)
 }
diff --git a/src/col/vct/col/ast/expr/apply/PredicateApplyImpl.scala b/src/col/vct/col/ast/expr/apply/PredicateApplyImpl.scala
index 4709df1476..52cd8b8c02 100644
--- a/src/col/vct/col/ast/expr/apply/PredicateApplyImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/PredicateApplyImpl.scala
@@ -4,17 +4,24 @@ import vct.col.ast.PredicateApply
 import vct.col.print.{Ctx, Doc, DocUtil, Empty, Group, Precedence, Text}
 import vct.col.ast.ops.PredicateApplyOps
 
-trait PredicateApplyImpl[G] extends PredicateApplyOps[G] { this: PredicateApply[G] =>
+trait PredicateApplyImpl[G] extends PredicateApplyOps[G] {
+  this: PredicateApply[G] =>
   override def precedence: Int = Precedence.PREFIX
 
   def layoutSilver(implicit ctx: Ctx): Doc =
-    Group(Text("acc(") <> ctx.name(ref) <> "(" <> Doc.args(args) <> "), " <> perm <> ")")
+    Group(
+      Text("acc(") <> ctx.name(ref) <> "(" <> Doc.args(args) <> "), " <> perm <>
+        ")"
+    )
 
   def layoutSpec(implicit ctx: Ctx): Doc =
-    Group(Text("[") <> perm <> "]" <> ctx.name(ref) <> "(" <> Doc.args(args) <> ")")
+    Group(
+      Text("[") <> perm <> "]" <> ctx.name(ref) <> "(" <> Doc.args(args) <> ")"
+    )
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => layoutSpec
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => layoutSpec
+    }
 }
diff --git a/src/col/vct/col/ast/expr/apply/ProcedureInvocationImpl.scala b/src/col/vct/col/ast/expr/apply/ProcedureInvocationImpl.scala
index bd6fc83b87..006115a1ea 100644
--- a/src/col/vct/col/ast/expr/apply/ProcedureInvocationImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/ProcedureInvocationImpl.scala
@@ -4,17 +4,22 @@ import vct.col.ast.{ProcedureInvocation, Type, Variable}
 import vct.col.print._
 import vct.col.ast.ops.ProcedureInvocationOps
 
-trait ProcedureInvocationImpl[G] extends ProcedureInvocationOps[G] { this: ProcedureInvocation[G] =>
+trait ProcedureInvocationImpl[G] extends ProcedureInvocationOps[G] {
+  this: ProcedureInvocation[G] =>
   override def precedence: Int = Precedence.POSTFIX
 
   override def layout(implicit ctx: Ctx): Doc =
     Group(
       Group(
         Text(ctx.name(ref)) <>
-          (if (typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs) <> ">" else Empty) <>
-          "("
-      ) <> Doc.args(args ++ outArgs) <> ")" <> DocUtil.givenYields(givenMap, yields)
+          (if (typeArgs.nonEmpty)
+             Text("<") <> Doc.args(typeArgs) <> ">"
+           else
+             Empty) <> "("
+      ) <> Doc.args(args ++ outArgs) <> ")" <>
+        DocUtil.givenYields(givenMap, yields)
     )
 
-  override def typeEnv: Map[Variable[G], Type[G]] = ref.decl.typeArgs.zip(typeArgs).toMap
-}
\ No newline at end of file
+  override def typeEnv: Map[Variable[G], Type[G]] =
+    ref.decl.typeArgs.zip(typeArgs).toMap
+}
diff --git a/src/col/vct/col/ast/expr/apply/ProcessApplyImpl.scala b/src/col/vct/col/ast/expr/apply/ProcessApplyImpl.scala
index ee0e9f42b3..d3c822992b 100644
--- a/src/col/vct/col/ast/expr/apply/ProcessApplyImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/ProcessApplyImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{ProcessApply, TProcess, Type}
 import vct.col.print._
 import vct.col.ast.ops.ProcessApplyOps
 
-trait ProcessApplyImpl[G] extends ProcessApplyOps[G] { this: ProcessApply[G] =>
+trait ProcessApplyImpl[G] extends ProcessApplyOps[G] {
+  this: ProcessApply[G] =>
   override def t: Type[G] = TProcess()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text(ctx.name(process)) <> "(" <> Doc.args(args) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/apply/ProverFunctionInvocationImpl.scala b/src/col/vct/col/ast/expr/apply/ProverFunctionInvocationImpl.scala
index 843f1b443a..8776f9bf73 100644
--- a/src/col/vct/col/ast/expr/apply/ProverFunctionInvocationImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/ProverFunctionInvocationImpl.scala
@@ -4,12 +4,10 @@ import vct.col.ast.ProverFunctionInvocation
 import vct.col.print.{Ctx, Doc, DocUtil, Empty, Group, Precedence, Text}
 import vct.col.ast.ops.ProverFunctionInvocationOps
 
-trait ProverFunctionInvocationImpl[G] extends ProverFunctionInvocationOps[G] { this: ProverFunctionInvocation[G] =>
+trait ProverFunctionInvocationImpl[G] extends ProverFunctionInvocationOps[G] {
+  this: ProverFunctionInvocation[G] =>
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(
-        Text(ctx.name(ref)) <>
-          "(" <> Doc.args(args) <> ")"
-    )
+    Group(Text(ctx.name(ref)) <> "(" <> Doc.args(args) <> ")")
 
 }
diff --git a/src/col/vct/col/ast/expr/binder/BinderImpl.scala b/src/col/vct/col/ast/expr/binder/BinderImpl.scala
index 0728fc6b06..85e6c39259 100644
--- a/src/col/vct/col/ast/expr/binder/BinderImpl.scala
+++ b/src/col/vct/col/ast/expr/binder/BinderImpl.scala
@@ -3,7 +3,8 @@ package vct.col.ast.expr.binder
 import vct.col.ast.util.Declarator
 import vct.col.ast.{Binder, Declaration, Variable}
 
-trait BinderImpl[G] extends Declarator[G] { this: Binder[G] =>
+trait BinderImpl[G] extends Declarator[G] {
+  this: Binder[G] =>
   def bindings: Seq[Variable[G]]
   override def declarations: Seq[Declaration[G]] = bindings
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/binder/ExistsImpl.scala b/src/col/vct/col/ast/expr/binder/ExistsImpl.scala
index b467d0681e..25b4704572 100644
--- a/src/col/vct/col/ast/expr/binder/ExistsImpl.scala
+++ b/src/col/vct/col/ast/expr/binder/ExistsImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Exists, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.ExistsOps
 
-trait ExistsImpl[G] extends ExistsOps[G] { this: Exists[G] =>
+trait ExistsImpl[G] extends ExistsOps[G] {
+  this: Exists[G] =>
   override def t: Type[G] = TBool()
 
   def layoutTriggers(implicit ctx: Ctx): Doc =
@@ -13,14 +14,21 @@ trait ExistsImpl[G] extends ExistsOps[G] { this: Exists[G] =>
     })(_ <> _)
 
   def layoutSpec(implicit ctx: Ctx): Doc =
-    Group(Text("(\\exists") <+> Doc.fold(bindings)(_ <> "," <+> _) <> ";" <>> body </> ")")
+    Group(
+      Text("(\\exists") <+> Doc.fold(bindings)(_ <> "," <+> _) <> ";" <>>
+        body </> ")"
+    )
 
   def layoutSilver(implicit ctx: Ctx): Doc =
-    Group(Text("(exists") <+> Doc.fold(bindings)(_ <> "," <+> _) <+> "::" <> layoutTriggers <>> body </> ")")
+    Group(
+      Text("(exists") <+> Doc.fold(bindings)(_ <> "," <+> _) <+> "::" <>
+        layoutTriggers <>> body </> ")"
+    )
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => layoutSpec
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => layoutSpec
+    }
+}
diff --git a/src/col/vct/col/ast/expr/binder/ForPermImpl.scala b/src/col/vct/col/ast/expr/binder/ForPermImpl.scala
index 6a5a1be26b..2f5cda10e5 100644
--- a/src/col/vct/col/ast/expr/binder/ForPermImpl.scala
+++ b/src/col/vct/col/ast/expr/binder/ForPermImpl.scala
@@ -4,19 +4,27 @@ import vct.col.ast.{ForPerm, TBool}
 import vct.col.print._
 import vct.col.ast.ops.ForPermOps
 
-trait ForPermImpl[G] extends ForPermOps[G] { this: ForPerm[G] =>
+trait ForPermImpl[G] extends ForPermOps[G] {
+  this: ForPerm[G] =>
   override def t: TBool[G] = TBool()
 
   def layoutSpec(implicit ctx: Ctx): Doc =
-    Group(Text("(\\forperm") <+> Doc.fold(bindings)(_ <> "," <+> _) <+> "\\in" <+> loc <> ";" <>> body.show </> ")")
+    Group(
+      Text("(\\forperm") <+> Doc.fold(bindings)(_ <> "," <+> _) <+> "\\in" <+>
+        loc <> ";" <>> body.show </> ")"
+    )
 
   // PB: does not need parentheses, so perhaps make precedence depend on ctx
   def layoutSilver(implicit ctx: Ctx): Doc =
-    Group(Text("(forperm") <+> Doc.fold(bindings)(_ <> "," <+> _) <+> "[" <> loc <> "]" <+> "::" <>> body.show </> ")")
+    Group(
+      Text("(forperm") <+> Doc.fold(bindings)(_ <> "," <+> _) <+> "[" <> loc <>
+        "]" <+> "::" <>> body.show </> ")"
+    )
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => layoutSpec
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => layoutSpec
+    }
 }
diff --git a/src/col/vct/col/ast/expr/binder/ForPermWithValueImpl.scala b/src/col/vct/col/ast/expr/binder/ForPermWithValueImpl.scala
index 9ecde585b5..4df4eb2419 100644
--- a/src/col/vct/col/ast/expr/binder/ForPermWithValueImpl.scala
+++ b/src/col/vct/col/ast/expr/binder/ForPermWithValueImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{ForPermWithValue, TBool, Variable}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.ForPermWithValueOps
 
-trait ForPermWithValueImpl[G] extends ForPermWithValueOps[G] { this: ForPermWithValue[G] =>
+trait ForPermWithValueImpl[G] extends ForPermWithValueOps[G] {
+  this: ForPermWithValue[G] =>
   override def bindings: Seq[Variable[G]] = Seq(binding)
   override def t: TBool[G] = TBool()
 
diff --git a/src/col/vct/col/ast/expr/binder/ForallImpl.scala b/src/col/vct/col/ast/expr/binder/ForallImpl.scala
index ca3fc2e559..827f2f3aa1 100644
--- a/src/col/vct/col/ast/expr/binder/ForallImpl.scala
+++ b/src/col/vct/col/ast/expr/binder/ForallImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Forall, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.ForallOps
 
-trait ForallImpl[G] extends ForallOps[G] { this: Forall[G] =>
+trait ForallImpl[G] extends ForallOps[G] {
+  this: Forall[G] =>
   override def t: Type[G] = TBool()
 
   def layoutTriggers(implicit ctx: Ctx): Doc =
@@ -13,14 +14,21 @@ trait ForallImpl[G] extends ForallOps[G] { this: Forall[G] =>
     })(_ <> _)
 
   def layoutSpec(implicit ctx: Ctx): Doc =
-    Group(Text("(\\forall") <+> Doc.fold(bindings)(_ <> "," <+> _) <> ";" <>> body </> ")")
+    Group(
+      Text("(\\forall") <+> Doc.fold(bindings)(_ <> "," <+> _) <> ";" <>>
+        body </> ")"
+    )
 
   def layoutSilver(implicit ctx: Ctx): Doc =
-    Group(Text("(forall") <+> Doc.fold(bindings)(_ <> "," <+> _) <+> "::" <> layoutTriggers <>> body </> ")")
+    Group(
+      Text("(forall") <+> Doc.fold(bindings)(_ <> "," <+> _) <+> "::" <>
+        layoutTriggers <>> body </> ")"
+    )
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => layoutSpec
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => layoutSpec
+    }
 }
diff --git a/src/col/vct/col/ast/expr/binder/LetImpl.scala b/src/col/vct/col/ast/expr/binder/LetImpl.scala
index 678adb6a7e..65cb9ebfc1 100644
--- a/src/col/vct/col/ast/expr/binder/LetImpl.scala
+++ b/src/col/vct/col/ast/expr/binder/LetImpl.scala
@@ -4,19 +4,26 @@ import vct.col.ast.{Let, Type, Variable}
 import vct.col.print._
 import vct.col.ast.ops.LetOps
 
-trait LetImpl[G] extends LetOps[G] { this: Let[G] =>
+trait LetImpl[G] extends LetOps[G] {
+  this: Let[G] =>
   override def t: Type[G] = main.t
   override def bindings: Seq[Variable[G]] = Seq(binding)
 
   def layoutSpec(implicit ctx: Ctx): Doc =
-    Group(Text("(") <> "\\let" <+> binding <+> "=" <+> value <> ";" <>> main </> ")")
+    Group(
+      Text("(") <> "\\let" <+> binding <+> "=" <+> value <> ";" <>> main </> ")"
+    )
 
   def layoutSilver(implicit ctx: Ctx): Doc =
-    Group(Text("(") <> "let" <+> ctx.name(binding) <+> "==" <+> "(" <> value <> ")" <+> "in" <>> main </> ")")
+    Group(
+      Text("(") <> "let" <+> ctx.name(binding) <+> "==" <+> "(" <> value <>
+        ")" <+> "in" <>> main </> ")"
+    )
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => layoutSpec
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => layoutSpec
+    }
+}
diff --git a/src/col/vct/col/ast/expr/binder/ProductImpl.scala b/src/col/vct/col/ast/expr/binder/ProductImpl.scala
index 15202d802f..9df9946b13 100644
--- a/src/col/vct/col/ast/expr/binder/ProductImpl.scala
+++ b/src/col/vct/col/ast/expr/binder/ProductImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.binder
 import vct.col.ast.{Product, TInt, Type}
 import vct.col.ast.ops.ProductOps
 
-trait ProductImpl[G] extends ProductOps[G] { this: Product[G] =>
+trait ProductImpl[G] extends ProductOps[G] {
+  this: Product[G] =>
   override def t: Type[G] = TInt()
 }
diff --git a/src/col/vct/col/ast/expr/binder/StarallImpl.scala b/src/col/vct/col/ast/expr/binder/StarallImpl.scala
index 7b7d2df873..ceee14f8bb 100644
--- a/src/col/vct/col/ast/expr/binder/StarallImpl.scala
+++ b/src/col/vct/col/ast/expr/binder/StarallImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Starall, TResource, Type}
 import vct.col.print._
 import vct.col.ast.ops.StarallOps
 
-trait StarallImpl[G] extends StarallOps[G] { this: Starall[G] =>
+trait StarallImpl[G] extends StarallOps[G] {
+  this: Starall[G] =>
   override def t: Type[G] = TResource()
 
   def layoutTriggers(implicit ctx: Ctx): Doc =
@@ -13,14 +14,21 @@ trait StarallImpl[G] extends StarallOps[G] { this: Starall[G] =>
     })(_ <> _)
 
   def layoutSpec(implicit ctx: Ctx): Doc =
-    Group(Text("(\\forall*") <+> Doc.fold(bindings)(_ <> "," <+> _) <> ";" <>> body </> ")")
+    Group(
+      Text("(\\forall*") <+> Doc.fold(bindings)(_ <> "," <+> _) <> ";" <>>
+        body </> ")"
+    )
 
   def layoutSilver(implicit ctx: Ctx): Doc =
-    Group(Text("(forall") <+> Doc.fold(bindings)(_ <> "," <+> _) <+> "::" <> layoutTriggers <>> body </> ")")
+    Group(
+      Text("(forall") <+> Doc.fold(bindings)(_ <> "," <+> _) <+> "::" <>
+        layoutTriggers <>> body </> ")"
+    )
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => layoutSpec
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => layoutSpec
+    }
 }
diff --git a/src/col/vct/col/ast/expr/binder/SumImpl.scala b/src/col/vct/col/ast/expr/binder/SumImpl.scala
index eee9600fdd..bf93bbcc9e 100644
--- a/src/col/vct/col/ast/expr/binder/SumImpl.scala
+++ b/src/col/vct/col/ast/expr/binder/SumImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.binder
 import vct.col.ast.{Sum, TInt, Type}
 import vct.col.ast.ops.SumOps
 
-trait SumImpl[G] extends SumOps[G] { this: Sum[G] =>
+trait SumImpl[G] extends SumOps[G] {
+  this: Sum[G] =>
   override def t: Type[G] = TInt()
 }
diff --git a/src/col/vct/col/ast/expr/bip/BipGuardInvocationImpl.scala b/src/col/vct/col/ast/expr/bip/BipGuardInvocationImpl.scala
index 02a8b3cb17..1088898b64 100644
--- a/src/col/vct/col/ast/expr/bip/BipGuardInvocationImpl.scala
+++ b/src/col/vct/col/ast/expr/bip/BipGuardInvocationImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{BipGuardInvocation, TBool, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.BipGuardInvocationOps
 
-trait BipGuardInvocationImpl[G] extends BipGuardInvocationOps[G] { this: BipGuardInvocation[G] =>
+trait BipGuardInvocationImpl[G] extends BipGuardInvocationOps[G] {
+  this: BipGuardInvocation[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.POSTFIX
diff --git a/src/col/vct/col/ast/expr/bip/BipLocalIncomingDataImpl.scala b/src/col/vct/col/ast/expr/bip/BipLocalIncomingDataImpl.scala
index 6b6e91721a..6624cf8447 100644
--- a/src/col/vct/col/ast/expr/bip/BipLocalIncomingDataImpl.scala
+++ b/src/col/vct/col/ast/expr/bip/BipLocalIncomingDataImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{BipLocalIncomingData, Type}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.BipLocalIncomingDataOps
 
-trait BipLocalIncomingDataImpl[G] extends BipLocalIncomingDataOps[G] { this: BipLocalIncomingData[G] =>
+trait BipLocalIncomingDataImpl[G] extends BipLocalIncomingDataOps[G] {
+  this: BipLocalIncomingData[G] =>
   override def t: Type[G] = ref.decl.t
 
   override def layout(implicit ctx: Ctx): Doc = Text(ctx.name(ref))
diff --git a/src/col/vct/col/ast/expr/bip/JavaBipGlueImpl.scala b/src/col/vct/col/ast/expr/bip/JavaBipGlueImpl.scala
index 2f20c2c943..74b367a76f 100644
--- a/src/col/vct/col/ast/expr/bip/JavaBipGlueImpl.scala
+++ b/src/col/vct/col/ast/expr/bip/JavaBipGlueImpl.scala
@@ -4,9 +4,9 @@ import vct.col.ast.{JavaBipGlue, TNotAValue, Type}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaBipGlueOps
 
-trait JavaBipGlueImpl[G] extends JavaBipGlueOps[G] { this: JavaBipGlue[G] =>
+trait JavaBipGlueImpl[G] extends JavaBipGlueOps[G] {
+  this: JavaBipGlue[G] =>
   override def t: Type[G] = new TNotAValue()
 
-  override def layout(implicit ctx: Ctx): Doc =
-    Doc.stack(elems)
+  override def layout(implicit ctx: Ctx): Doc = Doc.stack(elems)
 }
diff --git a/src/col/vct/col/ast/expr/context/AmbiguousResultImpl.scala b/src/col/vct/col/ast/expr/context/AmbiguousResultImpl.scala
index 0e92835902..eefa45fd0b 100644
--- a/src/col/vct/col/ast/expr/context/AmbiguousResultImpl.scala
+++ b/src/col/vct/col/ast/expr/context/AmbiguousResultImpl.scala
@@ -9,36 +9,52 @@ import vct.col.resolve.ctx._
 import vct.col.resolve.lang.{C, CPP}
 import vct.col.ast.ops.AmbiguousResultOps
 
-trait AmbiguousResultImpl[G] extends NodeFamilyImpl[G] with AmbiguousResultOps[G] { this: AmbiguousResult[G] =>
-  override lazy val t: Type[G] = ref.getOrElse(
-    throw err.ContextSensitiveNodeNotResolved(this, "'\\result' encountered, but its attached method is not resolved.")) match {
-    case RefCFunctionDefinition(decl) =>
-      C.typeOrReturnTypeFromDeclaration(decl.specs, decl.declarator)
-    case RefCGlobalDeclaration(decls, initIdx) =>
-      C.typeOrReturnTypeFromDeclaration(decls.decl.specs, decls.decl.inits(initIdx).decl)
-    case RefCPPFunctionDefinition(decl) =>
-      CPP.typeOrReturnTypeFromDeclarator(decl.specs, decl.declarator)
-    case RefCPPGlobalDeclaration(decls, initIdx) =>
-      CPP.typeOrReturnTypeFromDeclarator(decls.decl.specs, decls.decl.inits(initIdx).decl)
-    case RefFunction(decl) => decl.returnType
-    case RefProcedure(decl) => decl.returnType
-    case RefJavaMethod(decl) => decl.returnType
-    case RefJavaAnnotationMethod(decl) => decl.returnType
-    case RefLlvmFunctionDefinition(decl) => decl.returnType
-    case RefLlvmSpecFunction(decl) => decl.returnType
-    case RefInstanceFunction(decl) => decl.returnType
-    case RefInstanceMethod(decl) => decl.returnType
-    case RefInstanceOperatorMethod(decl) => decl.returnType
-    case RefInstanceOperatorFunction(decl) => decl.returnType
-  }
+trait AmbiguousResultImpl[G]
+    extends NodeFamilyImpl[G] with AmbiguousResultOps[G] {
+  this: AmbiguousResult[G] =>
+  override lazy val t: Type[G] =
+    ref.getOrElse(
+      throw err.ContextSensitiveNodeNotResolved(
+        this,
+        "'\\result' encountered, but its attached method is not resolved.",
+      )
+    ) match {
+      case RefCFunctionDefinition(decl) =>
+        C.typeOrReturnTypeFromDeclaration(decl.specs, decl.declarator)
+      case RefCGlobalDeclaration(decls, initIdx) =>
+        C.typeOrReturnTypeFromDeclaration(
+          decls.decl.specs,
+          decls.decl.inits(initIdx).decl,
+        )
+      case RefCPPFunctionDefinition(decl) =>
+        CPP.typeOrReturnTypeFromDeclarator(decl.specs, decl.declarator)
+      case RefCPPGlobalDeclaration(decls, initIdx) =>
+        CPP.typeOrReturnTypeFromDeclarator(
+          decls.decl.specs,
+          decls.decl.inits(initIdx).decl,
+        )
+      case RefFunction(decl) => decl.returnType
+      case RefProcedure(decl) => decl.returnType
+      case RefJavaMethod(decl) => decl.returnType
+      case RefJavaAnnotationMethod(decl) => decl.returnType
+      case RefLlvmFunctionDefinition(decl) => decl.returnType
+      case RefLlvmSpecFunction(decl) => decl.returnType
+      case RefInstanceFunction(decl) => decl.returnType
+      case RefInstanceMethod(decl) => decl.returnType
+      case RefInstanceOperatorMethod(decl) => decl.returnType
+      case RefInstanceOperatorFunction(decl) => decl.returnType
+    }
 
   override def check(context: CheckContext[G]): Seq[CheckError] =
-    if (context.inPostCondition) super.check(context)
-    else Seq(ResultOutsidePostcondition(this))
+    if (context.inPostCondition)
+      super.check(context)
+    else
+      Seq(ResultOutsidePostcondition(this))
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => Text("result")
-    case _ => Text("\\result")
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => Text("result")
+      case _ => Text("\\result")
+    }
+}
diff --git a/src/col/vct/col/ast/expr/context/AmbiguousThisImpl.scala b/src/col/vct/col/ast/expr/context/AmbiguousThisImpl.scala
index cf20a12cca..01b0ab843c 100644
--- a/src/col/vct/col/ast/expr/context/AmbiguousThisImpl.scala
+++ b/src/col/vct/col/ast/expr/context/AmbiguousThisImpl.scala
@@ -6,14 +6,21 @@ import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.resolve.ctx._
 import vct.col.ast.ops.AmbiguousThisOps
 
-trait AmbiguousThisImpl[G] extends AmbiguousThisOps[G] { this: AmbiguousThis[G] =>
+trait AmbiguousThisImpl[G] extends AmbiguousThisOps[G] {
+  this: AmbiguousThis[G] =>
   override lazy val t: Type[G] =
     ref.getOrElse(
-      throw ContextSensitiveNodeNotResolved(this,
-        "'this' encountered, but the surrounding class is not resolved.")
+      throw ContextSensitiveNodeNotResolved(
+        this,
+        "'this' encountered, but the surrounding class is not resolved.",
+      )
     ) match {
       case RefJavaClass(decl) => JavaTClass(decl.ref, Nil)
-      case RefClass(decl) => TClass(decl.ref, decl.typeArgs.map((v: Variable[G]) => TVar(v.ref[Variable[G]])))
+      case RefClass(decl) =>
+        TClass(
+          decl.ref,
+          decl.typeArgs.map((v: Variable[G]) => TVar(v.ref[Variable[G]])),
+        )
       case RefModel(decl) => TModel(decl.ref)
       case RefPVLChoreography(decl) => TPVLChoreography(decl.ref)
       case RefChoreography(decl) => TChoreography(decl.ref)
@@ -21,4 +28,4 @@ trait AmbiguousThisImpl[G] extends AmbiguousThisOps[G] { this: AmbiguousThis[G]
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("this")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/context/CurrentThreadIdImpl.scala b/src/col/vct/col/ast/expr/context/CurrentThreadIdImpl.scala
index 55c63a3b9c..eef485849c 100644
--- a/src/col/vct/col/ast/expr/context/CurrentThreadIdImpl.scala
+++ b/src/col/vct/col/ast/expr/context/CurrentThreadIdImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{CurrentThreadId, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.CurrentThreadIdOps
 
-trait CurrentThreadIdImpl[G] extends CurrentThreadIdOps[G] { this: CurrentThreadId[G] =>
+trait CurrentThreadIdImpl[G] extends CurrentThreadIdOps[G] {
+  this: CurrentThreadId[G] =>
   override def t: Type[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("\\current_thread")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/context/GlobalThreadIdImpl.scala b/src/col/vct/col/ast/expr/context/GlobalThreadIdImpl.scala
index 38ee76fefd..d535d20e87 100644
--- a/src/col/vct/col/ast/expr/context/GlobalThreadIdImpl.scala
+++ b/src/col/vct/col/ast/expr/context/GlobalThreadIdImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{GlobalThreadId, TInt}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.GlobalThreadIdOps
 
-trait GlobalThreadIdImpl[G] extends GlobalThreadIdOps[G] { this: GlobalThreadId[G] =>
+trait GlobalThreadIdImpl[G] extends GlobalThreadIdOps[G] {
+  this: GlobalThreadId[G] =>
   override def t: TInt[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
diff --git a/src/col/vct/col/ast/expr/context/LocalThreadIdImpl.scala b/src/col/vct/col/ast/expr/context/LocalThreadIdImpl.scala
index 46ac95eb0a..1a2fd9dd7b 100644
--- a/src/col/vct/col/ast/expr/context/LocalThreadIdImpl.scala
+++ b/src/col/vct/col/ast/expr/context/LocalThreadIdImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{LocalThreadId, TInt}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.LocalThreadIdOps
 
-trait LocalThreadIdImpl[G] extends LocalThreadIdOps[G] { this: LocalThreadId[G] =>
+trait LocalThreadIdImpl[G] extends LocalThreadIdOps[G] {
+  this: LocalThreadId[G] =>
   override def t: TInt[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
diff --git a/src/col/vct/col/ast/expr/context/ResultImpl.scala b/src/col/vct/col/ast/expr/context/ResultImpl.scala
index fc141dc8fa..f0ef5106d5 100644
--- a/src/col/vct/col/ast/expr/context/ResultImpl.scala
+++ b/src/col/vct/col/ast/expr/context/ResultImpl.scala
@@ -6,16 +6,20 @@ import vct.col.check.{CheckContext, CheckError, ResultOutsidePostcondition}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.ResultOps
 
-trait ResultImpl[G] extends NodeFamilyImpl[G] with ResultOps[G] { this: Result[G] =>
+trait ResultImpl[G] extends NodeFamilyImpl[G] with ResultOps[G] {
+  this: Result[G] =>
   override def t: Type[G] = applicable.decl.returnType
 
   override def check(context: CheckContext[G]): Seq[CheckError] =
-    if(context.inPostCondition) super.check(context)
-    else Seq(ResultOutsidePostcondition(this))
+    if (context.inPostCondition)
+      super.check(context)
+    else
+      Seq(ResultOutsidePostcondition(this))
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => Text("result")
-    case _ => Text("\\result")
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => Text("result")
+      case _ => Text("\\result")
+    }
+}
diff --git a/src/col/vct/col/ast/expr/context/ThisChoreographyImpl.scala b/src/col/vct/col/ast/expr/context/ThisChoreographyImpl.scala
index 607b53f9b7..715ad4503f 100644
--- a/src/col/vct/col/ast/expr/context/ThisChoreographyImpl.scala
+++ b/src/col/vct/col/ast/expr/context/ThisChoreographyImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{TAnyClass, TChoreography, ThisChoreography, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.ThisChoreographyOps
 
-trait ThisChoreographyImpl[G] extends ThisDeclarationImpl[G] with ThisChoreographyOps[G] { this: ThisChoreography[G] =>
+trait ThisChoreographyImpl[G]
+    extends ThisDeclarationImpl[G] with ThisChoreographyOps[G] {
+  this: ThisChoreography[G] =>
   override def t: Type[G] = TChoreography(cls)
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("this")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/context/ThisDeclarationImpl.scala b/src/col/vct/col/ast/expr/context/ThisDeclarationImpl.scala
index 4a471cea89..d6b810604b 100644
--- a/src/col/vct/col/ast/expr/context/ThisDeclarationImpl.scala
+++ b/src/col/vct/col/ast/expr/context/ThisDeclarationImpl.scala
@@ -5,10 +5,13 @@ import vct.col.ast.expr.ExprImpl
 import vct.col.check.{CheckContext, CheckError, ThisOutsideScopeError}
 import vct.col.ref.Ref
 
-trait ThisDeclarationImpl[G] extends ExprImpl[G] { this: ThisDeclaration[G] =>
+trait ThisDeclarationImpl[G] extends ExprImpl[G] {
+  this: ThisDeclaration[G] =>
   def cls: Ref[G, _ <: Declaration[G]]
 
   override def check(context: CheckContext[G]): Seq[CheckError] =
-    if(!context.declarationStack.contains(cls.decl)) super.check(context) ++ Seq(ThisOutsideScopeError(this))
-    else super.check(context)
+    if (!context.declarationStack.contains(cls.decl))
+      super.check(context) ++ Seq(ThisOutsideScopeError(this))
+    else
+      super.check(context)
 }
diff --git a/src/col/vct/col/ast/expr/context/ThisModelImpl.scala b/src/col/vct/col/ast/expr/context/ThisModelImpl.scala
index c47135fba8..3c0ab8d57d 100644
--- a/src/col/vct/col/ast/expr/context/ThisModelImpl.scala
+++ b/src/col/vct/col/ast/expr/context/ThisModelImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{TModel, ThisModel, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.ThisModelOps
 
-trait ThisModelImpl[G] extends ThisDeclarationImpl[G] with ThisModelOps[G] { this: ThisModel[G] =>
+trait ThisModelImpl[G] extends ThisDeclarationImpl[G] with ThisModelOps[G] {
+  this: ThisModel[G] =>
   override def t: Type[G] = TModel(cls)
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("this")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/context/ThisObjectImpl.scala b/src/col/vct/col/ast/expr/context/ThisObjectImpl.scala
index f12ed0722a..25e90414f7 100644
--- a/src/col/vct/col/ast/expr/context/ThisObjectImpl.scala
+++ b/src/col/vct/col/ast/expr/context/ThisObjectImpl.scala
@@ -5,14 +5,22 @@ import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.ThisObjectOps
 import vct.col.check.{CheckContext, CheckError, ThisInConstructorPre}
 
-trait ThisObjectImpl[G] extends ThisDeclarationImpl[G] with ThisObjectOps[G] { this: ThisObject[G] =>
-  override def t: Type[G] = TClass(cls, cls.decl.typeArgs.map(v => TVar(v.ref[Variable[G]])))
+trait ThisObjectImpl[G] extends ThisDeclarationImpl[G] with ThisObjectOps[G] {
+  this: ThisObject[G] =>
+  override def t: Type[G] =
+    TClass(cls, cls.decl.typeArgs.map(v => TVar(v.ref[Variable[G]])))
 
   override def check(context: CheckContext[G]): Seq[CheckError] = {
-    val inConstructor = context.declarationStack.collectFirst { case _: Constructor[G] => () }.nonEmpty
-    super.check(context) ++ (if(inConstructor && context.inPreCondition) Seq(ThisInConstructorPre(this)) else Nil)
+    val inConstructor =
+      context.declarationStack.collectFirst { case _: Constructor[G] => () }
+        .nonEmpty
+    super.check(context) ++
+      (if (inConstructor && context.inPreCondition)
+         Seq(ThisInConstructorPre(this))
+       else
+         Nil)
   }
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("this")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/heap/SizeOfImpl.scala b/src/col/vct/col/ast/expr/heap/SizeOfImpl.scala
index 698d3921a4..748fdec6c1 100644
--- a/src/col/vct/col/ast/expr/heap/SizeOfImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/SizeOfImpl.scala
@@ -4,9 +4,9 @@ import vct.col.ast.{SizeOf, TCInt, Type}
 import vct.col.print._
 import vct.col.ast.ops.SizeOfOps
 
-trait SizeOfImpl[G] extends SizeOfOps[G] { this: SizeOf[G] =>
+trait SizeOfImpl[G] extends SizeOfOps[G] {
+  this: SizeOf[G] =>
   override def t: Type[G] = TCInt()
 
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("sizeof(") <> tname <> ")"
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = Text("sizeof(") <> tname <> ")"
+}
diff --git a/src/col/vct/col/ast/expr/heap/alloc/FreePointerImpl.scala b/src/col/vct/col/ast/expr/heap/alloc/FreePointerImpl.scala
index 77ed121ed1..3988304004 100644
--- a/src/col/vct/col/ast/expr/heap/alloc/FreePointerImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/alloc/FreePointerImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{FreePointer, TVoid, Type}
 import vct.col.print._
 import vct.col.ast.ops.FreePointerOps
 
-trait FreePointerImpl[G] extends FreePointerOps[G] { this: FreePointer[G] =>
+trait FreePointerImpl[G] extends FreePointerOps[G] {
+  this: FreePointer[G] =>
   override lazy val t: Type[G] = TVoid()
 
   override def layout(implicit ctx: Ctx): Doc =
     Text("free") <+> "(" <> pointer <> ")"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/heap/alloc/NewArrayImpl.scala b/src/col/vct/col/ast/expr/heap/alloc/NewArrayImpl.scala
index 532cb8860d..e9d496b278 100644
--- a/src/col/vct/col/ast/expr/heap/alloc/NewArrayImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/alloc/NewArrayImpl.scala
@@ -5,10 +5,13 @@ import vct.col.ast.{NewArray, TArray, Type}
 import vct.col.print._
 import vct.col.ast.ops.NewArrayOps
 
-trait NewArrayImpl[G] extends NewArrayOps[G] { this: NewArray[G] =>
-  override lazy val t: Type[G] = FuncTools.repeat[Type[G]](TArray(_), dims.size + moreDims, element)
+trait NewArrayImpl[G] extends NewArrayOps[G] {
+  this: NewArray[G] =>
+  override lazy val t: Type[G] = FuncTools
+    .repeat[Type[G]](TArray(_), dims.size + moreDims, element)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Text("new") <+> element <> dims.map(dim => s"[$dim]").mkString <> "[]".repeat(moreDims)
-}
\ No newline at end of file
+    Text("new") <+> element <> dims.map(dim => s"[$dim]").mkString <>
+      "[]".repeat(moreDims)
+}
diff --git a/src/col/vct/col/ast/expr/heap/alloc/NewObjectImpl.scala b/src/col/vct/col/ast/expr/heap/alloc/NewObjectImpl.scala
index 6de0272e86..dbc0fa2953 100644
--- a/src/col/vct/col/ast/expr/heap/alloc/NewObjectImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/alloc/NewObjectImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{NewObject, TClass, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.NewObjectOps
 
-trait NewObjectImpl[G] extends NewObjectOps[G] { this: NewObject[G] =>
+trait NewObjectImpl[G] extends NewObjectOps[G] {
+  this: NewObject[G] =>
   override def t: Type[G] = TClass(cls, Seq())
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Text("new") <+> ctx.name(cls) <> "()"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/heap/alloc/NewPointerArrayImpl.scala b/src/col/vct/col/ast/expr/heap/alloc/NewPointerArrayImpl.scala
index 5286f32ce9..18bd2bfbf8 100644
--- a/src/col/vct/col/ast/expr/heap/alloc/NewPointerArrayImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/alloc/NewPointerArrayImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{NewPointerArray, TPointer, Type}
 import vct.col.print._
 import vct.col.ast.ops.NewPointerArrayOps
 
-trait NewPointerArrayImpl[G] extends NewPointerArrayOps[G] { this: NewPointerArray[G] =>
+trait NewPointerArrayImpl[G] extends NewPointerArrayOps[G] {
+  this: NewPointerArray[G] =>
   override lazy val t: Type[G] = TPointer(element)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Text("new") <+> element <> "[" <> size <> "]"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/AddrOfImpl.scala b/src/col/vct/col/ast/expr/heap/read/AddrOfImpl.scala
index c96df1970b..90815f30c4 100644
--- a/src/col/vct/col/ast/expr/heap/read/AddrOfImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/AddrOfImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{AddrOf, TPointer, Type}
 import vct.col.print._
 import vct.col.ast.ops.AddrOfOps
 
-trait AddrOfImpl[G] extends AddrOfOps[G] { this: AddrOf[G] =>
+trait AddrOfImpl[G] extends AddrOfOps[G] {
+  this: AddrOf[G] =>
   override def t: Type[G] = TPointer(e.t)
 
   override def precedence: Int = Precedence.PREFIX
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("&") <> assoc(e)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = Text("&") <> assoc(e)
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/ArraySubscriptImpl.scala b/src/col/vct/col/ast/expr/heap/read/ArraySubscriptImpl.scala
index f045531a02..47b3cc9689 100644
--- a/src/col/vct/col/ast/expr/heap/read/ArraySubscriptImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/ArraySubscriptImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{ArraySubscript, Type}
 import vct.col.print._
 import vct.col.ast.ops.ArraySubscriptOps
 
-trait ArraySubscriptImpl[G] extends ArraySubscriptOps[G] { this: ArraySubscript[G] =>
+trait ArraySubscriptImpl[G] extends ArraySubscriptOps[G] {
+  this: ArraySubscript[G] =>
   override lazy val t: Type[G] = arr.t.asArray.get.element
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(assoc(arr) <> "[" <> Doc.arg(index) <> "]")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/DerefHeapVariableImpl.scala b/src/col/vct/col/ast/expr/heap/read/DerefHeapVariableImpl.scala
index b262ea6955..1c329d35f3 100644
--- a/src/col/vct/col/ast/expr/heap/read/DerefHeapVariableImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/DerefHeapVariableImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{DerefHeapVariable, Type}
 import vct.col.print._
 import vct.col.ast.ops.DerefHeapVariableOps
 
-trait DerefHeapVariableImpl[G] extends DerefHeapVariableOps[G] { this: DerefHeapVariable[G] =>
+trait DerefHeapVariableImpl[G] extends DerefHeapVariableOps[G] {
+  this: DerefHeapVariable[G] =>
   override def t: Type[G] = ref.decl.t
 
   override def precedence: Int = Precedence.ATOMIC
diff --git a/src/col/vct/col/ast/expr/heap/read/DerefImpl.scala b/src/col/vct/col/ast/expr/heap/read/DerefImpl.scala
index fa9d80d9c1..45557b7a0a 100644
--- a/src/col/vct/col/ast/expr/heap/read/DerefImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/DerefImpl.scala
@@ -7,16 +7,18 @@ import vct.col.print.{Ctx, Doc, Group, Precedence}
 import vct.col.ref.Ref
 import vct.col.ast.ops.DerefOps
 
-trait DerefImpl[G] extends ExprImpl[G] with DerefOps[G] { this: Deref[G] =>
+trait DerefImpl[G] extends ExprImpl[G] with DerefOps[G] {
+  this: Deref[G] =>
   override def t: Type[G] =
     obj.t.asClass.map(_.instantiate(ref.decl.t)).getOrElse(ref.decl.t)
 
   override def check(context: CheckContext[G]): Seq[CheckError] =
     Check.inOrder(
       super.check(context),
-      obj.t.asClass.get.cls.decl.checkDefines(ref.decl, this))
+      obj.t.asClass.get.cls.decl.checkDefines(ref.decl, this),
+    )
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     assoc(obj) <> "." <> ctx.name(ref)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/DerefPointerImpl.scala b/src/col/vct/col/ast/expr/heap/read/DerefPointerImpl.scala
index 814011b198..ab2a387d2c 100644
--- a/src/col/vct/col/ast/expr/heap/read/DerefPointerImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/DerefPointerImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{DerefPointer, Type}
 import vct.col.print._
 import vct.col.ast.ops.DerefPointerOps
 
-trait DerefPointerImpl[G] extends DerefPointerOps[G] { this: DerefPointer[G] =>
+trait DerefPointerImpl[G] extends DerefPointerOps[G] {
+  this: DerefPointer[G] =>
   override def t: Type[G] = pointer.t.asPointer.get.element
 
   override def precedence: Int = Precedence.PREFIX
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("*") <> assoc(pointer)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = Text("*") <> assoc(pointer)
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/EndpointNameImpl.scala b/src/col/vct/col/ast/expr/heap/read/EndpointNameImpl.scala
index 4ab27a9878..97219dd485 100644
--- a/src/col/vct/col/ast/expr/heap/read/EndpointNameImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/EndpointNameImpl.scala
@@ -6,7 +6,8 @@ import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.EndpointNameOps
 import vct.col.ast.ops.{EndpointNameOps}
 
-trait EndpointNameImpl[G] extends NodeFamilyImpl[G] with EndpointNameOps[G] { this: EndpointName[G] =>
+trait EndpointNameImpl[G] extends NodeFamilyImpl[G] with EndpointNameOps[G] {
+  this: EndpointName[G] =>
   def t: Type[G] = ref.decl.t
 
   override def layout(implicit ctx: Ctx): Doc = Text(ctx.name(ref))
diff --git a/src/col/vct/col/ast/expr/heap/read/FunctionOfImpl.scala b/src/col/vct/col/ast/expr/heap/read/FunctionOfImpl.scala
index da4803ac36..de1e9ba893 100644
--- a/src/col/vct/col/ast/expr/heap/read/FunctionOfImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/FunctionOfImpl.scala
@@ -4,10 +4,12 @@ import vct.col.ast.{FunctionOf, Type}
 import vct.col.print._
 import vct.col.ast.ops.FunctionOfOps
 
-trait FunctionOfImpl[G] extends FunctionOfOps[G] { this: FunctionOf[G] =>
+trait FunctionOfImpl[G] extends FunctionOfOps[G] {
+  this: FunctionOf[G] =>
   override def t: Type[G] = binding.decl.t
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
-    Text("(") <> ctx.name(binding) <> "!" <> Doc.fold(vars.map(ctx.name(_)).map(Text))(_ <> "," <+> _) <> ")"
+    Text("(") <> ctx.name(binding) <> "!" <>
+      Doc.fold(vars.map(ctx.name(_)).map(Text))(_ <> "," <+> _) <> ")"
 }
diff --git a/src/col/vct/col/ast/expr/heap/read/HeapDerefImpl.scala b/src/col/vct/col/ast/expr/heap/read/HeapDerefImpl.scala
index ce7c1fae2b..ec95bcd909 100644
--- a/src/col/vct/col/ast/expr/heap/read/HeapDerefImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/HeapDerefImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.expr.heap.read
 
 import vct.col.ast.HeapDeref
 
-trait HeapDerefImpl[G] { this: HeapDeref[G] =>
+trait HeapDerefImpl[G] {
+  this: HeapDeref[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/LengthImpl.scala b/src/col/vct/col/ast/expr/heap/read/LengthImpl.scala
index fb4c837af7..0769087852 100644
--- a/src/col/vct/col/ast/expr/heap/read/LengthImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/LengthImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{Length, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.LengthOps
 
-trait LengthImpl[G] extends LengthOps[G] { this: Length[G] =>
+trait LengthImpl[G] extends LengthOps[G] {
+  this: Length[G] =>
   override def t: Type[G] = TInt()
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc =
-    assoc(arr) <> ".length"
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = assoc(arr) <> ".length"
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/ModelDerefImpl.scala b/src/col/vct/col/ast/expr/heap/read/ModelDerefImpl.scala
index 2dc7d9416c..7694e7e5cf 100644
--- a/src/col/vct/col/ast/expr/heap/read/ModelDerefImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/ModelDerefImpl.scala
@@ -6,7 +6,8 @@ import vct.col.check.{Check, CheckContext, CheckError}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.ModelDerefOps
 
-trait ModelDerefImpl[G] extends ExprImpl[G] with ModelDerefOps[G] { this: ModelDeref[G] =>
+trait ModelDerefImpl[G] extends ExprImpl[G] with ModelDerefOps[G] {
+  this: ModelDeref[G] =>
   override def t: Type[G] = ref.decl.t
   override def check(context: CheckContext[G]): Seq[CheckError] = {
     Check.inOrder(
@@ -18,4 +19,4 @@ trait ModelDerefImpl[G] extends ExprImpl[G] with ModelDerefOps[G] { this: ModelD
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     assoc(obj) <> "." <> ctx.name(ref)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/NdIndexImpl.scala b/src/col/vct/col/ast/expr/heap/read/NdIndexImpl.scala
index b99da15bfe..c106398f6e 100644
--- a/src/col/vct/col/ast/expr/heap/read/NdIndexImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/NdIndexImpl.scala
@@ -4,10 +4,13 @@ import vct.col.ast.{NdIndex, TInt}
 import vct.col.print._
 import vct.col.ast.ops.NdIndexOps
 
-trait NdIndexImpl[G] extends NdIndexOps[G] { this: NdIndex[G] =>
+trait NdIndexImpl[G] extends NdIndexOps[G] {
+  this: NdIndex[G] =>
   override def t: TInt[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("\\nd_index(") <> Doc.args(indices.zip(dimensions).map { case (idx, dim) => idx.show <> "," <+> dim }) <> ")")
+    Group(Text("\\nd_index(") <> Doc.args(indices.zip(dimensions).map {
+      case (idx, dim) => idx.show <> "," <+> dim
+    }) <> ")")
 }
diff --git a/src/col/vct/col/ast/expr/heap/read/NdLengthImpl.scala b/src/col/vct/col/ast/expr/heap/read/NdLengthImpl.scala
index ecd255872e..643728c2a7 100644
--- a/src/col/vct/col/ast/expr/heap/read/NdLengthImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/NdLengthImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{NdLength, TInt}
 import vct.col.print._
 import vct.col.ast.ops.NdLengthOps
 
-trait NdLengthImpl[G] extends NdLengthOps[G] { this: NdLength[G] =>
+trait NdLengthImpl[G] extends NdLengthOps[G] {
+  this: NdLength[G] =>
   override def t: TInt[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
diff --git a/src/col/vct/col/ast/expr/heap/read/NdPartialIndexImpl.scala b/src/col/vct/col/ast/expr/heap/read/NdPartialIndexImpl.scala
index 89178d740b..d776777282 100644
--- a/src/col/vct/col/ast/expr/heap/read/NdPartialIndexImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/NdPartialIndexImpl.scala
@@ -4,10 +4,14 @@ import vct.col.ast.{NdPartialIndex, TBool}
 import vct.col.print._
 import vct.col.ast.ops.NdPartialIndexOps
 
-trait NdPartialIndexImpl[G] extends NdPartialIndexOps[G] { this: NdPartialIndex[G] =>
+trait NdPartialIndexImpl[G] extends NdPartialIndexOps[G] {
+  this: NdPartialIndex[G] =>
   override def t: TBool[G] = TBool()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("\\nd_partial_index(") <> Doc.args(indices ++ Seq(linearIndex) ++ dimensions) <> ")")
+    Group(
+      Text("\\nd_partial_index(") <>
+        Doc.args(indices ++ Seq(linearIndex) ++ dimensions) <> ")"
+    )
 }
diff --git a/src/col/vct/col/ast/expr/heap/read/PointerAddImpl.scala b/src/col/vct/col/ast/expr/heap/read/PointerAddImpl.scala
index 4c9a619f9b..568944876b 100644
--- a/src/col/vct/col/ast/expr/heap/read/PointerAddImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/PointerAddImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{PointerAdd, Type}
 import vct.col.print._
 import vct.col.ast.ops.PointerAddOps
 
-trait PointerAddImpl[G] extends PointerAddOps[G] { this: PointerAdd[G] =>
+trait PointerAddImpl[G] extends PointerAddOps[G] {
+  this: PointerAdd[G] =>
   override def t: Type[G] = pointer.t
 
   override def precedence: Int = Precedence.ADDITIVE
-  override def layout(implicit ctx: Ctx): Doc =
-    lassoc(pointer, "+", offset)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = lassoc(pointer, "+", offset)
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/PointerBlockLengthImpl.scala b/src/col/vct/col/ast/expr/heap/read/PointerBlockLengthImpl.scala
index 5cd38475cb..6ac977af5c 100644
--- a/src/col/vct/col/ast/expr/heap/read/PointerBlockLengthImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/PointerBlockLengthImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{PointerBlockLength, TInt, Type}
 import vct.col.print._
 import vct.col.ast.ops.PointerBlockLengthOps
 
-trait PointerBlockLengthImpl[G] extends PointerBlockLengthOps[G] { this: PointerBlockLength[G] =>
+trait PointerBlockLengthImpl[G] extends PointerBlockLengthOps[G] {
+  this: PointerBlockLength[G] =>
   override def t: Type[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
     Text("\\pointer_block_length(") <> pointer <> ")"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/PointerBlockOffsetImpl.scala b/src/col/vct/col/ast/expr/heap/read/PointerBlockOffsetImpl.scala
index e89b1fe010..ada4def9e9 100644
--- a/src/col/vct/col/ast/expr/heap/read/PointerBlockOffsetImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/PointerBlockOffsetImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{PointerBlockOffset, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.PointerBlockOffsetOps
 
-trait PointerBlockOffsetImpl[G] extends PointerBlockOffsetOps[G] { this: PointerBlockOffset[G] =>
+trait PointerBlockOffsetImpl[G] extends PointerBlockOffsetOps[G] {
+  this: PointerBlockOffset[G] =>
   override def t: Type[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
diff --git a/src/col/vct/col/ast/expr/heap/read/PointerLengthImpl.scala b/src/col/vct/col/ast/expr/heap/read/PointerLengthImpl.scala
index 3703ccf57e..8a8c033cd8 100644
--- a/src/col/vct/col/ast/expr/heap/read/PointerLengthImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/PointerLengthImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{PointerLength, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.PointerLengthOps
 
-trait PointerLengthImpl[G] extends PointerLengthOps[G] { this: PointerLength[G] =>
+trait PointerLengthImpl[G] extends PointerLengthOps[G] {
+  this: PointerLength[G] =>
   override def t: Type[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
diff --git a/src/col/vct/col/ast/expr/heap/read/PointerSubscriptImpl.scala b/src/col/vct/col/ast/expr/heap/read/PointerSubscriptImpl.scala
index b71134d229..9022060f53 100644
--- a/src/col/vct/col/ast/expr/heap/read/PointerSubscriptImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/PointerSubscriptImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{PointerSubscript, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence}
 import vct.col.ast.ops.PointerSubscriptOps
 
-trait PointerSubscriptImpl[G] extends PointerSubscriptOps[G] { this: PointerSubscript[G] =>
+trait PointerSubscriptImpl[G] extends PointerSubscriptOps[G] {
+  this: PointerSubscript[G] =>
   override def t: Type[G] = pointer.t.asPointer.get.element
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(assoc(pointer) <> "[" <> Doc.arg(index) <> "]")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/heap/read/ValuesImpl.scala b/src/col/vct/col/ast/expr/heap/read/ValuesImpl.scala
index 81c33203e2..e118b2073d 100644
--- a/src/col/vct/col/ast/expr/heap/read/ValuesImpl.scala
+++ b/src/col/vct/col/ast/expr/heap/read/ValuesImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{TSeq, Type, Values}
 import vct.col.print._
 import vct.col.ast.ops.ValuesOps
 
-trait ValuesImpl[G] extends ValuesOps[G] { this: Values[G] =>
+trait ValuesImpl[G] extends ValuesOps[G] {
+  this: Values[G] =>
   override def t: Type[G] = TSeq(arr.t.asArray.get.element)
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("\\values(") <> Doc.args(Seq(arr, from, to)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/EitherLeftImpl.scala b/src/col/vct/col/ast/expr/literal/build/EitherLeftImpl.scala
index 9393491039..e84ab23e3c 100644
--- a/src/col/vct/col/ast/expr/literal/build/EitherLeftImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/EitherLeftImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{EitherLeft, TEither, TNothing, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.EitherLeftOps
 
-trait EitherLeftImpl[G] extends EitherLeftOps[G] { this: EitherLeft[G] =>
+trait EitherLeftImpl[G] extends EitherLeftOps[G] {
+  this: EitherLeft[G] =>
   override def t: Type[G] = TEither(e.t, TNothing())
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("Left(") <> e <> ")"
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = Text("Left(") <> e <> ")"
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/EitherRightImpl.scala b/src/col/vct/col/ast/expr/literal/build/EitherRightImpl.scala
index 14867ee0fb..7920490571 100644
--- a/src/col/vct/col/ast/expr/literal/build/EitherRightImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/EitherRightImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{EitherRight, TEither, TNothing, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.EitherRightOps
 
-trait EitherRightImpl[G] extends EitherRightOps[G] { this: EitherRight[G] =>
+trait EitherRightImpl[G] extends EitherRightOps[G] {
+  this: EitherRight[G] =>
   override def t: Type[G] = TEither(TNothing(), e.t)
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("Right(") <> e <> ")"
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = Text("Right(") <> e <> ")"
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/LiteralBagImpl.scala b/src/col/vct/col/ast/expr/literal/build/LiteralBagImpl.scala
index d97a1ca0d2..28097481d5 100644
--- a/src/col/vct/col/ast/expr/literal/build/LiteralBagImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/LiteralBagImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{LiteralBag, TBag, Type}
 import vct.col.print._
 import vct.col.ast.ops.LiteralBagOps
 
-trait LiteralBagImpl[G] extends LiteralBagOps[G] { this: LiteralBag[G] =>
+trait LiteralBagImpl[G] extends LiteralBagOps[G] {
+  this: LiteralBag[G] =>
   override def t: Type[G] = TBag(element)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("bag<") <> element <> ">{" <> Doc.args(values) <> "}")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/LiteralMapImpl.scala b/src/col/vct/col/ast/expr/literal/build/LiteralMapImpl.scala
index 8cd26c8582..adcd87c59f 100644
--- a/src/col/vct/col/ast/expr/literal/build/LiteralMapImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/LiteralMapImpl.scala
@@ -4,10 +4,13 @@ import vct.col.ast.{LiteralMap, TMap, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.LiteralMapOps
 
-trait LiteralMapImpl[G] extends LiteralMapOps[G] { this: LiteralMap[G] =>
+trait LiteralMapImpl[G] extends LiteralMapOps[G] {
+  this: LiteralMap[G] =>
   override def t: Type[G] = TMap(k, v)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("map<") <> k <> "," <+> v <> ">{" <> Doc.args(values.map { case (k, v) => k.show <+> "->" <+> v }) <> "}")
-}
\ No newline at end of file
+    Group(Text("map<") <> k <> "," <+> v <> ">{" <> Doc.args(values.map {
+      case (k, v) => k.show <+> "->" <+> v
+    }) <> "}")
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/LiteralSeqImpl.scala b/src/col/vct/col/ast/expr/literal/build/LiteralSeqImpl.scala
index 203d8c7c39..88f9005511 100644
--- a/src/col/vct/col/ast/expr/literal/build/LiteralSeqImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/LiteralSeqImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{LiteralSeq, TSeq, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.LiteralSeqOps
 
-trait LiteralSeqImpl[G] extends LiteralSeqOps[G] { this: LiteralSeq[G] =>
+trait LiteralSeqImpl[G] extends LiteralSeqOps[G] {
+  this: LiteralSeq[G] =>
   override def t: Type[G] = TSeq(element)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("seq<") <> element <> ">{" <> Doc.args(values) <> "}")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/LiteralSetImpl.scala b/src/col/vct/col/ast/expr/literal/build/LiteralSetImpl.scala
index 0da714cfb4..0bed126d09 100644
--- a/src/col/vct/col/ast/expr/literal/build/LiteralSetImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/LiteralSetImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{LiteralSet, TSet, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.LiteralSetOps
 
-trait LiteralSetImpl[G] extends LiteralSetOps[G] { this: LiteralSet[G] =>
+trait LiteralSetImpl[G] extends LiteralSetOps[G] {
+  this: LiteralSet[G] =>
   override def t: Type[G] = TSet(element)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("set<") <> element <> ">{" <> Doc.args(values) <> "}")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/LiteralTupleImpl.scala b/src/col/vct/col/ast/expr/literal/build/LiteralTupleImpl.scala
index 7f0f574966..1f5612db2e 100644
--- a/src/col/vct/col/ast/expr/literal/build/LiteralTupleImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/LiteralTupleImpl.scala
@@ -6,17 +6,15 @@ import vct.col.check.{CheckContext, CheckError, TupleTypeCount}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.LiteralTupleOps
 
-trait LiteralTupleImpl[G] extends ExprImpl[G] with LiteralTupleOps[G] { this: LiteralTuple[G] =>
+trait LiteralTupleImpl[G] extends ExprImpl[G] with LiteralTupleOps[G] {
+  this: LiteralTuple[G] =>
   override def t: Type[G] = TTuple(ts)
 
   override def check(context: CheckContext[G]): Seq[CheckError] =
-    if(ts.size == values.size) {
-      super.check(context)
-    } else {
-      Seq(TupleTypeCount(this))
-    }
+    if (ts.size == values.size) { super.check(context) }
+    else { Seq(TupleTypeCount(this)) }
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("tuple<") <> Doc.args(ts) <> ">{" <> Doc.args(values) <> "}")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/LiteralVectorImpl.scala b/src/col/vct/col/ast/expr/literal/build/LiteralVectorImpl.scala
index 9dc825fafd..c9da43b649 100644
--- a/src/col/vct/col/ast/expr/literal/build/LiteralVectorImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/LiteralVectorImpl.scala
@@ -4,10 +4,14 @@ import vct.col.ast.{LiteralVector, TVector, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.LiteralVectorOps
 
-trait LiteralVectorImpl[G] extends LiteralVectorOps[G] { this: LiteralVector[G] =>
+trait LiteralVectorImpl[G] extends LiteralVectorOps[G] {
+  this: LiteralVector[G] =>
   override def t: Type[G] = TVector(values.size, element)()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("vector<") <> element <> "," <> values.size.toString <> ">{" <> Doc.args(values) <> "}")
+    Group(
+      Text("vector<") <> element <> "," <> values.size.toString <> ">{" <>
+        Doc.args(values) <> "}"
+    )
 }
diff --git a/src/col/vct/col/ast/expr/literal/build/OptNoneTypedImpl.scala b/src/col/vct/col/ast/expr/literal/build/OptNoneTypedImpl.scala
index 25ba7cf7b2..4922d36406 100644
--- a/src/col/vct/col/ast/expr/literal/build/OptNoneTypedImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/OptNoneTypedImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{OptNoneTyped, TOption, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.OptNoneTypedOps
 
-trait OptNoneTypedImpl[G] extends OptNoneTypedOps[G] { this: OptNoneTyped[G] =>
+trait OptNoneTypedImpl[G] extends OptNoneTypedOps[G] {
+  this: OptNoneTyped[G] =>
   override def t: Type[G] = TOption(element)
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("None")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/OptSomeImpl.scala b/src/col/vct/col/ast/expr/literal/build/OptSomeImpl.scala
index 09e05236bb..d82a611c4a 100644
--- a/src/col/vct/col/ast/expr/literal/build/OptSomeImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/OptSomeImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{OptSome, TOption, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.OptSomeOps
 
-trait OptSomeImpl[G] extends OptSomeOps[G] { this: OptSome[G] =>
+trait OptSomeImpl[G] extends OptSomeOps[G] {
+  this: OptSome[G] =>
   override def t: Type[G] = TOption(e.t)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = Text("Some(") <> e <> ")"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/OptSomeTypedImpl.scala b/src/col/vct/col/ast/expr/literal/build/OptSomeTypedImpl.scala
index 43416c0749..f313582b74 100644
--- a/src/col/vct/col/ast/expr/literal/build/OptSomeTypedImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/OptSomeTypedImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{OptSomeTyped, TOption, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.OptSomeTypedOps
 
-trait OptSomeTypedImpl[G] extends OptSomeTypedOps[G] { this: OptSomeTyped[G] =>
+trait OptSomeTypedImpl[G] extends OptSomeTypedOps[G] {
+  this: OptSomeTyped[G] =>
   override def t: Type[G] = TOption(element)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = Text("Some(") <> e <> ")"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/RangeImpl.scala b/src/col/vct/col/ast/expr/literal/build/RangeImpl.scala
index 818b99e3f9..8b42b7d611 100644
--- a/src/col/vct/col/ast/expr/literal/build/RangeImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/RangeImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{Range, TInt, TSeq, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.RangeOps
 
-trait RangeImpl[G] extends RangeOps[G] { this: Range[G] =>
+trait RangeImpl[G] extends RangeOps[G] {
+  this: Range[G] =>
   override def t: Type[G] = TSeq(TInt())
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = Text("[") <> from <+> ".." <+> to <> "]"
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Text("[") <> from <+> ".." <+> to <> "]"
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/UntypedLiteralBagImpl.scala b/src/col/vct/col/ast/expr/literal/build/UntypedLiteralBagImpl.scala
index 58776d72ab..d5b59b3186 100644
--- a/src/col/vct/col/ast/expr/literal/build/UntypedLiteralBagImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/UntypedLiteralBagImpl.scala
@@ -5,11 +5,12 @@ import vct.col.print._
 import vct.col.typerules.Types
 import vct.col.ast.ops.UntypedLiteralBagOps
 
-trait UntypedLiteralBagImpl[G] extends UntypedLiteralBagOps[G] { this: UntypedLiteralBag[G] =>
+trait UntypedLiteralBagImpl[G] extends UntypedLiteralBagOps[G] {
+  this: UntypedLiteralBag[G] =>
   lazy val elementType: Type[G] = Types.leastCommonSuperType(values.map(_.t))
   override def t: Type[G] = TBag(elementType)
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("b{") <> Doc.args(values) <> "}")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/UntypedLiteralSeqImpl.scala b/src/col/vct/col/ast/expr/literal/build/UntypedLiteralSeqImpl.scala
index 77029440c7..7c2522c230 100644
--- a/src/col/vct/col/ast/expr/literal/build/UntypedLiteralSeqImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/UntypedLiteralSeqImpl.scala
@@ -5,11 +5,12 @@ import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.typerules.Types
 import vct.col.ast.ops.UntypedLiteralSeqOps
 
-trait UntypedLiteralSeqImpl[G] extends UntypedLiteralSeqOps[G] { this: UntypedLiteralSeq[G] =>
+trait UntypedLiteralSeqImpl[G] extends UntypedLiteralSeqOps[G] {
+  this: UntypedLiteralSeq[G] =>
   lazy val elementType: Type[G] = Types.leastCommonSuperType(values.map(_.t))
   override def t: Type[G] = TSeq(elementType)
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("[") <> Doc.args(values) <> "]")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/build/UntypedLiteralSetImpl.scala b/src/col/vct/col/ast/expr/literal/build/UntypedLiteralSetImpl.scala
index 160ec63280..1d6b39c44f 100644
--- a/src/col/vct/col/ast/expr/literal/build/UntypedLiteralSetImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/build/UntypedLiteralSetImpl.scala
@@ -5,11 +5,12 @@ import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.typerules.Types
 import vct.col.ast.ops.UntypedLiteralSetOps
 
-trait UntypedLiteralSetImpl[G] extends UntypedLiteralSetOps[G] { this: UntypedLiteralSet[G] =>
+trait UntypedLiteralSetImpl[G] extends UntypedLiteralSetOps[G] {
+  this: UntypedLiteralSet[G] =>
   lazy val elementType: Type[G] = Types.leastCommonSuperType(values.map(_.t))
   override def t: Type[G] = TSet(elementType)
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("{") <> Doc.args(values) <> "}")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/constant/AutoValueImpl.scala b/src/col/vct/col/ast/expr/literal/constant/AutoValueImpl.scala
index 3bc59a586a..0c514c4a08 100644
--- a/src/col/vct/col/ast/expr/literal/constant/AutoValueImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/AutoValueImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.ops.AutoValueOps
 import vct.col.ast.{AutoValue, TResource, Type}
 import vct.col.print._
 
-trait AutoValueImpl[G] extends AutoValueOps[G] { this: AutoValue[G] =>
+trait AutoValueImpl[G] extends AutoValueOps[G] {
+  this: AutoValue[G] =>
   override def t: Type[G] = TResource()
 
   override def layout(implicit ctx: Ctx): Doc = Text("AutoValue(") <> loc <> ")"
diff --git a/src/col/vct/col/ast/expr/literal/constant/BooleanValueImpl.scala b/src/col/vct/col/ast/expr/literal/constant/BooleanValueImpl.scala
index 0a1b97c143..2202095016 100644
--- a/src/col/vct/col/ast/expr/literal/constant/BooleanValueImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/BooleanValueImpl.scala
@@ -4,16 +4,35 @@ import vct.col.ast.{BooleanValue, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.BooleanValueOps
 
-trait BooleanValueImpl[G] extends BooleanValueOps[G] { this: BooleanValue[G] =>
+trait BooleanValueImpl[G] extends BooleanValueOps[G] {
+  this: BooleanValue[G] =>
   override def t: Type[G] = TBool()
 
-  sealed trait LayoutElement[+T] { def textualData: Char }
-  case class SharedLayoutElement(textualData: Char) extends LayoutElement[Nothing]
-  case class DedicatedLayoutElement[T](resource: T, textualData: Char) extends LayoutElement[T]
-  def orderedLayoutFixture: Seq[LayoutElement[Boolean]] = Seq(DedicatedLayoutElement(true, 't'),
-    DedicatedLayoutElement(false, 'f'), DedicatedLayoutElement(false, 'a'), DedicatedLayoutElement(true, 'r'),
-    DedicatedLayoutElement(true, 'u'), DedicatedLayoutElement(false, 'l'), DedicatedLayoutElement(false, 's'),
-    SharedLayoutElement('e'))
+  sealed trait LayoutElement[+T] {
+    def textualData: Char
+  }
+  case class SharedLayoutElement(textualData: Char)
+      extends LayoutElement[Nothing]
+  case class DedicatedLayoutElement[T](resource: T, textualData: Char)
+      extends LayoutElement[T]
+  def orderedLayoutFixture: Seq[LayoutElement[Boolean]] =
+    Seq(
+      DedicatedLayoutElement(true, 't'),
+      DedicatedLayoutElement(false, 'f'),
+      DedicatedLayoutElement(false, 'a'),
+      DedicatedLayoutElement(true, 'r'),
+      DedicatedLayoutElement(true, 'u'),
+      DedicatedLayoutElement(false, 'l'),
+      DedicatedLayoutElement(false, 's'),
+      SharedLayoutElement('e'),
+    )
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = Text(orderedLayoutFixture.collect { case e@SharedLayoutElement(_) => e; case e@DedicatedLayoutElement(r, _) if r.toString == value.toString => e }.map(_.textualData).mkString(""))
+  override def layout(implicit ctx: Ctx): Doc =
+    Text(
+      orderedLayoutFixture.collect {
+        case e @ SharedLayoutElement(_) => e;
+        case e @ DedicatedLayoutElement(r, _) if r.toString == value.toString =>
+          e
+      }.map(_.textualData).mkString("")
+    )
 }
diff --git a/src/col/vct/col/ast/expr/literal/constant/ConstantImpl.scala b/src/col/vct/col/ast/expr/literal/constant/ConstantImpl.scala
index fef6a6155f..c49837f844 100644
--- a/src/col/vct/col/ast/expr/literal/constant/ConstantImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/ConstantImpl.scala
@@ -2,13 +2,15 @@ package vct.col.ast.expr.literal.constant
 
 import vct.col.ast.Constant
 
-trait ConstantImpl[G] { this: Constant[G] =>
+trait ConstantImpl[G] {
+  this: Constant[G] =>
   def value: Any
 
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case const: Constant[_] => this.value == const.value
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case const: Constant[_] => this.value == const.value
+      case _ => false
+    }
 
   override def hashCode(): Int = value.hashCode()
   override def toString: String = value.toString
diff --git a/src/col/vct/col/ast/expr/literal/constant/ConstantIntImpl.scala b/src/col/vct/col/ast/expr/literal/constant/ConstantIntImpl.scala
index 85a0317ac0..0fe3322c01 100644
--- a/src/col/vct/col/ast/expr/literal/constant/ConstantIntImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/ConstantIntImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.expr.literal.constant
 
 import vct.col.ast.ConstantInt
 
-trait ConstantIntImpl[G] { this: ConstantInt[G] =>
+trait ConstantIntImpl[G] {
+  this: ConstantInt[G] =>
   override def value: BigInt
 }
diff --git a/src/col/vct/col/ast/expr/literal/constant/EmptyProcessImpl.scala b/src/col/vct/col/ast/expr/literal/constant/EmptyProcessImpl.scala
index cac357548d..1d4284a388 100644
--- a/src/col/vct/col/ast/expr/literal/constant/EmptyProcessImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/EmptyProcessImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{EmptyProcess, TProcess, Type}
 import vct.col.print._
 import vct.col.ast.ops.EmptyProcessOps
 
-trait EmptyProcessImpl[G] extends EmptyProcessOps[G] { this: EmptyProcess[G] =>
+trait EmptyProcessImpl[G] extends EmptyProcessOps[G] {
+  this: EmptyProcess[G] =>
   override def t: Type[G] = TProcess()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("empty")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/constant/FloatValueImpl.scala b/src/col/vct/col/ast/expr/literal/constant/FloatValueImpl.scala
index f02a4e4aba..c488103000 100644
--- a/src/col/vct/col/ast/expr/literal/constant/FloatValueImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/FloatValueImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.{FloatValue}
 import vct.col.print._
 import vct.col.ast.ops.FloatValueOps
 
-trait FloatValueImpl[G] extends FloatValueOps[G] { this: FloatValue[G] =>
+trait FloatValueImpl[G] extends FloatValueOps[G] {
+  this: FloatValue[G] =>
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = Text(value.toString()) // PB: this should change when we reconsider floats.
+  override def layout(implicit ctx: Ctx): Doc =
+    Text(value.toString()) // PB: this should change when we reconsider floats.
 }
diff --git a/src/col/vct/col/ast/expr/literal/constant/NoPermImpl.scala b/src/col/vct/col/ast/expr/literal/constant/NoPermImpl.scala
index eeb600bf9e..756ed50519 100644
--- a/src/col/vct/col/ast/expr/literal/constant/NoPermImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/NoPermImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{NoPerm, TBoundedInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.NoPermOps
 
-trait NoPermImpl[G] extends NoPermOps[G] { this: NoPerm[G] =>
+trait NoPermImpl[G] extends NoPermOps[G] {
+  this: NoPerm[G] =>
   override def t: Type[G] = TBoundedInt(0, 1)
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("none")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/constant/NullImpl.scala b/src/col/vct/col/ast/expr/literal/constant/NullImpl.scala
index 56423d7917..c331dea598 100644
--- a/src/col/vct/col/ast/expr/literal/constant/NullImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/NullImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Null, TNull, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.NullOps
 
-trait NullImpl[G] extends NullOps[G] { this: Null[G] =>
+trait NullImpl[G] extends NullOps[G] {
+  this: Null[G] =>
   override def t: Type[G] = TNull()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("null")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/constant/OptNoneImpl.scala b/src/col/vct/col/ast/expr/literal/constant/OptNoneImpl.scala
index d6bacbc8b8..aa4d804b0f 100644
--- a/src/col/vct/col/ast/expr/literal/constant/OptNoneImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/OptNoneImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{OptNone, TNothing, TOption, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.OptNoneOps
 
-trait OptNoneImpl[G] extends OptNoneOps[G] { this: OptNone[G] =>
+trait OptNoneImpl[G] extends OptNoneOps[G] {
+  this: OptNone[G] =>
   override def t: Type[G] = TOption(TNothing())
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("None")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/constant/ReadPermImpl.scala b/src/col/vct/col/ast/expr/literal/constant/ReadPermImpl.scala
index cc3b3c2a6a..4ac455ba52 100644
--- a/src/col/vct/col/ast/expr/literal/constant/ReadPermImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/ReadPermImpl.scala
@@ -4,12 +4,14 @@ import vct.col.ast.{ReadPerm, TFraction, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.ReadPermOps
 
-trait ReadPermImpl[G] extends ReadPermOps[G] { this: ReadPerm[G] =>
+trait ReadPermImpl[G] extends ReadPermOps[G] {
+  this: ReadPerm[G] =>
   override def t: Type[G] = TFraction()
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => Text("wildcard")
-    case _ => Text("read")
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => Text("wildcard")
+      case _ => Text("read")
+    }
+}
diff --git a/src/col/vct/col/ast/expr/literal/constant/VoidImpl.scala b/src/col/vct/col/ast/expr/literal/constant/VoidImpl.scala
index d8d7c09e24..ea414f8669 100644
--- a/src/col/vct/col/ast/expr/literal/constant/VoidImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/VoidImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{TVoid, Type, Void}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.VoidOps
 
-trait VoidImpl[G] extends VoidOps[G] { this: Void[G] =>
+trait VoidImpl[G] extends VoidOps[G] {
+  this: Void[G] =>
   override def t: Type[G] = TVoid()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("void")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/literal/constant/WritePermImpl.scala b/src/col/vct/col/ast/expr/literal/constant/WritePermImpl.scala
index 49bdc5d76a..5df4c216b2 100644
--- a/src/col/vct/col/ast/expr/literal/constant/WritePermImpl.scala
+++ b/src/col/vct/col/ast/expr/literal/constant/WritePermImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{TBoundedInt, Type, WritePerm}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.WritePermOps
 
-trait WritePermImpl[G] extends WritePermOps[G] { this: WritePerm[G] =>
+trait WritePermImpl[G] extends WritePermOps[G] {
+  this: WritePerm[G] =>
   override def t: Type[G] = TBoundedInt(1, 2)
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("write")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/lock/CommittedImpl.scala b/src/col/vct/col/ast/expr/lock/CommittedImpl.scala
index 69b31fe929..8681dc7651 100644
--- a/src/col/vct/col/ast/expr/lock/CommittedImpl.scala
+++ b/src/col/vct/col/ast/expr/lock/CommittedImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Committed, TBool}
 import vct.col.print.{Ctx, Doc, Precedence, Text, Group}
 import vct.col.ast.ops.CommittedOps
 
-trait CommittedImpl[G] extends CommittedOps[G] { this: Committed[G] =>
+trait CommittedImpl[G] extends CommittedOps[G] {
+  this: Committed[G] =>
   override def t: TBool[G] = TBool()
 
   override def precedence: Int = Precedence.ATOMIC
diff --git a/src/col/vct/col/ast/expr/lock/HeldImpl.scala b/src/col/vct/col/ast/expr/lock/HeldImpl.scala
index 1ca3834813..206ee743e9 100644
--- a/src/col/vct/col/ast/expr/lock/HeldImpl.scala
+++ b/src/col/vct/col/ast/expr/lock/HeldImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{Held, TBool, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.HeldOps
 
-trait HeldImpl[G] extends HeldOps[G] { this: Held[G] =>
+trait HeldImpl[G] extends HeldOps[G] {
+  this: Held[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("held(") <> Doc.arg(obj) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/lock/IdleTokenImpl.scala b/src/col/vct/col/ast/expr/lock/IdleTokenImpl.scala
index 760fab6e4b..9e7113f093 100644
--- a/src/col/vct/col/ast/expr/lock/IdleTokenImpl.scala
+++ b/src/col/vct/col/ast/expr/lock/IdleTokenImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{IdleToken, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.IdleTokenOps
 
-trait IdleTokenImpl[G] extends IdleTokenOps[G] { this: IdleToken[G] =>
+trait IdleTokenImpl[G] extends IdleTokenOps[G] {
+  this: IdleToken[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("idle(") <> Doc.arg(thread) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/lock/JoinTokenImpl.scala b/src/col/vct/col/ast/expr/lock/JoinTokenImpl.scala
index 2568a6a29a..778f2a04eb 100644
--- a/src/col/vct/col/ast/expr/lock/JoinTokenImpl.scala
+++ b/src/col/vct/col/ast/expr/lock/JoinTokenImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{JoinToken, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.JoinTokenOps
 
-trait JoinTokenImpl[G] extends JoinTokenOps[G] { this: JoinToken[G] =>
+trait JoinTokenImpl[G] extends JoinTokenOps[G] {
+  this: JoinToken[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("running(") <> Doc.arg(thread) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/misc/AnyImpl.scala b/src/col/vct/col/ast/expr/misc/AnyImpl.scala
index 1f26418813..16ee30c22a 100644
--- a/src/col/vct/col/ast/expr/misc/AnyImpl.scala
+++ b/src/col/vct/col/ast/expr/misc/AnyImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Any, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.AnyOps
 
-trait AnyImpl[G] extends AnyOps[G] { this: Any[G] =>
+trait AnyImpl[G] extends AnyOps[G] {
+  this: Any[G] =>
   override def t: Type[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("*")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/misc/ApplyCoercionImpl.scala b/src/col/vct/col/ast/expr/misc/ApplyCoercionImpl.scala
index 3b243715b2..7b47cada25 100644
--- a/src/col/vct/col/ast/expr/misc/ApplyCoercionImpl.scala
+++ b/src/col/vct/col/ast/expr/misc/ApplyCoercionImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.{ApplyCoercion, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.ApplyCoercionOps
 
-trait ApplyCoercionImpl[G] extends ApplyCoercionOps[G] { this: ApplyCoercion[G] =>
+trait ApplyCoercionImpl[G] extends ApplyCoercionOps[G] {
+  this: ApplyCoercion[G] =>
   override def t: Type[G] = coercion.target
 }
diff --git a/src/col/vct/col/ast/expr/misc/CharValueImpl.scala b/src/col/vct/col/ast/expr/misc/CharValueImpl.scala
index 3eb1f73e87..94a17592ed 100644
--- a/src/col/vct/col/ast/expr/misc/CharValueImpl.scala
+++ b/src/col/vct/col/ast/expr/misc/CharValueImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{CharValue, TChar, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.CharValueOps
 
-trait CharValueImpl[G] extends CharValueOps[G] { this: CharValue[G] =>
+trait CharValueImpl[G] extends CharValueOps[G] {
+  this: CharValue[G] =>
   def t: Type[G] = TChar()
 
   override def precedence: Int = Precedence.ATOMIC
diff --git a/src/col/vct/col/ast/expr/misc/EnumImpl.scala b/src/col/vct/col/ast/expr/misc/EnumImpl.scala
index f8d54ad460..a117193630 100644
--- a/src/col/vct/col/ast/expr/misc/EnumImpl.scala
+++ b/src/col/vct/col/ast/expr/misc/EnumImpl.scala
@@ -6,11 +6,15 @@ import vct.col.print._
 import vct.col.resolve.ctx.RefEnumConstant
 import vct.col.ast.ops.EnumOps
 
-trait EnumImpl[G] extends EnumOps[G] { this: Enum[G] =>
-  def getConstant(name: String): Option[RefEnumConstant[G]] = constants.collectFirst {
-    case c if c.o.find[SourceName].contains(SourceName(name)) => RefEnumConstant(Some(this), c)
-  }
+trait EnumImpl[G] extends EnumOps[G] {
+  this: Enum[G] =>
+  def getConstant(name: String): Option[RefEnumConstant[G]] =
+    constants.collectFirst {
+      case c if c.o.find[SourceName].contains(SourceName(name)) =>
+        RefEnumConstant(Some(this), c)
+    }
 
   override def layout(implicit ctx: Ctx): Doc =
-    Text("enum") <+> ctx.name(this) <+> "{" <>> Doc.stack(constants.map(_.show <> ",")) <+/> "}"
+    Text("enum") <+> ctx.name(this) <+> "{" <>>
+      Doc.stack(constants.map(_.show <> ",")) <+/> "}"
 }
diff --git a/src/col/vct/col/ast/expr/misc/EnumUseImpl.scala b/src/col/vct/col/ast/expr/misc/EnumUseImpl.scala
index b1fd8b3272..2b7ce97313 100644
--- a/src/col/vct/col/ast/expr/misc/EnumUseImpl.scala
+++ b/src/col/vct/col/ast/expr/misc/EnumUseImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{EnumUse, TEnum, Type}
 import vct.col.print._
 import vct.col.ast.ops.EnumUseOps
 
-trait EnumUseImpl[G] extends EnumUseOps[G] { this: EnumUse[G] =>
+trait EnumUseImpl[G] extends EnumUseOps[G] {
+  this: EnumUse[G] =>
   override def t: Type[G] = TEnum(enum)
 
   override def precedence: Int = Precedence.POSTFIX
diff --git a/src/col/vct/col/ast/expr/misc/InlinePatternImpl.scala b/src/col/vct/col/ast/expr/misc/InlinePatternImpl.scala
index eb53ab2f2a..f6f4ae72ae 100644
--- a/src/col/vct/col/ast/expr/misc/InlinePatternImpl.scala
+++ b/src/col/vct/col/ast/expr/misc/InlinePatternImpl.scala
@@ -4,13 +4,18 @@ import vct.col.ast.{InlinePattern, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.InlinePatternOps
 
-trait InlinePatternImpl[G] extends InlinePatternOps[G] { this: InlinePattern[G] =>
+trait InlinePatternImpl[G] extends InlinePatternOps[G] {
+  this: InlinePattern[G] =>
   override def t: Type[G] = inner.t
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = (parent, group) match {
-    case (0, 0) => Text("{:") <+> inner <+> ":}"
-    case (parent, 0) => Text("{:") <> "<".repeat(parent) <> ":" <+> inner <+> ":}"
-    case (parent, group) => Text("{:") <> "<".repeat(parent) <> group.toString <> ":" <+> inner <+> ":}"
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    (parent, group) match {
+      case (0, 0) => Text("{:") <+> inner <+> ":}"
+      case (parent, 0) =>
+        Text("{:") <> "<".repeat(parent) <> ":" <+> inner <+> ":}"
+      case (parent, group) =>
+        Text("{:") <> "<".repeat(parent) <> group.toString <> ":" <+> inner <+>
+          ":}"
+    }
+}
diff --git a/src/col/vct/col/ast/expr/misc/LocalImpl.scala b/src/col/vct/col/ast/expr/misc/LocalImpl.scala
index 8facf092d9..497ba2404f 100644
--- a/src/col/vct/col/ast/expr/misc/LocalImpl.scala
+++ b/src/col/vct/col/ast/expr/misc/LocalImpl.scala
@@ -6,11 +6,12 @@ import vct.col.check.{CheckContext, CheckError}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.LocalOps
 
-trait LocalImpl[G] extends ExprImpl[G] with LocalOps[G] { this: Local[G] =>
+trait LocalImpl[G] extends ExprImpl[G] with LocalOps[G] {
+  this: Local[G] =>
   override def t: Type[G] = ref.decl.t
   override def check(context: CheckContext[G]): Seq[CheckError] =
     context.checkInScope(this, ref)
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text(ctx.name(ref))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/misc/OldImpl.scala b/src/col/vct/col/ast/expr/misc/OldImpl.scala
index d3ea547029..46bf39e6a7 100644
--- a/src/col/vct/col/ast/expr/misc/OldImpl.scala
+++ b/src/col/vct/col/ast/expr/misc/OldImpl.scala
@@ -4,14 +4,18 @@ import vct.col.ast.{Old, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.OldOps
 
-trait OldImpl[G] extends OldOps[G] { this: Old[G] =>
+trait OldImpl[G] extends OldOps[G] {
+  this: Old[G] =>
   override def t: Type[G] = expr.t
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = (ctx.syntax, at) match {
-    case (Ctx.Silver, None) => Text("old(") <> expr <> ")"
-    case (Ctx.Silver, Some(at)) => Text("old[") <> ctx.name(at) <> "](" <> expr <> ")"
-    case (_, None) => Text("\\old(") <> expr <> ")"
-    case (_, Some(at)) => Text("\\old[") <> ctx.name(at) <> "](" <> expr <> ")"
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    (ctx.syntax, at) match {
+      case (Ctx.Silver, None) => Text("old(") <> expr <> ")"
+      case (Ctx.Silver, Some(at)) =>
+        Text("old[") <> ctx.name(at) <> "](" <> expr <> ")"
+      case (_, None) => Text("\\old(") <> expr <> ")"
+      case (_, Some(at)) =>
+        Text("\\old[") <> ctx.name(at) <> "](" <> expr <> ")"
+    }
+}
diff --git a/src/col/vct/col/ast/expr/misc/StringValueImpl.scala b/src/col/vct/col/ast/expr/misc/StringValueImpl.scala
index ae57cd3a0e..c71ce86bc1 100644
--- a/src/col/vct/col/ast/expr/misc/StringValueImpl.scala
+++ b/src/col/vct/col/ast/expr/misc/StringValueImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{StringValue, TString, Type}
 import vct.col.print._
 import vct.col.ast.ops.StringValueOps
 
-trait StringValueImpl[G] extends StringValueOps[G] { this: StringValue[G] =>
+trait StringValueImpl[G] extends StringValueOps[G] {
+  this: StringValue[G] =>
   override def t: Type[G] = TString()
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("\"") <> value <> "\""
+  override def layout(implicit ctx: Ctx): Doc = Text("\"") <> value <> "\""
 }
diff --git a/src/col/vct/col/ast/expr/model/ModelAbstractStateImpl.scala b/src/col/vct/col/ast/expr/model/ModelAbstractStateImpl.scala
index 28dee8d607..2cc5c40a01 100644
--- a/src/col/vct/col/ast/expr/model/ModelAbstractStateImpl.scala
+++ b/src/col/vct/col/ast/expr/model/ModelAbstractStateImpl.scala
@@ -4,10 +4,14 @@ import vct.col.ast.{ModelAbstractState, TResource, Type}
 import vct.col.print._
 import vct.col.ast.ops.ModelAbstractStateOps
 
-trait ModelAbstractStateImpl[G] extends ModelAbstractStateOps[G] { this: ModelAbstractState[G] =>
+trait ModelAbstractStateImpl[G] extends ModelAbstractStateOps[G] {
+  this: ModelAbstractState[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(assoc(model) <> "." <> "abstractState" <> "(" <> Doc.args(Seq(state)) <> ")")
-}
\ No newline at end of file
+    Group(
+      assoc(model) <> "." <> "abstractState" <> "(" <> Doc.args(Seq(state)) <>
+        ")"
+    )
+}
diff --git a/src/col/vct/col/ast/expr/model/ModelChooseImpl.scala b/src/col/vct/col/ast/expr/model/ModelChooseImpl.scala
index 14257f7861..6639daf2b0 100644
--- a/src/col/vct/col/ast/expr/model/ModelChooseImpl.scala
+++ b/src/col/vct/col/ast/expr/model/ModelChooseImpl.scala
@@ -4,10 +4,14 @@ import vct.col.ast.{ModelChoose, TVoid, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Group}
 import vct.col.ast.ops.ModelChooseOps
 
-trait ModelChooseImpl[G] extends ModelChooseOps[G] { this: ModelChoose[G] =>
+trait ModelChooseImpl[G] extends ModelChooseOps[G] {
+  this: ModelChoose[G] =>
   override def t: Type[G] = TVoid()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(assoc(model) <> "." <> "choose" <> "(" <> Doc.args(Seq(perm, totalProcess)) <> ")")
-}
\ No newline at end of file
+    Group(
+      assoc(model) <> "." <> "choose" <> "(" <>
+        Doc.args(Seq(perm, totalProcess)) <> ")"
+    )
+}
diff --git a/src/col/vct/col/ast/expr/model/ModelCreateImpl.scala b/src/col/vct/col/ast/expr/model/ModelCreateImpl.scala
index faaa0bb646..084f8172b9 100644
--- a/src/col/vct/col/ast/expr/model/ModelCreateImpl.scala
+++ b/src/col/vct/col/ast/expr/model/ModelCreateImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{ModelCreate, TVoid, Type}
 import vct.col.print._
 import vct.col.ast.ops.ModelCreateOps
 
-trait ModelCreateImpl[G] extends ModelCreateOps[G] { this: ModelCreate[G] =>
+trait ModelCreateImpl[G] extends ModelCreateOps[G] {
+  this: ModelCreate[G] =>
   override def t: Type[G] = TVoid()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(assoc(model) <> "." <> "create" <> "(" <> Doc.args(Seq(init)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/model/ModelDestroyImpl.scala b/src/col/vct/col/ast/expr/model/ModelDestroyImpl.scala
index 3909023f0e..b287424ebc 100644
--- a/src/col/vct/col/ast/expr/model/ModelDestroyImpl.scala
+++ b/src/col/vct/col/ast/expr/model/ModelDestroyImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{ModelDestroy, TVoid, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.ModelDestroyOps
 
-trait ModelDestroyImpl[G] extends ModelDestroyOps[G] { this: ModelDestroy[G] =>
+trait ModelDestroyImpl[G] extends ModelDestroyOps[G] {
+  this: ModelDestroy[G] =>
   override def t: Type[G] = TVoid()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     assoc(model) <> "." <> "destroy" <> "(" <> ")"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/model/ModelMergeImpl.scala b/src/col/vct/col/ast/expr/model/ModelMergeImpl.scala
index 95af9fcb24..56d1b2d016 100644
--- a/src/col/vct/col/ast/expr/model/ModelMergeImpl.scala
+++ b/src/col/vct/col/ast/expr/model/ModelMergeImpl.scala
@@ -4,10 +4,14 @@ import vct.col.ast.{ModelMerge, TVoid, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Group}
 import vct.col.ast.ops.ModelMergeOps
 
-trait ModelMergeImpl[G] extends ModelMergeOps[G] { this: ModelMerge[G] =>
+trait ModelMergeImpl[G] extends ModelMergeOps[G] {
+  this: ModelMerge[G] =>
   override def t: Type[G] = TVoid()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(assoc(model) <> "." <> "merge" <> "(" <> Doc.args(Seq(leftPerm, leftProcess, rightPerm, rightProcess)) <> ")")
-}
\ No newline at end of file
+    Group(
+      assoc(model) <> "." <> "merge" <> "(" <>
+        Doc.args(Seq(leftPerm, leftProcess, rightPerm, rightProcess)) <> ")"
+    )
+}
diff --git a/src/col/vct/col/ast/expr/model/ModelNewImpl.scala b/src/col/vct/col/ast/expr/model/ModelNewImpl.scala
index 27dbfd3eae..dc635373cb 100644
--- a/src/col/vct/col/ast/expr/model/ModelNewImpl.scala
+++ b/src/col/vct/col/ast/expr/model/ModelNewImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{ModelNew, TModel, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.ModelNewOps
 
-trait ModelNewImpl[G] extends ModelNewOps[G] { this: ModelNew[G] =>
+trait ModelNewImpl[G] extends ModelNewOps[G] {
+  this: ModelNew[G] =>
   override def t: Type[G] = TModel(ref)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Text(ctx.name(ref)) <> ".create()"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/model/ModelSplitImpl.scala b/src/col/vct/col/ast/expr/model/ModelSplitImpl.scala
index 26ceb8ecfa..f29bb72302 100644
--- a/src/col/vct/col/ast/expr/model/ModelSplitImpl.scala
+++ b/src/col/vct/col/ast/expr/model/ModelSplitImpl.scala
@@ -4,10 +4,14 @@ import vct.col.ast.{ModelSplit, TVoid, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence}
 import vct.col.ast.ops.ModelSplitOps
 
-trait ModelSplitImpl[G] extends ModelSplitOps[G] { this: ModelSplit[G] =>
+trait ModelSplitImpl[G] extends ModelSplitOps[G] {
+  this: ModelSplit[G] =>
   override def t: Type[G] = TVoid()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(assoc(model) <> "." <> "split" <> "(" <> Doc.args(Seq(leftPerm, leftProcess, rightPerm, rightProcess)) <> ")")
-}
\ No newline at end of file
+    Group(
+      assoc(model) <> "." <> "split" <> "(" <>
+        Doc.args(Seq(leftPerm, leftProcess, rightPerm, rightProcess)) <> ")"
+    )
+}
diff --git a/src/col/vct/col/ast/expr/model/ModelStateImpl.scala b/src/col/vct/col/ast/expr/model/ModelStateImpl.scala
index f444af32f1..eafb02b46a 100644
--- a/src/col/vct/col/ast/expr/model/ModelStateImpl.scala
+++ b/src/col/vct/col/ast/expr/model/ModelStateImpl.scala
@@ -4,10 +4,13 @@ import vct.col.ast.{ModelState, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence}
 import vct.col.ast.ops.ModelStateOps
 
-trait ModelStateImpl[G] extends ModelStateOps[G] { this: ModelState[G] =>
+trait ModelStateImpl[G] extends ModelStateOps[G] {
+  this: ModelState[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(assoc(model) <> "." <> "state" <> "(" <> Doc.args(Seq(perm, state)) <> ")")
-}
\ No newline at end of file
+    Group(
+      assoc(model) <> "." <> "state" <> "(" <> Doc.args(Seq(perm, state)) <> ")"
+    )
+}
diff --git a/src/col/vct/col/ast/expr/op/BinExprImpl.scala b/src/col/vct/col/ast/expr/op/BinExprImpl.scala
index 623b076275..7bbf539079 100644
--- a/src/col/vct/col/ast/expr/op/BinExprImpl.scala
+++ b/src/col/vct/col/ast/expr/op/BinExprImpl.scala
@@ -1,7 +1,19 @@
 package vct.col.ast.expr.op
 
 import vct.col.ast.`type`.typeclass.TFloats.getFloatMax
-import vct.col.ast.{BinExpr, Expr, IntType, TBool, TCInt, TInt, TProcess, TRational, TString, TVector, Type}
+import vct.col.ast.{
+  BinExpr,
+  Expr,
+  IntType,
+  TBool,
+  TCInt,
+  TInt,
+  TProcess,
+  TRational,
+  TString,
+  TVector,
+  Type,
+}
 import vct.col.origin.Origin
 import vct.col.typerules.{CoercionUtils, Types}
 import vct.result.VerificationError
@@ -19,53 +31,79 @@ object BinOperatorTypes {
     CoercionUtils.getCoercion(lt, TRational()).isDefined &&
       CoercionUtils.getCoercion(rt, TRational()).isDefined
 
-  def isBoolOp[G](lt: Type[G], rt: Type[G]): Boolean = CoercionUtils.getCoercion(lt, TBool()).isDefined &&
-    CoercionUtils.getCoercion(rt, TBool()).isDefined
-
-  def isStringOp[G](lt: Type[G], rt: Type[G]): Boolean = CoercionUtils.getCoercion(lt, TString()).isDefined
-
-  def isBagOp[G](lt: Type[G], rt: Type[G]): Boolean = CoercionUtils.getAnyBagCoercion(lt).isDefined
-  def isMapOp[G](lt: Type[G], rt: Type[G]): Boolean = CoercionUtils.getAnyMapCoercion(lt).isDefined
-  def isPointerOp[G](lt: Type[G], rt: Type[G]): Boolean = CoercionUtils.getAnyPointerCoercion(lt).isDefined
-  def isProcessOp[G](lt: Type[G], rt: Type[G]): Boolean = CoercionUtils.getCoercion(lt, TProcess()).isDefined
-  def isSeqOp[G](lt: Type[G], rt: Type[G]): Boolean = CoercionUtils.getAnySeqCoercion(lt).isDefined
-  def isSetOp[G](lt: Type[G], rt: Type[G]): Boolean = CoercionUtils.getAnySetCoercion(lt).isDefined
-  def isVectorOp[G](lt: Type[G], rt: Type[G]): Boolean = CoercionUtils.getAnyVectorCoercion(lt).isDefined
+  def isBoolOp[G](lt: Type[G], rt: Type[G]): Boolean =
+    CoercionUtils.getCoercion(lt, TBool()).isDefined &&
+      CoercionUtils.getCoercion(rt, TBool()).isDefined
+
+  def isStringOp[G](lt: Type[G], rt: Type[G]): Boolean =
+    CoercionUtils.getCoercion(lt, TString()).isDefined
+
+  def isBagOp[G](lt: Type[G], rt: Type[G]): Boolean =
+    CoercionUtils.getAnyBagCoercion(lt).isDefined
+  def isMapOp[G](lt: Type[G], rt: Type[G]): Boolean =
+    CoercionUtils.getAnyMapCoercion(lt).isDefined
+  def isPointerOp[G](lt: Type[G], rt: Type[G]): Boolean =
+    CoercionUtils.getAnyPointerCoercion(lt).isDefined
+  def isProcessOp[G](lt: Type[G], rt: Type[G]): Boolean =
+    CoercionUtils.getCoercion(lt, TProcess()).isDefined
+  def isSeqOp[G](lt: Type[G], rt: Type[G]): Boolean =
+    CoercionUtils.getAnySeqCoercion(lt).isDefined
+  def isSetOp[G](lt: Type[G], rt: Type[G]): Boolean =
+    CoercionUtils.getAnySetCoercion(lt).isDefined
+  def isVectorOp[G](lt: Type[G], rt: Type[G]): Boolean =
+    CoercionUtils.getAnyVectorCoercion(lt).isDefined
 
   def isVectorIntOp[G](lt: Type[G], rt: Type[G]): Boolean = {
-    (for{
+    (for {
       (_, TVector(sizeL, eL)) <- CoercionUtils.getAnyVectorCoercion(lt)
       (_, TVector(sizeR, eR)) <- CoercionUtils.getAnyVectorCoercion(rt)
-    } yield if(sizeL!=sizeR) ??? else isIntOp(eL, eR))
-    .getOrElse(false)
+    } yield
+      if (sizeL != sizeR)
+        ???
+      else
+        isIntOp(eL, eR)).getOrElse(false)
   }
 
   def getVectorType[G](lt: Type[G], rt: Type[G], o: Origin): TVector[G] = {
-    (for{
+    (for {
       (_, TVector(sizeL, eL)) <- CoercionUtils.getAnyVectorCoercion(lt)
       (_, TVector(sizeR, eR)) <- CoercionUtils.getAnyVectorCoercion(rt)
-    } yield if(sizeL!=sizeR) ??? else TVector[G](sizeL, getNumericType(eL, eR, o)))
-      .get
+    } yield
+      if (sizeL != sizeR)
+        ???
+      else
+        TVector[G](sizeL, getNumericType(eL, eR, o))).get
   }
 
-  def getIntType[G](lt: Type[G], rt: Type[G]): IntType[G] = if(isCIntOp(lt, rt)) TCInt() else TInt()
+  def getIntType[G](lt: Type[G], rt: Type[G]): IntType[G] =
+    if (isCIntOp(lt, rt))
+      TCInt()
+    else
+      TInt()
 
-  case class NumericBinError(lt: Type[_], rt: Type[_], o: Origin) extends VerificationError.UserError {
-    override def text: String = o.messageInContext(f"Expected types to numeric, but got: ${lt} and ${rt}")
+  case class NumericBinError(lt: Type[_], rt: Type[_], o: Origin)
+      extends VerificationError.UserError {
+    override def text: String =
+      o.messageInContext(f"Expected types to numeric, but got: ${lt} and ${rt}")
     override def code: String = "numericBinError"
   }
 
   def getNumericType[G](lt: Type[G], rt: Type[G], o: Origin): Type[G] = {
-    if (isCIntOp(lt, rt)) TCInt[G]() else
-      if(isIntOp(lt, rt)) TInt[G]() else
-        getFloatMax[G](lt, rt) getOrElse (
-          if(isRationalOp(lt, rt)) TRational[G]()
-          else throw NumericBinError(lt, rt, o)
-          )
+    if (isCIntOp(lt, rt))
+      TCInt[G]()
+    else if (isIntOp(lt, rt))
+      TInt[G]()
+    else
+      getFloatMax[G](lt, rt) getOrElse
+        (if (isRationalOp(lt, rt))
+           TRational[G]()
+         else
+           throw NumericBinError(lt, rt, o))
   }
 }
 
-trait BinExprImpl[G] { this: BinExpr[G] =>
+trait BinExprImpl[G] {
+  this: BinExpr[G] =>
   def left: Expr[G]
   def right: Expr[G]
 
@@ -90,7 +128,9 @@ trait BinExprImpl[G] { this: BinExpr[G] =>
 
   lazy val getIntType: IntType[G] = BinOperatorTypes.getIntType(left.t, right.t)
 
-  lazy val getNumericType: Type[G] = BinOperatorTypes.getNumericType(left.t, right.t, o)
+  lazy val getNumericType: Type[G] = BinOperatorTypes
+    .getNumericType(left.t, right.t, o)
 
-  lazy val getVectorType: TVector[G] = BinOperatorTypes.getVectorType(left.t, right.t, o)
-}
\ No newline at end of file
+  lazy val getVectorType: TVector[G] = BinOperatorTypes
+    .getVectorType(left.t, right.t, o)
+}
diff --git a/src/col/vct/col/ast/expr/op/UnExprImpl.scala b/src/col/vct/col/ast/expr/op/UnExprImpl.scala
index d96b4be8d1..714117a101 100644
--- a/src/col/vct/col/ast/expr/op/UnExprImpl.scala
+++ b/src/col/vct/col/ast/expr/op/UnExprImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.expr.op
 
 import vct.col.ast.{Expr, UnExpr}
 
-trait UnExprImpl[G] { this: UnExpr[G] =>
+trait UnExprImpl[G] {
+  this: UnExpr[G] =>
   def arg: Expr[G]
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bit/BitAndImpl.scala b/src/col/vct/col/ast/expr/op/bit/BitAndImpl.scala
index 0b23689e17..c90584c2d7 100644
--- a/src/col/vct/col/ast/expr/op/bit/BitAndImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bit/BitAndImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{BitAnd, TInt, Type}
 import vct.col.print._
 import vct.col.ast.ops.BitAndOps
 
-trait BitAndImpl[G] extends BitAndOps[G] { this: BitAnd[G] =>
+trait BitAndImpl[G] extends BitAndOps[G] {
+  this: BitAnd[G] =>
   override def t: Type[G] = getIntType
 
   override def precedence: Int = Precedence.BIT_AND
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "&", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bit/BitNotImpl.scala b/src/col/vct/col/ast/expr/op/bit/BitNotImpl.scala
index b6b5157cc1..82393b9126 100644
--- a/src/col/vct/col/ast/expr/op/bit/BitNotImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bit/BitNotImpl.scala
@@ -5,9 +5,14 @@ import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.typerules.CoercionUtils
 import vct.col.ast.ops.BitNotOps
 
-trait BitNotImpl[G] extends BitNotOps[G] { this: BitNot[G] =>
-  override def t: Type[G] = if(CoercionUtils.getCoercion(arg.t, TCInt()).isDefined) TCInt() else TInt()
+trait BitNotImpl[G] extends BitNotOps[G] {
+  this: BitNot[G] =>
+  override def t: Type[G] =
+    if (CoercionUtils.getCoercion(arg.t, TCInt()).isDefined)
+      TCInt()
+    else
+      TInt()
 
   override def precedence: Int = Precedence.PREFIX
   override def layout(implicit ctx: Ctx): Doc = Text("~") <> assoc(arg)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bit/BitOpImpl.scala b/src/col/vct/col/ast/expr/op/bit/BitOpImpl.scala
index cde456befa..d5d4aa9d62 100644
--- a/src/col/vct/col/ast/expr/op/bit/BitOpImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bit/BitOpImpl.scala
@@ -3,6 +3,13 @@ package vct.col.ast.expr.op.bit
 import vct.col.ast.{BitOp, TBool, TCInt, TInt, Type}
 import vct.col.typerules.CoercionUtils
 
-trait BitOpImpl[G] { this: BitOp[G] =>
-  override def t: Type[G] = if(isBoolOp) TBool() else if(isCIntOp) TCInt() else TInt()
-}
\ No newline at end of file
+trait BitOpImpl[G] {
+  this: BitOp[G] =>
+  override def t: Type[G] =
+    if (isBoolOp)
+      TBool()
+    else if (isCIntOp)
+      TCInt()
+    else
+      TInt()
+}
diff --git a/src/col/vct/col/ast/expr/op/bit/BitOrImpl.scala b/src/col/vct/col/ast/expr/op/bit/BitOrImpl.scala
index 5cb3d33e7d..78e85a1846 100644
--- a/src/col/vct/col/ast/expr/op/bit/BitOrImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bit/BitOrImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{BitOr, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.BitOrOps
 
-trait BitOrImpl[G] extends BitOrOps[G] { this: BitOr[G] =>
+trait BitOrImpl[G] extends BitOrOps[G] {
+  this: BitOr[G] =>
   override def t: Type[G] = getIntType
 
   override def precedence: Int = Precedence.BIT_OR
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "|", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bit/BitShlImpl.scala b/src/col/vct/col/ast/expr/op/bit/BitShlImpl.scala
index fadb4aa13f..d71d4e2605 100644
--- a/src/col/vct/col/ast/expr/op/bit/BitShlImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bit/BitShlImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{BitShl, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.BitShlOps
 
-trait BitShlImpl[G] extends BitShlOps[G] { this: BitShl[G] =>
+trait BitShlImpl[G] extends BitShlOps[G] {
+  this: BitShl[G] =>
   override def t: Type[G] = getIntType
 
   override def precedence: Int = Precedence.SHIFT
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "<<", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bit/BitShrImpl.scala b/src/col/vct/col/ast/expr/op/bit/BitShrImpl.scala
index 19568c7c14..862a6f2d36 100644
--- a/src/col/vct/col/ast/expr/op/bit/BitShrImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bit/BitShrImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{BitShr, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.BitShrOps
 
-trait BitShrImpl[G] extends BitShrOps[G] { this: BitShr[G] =>
+trait BitShrImpl[G] extends BitShrOps[G] {
+  this: BitShr[G] =>
   override def t: Type[G] = getIntType
 
   override def precedence: Int = Precedence.SHIFT
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, ">>", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bit/BitUShrImpl.scala b/src/col/vct/col/ast/expr/op/bit/BitUShrImpl.scala
index eb5479f80b..8d99e3f208 100644
--- a/src/col/vct/col/ast/expr/op/bit/BitUShrImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bit/BitUShrImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{BitUShr, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.BitUShrOps
 
-trait BitUShrImpl[G] extends BitUShrOps[G] { this: BitUShr[G] =>
+trait BitUShrImpl[G] extends BitUShrOps[G] {
+  this: BitUShr[G] =>
   override def t: Type[G] = getIntType
 
   override def precedence: Int = Precedence.SHIFT
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, ">>>", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bit/BitXorImpl.scala b/src/col/vct/col/ast/expr/op/bit/BitXorImpl.scala
index 97c5808712..2eb5d362fa 100644
--- a/src/col/vct/col/ast/expr/op/bit/BitXorImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bit/BitXorImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{BitXor, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.BitXorOps
 
-trait BitXorImpl[G] extends BitXorOps[G] { this: BitXor[G] =>
+trait BitXorImpl[G] extends BitXorOps[G] {
+  this: BitXor[G] =>
   override def t: Type[G] = getIntType
 
   override def precedence: Int = Precedence.BIT_XOR
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "^", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bool/AndImpl.scala b/src/col/vct/col/ast/expr/op/bool/AndImpl.scala
index 9fe494ec82..ed8dbd804b 100644
--- a/src/col/vct/col/ast/expr/op/bool/AndImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bool/AndImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{And, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.AndOps
 
-trait AndImpl[G] extends AndOps[G] { this: And[G] =>
+trait AndImpl[G] extends AndOps[G] {
+  this: And[G] =>
   override def t: Type[G] = TBool()
 
-  override def precedence: Int = Precedence.AND-5
+  override def precedence: Int = Precedence.AND - 5
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "&&", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bool/ComputationalAndImpl.scala b/src/col/vct/col/ast/expr/op/bool/ComputationalAndImpl.scala
index 14b0f078d8..2209ee5d35 100644
--- a/src/col/vct/col/ast/expr/op/bool/ComputationalAndImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bool/ComputationalAndImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{ComputationalAnd, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.ComputationalAndOps
 
-trait ComputationalAndImpl[G] extends ComputationalAndOps[G] { this: ComputationalAnd[G] =>
+trait ComputationalAndImpl[G] extends ComputationalAndOps[G] {
+  this: ComputationalAnd[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.BIT_AND
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "&", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bool/ComputationalOrImpl.scala b/src/col/vct/col/ast/expr/op/bool/ComputationalOrImpl.scala
index bcb07e1574..8afe79143c 100644
--- a/src/col/vct/col/ast/expr/op/bool/ComputationalOrImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bool/ComputationalOrImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{ComputationalOr, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.ComputationalOrOps
 
-trait ComputationalOrImpl[G] extends ComputationalOrOps[G] { this: ComputationalOr[G] =>
+trait ComputationalOrImpl[G] extends ComputationalOrOps[G] {
+  this: ComputationalOr[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.BIT_OR
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "|", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bool/ComputationalXorImpl.scala b/src/col/vct/col/ast/expr/op/bool/ComputationalXorImpl.scala
index 26631605a5..37ccace6d1 100644
--- a/src/col/vct/col/ast/expr/op/bool/ComputationalXorImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bool/ComputationalXorImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{ComputationalXor, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.ComputationalXorOps
 
-trait ComputationalXorImpl[G] extends ComputationalXorOps[G] { this: ComputationalXor[G] =>
+trait ComputationalXorImpl[G] extends ComputationalXorOps[G] {
+  this: ComputationalXor[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.BIT_XOR
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "^", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bool/NotImpl.scala b/src/col/vct/col/ast/expr/op/bool/NotImpl.scala
index 91ef57761a..0fe0c9ea7d 100644
--- a/src/col/vct/col/ast/expr/op/bool/NotImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bool/NotImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Not, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.NotOps
 
-trait NotImpl[G] extends NotOps[G] { this: Not[G] =>
+trait NotImpl[G] extends NotOps[G] {
+  this: Not[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.PREFIX
   override def layout(implicit ctx: Ctx): Doc = Text("!") <> assoc(arg)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bool/OrImpl.scala b/src/col/vct/col/ast/expr/op/bool/OrImpl.scala
index 9d205e16ae..31d57df1bf 100644
--- a/src/col/vct/col/ast/expr/op/bool/OrImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bool/OrImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Or, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.OrOps
 
-trait OrImpl[G] extends OrOps[G] { this: Or[G] =>
+trait OrImpl[G] extends OrOps[G] {
+  this: Or[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.OR
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "||", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/bool/SelectImpl.scala b/src/col/vct/col/ast/expr/op/bool/SelectImpl.scala
index 5873e75129..c296f7d5ca 100644
--- a/src/col/vct/col/ast/expr/op/bool/SelectImpl.scala
+++ b/src/col/vct/col/ast/expr/op/bool/SelectImpl.scala
@@ -5,11 +5,14 @@ import vct.col.print.{Ctx, Doc, Precedence, Text, Group}
 import vct.col.typerules.Types
 import vct.col.ast.ops.SelectOps
 
-trait SelectImpl[G] extends SelectOps[G] { this: Select[G] =>
-  override lazy val t: Type[G] =
-    Types.leastCommonSuperType(whenTrue.t, whenFalse.t)
+trait SelectImpl[G] extends SelectOps[G] {
+  this: Select[G] =>
+  override lazy val t: Type[G] = Types
+    .leastCommonSuperType(whenTrue.t, whenFalse.t)
 
   override def precedence: Int = Precedence.SELECT
   override def layout(implicit ctx: Ctx): Doc =
-    Group(nassoc(condition) <>> {Text("?") <+> nassoc(whenTrue)} <>> {Text(":") <+> assoc(whenFalse)})
-}
\ No newline at end of file
+    Group(nassoc(condition) <>> { Text("?") <+> nassoc(whenTrue) } <>> {
+      Text(":") <+> assoc(whenFalse)
+    })
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/AmbiguousComparisonImpl.scala b/src/col/vct/col/ast/expr/op/cmp/AmbiguousComparisonImpl.scala
index 917a601cf7..eeb247d8f1 100644
--- a/src/col/vct/col/ast/expr/op/cmp/AmbiguousComparisonImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/AmbiguousComparisonImpl.scala
@@ -2,10 +2,15 @@ package vct.col.ast.expr.op.cmp
 
 import vct.col.ast.{AmbiguousComparison, TBool, TVector, Type}
 
-trait AmbiguousComparisonImpl[G] { this: AmbiguousComparison[G] =>
+trait AmbiguousComparisonImpl[G] {
+  this: AmbiguousComparison[G] =>
   // So this is hacky, but in C languages the type of a vector comparison is vector<Int>, and here we need to make difference
   // Between CInt and Int because of the internal VerCors type checker.
   def vectorInnerType: Type[G]
 
-  override def t: Type[G] = if(isVectorOp) TVector[G](getVectorType.size, vectorInnerType) else TBool()
+  override def t: Type[G] =
+    if (isVectorOp)
+      TVector[G](getVectorType.size, vectorInnerType)
+    else
+      TBool()
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/AmbiguousEqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/AmbiguousEqImpl.scala
index 3e07ade35d..d5fcb9d711 100644
--- a/src/col/vct/col/ast/expr/op/cmp/AmbiguousEqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/AmbiguousEqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousEq
 import vct.col.ast.ops.AmbiguousEqOps
 import vct.col.print._
 
-trait AmbiguousEqImpl[G] extends AmbiguousEqOps[G] { this: AmbiguousEq[G] =>
+trait AmbiguousEqImpl[G] extends AmbiguousEqOps[G] {
+  this: AmbiguousEq[G] =>
   override def precedence: Int = Precedence.EQUALITY
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "==", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/AmbiguousGreaterEqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/AmbiguousGreaterEqImpl.scala
index cfc9c62776..cdfa0fedce 100644
--- a/src/col/vct/col/ast/expr/op/cmp/AmbiguousGreaterEqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/AmbiguousGreaterEqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousGreaterEq
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.AmbiguousGreaterEqOps
 
-trait AmbiguousGreaterEqImpl[G] extends AmbiguousGreaterEqOps[G] { this: AmbiguousGreaterEq[G] =>
+trait AmbiguousGreaterEqImpl[G] extends AmbiguousGreaterEqOps[G] {
+  this: AmbiguousGreaterEq[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, ">=", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/AmbiguousGreaterImpl.scala b/src/col/vct/col/ast/expr/op/cmp/AmbiguousGreaterImpl.scala
index 8902be4606..a2a9d9727c 100644
--- a/src/col/vct/col/ast/expr/op/cmp/AmbiguousGreaterImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/AmbiguousGreaterImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousGreater
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.AmbiguousGreaterOps
 
-trait AmbiguousGreaterImpl[G] extends AmbiguousGreaterOps[G] { this: AmbiguousGreater[G] =>
+trait AmbiguousGreaterImpl[G] extends AmbiguousGreaterOps[G] {
+  this: AmbiguousGreater[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, ">", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/AmbiguousLessEqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/AmbiguousLessEqImpl.scala
index 8aaf7cbfb5..64b24eec75 100644
--- a/src/col/vct/col/ast/expr/op/cmp/AmbiguousLessEqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/AmbiguousLessEqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousLessEq
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.AmbiguousLessEqOps
 
-trait AmbiguousLessEqImpl[G] extends AmbiguousLessEqOps[G] { this: AmbiguousLessEq[G] =>
+trait AmbiguousLessEqImpl[G] extends AmbiguousLessEqOps[G] {
+  this: AmbiguousLessEq[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "<=", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/AmbiguousLessImpl.scala b/src/col/vct/col/ast/expr/op/cmp/AmbiguousLessImpl.scala
index 2360b8d23a..36df88f02a 100644
--- a/src/col/vct/col/ast/expr/op/cmp/AmbiguousLessImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/AmbiguousLessImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousLess
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.AmbiguousLessOps
 
-trait AmbiguousLessImpl[G] extends AmbiguousLessOps[G] { this: AmbiguousLess[G] =>
+trait AmbiguousLessImpl[G] extends AmbiguousLessOps[G] {
+  this: AmbiguousLess[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "<", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/AmbiguousNeqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/AmbiguousNeqImpl.scala
index d6094dfc8b..556e127635 100644
--- a/src/col/vct/col/ast/expr/op/cmp/AmbiguousNeqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/AmbiguousNeqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousNeq
 import vct.col.ast.ops.AmbiguousNeqOps
 import vct.col.print._
 
-trait AmbiguousNeqImpl[G] extends AmbiguousNeqOps[G] { this: AmbiguousNeq[G] =>
+trait AmbiguousNeqImpl[G] extends AmbiguousNeqOps[G] {
+  this: AmbiguousNeq[G] =>
   override def precedence: Int = Precedence.EQUALITY
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "!=", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/AmbiguousOrderOpImpl.scala b/src/col/vct/col/ast/expr/op/cmp/AmbiguousOrderOpImpl.scala
index b13b8a1187..c929f5184c 100644
--- a/src/col/vct/col/ast/expr/op/cmp/AmbiguousOrderOpImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/AmbiguousOrderOpImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.expr.op.cmp
 
 import vct.col.ast.AmbiguousOrderOp
 
-trait AmbiguousOrderOpImpl[G] { this: AmbiguousOrderOp[G] =>
+trait AmbiguousOrderOpImpl[G] {
+  this: AmbiguousOrderOp[G] =>
 
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/ComparisonImpl.scala b/src/col/vct/col/ast/expr/op/cmp/ComparisonImpl.scala
index 5c0ba169fc..021ceb4587 100644
--- a/src/col/vct/col/ast/expr/op/cmp/ComparisonImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/ComparisonImpl.scala
@@ -3,7 +3,8 @@ package vct.col.ast.expr.op.cmp
 import vct.col.ast.{Comparison, TBool, Type}
 import vct.col.typerules.Types
 
-trait ComparisonImpl[G] { this: Comparison[G] =>
+trait ComparisonImpl[G] {
+  this: Comparison[G] =>
   override def t: Type[G] = TBool()
   lazy val comparisonType: Type[G] = Types.leastCommonSuperType(left.t, right.t)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/EqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/EqImpl.scala
index 2198fa8891..cf58cb8771 100644
--- a/src/col/vct/col/ast/expr/op/cmp/EqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/EqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.Eq
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.EqOps
 
-trait EqImpl[G] extends EqOps[G] { this: Eq[G] =>
+trait EqImpl[G] extends EqOps[G] {
+  this: Eq[G] =>
   override def precedence: Int = Precedence.EQUALITY
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "==", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/GreaterEqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/GreaterEqImpl.scala
index c081aae382..9c2acff3a8 100644
--- a/src/col/vct/col/ast/expr/op/cmp/GreaterEqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/GreaterEqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.GreaterEq
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.GreaterEqOps
 
-trait GreaterEqImpl[G] extends GreaterEqOps[G] { this: GreaterEq[G] =>
+trait GreaterEqImpl[G] extends GreaterEqOps[G] {
+  this: GreaterEq[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, ">=", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/GreaterImpl.scala b/src/col/vct/col/ast/expr/op/cmp/GreaterImpl.scala
index 29ab741c15..9ecb9702c6 100644
--- a/src/col/vct/col/ast/expr/op/cmp/GreaterImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/GreaterImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.Greater
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.GreaterOps
 
-trait GreaterImpl[G] extends GreaterOps[G] { this: Greater[G] =>
+trait GreaterImpl[G] extends GreaterOps[G] {
+  this: Greater[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, ">", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/LessEqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/LessEqImpl.scala
index 8f69abdca5..127dcf5d6f 100644
--- a/src/col/vct/col/ast/expr/op/cmp/LessEqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/LessEqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.LessEq
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.LessEqOps
 
-trait LessEqImpl[G] extends LessEqOps[G] { this: LessEq[G] =>
+trait LessEqImpl[G] extends LessEqOps[G] {
+  this: LessEq[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "<=", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/LessImpl.scala b/src/col/vct/col/ast/expr/op/cmp/LessImpl.scala
index 8681117b98..c52f6fa84c 100644
--- a/src/col/vct/col/ast/expr/op/cmp/LessImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/LessImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.Less
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.LessOps
 
-trait LessImpl[G] extends LessOps[G] { this: Less[G] =>
+trait LessImpl[G] extends LessOps[G] {
+  this: Less[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "<", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/MapCmpImpl.scala b/src/col/vct/col/ast/expr/op/cmp/MapCmpImpl.scala
index ed7e3a65b0..522b5b839e 100644
--- a/src/col/vct/col/ast/expr/op/cmp/MapCmpImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/MapCmpImpl.scala
@@ -3,12 +3,16 @@ package vct.col.ast.expr.op.cmp
 import vct.col.ast.{Expr, MapCmp, TMap}
 import vct.col.typerules.Types
 
-trait MapCmpImpl[G] { this: MapCmp[G] =>
+trait MapCmpImpl[G] {
+  this: MapCmp[G] =>
   def left: Expr[G]
   def right: Expr[G]
 
   def leftT: TMap[G] = left.t.asMap.get
   def rightT: TMap[G] = right.t.asMap.get
 
-  lazy val commonMapType: TMap[G] = TMap(leftT.key, Types.leastCommonSuperType(leftT.value, rightT.value))
+  lazy val commonMapType: TMap[G] = TMap(
+    leftT.key,
+    Types.leastCommonSuperType(leftT.value, rightT.value),
+  )
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/MapDisjointImpl.scala b/src/col/vct/col/ast/expr/op/cmp/MapDisjointImpl.scala
index a9decb24f7..b08c33898e 100644
--- a/src/col/vct/col/ast/expr/op/cmp/MapDisjointImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/MapDisjointImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{MapDisjoint, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Group}
 import vct.col.ast.ops.MapDisjointOps
 
-trait MapDisjointImpl[G] extends MapDisjointOps[G] { this: MapDisjoint[G] =>
+trait MapDisjointImpl[G] extends MapDisjointOps[G] {
+  this: MapDisjoint[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.POSTFIX
diff --git a/src/col/vct/col/ast/expr/op/cmp/MapEqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/MapEqImpl.scala
index bd4670654d..a60d4b6297 100644
--- a/src/col/vct/col/ast/expr/op/cmp/MapEqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/MapEqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{MapEq, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Group}
 import vct.col.ast.ops.MapEqOps
 
-trait MapEqImpl[G] extends MapEqOps[G] { this: MapEq[G] =>
+trait MapEqImpl[G] extends MapEqOps[G] {
+  this: MapEq[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.POSTFIX
diff --git a/src/col/vct/col/ast/expr/op/cmp/NeqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/NeqImpl.scala
index 8eab1e72bd..fd295ed678 100644
--- a/src/col/vct/col/ast/expr/op/cmp/NeqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/NeqImpl.scala
@@ -4,8 +4,9 @@ import vct.col.ast.Neq
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.NeqOps
 
-trait NeqImpl[G] extends NeqOps[G] { this: Neq[G] =>
+trait NeqImpl[G] extends NeqOps[G] {
+  this: Neq[G] =>
   override def precedence: Int = Precedence.EQUALITY
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "!=", right)
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/OrderOpImpl.scala b/src/col/vct/col/ast/expr/op/cmp/OrderOpImpl.scala
index 5f08338a5a..ba9d8f0d7c 100644
--- a/src/col/vct/col/ast/expr/op/cmp/OrderOpImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/OrderOpImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.op.cmp
 import vct.col.ast.{OrderOp, TInt}
 import vct.col.typerules.CoercionUtils
 
-trait OrderOpImpl[G] { this: OrderOp[G] =>
+trait OrderOpImpl[G] {
+  this: OrderOp[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/SetComparisonImpl.scala b/src/col/vct/col/ast/expr/op/cmp/SetComparisonImpl.scala
index d7568645be..1130346a6b 100644
--- a/src/col/vct/col/ast/expr/op/cmp/SetComparisonImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/SetComparisonImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.expr.op.cmp
 
 import vct.col.ast.SetComparison
 
-trait SetComparisonImpl[G] { this: SetComparison[G] =>
+trait SetComparisonImpl[G] {
+  this: SetComparison[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/SubBagEqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/SubBagEqImpl.scala
index f862cc59aa..6f3bac4ddb 100644
--- a/src/col/vct/col/ast/expr/op/cmp/SubBagEqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/SubBagEqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.SubBagEq
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.SubBagEqOps
 
-trait SubBagEqImpl[G] extends SubBagEqOps[G] { this: SubBagEq[G] =>
+trait SubBagEqImpl[G] extends SubBagEqOps[G] {
+  this: SubBagEq[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "<=", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/SubBagImpl.scala b/src/col/vct/col/ast/expr/op/cmp/SubBagImpl.scala
index 47168742a8..947c7c8b5b 100644
--- a/src/col/vct/col/ast/expr/op/cmp/SubBagImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/SubBagImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.SubBag
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.SubBagOps
 
-trait SubBagImpl[G] extends SubBagOps[G] { this: SubBag[G] =>
+trait SubBagImpl[G] extends SubBagOps[G] {
+  this: SubBag[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "<", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/cmp/SubSetEqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/SubSetEqImpl.scala
index e7522e0d23..783d97511a 100644
--- a/src/col/vct/col/ast/expr/op/cmp/SubSetEqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/SubSetEqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.SubSetEq
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.SubSetEqOps
 
-trait SubSetEqImpl[G] extends SubSetEqOps[G] { this: SubSetEq[G] =>
+trait SubSetEqImpl[G] extends SubSetEqOps[G] {
+  this: SubSetEq[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "<=", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/SubSetImpl.scala b/src/col/vct/col/ast/expr/op/cmp/SubSetImpl.scala
index 6592b4c7eb..d136acb275 100644
--- a/src/col/vct/col/ast/expr/op/cmp/SubSetImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/SubSetImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.SubSet
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.SubSetOps
 
-trait SubSetImpl[G] extends SubSetOps[G] { this: SubSet[G] =>
+trait SubSetImpl[G] extends SubSetOps[G] {
+  this: SubSet[G] =>
   override def precedence: Int = Precedence.RELATIONAL
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "<", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/cmp/VectorEqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/VectorEqImpl.scala
index 5ff8775477..5ceb82e116 100644
--- a/src/col/vct/col/ast/expr/op/cmp/VectorEqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/VectorEqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TInt, TVector, Type, VectorEq}
 import vct.col.ast.ops.VectorEqOps
 import vct.col.print._
 
-trait VectorEqImpl[G] extends VectorEqOps[G] { this: VectorEq[G] =>
+trait VectorEqImpl[G] extends VectorEqOps[G] {
+  this: VectorEq[G] =>
   override def t: Type[G] = TVector[G](getVectorType.size, TInt())
 
   override def precedence: Int = Precedence.EQUALITY
diff --git a/src/col/vct/col/ast/expr/op/cmp/VectorNeqImpl.scala b/src/col/vct/col/ast/expr/op/cmp/VectorNeqImpl.scala
index 887b1db200..1cb3dd2a65 100644
--- a/src/col/vct/col/ast/expr/op/cmp/VectorNeqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/cmp/VectorNeqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TInt, TVector, Type, VectorNeq}
 import vct.col.ast.ops.VectorNeqOps
 import vct.col.print._
 
-trait VectorNeqImpl[G] extends VectorNeqOps[G] { this: VectorNeq[G] =>
+trait VectorNeqImpl[G] extends VectorNeqOps[G] {
+  this: VectorNeq[G] =>
   override def t: Type[G] = TVector[G](getVectorType.size, TInt())
 
   override def precedence: Int = Precedence.EQUALITY
diff --git a/src/col/vct/col/ast/expr/op/collection/BagAddImpl.scala b/src/col/vct/col/ast/expr/op/collection/BagAddImpl.scala
index 0bb09379c2..8c3b6d7848 100644
--- a/src/col/vct/col/ast/expr/op/collection/BagAddImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/BagAddImpl.scala
@@ -5,10 +5,13 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.typerules.Types
 import vct.col.ast.ops.BagAddOps
 
-trait BagAddImpl[G] extends BagAddOps[G] { this: BagAdd[G] =>
+trait BagAddImpl[G] extends BagAddOps[G] {
+  this: BagAdd[G] =>
   def xsType: TBag[G] = xs.t.asBag.get
   def ysType: TBag[G] = ys.t.asBag.get
-  override lazy val t: TBag[G] = TBag(Types.leastCommonSuperType(xsType.element, ysType.element))
+  override lazy val t: TBag[G] = TBag(
+    Types.leastCommonSuperType(xsType.element, ysType.element)
+  )
 
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(xs, "+", ys)
diff --git a/src/col/vct/col/ast/expr/op/collection/BagLargestCommonImpl.scala b/src/col/vct/col/ast/expr/op/collection/BagLargestCommonImpl.scala
index ce31252e71..e8003d7405 100644
--- a/src/col/vct/col/ast/expr/op/collection/BagLargestCommonImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/BagLargestCommonImpl.scala
@@ -5,10 +5,13 @@ import vct.col.print._
 import vct.col.typerules.Types
 import vct.col.ast.ops.BagLargestCommonOps
 
-trait BagLargestCommonImpl[G] extends BagLargestCommonOps[G] { this: BagLargestCommon[G] =>
+trait BagLargestCommonImpl[G] extends BagLargestCommonOps[G] {
+  this: BagLargestCommon[G] =>
   def xsType: TBag[G] = xs.t.asBag.get
   def ysType: TBag[G] = ys.t.asBag.get
-  override lazy val t: TBag[G] = TBag(Types.leastCommonSuperType(xsType.element, ysType.element))
+  override lazy val t: TBag[G] = TBag(
+    Types.leastCommonSuperType(xsType.element, ysType.element)
+  )
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
diff --git a/src/col/vct/col/ast/expr/op/collection/BagMemberCountImpl.scala b/src/col/vct/col/ast/expr/op/collection/BagMemberCountImpl.scala
index 8d12c97d68..ac02b56fe6 100644
--- a/src/col/vct/col/ast/expr/op/collection/BagMemberCountImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/BagMemberCountImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{BagMemberCount, TInt, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence}
 import vct.col.ast.ops.BagMemberCountOps
 
-trait BagMemberCountImpl[G] extends BagMemberCountOps[G] { this: BagMemberCount[G] =>
+trait BagMemberCountImpl[G] extends BagMemberCountOps[G] {
+  this: BagMemberCount[G] =>
   override def t: Type[G] = TInt()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(assoc(xs) <> ".count(" <> Doc.arg(x) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/BagMinusImpl.scala b/src/col/vct/col/ast/expr/op/collection/BagMinusImpl.scala
index d876b28106..42e17505d5 100644
--- a/src/col/vct/col/ast/expr/op/collection/BagMinusImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/BagMinusImpl.scala
@@ -5,10 +5,13 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.typerules.Types
 import vct.col.ast.ops.BagMinusOps
 
-trait BagMinusImpl[G] extends BagMinusOps[G] { this: BagMinus[G] =>
+trait BagMinusImpl[G] extends BagMinusOps[G] {
+  this: BagMinus[G] =>
   def xsType: TBag[G] = xs.t.asBag.get
   def ysType: TBag[G] = ys.t.asBag.get
-  override lazy val t: TBag[G] = TBag(Types.leastCommonSuperType(xsType.element, ysType.element))
+  override lazy val t: TBag[G] = TBag(
+    Types.leastCommonSuperType(xsType.element, ysType.element)
+  )
 
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(xs, "-", ys)
diff --git a/src/col/vct/col/ast/expr/op/collection/ConcatImpl.scala b/src/col/vct/col/ast/expr/op/collection/ConcatImpl.scala
index b6336baede..73308857d6 100644
--- a/src/col/vct/col/ast/expr/op/collection/ConcatImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/ConcatImpl.scala
@@ -5,12 +5,15 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.typerules.Types
 import vct.col.ast.ops.ConcatOps
 
-trait ConcatImpl[G] extends ConcatOps[G] { this: Concat[G] =>
+trait ConcatImpl[G] extends ConcatOps[G] {
+  this: Concat[G] =>
   def leftType: TSeq[G] = xs.t.asSeq.get
   def rightType: TSeq[G] = ys.t.asSeq.get
 
-  override lazy val t: Type[G] = TSeq(Types.leastCommonSuperType(leftType.element, rightType.element))
+  override lazy val t: Type[G] = TSeq(
+    Types.leastCommonSuperType(leftType.element, rightType.element)
+  )
 
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(xs, "+", ys)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/ConsImpl.scala b/src/col/vct/col/ast/expr/op/collection/ConsImpl.scala
index 619ddceb98..c1a8afe17e 100644
--- a/src/col/vct/col/ast/expr/op/collection/ConsImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/ConsImpl.scala
@@ -5,11 +5,14 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.typerules.Types
 import vct.col.ast.ops.ConsOps
 
-trait ConsImpl[G] extends ConsOps[G] { this: Cons[G] =>
+trait ConsImpl[G] extends ConsOps[G] {
+  this: Cons[G] =>
   def tailType: TSeq[G] = xs.t.asSeq.get
 
-  override lazy val t: TSeq[G] = TSeq(Types.leastCommonSuperType(tailType.element, x.t))
+  override lazy val t: TSeq[G] = TSeq(
+    Types.leastCommonSuperType(tailType.element, x.t)
+  )
 
   override def precedence: Int = Precedence.SEQUENCE
   override def layout(implicit ctx: Ctx): Doc = rassoc(x, "::", xs)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/DropImpl.scala b/src/col/vct/col/ast/expr/op/collection/DropImpl.scala
index 27c5f6e1fc..0e3a005a97 100644
--- a/src/col/vct/col/ast/expr/op/collection/DropImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/DropImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{Drop, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.DropOps
 
-trait DropImpl[G] extends DropOps[G] { this: Drop[G] =>
+trait DropImpl[G] extends DropOps[G] {
+  this: Drop[G] =>
   override def t: Type[G] = xs.t
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = assoc(xs) <> "[" <> count <> "..]"
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    assoc(xs) <> "[" <> count <> "..]"
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/EmptyImpl.scala b/src/col/vct/col/ast/expr/op/collection/EmptyImpl.scala
index 6da225ba9d..57b930fdb4 100644
--- a/src/col/vct/col/ast/expr/op/collection/EmptyImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/EmptyImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Empty, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.EmptyOps
 
-trait EmptyImpl[G] extends EmptyOps[G] { this: Empty[G] =>
+trait EmptyImpl[G] extends EmptyOps[G] {
+  this: Empty[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(obj) <> ".isEmpty"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/HeadImpl.scala b/src/col/vct/col/ast/expr/op/collection/HeadImpl.scala
index 21e3fdabfd..088d3343fa 100644
--- a/src/col/vct/col/ast/expr/op/collection/HeadImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/HeadImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Head, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.HeadOps
 
-trait HeadImpl[G] extends HeadOps[G] { this: Head[G] =>
+trait HeadImpl[G] extends HeadOps[G] {
+  this: Head[G] =>
   override def t: Type[G] = xs.t.asSeq.get.element
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(xs) <> ".head"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/PermutationImpl.scala b/src/col/vct/col/ast/expr/op/collection/PermutationImpl.scala
index 4b301d0200..3688afee8a 100644
--- a/src/col/vct/col/ast/expr/op/collection/PermutationImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/PermutationImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.op.collection
 import vct.col.ast.{Permutation, TBool, Type}
 import vct.col.ast.ops.PermutationOps
 
-trait PermutationImpl[G] extends PermutationOps[G] { this: Permutation[G] =>
+trait PermutationImpl[G] extends PermutationOps[G] {
+  this: Permutation[G] =>
   override def t: Type[G] = TBool()
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/RemoveAtImpl.scala b/src/col/vct/col/ast/expr/op/collection/RemoveAtImpl.scala
index 58cf0c1334..5bae02b7ba 100644
--- a/src/col/vct/col/ast/expr/op/collection/RemoveAtImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/RemoveAtImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{RemoveAt, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Group}
 import vct.col.ast.ops.RemoveAtOps
 
-trait RemoveAtImpl[G] extends RemoveAtOps[G] { this: RemoveAt[G] =>
+trait RemoveAtImpl[G] extends RemoveAtOps[G] {
+  this: RemoveAt[G] =>
   override def t: Type[G] = xs.t
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = Group(assoc(xs) <> ".removeAt(" <> Doc.arg(i) <> ")")
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Group(assoc(xs) <> ".removeAt(" <> Doc.arg(i) <> ")")
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/SeqMemberImpl.scala b/src/col/vct/col/ast/expr/op/collection/SeqMemberImpl.scala
index 8aa8efcfdb..1953648748 100644
--- a/src/col/vct/col/ast/expr/op/collection/SeqMemberImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/SeqMemberImpl.scala
@@ -4,9 +4,18 @@ import vct.col.ast.{SeqMember, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.SeqMemberOps
 
-trait SeqMemberImpl[G] extends SeqMemberOps[G] { this: SeqMember[G] =>
+trait SeqMemberImpl[G] extends SeqMemberOps[G] {
+  this: SeqMember[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.RELATIONAL
-  override def layout(implicit ctx: Ctx): Doc = lassoc(x, if(ctx.syntax == Ctx.Silver) "in" else "\\in", xs)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    lassoc(
+      x,
+      if (ctx.syntax == Ctx.Silver)
+        "in"
+      else
+        "\\in",
+      xs,
+    )
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/SeqSubscriptImpl.scala b/src/col/vct/col/ast/expr/op/collection/SeqSubscriptImpl.scala
index f38c647765..8bb2917f82 100644
--- a/src/col/vct/col/ast/expr/op/collection/SeqSubscriptImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/SeqSubscriptImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{SeqSubscript, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Group}
 import vct.col.ast.ops.SeqSubscriptOps
 
-trait SeqSubscriptImpl[G] extends SeqSubscriptOps[G] { this: SeqSubscript[G] =>
+trait SeqSubscriptImpl[G] extends SeqSubscriptOps[G] {
+  this: SeqSubscript[G] =>
   override def t: Type[G] = seq.t.asSeq.get.element
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = Group(assoc(seq) <> "[" <> Doc.arg(index) <> "]")
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Group(assoc(seq) <> "[" <> Doc.arg(index) <> "]")
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/SeqUpdateImpl.scala b/src/col/vct/col/ast/expr/op/collection/SeqUpdateImpl.scala
index 0354028dad..7258b015c9 100644
--- a/src/col/vct/col/ast/expr/op/collection/SeqUpdateImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/SeqUpdateImpl.scala
@@ -5,12 +5,15 @@ import vct.col.print._
 import vct.col.typerules.Types
 import vct.col.ast.ops.SeqUpdateOps
 
-trait SeqUpdateImpl[G] extends SeqUpdateOps[G] { this: SeqUpdate[G] =>
+trait SeqUpdateImpl[G] extends SeqUpdateOps[G] {
+  this: SeqUpdate[G] =>
   def tailType: TSeq[G] = xs.t.asSeq.get
 
-  override lazy val t: TSeq[G] = TSeq(Types.leastCommonSuperType(tailType.element, x.t))
+  override lazy val t: TSeq[G] = TSeq(
+    Types.leastCommonSuperType(tailType.element, x.t)
+  )
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(assoc(xs) <> ".update(" <> Doc.args(Seq(i, x)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/SetIntersectionImpl.scala b/src/col/vct/col/ast/expr/op/collection/SetIntersectionImpl.scala
index ed5da86710..e381cc8ca6 100644
--- a/src/col/vct/col/ast/expr/op/collection/SetIntersectionImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/SetIntersectionImpl.scala
@@ -5,10 +5,13 @@ import vct.col.print.{Ctx, Doc, Group, Precedence}
 import vct.col.typerules.Types
 import vct.col.ast.ops.SetIntersectionOps
 
-trait SetIntersectionImpl[G] extends SetIntersectionOps[G] { this: SetIntersection[G] =>
+trait SetIntersectionImpl[G] extends SetIntersectionOps[G] {
+  this: SetIntersection[G] =>
   def xsType: TSet[G] = xs.t.asSet.get
   def ysType: TSet[G] = ys.t.asSet.get
-  override lazy val t: TSet[G] = TSet(Types.leastCommonSuperType(xsType.element, ysType.element))
+  override lazy val t: TSet[G] = TSet(
+    Types.leastCommonSuperType(xsType.element, ysType.element)
+  )
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
diff --git a/src/col/vct/col/ast/expr/op/collection/SetMemberImpl.scala b/src/col/vct/col/ast/expr/op/collection/SetMemberImpl.scala
index cc0a3972b2..1e39b006d0 100644
--- a/src/col/vct/col/ast/expr/op/collection/SetMemberImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/SetMemberImpl.scala
@@ -4,9 +4,18 @@ import vct.col.ast.{SetMember, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.SetMemberOps
 
-trait SetMemberImpl[G] extends SetMemberOps[G] { this: SetMember[G] =>
+trait SetMemberImpl[G] extends SetMemberOps[G] {
+  this: SetMember[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.RELATIONAL
-  override def layout(implicit ctx: Ctx): Doc = lassoc(x, if(ctx.syntax == Ctx.Silver) "in" else "\\in", xs)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    lassoc(
+      x,
+      if (ctx.syntax == Ctx.Silver)
+        "in"
+      else
+        "\\in",
+      xs,
+    )
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/SetMinusImpl.scala b/src/col/vct/col/ast/expr/op/collection/SetMinusImpl.scala
index 853b8b8246..6349523867 100644
--- a/src/col/vct/col/ast/expr/op/collection/SetMinusImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/SetMinusImpl.scala
@@ -5,10 +5,13 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.typerules.Types
 import vct.col.ast.ops.SetMinusOps
 
-trait SetMinusImpl[G] extends SetMinusOps[G] { this: SetMinus[G] =>
+trait SetMinusImpl[G] extends SetMinusOps[G] {
+  this: SetMinus[G] =>
   def xsType: TSet[G] = xs.t.asSet.get
   def ysType: TSet[G] = ys.t.asSet.get
-  override lazy val t: TSet[G] = TSet(Types.leastCommonSuperType(xsType.element, ysType.element))
+  override lazy val t: TSet[G] = TSet(
+    Types.leastCommonSuperType(xsType.element, ysType.element)
+  )
 
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(xs, "-", ys)
diff --git a/src/col/vct/col/ast/expr/op/collection/SetUnionImpl.scala b/src/col/vct/col/ast/expr/op/collection/SetUnionImpl.scala
index 8ff0cc404f..3c044a752e 100644
--- a/src/col/vct/col/ast/expr/op/collection/SetUnionImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/SetUnionImpl.scala
@@ -5,10 +5,13 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.typerules.Types
 import vct.col.ast.ops.SetUnionOps
 
-trait SetUnionImpl[G] extends SetUnionOps[G] { this: SetUnion[G] =>
+trait SetUnionImpl[G] extends SetUnionOps[G] {
+  this: SetUnion[G] =>
   def xsType: TSet[G] = xs.t.asSet.get
   def ysType: TSet[G] = ys.t.asSet.get
-  override lazy val t: TSet[G] = TSet(Types.leastCommonSuperType(xsType.element, ysType.element))
+  override lazy val t: TSet[G] = TSet(
+    Types.leastCommonSuperType(xsType.element, ysType.element)
+  )
 
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(xs, "+", ys)
diff --git a/src/col/vct/col/ast/expr/op/collection/SizeImpl.scala b/src/col/vct/col/ast/expr/op/collection/SizeImpl.scala
index fa472599e1..65ad15cd91 100644
--- a/src/col/vct/col/ast/expr/op/collection/SizeImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/SizeImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Size, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SizeOps
 
-trait SizeImpl[G] extends SizeOps[G] { this: Size[G] =>
+trait SizeImpl[G] extends SizeOps[G] {
+  this: Size[G] =>
   override def t: Type[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc = Text("|") <> obj <> "|"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/SliceImpl.scala b/src/col/vct/col/ast/expr/op/collection/SliceImpl.scala
index f33aa6b3f9..3a8844062f 100644
--- a/src/col/vct/col/ast/expr/op/collection/SliceImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/SliceImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{Slice, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.SliceOps
 
-trait SliceImpl[G] extends SliceOps[G] { this: Slice[G] =>
+trait SliceImpl[G] extends SliceOps[G] {
+  this: Slice[G] =>
   override def t: Type[G] = xs.t
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = assoc(xs) <> "[" <> from <> ".." <> to <> "]"
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    assoc(xs) <> "[" <> from <> ".." <> to <> "]"
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/StringConcatImpl.scala b/src/col/vct/col/ast/expr/op/collection/StringConcatImpl.scala
index 7fd00b6627..0795312801 100644
--- a/src/col/vct/col/ast/expr/op/collection/StringConcatImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/StringConcatImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{StringConcat, TString, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.StringConcatOps
 
-trait StringConcatImpl[G] extends StringConcatOps[G] { this: StringConcat[G] =>
+trait StringConcatImpl[G] extends StringConcatOps[G] {
+  this: StringConcat[G] =>
   override def t: Type[G] = TString()
 
   override def precedence: Int = Precedence.ADDITIVE
diff --git a/src/col/vct/col/ast/expr/op/collection/TailImpl.scala b/src/col/vct/col/ast/expr/op/collection/TailImpl.scala
index 82752c7969..f81d4f5578 100644
--- a/src/col/vct/col/ast/expr/op/collection/TailImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/TailImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Tail, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.TailOps
 
-trait TailImpl[G] extends TailOps[G] { this: Tail[G] =>
+trait TailImpl[G] extends TailOps[G] {
+  this: Tail[G] =>
   override def t: Type[G] = xs.t
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(xs) <> ".tail"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/TakeImpl.scala b/src/col/vct/col/ast/expr/op/collection/TakeImpl.scala
index a2fc78c78f..b8088b8b40 100644
--- a/src/col/vct/col/ast/expr/op/collection/TakeImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/TakeImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{Take, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.TakeOps
 
-trait TakeImpl[G] extends TakeOps[G] { this: Take[G] =>
+trait TakeImpl[G] extends TakeOps[G] {
+  this: Take[G] =>
   override def t: Type[G] = xs.t
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = assoc(xs) <> "[.." <> count <> "]"
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    assoc(xs) <> "[.." <> count <> "]"
+}
diff --git a/src/col/vct/col/ast/expr/op/collection/VectorSubscriptImpl.scala b/src/col/vct/col/ast/expr/op/collection/VectorSubscriptImpl.scala
index c63e387f4c..0bb03f9f91 100644
--- a/src/col/vct/col/ast/expr/op/collection/VectorSubscriptImpl.scala
+++ b/src/col/vct/col/ast/expr/op/collection/VectorSubscriptImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{VectorSubscript, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Group}
 import vct.col.ast.ops.VectorSubscriptOps
 
-trait VectorSubscriptImpl[G] extends VectorSubscriptOps[G] { this: VectorSubscript[G] =>
+trait VectorSubscriptImpl[G] extends VectorSubscriptOps[G] {
+  this: VectorSubscript[G] =>
   override def t: Type[G] = seq.t.asVector.get.element
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = Group(assoc(seq) <> "[" <> Doc.arg(index) <> "]")
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Group(assoc(seq) <> "[" <> Doc.arg(index) <> "]")
+}
diff --git a/src/col/vct/col/ast/expr/op/either/EitherOpImpl.scala b/src/col/vct/col/ast/expr/op/either/EitherOpImpl.scala
index a0f0b57e17..134bf71305 100644
--- a/src/col/vct/col/ast/expr/op/either/EitherOpImpl.scala
+++ b/src/col/vct/col/ast/expr/op/either/EitherOpImpl.scala
@@ -2,7 +2,8 @@ package vct.col.ast.expr.op.either
 
 import vct.col.ast.{EitherOp, Expr, TEither}
 
-trait EitherOpImpl[G] { this: EitherOp[G] =>
+trait EitherOpImpl[G] {
+  this: EitherOp[G] =>
   def either: Expr[G]
   def eitherType: TEither[G] = either.t.asEither.get
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/either/GetLeftImpl.scala b/src/col/vct/col/ast/expr/op/either/GetLeftImpl.scala
index e303dfc1f0..896093da57 100644
--- a/src/col/vct/col/ast/expr/op/either/GetLeftImpl.scala
+++ b/src/col/vct/col/ast/expr/op/either/GetLeftImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{GetLeft, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.GetLeftOps
 
-trait GetLeftImpl[G] extends GetLeftOps[G] { this: GetLeft[G] =>
+trait GetLeftImpl[G] extends GetLeftOps[G] {
+  this: GetLeft[G] =>
   override def t: Type[G] = eitherType.left
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(either) <> ".left"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/either/GetRightImpl.scala b/src/col/vct/col/ast/expr/op/either/GetRightImpl.scala
index f1c4baa678..2d3a1d2794 100644
--- a/src/col/vct/col/ast/expr/op/either/GetRightImpl.scala
+++ b/src/col/vct/col/ast/expr/op/either/GetRightImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{GetRight, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.GetRightOps
 
-trait GetRightImpl[G] extends GetRightOps[G] { this: GetRight[G] =>
+trait GetRightImpl[G] extends GetRightOps[G] {
+  this: GetRight[G] =>
   override def t: Type[G] = eitherType.right
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(either) <> ".right"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/either/IsLeftImpl.scala b/src/col/vct/col/ast/expr/op/either/IsLeftImpl.scala
index 088a51c4e3..0d129d0cf9 100644
--- a/src/col/vct/col/ast/expr/op/either/IsLeftImpl.scala
+++ b/src/col/vct/col/ast/expr/op/either/IsLeftImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{IsLeft, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.IsLeftOps
 
-trait IsLeftImpl[G] extends IsLeftOps[G] { this: IsLeft[G] =>
+trait IsLeftImpl[G] extends IsLeftOps[G] {
+  this: IsLeft[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(either) <> ".isLeft"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/either/IsRightImpl.scala b/src/col/vct/col/ast/expr/op/either/IsRightImpl.scala
index 6aff088eb1..9500b34684 100644
--- a/src/col/vct/col/ast/expr/op/either/IsRightImpl.scala
+++ b/src/col/vct/col/ast/expr/op/either/IsRightImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{IsRight, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.IsRightOps
 
-trait IsRightImpl[G] extends IsRightOps[G] { this: IsRight[G] =>
+trait IsRightImpl[G] extends IsRightOps[G] {
+  this: IsRight[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(either) <> ".isRight"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/map/MapConsImpl.scala b/src/col/vct/col/ast/expr/op/map/MapConsImpl.scala
index a63d291c4c..8a0150af79 100644
--- a/src/col/vct/col/ast/expr/op/map/MapConsImpl.scala
+++ b/src/col/vct/col/ast/expr/op/map/MapConsImpl.scala
@@ -4,11 +4,12 @@ import vct.col.ast.{MapCons, TMap, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence}
 import vct.col.ast.ops.MapConsOps
 
-trait MapConsImpl[G] extends MapConsOps[G] { this: MapCons[G] =>
+trait MapConsImpl[G] extends MapConsOps[G] {
+  this: MapCons[G] =>
   override def t: TMap[G] = tailType
   def tailType: TMap[G] = map.t.asMap.get
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(assoc(map) <> ".add(" <> Doc.args(Seq(k, v)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/map/MapGetImpl.scala b/src/col/vct/col/ast/expr/op/map/MapGetImpl.scala
index d3ed230aa5..8c92d32959 100644
--- a/src/col/vct/col/ast/expr/op/map/MapGetImpl.scala
+++ b/src/col/vct/col/ast/expr/op/map/MapGetImpl.scala
@@ -4,10 +4,12 @@ import vct.col.ast.{MapGet, TMap, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence}
 import vct.col.ast.ops.MapGetOps
 
-trait MapGetImpl[G] extends MapGetOps[G] { this: MapGet[G] =>
+trait MapGetImpl[G] extends MapGetOps[G] {
+  this: MapGet[G] =>
   def mapType: TMap[G] = map.t.asMap.get
   override def t: Type[G] = mapType.value
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = Group(assoc(map) <> "[" <> Doc.arg(k) <> "]")
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Group(assoc(map) <> "[" <> Doc.arg(k) <> "]")
+}
diff --git a/src/col/vct/col/ast/expr/op/map/MapItemSetImpl.scala b/src/col/vct/col/ast/expr/op/map/MapItemSetImpl.scala
index 757356f5ba..cf4e434486 100644
--- a/src/col/vct/col/ast/expr/op/map/MapItemSetImpl.scala
+++ b/src/col/vct/col/ast/expr/op/map/MapItemSetImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{MapItemSet, TSet, TTuple, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.MapItemSetOps
 
-trait MapItemSetImpl[G] extends MapItemSetOps[G] { this: MapItemSet[G] =>
+trait MapItemSetImpl[G] extends MapItemSetOps[G] {
+  this: MapItemSet[G] =>
   override def t: Type[G] = TSet(TTuple(Seq(mapType.key, mapType.value)))
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(map) <> ".items"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/map/MapKeySetImpl.scala b/src/col/vct/col/ast/expr/op/map/MapKeySetImpl.scala
index 4b296e1171..78a3e78b45 100644
--- a/src/col/vct/col/ast/expr/op/map/MapKeySetImpl.scala
+++ b/src/col/vct/col/ast/expr/op/map/MapKeySetImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{MapKeySet, TSet, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.MapKeySetOps
 
-trait MapKeySetImpl[G] extends MapKeySetOps[G] { this: MapKeySet[G] =>
+trait MapKeySetImpl[G] extends MapKeySetOps[G] {
+  this: MapKeySet[G] =>
   override def t: Type[G] = TSet(mapType.key)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(map) <> ".keys"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/map/MapMemberImpl.scala b/src/col/vct/col/ast/expr/op/map/MapMemberImpl.scala
index f499629328..02d256427b 100644
--- a/src/col/vct/col/ast/expr/op/map/MapMemberImpl.scala
+++ b/src/col/vct/col/ast/expr/op/map/MapMemberImpl.scala
@@ -4,9 +4,18 @@ import vct.col.ast.{MapMember, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.MapMemberOps
 
-trait MapMemberImpl[G] extends MapMemberOps[G] { this: MapMember[G] =>
+trait MapMemberImpl[G] extends MapMemberOps[G] {
+  this: MapMember[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.RELATIONAL
-  override def layout(implicit ctx: Ctx): Doc = lassoc(x, if(ctx.syntax == Ctx.Silver) "in" else "\\in", xs)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    lassoc(
+      x,
+      if (ctx.syntax == Ctx.Silver)
+        "in"
+      else
+        "\\in",
+      xs,
+    )
+}
diff --git a/src/col/vct/col/ast/expr/op/map/MapOpImpl.scala b/src/col/vct/col/ast/expr/op/map/MapOpImpl.scala
index 6d100edc32..f00a4a88aa 100644
--- a/src/col/vct/col/ast/expr/op/map/MapOpImpl.scala
+++ b/src/col/vct/col/ast/expr/op/map/MapOpImpl.scala
@@ -2,7 +2,8 @@ package vct.col.ast.expr.op.map
 
 import vct.col.ast.{Expr, MapOp, TMap}
 
-trait MapOpImpl[G] { this: MapOp[G] =>
+trait MapOpImpl[G] {
+  this: MapOp[G] =>
   def map: Expr[G]
   def mapType: TMap[G] = map.t.asMap.get
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/map/MapRemoveImpl.scala b/src/col/vct/col/ast/expr/op/map/MapRemoveImpl.scala
index 55c1f74462..3e7283afb1 100644
--- a/src/col/vct/col/ast/expr/op/map/MapRemoveImpl.scala
+++ b/src/col/vct/col/ast/expr/op/map/MapRemoveImpl.scala
@@ -4,11 +4,12 @@ import vct.col.ast.{MapRemove, TMap, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Group}
 import vct.col.ast.ops.MapRemoveOps
 
-trait MapRemoveImpl[G] extends MapRemoveOps[G] { this: MapRemove[G] =>
+trait MapRemoveImpl[G] extends MapRemoveOps[G] {
+  this: MapRemove[G] =>
   def mapType: TMap[G] = map.t.asMap.get
   override def t: Type[G] = mapType
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(assoc(map) <> ".remove(" <> Doc.arg(k) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/map/MapValueSetImpl.scala b/src/col/vct/col/ast/expr/op/map/MapValueSetImpl.scala
index e819b23e62..9f72b99344 100644
--- a/src/col/vct/col/ast/expr/op/map/MapValueSetImpl.scala
+++ b/src/col/vct/col/ast/expr/op/map/MapValueSetImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{MapValueSet, TSet, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.MapValueSetOps
 
-trait MapValueSetImpl[G] extends MapValueSetOps[G] { this: MapValueSet[G] =>
+trait MapValueSetImpl[G] extends MapValueSetOps[G] {
+  this: MapValueSet[G] =>
   override def t: Type[G] = TSet(mapType.value)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(map) <> ".values"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/AmbiguousDivImpl.scala b/src/col/vct/col/ast/expr/op/num/AmbiguousDivImpl.scala
index d0f1b1dc18..b4cdce748a 100644
--- a/src/col/vct/col/ast/expr/op/num/AmbiguousDivImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/AmbiguousDivImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousDiv
 import vct.col.ast.ops.AmbiguousDivOps
 import vct.col.print._
 
-trait AmbiguousDivImpl[G] extends AmbiguousDivOps[G] { this: AmbiguousDiv[G] =>
+trait AmbiguousDivImpl[G] extends AmbiguousDivOps[G] {
+  this: AmbiguousDiv[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "/", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/AmbiguousDividingExprImpl.scala b/src/col/vct/col/ast/expr/op/num/AmbiguousDividingExprImpl.scala
index 4e796221b5..f8b9ec60b5 100644
--- a/src/col/vct/col/ast/expr/op/num/AmbiguousDividingExprImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/AmbiguousDividingExprImpl.scala
@@ -4,8 +4,11 @@ import vct.col.ast.expr.op.BinOperatorTypes
 import vct.col.ast.{AmbiguousDividingExpr, Type}
 import vct.col.typerules.Types
 
-trait AmbiguousDividingExprImpl[G] { this: AmbiguousDividingExpr[G] =>
+trait AmbiguousDividingExprImpl[G] {
+  this: AmbiguousDividingExpr[G] =>
   def t: Type[G] =
-    if (isVectorOp) Types.leastCommonSuperType(left.t, right.t)
-    else BinOperatorTypes.getNumericType(left.t, right.t, o)
+    if (isVectorOp)
+      Types.leastCommonSuperType(left.t, right.t)
+    else
+      BinOperatorTypes.getNumericType(left.t, right.t, o)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/AmbiguousModImpl.scala b/src/col/vct/col/ast/expr/op/num/AmbiguousModImpl.scala
index 43e7a245a1..129b0f0f0a 100644
--- a/src/col/vct/col/ast/expr/op/num/AmbiguousModImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/AmbiguousModImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousMod
 import vct.col.ast.ops.AmbiguousModOps
 import vct.col.print._
 
-trait AmbiguousModImpl[G] extends AmbiguousModOps[G] { this: AmbiguousMod[G] =>
+trait AmbiguousModImpl[G] extends AmbiguousModOps[G] {
+  this: AmbiguousMod[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "%", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/AmbiguousTruncDivImpl.scala b/src/col/vct/col/ast/expr/op/num/AmbiguousTruncDivImpl.scala
index 4907216c39..a6de68454d 100644
--- a/src/col/vct/col/ast/expr/op/num/AmbiguousTruncDivImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/AmbiguousTruncDivImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousTruncDiv
 import vct.col.ast.ops.AmbiguousTruncDivOps
 import vct.col.print._
 
-trait AmbiguousTruncDivImpl[G] extends AmbiguousTruncDivOps[G] { this: AmbiguousTruncDiv[G] =>
+trait AmbiguousTruncDivImpl[G] extends AmbiguousTruncDivOps[G] {
+  this: AmbiguousTruncDiv[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "/", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/CastFloatImpl.scala b/src/col/vct/col/ast/expr/op/num/CastFloatImpl.scala
index d189b0efbb..129960653a 100644
--- a/src/col/vct/col/ast/expr/op/num/CastFloatImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/CastFloatImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{CastFloat}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.CastFloatOps
 
-trait CastFloatImpl[G] extends CastFloatOps[G] { this: CastFloat[G] =>
+trait CastFloatImpl[G] extends CastFloatOps[G] {
+  this: CastFloat[G] =>
   override def precedence: Int = Precedence.PREFIX
   override def layout(implicit ctx: Ctx): Doc =
     Text("(") <> t <> ")" <> assoc(e)
diff --git a/src/col/vct/col/ast/expr/op/num/DividingExprImpl.scala b/src/col/vct/col/ast/expr/op/num/DividingExprImpl.scala
index 4b0b63db83..2cb922de03 100644
--- a/src/col/vct/col/ast/expr/op/num/DividingExprImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/DividingExprImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.op.num
 import vct.col.ast.DividingExpr
 import vct.col.origin.{Blame, DivByZero}
 
-trait DividingExprImpl[G] { this: DividingExpr[G] =>
+trait DividingExprImpl[G] {
+  this: DividingExpr[G] =>
   def blame: Blame[DivByZero]
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/ExpImpl.scala b/src/col/vct/col/ast/expr/op/num/ExpImpl.scala
index e6be99b254..f1ba8816ba 100644
--- a/src/col/vct/col/ast/expr/op/num/ExpImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/ExpImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.Exp
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.ExpOps
 
-trait ExpImpl[G] extends ExpOps[G] { this: Exp[G] =>
+trait ExpImpl[G] extends ExpOps[G] {
+  this: Exp[G] =>
   override def precedence: Int = Precedence.PVL_POW
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "^^", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/FloatDivImpl.scala b/src/col/vct/col/ast/expr/op/num/FloatDivImpl.scala
index 17b3b8d292..d654189807 100644
--- a/src/col/vct/col/ast/expr/op/num/FloatDivImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/FloatDivImpl.scala
@@ -5,9 +5,10 @@ import vct.col.ast.{FloatDiv, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.FloatDivOps
 
-trait FloatDivImpl[G] extends FloatDivOps[G] { this: FloatDiv[G] =>
+trait FloatDivImpl[G] extends FloatDivOps[G] {
+  this: FloatDiv[G] =>
   override def t: Type[G] = TFloats.getFloatMax(left.t, right.t).get
 
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "/", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/FloorDivImpl.scala b/src/col/vct/col/ast/expr/op/num/FloorDivImpl.scala
index 31ccaddda1..f7366993af 100644
--- a/src/col/vct/col/ast/expr/op/num/FloorDivImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/FloorDivImpl.scala
@@ -4,8 +4,9 @@ import vct.col.ast.{FloorDiv, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.FloorDivOps
 
-trait FloorDivImpl[G] extends FloorDivOps[G] { this: FloorDiv[G] =>
+trait FloorDivImpl[G] extends FloorDivOps[G] {
+  this: FloorDiv[G] =>
   override def t: Type[G] = TInt()
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "/", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/MinusImpl.scala b/src/col/vct/col/ast/expr/op/num/MinusImpl.scala
index b302369d17..45673d7563 100644
--- a/src/col/vct/col/ast/expr/op/num/MinusImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/MinusImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.Minus
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.MinusOps
 
-trait MinusImpl[G] extends MinusOps[G] { this: Minus[G] =>
+trait MinusImpl[G] extends MinusOps[G] {
+  this: Minus[G] =>
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "-", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/ModImpl.scala b/src/col/vct/col/ast/expr/op/num/ModImpl.scala
index e195d8537c..37a1d773ac 100644
--- a/src/col/vct/col/ast/expr/op/num/ModImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/ModImpl.scala
@@ -4,8 +4,9 @@ import vct.col.ast.{Mod, TInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.ModOps
 
-trait ModImpl[G] extends ModOps[G] { this: Mod[G] =>
+trait ModImpl[G] extends ModOps[G] {
+  this: Mod[G] =>
   override def t: Type[G] = TInt()
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "%", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/MultImpl.scala b/src/col/vct/col/ast/expr/op/num/MultImpl.scala
index 283a60bdb2..2ef0088645 100644
--- a/src/col/vct/col/ast/expr/op/num/MultImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/MultImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.Mult
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.MultOps
 
-trait MultImpl[G] extends MultOps[G] { this: Mult[G] =>
+trait MultImpl[G] extends MultOps[G] {
+  this: Mult[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "*", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/NumericBinExprImpl.scala b/src/col/vct/col/ast/expr/op/num/NumericBinExprImpl.scala
index 53a288dd0d..90104452b3 100644
--- a/src/col/vct/col/ast/expr/op/num/NumericBinExprImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/NumericBinExprImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.op.num
 import vct.col.ast.{NumericBinExpr, TInt, TRational, Type}
 import vct.col.typerules.CoercionUtils
 
-trait NumericBinExprImpl[G] { this: NumericBinExpr[G] =>
+trait NumericBinExprImpl[G] {
+  this: NumericBinExpr[G] =>
   lazy val t: Type[G] = getNumericType
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/PlusImpl.scala b/src/col/vct/col/ast/expr/op/num/PlusImpl.scala
index d0c47b49bf..18dc7fef72 100644
--- a/src/col/vct/col/ast/expr/op/num/PlusImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/PlusImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.Plus
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.PlusOps
 
-trait PlusImpl[G] extends PlusOps[G] { this: Plus[G] =>
+trait PlusImpl[G] extends PlusOps[G] {
+  this: Plus[G] =>
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "+", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/RatDivImpl.scala b/src/col/vct/col/ast/expr/op/num/RatDivImpl.scala
index 8f5aabcbdf..65f5786529 100644
--- a/src/col/vct/col/ast/expr/op/num/RatDivImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/RatDivImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{RatDiv, TRational, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.RatDivOps
 
-trait RatDivImpl[G] extends RatDivOps[G] { this: RatDiv[G] =>
+trait RatDivImpl[G] extends RatDivOps[G] {
+  this: RatDiv[G] =>
   override def t: Type[G] = TRational()
 
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "\\", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/TruncDivImpl.scala b/src/col/vct/col/ast/expr/op/num/TruncDivImpl.scala
index 47b9bb9135..7a32431387 100644
--- a/src/col/vct/col/ast/expr/op/num/TruncDivImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/TruncDivImpl.scala
@@ -4,8 +4,9 @@ import vct.col.ast.{TInt, TruncDiv, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.TruncDivOps
 
-trait TruncDivImpl[G] extends TruncDivOps[G] { this: TruncDiv[G] =>
+trait TruncDivImpl[G] extends TruncDivOps[G] {
+  this: TruncDiv[G] =>
   override def t: Type[G] = TInt()
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "/", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/TruncModImpl.scala b/src/col/vct/col/ast/expr/op/num/TruncModImpl.scala
index 54e320c48b..71bced78fc 100644
--- a/src/col/vct/col/ast/expr/op/num/TruncModImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/TruncModImpl.scala
@@ -4,8 +4,9 @@ import vct.col.ast.{TInt, TruncMod, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.TruncModOps
 
-trait TruncModImpl[G] extends TruncModOps[G] { this: TruncMod[G] =>
+trait TruncModImpl[G] extends TruncModOps[G] {
+  this: TruncMod[G] =>
   override def t: Type[G] = TInt()
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "%", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/UMinusImpl.scala b/src/col/vct/col/ast/expr/op/num/UMinusImpl.scala
index 6de5dd71ec..f3a44e3c11 100644
--- a/src/col/vct/col/ast/expr/op/num/UMinusImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/UMinusImpl.scala
@@ -1,16 +1,28 @@
 package vct.col.ast.expr.op.num
 
-import vct.col.ast.{CoerceCIntInt, CoerceFloatRat, CoerceUnboundInt, TBoundedInt, TCInt, TInt, TRational, Type, UMinus}
+import vct.col.ast.{
+  CoerceCIntInt,
+  CoerceFloatRat,
+  CoerceUnboundInt,
+  TBoundedInt,
+  TCInt,
+  TInt,
+  TRational,
+  Type,
+  UMinus,
+}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.typerules.CoercionUtils
 import vct.col.ast.ops.UMinusOps
 
-trait UMinusImpl[G] extends UMinusOps[G] { this: UMinus[G] =>
+trait UMinusImpl[G] extends UMinusOps[G] {
+  this: UMinus[G] =>
   override def t: Type[G] = {
     CoercionUtils.getCoercion(arg.t, TInt())
       .orElse(CoercionUtils.getCoercion(arg.t, TRational())) match {
       case Some(CoerceCIntInt()) => TCInt()
-      case Some(CoerceUnboundInt(TBoundedInt(gte, lt), _)) => TBoundedInt(-lt + 1, -gte + 1)
+      case Some(CoerceUnboundInt(TBoundedInt(gte, lt), _)) =>
+        TBoundedInt(-lt + 1, -gte + 1)
       case Some(CoerceFloatRat(source)) => source
       case Some(_) => TInt()
       case _ => TRational()
@@ -19,4 +31,4 @@ trait UMinusImpl[G] extends UMinusOps[G] { this: UMinus[G] =>
 
   override def precedence: Int = Precedence.PREFIX
   override def layout(implicit ctx: Ctx): Doc = Text("-") <> assoc(arg)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/VectorBinExprImpl.scala b/src/col/vct/col/ast/expr/op/num/VectorBinExprImpl.scala
index 2d7dad74c3..a7bbb5e8f1 100644
--- a/src/col/vct/col/ast/expr/op/num/VectorBinExprImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/VectorBinExprImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.op.num
 import vct.col.ast.expr.op.BinOperatorTypes
 import vct.col.ast.{TVector, Type, VectorBinExpr}
 
-trait VectorBinExprImpl[G] { this: VectorBinExpr[G] =>
+trait VectorBinExprImpl[G] {
+  this: VectorBinExpr[G] =>
   override def t: Type[G] = getVectorType
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/num/VectorFloatDivImpl.scala b/src/col/vct/col/ast/expr/op/num/VectorFloatDivImpl.scala
index afb9db33d5..93abd18703 100644
--- a/src/col/vct/col/ast/expr/op/num/VectorFloatDivImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/VectorFloatDivImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.VectorFloatDiv
 import vct.col.ast.ops.VectorFloatDivOps
 import vct.col.print._
 
-trait VectorFloatDivImpl[G] extends VectorFloatDivOps[G] { this: VectorFloatDiv[G] =>
+trait VectorFloatDivImpl[G] extends VectorFloatDivOps[G] {
+  this: VectorFloatDiv[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "/", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/VectorFloorDivImpl.scala b/src/col/vct/col/ast/expr/op/num/VectorFloorDivImpl.scala
index ac56b1577b..4f323e858c 100644
--- a/src/col/vct/col/ast/expr/op/num/VectorFloorDivImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/VectorFloorDivImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.VectorFloorDiv
 import vct.col.ast.ops.VectorFloorDivOps
 import vct.col.print._
 
-trait VectorFloorDivImpl[G] extends VectorFloorDivOps[G] { this: VectorFloorDiv[G] =>
+trait VectorFloorDivImpl[G] extends VectorFloorDivOps[G] {
+  this: VectorFloorDiv[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "/", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/VectorMinusImpl.scala b/src/col/vct/col/ast/expr/op/num/VectorMinusImpl.scala
index c2fcceb5fc..08d5435340 100644
--- a/src/col/vct/col/ast/expr/op/num/VectorMinusImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/VectorMinusImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.VectorMinus
 import vct.col.ast.ops.VectorMinusOps
 import vct.col.print.{Ctx, Doc, Precedence}
 
-trait VectorMinusImpl[G] extends VectorMinusOps[G] { this: VectorMinus[G] =>
+trait VectorMinusImpl[G] extends VectorMinusOps[G] {
+  this: VectorMinus[G] =>
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "-", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/VectorModImpl.scala b/src/col/vct/col/ast/expr/op/num/VectorModImpl.scala
index 322aee45ca..0a2efd456e 100644
--- a/src/col/vct/col/ast/expr/op/num/VectorModImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/VectorModImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.VectorMod
 import vct.col.ast.ops.VectorModOps
 import vct.col.print._
 
-trait VectorModImpl[G] extends VectorModOps[G] { this: VectorMod[G] =>
+trait VectorModImpl[G] extends VectorModOps[G] {
+  this: VectorMod[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "%", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/VectorMultImpl.scala b/src/col/vct/col/ast/expr/op/num/VectorMultImpl.scala
index a331f4ffd7..40d934c1bb 100644
--- a/src/col/vct/col/ast/expr/op/num/VectorMultImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/VectorMultImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.VectorMult
 import vct.col.ast.ops.VectorMultOps
 import vct.col.print.{Ctx, Doc, Precedence}
 
-trait VectorMultImpl[G] extends VectorMultOps[G] { this: VectorMult[G] =>
+trait VectorMultImpl[G] extends VectorMultOps[G] {
+  this: VectorMult[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "*", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/VectorPlusImpl.scala b/src/col/vct/col/ast/expr/op/num/VectorPlusImpl.scala
index 67cf38e1a7..da268cf8fc 100644
--- a/src/col/vct/col/ast/expr/op/num/VectorPlusImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/VectorPlusImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.VectorPlus
 import vct.col.ast.ops.VectorPlusOps
 import vct.col.print._
 
-trait VectorPlusImpl[G] extends VectorPlusOps[G] { this: VectorPlus[G] =>
+trait VectorPlusImpl[G] extends VectorPlusOps[G] {
+  this: VectorPlus[G] =>
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "+", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/VectorTruncDivImpl.scala b/src/col/vct/col/ast/expr/op/num/VectorTruncDivImpl.scala
index 4240773aba..612517b748 100644
--- a/src/col/vct/col/ast/expr/op/num/VectorTruncDivImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/VectorTruncDivImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.VectorTruncDiv
 import vct.col.ast.ops.VectorTruncDivOps
 import vct.col.print._
 
-trait VectorTruncDivImpl[G] extends VectorTruncDivOps[G] { this: VectorTruncDiv[G] =>
+trait VectorTruncDivImpl[G] extends VectorTruncDivOps[G] {
+  this: VectorTruncDiv[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "/", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/num/VectorTruncModImpl.scala b/src/col/vct/col/ast/expr/op/num/VectorTruncModImpl.scala
index c8cf62d315..29c7f25555 100644
--- a/src/col/vct/col/ast/expr/op/num/VectorTruncModImpl.scala
+++ b/src/col/vct/col/ast/expr/op/num/VectorTruncModImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.VectorTruncMod
 import vct.col.ast.ops.VectorTruncModOps
 import vct.col.print._
 
-trait VectorTruncModImpl[G] extends VectorTruncModOps[G] { this: VectorTruncMod[G] =>
+trait VectorTruncModImpl[G] extends VectorTruncModOps[G] {
+  this: VectorTruncMod[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "%", right)
 }
diff --git a/src/col/vct/col/ast/expr/op/option/OptEmptyImpl.scala b/src/col/vct/col/ast/expr/op/option/OptEmptyImpl.scala
index dee799cf01..3c9a843be5 100644
--- a/src/col/vct/col/ast/expr/op/option/OptEmptyImpl.scala
+++ b/src/col/vct/col/ast/expr/op/option/OptEmptyImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{OptEmpty, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.OptEmptyOps
 
-trait OptEmptyImpl[G] extends OptEmptyOps[G] { this: OptEmpty[G] =>
+trait OptEmptyImpl[G] extends OptEmptyOps[G] {
+  this: OptEmpty[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(opt) <> ".isEmpty"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/option/OptGetImpl.scala b/src/col/vct/col/ast/expr/op/option/OptGetImpl.scala
index 826a9fdcff..05f43b2d40 100644
--- a/src/col/vct/col/ast/expr/op/option/OptGetImpl.scala
+++ b/src/col/vct/col/ast/expr/op/option/OptGetImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{OptGet, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.OptGetOps
 
-trait OptGetImpl[G] extends OptGetOps[G] { this: OptGet[G] =>
+trait OptGetImpl[G] extends OptGetOps[G] {
+  this: OptGet[G] =>
   override def t: Type[G] = opt.t.asOption.get.element
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc = assoc(opt) <> ".get"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/option/OptGetOrElseImpl.scala b/src/col/vct/col/ast/expr/op/option/OptGetOrElseImpl.scala
index e8c5a5c277..9005cfc7a2 100644
--- a/src/col/vct/col/ast/expr/op/option/OptGetOrElseImpl.scala
+++ b/src/col/vct/col/ast/expr/op/option/OptGetOrElseImpl.scala
@@ -5,10 +5,13 @@ import vct.col.print.{Ctx, Doc, Precedence, Group}
 import vct.col.typerules.Types
 import vct.col.ast.ops.OptGetOrElseOps
 
-trait OptGetOrElseImpl[G] extends OptGetOrElseOps[G] { this: OptGetOrElse[G] =>
+trait OptGetOrElseImpl[G] extends OptGetOrElseOps[G] {
+  this: OptGetOrElse[G] =>
   def optionType: TOption[G] = opt.t.asOption.get
-  override lazy val t: Type[G] = Types.leastCommonSuperType(optionType.element, alt.t)
+  override lazy val t: Type[G] = Types
+    .leastCommonSuperType(optionType.element, alt.t)
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = Group(assoc(opt) <> ".getOrElse(" <> Doc.arg(alt) <> ")")
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Group(assoc(opt) <> ".getOrElse(" <> Doc.arg(alt) <> ")")
+}
diff --git a/src/col/vct/col/ast/expr/op/process/ProcessChoiceImpl.scala b/src/col/vct/col/ast/expr/op/process/ProcessChoiceImpl.scala
index 80ba86dbb2..8f866d3b9d 100644
--- a/src/col/vct/col/ast/expr/op/process/ProcessChoiceImpl.scala
+++ b/src/col/vct/col/ast/expr/op/process/ProcessChoiceImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{ProcessChoice, TProcess, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.ProcessChoiceOps
 
-trait ProcessChoiceImpl[G] extends ProcessChoiceOps[G] { this: ProcessChoice[G] =>
+trait ProcessChoiceImpl[G] extends ProcessChoiceOps[G] {
+  this: ProcessChoice[G] =>
   override def t: Type[G] = TProcess()
 
   override def precedence: Int = Precedence.ADDITIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "+", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/process/ProcessParImpl.scala b/src/col/vct/col/ast/expr/op/process/ProcessParImpl.scala
index 6bb467779b..c3345bd85b 100644
--- a/src/col/vct/col/ast/expr/op/process/ProcessParImpl.scala
+++ b/src/col/vct/col/ast/expr/op/process/ProcessParImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{ProcessPar, TProcess, Type}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.ProcessParOps
 
-trait ProcessParImpl[G] extends ProcessParOps[G] { this: ProcessPar[G] =>
+trait ProcessParImpl[G] extends ProcessParOps[G] {
+  this: ProcessPar[G] =>
   override def t: Type[G] = TProcess()
 
   override def precedence: Int = Precedence.OR
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "||", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/process/ProcessSelectImpl.scala b/src/col/vct/col/ast/expr/op/process/ProcessSelectImpl.scala
index c0dbc4f9e2..1aed06c9bc 100644
--- a/src/col/vct/col/ast/expr/op/process/ProcessSelectImpl.scala
+++ b/src/col/vct/col/ast/expr/op/process/ProcessSelectImpl.scala
@@ -4,10 +4,13 @@ import vct.col.ast.{ProcessSelect, TProcess, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.ProcessSelectOps
 
-trait ProcessSelectImpl[G] extends ProcessSelectOps[G] { this: ProcessSelect[G] =>
+trait ProcessSelectImpl[G] extends ProcessSelectOps[G] {
+  this: ProcessSelect[G] =>
   override def t: Type[G] = TProcess()
 
   override def precedence: Int = Precedence.SELECT
   override def layout(implicit ctx: Ctx): Doc =
-    Group(nassoc(cond) <>> {Text("?") <+> nassoc(whenTrue)} <>> {Text(":") <+> assoc(whenFalse)})
-}
\ No newline at end of file
+    Group(nassoc(cond) <>> { Text("?") <+> nassoc(whenTrue) } <>> {
+      Text(":") <+> assoc(whenFalse)
+    })
+}
diff --git a/src/col/vct/col/ast/expr/op/process/ProcessSeqImpl.scala b/src/col/vct/col/ast/expr/op/process/ProcessSeqImpl.scala
index 7772c4d825..222c7b4ac9 100644
--- a/src/col/vct/col/ast/expr/op/process/ProcessSeqImpl.scala
+++ b/src/col/vct/col/ast/expr/op/process/ProcessSeqImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{ProcessSeq, TProcess, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.ProcessSeqOps
 
-trait ProcessSeqImpl[G] extends ProcessSeqOps[G] { this: ProcessSeq[G] =>
+trait ProcessSeqImpl[G] extends ProcessSeqOps[G] {
+  this: ProcessSeq[G] =>
   override def t: Type[G] = TProcess()
 
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "*", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/tuple/TupGetImpl.scala b/src/col/vct/col/ast/expr/op/tuple/TupGetImpl.scala
index 70222ab345..d66a46a76b 100644
--- a/src/col/vct/col/ast/expr/op/tuple/TupGetImpl.scala
+++ b/src/col/vct/col/ast/expr/op/tuple/TupGetImpl.scala
@@ -7,19 +7,28 @@ import vct.col.check.{CheckContext, CheckError}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.TupGetOps
 
-trait TupGetImpl[G] extends ExprImpl[G] with TupGetOps[G] { this: TupGet[G] =>
+trait TupGetImpl[G] extends ExprImpl[G] with TupGetOps[G] {
+  this: TupGet[G] =>
   def tupleType: TTuple[G] = tup.t.asTuple.get
   override def t: Type[G] = tupleType.elements(index)
   override def check(context: CheckContext[G]): Seq[CheckError] =
     super.check(context) match {
-      case Nil => if(0 <= index && index < tupleType.elements.size) Nil else Seq(col.check.TypeErrorExplanation(this, "Tuple getter exceeds tuple size"))
+      case Nil =>
+        if (0 <= index && index < tupleType.elements.size)
+          Nil
+        else
+          Seq(
+            col.check
+              .TypeErrorExplanation(this, "Tuple getter exceeds tuple size")
+          )
       case some => some
     }
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc = index match {
-    case 0 => assoc(tup) <> ".fst"
-    case 1 => assoc(tup) <> ".snd"
-    case other => assoc(tup) <> "." <> other.toString
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    index match {
+      case 0 => assoc(tup) <> ".fst"
+      case 1 => assoc(tup) <> ".snd"
+      case other => assoc(tup) <> "." <> other.toString
+    }
+}
diff --git a/src/col/vct/col/ast/expr/op/vec/MatrixCompareImpl.scala b/src/col/vct/col/ast/expr/op/vec/MatrixCompareImpl.scala
index 5aefdfc4c7..d6b1e32d2c 100644
--- a/src/col/vct/col/ast/expr/op/vec/MatrixCompareImpl.scala
+++ b/src/col/vct/col/ast/expr/op/vec/MatrixCompareImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.op.vec
 import vct.col.ast.{MatrixCompare, TInt, TMatrix, Type}
 import vct.col.ast.ops.MatrixCompareOps
 
-trait MatrixCompareImpl[G] extends MatrixCompareOps[G] { this: MatrixCompare[G] =>
+trait MatrixCompareImpl[G] extends MatrixCompareOps[G] {
+  this: MatrixCompare[G] =>
   override def t: Type[G] = TMatrix(TInt())
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/vec/MatrixRepeatImpl.scala b/src/col/vct/col/ast/expr/op/vec/MatrixRepeatImpl.scala
index 5e4deeb816..7946536a35 100644
--- a/src/col/vct/col/ast/expr/op/vec/MatrixRepeatImpl.scala
+++ b/src/col/vct/col/ast/expr/op/vec/MatrixRepeatImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.op.vec
 import vct.col.ast.{MatrixRepeat, TMatrix, Type}
 import vct.col.ast.ops.MatrixRepeatOps
 
-trait MatrixRepeatImpl[G] extends MatrixRepeatOps[G] { this: MatrixRepeat[G] =>
+trait MatrixRepeatImpl[G] extends MatrixRepeatOps[G] {
+  this: MatrixRepeat[G] =>
   override def t: Type[G] = TMatrix(e.t)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/vec/MatrixSumImpl.scala b/src/col/vct/col/ast/expr/op/vec/MatrixSumImpl.scala
index 94a5e3841d..3cdd7b0451 100644
--- a/src/col/vct/col/ast/expr/op/vec/MatrixSumImpl.scala
+++ b/src/col/vct/col/ast/expr/op/vec/MatrixSumImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.op.vec
 import vct.col.ast.{MatrixSum, Type}
 import vct.col.ast.ops.MatrixSumOps
 
-trait MatrixSumImpl[G] extends MatrixSumOps[G] { this: MatrixSum[G] =>
+trait MatrixSumImpl[G] extends MatrixSumOps[G] {
+  this: MatrixSum[G] =>
   override def t: Type[G] = mat.t.asMatrix.get.element
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/vec/VectorCompareImpl.scala b/src/col/vct/col/ast/expr/op/vec/VectorCompareImpl.scala
index 3808ac820d..3cb95173f6 100644
--- a/src/col/vct/col/ast/expr/op/vec/VectorCompareImpl.scala
+++ b/src/col/vct/col/ast/expr/op/vec/VectorCompareImpl.scala
@@ -3,6 +3,8 @@ package vct.col.ast.expr.op.vec
 import vct.col.ast.{TInt, TSeq, Type, VectorCompare}
 import vct.col.ast.ops.VectorCompareOps
 
-trait VectorCompareImpl[G] extends VectorCompareOps[G] { this: VectorCompare[G] =>
-  override def t: Type[G] = TSeq(TInt()) // the results are 0 or 1, mimicking TSeq(TBool())
-}
\ No newline at end of file
+trait VectorCompareImpl[G] extends VectorCompareOps[G] {
+  this: VectorCompare[G] =>
+  override def t: Type[G] =
+    TSeq(TInt()) // the results are 0 or 1, mimicking TSeq(TBool())
+}
diff --git a/src/col/vct/col/ast/expr/op/vec/VectorRepeatImpl.scala b/src/col/vct/col/ast/expr/op/vec/VectorRepeatImpl.scala
index a04df96c81..b954f85099 100644
--- a/src/col/vct/col/ast/expr/op/vec/VectorRepeatImpl.scala
+++ b/src/col/vct/col/ast/expr/op/vec/VectorRepeatImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.op.vec
 import vct.col.ast.{TSeq, Type, VectorRepeat}
 import vct.col.ast.ops.VectorRepeatOps
 
-trait VectorRepeatImpl[G] extends VectorRepeatOps[G] { this: VectorRepeat[G] =>
+trait VectorRepeatImpl[G] extends VectorRepeatOps[G] {
+  this: VectorRepeat[G] =>
   override def t: Type[G] = TSeq(e.t)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/op/vec/VectorSumImpl.scala b/src/col/vct/col/ast/expr/op/vec/VectorSumImpl.scala
index 7caba5c1c2..c9d5b022aa 100644
--- a/src/col/vct/col/ast/expr/op/vec/VectorSumImpl.scala
+++ b/src/col/vct/col/ast/expr/op/vec/VectorSumImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.op.vec
 import vct.col.ast.{Type, VectorSum}
 import vct.col.ast.ops.VectorSumOps
 
-trait VectorSumImpl[G] extends VectorSumOps[G] { this: VectorSum[G] =>
+trait VectorSumImpl[G] extends VectorSumOps[G] {
+  this: VectorSum[G] =>
   override def t: Type[G] = vec.t.asSeq.get.element
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/ActionPermImpl.scala b/src/col/vct/col/ast/expr/resource/ActionPermImpl.scala
index 694ab14cfe..812c7135d9 100644
--- a/src/col/vct/col/ast/expr/resource/ActionPermImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/ActionPermImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{ActionPerm, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.ActionPermOps
 
-trait ActionPermImpl[G] extends ActionPermOps[G] { this: ActionPerm[G] =>
+trait ActionPermImpl[G] extends ActionPermOps[G] {
+  this: ActionPerm[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.POSTFIX
diff --git a/src/col/vct/col/ast/expr/resource/CurPermImpl.scala b/src/col/vct/col/ast/expr/resource/CurPermImpl.scala
index 8182cec1ba..9cfcbda1c1 100644
--- a/src/col/vct/col/ast/expr/resource/CurPermImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/CurPermImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{CurPerm, TRational, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.CurPermOps
 
-trait CurPermImpl[G] extends CurPermOps[G] { this: CurPerm[G] =>
+trait CurPermImpl[G] extends CurPermOps[G] {
+  this: CurPerm[G] =>
   override def t: Type[G] = TRational()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("perm(") <> Doc.arg(loc) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/ImpliesImpl.scala b/src/col/vct/col/ast/expr/resource/ImpliesImpl.scala
index 35532bc114..e400eca5da 100644
--- a/src/col/vct/col/ast/expr/resource/ImpliesImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/ImpliesImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Implies, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.ImpliesOps
 
-trait ImpliesImpl[G] extends ImpliesOps[G] { this: Implies[G] =>
+trait ImpliesImpl[G] extends ImpliesOps[G] {
+  this: Implies[G] =>
   override def t: Type[G] = right.t
 
   override def precedence: Int = Precedence.IMPLIES
   override def layout(implicit ctx: Ctx): Doc = rassoc(left, "==>", right)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/ModelPermImpl.scala b/src/col/vct/col/ast/expr/resource/ModelPermImpl.scala
index 924a57216c..3add62bf15 100644
--- a/src/col/vct/col/ast/expr/resource/ModelPermImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/ModelPermImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{ModelPerm, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.ModelPermOps
 
-trait ModelPermImpl[G] extends ModelPermOps[G] { this: ModelPerm[G] =>
+trait ModelPermImpl[G] extends ModelPermOps[G] {
+  this: ModelPerm[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("HPerm(") <> Doc.args(Seq(loc, perm)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/PermImpl.scala b/src/col/vct/col/ast/expr/resource/PermImpl.scala
index 53f4c7de66..13ff250499 100644
--- a/src/col/vct/col/ast/expr/resource/PermImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/PermImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{Perm, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.PermOps
 
-trait PermImpl[G] extends PermOps[G] { this: Perm[G] =>
+trait PermImpl[G] extends PermOps[G] {
+  this: Perm[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("Perm(") <> Doc.args(Seq(loc, perm)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/PermPointerImpl.scala b/src/col/vct/col/ast/expr/resource/PermPointerImpl.scala
index 25ac78f5f0..dbf6cfc853 100644
--- a/src/col/vct/col/ast/expr/resource/PermPointerImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/PermPointerImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{PermPointer, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.PermPointerOps
 
-trait PermPointerImpl[G] extends PermPointerOps[G] { this: PermPointer[G] =>
+trait PermPointerImpl[G] extends PermPointerOps[G] {
+  this: PermPointer[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("\\pointer(") <> Doc.args(Seq(p, len, perm)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/PermPointerIndexImpl.scala b/src/col/vct/col/ast/expr/resource/PermPointerIndexImpl.scala
index cf317d022a..6864571c28 100644
--- a/src/col/vct/col/ast/expr/resource/PermPointerIndexImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/PermPointerIndexImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{PermPointerIndex, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.PermPointerIndexOps
 
-trait PermPointerIndexImpl[G] extends PermPointerIndexOps[G] { this: PermPointerIndex[G] =>
+trait PermPointerIndexImpl[G] extends PermPointerIndexOps[G] {
+  this: PermPointerIndex[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("\\pointer_index(") <> Doc.args(Seq(p, idx, perm)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/PointsToImpl.scala b/src/col/vct/col/ast/expr/resource/PointsToImpl.scala
index 762aa55cdf..4e2ce7c1f2 100644
--- a/src/col/vct/col/ast/expr/resource/PointsToImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/PointsToImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{PointsTo, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.PointsToOps
 
-trait PointsToImpl[G] extends PointsToOps[G] { this: PointsTo[G] =>
+trait PointsToImpl[G] extends PointsToOps[G] {
+  this: PointsTo[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("PointsTo(") <> Doc.args(Seq(loc, perm, value)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/PolarityDependentImpl.scala b/src/col/vct/col/ast/expr/resource/PolarityDependentImpl.scala
index fab4e9b5a5..8147bc2a6f 100644
--- a/src/col/vct/col/ast/expr/resource/PolarityDependentImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/PolarityDependentImpl.scala
@@ -5,10 +5,14 @@ import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.typerules.Types
 import vct.col.ast.ops.PolarityDependentOps
 
-trait PolarityDependentImpl[G] extends PolarityDependentOps[G] { this: PolarityDependent[G] =>
-  override lazy val t: Type[G] = Types.leastCommonSuperType(onInhale.t, onExhale.t)
+trait PolarityDependentImpl[G] extends PolarityDependentOps[G] {
+  this: PolarityDependent[G] =>
+  override lazy val t: Type[G] = Types
+    .leastCommonSuperType(onInhale.t, onExhale.t)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("\\polarity_dependent(") <> Doc.args(Seq(onInhale, onExhale)) <> ")")
+    Group(
+      Text("\\polarity_dependent(") <> Doc.args(Seq(onInhale, onExhale)) <> ")"
+    )
 }
diff --git a/src/col/vct/col/ast/expr/resource/ResourceOfResourceValueImpl.scala b/src/col/vct/col/ast/expr/resource/ResourceOfResourceValueImpl.scala
index e1a27c4b86..3db3246b8d 100644
--- a/src/col/vct/col/ast/expr/resource/ResourceOfResourceValueImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/ResourceOfResourceValueImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.resource
 import vct.col.ast.{ResourceOfResourceValue, TResource}
 import vct.col.ast.ops.ResourceOfResourceValueOps
 
-trait ResourceOfResourceValueImpl[G] extends ResourceOfResourceValueOps[G] { this: ResourceOfResourceValue[G] =>
+trait ResourceOfResourceValueImpl[G] extends ResourceOfResourceValueOps[G] {
+  this: ResourceOfResourceValue[G] =>
   override def t: TResource[G] = TResource()
 }
diff --git a/src/col/vct/col/ast/expr/resource/ResourceValueImpl.scala b/src/col/vct/col/ast/expr/resource/ResourceValueImpl.scala
index badb7a16e1..c7a15529c7 100644
--- a/src/col/vct/col/ast/expr/resource/ResourceValueImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/ResourceValueImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.resource
 import vct.col.ast.{ResourceValue, TResourceVal}
 import vct.col.ast.ops.ResourceValueOps
 
-trait ResourceValueImpl[G] extends ResourceValueOps[G] { this: ResourceValue[G] =>
+trait ResourceValueImpl[G] extends ResourceValueOps[G] {
+  this: ResourceValue[G] =>
   override def t: TResourceVal[G] = TResourceVal()
 }
diff --git a/src/col/vct/col/ast/expr/resource/ScaleByParBlockImpl.scala b/src/col/vct/col/ast/expr/resource/ScaleByParBlockImpl.scala
index 50d0362e4f..8a94bff1d7 100644
--- a/src/col/vct/col/ast/expr/resource/ScaleByParBlockImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/ScaleByParBlockImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.resource
 import vct.col.ast.{ScaleByParBlock, Type}
 import vct.col.ast.ops.ScaleByParBlockOps
 
-trait ScaleByParBlockImpl[G] extends ScaleByParBlockOps[G] { this: ScaleByParBlock[G] =>
+trait ScaleByParBlockImpl[G] extends ScaleByParBlockOps[G] {
+  this: ScaleByParBlock[G] =>
   override def t: Type[G] = res.t
 }
diff --git a/src/col/vct/col/ast/expr/resource/ScaleImpl.scala b/src/col/vct/col/ast/expr/resource/ScaleImpl.scala
index fc83b3db62..e475d2ebcb 100644
--- a/src/col/vct/col/ast/expr/resource/ScaleImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/ScaleImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{Scale, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.ScaleOps
 
-trait ScaleImpl[G] extends ScaleOps[G] { this: Scale[G] =>
+trait ScaleImpl[G] extends ScaleOps[G] {
+  this: Scale[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.PREFIX
   override def layout(implicit ctx: Ctx): Doc =
     Text("[") <> scale <> "]" <> assoc(res)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/StarImpl.scala b/src/col/vct/col/ast/expr/resource/StarImpl.scala
index ff6362c210..7193cbac2c 100644
--- a/src/col/vct/col/ast/expr/resource/StarImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/StarImpl.scala
@@ -4,9 +4,18 @@ import vct.col.ast.{Star, TResource, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.StarOps
 
-trait StarImpl[G] extends StarOps[G] { this: Star[G] =>
+trait StarImpl[G] extends StarOps[G] {
+  this: Star[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.AND
-  override def layout(implicit ctx: Ctx): Doc = lassoc(left, if(ctx.syntax == Ctx.Silver) "&&" else "**", right)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    lassoc(
+      left,
+      if (ctx.syntax == Ctx.Silver)
+        "&&"
+      else
+        "**",
+      right,
+    )
+}
diff --git a/src/col/vct/col/ast/expr/resource/UnfoldingImpl.scala b/src/col/vct/col/ast/expr/resource/UnfoldingImpl.scala
index eb729b3aed..2f03c33691 100644
--- a/src/col/vct/col/ast/expr/resource/UnfoldingImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/UnfoldingImpl.scala
@@ -6,7 +6,11 @@ import vct.col.ast.{Type, Unfolding}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.UnfoldingOps
 
-trait UnfoldingImpl[G] extends NodeFamilyImpl[G] with CheckFoldUnfoldTarget[G] with UnfoldingOps[G] { this: Unfolding[G] =>
+trait UnfoldingImpl[G]
+    extends NodeFamilyImpl[G]
+    with CheckFoldUnfoldTarget[G]
+    with UnfoldingOps[G] {
+  this: Unfolding[G] =>
   override def t: Type[G] = body.t
 
   def layoutPVL(implicit ctx: Ctx): Doc =
@@ -22,10 +26,11 @@ trait UnfoldingImpl[G] extends NodeFamilyImpl[G] with CheckFoldUnfoldTarget[G] w
     Group(Text("\\unfolding") <+> assoc(res) <+> "\\in" <>> body)
 
   override def precedence: Int = Precedence.PVL_UNFOLDING
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.PVL => layoutPVL
-    case Ctx.Silver => layoutSilver
-    case Ctx.Java => layoutJava
-    case _ => layoutSpec
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.PVL => layoutPVL
+      case Ctx.Silver => layoutSilver
+      case Ctx.Java => layoutJava
+      case _ => layoutSpec
+    }
+}
diff --git a/src/col/vct/col/ast/expr/resource/ValidArrayImpl.scala b/src/col/vct/col/ast/expr/resource/ValidArrayImpl.scala
index 4a6149a4a1..daf623c4d0 100644
--- a/src/col/vct/col/ast/expr/resource/ValidArrayImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/ValidArrayImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{TBool, Type, ValidArray}
 import vct.col.print._
 import vct.col.ast.ops.ValidArrayOps
 
-trait ValidArrayImpl[G] extends ValidArrayOps[G] { this: ValidArray[G] =>
+trait ValidArrayImpl[G] extends ValidArrayOps[G] {
+  this: ValidArray[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("\\array(") <> Doc.args(Seq(arr, len)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/ValidMatrixImpl.scala b/src/col/vct/col/ast/expr/resource/ValidMatrixImpl.scala
index 7c25f9f21a..fb2317197c 100644
--- a/src/col/vct/col/ast/expr/resource/ValidMatrixImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/ValidMatrixImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{TBool, Type, ValidMatrix}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.ValidMatrixOps
 
-trait ValidMatrixImpl[G] extends ValidMatrixOps[G] { this: ValidMatrix[G] =>
+trait ValidMatrixImpl[G] extends ValidMatrixOps[G] {
+  this: ValidMatrix[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("\\matrix(") <> Doc.args(Seq(mat, w, h)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/resource/ValueImpl.scala b/src/col/vct/col/ast/expr/resource/ValueImpl.scala
index 42d5a80c78..356b93a728 100644
--- a/src/col/vct/col/ast/expr/resource/ValueImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/ValueImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TResource, Type, Value}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.ValueOps
 
-trait ValueImpl[G] extends ValueOps[G] { this: Value[G] =>
+trait ValueImpl[G] extends ValueOps[G] {
+  this: Value[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.POSTFIX
diff --git a/src/col/vct/col/ast/expr/resource/WandImpl.scala b/src/col/vct/col/ast/expr/resource/WandImpl.scala
index a4a3f6745b..8a85c21d84 100644
--- a/src/col/vct/col/ast/expr/resource/WandImpl.scala
+++ b/src/col/vct/col/ast/expr/resource/WandImpl.scala
@@ -4,9 +4,18 @@ import vct.col.ast.{TResource, Type, Wand}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.WandOps
 
-trait WandImpl[G] extends WandOps[G] { this: Wand[G] =>
+trait WandImpl[G] extends WandOps[G] {
+  this: Wand[G] =>
   override def t: Type[G] = TResource()
 
   override def precedence: Int = Precedence.IMPLIES
-  override def layout(implicit ctx: Ctx): Doc = rassoc(left, if(ctx.syntax == Ctx.Silver) "--*" else "-*", right)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    rassoc(
+      left,
+      if (ctx.syntax == Ctx.Silver)
+        "--*"
+      else
+        "-*",
+      right,
+    )
+}
diff --git a/src/col/vct/col/ast/expr/sideeffect/AssignExpressionImpl.scala b/src/col/vct/col/ast/expr/sideeffect/AssignExpressionImpl.scala
index ff699287ff..635ea75b7a 100644
--- a/src/col/vct/col/ast/expr/sideeffect/AssignExpressionImpl.scala
+++ b/src/col/vct/col/ast/expr/sideeffect/AssignExpressionImpl.scala
@@ -4,13 +4,16 @@ import vct.col.ast.expr.ExprImpl
 import vct.col.ast.{AssignExpression, Expr, Local}
 import vct.col.check.{CheckContext, CheckError}
 
-trait AssignExpressionImpl[G] extends ExprImpl[G] { this: AssignExpression[G] =>
+trait AssignExpressionImpl[G] extends ExprImpl[G] {
+  this: AssignExpression[G] =>
   def target: Expr[G]
   def value: Expr[G]
 
   override def check(context: CheckContext[G]): Seq[CheckError] =
-    super.check(context) ++ (target match {
-      case Local(ref) => context.checkInWriteScope(context.roScopeReason, this, ref)
-      case _ => Nil
-    })
-}
\ No newline at end of file
+    super.check(context) ++
+      (target match {
+        case Local(ref) =>
+          context.checkInWriteScope(context.roScopeReason, this, ref)
+        case _ => Nil
+      })
+}
diff --git a/src/col/vct/col/ast/expr/sideeffect/PostAssignExpressionImpl.scala b/src/col/vct/col/ast/expr/sideeffect/PostAssignExpressionImpl.scala
index 8e26792d1a..c4fb48a18e 100644
--- a/src/col/vct/col/ast/expr/sideeffect/PostAssignExpressionImpl.scala
+++ b/src/col/vct/col/ast/expr/sideeffect/PostAssignExpressionImpl.scala
@@ -4,10 +4,17 @@ import vct.col.ast.{PostAssignExpression, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.PostAssignExpressionOps
 
-trait PostAssignExpressionImpl[G] extends PostAssignExpressionOps[G] { this: PostAssignExpression[G] =>
+trait PostAssignExpressionImpl[G] extends PostAssignExpressionOps[G] {
+  this: PostAssignExpression[G] =>
   override def t: Type[G] = target.t
 
   override def precedence: Int = Precedence.ASSIGN
   override def layout(implicit ctx: Ctx): Doc =
-    Group(nassoc(target) <+> (if(ctx.syntax == Ctx.Silver) ":=" else "=") <>> assoc(value))
-}
\ No newline at end of file
+    Group(
+      nassoc(target) <+>
+        (if (ctx.syntax == Ctx.Silver)
+           ":="
+         else
+           "=") <>> assoc(value)
+    )
+}
diff --git a/src/col/vct/col/ast/expr/sideeffect/PreAssignExpressionImpl.scala b/src/col/vct/col/ast/expr/sideeffect/PreAssignExpressionImpl.scala
index 7ede8a5ce2..0854de60c6 100644
--- a/src/col/vct/col/ast/expr/sideeffect/PreAssignExpressionImpl.scala
+++ b/src/col/vct/col/ast/expr/sideeffect/PreAssignExpressionImpl.scala
@@ -4,10 +4,17 @@ import vct.col.ast.{PreAssignExpression, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence}
 import vct.col.ast.ops.PreAssignExpressionOps
 
-trait PreAssignExpressionImpl[G] extends PreAssignExpressionOps[G] { this: PreAssignExpression[G] =>
+trait PreAssignExpressionImpl[G] extends PreAssignExpressionOps[G] {
+  this: PreAssignExpression[G] =>
   override def t: Type[G] = value.t
 
   override def precedence: Int = Precedence.ASSIGN
   override def layout(implicit ctx: Ctx): Doc =
-    Group(nassoc(target) <+> (if(ctx.syntax == Ctx.Silver) ":=" else "=") <>> assoc(value))
-}
\ No newline at end of file
+    Group(
+      nassoc(target) <+>
+        (if (ctx.syntax == Ctx.Silver)
+           ":="
+         else
+           "=") <>> assoc(value)
+    )
+}
diff --git a/src/col/vct/col/ast/expr/sideeffect/ScopedExprImpl.scala b/src/col/vct/col/ast/expr/sideeffect/ScopedExprImpl.scala
index 3b72410555..0b891ad529 100644
--- a/src/col/vct/col/ast/expr/sideeffect/ScopedExprImpl.scala
+++ b/src/col/vct/col/ast/expr/sideeffect/ScopedExprImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.sideeffect
 import vct.col.ast.{ScopedExpr, Type}
 import vct.col.ast.ops.ScopedExprOps
 
-trait ScopedExprImpl[G] extends ScopedExprOps[G] { this: ScopedExpr[G] =>
+trait ScopedExprImpl[G] extends ScopedExprOps[G] {
+  this: ScopedExpr[G] =>
   override def t: Type[G] = body.t
 }
diff --git a/src/col/vct/col/ast/expr/sideeffect/ThenImpl.scala b/src/col/vct/col/ast/expr/sideeffect/ThenImpl.scala
index e1e2aab4fa..69e2c3a807 100644
--- a/src/col/vct/col/ast/expr/sideeffect/ThenImpl.scala
+++ b/src/col/vct/col/ast/expr/sideeffect/ThenImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Then, Type}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Show, Text}
 import vct.col.ast.ops.ThenOps
 
-trait ThenImpl[G] extends ThenOps[G] { this: Then[G] =>
+trait ThenImpl[G] extends ThenOps[G] {
+  this: Then[G] =>
   override def t: Type[G] = value.t
 
   def layoutEffect(implicit ctx: Ctx): Doc =
@@ -13,4 +14,4 @@ trait ThenImpl[G] extends ThenOps[G] { this: Then[G] =>
   override def precedence: Int = Precedence.PVL_WITH_THEN
   override def layout(implicit ctx: Ctx): Doc =
     Group(assoc(value) <>> Doc.inlineSpec(Show.lazily(layoutEffect(_))))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/sideeffect/WithImpl.scala b/src/col/vct/col/ast/expr/sideeffect/WithImpl.scala
index 2f51d00e82..7768b92503 100644
--- a/src/col/vct/col/ast/expr/sideeffect/WithImpl.scala
+++ b/src/col/vct/col/ast/expr/sideeffect/WithImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Type, With}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Show, Text}
 import vct.col.ast.ops.WithOps
 
-trait WithImpl[G] extends WithOps[G] { this: With[G] =>
+trait WithImpl[G] extends WithOps[G] {
+  this: With[G] =>
   override def t: Type[G] = value.t
 
   def layoutEffect(implicit ctx: Ctx): Doc =
@@ -13,4 +14,4 @@ trait WithImpl[G] extends WithOps[G] { this: With[G] =>
   override def precedence: Int = Precedence.PVL_WITH_THEN
   override def layout(implicit ctx: Ctx): Doc =
     Group(assoc(value) <>> Doc.inlineSpec(Show.lazily(layoutEffect(_))))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/type/CastImpl.scala b/src/col/vct/col/ast/expr/type/CastImpl.scala
index 69d9cf5c5e..2a151bb951 100644
--- a/src/col/vct/col/ast/expr/type/CastImpl.scala
+++ b/src/col/vct/col/ast/expr/type/CastImpl.scala
@@ -5,13 +5,16 @@ import vct.col.check.UnreachableAfterTypeCheck
 import vct.col.print.{Ctx, Doc, Group, Precedence, Show, Text}
 import vct.col.ast.ops.CastOps
 
-trait CastImpl[G] extends CastOps[G] { this: Cast[G] =>
-  override def t: Type[G] = typeValue.t match {
-    case TType(t) => t
-    case _ => throw UnreachableAfterTypeCheck("The cast type is not a type", this)
-  }
+trait CastImpl[G] extends CastOps[G] {
+  this: Cast[G] =>
+  override def t: Type[G] =
+    typeValue.t match {
+      case TType(t) => t
+      case _ =>
+        throw UnreachableAfterTypeCheck("The cast type is not a type", this)
+    }
 
   override def precedence: Int = Precedence.PREFIX
   override def layout(implicit ctx: Ctx): Doc =
     Text("(") <> typeValue <> ")" <> assoc(value)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/type/InstanceOfImpl.scala b/src/col/vct/col/ast/expr/type/InstanceOfImpl.scala
index 0adf092b79..d9bb3740e3 100644
--- a/src/col/vct/col/ast/expr/type/InstanceOfImpl.scala
+++ b/src/col/vct/col/ast/expr/type/InstanceOfImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{InstanceOf, TBool, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.InstanceOfOps
 
-trait InstanceOfImpl[G] extends InstanceOfOps[G] { this: InstanceOf[G] =>
+trait InstanceOfImpl[G] extends InstanceOfOps[G] {
+  this: InstanceOf[G] =>
   override def t: Type[G] = TBool()
 
   override def precedence: Int = Precedence.RELATIONAL
-  override def layout(implicit ctx: Ctx): Doc = assoc(value) <+> "instanceof" <+> typeValue
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    assoc(value) <+> "instanceof" <+> typeValue
+}
diff --git a/src/col/vct/col/ast/expr/type/SubTypeImpl.scala b/src/col/vct/col/ast/expr/type/SubTypeImpl.scala
index 9d59541ece..15c623cf64 100644
--- a/src/col/vct/col/ast/expr/type/SubTypeImpl.scala
+++ b/src/col/vct/col/ast/expr/type/SubTypeImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.`type`
 import vct.col.ast.SubType
 import vct.col.ast.ops.SubTypeOps
 
-trait SubTypeImpl[G] extends SubTypeOps[G] { this: SubType[G] =>
+trait SubTypeImpl[G] extends SubTypeOps[G] {
+  this: SubType[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/type/SuperTypeImpl.scala b/src/col/vct/col/ast/expr/type/SuperTypeImpl.scala
index cef660506a..650b9adb08 100644
--- a/src/col/vct/col/ast/expr/type/SuperTypeImpl.scala
+++ b/src/col/vct/col/ast/expr/type/SuperTypeImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.expr.`type`
 import vct.col.ast.SuperType
 import vct.col.ast.ops.SuperTypeOps
 
-trait SuperTypeImpl[G] extends SuperTypeOps[G] { this: SuperType[G] =>
+trait SuperTypeImpl[G] extends SuperTypeOps[G] {
+  this: SuperType[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/type/TypeComparisonImpl.scala b/src/col/vct/col/ast/expr/type/TypeComparisonImpl.scala
index cb4b51f967..0d43a8a75c 100644
--- a/src/col/vct/col/ast/expr/type/TypeComparisonImpl.scala
+++ b/src/col/vct/col/ast/expr/type/TypeComparisonImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.expr.`type`
 
 import vct.col.ast.TypeComparison
 
-trait TypeComparisonImpl[G] { this: TypeComparison[G] =>
+trait TypeComparisonImpl[G] {
+  this: TypeComparison[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/type/TypeOfImpl.scala b/src/col/vct/col/ast/expr/type/TypeOfImpl.scala
index d964471faf..6569eb8416 100644
--- a/src/col/vct/col/ast/expr/type/TypeOfImpl.scala
+++ b/src/col/vct/col/ast/expr/type/TypeOfImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{TType, Type, TypeOf}
 import vct.col.print.{Ctx, Doc, Precedence, Text, Group}
 import vct.col.ast.ops.TypeOfOps
 
-trait TypeOfImpl[G] extends TypeOfOps[G] { this: TypeOf[G] =>
+trait TypeOfImpl[G] extends TypeOfOps[G] {
+  this: TypeOf[G] =>
   override def t: Type[G] = TType(expr.t)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("\\typeof(") <> Doc.arg(expr) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/expr/type/TypeValueImpl.scala b/src/col/vct/col/ast/expr/type/TypeValueImpl.scala
index a439303117..f2e64529c3 100644
--- a/src/col/vct/col/ast/expr/type/TypeValueImpl.scala
+++ b/src/col/vct/col/ast/expr/type/TypeValueImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{TType, Type, TypeValue}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.TypeValueOps
 
-trait TypeValueImpl[G] extends TypeValueOps[G] { this: TypeValue[G] =>
+trait TypeValueImpl[G] extends TypeValueOps[G] {
+  this: TypeValue[G] =>
   override def t: Type[G] = TType(value)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("\\type(") <> Doc.arg(value) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/accountedpredicate/AccountedPredicateImpl.scala b/src/col/vct/col/ast/family/accountedpredicate/AccountedPredicateImpl.scala
index 6dab0c779c..b02900fb16 100644
--- a/src/col/vct/col/ast/family/accountedpredicate/AccountedPredicateImpl.scala
+++ b/src/col/vct/col/ast/family/accountedpredicate/AccountedPredicateImpl.scala
@@ -3,13 +3,16 @@ package vct.col.ast.family.accountedpredicate
 import vct.col.ast.AccountedPredicate
 import vct.col.ast.ops.AccountedPredicateFamilyOps
 
-/**
- * A tree of assertions that represents the separating conjunction of the flattened tree. Either the tree splits
- * ([[vct.col.ast.SplitAccountedPredicate]]) or it is a leaf ([[vct.col.ast.UnitAccountedPredicate]]) consisting of one
- * expression. If verification of the predicate as a whole fails, additionally a path is returned that indicates the
- * position in the tree that failed via a path. See also [[vct.col.origin.AccountedDirection]],
- * [[vct.col.origin.PostBlameSplit]], [[vct.col.origin.PreBlameSplit]].
- */
-trait AccountedPredicateImpl[G] extends AccountedPredicateFamilyOps[G] { this: AccountedPredicate[G] =>
+/** A tree of assertions that represents the separating conjunction of the
+  * flattened tree. Either the tree splits
+  * ([[vct.col.ast.SplitAccountedPredicate]]) or it is a leaf
+  * ([[vct.col.ast.UnitAccountedPredicate]]) consisting of one expression. If
+  * verification of the predicate as a whole fails, additionally a path is
+  * returned that indicates the position in the tree that failed via a path. See
+  * also [[vct.col.origin.AccountedDirection]],
+  * [[vct.col.origin.PostBlameSplit]], [[vct.col.origin.PreBlameSplit]].
+  */
+trait AccountedPredicateImpl[G] extends AccountedPredicateFamilyOps[G] {
+  this: AccountedPredicate[G] =>
 
 }
diff --git a/src/col/vct/col/ast/family/accountedpredicate/SplitAccountedPredicateImpl.scala b/src/col/vct/col/ast/family/accountedpredicate/SplitAccountedPredicateImpl.scala
index 931bc8528a..a15aa6609a 100644
--- a/src/col/vct/col/ast/family/accountedpredicate/SplitAccountedPredicateImpl.scala
+++ b/src/col/vct/col/ast/family/accountedpredicate/SplitAccountedPredicateImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.accountedpredicate
 import vct.col.ast.SplitAccountedPredicate
 import vct.col.ast.ops.SplitAccountedPredicateOps
 
-trait SplitAccountedPredicateImpl[G] extends SplitAccountedPredicateOps[G] { this: SplitAccountedPredicate[G] =>
+trait SplitAccountedPredicateImpl[G] extends SplitAccountedPredicateOps[G] {
+  this: SplitAccountedPredicate[G] =>
 
 }
diff --git a/src/col/vct/col/ast/family/accountedpredicate/UnitAccountedPredicateImpl.scala b/src/col/vct/col/ast/family/accountedpredicate/UnitAccountedPredicateImpl.scala
index ce4a9ac50c..4560cfa7d1 100644
--- a/src/col/vct/col/ast/family/accountedpredicate/UnitAccountedPredicateImpl.scala
+++ b/src/col/vct/col/ast/family/accountedpredicate/UnitAccountedPredicateImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.ops.UnitAccountedPredicateOps
 import vct.col.check._
 import vct.col.typerules.{CoercionUtils}
 
-trait UnitAccountedPredicateImpl[G] extends UnitAccountedPredicateOps[G] { this: UnitAccountedPredicate[G] =>
+trait UnitAccountedPredicateImpl[G] extends UnitAccountedPredicateOps[G] {
+  this: UnitAccountedPredicate[G] =>
   override def check(context: CheckContext[G]): Seq[CheckError] =
     CoercionUtils.getCoercion(pred.t, TResource()) match {
       case Some(_) => Nil
diff --git a/src/col/vct/col/ast/family/bipdata/BipIncomingDataImpl.scala b/src/col/vct/col/ast/family/bipdata/BipIncomingDataImpl.scala
index 1364efddcb..92b3e7ce56 100644
--- a/src/col/vct/col/ast/family/bipdata/BipIncomingDataImpl.scala
+++ b/src/col/vct/col/ast/family/bipdata/BipIncomingDataImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.BipIncomingData
 import vct.col.print._
 import vct.col.ast.ops.BipIncomingDataOps
 
-trait BipIncomingDataImpl[G] extends BipIncomingDataOps[G] { this: BipIncomingData[G] =>
+trait BipIncomingDataImpl[G] extends BipIncomingDataOps[G] {
+  this: BipIncomingData[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text("/* bipIncomingData") <+> t <+> ctx.name(this) <+> "*/"
 }
diff --git a/src/col/vct/col/ast/family/bipdata/BipOutgoingDataImpl.scala b/src/col/vct/col/ast/family/bipdata/BipOutgoingDataImpl.scala
index 6b2d1d362e..092da55f21 100644
--- a/src/col/vct/col/ast/family/bipdata/BipOutgoingDataImpl.scala
+++ b/src/col/vct/col/ast/family/bipdata/BipOutgoingDataImpl.scala
@@ -4,10 +4,14 @@ import vct.col.ast.BipOutgoingData
 import vct.col.print._
 import vct.col.ast.ops.BipOutgoingDataOps
 
-trait BipOutgoingDataImpl[G] extends BipOutgoingDataOps[G] { this: BipOutgoingData[G] =>
+trait BipOutgoingDataImpl[G] extends BipOutgoingDataOps[G] {
+  this: BipOutgoingData[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
-      if(pure) Text("@Pure") else Empty,
+      if (pure)
+        Text("@Pure")
+      else
+        Empty,
       Text("@Data(name =") <+> ctx.name(this) <> ")",
       Text("public") <+> t <+> ctx.name(this) <> "()" <+> body.layoutAsBlock,
     ))
diff --git a/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueAcceptsImpl.scala b/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueAcceptsImpl.scala
index 95decd28aa..05bfaeee77 100644
--- a/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueAcceptsImpl.scala
+++ b/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueAcceptsImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.JavaBipGlueAccepts
 import vct.col.print._
 import vct.col.ast.ops.JavaBipGlueAcceptsOps
 
-trait JavaBipGlueAcceptsImpl[G] extends JavaBipGlueAcceptsOps[G] { this: JavaBipGlueAccepts[G] =>
-   override def layout(implicit ctx: Ctx): Doc =
-      Group(port.show <> ".accepts(" <> Doc.args(others) <> ");")
+trait JavaBipGlueAcceptsImpl[G] extends JavaBipGlueAcceptsOps[G] {
+  this: JavaBipGlueAccepts[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Group(port.show <> ".accepts(" <> Doc.args(others) <> ");")
 }
diff --git a/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueDataWireImpl.scala b/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueDataWireImpl.scala
index 9a2e10b6e5..ee20b6db48 100644
--- a/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueDataWireImpl.scala
+++ b/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueDataWireImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.JavaBipGlueDataWire
 import vct.col.print._
 import vct.col.ast.ops.JavaBipGlueDataWireOps
 
-trait JavaBipGlueDataWireImpl[G] extends JavaBipGlueDataWireOps[G] { this: JavaBipGlueDataWire[G] =>
+trait JavaBipGlueDataWireImpl[G] extends JavaBipGlueDataWireOps[G] {
+  this: JavaBipGlueDataWire[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(dataOut.show <> ".to(" <> Doc.arg(dataIn) <> ");")
 }
diff --git a/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueRequiresImpl.scala b/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueRequiresImpl.scala
index 667b27a13a..4fd6e872e4 100644
--- a/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueRequiresImpl.scala
+++ b/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueRequiresImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.JavaBipGlueRequires
 import vct.col.print._
 import vct.col.ast.ops.JavaBipGlueRequiresOps
 
-trait JavaBipGlueRequiresImpl[G] extends JavaBipGlueRequiresOps[G] { this: JavaBipGlueRequires[G] =>
+trait JavaBipGlueRequiresImpl[G] extends JavaBipGlueRequiresOps[G] {
+  this: JavaBipGlueRequires[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(port.show <> ".requires(" <> Doc.args(others) <> ");")
 }
diff --git a/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueSynchronImpl.scala b/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueSynchronImpl.scala
index d7f1941a51..6151fd6ae4 100644
--- a/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueSynchronImpl.scala
+++ b/src/col/vct/col/ast/family/bipglueelement/JavaBipGlueSynchronImpl.scala
@@ -4,7 +4,10 @@ import vct.col.ast.JavaBipGlueSynchron
 import vct.col.print._
 import vct.col.ast.ops.JavaBipGlueSynchronOps
 
-trait JavaBipGlueSynchronImpl[G] extends JavaBipGlueSynchronOps[G] { this: JavaBipGlueSynchron[G] =>
+trait JavaBipGlueSynchronImpl[G] extends JavaBipGlueSynchronOps[G] {
+  this: JavaBipGlueSynchron[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("synchron(") <> Doc.arg(port0) <> ").to(" <> Doc.arg(port1) <> ");")
-}
\ No newline at end of file
+    Group(
+      Text("synchron(") <> Doc.arg(port0) <> ").to(" <> Doc.arg(port1) <> ");"
+    )
+}
diff --git a/src/col/vct/col/ast/family/bipporttype/BipEnforceableImpl.scala b/src/col/vct/col/ast/family/bipporttype/BipEnforceableImpl.scala
index 4c35b1a229..483416448f 100644
--- a/src/col/vct/col/ast/family/bipporttype/BipEnforceableImpl.scala
+++ b/src/col/vct/col/ast/family/bipporttype/BipEnforceableImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.BipEnforceable
 import vct.col.print._
 import vct.col.ast.ops.BipEnforceableOps
 
-trait BipEnforceableImpl[G] extends BipEnforceableOps[G] { this: BipEnforceable[G] =>
+trait BipEnforceableImpl[G] extends BipEnforceableOps[G] {
+  this: BipEnforceable[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("enforceable")
 }
diff --git a/src/col/vct/col/ast/family/bipporttype/BipInternalImpl.scala b/src/col/vct/col/ast/family/bipporttype/BipInternalImpl.scala
index 991184049b..8f4a233517 100644
--- a/src/col/vct/col/ast/family/bipporttype/BipInternalImpl.scala
+++ b/src/col/vct/col/ast/family/bipporttype/BipInternalImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.BipInternal
 import vct.col.print._
 import vct.col.ast.ops.BipInternalOps
 
-trait BipInternalImpl[G] extends BipInternalOps[G] { this: BipInternal[G] =>
+trait BipInternalImpl[G] extends BipInternalOps[G] {
+  this: BipInternal[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("internal")
 }
diff --git a/src/col/vct/col/ast/family/bipporttype/BipSpontaneousImpl.scala b/src/col/vct/col/ast/family/bipporttype/BipSpontaneousImpl.scala
index a69ff96b4c..5503b8555f 100644
--- a/src/col/vct/col/ast/family/bipporttype/BipSpontaneousImpl.scala
+++ b/src/col/vct/col/ast/family/bipporttype/BipSpontaneousImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.BipSpontaneous
 import vct.col.print._
 import vct.col.ast.ops.BipSpontaneousOps
 
-trait BipSpontaneousImpl[G] extends BipSpontaneousOps[G] { this: BipSpontaneous[G] =>
+trait BipSpontaneousImpl[G] extends BipSpontaneousOps[G] {
+  this: BipSpontaneous[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("spontaneous")
 }
diff --git a/src/col/vct/col/ast/family/catchclause/CatchClauseImpl.scala b/src/col/vct/col/ast/family/catchclause/CatchClauseImpl.scala
index 0bd2b4aaae..8c094ea6a1 100644
--- a/src/col/vct/col/ast/family/catchclause/CatchClauseImpl.scala
+++ b/src/col/vct/col/ast/family/catchclause/CatchClauseImpl.scala
@@ -5,9 +5,11 @@ import vct.col.ast.{CatchClause, Declaration}
 import vct.col.print._
 import vct.col.ast.ops.{CatchClauseOps, CatchClauseFamilyOps}
 
-trait CatchClauseImpl[G] extends Declarator[G] with CatchClauseOps[G] with CatchClauseFamilyOps[G] { this: CatchClause[G] =>
+trait CatchClauseImpl[G]
+    extends Declarator[G] with CatchClauseOps[G] with CatchClauseFamilyOps[G] {
+  this: CatchClause[G] =>
   override def declarations: Seq[Declaration[G]] = Seq(decl)
 
   override def layout(implicit ctx: Ctx): Doc =
     Text("catch") <+> "(" <> decl <> ")" <+> body.layoutAsBlock
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/coercion/CoerceBoolResourceImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceBoolResourceImpl.scala
index 2b0e0746ff..7d3d0f74b3 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceBoolResourceImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceBoolResourceImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceBoolResource, TResource}
 import vct.col.ast.ops.CoerceBoolResourceOps
 
-trait CoerceBoolResourceImpl[G] extends CoerceBoolResourceOps[G] { this: CoerceBoolResource[G] => 
+trait CoerceBoolResourceImpl[G] extends CoerceBoolResourceOps[G] {
+  this: CoerceBoolResource[G] =>
   override def target: TResource[G] = TResource()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceBoundIntFloatImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceBoundIntFloatImpl.scala
index 9fa78412b4..af4fa2322e 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceBoundIntFloatImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceBoundIntFloatImpl.scala
@@ -3,5 +3,6 @@ package vct.col.ast.family.coercion
 import vct.col.ast.CoerceBoundIntFloat
 import vct.col.ast.ops.CoerceBoundIntFloatOps
 
-trait CoerceBoundIntFloatImpl[G] extends CoerceBoundIntFloatOps[G] { this: CoerceBoundIntFloat[G] =>
+trait CoerceBoundIntFloatImpl[G] extends CoerceBoundIntFloatOps[G] {
+  this: CoerceBoundIntFloat[G] =>
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceBoundIntFracImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceBoundIntFracImpl.scala
index 6e2870642a..5d66972c16 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceBoundIntFracImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceBoundIntFracImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceBoundIntFrac, TFraction}
 import vct.col.ast.ops.CoerceBoundIntFracOps
 
-trait CoerceBoundIntFracImpl[G] extends CoerceBoundIntFracOps[G] { this: CoerceBoundIntFrac[G] =>
+trait CoerceBoundIntFracImpl[G] extends CoerceBoundIntFracOps[G] {
+  this: CoerceBoundIntFrac[G] =>
   override def target: TFraction[G] = TFraction()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceBoundIntZFracImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceBoundIntZFracImpl.scala
index 1bfadfa895..23871e2e15 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceBoundIntZFracImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceBoundIntZFracImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceBoundIntZFrac, TZFraction}
 import vct.col.ast.ops.CoerceBoundIntZFracOps
 
-trait CoerceBoundIntZFracImpl[G] extends CoerceBoundIntZFracOps[G] { this: CoerceBoundIntZFrac[G] =>
+trait CoerceBoundIntZFracImpl[G] extends CoerceBoundIntZFracOps[G] {
+  this: CoerceBoundIntZFrac[G] =>
   override def target: TZFraction[G] = TZFraction()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceCArrayPointerImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceCArrayPointerImpl.scala
index db72005193..e751398314 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceCArrayPointerImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceCArrayPointerImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceCArrayPointer, TPointer}
 import vct.col.ast.ops.CoerceCArrayPointerOps
 
-trait CoerceCArrayPointerImpl[G] extends CoerceCArrayPointerOps[G] { this: CoerceCArrayPointer[G] =>
+trait CoerceCArrayPointerImpl[G] extends CoerceCArrayPointerOps[G] {
+  this: CoerceCArrayPointer[G] =>
   override def target: TPointer[G] = TPointer(elementType)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceCFloatCIntImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceCFloatCIntImpl.scala
index 44eed6a7fb..ff78955dda 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceCFloatCIntImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceCFloatCIntImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceCFloatCInt, TCInt}
 import vct.col.ast.ops.CoerceCFloatCIntOps
 
-trait CoerceCFloatCIntImpl[G] extends CoerceCFloatCIntOps[G] { this: CoerceCFloatCInt[G] =>
+trait CoerceCFloatCIntImpl[G] extends CoerceCFloatCIntOps[G] {
+  this: CoerceCFloatCInt[G] =>
   override def target: TCInt[G] = TCInt()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceCFloatFloatImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceCFloatFloatImpl.scala
index be08998f3d..c043ce0816 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceCFloatFloatImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceCFloatFloatImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.CoerceCFloatFloat
 import vct.col.ast.ops.CoerceCFloatFloatOps
 
-trait CoerceCFloatFloatImpl[G] extends CoerceCFloatFloatOps[G] { this: CoerceCFloatFloat[G] =>
+trait CoerceCFloatFloatImpl[G] extends CoerceCFloatFloatOps[G] {
+  this: CoerceCFloatFloat[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/coercion/CoerceCIntCFloatImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceCIntCFloatImpl.scala
index 3c38306850..3a8b9ab067 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceCIntCFloatImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceCIntCFloatImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceCIntCFloat}
 import vct.col.ast.ops.CoerceCIntCFloatOps
 
-trait CoerceCIntCFloatImpl[G] extends CoerceCIntCFloatOps[G] { this: CoerceCIntCFloat[G] =>
+trait CoerceCIntCFloatImpl[G] extends CoerceCIntCFloatOps[G] {
+  this: CoerceCIntCFloat[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/coercion/CoerceCIntIntImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceCIntIntImpl.scala
index cf7ec8a5df..e79a6e51e2 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceCIntIntImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceCIntIntImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceCIntInt, TInt}
 import vct.col.ast.ops.CoerceCIntIntOps
 
-trait CoerceCIntIntImpl[G] extends CoerceCIntIntOps[G] { this: CoerceCIntInt[G] =>
+trait CoerceCIntIntImpl[G] extends CoerceCIntIntOps[G] {
+  this: CoerceCIntInt[G] =>
   override def target: TInt[G] = TInt()
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/coercion/CoerceCPPArrayPointerImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceCPPArrayPointerImpl.scala
index 087e8dd89e..d7af5e50db 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceCPPArrayPointerImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceCPPArrayPointerImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceCPPArrayPointer, TPointer}
 import vct.col.ast.ops.CoerceCPPArrayPointerOps
 
-trait CoerceCPPArrayPointerImpl[G] extends CoerceCPPArrayPointerOps[G] { this: CoerceCPPArrayPointer[G] =>
+trait CoerceCPPArrayPointerImpl[G] extends CoerceCPPArrayPointerOps[G] {
+  this: CoerceCPPArrayPointer[G] =>
   override def target: TPointer[G] = TPointer(elementType)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/coercion/CoerceCPPPrimitiveToColImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceCPPPrimitiveToColImpl.scala
index 3eee8c2edc..fca53dbb13 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceCPPPrimitiveToColImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceCPPPrimitiveToColImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.CoerceCPPPrimitiveToCol
 import vct.col.ast.ops.CoerceCPPPrimitiveToColOps
 
-trait CoerceCPPPrimitiveToColImpl[G] extends CoerceCPPPrimitiveToColOps[G] { this: CoerceCPPPrimitiveToCol[G] =>
-    
-}
\ No newline at end of file
+trait CoerceCPPPrimitiveToColImpl[G] extends CoerceCPPPrimitiveToColOps[G] {
+  this: CoerceCPPPrimitiveToCol[G] =>
+
+}
diff --git a/src/col/vct/col/ast/family/coercion/CoerceCPrimitiveToColImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceCPrimitiveToColImpl.scala
index 9b1520a5ac..0c90f37966 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceCPrimitiveToColImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceCPrimitiveToColImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.CoerceCPrimitiveToCol
 import vct.col.ast.ops.CoerceCPrimitiveToColOps
 
-trait CoerceCPrimitiveToColImpl[G] extends CoerceCPrimitiveToColOps[G] { this: CoerceCPrimitiveToCol[G] => 
-    
+trait CoerceCPrimitiveToColImpl[G] extends CoerceCPrimitiveToColOps[G] {
+  this: CoerceCPrimitiveToCol[G] =>
+
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceCVectorVectorImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceCVectorVectorImpl.scala
index 4be1a4fa3d..dfd481114c 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceCVectorVectorImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceCVectorVectorImpl.scala
@@ -3,7 +3,8 @@ package vct.col.ast.family.coercion
 import vct.col.ast.ops.CoerceCVectorVectorOps
 import vct.col.ast.{CoerceCVectorVector, TVector}
 
-trait CoerceCVectorVectorImpl[G] extends CoerceCVectorVectorOps[G] { this: CoerceCVectorVector[G] =>
+trait CoerceCVectorVectorImpl[G] extends CoerceCVectorVectorOps[G] {
+  this: CoerceCVectorVector[G] =>
   override def target: TVector[G] = TVector(size, elementType)()
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceClassAnyClassImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceClassAnyClassImpl.scala
index 78ddf9490f..6573ccfb82 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceClassAnyClassImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceClassAnyClassImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceClassAnyClass, TAnyClass}
 import vct.col.ast.ops.CoerceClassAnyClassOps
 
-trait CoerceClassAnyClassImpl[G] extends CoerceClassAnyClassOps[G] { this: CoerceClassAnyClass[G] =>
+trait CoerceClassAnyClassImpl[G] extends CoerceClassAnyClassOps[G] {
+  this: CoerceClassAnyClass[G] =>
   override def target: TAnyClass[G] = TAnyClass()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceColToCPPPrimitiveImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceColToCPPPrimitiveImpl.scala
index 5dad91ca51..72f72fb82a 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceColToCPPPrimitiveImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceColToCPPPrimitiveImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.CoerceColToCPPPrimitive
 import vct.col.ast.ops.CoerceColToCPPPrimitiveOps
 
-trait CoerceColToCPPPrimitiveImpl[G] extends CoerceColToCPPPrimitiveOps[G] { this: CoerceColToCPPPrimitive[G] =>
-    
-}
\ No newline at end of file
+trait CoerceColToCPPPrimitiveImpl[G] extends CoerceColToCPPPrimitiveOps[G] {
+  this: CoerceColToCPPPrimitive[G] =>
+
+}
diff --git a/src/col/vct/col/ast/family/coercion/CoerceColToCPrimitiveImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceColToCPrimitiveImpl.scala
index 4ac453f954..7685dd8047 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceColToCPrimitiveImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceColToCPrimitiveImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.CoerceColToCPrimitive
 import vct.col.ast.ops.CoerceColToCPrimitiveOps
 
-trait CoerceColToCPrimitiveImpl[G] extends CoerceColToCPrimitiveOps[G] { this: CoerceColToCPrimitive[G] => 
-    
+trait CoerceColToCPrimitiveImpl[G] extends CoerceColToCPrimitiveOps[G] {
+  this: CoerceColToCPrimitive[G] =>
+
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceFloatRatImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceFloatRatImpl.scala
index 5a60fb8baa..6adeb2a2aa 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceFloatRatImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceFloatRatImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceFloatRat, TRational}
 import vct.col.ast.ops.CoerceFloatRatOps
 
-trait CoerceFloatRatImpl[G] extends CoerceFloatRatOps[G] { this: CoerceFloatRat[G] => 
+trait CoerceFloatRatImpl[G] extends CoerceFloatRatOps[G] {
+  this: CoerceFloatRat[G] =>
   override def target: TRational[G] = TRational()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceFracZFracImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceFracZFracImpl.scala
index 2bafba86cf..43e9828c1e 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceFracZFracImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceFracZFracImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceFracZFrac, TZFraction}
 import vct.col.ast.ops.CoerceFracZFracOps
 
-trait CoerceFracZFracImpl[G] extends CoerceFracZFracOps[G] { this: CoerceFracZFrac[G] => 
+trait CoerceFracZFracImpl[G] extends CoerceFracZFracOps[G] {
+  this: CoerceFracZFrac[G] =>
   override def target: TZFraction[G] = TZFraction()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceIdentityImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceIdentityImpl.scala
index 9e1a4774ca..f089cb1e96 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceIdentityImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceIdentityImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceIdentity, Type}
 import vct.col.ast.ops.CoerceIdentityOps
 
-trait CoerceIdentityImpl[G] extends CoerceIdentityOps[G] { this: CoerceIdentity[G] =>
+trait CoerceIdentityImpl[G] extends CoerceIdentityOps[G] {
+  this: CoerceIdentity[G] =>
   override def target: Type[G] = source
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceIntRatImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceIntRatImpl.scala
index 6d7300dd3a..818e4dc472 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceIntRatImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceIntRatImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceIntRat, TRational}
 import vct.col.ast.ops.CoerceIntRatOps
 
-trait CoerceIntRatImpl[G] extends CoerceIntRatOps[G] { this: CoerceIntRat[G] =>
+trait CoerceIntRatImpl[G] extends CoerceIntRatOps[G] {
+  this: CoerceIntRat[G] =>
   override def target: TRational[G] = TRational()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceJavaClassAnyClassImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceJavaClassAnyClassImpl.scala
index e5f6f9a0bc..8725e9da29 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceJavaClassAnyClassImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceJavaClassAnyClassImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceJavaClassAnyClass, TAnyClass}
 import vct.col.ast.ops.CoerceJavaClassAnyClassOps
 
-trait CoerceJavaClassAnyClassImpl[G] extends CoerceJavaClassAnyClassOps[G] { this: CoerceJavaClassAnyClass[G] =>
+trait CoerceJavaClassAnyClassImpl[G] extends CoerceJavaClassAnyClassOps[G] {
+  this: CoerceJavaClassAnyClass[G] =>
   override def target: TAnyClass[G] = TAnyClass()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceJavaSupportsImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceJavaSupportsImpl.scala
index eb5d626e48..51c1fe8775 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceJavaSupportsImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceJavaSupportsImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceJavaSupports, JavaTClass}
 import vct.col.ast.ops.CoerceJavaSupportsOps
 
-trait CoerceJavaSupportsImpl[G] extends CoerceJavaSupportsOps[G] { this: CoerceJavaSupports[G] => 
+trait CoerceJavaSupportsImpl[G] extends CoerceJavaSupportsOps[G] {
+  this: CoerceJavaSupports[G] =>
   override def target: JavaTClass[G] = JavaTClass(targetClass, Nil)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceJoinUnionImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceJoinUnionImpl.scala
index e82d752f63..834e8b05f7 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceJoinUnionImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceJoinUnionImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.CoerceJoinUnion
 import vct.col.ast.ops.CoerceJoinUnionOps
 
-trait CoerceJoinUnionImpl[G] extends CoerceJoinUnionOps[G] { this: CoerceJoinUnion[G] => 
-    
+trait CoerceJoinUnionImpl[G] extends CoerceJoinUnionOps[G] {
+  this: CoerceJoinUnion[G] =>
+
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceMapBagImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceMapBagImpl.scala
index c70d8a7895..692fd79d2a 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceMapBagImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceMapBagImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceMapBag, TBag}
 import vct.col.ast.ops.CoerceMapBagOps
 
-trait CoerceMapBagImpl[G] extends CoerceMapBagOps[G] { this: CoerceMapBag[G] => 
+trait CoerceMapBagImpl[G] extends CoerceMapBagOps[G] {
+  this: CoerceMapBag[G] =>
   override def target: TBag[G] = TBag(targetBagElement)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceMapEitherImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceMapEitherImpl.scala
index fd6b2a910d..ba259431f6 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceMapEitherImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceMapEitherImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceMapEither, TEither}
 import vct.col.ast.ops.CoerceMapEitherOps
 
-trait CoerceMapEitherImpl[G] extends CoerceMapEitherOps[G] { this: CoerceMapEither[G] => 
+trait CoerceMapEitherImpl[G] extends CoerceMapEitherOps[G] {
+  this: CoerceMapEither[G] =>
   override def target: TEither[G] = TEither(targetTypes._1, targetTypes._2)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceMapMapImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceMapMapImpl.scala
index 9550970ebc..eb4c48a75f 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceMapMapImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceMapMapImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceMapMap, TMap}
 import vct.col.ast.ops.CoerceMapMapOps
 
-trait CoerceMapMapImpl[G] extends CoerceMapMapOps[G] { this: CoerceMapMap[G] => 
+trait CoerceMapMapImpl[G] extends CoerceMapMapOps[G] {
+  this: CoerceMapMap[G] =>
   def target: TMap[G] = TMap(targetTypes._1, targetTypes._2)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceMapMatrixImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceMapMatrixImpl.scala
index 4acedcb7fd..9ada3224d4 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceMapMatrixImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceMapMatrixImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceMapMatrix, TMatrix}
 import vct.col.ast.ops.CoerceMapMatrixOps
 
-trait CoerceMapMatrixImpl[G] extends CoerceMapMatrixOps[G] { this: CoerceMapMatrix[G] => 
+trait CoerceMapMatrixImpl[G] extends CoerceMapMatrixOps[G] {
+  this: CoerceMapMatrix[G] =>
   override def target: TMatrix[G] = TMatrix(targetMatrixElement)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceMapOptionImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceMapOptionImpl.scala
index 2de351a2c2..e1e93667bb 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceMapOptionImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceMapOptionImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceMapOption, TOption}
 import vct.col.ast.ops.CoerceMapOptionOps
 
-trait CoerceMapOptionImpl[G] extends CoerceMapOptionOps[G] { this: CoerceMapOption[G] => 
+trait CoerceMapOptionImpl[G] extends CoerceMapOptionOps[G] {
+  this: CoerceMapOption[G] =>
   override def target: TOption[G] = TOption(targetOptionElement)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceMapSeqImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceMapSeqImpl.scala
index 5347be4afc..4d5e460eb6 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceMapSeqImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceMapSeqImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceMapSeq, TSeq}
 import vct.col.ast.ops.CoerceMapSeqOps
 
-trait CoerceMapSeqImpl[G] extends CoerceMapSeqOps[G] { this: CoerceMapSeq[G] => 
+trait CoerceMapSeqImpl[G] extends CoerceMapSeqOps[G] {
+  this: CoerceMapSeq[G] =>
   override def target: TSeq[G] = TSeq(targetSeqElement)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceMapSetImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceMapSetImpl.scala
index e978a13727..f6571f944f 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceMapSetImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceMapSetImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceMapSet, TSet}
 import vct.col.ast.ops.CoerceMapSetOps
 
-trait CoerceMapSetImpl[G] extends CoerceMapSetOps[G] { this: CoerceMapSet[G] => 
+trait CoerceMapSetImpl[G] extends CoerceMapSetOps[G] {
+  this: CoerceMapSet[G] =>
   override def target: TSet[G] = TSet(targetSetElement)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceMapTupleImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceMapTupleImpl.scala
index e7319cb503..23b0595836 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceMapTupleImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceMapTupleImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceMapTuple, TTuple}
 import vct.col.ast.ops.CoerceMapTupleOps
 
-trait CoerceMapTupleImpl[G] extends CoerceMapTupleOps[G] { this: CoerceMapTuple[G] => 
+trait CoerceMapTupleImpl[G] extends CoerceMapTupleOps[G] {
+  this: CoerceMapTuple[G] =>
   override def target: TTuple[G] = TTuple(targetTypes)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceMapTypeImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceMapTypeImpl.scala
index 1f469ead02..3043dc1fe6 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceMapTypeImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceMapTypeImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceMapType, TType}
 import vct.col.ast.ops.CoerceMapTypeOps
 
-trait CoerceMapTypeImpl[G] extends CoerceMapTypeOps[G] { this: CoerceMapType[G] => 
+trait CoerceMapTypeImpl[G] extends CoerceMapTypeOps[G] {
+  this: CoerceMapType[G] =>
   def target: TType[G] = TType(targetBound)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceMapVectorImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceMapVectorImpl.scala
index 60c450bff7..ed91b97a80 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceMapVectorImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceMapVectorImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceMapVector, TVector}
 import vct.col.ast.ops.CoerceMapVectorOps
 
-trait CoerceMapVectorImpl[G] extends CoerceMapVectorOps[G] { this: CoerceMapVector[G] =>
+trait CoerceMapVectorImpl[G] extends CoerceMapVectorOps[G] {
+  this: CoerceMapVector[G] =>
   override def target: TVector[G] = TVector(size, targetVectorElement)()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceNothingSomethingImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceNothingSomethingImpl.scala
index a55ab08c57..61d155e4c3 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceNothingSomethingImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceNothingSomethingImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.CoerceNothingSomething
 import vct.col.ast.ops.CoerceNothingSomethingOps
 
-trait CoerceNothingSomethingImpl[G] extends CoerceNothingSomethingOps[G] { this: CoerceNothingSomething[G] =>
+trait CoerceNothingSomethingImpl[G] extends CoerceNothingSomethingOps[G] {
+  this: CoerceNothingSomething[G] =>
 
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceNullAnyClassImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceNullAnyClassImpl.scala
index 17a3294fc7..8d0dc38430 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceNullAnyClassImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceNullAnyClassImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceNullAnyClass, TAnyClass}
 import vct.col.ast.ops.CoerceNullAnyClassOps
 
-trait CoerceNullAnyClassImpl[G] extends CoerceNullAnyClassOps[G] { this: CoerceNullAnyClass[G] =>
+trait CoerceNullAnyClassImpl[G] extends CoerceNullAnyClassOps[G] {
+  this: CoerceNullAnyClass[G] =>
   override def target: TAnyClass[G] = TAnyClass()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceNullArrayImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceNullArrayImpl.scala
index 630b811319..020b95e812 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceNullArrayImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceNullArrayImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceNullArray, TArray}
 import vct.col.ast.ops.CoerceNullArrayOps
 
-trait CoerceNullArrayImpl[G] extends CoerceNullArrayOps[G] { this: CoerceNullArray[G] => 
+trait CoerceNullArrayImpl[G] extends CoerceNullArrayOps[G] {
+  this: CoerceNullArray[G] =>
   override def target: TArray[G] = TArray(arrayElementType)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceNullClassImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceNullClassImpl.scala
index d52c5635db..4dc7f0662b 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceNullClassImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceNullClassImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceNullClass, TClass}
 import vct.col.ast.ops.CoerceNullClassOps
 
-trait CoerceNullClassImpl[G] extends CoerceNullClassOps[G] { this: CoerceNullClass[G] => 
+trait CoerceNullClassImpl[G] extends CoerceNullClassOps[G] {
+  this: CoerceNullClass[G] =>
   override def target: TClass[G] = TClass(targetClass, typeArgs)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceNullEnumImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceNullEnumImpl.scala
index c48d08ab69..bcd2744a83 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceNullEnumImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceNullEnumImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceNullEnum, TEnum}
 import vct.col.ast.ops.CoerceNullEnumOps
 
-trait CoerceNullEnumImpl[G] extends CoerceNullEnumOps[G] { this: CoerceNullEnum[G] =>
+trait CoerceNullEnumImpl[G] extends CoerceNullEnumOps[G] {
+  this: CoerceNullEnum[G] =>
   override def target: TEnum[G] = TEnum(targetEnum)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceNullJavaClassImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceNullJavaClassImpl.scala
index 9b775133a3..dcd80d1571 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceNullJavaClassImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceNullJavaClassImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceNullJavaClass, JavaTClass}
 import vct.col.ast.ops.CoerceNullJavaClassOps
 
-trait CoerceNullJavaClassImpl[G] extends CoerceNullJavaClassOps[G] { this: CoerceNullJavaClass[G] => 
+trait CoerceNullJavaClassImpl[G] extends CoerceNullJavaClassOps[G] {
+  this: CoerceNullJavaClass[G] =>
   override def target: JavaTClass[G] = JavaTClass(targetClass, Nil)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceNullPointerImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceNullPointerImpl.scala
index a3738dfc4a..d5ac3ea93b 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceNullPointerImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceNullPointerImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceNullPointer, TPointer}
 import vct.col.ast.ops.CoerceNullPointerOps
 
-trait CoerceNullPointerImpl[G] extends CoerceNullPointerOps[G] { this: CoerceNullPointer[G] => 
+trait CoerceNullPointerImpl[G] extends CoerceNullPointerOps[G] {
+  this: CoerceNullPointer[G] =>
   override def target: TPointer[G] = TPointer(pointerElementType)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceNullRefImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceNullRefImpl.scala
index f2ff5c16ba..d9a7d6e92c 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceNullRefImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceNullRefImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceNullRef, TRef}
 import vct.col.ast.ops.CoerceNullRefOps
 
-trait CoerceNullRefImpl[G] extends CoerceNullRefOps[G] { this: CoerceNullRef[G] => 
+trait CoerceNullRefImpl[G] extends CoerceNullRefOps[G] {
+  this: CoerceNullRef[G] =>
   override def target: TRef[G] = TRef()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceRatZFracImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceRatZFracImpl.scala
index 58299a680c..665c41ec73 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceRatZFracImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceRatZFracImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceRatZFrac, TZFraction}
 import vct.col.ast.ops.CoerceRatZFracOps
 
-trait CoerceRatZFracImpl[G] extends CoerceRatZFracOps[G] { this: CoerceRatZFrac[G] =>
+trait CoerceRatZFracImpl[G] extends CoerceRatZFracOps[G] {
+  this: CoerceRatZFrac[G] =>
   override def target: TZFraction[G] = TZFraction()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceResourceResourceValImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceResourceResourceValImpl.scala
index 2d04793f72..dc07b0716e 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceResourceResourceValImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceResourceResourceValImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceResourceResourceVal, TResourceVal}
 import vct.col.ast.ops.CoerceResourceResourceValOps
 
-trait CoerceResourceResourceValImpl[G] extends CoerceResourceResourceValOps[G] { this: CoerceResourceResourceVal[G] =>
+trait CoerceResourceResourceValImpl[G] extends CoerceResourceResourceValOps[G] {
+  this: CoerceResourceResourceVal[G] =>
   override def target: TResourceVal[G] = TResourceVal()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceResourceValResourceImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceResourceValResourceImpl.scala
index a57254ab1a..faff771482 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceResourceValResourceImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceResourceValResourceImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceResourceValResource, TResource}
 import vct.col.ast.ops.CoerceResourceValResourceOps
 
-trait CoerceResourceValResourceImpl[G] extends CoerceResourceValResourceOps[G] { this: CoerceResourceValResource[G] =>
+trait CoerceResourceValResourceImpl[G] extends CoerceResourceValResourceOps[G] {
+  this: CoerceResourceValResource[G] =>
   override def target: TResource[G] = TResource()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceSelectUnionImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceSelectUnionImpl.scala
index 89b0515215..6eefb54061 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceSelectUnionImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceSelectUnionImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceSelectUnion, TUnion}
 import vct.col.ast.ops.CoerceSelectUnionOps
 
-trait CoerceSelectUnionImpl[G] extends CoerceSelectUnionOps[G] { this: CoerceSelectUnion[G] => 
+trait CoerceSelectUnionImpl[G] extends CoerceSelectUnionOps[G] {
+  this: CoerceSelectUnion[G] =>
   override def target: TUnion[G] = TUnion(targetAlts)
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceSomethingAnyImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceSomethingAnyImpl.scala
index ecc2a5bcf6..f5c9c2fcb3 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceSomethingAnyImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceSomethingAnyImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceSomethingAny, Type, TAny}
 import vct.col.ast.ops.CoerceSomethingAnyOps
 
-trait CoerceSomethingAnyImpl[G] extends CoerceSomethingAnyOps[G] { this: CoerceSomethingAny[G] =>
+trait CoerceSomethingAnyImpl[G] extends CoerceSomethingAnyOps[G] {
+  this: CoerceSomethingAny[G] =>
   override def target: Type[G] = TAny()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceSomethingAnyValueImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceSomethingAnyValueImpl.scala
index 0ae84126db..c6eb2f4a7d 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceSomethingAnyValueImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceSomethingAnyValueImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceSomethingAnyValue, TAnyValue, Type}
 import vct.col.ast.ops.CoerceSomethingAnyValueOps
 
-trait CoerceSomethingAnyValueImpl[G] extends CoerceSomethingAnyValueOps[G] { this: CoerceSomethingAnyValue[G] =>
+trait CoerceSomethingAnyValueImpl[G] extends CoerceSomethingAnyValueOps[G] {
+  this: CoerceSomethingAnyValue[G] =>
   override def target: Type[G] = TAnyValue()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceSupportsImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceSupportsImpl.scala
index 3585d774d6..e0ce3a4353 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceSupportsImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceSupportsImpl.scala
@@ -3,7 +3,9 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceSupports, TClass}
 import vct.col.ast.ops.CoerceSupportsOps
 
-trait CoerceSupportsImpl[G] extends CoerceSupportsOps[G] { this: CoerceSupports[G] =>
+trait CoerceSupportsImpl[G] extends CoerceSupportsOps[G] {
+  this: CoerceSupports[G] =>
   // TODO (RR): Integrate coercions with generics?
-  override def target: TClass[G] = TClass(targetClass, { assert(sourceClass.decl.typeArgs.isEmpty); Seq() })
+  override def target: TClass[G] =
+    TClass(targetClass, { assert(sourceClass.decl.typeArgs.isEmpty); Seq() })
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceUnboundIntImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceUnboundIntImpl.scala
index a92d365b62..90aead95c5 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceUnboundIntImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceUnboundIntImpl.scala
@@ -3,5 +3,6 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceUnboundInt, TInt}
 import vct.col.ast.ops.CoerceUnboundIntOps
 
-trait CoerceUnboundIntImpl[G] extends CoerceUnboundIntOps[G] { this: CoerceUnboundInt[G] =>
+trait CoerceUnboundIntImpl[G] extends CoerceUnboundIntOps[G] {
+  this: CoerceUnboundInt[G] =>
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceWidenBoundImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceWidenBoundImpl.scala
index 3efc9b5d53..949672214b 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceWidenBoundImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceWidenBoundImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.CoerceWidenBound
 import vct.col.ast.ops.CoerceWidenBoundOps
 
-trait CoerceWidenBoundImpl[G] extends CoerceWidenBoundOps[G] { this: CoerceWidenBound[G] => 
-    
+trait CoerceWidenBoundImpl[G] extends CoerceWidenBoundOps[G] {
+  this: CoerceWidenBound[G] =>
+
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceZFracFracImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceZFracFracImpl.scala
index 133fb6876a..71c646abd3 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceZFracFracImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceZFracFracImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceZFracFrac, TFraction}
 import vct.col.ast.ops.CoerceZFracFracOps
 
-trait CoerceZFracFracImpl[G] extends CoerceZFracFracOps[G] { this: CoerceZFracFrac[G] =>
+trait CoerceZFracFracImpl[G] extends CoerceZFracFracOps[G] {
+  this: CoerceZFracFrac[G] =>
   override def target: TFraction[G] = TFraction()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoerceZFracRatImpl.scala b/src/col/vct/col/ast/family/coercion/CoerceZFracRatImpl.scala
index 5852a5ff6f..cb83cac581 100644
--- a/src/col/vct/col/ast/family/coercion/CoerceZFracRatImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoerceZFracRatImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoerceZFracRat, TRational}
 import vct.col.ast.ops.CoerceZFracRatOps
 
-trait CoerceZFracRatImpl[G] extends CoerceZFracRatOps[G] { this: CoerceZFracRat[G] => 
+trait CoerceZFracRatImpl[G] extends CoerceZFracRatOps[G] {
+  this: CoerceZFracRat[G] =>
   override def target: TRational[G] = TRational()
 }
diff --git a/src/col/vct/col/ast/family/coercion/CoercionImpl.scala b/src/col/vct/col/ast/family/coercion/CoercionImpl.scala
index 81a7914b52..738aae3fdc 100644
--- a/src/col/vct/col/ast/family/coercion/CoercionImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoercionImpl.scala
@@ -3,84 +3,89 @@ package vct.col.ast.family.coercion
 import vct.col.ast._
 import vct.col.ast.ops.CoercionFamilyOps
 
-trait CoercionImpl[G] extends CoercionFamilyOps[G] { this: Coercion[G] =>
+trait CoercionImpl[G] extends CoercionFamilyOps[G] {
+  this: Coercion[G] =>
   def target: Type[G]
 
-  def isCPromoting: Boolean = this match {
-    case CoerceDecreasePrecision(_, _) => false
-    case CoerceCFloatCInt(_) => false
-    case CoercionSequence(coercions) => coercions.forall(_.isCPromoting)
-    case CoerceJoinUnion(inner, _, _) => inner.forall(_.isPromoting)
-    case CoerceSelectUnion(inner, _, _, _) => inner.isPromoting
-    case CoerceMapOption(inner, _, _) => inner.isCPromoting
-    case CoerceMapTuple(inner, _, _) => inner.forall(_.isCPromoting)
-    case CoerceMapEither(inner, _, _) => inner._1.isCPromoting && inner._2.isCPromoting
-    case CoerceMapSeq(inner, _, _) => inner.isCPromoting
-    case CoerceMapSet(inner, _, _) => inner.isCPromoting
-    case CoerceMapVector(inner, _, _, _) => inner.isCPromoting
-    case CoerceMapBag(inner, _, _) => inner.isCPromoting
-    case CoerceMapMatrix(inner, _, _) => inner.isCPromoting
-    case CoerceMapMap(inner, _, _) => inner.isCPromoting
-    case CoerceMapType(inner, _, _) => inner.isCPromoting
-    case _ => true
-  }
+  def isCPromoting: Boolean =
+    this match {
+      case CoerceDecreasePrecision(_, _) => false
+      case CoerceCFloatCInt(_) => false
+      case CoercionSequence(coercions) => coercions.forall(_.isCPromoting)
+      case CoerceJoinUnion(inner, _, _) => inner.forall(_.isPromoting)
+      case CoerceSelectUnion(inner, _, _, _) => inner.isPromoting
+      case CoerceMapOption(inner, _, _) => inner.isCPromoting
+      case CoerceMapTuple(inner, _, _) => inner.forall(_.isCPromoting)
+      case CoerceMapEither(inner, _, _) =>
+        inner._1.isCPromoting && inner._2.isCPromoting
+      case CoerceMapSeq(inner, _, _) => inner.isCPromoting
+      case CoerceMapSet(inner, _, _) => inner.isCPromoting
+      case CoerceMapVector(inner, _, _, _) => inner.isCPromoting
+      case CoerceMapBag(inner, _, _) => inner.isCPromoting
+      case CoerceMapMatrix(inner, _, _) => inner.isCPromoting
+      case CoerceMapMap(inner, _, _) => inner.isCPromoting
+      case CoerceMapType(inner, _, _) => inner.isCPromoting
+      case _ => true
+    }
 
-  def isPromoting: Boolean = this match {
-    case CoerceIdentity(_) => true
-    case CoercionSequence(coercions) => coercions.forall(_.isPromoting)
-    case CoerceNothingSomething(_) => true
-    case CoerceSomethingAny(_) => true
-    case CoerceSomethingAnyValue(_) => true
-    case CoerceJoinUnion(inner, _, _) => inner.forall(_.isPromoting)
-    case CoerceSelectUnion(inner, _, _, _) => inner.isPromoting
-    case CoerceBoolResource() => true
-    case CoerceNullRef() => true
-    case CoerceNullArray(_) => true
-    case CoerceNullClass(_, _) => true
-    case CoerceNullJavaClass(_) => true
-    case CoerceNullAnyClass() => true
-    case CoerceNullPointer(_) => true
-    case CoerceNullEnum(_) => true
-    case CoerceFracZFrac() => true
-    case CoerceZFracRat() => true
-    case CoerceFloatRat(_) => true
-    case CoerceIncreasePrecision(_, _) => true
-    case CoerceIntRat() => true
-    case CoerceWidenBound(_, _) => true
-    case CoerceUnboundInt(_, _) => true
-    case CoerceBoundIntFrac() => true
-    case CoerceBoundIntZFrac(_) => true
-    case CoerceSupports(_, _) => true
-    case CoerceJavaSupports(_, _) => true
-    case CoerceClassAnyClass(_, _) => true
-    case CoerceJavaClassAnyClass(_) => true
-    case CoerceCPrimitiveToCol(_, _) => true
-    case CoerceColToCPrimitive(_, _) => true
-    case CoerceCPPPrimitiveToCol(_, _) => true
-    case CoerceColToCPPPrimitive(_, _) => true
-    case CoerceCPPArrayPointer(_) => true
-    case CoerceCArrayPointer(_) => true
-    case CoerceCVectorVector(_, _) => true
-    case CoerceResourceResourceVal() => true
-    case CoerceResourceValResource() => true
-    case CoerceMapOption(inner, _, _) => inner.isPromoting
-    case CoerceMapTuple(inner, _, _) => inner.forall(_.isPromoting)
-    case CoerceMapEither(inner, _, _) => inner._1.isPromoting && inner._2.isPromoting
-    case CoerceMapSeq(inner, _, _) => inner.isPromoting
-    case CoerceMapSet(inner, _, _) => inner.isPromoting
-    case CoerceMapVector(inner, _, _, _) => inner.isPromoting
-    case CoerceMapBag(inner, _, _) => inner.isPromoting
-    case CoerceMapMatrix(inner, _, _) => inner.isPromoting
-    case CoerceMapMap(inner, _, _) => inner.isPromoting
-    case CoerceMapType(inner, _, _) => inner.isPromoting
-    case CoerceRatZFrac() => false
-    case CoerceZFracFrac() => false
-    case CoerceBoundIntFloat(_, _) => false
+  def isPromoting: Boolean =
+    this match {
+      case CoerceIdentity(_) => true
+      case CoercionSequence(coercions) => coercions.forall(_.isPromoting)
+      case CoerceNothingSomething(_) => true
+      case CoerceSomethingAny(_) => true
+      case CoerceSomethingAnyValue(_) => true
+      case CoerceJoinUnion(inner, _, _) => inner.forall(_.isPromoting)
+      case CoerceSelectUnion(inner, _, _, _) => inner.isPromoting
+      case CoerceBoolResource() => true
+      case CoerceNullRef() => true
+      case CoerceNullArray(_) => true
+      case CoerceNullClass(_, _) => true
+      case CoerceNullJavaClass(_) => true
+      case CoerceNullAnyClass() => true
+      case CoerceNullPointer(_) => true
+      case CoerceNullEnum(_) => true
+      case CoerceFracZFrac() => true
+      case CoerceZFracRat() => true
+      case CoerceFloatRat(_) => true
+      case CoerceIncreasePrecision(_, _) => true
+      case CoerceIntRat() => true
+      case CoerceWidenBound(_, _) => true
+      case CoerceUnboundInt(_, _) => true
+      case CoerceBoundIntFrac() => true
+      case CoerceBoundIntZFrac(_) => true
+      case CoerceSupports(_, _) => true
+      case CoerceJavaSupports(_, _) => true
+      case CoerceClassAnyClass(_, _) => true
+      case CoerceJavaClassAnyClass(_) => true
+      case CoerceCPrimitiveToCol(_, _) => true
+      case CoerceColToCPrimitive(_, _) => true
+      case CoerceCPPPrimitiveToCol(_, _) => true
+      case CoerceColToCPPPrimitive(_, _) => true
+      case CoerceCPPArrayPointer(_) => true
+      case CoerceCArrayPointer(_) => true
+      case CoerceCVectorVector(_, _) => true
+      case CoerceResourceResourceVal() => true
+      case CoerceResourceValResource() => true
+      case CoerceMapOption(inner, _, _) => inner.isPromoting
+      case CoerceMapTuple(inner, _, _) => inner.forall(_.isPromoting)
+      case CoerceMapEither(inner, _, _) =>
+        inner._1.isPromoting && inner._2.isPromoting
+      case CoerceMapSeq(inner, _, _) => inner.isPromoting
+      case CoerceMapSet(inner, _, _) => inner.isPromoting
+      case CoerceMapVector(inner, _, _, _) => inner.isPromoting
+      case CoerceMapBag(inner, _, _) => inner.isPromoting
+      case CoerceMapMatrix(inner, _, _) => inner.isPromoting
+      case CoerceMapMap(inner, _, _) => inner.isPromoting
+      case CoerceMapType(inner, _, _) => inner.isPromoting
+      case CoerceRatZFrac() => false
+      case CoerceZFracFrac() => false
+      case CoerceBoundIntFloat(_, _) => false
 
-    case CoerceCIntCFloat(_) => true
-    case CoerceCIntInt() => true
-    case CoerceCFloatFloat(_, _) => true
-    case CoerceDecreasePrecision(_, _) => false
-    case CoerceCFloatCInt(_) => false
-  }
-}
\ No newline at end of file
+      case CoerceCIntCFloat(_) => true
+      case CoerceCIntInt() => true
+      case CoerceCFloatFloat(_, _) => true
+      case CoerceDecreasePrecision(_, _) => false
+      case CoerceCFloatCInt(_) => false
+    }
+}
diff --git a/src/col/vct/col/ast/family/coercion/CoercionSequenceImpl.scala b/src/col/vct/col/ast/family/coercion/CoercionSequenceImpl.scala
index 1a9a363b30..d616b19e86 100644
--- a/src/col/vct/col/ast/family/coercion/CoercionSequenceImpl.scala
+++ b/src/col/vct/col/ast/family/coercion/CoercionSequenceImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.coercion
 import vct.col.ast.{CoercionSequence, Type}
 import vct.col.ast.ops.CoercionSequenceOps
 
-trait CoercionSequenceImpl[G] extends CoercionSequenceOps[G] { this: CoercionSequence[G] =>
+trait CoercionSequenceImpl[G] extends CoercionSequenceOps[G] {
+  this: CoercionSequence[G] =>
   override def target: Type[G] = coercions.last.target
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/contract/ApplicableContractImpl.scala b/src/col/vct/col/ast/family/contract/ApplicableContractImpl.scala
index 71c0f49fcc..2f624e3dd4 100644
--- a/src/col/vct/col/ast/family/contract/ApplicableContractImpl.scala
+++ b/src/col/vct/col/ast/family/contract/ApplicableContractImpl.scala
@@ -1,30 +1,60 @@
 package vct.col.ast.family.contract
 
-import vct.col.ast.{ApplicableContract, BooleanValue, Node, UnitAccountedPredicate}
+import vct.col.ast.{
+  ApplicableContract,
+  BooleanValue,
+  Node,
+  UnitAccountedPredicate,
+}
 import vct.col.ast.node.NodeFamilyImpl
 import vct.col.check.{CheckContext, CheckError}
 import vct.col.print._
 import vct.col.ast.ops.{ApplicableContractOps, ApplicableContractFamilyOps}
 
-trait ApplicableContractImpl[G] extends NodeFamilyImpl[G] with ApplicableContractOps[G] with ApplicableContractFamilyOps[G] { this: ApplicableContract[G] =>
-  override def checkContextRecursor[T](context: CheckContext[G], f: (CheckContext[G], Node[G]) => T): Seq[T] =
+trait ApplicableContractImpl[G]
+    extends NodeFamilyImpl[G]
+    with ApplicableContractOps[G]
+    with ApplicableContractFamilyOps[G] {
+  this: ApplicableContract[G] =>
+  override def checkContextRecursor[T](
+      context: CheckContext[G],
+      f: (CheckContext[G], Node[G]) => T,
+  ): Seq[T] =
     this match {
       // Redundant match so this doesn't compile if we add a field to ApplicableContract
-      case ApplicableContract(requires, ensures, contextEverywhere, signals, givenArgs, yieldsArgs, decreases) =>
+      case ApplicableContract(
+            requires,
+            ensures,
+            contextEverywhere,
+            signals,
+            givenArgs,
+            yieldsArgs,
+            decreases,
+          ) =>
         f(context.withUndeclared(yieldsArgs).withPrecondition, requires) +:
-          f(context.withPostcondition, ensures) +:
-          f(context.withUndeclared(yieldsArgs).withPrecondition, contextEverywhere) +: (
-            signals.map(f(context, _)) ++
-              givenArgs.map(f(context, _)) ++
-              yieldsArgs.map(f(context, _)) ++
-              decreases.toSeq.map(f(context.withUndeclared(yieldsArgs), _))
-          )
+          f(context.withPostcondition, ensures) +: f(
+            context.withUndeclared(yieldsArgs).withPrecondition,
+            contextEverywhere,
+          ) +:
+          (signals.map(f(context, _)) ++ givenArgs.map(f(context, _)) ++
+            yieldsArgs.map(f(context, _)) ++
+            decreases.toSeq.map(f(context.withUndeclared(yieldsArgs), _)))
     }
 
-  def isEmpty: Boolean = this match {
-    case ApplicableContract(UnitAccountedPredicate(BooleanValue(true)), UnitAccountedPredicate(BooleanValue(true)), BooleanValue(true), Nil, Nil, Nil, None) => true
-    case _ => false
-  }
+  def isEmpty: Boolean =
+    this match {
+      case ApplicableContract(
+            UnitAccountedPredicate(BooleanValue(true)),
+            UnitAccountedPredicate(BooleanValue(true)),
+            BooleanValue(true),
+            Nil,
+            Nil,
+            Nil,
+            None,
+          ) =>
+        true
+      case _ => false
+    }
 
   def nonEmpty: Boolean = !isEmpty
 
@@ -51,8 +81,9 @@ trait ApplicableContractImpl[G] extends NodeFamilyImpl[G] with ApplicableContrac
       Doc.stack(signals),
     ))
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.spec(Show.lazily(layoutSpec(_)))
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.spec(Show.lazily(layoutSpec(_)))
+    }
+}
diff --git a/src/col/vct/col/ast/family/data/BipGlueAcceptsImpl.scala b/src/col/vct/col/ast/family/data/BipGlueAcceptsImpl.scala
index 1fa9767dde..24a1d4af84 100644
--- a/src/col/vct/col/ast/family/data/BipGlueAcceptsImpl.scala
+++ b/src/col/vct/col/ast/family/data/BipGlueAcceptsImpl.scala
@@ -4,7 +4,10 @@ import vct.col.ast.BipGlueAccepts
 import vct.col.print._
 import vct.col.ast.ops.{BipGlueAcceptsOps, BipGlueAcceptsFamilyOps}
 
-trait BipGlueAcceptsImpl[G] extends BipGlueAcceptsOps[G] with BipGlueAcceptsFamilyOps[G] { this: BipGlueAccepts[G] =>
+trait BipGlueAcceptsImpl[G]
+    extends BipGlueAcceptsOps[G] with BipGlueAcceptsFamilyOps[G] {
+  this: BipGlueAccepts[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Text(ctx.name(port)) <> ".accepts(" <> Doc.args(others.map(ctx.name).map(Text)) <> ");"
+    Text(ctx.name(port)) <> ".accepts(" <>
+      Doc.args(others.map(ctx.name).map(Text)) <> ");"
 }
diff --git a/src/col/vct/col/ast/family/data/BipGlueDataWireImpl.scala b/src/col/vct/col/ast/family/data/BipGlueDataWireImpl.scala
index 05e27f07c8..b5fa6e1ee1 100644
--- a/src/col/vct/col/ast/family/data/BipGlueDataWireImpl.scala
+++ b/src/col/vct/col/ast/family/data/BipGlueDataWireImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.BipGlueDataWire
 import vct.col.print._
 import vct.col.ast.ops.{BipGlueDataWireOps, BipGlueDataWireFamilyOps}
 
-trait BipGlueDataWireImpl[G] extends BipGlueDataWireOps[G] with BipGlueDataWireFamilyOps[G] { this: BipGlueDataWire[G] =>
+trait BipGlueDataWireImpl[G]
+    extends BipGlueDataWireOps[G] with BipGlueDataWireFamilyOps[G] {
+  this: BipGlueDataWire[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text(ctx.name(dataOut)) <> ".to(" <> Doc.arg(Text(ctx.name(dataIn))) <> ");"
 }
diff --git a/src/col/vct/col/ast/family/data/BipGlueRequiresImpl.scala b/src/col/vct/col/ast/family/data/BipGlueRequiresImpl.scala
index fc7283ab21..53d065153c 100644
--- a/src/col/vct/col/ast/family/data/BipGlueRequiresImpl.scala
+++ b/src/col/vct/col/ast/family/data/BipGlueRequiresImpl.scala
@@ -4,7 +4,10 @@ import vct.col.ast.BipGlueRequires
 import vct.col.print._
 import vct.col.ast.ops.{BipGlueRequiresOps, BipGlueRequiresFamilyOps}
 
-trait BipGlueRequiresImpl[G] extends BipGlueRequiresOps[G] with BipGlueRequiresFamilyOps[G] { this: BipGlueRequires[G] =>
+trait BipGlueRequiresImpl[G]
+    extends BipGlueRequiresOps[G] with BipGlueRequiresFamilyOps[G] {
+  this: BipGlueRequires[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Text(ctx.name(port)) <> ".requires(" <> Doc.args(others.map(ctx.name).map(Text)) <> ");"
+    Text(ctx.name(port)) <> ".requires(" <>
+      Doc.args(others.map(ctx.name).map(Text)) <> ");"
 }
diff --git a/src/col/vct/col/ast/family/data/JavaBipGlueNameImpl.scala b/src/col/vct/col/ast/family/data/JavaBipGlueNameImpl.scala
index 5b0409d809..2ad4671cb0 100644
--- a/src/col/vct/col/ast/family/data/JavaBipGlueNameImpl.scala
+++ b/src/col/vct/col/ast/family/data/JavaBipGlueNameImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.JavaBipGlueName
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.{JavaBipGlueNameOps, JavaBipGlueNameFamilyOps}
 
-trait JavaBipGlueNameImpl[G] extends JavaBipGlueNameOps[G] with JavaBipGlueNameFamilyOps[G] { this: JavaBipGlueName[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    t.show <> "," <+> e.show
+trait JavaBipGlueNameImpl[G]
+    extends JavaBipGlueNameOps[G] with JavaBipGlueNameFamilyOps[G] {
+  this: JavaBipGlueName[G] =>
+  override def layout(implicit ctx: Ctx): Doc = t.show <> "," <+> e.show
 }
diff --git a/src/col/vct/col/ast/family/decreases/DecreasesClauseAssumeImpl.scala b/src/col/vct/col/ast/family/decreases/DecreasesClauseAssumeImpl.scala
index d2cd961a89..ea274dda5c 100644
--- a/src/col/vct/col/ast/family/decreases/DecreasesClauseAssumeImpl.scala
+++ b/src/col/vct/col/ast/family/decreases/DecreasesClauseAssumeImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.DecreasesClauseAssume
 import vct.col.print._
 import vct.col.ast.ops.DecreasesClauseAssumeOps
 
-trait DecreasesClauseAssumeImpl[G] extends DecreasesClauseAssumeOps[G] { this: DecreasesClauseAssume[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("decreases assume;")
+trait DecreasesClauseAssumeImpl[G] extends DecreasesClauseAssumeOps[G] {
+  this: DecreasesClauseAssume[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text("decreases assume;")
 }
diff --git a/src/col/vct/col/ast/family/decreases/DecreasesClauseImpl.scala b/src/col/vct/col/ast/family/decreases/DecreasesClauseImpl.scala
index f9eea85fc8..422209a2f1 100644
--- a/src/col/vct/col/ast/family/decreases/DecreasesClauseImpl.scala
+++ b/src/col/vct/col/ast/family/decreases/DecreasesClauseImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.decreases
 import vct.col.ast.DecreasesClause
 import vct.col.ast.ops.DecreasesClauseFamilyOps
 
-trait DecreasesClauseImpl[G] extends DecreasesClauseFamilyOps[G] { this: DecreasesClause[G] =>
+trait DecreasesClauseImpl[G] extends DecreasesClauseFamilyOps[G] {
+  this: DecreasesClause[G] =>
 
 }
diff --git a/src/col/vct/col/ast/family/decreases/DecreasesClauseNoRecursionImpl.scala b/src/col/vct/col/ast/family/decreases/DecreasesClauseNoRecursionImpl.scala
index e821b09089..bf350c5986 100644
--- a/src/col/vct/col/ast/family/decreases/DecreasesClauseNoRecursionImpl.scala
+++ b/src/col/vct/col/ast/family/decreases/DecreasesClauseNoRecursionImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.DecreasesClauseNoRecursion
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.DecreasesClauseNoRecursionOps
 
-trait DecreasesClauseNoRecursionImpl[G] extends DecreasesClauseNoRecursionOps[G] { this: DecreasesClauseNoRecursion[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("decreases;")
+trait DecreasesClauseNoRecursionImpl[G]
+    extends DecreasesClauseNoRecursionOps[G] {
+  this: DecreasesClauseNoRecursion[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text("decreases;")
 }
diff --git a/src/col/vct/col/ast/family/decreases/DecreasesClauseTupleImpl.scala b/src/col/vct/col/ast/family/decreases/DecreasesClauseTupleImpl.scala
index 3cb5bac02d..c5143b1246 100644
--- a/src/col/vct/col/ast/family/decreases/DecreasesClauseTupleImpl.scala
+++ b/src/col/vct/col/ast/family/decreases/DecreasesClauseTupleImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.DecreasesClauseTuple
 import vct.col.print._
 import vct.col.ast.ops.DecreasesClauseTupleOps
 
-trait DecreasesClauseTupleImpl[G] extends DecreasesClauseTupleOps[G] { this: DecreasesClauseTuple[G] =>
+trait DecreasesClauseTupleImpl[G] extends DecreasesClauseTupleOps[G] {
+  this: DecreasesClauseTuple[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("decreases") <+> Doc.args(exprs) <> ";")
 }
diff --git a/src/col/vct/col/ast/family/fieldflag/FieldFlagImpl.scala b/src/col/vct/col/ast/family/fieldflag/FieldFlagImpl.scala
index 18912ba42e..7a0546fe6d 100644
--- a/src/col/vct/col/ast/family/fieldflag/FieldFlagImpl.scala
+++ b/src/col/vct/col/ast/family/fieldflag/FieldFlagImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.FieldFlag
 import vct.col.print._
 import vct.col.ast.ops.FieldFlagFamilyOps
 
-trait FieldFlagImpl[G] extends FieldFlagFamilyOps[G] { this: FieldFlag[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("final")
+trait FieldFlagImpl[G] extends FieldFlagFamilyOps[G] {
+  this: FieldFlag[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text("final")
 }
diff --git a/src/col/vct/col/ast/family/fieldflag/FinalImpl.scala b/src/col/vct/col/ast/family/fieldflag/FinalImpl.scala
index 5a62e87069..f2af622e06 100644
--- a/src/col/vct/col/ast/family/fieldflag/FinalImpl.scala
+++ b/src/col/vct/col/ast/family/fieldflag/FinalImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.fieldflag
 import vct.col.ast.Final
 import vct.col.ast.ops.FinalOps
 
-trait FinalImpl[G] extends FinalOps[G] { this: Final[G] =>
+trait FinalImpl[G] extends FinalOps[G] {
+  this: Final[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/invoking/InvokingNodeImpl.scala b/src/col/vct/col/ast/family/invoking/InvokingNodeImpl.scala
index 7db967605c..8262484c1c 100644
--- a/src/col/vct/col/ast/family/invoking/InvokingNodeImpl.scala
+++ b/src/col/vct/col/ast/family/invoking/InvokingNodeImpl.scala
@@ -5,7 +5,8 @@ import vct.col.check.CheckError
 import vct.col.origin.{Blame, InvocationFailure}
 import vct.col.ref.Ref
 
-trait InvokingNodeImpl[G] { this: InvokingNode[G] =>
+trait InvokingNodeImpl[G] {
+  this: InvokingNode[G] =>
   def ref: Ref[G, _ <: ContractApplicable[G]]
   def blame: Blame[InvocationFailure]
   def givenMap: Seq[(Ref[G, Variable[G]], Expr[G])]
diff --git a/src/col/vct/col/ast/family/itervariable/IterVariableImpl.scala b/src/col/vct/col/ast/family/itervariable/IterVariableImpl.scala
index 227cb52d11..b712fc503a 100644
--- a/src/col/vct/col/ast/family/itervariable/IterVariableImpl.scala
+++ b/src/col/vct/col/ast/family/itervariable/IterVariableImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.IterVariable
 import vct.col.print._
 import vct.col.ast.ops.{IterVariableOps, IterVariableFamilyOps}
 
-trait IterVariableImpl[G] extends IterVariableOps[G] with IterVariableFamilyOps[G] { this: IterVariable[G] =>
+trait IterVariableImpl[G]
+    extends IterVariableOps[G] with IterVariableFamilyOps[G] {
+  this: IterVariable[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(variable.show <+> "=" <>> Group(from.show <+> ".." <+/> to))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/javavar/JavaVariableDeclarationImpl.scala b/src/col/vct/col/ast/family/javavar/JavaVariableDeclarationImpl.scala
index 26d1b87b63..2477fad8e3 100644
--- a/src/col/vct/col/ast/family/javavar/JavaVariableDeclarationImpl.scala
+++ b/src/col/vct/col/ast/family/javavar/JavaVariableDeclarationImpl.scala
@@ -2,10 +2,18 @@ package vct.col.ast.family.javavar
 
 import vct.col.ast.JavaVariableDeclaration
 import vct.col.print._
-import vct.col.ast.ops.{JavaVariableDeclarationOps, JavaVariableDeclarationFamilyOps}
+import vct.col.ast.ops.{
+  JavaVariableDeclarationOps,
+  JavaVariableDeclarationFamilyOps,
+}
 
-trait JavaVariableDeclarationImpl[G] extends JavaVariableDeclarationOps[G] with JavaVariableDeclarationFamilyOps[G] { this: JavaVariableDeclaration[G] =>
+trait JavaVariableDeclarationImpl[G]
+    extends JavaVariableDeclarationOps[G]
+    with JavaVariableDeclarationFamilyOps[G] {
+  this: JavaVariableDeclaration[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text(name) <> "[]".repeat(moreDims) <>
-      init.map(Text(" =") <>> _).getOrElse(Empty))
+    Group(
+      Text(name) <> "[]".repeat(moreDims) <> init.map(Text(" =") <>> _)
+        .getOrElse(Empty)
+    )
 }
diff --git a/src/col/vct/col/ast/family/location/AmbiguousLocationImpl.scala b/src/col/vct/col/ast/family/location/AmbiguousLocationImpl.scala
index 3f7dcde32c..343e6450c1 100644
--- a/src/col/vct/col/ast/family/location/AmbiguousLocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/AmbiguousLocationImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.AmbiguousLocation
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.AmbiguousLocationOps
 
-trait AmbiguousLocationImpl[G] extends AmbiguousLocationOps[G] { this: AmbiguousLocation[G] =>
+trait AmbiguousLocationImpl[G] extends AmbiguousLocationOps[G] {
+  this: AmbiguousLocation[G] =>
   override def layout(implicit ctx: Ctx): Doc = expr.show
 }
diff --git a/src/col/vct/col/ast/family/location/ArrayLocationImpl.scala b/src/col/vct/col/ast/family/location/ArrayLocationImpl.scala
index e45868d571..8f0e848414 100644
--- a/src/col/vct/col/ast/family/location/ArrayLocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/ArrayLocationImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.ArrayLocation
 import vct.col.print._
 import vct.col.ast.ops.ArrayLocationOps
 
-trait ArrayLocationImpl[G] extends ArrayLocationOps[G] { this: ArrayLocation[G] =>
+trait ArrayLocationImpl[G] extends ArrayLocationOps[G] {
+  this: ArrayLocation[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(array.bind(Precedence.POSTFIX) <> "[" <> Doc.arg(subscript) <> "]")
 }
diff --git a/src/col/vct/col/ast/family/location/FieldLocationImpl.scala b/src/col/vct/col/ast/family/location/FieldLocationImpl.scala
index b3ef8b9af7..65482ed0fa 100644
--- a/src/col/vct/col/ast/family/location/FieldLocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/FieldLocationImpl.scala
@@ -5,10 +5,13 @@ import vct.col.print._
 import vct.col.ast.ops.FieldLocationOps
 import vct.col.check.{CheckContext, CheckError, FinalPermission}
 
-trait FieldLocationImpl[G] extends FieldLocationOps[G] with LocationImpl[G] { this: FieldLocation[G] =>
+trait FieldLocationImpl[G] extends FieldLocationOps[G] with LocationImpl[G] {
+  this: FieldLocation[G] =>
   override def check(context: CheckContext[G]): Seq[CheckError] =
-    if(field.decl.flags.collectFirst { case Final() => () }.nonEmpty) Seq(FinalPermission(this)) ++ super.check(context)
-    else super.check(context)
+    if (field.decl.flags.collectFirst { case Final() => () }.nonEmpty)
+      Seq(FinalPermission(this)) ++ super.check(context)
+    else
+      super.check(context)
 
   override def layout(implicit ctx: Ctx): Doc =
     obj.bind(Precedence.POSTFIX) <> "." <> ctx.name(field)
diff --git a/src/col/vct/col/ast/family/location/HeapVariableLocationImpl.scala b/src/col/vct/col/ast/family/location/HeapVariableLocationImpl.scala
index 34eb64b29a..e0b00561a1 100644
--- a/src/col/vct/col/ast/family/location/HeapVariableLocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/HeapVariableLocationImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.location
 import vct.col.ast.HeapVariableLocation
 import vct.col.ast.ops.HeapVariableLocationOps
 
-trait HeapVariableLocationImpl[G] extends HeapVariableLocationOps[G] { this: HeapVariableLocation[G] =>
+trait HeapVariableLocationImpl[G] extends HeapVariableLocationOps[G] {
+  this: HeapVariableLocation[G] =>
 
 }
diff --git a/src/col/vct/col/ast/family/location/InLinePatternLocationImpl.scala b/src/col/vct/col/ast/family/location/InLinePatternLocationImpl.scala
index 2866fd92b2..305ad82e7e 100644
--- a/src/col/vct/col/ast/family/location/InLinePatternLocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/InLinePatternLocationImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.InLinePatternLocation
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.InLinePatternLocationOps
 
-trait InLinePatternLocationImpl[G] extends InLinePatternLocationOps[G] { this: InLinePatternLocation[G] =>
-  override def layout(implicit ctx: Ctx): Doc = loc.show <+> "{" <> pattern <> "}"
+trait InLinePatternLocationImpl[G] extends InLinePatternLocationOps[G] {
+  this: InLinePatternLocation[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    loc.show <+> "{" <> pattern <> "}"
 }
diff --git a/src/col/vct/col/ast/family/location/InstancePredicateLocationImpl.scala b/src/col/vct/col/ast/family/location/InstancePredicateLocationImpl.scala
index c790d35e46..68bdcef925 100644
--- a/src/col/vct/col/ast/family/location/InstancePredicateLocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/InstancePredicateLocationImpl.scala
@@ -4,7 +4,11 @@ import vct.col.ast.InstancePredicateLocation
 import vct.col.print._
 import vct.col.ast.ops.InstancePredicateLocationOps
 
-trait InstancePredicateLocationImpl[G] extends InstancePredicateLocationOps[G] { this: InstancePredicateLocation[G] =>
+trait InstancePredicateLocationImpl[G] extends InstancePredicateLocationOps[G] {
+  this: InstancePredicateLocation[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(obj.bind(Precedence.POSTFIX) <> "." <> ctx.name(predicate) <> "(" <> Doc.args(args) <> ")")
+    Group(
+      obj.bind(Precedence.POSTFIX) <> "." <> ctx.name(predicate) <> "(" <>
+        Doc.args(args) <> ")"
+    )
 }
diff --git a/src/col/vct/col/ast/family/location/LocationImpl.scala b/src/col/vct/col/ast/family/location/LocationImpl.scala
index f524adafc7..73681feca4 100644
--- a/src/col/vct/col/ast/family/location/LocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/LocationImpl.scala
@@ -1,12 +1,27 @@
 package vct.col.ast.family.location
 
-import vct.col.ast.{AmbiguousLocation, ArrayLocation, FieldLocation, HeapVariableLocation, InLinePatternLocation, InstancePredicateLocation, Location, ModelLocation, PointerLocation, PredicateLocation, SilverFieldLocation, Type}
+import vct.col.ast.{
+  AmbiguousLocation,
+  ArrayLocation,
+  FieldLocation,
+  HeapVariableLocation,
+  InLinePatternLocation,
+  InstancePredicateLocation,
+  Location,
+  ModelLocation,
+  PointerLocation,
+  PredicateLocation,
+  SilverFieldLocation,
+  Type,
+}
 import vct.col.ast.node.NodeFamilyImpl
 import vct.col.ast.ops.LocationFamilyOps
 import vct.col.check.{CheckContext, CheckError}
 
-trait LocationImpl[G] extends NodeFamilyImpl[G] with LocationFamilyOps[G] { this: Location[G] =>
-  override def check(context: CheckContext[G]): Seq[CheckError] = super.check(context)
+trait LocationImpl[G] extends NodeFamilyImpl[G] with LocationFamilyOps[G] {
+  this: Location[G] =>
+  override def check(context: CheckContext[G]): Seq[CheckError] =
+    super.check(context)
 
   def t: Type[G] = {
     this match {
diff --git a/src/col/vct/col/ast/family/location/ModelLocationImpl.scala b/src/col/vct/col/ast/family/location/ModelLocationImpl.scala
index c14fc279ba..191d3f5fc9 100644
--- a/src/col/vct/col/ast/family/location/ModelLocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/ModelLocationImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.ModelLocation
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.ModelLocationOps
 
-trait ModelLocationImpl[G] extends ModelLocationOps[G] { this: ModelLocation[G] =>
+trait ModelLocationImpl[G] extends ModelLocationOps[G] {
+  this: ModelLocation[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     obj.bind(Precedence.POSTFIX) <> "." <> ctx.name(field)
 }
diff --git a/src/col/vct/col/ast/family/location/PointerLocationImpl.scala b/src/col/vct/col/ast/family/location/PointerLocationImpl.scala
index 2fe127436e..73af012f76 100644
--- a/src/col/vct/col/ast/family/location/PointerLocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/PointerLocationImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.PointerLocation
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.PointerLocationOps
 
-trait PointerLocationImpl[G] extends PointerLocationOps[G] { this: PointerLocation[G] =>
+trait PointerLocationImpl[G] extends PointerLocationOps[G] {
+  this: PointerLocation[G] =>
   override def layout(implicit ctx: Ctx): Doc = pointer.show
 }
diff --git a/src/col/vct/col/ast/family/location/PredicateLocationImpl.scala b/src/col/vct/col/ast/family/location/PredicateLocationImpl.scala
index 039e94b687..33937b63bb 100644
--- a/src/col/vct/col/ast/family/location/PredicateLocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/PredicateLocationImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.PredicateLocation
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.PredicateLocationOps
 
-trait PredicateLocationImpl[G] extends PredicateLocationOps[G] { this: PredicateLocation[G] =>
+trait PredicateLocationImpl[G] extends PredicateLocationOps[G] {
+  this: PredicateLocation[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text(ctx.name(predicate)) <> "(" <> Doc.args(args) <> ")")
 }
diff --git a/src/col/vct/col/ast/family/location/SilverFieldLocationImpl.scala b/src/col/vct/col/ast/family/location/SilverFieldLocationImpl.scala
index 572ff9f298..4f58c5b5b4 100644
--- a/src/col/vct/col/ast/family/location/SilverFieldLocationImpl.scala
+++ b/src/col/vct/col/ast/family/location/SilverFieldLocationImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.SilverFieldLocation
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.ast.ops.SilverFieldLocationOps
 
-trait SilverFieldLocationImpl[G] extends SilverFieldLocationOps[G] { this: SilverFieldLocation[G] =>
+trait SilverFieldLocationImpl[G] extends SilverFieldLocationOps[G] {
+  this: SilverFieldLocation[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     obj.bind(Precedence.POSTFIX) <> "." <> ctx.name(field)
 }
diff --git a/src/col/vct/col/ast/family/loopcontract/IterationContractImpl.scala b/src/col/vct/col/ast/family/loopcontract/IterationContractImpl.scala
index 7dccfc1d8d..6de106c28d 100644
--- a/src/col/vct/col/ast/family/loopcontract/IterationContractImpl.scala
+++ b/src/col/vct/col/ast/family/loopcontract/IterationContractImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.IterationContract
 import vct.col.print._
 import vct.col.ast.ops.IterationContractOps
 
-trait IterationContractImpl[G] extends IterationContractOps[G] { this: IterationContract[G] =>
+trait IterationContractImpl[G] extends IterationContractOps[G] {
+  this: IterationContract[G] =>
   def layoutSpec(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       DocUtil.clauses("context_everywhere", context_everywhere),
@@ -14,4 +15,4 @@ trait IterationContractImpl[G] extends IterationContractOps[G] { this: Iteration
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.spec(Show.lazily(layoutSpec(_)))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/loopcontract/LoopContractImpl.scala b/src/col/vct/col/ast/family/loopcontract/LoopContractImpl.scala
index 30d35d9039..3bb8f65d07 100644
--- a/src/col/vct/col/ast/family/loopcontract/LoopContractImpl.scala
+++ b/src/col/vct/col/ast/family/loopcontract/LoopContractImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.loopcontract
 import vct.col.ast.LoopContract
 import vct.col.ast.ops.LoopContractFamilyOps
 
-trait LoopContractImpl[G] extends LoopContractFamilyOps[G] { this: LoopContract[G] =>
+trait LoopContractImpl[G] extends LoopContractFamilyOps[G] {
+  this: LoopContract[G] =>
 
 }
diff --git a/src/col/vct/col/ast/family/loopcontract/LoopInvariantImpl.scala b/src/col/vct/col/ast/family/loopcontract/LoopInvariantImpl.scala
index 5aab279a24..f630b9d90e 100644
--- a/src/col/vct/col/ast/family/loopcontract/LoopInvariantImpl.scala
+++ b/src/col/vct/col/ast/family/loopcontract/LoopInvariantImpl.scala
@@ -4,10 +4,17 @@ import vct.col.ast.LoopInvariant
 import vct.col.print._
 import vct.col.ast.ops.LoopInvariantOps
 
-trait LoopInvariantImpl[G] extends LoopInvariantOps[G] { this: LoopInvariant[G] =>
+trait LoopInvariantImpl[G] extends LoopInvariantOps[G] {
+  this: LoopInvariant[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       Doc.stack(decreases.toSeq),
-      DocUtil.clauses(if(ctx.syntax == Ctx.Silver) "invariant" else "loop_invariant", invariant),
+      DocUtil.clauses(
+        if (ctx.syntax == Ctx.Silver)
+          "invariant"
+        else
+          "loop_invariant",
+        invariant,
+      ),
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/parregion/ParBlockImpl.scala b/src/col/vct/col/ast/family/parregion/ParBlockImpl.scala
index 200700222b..da9f48d639 100644
--- a/src/col/vct/col/ast/family/parregion/ParBlockImpl.scala
+++ b/src/col/vct/col/ast/family/parregion/ParBlockImpl.scala
@@ -9,30 +9,45 @@ import vct.col.util.AstBuildHelpers._
 import vct.col.util.Substitute
 import vct.col.ast.ops.ParBlockOps
 
-trait ParBlockImpl[G] extends ParRegionImpl[G] with Declarator[G] with ParBlockOps[G] { this: ParBlock[G] =>
+trait ParBlockImpl[G]
+    extends ParRegionImpl[G] with Declarator[G] with ParBlockOps[G] {
+  this: ParBlock[G] =>
   override def declarations: Seq[Declaration[G]] = iters.map(_.variable)
 
   def quantify(expr: Expr[G], blame: Blame[ReceiverNotInjective]): Expr[G] = {
-    val quantVars = iters.map(_.variable).map(v => v -> new Variable[G](v.t)(v.o)).toMap
-    val body = Substitute(quantVars.map { case (l, r) => Local[G](l.ref) -> Local[G](r.ref) }.toMap[Expr[G], Expr[G]]).dispatch(expr)
+    val quantVars =
+      iters.map(_.variable).map(v => v -> new Variable[G](v.t)(v.o)).toMap
+    val body = Substitute(
+      quantVars.map { case (l, r) => Local[G](l.ref) -> Local[G](r.ref) }
+        .toMap[Expr[G], Expr[G]]
+    ).dispatch(expr)
     iters.foldLeft(body)((body, iter) => {
       val v = quantVars(iter.variable)
-      Starall(Seq(v), Nil, (iter.from <= v.get && v.get < iter.to) ==> body)(blame)
+      Starall(Seq(v), Nil, (iter.from <= v.get && v.get < iter.to) ==> body)(
+        blame
+      )
     })
   }
 
   override def enterCheckContextRoScopes(context: CheckContext[G]): Int =
     context.scopes.size
 
-  override def enterCheckContextRoScopeReason(context: CheckContext[G]): Option[Node[G]] =
-    Some(this)
+  override def enterCheckContextRoScopeReason(
+      context: CheckContext[G]
+  ): Option[Node[G]] = Some(this)
 
-  override def enterCheckContextScopes(context: CheckContext[G]): Seq[CheckContext.ScopeFrame[G]] =
-    context.withScope(declarations)
+  override def enterCheckContextScopes(
+      context: CheckContext[G]
+  ): Seq[CheckContext.ScopeFrame[G]] = context.withScope(declarations)
 
   override def layout(implicit ctx: Ctx): Doc = {
-    val header = Group(Text("par") <+> ctx.name(decl) <>
-      (if(iters.nonEmpty) Text("(") <> Doc.args(iters) <> ")" else Empty))
+    val header = Group(
+      Text("par") <+> ctx.name(decl) <>
+        (if (iters.nonEmpty)
+           Text("(") <> Doc.args(iters) <> ")"
+         else
+           Empty)
+    )
 
     val contract = Doc.stack(Seq(
       DocUtil.clauses("context_everywhere", context_everywhere),
@@ -42,4 +57,4 @@ trait ParBlockImpl[G] extends ParRegionImpl[G] with Declarator[G] with ParBlockO
 
     Doc.stack(Seq(header, contract)) <+> content.layoutAsBlock
   }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/parregion/ParParallelImpl.scala b/src/col/vct/col/ast/family/parregion/ParParallelImpl.scala
index 3cd7223c9f..9a36a3c905 100644
--- a/src/col/vct/col/ast/family/parregion/ParParallelImpl.scala
+++ b/src/col/vct/col/ast/family/parregion/ParParallelImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.ParParallel
 import vct.col.print._
 import vct.col.ast.ops.ParParallelOps
 
-trait ParParallelImpl[G] extends ParParallelOps[G] { this: ParParallel[G] =>
+trait ParParallelImpl[G] extends ParParallelOps[G] {
+  this: ParParallel[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text("parallel") <+> "{" <>> Doc.stack(regions) <+/> "}"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/parregion/ParRegionImpl.scala b/src/col/vct/col/ast/family/parregion/ParRegionImpl.scala
index dc296ebaf4..7c56b17a11 100644
--- a/src/col/vct/col/ast/family/parregion/ParRegionImpl.scala
+++ b/src/col/vct/col/ast/family/parregion/ParRegionImpl.scala
@@ -6,12 +6,14 @@ import vct.col.check.{CheckContext, CheckError}
 import vct.col.origin.{Blame, ParPreconditionFailed}
 import vct.col.ast.ops.ParRegionFamilyOps
 
-trait ParRegionImpl[G] extends NodeFamilyImpl[G] with ParRegionFamilyOps[G] { this: ParRegion[G] =>
+trait ParRegionImpl[G] extends NodeFamilyImpl[G] with ParRegionFamilyOps[G] {
+  this: ParRegion[G] =>
   def blame: Blame[ParPreconditionFailed]
 
   override def enterCheckContextRoScopes(context: CheckContext[G]): Int =
     context.scopes.size
 
-  override def enterCheckContextRoScopeReason(context: CheckContext[G]): Option[Node[G]] =
-    Some(this)
+  override def enterCheckContextRoScopeReason(
+      context: CheckContext[G]
+  ): Option[Node[G]] = Some(this)
 }
diff --git a/src/col/vct/col/ast/family/parregion/ParSequentialImpl.scala b/src/col/vct/col/ast/family/parregion/ParSequentialImpl.scala
index b0bdc710c0..bbc2083de3 100644
--- a/src/col/vct/col/ast/family/parregion/ParSequentialImpl.scala
+++ b/src/col/vct/col/ast/family/parregion/ParSequentialImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.ParSequential
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.ParSequentialOps
 
-trait ParSequentialImpl[G] extends ParSequentialOps[G] { this: ParSequential[G] =>
+trait ParSequentialImpl[G] extends ParSequentialOps[G] {
+  this: ParSequential[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text("sequential") <+> "{" <>> Doc.stack(regions) <+/> "}"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/family/pvlcommunicate/PVLCommunicateImpl.scala b/src/col/vct/col/ast/family/pvlcommunicate/PVLCommunicateImpl.scala
index ae8ed3af2f..a3eaf9a6fe 100644
--- a/src/col/vct/col/ast/family/pvlcommunicate/PVLCommunicateImpl.scala
+++ b/src/col/vct/col/ast/family/pvlcommunicate/PVLCommunicateImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.pvlcommunicate
 import vct.col.ast.PVLCommunicate
 import vct.col.ast.ops.PVLCommunicateOps
 
-trait PVLCommunicateImpl[G] extends PVLCommunicateOps[G] { this: PVLCommunicate[G] =>
+trait PVLCommunicateImpl[G] extends PVLCommunicateOps[G] {
+  this: PVLCommunicate[G] =>
 
 }
diff --git a/src/col/vct/col/ast/family/pvlcommunicate/PVLEndpointNameImpl.scala b/src/col/vct/col/ast/family/pvlcommunicate/PVLEndpointNameImpl.scala
index 2a539b2d91..3e0e663699 100644
--- a/src/col/vct/col/ast/family/pvlcommunicate/PVLEndpointNameImpl.scala
+++ b/src/col/vct/col/ast/family/pvlcommunicate/PVLEndpointNameImpl.scala
@@ -4,5 +4,7 @@ import vct.col.ast.PVLEndpointName
 import vct.col.ast.ops.PVLEndpointNameOps
 import vct.col.ast.ops.{PVLEndpointNameOps, PVLEndpointNameFamilyOps}
 
-trait PVLEndpointNameImpl[G] extends PVLEndpointNameOps[G] with PVLEndpointNameFamilyOps[G] { this: PVLEndpointName[G] =>
+trait PVLEndpointNameImpl[G]
+    extends PVLEndpointNameOps[G] with PVLEndpointNameFamilyOps[G] {
+  this: PVLEndpointName[G] =>
 }
diff --git a/src/col/vct/col/ast/family/seqguard/ChorGuardImpl.scala b/src/col/vct/col/ast/family/seqguard/ChorGuardImpl.scala
index f6e900950d..a40fbf67d0 100644
--- a/src/col/vct/col/ast/family/seqguard/ChorGuardImpl.scala
+++ b/src/col/vct/col/ast/family/seqguard/ChorGuardImpl.scala
@@ -3,7 +3,8 @@ package vct.col.ast.family.seqguard
 import vct.col.ast.{Endpoint, Expr, ChorGuard, UnpointedGuard}
 import vct.col.ast.ops.ChorGuardFamilyOps
 
-trait ChorGuardImpl[G] extends ChorGuardFamilyOps[G] { this: ChorGuard[G] =>
+trait ChorGuardImpl[G] extends ChorGuardFamilyOps[G] {
+  this: ChorGuard[G] =>
   def condition: Expr[G]
   def endpointOpt: Option[Endpoint[G]]
 }
diff --git a/src/col/vct/col/ast/family/seqguard/EndpointGuardImpl.scala b/src/col/vct/col/ast/family/seqguard/EndpointGuardImpl.scala
index f6a6d99016..6a96824e98 100644
--- a/src/col/vct/col/ast/family/seqguard/EndpointGuardImpl.scala
+++ b/src/col/vct/col/ast/family/seqguard/EndpointGuardImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.family.seqguard
 import vct.col.ast.EndpointGuard
 import vct.col.ast.ops.EndpointGuardOps
 
-trait EndpointGuardImpl[G] extends EndpointGuardOps[G] { this: EndpointGuard[G] =>
+trait EndpointGuardImpl[G] extends EndpointGuardOps[G] {
+  this: EndpointGuard[G] =>
   def endpointOpt = Some(endpoint.decl)
 }
diff --git a/src/col/vct/col/ast/family/seqguard/UnpointedGuardImpl.scala b/src/col/vct/col/ast/family/seqguard/UnpointedGuardImpl.scala
index 7b5a1a3e25..7c89c4f7ff 100644
--- a/src/col/vct/col/ast/family/seqguard/UnpointedGuardImpl.scala
+++ b/src/col/vct/col/ast/family/seqguard/UnpointedGuardImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.UnpointedGuard
 import vct.col.ast.ops.UnpointedGuardOps
 import vct.result.VerificationError.Unreachable
 
-trait UnpointedGuardImpl[G] extends UnpointedGuardOps[G] { this: UnpointedGuard[G] =>
+trait UnpointedGuardImpl[G] extends UnpointedGuardOps[G] {
+  this: UnpointedGuard[G] =>
   def endpointOpt = None
 }
diff --git a/src/col/vct/col/ast/family/seqrun/ChorRunImpl.scala b/src/col/vct/col/ast/family/seqrun/ChorRunImpl.scala
index 657b196ae0..efced73456 100644
--- a/src/col/vct/col/ast/family/seqrun/ChorRunImpl.scala
+++ b/src/col/vct/col/ast/family/seqrun/ChorRunImpl.scala
@@ -5,7 +5,8 @@ import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.{ChorRunOps, ChorRunFamilyOps}
 import vct.col.ast.ops.{ChorRunOps, ChorRunFamilyOps}
 
-trait ChorRunImpl[G] extends ChorRunOps[G] with ChorRunFamilyOps[G] { this: ChorRun[G] =>
+trait ChorRunImpl[G] extends ChorRunOps[G] with ChorRunFamilyOps[G] {
+  this: ChorRun[G] =>
   override def layout(implicit ctx: Ctx): Doc = {
     contract.show </> Text("seq_run") <+> this.body.show
   }
diff --git a/src/col/vct/col/ast/family/signals/SignalsClauseImpl.scala b/src/col/vct/col/ast/family/signals/SignalsClauseImpl.scala
index e8562a38f6..65353cf7e2 100644
--- a/src/col/vct/col/ast/family/signals/SignalsClauseImpl.scala
+++ b/src/col/vct/col/ast/family/signals/SignalsClauseImpl.scala
@@ -5,9 +5,13 @@ import vct.col.ast.util.Declarator
 import vct.col.print.{Ctx, Doc, Text, Group}
 import vct.col.ast.ops.{SignalsClauseOps, SignalsClauseFamilyOps}
 
-trait SignalsClauseImpl[G] extends Declarator[G] with SignalsClauseOps[G] with SignalsClauseFamilyOps[G] { this: SignalsClause[G] =>
+trait SignalsClauseImpl[G]
+    extends Declarator[G]
+    with SignalsClauseOps[G]
+    with SignalsClauseFamilyOps[G] {
+  this: SignalsClause[G] =>
   override def declarations: Seq[Declaration[G]] = Seq(binding)
 
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("signals") <+> "(" <> binding <> ")" <>> assn)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/AmbiguousTruncModImpl.scala b/src/col/vct/col/ast/lang/c/AmbiguousTruncModImpl.scala
index 256562db2e..ea78abb35b 100644
--- a/src/col/vct/col/ast/lang/c/AmbiguousTruncModImpl.scala
+++ b/src/col/vct/col/ast/lang/c/AmbiguousTruncModImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.AmbiguousTruncMod
 import vct.col.ast.ops.AmbiguousTruncModOps
 import vct.col.print._
 
-trait AmbiguousTruncModImpl[G] extends AmbiguousTruncModOps[G] { this: AmbiguousTruncMod[G] =>
+trait AmbiguousTruncModImpl[G] extends AmbiguousTruncModOps[G] {
+  this: AmbiguousTruncMod[G] =>
   override def precedence: Int = Precedence.MULTIPLICATIVE
   override def layout(implicit ctx: Ctx): Doc = lassoc(left, "%", right)
 }
diff --git a/src/col/vct/col/ast/lang/c/CAbstractDeclarationImpl.scala b/src/col/vct/col/ast/lang/c/CAbstractDeclarationImpl.scala
index fdf49da510..0da9b5823b 100644
--- a/src/col/vct/col/ast/lang/c/CAbstractDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CAbstractDeclarationImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.c
 
 import vct.col.ast.CAbstractDeclaration
 
-trait CAbstractDeclarationImpl[G] { this: CAbstractDeclaration[G] =>
+trait CAbstractDeclarationImpl[G] {
+  this: CAbstractDeclaration[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CAlignmentSpecifierImpl.scala b/src/col/vct/col/ast/lang/c/CAlignmentSpecifierImpl.scala
index f69e87c56d..9636e52d44 100644
--- a/src/col/vct/col/ast/lang/c/CAlignmentSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CAlignmentSpecifierImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.c
 
 import vct.col.ast.CAlignmentSpecifier
 
-trait CAlignmentSpecifierImpl[G] { this: CAlignmentSpecifier[G] =>
+trait CAlignmentSpecifierImpl[G] {
+  this: CAlignmentSpecifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CAnonymousFunctionDeclaratorImpl.scala b/src/col/vct/col/ast/lang/c/CAnonymousFunctionDeclaratorImpl.scala
index 67914a743f..b43f0bb83c 100644
--- a/src/col/vct/col/ast/lang/c/CAnonymousFunctionDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CAnonymousFunctionDeclaratorImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.CAnonymousFunctionDeclarator
 import vct.col.ast.ops.CAnonymousFunctionDeclaratorOps
 import vct.col.print._
 
-trait CAnonymousFunctionDeclaratorImpl[G] extends CAnonymousFunctionDeclaratorOps[G] { this: CAnonymousFunctionDeclarator[G] =>
+trait CAnonymousFunctionDeclaratorImpl[G]
+    extends CAnonymousFunctionDeclaratorOps[G] {
+  this: CAnonymousFunctionDeclarator[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(inner.show <> "(" <> Doc.args(params.map(Text)) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CArrayDeclaratorImpl.scala b/src/col/vct/col/ast/lang/c/CArrayDeclaratorImpl.scala
index d73dfd3e22..d227babf9e 100644
--- a/src/col/vct/col/ast/lang/c/CArrayDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CArrayDeclaratorImpl.scala
@@ -4,7 +4,10 @@ import vct.col.ast.CArrayDeclarator
 import vct.col.ast.ops.CArrayDeclaratorOps
 import vct.col.print.{Ctx, Doc, Group}
 
-trait CArrayDeclaratorImpl[G] extends CArrayDeclaratorOps[G] { this: CArrayDeclarator[G] =>
+trait CArrayDeclaratorImpl[G] extends CArrayDeclaratorOps[G] {
+  this: CArrayDeclarator[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(inner.show <> "[" <> Doc.arg(Doc.stack(qualifiers ++ size.toSeq)) <> "]")
-}
\ No newline at end of file
+    Group(
+      inner.show <> "[" <> Doc.arg(Doc.stack(qualifiers ++ size.toSeq)) <> "]"
+    )
+}
diff --git a/src/col/vct/col/ast/lang/c/CAtomicImpl.scala b/src/col/vct/col/ast/lang/c/CAtomicImpl.scala
index acca1d368c..a9452337ce 100644
--- a/src/col/vct/col/ast/lang/c/CAtomicImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CAtomicImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CAtomic
 import vct.col.ast.ops.CAtomicOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CAtomicImpl[G] extends CAtomicOps[G] { this: CAtomic[G] =>
+trait CAtomicImpl[G] extends CAtomicOps[G] {
+  this: CAtomic[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("_Atomic")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CBoolImpl.scala b/src/col/vct/col/ast/lang/c/CBoolImpl.scala
index 613e37503f..234384e9f9 100644
--- a/src/col/vct/col/ast/lang/c/CBoolImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CBoolImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CBool
 import vct.col.ast.ops.CBoolOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CBoolImpl[G] extends CBoolOps[G] { this: CBool[G] =>
+trait CBoolImpl[G] extends CBoolOps[G] {
+  this: CBool[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("_Bool")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CCastImpl.scala b/src/col/vct/col/ast/lang/c/CCastImpl.scala
index f818755f3f..7e2d8488ec 100644
--- a/src/col/vct/col/ast/lang/c/CCastImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CCastImpl.scala
@@ -5,10 +5,12 @@ import vct.col.print.Doc.{arg, fold}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.CCastOps
 
-trait CCastImpl[G] extends CCastOps[G] { this: CCast[G] =>
+trait CCastImpl[G] extends CCastOps[G] {
+  this: CCast[G] =>
   override def t: Type[G] = castType
 
   override def precedence = Precedence.ATOMIC
 
-  override def layout(implicit ctx: Ctx): Doc = Text("(") <> t <> ")" <> assoc(expr)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Text("(") <> t <> ")" <> assoc(expr)
+}
diff --git a/src/col/vct/col/ast/lang/c/CCharImpl.scala b/src/col/vct/col/ast/lang/c/CCharImpl.scala
index 38d2a3602b..950a18cd18 100644
--- a/src/col/vct/col/ast/lang/c/CCharImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CCharImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CChar
 import vct.col.ast.ops.CCharOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CCharImpl[G] extends CCharOps[G] { this: CChar[G] =>
+trait CCharImpl[G] extends CCharOps[G] {
+  this: CChar[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("char")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CConstImpl.scala b/src/col/vct/col/ast/lang/c/CConstImpl.scala
index 209faac224..7dc42ed017 100644
--- a/src/col/vct/col/ast/lang/c/CConstImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CConstImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CConst
 import vct.col.ast.ops.CConstOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CConstImpl[G] extends CConstOps[G] { this: CConst[G] =>
+trait CConstImpl[G] extends CConstOps[G] {
+  this: CConst[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("const")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CDeclarationImpl.scala b/src/col/vct/col/ast/lang/c/CDeclarationImpl.scala
index ea69bb27ac..c0bf5af319 100644
--- a/src/col/vct/col/ast/lang/c/CDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CDeclarationImpl.scala
@@ -5,8 +5,11 @@ import vct.col.ast.{CDeclaration, TResource}
 import vct.col.check.{CheckContext, CheckError}
 import vct.col.print._
 
-trait CDeclarationImpl[G] extends CDeclarationOps[G] with CDeclarationFamilyOps[G] { this: CDeclaration[G] =>
-  override def check(context: CheckContext[G]): Seq[CheckError] = kernelInvariant.checkSubType(TResource())
+trait CDeclarationImpl[G]
+    extends CDeclarationOps[G] with CDeclarationFamilyOps[G] {
+  this: CDeclaration[G] =>
+  override def check(context: CheckContext[G]): Seq[CheckError] =
+    kernelInvariant.checkSubType(TResource())
 
   // PB: Please keep in sync with ApplicableContractImpl
   def layoutContract(implicit ctx: Ctx): Doc =
@@ -22,10 +25,5 @@ trait CDeclarationImpl[G] extends CDeclarationOps[G] with CDeclarationFamilyOps[
     ))
 
   override def layout(implicit ctx: Ctx): Doc =
-    Doc.stack(Seq(
-      layoutContract,
-      Group(
-        Doc.spread(specs) <>> Doc.args(inits)
-      ),
-    ))
-}
\ No newline at end of file
+    Doc.stack(Seq(layoutContract, Group(Doc.spread(specs) <>> Doc.args(inits))))
+}
diff --git a/src/col/vct/col/ast/lang/c/CDeclarationSpecifierImpl.scala b/src/col/vct/col/ast/lang/c/CDeclarationSpecifierImpl.scala
index 2ffaa806f4..55a2a80f29 100644
--- a/src/col/vct/col/ast/lang/c/CDeclarationSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CDeclarationSpecifierImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.c
 import vct.col.ast.CDeclarationSpecifier
 import vct.col.ast.ops.CDeclarationSpecifierFamilyOps
 
-trait CDeclarationSpecifierImpl[G] extends CDeclarationSpecifierFamilyOps[G] { this: CDeclarationSpecifier[G] =>
+trait CDeclarationSpecifierImpl[G] extends CDeclarationSpecifierFamilyOps[G] {
+  this: CDeclarationSpecifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CDeclarationStatementImpl.scala b/src/col/vct/col/ast/lang/c/CDeclarationStatementImpl.scala
index 633d2794d9..6505ca9dd3 100644
--- a/src/col/vct/col/ast/lang/c/CDeclarationStatementImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CDeclarationStatementImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CDeclarationStatement
 import vct.col.ast.ops.CDeclarationStatementOps
 import vct.col.print.{Ctx, Doc}
 
-trait CDeclarationStatementImpl[G] extends CDeclarationStatementOps[G] { this: CDeclarationStatement[G] =>
+trait CDeclarationStatementImpl[G] extends CDeclarationStatementOps[G] {
+  this: CDeclarationStatement[G] =>
   override def layout(implicit ctx: Ctx): Doc = decl.show <> ";"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CDeclaratorImpl.scala b/src/col/vct/col/ast/lang/c/CDeclaratorImpl.scala
index 96c17fa875..1871d85ff8 100644
--- a/src/col/vct/col/ast/lang/c/CDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CDeclaratorImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.c
 import vct.col.ast.CDeclarator
 import vct.col.ast.ops.CDeclaratorFamilyOps
 
-trait CDeclaratorImpl[G] extends CDeclaratorFamilyOps[G] { this: CDeclarator[G] =>
+trait CDeclaratorImpl[G] extends CDeclaratorFamilyOps[G] {
+  this: CDeclarator[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CDoubleImpl.scala b/src/col/vct/col/ast/lang/c/CDoubleImpl.scala
index 2994edcd38..2ae57502c0 100644
--- a/src/col/vct/col/ast/lang/c/CDoubleImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CDoubleImpl.scala
@@ -4,6 +4,7 @@ import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.CDouble
 import vct.col.ast.ops.CDoubleOps
 
-trait CDoubleImpl[G] extends CDoubleOps[G] { this: CDouble[G] =>
-   override def layout(implicit ctx: Ctx): Doc = Text("double")
-}
\ No newline at end of file
+trait CDoubleImpl[G] extends CDoubleOps[G] {
+  this: CDouble[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text("double")
+}
diff --git a/src/col/vct/col/ast/lang/c/CExprImpl.scala b/src/col/vct/col/ast/lang/c/CExprImpl.scala
index b13cfca592..892e63adb1 100644
--- a/src/col/vct/col/ast/lang/c/CExprImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CExprImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.c
 
 import vct.col.ast.CExpr
 
-trait CExprImpl[G] { this: CExpr[G] =>
+trait CExprImpl[G] {
+  this: CExpr[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CExternImpl.scala b/src/col/vct/col/ast/lang/c/CExternImpl.scala
index 09fb7aeeed..9e12da9a22 100644
--- a/src/col/vct/col/ast/lang/c/CExternImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CExternImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CExtern
 import vct.col.ast.ops.CExternOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CExternImpl[G] extends CExternOps[G] { this: CExtern[G] =>
+trait CExternImpl[G] extends CExternOps[G] {
+  this: CExtern[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("extern")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CFieldAccessImpl.scala b/src/col/vct/col/ast/lang/c/CFieldAccessImpl.scala
index 2c7bea5430..08c328f41f 100644
--- a/src/col/vct/col/ast/lang/c/CFieldAccessImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CFieldAccessImpl.scala
@@ -1,43 +1,61 @@
 package vct.col.ast.lang.c
 
-import vct.col.ast.{CFieldAccess, CPrimitiveType, CSpecificationType, TCInt, TEnum, TOpenCLVector, Type}
+import vct.col.ast.{
+  CFieldAccess,
+  CPrimitiveType,
+  CSpecificationType,
+  TCInt,
+  TEnum,
+  TOpenCLVector,
+  Type,
+}
 import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.resolve.ctx._
 import vct.col.typerules.Types
 import vct.col.ast.ops.CFieldAccessOps
 import vct.col.resolve.lang.C
 
-trait CFieldAccessImpl[G] extends CFieldAccessOps[G] { this: CFieldAccess[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case ref: RefCStructField[G] => C.typeOrReturnTypeFromDeclaration(ref.decls.specs, ref.decls.decls(ref.idx))
-    case ref: RefOpenCLVectorMembers[G] =>
-      val innerType = obj.t match {
-        case CPrimitiveType(Seq(CSpecificationType(v: TOpenCLVector[G]))) => v.innerType
-        case v: TOpenCLVector[G] => v.innerType
-        case _ => ???
-      }
+trait CFieldAccessImpl[G] extends CFieldAccessOps[G] {
+  this: CFieldAccess[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case ref: RefCStructField[G] =>
+        C.typeOrReturnTypeFromDeclaration(
+          ref.decls.specs,
+          ref.decls.decls(ref.idx),
+        )
+      case ref: RefOpenCLVectorMembers[G] =>
+        val innerType =
+          obj.t match {
+            case CPrimitiveType(Seq(CSpecificationType(v: TOpenCLVector[G]))) =>
+              v.innerType
+            case v: TOpenCLVector[G] => v.innerType
+            case _ => ???
+          }
 
-      if(ref.idx.size == 1) innerType
-      else if(ref.idx.size > 1) TOpenCLVector(ref.idx.size, innerType)
-      else ???
-    case ref: RefModelField[G] => ref.decl.t
-    case ref: RefFunction[G] => Types.notAValue(ref)
-    case ref: RefProcedure[G] => Types.notAValue(ref)
-    case ref: RefPredicate[G] => Types.notAValue(ref)
-    case ref: RefInstanceFunction[G] => Types.notAValue(ref)
-    case ref: RefInstanceMethod[G] => Types.notAValue(ref)
-    case ref: RefInstancePredicate[G] => Types.notAValue(ref)
-    case ref: RefADTFunction[G] => Types.notAValue(ref)
-    case ref: RefModelProcess[G] => Types.notAValue(ref)
-    case ref: RefModelAction[G] => Types.notAValue(ref)
-    case ref: BuiltinField[G] => ref.f(obj).t
-    case ref: BuiltinInstanceMethod[G] => Types.notAValue(ref)
-    case ref: RefCudaVecDim[G] => TCInt()
-    case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
-    case RefProverFunction(decl) => decl.returnType
-  }
+        if (ref.idx.size == 1)
+          innerType
+        else if (ref.idx.size > 1)
+          TOpenCLVector(ref.idx.size, innerType)
+        else
+          ???
+      case ref: RefModelField[G] => ref.decl.t
+      case ref: RefFunction[G] => Types.notAValue(ref)
+      case ref: RefProcedure[G] => Types.notAValue(ref)
+      case ref: RefPredicate[G] => Types.notAValue(ref)
+      case ref: RefInstanceFunction[G] => Types.notAValue(ref)
+      case ref: RefInstanceMethod[G] => Types.notAValue(ref)
+      case ref: RefInstancePredicate[G] => Types.notAValue(ref)
+      case ref: RefADTFunction[G] => Types.notAValue(ref)
+      case ref: RefModelProcess[G] => Types.notAValue(ref)
+      case ref: RefModelAction[G] => Types.notAValue(ref)
+      case ref: BuiltinField[G] => ref.f(obj).t
+      case ref: BuiltinInstanceMethod[G] => Types.notAValue(ref)
+      case ref: RefCudaVecDim[G] => TCInt()
+      case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
+      case RefProverFunction(decl) => decl.returnType
+    }
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc =
-    assoc(obj) <> "." <> field
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = assoc(obj) <> "." <> field
+}
diff --git a/src/col/vct/col/ast/lang/c/CFloatImpl.scala b/src/col/vct/col/ast/lang/c/CFloatImpl.scala
index a3cf473e85..0fddfb7360 100644
--- a/src/col/vct/col/ast/lang/c/CFloatImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CFloatImpl.scala
@@ -4,6 +4,7 @@ import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.CFloat
 import vct.col.ast.ops.CFloatOps
 
-trait CFloatImpl[G] extends CFloatOps[G] { this: CFloat[G] =>
-   override def layout(implicit ctx: Ctx): Doc = Text("float")
-}
\ No newline at end of file
+trait CFloatImpl[G] extends CFloatOps[G] {
+  this: CFloat[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text("float")
+}
diff --git a/src/col/vct/col/ast/lang/c/CFunctionDefinitionImpl.scala b/src/col/vct/col/ast/lang/c/CFunctionDefinitionImpl.scala
index c02cb416be..3ccc037fb7 100644
--- a/src/col/vct/col/ast/lang/c/CFunctionDefinitionImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CFunctionDefinitionImpl.scala
@@ -4,12 +4,11 @@ import vct.col.ast.CFunctionDefinition
 import vct.col.ast.ops.CFunctionDefinitionOps
 import vct.col.print.{Ctx, Doc, Group}
 
-trait CFunctionDefinitionImpl[G] extends CFunctionDefinitionOps[G] { this: CFunctionDefinition[G] =>
+trait CFunctionDefinitionImpl[G] extends CFunctionDefinitionOps[G] {
+  this: CFunctionDefinition[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(
-        Doc.spread(specs) <>> declarator
-      ) <+> body.layoutAsBlock,
+      Group(Doc.spread(specs) <>> declarator) <+> body.layoutAsBlock,
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CFunctionSpecifierImpl.scala b/src/col/vct/col/ast/lang/c/CFunctionSpecifierImpl.scala
index af4f5d44b8..424c53d6d4 100644
--- a/src/col/vct/col/ast/lang/c/CFunctionSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CFunctionSpecifierImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.c
 
 import vct.col.ast.CFunctionSpecifier
 
-trait CFunctionSpecifierImpl[G] { this: CFunctionSpecifier[G] =>
+trait CFunctionSpecifierImpl[G] {
+  this: CFunctionSpecifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CGlobalDeclarationImpl.scala b/src/col/vct/col/ast/lang/c/CGlobalDeclarationImpl.scala
index 69d5e98489..b3976af6b8 100644
--- a/src/col/vct/col/ast/lang/c/CGlobalDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CGlobalDeclarationImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.CGlobalDeclaration
 import vct.col.ast.ops.CGlobalDeclarationOps
 import vct.col.print._
 
-trait CGlobalDeclarationImpl[G] extends CGlobalDeclarationOps[G] { this: CGlobalDeclaration[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    decl.show <> ";"
-}
\ No newline at end of file
+trait CGlobalDeclarationImpl[G] extends CGlobalDeclarationOps[G] {
+  this: CGlobalDeclaration[G] =>
+  override def layout(implicit ctx: Ctx): Doc = decl.show <> ";"
+}
diff --git a/src/col/vct/col/ast/lang/c/CGotoImpl.scala b/src/col/vct/col/ast/lang/c/CGotoImpl.scala
index 3785b17b50..873f0d938b 100644
--- a/src/col/vct/col/ast/lang/c/CGotoImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CGotoImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.CGoto
 import vct.col.ast.ops.CGotoOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CGotoImpl[G] extends CGotoOps[G] { this: CGoto[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("goto") <+> label <> ";"
-}
\ No newline at end of file
+trait CGotoImpl[G] extends CGotoOps[G] {
+  this: CGoto[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text("goto") <+> label <> ";"
+}
diff --git a/src/col/vct/col/ast/lang/c/CGpgpuKernelSpecifierImpl.scala b/src/col/vct/col/ast/lang/c/CGpgpuKernelSpecifierImpl.scala
index ae6b53c2e9..9200778932 100644
--- a/src/col/vct/col/ast/lang/c/CGpgpuKernelSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CGpgpuKernelSpecifierImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.c
 import vct.col.ast.CGpgpuKernelSpecifier
 import vct.col.origin.{Blame, KernelFailure}
 
-trait CGpgpuKernelSpecifierImpl[G] { this: CGpgpuKernelSpecifier[G] =>
+trait CGpgpuKernelSpecifierImpl[G] {
+  this: CGpgpuKernelSpecifier[G] =>
   def blame: Blame[KernelFailure]
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CInitImpl.scala b/src/col/vct/col/ast/lang/c/CInitImpl.scala
index f6b65c4fa9..f648c4164b 100644
--- a/src/col/vct/col/ast/lang/c/CInitImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CInitImpl.scala
@@ -4,7 +4,11 @@ import vct.col.ast.CInit
 import vct.col.ast.ops.{CInitFamilyOps, CInitOps}
 import vct.col.print.{Ctx, Doc, Group}
 
-trait CInitImpl[G] extends CInitOps[G] with CInitFamilyOps[G] { this: CInit[G] =>
+trait CInitImpl[G] extends CInitOps[G] with CInitFamilyOps[G] {
+  this: CInit[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    if(init.isEmpty) decl.show else Group(decl.show <+> "=" <>> init.get)
-}
\ No newline at end of file
+    if (init.isEmpty)
+      decl.show
+    else
+      Group(decl.show <+> "=" <>> init.get)
+}
diff --git a/src/col/vct/col/ast/lang/c/CInlineImpl.scala b/src/col/vct/col/ast/lang/c/CInlineImpl.scala
index 4943cc63ab..a3ff453e88 100644
--- a/src/col/vct/col/ast/lang/c/CInlineImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CInlineImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CInline
 import vct.col.ast.ops.CInlineOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CInlineImpl[G] extends CInlineOps[G] { this: CInline[G] =>
+trait CInlineImpl[G] extends CInlineOps[G] {
+  this: CInline[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("inline")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CIntImpl.scala b/src/col/vct/col/ast/lang/c/CIntImpl.scala
index 3aa4cf2aaf..eb17b77c94 100644
--- a/src/col/vct/col/ast/lang/c/CIntImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CIntImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CInt
 import vct.col.ast.ops.CIntOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CIntImpl[G] extends CIntOps[G] { this: CInt[G] =>
+trait CIntImpl[G] extends CIntOps[G] {
+  this: CInt[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("int")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CInvocationImpl.scala b/src/col/vct/col/ast/lang/c/CInvocationImpl.scala
index 14d501bdd4..f6db4c5ea8 100644
--- a/src/col/vct/col/ast/lang/c/CInvocationImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CInvocationImpl.scala
@@ -7,29 +7,44 @@ import vct.col.resolve.ctx._
 import vct.col.resolve.lang.C
 import vct.result.VerificationError.Unreachable
 
-trait CInvocationImpl[G] extends CInvocationOps[G] { this: CInvocation[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case RefFunction(decl) =>  decl.returnType
-    case RefProcedure(decl) => decl.returnType
-    case RefPredicate(decl) => decl.returnType
-    case RefADTFunction(decl) => decl.returnType
-    case RefModelProcess(decl) => decl.returnType
-    case RefModelAction(decl) => decl.returnType
-    case RefOpenCLVectorLiteralCInvocationTarget(size, t) => TOpenCLVector(size, t)
-    case RefCFunctionDefinition(decl) => C.typeOrReturnTypeFromDeclaration(decl.specs, decl.declarator)
-    case RefCGlobalDeclaration(decls, initIdx) => C.typeOrReturnTypeFromDeclaration(decls.decl.specs, decls.decl.inits(initIdx).decl)
-    case RefProverFunction(decl) => decl.returnType
-    case RefInstanceMethod(decl) => decl.returnType
-    case RefInstanceFunction(decl) => decl.returnType
-    case RefInstancePredicate(decl) => decl.returnType
-    case BuiltinInstanceMethod(f) => applicable match {
-      case CFieldAccess(obj, _) => f(obj)(args).t
-      case other => throw Unreachable("BuiltinInstanceMethod resolution of CInvocation must invoke a CStructAccess.")
+trait CInvocationImpl[G] extends CInvocationOps[G] {
+  this: CInvocation[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case RefFunction(decl) => decl.returnType
+      case RefProcedure(decl) => decl.returnType
+      case RefPredicate(decl) => decl.returnType
+      case RefADTFunction(decl) => decl.returnType
+      case RefModelProcess(decl) => decl.returnType
+      case RefModelAction(decl) => decl.returnType
+      case RefOpenCLVectorLiteralCInvocationTarget(size, t) =>
+        TOpenCLVector(size, t)
+      case RefCFunctionDefinition(decl) =>
+        C.typeOrReturnTypeFromDeclaration(decl.specs, decl.declarator)
+      case RefCGlobalDeclaration(decls, initIdx) =>
+        C.typeOrReturnTypeFromDeclaration(
+          decls.decl.specs,
+          decls.decl.inits(initIdx).decl,
+        )
+      case RefProverFunction(decl) => decl.returnType
+      case RefInstanceMethod(decl) => decl.returnType
+      case RefInstanceFunction(decl) => decl.returnType
+      case RefInstancePredicate(decl) => decl.returnType
+      case BuiltinInstanceMethod(f) =>
+        applicable match {
+          case CFieldAccess(obj, _) => f(obj)(args).t
+          case other =>
+            throw Unreachable(
+              "BuiltinInstanceMethod resolution of CInvocation must invoke a CStructAccess."
+            )
+        }
     }
-  }
 
   override def precedence: Int = Precedence.POSTFIX
 
   override def layout(implicit ctx: Ctx): Doc =
-    Group(assoc(applicable) <> "(" <> Doc.args(args) <> ")" <> DocUtil.givenYields(givenArgs, yields))
-}
\ No newline at end of file
+    Group(
+      assoc(applicable) <> "(" <> Doc.args(args) <> ")" <>
+        DocUtil.givenYields(givenArgs, yields)
+    )
+}
diff --git a/src/col/vct/col/ast/lang/c/CLiteralArrayImpl.scala b/src/col/vct/col/ast/lang/c/CLiteralArrayImpl.scala
index adee02947b..093df9f3a9 100644
--- a/src/col/vct/col/ast/lang/c/CLiteralArrayImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CLiteralArrayImpl.scala
@@ -5,10 +5,12 @@ import vct.col.print.Doc.{arg, fold}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.CLiteralArrayOps
 
-trait CLiteralArrayImpl[G] extends CLiteralArrayOps[G] { this: CLiteralArray[G] =>
+trait CLiteralArrayImpl[G] extends CLiteralArrayOps[G] {
+  this: CLiteralArray[G] =>
   override def t: Type[G] = new TNotAValue()
 
   override def precedence = Precedence.ATOMIC
 
-  override def layout(implicit ctx: Ctx): Doc = Text("{") <> arg(fold(exprs)(_ <> "," <+> _)) <> "}"
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Text("{") <> arg(fold(exprs)(_ <> "," <+> _)) <> "}"
+}
diff --git a/src/col/vct/col/ast/lang/c/CLocalDeclarationImpl.scala b/src/col/vct/col/ast/lang/c/CLocalDeclarationImpl.scala
index 8e292b07ad..c00a17133e 100644
--- a/src/col/vct/col/ast/lang/c/CLocalDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CLocalDeclarationImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.CLocalDeclaration
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.{CLocalDeclarationOps, CLocalDeclarationFamilyOps}
 
-trait CLocalDeclarationImpl[G] extends CLocalDeclarationOps[G] with CLocalDeclarationFamilyOps[G] { this: CLocalDeclaration[G] =>
+trait CLocalDeclarationImpl[G]
+    extends CLocalDeclarationOps[G] with CLocalDeclarationFamilyOps[G] {
+  this: CLocalDeclaration[G] =>
   override def layout(implicit ctx: Ctx): Doc = decl.show
 }
diff --git a/src/col/vct/col/ast/lang/c/CLocalImpl.scala b/src/col/vct/col/ast/lang/c/CLocalImpl.scala
index c8ebb7d5d0..f5e14ba194 100644
--- a/src/col/vct/col/ast/lang/c/CLocalImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CLocalImpl.scala
@@ -7,32 +7,46 @@ import vct.col.resolve.ctx._
 import vct.col.resolve.lang.C
 import vct.col.typerules.Types
 
-trait CLocalImpl[G] extends CLocalOps[G] { this: CLocal[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case ref: RefCParam[G] => C.typeOrReturnTypeFromDeclaration(ref.decl.specifiers, ref.decl.declarator)
-    case ref: RefAxiomaticDataType[G] => Types.notAValue(ref)
-    case RefVariable(decl) => decl.t
-    case ref: RefCFunctionDefinition[G] => Types.notAValue(ref)
-    case ref: RefCStruct[G] => Types.notAValue(ref)
-    case ref @ RefCGlobalDeclaration(decls, initIdx) =>
-      val declInfo = C.getDeclaratorInfo(decls.decl.inits(initIdx).decl)
-      declInfo.params match {
-        case Some(_) => Types.notAValue(ref) // Function declaration
-        case None => declInfo.typeOrReturnType(CPrimitiveType(decls.decl.specs)) // Static declaration
-      }
-    case ref @ RefCLocalDeclaration(decls, initIdx) =>
-      val declInfo = C.getDeclaratorInfo(decls.decl.inits(initIdx).decl)
-      declInfo.params match {
-        case Some(_) => Types.notAValue(ref) // Function declaration
-        case None => declInfo.typeOrReturnType(CPrimitiveType(decls.decl.specs)) // Static declaration
-      }
-    case RefModelField(field) => field.t
-    case target: SpecInvocationTarget[G] => Types.notAValue(target)
-    case _: RefCudaVec[G] => CTCudaVec()
-    case cls: RefClass[G] => Types.notAValue(cls)
-    case enum: RefEnum[G] => Types.notAValue(enum)
-    case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
-  }
+trait CLocalImpl[G] extends CLocalOps[G] {
+  this: CLocal[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case ref: RefCParam[G] =>
+        C.typeOrReturnTypeFromDeclaration(
+          ref.decl.specifiers,
+          ref.decl.declarator,
+        )
+      case ref: RefAxiomaticDataType[G] => Types.notAValue(ref)
+      case RefVariable(decl) => decl.t
+      case ref: RefCFunctionDefinition[G] => Types.notAValue(ref)
+      case ref: RefCStruct[G] => Types.notAValue(ref)
+      case ref @ RefCGlobalDeclaration(decls, initIdx) =>
+        val declInfo = C.getDeclaratorInfo(decls.decl.inits(initIdx).decl)
+        declInfo.params match {
+          case Some(_) => Types.notAValue(ref) // Function declaration
+          case None =>
+            declInfo
+              .typeOrReturnType(CPrimitiveType(
+                decls.decl.specs
+              )) // Static declaration
+        }
+      case ref @ RefCLocalDeclaration(decls, initIdx) =>
+        val declInfo = C.getDeclaratorInfo(decls.decl.inits(initIdx).decl)
+        declInfo.params match {
+          case Some(_) => Types.notAValue(ref) // Function declaration
+          case None =>
+            declInfo
+              .typeOrReturnType(CPrimitiveType(
+                decls.decl.specs
+              )) // Static declaration
+        }
+      case RefModelField(field) => field.t
+      case target: SpecInvocationTarget[G] => Types.notAValue(target)
+      case _: RefCudaVec[G] => CTCudaVec()
+      case cls: RefClass[G] => Types.notAValue(cls)
+      case enum: RefEnum[G] => Types.notAValue(enum)
+      case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
+    }
 
   override def layout(implicit ctx: Ctx): Doc = Text(name)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CLongImpl.scala b/src/col/vct/col/ast/lang/c/CLongImpl.scala
index c64d6f21d3..cd194f77ae 100644
--- a/src/col/vct/col/ast/lang/c/CLongImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CLongImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CLong
 import vct.col.ast.ops.CLongOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CLongImpl[G] extends CLongOps[G] { this: CLong[G] =>
+trait CLongImpl[G] extends CLongOps[G] {
+  this: CLong[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("long")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CNameImpl.scala b/src/col/vct/col/ast/lang/c/CNameImpl.scala
index 9a92099ea8..d1087c9227 100644
--- a/src/col/vct/col/ast/lang/c/CNameImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CNameImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CName
 import vct.col.ast.ops.CNameOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CNameImpl[G] extends CNameOps[G] { this: CName[G] =>
+trait CNameImpl[G] extends CNameOps[G] {
+  this: CName[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text(name)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CParamImpl.scala b/src/col/vct/col/ast/lang/c/CParamImpl.scala
index c2d982405c..88fbec2c0c 100644
--- a/src/col/vct/col/ast/lang/c/CParamImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CParamImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.CParam
 import vct.col.ast.ops.{CParamFamilyOps, CParamOps}
 import vct.col.print.{Ctx, Doc}
 
-trait CParamImpl[G] extends CParamOps[G] with CParamFamilyOps[G] { this: CParam[G] =>
+trait CParamImpl[G] extends CParamOps[G] with CParamFamilyOps[G] {
+  this: CParam[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.spread(specifiers) <+> declarator
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CPointerDeclaratorImpl.scala b/src/col/vct/col/ast/lang/c/CPointerDeclaratorImpl.scala
index c0ff813e80..3e9a24704f 100644
--- a/src/col/vct/col/ast/lang/c/CPointerDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CPointerDeclaratorImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.CPointerDeclarator
 import vct.col.ast.ops.CPointerDeclaratorOps
 import vct.col.print.{Ctx, Doc}
 
-trait CPointerDeclaratorImpl[G] extends CPointerDeclaratorOps[G] { this: CPointerDeclarator[G] =>
+trait CPointerDeclaratorImpl[G] extends CPointerDeclaratorOps[G] {
+  this: CPointerDeclarator[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     inner.show <> Doc.fold(pointers)(_ <> _)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CPointerImpl.scala b/src/col/vct/col/ast/lang/c/CPointerImpl.scala
index d2219f873e..9a929524e8 100644
--- a/src/col/vct/col/ast/lang/c/CPointerImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CPointerImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.CPointer
 import vct.col.ast.ops.{CPointerFamilyOps, CPointerOps}
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CPointerImpl[G] extends CPointerOps[G] with CPointerFamilyOps[G] { this: CPointer[G] =>
+trait CPointerImpl[G] extends CPointerOps[G] with CPointerFamilyOps[G] {
+  this: CPointer[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text("*") <> Doc.rspread(qualifiers)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CPrimitiveTypeImpl.scala b/src/col/vct/col/ast/lang/c/CPrimitiveTypeImpl.scala
index 1b2757eb69..613a7671c7 100644
--- a/src/col/vct/col/ast/lang/c/CPrimitiveTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CPrimitiveTypeImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPrimitiveType
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.CPrimitiveTypeOps
 
-trait CPrimitiveTypeImpl[G] extends CPrimitiveTypeOps[G] { this: CPrimitiveType[G] =>
+trait CPrimitiveTypeImpl[G] extends CPrimitiveTypeOps[G] {
+  this: CPrimitiveType[G] =>
   override def layout(implicit ctx: Ctx): Doc = Doc.spread(specifiers)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CPureImpl.scala b/src/col/vct/col/ast/lang/c/CPureImpl.scala
index 59c47851a4..061e6532d1 100644
--- a/src/col/vct/col/ast/lang/c/CPureImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CPureImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPure
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPureOps
 
-trait CPureImpl[G] extends CPureOps[G] { this: CPure[G] =>
+trait CPureImpl[G] extends CPureOps[G] {
+  this: CPure[G] =>
   override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Text("pure"))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CRestrictImpl.scala b/src/col/vct/col/ast/lang/c/CRestrictImpl.scala
index c942daf792..988e4e5cf6 100644
--- a/src/col/vct/col/ast/lang/c/CRestrictImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CRestrictImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CRestrict
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CRestrictOps
 
-trait CRestrictImpl[G] extends CRestrictOps[G] { this: CRestrict[G] =>
+trait CRestrictImpl[G] extends CRestrictOps[G] {
+  this: CRestrict[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("restrict")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CShortImpl.scala b/src/col/vct/col/ast/lang/c/CShortImpl.scala
index f27ba9e4ed..a055047d87 100644
--- a/src/col/vct/col/ast/lang/c/CShortImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CShortImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CShort
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CShortOps
 
-trait CShortImpl[G] extends CShortOps[G] { this: CShort[G] =>
+trait CShortImpl[G] extends CShortOps[G] {
+  this: CShort[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("short")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CSignedImpl.scala b/src/col/vct/col/ast/lang/c/CSignedImpl.scala
index 429c3a9ded..1b5076bec7 100644
--- a/src/col/vct/col/ast/lang/c/CSignedImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CSignedImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CSigned
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CSignedOps
 
-trait CSignedImpl[G] extends CSignedOps[G] { this: CSigned[G] =>
+trait CSignedImpl[G] extends CSignedOps[G] {
+  this: CSigned[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("signed")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CSpecificationModifierImpl.scala b/src/col/vct/col/ast/lang/c/CSpecificationModifierImpl.scala
index c1796587cf..630a8f60f6 100644
--- a/src/col/vct/col/ast/lang/c/CSpecificationModifierImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CSpecificationModifierImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.c
 
 import vct.col.ast.CSpecificationModifier
 
-trait CSpecificationModifierImpl[G] { this: CSpecificationModifier[G] =>
+trait CSpecificationModifierImpl[G] {
+  this: CSpecificationModifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CSpecificationTypeImpl.scala b/src/col/vct/col/ast/lang/c/CSpecificationTypeImpl.scala
index 97aa6b0c1a..3e3fb21df6 100644
--- a/src/col/vct/col/ast/lang/c/CSpecificationTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CSpecificationTypeImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CSpecificationType
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CSpecificationTypeOps
 
-trait CSpecificationTypeImpl[G] extends CSpecificationTypeOps[G] { this: CSpecificationType[G] =>
+trait CSpecificationTypeImpl[G] extends CSpecificationTypeOps[G] {
+  this: CSpecificationType[G] =>
   override def layout(implicit ctx: Ctx): Doc = t.show
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CStatementImpl.scala b/src/col/vct/col/ast/lang/c/CStatementImpl.scala
index 4deeb227cf..058905a139 100644
--- a/src/col/vct/col/ast/lang/c/CStatementImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CStatementImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.c
 
 import vct.col.ast.CStatement
 
-trait CStatementImpl[G] { this: CStatement[G] =>
+trait CStatementImpl[G] {
+  this: CStatement[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CStaticImpl.scala b/src/col/vct/col/ast/lang/c/CStaticImpl.scala
index 0d87248d6e..1c31552fd2 100644
--- a/src/col/vct/col/ast/lang/c/CStaticImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CStaticImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CStatic
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CStaticOps
 
-trait CStaticImpl[G] extends CStaticOps[G] { this: CStatic[G] =>
+trait CStaticImpl[G] extends CStaticOps[G] {
+  this: CStatic[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("static")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CStorageClassSpecifierImpl.scala b/src/col/vct/col/ast/lang/c/CStorageClassSpecifierImpl.scala
index 3c46c438a5..8992e1ae24 100644
--- a/src/col/vct/col/ast/lang/c/CStorageClassSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CStorageClassSpecifierImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.c
 
 import vct.col.ast.CStorageClassSpecifier
 
-trait CStorageClassSpecifierImpl[G] { this: CStorageClassSpecifier[G] =>
+trait CStorageClassSpecifierImpl[G] {
+  this: CStorageClassSpecifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CStructDeclarationImpl.scala b/src/col/vct/col/ast/lang/c/CStructDeclarationImpl.scala
index cc5827cd60..ee288f91c2 100644
--- a/src/col/vct/col/ast/lang/c/CStructDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CStructDeclarationImpl.scala
@@ -4,12 +4,15 @@ import vct.col.ast.CStructDeclaration
 import vct.col.ast.ops.CStructDeclarationOps
 import vct.col.print.{Ctx, Doc, Empty, Text}
 
-trait CStructDeclarationImpl[G] extends CStructDeclarationOps[G] { this: CStructDeclaration[G] =>
+trait CStructDeclarationImpl[G] extends CStructDeclarationOps[G] {
+  this: CStructDeclaration[G] =>
   override def layout(implicit ctx: Ctx): Doc = {
     Doc.stack(Seq(
       Text("struct") <+>
-      (if (name.isEmpty) Empty else Text(name.get)) <+>
-        "{" <>> Doc.stack(decl) <+/> "}"
+        (if (name.isEmpty)
+           Empty
+         else
+           Text(name.get)) <+> "{" <>> Doc.stack(decl) <+/> "}"
     ))
   }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CStructDerefImpl.scala b/src/col/vct/col/ast/lang/c/CStructDerefImpl.scala
index 5b13d194f3..76847a4111 100644
--- a/src/col/vct/col/ast/lang/c/CStructDerefImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CStructDerefImpl.scala
@@ -7,26 +7,31 @@ import vct.col.resolve.ctx._
 import vct.col.resolve.lang.C
 import vct.col.typerules.Types
 
-trait CStructDerefImpl[G] extends CStructDerefOps[G] { this: CStructDeref[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case ref: RefCStructField[G] => C.typeOrReturnTypeFromDeclaration(ref.decls.specs, ref.decls.decls(ref.idx))
-    case ref: RefCStruct[G] => Types.notAValue(ref)
-    case ref: RefModelField[G] => ref.decl.t
-    case ref: RefFunction[G] => Types.notAValue(ref)
-    case ref: RefProcedure[G] => Types.notAValue(ref)
-    case ref: RefPredicate[G] => Types.notAValue(ref)
-    case ref: RefInstanceFunction[G] => Types.notAValue(ref)
-    case ref: RefInstanceMethod[G] => Types.notAValue(ref)
-    case ref: RefInstancePredicate[G] => Types.notAValue(ref)
-    case ref: RefADTFunction[G] => Types.notAValue(ref)
-    case ref: RefModelProcess[G] => Types.notAValue(ref)
-    case ref: RefModelAction[G] => Types.notAValue(ref)
-    case ref: BuiltinField[G] => ref.f(struct).t
-    case ref: BuiltinInstanceMethod[G] => Types.notAValue(ref)
-    case ref: RefCudaVecDim[G] => TCInt()
-  }
+trait CStructDerefImpl[G] extends CStructDerefOps[G] {
+  this: CStructDeref[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case ref: RefCStructField[G] =>
+        C.typeOrReturnTypeFromDeclaration(
+          ref.decls.specs,
+          ref.decls.decls(ref.idx),
+        )
+      case ref: RefCStruct[G] => Types.notAValue(ref)
+      case ref: RefModelField[G] => ref.decl.t
+      case ref: RefFunction[G] => Types.notAValue(ref)
+      case ref: RefProcedure[G] => Types.notAValue(ref)
+      case ref: RefPredicate[G] => Types.notAValue(ref)
+      case ref: RefInstanceFunction[G] => Types.notAValue(ref)
+      case ref: RefInstanceMethod[G] => Types.notAValue(ref)
+      case ref: RefInstancePredicate[G] => Types.notAValue(ref)
+      case ref: RefADTFunction[G] => Types.notAValue(ref)
+      case ref: RefModelProcess[G] => Types.notAValue(ref)
+      case ref: RefModelAction[G] => Types.notAValue(ref)
+      case ref: BuiltinField[G] => ref.f(struct).t
+      case ref: BuiltinInstanceMethod[G] => Types.notAValue(ref)
+      case ref: RefCudaVecDim[G] => TCInt()
+    }
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc =
-    assoc(struct) <> "->" <> field
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = assoc(struct) <> "->" <> field
+}
diff --git a/src/col/vct/col/ast/lang/c/CStructMemberDeclaratorImpl.scala b/src/col/vct/col/ast/lang/c/CStructMemberDeclaratorImpl.scala
index 8e6dbfeed3..e5406b400c 100644
--- a/src/col/vct/col/ast/lang/c/CStructMemberDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CStructMemberDeclaratorImpl.scala
@@ -1,10 +1,20 @@
 package vct.col.ast.lang.c
 
 import vct.col.ast.CStructMemberDeclarator
-import vct.col.ast.ops.{CStructMemberDeclaratorFamilyOps, CStructMemberDeclaratorOps}
+import vct.col.ast.ops.{
+  CStructMemberDeclaratorFamilyOps,
+  CStructMemberDeclaratorOps,
+}
 import vct.col.print.{Ctx, Doc, Empty, Text}
 
-trait CStructMemberDeclaratorImpl[G] extends CStructMemberDeclaratorOps[G] with CStructMemberDeclaratorFamilyOps[G] { this: CStructMemberDeclarator[G] =>
-  override def layout(implicit ctx: Ctx): Doc = Doc.spread(specs) <>
-    (if(decls.isEmpty) Empty else Text(" ") <> Doc.fold(decls)(_ <> ", " <> _)) <> ";"
-}
\ No newline at end of file
+trait CStructMemberDeclaratorImpl[G]
+    extends CStructMemberDeclaratorOps[G]
+    with CStructMemberDeclaratorFamilyOps[G] {
+  this: CStructMemberDeclarator[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.spread(specs) <>
+      (if (decls.isEmpty)
+         Empty
+       else
+         Text(" ") <> Doc.fold(decls)(_ <> ", " <> _)) <> ";"
+}
diff --git a/src/col/vct/col/ast/lang/c/CStructSpecifierImpl.scala b/src/col/vct/col/ast/lang/c/CStructSpecifierImpl.scala
index 7e1a4d320d..fbd3746564 100644
--- a/src/col/vct/col/ast/lang/c/CStructSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CStructSpecifierImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CStructSpecifier
 import vct.col.ast.ops.CStructSpecifierOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CStructSpecifierImpl[G] extends CStructSpecifierOps[G] { this: CStructSpecifier[G] =>
+trait CStructSpecifierImpl[G] extends CStructSpecifierOps[G] {
+  this: CStructSpecifier[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("struct") <+> name
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CTArrayImpl.scala b/src/col/vct/col/ast/lang/c/CTArrayImpl.scala
index d62349da12..e9e1f5b4ef 100644
--- a/src/col/vct/col/ast/lang/c/CTArrayImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTArrayImpl.scala
@@ -4,8 +4,8 @@ import vct.col.ast.CTArray
 import vct.col.print.{Ctx, Doc, Group}
 import vct.col.ast.ops.CTArrayOps
 
-trait CTArrayImpl[G] extends CTArrayOps[G] { this: CTArray[G] =>
+trait CTArrayImpl[G] extends CTArrayOps[G] {
+  this: CTArray[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(innerType.show <> "[" <> Doc.args(size.toSeq) <> "]")
 }
-
diff --git a/src/col/vct/col/ast/lang/c/CTCudaVecImpl.scala b/src/col/vct/col/ast/lang/c/CTCudaVecImpl.scala
index 37f3b7ab8e..3ba3cb7a08 100644
--- a/src/col/vct/col/ast/lang/c/CTCudaVecImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTCudaVecImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.c
 import vct.col.ast.CTCudaVec
 import vct.col.ast.ops.CTCudaVecOps
 
-trait CTCudaVecImpl[G] extends CTCudaVecOps[G] { this: CTCudaVec[G] =>
+trait CTCudaVecImpl[G] extends CTCudaVecOps[G] {
+  this: CTCudaVec[G] =>
 
 }
diff --git a/src/col/vct/col/ast/lang/c/CTPointerImpl.scala b/src/col/vct/col/ast/lang/c/CTPointerImpl.scala
index 328d0d21c4..233f297193 100644
--- a/src/col/vct/col/ast/lang/c/CTPointerImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTPointerImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.CTPointer
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CTPointerOps
 
-trait CTPointerImpl[G] extends CTPointerOps[G] { this: CTPointer[G] =>
+trait CTPointerImpl[G] extends CTPointerOps[G] {
+  this: CTPointer[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text("pointer") <> open <> innerType <> close
 }
diff --git a/src/col/vct/col/ast/lang/c/CTStructImpl.scala b/src/col/vct/col/ast/lang/c/CTStructImpl.scala
index 887f2d6e02..441bb9a2e4 100644
--- a/src/col/vct/col/ast/lang/c/CTStructImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTStructImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.CTStruct
 import vct.col.ast.ops.CTStructOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CTStructImpl[G] extends CTStructOps[G] { this: CTStruct[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("struct") <+> ctx.name(ref)
-}
\ No newline at end of file
+trait CTStructImpl[G] extends CTStructOps[G] {
+  this: CTStruct[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text("struct") <+> ctx.name(ref)
+}
diff --git a/src/col/vct/col/ast/lang/c/CTVectorImpl.scala b/src/col/vct/col/ast/lang/c/CTVectorImpl.scala
index 36bbb6a75d..141f0c8d08 100644
--- a/src/col/vct/col/ast/lang/c/CTVectorImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTVectorImpl.scala
@@ -15,15 +15,25 @@ object CTVector {
   }
 }
 
-trait CTVectorImpl[G] extends CTVectorOps[G] { this: CTVector[G] =>
+trait CTVectorImpl[G] extends CTVectorOps[G] {
+  this: CTVector[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text("vector") <> "<" <> innerType <> "," <> size <> ">"
 
-  lazy val intSize = size match {
-    case AmbiguousMult(SizeOf(ts), e) if ts == innerType && isConstantInt(e).isDefined => isConstantInt(e).get
-    case AmbiguousMult(e, SizeOf(ts)) if ts == innerType && isConstantInt(e).isDefined => isConstantInt(e).get
-    case Mult(e, SizeOf(ts)) if ts == innerType && isConstantInt(e).isDefined => isConstantInt(e).get
-    case Mult(SizeOf(ts), e) if ts == innerType && isConstantInt(e).isDefined => isConstantInt(e).get
-    case _ => throw CTVector.WrongVectorType(this)
-  }
+  lazy val intSize =
+    size match {
+      case AmbiguousMult(SizeOf(ts), e)
+          if ts == innerType && isConstantInt(e).isDefined =>
+        isConstantInt(e).get
+      case AmbiguousMult(e, SizeOf(ts))
+          if ts == innerType && isConstantInt(e).isDefined =>
+        isConstantInt(e).get
+      case Mult(e, SizeOf(ts))
+          if ts == innerType && isConstantInt(e).isDefined =>
+        isConstantInt(e).get
+      case Mult(SizeOf(ts), e)
+          if ts == innerType && isConstantInt(e).isDefined =>
+        isConstantInt(e).get
+      case _ => throw CTVector.WrongVectorType(this)
+    }
 }
diff --git a/src/col/vct/col/ast/lang/c/CTranslationUnitImpl.scala b/src/col/vct/col/ast/lang/c/CTranslationUnitImpl.scala
index d9e4157b1e..5005d60c5b 100644
--- a/src/col/vct/col/ast/lang/c/CTranslationUnitImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTranslationUnitImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CTranslationUnit
 import vct.col.print.{Ctx, Doc, Group}
 import vct.col.ast.ops.CTranslationUnitOps
 
-trait CTranslationUnitImpl[G] extends CTranslationUnitOps[G] { this: CTranslationUnit[G] =>
+trait CTranslationUnitImpl[G] extends CTranslationUnitOps[G] {
+  this: CTranslationUnit[G] =>
   override def layout(implicit ctx: Ctx): Doc = Doc.stack(declarations)
 }
diff --git a/src/col/vct/col/ast/lang/c/CTypeAttributeImpl.scala b/src/col/vct/col/ast/lang/c/CTypeAttributeImpl.scala
index 3678981e63..d1e3612589 100644
--- a/src/col/vct/col/ast/lang/c/CTypeAttributeImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTypeAttributeImpl.scala
@@ -4,8 +4,10 @@ import vct.col.ast.CTypeAttribute
 import vct.col.ast.ops.CTypeAttributeOps
 import vct.col.print.{Ctx, Doc, Text}
 
-trait CTypeAttributeImpl[G] extends CTypeAttributeOps[G] { this: CTypeAttribute[G] =>
+trait CTypeAttributeImpl[G] extends CTypeAttributeOps[G] {
+  this: CTypeAttribute[G] =>
   override def layout(implicit ctx: Ctx): Doc = {
-    Text("__attribute__") <> "( (" <> name <> "(" <> Doc.args(args) <> ")" <> ") )"
+    Text("__attribute__") <> "( (" <> name <> "(" <> Doc.args(args) <> ")" <>
+      ") )"
   }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CTypeExtensionDeclaratorImpl.scala b/src/col/vct/col/ast/lang/c/CTypeExtensionDeclaratorImpl.scala
index 2dd30a995d..d1972612d0 100644
--- a/src/col/vct/col/ast/lang/c/CTypeExtensionDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTypeExtensionDeclaratorImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.CTypeExtensionDeclarator
 import vct.col.ast.ops.CTypeExtensionDeclaratorOps
 import vct.col.print.{Ctx, Doc}
 
-trait CTypeExtensionDeclaratorImpl[G] extends CTypeExtensionDeclaratorOps[G] { this: CTypeExtensionDeclarator[G] =>
+trait CTypeExtensionDeclaratorImpl[G] extends CTypeExtensionDeclaratorOps[G] {
+  this: CTypeExtensionDeclarator[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     inner.show <> Doc.fold(extensions)(_ <+> _)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CTypeExtensionsImpl.scala b/src/col/vct/col/ast/lang/c/CTypeExtensionsImpl.scala
index 8e0105ef28..a2e22e234a 100644
--- a/src/col/vct/col/ast/lang/c/CTypeExtensionsImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTypeExtensionsImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.c
 import vct.col.ast.CTypeExtensions
 import vct.col.ast.ops.CTypeExtensionsFamilyOps
 
-trait CTypeExtensionsImpl[G] extends CTypeExtensionsFamilyOps[G] { this: CTypeExtensions[G] =>
+trait CTypeExtensionsImpl[G] extends CTypeExtensionsFamilyOps[G] {
+  this: CTypeExtensions[G] =>
 
 }
diff --git a/src/col/vct/col/ast/lang/c/CTypeImpl.scala b/src/col/vct/col/ast/lang/c/CTypeImpl.scala
index d3fd1f056d..02a19fa2d2 100644
--- a/src/col/vct/col/ast/lang/c/CTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTypeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.c
 
 import vct.col.ast.CType
 
-trait CTypeImpl[G] { this: CType[G] =>
+trait CTypeImpl[G] {
+  this: CType[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CTypeQualifierDeclarationSpecifierImpl.scala b/src/col/vct/col/ast/lang/c/CTypeQualifierDeclarationSpecifierImpl.scala
index b28bdd0529..889c91cfbf 100644
--- a/src/col/vct/col/ast/lang/c/CTypeQualifierDeclarationSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTypeQualifierDeclarationSpecifierImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.CTypeQualifierDeclarationSpecifier
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.CTypeQualifierDeclarationSpecifierOps
 
-trait CTypeQualifierDeclarationSpecifierImpl[G] extends CTypeQualifierDeclarationSpecifierOps[G] { this: CTypeQualifierDeclarationSpecifier[G] =>
+trait CTypeQualifierDeclarationSpecifierImpl[G]
+    extends CTypeQualifierDeclarationSpecifierOps[G] {
+  this: CTypeQualifierDeclarationSpecifier[G] =>
   override def layout(implicit ctx: Ctx): Doc = typeQual.show
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CTypeQualifierImpl.scala b/src/col/vct/col/ast/lang/c/CTypeQualifierImpl.scala
index 532e3df4a7..47aac8bac5 100644
--- a/src/col/vct/col/ast/lang/c/CTypeQualifierImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTypeQualifierImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.c
 import vct.col.ast.CTypeQualifier
 import vct.col.ast.ops.CTypeQualifierFamilyOps
 
-trait CTypeQualifierImpl[G] extends CTypeQualifierFamilyOps[G] { this: CTypeQualifier[G] =>
+trait CTypeQualifierImpl[G] extends CTypeQualifierFamilyOps[G] {
+  this: CTypeQualifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CTypeSpecifierImpl.scala b/src/col/vct/col/ast/lang/c/CTypeSpecifierImpl.scala
index 87334676ef..529d19ce1a 100644
--- a/src/col/vct/col/ast/lang/c/CTypeSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTypeSpecifierImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.c
 
 import vct.col.ast.CTypeSpecifier
 
-trait CTypeSpecifierImpl[G] { this: CTypeSpecifier[G] =>
+trait CTypeSpecifierImpl[G] {
+  this: CTypeSpecifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CTypedFunctionDeclaratorImpl.scala b/src/col/vct/col/ast/lang/c/CTypedFunctionDeclaratorImpl.scala
index 11c4485dd6..b87a4b96d7 100644
--- a/src/col/vct/col/ast/lang/c/CTypedFunctionDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTypedFunctionDeclaratorImpl.scala
@@ -4,7 +4,16 @@ import vct.col.ast.CTypedFunctionDeclarator
 import vct.col.print.{Ctx, Doc, Text, Group}
 import vct.col.ast.ops.CTypedFunctionDeclaratorOps
 
-trait CTypedFunctionDeclaratorImpl[G] extends CTypedFunctionDeclaratorOps[G] { this: CTypedFunctionDeclarator[G] =>
+trait CTypedFunctionDeclaratorImpl[G] extends CTypedFunctionDeclaratorOps[G] {
+  this: CTypedFunctionDeclarator[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(inner.show <> "(" <> Doc.args(params ++ (if(varargs) Seq(Text("...")) else Nil)) <> ")")
-}
\ No newline at end of file
+    Group(
+      inner.show <> "(" <> Doc.args(
+        params ++
+          (if (varargs)
+             Seq(Text("..."))
+           else
+             Nil)
+      ) <> ")"
+    )
+}
diff --git a/src/col/vct/col/ast/lang/c/CTypedefImpl.scala b/src/col/vct/col/ast/lang/c/CTypedefImpl.scala
index b3dc216594..0fe4750a29 100644
--- a/src/col/vct/col/ast/lang/c/CTypedefImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTypedefImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CTypedef
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CTypedefOps
 
-trait CTypedefImpl[G] extends CTypedefOps[G] { this: CTypedef[G] =>
+trait CTypedefImpl[G] extends CTypedefOps[G] {
+  this: CTypedef[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("typedef")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CTypedefNameImpl.scala b/src/col/vct/col/ast/lang/c/CTypedefNameImpl.scala
index cdb6945b04..6a101af027 100644
--- a/src/col/vct/col/ast/lang/c/CTypedefNameImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CTypedefNameImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CTypedefName
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CTypedefNameOps
 
-trait CTypedefNameImpl[G] extends CTypedefNameOps[G] { this: CTypedefName[G] =>
+trait CTypedefNameImpl[G] extends CTypedefNameOps[G] {
+  this: CTypedefName[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text(name)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CUDAKernelImpl.scala b/src/col/vct/col/ast/lang/c/CUDAKernelImpl.scala
index 9aea87a0d4..2d02634739 100644
--- a/src/col/vct/col/ast/lang/c/CUDAKernelImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CUDAKernelImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CUDAKernel
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CUDAKernelOps
 
-trait CUDAKernelImpl[G] extends CUDAKernelOps[G] { this: CUDAKernel[G] =>
+trait CUDAKernelImpl[G] extends CUDAKernelOps[G] {
+  this: CUDAKernel[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("__global__")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CUnsignedImpl.scala b/src/col/vct/col/ast/lang/c/CUnsignedImpl.scala
index 6c00aba168..fb95bba412 100644
--- a/src/col/vct/col/ast/lang/c/CUnsignedImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CUnsignedImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CUnsigned
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CUnsignedOps
 
-trait CUnsignedImpl[G] extends CUnsignedOps[G] { this: CUnsigned[G] =>
+trait CUnsignedImpl[G] extends CUnsignedOps[G] {
+  this: CUnsigned[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("unsigned")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CVoidImpl.scala b/src/col/vct/col/ast/lang/c/CVoidImpl.scala
index e646d1a771..537e7e8d9d 100644
--- a/src/col/vct/col/ast/lang/c/CVoidImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CVoidImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CVoid
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CVoidOps
 
-trait CVoidImpl[G] extends CVoidOps[G] { this: CVoid[G] =>
+trait CVoidImpl[G] extends CVoidOps[G] {
+  this: CVoid[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("void")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/CVolatileImpl.scala b/src/col/vct/col/ast/lang/c/CVolatileImpl.scala
index 428c3bb19e..8c2980046c 100644
--- a/src/col/vct/col/ast/lang/c/CVolatileImpl.scala
+++ b/src/col/vct/col/ast/lang/c/CVolatileImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CVolatile
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CVolatileOps
 
-trait CVolatileImpl[G] extends CVolatileOps[G] { this: CVolatile[G] =>
+trait CVolatileImpl[G] extends CVolatileOps[G] {
+  this: CVolatile[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("volatile")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/c/TOpenCLVectorImpl.scala b/src/col/vct/col/ast/lang/c/TOpenCLVectorImpl.scala
index 07fc0be817..eccf5a476d 100644
--- a/src/col/vct/col/ast/lang/c/TOpenCLVectorImpl.scala
+++ b/src/col/vct/col/ast/lang/c/TOpenCLVectorImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TOpenCLVector
 import vct.col.ast.ops.TOpenCLVectorOps
 import vct.col.print._
 
-trait TOpenCLVectorImpl[G] extends TOpenCLVectorOps[G] { this: TOpenCLVector[G] =>
+trait TOpenCLVectorImpl[G] extends TOpenCLVectorOps[G] {
+  this: TOpenCLVector[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text("openCLVector") <> "<" <> innerType <> "," <> size.toString <> ">"
 }
diff --git a/src/col/vct/col/ast/lang/cpp/CPPAbstractDeclarationImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPAbstractDeclarationImpl.scala
index fd0210b781..aea9f64672 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPAbstractDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPAbstractDeclarationImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.cpp
 
 import vct.col.ast.CPPAbstractDeclaration
 
-trait CPPAbstractDeclarationImpl[G] { this: CPPAbstractDeclaration[G] =>
+trait CPPAbstractDeclarationImpl[G] {
+  this: CPPAbstractDeclaration[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPAddressingDeclaratorImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPAddressingDeclaratorImpl.scala
index 20bf09e354..2774f80f33 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPAddressingDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPAddressingDeclaratorImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.CPPAddressingDeclarator
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.CPPAddressingDeclaratorOps
 
-trait CPPAddressingDeclaratorImpl[G] extends CPPAddressingDeclaratorOps[G] { this: CPPAddressingDeclarator[G] =>
+trait CPPAddressingDeclaratorImpl[G] extends CPPAddressingDeclaratorOps[G] {
+  this: CPPAddressingDeclarator[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     inner.show <> Doc.fold(operators)(_ <> _)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPAddressingImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPAddressingImpl.scala
index d39c22b2bf..0d58aafdca 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPAddressingImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPAddressingImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.cpp
 import vct.col.ast.CPPAddressing
 import vct.col.ast.ops.CPPAddressingFamilyOps
 
-trait CPPAddressingImpl[G] extends CPPAddressingFamilyOps[G] { this: CPPAddressing[G] =>
+trait CPPAddressingImpl[G] extends CPPAddressingFamilyOps[G] {
+  this: CPPAddressing[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPArrayDeclaratorImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPArrayDeclaratorImpl.scala
index 84c463479d..f624f779a5 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPArrayDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPArrayDeclaratorImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.CPPArrayDeclarator
 import vct.col.print.{Ctx, Doc, Group}
 import vct.col.ast.ops.CPPArrayDeclaratorOps
 
-trait CPPArrayDeclaratorImpl[G] extends CPPArrayDeclaratorOps[G] { this: CPPArrayDeclarator[G] =>
+trait CPPArrayDeclaratorImpl[G] extends CPPArrayDeclaratorOps[G] {
+  this: CPPArrayDeclarator[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(inner.show <> "[" <> Doc.arg(Doc.stack(size.toSeq)) <> "]")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPBoolImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPBoolImpl.scala
index 9f35235c33..8d6316a4cf 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPBoolImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPBoolImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPBool
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPBoolOps
 
-trait CPPBoolImpl[G] extends CPPBoolOps[G] { this: CPPBool[G] =>
+trait CPPBoolImpl[G] extends CPPBoolOps[G] {
+  this: CPPBool[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("bool")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPCharImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPCharImpl.scala
index 304607054f..920eda78c6 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPCharImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPCharImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPChar
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPCharOps
 
-trait CPPCharImpl[G] extends CPPCharOps[G] { this: CPPChar[G] =>
+trait CPPCharImpl[G] extends CPPCharOps[G] {
+  this: CPPChar[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("char")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPClassMethodOrFieldAccessImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPClassMethodOrFieldAccessImpl.scala
index 4e95c47cd0..f78c686b66 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPClassMethodOrFieldAccessImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPClassMethodOrFieldAccessImpl.scala
@@ -6,26 +6,29 @@ import vct.col.resolve.ctx._
 import vct.col.typerules.Types
 import vct.col.ast.ops.CPPClassMethodOrFieldAccessOps
 
-trait CPPClassMethodOrFieldAccessImpl[G] extends CPPClassMethodOrFieldAccessOps[G] { this: CPPClassMethodOrFieldAccess[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case ref: RefModelField[G] => ref.decl.t
-    case ref: RefFunction[G] => Types.notAValue(ref)
-    case ref: RefProcedure[G] => Types.notAValue(ref)
-    case ref: RefPredicate[G] => Types.notAValue(ref)
-    case ref: RefInstanceFunction[G] => Types.notAValue(ref)
-    case ref: RefInstanceMethod[G] => Types.notAValue(ref)
-    case ref: RefInstancePredicate[G] => Types.notAValue(ref)
-    case ref: RefADTFunction[G] => Types.notAValue(ref)
-    case ref: RefModelProcess[G] => Types.notAValue(ref)
-    case ref: RefModelAction[G] => Types.notAValue(ref)
-    case RefProverFunction(decl) => decl.returnType
-    case ref: BuiltinField[G] => ref.f(classInstance).t
-    case ref: BuiltinInstanceMethod[G] => Types.notAValue(ref)
-    case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
-    case ref: RefCPPGlobalDeclaration[G] => Types.notAValue(ref)
-  }
+trait CPPClassMethodOrFieldAccessImpl[G]
+    extends CPPClassMethodOrFieldAccessOps[G] {
+  this: CPPClassMethodOrFieldAccess[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case ref: RefModelField[G] => ref.decl.t
+      case ref: RefFunction[G] => Types.notAValue(ref)
+      case ref: RefProcedure[G] => Types.notAValue(ref)
+      case ref: RefPredicate[G] => Types.notAValue(ref)
+      case ref: RefInstanceFunction[G] => Types.notAValue(ref)
+      case ref: RefInstanceMethod[G] => Types.notAValue(ref)
+      case ref: RefInstancePredicate[G] => Types.notAValue(ref)
+      case ref: RefADTFunction[G] => Types.notAValue(ref)
+      case ref: RefModelProcess[G] => Types.notAValue(ref)
+      case ref: RefModelAction[G] => Types.notAValue(ref)
+      case RefProverFunction(decl) => decl.returnType
+      case ref: BuiltinField[G] => ref.f(classInstance).t
+      case ref: BuiltinInstanceMethod[G] => Types.notAValue(ref)
+      case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
+      case ref: RefCPPGlobalDeclaration[G] => Types.notAValue(ref)
+    }
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     assoc(classInstance) <> "." <> methodOrFieldName
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPDeclarationImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPDeclarationImpl.scala
index d8eef630c3..ed3897c729 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPDeclarationImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.CPPDeclaration
 import vct.col.print._
 import vct.col.ast.ops.{CPPDeclarationOps, CPPDeclarationFamilyOps}
 
-trait CPPDeclarationImpl[G] extends CPPDeclarationOps[G] with CPPDeclarationFamilyOps[G] { this: CPPDeclaration[G] =>
+trait CPPDeclarationImpl[G]
+    extends CPPDeclarationOps[G] with CPPDeclarationFamilyOps[G] {
+  this: CPPDeclaration[G] =>
   // PB: Please keep in sync with ApplicableContractImpl
   def layoutContract(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
@@ -18,10 +20,5 @@ trait CPPDeclarationImpl[G] extends CPPDeclarationOps[G] with CPPDeclarationFami
     ))
 
   override def layout(implicit ctx: Ctx): Doc =
-    Doc.stack(Seq(
-      layoutContract,
-      Group(
-        Doc.spread(specs) <>> Doc.args(inits)
-      ),
-    ))
-}
\ No newline at end of file
+    Doc.stack(Seq(layoutContract, Group(Doc.spread(specs) <>> Doc.args(inits))))
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPDeclarationSpecifierImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPDeclarationSpecifierImpl.scala
index 6f34e2a97e..bdf470162d 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPDeclarationSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPDeclarationSpecifierImpl.scala
@@ -3,6 +3,8 @@ package vct.col.ast.lang.cpp
 import vct.col.ast.CPPDeclarationSpecifier
 import vct.col.ast.ops.CPPDeclarationSpecifierFamilyOps
 
-trait CPPDeclarationSpecifierImpl[G] extends CPPDeclarationSpecifierFamilyOps[G] { this: CPPDeclarationSpecifier[G] =>
+trait CPPDeclarationSpecifierImpl[G]
+    extends CPPDeclarationSpecifierFamilyOps[G] {
+  this: CPPDeclarationSpecifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPDeclarationStatementImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPDeclarationStatementImpl.scala
index 68d6e88946..be46d5b244 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPDeclarationStatementImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPDeclarationStatementImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPDeclarationStatement
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.CPPDeclarationStatementOps
 
-trait CPPDeclarationStatementImpl[G] extends CPPDeclarationStatementOps[G] { this: CPPDeclarationStatement[G] =>
+trait CPPDeclarationStatementImpl[G] extends CPPDeclarationStatementOps[G] {
+  this: CPPDeclarationStatement[G] =>
   override def layout(implicit ctx: Ctx): Doc = decl.show <> ";"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPDeclaratorImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPDeclaratorImpl.scala
index 89b17ec635..adb78968d2 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPDeclaratorImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.cpp
 import vct.col.ast.CPPDeclarator
 import vct.col.ast.ops.CPPDeclaratorFamilyOps
 
-trait CPPDeclaratorImpl[G] extends CPPDeclaratorFamilyOps[G] { this: CPPDeclarator[G] =>
+trait CPPDeclaratorImpl[G] extends CPPDeclaratorFamilyOps[G] {
+  this: CPPDeclarator[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPExprImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPExprImpl.scala
index b479fc2010..1a036a7e12 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPExprImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPExprImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.cpp
 
 import vct.col.ast.CPPExpr
 
-trait CPPExprImpl[G] { this: CPPExpr[G] =>
+trait CPPExprImpl[G] {
+  this: CPPExpr[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPExprOrTypeSpecifierImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPExprOrTypeSpecifierImpl.scala
index edd5838bf9..3e9f8dbbec 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPExprOrTypeSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPExprOrTypeSpecifierImpl.scala
@@ -1,8 +1,14 @@
 package vct.col.ast.lang.cpp
 
 import vct.col.ast.CPPExprOrTypeSpecifier
-import vct.col.ast.ops.{CPPExprOrTypeSpecifierOps, CPPExprOrTypeSpecifierFamilyOps}
+import vct.col.ast.ops.{
+  CPPExprOrTypeSpecifierOps,
+  CPPExprOrTypeSpecifierFamilyOps,
+}
 
-trait CPPExprOrTypeSpecifierImpl[G] extends CPPExprOrTypeSpecifierOps[G] with CPPExprOrTypeSpecifierFamilyOps[G] { this: CPPExprOrTypeSpecifier[G] =>
+trait CPPExprOrTypeSpecifierImpl[G]
+    extends CPPExprOrTypeSpecifierOps[G]
+    with CPPExprOrTypeSpecifierFamilyOps[G] {
+  this: CPPExprOrTypeSpecifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPFunctionDefinitionImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPFunctionDefinitionImpl.scala
index 81a5a36256..c64f8b6503 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPFunctionDefinitionImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPFunctionDefinitionImpl.scala
@@ -4,12 +4,11 @@ import vct.col.ast.CPPFunctionDefinition
 import vct.col.print.{Ctx, Doc, Group}
 import vct.col.ast.ops.CPPFunctionDefinitionOps
 
-trait CPPFunctionDefinitionImpl[G] extends CPPFunctionDefinitionOps[G] { this: CPPFunctionDefinition[G] =>
+trait CPPFunctionDefinitionImpl[G] extends CPPFunctionDefinitionOps[G] {
+  this: CPPFunctionDefinition[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(
-        Doc.spread(specs) <>> declarator
-      ) <+> body.layoutAsBlock,
+      Group(Doc.spread(specs) <>> declarator) <+> body.layoutAsBlock,
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPGlobalDeclarationImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPGlobalDeclarationImpl.scala
index 4f690fec9f..40ec5ce431 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPGlobalDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPGlobalDeclarationImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.CPPGlobalDeclaration
 import vct.col.print._
 import vct.col.ast.ops.CPPGlobalDeclarationOps
 
-trait CPPGlobalDeclarationImpl[G] extends CPPGlobalDeclarationOps[G] { this: CPPGlobalDeclaration[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    decl.show <> ";"
-}
\ No newline at end of file
+trait CPPGlobalDeclarationImpl[G] extends CPPGlobalDeclarationOps[G] {
+  this: CPPGlobalDeclaration[G] =>
+  override def layout(implicit ctx: Ctx): Doc = decl.show <> ";"
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPInitImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPInitImpl.scala
index e33cf12b07..5e2a0c3003 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPInitImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPInitImpl.scala
@@ -4,7 +4,11 @@ import vct.col.ast.CPPInit
 import vct.col.print.{Ctx, Doc, Group}
 import vct.col.ast.ops.{CPPInitOps, CPPInitFamilyOps}
 
-trait CPPInitImpl[G] extends CPPInitOps[G] with CPPInitFamilyOps[G] { this: CPPInit[G] =>
+trait CPPInitImpl[G] extends CPPInitOps[G] with CPPInitFamilyOps[G] {
+  this: CPPInit[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    if(init.isEmpty) decl.show else Group(decl.show <+> "=" <>> init.get)
-}
\ No newline at end of file
+    if (init.isEmpty)
+      decl.show
+    else
+      Group(decl.show <+> "=" <>> init.get)
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPInlineImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPInlineImpl.scala
index f04fd32d9e..ae0e38b4a7 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPInlineImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPInlineImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPInline
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPInlineOps
 
-trait CPPInlineImpl[G] extends CPPInlineOps[G] { this: CPPInline[G] =>
+trait CPPInlineImpl[G] extends CPPInlineOps[G] {
+  this: CPPInline[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("inline")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPIntImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPIntImpl.scala
index b3a7c9a7b1..e2266dd661 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPIntImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPIntImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPInt
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPIntOps
 
-trait CPPIntImpl[G] extends CPPIntOps[G] { this: CPPInt[G] =>
+trait CPPIntImpl[G] extends CPPIntOps[G] {
+  this: CPPInt[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("int")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPInvocationImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPInvocationImpl.scala
index 594f59ec55..8703911e3d 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPInvocationImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPInvocationImpl.scala
@@ -7,29 +7,43 @@ import vct.col.resolve.lang.CPP
 import vct.result.VerificationError.Unreachable
 import vct.col.ast.ops.CPPInvocationOps
 
-trait CPPInvocationImpl[G] extends CPPInvocationOps[G] { this: CPPInvocation[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case RefFunction(decl) =>  decl.returnType
-    case RefProcedure(decl) => decl.returnType
-    case RefPredicate(decl) => decl.returnType
-    case RefADTFunction(decl) => decl.returnType
-    case RefModelProcess(decl) => decl.returnType
-    case RefModelAction(decl) => decl.returnType
-    case RefCPPFunctionDefinition(decl) => CPP.typeOrReturnTypeFromDeclarator(decl.specs, decl.declarator)
-    case RefCPPGlobalDeclaration(decls, initIdx) => CPP.typeOrReturnTypeFromDeclarator(decls.decl.specs, decls.decl.inits(initIdx).decl)
-    case RefSYCLConstructorDefinition(typ) => typ
-    case RefCPPLambdaDefinition(_) => CPPTLambda()
-    case RefProverFunction(decl) => decl.returnType
-    case RefInstanceMethod(decl) => decl.returnType
-    case RefInstanceFunction(decl) => decl.returnType
-    case RefInstancePredicate(decl) => decl.returnType
-    case BuiltinInstanceMethod(f) => applicable match {
-      case _ => throw Unreachable("BuiltinInstanceMethod resolution of CPPInvocation cannot invoke anything.")
+trait CPPInvocationImpl[G] extends CPPInvocationOps[G] {
+  this: CPPInvocation[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case RefFunction(decl) => decl.returnType
+      case RefProcedure(decl) => decl.returnType
+      case RefPredicate(decl) => decl.returnType
+      case RefADTFunction(decl) => decl.returnType
+      case RefModelProcess(decl) => decl.returnType
+      case RefModelAction(decl) => decl.returnType
+      case RefCPPFunctionDefinition(decl) =>
+        CPP.typeOrReturnTypeFromDeclarator(decl.specs, decl.declarator)
+      case RefCPPGlobalDeclaration(decls, initIdx) =>
+        CPP.typeOrReturnTypeFromDeclarator(
+          decls.decl.specs,
+          decls.decl.inits(initIdx).decl,
+        )
+      case RefSYCLConstructorDefinition(typ) => typ
+      case RefCPPLambdaDefinition(_) => CPPTLambda()
+      case RefProverFunction(decl) => decl.returnType
+      case RefInstanceMethod(decl) => decl.returnType
+      case RefInstanceFunction(decl) => decl.returnType
+      case RefInstancePredicate(decl) => decl.returnType
+      case BuiltinInstanceMethod(f) =>
+        applicable match {
+          case _ =>
+            throw Unreachable(
+              "BuiltinInstanceMethod resolution of CPPInvocation cannot invoke anything."
+            )
+        }
     }
-  }
 
   override def precedence: Int = Precedence.POSTFIX
 
   override def layout(implicit ctx: Ctx): Doc =
-    Group(assoc(applicable) <> "(" <> Doc.args(args) <> ")" <> DocUtil.givenYields(givenArgs, yields))
-}
\ No newline at end of file
+    Group(
+      assoc(applicable) <> "(" <> Doc.args(args) <> ")" <>
+        DocUtil.givenYields(givenArgs, yields)
+    )
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPLambdaDeclaratorImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPLambdaDeclaratorImpl.scala
index e14f8715b8..5e508c5955 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPLambdaDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPLambdaDeclaratorImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.CPPLambdaDeclarator
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.CPPLambdaDeclaratorOps
 
-trait CPPLambdaDeclaratorImpl[G] extends CPPLambdaDeclaratorOps[G] { this: CPPLambdaDeclarator[G] =>
+trait CPPLambdaDeclaratorImpl[G] extends CPPLambdaDeclaratorOps[G] {
+  this: CPPLambdaDeclarator[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("(") <> Doc.args(params) <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPLambdaDefinitionImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPLambdaDefinitionImpl.scala
index 0f079a84a4..a310105373 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPLambdaDefinitionImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPLambdaDefinitionImpl.scala
@@ -4,11 +4,10 @@ import vct.col.ast.{CPPLambdaDefinition, CPPTLambda, Type}
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.CPPLambdaDefinitionOps
 
-trait CPPLambdaDefinitionImpl[G] extends CPPLambdaDefinitionOps[G] { this: CPPLambdaDefinition[G] =>
+trait CPPLambdaDefinitionImpl[G] extends CPPLambdaDefinitionOps[G] {
+  this: CPPLambdaDefinition[G] =>
   override lazy val t: Type[G] = CPPTLambda[G]()
 
   override def layout(implicit ctx: Ctx): Doc =
-    Doc.stack(Seq(
-      contract, declarator.show <+> body.layoutAsBlock,
-    ))
-}
\ No newline at end of file
+    Doc.stack(Seq(contract, declarator.show <+> body.layoutAsBlock))
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPLambdaRefImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPLambdaRefImpl.scala
index d676dc23f4..52cd8a8508 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPLambdaRefImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPLambdaRefImpl.scala
@@ -4,8 +4,9 @@ import vct.col.ast.{CPPLambdaRef, TRef, Type}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPLambdaRefOps
 
-trait CPPLambdaRefImpl[G] extends CPPLambdaRefOps[G] { this: CPPLambdaRef[G] =>
+trait CPPLambdaRefImpl[G] extends CPPLambdaRefOps[G] {
+  this: CPPLambdaRef[G] =>
   override lazy val t: Type[G] = TRef()
 
   override def layout(implicit ctx: Ctx): Doc = Text("VERCORS::LAMBDA")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPLifetimeScopeImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPLifetimeScopeImpl.scala
index bc4528db9d..1741ac9ed6 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPLifetimeScopeImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPLifetimeScopeImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPLifetimeScope
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.CPPLifetimeScopeOps
 
-trait CPPLifetimeScopeImpl[G] extends CPPLifetimeScopeOps[G] {this: CPPLifetimeScope[G] =>
+trait CPPLifetimeScopeImpl[G] extends CPPLifetimeScopeOps[G] {
+  this: CPPLifetimeScope[G] =>
   override def layout(implicit ctx: Ctx): Doc = body.show
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPLiteralArrayImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPLiteralArrayImpl.scala
index 18d1fd8b18..cfc5baa5c3 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPLiteralArrayImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPLiteralArrayImpl.scala
@@ -5,10 +5,12 @@ import vct.col.print.Doc.{arg, fold}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.CPPLiteralArrayOps
 
-trait CPPLiteralArrayImpl[G] extends CPPLiteralArrayOps[G] { this: CPPLiteralArray[G] =>
+trait CPPLiteralArrayImpl[G] extends CPPLiteralArrayOps[G] {
+  this: CPPLiteralArray[G] =>
   override def t: Type[G] = new TNotAValue()
 
   override def precedence = Precedence.ATOMIC
 
-  override def layout(implicit ctx: Ctx): Doc = Text("{") <> arg(fold(exprs)(_ <> "," <+> _)) <> "}"
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Text("{") <> arg(fold(exprs)(_ <> "," <+> _)) <> "}"
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPLocalDeclarationImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPLocalDeclarationImpl.scala
index f680a414bb..da5b67179a 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPLocalDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPLocalDeclarationImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.CPPLocalDeclaration
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.{CPPLocalDeclarationOps, CPPLocalDeclarationFamilyOps}
 
-trait CPPLocalDeclarationImpl[G] extends CPPLocalDeclarationOps[G] with CPPLocalDeclarationFamilyOps[G] { this: CPPLocalDeclaration[G] =>
+trait CPPLocalDeclarationImpl[G]
+    extends CPPLocalDeclarationOps[G] with CPPLocalDeclarationFamilyOps[G] {
+  this: CPPLocalDeclaration[G] =>
   override def layout(implicit ctx: Ctx): Doc = decl.show
 }
diff --git a/src/col/vct/col/ast/lang/cpp/CPPLocalImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPLocalImpl.scala
index 84f7506cf3..f951462bbb 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPLocalImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPLocalImpl.scala
@@ -7,33 +7,53 @@ import vct.col.resolve.lang.CPP
 import vct.col.typerules.Types
 import vct.col.ast.ops.CPPLocalOps
 
-trait CPPLocalImpl[G] extends CPPLocalOps[G] { this: CPPLocal[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case ref: RefCPPParam[G] => CPP.typeOrReturnTypeFromDeclarator(ref.decl.specifiers, ref.decl.declarator)
-    case ref: RefAxiomaticDataType[G] => Types.notAValue(ref)
-    case RefVariable(decl) => decl.t
-    case ref: RefCPPFunctionDefinition[G] => Types.notAValue(ref)
-    case ref @ RefCPPGlobalDeclaration(decls, initIdx) =>
-      val declInfo = CPP.getDeclaratorInfo(decls.decl.inits(initIdx).decl)
-      declInfo.params match {
-        case Some(_) => Types.notAValue(ref) // Function declaration
-        case None => declInfo.typeOrReturnType(CPPPrimitiveType(decls.decl.specs)) // Static declaration
-      }
-    case ref @ RefCPPLocalDeclaration(decls, initIdx) =>
-      val declInfo = CPP.getDeclaratorInfo(decls.decl.inits(initIdx).decl)
-      declInfo.params match {
-        case Some(_) => Types.notAValue(ref) // Function declaration
-        case None => declInfo.typeOrReturnType(CPPPrimitiveType(decls.decl.specs)) // Static declaration
-      }
-    case _: RefSYCLAccessMode[G] => SYCLTAccessMode()
-    case ref: RefSYCLConstructorDefinition[G] => Types.notAValue(ref)
-    case RefModelField(field) => field.t
-    case target: SpecInvocationTarget[G] => Types.notAValue(target)
-    case cls: RefClass[G] => Types.notAValue(cls)
-    case enum: RefEnum[G] => Types.notAValue(enum)
-    case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
-  }
+trait CPPLocalImpl[G] extends CPPLocalOps[G] {
+  this: CPPLocal[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case ref: RefCPPParam[G] =>
+        CPP.typeOrReturnTypeFromDeclarator(
+          ref.decl.specifiers,
+          ref.decl.declarator,
+        )
+      case ref: RefAxiomaticDataType[G] => Types.notAValue(ref)
+      case RefVariable(decl) => decl.t
+      case ref: RefCPPFunctionDefinition[G] => Types.notAValue(ref)
+      case ref @ RefCPPGlobalDeclaration(decls, initIdx) =>
+        val declInfo = CPP.getDeclaratorInfo(decls.decl.inits(initIdx).decl)
+        declInfo.params match {
+          case Some(_) => Types.notAValue(ref) // Function declaration
+          case None =>
+            declInfo
+              .typeOrReturnType(CPPPrimitiveType(
+                decls.decl.specs
+              )) // Static declaration
+        }
+      case ref @ RefCPPLocalDeclaration(decls, initIdx) =>
+        val declInfo = CPP.getDeclaratorInfo(decls.decl.inits(initIdx).decl)
+        declInfo.params match {
+          case Some(_) => Types.notAValue(ref) // Function declaration
+          case None =>
+            declInfo
+              .typeOrReturnType(CPPPrimitiveType(
+                decls.decl.specs
+              )) // Static declaration
+        }
+      case _: RefSYCLAccessMode[G] => SYCLTAccessMode()
+      case ref: RefSYCLConstructorDefinition[G] => Types.notAValue(ref)
+      case RefModelField(field) => field.t
+      case target: SpecInvocationTarget[G] => Types.notAValue(target)
+      case cls: RefClass[G] => Types.notAValue(cls)
+      case enum: RefEnum[G] => Types.notAValue(enum)
+      case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
+    }
 
-  override def layout(implicit ctx: Ctx): Doc = Group(Text(name) <>
-    (if (genericArgs.nonEmpty) (Text("<") <> Doc.args(genericArgs) <> Text(">")) else Empty))
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    Group(
+      Text(name) <>
+        (if (genericArgs.nonEmpty)
+           (Text("<") <> Doc.args(genericArgs) <> Text(">"))
+         else
+           Empty)
+    )
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPLongImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPLongImpl.scala
index 494318e6e0..b93bd08711 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPLongImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPLongImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPLong
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPLongOps
 
-trait CPPLongImpl[G] extends CPPLongOps[G] { this: CPPLong[G] =>
+trait CPPLongImpl[G] extends CPPLongOps[G] {
+  this: CPPLong[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("long")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPNameImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPNameImpl.scala
index 4e6b0d0fea..c818346b89 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPNameImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPNameImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPName
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPNameOps
 
-trait CPPNameImpl[G] extends CPPNameOps[G] { this: CPPName[G] =>
+trait CPPNameImpl[G] extends CPPNameOps[G] {
+  this: CPPName[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text(name)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPParamImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPParamImpl.scala
index 801a3a0420..05608f27fc 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPParamImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPParamImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.CPPParam
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.{CPPParamOps, CPPParamFamilyOps}
 
-trait CPPParamImpl[G] extends CPPParamOps[G] with CPPParamFamilyOps[G] { this: CPPParam[G] =>
+trait CPPParamImpl[G] extends CPPParamOps[G] with CPPParamFamilyOps[G] {
+  this: CPPParam[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.spread(specifiers) <+> declarator
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPPointerImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPPointerImpl.scala
index 906cb5ad23..a21fd48ca1 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPPointerImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPPointerImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPPointer
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPPointerOps
 
-trait CPPPointerImpl[G] extends CPPPointerOps[G] { this: CPPPointer[G] =>
+trait CPPPointerImpl[G] extends CPPPointerOps[G] {
+  this: CPPPointer[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("*")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPPrimitiveTypeImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPPrimitiveTypeImpl.scala
index 503c1ad9d3..f65eb18bef 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPPrimitiveTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPPrimitiveTypeImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPPrimitiveType
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.CPPPrimitiveTypeOps
 
-trait CPPPrimitiveTypeImpl[G] extends CPPPrimitiveTypeOps[G] { this: CPPPrimitiveType[G] =>
+trait CPPPrimitiveTypeImpl[G] extends CPPPrimitiveTypeOps[G] {
+  this: CPPPrimitiveType[G] =>
   override def layout(implicit ctx: Ctx): Doc = Doc.spread(specifiers)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPPureImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPPureImpl.scala
index f3706d1b2b..7a7eb2bc4b 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPPureImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPPureImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPPure
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPPureOps
 
-trait CPPPureImpl[G] extends CPPPureOps[G] { this: CPPPure[G] =>
+trait CPPPureImpl[G] extends CPPPureOps[G] {
+  this: CPPPure[G] =>
   override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Text("pure"))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPReferenceImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPReferenceImpl.scala
index f191863592..41d8b5f014 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPReferenceImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPReferenceImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPReference
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPReferenceOps
 
-trait CPPReferenceImpl[G] extends CPPReferenceOps[G] { this: CPPReference[G] =>
+trait CPPReferenceImpl[G] extends CPPReferenceOps[G] {
+  this: CPPReference[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("&")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPShortImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPShortImpl.scala
index c018004662..edb7d80211 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPShortImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPShortImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPShort
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPShortOps
 
-trait CPPShortImpl[G] extends CPPShortOps[G] { this: CPPShort[G] =>
+trait CPPShortImpl[G] extends CPPShortOps[G] {
+  this: CPPShort[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("short")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPSignedImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPSignedImpl.scala
index 899bbc4be5..a04ac447ee 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPSignedImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPSignedImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPSigned
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPSignedOps
 
-trait CPPSignedImpl[G] extends CPPSignedOps[G] { this: CPPSigned[G] =>
+trait CPPSignedImpl[G] extends CPPSignedOps[G] {
+  this: CPPSigned[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("signed")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPSpecificationModifierImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPSpecificationModifierImpl.scala
index 4ee92d0e50..9dfb589b36 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPSpecificationModifierImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPSpecificationModifierImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.cpp
 
 import vct.col.ast.CPPSpecificationModifier
 
-trait CPPSpecificationModifierImpl[G] { this: CPPSpecificationModifier[G] =>
+trait CPPSpecificationModifierImpl[G] {
+  this: CPPSpecificationModifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPSpecificationTypeImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPSpecificationTypeImpl.scala
index 670f9bce7b..8ec7a8c94b 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPSpecificationTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPSpecificationTypeImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPSpecificationType
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.CPPSpecificationTypeOps
 
-trait CPPSpecificationTypeImpl[G] extends CPPSpecificationTypeOps[G] { this: CPPSpecificationType[G] =>
+trait CPPSpecificationTypeImpl[G] extends CPPSpecificationTypeOps[G] {
+  this: CPPSpecificationType[G] =>
   override def layout(implicit ctx: Ctx): Doc = t.show
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPStatementImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPStatementImpl.scala
index f98bf4f3ba..5467653b1c 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPStatementImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPStatementImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.cpp
 
 import vct.col.ast.CPPStatement
 
-trait CPPStatementImpl[G] { this: CPPStatement[G] =>
+trait CPPStatementImpl[G] {
+  this: CPPStatement[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPTArrayImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPTArrayImpl.scala
index 00ece02f0a..b3128ea093 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPTArrayImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPTArrayImpl.scala
@@ -4,8 +4,8 @@ import vct.col.ast.CPPTArray
 import vct.col.print.{Ctx, Doc, Group}
 import vct.col.ast.ops.CPPTArrayOps
 
-trait CPPTArrayImpl[G] extends CPPTArrayOps[G] { this: CPPTArray[G] =>
+trait CPPTArrayImpl[G] extends CPPTArrayOps[G] {
+  this: CPPTArray[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(innerType.show <> "[" <> Doc.args(size.toSeq) <> "]")
 }
-
diff --git a/src/col/vct/col/ast/lang/cpp/CPPTLambdaImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPTLambdaImpl.scala
index 6c19892c25..76c68f8861 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPTLambdaImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPTLambdaImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPTLambda
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPTLambdaOps
 
-trait CPPTLambdaImpl[G] extends CPPTLambdaOps[G] { this: CPPTLambda[G] =>
+trait CPPTLambdaImpl[G] extends CPPTLambdaOps[G] {
+  this: CPPTLambda[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("VERCORS::LAMBDA")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPTranslationUnitImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPTranslationUnitImpl.scala
index 0d9bb6b117..65986e04fe 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPTranslationUnitImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPTranslationUnitImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPTranslationUnit
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.CPPTranslationUnitOps
 
-trait CPPTranslationUnitImpl[G] extends CPPTranslationUnitOps[G] { this: CPPTranslationUnit[G] =>
+trait CPPTranslationUnitImpl[G] extends CPPTranslationUnitOps[G] {
+  this: CPPTranslationUnit[G] =>
   override def layout(implicit ctx: Ctx): Doc = Doc.stack(declarations)
 }
diff --git a/src/col/vct/col/ast/lang/cpp/CPPTypeImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPTypeImpl.scala
index 7e3f3da99e..8df469ab39 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPTypeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.cpp
 
 import vct.col.ast.CPPType
 
-trait CPPTypeImpl[G] { this: CPPType[G] =>
+trait CPPTypeImpl[G] {
+  this: CPPType[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPTypeSpecifierImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPTypeSpecifierImpl.scala
index 1f47f648ff..f26a133340 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPTypeSpecifierImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPTypeSpecifierImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.cpp
 
 import vct.col.ast.CPPTypeSpecifier
 
-trait CPPTypeSpecifierImpl[G] { this: CPPTypeSpecifier[G] =>
+trait CPPTypeSpecifierImpl[G] {
+  this: CPPTypeSpecifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPTypedFunctionDeclaratorImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPTypedFunctionDeclaratorImpl.scala
index 29c9da7eb0..d9b3585aa9 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPTypedFunctionDeclaratorImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPTypedFunctionDeclaratorImpl.scala
@@ -4,7 +4,17 @@ import vct.col.ast.CPPTypedFunctionDeclarator
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.CPPTypedFunctionDeclaratorOps
 
-trait CPPTypedFunctionDeclaratorImpl[G] extends CPPTypedFunctionDeclaratorOps[G] { this: CPPTypedFunctionDeclarator[G] =>
+trait CPPTypedFunctionDeclaratorImpl[G]
+    extends CPPTypedFunctionDeclaratorOps[G] {
+  this: CPPTypedFunctionDeclarator[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(inner.show <> "(" <> Doc.args(params ++ (if(varargs) Seq(Text("...")) else Nil)) <> ")")
-}
\ No newline at end of file
+    Group(
+      inner.show <> "(" <> Doc.args(
+        params ++
+          (if (varargs)
+             Seq(Text("..."))
+           else
+             Nil)
+      ) <> ")"
+    )
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPTypedefNameImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPTypedefNameImpl.scala
index 7776ad8f3e..138c9e4f47 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPTypedefNameImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPTypedefNameImpl.scala
@@ -4,12 +4,19 @@ import vct.col.ast.CPPTypedefName
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.CPPTypedefNameOps
 
-trait CPPTypedefNameImpl[G] extends CPPTypedefNameOps[G] { this: CPPTypedefName[G] =>
-  override def layout(implicit ctx: Ctx): Doc = Group(Text(nestedName) <>
-    (if (genericArgs.nonEmpty) (Text("<") <> Doc.args(genericArgs) <> Text(">")) else Text("")))
+trait CPPTypedefNameImpl[G] extends CPPTypedefNameOps[G] {
+  this: CPPTypedefName[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Group(
+      Text(nestedName) <>
+        (if (genericArgs.nonEmpty)
+           (Text("<") <> Doc.args(genericArgs) <> Text(">"))
+         else
+           Text(""))
+    )
 
   def appendName(postfix: String): CPPTypedefName[G] = {
     nestedName ++= postfix
     this
   }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPUnsignedImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPUnsignedImpl.scala
index 86d0535614..44a54e3b75 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPUnsignedImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPUnsignedImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPUnsigned
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPUnsignedOps
 
-trait CPPUnsignedImpl[G] extends CPPUnsignedOps[G] { this: CPPUnsigned[G] =>
+trait CPPUnsignedImpl[G] extends CPPUnsignedOps[G] {
+  this: CPPUnsigned[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("unsigned")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/cpp/CPPVoidImpl.scala b/src/col/vct/col/ast/lang/cpp/CPPVoidImpl.scala
index 6a14125d67..c4f99a1765 100644
--- a/src/col/vct/col/ast/lang/cpp/CPPVoidImpl.scala
+++ b/src/col/vct/col/ast/lang/cpp/CPPVoidImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CPPVoid
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.CPPVoidOps
 
-trait CPPVoidImpl[G] extends CPPVoidOps[G] { this: CPPVoid[G] =>
+trait CPPVoidImpl[G] extends CPPVoidOps[G] {
+  this: CPPVoid[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("void")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/gpgpu/GPUGlobalImpl.scala b/src/col/vct/col/ast/lang/gpgpu/GPUGlobalImpl.scala
index b377dbe042..6e395f145f 100644
--- a/src/col/vct/col/ast/lang/gpgpu/GPUGlobalImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/GPUGlobalImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.GPUGlobal
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.GPUGlobalOps
 
-trait GPUGlobalImpl[G] extends GPUGlobalOps[G] { this: GPUGlobal[G] =>
-  override def layout(implicit ctx: Ctx): Doc = Text("__vercors_global_memory__")
+trait GPUGlobalImpl[G] extends GPUGlobalOps[G] {
+  this: GPUGlobal[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Text("__vercors_global_memory__")
 }
diff --git a/src/col/vct/col/ast/lang/gpgpu/GPULocalImpl.scala b/src/col/vct/col/ast/lang/gpgpu/GPULocalImpl.scala
index 85024ace45..12f502e8d1 100644
--- a/src/col/vct/col/ast/lang/gpgpu/GPULocalImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/GPULocalImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.GPULocal
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.GPULocalOps
 
-trait GPULocalImpl[G] extends GPULocalOps[G] {this: GPULocal[G] =>
+trait GPULocalImpl[G] extends GPULocalOps[G] {
+  this: GPULocal[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("__vercors_local_memory__")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/gpgpu/GpgpuAtomicImpl.scala b/src/col/vct/col/ast/lang/gpgpu/GpgpuAtomicImpl.scala
index 4d65563578..4cdd220925 100644
--- a/src/col/vct/col/ast/lang/gpgpu/GpgpuAtomicImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/GpgpuAtomicImpl.scala
@@ -4,15 +4,24 @@ import vct.col.ast.{GpgpuAtomic, Block}
 import vct.col.print._
 import vct.col.ast.ops.GpgpuAtomicOps
 
-trait GpgpuAtomicImpl[G] extends GpgpuAtomicOps[G] { this: GpgpuAtomic[G] =>
-  def layoutWith(implicit ctx: Ctx): Doc = Group(Text("with") <+> before.layoutAsBlock)
+trait GpgpuAtomicImpl[G] extends GpgpuAtomicOps[G] {
+  this: GpgpuAtomic[G] =>
+  def layoutWith(implicit ctx: Ctx): Doc =
+    Group(Text("with") <+> before.layoutAsBlock)
 
-  def layoutThen(implicit ctx: Ctx): Doc = Group(Text("then") <+> after.layoutAsBlock)
+  def layoutThen(implicit ctx: Ctx): Doc =
+    Group(Text("then") <+> after.layoutAsBlock)
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
-      if(impl == Block[G](Nil)) Empty else Doc.inlineSpec(Show.lazily(layoutWith(_))),
+      if (impl == Block[G](Nil))
+        Empty
+      else
+        Doc.inlineSpec(Show.lazily(layoutWith(_))),
       Text("__vercors_atomic__") <+> impl.layoutAsBlock,
-      if(impl == Block[G](Nil)) Empty else Doc.inlineSpec(Show.lazily(layoutThen(_))),
+      if (impl == Block[G](Nil))
+        Empty
+      else
+        Doc.inlineSpec(Show.lazily(layoutThen(_))),
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/gpgpu/GpgpuBarrierImpl.scala b/src/col/vct/col/ast/lang/gpgpu/GpgpuBarrierImpl.scala
index e9e0a71e51..e4ab6fe736 100644
--- a/src/col/vct/col/ast/lang/gpgpu/GpgpuBarrierImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/GpgpuBarrierImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.GpgpuBarrier
 import vct.col.print.{Ctx, Doc, DocUtil, Show, Text, Group}
 import vct.col.ast.ops.GpgpuBarrierOps
 
-trait GpgpuBarrierImpl[G] extends GpgpuBarrierOps[G] { this: GpgpuBarrier[G] =>
+trait GpgpuBarrierImpl[G] extends GpgpuBarrierOps[G] {
+  this: GpgpuBarrier[G] =>
   def layoutContract(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       DocUtil.clauses("requires", requires),
@@ -15,7 +16,8 @@ trait GpgpuBarrierImpl[G] extends GpgpuBarrierOps[G] { this: GpgpuBarrier[G] =>
     Doc.stack(Seq(
       Doc.spec(Show.lazily(layoutContract(_))),
       Group(
-        Text("__vercors_barrier__") <> "(" <> Doc.arg(Doc.fold(specifiers)(_ <+> "|" <+/> _)) <> ")"
+        Text("__vercors_barrier__") <> "(" <>
+          Doc.arg(Doc.fold(specifiers)(_ <+> "|" <+/> _)) <> ")"
       ),
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/gpgpu/GpgpuCudaKernelInvocationImpl.scala b/src/col/vct/col/ast/lang/gpgpu/GpgpuCudaKernelInvocationImpl.scala
index dbc159b30e..89da73ed96 100644
--- a/src/col/vct/col/ast/lang/gpgpu/GpgpuCudaKernelInvocationImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/GpgpuCudaKernelInvocationImpl.scala
@@ -6,23 +6,36 @@ import vct.col.resolve.ctx._
 import vct.col.resolve.lang.C
 import vct.col.ast.ops.GpgpuCudaKernelInvocationOps
 
-trait GpgpuCudaKernelInvocationImpl[G] extends GpgpuCudaKernelInvocationOps[G] { this: GpgpuCudaKernelInvocation[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case RefFunction(decl) => decl.returnType
-    case RefProcedure(decl) => decl.returnType
-    case RefPredicate(decl) => decl.returnType
-    case RefInstanceFunction(decl) => decl.returnType
-    case RefInstanceMethod(decl) => decl.returnType
-    case RefInstancePredicate(decl) => decl.returnType
-    case RefADTFunction(decl) => decl.returnType
-    case RefModelProcess(decl) => decl.returnType
-    case RefModelAction(decl) => decl.returnType
-    case RefCFunctionDefinition(decl) => C.typeOrReturnTypeFromDeclaration(decl.specs, decl.declarator)
-    case RefCGlobalDeclaration(decls, initIdx) => C.typeOrReturnTypeFromDeclaration(decls.decl.specs, decls.decl.inits(initIdx).decl)
-    case BuiltinInstanceMethod(f) => ???
-    case RefProverFunction(decl) => decl.returnType
-  }
+trait GpgpuCudaKernelInvocationImpl[G] extends GpgpuCudaKernelInvocationOps[G] {
+  this: GpgpuCudaKernelInvocation[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case RefFunction(decl) => decl.returnType
+      case RefProcedure(decl) => decl.returnType
+      case RefPredicate(decl) => decl.returnType
+      case RefInstanceFunction(decl) => decl.returnType
+      case RefInstanceMethod(decl) => decl.returnType
+      case RefInstancePredicate(decl) => decl.returnType
+      case RefADTFunction(decl) => decl.returnType
+      case RefModelProcess(decl) => decl.returnType
+      case RefModelAction(decl) => decl.returnType
+      case RefCFunctionDefinition(decl) =>
+        C.typeOrReturnTypeFromDeclaration(decl.specs, decl.declarator)
+      case RefCGlobalDeclaration(decls, initIdx) =>
+        C.typeOrReturnTypeFromDeclaration(
+          decls.decl.specs,
+          decls.decl.inits(initIdx).decl,
+        )
+      case BuiltinInstanceMethod(f) => ???
+      case RefProverFunction(decl) => decl.returnType
+    }
 
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Group(Group(Text(kernel) <> "<<<" <> Doc.args(Seq(blocks, threads)) <> ">>>") <> "(" <> Doc.args(args) <> ")") <> DocUtil.givenYields(givenArgs, yields))
-}
\ No newline at end of file
+    Group(
+      Group(
+        Group(
+          Text(kernel) <> "<<<" <> Doc.args(Seq(blocks, threads)) <> ">>>"
+        ) <> "(" <> Doc.args(args) <> ")"
+      ) <> DocUtil.givenYields(givenArgs, yields)
+    )
+}
diff --git a/src/col/vct/col/ast/lang/gpgpu/GpuGlobalMemoryFenceImpl.scala b/src/col/vct/col/ast/lang/gpgpu/GpuGlobalMemoryFenceImpl.scala
index 263e1f4c68..ce2bdd9c5f 100644
--- a/src/col/vct/col/ast/lang/gpgpu/GpuGlobalMemoryFenceImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/GpuGlobalMemoryFenceImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.GpuGlobalMemoryFence
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.GpuGlobalMemoryFenceOps
 
-trait GpuGlobalMemoryFenceImpl[G] extends GpuGlobalMemoryFenceOps[G] { this: GpuGlobalMemoryFence[G] =>
-  override def layout(implicit ctx: Ctx): Doc = Text("__vercors_global_mem_fence__")
+trait GpuGlobalMemoryFenceImpl[G] extends GpuGlobalMemoryFenceOps[G] {
+  this: GpuGlobalMemoryFence[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Text("__vercors_global_mem_fence__")
 }
diff --git a/src/col/vct/col/ast/lang/gpgpu/GpuLocalMemoryFenceImpl.scala b/src/col/vct/col/ast/lang/gpgpu/GpuLocalMemoryFenceImpl.scala
index 470949b9df..7c17363ffa 100644
--- a/src/col/vct/col/ast/lang/gpgpu/GpuLocalMemoryFenceImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/GpuLocalMemoryFenceImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.GpuLocalMemoryFence
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.GpuLocalMemoryFenceOps
 
-trait GpuLocalMemoryFenceImpl[G] extends GpuLocalMemoryFenceOps[G] { this: GpuLocalMemoryFence[G] =>
-  override def layout(implicit ctx: Ctx): Doc = Text("__vercors_local_mem_fence__")
+trait GpuLocalMemoryFenceImpl[G] extends GpuLocalMemoryFenceOps[G] {
+  this: GpuLocalMemoryFence[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Text("__vercors_local_mem_fence__")
 }
diff --git a/src/col/vct/col/ast/lang/gpgpu/GpuMemoryFenceImpl.scala b/src/col/vct/col/ast/lang/gpgpu/GpuMemoryFenceImpl.scala
index d3f879d224..73371610fb 100644
--- a/src/col/vct/col/ast/lang/gpgpu/GpuMemoryFenceImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/GpuMemoryFenceImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.gpgpu
 import vct.col.ast.GpuMemoryFence
 import vct.col.ast.ops.GpuMemoryFenceFamilyOps
 
-trait GpuMemoryFenceImpl[G] extends GpuMemoryFenceFamilyOps[G] { this: GpuMemoryFence[G] =>
+trait GpuMemoryFenceImpl[G] extends GpuMemoryFenceFamilyOps[G] {
+  this: GpuMemoryFence[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/gpgpu/GpuZeroMemoryFenceImpl.scala b/src/col/vct/col/ast/lang/gpgpu/GpuZeroMemoryFenceImpl.scala
index eb6abd8757..d8dfb1576c 100644
--- a/src/col/vct/col/ast/lang/gpgpu/GpuZeroMemoryFenceImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/GpuZeroMemoryFenceImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.GpuZeroMemoryFence
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.GpuZeroMemoryFenceOps
 
-trait GpuZeroMemoryFenceImpl[G] extends GpuZeroMemoryFenceOps[G] { this: GpuZeroMemoryFence[G] =>
+trait GpuZeroMemoryFenceImpl[G] extends GpuZeroMemoryFenceOps[G] {
+  this: GpuZeroMemoryFence[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text(value.toString)
 }
diff --git a/src/col/vct/col/ast/lang/gpgpu/OpenCLKernelImpl.scala b/src/col/vct/col/ast/lang/gpgpu/OpenCLKernelImpl.scala
index b39d665e3e..ff990b9a51 100644
--- a/src/col/vct/col/ast/lang/gpgpu/OpenCLKernelImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/OpenCLKernelImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.OpenCLKernel
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.OpenCLKernelOps
 
-trait OpenCLKernelImpl[G] extends OpenCLKernelOps[G] { this: OpenCLKernel[G] =>
+trait OpenCLKernelImpl[G] extends OpenCLKernelOps[G] {
+  this: OpenCLKernel[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("__kernel")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/gpgpu/SharedMemSizeImpl.scala b/src/col/vct/col/ast/lang/gpgpu/SharedMemSizeImpl.scala
index 4af6efaedd..453c062bc8 100644
--- a/src/col/vct/col/ast/lang/gpgpu/SharedMemSizeImpl.scala
+++ b/src/col/vct/col/ast/lang/gpgpu/SharedMemSizeImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{SharedMemSize, TCInt, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SharedMemSizeOps
 
-trait SharedMemSizeImpl[G] extends SharedMemSizeOps[G] { this: SharedMemSize[G] =>
+trait SharedMemSizeImpl[G] extends SharedMemSizeOps[G] {
+  this: SharedMemSize[G] =>
   override def t: Type[G] = TCInt()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Text("\\shared_mem_size(") <> pointer <> ")"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaAbstractImpl.scala b/src/col/vct/col/ast/lang/java/JavaAbstractImpl.scala
index bf3c13e683..bf81e757dd 100644
--- a/src/col/vct/col/ast/lang/java/JavaAbstractImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaAbstractImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaAbstract
 import vct.col.print._
 import vct.col.ast.ops.JavaAbstractOps
 
-trait JavaAbstractImpl[G] extends JavaAbstractOps[G] { this: JavaAbstract[G] =>
+trait JavaAbstractImpl[G] extends JavaAbstractOps[G] {
+  this: JavaAbstract[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("abstract")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaAnnotationImpl.scala b/src/col/vct/col/ast/lang/java/JavaAnnotationImpl.scala
index edb846c94d..52c639222e 100644
--- a/src/col/vct/col/ast/lang/java/JavaAnnotationImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaAnnotationImpl.scala
@@ -8,15 +8,19 @@ import vct.result.VerificationError.UserError
 import vct.col.ast.ops.JavaAnnotationOps
 
 object JavaAnnotationImpl {
-  case class AnnotationElementMissing(ann: JavaAnnotation[_], element: String) extends UserError {
+  case class AnnotationElementMissing(ann: JavaAnnotation[_], element: String)
+      extends UserError {
     override def code: String = "annotationElementMissing"
 
-    override def text: String = ann.o.messageInContext(s"The element $element should be present")
+    override def text: String =
+      ann.o.messageInContext(s"The element $element should be present")
   }
 }
 
 object JavaAnnotationEx {
-  def unapply[G](ja: JavaAnnotation[G]): Option[(Type[G], Seq[(String, Expr[G])], JavaAnnotationData[G])] = {
+  def unapply[G](
+      ja: JavaAnnotation[G]
+  ): Option[(Type[G], Seq[(String, Expr[G])], JavaAnnotationData[G])] = {
     ja.data match {
       case Some(data) => Some(ja.name, ja.args, data)
       case None => None
@@ -24,14 +28,18 @@ object JavaAnnotationEx {
   }
 }
 
-trait JavaAnnotationImpl[G] extends JavaAnnotationOps[G] { this: JavaAnnotation[G] =>
+trait JavaAnnotationImpl[G] extends JavaAnnotationOps[G] {
+  this: JavaAnnotation[G] =>
   def get(n: String): Option[Expr[G]] = args.find(_._1 == n).map(_._2)
 
-  def expect(elem: String): Expr[G] = get(elem) match {
-    case Some(expr) => expr
-    case None => throw AnnotationElementMissing(this, elem)
-  }
+  def expect(elem: String): Expr[G] =
+    get(elem) match {
+      case Some(expr) => expr
+      case None => throw AnnotationElementMissing(this, elem)
+    }
 
   override def layout(implicit ctx: Ctx): Doc =
-    Text("@") <> name <> "(" <> Doc.args(args.map { case (key, value) => Text(key) <> "=" <> value }) <> ")"
-}
\ No newline at end of file
+    Text("@") <> name <> "(" <> Doc.args(args.map { case (key, value) =>
+      Text(key) <> "=" <> value
+    }) <> ")"
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaAnnotationInterfaceImpl.scala b/src/col/vct/col/ast/lang/java/JavaAnnotationInterfaceImpl.scala
index 22b6f49ce1..c006891b20 100644
--- a/src/col/vct/col/ast/lang/java/JavaAnnotationInterfaceImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaAnnotationInterfaceImpl.scala
@@ -3,7 +3,8 @@ package vct.col.ast.lang.java
 import vct.col.ast.{JavaAnnotationInterface, Type, Variable}
 import vct.col.ast.ops.JavaAnnotationInterfaceOps
 
-trait JavaAnnotationInterfaceImpl[G] extends JavaAnnotationInterfaceOps[G] { this: JavaAnnotationInterface[G] =>
+trait JavaAnnotationInterfaceImpl[G] extends JavaAnnotationInterfaceOps[G] {
+  this: JavaAnnotationInterface[G] =>
   override def supports: Seq[Type[G]] = Seq(ext)
   override def typeParams: Seq[Variable[G]] = Seq()
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaAnnotationMethodImpl.scala b/src/col/vct/col/ast/lang/java/JavaAnnotationMethodImpl.scala
index 14fc5c997f..eb4a652755 100644
--- a/src/col/vct/col/ast/lang/java/JavaAnnotationMethodImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaAnnotationMethodImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.{Declaration, JavaAnnotationMethod}
 import vct.col.ast.util.Declarator
 import vct.col.ast.ops.JavaAnnotationMethodOps
 
-trait JavaAnnotationMethodImpl[G] extends Declarator[G] with JavaAnnotationMethodOps[G] { this: JavaAnnotationMethod[G] =>
+trait JavaAnnotationMethodImpl[G]
+    extends Declarator[G] with JavaAnnotationMethodOps[G] {
+  this: JavaAnnotationMethod[G] =>
   override def declarations: Seq[Declaration[G]] = Seq()
   override def isStatic = false
 }
diff --git a/src/col/vct/col/ast/lang/java/JavaClassDeclarationImpl.scala b/src/col/vct/col/ast/lang/java/JavaClassDeclarationImpl.scala
index 1789d711e9..c39842d81d 100644
--- a/src/col/vct/col/ast/lang/java/JavaClassDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaClassDeclarationImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.java
 
 import vct.col.ast.JavaClassDeclaration
 
-trait JavaClassDeclarationImpl[G] { this: JavaClassDeclaration[G] =>
+trait JavaClassDeclarationImpl[G] {
+  this: JavaClassDeclaration[G] =>
   def isStatic: Boolean
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaClassImpl.scala b/src/col/vct/col/ast/lang/java/JavaClassImpl.scala
index b6601ed02b..6f8c30b5cd 100644
--- a/src/col/vct/col/ast/lang/java/JavaClassImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaClassImpl.scala
@@ -6,40 +6,56 @@ import vct.col.resolve.ctx._
 import vct.col.util.AstBuildHelpers.tt
 import vct.col.ast.ops.JavaClassOps
 
-trait JavaClassImpl[G] extends JavaClassOps[G] { this: JavaClass[G] =>
+trait JavaClassImpl[G] extends JavaClassOps[G] {
+  this: JavaClass[G] =>
   override def supports: Seq[Type[G]] = ext +: imp
 
-  def getField(name: String): Option[JavaFields[G]] = decls.collectFirst {
-    case fields: JavaFields[G] if fields.decls.exists(_.name == name) => fields
-  }
+  def getField(name: String): Option[JavaFields[G]] =
+    decls.collectFirst {
+      case fields: JavaFields[G] if fields.decls.exists(_.name == name) =>
+        fields
+    }
 
-  def getFieldRef(name: String): Option[RefJavaField[G]] = getField(name).map({
-    case fields => RefJavaField(fields, fields.decls.indexWhere(_.name == name))
-  })
+  def getFieldRef(name: String): Option[RefJavaField[G]] =
+    getField(name).map({ case fields =>
+      RefJavaField(fields, fields.decls.indexWhere(_.name == name))
+    })
 
-  def getInstanceField(name: String): Option[RefJavaField[G]] = getFieldRef(name).collect({
-    case r @ RefJavaField(decls, idx) if !decls.isStatic => r
-  })
+  def getInstanceField(name: String): Option[RefJavaField[G]] =
+    getFieldRef(name).collect({
+      case r @ RefJavaField(decls, idx) if !decls.isStatic => r
+    })
 
-  def getClassField(name: String): Option[RefJavaField[G]] = getFieldRef(name).collect({
-    case r @ RefJavaField(decls, idx) if decls.isStatic => r
-  })
+  def getClassField(name: String): Option[RefJavaField[G]] =
+    getFieldRef(name).collect({
+      case r @ RefJavaField(decls, idx) if decls.isStatic => r
+    })
 
-  def getMethods(name: String): Seq[RefJavaMethod[G]] = decls.collect {
-    case m: JavaMethod[G] if m.name == name => RefJavaMethod(m)
-  }
+  def getMethods(name: String): Seq[RefJavaMethod[G]] =
+    decls.collect {
+      case m: JavaMethod[G] if m.name == name => RefJavaMethod(m)
+    }
 
   def layoutLockInvariant(implicit ctx: Ctx): Doc =
     Text("lock_invariant") <+> intrinsicLockInvariant <> ";"
 
   override def layout(implicit ctx: Ctx): Doc = {
     Doc.stack(Seq(
-      if(intrinsicLockInvariant == tt[G]) Empty else Doc.inlineSpec(Show.lazily(layoutLockInvariant(_))),
-      Group(Doc.spread(modifiers :+ Text("class")) <+> name <>
-        (if(typeParams.isEmpty) Empty else Text("<") <> Doc.args(typeParams) <> ">") <+>
-        "extends" <+> ext <>
-        (if(imp.isEmpty) Empty else Empty <+> "implements" <+> Doc.args(imp))) <+>
-        "{" <>> Doc.stack(decls) <+/> "}",
+      if (intrinsicLockInvariant == tt[G])
+        Empty
+      else
+        Doc.inlineSpec(Show.lazily(layoutLockInvariant(_))),
+      Group(
+        Doc.spread(modifiers :+ Text("class")) <+> name <>
+          (if (typeParams.isEmpty)
+             Empty
+           else
+             Text("<") <> Doc.args(typeParams) <> ">") <+> "extends" <+> ext <>
+          (if (imp.isEmpty)
+             Empty
+           else
+             Empty <+> "implements" <+> Doc.args(imp))
+      ) <+> "{" <>> Doc.stack(decls) <+/> "}",
     ))
   }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaClassOrInterfaceImpl.scala b/src/col/vct/col/ast/lang/java/JavaClassOrInterfaceImpl.scala
index 81437331ba..281fc7bfdd 100644
--- a/src/col/vct/col/ast/lang/java/JavaClassOrInterfaceImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaClassOrInterfaceImpl.scala
@@ -1,23 +1,36 @@
 package vct.col.ast.lang.java
 
-import vct.col.ast.{ClassDeclaration, Declaration, JavaAnnotationMethod, JavaClassOrInterface, JavaMethod, JavaModifier, JavaName, JavaTClass, Type, Variable}
+import vct.col.ast.{
+  ClassDeclaration,
+  Declaration,
+  JavaAnnotationMethod,
+  JavaClassOrInterface,
+  JavaMethod,
+  JavaModifier,
+  JavaName,
+  JavaTClass,
+  Type,
+  Variable,
+}
 import vct.col.origin.DiagnosticOrigin
 import vct.col.ref.Ref
 import vct.result.VerificationError.Unreachable
 
 import scala.reflect.ClassTag
 
-trait JavaClassOrInterfaceImpl[G] { this: JavaClassOrInterface[G] =>
+trait JavaClassOrInterfaceImpl[G] {
+  this: JavaClassOrInterface[G] =>
   def name: String
   def modifiers: Seq[JavaModifier[G]]
   def typeParams: Seq[Variable[G]]
   def decls: Seq[ClassDeclaration[G]]
   def supports: Seq[Type[G]]
 
-  def transSupportArrows(seen: Set[JavaClassOrInterface[G]]): Seq[(JavaClassOrInterface[G], JavaClassOrInterface[G])] = {
-    if(seen.contains(this)) {
-      Nil
-    } else {
+  def transSupportArrows(
+      seen: Set[JavaClassOrInterface[G]]
+  ): Seq[(JavaClassOrInterface[G], JavaClassOrInterface[G])] = {
+    if (seen.contains(this)) { Nil }
+    else {
       val ts = supports.flatMap {
         case JavaTClass(Ref(cls), _) => Seq(cls)
         case _ => Nil
@@ -29,15 +42,16 @@ trait JavaClassOrInterfaceImpl[G] { this: JavaClassOrInterface[G] =>
 
   override def declarations: Seq[Declaration[G]] = typeParams ++ decls
 
-  def findMethodByName[Decl <: ClassDeclaration[G]](name: String)(implicit tag: ClassTag[Decl]): Seq[Decl] = {
-    def matches(decl: ClassDeclaration[G]): Boolean = decl match {
-      case decl: JavaMethod[G] if decl.name == name => true
-      case decl: JavaAnnotationMethod[G] if decl.name == name => true
-      case _ => false
-    }
+  def findMethodByName[Decl <: ClassDeclaration[G]](
+      name: String
+  )(implicit tag: ClassTag[Decl]): Seq[Decl] = {
+    def matches(decl: ClassDeclaration[G]): Boolean =
+      decl match {
+        case decl: JavaMethod[G] if decl.name == name => true
+        case decl: JavaAnnotationMethod[G] if decl.name == name => true
+        case _ => false
+      }
 
-    decls.collect {
-      case decl: Decl if matches(decl) => decl
-    }
+    decls.collect { case decl: Decl if matches(decl) => decl }
   }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaConstructorImpl.scala b/src/col/vct/col/ast/lang/java/JavaConstructorImpl.scala
index a10d2462ed..1103129e48 100644
--- a/src/col/vct/col/ast/lang/java/JavaConstructorImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaConstructorImpl.scala
@@ -5,19 +5,30 @@ import vct.col.ast.{Declaration, JavaConstructor}
 import vct.col.print._
 import vct.col.ast.ops.JavaConstructorOps
 
-trait JavaConstructorImpl[G] extends Declarator[G] with JavaConstructorOps[G] { this: JavaConstructor[G] =>
-  override def declarations: Seq[Declaration[G]] = parameters ++ typeParameters ++ contract.givenArgs ++ contract.yieldsArgs
+trait JavaConstructorImpl[G] extends Declarator[G] with JavaConstructorOps[G] {
+  this: JavaConstructor[G] =>
+  override def declarations: Seq[Declaration[G]] =
+    parameters ++ typeParameters ++ contract.givenArgs ++ contract.yieldsArgs
   override def isStatic = false
 
   def layoutTypeArgs(implicit ctx: Ctx): Doc =
-    if(typeParameters.isEmpty) Empty else Text("<") <> Doc.args(typeParameters) <> ">"
+    if (typeParameters.isEmpty)
+      Empty
+    else
+      Text("<") <> Doc.args(typeParameters) <> ">"
 
   def layoutSignals(implicit ctx: Ctx): Doc =
-    if(signals.isEmpty) Empty else Empty <>> Group(Text("throws") <+> Doc.args(signals))
+    if (signals.isEmpty)
+      Empty
+    else
+      Empty <>> Group(Text("throws") <+> Doc.args(signals))
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(Doc.spread(modifiers :+ layoutTypeArgs :+ Text(name)) <> "(" <> Doc.args(parameters) <> ")" <> layoutSignals) <+> body.layoutAsBlock,
+      Group(
+        Doc.spread(modifiers :+ layoutTypeArgs :+ Text(name)) <> "(" <>
+          Doc.args(parameters) <> ")" <> layoutSignals
+      ) <+> body.layoutAsBlock,
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaDerefImpl.scala b/src/col/vct/col/ast/lang/java/JavaDerefImpl.scala
index 6b80efde82..b5b8011951 100644
--- a/src/col/vct/col/ast/lang/java/JavaDerefImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaDerefImpl.scala
@@ -7,22 +7,24 @@ import vct.col.resolve.ctx._
 import vct.col.typerules.Types
 import vct.col.ast.ops.JavaDerefOps
 
-trait JavaDerefImpl[G] extends JavaDerefOps[G] { this: JavaDeref[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case RefModelField(decl) => decl.t
-    case ref: RefUnloadedJavaNamespace[G] => Types.notAValue(ref)
-    case ref: RefJavaClass[G] => Types.notAValue(ref)
-    case ref: RefAxiomaticDataType[G] => Types.notAValue(ref)
-    case ref: RefModel[G] => Types.notAValue(ref)
-    case RefVariable(v) => v.t
-    case RefJavaField(decls, idx) => FuncTools.repeat[Type[G]](TArray(_), decls.decls(idx).moreDims, decls.t)
-    case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
-    case BuiltinField(f) => f(obj).t
-    case ref: RefEnum[G] => Types.notAValue(ref)
-    case ref: RefProverType[G] => Types.notAValue(ref)
-  }
+trait JavaDerefImpl[G] extends JavaDerefOps[G] {
+  this: JavaDeref[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case RefModelField(decl) => decl.t
+      case ref: RefUnloadedJavaNamespace[G] => Types.notAValue(ref)
+      case ref: RefJavaClass[G] => Types.notAValue(ref)
+      case ref: RefAxiomaticDataType[G] => Types.notAValue(ref)
+      case ref: RefModel[G] => Types.notAValue(ref)
+      case RefVariable(v) => v.t
+      case RefJavaField(decls, idx) =>
+        FuncTools.repeat[Type[G]](TArray(_), decls.decls(idx).moreDims, decls.t)
+      case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
+      case BuiltinField(f) => f(obj).t
+      case ref: RefEnum[G] => Types.notAValue(ref)
+      case ref: RefProverType[G] => Types.notAValue(ref)
+    }
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc =
-    assoc(obj) <> "." <> field
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = assoc(obj) <> "." <> field
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaExprImpl.scala b/src/col/vct/col/ast/lang/java/JavaExprImpl.scala
index 7477258cad..0f91b1b087 100644
--- a/src/col/vct/col/ast/lang/java/JavaExprImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaExprImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.java
 
 import vct.col.ast.JavaExpr
 
-trait JavaExprImpl[G] { this: JavaExpr[G] =>
+trait JavaExprImpl[G] {
+  this: JavaExpr[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaFieldsImpl.scala b/src/col/vct/col/ast/lang/java/JavaFieldsImpl.scala
index 17ecc82fe9..772e622a51 100644
--- a/src/col/vct/col/ast/lang/java/JavaFieldsImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaFieldsImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{JavaFields, JavaStatic}
 import vct.col.print._
 import vct.col.ast.ops.JavaFieldsOps
 
-trait JavaFieldsImpl[G] extends JavaFieldsOps[G] { this: JavaFields[G] =>
+trait JavaFieldsImpl[G] extends JavaFieldsOps[G] {
+  this: JavaFields[G] =>
   override def isStatic = modifiers.contains(JavaStatic[G]())
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.rspread(modifiers) <> t <+> Doc.spread(decls) <> ";"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaFinalImpl.scala b/src/col/vct/col/ast/lang/java/JavaFinalImpl.scala
index 3ae75ca764..57e05a8934 100644
--- a/src/col/vct/col/ast/lang/java/JavaFinalImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaFinalImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaFinal
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaFinalOps
 
-trait JavaFinalImpl[G] extends JavaFinalOps[G] { this: JavaFinal[G] =>
+trait JavaFinalImpl[G] extends JavaFinalOps[G] {
+  this: JavaFinal[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("final")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaGlobalDeclarationImpl.scala b/src/col/vct/col/ast/lang/java/JavaGlobalDeclarationImpl.scala
index 37327d091e..2fcc7896d0 100644
--- a/src/col/vct/col/ast/lang/java/JavaGlobalDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaGlobalDeclarationImpl.scala
@@ -2,5 +2,6 @@ package vct.col.ast.lang.java
 
 import vct.col.ast.{JavaGlobalDeclaration}
 
-trait JavaGlobalDeclarationImpl[G] { this: JavaGlobalDeclaration[G] =>
-}
\ No newline at end of file
+trait JavaGlobalDeclarationImpl[G] {
+  this: JavaGlobalDeclaration[G] =>
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaImportImpl.scala b/src/col/vct/col/ast/lang/java/JavaImportImpl.scala
index c81762943c..4cdbce4354 100644
--- a/src/col/vct/col/ast/lang/java/JavaImportImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaImportImpl.scala
@@ -4,8 +4,17 @@ import vct.col.ast.JavaImport
 import vct.col.print.{Ctx, Doc, Text, Empty}
 import vct.col.ast.ops.{JavaImportOps, JavaImportFamilyOps}
 
-trait JavaImportImpl[G] extends JavaImportOps[G] with JavaImportFamilyOps[G] { this: JavaImport[G] =>
+trait JavaImportImpl[G] extends JavaImportOps[G] with JavaImportFamilyOps[G] {
+  this: JavaImport[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Text(if(isStatic) "import static" else "import") <+>
-      name <> (if(star) Text(".*") else Empty)
-}
\ No newline at end of file
+    Text(
+      if (isStatic)
+        "import static"
+      else
+        "import"
+    ) <+> name <>
+      (if (star)
+         Text(".*")
+       else
+         Empty)
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaInlineImpl.scala b/src/col/vct/col/ast/lang/java/JavaInlineImpl.scala
index f5907149b7..d943eb4bf7 100644
--- a/src/col/vct/col/ast/lang/java/JavaInlineImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaInlineImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaInline
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaInlineOps
 
-trait JavaInlineImpl[G] extends JavaInlineOps[G] { this: JavaInline[G] =>
+trait JavaInlineImpl[G] extends JavaInlineOps[G] {
+  this: JavaInline[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("inline")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaInterfaceImpl.scala b/src/col/vct/col/ast/lang/java/JavaInterfaceImpl.scala
index d35b70722a..6bd65a8fe7 100644
--- a/src/col/vct/col/ast/lang/java/JavaInterfaceImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaInterfaceImpl.scala
@@ -5,13 +5,21 @@ import vct.col.print.{Ctx, Doc, Empty, Group, Show, Text}
 import vct.col.util.AstBuildHelpers.tt
 import vct.col.ast.ops.JavaInterfaceOps
 
-trait JavaInterfaceImpl[G] extends JavaInterfaceOps[G] { this: JavaInterface[G] =>
+trait JavaInterfaceImpl[G] extends JavaInterfaceOps[G] {
+  this: JavaInterface[G] =>
   override def supports: Seq[Type[G]] = ext
 
   override def layout(implicit ctx: Ctx): Doc = {
-    Group(Doc.spread(modifiers :+ Text("interface")) <+> name <>
-      (if (typeParams.isEmpty) Empty else Text("<") <> Doc.args(typeParams) <> ">") <>
-      (if (ext.isEmpty) Empty else Empty <+> "extends" <+> Doc.args(ext))) <+>
-      "{" <>> Doc.stack(decls) <+/> "}"
+    Group(
+      Doc.spread(modifiers :+ Text("interface")) <+> name <>
+        (if (typeParams.isEmpty)
+           Empty
+         else
+           Text("<") <> Doc.args(typeParams) <> ">") <>
+        (if (ext.isEmpty)
+           Empty
+         else
+           Empty <+> "extends" <+> Doc.args(ext))
+    ) <+> "{" <>> Doc.stack(decls) <+/> "}"
   }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaInvocationImpl.scala b/src/col/vct/col/ast/lang/java/JavaInvocationImpl.scala
index 80eeb07368..da81e9e9fa 100644
--- a/src/col/vct/col/ast/lang/java/JavaInvocationImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaInvocationImpl.scala
@@ -6,27 +6,31 @@ import vct.col.resolve.ctx._
 import vct.col.util.AstBuildHelpers.tt
 import vct.col.ast.ops.JavaInvocationOps
 
-trait JavaInvocationImpl[G] extends JavaInvocationOps[G] { this: JavaInvocation[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case RefFunction(decl) => decl.returnType
-    case RefProcedure(decl) => decl.returnType
-    case RefPredicate(decl) => decl.returnType
-    case RefInstanceFunction(decl) => decl.returnType
-    case RefInstanceMethod(decl) => decl.returnType
-    case RefInstancePredicate(decl) => decl.returnType
-    case RefADTFunction(decl) => decl.returnType
-    case RefModelProcess(decl) => decl.returnType
-    case RefModelAction(decl) => decl.returnType
-    case RefJavaMethod(decl) => decl.returnType
-    case RefProverFunction(decl) => decl.returnType
-    case BuiltinInstanceMethod(f) => f(obj.get)(arguments).t
-    case RefJavaAnnotationMethod(decl) => decl.returnType
-  }
+trait JavaInvocationImpl[G] extends JavaInvocationOps[G] {
+  this: JavaInvocation[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case RefFunction(decl) => decl.returnType
+      case RefProcedure(decl) => decl.returnType
+      case RefPredicate(decl) => decl.returnType
+      case RefInstanceFunction(decl) => decl.returnType
+      case RefInstanceMethod(decl) => decl.returnType
+      case RefInstancePredicate(decl) => decl.returnType
+      case RefADTFunction(decl) => decl.returnType
+      case RefModelProcess(decl) => decl.returnType
+      case RefModelAction(decl) => decl.returnType
+      case RefJavaMethod(decl) => decl.returnType
+      case RefProverFunction(decl) => decl.returnType
+      case BuiltinInstanceMethod(f) => f(obj.get)(arguments).t
+      case RefJavaAnnotationMethod(decl) => decl.returnType
+    }
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    obj.map(obj => assoc(obj) <> ".").getOrElse(Empty) <>
-      method <>
-      (if(typeParams.isEmpty) Empty else Text("<") <> Doc.args(typeParams) <> ">") <>
-      "(" <> Doc.args(arguments) <> ")" <> DocUtil.givenYields(givenArgs, yields)
-}
\ No newline at end of file
+    obj.map(obj => assoc(obj) <> ".").getOrElse(Empty) <> method <>
+      (if (typeParams.isEmpty)
+         Empty
+       else
+         Text("<") <> Doc.args(typeParams) <> ">") <> "(" <>
+      Doc.args(arguments) <> ")" <> DocUtil.givenYields(givenArgs, yields)
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaLiteralArrayImpl.scala b/src/col/vct/col/ast/lang/java/JavaLiteralArrayImpl.scala
index d3251d18a0..dace7ef298 100644
--- a/src/col/vct/col/ast/lang/java/JavaLiteralArrayImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaLiteralArrayImpl.scala
@@ -4,8 +4,9 @@ import vct.col.ast.{JavaLiteralArray, Type}
 import vct.col.print.Precedence
 import vct.col.ast.ops.JavaLiteralArrayOps
 
-trait JavaLiteralArrayImpl[G] extends JavaLiteralArrayOps[G] { this: JavaLiteralArray[G] =>
+trait JavaLiteralArrayImpl[G] extends JavaLiteralArrayOps[G] {
+  this: JavaLiteralArray[G] =>
   override def t: Type[G] = typeContext.get
 
   override def precedence = Precedence.ATOMIC
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaLocalDeclarationImpl.scala b/src/col/vct/col/ast/lang/java/JavaLocalDeclarationImpl.scala
index 7ddc4fd61b..134e802c8e 100644
--- a/src/col/vct/col/ast/lang/java/JavaLocalDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaLocalDeclarationImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.JavaLocalDeclaration
 import vct.col.print.{Ctx, Doc, Group}
 import vct.col.ast.ops.{JavaLocalDeclarationOps, JavaLocalDeclarationFamilyOps}
 
-trait JavaLocalDeclarationImpl[G] extends JavaLocalDeclarationOps[G] with JavaLocalDeclarationFamilyOps[G] { this: JavaLocalDeclaration[G] =>
+trait JavaLocalDeclarationImpl[G]
+    extends JavaLocalDeclarationOps[G] with JavaLocalDeclarationFamilyOps[G] {
+  this: JavaLocalDeclaration[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Doc.rspread(modifiers) <> t <+> Doc.args(decls))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaLocalDeclarationStatementImpl.scala b/src/col/vct/col/ast/lang/java/JavaLocalDeclarationStatementImpl.scala
index dcc7d4b477..6016e9b7c6 100644
--- a/src/col/vct/col/ast/lang/java/JavaLocalDeclarationStatementImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaLocalDeclarationStatementImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.JavaLocalDeclarationStatement
 import vct.col.print.{Ctx, Doc, Group}
 import vct.col.ast.ops.JavaLocalDeclarationStatementOps
 
-trait JavaLocalDeclarationStatementImpl[G] extends JavaLocalDeclarationStatementOps[G] { this: JavaLocalDeclarationStatement[G] =>
+trait JavaLocalDeclarationStatementImpl[G]
+    extends JavaLocalDeclarationStatementOps[G] {
+  this: JavaLocalDeclarationStatement[G] =>
   override def layout(implicit ctx: Ctx): Doc = decl.show <> ";"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaLocalImpl.scala b/src/col/vct/col/ast/lang/java/JavaLocalImpl.scala
index 0a41454069..820d05c981 100644
--- a/src/col/vct/col/ast/lang/java/JavaLocalImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaLocalImpl.scala
@@ -7,21 +7,25 @@ import vct.col.resolve.ctx._
 import vct.col.typerules.Types
 import vct.col.ast.ops.JavaLocalOps
 
-trait JavaLocalImpl[G] extends JavaLocalOps[G] { this: JavaLocal[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case ref: RefAxiomaticDataType[G] => Types.notAValue(ref)
-    case ref: RefEnum[G] => Types.notAValue(ref)
-    case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
-    case RefVariable(decl) => decl.t
-    case ref: RefUnloadedJavaNamespace[G] => Types.notAValue(ref)
-    case ref: RefJavaClass[G] => Types.notAValue(ref)
-    case RefJavaField(decls, idx) => FuncTools.repeat[Type[G]](TArray(_), decls.decls(idx).moreDims, decls.t)
-    case RefJavaLocalDeclaration(decls, idx) => FuncTools.repeat[Type[G]](TArray(_), decls.decls(idx).moreDims, decls.t)
-    case RefJavaParam(decl) => decl.t
-    case RefJavaBipGuard(_) => TBool()
-    case RefModelField(field) => field.t
-    case ref: RefClass[G] => Types.notAValue(ref)
-  }
+trait JavaLocalImpl[G] extends JavaLocalOps[G] {
+  this: JavaLocal[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case ref: RefAxiomaticDataType[G] => Types.notAValue(ref)
+      case ref: RefEnum[G] => Types.notAValue(ref)
+      case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
+      case RefVariable(decl) => decl.t
+      case ref: RefUnloadedJavaNamespace[G] => Types.notAValue(ref)
+      case ref: RefJavaClass[G] => Types.notAValue(ref)
+      case RefJavaField(decls, idx) =>
+        FuncTools.repeat[Type[G]](TArray(_), decls.decls(idx).moreDims, decls.t)
+      case RefJavaLocalDeclaration(decls, idx) =>
+        FuncTools.repeat[Type[G]](TArray(_), decls.decls(idx).moreDims, decls.t)
+      case RefJavaParam(decl) => decl.t
+      case RefJavaBipGuard(_) => TBool()
+      case RefModelField(field) => field.t
+      case ref: RefClass[G] => Types.notAValue(ref)
+    }
 
   override def layout(implicit ctx: Ctx): Doc = Text(name)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaMethodImpl.scala b/src/col/vct/col/ast/lang/java/JavaMethodImpl.scala
index 12880ed64a..c20a7a4785 100644
--- a/src/col/vct/col/ast/lang/java/JavaMethodImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaMethodImpl.scala
@@ -5,18 +5,30 @@ import vct.col.ast.util.Declarator
 import vct.col.print._
 import vct.col.ast.ops.JavaMethodOps
 
-trait JavaMethodImpl[G] extends Declarator[G] with JavaMethodOps[G] { this: JavaMethod[G] =>
-  override def declarations: Seq[Declaration[G]] = parameters ++ typeParameters ++ contract.givenArgs ++ contract.yieldsArgs
+trait JavaMethodImpl[G] extends Declarator[G] with JavaMethodOps[G] {
+  this: JavaMethod[G] =>
+  override def declarations: Seq[Declaration[G]] =
+    parameters ++ typeParameters ++ contract.givenArgs ++ contract.yieldsArgs
   override def isStatic = modifiers.contains(JavaStatic[G]())
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(Group(Group(
-        Doc.rspread(modifiers) <>
-        (if(typeParameters.isEmpty) Empty else Text("<") <> Doc.args(typeParameters) <> ">" <+> Empty) <>
-        returnType <+> name <> "[]".repeat(dims)) <> "(" <> Doc.args(parameters) <> ")") <>
-        (if(signals.isEmpty) Empty else Empty <>> Group(Text("throws") <+> Doc.args(signals)))
-      ) <> body.map(Empty <+> _.layoutAsBlock).getOrElse(Text(";"))
+      Group(
+        Group(
+          Group(
+            Doc.rspread(modifiers) <>
+              (if (typeParameters.isEmpty)
+                 Empty
+               else
+                 Text("<") <> Doc.args(typeParameters) <> ">" <+> Empty) <>
+              returnType <+> name <> "[]".repeat(dims)
+          ) <> "(" <> Doc.args(parameters) <> ")"
+        ) <>
+          (if (signals.isEmpty)
+             Empty
+           else
+             Empty <>> Group(Text("throws") <+> Doc.args(signals)))
+      ) <> body.map(Empty <+> _.layoutAsBlock).getOrElse(Text(";")),
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaModifierImpl.scala b/src/col/vct/col/ast/lang/java/JavaModifierImpl.scala
index 323c07a7cd..1c211d648b 100644
--- a/src/col/vct/col/ast/lang/java/JavaModifierImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaModifierImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.java
 import vct.col.ast.JavaModifier
 import vct.col.ast.ops.JavaModifierFamilyOps
 
-trait JavaModifierImpl[G] extends JavaModifierFamilyOps[G] { this: JavaModifier[G] =>
+trait JavaModifierImpl[G] extends JavaModifierFamilyOps[G] {
+  this: JavaModifier[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaNameImpl.scala b/src/col/vct/col/ast/lang/java/JavaNameImpl.scala
index f465e4fa5b..b2bf0e84d1 100644
--- a/src/col/vct/col/ast/lang/java/JavaNameImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaNameImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.JavaName
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.{JavaNameOps, JavaNameFamilyOps}
 
-trait JavaNameImpl[G] extends JavaNameOps[G] with JavaNameFamilyOps[G] { this: JavaName[G] =>
-  override def layout(implicit ctx: Ctx): Doc = Doc.fold(names.map(Text))(_ <> "." <> _)
-}
\ No newline at end of file
+trait JavaNameImpl[G] extends JavaNameOps[G] with JavaNameFamilyOps[G] {
+  this: JavaName[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.fold(names.map(Text))(_ <> "." <> _)
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaNamedTypeImpl.scala b/src/col/vct/col/ast/lang/java/JavaNamedTypeImpl.scala
index b6201ff882..c189baad36 100644
--- a/src/col/vct/col/ast/lang/java/JavaNamedTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaNamedTypeImpl.scala
@@ -4,10 +4,12 @@ import vct.col.ast.JavaNamedType
 import vct.col.print._
 import vct.col.ast.ops.JavaNamedTypeOps
 
-trait JavaNamedTypeImpl[G] extends JavaNamedTypeOps[G] { this: JavaNamedType[G] =>
+trait JavaNamedTypeImpl[G] extends JavaNamedTypeOps[G] {
+  this: JavaNamedType[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.fold(names.map {
       case (name, None) => Text(name)
-      case (name, Some(typeArgs)) => Text(name) <> "<" <> Doc.fold(typeArgs)(_ <> "," <+> _) <> ">"
+      case (name, Some(typeArgs)) =>
+        Text(name) <> "<" <> Doc.fold(typeArgs)(_ <> "," <+> _) <> ">"
     })(_ <> "." <> _)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaNamespaceImpl.scala b/src/col/vct/col/ast/lang/java/JavaNamespaceImpl.scala
index 6684378feb..ddb9690403 100644
--- a/src/col/vct/col/ast/lang/java/JavaNamespaceImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaNamespaceImpl.scala
@@ -6,16 +6,21 @@ import vct.col.print._
 import vct.col.resolve.lang.Java
 import vct.col.ast.ops.JavaNamespaceOps
 
-trait JavaNamespaceImpl[G] extends JavaNamespaceOps[G] { this: JavaNamespace[G] =>
-  lazy val name: Option[String] = pkg match {
-    case Some(value) => Some(value.names.mkString("."))
-    case None => None
-  }
+trait JavaNamespaceImpl[G] extends JavaNamespaceOps[G] {
+  this: JavaNamespace[G] =>
+  lazy val name: Option[String] =
+    pkg match {
+      case Some(value) => Some(value.names.mkString("."))
+      case None => None
+    }
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
-      if(pkg.isEmpty) Empty else Text("package") <+> pkg.get,
+      if (pkg.isEmpty)
+        Empty
+      else
+        Text("package") <+> pkg.get,
       Doc.stack(imports),
       Doc.stack(declarations),
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaNativeImpl.scala b/src/col/vct/col/ast/lang/java/JavaNativeImpl.scala
index 2e9de48e61..54897f6fe2 100644
--- a/src/col/vct/col/ast/lang/java/JavaNativeImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaNativeImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaNative
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaNativeOps
 
-trait JavaNativeImpl[G] extends JavaNativeOps[G] { this: JavaNative[G] =>
+trait JavaNativeImpl[G] extends JavaNativeOps[G] {
+  this: JavaNative[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("native")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaNewClassImpl.scala b/src/col/vct/col/ast/lang/java/JavaNewClassImpl.scala
index d44fa125d0..a02539fbad 100644
--- a/src/col/vct/col/ast/lang/java/JavaNewClassImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaNewClassImpl.scala
@@ -4,14 +4,19 @@ import vct.col.ast.{JavaNewClass, Type}
 import vct.col.print.{Ctx, Doc, DocUtil, Empty, Group, Text}
 import vct.col.ast.ops.JavaNewClassOps
 
-trait JavaNewClassImpl[G] extends JavaNewClassOps[G] { this: JavaNewClass[G] =>
+trait JavaNewClassImpl[G] extends JavaNewClassOps[G] {
+  this: JavaNewClass[G] =>
   override def t: Type[G] = name
 
   override def layout(implicit ctx: Ctx): Doc =
     Group(
-      Group(Text("new") <+> name <>
-        (if(typeArgs.isEmpty) Empty else Text("<") <> Doc.args(typeArgs) <> ">")) <>
-        "(" <> Doc.args(args) <> ")" <>
+      Group(
+        Text("new") <+> name <>
+          (if (typeArgs.isEmpty)
+             Empty
+           else
+             Text("<") <> Doc.args(typeArgs) <> ">")
+      ) <> "(" <> Doc.args(args) <> ")" <>
         DocUtil.givenYields(givenArgs, yields)
     )
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaNewDefaultArrayImpl.scala b/src/col/vct/col/ast/lang/java/JavaNewDefaultArrayImpl.scala
index e96d6b5b7b..9c2a82b355 100644
--- a/src/col/vct/col/ast/lang/java/JavaNewDefaultArrayImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaNewDefaultArrayImpl.scala
@@ -4,10 +4,14 @@ import vct.col.ast.{JavaNewDefaultArray, TArray, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.JavaNewDefaultArrayOps
 
-trait JavaNewDefaultArrayImpl[G] extends JavaNewDefaultArrayOps[G] { this: JavaNewDefaultArray[G] =>
-  override lazy val t: Type[G] = (0 until (specifiedDims.size + moreDims)).foldLeft(baseType)((t, _) => TArray(t))
+trait JavaNewDefaultArrayImpl[G] extends JavaNewDefaultArrayOps[G] {
+  this: JavaNewDefaultArray[G] =>
+  override lazy val t: Type[G] = (0 until (specifiedDims.size + moreDims))
+    .foldLeft(baseType)((t, _) => TArray(t))
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Text("new") <+> baseType <> Doc.fold(specifiedDims.map(Text("[") <> _ <> "]"))(_ <> _) <> "[]".repeat(moreDims)
-}
\ No newline at end of file
+    Text("new") <+> baseType <>
+      Doc.fold(specifiedDims.map(Text("[") <> _ <> "]"))(_ <> _) <>
+      "[]".repeat(moreDims)
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaNewLiteralArrayImpl.scala b/src/col/vct/col/ast/lang/java/JavaNewLiteralArrayImpl.scala
index 33db0c0354..9e79dd435c 100644
--- a/src/col/vct/col/ast/lang/java/JavaNewLiteralArrayImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaNewLiteralArrayImpl.scala
@@ -5,10 +5,12 @@ import vct.col.ast.{JavaNewLiteralArray, TArray, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.JavaNewLiteralArrayOps
 
-trait JavaNewLiteralArrayImpl[G] extends JavaNewLiteralArrayOps[G] { this: JavaNewLiteralArray[G] =>
-  override lazy val t: Type[G] = FuncTools.repeat[Type[G]](TArray(_), dims, baseType)
+trait JavaNewLiteralArrayImpl[G] extends JavaNewLiteralArrayOps[G] {
+  this: JavaNewLiteralArray[G] =>
+  override lazy val t: Type[G] = FuncTools
+    .repeat[Type[G]](TArray(_), dims, baseType)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Text("new") <+> baseType <> "[]".repeat(dims) <> initializer
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaParamImpl.scala b/src/col/vct/col/ast/lang/java/JavaParamImpl.scala
index f039c3a0fe..6cbeb9e39a 100644
--- a/src/col/vct/col/ast/lang/java/JavaParamImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaParamImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.JavaParam
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.{JavaParamOps, JavaParamFamilyOps}
 
-trait JavaParamImpl[G] extends JavaParamOps[G] with JavaParamFamilyOps[G] { this: JavaParam[G] =>
+trait JavaParamImpl[G] extends JavaParamOps[G] with JavaParamFamilyOps[G] {
+  this: JavaParam[G] =>
   override def layout(implicit ctx: Ctx): Doc = t.show <+> name
 
 }
diff --git a/src/col/vct/col/ast/lang/java/JavaPrivateImpl.scala b/src/col/vct/col/ast/lang/java/JavaPrivateImpl.scala
index 2e8921c2d8..fa927905f8 100644
--- a/src/col/vct/col/ast/lang/java/JavaPrivateImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaPrivateImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaPrivate
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaPrivateOps
 
-trait JavaPrivateImpl[G] extends JavaPrivateOps[G] { this: JavaPrivate[G] =>
+trait JavaPrivateImpl[G] extends JavaPrivateOps[G] {
+  this: JavaPrivate[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("private")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaProtectedImpl.scala b/src/col/vct/col/ast/lang/java/JavaProtectedImpl.scala
index caee28aa8f..08b1340ff4 100644
--- a/src/col/vct/col/ast/lang/java/JavaProtectedImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaProtectedImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaProtected
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaProtectedOps
 
-trait JavaProtectedImpl[G] extends JavaProtectedOps[G] { this: JavaProtected[G] =>
+trait JavaProtectedImpl[G] extends JavaProtectedOps[G] {
+  this: JavaProtected[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("protected")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaPublicImpl.scala b/src/col/vct/col/ast/lang/java/JavaPublicImpl.scala
index 63d5c6c0c4..a6ab2ae321 100644
--- a/src/col/vct/col/ast/lang/java/JavaPublicImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaPublicImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaPublic
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaPublicOps
 
-trait JavaPublicImpl[G] extends JavaPublicOps[G] { this: JavaPublic[G] =>
+trait JavaPublicImpl[G] extends JavaPublicOps[G] {
+  this: JavaPublic[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("public")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaPureImpl.scala b/src/col/vct/col/ast/lang/java/JavaPureImpl.scala
index 82778ef5af..ccd90f92ae 100644
--- a/src/col/vct/col/ast/lang/java/JavaPureImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaPureImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaPure
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaPureOps
 
-trait JavaPureImpl[G] extends JavaPureOps[G] { this: JavaPure[G] =>
+trait JavaPureImpl[G] extends JavaPureOps[G] {
+  this: JavaPure[G] =>
   override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Text("pure"))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaSharedInitializationImpl.scala b/src/col/vct/col/ast/lang/java/JavaSharedInitializationImpl.scala
index 9c62013207..9f16738bac 100644
--- a/src/col/vct/col/ast/lang/java/JavaSharedInitializationImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaSharedInitializationImpl.scala
@@ -4,7 +4,11 @@ import vct.col.ast.JavaSharedInitialization
 import vct.col.print.{Ctx, Doc, Text, Empty}
 import vct.col.ast.ops.JavaSharedInitializationOps
 
-trait JavaSharedInitializationImpl[G] extends JavaSharedInitializationOps[G] { this: JavaSharedInitialization[G] =>
+trait JavaSharedInitializationImpl[G] extends JavaSharedInitializationOps[G] {
+  this: JavaSharedInitialization[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    (if(isStatic) Text("static") <+> Empty else Empty) <> initialization.layoutAsBlock
-}
\ No newline at end of file
+    (if (isStatic)
+       Text("static") <+> Empty
+     else
+       Empty) <> initialization.layoutAsBlock
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaStatementImpl.scala b/src/col/vct/col/ast/lang/java/JavaStatementImpl.scala
index a065daa476..77578e554a 100644
--- a/src/col/vct/col/ast/lang/java/JavaStatementImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaStatementImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.java
 
 import vct.col.ast.JavaStatement
 
-trait JavaStatementImpl[G] { this: JavaStatement[G] =>
+trait JavaStatementImpl[G] {
+  this: JavaStatement[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaStaticImpl.scala b/src/col/vct/col/ast/lang/java/JavaStaticImpl.scala
index 1e5f07ffec..b470c837ac 100644
--- a/src/col/vct/col/ast/lang/java/JavaStaticImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaStaticImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaStatic
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaStaticOps
 
-trait JavaStaticImpl[G] extends JavaStaticOps[G] { this: JavaStatic[G] =>
+trait JavaStaticImpl[G] extends JavaStaticOps[G] {
+  this: JavaStatic[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("static")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaStrictFPImpl.scala b/src/col/vct/col/ast/lang/java/JavaStrictFPImpl.scala
index fcd68166f6..a33a0aee8c 100644
--- a/src/col/vct/col/ast/lang/java/JavaStrictFPImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaStrictFPImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaStrictFP
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaStrictFPOps
 
-trait JavaStrictFPImpl[G] extends JavaStrictFPOps[G] { this: JavaStrictFP[G] =>
+trait JavaStrictFPImpl[G] extends JavaStrictFPOps[G] {
+  this: JavaStrictFP[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("strictfp")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaStringValueImpl.scala b/src/col/vct/col/ast/lang/java/JavaStringValueImpl.scala
index 9f14ba2d9f..8f4522dee5 100644
--- a/src/col/vct/col/ast/lang/java/JavaStringValueImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaStringValueImpl.scala
@@ -1,11 +1,17 @@
 package vct.col.ast.lang.java
 
-import vct.col.ast.{JavaClass, JavaClassOrInterface, JavaStringValue, JavaTClass, Type}
+import vct.col.ast.{
+  JavaClass,
+  JavaClassOrInterface,
+  JavaStringValue,
+  JavaTClass,
+  Type,
+}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.result.VerificationError.Unreachable
 import vct.col.ast.ops.JavaStringValueOps
 
-trait JavaStringValueImpl[G] extends JavaStringValueOps[G] { this: JavaStringValue[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("\"") <> data <> Text("\"")
+trait JavaStringValueImpl[G] extends JavaStringValueOps[G] {
+  this: JavaStringValue[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text("\"") <> data <> Text("\"")
 }
diff --git a/src/col/vct/col/ast/lang/java/JavaSynchronizedImpl.scala b/src/col/vct/col/ast/lang/java/JavaSynchronizedImpl.scala
index 90203d3c59..fccc2464ff 100644
--- a/src/col/vct/col/ast/lang/java/JavaSynchronizedImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaSynchronizedImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaSynchronized
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaSynchronizedOps
 
-trait JavaSynchronizedImpl[G] extends JavaSynchronizedOps[G] { this: JavaSynchronized[G] =>
+trait JavaSynchronizedImpl[G] extends JavaSynchronizedOps[G] {
+  this: JavaSynchronized[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("synchronized")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaTClassImpl.scala b/src/col/vct/col/ast/lang/java/JavaTClassImpl.scala
index 38270857e8..4ab2edfba6 100644
--- a/src/col/vct/col/ast/lang/java/JavaTClassImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaTClassImpl.scala
@@ -4,8 +4,12 @@ import vct.col.ast.JavaTClass
 import vct.col.print.{Ctx, Doc, Empty, Text}
 import vct.col.ast.ops.JavaTClassOps
 
-trait JavaTClassImpl[G] extends JavaTClassOps[G] { this: JavaTClass[G] =>
+trait JavaTClassImpl[G] extends JavaTClassOps[G] {
+  this: JavaTClass[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text(ctx.name(ref)) <>
-      (if(typeArgs.isEmpty) Empty else Empty <+> "<" <> Doc.args(typeArgs) <> ">")
-}
\ No newline at end of file
+      (if (typeArgs.isEmpty)
+         Empty
+       else
+         Empty <+> "<" <> Doc.args(typeArgs) <> ">")
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaTransientImpl.scala b/src/col/vct/col/ast/lang/java/JavaTransientImpl.scala
index 54895fc8ce..3293f76987 100644
--- a/src/col/vct/col/ast/lang/java/JavaTransientImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaTransientImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaTransient
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaTransientOps
 
-trait JavaTransientImpl[G] extends JavaTransientOps[G] { this: JavaTransient[G] =>
+trait JavaTransientImpl[G] extends JavaTransientOps[G] {
+  this: JavaTransient[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("transient")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaTypeImpl.scala b/src/col/vct/col/ast/lang/java/JavaTypeImpl.scala
index 8a87f12eb3..d0e0fdc933 100644
--- a/src/col/vct/col/ast/lang/java/JavaTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaTypeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.java
 
 import vct.col.ast.JavaType
 
-trait JavaTypeImpl[G] { this: JavaType[G] =>
+trait JavaTypeImpl[G] {
+  this: JavaType[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaVolatileImpl.scala b/src/col/vct/col/ast/lang/java/JavaVolatileImpl.scala
index 2babb59a6e..ca7ae3cf8d 100644
--- a/src/col/vct/col/ast/lang/java/JavaVolatileImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaVolatileImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaVolatile
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaVolatileOps
 
-trait JavaVolatileImpl[G] extends JavaVolatileOps[G] { this: JavaVolatile[G] =>
+trait JavaVolatileImpl[G] extends JavaVolatileOps[G] {
+  this: JavaVolatile[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("volatile")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/java/JavaWildcardImpl.scala b/src/col/vct/col/ast/lang/java/JavaWildcardImpl.scala
index 9d96f4a506..76261c33e2 100644
--- a/src/col/vct/col/ast/lang/java/JavaWildcardImpl.scala
+++ b/src/col/vct/col/ast/lang/java/JavaWildcardImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaWildcard
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.JavaWildcardOps
 
-trait JavaWildcardImpl[G] extends JavaWildcardOps[G] { this: JavaWildcard[G] =>
+trait JavaWildcardImpl[G] extends JavaWildcardOps[G] {
+  this: JavaWildcard[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("?")
 }
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmAmbiguousFunctionInvocationImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmAmbiguousFunctionInvocationImpl.scala
index 54008f75e4..cb6b12eba3 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmAmbiguousFunctionInvocationImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmAmbiguousFunctionInvocationImpl.scala
@@ -1,20 +1,28 @@
 package vct.col.ast.lang.llvm
 
-import vct.col.ast.{LlvmAmbiguousFunctionInvocation, LlvmFunctionDefinition, LlvmSpecFunction, Type}
+import vct.col.ast.{
+  LlvmAmbiguousFunctionInvocation,
+  LlvmFunctionDefinition,
+  LlvmSpecFunction,
+  Type,
+}
 import vct.col.print.{Ctx, Doc, DocUtil, Group, Precedence, Text}
 import vct.col.ast.ops.LlvmAmbiguousFunctionInvocationOps
 
-trait LlvmAmbiguousFunctionInvocationImpl[G] extends LlvmAmbiguousFunctionInvocationOps[G] { this: LlvmAmbiguousFunctionInvocation[G] =>
-  override lazy val t: Type[G] = ref.get.decl match {
-    case func: LlvmFunctionDefinition[G] => func.returnType
-    case func: LlvmSpecFunction[G] => func.returnType
-  }
+trait LlvmAmbiguousFunctionInvocationImpl[G]
+    extends LlvmAmbiguousFunctionInvocationOps[G] {
+  this: LlvmAmbiguousFunctionInvocation[G] =>
+  override lazy val t: Type[G] =
+    ref.get.decl match {
+      case func: LlvmFunctionDefinition[G] => func.returnType
+      case func: LlvmSpecFunction[G] => func.returnType
+    }
 
   override def precedence: Int = Precedence.POSTFIX
 
   override def layout(implicit ctx: Ctx): Doc =
     Group(
-      Group(
-        Text(name) <> "(") <> Doc.args(args) <> ")" <> DocUtil.givenYields(givenMap, yields)
+      Group(Text(name) <> "(") <> Doc.args(args) <> ")" <>
+        DocUtil.givenYields(givenMap, yields)
     )
 }
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmExprImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmExprImpl.scala
index ee5805f530..6b4c7524e8 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmExprImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmExprImpl.scala
@@ -1,7 +1,7 @@
 package vct.col.ast.lang.llvm
 
-
 import vct.col.ast.LlvmExpr
-trait LlvmExprImpl[G] { this: LlvmExpr[G] =>
+trait LlvmExprImpl[G] {
+  this: LlvmExpr[G] =>
 
 }
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmFunctionContractImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmFunctionContractImpl.scala
index c8480817e0..48c8828248 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmFunctionContractImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmFunctionContractImpl.scala
@@ -3,5 +3,7 @@ package vct.col.ast.lang.llvm
 import vct.col.ast.LlvmFunctionContract
 import vct.col.ast.ops.{LlvmFunctionContractOps, LlvmFunctionContractFamilyOps}
 
-trait LlvmFunctionContractImpl[G] extends LlvmFunctionContractOps[G] with LlvmFunctionContractFamilyOps[G] { this: LlvmFunctionContract[G] =>
+trait LlvmFunctionContractImpl[G]
+    extends LlvmFunctionContractOps[G] with LlvmFunctionContractFamilyOps[G] {
+  this: LlvmFunctionContract[G] =>
 }
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmFunctionDefinitionImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmFunctionDefinitionImpl.scala
index f304be3124..89b836798c 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmFunctionDefinitionImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmFunctionDefinitionImpl.scala
@@ -5,7 +5,11 @@ import vct.col.ast.{Declaration, LlvmFunctionDefinition, Statement}
 import vct.col.ast.util.Declarator
 import vct.col.ast.ops.LlvmFunctionDefinitionOps
 
-trait LlvmFunctionDefinitionImpl[G] extends Declarator[G] with ApplicableImpl[G] with LlvmFunctionDefinitionOps[G] { this: LlvmFunctionDefinition[G] =>
+trait LlvmFunctionDefinitionImpl[G]
+    extends Declarator[G]
+    with ApplicableImpl[G]
+    with LlvmFunctionDefinitionOps[G] {
+  this: LlvmFunctionDefinition[G] =>
   override def declarations: Seq[Declaration[G]] = args
 
   override def body: Option[Statement[G]] = Some(functionBody)
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmFunctionInvocationImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmFunctionInvocationImpl.scala
index b14416eaf9..40f41dd1b4 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmFunctionInvocationImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmFunctionInvocationImpl.scala
@@ -4,12 +4,13 @@ import vct.col.ast.LlvmFunctionInvocation
 import vct.col.print.{Ctx, Doc, DocUtil, Empty, Group, Precedence, Text}
 import vct.col.ast.ops.LlvmFunctionInvocationOps
 
-trait LlvmFunctionInvocationImpl[G] extends LlvmFunctionInvocationOps[G] { this: LlvmFunctionInvocation[G] =>
+trait LlvmFunctionInvocationImpl[G] extends LlvmFunctionInvocationOps[G] {
+  this: LlvmFunctionInvocation[G] =>
   override def precedence: Int = Precedence.POSTFIX
 
   override def layout(implicit ctx: Ctx): Doc =
     Group(
-      Group(
-        Text(ctx.name(ref)) <> "(") <> Doc.args(args) <> ")" <> DocUtil.givenYields(givenMap, yields)
+      Group(Text(ctx.name(ref)) <> "(") <> Doc.args(args) <> ")" <>
+        DocUtil.givenYields(givenMap, yields)
     )
 }
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmGlobalImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmGlobalImpl.scala
index c1205598d5..3a92e81e9e 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmGlobalImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmGlobalImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.LlvmGlobal
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.LlvmGlobalOps
 
-trait LlvmGlobalImpl[G] extends LlvmGlobalOps[G] { this: LlvmGlobal[G] =>
+trait LlvmGlobalImpl[G] extends LlvmGlobalOps[G] {
+  this: LlvmGlobal[G] =>
 
   override def layout(implicit ctx: Ctx): Doc = Text(value)
 
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmLocalImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmLocalImpl.scala
index 6d8468df6c..0baa756520 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmLocalImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmLocalImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{LlvmLocal, Type}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.LlvmLocalOps
 
-trait LlvmLocalImpl[G] extends LlvmLocalOps[G] { this: LlvmLocal[G] =>
+trait LlvmLocalImpl[G] extends LlvmLocalOps[G] {
+  this: LlvmLocal[G] =>
   override lazy val t: Type[G] = ref.get.decl.t
 
   override def layout(implicit ctx: Ctx): Doc = Text(name)
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmLoopContractImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmLoopContractImpl.scala
index 08af908b3b..95f2c492c5 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmLoopContractImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmLoopContractImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.llvm
 import vct.col.ast.LlvmLoopContract
 import vct.col.ast.ops.LlvmLoopContractFamilyOps
 
-trait LlvmLoopContractImpl[G] extends LlvmLoopContractFamilyOps[G] { this: LlvmLoopContract[G] =>
+trait LlvmLoopContractImpl[G] extends LlvmLoopContractFamilyOps[G] {
+  this: LlvmLoopContract[G] =>
 
 }
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmLoopImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmLoopImpl.scala
index 2f723bdf0b..29b2aca394 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmLoopImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmLoopImpl.scala
@@ -3,7 +3,7 @@ package vct.col.ast.lang.llvm
 import vct.col.ast.LlvmLoop
 import vct.col.ast.ops.LlvmLoopOps
 
-
-trait LlvmLoopImpl[G] extends LlvmLoopOps[G] { this: LlvmLoop[G] =>
+trait LlvmLoopImpl[G] extends LlvmLoopOps[G] {
+  this: LlvmLoop[G] =>
 
 }
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmLoopInvariantImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmLoopInvariantImpl.scala
index 1e14ff9846..30f26a31b1 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmLoopInvariantImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmLoopInvariantImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.lang.llvm
 import vct.col.ast.LlvmLoopInvariant
 import vct.col.ast.ops.LlvmLoopInvariantOps
 
-trait LlvmLoopInvariantImpl[G] extends LlvmLoopInvariantOps[G] { this: LlvmLoopInvariant[G] =>
+trait LlvmLoopInvariantImpl[G] extends LlvmLoopInvariantOps[G] {
+  this: LlvmLoopInvariant[G] =>
 
 }
diff --git a/src/col/vct/col/ast/lang/llvm/LlvmSpecFunctionImpl.scala b/src/col/vct/col/ast/lang/llvm/LlvmSpecFunctionImpl.scala
index 58ad33d280..fe9430a026 100644
--- a/src/col/vct/col/ast/lang/llvm/LlvmSpecFunctionImpl.scala
+++ b/src/col/vct/col/ast/lang/llvm/LlvmSpecFunctionImpl.scala
@@ -8,25 +8,32 @@ import vct.col.print.{Ctx, Doc, Empty, Group, Show, Text}
 import scala.collection.immutable.ListMap
 import vct.col.ast.ops.LlvmSpecFunctionOps
 
-trait LlvmSpecFunctionImpl[G] extends GlobalDeclarationImpl[G] with AbstractFunctionImpl[G] with LlvmSpecFunctionOps[G] {
+trait LlvmSpecFunctionImpl[G]
+    extends GlobalDeclarationImpl[G]
+    with AbstractFunctionImpl[G]
+    with LlvmSpecFunctionOps[G] {
   this: LlvmSpecFunction[G] =>
 
-  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] = ListMap(
-    inline -> "inline",
-    threadLocal -> "thread_local",
-  ).filter(_._1).values.map(Text).map(Doc.inlineSpec).toSeq
+  def layoutModifiers(implicit ctx: Ctx): Seq[Doc] =
+    ListMap(inline -> "inline", threadLocal -> "thread_local").filter(_._1)
+      .values.map(Text).map(Doc.inlineSpec).toSeq
 
   def layoutSpec(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
       Group(
-        Group(Doc.rspread(layoutModifiers) <> "pure" <+> returnType <+> ctx.name(this) <>
-          (if (typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ">" else Empty) <>
-          "(" <> Doc.args(args) <> ")") <>
-          body.map(Text(" =") <>> _ <> ";").getOrElse(Text(";"))
+        Group(
+          Doc.rspread(layoutModifiers) <> "pure" <+> returnType <+>
+            ctx.name(this) <>
+            (if (typeArgs.nonEmpty)
+               Text("<") <> Doc.args(typeArgs.map(ctx.name).map(Text)) <> ">"
+             else
+               Empty) <> "(" <> Doc.args(args) <> ")"
+        ) <> body.map(Text(" =") <>> _ <> ";").getOrElse(Text(";"))
       ),
     ))
 
-  override def layout(implicit ctx: Ctx): Doc = Doc.spec(Show.lazily(layoutSpec(_)))
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.spec(Show.lazily(layoutSpec(_)))
 
 }
diff --git a/src/col/vct/col/ast/lang/pvl/PVLClassDeclarationImpl.scala b/src/col/vct/col/ast/lang/pvl/PVLClassDeclarationImpl.scala
index 898a633acb..60ab1bddcb 100644
--- a/src/col/vct/col/ast/lang/pvl/PVLClassDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/pvl/PVLClassDeclarationImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.pvl
 
 import vct.col.ast.PVLClassDeclaration
 
-trait PVLClassDeclarationImpl[G] { this: PVLClassDeclaration[G] =>
+trait PVLClassDeclarationImpl[G] {
+  this: PVLClassDeclaration[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/pvl/PVLConstructorImpl.scala b/src/col/vct/col/ast/lang/pvl/PVLConstructorImpl.scala
index b6989b661c..55c6ca0120 100644
--- a/src/col/vct/col/ast/lang/pvl/PVLConstructorImpl.scala
+++ b/src/col/vct/col/ast/lang/pvl/PVLConstructorImpl.scala
@@ -5,12 +5,15 @@ import vct.col.ast.{Declaration, PVLConstructor}
 import vct.col.print.{Ctx, Doc, Text, Empty}
 import vct.col.ast.ops.PVLConstructorOps
 
-trait PVLConstructorImpl[G] extends Declarator[G] with PVLConstructorOps[G] { this: PVLConstructor[G] =>
-  override def declarations: Seq[Declaration[G]] = args ++ contract.givenArgs ++ contract.yieldsArgs
+trait PVLConstructorImpl[G] extends Declarator[G] with PVLConstructorOps[G] {
+  this: PVLConstructor[G] =>
+  override def declarations: Seq[Declaration[G]] =
+    args ++ contract.givenArgs ++ contract.yieldsArgs
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Text("constructor") <> "(" <> Doc.args(args) <> ")" <> body.map(Empty <+> _.layoutAsBlock).getOrElse(Text(";"))
+      Text("constructor") <> "(" <> Doc.args(args) <> ")" <>
+        body.map(Empty <+> _.layoutAsBlock).getOrElse(Text(";")),
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/pvl/PVLDerefImpl.scala b/src/col/vct/col/ast/lang/pvl/PVLDerefImpl.scala
index 0ecea7a19d..468c4c7716 100644
--- a/src/col/vct/col/ast/lang/pvl/PVLDerefImpl.scala
+++ b/src/col/vct/col/ast/lang/pvl/PVLDerefImpl.scala
@@ -5,16 +5,17 @@ import vct.col.print.{Ctx, Doc, Precedence}
 import vct.col.resolve.ctx._
 import vct.col.ast.ops.PVLDerefOps
 
-trait PVLDerefImpl[G] extends PVLDerefOps[G] { this: PVLDeref[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case ref: RefModelField[G] => ref.decl.t
-    case ref: RefField[G] =>
-      obj.t.asClass.map(_.instantiate(ref.decl.t)).getOrElse(ref.decl.t)
-    case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
-    case ref: BuiltinField[G] => ref.f(obj).t
-  }
+trait PVLDerefImpl[G] extends PVLDerefOps[G] {
+  this: PVLDeref[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case ref: RefModelField[G] => ref.decl.t
+      case ref: RefField[G] =>
+        obj.t.asClass.map(_.instantiate(ref.decl.t)).getOrElse(ref.decl.t)
+      case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
+      case ref: BuiltinField[G] => ref.f(obj).t
+    }
 
   override def precedence: Int = Precedence.POSTFIX
-  override def layout(implicit ctx: Ctx): Doc =
-    assoc(obj) <> "." <> field
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = assoc(obj) <> "." <> field
+}
diff --git a/src/col/vct/col/ast/lang/pvl/PVLExprImpl.scala b/src/col/vct/col/ast/lang/pvl/PVLExprImpl.scala
index a9c7f15be0..cbda94e8e9 100644
--- a/src/col/vct/col/ast/lang/pvl/PVLExprImpl.scala
+++ b/src/col/vct/col/ast/lang/pvl/PVLExprImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.pvl
 
 import vct.col.ast.PVLExpr
 
-trait PVLExprImpl[G] { this: PVLExpr[G] =>
+trait PVLExprImpl[G] {
+  this: PVLExpr[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/pvl/PVLInvocationImpl.scala b/src/col/vct/col/ast/lang/pvl/PVLInvocationImpl.scala
index 788fda9029..0f8e9c741a 100644
--- a/src/col/vct/col/ast/lang/pvl/PVLInvocationImpl.scala
+++ b/src/col/vct/col/ast/lang/pvl/PVLInvocationImpl.scala
@@ -1,26 +1,37 @@
 package vct.col.ast.lang.pvl
 
-import vct.col.ast.{Applicable, ContractApplicable, PVLInvocation, TClass, TProcess, TResource, Type, Variable}
+import vct.col.ast.{
+  Applicable,
+  ContractApplicable,
+  PVLInvocation,
+  TClass,
+  TProcess,
+  TResource,
+  Type,
+  Variable,
+}
 import vct.col.print.{Ctx, Doc, DocUtil, Empty, Group, Text}
 import vct.col.resolve.ctx._
 import vct.col.ast.ops.PVLInvocationOps
 import vct.col.ref.Ref
 
-trait PVLInvocationImpl[G] extends PVLInvocationOps[G] { this: PVLInvocation[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case RefFunction(decl) => returnType(decl)
-    case RefProcedure(decl) => returnType(decl)
-    case RefPredicate(_) => TResource()
-    case RefInstanceFunction(decl) => returnType(decl)
-    case RefInstanceMethod(decl) => returnType(decl)
-    case RefInstancePredicate(_) => TResource()
-    case RefADTFunction(decl) => decl.returnType
-    case RefModelProcess(_) => TProcess()
-    case RefModelAction(_) => TProcess()
-    case RefProverFunction(decl) => decl.returnType
-    case PVLBuiltinInstanceMethod(f) => f(obj.get)(args).t
-    case BuiltinInstanceMethod(f) => f(obj.get)(args).t
-  }
+trait PVLInvocationImpl[G] extends PVLInvocationOps[G] {
+  this: PVLInvocation[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case RefFunction(decl) => returnType(decl)
+      case RefProcedure(decl) => returnType(decl)
+      case RefPredicate(_) => TResource()
+      case RefInstanceFunction(decl) => returnType(decl)
+      case RefInstanceMethod(decl) => returnType(decl)
+      case RefInstancePredicate(_) => TResource()
+      case RefADTFunction(decl) => decl.returnType
+      case RefModelProcess(_) => TProcess()
+      case RefModelAction(_) => TProcess()
+      case RefProverFunction(decl) => decl.returnType
+      case PVLBuiltinInstanceMethod(f) => f(obj.get)(args).t
+      case BuiltinInstanceMethod(f) => f(obj.get)(args).t
+    }
 
   private def returnType(app: ContractApplicable[G]): Type[G] =
     app.returnType.particularize(typeEnv(app))
@@ -28,13 +39,19 @@ trait PVLInvocationImpl[G] extends PVLInvocationOps[G] { this: PVLInvocation[G]
   // Take care to include type arguments of both the type of the object the method is called on, as well as
   // the arguments given to the method call itself.
   private def typeEnv(app: ContractApplicable[G]): Map[Variable[G], Type[G]] =
-    app.typeArgs.zip(typeArgs).toMap ++
-      obj.flatMap(_.t.asClass).map(_.typeEnv).getOrElse(Map.empty)
+    app.typeArgs.zip(typeArgs).toMap ++ obj.flatMap(_.t.asClass).map(_.typeEnv)
+      .getOrElse(Map.empty)
 
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Group(Group(obj.map(assoc(_) <> ".").getOrElse(Empty) <>
-      method <>
-      (if(typeArgs.isEmpty) Empty else Text("<") <> Doc.args(typeArgs) <> ">")) <>
-      "(" <> Doc.args(args) <> ")") <>
-      DocUtil.givenYields(givenMap, yields))
-}
\ No newline at end of file
+    Group(
+      Group(
+        Group(
+          obj.map(assoc(_) <> ".").getOrElse(Empty) <> method <>
+            (if (typeArgs.isEmpty)
+               Empty
+             else
+               Text("<") <> Doc.args(typeArgs) <> ">")
+        ) <> "(" <> Doc.args(args) <> ")"
+      ) <> DocUtil.givenYields(givenMap, yields)
+    )
+}
diff --git a/src/col/vct/col/ast/lang/pvl/PVLLocalImpl.scala b/src/col/vct/col/ast/lang/pvl/PVLLocalImpl.scala
index f22e9a1791..e5fc66c9e1 100644
--- a/src/col/vct/col/ast/lang/pvl/PVLLocalImpl.scala
+++ b/src/col/vct/col/ast/lang/pvl/PVLLocalImpl.scala
@@ -6,18 +6,20 @@ import vct.col.resolve.ctx._
 import vct.col.typerules.Types
 import vct.col.ast.ops.PVLLocalOps
 
-trait PVLLocalImpl[G] extends PVLLocalOps[G] { this: PVLLocal[G] =>
-  override lazy val t: Type[G] = ref.get match {
-    case ref: RefAxiomaticDataType[G] => Types.notAValue(ref)
-    case ref: RefEnum[G] => Types.notAValue(ref)
-    case ref: RefVariable[G] => ref.decl.t
-    case ref: RefClass[G] => Types.notAValue(ref)
-    case ref: RefField[G] => ref.decl.t
-    case ref: RefModelField[G] => ref.decl.t
-    case ref: RefEndpoint[G] => ref.decl.t
-    case ref: RefPVLEndpoint[G] => ref.decl.t
-    case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
-  }
+trait PVLLocalImpl[G] extends PVLLocalOps[G] {
+  this: PVLLocal[G] =>
+  override lazy val t: Type[G] =
+    ref.get match {
+      case ref: RefAxiomaticDataType[G] => Types.notAValue(ref)
+      case ref: RefEnum[G] => Types.notAValue(ref)
+      case ref: RefVariable[G] => ref.decl.t
+      case ref: RefClass[G] => Types.notAValue(ref)
+      case ref: RefField[G] => ref.decl.t
+      case ref: RefModelField[G] => ref.decl.t
+      case ref: RefEndpoint[G] => ref.decl.t
+      case ref: RefPVLEndpoint[G] => ref.decl.t
+      case RefEnumConstant(enum, _) => TEnum(enum.get.ref)
+    }
 
   override def layout(implicit ctx: Ctx): Doc = Text(name)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/pvl/PVLNamedTypeImpl.scala b/src/col/vct/col/ast/lang/pvl/PVLNamedTypeImpl.scala
index a3951767a9..0bb2eba821 100644
--- a/src/col/vct/col/ast/lang/pvl/PVLNamedTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/pvl/PVLNamedTypeImpl.scala
@@ -4,8 +4,14 @@ import vct.col.ast.PVLNamedType
 import vct.col.print.{Ctx, Doc, Text, Empty, Group}
 import vct.col.ast.ops.PVLNamedTypeOps
 
-trait PVLNamedTypeImpl[G] extends PVLNamedTypeOps[G] { this: PVLNamedType[G] =>
+trait PVLNamedTypeImpl[G] extends PVLNamedTypeOps[G] {
+  this: PVLNamedType[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text(name) <>
-      (if(typeArgs.isEmpty) Empty else Text("<") <> Doc.args(typeArgs) <> ">"))
-}
\ No newline at end of file
+    Group(
+      Text(name) <>
+        (if (typeArgs.isEmpty)
+           Empty
+         else
+           Text("<") <> Doc.args(typeArgs) <> ">")
+    )
+}
diff --git a/src/col/vct/col/ast/lang/pvl/PVLNewImpl.scala b/src/col/vct/col/ast/lang/pvl/PVLNewImpl.scala
index 2e749636fd..a180363c77 100644
--- a/src/col/vct/col/ast/lang/pvl/PVLNewImpl.scala
+++ b/src/col/vct/col/ast/lang/pvl/PVLNewImpl.scala
@@ -4,7 +4,11 @@ import vct.col.ast.PVLNew
 import vct.col.print.{Ctx, Doc, DocUtil, Text, Group}
 import vct.col.ast.ops.PVLNewOps
 
-trait PVLNewImpl[G] extends PVLNewOps[G] { this: PVLNew[G] =>
+trait PVLNewImpl[G] extends PVLNewOps[G] {
+  this: PVLNew[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Group(Text("new") <+> t <> "(" <> Doc.args(args) <> ")") <> DocUtil.givenYields(givenMap, yields))
-}
\ No newline at end of file
+    Group(
+      Group(Text("new") <+> t <> "(" <> Doc.args(args) <> ")") <>
+        DocUtil.givenYields(givenMap, yields)
+    )
+}
diff --git a/src/col/vct/col/ast/lang/pvl/PVLTypeImpl.scala b/src/col/vct/col/ast/lang/pvl/PVLTypeImpl.scala
index 71428cfa6b..22e809bb7c 100644
--- a/src/col/vct/col/ast/lang/pvl/PVLTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/pvl/PVLTypeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.pvl
 
 import vct.col.ast.PVLType
 
-trait PVLTypeImpl[G] { this: PVLType[G] =>
+trait PVLTypeImpl[G] {
+  this: PVLType[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverAssignImpl.scala b/src/col/vct/col/ast/lang/silver/SilverAssignImpl.scala
index 2eaf4b8c24..028cea832b 100644
--- a/src/col/vct/col/ast/lang/silver/SilverAssignImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverAssignImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.silver
 
 import vct.col.ast.SilverAssign
 
-trait SilverAssignImpl[G] { this: SilverAssign[G] =>
+trait SilverAssignImpl[G] {
+  this: SilverAssign[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverBagSizeImpl.scala b/src/col/vct/col/ast/lang/silver/SilverBagSizeImpl.scala
index b5a40aaa67..35cea1cc0a 100644
--- a/src/col/vct/col/ast/lang/silver/SilverBagSizeImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverBagSizeImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{SilverBagSize, TInt}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SilverBagSizeOps
 
-trait SilverBagSizeImpl[G] extends SilverBagSizeOps[G] { this: SilverBagSize[G] =>
+trait SilverBagSizeImpl[G] extends SilverBagSizeOps[G] {
+  this: SilverBagSize[G] =>
   override def t: TInt[G] = TInt[G]()
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("|") <> bag <> "|"
+  override def layout(implicit ctx: Ctx): Doc = Text("|") <> bag <> "|"
 }
diff --git a/src/col/vct/col/ast/lang/silver/SilverCurFieldPermImpl.scala b/src/col/vct/col/ast/lang/silver/SilverCurFieldPermImpl.scala
index 464f58fb71..20a6e3ae9b 100644
--- a/src/col/vct/col/ast/lang/silver/SilverCurFieldPermImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverCurFieldPermImpl.scala
@@ -4,10 +4,12 @@ import vct.col.ast.{SilverCurFieldPerm, TRational, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SilverCurFieldPermOps
 
-trait SilverCurFieldPermImpl[G] extends SilverCurFieldPermOps[G] { this: SilverCurFieldPerm[G] =>
+trait SilverCurFieldPermImpl[G] extends SilverCurFieldPermOps[G] {
+  this: SilverCurFieldPerm[G] =>
   override def t: Type[G] = TRational()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Text("perm(") <> obj.bind(Precedence.POSTFIX) <> "." <> ctx.name(field) <> ")"
-}
\ No newline at end of file
+    Text("perm(") <> obj.bind(Precedence.POSTFIX) <> "." <> ctx.name(field) <>
+      ")"
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverCurPredPermImpl.scala b/src/col/vct/col/ast/lang/silver/SilverCurPredPermImpl.scala
index f7837f0b3e..ff7d8d33db 100644
--- a/src/col/vct/col/ast/lang/silver/SilverCurPredPermImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverCurPredPermImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{SilverCurPredPerm, TRational, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text, Group}
 import vct.col.ast.ops.SilverCurPredPermOps
 
-trait SilverCurPredPermImpl[G] extends SilverCurPredPermOps[G] { this: SilverCurPredPerm[G] =>
+trait SilverCurPredPermImpl[G] extends SilverCurPredPermOps[G] {
+  this: SilverCurPredPerm[G] =>
   override def t: Type[G] = TRational()
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("perm(") <> ctx.name(ref) <> "(" <> Doc.args(args) <> ")" <> ")")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverDeclarationImpl.scala b/src/col/vct/col/ast/lang/silver/SilverDeclarationImpl.scala
index d8440d12d4..7bc2fb757c 100644
--- a/src/col/vct/col/ast/lang/silver/SilverDeclarationImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverDeclarationImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.silver
 
 import vct.col.ast.SilverDeclaration
 
-trait SilverDeclarationImpl[G] { this: SilverDeclaration[G] =>
+trait SilverDeclarationImpl[G] {
+  this: SilverDeclaration[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverDerefImpl.scala b/src/col/vct/col/ast/lang/silver/SilverDerefImpl.scala
index 666b20ad74..23af7dbd16 100644
--- a/src/col/vct/col/ast/lang/silver/SilverDerefImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverDerefImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{SilverDeref, Type}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SilverDerefOps
 
-trait SilverDerefImpl[G] extends SilverDerefOps[G] { this: SilverDeref[G] =>
+trait SilverDerefImpl[G] extends SilverDerefOps[G] {
+  this: SilverDeref[G] =>
   override def t: Type[G] = field.decl.t
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
     assoc(obj) <> "." <> ctx.name(field)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverExprImpl.scala b/src/col/vct/col/ast/lang/silver/SilverExprImpl.scala
index fb80614d38..0813cb6e69 100644
--- a/src/col/vct/col/ast/lang/silver/SilverExprImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverExprImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.silver
 
 import vct.col.ast.SilverExpr
 
-trait SilverExprImpl[G] { this: SilverExpr[G] =>
+trait SilverExprImpl[G] {
+  this: SilverExpr[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverFieldAssignImpl.scala b/src/col/vct/col/ast/lang/silver/SilverFieldAssignImpl.scala
index 5483a0f410..243936288e 100644
--- a/src/col/vct/col/ast/lang/silver/SilverFieldAssignImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverFieldAssignImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Expr, SilverFieldAssign}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SilverFieldAssignOps
 
-trait SilverFieldAssignImpl[G] extends SilverFieldAssignOps[G] { this: SilverFieldAssign[G] =>
+trait SilverFieldAssignImpl[G] extends SilverFieldAssignOps[G] {
+  this: SilverFieldAssign[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     obj.bind(Precedence.POSTFIX) <> "." <> ctx.name(field) <+> ":=" <+> value
 
   override def expr: Expr[G] = this.value
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverFieldImpl.scala b/src/col/vct/col/ast/lang/silver/SilverFieldImpl.scala
index 44e386122d..68c5e55103 100644
--- a/src/col/vct/col/ast/lang/silver/SilverFieldImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverFieldImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.SilverField
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SilverFieldOps
 
-trait SilverFieldImpl[G] extends SilverFieldOps[G] { this: SilverField[G] =>
+trait SilverFieldImpl[G] extends SilverFieldOps[G] {
+  this: SilverField[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text("field") <+> ctx.name(this) <> ":" <+> t
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverIntToRatImpl.scala b/src/col/vct/col/ast/lang/silver/SilverIntToRatImpl.scala
index 79f1c473f6..959feb7658 100644
--- a/src/col/vct/col/ast/lang/silver/SilverIntToRatImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverIntToRatImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SilverIntToRat, TRational, Type}
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.SilverIntToRatOps
 
-trait SilverIntToRatImpl[G] extends SilverIntToRatOps[G] { this: SilverIntToRat[G] =>
+trait SilverIntToRatImpl[G] extends SilverIntToRatOps[G] {
+  this: SilverIntToRat[G] =>
   override def t: Type[G] = TRational()
 
   override def precedence: Int = perm.precedence
diff --git a/src/col/vct/col/ast/lang/silver/SilverLocalAssignImpl.scala b/src/col/vct/col/ast/lang/silver/SilverLocalAssignImpl.scala
index 432549a54a..6e0e30ff09 100644
--- a/src/col/vct/col/ast/lang/silver/SilverLocalAssignImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverLocalAssignImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.{Expr, SilverLocalAssign}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.SilverLocalAssignOps
 
-trait SilverLocalAssignImpl[G] extends SilverLocalAssignOps[G] { this: SilverLocalAssign[G] =>
+trait SilverLocalAssignImpl[G] extends SilverLocalAssignOps[G] {
+  this: SilverLocalAssign[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text(ctx.name(v)) <+> ":=" <+> value
 
   override def expr: Expr[G] = this.value
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverMapSizeImpl.scala b/src/col/vct/col/ast/lang/silver/SilverMapSizeImpl.scala
index e245b57098..0d31b5f21c 100644
--- a/src/col/vct/col/ast/lang/silver/SilverMapSizeImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverMapSizeImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{SilverMapSize, TInt}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SilverMapSizeOps
 
-trait SilverMapSizeImpl[G] extends SilverMapSizeOps[G] { this: SilverMapSize[G] =>
+trait SilverMapSizeImpl[G] extends SilverMapSizeOps[G] {
+  this: SilverMapSize[G] =>
   override def t: TInt[G] = TInt()
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("|") <> map.show <> "|"
+  override def layout(implicit ctx: Ctx): Doc = Text("|") <> map.show <> "|"
 }
diff --git a/src/col/vct/col/ast/lang/silver/SilverNewRefImpl.scala b/src/col/vct/col/ast/lang/silver/SilverNewRefImpl.scala
index cbab39b2a3..8f745fd480 100644
--- a/src/col/vct/col/ast/lang/silver/SilverNewRefImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverNewRefImpl.scala
@@ -4,7 +4,11 @@ import vct.col.ast.SilverNewRef
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.SilverNewRefOps
 
-trait SilverNewRefImpl[G] extends SilverNewRefOps[G] { this: SilverNewRef[G] =>
+trait SilverNewRefImpl[G] extends SilverNewRefOps[G] {
+  this: SilverNewRef[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text(ctx.name(v)) <+> ":=" <+> "new(" <> Doc.args(fields.map(ctx.name).map(Text)) <> ")")
-}
\ No newline at end of file
+    Group(
+      Text(ctx.name(v)) <+> ":=" <+> "new(" <>
+        Doc.args(fields.map(ctx.name).map(Text)) <> ")"
+    )
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverNullImpl.scala b/src/col/vct/col/ast/lang/silver/SilverNullImpl.scala
index d7e9f691d5..daefad2332 100644
--- a/src/col/vct/col/ast/lang/silver/SilverNullImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverNullImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SilverNull, TRef}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SilverNullOps
 
-trait SilverNullImpl[G] extends SilverNullOps[G] { this: SilverNull[G] =>
+trait SilverNullImpl[G] extends SilverNullOps[G] {
+  this: SilverNull[G] =>
   override def t: TRef[G] = TRef[G]()
 
   override def layout(implicit ctx: Ctx): Doc = Text("null")
diff --git a/src/col/vct/col/ast/lang/silver/SilverPartialADTFunctionInvocationImpl.scala b/src/col/vct/col/ast/lang/silver/SilverPartialADTFunctionInvocationImpl.scala
index 31e6d0ecc2..e31f156d03 100644
--- a/src/col/vct/col/ast/lang/silver/SilverPartialADTFunctionInvocationImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverPartialADTFunctionInvocationImpl.scala
@@ -1,20 +1,31 @@
 package vct.col.ast.lang.silver
 
-import vct.col.ast.{ADTFunction, AxiomaticDataType, SilverPartialADTFunctionInvocation, Type}
+import vct.col.ast.{
+  ADTFunction,
+  AxiomaticDataType,
+  SilverPartialADTFunctionInvocation,
+  Type,
+}
 import vct.col.print._
 import vct.col.ref.Ref
 import vct.col.ast.ops.SilverPartialADTFunctionInvocationOps
 
-trait SilverPartialADTFunctionInvocationImpl[G] extends SilverPartialADTFunctionInvocationOps[G] { this: SilverPartialADTFunctionInvocation[G] =>
+trait SilverPartialADTFunctionInvocationImpl[G]
+    extends SilverPartialADTFunctionInvocationOps[G] {
+  this: SilverPartialADTFunctionInvocation[G] =>
   def adt: AxiomaticDataType[G] = ref.get._1
   def function: ADTFunction[G] = ref.get._2
 
   def maybeTypeArgs: Option[Seq[Type[G]]] =
-    Some(adt.typeArgs.map(arg => partialTypeArgs.collectFirst { case (Ref(v), t) if arg == v => t }.getOrElse(return None)))
+    Some(adt.typeArgs.map(arg =>
+      partialTypeArgs.collectFirst { case (Ref(v), t) if arg == v => t }
+        .getOrElse(return None)
+    ))
 
   def typeArgs: Seq[Type[G]] = maybeTypeArgs.get
 
-  override lazy val t: Type[G] = function.returnType.particularize(adt.typeArgs.zip(typeArgs).toMap)
+  override lazy val t: Type[G] = function.returnType
+    .particularize(adt.typeArgs.zip(typeArgs).toMap)
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
diff --git a/src/col/vct/col/ast/lang/silver/SilverPartialTAxiomaticImpl.scala b/src/col/vct/col/ast/lang/silver/SilverPartialTAxiomaticImpl.scala
index 454dbd571d..1be8b638f9 100644
--- a/src/col/vct/col/ast/lang/silver/SilverPartialTAxiomaticImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverPartialTAxiomaticImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.SilverPartialTAxiomatic
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SilverPartialTAxiomaticOps
 
-trait SilverPartialTAxiomaticImpl[G] extends SilverPartialTAxiomaticOps[G] { this: SilverPartialTAxiomatic[G] =>
+trait SilverPartialTAxiomaticImpl[G] extends SilverPartialTAxiomaticOps[G] {
+  this: SilverPartialTAxiomatic[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text(ctx.name(ref)) <> open <> "..." <> close
 }
diff --git a/src/col/vct/col/ast/lang/silver/SilverSeqSizeImpl.scala b/src/col/vct/col/ast/lang/silver/SilverSeqSizeImpl.scala
index 67b12a118e..0ebbbda5c7 100644
--- a/src/col/vct/col/ast/lang/silver/SilverSeqSizeImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverSeqSizeImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{SilverSeqSize, TInt}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SilverSeqSizeOps
 
-trait SilverSeqSizeImpl[G] extends SilverSeqSizeOps[G] { this: SilverSeqSize[G] =>
+trait SilverSeqSizeImpl[G] extends SilverSeqSizeOps[G] {
+  this: SilverSeqSize[G] =>
   override def t: TInt[G] = TInt[G]()
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("|") <> seq <> "|"
+  override def layout(implicit ctx: Ctx): Doc = Text("|") <> seq <> "|"
 }
diff --git a/src/col/vct/col/ast/lang/silver/SilverSetSizeImpl.scala b/src/col/vct/col/ast/lang/silver/SilverSetSizeImpl.scala
index 4fd311ae34..785126d4ca 100644
--- a/src/col/vct/col/ast/lang/silver/SilverSetSizeImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverSetSizeImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.{SilverSetSize, TInt}
 import vct.col.print.{Ctx, Doc, Precedence, Text}
 import vct.col.ast.ops.SilverSetSizeOps
 
-trait SilverSetSizeImpl[G] extends SilverSetSizeOps[G] { this: SilverSetSize[G] =>
+trait SilverSetSizeImpl[G] extends SilverSetSizeOps[G] {
+  this: SilverSetSize[G] =>
   override def t: TInt[G] = TInt[G]()
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("|") <> set <> "|"
+  override def layout(implicit ctx: Ctx): Doc = Text("|") <> set <> "|"
 }
diff --git a/src/col/vct/col/ast/lang/silver/SilverStatementImpl.scala b/src/col/vct/col/ast/lang/silver/SilverStatementImpl.scala
index f7674da787..0ab76fccb4 100644
--- a/src/col/vct/col/ast/lang/silver/SilverStatementImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverStatementImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.silver
 
 import vct.col.ast.SilverStatement
 
-trait SilverStatementImpl[G] { this: SilverStatement[G] =>
+trait SilverStatementImpl[G] {
+  this: SilverStatement[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/silver/SilverTypeImpl.scala b/src/col/vct/col/ast/lang/silver/SilverTypeImpl.scala
index e61d1ff42a..c3c86165c8 100644
--- a/src/col/vct/col/ast/lang/silver/SilverTypeImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverTypeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.silver
 
 import vct.col.ast.SilverType
 
-trait SilverTypeImpl[G] { this: SilverType[G] =>
-  
+trait SilverTypeImpl[G] {
+  this: SilverType[G] =>
+
 }
diff --git a/src/col/vct/col/ast/lang/silver/SilverUntypedNonemptyLiteralMapImpl.scala b/src/col/vct/col/ast/lang/silver/SilverUntypedNonemptyLiteralMapImpl.scala
index fe6bdd5f0c..9a90e0b959 100644
--- a/src/col/vct/col/ast/lang/silver/SilverUntypedNonemptyLiteralMapImpl.scala
+++ b/src/col/vct/col/ast/lang/silver/SilverUntypedNonemptyLiteralMapImpl.scala
@@ -5,7 +5,9 @@ import vct.col.print.{Ctx, Doc, Precedence, Text, Group}
 import vct.col.typerules.Types
 import vct.col.ast.ops.SilverUntypedNonemptyLiteralMapOps
 
-trait SilverUntypedNonemptyLiteralMapImpl[G] extends SilverUntypedNonemptyLiteralMapOps[G] { this: SilverUntypedNonemptyLiteralMap[G] =>
+trait SilverUntypedNonemptyLiteralMapImpl[G]
+    extends SilverUntypedNonemptyLiteralMapOps[G] {
+  this: SilverUntypedNonemptyLiteralMap[G] =>
   def mapKeys: Seq[Expr[G]] = values.map(_._1)
   def mapValues: Seq[Expr[G]] = values.map(_._2)
 
@@ -16,7 +18,7 @@ trait SilverUntypedNonemptyLiteralMapImpl[G] extends SilverUntypedNonemptyLitera
 
   override def precedence: Int = Precedence.POSTFIX
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("Map(") <> Doc.args(values.map {
-      case (k, v) => k.show <+> ":=" <+> v
+    Group(Text("Map(") <> Doc.args(values.map { case (k, v) =>
+      k.show <+> ":=" <+> v
     }) <> ")")
 }
diff --git a/src/col/vct/col/ast/lang/smt/BoogieImpl.scala b/src/col/vct/col/ast/lang/smt/BoogieImpl.scala
index ed7acca297..54d2839115 100644
--- a/src/col/vct/col/ast/lang/smt/BoogieImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/BoogieImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.Boogie
 import vct.col.ast.ops.BoogieOps
 import vct.col.print._
 
-trait BoogieImpl[G] extends BoogieOps[G] { this: Boogie[G] =>
+trait BoogieImpl[G] extends BoogieOps[G] {
+  this: Boogie[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/ProverLanguageImpl.scala b/src/col/vct/col/ast/lang/smt/ProverLanguageImpl.scala
index 2d6c529f06..8c4a7eaeb7 100644
--- a/src/col/vct/col/ast/lang/smt/ProverLanguageImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/ProverLanguageImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.ProverLanguage
 import vct.col.ast.ops.ProverLanguageFamilyOps
 import vct.col.print._
 
-trait ProverLanguageImpl[G] extends ProverLanguageFamilyOps[G] { this: ProverLanguage[G] =>
+trait ProverLanguageImpl[G] extends ProverLanguageFamilyOps[G] {
+  this: ProverLanguage[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtLibImpl.scala b/src/col/vct/col/ast/lang/smt/SmtLibImpl.scala
index c1ed79dbcb..44f4fe06e1 100644
--- a/src/col/vct/col/ast/lang/smt/SmtLibImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtLibImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.SmtLib
 import vct.col.ast.ops.SmtLibOps
 import vct.col.print._
 
-trait SmtLibImpl[G] extends SmtLibOps[G] { this: SmtLib[G] =>
+trait SmtLibImpl[G] extends SmtLibOps[G] {
+  this: SmtLib[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibADTFunctionSymbolImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibADTFunctionSymbolImpl.scala
index 98b6a30de4..d62ad3268e 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibADTFunctionSymbolImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibADTFunctionSymbolImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.SmtlibADTFunctionSymbol
 import vct.col.ast.ops.SmtlibADTFunctionSymbolOps
 import vct.col.print._
 
-trait SmtlibADTFunctionSymbolImpl[G] extends SmtlibADTFunctionSymbolOps[G] { this: SmtlibADTFunctionSymbol[G] =>
+trait SmtlibADTFunctionSymbolImpl[G] extends SmtlibADTFunctionSymbolOps[G] {
+  this: SmtlibADTFunctionSymbol[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBitvecLiteralImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBitvecLiteralImpl.scala
index 9bf93ad860..6bdde0e020 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBitvecLiteralImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBitvecLiteralImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibBitvecLiteral, TSmtlibBitVector, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBitvecLiteralOps
 
-trait SmtlibBitvecLiteralImpl[G] extends SmtlibBitvecLiteralOps[G] { this: SmtlibBitvecLiteral[G] =>
+trait SmtlibBitvecLiteralImpl[G] extends SmtlibBitvecLiteralOps[G] {
+  this: SmtlibBitvecLiteral[G] =>
   override def t: Type[G] = TSmtlibBitVector(data.length)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvAddImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvAddImpl.scala
index c1d73f1750..69696e4328 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvAddImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvAddImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvAddOps
 
-trait SmtlibBvAddImpl[G] extends SmtlibBvAddOps[G] { this: SmtlibBvAdd[G] =>
+trait SmtlibBvAddImpl[G] extends SmtlibBvAddOps[G] {
+  this: SmtlibBvAdd[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvAndImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvAndImpl.scala
index 7039a5190a..682056ec00 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvAndImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvAndImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvAndOps
 
-trait SmtlibBvAndImpl[G] extends SmtlibBvAndOps[G] { this: SmtlibBvAnd[G] =>
+trait SmtlibBvAndImpl[G] extends SmtlibBvAndOps[G] {
+  this: SmtlibBvAnd[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvMulImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvMulImpl.scala
index b1b3fd1567..4cdae9d8a0 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvMulImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvMulImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvMulOps
 
-trait SmtlibBvMulImpl[G] extends SmtlibBvMulOps[G] { this: SmtlibBvMul[G] =>
+trait SmtlibBvMulImpl[G] extends SmtlibBvMulOps[G] {
+  this: SmtlibBvMul[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvNegImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvNegImpl.scala
index e14f787b10..d6db2814b5 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvNegImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvNegImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvNegOps
 
-trait SmtlibBvNegImpl[G] extends SmtlibBvNegOps[G] { this: SmtlibBvNeg[G] =>
+trait SmtlibBvNegImpl[G] extends SmtlibBvNegOps[G] {
+  this: SmtlibBvNeg[G] =>
   override def t: Type[G] = bv.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvNotImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvNotImpl.scala
index 23c72f1b60..e81a511d2d 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvNotImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvNotImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvNotOps
 
-trait SmtlibBvNotImpl[G] extends SmtlibBvNotOps[G] { this: SmtlibBvNot[G] =>
+trait SmtlibBvNotImpl[G] extends SmtlibBvNotOps[G] {
+  this: SmtlibBvNot[G] =>
   override def t: Type[G] = bv.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvOrImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvOrImpl.scala
index 961432228e..4026a7fb8a 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvOrImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvOrImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvOrOps
 
-trait SmtlibBvOrImpl[G] extends SmtlibBvOrOps[G] { this: SmtlibBvOr[G] =>
+trait SmtlibBvOrImpl[G] extends SmtlibBvOrOps[G] {
+  this: SmtlibBvOr[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvShlImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvShlImpl.scala
index 7cee447db6..afbe7bc5ce 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvShlImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvShlImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvShlOps
 
-trait SmtlibBvShlImpl[G] extends SmtlibBvShlOps[G] { this: SmtlibBvShl[G] =>
+trait SmtlibBvShlImpl[G] extends SmtlibBvShlOps[G] {
+  this: SmtlibBvShl[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvShrImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvShrImpl.scala
index d6fa0b3e25..c60fd58e2f 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvShrImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvShrImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvShrOps
 
-trait SmtlibBvShrImpl[G] extends SmtlibBvShrOps[G] { this: SmtlibBvShr[G] =>
+trait SmtlibBvShrImpl[G] extends SmtlibBvShrOps[G] {
+  this: SmtlibBvShr[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvUDivImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvUDivImpl.scala
index 510d8991a5..88f3656a12 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvUDivImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvUDivImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvUDivOps
 
-trait SmtlibBvUDivImpl[G] extends SmtlibBvUDivOps[G] { this: SmtlibBvUDiv[G] =>
+trait SmtlibBvUDivImpl[G] extends SmtlibBvUDivOps[G] {
+  this: SmtlibBvUDiv[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvULtImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvULtImpl.scala
index 23b894991b..824898b319 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvULtImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvULtImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvULtOps
 
-trait SmtlibBvULtImpl[G] extends SmtlibBvULtOps[G] { this: SmtlibBvULt[G] =>
+trait SmtlibBvULtImpl[G] extends SmtlibBvULtOps[G] {
+  this: SmtlibBvULt[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibBvURemImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibBvURemImpl.scala
index 5811a31ad4..599fc258e9 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibBvURemImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibBvURemImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibBvURemOps
 
-trait SmtlibBvURemImpl[G] extends SmtlibBvURemOps[G] { this: SmtlibBvURem[G] =>
+trait SmtlibBvURemImpl[G] extends SmtlibBvURemOps[G] {
+  this: SmtlibBvURem[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibConcatImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibConcatImpl.scala
index fac1a05d14..62ab9a3aa1 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibConcatImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibConcatImpl.scala
@@ -4,7 +4,10 @@ import vct.col.ast.{SmtlibConcat, TSmtlibBitVector, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibConcatOps
 
-trait SmtlibConcatImpl[G] extends SmtlibConcatOps[G] { this: SmtlibConcat[G] =>
-  override lazy val t: Type[G] = TSmtlibBitVector(left.t.asBitvec.get.size + right.t.asBitvec.get.size)
+trait SmtlibConcatImpl[G] extends SmtlibConcatOps[G] {
+  this: SmtlibConcat[G] =>
+  override lazy val t: Type[G] = TSmtlibBitVector(
+    left.t.asBitvec.get.size + right.t.asBitvec.get.size
+  )
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibExtractImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibExtractImpl.scala
index 31ebd628cd..01e5251183 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibExtractImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibExtractImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.{SmtlibExtract, TSmtlibBitVector, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibExtractOps
 
-trait SmtlibExtractImpl[G] extends SmtlibExtractOps[G] { this: SmtlibExtract[G] =>
-  override def t: Type[G] = TSmtlibBitVector(inclusiveEndIndexFromRight - startIndexFromRight + 1)
+trait SmtlibExtractImpl[G] extends SmtlibExtractOps[G] {
+  this: SmtlibExtract[G] =>
+  override def t: Type[G] =
+    TSmtlibBitVector(inclusiveEndIndexFromRight - startIndexFromRight + 1)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpAbsImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpAbsImpl.scala
index 259a8a4983..4d413a13b0 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpAbsImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpAbsImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpAbsOps
 
-trait SmtlibFpAbsImpl[G] extends SmtlibFpAbsOps[G] { this: SmtlibFpAbs[G] =>
+trait SmtlibFpAbsImpl[G] extends SmtlibFpAbsOps[G] {
+  this: SmtlibFpAbs[G] =>
   override def t: Type[G] = arg.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpAddImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpAddImpl.scala
index 438391e25c..40ad794696 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpAddImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpAddImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpAddOps
 
-trait SmtlibFpAddImpl[G] extends SmtlibFpAddOps[G] { this: SmtlibFpAdd[G] =>
+trait SmtlibFpAddImpl[G] extends SmtlibFpAddOps[G] {
+  this: SmtlibFpAdd[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpCastImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpCastImpl.scala
index b43fd8861a..6d7c49d517 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpCastImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpCastImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.{SmtlibFpCast, TSmtlibFloatingPoint, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpCastOps
 
-trait SmtlibFpCastImpl[G] extends SmtlibFpCastOps[G] { this: SmtlibFpCast[G] =>
-  override def t: Type[G] = TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits)
+trait SmtlibFpCastImpl[G] extends SmtlibFpCastOps[G] {
+  this: SmtlibFpCast[G] =>
+  override def t: Type[G] =
+    TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpDivImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpDivImpl.scala
index e1224b8fc5..da7863201a 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpDivImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpDivImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpDivOps
 
-trait SmtlibFpDivImpl[G] extends SmtlibFpDivOps[G] { this: SmtlibFpDiv[G] =>
+trait SmtlibFpDivImpl[G] extends SmtlibFpDivOps[G] {
+  this: SmtlibFpDiv[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpEqImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpEqImpl.scala
index d5725a1003..a21437b899 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpEqImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpEqImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.{Type, TBool}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpEqOps
 
-trait SmtlibFpEqImpl[G] extends SmtlibFpEqOps[G] { this: SmtlibFpEq[G] =>
+trait SmtlibFpEqImpl[G] extends SmtlibFpEqOps[G] {
+  this: SmtlibFpEq[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpFmaImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpFmaImpl.scala
index 883c1eae60..6921666bb3 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpFmaImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpFmaImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpFmaOps
 
-trait SmtlibFpFmaImpl[G] extends SmtlibFpFmaOps[G] { this: SmtlibFpFma[G] =>
+trait SmtlibFpFmaImpl[G] extends SmtlibFpFmaOps[G] {
+  this: SmtlibFpFma[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpFromRealImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpFromRealImpl.scala
index 145e94fdf2..637c543a76 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpFromRealImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpFromRealImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.{SmtlibFpFromReal, TSmtlibFloatingPoint, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpFromRealOps
 
-trait SmtlibFpFromRealImpl[G] extends SmtlibFpFromRealOps[G] { this: SmtlibFpFromReal[G] =>
-  override def t: Type[G] = TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits)
+trait SmtlibFpFromRealImpl[G] extends SmtlibFpFromRealOps[G] {
+  this: SmtlibFpFromReal[G] =>
+  override def t: Type[G] =
+    TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpFromSIntImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpFromSIntImpl.scala
index 023a05c380..9e6e100423 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpFromSIntImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpFromSIntImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.{SmtlibFpFromSInt, TSmtlibFloatingPoint, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpFromSIntOps
 
-trait SmtlibFpFromSIntImpl[G] extends SmtlibFpFromSIntOps[G] { this: SmtlibFpFromSInt[G] =>
-  override def t: Type[G] = TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits)
+trait SmtlibFpFromSIntImpl[G] extends SmtlibFpFromSIntOps[G] {
+  this: SmtlibFpFromSInt[G] =>
+  override def t: Type[G] =
+    TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpFromUIntImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpFromUIntImpl.scala
index e63a36b2e5..8bceef1ae5 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpFromUIntImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpFromUIntImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.{SmtlibFpFromUInt, TSmtlibFloatingPoint, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpFromUIntOps
 
-trait SmtlibFpFromUIntImpl[G] extends SmtlibFpFromUIntOps[G] { this: SmtlibFpFromUInt[G] =>
-  override def t: Type[G] = TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits)
+trait SmtlibFpFromUIntImpl[G] extends SmtlibFpFromUIntOps[G] {
+  this: SmtlibFpFromUInt[G] =>
+  override def t: Type[G] =
+    TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpGeqImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpGeqImpl.scala
index 0de5d01d3f..051b9ef04b 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpGeqImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpGeqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpGeq, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpGeqOps
 
-trait SmtlibFpGeqImpl[G] extends SmtlibFpGeqOps[G] { this: SmtlibFpGeq[G] =>
+trait SmtlibFpGeqImpl[G] extends SmtlibFpGeqOps[G] {
+  this: SmtlibFpGeq[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpGtImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpGtImpl.scala
index 41393e1623..f7d265c438 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpGtImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpGtImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpGt, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpGtOps
 
-trait SmtlibFpGtImpl[G] extends SmtlibFpGtOps[G] { this: SmtlibFpGt[G] =>
+trait SmtlibFpGtImpl[G] extends SmtlibFpGtOps[G] {
+  this: SmtlibFpGt[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpImpl.scala
index 6e915f7a8d..15a879eca6 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpImpl.scala
@@ -4,7 +4,12 @@ import vct.col.ast.{SmtlibFp, TSmtlibFloatingPoint, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpOps
 
-trait SmtlibFpImpl[G] extends SmtlibFpOps[G] { this: SmtlibFp[G] =>
-  override def t: Type[G] = TSmtlibFloatingPoint(exponent.t.asBitvec.get.size, mantissa.t.asBitvec.get.size + 1)
+trait SmtlibFpImpl[G] extends SmtlibFpOps[G] {
+  this: SmtlibFp[G] =>
+  override def t: Type[G] =
+    TSmtlibFloatingPoint(
+      exponent.t.asBitvec.get.size,
+      mantissa.t.asBitvec.get.size + 1,
+    )
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpIsInfiniteImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpIsInfiniteImpl.scala
index 72c123497b..6a7b2a9454 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpIsInfiniteImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpIsInfiniteImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpIsInfinite, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpIsInfiniteOps
 
-trait SmtlibFpIsInfiniteImpl[G] extends SmtlibFpIsInfiniteOps[G] { this: SmtlibFpIsInfinite[G] =>
+trait SmtlibFpIsInfiniteImpl[G] extends SmtlibFpIsInfiniteOps[G] {
+  this: SmtlibFpIsInfinite[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpIsNaNImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpIsNaNImpl.scala
index 4db14783d1..7e019fe8bb 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpIsNaNImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpIsNaNImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpIsNaN, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpIsNaNOps
 
-trait SmtlibFpIsNaNImpl[G] extends SmtlibFpIsNaNOps[G] { this: SmtlibFpIsNaN[G] =>
+trait SmtlibFpIsNaNImpl[G] extends SmtlibFpIsNaNOps[G] {
+  this: SmtlibFpIsNaN[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpIsNegativeImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpIsNegativeImpl.scala
index 7f0368d6e2..d31464a68f 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpIsNegativeImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpIsNegativeImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpIsNegative, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpIsNegativeOps
 
-trait SmtlibFpIsNegativeImpl[G] extends SmtlibFpIsNegativeOps[G] { this: SmtlibFpIsNegative[G] =>
+trait SmtlibFpIsNegativeImpl[G] extends SmtlibFpIsNegativeOps[G] {
+  this: SmtlibFpIsNegative[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpIsNormalImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpIsNormalImpl.scala
index a79ad6efd4..c3f0a09c66 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpIsNormalImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpIsNormalImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpIsNormal, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpIsNormalOps
 
-trait SmtlibFpIsNormalImpl[G] extends SmtlibFpIsNormalOps[G] { this: SmtlibFpIsNormal[G] =>
+trait SmtlibFpIsNormalImpl[G] extends SmtlibFpIsNormalOps[G] {
+  this: SmtlibFpIsNormal[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpIsPositiveImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpIsPositiveImpl.scala
index 8bd5fcdc49..83cfc96fa8 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpIsPositiveImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpIsPositiveImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpIsPositive, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpIsPositiveOps
 
-trait SmtlibFpIsPositiveImpl[G] extends SmtlibFpIsPositiveOps[G] { this: SmtlibFpIsPositive[G] =>
+trait SmtlibFpIsPositiveImpl[G] extends SmtlibFpIsPositiveOps[G] {
+  this: SmtlibFpIsPositive[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpIsSubnormalImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpIsSubnormalImpl.scala
index 8e8b5c3303..4f1c610edf 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpIsSubnormalImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpIsSubnormalImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpIsSubnormal, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpIsSubnormalOps
 
-trait SmtlibFpIsSubnormalImpl[G] extends SmtlibFpIsSubnormalOps[G] { this: SmtlibFpIsSubnormal[G] =>
+trait SmtlibFpIsSubnormalImpl[G] extends SmtlibFpIsSubnormalOps[G] {
+  this: SmtlibFpIsSubnormal[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpIsZeroImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpIsZeroImpl.scala
index 0edc14d36e..877c62ae2a 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpIsZeroImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpIsZeroImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpIsZero, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpIsZeroOps
 
-trait SmtlibFpIsZeroImpl[G] extends SmtlibFpIsZeroOps[G] { this: SmtlibFpIsZero[G] =>
+trait SmtlibFpIsZeroImpl[G] extends SmtlibFpIsZeroOps[G] {
+  this: SmtlibFpIsZero[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpLeqImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpLeqImpl.scala
index 3ad2342af0..57d81504c3 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpLeqImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpLeqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpLeq, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpLeqOps
 
-trait SmtlibFpLeqImpl[G] extends SmtlibFpLeqOps[G] { this: SmtlibFpLeq[G] =>
+trait SmtlibFpLeqImpl[G] extends SmtlibFpLeqOps[G] {
+  this: SmtlibFpLeq[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpLtImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpLtImpl.scala
index 32f22ce083..4eb61c66ab 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpLtImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpLtImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpLt, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpLtOps
 
-trait SmtlibFpLtImpl[G] extends SmtlibFpLtOps[G] { this: SmtlibFpLt[G] =>
+trait SmtlibFpLtImpl[G] extends SmtlibFpLtOps[G] {
+  this: SmtlibFpLt[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpMaxImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpMaxImpl.scala
index c81475da7e..7f56deecca 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpMaxImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpMaxImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpMaxOps
 
-trait SmtlibFpMaxImpl[G] extends SmtlibFpMaxOps[G] { this: SmtlibFpMax[G] =>
+trait SmtlibFpMaxImpl[G] extends SmtlibFpMaxOps[G] {
+  this: SmtlibFpMax[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpMinImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpMinImpl.scala
index 04f1b0004e..2cfe19b413 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpMinImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpMinImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpMinOps
 
-trait SmtlibFpMinImpl[G] extends SmtlibFpMinOps[G] { this: SmtlibFpMin[G] =>
+trait SmtlibFpMinImpl[G] extends SmtlibFpMinOps[G] {
+  this: SmtlibFpMin[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpMulImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpMulImpl.scala
index 1ac952d822..26adea8739 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpMulImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpMulImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpMulOps
 
-trait SmtlibFpMulImpl[G] extends SmtlibFpMulOps[G] { this: SmtlibFpMul[G] =>
+trait SmtlibFpMulImpl[G] extends SmtlibFpMulOps[G] {
+  this: SmtlibFpMul[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpNegImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpNegImpl.scala
index 02005d4b89..ed874ccf15 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpNegImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpNegImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpNegOps
 
-trait SmtlibFpNegImpl[G] extends SmtlibFpNegOps[G] { this: SmtlibFpNeg[G] =>
+trait SmtlibFpNegImpl[G] extends SmtlibFpNegOps[G] {
+  this: SmtlibFpNeg[G] =>
   override def t: Type[G] = arg.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpRemImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpRemImpl.scala
index 0842e110a2..c3c3598368 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpRemImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpRemImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpRemOps
 
-trait SmtlibFpRemImpl[G] extends SmtlibFpRemOps[G] { this: SmtlibFpRem[G] =>
+trait SmtlibFpRemImpl[G] extends SmtlibFpRemOps[G] {
+  this: SmtlibFpRem[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpRoundToIntegralImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpRoundToIntegralImpl.scala
index 48230d724e..c9b42df03c 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpRoundToIntegralImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpRoundToIntegralImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpRoundToIntegralOps
 
-trait SmtlibFpRoundToIntegralImpl[G] extends SmtlibFpRoundToIntegralOps[G] { this: SmtlibFpRoundToIntegral[G] =>
+trait SmtlibFpRoundToIntegralImpl[G] extends SmtlibFpRoundToIntegralOps[G] {
+  this: SmtlibFpRoundToIntegral[G] =>
   override def t: Type[G] = arg.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpSqrtImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpSqrtImpl.scala
index d86891a3ab..ae83e4b18c 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpSqrtImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpSqrtImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpSqrtOps
 
-trait SmtlibFpSqrtImpl[G] extends SmtlibFpSqrtOps[G] { this: SmtlibFpSqrt[G] =>
+trait SmtlibFpSqrtImpl[G] extends SmtlibFpSqrtOps[G] {
+  this: SmtlibFpSqrt[G] =>
   override def t: Type[G] = arg.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpSubImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpSubImpl.scala
index 00962cb337..dfb5f35740 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpSubImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpSubImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpSubOps
 
-trait SmtlibFpSubImpl[G] extends SmtlibFpSubOps[G] { this: SmtlibFpSub[G] =>
+trait SmtlibFpSubImpl[G] extends SmtlibFpSubOps[G] {
+  this: SmtlibFpSub[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpToRealImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpToRealImpl.scala
index b7d535fd6b..d0d94f686a 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpToRealImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpToRealImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpToReal, TRational, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpToRealOps
 
-trait SmtlibFpToRealImpl[G] extends SmtlibFpToRealOps[G] { this: SmtlibFpToReal[G] =>
+trait SmtlibFpToRealImpl[G] extends SmtlibFpToRealOps[G] {
+  this: SmtlibFpToReal[G] =>
   override def t: Type[G] = TRational()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpToSIntImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpToSIntImpl.scala
index 7deaf7009b..2663b85156 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpToSIntImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpToSIntImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpToSInt, TSmtlibBitVector, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpToSIntOps
 
-trait SmtlibFpToSIntImpl[G] extends SmtlibFpToSIntOps[G] { this: SmtlibFpToSInt[G] =>
+trait SmtlibFpToSIntImpl[G] extends SmtlibFpToSIntOps[G] {
+  this: SmtlibFpToSInt[G] =>
   override def t: Type[G] = TSmtlibBitVector(bits)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFpToUIntImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFpToUIntImpl.scala
index 8ecb67f2b5..cda47c85d2 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFpToUIntImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFpToUIntImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibFpToUInt, TSmtlibBitVector, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibFpToUIntOps
 
-trait SmtlibFpToUIntImpl[G] extends SmtlibFpToUIntOps[G] { this: SmtlibFpToUInt[G] =>
+trait SmtlibFpToUIntImpl[G] extends SmtlibFpToUIntOps[G] {
+  this: SmtlibFpToUInt[G] =>
   override def t: Type[G] = TSmtlibBitVector(bits)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibFunctionSymbolImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibFunctionSymbolImpl.scala
index ebba4f185b..462fe728a1 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibFunctionSymbolImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibFunctionSymbolImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.{Applicable, SmtlibFunctionSymbol}
 import vct.col.ref.Ref
 import vct.col.ast.ops.SmtlibFunctionSymbolFamilyOps
 
-trait SmtlibFunctionSymbolImpl[G] extends SmtlibFunctionSymbolFamilyOps[G] { this: SmtlibFunctionSymbol[G] =>
+trait SmtlibFunctionSymbolImpl[G] extends SmtlibFunctionSymbolFamilyOps[G] {
+  this: SmtlibFunctionSymbol[G] =>
   def ref: Ref[G, _ <: Applicable[G]]
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibIsIntImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibIsIntImpl.scala
index 179c1ee50f..343f8ce562 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibIsIntImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibIsIntImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibIsInt, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibIsIntOps
 
-trait SmtlibIsIntImpl[G] extends SmtlibIsIntOps[G] { this: SmtlibIsInt[G] =>
+trait SmtlibIsIntImpl[G] extends SmtlibIsIntOps[G] {
+  this: SmtlibIsInt[G] =>
   override def t: Type[G] = TBool()
   override def layout(implicit ctx: Ctx): Doc = Text("is_int(") <> arg <> ")"
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibLiteralStringImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibLiteralStringImpl.scala
index bcbc510190..b77df1506d 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibLiteralStringImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibLiteralStringImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibLiteralString, TSmtlibString, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibLiteralStringOps
 
-trait SmtlibLiteralStringImpl[G] extends SmtlibLiteralStringOps[G] { this: SmtlibLiteralString[G] =>
+trait SmtlibLiteralStringImpl[G] extends SmtlibLiteralStringOps[G] {
+  this: SmtlibLiteralString[G] =>
   override def t: Type[G] = TSmtlibString()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibPowImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibPowImpl.scala
index b0a12cfe76..31dad2bfb2 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibPowImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibPowImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibPow, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibPowOps
 
-trait SmtlibPowImpl[G] extends SmtlibPowOps[G] { this: SmtlibPow[G] =>
+trait SmtlibPowImpl[G] extends SmtlibPowOps[G] {
+  this: SmtlibPow[G] =>
   override def precedence: Int = Precedence.PVL_POW
 
   override lazy val t: Type[G] = getNumericType
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibProverFunctionSymbolImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibProverFunctionSymbolImpl.scala
index 3fd196ce58..e1e61fb5e6 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibProverFunctionSymbolImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibProverFunctionSymbolImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.SmtlibProverFunctionSymbol
 import vct.col.ast.ops.SmtlibProverFunctionSymbolOps
 import vct.col.print._
 
-trait SmtlibProverFunctionSymbolImpl[G] extends SmtlibProverFunctionSymbolOps[G] { this: SmtlibProverFunctionSymbol[G] =>
+trait SmtlibProverFunctionSymbolImpl[G]
+    extends SmtlibProverFunctionSymbolOps[G] {
+  this: SmtlibProverFunctionSymbol[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibRNAImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibRNAImpl.scala
index 70c3f19dfb..8b1b1a4e90 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibRNAImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibRNAImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibRNA, TSmtlibRoundingMode, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibRNAOps
 
-trait SmtlibRNAImpl[G] extends SmtlibRNAOps[G] { this: SmtlibRNA[G] =>
+trait SmtlibRNAImpl[G] extends SmtlibRNAOps[G] {
+  this: SmtlibRNA[G] =>
   override def t: Type[G] = TSmtlibRoundingMode()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibRNEImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibRNEImpl.scala
index 52ed147b23..5b2dbe432d 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibRNEImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibRNEImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibRNE, TSmtlibRoundingMode, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibRNEOps
 
-trait SmtlibRNEImpl[G] extends SmtlibRNEOps[G] { this: SmtlibRNE[G] =>
+trait SmtlibRNEImpl[G] extends SmtlibRNEOps[G] {
+  this: SmtlibRNE[G] =>
   override def t: Type[G] = TSmtlibRoundingMode()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibRTNImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibRTNImpl.scala
index 6717f54a45..b7cd80c95d 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibRTNImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibRTNImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibRTN, TSmtlibRoundingMode, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibRTNOps
 
-trait SmtlibRTNImpl[G] extends SmtlibRTNOps[G] { this: SmtlibRTN[G] =>
+trait SmtlibRTNImpl[G] extends SmtlibRTNOps[G] {
+  this: SmtlibRTN[G] =>
   override def t: Type[G] = TSmtlibRoundingMode()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibRTPImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibRTPImpl.scala
index 65c521b9e3..12241d2112 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibRTPImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibRTPImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibRTP, TSmtlibRoundingMode, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibRTPOps
 
-trait SmtlibRTPImpl[G] extends SmtlibRTPOps[G] { this: SmtlibRTP[G] =>
+trait SmtlibRTPImpl[G] extends SmtlibRTPOps[G] {
+  this: SmtlibRTP[G] =>
   override def t: Type[G] = TSmtlibRoundingMode()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibRTZImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibRTZImpl.scala
index 3bedc05e7f..bffb043a56 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibRTZImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibRTZImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibRTZ, TSmtlibRoundingMode, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibRTZOps
 
-trait SmtlibRTZImpl[G] extends SmtlibRTZOps[G] { this: SmtlibRTZ[G] =>
+trait SmtlibRTZImpl[G] extends SmtlibRTZOps[G] {
+  this: SmtlibRTZ[G] =>
   override def t: Type[G] = TSmtlibRoundingMode()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReAllCharImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReAllCharImpl.scala
index 308207abfc..b9ba1c99cc 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReAllCharImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReAllCharImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReAllChar, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReAllCharOps
 
-trait SmtlibReAllCharImpl[G] extends SmtlibReAllCharOps[G] { this: SmtlibReAllChar[G] =>
+trait SmtlibReAllCharImpl[G] extends SmtlibReAllCharOps[G] {
+  this: SmtlibReAllChar[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReAllImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReAllImpl.scala
index d555050495..9926576972 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReAllImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReAllImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReAll, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReAllOps
 
-trait SmtlibReAllImpl[G] extends SmtlibReAllOps[G] { this: SmtlibReAll[G] =>
+trait SmtlibReAllImpl[G] extends SmtlibReAllOps[G] {
+  this: SmtlibReAll[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReCompImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReCompImpl.scala
index ebd899f9fa..0486ccadef 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReCompImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReCompImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReComp, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReCompOps
 
-trait SmtlibReCompImpl[G] extends SmtlibReCompOps[G] { this: SmtlibReComp[G] =>
+trait SmtlibReCompImpl[G] extends SmtlibReCompOps[G] {
+  this: SmtlibReComp[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReConcatImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReConcatImpl.scala
index bee281d9f9..4951ce0f7e 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReConcatImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReConcatImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReConcat, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReConcatOps
 
-trait SmtlibReConcatImpl[G] extends SmtlibReConcatOps[G] { this: SmtlibReConcat[G] =>
+trait SmtlibReConcatImpl[G] extends SmtlibReConcatOps[G] {
+  this: SmtlibReConcat[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReContainsImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReContainsImpl.scala
index 7af8850996..cc3b03ad55 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReContainsImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReContainsImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReContains, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReContainsOps
 
-trait SmtlibReContainsImpl[G] extends SmtlibReContainsOps[G] { this: SmtlibReContains[G] =>
+trait SmtlibReContainsImpl[G] extends SmtlibReContainsOps[G] {
+  this: SmtlibReContains[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReDiffImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReDiffImpl.scala
index c818ab46f3..3d229b3f5a 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReDiffImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReDiffImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReDiff, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReDiffOps
 
-trait SmtlibReDiffImpl[G] extends SmtlibReDiffOps[G] { this: SmtlibReDiff[G] =>
+trait SmtlibReDiffImpl[G] extends SmtlibReDiffOps[G] {
+  this: SmtlibReDiff[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReFromStrImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReFromStrImpl.scala
index 6d4420998a..17921483a7 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReFromStrImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReFromStrImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReFromStr, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReFromStrOps
 
-trait SmtlibReFromStrImpl[G] extends SmtlibReFromStrOps[G] { this: SmtlibReFromStr[G] =>
+trait SmtlibReFromStrImpl[G] extends SmtlibReFromStrOps[G] {
+  this: SmtlibReFromStr[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReInterImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReInterImpl.scala
index ab7cfb966f..526940041b 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReInterImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReInterImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReInter, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReInterOps
 
-trait SmtlibReInterImpl[G] extends SmtlibReInterOps[G] { this: SmtlibReInter[G] =>
+trait SmtlibReInterImpl[G] extends SmtlibReInterOps[G] {
+  this: SmtlibReInter[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReNoneImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReNoneImpl.scala
index 471c7835e3..50304c1749 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReNoneImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReNoneImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReNone, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReNoneOps
 
-trait SmtlibReNoneImpl[G] extends SmtlibReNoneOps[G] { this: SmtlibReNone[G] =>
+trait SmtlibReNoneImpl[G] extends SmtlibReNoneOps[G] {
+  this: SmtlibReNone[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReOptImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReOptImpl.scala
index f287bd4e0d..40499bf34e 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReOptImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReOptImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReOpt, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReOptOps
 
-trait SmtlibReOptImpl[G] extends SmtlibReOptOps[G] { this: SmtlibReOpt[G] =>
+trait SmtlibReOptImpl[G] extends SmtlibReOptOps[G] {
+  this: SmtlibReOpt[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibRePlusImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibRePlusImpl.scala
index b60a8e8c4d..ad95f45264 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibRePlusImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibRePlusImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibRePlus, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibRePlusOps
 
-trait SmtlibRePlusImpl[G] extends SmtlibRePlusOps[G] { this: SmtlibRePlus[G] =>
+trait SmtlibRePlusImpl[G] extends SmtlibRePlusOps[G] {
+  this: SmtlibRePlus[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReRangeImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReRangeImpl.scala
index 505442efcd..8d2d9ed3d9 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReRangeImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReRangeImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReRange, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReRangeOps
 
-trait SmtlibReRangeImpl[G] extends SmtlibReRangeOps[G] { this: SmtlibReRange[G] =>
+trait SmtlibReRangeImpl[G] extends SmtlibReRangeOps[G] {
+  this: SmtlibReRange[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReRepeatImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReRepeatImpl.scala
index f428b5d293..886959c6c8 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReRepeatImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReRepeatImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReRepeat, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReRepeatOps
 
-trait SmtlibReRepeatImpl[G] extends SmtlibReRepeatOps[G] { this: SmtlibReRepeat[G] =>
+trait SmtlibReRepeatImpl[G] extends SmtlibReRepeatOps[G] {
+  this: SmtlibReRepeat[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReRepeatRangeImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReRepeatRangeImpl.scala
index 9d6115a116..3c4da64e14 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReRepeatRangeImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReRepeatRangeImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReRepeatRange, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReRepeatRangeOps
 
-trait SmtlibReRepeatRangeImpl[G] extends SmtlibReRepeatRangeOps[G] { this: SmtlibReRepeatRange[G] =>
+trait SmtlibReRepeatRangeImpl[G] extends SmtlibReRepeatRangeOps[G] {
+  this: SmtlibReRepeatRange[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReStarImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReStarImpl.scala
index 7e7d91982f..c62c2e9a42 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReStarImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReStarImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReStar, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReStarOps
 
-trait SmtlibReStarImpl[G] extends SmtlibReStarOps[G] { this: SmtlibReStar[G] =>
+trait SmtlibReStarImpl[G] extends SmtlibReStarOps[G] {
+  this: SmtlibReStar[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibReUnionImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibReUnionImpl.scala
index ff5974508f..a9c7f3820e 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibReUnionImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibReUnionImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibReUnion, TSmtlibRegLan, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibReUnionOps
 
-trait SmtlibReUnionImpl[G] extends SmtlibReUnionOps[G] { this: SmtlibReUnion[G] =>
+trait SmtlibReUnionImpl[G] extends SmtlibReUnionOps[G] {
+  this: SmtlibReUnion[G] =>
   override def t: Type[G] = TSmtlibRegLan()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibSelectImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibSelectImpl.scala
index 83b50cd51a..75f0fceab0 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibSelectImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibSelectImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibSelectOps
 
-trait SmtlibSelectImpl[G] extends SmtlibSelectOps[G] { this: SmtlibSelect[G] =>
+trait SmtlibSelectImpl[G] extends SmtlibSelectOps[G] {
+  this: SmtlibSelect[G] =>
   override def t: Type[G] = arr.t.asSmtlibArray.get.value
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStoreImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStoreImpl.scala
index 8f54a35802..44c0800503 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStoreImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStoreImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStoreOps
 
-trait SmtlibStoreImpl[G] extends SmtlibStoreOps[G] { this: SmtlibStore[G] =>
+trait SmtlibStoreImpl[G] extends SmtlibStoreOps[G] {
+  this: SmtlibStore[G] =>
   override def t: Type[G] = arr.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrAtImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrAtImpl.scala
index f1991db2b5..f7514a40d8 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrAtImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrAtImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrAt, TSmtlibString, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrAtOps
 
-trait SmtlibStrAtImpl[G] extends SmtlibStrAtOps[G] { this: SmtlibStrAt[G] =>
+trait SmtlibStrAtImpl[G] extends SmtlibStrAtOps[G] {
+  this: SmtlibStrAt[G] =>
   override def t: Type[G] = TSmtlibString()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrConcatImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrConcatImpl.scala
index a04bc82e6d..b270ad8091 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrConcatImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrConcatImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrConcat, TSmtlibString, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrConcatOps
 
-trait SmtlibStrConcatImpl[G] extends SmtlibStrConcatOps[G] { this: SmtlibStrConcat[G] =>
+trait SmtlibStrConcatImpl[G] extends SmtlibStrConcatOps[G] {
+  this: SmtlibStrConcat[G] =>
   override def t: Type[G] = TSmtlibString()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrContainsImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrContainsImpl.scala
index b3d19c0551..224c6f3feb 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrContainsImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrContainsImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrContains, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrContainsOps
 
-trait SmtlibStrContainsImpl[G] extends SmtlibStrContainsOps[G] { this: SmtlibStrContains[G] =>
+trait SmtlibStrContainsImpl[G] extends SmtlibStrContainsOps[G] {
+  this: SmtlibStrContains[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrFromCodeImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrFromCodeImpl.scala
index e553b3b079..50002eef64 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrFromCodeImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrFromCodeImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrFromCode, TSmtlibString, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrFromCodeOps
 
-trait SmtlibStrFromCodeImpl[G] extends SmtlibStrFromCodeOps[G] { this: SmtlibStrFromCode[G] =>
+trait SmtlibStrFromCodeImpl[G] extends SmtlibStrFromCodeOps[G] {
+  this: SmtlibStrFromCode[G] =>
   override def t: Type[G] = TSmtlibString()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrFromIntImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrFromIntImpl.scala
index 5bbf87df7a..10dae3f1a3 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrFromIntImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrFromIntImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrFromInt, TSmtlibString, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrFromIntOps
 
-trait SmtlibStrFromIntImpl[G] extends SmtlibStrFromIntOps[G] { this: SmtlibStrFromInt[G] =>
+trait SmtlibStrFromIntImpl[G] extends SmtlibStrFromIntOps[G] {
+  this: SmtlibStrFromInt[G] =>
   override def t: Type[G] = TSmtlibString()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrIndexOfImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrIndexOfImpl.scala
index 4d15aa26d1..a4eabc5594 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrIndexOfImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrIndexOfImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrIndexOf, TInt, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrIndexOfOps
 
-trait SmtlibStrIndexOfImpl[G] extends SmtlibStrIndexOfOps[G] { this: SmtlibStrIndexOf[G] =>
+trait SmtlibStrIndexOfImpl[G] extends SmtlibStrIndexOfOps[G] {
+  this: SmtlibStrIndexOf[G] =>
   override def t: Type[G] = TInt()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrIsDigitImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrIsDigitImpl.scala
index daedf8b97e..1a21d22335 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrIsDigitImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrIsDigitImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrIsDigit, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrIsDigitOps
 
-trait SmtlibStrIsDigitImpl[G] extends SmtlibStrIsDigitOps[G] { this: SmtlibStrIsDigit[G] =>
+trait SmtlibStrIsDigitImpl[G] extends SmtlibStrIsDigitOps[G] {
+  this: SmtlibStrIsDigit[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrLenImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrLenImpl.scala
index 968acc565d..e43a1c6bc0 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrLenImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrLenImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrLen, TInt, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrLenOps
 
-trait SmtlibStrLenImpl[G] extends SmtlibStrLenOps[G] { this: SmtlibStrLen[G] =>
+trait SmtlibStrLenImpl[G] extends SmtlibStrLenOps[G] {
+  this: SmtlibStrLen[G] =>
   override def t: Type[G] = TInt()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrLeqImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrLeqImpl.scala
index e15b532f2e..3dd00f0804 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrLeqImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrLeqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrLeq, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrLeqOps
 
-trait SmtlibStrLeqImpl[G] extends SmtlibStrLeqOps[G] { this: SmtlibStrLeq[G] =>
+trait SmtlibStrLeqImpl[G] extends SmtlibStrLeqOps[G] {
+  this: SmtlibStrLeq[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrLtImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrLtImpl.scala
index 3de93a5e65..566067c062 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrLtImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrLtImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrLt, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrLtOps
 
-trait SmtlibStrLtImpl[G] extends SmtlibStrLtOps[G] { this: SmtlibStrLt[G] =>
+trait SmtlibStrLtImpl[G] extends SmtlibStrLtOps[G] {
+  this: SmtlibStrLt[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrPrefixOfImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrPrefixOfImpl.scala
index bd4ed657fa..bcbf54e9f2 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrPrefixOfImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrPrefixOfImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrPrefixOf, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrPrefixOfOps
 
-trait SmtlibStrPrefixOfImpl[G] extends SmtlibStrPrefixOfOps[G] { this: SmtlibStrPrefixOf[G] =>
+trait SmtlibStrPrefixOfImpl[G] extends SmtlibStrPrefixOfOps[G] {
+  this: SmtlibStrPrefixOf[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceAllImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceAllImpl.scala
index 7f0a9225a0..bbae08ff06 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceAllImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceAllImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrReplaceAll, TSmtlibString, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrReplaceAllOps
 
-trait SmtlibStrReplaceAllImpl[G] extends SmtlibStrReplaceAllOps[G] { this: SmtlibStrReplaceAll[G] =>
+trait SmtlibStrReplaceAllImpl[G] extends SmtlibStrReplaceAllOps[G] {
+  this: SmtlibStrReplaceAll[G] =>
   override def t: Type[G] = TSmtlibString()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceImpl.scala
index fddf02307f..d87923ea09 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrReplace, TSmtlibString, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrReplaceOps
 
-trait SmtlibStrReplaceImpl[G] extends SmtlibStrReplaceOps[G] { this: SmtlibStrReplace[G] =>
+trait SmtlibStrReplaceImpl[G] extends SmtlibStrReplaceOps[G] {
+  this: SmtlibStrReplace[G] =>
   override def t: Type[G] = TSmtlibString()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceReAllImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceReAllImpl.scala
index 8eb2a32489..59c5aa23fc 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceReAllImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceReAllImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrReplaceReAll, TSmtlibString, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrReplaceReAllOps
 
-trait SmtlibStrReplaceReAllImpl[G] extends SmtlibStrReplaceReAllOps[G] { this: SmtlibStrReplaceReAll[G] =>
+trait SmtlibStrReplaceReAllImpl[G] extends SmtlibStrReplaceReAllOps[G] {
+  this: SmtlibStrReplaceReAll[G] =>
   override def t: Type[G] = TSmtlibString()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceReImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceReImpl.scala
index 0bf6f4bef4..38425fa292 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceReImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrReplaceReImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrReplaceRe, TSmtlibString, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrReplaceReOps
 
-trait SmtlibStrReplaceReImpl[G] extends SmtlibStrReplaceReOps[G] { this: SmtlibStrReplaceRe[G] =>
+trait SmtlibStrReplaceReImpl[G] extends SmtlibStrReplaceReOps[G] {
+  this: SmtlibStrReplaceRe[G] =>
   override def t: Type[G] = TSmtlibString()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrSuffixOfImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrSuffixOfImpl.scala
index 53a6dfde16..7fbe3772d8 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrSuffixOfImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrSuffixOfImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrSuffixOf, TBool, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrSuffixOfOps
 
-trait SmtlibStrSuffixOfImpl[G] extends SmtlibStrSuffixOfOps[G] { this: SmtlibStrSuffixOf[G] =>
+trait SmtlibStrSuffixOfImpl[G] extends SmtlibStrSuffixOfOps[G] {
+  this: SmtlibStrSuffixOf[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrToCodeImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrToCodeImpl.scala
index 80d11a6441..8dac30d758 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrToCodeImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrToCodeImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibStrToCode, TInt, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrToCodeOps
 
-trait SmtlibStrToCodeImpl[G] extends SmtlibStrToCodeOps[G] { this: SmtlibStrToCode[G] =>
+trait SmtlibStrToCodeImpl[G] extends SmtlibStrToCodeOps[G] {
+  this: SmtlibStrToCode[G] =>
   override def t: Type[G] = TInt()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibStrToIntImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibStrToIntImpl.scala
index 12dbb69267..ccf9266af4 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibStrToIntImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibStrToIntImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.{Type, TInt}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibStrToIntOps
 
-trait SmtlibStrToIntImpl[G] extends SmtlibStrToIntOps[G] { this: SmtlibStrToInt[G] =>
+trait SmtlibStrToIntImpl[G] extends SmtlibStrToIntOps[G] {
+  this: SmtlibStrToInt[G] =>
   override def t: Type[G] = TInt()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibSubstrImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibSubstrImpl.scala
index bb5eaf1d75..f36cea7d13 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibSubstrImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibSubstrImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibSubstr, TSmtlibString, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibSubstrOps
 
-trait SmtlibSubstrImpl[G] extends SmtlibSubstrOps[G] { this: SmtlibSubstr[G] =>
+trait SmtlibSubstrImpl[G] extends SmtlibSubstrOps[G] {
+  this: SmtlibSubstr[G] =>
   override def t: Type[G] = TSmtlibString()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibToFpImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibToFpImpl.scala
index 111e763c8d..3947fa2284 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibToFpImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibToFpImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.{SmtlibToFp, TSmtlibFloatingPoint, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibToFpOps
 
-trait SmtlibToFpImpl[G] extends SmtlibToFpOps[G] { this: SmtlibToFp[G] =>
-  override def t: Type[G] = TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits)
+trait SmtlibToFpImpl[G] extends SmtlibToFpOps[G] {
+  this: SmtlibToFp[G] =>
+  override def t: Type[G] =
+    TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibToIntImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibToIntImpl.scala
index bf99a541cb..f18ed68b52 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibToIntImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibToIntImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibToInt, TInt, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibToIntOps
 
-trait SmtlibToIntImpl[G] extends SmtlibToIntOps[G] { this: SmtlibToInt[G] =>
+trait SmtlibToIntImpl[G] extends SmtlibToIntOps[G] {
+  this: SmtlibToInt[G] =>
   override def t: Type[G] = TInt()
   override def layout(implicit ctx: Ctx): Doc = Text("to_int(") <> arg <> ")"
 }
diff --git a/src/col/vct/col/ast/lang/smt/SmtlibToRealImpl.scala b/src/col/vct/col/ast/lang/smt/SmtlibToRealImpl.scala
index 8e02765b95..f8aafb590b 100644
--- a/src/col/vct/col/ast/lang/smt/SmtlibToRealImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/SmtlibToRealImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{SmtlibToReal, TRational, Type}
 import vct.col.print._
 import vct.col.ast.ops.SmtlibToRealOps
 
-trait SmtlibToRealImpl[G] extends SmtlibToRealOps[G] { this: SmtlibToReal[G] =>
+trait SmtlibToRealImpl[G] extends SmtlibToRealOps[G] {
+  this: SmtlibToReal[G] =>
   override def t: Type[G] = TRational()
   override def layout(implicit ctx: Ctx): Doc = Text("to_real(") <> arg <> ")"
 }
diff --git a/src/col/vct/col/ast/lang/smt/TSmtlibArrayImpl.scala b/src/col/vct/col/ast/lang/smt/TSmtlibArrayImpl.scala
index 33ac7a3f18..f8dbec2cda 100644
--- a/src/col/vct/col/ast/lang/smt/TSmtlibArrayImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/TSmtlibArrayImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TSmtlibArray
 import vct.col.ast.ops.TSmtlibArrayOps
 import vct.col.print._
 
-trait TSmtlibArrayImpl[G] extends TSmtlibArrayOps[G] { this: TSmtlibArray[G] =>
+trait TSmtlibArrayImpl[G] extends TSmtlibArrayOps[G] {
+  this: TSmtlibArray[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/TSmtlibBitVectorImpl.scala b/src/col/vct/col/ast/lang/smt/TSmtlibBitVectorImpl.scala
index 9fafadef78..4fc8c45292 100644
--- a/src/col/vct/col/ast/lang/smt/TSmtlibBitVectorImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/TSmtlibBitVectorImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TSmtlibBitVector
 import vct.col.ast.ops.TSmtlibBitVectorOps
 import vct.col.print._
 
-trait TSmtlibBitVectorImpl[G] extends TSmtlibBitVectorOps[G] { this: TSmtlibBitVector[G] =>
+trait TSmtlibBitVectorImpl[G] extends TSmtlibBitVectorOps[G] {
+  this: TSmtlibBitVector[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/TSmtlibFloatingPointImpl.scala b/src/col/vct/col/ast/lang/smt/TSmtlibFloatingPointImpl.scala
index 35b8158d9d..5f4e4e9ac0 100644
--- a/src/col/vct/col/ast/lang/smt/TSmtlibFloatingPointImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/TSmtlibFloatingPointImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TSmtlibFloatingPoint
 import vct.col.ast.ops.TSmtlibFloatingPointOps
 import vct.col.print._
 
-trait TSmtlibFloatingPointImpl[G] extends TSmtlibFloatingPointOps[G] { this: TSmtlibFloatingPoint[G] =>
+trait TSmtlibFloatingPointImpl[G] extends TSmtlibFloatingPointOps[G] {
+  this: TSmtlibFloatingPoint[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/TSmtlibRegLanImpl.scala b/src/col/vct/col/ast/lang/smt/TSmtlibRegLanImpl.scala
index c2c3de3e7b..4c68ee9b48 100644
--- a/src/col/vct/col/ast/lang/smt/TSmtlibRegLanImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/TSmtlibRegLanImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TSmtlibRegLan
 import vct.col.ast.ops.TSmtlibRegLanOps
 import vct.col.print._
 
-trait TSmtlibRegLanImpl[G] extends TSmtlibRegLanOps[G] { this: TSmtlibRegLan[G] =>
+trait TSmtlibRegLanImpl[G] extends TSmtlibRegLanOps[G] {
+  this: TSmtlibRegLan[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/TSmtlibRoundingModeImpl.scala b/src/col/vct/col/ast/lang/smt/TSmtlibRoundingModeImpl.scala
index 5051b74c8c..3bf54350a1 100644
--- a/src/col/vct/col/ast/lang/smt/TSmtlibRoundingModeImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/TSmtlibRoundingModeImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TSmtlibRoundingMode
 import vct.col.ast.ops.TSmtlibRoundingModeOps
 import vct.col.print._
 
-trait TSmtlibRoundingModeImpl[G] extends TSmtlibRoundingModeOps[G] { this: TSmtlibRoundingMode[G] =>
+trait TSmtlibRoundingModeImpl[G] extends TSmtlibRoundingModeOps[G] {
+  this: TSmtlibRoundingMode[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/TSmtlibSeqImpl.scala b/src/col/vct/col/ast/lang/smt/TSmtlibSeqImpl.scala
index faac536c46..4be7e7cea4 100644
--- a/src/col/vct/col/ast/lang/smt/TSmtlibSeqImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/TSmtlibSeqImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TSmtlibSeq
 import vct.col.ast.ops.TSmtlibSeqOps
 import vct.col.print._
 
-trait TSmtlibSeqImpl[G] extends TSmtlibSeqOps[G] { this: TSmtlibSeq[G] =>
+trait TSmtlibSeqImpl[G] extends TSmtlibSeqOps[G] {
+  this: TSmtlibSeq[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/TSmtlibStringImpl.scala b/src/col/vct/col/ast/lang/smt/TSmtlibStringImpl.scala
index 36645dc1f3..e868566b60 100644
--- a/src/col/vct/col/ast/lang/smt/TSmtlibStringImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/TSmtlibStringImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TSmtlibString
 import vct.col.ast.ops.TSmtlibStringOps
 import vct.col.print._
 
-trait TSmtlibStringImpl[G] extends TSmtlibStringOps[G] { this: TSmtlibString[G] =>
+trait TSmtlibStringImpl[G] extends TSmtlibStringOps[G] {
+  this: TSmtlibString[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3ArrayConstImpl.scala b/src/col/vct/col/ast/lang/smt/Z3ArrayConstImpl.scala
index c0fb668076..bd9e54a46b 100644
--- a/src/col/vct/col/ast/lang/smt/Z3ArrayConstImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3ArrayConstImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TSmtlibArray, Type, Z3ArrayConst}
 import vct.col.print._
 import vct.col.ast.ops.Z3ArrayConstOps
 
-trait Z3ArrayConstImpl[G] extends Z3ArrayConstOps[G] { this: Z3ArrayConst[G] =>
+trait Z3ArrayConstImpl[G] extends Z3ArrayConstOps[G] {
+  this: Z3ArrayConst[G] =>
   override def t: Type[G] = TSmtlibArray(domain, codomain)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3ArrayMapImpl.scala b/src/col/vct/col/ast/lang/smt/Z3ArrayMapImpl.scala
index 4624312a8f..e90f037aa5 100644
--- a/src/col/vct/col/ast/lang/smt/Z3ArrayMapImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3ArrayMapImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3ArrayMapOps
 
-trait Z3ArrayMapImpl[G] extends Z3ArrayMapOps[G] { this: Z3ArrayMap[G] =>
+trait Z3ArrayMapImpl[G] extends Z3ArrayMapOps[G] {
+  this: Z3ArrayMap[G] =>
   override def t: Type[G] = ref.ref.decl.returnType
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3ArrayOfFunctionImpl.scala b/src/col/vct/col/ast/lang/smt/Z3ArrayOfFunctionImpl.scala
index 9a256f4835..ee6e56e64f 100644
--- a/src/col/vct/col/ast/lang/smt/Z3ArrayOfFunctionImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3ArrayOfFunctionImpl.scala
@@ -4,7 +4,11 @@ import vct.col.ast.{TSmtlibArray, Type, Z3ArrayOfFunction}
 import vct.col.print._
 import vct.col.ast.ops.Z3ArrayOfFunctionOps
 
-trait Z3ArrayOfFunctionImpl[G] extends Z3ArrayOfFunctionOps[G] { this: Z3ArrayOfFunction[G] =>
-  override lazy val t: Type[G] = TSmtlibArray(ref.ref.decl.args.map(_.t), ref.ref.decl.returnType)
+trait Z3ArrayOfFunctionImpl[G] extends Z3ArrayOfFunctionOps[G] {
+  this: Z3ArrayOfFunction[G] =>
+  override lazy val t: Type[G] = TSmtlibArray(
+    ref.ref.decl.args.map(_.t),
+    ref.ref.decl.returnType,
+  )
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3BvNandImpl.scala b/src/col/vct/col/ast/lang/smt/Z3BvNandImpl.scala
index 6e62806c44..c622f3c35f 100644
--- a/src/col/vct/col/ast/lang/smt/Z3BvNandImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3BvNandImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3BvNandOps
 
-trait Z3BvNandImpl[G] extends Z3BvNandOps[G] { this: Z3BvNand[G] =>
+trait Z3BvNandImpl[G] extends Z3BvNandOps[G] {
+  this: Z3BvNand[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3BvNorImpl.scala b/src/col/vct/col/ast/lang/smt/Z3BvNorImpl.scala
index 511f522c41..bc7cf660bb 100644
--- a/src/col/vct/col/ast/lang/smt/Z3BvNorImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3BvNorImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3BvNorOps
 
-trait Z3BvNorImpl[G] extends Z3BvNorOps[G] { this: Z3BvNor[G] =>
+trait Z3BvNorImpl[G] extends Z3BvNorOps[G] {
+  this: Z3BvNor[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3BvSModImpl.scala b/src/col/vct/col/ast/lang/smt/Z3BvSModImpl.scala
index 22b54b5633..60b27dc0a4 100644
--- a/src/col/vct/col/ast/lang/smt/Z3BvSModImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3BvSModImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3BvSModOps
 
-trait Z3BvSModImpl[G] extends Z3BvSModOps[G] { this: Z3BvSMod[G] =>
+trait Z3BvSModImpl[G] extends Z3BvSModOps[G] {
+  this: Z3BvSMod[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3BvSRemImpl.scala b/src/col/vct/col/ast/lang/smt/Z3BvSRemImpl.scala
index 79dbb81cd0..ba0453830f 100644
--- a/src/col/vct/col/ast/lang/smt/Z3BvSRemImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3BvSRemImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3BvSRemOps
 
-trait Z3BvSRemImpl[G] extends Z3BvSRemOps[G] { this: Z3BvSRem[G] =>
+trait Z3BvSRemImpl[G] extends Z3BvSRemOps[G] {
+  this: Z3BvSRem[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3BvSShrImpl.scala b/src/col/vct/col/ast/lang/smt/Z3BvSShrImpl.scala
index 36467ca26d..04210e2563 100644
--- a/src/col/vct/col/ast/lang/smt/Z3BvSShrImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3BvSShrImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3BvSShrOps
 
-trait Z3BvSShrImpl[G] extends Z3BvSShrOps[G] { this: Z3BvSShr[G] =>
+trait Z3BvSShrImpl[G] extends Z3BvSShrOps[G] {
+  this: Z3BvSShr[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3BvSubImpl.scala b/src/col/vct/col/ast/lang/smt/Z3BvSubImpl.scala
index 5daf591568..8349e9365c 100644
--- a/src/col/vct/col/ast/lang/smt/Z3BvSubImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3BvSubImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3BvSubOps
 
-trait Z3BvSubImpl[G] extends Z3BvSubOps[G] { this: Z3BvSub[G] =>
+trait Z3BvSubImpl[G] extends Z3BvSubOps[G] {
+  this: Z3BvSub[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3BvXnorImpl.scala b/src/col/vct/col/ast/lang/smt/Z3BvXnorImpl.scala
index 384131c379..72142cda0c 100644
--- a/src/col/vct/col/ast/lang/smt/Z3BvXnorImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3BvXnorImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3BvXnorOps
 
-trait Z3BvXnorImpl[G] extends Z3BvXnorOps[G] { this: Z3BvXnor[G] =>
+trait Z3BvXnorImpl[G] extends Z3BvXnorOps[G] {
+  this: Z3BvXnor[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqAtImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqAtImpl.scala
index b252bd8e72..4fe35604f5 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqAtImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqAtImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqAtOps
 
-trait Z3SeqAtImpl[G] extends Z3SeqAtOps[G] { this: Z3SeqAt[G] =>
+trait Z3SeqAtImpl[G] extends Z3SeqAtOps[G] {
+  this: Z3SeqAt[G] =>
   override def t: Type[G] = seq.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqConcatImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqConcatImpl.scala
index 87f123bc41..c0322511a3 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqConcatImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqConcatImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqConcatOps
 
-trait Z3SeqConcatImpl[G] extends Z3SeqConcatOps[G] { this: Z3SeqConcat[G] =>
+trait Z3SeqConcatImpl[G] extends Z3SeqConcatOps[G] {
+  this: Z3SeqConcat[G] =>
   override def t: Type[G] = left.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqContainsImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqContainsImpl.scala
index 9c36c4e87d..3a545ee06e 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqContainsImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqContainsImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TBool, Type, Z3SeqContains}
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqContainsOps
 
-trait Z3SeqContainsImpl[G] extends Z3SeqContainsOps[G] { this: Z3SeqContains[G] =>
+trait Z3SeqContainsImpl[G] extends Z3SeqContainsOps[G] {
+  this: Z3SeqContains[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqEmptyImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqEmptyImpl.scala
index 30ef9b6ef1..cc4f84476a 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqEmptyImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqEmptyImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TSmtlibSeq, Type, Z3SeqEmpty}
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqEmptyOps
 
-trait Z3SeqEmptyImpl[G] extends Z3SeqEmptyOps[G] { this: Z3SeqEmpty[G] =>
+trait Z3SeqEmptyImpl[G] extends Z3SeqEmptyOps[G] {
+  this: Z3SeqEmpty[G] =>
   override def t: Type[G] = TSmtlibSeq(elementType)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqExtractImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqExtractImpl.scala
index 85e8e41ed8..ef5563c3a0 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqExtractImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqExtractImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqExtractOps
 
-trait Z3SeqExtractImpl[G] extends Z3SeqExtractOps[G] { this: Z3SeqExtract[G] =>
+trait Z3SeqExtractImpl[G] extends Z3SeqExtractOps[G] {
+  this: Z3SeqExtract[G] =>
   override def t: Type[G] = seq.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqFoldlIImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqFoldlIImpl.scala
index 27661e959b..84457e5c7a 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqFoldlIImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqFoldlIImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqFoldlIOps
 
-trait Z3SeqFoldlIImpl[G] extends Z3SeqFoldlIOps[G] { this: Z3SeqFoldlI[G] =>
+trait Z3SeqFoldlIImpl[G] extends Z3SeqFoldlIOps[G] {
+  this: Z3SeqFoldlI[G] =>
   override def t: Type[G] = seq.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqFoldlImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqFoldlImpl.scala
index e0a63a1b77..5cb5eb5d74 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqFoldlImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqFoldlImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqFoldlOps
 
-trait Z3SeqFoldlImpl[G] extends Z3SeqFoldlOps[G] { this: Z3SeqFoldl[G] =>
+trait Z3SeqFoldlImpl[G] extends Z3SeqFoldlOps[G] {
+  this: Z3SeqFoldl[G] =>
   override def t: Type[G] = seq.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqLenImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqLenImpl.scala
index 4e670b6304..adfdbf2241 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqLenImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqLenImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TInt, Type, Z3SeqLen}
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqLenOps
 
-trait Z3SeqLenImpl[G] extends Z3SeqLenOps[G] { this: Z3SeqLen[G] =>
+trait Z3SeqLenImpl[G] extends Z3SeqLenOps[G] {
+  this: Z3SeqLen[G] =>
   override def t: Type[G] = TInt()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqMapIImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqMapIImpl.scala
index eb1cd0c5e0..5d48bf25a0 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqMapIImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqMapIImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TSmtlibSeq, Type, Z3SeqMapI}
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqMapIOps
 
-trait Z3SeqMapIImpl[G] extends Z3SeqMapIOps[G] { this: Z3SeqMapI[G] =>
+trait Z3SeqMapIImpl[G] extends Z3SeqMapIOps[G] {
+  this: Z3SeqMapI[G] =>
   override lazy val t: Type[G] = TSmtlibSeq(f.t.asSmtlibArray.get.value)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqMapImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqMapImpl.scala
index 4274da73d8..e9877258bb 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqMapImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqMapImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TSmtlibSeq, Type, Z3SeqMap}
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqMapOps
 
-trait Z3SeqMapImpl[G] extends Z3SeqMapOps[G] { this: Z3SeqMap[G] =>
+trait Z3SeqMapImpl[G] extends Z3SeqMapOps[G] {
+  this: Z3SeqMap[G] =>
   override def t: Type[G] = TSmtlibSeq(f.t.asSmtlibArray.get.value)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqNthImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqNthImpl.scala
index e478089613..36182f47dd 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqNthImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqNthImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqNthOps
 
-trait Z3SeqNthImpl[G] extends Z3SeqNthOps[G] { this: Z3SeqNth[G] =>
+trait Z3SeqNthImpl[G] extends Z3SeqNthOps[G] {
+  this: Z3SeqNth[G] =>
   override def t: Type[G] = seq.t.asSmtlibSeq.get.element
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqPrefixOfImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqPrefixOfImpl.scala
index 55b2b0dfbb..a518aca7a3 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqPrefixOfImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqPrefixOfImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TBool, Type, Z3SeqPrefixOf}
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqPrefixOfOps
 
-trait Z3SeqPrefixOfImpl[G] extends Z3SeqPrefixOfOps[G] { this: Z3SeqPrefixOf[G] =>
+trait Z3SeqPrefixOfImpl[G] extends Z3SeqPrefixOfOps[G] {
+  this: Z3SeqPrefixOf[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqReplaceImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqReplaceImpl.scala
index bc784052a1..319705a9be 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqReplaceImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqReplaceImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.Type
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqReplaceOps
 
-trait Z3SeqReplaceImpl[G] extends Z3SeqReplaceOps[G] { this: Z3SeqReplace[G] =>
+trait Z3SeqReplaceImpl[G] extends Z3SeqReplaceOps[G] {
+  this: Z3SeqReplace[G] =>
   override def t: Type[G] = haystack.t
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqSuffixOfImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqSuffixOfImpl.scala
index c5816d50a7..478e0839c9 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqSuffixOfImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqSuffixOfImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TBool, Type, Z3SeqSuffixOf}
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqSuffixOfOps
 
-trait Z3SeqSuffixOfImpl[G] extends Z3SeqSuffixOfOps[G] { this: Z3SeqSuffixOf[G] =>
+trait Z3SeqSuffixOfImpl[G] extends Z3SeqSuffixOfOps[G] {
+  this: Z3SeqSuffixOf[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3SeqUnitImpl.scala b/src/col/vct/col/ast/lang/smt/Z3SeqUnitImpl.scala
index dc9728dc2b..65960fa57e 100644
--- a/src/col/vct/col/ast/lang/smt/Z3SeqUnitImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3SeqUnitImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TSmtlibSeq, Type, Z3SeqUnit}
 import vct.col.print._
 import vct.col.ast.ops.Z3SeqUnitOps
 
-trait Z3SeqUnitImpl[G] extends Z3SeqUnitOps[G] { this: Z3SeqUnit[G] =>
+trait Z3SeqUnitImpl[G] extends Z3SeqUnitOps[G] {
+  this: Z3SeqUnit[G] =>
   override def t: Type[G] = TSmtlibSeq(arg.t)
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/smt/Z3TransitiveClosureImpl.scala b/src/col/vct/col/ast/lang/smt/Z3TransitiveClosureImpl.scala
index 8c44ff71c8..ec06560196 100644
--- a/src/col/vct/col/ast/lang/smt/Z3TransitiveClosureImpl.scala
+++ b/src/col/vct/col/ast/lang/smt/Z3TransitiveClosureImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{TBool, Type, Z3TransitiveClosure}
 import vct.col.print._
 import vct.col.ast.ops.Z3TransitiveClosureOps
 
-trait Z3TransitiveClosureImpl[G] extends Z3TransitiveClosureOps[G] { this: Z3TransitiveClosure[G] =>
+trait Z3TransitiveClosureImpl[G] extends Z3TransitiveClosureOps[G] {
+  this: Z3TransitiveClosure[G] =>
   override def t: Type[G] = TBool()
   // def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLAccessModeImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLAccessModeImpl.scala
index 60deaab288..3243d56bb0 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLAccessModeImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLAccessModeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.sycl
 
 import vct.col.ast.SYCLAccessMode
 
-trait SYCLAccessModeImpl[G] { this: SYCLAccessMode[G] =>
+trait SYCLAccessModeImpl[G] {
+  this: SYCLAccessMode[G] =>
   val name: String
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLClassDefNameImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLClassDefNameImpl.scala
index a4c8e64135..106b82a655 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLClassDefNameImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLClassDefNameImpl.scala
@@ -4,8 +4,14 @@ import vct.col.ast.SYCLClassDefName
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.SYCLClassDefNameOps
 
-trait SYCLClassDefNameImpl[G] extends SYCLClassDefNameOps[G] { this: SYCLClassDefName[G] =>
+trait SYCLClassDefNameImpl[G] extends SYCLClassDefNameOps[G] {
+  this: SYCLClassDefName[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text(name) <>
-      (if (genericArgs.nonEmpty) (Text("<") <> Doc.args(genericArgs) <> Text(">")) else Text("")))
-}
\ No newline at end of file
+    Group(
+      Text(name) <>
+        (if (genericArgs.nonEmpty)
+           (Text("<") <> Doc.args(genericArgs) <> Text(">"))
+         else
+           Text(""))
+    )
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLNDRangeImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLNDRangeImpl.scala
index 9b6df10ad3..d2636a936d 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLNDRangeImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLNDRangeImpl.scala
@@ -4,13 +4,18 @@ import vct.col.ast.{SYCLNDRange, SYCLTNDRange, SYCLTRange, Type}
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.SYCLNDRangeOps
 
-trait SYCLNDRangeImpl[G] extends SYCLNDRangeOps[G] { this: SYCLNDRange[G] =>
-  override def t: Type[G] = globalSize.t match {
-    case SYCLTRange(dimCount) => SYCLTNDRange(dimCount)
-    case _ => ??? // All other types are not allowed
-  }
+trait SYCLNDRangeImpl[G] extends SYCLNDRangeOps[G] {
+  this: SYCLNDRange[G] =>
+  override def t: Type[G] =
+    globalSize.t match {
+      case SYCLTRange(dimCount) => SYCLTNDRange(dimCount)
+      case _ => ??? // All other types are not allowed
+    }
 
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("sycl::nd_range") <> "<" <> Text(this.t.asInstanceOf[SYCLTNDRange[G]].dimCount.toString) <> ">" <>
-      "(" <> globalSize.show <> ", " <> localSize.show <> ")")
-}
\ No newline at end of file
+    Group(
+      Text("sycl::nd_range") <> "<" <>
+        Text(this.t.asInstanceOf[SYCLTNDRange[G]].dimCount.toString) <> ">" <>
+        "(" <> globalSize.show <> ", " <> localSize.show <> ")"
+    )
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLRangeImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLRangeImpl.scala
index 44ac2dd862..5059c9747f 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLRangeImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLRangeImpl.scala
@@ -5,12 +5,15 @@ import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.util.AstBuildHelpers.ExprBuildHelpers
 import vct.col.ast.ops.SYCLRangeOps
 
-trait SYCLRangeImpl[G] extends SYCLRangeOps[G] { this: SYCLRange[G] =>
+trait SYCLRangeImpl[G] extends SYCLRangeOps[G] {
+  this: SYCLRange[G] =>
   val size: Expr[G] = dimensions.reduce((e1, e2) => e1 * e2)
 
   override def t: Type[G] = SYCLTRange(dimensions.size)
 
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("sycl::range") <> "<" <> Text(dimensions.size.toString) <> ">" <>
-      "(" <> Text(dimensions.mkString(",")) <> ")")
-}
\ No newline at end of file
+    Group(
+      Text("sycl::range") <> "<" <> Text(dimensions.size.toString) <> ">" <>
+        "(" <> Text(dimensions.mkString(",")) <> ")"
+    )
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLReadOnlyAccessImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLReadOnlyAccessImpl.scala
index c0d2ed1f91..0d3a335f62 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLReadOnlyAccessImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLReadOnlyAccessImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{SYCLReadOnlyAccess, SYCLTAccessMode, Type}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.SYCLReadOnlyAccessOps
 
-trait SYCLReadOnlyAccessImpl[G] extends SYCLReadOnlyAccessOps[G] { this: SYCLReadOnlyAccess[G] =>
+trait SYCLReadOnlyAccessImpl[G] extends SYCLReadOnlyAccessOps[G] {
+  this: SYCLReadOnlyAccess[G] =>
   override def t: Type[G] = SYCLTAccessMode()
 
   override def layout(implicit ctx: Ctx): Doc = Text(name)
 
   val name = "sycl::read_only"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLReadWriteAccessImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLReadWriteAccessImpl.scala
index 00e688eb81..e422af81ff 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLReadWriteAccessImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLReadWriteAccessImpl.scala
@@ -4,10 +4,11 @@ import vct.col.ast.{SYCLReadWriteAccess, SYCLTAccessMode, Type}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.SYCLReadWriteAccessOps
 
-trait SYCLReadWriteAccessImpl[G] extends SYCLReadWriteAccessOps[G] { this: SYCLReadWriteAccess[G] =>
+trait SYCLReadWriteAccessImpl[G] extends SYCLReadWriteAccessOps[G] {
+  this: SYCLReadWriteAccess[G] =>
   override def t: Type[G] = SYCLTAccessMode()
 
   override def layout(implicit ctx: Ctx): Doc = Text(name)
 
   val name = "sycl::read_write"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTAccessModeImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTAccessModeImpl.scala
index fccc01b110..56700bf1b3 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTAccessModeImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTAccessModeImpl.scala
@@ -4,8 +4,10 @@ import vct.col.ast.SYCLTAccessMode
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.SYCLTAccessModeOps
 
-trait SYCLTAccessModeImpl[G] extends SYCLTAccessModeOps[G] { this: SYCLTAccessMode[G] =>
-  override def layout(implicit ctx: Ctx): Doc = Text("VERCORS::SYCL::ACCESS_MODE")
+trait SYCLTAccessModeImpl[G] extends SYCLTAccessModeOps[G] {
+  this: SYCLTAccessMode[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Text("VERCORS::SYCL::ACCESS_MODE")
 
   override val namespacePath = ""
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTAccessorImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTAccessorImpl.scala
index 49b1565af6..5d29ff9d4e 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTAccessorImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTAccessorImpl.scala
@@ -2,42 +2,123 @@ package vct.col.ast.lang.sycl
 
 import vct.col.ast._
 import vct.col.print.{Ctx, Doc, Group, Text}
-import vct.col.resolve.ctx.{CPPInvocationTarget, RefSYCLAccessMode, RefSYCLConstructorDefinition}
+import vct.col.resolve.ctx.{
+  CPPInvocationTarget,
+  RefSYCLAccessMode,
+  RefSYCLConstructorDefinition,
+}
 import vct.col.resolve.lang.{CPP, Util}
 import vct.col.ast.ops.SYCLTAccessorOps
 
-trait SYCLTAccessorImpl[G] extends SYCLTAccessorOps[G] { this: SYCLTAccessor[G] =>
+trait SYCLTAccessorImpl[G] extends SYCLTAccessorOps[G] {
+  this: SYCLTAccessor[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("sycl::accessor") <> "<" <> typ <> ", " <> Text(dimCount.toString) <> ", " <> Text(if (readOnly) "sycl::access_mode::read" else "sycl::access_mode::read_write") <> ">")
+    Group(
+      Text("sycl::accessor") <> "<" <> typ <> ", " <> Text(dimCount.toString) <>
+        ", " <> Text(
+          if (readOnly)
+            "sycl::access_mode::read"
+          else
+            "sycl::access_mode::read_write"
+        ) <> ">"
+    )
 
   override val namespacePath = "sycl::accessor"
 
-  def findConstructor(genericArgs: Seq[CPPExprOrTypeSpecifier[G]], args: Seq[Expr[G]]): Option[CPPInvocationTarget[G]] = {
-    if (args.nonEmpty) CPP.unwrappedType(args.head.t) match {
-      case SYCLTBuffer(typ, dimCount) => genericArgs match {
-        case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec)), CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None), CPPExprOrTypeSpecifier(None, Some(SYCLClassDefName("access_mode::read_write", Nil)))) if dim > 0 && dim <= 3 &&
-          Util.compatTypes[G](args, Seq(SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), dim.toInt), SYCLTHandler[G](), SYCLTAccessMode[G]())) && isAccessMode(args(2), SYCLReadWriteAccess[G]()) =>
-          Some(RefSYCLConstructorDefinition(SYCLTAccessor(typ, dimCount)))
-        case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec)), CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None), CPPExprOrTypeSpecifier(None, Some(SYCLClassDefName("access_mode::read", Nil)))) if dim > 0 && dim <= 3 &&
-          Util.compatTypes[G](args, Seq(SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), dim.toInt), SYCLTHandler[G](), SYCLTAccessMode[G]())) && isAccessMode(args(2), SYCLReadOnlyAccess[G]()) =>
-          Some(RefSYCLConstructorDefinition(SYCLTAccessor(typ, dimCount, readOnly = true)))
-        case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec)), CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None)) if dim > 0 && dim <= 3 &&
-          Util.compatTypes[G](args, Seq(SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), dim.toInt), SYCLTHandler[G](), SYCLTAccessMode[G]())) && isAccessMode(args(2), SYCLReadWriteAccess[G]()) =>
-          Some(RefSYCLConstructorDefinition(SYCLTAccessor(typ, dimCount)))
-        case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec))) if dimCount == 1 &&
-          Util.compatTypes[G](args, Seq(SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec))), SYCLTHandler[G](), SYCLTAccessMode[G]())) && isAccessMode(args(2), SYCLReadWriteAccess[G]()) =>
-          Some(RefSYCLConstructorDefinition(SYCLTAccessor(typ, dimCount)))
-        case Nil => Some(RefSYCLConstructorDefinition(SYCLTAccessor(typ, dimCount, isAccessMode(args(2), SYCLReadOnlyAccess[G]()))))
+  def findConstructor(
+      genericArgs: Seq[CPPExprOrTypeSpecifier[G]],
+      args: Seq[Expr[G]],
+  ): Option[CPPInvocationTarget[G]] = {
+    if (args.nonEmpty)
+      CPP.unwrappedType(args.head.t) match {
+        case SYCLTBuffer(typ, dimCount) =>
+          genericArgs match {
+            case Seq(
+                  CPPExprOrTypeSpecifier(None, Some(typeSpec)),
+                  CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None),
+                  CPPExprOrTypeSpecifier(
+                    None,
+                    Some(SYCLClassDefName("access_mode::read_write", Nil)),
+                  ),
+                )
+                if dim > 0 && dim <= 3 && Util.compatTypes[G](
+                  args,
+                  Seq(
+                    SYCLTBuffer(
+                      CPP.getBaseTypeFromSpecs(Seq(typeSpec)),
+                      dim.toInt,
+                    ),
+                    SYCLTHandler[G](),
+                    SYCLTAccessMode[G](),
+                  ),
+                ) && isAccessMode(args(2), SYCLReadWriteAccess[G]()) =>
+              Some(RefSYCLConstructorDefinition(SYCLTAccessor(typ, dimCount)))
+            case Seq(
+                  CPPExprOrTypeSpecifier(None, Some(typeSpec)),
+                  CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None),
+                  CPPExprOrTypeSpecifier(
+                    None,
+                    Some(SYCLClassDefName("access_mode::read", Nil)),
+                  ),
+                )
+                if dim > 0 && dim <= 3 && Util.compatTypes[G](
+                  args,
+                  Seq(
+                    SYCLTBuffer(
+                      CPP.getBaseTypeFromSpecs(Seq(typeSpec)),
+                      dim.toInt,
+                    ),
+                    SYCLTHandler[G](),
+                    SYCLTAccessMode[G](),
+                  ),
+                ) && isAccessMode(args(2), SYCLReadOnlyAccess[G]()) =>
+              Some(RefSYCLConstructorDefinition(
+                SYCLTAccessor(typ, dimCount, readOnly = true)
+              ))
+            case Seq(
+                  CPPExprOrTypeSpecifier(None, Some(typeSpec)),
+                  CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None),
+                )
+                if dim > 0 && dim <= 3 && Util.compatTypes[G](
+                  args,
+                  Seq(
+                    SYCLTBuffer(
+                      CPP.getBaseTypeFromSpecs(Seq(typeSpec)),
+                      dim.toInt,
+                    ),
+                    SYCLTHandler[G](),
+                    SYCLTAccessMode[G](),
+                  ),
+                ) && isAccessMode(args(2), SYCLReadWriteAccess[G]()) =>
+              Some(RefSYCLConstructorDefinition(SYCLTAccessor(typ, dimCount)))
+            case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec)))
+                if dimCount == 1 && Util.compatTypes[G](
+                  args,
+                  Seq(
+                    SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec))),
+                    SYCLTHandler[G](),
+                    SYCLTAccessMode[G](),
+                  ),
+                ) && isAccessMode(args(2), SYCLReadWriteAccess[G]()) =>
+              Some(RefSYCLConstructorDefinition(SYCLTAccessor(typ, dimCount)))
+            case Nil =>
+              Some(RefSYCLConstructorDefinition(SYCLTAccessor(
+                typ,
+                dimCount,
+                isAccessMode(args(2), SYCLReadOnlyAccess[G]()),
+              )))
+            case _ => None
+          }
         case _ => None
       }
-      case _ => None
-    } else {
-      None
-    }
+    else { None }
   }
 
-  private def isAccessMode(e: Expr[G], accessMode: SYCLAccessMode[G]): Boolean = e match {
-    case local: CPPLocal[G] if local.ref.get.equals(RefSYCLAccessMode(accessMode)) => true
-    case _ => false
-  }
-}
\ No newline at end of file
+  private def isAccessMode(e: Expr[G], accessMode: SYCLAccessMode[G]): Boolean =
+    e match {
+      case local: CPPLocal[G]
+          if local.ref.get.equals(RefSYCLAccessMode(accessMode)) =>
+        true
+      case _ => false
+    }
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTBufferImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTBufferImpl.scala
index 6a64475501..c4b2da5c94 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTBufferImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTBufferImpl.scala
@@ -7,45 +7,103 @@ import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ref.Ref
 import vct.col.resolve.ctx.{CPPInvocationTarget, RefSYCLConstructorDefinition}
 import vct.col.resolve.lang.{CPP, Util}
-import vct.col.util.AstBuildHelpers.{ExprBuildHelpers, c_const, foldStar, tt, withResult}
+import vct.col.util.AstBuildHelpers.{
+  ExprBuildHelpers,
+  c_const,
+  foldStar,
+  tt,
+  withResult,
+}
 import vct.col.ast.ops.SYCLTBufferOps
 
-trait SYCLTBufferImpl[G] extends SYCLTBufferOps[G] { this: SYCLTBuffer[G] =>
+trait SYCLTBufferImpl[G] extends SYCLTBufferOps[G] {
+  this: SYCLTBuffer[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("sycl::buffer") <> "<" <> typ <> ", " <> Text(dimCount.toString) <> ">")
+    Group(
+      Text("sycl::buffer") <> "<" <> typ <> ", " <> Text(dimCount.toString) <>
+        ">"
+    )
 
   override val namespacePath = "sycl::buffer"
 
-  def findConstructor(genericArgs: Seq[CPPExprOrTypeSpecifier[G]], args: Seq[Expr[G]]): Option[CPPInvocationTarget[G]] = genericArgs match {
-    case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec)), CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None)) if dim > 0 && dim <= 3 && args.nonEmpty && args.head.t.asPointer.isDefined &&
-      CPP.getBaseTypeFromSpecs[G](Seq(typeSpec)).superTypeOf(args.head.t.asPointer.get.element) && Util.compatTypes[G](args.tail, Seq(SYCLTRange[G](dim.toInt))) =>
-      Some(RefSYCLConstructorDefinition[G](SYCLTBuffer[G](CPP.getBaseTypeFromSpecs[G](Seq(typeSpec)), dim.toInt)))
-    case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec))) if args.nonEmpty && args.head.t.asPointer.isDefined &&
-      CPP.getBaseTypeFromSpecs[G](Seq(typeSpec)).superTypeOf(args.head.t.asPointer.get.element) && Util.compatTypes[G](args.tail, Seq(SYCLTRange[G](1))) =>
-      Some(RefSYCLConstructorDefinition(SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), 1)))
-    case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec))) if args.nonEmpty && args.head.t.asPointer.isDefined &&
-      CPP.getBaseTypeFromSpecs[G](Seq(typeSpec)).superTypeOf(args.head.t.asPointer.get.element) && Util.compatTypes[G](args.tail, Seq(SYCLTRange[G](2))) =>
-      Some(RefSYCLConstructorDefinition(SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), 2)))
-    case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec))) if args.nonEmpty && args.head.t.asPointer.isDefined &&
-      CPP.getBaseTypeFromSpecs[G](Seq(typeSpec)).superTypeOf(args.head.t.asPointer.get.element) && Util.compatTypes[G](args.tail, Seq(SYCLTRange[G](3))) =>
-      Some(RefSYCLConstructorDefinition(SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), 3)))
-    case Nil if args.nonEmpty && args.head.t.asPointer.isDefined && Util.compatTypes(args.tail, Seq(SYCLTRange[G](1))) =>
-      Some(RefSYCLConstructorDefinition(SYCLTBuffer(args.head.t.asPointer.get.element, 1)))
-    case Nil if args.nonEmpty && args.head.t.asPointer.isDefined && Util.compatTypes(args.tail, Seq(SYCLTRange[G](2))) =>
-      Some(RefSYCLConstructorDefinition(SYCLTBuffer(args.head.t.asPointer.get.element, 2)))
-    case Nil if args.nonEmpty && args.head.t.asPointer.isDefined && Util.compatTypes(args.tail, Seq(SYCLTRange[G](3))) =>
-      Some(RefSYCLConstructorDefinition(SYCLTBuffer(args.head.t.asPointer.get.element, 3)))
-    case _ => None
-  }
+  def findConstructor(
+      genericArgs: Seq[CPPExprOrTypeSpecifier[G]],
+      args: Seq[Expr[G]],
+  ): Option[CPPInvocationTarget[G]] =
+    genericArgs match {
+      case Seq(
+            CPPExprOrTypeSpecifier(None, Some(typeSpec)),
+            CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None),
+          )
+          if dim > 0 && dim <= 3 && args.nonEmpty &&
+            args.head.t.asPointer.isDefined &&
+            CPP.getBaseTypeFromSpecs[G](Seq(typeSpec))
+              .superTypeOf(args.head.t.asPointer.get.element) &&
+            Util.compatTypes[G](args.tail, Seq(SYCLTRange[G](dim.toInt))) =>
+        Some(RefSYCLConstructorDefinition[G](
+          SYCLTBuffer[G](CPP.getBaseTypeFromSpecs[G](Seq(typeSpec)), dim.toInt)
+        ))
+      case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec)))
+          if args.nonEmpty && args.head.t.asPointer.isDefined &&
+            CPP.getBaseTypeFromSpecs[G](Seq(typeSpec))
+              .superTypeOf(args.head.t.asPointer.get.element) &&
+            Util.compatTypes[G](args.tail, Seq(SYCLTRange[G](1))) =>
+        Some(RefSYCLConstructorDefinition(
+          SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), 1)
+        ))
+      case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec)))
+          if args.nonEmpty && args.head.t.asPointer.isDefined &&
+            CPP.getBaseTypeFromSpecs[G](Seq(typeSpec))
+              .superTypeOf(args.head.t.asPointer.get.element) &&
+            Util.compatTypes[G](args.tail, Seq(SYCLTRange[G](2))) =>
+        Some(RefSYCLConstructorDefinition(
+          SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), 2)
+        ))
+      case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec)))
+          if args.nonEmpty && args.head.t.asPointer.isDefined &&
+            CPP.getBaseTypeFromSpecs[G](Seq(typeSpec))
+              .superTypeOf(args.head.t.asPointer.get.element) &&
+            Util.compatTypes[G](args.tail, Seq(SYCLTRange[G](3))) =>
+        Some(RefSYCLConstructorDefinition(
+          SYCLTBuffer(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), 3)
+        ))
+      case Nil
+          if args.nonEmpty && args.head.t.asPointer.isDefined &&
+            Util.compatTypes(args.tail, Seq(SYCLTRange[G](1))) =>
+        Some(RefSYCLConstructorDefinition(
+          SYCLTBuffer(args.head.t.asPointer.get.element, 1)
+        ))
+      case Nil
+          if args.nonEmpty && args.head.t.asPointer.isDefined &&
+            Util.compatTypes(args.tail, Seq(SYCLTRange[G](2))) =>
+        Some(RefSYCLConstructorDefinition(
+          SYCLTBuffer(args.head.t.asPointer.get.element, 2)
+        ))
+      case Nil
+          if args.nonEmpty && args.head.t.asPointer.isDefined &&
+            Util.compatTypes(args.tail, Seq(SYCLTRange[G](3))) =>
+        Some(RefSYCLConstructorDefinition(
+          SYCLTBuffer(args.head.t.asPointer.get.element, 3)
+        ))
+      case _ => None
+    }
 
   // resource exclusive_hostData_access(TYPE* hostData, int range) = \pointer(hostData, range, write);
   def generateExclusiveAccessPredicate(): Predicate[G] = {
-    val hostDataVar = new Variable[G](TPointer(this.typ))(o.where(name = "hostData"))
-    val sizeVar = new Variable[G](TInt())(o.where(name = "size")) // Needs to be TInt instead of TCInt as it is called with a Length expr which has type TInt
+    val hostDataVar =
+      new Variable[G](TPointer(this.typ))(o.where(name = "hostData"))
+    val sizeVar =
+      new Variable[G](TInt())(
+        o.where(name = "size")
+      ) // Needs to be TInt instead of TCInt as it is called with a Length expr which has type TInt
 
     new Predicate[G](
       args = Seq(hostDataVar, sizeVar),
-      body = Some(PermPointer[G](Local[G](hostDataVar.ref), Local[G](sizeVar.ref), WritePerm())),
+      body = Some(PermPointer[G](
+        Local[G](hostDataVar.ref),
+        Local[G](sizeVar.ref),
+        WritePerm(),
+      )),
     )(o.where(name = "exclusive_hostData_access"))
   }
 
@@ -55,10 +113,13 @@ trait SYCLTBufferImpl[G] extends SYCLTBufferOps[G] { this: SYCLTBuffer[G] =>
   // ensures (\forall int i; i >= 0 && i < size; {: \result[i] :} == hostData[i]);
   // TYPE[] copy_hostdata_to_buffer(TYPE* hostData, int size);
   def generateCopyHostDataToBufferProcedure(): Procedure[G] = {
-    val hostDataVar = new Variable[G](TPointer(this.typ))(o.where(name = "hostData"))
+    val hostDataVar =
+      new Variable[G](TPointer(this.typ))(o.where(name = "hostData"))
     val sizeVar = new Variable[G](TCInt())(o.where(name = "size"))
     val indexVar = new Variable[G](TCInt())(o.where(name = "i"))
-    val copyHostdataToBufferBlame = PanicBlame("The generated method 'copy_hostData_to_buffer' should not throw any errors.")
+    val copyHostdataToBufferBlame = PanicBlame(
+      "The generated method 'copy_hostData_to_buffer' should not throw any errors."
+    )
 
     withResult((result: Result[G]) => {
       new Procedure[G](
@@ -67,31 +128,54 @@ trait SYCLTBufferImpl[G] extends SYCLTBufferOps[G] { this: SYCLTBuffer[G] =>
         outArgs = Nil,
         typeArgs = Nil,
         body = None,
-        contract = ApplicableContract(
-          requires = UnitAccountedPredicate(Star(
-            GreaterEq(Local[G](sizeVar.ref), c_const(0)),
-            PermPointer[G](Local[G](hostDataVar.ref), Local[G](sizeVar.ref), WritePerm())
-          )),
-          ensures = UnitAccountedPredicate(foldStar(Seq(
-            PermPointer[G](Local[G](hostDataVar.ref), Local[G](sizeVar.ref), WritePerm()),
-            validArray(result, Local[G](sizeVar.ref), WritePerm(), copyHostdataToBufferBlame),
-            Forall(
-              bindings = Seq(indexVar),
-              triggers = Seq(Seq(ArraySubscript(result, Local[G](indexVar.ref))(copyHostdataToBufferBlame))),
-              body =
-                (Local[G](indexVar.ref) >= c_const(0) && Local[G](indexVar.ref) < Local[G](sizeVar.ref)) ==>
-                Eq(
-                  ArraySubscript(result, Local[G](indexVar.ref))(copyHostdataToBufferBlame),
-                  PointerSubscript(Local[G](hostDataVar.ref), Local[G](indexVar.ref))(copyHostdataToBufferBlame)
-                )
-            )
-          ))),
-          contextEverywhere = tt,
-          signals = Nil,
-          givenArgs = Nil,
-          yieldsArgs = Nil,
-          decreases = None
-        )(copyHostdataToBufferBlame)
+        contract =
+          ApplicableContract(
+            requires = UnitAccountedPredicate(Star(
+              GreaterEq(Local[G](sizeVar.ref), c_const(0)),
+              PermPointer[G](
+                Local[G](hostDataVar.ref),
+                Local[G](sizeVar.ref),
+                WritePerm(),
+              ),
+            )),
+            ensures = UnitAccountedPredicate(foldStar(Seq(
+              PermPointer[G](
+                Local[G](hostDataVar.ref),
+                Local[G](sizeVar.ref),
+                WritePerm(),
+              ),
+              validArray(
+                result,
+                Local[G](sizeVar.ref),
+                WritePerm(),
+                copyHostdataToBufferBlame,
+              ),
+              Forall(
+                bindings = Seq(indexVar),
+                triggers = Seq(
+                  Seq(ArraySubscript(result, Local[G](indexVar.ref))(
+                    copyHostdataToBufferBlame
+                  ))
+                ),
+                body =
+                  (Local[G](indexVar.ref) >= c_const(0) &&
+                    Local[G](indexVar.ref) < Local[G](sizeVar.ref)) ==> Eq(
+                    ArraySubscript(result, Local[G](indexVar.ref))(
+                      copyHostdataToBufferBlame
+                    ),
+                    PointerSubscript(
+                      Local[G](hostDataVar.ref),
+                      Local[G](indexVar.ref),
+                    )(copyHostdataToBufferBlame),
+                  ),
+              ),
+            ))),
+            contextEverywhere = tt,
+            signals = Nil,
+            givenArgs = Nil,
+            yieldsArgs = Nil,
+            decreases = None,
+          )(copyHostdataToBufferBlame),
       )(copyHostdataToBufferBlame)(o.where(name = "copy_hostData_to_buffer"))
     })
   }
@@ -100,11 +184,16 @@ trait SYCLTBufferImpl[G] extends SYCLTBufferOps[G] { this: SYCLTBuffer[G] =>
   // context \array(buffer, buffer.length) ** Perm(buffer[*], read);
   // ensures \unfolding sycl::buffer::exclusive_hostData_access(hostData, buffer.length) \in (\forall int i; i >= 0 && i < buffer.length; {: hostData[i] :} == buffer[i]);
   // void copy_buffer_to_hostdata(TYPE* hostData, TYPE[] buffer);
-  def generateCopyBufferToHostDataProcedure(exclusiveAccessPredRef: Ref[G, Predicate[G]]): Procedure[G] = {
+  def generateCopyBufferToHostDataProcedure(
+      exclusiveAccessPredRef: Ref[G, Predicate[G]]
+  ): Procedure[G] = {
     val bufferVar = new Variable[G](TArray(this.typ))(o.where(name = "buffer"))
-    val hostDataVar = new Variable[G](TPointer(this.typ))(o.where(name = "hostData"))
+    val hostDataVar =
+      new Variable[G](TPointer(this.typ))(o.where(name = "hostData"))
     val indexVar = new Variable[G](TCInt())(o.where(name = "i"))
-    val copyBufferToHostdataBlame = PanicBlame("The generated method 'copy_buffer_to_hostData' should not throw any errors.")
+    val copyBufferToHostdataBlame = PanicBlame(
+      "The generated method 'copy_buffer_to_hostData' should not throw any errors."
+    )
 
     new Procedure[G](
       returnType = TVoid(),
@@ -112,45 +201,95 @@ trait SYCLTBufferImpl[G] extends SYCLTBufferOps[G] { this: SYCLTBuffer[G] =>
       outArgs = Nil,
       typeArgs = Nil,
       body = None,
-      contract = ApplicableContract(
-        requires = UnitAccountedPredicate(foldStar(Seq(
-          validArray(Local(bufferVar.ref), Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame), ReadPerm(), copyBufferToHostdataBlame),
-          predApply(exclusiveAccessPredRef, hostDataVar, Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame))
-        ))),
-        ensures = UnitAccountedPredicate(foldStar(Seq(
-          validArray(Local(bufferVar.ref), Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame), ReadPerm(), copyBufferToHostdataBlame),
-          predApply(exclusiveAccessPredRef, hostDataVar, Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame)),
-          Unfolding(
-            predApply(exclusiveAccessPredRef, hostDataVar, Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame)),
-            Forall(
-              bindings = Seq(indexVar),
-              triggers = Seq(Seq(PointerSubscript(Local[G](hostDataVar.ref), Local[G](indexVar.ref))(copyBufferToHostdataBlame))),
-              body =
-                (Local[G](indexVar.ref) >= c_const(0) && Local[G](indexVar.ref) < Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame)) ==>
-                Eq(
-                  PointerSubscript(Local[G](hostDataVar.ref), Local[G](indexVar.ref))(copyBufferToHostdataBlame),
-                  ArraySubscript[G](Local[G](bufferVar.ref), Local[G](indexVar.ref))(copyBufferToHostdataBlame)
-                )
-            )
-          )(copyBufferToHostdataBlame)
-        ))),
-        contextEverywhere = tt,
-        signals = Nil,
-        givenArgs = Nil,
-        yieldsArgs = Nil,
-        decreases = None
-      )(copyBufferToHostdataBlame)
+      contract =
+        ApplicableContract(
+          requires = UnitAccountedPredicate(foldStar(Seq(
+            validArray(
+              Local(bufferVar.ref),
+              Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame),
+              ReadPerm(),
+              copyBufferToHostdataBlame,
+            ),
+            predApply(
+              exclusiveAccessPredRef,
+              hostDataVar,
+              Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame),
+            ),
+          ))),
+          ensures = UnitAccountedPredicate(foldStar(Seq(
+            validArray(
+              Local(bufferVar.ref),
+              Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame),
+              ReadPerm(),
+              copyBufferToHostdataBlame,
+            ),
+            predApply(
+              exclusiveAccessPredRef,
+              hostDataVar,
+              Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame),
+            ),
+            Unfolding(
+              predApply(
+                exclusiveAccessPredRef,
+                hostDataVar,
+                Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame),
+              ),
+              Forall(
+                bindings = Seq(indexVar),
+                triggers = Seq(Seq(
+                  PointerSubscript(
+                    Local[G](hostDataVar.ref),
+                    Local[G](indexVar.ref),
+                  )(copyBufferToHostdataBlame)
+                )),
+                body =
+                  (
+                    Local[G](indexVar.ref) >= c_const(0) &&
+                      Local[G](indexVar.ref) <
+                      Length(Local[G](bufferVar.ref))(copyBufferToHostdataBlame)
+                  ) ==> Eq(
+                    PointerSubscript(
+                      Local[G](hostDataVar.ref),
+                      Local[G](indexVar.ref),
+                    )(copyBufferToHostdataBlame),
+                    ArraySubscript[G](
+                      Local[G](bufferVar.ref),
+                      Local[G](indexVar.ref),
+                    )(copyBufferToHostdataBlame),
+                  ),
+              ),
+            )(copyBufferToHostdataBlame),
+          ))),
+          contextEverywhere = tt,
+          signals = Nil,
+          givenArgs = Nil,
+          yieldsArgs = Nil,
+          decreases = None,
+        )(copyBufferToHostdataBlame),
     )(copyBufferToHostdataBlame)(o.where(name = "copy_buffer_to_hostData"))
   }
 
-  private def validArray(arr: Expr[G], len: Expr[G], perm: Expr[G], blame: PanicBlame): Expr[G] = {
+  private def validArray(
+      arr: Expr[G],
+      len: Expr[G],
+      perm: Expr[G],
+      blame: PanicBlame,
+  ): Expr[G] = {
     Star(
       ValidArray[G](arr, len),
-      Perm(ArrayLocation(arr, Any()(blame))(blame), perm)
+      Perm(ArrayLocation(arr, Any()(blame))(blame), perm),
     )
   }
 
-  private def predApply(exclusiveAccessPredRef: Ref[G, Predicate[G]], hostData: Variable[G], len: Expr[G]): Expr[G] = {
-    PredicateApply[G](exclusiveAccessPredRef, Seq(Local[G](hostData.ref), len), WritePerm())
+  private def predApply(
+      exclusiveAccessPredRef: Ref[G, Predicate[G]],
+      hostData: Variable[G],
+      len: Expr[G],
+  ): Expr[G] = {
+    PredicateApply[G](
+      exclusiveAccessPredRef,
+      Seq(Local[G](hostData.ref), len),
+      WritePerm(),
+    )
   }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTClassImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTClassImpl.scala
index bb033415b6..259cf67987 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTClassImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTClassImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.lang.sycl
 
 import vct.col.ast.SYCLTClass
 
-trait SYCLTClassImpl[G] { this: SYCLTClass[G] =>
+trait SYCLTClassImpl[G] {
+  this: SYCLTClass[G] =>
   val namespacePath: String
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTConstructableClassImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTConstructableClassImpl.scala
index 32d0ae5cb1..1a98eabdf8 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTConstructableClassImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTConstructableClassImpl.scala
@@ -3,6 +3,10 @@ package vct.col.ast.lang.sycl
 import vct.col.ast.{CPPExprOrTypeSpecifier, Expr, SYCLTConstructableClass}
 import vct.col.resolve.ctx.CPPInvocationTarget
 
-trait SYCLTConstructableClassImpl[G] { this: SYCLTConstructableClass[G] =>
-  def findConstructor(genericArgs: Seq[CPPExprOrTypeSpecifier[G]], args: Seq[Expr[G]]): Option[CPPInvocationTarget[G]]
-}
\ No newline at end of file
+trait SYCLTConstructableClassImpl[G] {
+  this: SYCLTConstructableClass[G] =>
+  def findConstructor(
+      genericArgs: Seq[CPPExprOrTypeSpecifier[G]],
+      args: Seq[Expr[G]],
+  ): Option[CPPInvocationTarget[G]]
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTEventImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTEventImpl.scala
index ab440c95c0..74a36a61a5 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTEventImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTEventImpl.scala
@@ -4,8 +4,9 @@ import vct.col.ast.SYCLTEvent
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.SYCLTEventOps
 
-trait SYCLTEventImpl[G] extends SYCLTEventOps[G] { this: SYCLTEvent[G] =>
+trait SYCLTEventImpl[G] extends SYCLTEventOps[G] {
+  this: SYCLTEvent[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("sycl::event")
 
   override val namespacePath = "sycl::event"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTHandlerImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTHandlerImpl.scala
index 18b8ec3aeb..562464872f 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTHandlerImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTHandlerImpl.scala
@@ -4,8 +4,9 @@ import vct.col.ast.SYCLTHandler
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.SYCLTHandlerOps
 
-trait SYCLTHandlerImpl[G] extends SYCLTHandlerOps[G] { this: SYCLTHandler[G] =>
+trait SYCLTHandlerImpl[G] extends SYCLTHandlerOps[G] {
+  this: SYCLTHandler[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("sycl::handler")
 
   override val namespacePath = "sycl::handler"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTItemImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTItemImpl.scala
index c505b8a8c1..eeaafa2467 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTItemImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTItemImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.SYCLTItem
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.SYCLTItemOps
 
-trait SYCLTItemImpl[G] extends SYCLTItemOps[G] { this: SYCLTItem[G] =>
+trait SYCLTItemImpl[G] extends SYCLTItemOps[G] {
+  this: SYCLTItem[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("sycl::item") <> "<" <> Text(dimCount.toString) <> ">")
 
   override val namespacePath = "sycl::item"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTLocalAccessorImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTLocalAccessorImpl.scala
index 0f2317ac45..204e3cdb22 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTLocalAccessorImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTLocalAccessorImpl.scala
@@ -6,17 +6,38 @@ import vct.col.resolve.ctx.{CPPInvocationTarget, RefSYCLConstructorDefinition}
 import vct.col.resolve.lang.{CPP, Util}
 import vct.col.ast.ops.SYCLTLocalAccessorOps
 
-trait SYCLTLocalAccessorImpl[G] extends SYCLTLocalAccessorOps[G] { this: SYCLTLocalAccessor[G] =>
+trait SYCLTLocalAccessorImpl[G] extends SYCLTLocalAccessorOps[G] {
+  this: SYCLTLocalAccessor[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("sycl::local_accessor") <> "<" <> typ <> ", " <> Text(dimCount.toString) <> ">")
+    Group(
+      Text("sycl::local_accessor") <> "<" <> typ <> ", " <>
+        Text(dimCount.toString) <> ">"
+    )
 
   override val namespacePath = "sycl::local_accessor"
 
-  def findConstructor(genericArgs: Seq[CPPExprOrTypeSpecifier[G]], args: Seq[Expr[G]]): Option[CPPInvocationTarget[G]] = genericArgs match {
-    case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec)), CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None)) if dim > 0 && dim <= 3 &&
-      Util.compatTypes[G](args, Seq(SYCLTRange[G](dim.toInt), SYCLTHandler[G]())) => Some(RefSYCLConstructorDefinition(SYCLTLocalAccessor[G](CPP.getBaseTypeFromSpecs[G](Seq(typeSpec)), dim.toInt)))
-    case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec))) if Util.compatTypes(args, Seq(SYCLTRange[G](1), SYCLTHandler[G]())) =>
-      Some(RefSYCLConstructorDefinition(SYCLTLocalAccessor(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), 1)))
-    case _ => None
-  }
-}
\ No newline at end of file
+  def findConstructor(
+      genericArgs: Seq[CPPExprOrTypeSpecifier[G]],
+      args: Seq[Expr[G]],
+  ): Option[CPPInvocationTarget[G]] =
+    genericArgs match {
+      case Seq(
+            CPPExprOrTypeSpecifier(None, Some(typeSpec)),
+            CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None),
+          )
+          if dim > 0 && dim <= 3 && Util.compatTypes[G](
+            args,
+            Seq(SYCLTRange[G](dim.toInt), SYCLTHandler[G]()),
+          ) =>
+        Some(RefSYCLConstructorDefinition(SYCLTLocalAccessor[G](
+          CPP.getBaseTypeFromSpecs[G](Seq(typeSpec)),
+          dim.toInt,
+        )))
+      case Seq(CPPExprOrTypeSpecifier(None, Some(typeSpec)))
+          if Util.compatTypes(args, Seq(SYCLTRange[G](1), SYCLTHandler[G]())) =>
+        Some(RefSYCLConstructorDefinition(
+          SYCLTLocalAccessor(CPP.getBaseTypeFromSpecs(Seq(typeSpec)), 1)
+        ))
+      case _ => None
+    }
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTNDItemImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTNDItemImpl.scala
index e457881d4d..a6ff4f9ee9 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTNDItemImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTNDItemImpl.scala
@@ -4,9 +4,10 @@ import vct.col.ast.SYCLTNDItem
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.SYCLTNDItemOps
 
-trait SYCLTNDItemImpl[G] extends SYCLTNDItemOps[G] { this: SYCLTNDItem[G] =>
+trait SYCLTNDItemImpl[G] extends SYCLTNDItemOps[G] {
+  this: SYCLTNDItem[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("sycl::nd_item") <> "<" <> Text(dimCount.toString) <> ">")
 
   override val namespacePath = "sycl::nd_item"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTNDRangeImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTNDRangeImpl.scala
index c7ad4226d7..af20baed47 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTNDRangeImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTNDRangeImpl.scala
@@ -6,17 +6,33 @@ import vct.col.resolve.ctx.{CPPInvocationTarget, RefSYCLConstructorDefinition}
 import vct.col.resolve.lang.Util
 import vct.col.ast.ops.SYCLTNDRangeOps
 
-trait SYCLTNDRangeImpl[G] extends SYCLTNDRangeOps[G] { this: SYCLTNDRange[G] =>
+trait SYCLTNDRangeImpl[G] extends SYCLTNDRangeOps[G] {
+  this: SYCLTNDRange[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("sycl::nd_range") <> "<" <> Text(dimCount.toString) <> ">")
 
   override val namespacePath = "sycl::nd_range"
 
-  def findConstructor(genericArgs: Seq[CPPExprOrTypeSpecifier[G]], args: Seq[Expr[G]]): Option[CPPInvocationTarget[G]] = genericArgs match {
-    case Seq(CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None)) if dim > 0 && dim <= 3 && Util.compatTypes(args, Seq(SYCLTRange[G](dim.toInt), SYCLTRange[G](dim.toInt))) => Some(RefSYCLConstructorDefinition(SYCLTNDRange(dim.toInt)))
-    case Nil if Util.compatTypes(args, Seq(SYCLTRange[G](1), SYCLTRange[G](1))) => Some(RefSYCLConstructorDefinition(SYCLTNDRange(1)))
-    case Nil if Util.compatTypes(args, Seq(SYCLTRange[G](2), SYCLTRange[G](2))) => Some(RefSYCLConstructorDefinition(SYCLTNDRange(2)))
-    case Nil if Util.compatTypes(args, Seq(SYCLTRange[G](3), SYCLTRange[G](3))) => Some(RefSYCLConstructorDefinition(SYCLTNDRange(3)))
-    case _ => None
-  }
-}
\ No newline at end of file
+  def findConstructor(
+      genericArgs: Seq[CPPExprOrTypeSpecifier[G]],
+      args: Seq[Expr[G]],
+  ): Option[CPPInvocationTarget[G]] =
+    genericArgs match {
+      case Seq(CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None))
+          if dim > 0 && dim <= 3 && Util.compatTypes(
+            args,
+            Seq(SYCLTRange[G](dim.toInt), SYCLTRange[G](dim.toInt)),
+          ) =>
+        Some(RefSYCLConstructorDefinition(SYCLTNDRange(dim.toInt)))
+      case Nil
+          if Util.compatTypes(args, Seq(SYCLTRange[G](1), SYCLTRange[G](1))) =>
+        Some(RefSYCLConstructorDefinition(SYCLTNDRange(1)))
+      case Nil
+          if Util.compatTypes(args, Seq(SYCLTRange[G](2), SYCLTRange[G](2))) =>
+        Some(RefSYCLConstructorDefinition(SYCLTNDRange(2)))
+      case Nil
+          if Util.compatTypes(args, Seq(SYCLTRange[G](3), SYCLTRange[G](3))) =>
+        Some(RefSYCLConstructorDefinition(SYCLTNDRange(3)))
+      case _ => None
+    }
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTQueueImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTQueueImpl.scala
index 2d9eae79b3..756c893701 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTQueueImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTQueueImpl.scala
@@ -4,8 +4,9 @@ import vct.col.ast.SYCLTQueue
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.SYCLTQueueOps
 
-trait SYCLTQueueImpl[G] extends SYCLTQueueOps[G] { this: SYCLTQueue[G] =>
+trait SYCLTQueueImpl[G] extends SYCLTQueueOps[G] {
+  this: SYCLTQueue[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("sycl::queue")
 
   override val namespacePath = "sycl::queue"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/lang/sycl/SYCLTRangeImpl.scala b/src/col/vct/col/ast/lang/sycl/SYCLTRangeImpl.scala
index 5f195d10ae..11dcd9c241 100644
--- a/src/col/vct/col/ast/lang/sycl/SYCLTRangeImpl.scala
+++ b/src/col/vct/col/ast/lang/sycl/SYCLTRangeImpl.scala
@@ -6,17 +6,31 @@ import vct.col.resolve.ctx.{CPPInvocationTarget, RefSYCLConstructorDefinition}
 import vct.col.resolve.lang.Util
 import vct.col.ast.ops.SYCLTRangeOps
 
-trait SYCLTRangeImpl[G] extends SYCLTRangeOps[G] { this: SYCLTRange[G] =>
+trait SYCLTRangeImpl[G] extends SYCLTRangeOps[G] {
+  this: SYCLTRange[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("sycl::range") <> "<" <> Text(dimCount.toString) <> ">")
 
   val namespacePath = "sycl::range"
 
-  def findConstructor(genericArgs: Seq[CPPExprOrTypeSpecifier[G]], args: Seq[Expr[G]]): Option[CPPInvocationTarget[G]] = genericArgs match {
-    case Seq(CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None)) if dim > 0 && dim <= 3 && Util.compatTypes(args, Seq.range(0, dim.toInt).map(_ => TCInt[G]())) => Some(RefSYCLConstructorDefinition(SYCLTRange(dim.toInt)))
-    case Nil if Util.compatTypes(args, Seq(TCInt[G]())) => Some(RefSYCLConstructorDefinition(SYCLTRange(1)))
-    case Nil if Util.compatTypes(args, Seq(TCInt[G](), TCInt[G]())) => Some(RefSYCLConstructorDefinition(SYCLTRange(2)))
-    case Nil if Util.compatTypes(args, Seq(TCInt[G](), TCInt[G](), TCInt[G]())) => Some(RefSYCLConstructorDefinition(SYCLTRange(3)))
-    case _ => None
-  }
-}
\ No newline at end of file
+  def findConstructor(
+      genericArgs: Seq[CPPExprOrTypeSpecifier[G]],
+      args: Seq[Expr[G]],
+  ): Option[CPPInvocationTarget[G]] =
+    genericArgs match {
+      case Seq(CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None))
+          if dim > 0 && dim <= 3 && Util.compatTypes(
+            args,
+            Seq.range(0, dim.toInt).map(_ => TCInt[G]()),
+          ) =>
+        Some(RefSYCLConstructorDefinition(SYCLTRange(dim.toInt)))
+      case Nil if Util.compatTypes(args, Seq(TCInt[G]())) =>
+        Some(RefSYCLConstructorDefinition(SYCLTRange(1)))
+      case Nil if Util.compatTypes(args, Seq(TCInt[G](), TCInt[G]())) =>
+        Some(RefSYCLConstructorDefinition(SYCLTRange(2)))
+      case Nil
+          if Util.compatTypes(args, Seq(TCInt[G](), TCInt[G](), TCInt[G]())) =>
+        Some(RefSYCLConstructorDefinition(SYCLTRange(3)))
+      case _ => None
+    }
+}
diff --git a/src/col/vct/col/ast/node/NodeFamilyImpl.scala b/src/col/vct/col/ast/node/NodeFamilyImpl.scala
index f757e761fd..c9c072850f 100644
--- a/src/col/vct/col/ast/node/NodeFamilyImpl.scala
+++ b/src/col/vct/col/ast/node/NodeFamilyImpl.scala
@@ -9,14 +9,17 @@ import vct.col.typerules.{CoercingRewriter, NopCoercingRewriter}
   Marker trait to indicate this node, or this hierarchy of nodes, always rewrites to itself. This is for example for
   Expr (which always rewrites to an Expr), but also single-purpose nodes, such as a catch clause.
  */
-trait NodeFamilyImpl[G] extends NodeImpl[G] { this: NodeFamily[G] =>
+trait NodeFamilyImpl[G] extends NodeImpl[G] {
+  this: NodeFamily[G] =>
   override def check(context: CheckContext[G]): Seq[CheckError] =
     try {
-      NopCoercingRewriter().coerceAny(this.asInstanceOf[NodeFamily[InitialGeneration]])
+      NopCoercingRewriter()
+        .coerceAny(this.asInstanceOf[NodeFamily[InitialGeneration]])
       Nil
     } catch {
       case CoercingRewriter.Incoercible(e, t) => Seq(TypeError(e, t))
       case CoercingRewriter.IncoercibleText(e, m) => Seq(TypeErrorText(e, m))
-      case CoercingRewriter.IncoercibleExplanation(e, m) => Seq(TypeErrorExplanation(e, m))
+      case CoercingRewriter.IncoercibleExplanation(e, m) =>
+        Seq(TypeErrorExplanation(e, m))
     }
 }
diff --git a/src/col/vct/col/ast/node/NodeImpl.scala b/src/col/vct/col/ast/node/NodeImpl.scala
index f71e70513e..a208fb098f 100644
--- a/src/col/vct/col/ast/node/NodeImpl.scala
+++ b/src/col/vct/col/ast/node/NodeImpl.scala
@@ -11,40 +11,48 @@ import vct.col.util.CurrentCheckNodeContext
 
 import scala.runtime.ScalaRunTime
 
-/**
- * [[Node]] is the root type for all nodes in the abstract syntax tree. The family is sealed, meaning the compiler
- * guarantees that all node definitions occur in one file; Node.scala.
- *
- * Note that the structure of the Node file is restricted: helpers are generated based on the definitions in the file,
- * so you cannot write arbitrary code in the file. Please refer to the developer documentation in the
- * <a href="https://github.com/utwente-fmt/vercors/wiki">VerCors wiki</a> for details.
- *
- * [[Node]] is subdivided into categories. The root of each category extends the marker trait [[NodeFamily]]; the code
- * generation looks for this trait to determine the node categories. Some of the bigger categories include:
- *
- * <ul>
- *   <li>[[Type]] contains all the types that can be declared and stored, as well as some helper types.</li>
- *   <li>[[Statement]] contains nodes that are executable, and may change the state.</li>
- *   <li>[[Expr]] contains nodes that have a defined value and type, given a state.</li>
- * </ul>
- *
- * The [[Declaration]] family has a special status, and is hence not marked as a [[NodeFamily]]. All direct descendants
- * of [[Declaration]] together constitute the "declaration kinds".
- *
- * For each node `equals` must be implemented in such a way that equality means they are semantically equivalent. For
- * most nodes that means simple structural equality, while for (references to) declarations this means identity
- * (reference) equality.
- *
- * @tparam G The generation marker: not used as a concrete type.
- */
-trait NodeImpl[G] extends Show { this: Node[G] =>
+/** [[Node]] is the root type for all nodes in the abstract syntax tree. The
+  * family is sealed, meaning the compiler guarantees that all node definitions
+  * occur in one file; Node.scala.
+  *
+  * Note that the structure of the Node file is restricted: helpers are
+  * generated based on the definitions in the file, so you cannot write
+  * arbitrary code in the file. Please refer to the developer documentation in
+  * the <a href="https://github.com/utwente-fmt/vercors/wiki">VerCors wiki</a>
+  * for details.
+  *
+  * [[Node]] is subdivided into categories. The root of each category extends
+  * the marker trait [[NodeFamily]]; the code generation looks for this trait to
+  * determine the node categories. Some of the bigger categories include:
+  *
+  * <ul> <li>[[Type]] contains all the types that can be declared and stored, as
+  * well as some helper types.</li> <li>[[Statement]] contains nodes that are
+  * executable, and may change the state.</li> <li>[[Expr]] contains nodes that
+  * have a defined value and type, given a state.</li> </ul>
+  *
+  * The [[Declaration]] family has a special status, and is hence not marked as
+  * a [[NodeFamily]]. All direct descendants of [[Declaration]] together
+  * constitute the "declaration kinds".
+  *
+  * For each node `equals` must be implemented in such a way that equality means
+  * they are semantically equivalent. For most nodes that means simple
+  * structural equality, while for (references to) declarations this means
+  * identity (reference) equality.
+  *
+  * @tparam G
+  *   The generation marker: not used as a concrete type.
+  */
+trait NodeImpl[G] extends Show {
+  this: Node[G] =>
   def check(context: CheckContext[G]): Seq[CheckError]
   def o: Origin
 
   def compare[G1](other: Node[G1]): LazyList[CompareResult[G, G1]]
   def rewriteDefault[G1]()(implicit rw: AbstractRewriter[G, G1]): Node[G1]
   def serialize(decls: Map[Declaration[G], Long]): scalapb.GeneratedMessage
-  def serializeFamily(decls: Map[Declaration[G], Long]): scalapb.GeneratedMessage
+  def serializeFamily(
+      decls: Map[Declaration[G], Long]
+  ): scalapb.GeneratedMessage
 
   final def enterCheckContext(context: CheckContext[G]): CheckContext[G] =
     CheckContext(
@@ -61,42 +69,68 @@ trait NodeImpl[G] extends Show { this: Node[G] =>
       enterCheckContextDeclarationStack(context),
     )
 
-  def enterCheckContextScopes(context: CheckContext[G]): Seq[CheckContext.ScopeFrame[G]] = context.scopes
-  def enterCheckContextUndeclared(context: CheckContext[G]): Seq[Seq[Declaration[G]]] = context.undeclared
-  def enterCheckContextRoScopes(context: CheckContext[G]): Int = context.roScopes
-  def enterCheckContextRoScopeReason(context: CheckContext[G]): Option[Node[G]] = context.roScopeReason
-  def enterCheckContextCurrentApplicable(context: CheckContext[G]): Option[Applicable[G]] = context.currentApplicable
-  def enterCheckContextInPreCondition(context: CheckContext[G]): Boolean = context.inPreCondition
-  def enterCheckContextInPostCondition(context: CheckContext[G]): Boolean = context.inPostCondition
-  def enterCheckContextCurrentChoreography(context: CheckContext[G]): Option[Choreography[G]] = context.currentChoreography
-  def enterCheckContextCurrentReceiverEndpoint(context: CheckContext[G]): Option[Endpoint[G]] = context.currentReceiverEndpoint
-  def enterCheckContextCurrentParticipatingEndpoints(context: CheckContext[G]): Option[Set[Endpoint[G]]] = context.currentParticipatingEndpoints
-  def enterCheckContextDeclarationStack(context: CheckContext[G]): Seq[Declaration[G]] = context.declarationStack
+  def enterCheckContextScopes(
+      context: CheckContext[G]
+  ): Seq[CheckContext.ScopeFrame[G]] = context.scopes
+  def enterCheckContextUndeclared(
+      context: CheckContext[G]
+  ): Seq[Seq[Declaration[G]]] = context.undeclared
+  def enterCheckContextRoScopes(context: CheckContext[G]): Int =
+    context.roScopes
+  def enterCheckContextRoScopeReason(
+      context: CheckContext[G]
+  ): Option[Node[G]] = context.roScopeReason
+  def enterCheckContextCurrentApplicable(
+      context: CheckContext[G]
+  ): Option[Applicable[G]] = context.currentApplicable
+  def enterCheckContextInPreCondition(context: CheckContext[G]): Boolean =
+    context.inPreCondition
+  def enterCheckContextInPostCondition(context: CheckContext[G]): Boolean =
+    context.inPostCondition
+  def enterCheckContextCurrentChoreography(
+      context: CheckContext[G]
+  ): Option[Choreography[G]] = context.currentChoreography
+  def enterCheckContextCurrentReceiverEndpoint(
+      context: CheckContext[G]
+  ): Option[Endpoint[G]] = context.currentReceiverEndpoint
+  def enterCheckContextCurrentParticipatingEndpoints(
+      context: CheckContext[G]
+  ): Option[Set[Endpoint[G]]] = context.currentParticipatingEndpoints
+  def enterCheckContextDeclarationStack(
+      context: CheckContext[G]
+  ): Seq[Declaration[G]] = context.declarationStack
 
   /* Check children first, so that the check of nodes higher in the tree may depend on the type and correctness of
     subnodes */
   final def checkTrans(context: CheckContext[G]): Seq[CheckError] = {
-    val childrenErrors = checkContextRecursor(context, (ctx, node) => node.checkTrans(ctx)).flatten
+    val childrenErrors =
+      checkContextRecursor(context, (ctx, node) => node.checkTrans(ctx)).flatten
 
-    if(childrenErrors.nonEmpty) {
-      childrenErrors
-    } else {
+    if (childrenErrors.nonEmpty) { childrenErrors }
+    else {
       VerificationError.withContext(CurrentCheckNodeContext(this)) {
         check(context)
       }
     }
   }
 
-  /**
-   * Applies a function to all subnodes, passing the appropriate context per subnode. By default, all subnodes get the
-   * same context, as defined by [[enterCheckContext]]
-   * @param context the initial context
-   * @param f the function to apply to all subnodes
-   * @tparam T the result type of the function
-   * @return the result of applying `f` with the appropriate context per subnode to all subnodes
-   */
-  def checkContextRecursor[T](context: CheckContext[G], f: (CheckContext[G], Node[G]) => T): Seq[T] =
-    subnodes.map(f(enterCheckContext(context), _))
+  /** Applies a function to all subnodes, passing the appropriate context per
+    * subnode. By default, all subnodes get the same context, as defined by
+    * [[enterCheckContext]]
+    * @param context
+    *   the initial context
+    * @param f
+    *   the function to apply to all subnodes
+    * @tparam T
+    *   the result type of the function
+    * @return
+    *   the result of applying `f` with the appropriate context per subnode to
+    *   all subnodes
+    */
+  def checkContextRecursor[T](
+      context: CheckContext[G],
+      f: (CheckContext[G], Node[G]) => T,
+  ): Seq[T] = subnodes.map(f(enterCheckContext(context), _))
 
   def subnodes: Seq[Node[G]]
 
@@ -118,8 +152,9 @@ trait NodeImpl[G] extends Show { this: Node[G] =>
   def collect[T](f: PartialFunction[Node[G], T]): LazyList[T] =
     transSubnodes.collect(f)
 
-  def flatCollect[T](f: PartialFunction[Node[G], IterableOnce[T]]): LazyList[T] =
-    transSubnodes.collect(f).flatten
+  def flatCollect[T](
+      f: PartialFunction[Node[G], IterableOnce[T]]
+  ): LazyList[T] = transSubnodes.collect(f).flatten
 
   def collectFirst[T](f: PartialFunction[Node[G], T]): Option[T] =
     collect(f).headOption
@@ -127,30 +162,46 @@ trait NodeImpl[G] extends Show { this: Node[G] =>
   def exists[T](f: PartialFunction[Node[G], Boolean]): Boolean =
     collectFirst(f).getOrElse(false)
 
-  def unsafeTransmuteGeneration[TNode[_] <: Node[_], G2]
-                               (implicit witness: this.type <:< TNode[G])
-                               : TNode[G2] = (this : TNode[G]).asInstanceOf[TNode[G2]]
-
-  private def debugLayout(x: scala.Any)(implicit ctx: Ctx): Doc = x match {
-    case n: Node[_] => n.show
-    case r: Ref[_, _] => Text("Ref(") <> ctx.name(r) <> ")"
-    case o: scala.Option[scala.Any] if o.isEmpty => Text("None")
-    case o: scala.Option[scala.Any] => Text("Some(") <> debugLayout(o.get) <> ")"
-    case i: scala.Iterable[scala.Any] => Group(Text(i.getClass.getSimpleName) <> "(" <> Doc.args(i.map(debugLayout).toSeq) <> ")")
-    case p: scala.Product => Group(Text(p.getClass.getSimpleName) <> "(" <> Doc.args(p.productIterator.map(debugLayout).toSeq) <> ")")
-    case other => Text(other.toString)
-  }
+  def unsafeTransmuteGeneration[TNode[_] <: Node[_], G2](
+      implicit witness: this.type <:< TNode[G]
+  ): TNode[G2] = (this: TNode[G]).asInstanceOf[TNode[G2]]
+
+  private def debugLayout(x: scala.Any)(implicit ctx: Ctx): Doc =
+    x match {
+      case n: Node[_] => n.show
+      case r: Ref[_, _] => Text("Ref(") <> ctx.name(r) <> ")"
+      case o: scala.Option[scala.Any] if o.isEmpty => Text("None")
+      case o: scala.Option[scala.Any] =>
+        Text("Some(") <> debugLayout(o.get) <> ")"
+      case i: scala.Iterable[scala.Any] =>
+        Group(
+          Text(i.getClass.getSimpleName) <> "(" <>
+            Doc.args(i.map(debugLayout).toSeq) <> ")"
+        )
+      case p: scala.Product =>
+        Group(
+          Text(p.getClass.getSimpleName) <> "(" <>
+            Doc.args(p.productIterator.map(debugLayout).toSeq) <> ")"
+        )
+      case other => Text(other.toString)
+    }
 
   final def show(implicit ctx: Ctx): Doc = NodeDoc(this, layout)
-  protected[this] def layout(implicit ctx: Ctx): Doc = this match {
-    case p: scala.Product =>
-      Group(Text(s"??${this.getClass.getSimpleName}??(") <> Doc.args(p.productIterator.map(debugLayout).toSeq) <> ")")
-    case _ =>
-      Group(Text(s"??${this.getClass.getSimpleName}??(") <> Doc.args(subnodes) <> ")")
-  }
+  protected[this] def layout(implicit ctx: Ctx): Doc =
+    this match {
+      case p: scala.Product =>
+        Group(
+          Text(s"??${this.getClass.getSimpleName}??(") <>
+            Doc.args(p.productIterator.map(debugLayout).toSeq) <> ")"
+        )
+      case _ =>
+        Group(
+          Text(s"??${this.getClass.getSimpleName}??(") <> Doc.args(subnodes) <>
+            ")"
+        )
+    }
 
-  override def toString: String =
-    toStringWithContext(Ctx().namesIn(this))
+  override def toString: String = toStringWithContext(Ctx().namesIn(this))
 
   def toInlineString: String = {
     implicit val ctx = Ctx().namesIn(this).copy(width = Int.MaxValue)
@@ -164,4 +215,4 @@ trait NodeImpl[G] extends Show { this: Node[G] =>
         NodeImpl.this.show.highlight(node).strip()
       }
     }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/node/ProgramImpl.scala b/src/col/vct/col/ast/node/ProgramImpl.scala
index d5fb1cdd44..e17e0373c9 100644
--- a/src/col/vct/col/ast/node/ProgramImpl.scala
+++ b/src/col/vct/col/ast/node/ProgramImpl.scala
@@ -8,14 +8,18 @@ import vct.col.util.CurrentCheckProgramContext
 import vct.result.VerificationError
 import vct.col.ast.ops.{ProgramOps, ProgramFamilyOps}
 
-trait ProgramImpl[G] extends Declarator[G] with ProgramOps[G] with ProgramFamilyOps[G] { this: Program[G] =>
+trait ProgramImpl[G]
+    extends Declarator[G] with ProgramOps[G] with ProgramFamilyOps[G] {
+  this: Program[G] =>
   def check: Seq[CheckError] = checkTrans(CheckContext())
 
-  override def checkContextRecursor[T](context: CheckContext[G], f: (CheckContext[G], Node[G]) => T): Seq[T] =
+  override def checkContextRecursor[T](
+      context: CheckContext[G],
+      f: (CheckContext[G], Node[G]) => T,
+  ): Seq[T] =
     VerificationError.withContext(CurrentCheckProgramContext(this)) {
       super.checkContextRecursor(context, f)
     }
 
-  override def layout(implicit ctx: Ctx): Doc =
-    Doc.stack(declarations)
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc = Doc.stack(declarations)
+}
diff --git a/src/col/vct/col/ast/node/VerificationContextImpl.scala b/src/col/vct/col/ast/node/VerificationContextImpl.scala
index 31e5e0ac7f..1f2bb67b26 100644
--- a/src/col/vct/col/ast/node/VerificationContextImpl.scala
+++ b/src/col/vct/col/ast/node/VerificationContextImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.VerificationContext
 import vct.col.print._
 import vct.col.ast.ops.{VerificationContextOps, VerificationContextFamilyOps}
 
-trait VerificationContextImpl[G] extends VerificationContextOps[G] with VerificationContextFamilyOps[G] { this: VerificationContext[G] =>
+trait VerificationContextImpl[G]
+    extends VerificationContextOps[G] with VerificationContextFamilyOps[G] {
+  this: VerificationContext[G] =>
   override def layout(implicit ctx: Ctx): Doc = program.show
 }
diff --git a/src/col/vct/col/ast/node/VerificationImpl.scala b/src/col/vct/col/ast/node/VerificationImpl.scala
index a0e4d76331..f5cf293f62 100644
--- a/src/col/vct/col/ast/node/VerificationImpl.scala
+++ b/src/col/vct/col/ast/node/VerificationImpl.scala
@@ -5,12 +5,16 @@ import vct.col.check.{CheckContext, CheckError}
 import vct.col.print._
 import vct.col.ast.ops.{VerificationOps, VerificationFamilyOps}
 
-trait VerificationImpl[G] extends VerificationOps[G] with VerificationFamilyOps[G] { this: Verification[G] =>
+trait VerificationImpl[G]
+    extends VerificationOps[G] with VerificationFamilyOps[G] {
+  this: Verification[G] =>
   def check: Seq[CheckError] = checkTrans(CheckContext())
 
   override def layout(implicit ctx: Ctx): Doc =
-    if(tasks.size == 1) tasks.head.show
-    else Doc.stack(tasks.zipWithIndex.map {
-      case (task, i) => Text(s"/* Verification task ${i+1} */") <+/> task.show
-    })
+    if (tasks.size == 1)
+      tasks.head.show
+    else
+      Doc.stack(tasks.zipWithIndex.map { case (task, i) =>
+        Text(s"/* Verification task ${i + 1} */") <+/> task.show
+      })
 }
diff --git a/src/col/vct/col/ast/statement/StatementImpl.scala b/src/col/vct/col/ast/statement/StatementImpl.scala
index 1108745d7d..45cede57fe 100644
--- a/src/col/vct/col/ast/statement/StatementImpl.scala
+++ b/src/col/vct/col/ast/statement/StatementImpl.scala
@@ -6,7 +6,8 @@ import vct.col.check.{CheckContext, CheckError, SeqProgStatement}
 import vct.col.print._
 import vct.col.ast.ops.StatementFamilyOps
 
-trait StatementImpl[G] extends NodeFamilyImpl[G] with StatementFamilyOps[G] { this: Statement[G] =>
+trait StatementImpl[G] extends NodeFamilyImpl[G] with StatementFamilyOps[G] {
+  this: Statement[G] =>
   def layoutAsBlock(implicit ctx: Ctx): Doc =
     Text("{") <>> foldBlock(_ <+/> _) <+/> "}"
 
diff --git a/src/col/vct/col/ast/statement/behavior/ExpressionContainerStatementImpl.scala b/src/col/vct/col/ast/statement/behavior/ExpressionContainerStatementImpl.scala
index b9e503bccb..1e30f37219 100644
--- a/src/col/vct/col/ast/statement/behavior/ExpressionContainerStatementImpl.scala
+++ b/src/col/vct/col/ast/statement/behavior/ExpressionContainerStatementImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.statement.behavior
 import vct.col.ast.{Expr, ExpressionContainerStatement}
 import vct.col.ast.statement.StatementImpl
 
-trait ExpressionContainerStatementImpl[G] extends StatementImpl[G] { this: ExpressionContainerStatement[G] =>
+trait ExpressionContainerStatementImpl[G] extends StatementImpl[G] {
+  this: ExpressionContainerStatement[G] =>
   def expr: Expr[G]
 }
diff --git a/src/col/vct/col/ast/statement/composite/BlockImpl.scala b/src/col/vct/col/ast/statement/composite/BlockImpl.scala
index bf3a095fbe..99f837d785 100644
--- a/src/col/vct/col/ast/statement/composite/BlockImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/BlockImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.Block
 import vct.col.print._
 import vct.col.ast.ops.BlockOps
 
-trait BlockImpl[G] extends BlockOps[G] { this: Block[G] =>
+trait BlockImpl[G] extends BlockOps[G] {
+  this: Block[G] =>
   override def layout(implicit ctx: Ctx): Doc = layoutAsBlock
-  override def foldBlock(f: (Doc, Doc) => Doc)(implicit ctx: Ctx): Doc = NodeDoc(this, Doc.fold(statements.map(_.foldBlock(f)))(f))
-}
\ No newline at end of file
+  override def foldBlock(f: (Doc, Doc) => Doc)(implicit ctx: Ctx): Doc =
+    NodeDoc(this, Doc.fold(statements.map(_.foldBlock(f)))(f))
+}
diff --git a/src/col/vct/col/ast/statement/composite/BranchImpl.scala b/src/col/vct/col/ast/statement/composite/BranchImpl.scala
index fa89d40e01..ed9398829e 100644
--- a/src/col/vct/col/ast/statement/composite/BranchImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/BranchImpl.scala
@@ -4,12 +4,13 @@ import vct.col.ast.{Branch, BooleanValue}
 import vct.col.print._
 import vct.col.ast.ops.BranchOps
 
-trait BranchImpl[G] extends BranchOps[G] { this: Branch[G] =>
+trait BranchImpl[G] extends BranchOps[G] {
+  this: Branch[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.fold(branches.zipWithIndex.map {
-      case ((BooleanValue(true), body), i) if i == branches.size-1 =>
+      case ((BooleanValue(true), body), i) if i == branches.size - 1 =>
         body.layoutAsBlock
       case ((cond, body), _) =>
         Group(Text("if (") <> Doc.arg(cond) <> ")") <+> body.layoutAsBlock
     })(_ <+> "else" <+> _)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/composite/CompositeStatementImpl.scala b/src/col/vct/col/ast/statement/composite/CompositeStatementImpl.scala
index 11cd77b0f3..674e1137c7 100644
--- a/src/col/vct/col/ast/statement/composite/CompositeStatementImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/CompositeStatementImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.statement.composite
 
 import vct.col.ast.CompositeStatement
 
-trait CompositeStatementImpl[G] { this: CompositeStatement[G] =>
+trait CompositeStatementImpl[G] {
+  this: CompositeStatement[G] =>
 
 }
diff --git a/src/col/vct/col/ast/statement/composite/IndetBranchImpl.scala b/src/col/vct/col/ast/statement/composite/IndetBranchImpl.scala
index 3bf37e543e..2493be3f1d 100644
--- a/src/col/vct/col/ast/statement/composite/IndetBranchImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/IndetBranchImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.ops.IndetBranchOps
 import vct.col.ast.statement.StatementImpl
 import vct.col.print._
 
-trait IndetBranchImpl[G] extends StatementImpl[G] with IndetBranchOps[G] { this: IndetBranch[G] =>
+trait IndetBranchImpl[G] extends StatementImpl[G] with IndetBranchOps[G] {
+  this: IndetBranch[G] =>
   override def foldBlock(f: (Doc, Doc) => Doc)(implicit ctx: Ctx): Doc =
     branches match {
       case Seq(branch) => NodeDoc(this, branch.foldBlock(f))
@@ -14,9 +15,7 @@ trait IndetBranchImpl[G] extends StatementImpl[G] with IndetBranchOps[G] { this:
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.fold(branches.zipWithIndex.map {
-      case (branch, i) if i == branches.size - 1 =>
-        branch.layoutAsBlock
-      case (branch, _) =>
-        Text("if(*)") <+> branch.layoutAsBlock
+      case (branch, i) if i == branches.size - 1 => branch.layoutAsBlock
+      case (branch, _) => Text("if(*)") <+> branch.layoutAsBlock
     })(_ <+> "else" <+> _)
 }
diff --git a/src/col/vct/col/ast/statement/composite/LoopImpl.scala b/src/col/vct/col/ast/statement/composite/LoopImpl.scala
index de4751be5e..a8b06b176b 100644
--- a/src/col/vct/col/ast/statement/composite/LoopImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/LoopImpl.scala
@@ -10,26 +10,38 @@ import vct.col.util.AstBuildHelpers._
 import vct.result.VerificationError.UserError
 
 object LoopImpl {
-  case class InvalidLoopFormatForIterationContract(loop: Loop[_], message: String) extends UserError {
+  case class InvalidLoopFormatForIterationContract(
+      loop: Loop[_],
+      message: String,
+  ) extends UserError {
     override def code: String = "invalidIterationLoop"
     override def text: String =
-      loop.o.messageInContext(s"This loop has an iteration contract, but $message.")
+      loop.o
+        .messageInContext(s"This loop has an iteration contract, but $message.")
   }
 
-  case class IterationContractData[G](v: Variable[G], lowerBound: Expr[G], upperBound: Expr[G])
+  case class IterationContractData[G](
+      v: Variable[G],
+      lowerBound: Expr[G],
+      upperBound: Expr[G],
+  )
 }
 
-trait LoopImpl[G] extends LoopOps[G] { this: Loop[G] =>
+trait LoopImpl[G] extends LoopOps[G] {
+  this: Loop[G] =>
   import LoopImpl._
 
-  def getVariableAndLowerBound(implicit o: Origin): Option[(Variable[G], Expr[G])] =
+  def getVariableAndLowerBound(
+      implicit o: Origin
+  ): Option[(Variable[G], Expr[G])] =
     init match {
-      case Block(Seq(Assign(Local(Ref(v)), low))) =>
-        Some((v, low))
+      case Block(Seq(Assign(Local(Ref(v)), low))) => Some((v, low))
       case _ => None
     }
 
-  def getExclusiveUpperBound(v: Variable[G])(implicit o: Origin): Option[Expr[G]] =
+  def getExclusiveUpperBound(
+      v: Variable[G]
+  )(implicit o: Origin): Option[Expr[G]] =
     cond match {
       case Less(Local(Ref(`v`)), high) => Some(high)
       case LessEq(Local(Ref(`v`)), high) => Some(high + const(1))
@@ -41,78 +53,108 @@ trait LoopImpl[G] extends LoopOps[G] { this: Loop[G] =>
   def doesIncrement(v: Variable[G], update: Statement[G] = update): Boolean =
     update match {
       case Block(Seq(s)) => doesIncrement(v, s)
-      case Assign(Local(Ref(`v`)), Plus(Local(Ref(`v`)), IntegerValue(ONE))) => true
-      case Eval(PostAssignExpression(Local(Ref(`v`)), Plus(Local(Ref(`v`)), IntegerValue(ONE)))) => true
+      case Assign(Local(Ref(`v`)), Plus(Local(Ref(`v`)), IntegerValue(ONE))) =>
+        true
+      case Eval(
+            PostAssignExpression(
+              Local(Ref(`v`)),
+              Plus(Local(Ref(`v`)), IntegerValue(ONE)),
+            )
+          ) =>
+        true
       case _ => false
     }
 
-  def getIterationContractData(implicit o: Origin): Either[InvalidLoopFormatForIterationContract, IterationContractData[G]] = {
+  def getIterationContractData(
+      implicit o: Origin
+  ): Either[InvalidLoopFormatForIterationContract, IterationContractData[G]] = {
     val (v, low) = getVariableAndLowerBound.getOrElse(
-      return Left(InvalidLoopFormatForIterationContract(this,
-      "we could not derive the iteration variable or its lower bound from the initialization portion of the loop")))
+      return Left(InvalidLoopFormatForIterationContract(
+        this,
+        "we could not derive the iteration variable or its lower bound from the initialization portion of the loop",
+      ))
+    )
 
     val high = getExclusiveUpperBound(v).getOrElse(
-      return Left(InvalidLoopFormatForIterationContract(this,
-      "we could not derive an upper bound for the iteration variable from the condition")))
-
-    if(!doesIncrement(v))
-      return Left(InvalidLoopFormatForIterationContract(this,
-        "we could not ascertain that the iteration variable is incremented by one each iteration"))
+      return Left(InvalidLoopFormatForIterationContract(
+        this,
+        "we could not derive an upper bound for the iteration variable from the condition",
+      ))
+    )
+
+    if (!doesIncrement(v))
+      return Left(InvalidLoopFormatForIterationContract(
+        this,
+        "we could not ascertain that the iteration variable is incremented by one each iteration",
+      ))
 
     Right(IterationContractData(v, low, high))
   }
 
   def layoutSilver(implicit ctx: Ctx): Doc =
-    Doc.stack(Seq(
-      Group(Text("while") <+> "(" <> Doc.arg(cond) <> ")"),
-      contract,
-    )) <+> body.layoutAsBlock
+    Doc.stack(
+      Seq(Group(Text("while") <+> "(" <> Doc.arg(cond) <> ")"), contract)
+    ) <+> body.layoutAsBlock
 
   def layoutGeneric(implicit ctx: Ctx): Doc =
-    if(init == Block[G](Nil) && update == Block[G](Nil)) layoutGenericWhile
-    else layoutGenericFor
+    if (init == Block[G](Nil) && update == Block[G](Nil))
+      layoutGenericWhile
+    else
+      layoutGenericFor
 
   def layoutGenericWhile(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(Text("while") <+> "(" <> Doc.arg(cond) <> ")") <+> body.layoutAsBlock
+      Group(Text("while") <+> "(" <> Doc.arg(cond) <> ")") <+>
+        body.layoutAsBlock,
     ))
 
-  def simpleControlElements(stat: Statement[G])(implicit ctx: Ctx): Option[Doc] = stat match {
-    case Eval(e) => Some(e.show)
-    case a: Assign[G] => Some(a.layoutAsExpr)
-    case e: VeyMontAssignExpression[G] => simpleControlElements(e.assign)
-    case e: CommunicateX[G] => simpleControlElements(e.assign)
-    case LocalDecl(local) => Some(local.show)
-    case JavaLocalDeclarationStatement(local) => Some(local.show)
-
-    case Block(stats) =>
-      stats
-        .map(simpleControlElements(_))
-        .foldLeft[Option[Seq[Doc]]](Some(Nil)) {
-          case (Some(acc), Some(more)) => Some(acc :+ more)
-          case (_, _) => None
-        }
-        .map(elems => NodeDoc(stat, Doc.fold(elems)(_ <> "," <+/> _)))
-
-    case _ => None
-  }
+  def simpleControlElements(
+      stat: Statement[G]
+  )(implicit ctx: Ctx): Option[Doc] =
+    stat match {
+      case Eval(e) => Some(e.show)
+      case a: Assign[G] => Some(a.layoutAsExpr)
+      case e: VeyMontAssignExpression[G] => simpleControlElements(e.assign)
+      case e: CommunicateX[G] => simpleControlElements(e.assign)
+      case LocalDecl(local) => Some(local.show)
+      case JavaLocalDeclarationStatement(local) => Some(local.show)
+
+      case Block(stats) =>
+        stats.map(simpleControlElements(_))
+          .foldLeft[Option[Seq[Doc]]](Some(Nil)) {
+            case (Some(acc), Some(more)) => Some(acc :+ more)
+            case (_, _) => None
+          }.map(elems => NodeDoc(stat, Doc.fold(elems)(_ <> "," <+/> _)))
+
+      case _ => None
+    }
 
   def layoutControl(stat: Statement[G])(implicit ctx: Ctx): Doc =
-    simpleControlElements(stat).map(doc => Group(Doc.arg(doc))).getOrElse(stat.show)
+    simpleControlElements(stat).map(doc => Group(Doc.arg(doc)))
+      .getOrElse(stat.show)
 
   def layoutGenericFor(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       contract,
-      Group(Text("for") <+> "(" <> Nest(NonWsLine <>
-        (if(init == Block[G](Nil)) Text(";") else layoutControl(init) <> ";" <+/> print.Empty) <>
-          cond <> ";" <>
-          (if(update == Block[G](Nil)) print.Empty else print.Empty <+/> layoutControl(update))
-      ) </> ")") <+> body.layoutAsBlock
+      Group(
+        Text("for") <+> "(" <> Nest(
+          NonWsLine <>
+            (if (init == Block[G](Nil))
+               Text(";")
+             else
+               layoutControl(init) <> ";" <+/> print.Empty) <> cond <> ";" <>
+            (if (update == Block[G](Nil))
+               print.Empty
+             else
+               print.Empty <+/> layoutControl(update))
+        ) </> ")"
+      ) <+> body.layoutAsBlock,
     ))
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => layoutGeneric
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => layoutGeneric
+    }
+}
diff --git a/src/col/vct/col/ast/statement/composite/ModelDoImpl.scala b/src/col/vct/col/ast/statement/composite/ModelDoImpl.scala
index 03bf8f692f..aef4baa657 100644
--- a/src/col/vct/col/ast/statement/composite/ModelDoImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/ModelDoImpl.scala
@@ -4,7 +4,10 @@ import vct.col.ast.ModelDo
 import vct.col.print._
 import vct.col.ast.ops.ModelDoOps
 
-trait ModelDoImpl[G] extends ModelDoOps[G] { this: ModelDo[G] =>
+trait ModelDoImpl[G] extends ModelDoOps[G] {
+  this: ModelDo[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("action(") <> Doc.args(Seq(model, perm, after, action)) <> ")") <+> impl.layoutAsBlock
-}
\ No newline at end of file
+    Group(
+      Text("action(") <> Doc.args(Seq(model, perm, after, action)) <> ")"
+    ) <+> impl.layoutAsBlock
+}
diff --git a/src/col/vct/col/ast/statement/composite/ParAtomicImpl.scala b/src/col/vct/col/ast/statement/composite/ParAtomicImpl.scala
index 4891731511..54a3af1477 100644
--- a/src/col/vct/col/ast/statement/composite/ParAtomicImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/ParAtomicImpl.scala
@@ -5,10 +5,12 @@ import vct.col.check.{CheckContext, CheckError}
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.ParAtomicOps
 
-trait ParAtomicImpl[G] extends ParAtomicOps[G] { this: ParAtomic[G] =>
+trait ParAtomicImpl[G] extends ParAtomicOps[G] {
+  this: ParAtomic[G] =>
   override def check(context: CheckContext[G]): Seq[CheckError] =
     inv.flatMap(context.checkInScope(this, _))
 
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("atomic(") <> Doc.args(inv.map(ctx.name).map(Text)) <> ")") <+> content.layoutAsBlock
-}
\ No newline at end of file
+    Group(Text("atomic(") <> Doc.args(inv.map(ctx.name).map(Text)) <> ")") <+>
+      content.layoutAsBlock
+}
diff --git a/src/col/vct/col/ast/statement/composite/ParBarrierImpl.scala b/src/col/vct/col/ast/statement/composite/ParBarrierImpl.scala
index 4e6232e9fa..c239be7f5e 100644
--- a/src/col/vct/col/ast/statement/composite/ParBarrierImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/ParBarrierImpl.scala
@@ -4,9 +4,12 @@ import vct.col.ast.ParBarrier
 import vct.col.print.{Ctx, Doc, Empty, Text}
 import vct.col.ast.ops.ParBarrierOps
 
-trait ParBarrierImpl[G] extends ParBarrierOps[G] { this: ParBarrier[G] =>
+trait ParBarrierImpl[G] extends ParBarrierOps[G] {
+  this: ParBarrier[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text("barrier(") <> ctx.name(block) <>
-      (if(invs.nonEmpty) Text(";") <+> Doc.args(invs.map(ctx.name).map(Text)) else Empty) <> ")" <+>
-      content.layoutAsBlock
-}
\ No newline at end of file
+      (if (invs.nonEmpty)
+         Text(";") <+> Doc.args(invs.map(ctx.name).map(Text))
+       else
+         Empty) <> ")" <+> content.layoutAsBlock
+}
diff --git a/src/col/vct/col/ast/statement/composite/ParInvariantImpl.scala b/src/col/vct/col/ast/statement/composite/ParInvariantImpl.scala
index 5a1470d9e8..1704c7b4ce 100644
--- a/src/col/vct/col/ast/statement/composite/ParInvariantImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/ParInvariantImpl.scala
@@ -5,9 +5,12 @@ import vct.col.ast.{Declaration, ParInvariant}
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.ParInvariantOps
 
-trait ParInvariantImpl[G] extends Declarator[G] with ParInvariantOps[G] { this: ParInvariant[G] =>
+trait ParInvariantImpl[G] extends Declarator[G] with ParInvariantOps[G] {
+  this: ParInvariant[G] =>
   override def declarations: Seq[Declaration[G]] = Seq(decl)
 
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("invariant") <+> ctx.name(decl) <> "(" <> Doc.arg(inv) <> ")") <+> content.layoutAsBlock
-}
\ No newline at end of file
+    Group(
+      Text("invariant") <+> ctx.name(decl) <> "(" <> Doc.arg(inv) <> ")"
+    ) <+> content.layoutAsBlock
+}
diff --git a/src/col/vct/col/ast/statement/composite/ParStatementImpl.scala b/src/col/vct/col/ast/statement/composite/ParStatementImpl.scala
index 27bb9e656e..5f400d5bcd 100644
--- a/src/col/vct/col/ast/statement/composite/ParStatementImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/ParStatementImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.ParStatement
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.ParStatementOps
 
-trait ParStatementImpl[G] extends ParStatementOps[G] { this: ParStatement[G] =>
+trait ParStatementImpl[G] extends ParStatementOps[G] {
+  this: ParStatement[G] =>
   override def layout(implicit ctx: Ctx): Doc = impl.show
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/composite/RangedForImpl.scala b/src/col/vct/col/ast/statement/composite/RangedForImpl.scala
index 1af3e4e362..e9867e342e 100644
--- a/src/col/vct/col/ast/statement/composite/RangedForImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/RangedForImpl.scala
@@ -4,12 +4,12 @@ import vct.col.ast.{Declaration, RangedFor}
 import vct.col.print._
 import vct.col.ast.ops.RangedForOps
 
-trait RangedForImpl[G] extends RangedForOps[G] { this: RangedFor[G] =>
+trait RangedForImpl[G] extends RangedForOps[G] {
+  this: RangedFor[G] =>
   override def declarations: Seq[Declaration[G]] = Seq(iter.variable)
 
   override def layout(implicit ctx: Ctx): Doc =
-    Doc.stack(Seq(
-      contract.show,
-      Group(Text("for") <> "(" <> Doc.arg(iter) <> ")"),
-    )) <+> body.layoutAsBlock
+    Doc.stack(
+      Seq(contract.show, Group(Text("for") <> "(" <> Doc.arg(iter) <> ")"))
+    ) <+> body.layoutAsBlock
 }
diff --git a/src/col/vct/col/ast/statement/composite/ScopeImpl.scala b/src/col/vct/col/ast/statement/composite/ScopeImpl.scala
index bb0301ba51..64a3a7c6a6 100644
--- a/src/col/vct/col/ast/statement/composite/ScopeImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/ScopeImpl.scala
@@ -9,15 +9,22 @@ import vct.col.ast.ops.ScopeOps
 trait ScopeImpl[G] extends ScopeOps[G] {
   this: Scope[G] =>
 
-  override def enterCheckContextScopes(context: CheckContext[G]): Seq[CheckContext.ScopeFrame[G]] =
+  override def enterCheckContextScopes(
+      context: CheckContext[G]
+  ): Seq[CheckContext.ScopeFrame[G]] =
     context.withScope(locals, toScan = Seq(body))
 
   override def layout(implicit ctx: Ctx): Doc = layoutAsBlock
   override def foldBlock(f: (Doc, Doc) => Doc)(implicit ctx: Ctx): Doc =
-    NodeDoc(this,
-      Doc.fold(locals.map(local => ctx.syntax match {
-        case Ctx.Silver => Text("var") <+> local
-        case _ => local.show <> ";"
-      }) :+ body.foldBlock(f))(f)
+    NodeDoc(
+      this,
+      Doc.fold(
+        locals.map(local =>
+          ctx.syntax match {
+            case Ctx.Silver => Text("var") <+> local
+            case _ => local.show <> ";"
+          }
+        ) :+ body.foldBlock(f)
+      )(f),
     )
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/composite/SwitchImpl.scala b/src/col/vct/col/ast/statement/composite/SwitchImpl.scala
index 64d19a6744..7790c66b4e 100644
--- a/src/col/vct/col/ast/statement/composite/SwitchImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/SwitchImpl.scala
@@ -6,14 +6,17 @@ import vct.col.print._
 import scala.annotation.tailrec
 import vct.col.ast.ops.SwitchOps
 
-trait SwitchImpl[G] extends SwitchOps[G] { this: Switch[G] =>
-  def isCase(s: Show): Boolean = s match {
-    case DefaultCase() | Case(_) => true
-    case _ => false
-  }
+trait SwitchImpl[G] extends SwitchOps[G] {
+  this: Switch[G] =>
+  def isCase(s: Show): Boolean =
+    s match {
+      case DefaultCase() | Case(_) => true
+      case _ => false
+    }
 
   def isNotCase(s: Show): Boolean = !isCase(s)
 
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("switch") <+> "(" <> Doc.arg(expr) <> ")") <+> "{" <>> body.foldBlock(_ <+/> _) <+/> "}"
-}
\ No newline at end of file
+    Group(Text("switch") <+> "(" <> Doc.arg(expr) <> ")") <+> "{" <>>
+      body.foldBlock(_ <+/> _) <+/> "}"
+}
diff --git a/src/col/vct/col/ast/statement/composite/SynchronizedImpl.scala b/src/col/vct/col/ast/statement/composite/SynchronizedImpl.scala
index 2f68dd7b8d..0b8b2341fc 100644
--- a/src/col/vct/col/ast/statement/composite/SynchronizedImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/SynchronizedImpl.scala
@@ -4,7 +4,9 @@ import vct.col.ast.Synchronized
 import vct.col.print._
 import vct.col.ast.ops.SynchronizedOps
 
-trait SynchronizedImpl[G] extends SynchronizedOps[G] { this: Synchronized[G] =>
+trait SynchronizedImpl[G] extends SynchronizedOps[G] {
+  this: Synchronized[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("synchronized") <+> "(" <> Doc.arg(obj) <> ")") <+> body.layoutAsBlock
-}
\ No newline at end of file
+    Group(Text("synchronized") <+> "(" <> Doc.arg(obj) <> ")") <+>
+      body.layoutAsBlock
+}
diff --git a/src/col/vct/col/ast/statement/composite/TryCatchFinallyImpl.scala b/src/col/vct/col/ast/statement/composite/TryCatchFinallyImpl.scala
index 477a39a4e2..667973d7fb 100644
--- a/src/col/vct/col/ast/statement/composite/TryCatchFinallyImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/TryCatchFinallyImpl.scala
@@ -7,15 +7,14 @@ import vct.col.print._
 import vct.col.typerules.Types
 import vct.col.ast.ops.TryCatchFinallyOps
 
-trait TryCatchFinallyImpl[G] extends NodeFamilyImpl[G] with TryCatchFinallyOps[G] { this: TryCatchFinally[G] =>
+trait TryCatchFinallyImpl[G]
+    extends NodeFamilyImpl[G] with TryCatchFinallyOps[G] {
+  this: TryCatchFinally[G] =>
   def checkOverlappingCatches: Seq[CheckError] = {
-    this.catches.foldLeft[Type[G]](TNothing()) {
-      case (caughtAlready, clause) =>
-        if(caughtAlready.superTypeOf(clause.decl.t)) {
-          return Seq(RedundantCatchClause(clause))
-        } else {
-          Types.leastCommonSuperType(caughtAlready, clause.decl.t)
-        }
+    this.catches.foldLeft[Type[G]](TNothing()) { case (caughtAlready, clause) =>
+      if (caughtAlready.superTypeOf(clause.decl.t)) {
+        return Seq(RedundantCatchClause(clause))
+      } else { Types.leastCommonSuperType(caughtAlready, clause.decl.t) }
     }
     Nil
   }
@@ -27,6 +26,9 @@ trait TryCatchFinallyImpl[G] extends NodeFamilyImpl[G] with TryCatchFinallyOps[G
     Doc.spread(Seq(
       Text("try") <+> body.layoutAsBlock,
       Doc.spread(catches),
-      if(after == Block[G](Nil)) Empty else Text("finally") <+> after.layoutAsBlock
+      if (after == Block[G](Nil))
+        Empty
+      else
+        Text("finally") <+> after.layoutAsBlock,
     ))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/composite/VecBlockImpl.scala b/src/col/vct/col/ast/statement/composite/VecBlockImpl.scala
index fac73fd9b0..b01eb45b4a 100644
--- a/src/col/vct/col/ast/statement/composite/VecBlockImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/VecBlockImpl.scala
@@ -5,7 +5,8 @@ import vct.col.ast.{Declaration, VecBlock}
 import vct.col.print._
 import vct.col.ast.ops.VecBlockOps
 
-trait VecBlockImpl[G] extends Declarator[G] with VecBlockOps[G] { this: VecBlock[G] =>
+trait VecBlockImpl[G] extends Declarator[G] with VecBlockOps[G] {
+  this: VecBlock[G] =>
   override def declarations: Seq[Declaration[G]] = iters.map(_.variable)
 
   override def layout(implicit ctx: Ctx): Doc =
@@ -14,4 +15,4 @@ trait VecBlockImpl[G] extends Declarator[G] with VecBlockOps[G] { this: VecBlock
       DocUtil.clauses("requires", requires),
       DocUtil.clauses("ensures", ensures),
     )) <+> content.layoutAsBlock
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/composite/WandPackageImpl.scala b/src/col/vct/col/ast/statement/composite/WandPackageImpl.scala
index 49c9c47157..65649d1a00 100644
--- a/src/col/vct/col/ast/statement/composite/WandPackageImpl.scala
+++ b/src/col/vct/col/ast/statement/composite/WandPackageImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.WandPackage
 import vct.col.print._
 import vct.col.ast.ops.WandPackageOps
 
-trait WandPackageImpl[G] extends WandPackageOps[G] { this: WandPackage[G] =>
+trait WandPackageImpl[G] extends WandPackageOps[G] {
+  this: WandPackage[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("package") <>> res) <+> proof.layoutAsBlock
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/exceptional/BreakImpl.scala b/src/col/vct/col/ast/statement/exceptional/BreakImpl.scala
index 7a5aeea069..a17ca2af5f 100644
--- a/src/col/vct/col/ast/statement/exceptional/BreakImpl.scala
+++ b/src/col/vct/col/ast/statement/exceptional/BreakImpl.scala
@@ -4,7 +4,12 @@ import vct.col.ast.Break
 import vct.col.print.{Ctx, Doc, Empty, Text}
 import vct.col.ast.ops.BreakOps
 
-trait BreakImpl[G] extends BreakOps[G] { this: Break[G] =>
+trait BreakImpl[G] extends BreakOps[G] {
+  this: Break[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Text("break") <> (if(label.isEmpty) Empty else Empty <+> ctx.name(label.get)) <> ";"
-}
\ No newline at end of file
+    Text("break") <>
+      (if (label.isEmpty)
+         Empty
+       else
+         Empty <+> ctx.name(label.get)) <> ";"
+}
diff --git a/src/col/vct/col/ast/statement/exceptional/ContinueImpl.scala b/src/col/vct/col/ast/statement/exceptional/ContinueImpl.scala
index a43615db38..7746c338b8 100644
--- a/src/col/vct/col/ast/statement/exceptional/ContinueImpl.scala
+++ b/src/col/vct/col/ast/statement/exceptional/ContinueImpl.scala
@@ -4,7 +4,12 @@ import vct.col.ast.Continue
 import vct.col.print.{Ctx, Doc, Empty, Text}
 import vct.col.ast.ops.ContinueOps
 
-trait ContinueImpl[G] extends ContinueOps[G] { this: Continue[G] =>
+trait ContinueImpl[G] extends ContinueOps[G] {
+  this: Continue[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Text("continue") <> (if (label.isEmpty) Empty else Empty <+> ctx.name(label.get)) <> ";"
-}
\ No newline at end of file
+    Text("continue") <>
+      (if (label.isEmpty)
+         Empty
+       else
+         Empty <+> ctx.name(label.get)) <> ";"
+}
diff --git a/src/col/vct/col/ast/statement/exceptional/EvalImpl.scala b/src/col/vct/col/ast/statement/exceptional/EvalImpl.scala
index 3ab5cf9eb5..9303605581 100644
--- a/src/col/vct/col/ast/statement/exceptional/EvalImpl.scala
+++ b/src/col/vct/col/ast/statement/exceptional/EvalImpl.scala
@@ -1,13 +1,26 @@
 package vct.col.ast.statement.exceptional
 
 import vct.col.ast.statement.StatementImpl
-import vct.col.ast.{Deref, Endpoint, EndpointName, Eval, Expr, MethodInvocation, PVLDeref, PVLEndpoint, PVLLocal, Statement, ThisChoreography}
+import vct.col.ast.{
+  Deref,
+  Endpoint,
+  EndpointName,
+  Eval,
+  Expr,
+  MethodInvocation,
+  PVLDeref,
+  PVLEndpoint,
+  PVLLocal,
+  Statement,
+  ThisChoreography,
+}
 import vct.col.check.{CheckContext, CheckError, SeqProgInvocation}
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.EvalOps
 import vct.col.ref.Ref
 import vct.col.resolve.ctx.RefPVLEndpoint
 
-trait EvalImpl[G] extends StatementImpl[G] with EvalOps[G] { this: Eval[G] =>
+trait EvalImpl[G] extends StatementImpl[G] with EvalOps[G] {
+  this: Eval[G] =>
   override def layout(implicit ctx: Ctx): Doc = expr.show <> ";"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/exceptional/ExceptionalStatementImpl.scala b/src/col/vct/col/ast/statement/exceptional/ExceptionalStatementImpl.scala
index f0ed571ec5..ad1a44c0f5 100644
--- a/src/col/vct/col/ast/statement/exceptional/ExceptionalStatementImpl.scala
+++ b/src/col/vct/col/ast/statement/exceptional/ExceptionalStatementImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.statement.exceptional
 import vct.col.ast.ExceptionalStatement
 import vct.col.ast.statement.StatementImpl
 
-trait ExceptionalStatementImpl[G] extends StatementImpl[G] { this: ExceptionalStatement[G] =>
+trait ExceptionalStatementImpl[G] extends StatementImpl[G] {
+  this: ExceptionalStatement[G] =>
 
 }
diff --git a/src/col/vct/col/ast/statement/exceptional/InvocationStatementImpl.scala b/src/col/vct/col/ast/statement/exceptional/InvocationStatementImpl.scala
index 4b56dd0f77..a82b1ae637 100644
--- a/src/col/vct/col/ast/statement/exceptional/InvocationStatementImpl.scala
+++ b/src/col/vct/col/ast/statement/exceptional/InvocationStatementImpl.scala
@@ -3,7 +3,8 @@ package vct.col.ast.statement.exceptional
 import vct.col.ast.{AbstractMethod, Expr, InvocationStatement, Variable}
 import vct.col.ref.Ref
 
-trait InvocationStatementImpl[G] { this: InvocationStatement[G] =>
+trait InvocationStatementImpl[G] {
+  this: InvocationStatement[G] =>
   override def ref: Ref[G, _ <: AbstractMethod[G]]
   def outArgs: Seq[Expr[G]]
   def args: Seq[Expr[G]]
diff --git a/src/col/vct/col/ast/statement/exceptional/InvokeMethodImpl.scala b/src/col/vct/col/ast/statement/exceptional/InvokeMethodImpl.scala
index d8780fcae6..f6c026719c 100644
--- a/src/col/vct/col/ast/statement/exceptional/InvokeMethodImpl.scala
+++ b/src/col/vct/col/ast/statement/exceptional/InvokeMethodImpl.scala
@@ -4,15 +4,20 @@ import vct.col.ast.{InvokeMethod, Variable, Type}
 import vct.col.print.{Ctx, Doc, DocUtil, Empty, Group, Text}
 import vct.col.ast.ops.InvokeMethodOps
 
-trait InvokeMethodImpl[G] extends InvokeMethodOps[G] { this: InvokeMethod[G] =>
+trait InvokeMethodImpl[G] extends InvokeMethodOps[G] {
+  this: InvokeMethod[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(
       Group(
         obj.show <> "." <> ctx.name(ref) <>
-          (if (typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs) <> ">" else Empty) <>
-          "("
-      ) <> Doc.args(args ++ outArgs) <> ")" <> DocUtil.givenYields(givenMap, yields) <> ";"
+          (if (typeArgs.nonEmpty)
+             Text("<") <> Doc.args(typeArgs) <> ">"
+           else
+             Empty) <> "("
+      ) <> Doc.args(args ++ outArgs) <> ")" <>
+        DocUtil.givenYields(givenMap, yields) <> ";"
     )
 
-  def typeEnv: Map[Variable[G], Type[G]] = ref.decl.typeArgs.zip(typeArgs).toMap ++ obj.t.asClass.get.typeEnv
+  def typeEnv: Map[Variable[G], Type[G]] =
+    ref.decl.typeArgs.zip(typeArgs).toMap ++ obj.t.asClass.get.typeEnv
 }
diff --git a/src/col/vct/col/ast/statement/exceptional/InvokeProcedureImpl.scala b/src/col/vct/col/ast/statement/exceptional/InvokeProcedureImpl.scala
index 41d32493d3..b7a6359809 100644
--- a/src/col/vct/col/ast/statement/exceptional/InvokeProcedureImpl.scala
+++ b/src/col/vct/col/ast/statement/exceptional/InvokeProcedureImpl.scala
@@ -4,23 +4,31 @@ import vct.col.ast.{InvokeProcedure, Variable, Type}
 import vct.col.print.{Ctx, Doc, DocUtil, Empty, Group, Text}
 import vct.col.ast.ops.InvokeProcedureOps
 
-trait InvokeProcedureImpl[G] extends InvokeProcedureOps[G] { this: InvokeProcedure[G] =>
-  def layoutGeneric(implicit ctx: Ctx): Doc = Group(
+trait InvokeProcedureImpl[G] extends InvokeProcedureOps[G] {
+  this: InvokeProcedure[G] =>
+  def layoutGeneric(implicit ctx: Ctx): Doc =
     Group(
-      Text(ctx.name(ref)) <>
-        (if (typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs) <> ">" else Empty) <>
-        "("
-    ) <> Doc.args(args ++ outArgs) <> ")" <> DocUtil.givenYields(givenMap, yields)
-  ) <> ";"
+      Group(
+        Text(ctx.name(ref)) <>
+          (if (typeArgs.nonEmpty)
+             Text("<") <> Doc.args(typeArgs) <> ">"
+           else
+             Empty) <> "("
+      ) <> Doc.args(args ++ outArgs) <> ")" <>
+        DocUtil.givenYields(givenMap, yields)
+    ) <> ";"
 
   def layoutSilver(implicit ctx: Ctx): Doc =
-    (if(outArgs.nonEmpty) Doc.fold(outArgs)(_ <> "," <+> _) <+> ":=" <+> Empty else Empty) <>
-    Text(ctx.name(ref)) <> "(" <> Doc.args(args) <> ")"
+    (if (outArgs.nonEmpty)
+       Doc.fold(outArgs)(_ <> "," <+> _) <+> ":=" <+> Empty
+     else
+       Empty) <> Text(ctx.name(ref)) <> "(" <> Doc.args(args) <> ")"
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => layoutGeneric
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => layoutGeneric
+    }
 
   def typeEnv: Map[Variable[G], Type[G]] = ref.decl.typeArgs.zip(typeArgs).toMap
 }
diff --git a/src/col/vct/col/ast/statement/exceptional/ReturnImpl.scala b/src/col/vct/col/ast/statement/exceptional/ReturnImpl.scala
index d5b5060505..c0a39fd96e 100644
--- a/src/col/vct/col/ast/statement/exceptional/ReturnImpl.scala
+++ b/src/col/vct/col/ast/statement/exceptional/ReturnImpl.scala
@@ -5,19 +5,32 @@ import vct.col.print.{Ctx, Doc, Empty, Text}
 import vct.col.ast.ops.ReturnOps
 import vct.col.check.{CheckContext, CheckError, ReturnOutsideMethod}
 
-trait ReturnImpl[G] extends ExceptionalStatementImpl[G] with ReturnOps[G] { this: Return[G] =>
+trait ReturnImpl[G] extends ExceptionalStatementImpl[G] with ReturnOps[G] {
+  this: Return[G] =>
   override def check(context: CheckContext[G]): Seq[CheckError] = {
     val app = context.declarationStack.collectFirst {
-      case _: Procedure[G] | _: InstanceMethod[G] | _: InstanceOperatorMethod[G] => ()
-      case _: JavaMethod[G] | _: CFunctionDefinition[G] | _: CPPFunctionDefinition[G] | _: LlvmFunctionDefinition[G] => ()
+      case _: Procedure[G] | _: InstanceMethod[G] |
+          _: InstanceOperatorMethod[G] =>
+        ()
+      case _: JavaMethod[G] | _: CFunctionDefinition[G] |
+          _: CPPFunctionDefinition[G] | _: LlvmFunctionDefinition[G] =>
+        ()
       case _: BipTransition[G] | _: BipGuard[G] | _: BipOutgoingData[G] => ()
     }
-    val wrongReturn = if(app.isEmpty) Seq(ReturnOutsideMethod(this)) else Nil
+    val wrongReturn =
+      if (app.isEmpty)
+        Seq(ReturnOutsideMethod(this))
+      else
+        Nil
     super.check(context) ++ wrongReturn
   }
 
   override def layout(implicit ctx: Ctx): Doc =
-    Text("return") <> (if(result == Void[G]()) Text(";") else Empty <+> result <> ";")
+    Text("return") <>
+      (if (result == Void[G]())
+         Text(";")
+       else
+         Empty <+> result <> ";")
 
   override def expr: Expr[G] = this.result
 }
diff --git a/src/col/vct/col/ast/statement/exceptional/ThrowImpl.scala b/src/col/vct/col/ast/statement/exceptional/ThrowImpl.scala
index c49866e6e9..30c69b3611 100644
--- a/src/col/vct/col/ast/statement/exceptional/ThrowImpl.scala
+++ b/src/col/vct/col/ast/statement/exceptional/ThrowImpl.scala
@@ -4,9 +4,9 @@ import vct.col.ast.{Expr, Throw}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.ThrowOps
 
-trait ThrowImpl[G] extends ThrowOps[G] { this: Throw[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("throw") <+> obj <> ";"
+trait ThrowImpl[G] extends ThrowOps[G] {
+  this: Throw[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text("throw") <+> obj <> ";"
 
   override def expr: Expr[G] = this.obj
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/nonexecutable/LocalDeclImpl.scala b/src/col/vct/col/ast/statement/nonexecutable/LocalDeclImpl.scala
index 2d36f609b7..ec3d5ffb3f 100644
--- a/src/col/vct/col/ast/statement/nonexecutable/LocalDeclImpl.scala
+++ b/src/col/vct/col/ast/statement/nonexecutable/LocalDeclImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.LocalDecl
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.LocalDeclOps
 
-trait LocalDeclImpl[G] extends LocalDeclOps[G] { this: LocalDecl[G] =>
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => Text("var") <+> local.show
-    case _ => local.show <> ";"
-  }
-}
\ No newline at end of file
+trait LocalDeclImpl[G] extends LocalDeclOps[G] {
+  this: LocalDecl[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => Text("var") <+> local.show
+      case _ => local.show <> ";"
+    }
+}
diff --git a/src/col/vct/col/ast/statement/nonexecutable/NonExecutableStatementImpl.scala b/src/col/vct/col/ast/statement/nonexecutable/NonExecutableStatementImpl.scala
index 37d4104280..5854b309e1 100644
--- a/src/col/vct/col/ast/statement/nonexecutable/NonExecutableStatementImpl.scala
+++ b/src/col/vct/col/ast/statement/nonexecutable/NonExecutableStatementImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.statement.nonexecutable
 
 import vct.col.ast.NonExecutableStatement
 
-trait NonExecutableStatementImpl[G] { this: NonExecutableStatement[G] =>
+trait NonExecutableStatementImpl[G] {
+  this: NonExecutableStatement[G] =>
 
 }
diff --git a/src/col/vct/col/ast/statement/nonexecutable/SpecIgnoreEndImpl.scala b/src/col/vct/col/ast/statement/nonexecutable/SpecIgnoreEndImpl.scala
index 420178a710..91e439213d 100644
--- a/src/col/vct/col/ast/statement/nonexecutable/SpecIgnoreEndImpl.scala
+++ b/src/col/vct/col/ast/statement/nonexecutable/SpecIgnoreEndImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.SpecIgnoreEnd
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.SpecIgnoreEndOps
 
-trait SpecIgnoreEndImpl[G] extends SpecIgnoreEndOps[G] { this: SpecIgnoreEnd[G] =>
+trait SpecIgnoreEndImpl[G] extends SpecIgnoreEndOps[G] {
+  this: SpecIgnoreEnd[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.inlineSpec(Text("spec_ignore }"))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/nonexecutable/SpecIgnoreStartImpl.scala b/src/col/vct/col/ast/statement/nonexecutable/SpecIgnoreStartImpl.scala
index 19b96e5de7..d9527fc1ca 100644
--- a/src/col/vct/col/ast/statement/nonexecutable/SpecIgnoreStartImpl.scala
+++ b/src/col/vct/col/ast/statement/nonexecutable/SpecIgnoreStartImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.SpecIgnoreStart
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.SpecIgnoreStartOps
 
-trait SpecIgnoreStartImpl[G] extends SpecIgnoreStartOps[G] { this: SpecIgnoreStart[G] =>
+trait SpecIgnoreStartImpl[G] extends SpecIgnoreStartOps[G] {
+  this: SpecIgnoreStart[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Doc.inlineSpec(Text("spec_ignore {"))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/AssertImpl.scala b/src/col/vct/col/ast/statement/terminal/AssertImpl.scala
index c34211c664..3b6808b00f 100644
--- a/src/col/vct/col/ast/statement/terminal/AssertImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/AssertImpl.scala
@@ -4,17 +4,17 @@ import vct.col.ast.{Assert, Expr}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.AssertOps
 
-trait AssertImpl[G] extends AssertOps[G] { this: Assert[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("assert") <+> res <> ";"
+trait AssertImpl[G] extends AssertOps[G] {
+  this: Assert[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("assert") <+> res <> ";"
 
-  def layoutSilver(implicit ctx: Ctx): Doc =
-    Text("assert") <+> res
+  def layoutSilver(implicit ctx: Ctx): Doc = Text("assert") <+> res
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+    }
 
   override def expr: Expr[G] = this.res
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/AssignImpl.scala b/src/col/vct/col/ast/statement/terminal/AssignImpl.scala
index 43bf790119..f8079b4e50 100644
--- a/src/col/vct/col/ast/statement/terminal/AssignImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/AssignImpl.scala
@@ -5,17 +5,32 @@ import vct.col.check.{CheckContext, CheckError, SeqProgEndpointAssign}
 import vct.col.print._
 import vct.col.ast.ops.AssignOps
 
-trait AssignImpl[G] extends NormallyCompletingStatementImpl[G] with AssignOps[G] { this: Assign[G] =>
+trait AssignImpl[G]
+    extends NormallyCompletingStatementImpl[G] with AssignOps[G] {
+  this: Assign[G] =>
   override def check(context: CheckContext[G]): Seq[CheckError] =
-    super.check(context) ++ (target match {
-      case Local(ref) => context.checkInWriteScope(context.roScopeReason, this, ref)
-      case EndpointName(_) if context.currentChoreography.isDefined => Seq(SeqProgEndpointAssign(this))
-      case _ => Nil
-    })
+    super.check(context) ++
+      (target match {
+        case Local(ref) =>
+          context.checkInWriteScope(context.roScopeReason, this, ref)
+        case EndpointName(_) if context.currentChoreography.isDefined =>
+          Seq(SeqProgEndpointAssign(this))
+        case _ => Nil
+      })
 
   def layoutAsExpr(implicit ctx: Ctx): Doc =
-    Group(target.show <+> (if(ctx.syntax == Ctx.Silver) ":=" else "=") <>> value)
+    Group(
+      target.show <+>
+        (if (ctx.syntax == Ctx.Silver)
+           ":="
+         else
+           "=") <>> value
+    )
 
   override def layout(implicit ctx: Ctx): Doc =
-    layoutAsExpr <> (if(ctx.syntax == Ctx.Silver) Empty else Text(";"))
-}
\ No newline at end of file
+    layoutAsExpr <>
+      (if (ctx.syntax == Ctx.Silver)
+         Empty
+       else
+         Text(";"))
+}
diff --git a/src/col/vct/col/ast/statement/terminal/AssumeImpl.scala b/src/col/vct/col/ast/statement/terminal/AssumeImpl.scala
index 0c6ebb0227..7022a9daa6 100644
--- a/src/col/vct/col/ast/statement/terminal/AssumeImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/AssumeImpl.scala
@@ -4,17 +4,17 @@ import vct.col.ast.{Assume, Expr}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.AssumeOps
 
-trait AssumeImpl[G] extends AssumeOps[G] { this: Assume[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("assume") <+> assn <> ";"
+trait AssumeImpl[G] extends AssumeOps[G] {
+  this: Assume[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("assume") <+> assn <> ";"
 
-  def layoutSilver(implicit ctx: Ctx): Doc =
-    Text("assume") <+> assn
+  def layoutSilver(implicit ctx: Ctx): Doc = Text("assume") <+> assn
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+    }
 
   override def expr: Expr[G] = this.assn
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/CaseImpl.scala b/src/col/vct/col/ast/statement/terminal/CaseImpl.scala
index 26c06cf445..66e5a53895 100644
--- a/src/col/vct/col/ast/statement/terminal/CaseImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/CaseImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.Case
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.CaseOps
 
-trait CaseImpl[G] extends CaseOps[G] { this: Case[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    Text("case") <+> pattern <> ":"
-}
\ No newline at end of file
+trait CaseImpl[G] extends CaseOps[G] {
+  this: Case[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text("case") <+> pattern <> ":"
+}
diff --git a/src/col/vct/col/ast/statement/terminal/CommitImpl.scala b/src/col/vct/col/ast/statement/terminal/CommitImpl.scala
index 58260e1576..c130809981 100644
--- a/src/col/vct/col/ast/statement/terminal/CommitImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/CommitImpl.scala
@@ -4,11 +4,12 @@ import vct.col.ast.{Commit, Expr}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.CommitOps
 
-trait CommitImpl[G] extends CommitOps[G] { this: Commit[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("commit") <+> obj <> ";"
+trait CommitImpl[G] extends CommitOps[G] {
+  this: Commit[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("commit") <+> obj <> ";"
 
-  override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.inlineSpec(Show.lazily(layoutSpec(_)))
 
   override def expr: Expr[G] = this.obj
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/DefaultCaseImpl.scala b/src/col/vct/col/ast/statement/terminal/DefaultCaseImpl.scala
index 4f13844557..efadae3f9e 100644
--- a/src/col/vct/col/ast/statement/terminal/DefaultCaseImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/DefaultCaseImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.DefaultCase
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.DefaultCaseOps
 
-trait DefaultCaseImpl[G] extends DefaultCaseOps[G] { this: DefaultCase[G] =>
+trait DefaultCaseImpl[G] extends DefaultCaseOps[G] {
+  this: DefaultCase[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("default:")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/ExhaleImpl.scala b/src/col/vct/col/ast/statement/terminal/ExhaleImpl.scala
index a4f547867f..b18536c7a9 100644
--- a/src/col/vct/col/ast/statement/terminal/ExhaleImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/ExhaleImpl.scala
@@ -4,17 +4,17 @@ import vct.col.ast.{Exhale, Expr}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.ExhaleOps
 
-trait ExhaleImpl[G] extends ExhaleOps[G] { this: Exhale[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("exhale") <+> res <> ";"
+trait ExhaleImpl[G] extends ExhaleOps[G] {
+  this: Exhale[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("exhale") <+> res <> ";"
 
-  def layoutSilver(implicit ctx: Ctx): Doc =
-    Text("exhale") <+> res
+  def layoutSilver(implicit ctx: Ctx): Doc = Text("exhale") <+> res
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+    }
 
   override def expr: Expr[G] = this.res
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/ExtractImpl.scala b/src/col/vct/col/ast/statement/terminal/ExtractImpl.scala
index 526034c8da..1c811e9d0c 100644
--- a/src/col/vct/col/ast/statement/terminal/ExtractImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/ExtractImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.Extract
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.ExtractOps
 
-trait ExtractImpl[G] extends ExtractOps[G] { this: Extract[G] =>
-  override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Text("extract")) <+> contractedStatement
+trait ExtractImpl[G] extends ExtractOps[G] {
+  this: Extract[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.inlineSpec(Text("extract")) <+> contractedStatement
 }
diff --git a/src/col/vct/col/ast/statement/terminal/FoldImpl.scala b/src/col/vct/col/ast/statement/terminal/FoldImpl.scala
index ace25ef36f..88d88897aa 100644
--- a/src/col/vct/col/ast/statement/terminal/FoldImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/FoldImpl.scala
@@ -6,17 +6,18 @@ import vct.col.ast.util.CheckFoldUnfoldTarget
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.FoldOps
 
-trait FoldImpl[G] extends NodeFamilyImpl[G] with CheckFoldUnfoldTarget[G] with FoldOps[G] { this: Fold[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("fold") <+> res <> ";"
+trait FoldImpl[G]
+    extends NodeFamilyImpl[G] with CheckFoldUnfoldTarget[G] with FoldOps[G] {
+  this: Fold[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("fold") <+> res <> ";"
 
-  def layoutSilver(implicit ctx: Ctx): Doc =
-    Text("fold") <+> res
+  def layoutSilver(implicit ctx: Ctx): Doc = Text("fold") <+> res
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+    }
 
   override def expr: Expr[G] = this.res
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/ForkImpl.scala b/src/col/vct/col/ast/statement/terminal/ForkImpl.scala
index 6ae45b80c8..edb237ca80 100644
--- a/src/col/vct/col/ast/statement/terminal/ForkImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/ForkImpl.scala
@@ -4,11 +4,12 @@ import vct.col.ast.{Expr, Fork}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.ForkOps
 
-trait ForkImpl[G] extends ForkOps[G] { this: Fork[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("fork") <+> obj <> ";"
+trait ForkImpl[G] extends ForkOps[G] {
+  this: Fork[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("fork") <+> obj <> ";"
 
-  override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.inlineSpec(Show.lazily(layoutSpec(_)))
 
   override def expr: Expr[G] = this.obj
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/FramedProofImpl.scala b/src/col/vct/col/ast/statement/terminal/FramedProofImpl.scala
index d0db7e4fa7..314d068343 100644
--- a/src/col/vct/col/ast/statement/terminal/FramedProofImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/FramedProofImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.FramedProof
 import vct.col.print.{Ctx, Doc, DocUtil, Show, Text}
 import vct.col.ast.ops.FramedProofOps
 
-trait FramedProofImpl[G] extends FramedProofOps[G] { this: FramedProof[G] =>
+trait FramedProofImpl[G] extends FramedProofOps[G] {
+  this: FramedProof[G] =>
   def frameHeader(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
       Text("frame"),
@@ -14,7 +15,8 @@ trait FramedProofImpl[G] extends FramedProofOps[G] { this: FramedProof[G] =>
     ))
 
   def layoutWithSpec(implicit ctx: Ctx): Doc =
-    Doc.spec(Show.lazily(frameHeader(_))) <+/> body.foldBlock(_ <+/> _) <+/> Doc.inlineSpec(Text("}"))
+    Doc.spec(Show.lazily(frameHeader(_))) <+/> body.foldBlock(_ <+/> _) <+/>
+      Doc.inlineSpec(Text("}"))
 
   def layoutNative(implicit ctx: Ctx): Doc =
     Doc.stack(Seq(
@@ -24,6 +26,8 @@ trait FramedProofImpl[G] extends FramedProofOps[G] { this: FramedProof[G] =>
     )) <+> body.layoutAsBlock
 
   override def layout(implicit ctx: Ctx): Doc =
-    if(ctx.syntax != Ctx.PVL && !ctx.inSpec) layoutWithSpec
-    else layoutNative
+    if (ctx.syntax != Ctx.PVL && !ctx.inSpec)
+      layoutWithSpec
+    else
+      layoutNative
 }
diff --git a/src/col/vct/col/ast/statement/terminal/GotoImpl.scala b/src/col/vct/col/ast/statement/terminal/GotoImpl.scala
index bef6e93042..0d3fda6435 100644
--- a/src/col/vct/col/ast/statement/terminal/GotoImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/GotoImpl.scala
@@ -5,7 +5,8 @@ import vct.col.check.{CheckContext, CheckError, OutOfScopeError}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.GotoOps
 
-trait GotoImpl[G] extends GotoOps[G] { this: Goto[G] =>
+trait GotoImpl[G] extends GotoOps[G] {
+  this: Goto[G] =>
   override def check(context: CheckContext[G]): Seq[CheckError] =
     context.currentApplicable.get.body.get.transSubnodes.collectFirst {
       case label: LabelDecl[G] if label == lbl.decl => label
@@ -14,8 +15,9 @@ trait GotoImpl[G] extends GotoOps[G] { this: Goto[G] =>
       case None => Seq(OutOfScopeError(this, lbl))
     }
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => Text("goto") <+> ctx.name(lbl)
-    case _ => Text("goto") <+> ctx.name(lbl) <> ";"
-  }
-}
\ No newline at end of file
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => Text("goto") <+> ctx.name(lbl)
+      case _ => Text("goto") <+> ctx.name(lbl) <> ";"
+    }
+}
diff --git a/src/col/vct/col/ast/statement/terminal/HavocImpl.scala b/src/col/vct/col/ast/statement/terminal/HavocImpl.scala
index eb346ef388..c33f126482 100644
--- a/src/col/vct/col/ast/statement/terminal/HavocImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/HavocImpl.scala
@@ -4,11 +4,12 @@ import vct.col.ast.{Expr, Havoc}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.HavocOps
 
-trait HavocImpl[G] extends HavocOps[G] { this: Havoc[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("havoc") <+> loc <> ";"
+trait HavocImpl[G] extends HavocOps[G] {
+  this: Havoc[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("havoc") <+> loc <> ";"
 
-  override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.inlineSpec(Show.lazily(layoutSpec(_)))
 
   override def expr: Expr[G] = this.loc
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/InhaleImpl.scala b/src/col/vct/col/ast/statement/terminal/InhaleImpl.scala
index 0a4dfcf00a..a46f2f6f67 100644
--- a/src/col/vct/col/ast/statement/terminal/InhaleImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/InhaleImpl.scala
@@ -4,17 +4,17 @@ import vct.col.ast.{Expr, Inhale}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.InhaleOps
 
-trait InhaleImpl[G] extends InhaleOps[G] { this: Inhale[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("inhale") <+> res <> ";"
+trait InhaleImpl[G] extends InhaleOps[G] {
+  this: Inhale[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("inhale") <+> res <> ";"
 
-  def layoutSilver(implicit ctx: Ctx): Doc =
-    Text("inhale") <+> res
+  def layoutSilver(implicit ctx: Ctx): Doc = Text("inhale") <+> res
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+    }
 
   override def expr: Expr[G] = this.res
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/JoinImpl.scala b/src/col/vct/col/ast/statement/terminal/JoinImpl.scala
index 3d7f3f9bde..1d77797aa6 100644
--- a/src/col/vct/col/ast/statement/terminal/JoinImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/JoinImpl.scala
@@ -4,11 +4,12 @@ import vct.col.ast.{Expr, Join}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.JoinOps
 
-trait JoinImpl[G] extends JoinOps[G] { this: Join[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("join") <+> obj <> ";"
+trait JoinImpl[G] extends JoinOps[G] {
+  this: Join[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("join") <+> obj <> ";"
 
-  override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.inlineSpec(Show.lazily(layoutSpec(_)))
 
   override def expr: Expr[G] = this.obj
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/LabelImpl.scala b/src/col/vct/col/ast/statement/terminal/LabelImpl.scala
index 3f8b621850..0d0b777da7 100644
--- a/src/col/vct/col/ast/statement/terminal/LabelImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/LabelImpl.scala
@@ -4,20 +4,28 @@ import vct.col.ast.Label
 import vct.col.print.{Ctx, Doc, NodeDoc, Show, Text}
 import vct.col.ast.ops.LabelOps
 
-trait LabelImpl[G] extends LabelOps[G] { this: Label[G] =>
-  override def foldBlock(f: (Doc, Doc) => Doc)(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.PVL => f(layoutLabel, stat.foldBlock(f))
-    case Ctx.Silver => f(layoutLabel, stat.foldBlock(f))
-    case Ctx.Java => layoutLabel <+> stat.show
-    case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP => f(layoutLabel, stat.foldBlock(f))
-  }
+trait LabelImpl[G] extends LabelOps[G] {
+  this: Label[G] =>
+  override def foldBlock(f: (Doc, Doc) => Doc)(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.PVL => f(layoutLabel, stat.foldBlock(f))
+      case Ctx.Silver => f(layoutLabel, stat.foldBlock(f))
+      case Ctx.Java => layoutLabel <+> stat.show
+      case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP =>
+        f(layoutLabel, stat.foldBlock(f))
+    }
 
-  def layoutLabel(implicit ctx: Ctx): Doc = NodeDoc(this, ctx.syntax match {
-    case Ctx.PVL => Text("label") <+> ctx.name(decl) <> ";"
-    case Ctx.Silver => Text("label") <+> ctx.name(decl)
-    case Ctx.Java => Text(ctx.name(decl)) <> ":"
-    case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP => Text(ctx.name(decl)) <> ":"
-  })
+  def layoutLabel(implicit ctx: Ctx): Doc =
+    NodeDoc(
+      this,
+      ctx.syntax match {
+        case Ctx.PVL => Text("label") <+> ctx.name(decl) <> ";"
+        case Ctx.Silver => Text("label") <+> ctx.name(decl)
+        case Ctx.Java => Text(ctx.name(decl)) <> ":"
+        case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP =>
+          Text(ctx.name(decl)) <> ":"
+      },
+    )
 
   override def layout(implicit ctx: Ctx): Doc = foldBlock(_ <+/> _)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/LockImpl.scala b/src/col/vct/col/ast/statement/terminal/LockImpl.scala
index 6a864ee3f7..4ada85438b 100644
--- a/src/col/vct/col/ast/statement/terminal/LockImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/LockImpl.scala
@@ -4,11 +4,12 @@ import vct.col.ast.{Expr, Lock}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.LockOps
 
-trait LockImpl[G] extends LockOps[G] { this: Lock[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("lock") <+> obj <> ";"
+trait LockImpl[G] extends LockOps[G] {
+  this: Lock[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("lock") <+> obj <> ";"
 
-  override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.inlineSpec(Show.lazily(layoutSpec(_)))
 
   override def expr: Expr[G] = this.obj
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/NormallyCompletingStatementImpl.scala b/src/col/vct/col/ast/statement/terminal/NormallyCompletingStatementImpl.scala
index 92d2d6696b..0489aacad5 100644
--- a/src/col/vct/col/ast/statement/terminal/NormallyCompletingStatementImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/NormallyCompletingStatementImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.statement.terminal
 import vct.col.ast.NormallyCompletingStatement
 import vct.col.ast.statement.StatementImpl
 
-trait NormallyCompletingStatementImpl[G] extends StatementImpl[G] { this: NormallyCompletingStatement[G] =>
+trait NormallyCompletingStatementImpl[G] extends StatementImpl[G] {
+  this: NormallyCompletingStatement[G] =>
 
 }
diff --git a/src/col/vct/col/ast/statement/terminal/NotifyImpl.scala b/src/col/vct/col/ast/statement/terminal/NotifyImpl.scala
index 28a79fd47a..b362e81496 100644
--- a/src/col/vct/col/ast/statement/terminal/NotifyImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/NotifyImpl.scala
@@ -4,11 +4,12 @@ import vct.col.ast.{Expr, Notify}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.NotifyOps
 
-trait NotifyImpl[G] extends NotifyOps[G] { this: Notify[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("notify") <+> obj <> ";"
+trait NotifyImpl[G] extends NotifyOps[G] {
+  this: Notify[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("notify") <+> obj <> ";"
 
-  override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.inlineSpec(Show.lazily(layoutSpec(_)))
 
   override def expr: Expr[G] = this.obj
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/RecvImpl.scala b/src/col/vct/col/ast/statement/terminal/RecvImpl.scala
index b07bfd077f..e03bd02b8e 100644
--- a/src/col/vct/col/ast/statement/terminal/RecvImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/RecvImpl.scala
@@ -4,10 +4,10 @@ import vct.col.ast.Recv
 import vct.col.print._
 import vct.col.ast.ops.RecvOps
 
-trait RecvImpl[G] extends RecvOps[G] { this: Recv[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("recv") <+> ctx.name(ref) <> ";"
+trait RecvImpl[G] extends RecvOps[G] {
+  this: Recv[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("recv") <+> ctx.name(ref) <> ";"
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.inlineSpec(Show.lazily(layoutSpec(_)))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/RefuteImpl.scala b/src/col/vct/col/ast/statement/terminal/RefuteImpl.scala
index 957e4ed4e4..f48b4a3647 100644
--- a/src/col/vct/col/ast/statement/terminal/RefuteImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/RefuteImpl.scala
@@ -4,17 +4,17 @@ import vct.col.ast.{Expr, Refute}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.RefuteOps
 
-trait RefuteImpl[G] extends RefuteOps[G] { this: Refute[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("refute") <+> assn <> ";"
+trait RefuteImpl[G] extends RefuteOps[G] {
+  this: Refute[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("refute") <+> assn <> ";"
 
-  def layoutSilver(implicit ctx: Ctx): Doc =
-    Text("refute") <+> assn
+  def layoutSilver(implicit ctx: Ctx): Doc = Text("refute") <+> assn
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+    }
 
   override def expr: Expr[G] = this.assn
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/SendImpl.scala b/src/col/vct/col/ast/statement/terminal/SendImpl.scala
index fd007d8340..1f93da7b32 100644
--- a/src/col/vct/col/ast/statement/terminal/SendImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/SendImpl.scala
@@ -4,12 +4,16 @@ import vct.col.ast.{Expr, Send}
 import vct.col.print.{Ctx, Doc, Group, Show, Text}
 import vct.col.ast.ops.SendOps
 
-trait SendImpl[G] extends SendOps[G] { this: Send[G] =>
+trait SendImpl[G] extends SendOps[G] {
+  this: Send[G] =>
   def layoutSpec(implicit ctx: Ctx): Doc =
-    Group(Text("send") <+> ctx.name(decl) <> "," <+> delta.toString <> ":" <>> res <> ";")
+    Group(
+      Text("send") <+> ctx.name(decl) <> "," <+> delta.toString <> ":" <>>
+        res <> ";"
+    )
 
   override def layout(implicit ctx: Ctx): Doc =
     Doc.inlineSpec(Show.lazily(layoutSpec(_)))
 
   override def expr: Expr[G] = this.res
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/SwitchCaseImpl.scala b/src/col/vct/col/ast/statement/terminal/SwitchCaseImpl.scala
index 45daea311f..ae0290641b 100644
--- a/src/col/vct/col/ast/statement/terminal/SwitchCaseImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/SwitchCaseImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.statement.terminal
 
 import vct.col.ast.SwitchCase
 
-trait SwitchCaseImpl[G] { this: SwitchCase[G] =>
+trait SwitchCaseImpl[G] {
+  this: SwitchCase[G] =>
 
 }
diff --git a/src/col/vct/col/ast/statement/terminal/UnfoldImpl.scala b/src/col/vct/col/ast/statement/terminal/UnfoldImpl.scala
index 759e81c9c5..3d38445a62 100644
--- a/src/col/vct/col/ast/statement/terminal/UnfoldImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/UnfoldImpl.scala
@@ -6,17 +6,18 @@ import vct.col.ast.util.CheckFoldUnfoldTarget
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.UnfoldOps
 
-trait UnfoldImpl[G] extends NodeFamilyImpl[G] with CheckFoldUnfoldTarget[G] with UnfoldOps[G] { this: Unfold[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("unfold") <+> res <> ";"
+trait UnfoldImpl[G]
+    extends NodeFamilyImpl[G] with CheckFoldUnfoldTarget[G] with UnfoldOps[G] {
+  this: Unfold[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("unfold") <+> res <> ";"
 
-  def layoutSilver(implicit ctx: Ctx): Doc =
-    Text("unfold") <+> res
+  def layoutSilver(implicit ctx: Ctx): Doc = Text("unfold") <+> res
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => layoutSilver
-    case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => layoutSilver
+      case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+    }
 
   override def expr: Expr[G] = this.res
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/UnlockImpl.scala b/src/col/vct/col/ast/statement/terminal/UnlockImpl.scala
index 3f4f2acc23..455f2eb2e6 100644
--- a/src/col/vct/col/ast/statement/terminal/UnlockImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/UnlockImpl.scala
@@ -4,11 +4,12 @@ import vct.col.ast.{Expr, Unlock}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.UnlockOps
 
-trait UnlockImpl[G] extends UnlockOps[G] { this: Unlock[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("unlock") <+> obj <> ";"
+trait UnlockImpl[G] extends UnlockOps[G] {
+  this: Unlock[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("unlock") <+> obj <> ";"
 
-  override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.inlineSpec(Show.lazily(layoutSpec(_)))
 
   override def expr: Expr[G] = this.obj
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/WaitImpl.scala b/src/col/vct/col/ast/statement/terminal/WaitImpl.scala
index 317a91b89c..f97a7a588f 100644
--- a/src/col/vct/col/ast/statement/terminal/WaitImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/WaitImpl.scala
@@ -4,11 +4,12 @@ import vct.col.ast.{Expr, Wait}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.WaitOps
 
-trait WaitImpl[G] extends WaitOps[G] { this: Wait[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("wait") <+> obj <> ";"
+trait WaitImpl[G] extends WaitOps[G] {
+  this: Wait[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("wait") <+> obj <> ";"
 
-  override def layout(implicit ctx: Ctx): Doc = Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+  override def layout(implicit ctx: Ctx): Doc =
+    Doc.inlineSpec(Show.lazily(layoutSpec(_)))
 
   override def expr: Expr[G] = this.obj
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/terminal/WandApplyImpl.scala b/src/col/vct/col/ast/statement/terminal/WandApplyImpl.scala
index 332ca1d490..1de595469a 100644
--- a/src/col/vct/col/ast/statement/terminal/WandApplyImpl.scala
+++ b/src/col/vct/col/ast/statement/terminal/WandApplyImpl.scala
@@ -4,14 +4,15 @@ import vct.col.ast.{Expr, WandApply}
 import vct.col.print.{Ctx, Doc, Show, Text}
 import vct.col.ast.ops.WandApplyOps
 
-trait WandApplyImpl[G] extends WandApplyOps[G] { this: WandApply[G] =>
-  def layoutSpec(implicit ctx: Ctx): Doc =
-    Text("apply") <+> res <> ";"
+trait WandApplyImpl[G] extends WandApplyOps[G] {
+  this: WandApply[G] =>
+  def layoutSpec(implicit ctx: Ctx): Doc = Text("apply") <+> res <> ";"
 
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.Silver => Text("apply") <+> res
-    case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
-  }
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.Silver => Text("apply") <+> res
+      case _ => Doc.inlineSpec(Show.lazily(layoutSpec(_)))
+    }
 
   override def expr: Expr[G] = this.res
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/statement/veymont/ChorBranchImpl.scala b/src/col/vct/col/ast/statement/veymont/ChorBranchImpl.scala
index 5ba52ab396..a7b8f1b3f4 100644
--- a/src/col/vct/col/ast/statement/veymont/ChorBranchImpl.scala
+++ b/src/col/vct/col/ast/statement/veymont/ChorBranchImpl.scala
@@ -1,6 +1,15 @@
 package vct.col.ast.statement.veymont
 
-import vct.col.ast.{Assign, ChorStatement, Communicate, Endpoint, EndpointGuard, EndpointName, ChorBranch, UnpointedGuard}
+import vct.col.ast.{
+  Assign,
+  ChorStatement,
+  Communicate,
+  Endpoint,
+  EndpointGuard,
+  EndpointName,
+  ChorBranch,
+  UnpointedGuard,
+}
 import vct.col.ast.statement.StatementImpl
 import vct.col.check.{CheckContext, CheckError, SeqProgParticipant}
 import vct.col.ref.Ref
@@ -8,13 +17,18 @@ import vct.col.ref.Ref
 import scala.collection.immutable.ListSet
 import vct.col.ast.ops.ChorBranchOps
 
-trait ChorBranchImpl[G] extends StatementImpl[G] with ChorBranchOps[G] { this: ChorBranch[G] =>
+trait ChorBranchImpl[G] extends StatementImpl[G] with ChorBranchOps[G] {
+  this: ChorBranch[G] =>
   assert(guards.nonEmpty)
 
-  def hasUnpointed: Boolean = guards.exists { case _: UnpointedGuard[G] => true; case _ => false }
-  def explicitParticipants: Seq[Endpoint[G]] = guards.collect { case EndpointGuard(Ref(endpoint), condition) => endpoint }
+  def hasUnpointed: Boolean =
+    guards.exists { case _: UnpointedGuard[G] => true; case _ => false }
+  def explicitParticipants: Seq[Endpoint[G]] =
+    guards.collect { case EndpointGuard(Ref(endpoint), condition) => endpoint }
 
-  override def enterCheckContextCurrentParticipatingEndpoints(context: CheckContext[G]): Option[Set[Endpoint[G]]] = {
+  override def enterCheckContextCurrentParticipatingEndpoints(
+      context: CheckContext[G]
+  ): Option[Set[Endpoint[G]]] = {
     // Assume SeqProg sets participatingEndpoints
     assert(context.currentParticipatingEndpoints.isDefined)
 
@@ -27,18 +41,21 @@ trait ChorBranchImpl[G] extends StatementImpl[G] with ChorBranchOps[G] { this: C
     }
   }
 
-  override def check(context: CheckContext[G]): Seq[CheckError] = super.check(context) ++ {
-    // Assume SeqProg sets participatingEndpoints
-    assert(context.currentParticipatingEndpoints.isDefined)
+  override def check(context: CheckContext[G]): Seq[CheckError] =
+    super.check(context) ++ {
+      // Assume SeqProg sets participatingEndpoints
+      assert(context.currentParticipatingEndpoints.isDefined)
 
-    // Ensure the set of participants is at most refined
-    if (Set.from(explicitParticipants).subsetOf(context.currentParticipatingEndpoints.get)) {
-      Seq()
-    } else {
-      // There are participants in this if that have been excluded from participation: error
-      Seq(SeqProgParticipant(this))
+      // Ensure the set of participants is at most refined
+      if (
+        Set.from(explicitParticipants)
+          .subsetOf(context.currentParticipatingEndpoints.get)
+      ) { Seq() }
+      else {
+        // There are participants in this if that have been excluded from participation: error
+        Seq(SeqProgParticipant(this))
+      }
     }
-  }
 
   // All participants that concretely participate in the branch by being named explicitly through the condition,
   // an assignment, or a communicate.
diff --git a/src/col/vct/col/ast/statement/veymont/ChorLoopImpl.scala b/src/col/vct/col/ast/statement/veymont/ChorLoopImpl.scala
index 511c531c76..fdb88069bb 100644
--- a/src/col/vct/col/ast/statement/veymont/ChorLoopImpl.scala
+++ b/src/col/vct/col/ast/statement/veymont/ChorLoopImpl.scala
@@ -1,18 +1,33 @@
 package vct.col.ast.statement.veymont
 
 import vct.col.ast.statement.StatementImpl
-import vct.col.ast.{Assign, ChorStatement, Communicate, Endpoint, EndpointGuard, EndpointName, ChorBranch, ChorLoop, UnpointedGuard}
+import vct.col.ast.{
+  Assign,
+  ChorStatement,
+  Communicate,
+  Endpoint,
+  EndpointGuard,
+  EndpointName,
+  ChorBranch,
+  ChorLoop,
+  UnpointedGuard,
+}
 import vct.col.check.{CheckContext, CheckError, SeqProgParticipant}
 import vct.col.ref.Ref
 
 import scala.collection.immutable.ListSet
 import vct.col.ast.ops.ChorLoopOps
 
-trait ChorLoopImpl[G] extends StatementImpl[G] with ChorLoopOps[G] { this: ChorLoop[G] =>
-  def hasUnpointed: Boolean = guards.exists { case _: UnpointedGuard[G] => true; case _ => false }
-  def explicitParticipants: Seq[Endpoint[G]] = guards.collect { case EndpointGuard(Ref(endpoint), condition) => endpoint }
+trait ChorLoopImpl[G] extends StatementImpl[G] with ChorLoopOps[G] {
+  this: ChorLoop[G] =>
+  def hasUnpointed: Boolean =
+    guards.exists { case _: UnpointedGuard[G] => true; case _ => false }
+  def explicitParticipants: Seq[Endpoint[G]] =
+    guards.collect { case EndpointGuard(Ref(endpoint), condition) => endpoint }
 
-  override def enterCheckContextCurrentParticipatingEndpoints(context: CheckContext[G]): Option[Set[Endpoint[G]]] = {
+  override def enterCheckContextCurrentParticipatingEndpoints(
+      context: CheckContext[G]
+  ): Option[Set[Endpoint[G]]] = {
     // Assume SeqProg sets participatingEndpoints
     assert(context.currentParticipatingEndpoints.isDefined)
 
@@ -25,18 +40,21 @@ trait ChorLoopImpl[G] extends StatementImpl[G] with ChorLoopOps[G] { this: ChorL
     }
   }
 
-  override def check(context: CheckContext[G]): Seq[CheckError] = super.check(context) ++ {
-    // Assume SeqProg sets participatingEndpoints
-    assert(context.currentParticipatingEndpoints.isDefined)
+  override def check(context: CheckContext[G]): Seq[CheckError] =
+    super.check(context) ++ {
+      // Assume SeqProg sets participatingEndpoints
+      assert(context.currentParticipatingEndpoints.isDefined)
 
-    // Ensure the set of participants is at most refined
-    if (Set.from(explicitParticipants).subsetOf(context.currentParticipatingEndpoints.get)) {
-      Seq()
-    } else {
-      // There are participants in this if that have been excluded from participation: error
-      Seq(SeqProgParticipant(this))
+      // Ensure the set of participants is at most refined
+      if (
+        Set.from(explicitParticipants)
+          .subsetOf(context.currentParticipatingEndpoints.get)
+      ) { Seq() }
+      else {
+        // There are participants in this if that have been excluded from participation: error
+        Seq(SeqProgParticipant(this))
+      }
     }
-  }
 
   def participants: Set[Endpoint[G]] =
     ListSet.from(collect {
diff --git a/src/col/vct/col/ast/statement/veymont/ChorStatementImpl.scala b/src/col/vct/col/ast/statement/veymont/ChorStatementImpl.scala
index 9be0079e8d..ba9286da0e 100644
--- a/src/col/vct/col/ast/statement/veymont/ChorStatementImpl.scala
+++ b/src/col/vct/col/ast/statement/veymont/ChorStatementImpl.scala
@@ -1,23 +1,58 @@
 package vct.col.ast.statement.veymont
 
-import vct.col.ast.{Assert, Assign, Assume, Block, Branch, ChorBranch, ChorLoop, ChorStatement, Communicate, CommunicateStatement, CommunicateX, Deref, Endpoint, EndpointName, Eval, Expr, Loop, MethodInvocation, Scope, ThisChoreography, UnresolvedChorBranch, UnresolvedChorLoop, VeyMontAssignExpression}
+import vct.col.ast.{
+  Assert,
+  Assign,
+  Assume,
+  Block,
+  Branch,
+  ChorBranch,
+  ChorLoop,
+  ChorStatement,
+  Communicate,
+  CommunicateStatement,
+  CommunicateX,
+  Deref,
+  Endpoint,
+  EndpointName,
+  Eval,
+  Expr,
+  Loop,
+  MethodInvocation,
+  Scope,
+  ThisChoreography,
+  UnresolvedChorBranch,
+  UnresolvedChorLoop,
+  VeyMontAssignExpression,
+}
 import vct.col.ast.ops.ChorStatementOps
 import vct.col.ast.statement.StatementImpl
-import vct.col.check.{CheckContext, CheckError, SeqProgInvocation, SeqProgNoParticipant, SeqProgParticipant, SeqProgStatement}
+import vct.col.check.{
+  CheckContext,
+  CheckError,
+  SeqProgInvocation,
+  SeqProgNoParticipant,
+  SeqProgParticipant,
+  SeqProgStatement,
+}
 import vct.col.print.{Ctx, Doc, Line, Text}
 import vct.col.ref.Ref
 
-trait ChorStatementImpl[G] extends ChorStatementOps[G] with StatementImpl[G] { this: ChorStatement[G] =>
+trait ChorStatementImpl[G] extends ChorStatementOps[G] with StatementImpl[G] {
+  this: ChorStatement[G] =>
   assert(wellformed)
-  def wellformed: Boolean = inner match {
-    // ChorStatement should not be nested, and is transparent w.r.t some statements.
-    // Proper encoding & filtering of this should happen in LangVeymontToCol
-    case _: Block[G] | _: Scope[G] | _: Branch[G] | _: Loop[G] | _: ChorStatement[G] => false
-    // Communicate consists of two statements (send & receive) for which each should easily resolve to an endpoint,
-    // so it also shouldn't be put in a chorstmt
-    case _: CommunicateStatement[G] => false
-    case _ => true
-  }
+  def wellformed: Boolean =
+    inner match {
+      // ChorStatement should not be nested, and is transparent w.r.t some statements.
+      // Proper encoding & filtering of this should happen in LangVeymontToCol
+      case _: Block[G] | _: Scope[G] | _: Branch[G] | _: Loop[G] |
+          _: ChorStatement[G] =>
+        false
+      // Communicate consists of two statements (send & receive) for which each should easily resolve to an endpoint,
+      // so it also shouldn't be put in a chorstmt
+      case _: CommunicateStatement[G] => false
+      case _ => true
+    }
 
   override def layout(implicit ctx: Ctx): Doc =
     (endpoint match {
@@ -26,68 +61,98 @@ trait ChorStatementImpl[G] extends ChorStatementOps[G] with StatementImpl[G] { t
     }) <> inner
 
   object eval {
-    def enterCheckContextCurrentReceiverEndpoint(chorStmt: ChorStatement[G], node: Eval[G], context: CheckContext[G]): Option[Endpoint[G]] =
+    def enterCheckContextCurrentReceiverEndpoint(
+        chorStmt: ChorStatement[G],
+        node: Eval[G],
+        context: CheckContext[G],
+    ): Option[Endpoint[G]] =
       (chorStmt.endpoint, node) match {
-        case (Some(Ref(endpoint)), Eval(MethodInvocation(_, _, _, _, _, _, _))) => Some(endpoint)
-        case (None, Eval(MethodInvocation(e, _, _, _, _, _, _))) if rootEndpoint(e).isDefined => Some(rootEndpoint(e).get)
+        case (
+              Some(Ref(endpoint)),
+              Eval(MethodInvocation(_, _, _, _, _, _, _)),
+            ) =>
+          Some(endpoint)
+        case (None, Eval(MethodInvocation(e, _, _, _, _, _, _)))
+            if rootEndpoint(e).isDefined =>
+          Some(rootEndpoint(e).get)
         case _ => context.currentReceiverEndpoint
       }
 
-    def check(chorStmt: ChorStatement[G], node: Eval[G], context: CheckContext[G]): Seq[CheckError] = (context.currentChoreography, node.expr) match {
-      case (None, _) => Seq()
-      case (Some(_), MethodInvocation(ThisChoreography(_), _, _, _, _, _, _)) => Seq()
-      case (Some(_), MethodInvocation(e, _, _, _, _, _, _)) if rootEndpoint(e).isDefined => Seq()
-      case _ => Seq(SeqProgInvocation(node))
-    }
+    def check(
+        chorStmt: ChorStatement[G],
+        node: Eval[G],
+        context: CheckContext[G],
+    ): Seq[CheckError] =
+      (context.currentChoreography, node.expr) match {
+        case (None, _) => Seq()
+        case (
+              Some(_),
+              MethodInvocation(ThisChoreography(_), _, _, _, _, _, _),
+            ) =>
+          Seq()
+        case (Some(_), MethodInvocation(e, _, _, _, _, _, _))
+            if rootEndpoint(e).isDefined =>
+          Seq()
+        case _ => Seq(SeqProgInvocation(node))
+      }
   }
 
-  def rootEndpoint(expr: Expr[G]): Option[Endpoint[G]] = expr match {
-    case MethodInvocation(e, _, _, _, _, _, _) => rootEndpoint(e)
-    case Deref(obj, _) => rootEndpoint(obj)
-    case EndpointName(Ref(e)) => Some(e)
-    case _ => None
-  }
+  def rootEndpoint(expr: Expr[G]): Option[Endpoint[G]] =
+    expr match {
+      case MethodInvocation(e, _, _, _, _, _, _) => rootEndpoint(e)
+      case Deref(obj, _) => rootEndpoint(obj)
+      case EndpointName(Ref(e)) => Some(e)
+      case _ => None
+    }
 
   object assign {
-    def receiver(chorStmt: ChorStatement[G], node: Assign[G]): Option[Endpoint[G]] =
-      chorStmt.endpoint.map(_.decl)
+    def receiver(
+        chorStmt: ChorStatement[G],
+        node: Assign[G],
+    ): Option[Endpoint[G]] = chorStmt.endpoint.map(_.decl)
 
-    def enterCheckContextCurrentReceiverEndpoint(chorStmt: ChorStatement[G], node: Assign[G], context: CheckContext[G]): Option[Endpoint[G]] =
-      receiver(chorStmt, node)
+    def enterCheckContextCurrentReceiverEndpoint(
+        chorStmt: ChorStatement[G],
+        node: Assign[G],
+        context: CheckContext[G],
+    ): Option[Endpoint[G]] = receiver(chorStmt, node)
 
-    def check(chorStmt: ChorStatement[G], node: Assign[G], context: CheckContext[G]): Seq[CheckError] = {
+    def check(
+        chorStmt: ChorStatement[G],
+        node: Assign[G],
+        context: CheckContext[G],
+    ): Seq[CheckError] = {
       receiver(chorStmt, node) match {
-        case Some(endpoint) if !context.currentParticipatingEndpoints.get.contains(endpoint) =>
+        case Some(endpoint)
+            if !context.currentParticipatingEndpoints.get.contains(endpoint) =>
           Seq(SeqProgParticipant(chorStmt))
         case _ => Nil
       }
     }
   }
 
-  override def enterCheckContextCurrentReceiverEndpoint(context: CheckContext[G]): Option[Endpoint[G]] = inner match {
-    case node: Eval[G] => eval.enterCheckContextCurrentReceiverEndpoint(this, node, context)
-    case node: Assign[G] => assign.enterCheckContextCurrentReceiverEndpoint(this, node, context)
-    case _ => context.currentReceiverEndpoint
-  }
+  override def enterCheckContextCurrentReceiverEndpoint(
+      context: CheckContext[G]
+  ): Option[Endpoint[G]] =
+    inner match {
+      case node: Eval[G] =>
+        eval.enterCheckContextCurrentReceiverEndpoint(this, node, context)
+      case node: Assign[G] =>
+        assign.enterCheckContextCurrentReceiverEndpoint(this, node, context)
+      case _ => context.currentReceiverEndpoint
+    }
 
-  override def check(context: CheckContext[G]): Seq[CheckError] = super.check(context) ++ (inner match {
-    case node: Eval[G] => eval.check(this, node, context)
-    case node: Assign[G] => assign.check(this, node, context)
-    case
-      _: CommunicateX[G] |
-      _: CommunicateStatement[G] |
-      _: VeyMontAssignExpression[G] |
-      _: Branch[G] |
-      _: Loop[G] |
-      _: Scope[G] |
-      _: Block[G] |
-      _: Assert[G] |
-      _: Assume[G] |
-      _: UnresolvedChorBranch[G] |
-      _: UnresolvedChorLoop[G] |
-      _: ChorBranch[G] |
-      _: ChorLoop[G] |
-      _: ChorStatement[G] => Seq()
-    case _ => Seq(SeqProgStatement(this))
-  })
+  override def check(context: CheckContext[G]): Seq[CheckError] =
+    super.check(context) ++
+      (inner match {
+        case node: Eval[G] => eval.check(this, node, context)
+        case node: Assign[G] => assign.check(this, node, context)
+        case _: CommunicateX[G] | _: CommunicateStatement[G] |
+            _: VeyMontAssignExpression[G] | _: Branch[G] | _: Loop[G] |
+            _: Scope[G] | _: Block[G] | _: Assert[G] | _: Assume[G] |
+            _: UnresolvedChorBranch[G] | _: UnresolvedChorLoop[G] |
+            _: ChorBranch[G] | _: ChorLoop[G] | _: ChorStatement[G] =>
+          Seq()
+        case _ => Seq(SeqProgStatement(this))
+      })
 }
diff --git a/src/col/vct/col/ast/statement/veymont/CommunicateImpl.scala b/src/col/vct/col/ast/statement/veymont/CommunicateImpl.scala
index 103efe356a..5a7bd590a5 100644
--- a/src/col/vct/col/ast/statement/veymont/CommunicateImpl.scala
+++ b/src/col/vct/col/ast/statement/veymont/CommunicateImpl.scala
@@ -7,21 +7,34 @@ import vct.col.ref.Ref
 import vct.col.ast.ops.CommunicateOps
 import vct.col.ast.ops.{CommunicateOps, CommunicateFamilyOps}
 
-trait CommunicateImpl[G] extends CommunicateOps[G] with CommunicateFamilyOps[G] { this: Communicate[G] =>
+trait CommunicateImpl[G]
+    extends CommunicateOps[G] with CommunicateFamilyOps[G] {
+  this: Communicate[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("communicate") <+> layoutParticipant(receiver) <> target.show <+> "<-" <+> layoutParticipant(sender) <> msg.show <> ";")
+    Group(
+      Text("communicate") <+> layoutParticipant(receiver) <> target.show <+>
+        "<-" <+> layoutParticipant(sender) <> msg.show <> ";"
+    )
 
-  def layoutParticipant(endpoint: Option[Ref[G, Endpoint[G]]])(implicit ctx: Ctx) =
-    endpoint.map(ref => Text(ctx.name(ref)) <> ": ").getOrElse(Text(""))
+  def layoutParticipant(endpoint: Option[Ref[G, Endpoint[G]]])(
+      implicit ctx: Ctx
+  ) = endpoint.map(ref => Text(ctx.name(ref)) <> ": ").getOrElse(Text(""))
 
-  override def check(context: CheckContext[G]): Seq[CheckError] = this match {
-    case comm: Communicate[G] if sender.isDefined && !context.currentParticipatingEndpoints.get.contains(sender.get.decl) =>
-      Seq(SeqProgParticipant(sender.get.decl))
-    case comm: Communicate[G] if receiver.isDefined && !context.currentParticipatingEndpoints.get.contains(receiver.get.decl) =>
-      Seq(SeqProgParticipant(receiver.get.decl))
-    case _ => Nil
-  }
+  override def check(context: CheckContext[G]): Seq[CheckError] =
+    this match {
+      case comm: Communicate[G]
+          if sender.isDefined &&
+            !context.currentParticipatingEndpoints.get
+              .contains(sender.get.decl) =>
+        Seq(SeqProgParticipant(sender.get.decl))
+      case comm: Communicate[G]
+          if receiver.isDefined &&
+            !context.currentParticipatingEndpoints.get
+              .contains(receiver.get.decl) =>
+        Seq(SeqProgParticipant(receiver.get.decl))
+      case _ => Nil
+    }
 
-  def participants: Seq[Endpoint[G]] =
-    (sender.toSeq ++ receiver.toSeq).map(_.decl)
+  def participants: Seq[Endpoint[G]] = (sender.toSeq ++ receiver.toSeq)
+    .map(_.decl)
 }
diff --git a/src/col/vct/col/ast/statement/veymont/CommunicateXImpl.scala b/src/col/vct/col/ast/statement/veymont/CommunicateXImpl.scala
index a9673da207..96fdaabca4 100644
--- a/src/col/vct/col/ast/statement/veymont/CommunicateXImpl.scala
+++ b/src/col/vct/col/ast/statement/veymont/CommunicateXImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CommunicateX
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.CommunicateXOps
 
-trait CommunicateXImpl[G] extends CommunicateXOps[G] { this: CommunicateX[G] =>
+trait CommunicateXImpl[G] extends CommunicateXOps[G] {
+  this: CommunicateX[G] =>
   override def layout(implicit ctx: Ctx): Doc = assign.show
 }
diff --git a/src/col/vct/col/ast/statement/veymont/VeyMontAssignExpressionImpl.scala b/src/col/vct/col/ast/statement/veymont/VeyMontAssignExpressionImpl.scala
index 1b24014bd3..4f36cc51dd 100644
--- a/src/col/vct/col/ast/statement/veymont/VeyMontAssignExpressionImpl.scala
+++ b/src/col/vct/col/ast/statement/veymont/VeyMontAssignExpressionImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.VeyMontAssignExpression
 import vct.col.print._
 import vct.col.ast.ops.VeyMontAssignExpressionOps
 
-trait VeyMontAssignExpressionImpl[G] extends VeyMontAssignExpressionOps[G] { this: VeyMontAssignExpression[G] =>
+trait VeyMontAssignExpressionImpl[G] extends VeyMontAssignExpressionOps[G] {
+  this: VeyMontAssignExpression[G] =>
   override def layout(implicit ctx: Ctx): Doc = assign.show
 }
diff --git a/src/col/vct/col/ast/type/TAnyClassImpl.scala b/src/col/vct/col/ast/type/TAnyClassImpl.scala
index f6090146b3..092921c5e0 100644
--- a/src/col/vct/col/ast/type/TAnyClassImpl.scala
+++ b/src/col/vct/col/ast/type/TAnyClassImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TAnyClass
 import vct.col.print._
 import vct.col.ast.ops.TAnyClassOps
 
-trait TAnyClassImpl[G] extends TAnyClassOps[G] { this: TAnyClass[G] =>
+trait TAnyClassImpl[G] extends TAnyClassOps[G] {
+  this: TAnyClass[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("Object")
 }
diff --git a/src/col/vct/col/ast/type/TAnyImpl.scala b/src/col/vct/col/ast/type/TAnyImpl.scala
index af6257082d..f8e7d9d73f 100644
--- a/src/col/vct/col/ast/type/TAnyImpl.scala
+++ b/src/col/vct/col/ast/type/TAnyImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.`type`
 import vct.col.ast.TAny
 import vct.col.ast.ops.TAnyOps
 
-trait TAnyImpl[G] extends TAnyOps[G] { this: TAny[G] =>
+trait TAnyImpl[G] extends TAnyOps[G] {
+  this: TAny[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TAnyValueImpl.scala b/src/col/vct/col/ast/type/TAnyValueImpl.scala
index e70b98a126..195e4fe15c 100644
--- a/src/col/vct/col/ast/type/TAnyValueImpl.scala
+++ b/src/col/vct/col/ast/type/TAnyValueImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TAnyValue
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TAnyValueOps
 
-trait TAnyValueImpl[G] extends TAnyValueOps[G] { this: TAnyValue[G] =>
+trait TAnyValueImpl[G] extends TAnyValueOps[G] {
+  this: TAnyValue[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("any")
 }
diff --git a/src/col/vct/col/ast/type/TArrayImpl.scala b/src/col/vct/col/ast/type/TArrayImpl.scala
index 250e0fc7a7..6cce58a313 100644
--- a/src/col/vct/col/ast/type/TArrayImpl.scala
+++ b/src/col/vct/col/ast/type/TArrayImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TArray
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TArrayOps
 
-trait TArrayImpl[G] extends TArrayOps[G] { this: TArray[G] =>
+trait TArrayImpl[G] extends TArrayOps[G] {
+  this: TArray[G] =>
   override def layout(implicit ctx: Ctx): Doc = element.show <> "[]"
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TAxiomaticImpl.scala b/src/col/vct/col/ast/type/TAxiomaticImpl.scala
index 02ba46b302..0e7a0cbd8e 100644
--- a/src/col/vct/col/ast/type/TAxiomaticImpl.scala
+++ b/src/col/vct/col/ast/type/TAxiomaticImpl.scala
@@ -4,7 +4,14 @@ import vct.col.ast.TAxiomatic
 import vct.col.print.{Ctx, Doc, Text, Empty, Group}
 import vct.col.ast.ops.TAxiomaticOps
 
-trait TAxiomaticImpl[G] extends TAxiomaticOps[G] { this: TAxiomatic[G] =>
+trait TAxiomaticImpl[G] extends TAxiomaticOps[G] {
+  this: TAxiomatic[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text(ctx.name(adt)) <> (if(args.isEmpty) Empty else open <> Doc.args(args) <> close))
-}
\ No newline at end of file
+    Group(
+      Text(ctx.name(adt)) <>
+        (if (args.isEmpty)
+           Empty
+         else
+           open <> Doc.args(args) <> close)
+    )
+}
diff --git a/src/col/vct/col/ast/type/TBagImpl.scala b/src/col/vct/col/ast/type/TBagImpl.scala
index f5b01448f0..321ee3540f 100644
--- a/src/col/vct/col/ast/type/TBagImpl.scala
+++ b/src/col/vct/col/ast/type/TBagImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TBag
 import vct.col.print.{Ctx, Doc, Empty, Group, Text}
 import vct.col.ast.ops.TBagOps
 
-trait TBagImpl[G] extends TBagOps[G] { this: TBag[G] =>
+trait TBagImpl[G] extends TBagOps[G] {
+  this: TBag[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("bag") <> open <> Doc.arg(element) <> close)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TBoolImpl.scala b/src/col/vct/col/ast/type/TBoolImpl.scala
index 3f0c75b9df..b12a553cb0 100644
--- a/src/col/vct/col/ast/type/TBoolImpl.scala
+++ b/src/col/vct/col/ast/type/TBoolImpl.scala
@@ -4,11 +4,13 @@ import vct.col.ast.TBool
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TBoolOps
 
-trait TBoolImpl[G] extends TBoolOps[G] { this: TBool[G] =>
-  override def layout(implicit ctx: Ctx): Doc = ctx.syntax match {
-    case Ctx.PVL => Text("boolean")
-    case Ctx.Silver => Text("Bool")
-    case Ctx.Java => Text("boolean")
-    case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP => Text("bool")
-  }
-}
\ No newline at end of file
+trait TBoolImpl[G] extends TBoolOps[G] {
+  this: TBool[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    ctx.syntax match {
+      case Ctx.PVL => Text("boolean")
+      case Ctx.Silver => Text("Bool")
+      case Ctx.Java => Text("boolean")
+      case Ctx.C | Ctx.Cuda | Ctx.OpenCL | Ctx.CPP => Text("bool")
+    }
+}
diff --git a/src/col/vct/col/ast/type/TBoundedIntImpl.scala b/src/col/vct/col/ast/type/TBoundedIntImpl.scala
index f3590db4a6..c0d2899206 100644
--- a/src/col/vct/col/ast/type/TBoundedIntImpl.scala
+++ b/src/col/vct/col/ast/type/TBoundedIntImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.`type`
 import vct.col.ast.TBoundedInt
 import vct.col.ast.ops.TBoundedIntOps
 
-trait TBoundedIntImpl[G] extends TBoundedIntOps[G] { this: TBoundedInt[G] =>
+trait TBoundedIntImpl[G] extends TBoundedIntOps[G] {
+  this: TBoundedInt[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TCFloatImpl.scala b/src/col/vct/col/ast/type/TCFloatImpl.scala
index c97b7ad49e..e635d66aa0 100644
--- a/src/col/vct/col/ast/type/TCFloatImpl.scala
+++ b/src/col/vct/col/ast/type/TCFloatImpl.scala
@@ -5,12 +5,14 @@ import vct.col.ast.`type`.typeclass.TFloats
 import vct.col.ast.ops.TCFloatOps
 
 object TCFloats {
-  def fromTCFloat[G](t: TCFloat[G]): TFloat[G] = TFloat(t.exponent, t.mantissa)(t.o)
+  def fromTCFloat[G](t: TCFloat[G]): TFloat[G] =
+    TFloat(t.exponent, t.mantissa)(t.o)
 }
 
-trait TCFloatImpl[G] extends TCFloatOps[G] { this: TCFloat[G] =>
+trait TCFloatImpl[G] extends TCFloatOps[G] {
+  this: TCFloat[G] =>
 
   def is_ieee754_32bit: Boolean = this == TFloats.C_ieee754_32bit[G]
 
   def is_ieee754_64bit: Boolean = this == TFloats.C_ieee754_64bit[G]
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TCIntImpl.scala b/src/col/vct/col/ast/type/TCIntImpl.scala
index b97a18730b..ffda4c52f0 100644
--- a/src/col/vct/col/ast/type/TCIntImpl.scala
+++ b/src/col/vct/col/ast/type/TCIntImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TCInt
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TCIntOps
 
-trait TCIntImpl[G] extends TCIntOps[G] { this: TCInt[G] =>
+trait TCIntImpl[G] extends TCIntOps[G] {
+  this: TCInt[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("int")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TCharImpl.scala b/src/col/vct/col/ast/type/TCharImpl.scala
index 14c580312a..5e0b428326 100644
--- a/src/col/vct/col/ast/type/TCharImpl.scala
+++ b/src/col/vct/col/ast/type/TCharImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TChar
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.TCharOps
 
-trait TCharImpl[G] extends TCharOps[G] { this: TChar[G] =>
+trait TCharImpl[G] extends TCharOps[G] {
+  this: TChar[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("char")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TChoreographyImpl.scala b/src/col/vct/col/ast/type/TChoreographyImpl.scala
index 5661da8bc6..57b4885dfa 100644
--- a/src/col/vct/col/ast/type/TChoreographyImpl.scala
+++ b/src/col/vct/col/ast/type/TChoreographyImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TChoreography
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TChoreographyOps
 
-trait TChoreographyImpl[G] extends TChoreographyOps[G] { this: TChoreography[G] =>
+trait TChoreographyImpl[G] extends TChoreographyOps[G] {
+  this: TChoreography[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text(ctx.name(cls))
 }
diff --git a/src/col/vct/col/ast/type/TClassImpl.scala b/src/col/vct/col/ast/type/TClassImpl.scala
index 1cc807da7a..42a03d7983 100644
--- a/src/col/vct/col/ast/type/TClassImpl.scala
+++ b/src/col/vct/col/ast/type/TClassImpl.scala
@@ -1,21 +1,45 @@
 package vct.col.ast.`type`
 
-import vct.col.ast.{Applicable, Class, ClassDeclaration, Constructor, ContractApplicable, InstanceField, InstanceFunction, InstanceMethod, InstanceOperatorFunction, InstanceOperatorMethod, TClass, Type, Variable}
+import vct.col.ast.{
+  Applicable,
+  Class,
+  ClassDeclaration,
+  Constructor,
+  ContractApplicable,
+  InstanceField,
+  InstanceFunction,
+  InstanceMethod,
+  InstanceOperatorFunction,
+  InstanceOperatorMethod,
+  TClass,
+  Type,
+  Variable,
+}
 import vct.col.print.{Ctx, Doc, Empty, Group, Text}
 import vct.col.ast.ops.TClassOps
 import vct.col.ref.Ref
 import vct.result.VerificationError.Unreachable
 
-trait TClassImpl[G] extends TClassOps[G] { this: TClass[G] =>
-  def transSupportArrowsHelper(seen: Set[TClass[G]]): Seq[(TClass[G], TClass[G])] =
-    cls.decl.transSupportArrowsHelper(seen).map {
-      case (clsA, clsB) => (instantiate(clsA).asClass.get, instantiate(clsB).asClass.get)
+trait TClassImpl[G] extends TClassOps[G] {
+  this: TClass[G] =>
+  def transSupportArrowsHelper(
+      seen: Set[TClass[G]]
+  ): Seq[(TClass[G], TClass[G])] =
+    cls.decl.transSupportArrowsHelper(seen).map { case (clsA, clsB) =>
+      (instantiate(clsA).asClass.get, instantiate(clsB).asClass.get)
     }
 
-  def transSupportArrows(): Seq[(TClass[G], TClass[G])] = transSupportArrowsHelper(Set.empty)
+  def transSupportArrows(): Seq[(TClass[G], TClass[G])] =
+    transSupportArrowsHelper(Set.empty)
 
-  override def layout(implicit ctx: Ctx): Doc = Group(Text(ctx.name(cls)) <> (
-    if (typeArgs.nonEmpty) Text("<") <> Doc.args(typeArgs) <> ">" else Empty))
+  override def layout(implicit ctx: Ctx): Doc =
+    Group(
+      Text(ctx.name(cls)) <>
+        (if (typeArgs.nonEmpty)
+           Text("<") <> Doc.args(typeArgs) <> ">"
+         else
+           Empty)
+    )
 
   def typeEnv: Map[Variable[G], Type[G]] = cls.decl.typeArgs.zip(typeArgs).toMap
 
@@ -27,4 +51,4 @@ trait TClassImpl[G] extends TClassOps[G] { this: TClass[G] =>
     }
 
   def fieldType(decl: InstanceField[G]): Type[G] = instantiate(decl.t)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TEitherImpl.scala b/src/col/vct/col/ast/type/TEitherImpl.scala
index 0287bd6359..6a3b5dfc7e 100644
--- a/src/col/vct/col/ast/type/TEitherImpl.scala
+++ b/src/col/vct/col/ast/type/TEitherImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TEither
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.TEitherOps
 
-trait TEitherImpl[G] extends TEitherOps[G] { this: TEither[G] =>
+trait TEitherImpl[G] extends TEitherOps[G] {
+  this: TEither[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("either") <> open <> Doc.args(Seq(left, right)) <> close)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TEndpointImpl.scala b/src/col/vct/col/ast/type/TEndpointImpl.scala
index 905b089c36..a12fadf8fd 100644
--- a/src/col/vct/col/ast/type/TEndpointImpl.scala
+++ b/src/col/vct/col/ast/type/TEndpointImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TEndpoint
 import vct.col.print._
 import vct.col.ast.ops.TEndpointOps
 
-trait TEndpointImpl[G] extends TEndpointOps[G] { this: TEndpoint[G] =>
+trait TEndpointImpl[G] extends TEndpointOps[G] {
+  this: TEndpoint[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("endpoint")
 }
diff --git a/src/col/vct/col/ast/type/TFloatImpl.scala b/src/col/vct/col/ast/type/TFloatImpl.scala
index dba980e14e..7b9430b0af 100644
--- a/src/col/vct/col/ast/type/TFloatImpl.scala
+++ b/src/col/vct/col/ast/type/TFloatImpl.scala
@@ -5,8 +5,9 @@ import vct.col.ast
 import vct.col.ast.ops.TFloatOps
 import vct.col.ast.`type`.typeclass.TFloats
 
-trait TFloatImpl[G] extends TFloatOps[G] { this: TFloat[G] =>
+trait TFloatImpl[G] extends TFloatOps[G] {
+  this: TFloat[G] =>
   override def is_ieee754_32bit: Boolean = this == TFloats.ieee754_32bit
 
   override def is_ieee754_64bit: Boolean = this == TFloats.ieee754_64bit
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TFractionImpl.scala b/src/col/vct/col/ast/type/TFractionImpl.scala
index 93aa770cfa..ae7e31c86a 100644
--- a/src/col/vct/col/ast/type/TFractionImpl.scala
+++ b/src/col/vct/col/ast/type/TFractionImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TFraction
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TFractionOps
 
-trait TFractionImpl[G] extends TFractionOps[G] { this: TFraction[G] =>
+trait TFractionImpl[G] extends TFractionOps[G] {
+  this: TFraction[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("frac")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TIntImpl.scala b/src/col/vct/col/ast/type/TIntImpl.scala
index 04c9d68949..365cb5224f 100644
--- a/src/col/vct/col/ast/type/TIntImpl.scala
+++ b/src/col/vct/col/ast/type/TIntImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.`type`
 import vct.col.ast.TInt
 import vct.col.ast.ops.TIntOps
 
-trait TIntImpl[G] extends TIntOps[G] { this: TInt[G] =>
+trait TIntImpl[G] extends TIntOps[G] {
+  this: TInt[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TMapImpl.scala b/src/col/vct/col/ast/type/TMapImpl.scala
index 46464a1054..6ec43eaac8 100644
--- a/src/col/vct/col/ast/type/TMapImpl.scala
+++ b/src/col/vct/col/ast/type/TMapImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TMap
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.TMapOps
 
-trait TMapImpl[G] extends TMapOps[G] { this: TMap[G] =>
+trait TMapImpl[G] extends TMapOps[G] {
+  this: TMap[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("maps") <> open <> Doc.args(Seq(key, value)) <> close)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TMatrixImpl.scala b/src/col/vct/col/ast/type/TMatrixImpl.scala
index 82e7fc5ae3..1b28d5c068 100644
--- a/src/col/vct/col/ast/type/TMatrixImpl.scala
+++ b/src/col/vct/col/ast/type/TMatrixImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.`type`
 import vct.col.ast.TMatrix
 import vct.col.ast.ops.TMatrixOps
 
-trait TMatrixImpl[G] extends TMatrixOps[G] { this: TMatrix[G] =>
+trait TMatrixImpl[G] extends TMatrixOps[G] {
+  this: TMatrix[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TModelImpl.scala b/src/col/vct/col/ast/type/TModelImpl.scala
index 28559ea61b..e57b7430a2 100644
--- a/src/col/vct/col/ast/type/TModelImpl.scala
+++ b/src/col/vct/col/ast/type/TModelImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.TModel
 import vct.col.print._
 import vct.col.ast.ops.TModelOps
 
-trait TModelImpl[G] extends TModelOps[G] { this: TModel[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    Text(ctx.name(model))
-}
\ No newline at end of file
+trait TModelImpl[G] extends TModelOps[G] {
+  this: TModel[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text(ctx.name(model))
+}
diff --git a/src/col/vct/col/ast/type/TNotAValueImpl.scala b/src/col/vct/col/ast/type/TNotAValueImpl.scala
index bbb9feb073..b2c379a8b4 100644
--- a/src/col/vct/col/ast/type/TNotAValueImpl.scala
+++ b/src/col/vct/col/ast/type/TNotAValueImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.`type`
 import vct.col.ast.TNotAValue
 import vct.col.ast.ops.TNotAValueOps
 
-trait TNotAValueImpl[G] extends TNotAValueOps[G] { this: TNotAValue[G] =>
+trait TNotAValueImpl[G] extends TNotAValueOps[G] {
+  this: TNotAValue[G] =>
 
 }
diff --git a/src/col/vct/col/ast/type/TNothingImpl.scala b/src/col/vct/col/ast/type/TNothingImpl.scala
index c81de6c1f3..3d6e01771e 100644
--- a/src/col/vct/col/ast/type/TNothingImpl.scala
+++ b/src/col/vct/col/ast/type/TNothingImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TNothing
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TNothingOps
 
-trait TNothingImpl[G] extends TNothingOps[G] { this: TNothing[G] =>
+trait TNothingImpl[G] extends TNothingOps[G] {
+  this: TNothing[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("nothing")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TNullImpl.scala b/src/col/vct/col/ast/type/TNullImpl.scala
index 19f286f88c..d6d99f365b 100644
--- a/src/col/vct/col/ast/type/TNullImpl.scala
+++ b/src/col/vct/col/ast/type/TNullImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.`type`
 import vct.col.ast.TNull
 import vct.col.ast.ops.TNullOps
 
-trait TNullImpl[G] extends TNullOps[G] { this: TNull[G] =>
+trait TNullImpl[G] extends TNullOps[G] {
+  this: TNull[G] =>
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TOptionImpl.scala b/src/col/vct/col/ast/type/TOptionImpl.scala
index 30d02204a8..a409405522 100644
--- a/src/col/vct/col/ast/type/TOptionImpl.scala
+++ b/src/col/vct/col/ast/type/TOptionImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TOption
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.TOptionOps
 
-trait TOptionImpl[G] extends TOptionOps[G] { this: TOption[G] =>
+trait TOptionImpl[G] extends TOptionOps[G] {
+  this: TOption[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("option") <> open <> Doc.arg(element) <> close)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TPointerImpl.scala b/src/col/vct/col/ast/type/TPointerImpl.scala
index fe0ad7f39b..f0a5302b3c 100644
--- a/src/col/vct/col/ast/type/TPointerImpl.scala
+++ b/src/col/vct/col/ast/type/TPointerImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TPointer
 import vct.col.print._
 import vct.col.ast.ops.TPointerOps
 
-trait TPointerImpl[G] extends TPointerOps[G] { this: TPointer[G] =>
+trait TPointerImpl[G] extends TPointerOps[G] {
+  this: TPointer[G] =>
   override def layoutSplitDeclarator(implicit ctx: Ctx): (Doc, Doc) = {
     val (spec, decl) = element.layoutSplitDeclarator
     (spec, decl <> "*")
@@ -12,4 +13,4 @@ trait TPointerImpl[G] extends TPointerOps[G] { this: TPointer[G] =>
 
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("pointer") <> open <> element <> close)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TProcessImpl.scala b/src/col/vct/col/ast/type/TProcessImpl.scala
index d7f8583f16..518ce18ba2 100644
--- a/src/col/vct/col/ast/type/TProcessImpl.scala
+++ b/src/col/vct/col/ast/type/TProcessImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TProcess
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TProcessOps
 
-trait TProcessImpl[G] extends TProcessOps[G] { this: TProcess[G] =>
+trait TProcessImpl[G] extends TProcessOps[G] {
+  this: TProcess[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("process")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TProverTypeImpl.scala b/src/col/vct/col/ast/type/TProverTypeImpl.scala
index 46f0514e0a..64564f3512 100644
--- a/src/col/vct/col/ast/type/TProverTypeImpl.scala
+++ b/src/col/vct/col/ast/type/TProverTypeImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.`type`
 import vct.col.ast.TProverType
 import vct.col.ast.ops.TProverTypeOps
 
-trait TProverTypeImpl[G] extends TProverTypeOps[G] { this: TProverType[G] =>
+trait TProverTypeImpl[G] extends TProverTypeOps[G] {
+  this: TProverType[G] =>
 
 }
diff --git a/src/col/vct/col/ast/type/TRationalImpl.scala b/src/col/vct/col/ast/type/TRationalImpl.scala
index 99645528fe..22046231a2 100644
--- a/src/col/vct/col/ast/type/TRationalImpl.scala
+++ b/src/col/vct/col/ast/type/TRationalImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TRational
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TRationalOps
 
-trait TRationalImpl[G] extends TRationalOps[G] { this: TRational[G] =>
+trait TRationalImpl[G] extends TRationalOps[G] {
+  this: TRational[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("rational")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TRefImpl.scala b/src/col/vct/col/ast/type/TRefImpl.scala
index 0b76f7220b..ba54df95b9 100644
--- a/src/col/vct/col/ast/type/TRefImpl.scala
+++ b/src/col/vct/col/ast/type/TRefImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TRef
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TRefOps
 
-trait TRefImpl[G] extends TRefOps[G] { this: TRef[G] =>
+trait TRefImpl[G] extends TRefOps[G] {
+  this: TRef[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("ref")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TResourceImpl.scala b/src/col/vct/col/ast/type/TResourceImpl.scala
index f875aaf78a..bdcdcbe75b 100644
--- a/src/col/vct/col/ast/type/TResourceImpl.scala
+++ b/src/col/vct/col/ast/type/TResourceImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TResource
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TResourceOps
 
-trait TResourceImpl[G] extends TResourceOps[G] { this: TResource[G] =>
+trait TResourceImpl[G] extends TResourceOps[G] {
+  this: TResource[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("resource")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TResourceValImpl.scala b/src/col/vct/col/ast/type/TResourceValImpl.scala
index d17c2aa589..83ff9f4409 100644
--- a/src/col/vct/col/ast/type/TResourceValImpl.scala
+++ b/src/col/vct/col/ast/type/TResourceValImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.`type`
 import vct.col.ast.TResourceVal
 import vct.col.ast.ops.TResourceValOps
 
-trait TResourceValImpl[G] extends TResourceValOps[G] { this: TResourceVal[G] =>
+trait TResourceValImpl[G] extends TResourceValOps[G] {
+  this: TResourceVal[G] =>
 
 }
diff --git a/src/col/vct/col/ast/type/TSeqImpl.scala b/src/col/vct/col/ast/type/TSeqImpl.scala
index a605903130..fab36672a9 100644
--- a/src/col/vct/col/ast/type/TSeqImpl.scala
+++ b/src/col/vct/col/ast/type/TSeqImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TSeq
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.TSeqOps
 
-trait TSeqImpl[G] extends TSeqOps[G] { this: TSeq[G] =>
+trait TSeqImpl[G] extends TSeqOps[G] {
+  this: TSeq[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("seq") <> open <> Doc.arg(element) <> close)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TSetImpl.scala b/src/col/vct/col/ast/type/TSetImpl.scala
index a906060f9c..772e1bc18b 100644
--- a/src/col/vct/col/ast/type/TSetImpl.scala
+++ b/src/col/vct/col/ast/type/TSetImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TSet
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.TSetOps
 
-trait TSetImpl[G] extends TSetOps[G] { this: TSet[G] =>
+trait TSetImpl[G] extends TSetOps[G] {
+  this: TSet[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("set") <> open <> Doc.arg(element) <> close)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TStringImpl.scala b/src/col/vct/col/ast/type/TStringImpl.scala
index f69149fd9a..d54755890b 100644
--- a/src/col/vct/col/ast/type/TStringImpl.scala
+++ b/src/col/vct/col/ast/type/TStringImpl.scala
@@ -4,10 +4,12 @@ import vct.col.ast.TString
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TStringOps
 
-trait TStringImpl[G] extends TStringOps[G] { this: TString[G] =>
-  override def layout(implicit ctx: Ctx): Doc = Text(ctx.syntax match {
-    case Ctx.PVL => "string"
-    case Ctx.Java => "String"
-    case _ => "string"
-  })
-}
\ No newline at end of file
+trait TStringImpl[G] extends TStringOps[G] {
+  this: TString[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Text(ctx.syntax match {
+      case Ctx.PVL => "string"
+      case Ctx.Java => "String"
+      case _ => "string"
+    })
+}
diff --git a/src/col/vct/col/ast/type/TTupleImpl.scala b/src/col/vct/col/ast/type/TTupleImpl.scala
index e591f61405..a2e9bf82c6 100644
--- a/src/col/vct/col/ast/type/TTupleImpl.scala
+++ b/src/col/vct/col/ast/type/TTupleImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TTuple
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.TTupleOps
 
-trait TTupleImpl[G] extends TTupleOps[G] { this: TTuple[G] =>
+trait TTupleImpl[G] extends TTupleOps[G] {
+  this: TTuple[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("seq") <> open <> Doc.args(elements) <> close)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TTypeImpl.scala b/src/col/vct/col/ast/type/TTypeImpl.scala
index 77eb95e067..ecbf310bab 100644
--- a/src/col/vct/col/ast/type/TTypeImpl.scala
+++ b/src/col/vct/col/ast/type/TTypeImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TType
 import vct.col.print.{Ctx, Doc, Group, Text}
 import vct.col.ast.ops.TTypeOps
 
-trait TTypeImpl[G] extends TTypeOps[G] { this: TType[G] =>
+trait TTypeImpl[G] extends TTypeOps[G] {
+  this: TType[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Group(Text("type") <> open <> Doc.arg(t) <> close)
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TUnionImpl.scala b/src/col/vct/col/ast/type/TUnionImpl.scala
index ccdb75e5fb..de8160a261 100644
--- a/src/col/vct/col/ast/type/TUnionImpl.scala
+++ b/src/col/vct/col/ast/type/TUnionImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.TUnion
 import vct.col.print.{Ctx, Doc}
 import vct.col.ast.ops.TUnionOps
 
-trait TUnionImpl[G] extends TUnionOps[G] { this: TUnion[G] =>
-  override def layout(implicit ctx: Ctx): Doc =  Doc.fold(types)(_ <+> "|" <+> _)
+trait TUnionImpl[G] extends TUnionOps[G] {
+  this: TUnion[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Doc.fold(types)(_ <+> "|" <+> _)
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TVarImpl.scala b/src/col/vct/col/ast/type/TVarImpl.scala
index 056babccc5..1c5141d431 100644
--- a/src/col/vct/col/ast/type/TVarImpl.scala
+++ b/src/col/vct/col/ast/type/TVarImpl.scala
@@ -5,11 +5,14 @@ import vct.col.check.{CheckContext, CheckError, GenericTypeError}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TVarOps
 
-trait TVarImpl[G] extends TVarOps[G] { this: TVar[G] =>
+trait TVarImpl[G] extends TVarOps[G] {
+  this: TVar[G] =>
   override def check(context: CheckContext[G]): Seq[CheckError] =
     context.checkInScope(this, ref) ++
-      (if(TType(TAnyValue()).superTypeOf(ref.decl.t)) Nil
-      else Seq(GenericTypeError(this, TType(TAnyValue()))))
+      (if (TType(TAnyValue()).superTypeOf(ref.decl.t))
+         Nil
+       else
+         Seq(GenericTypeError(this, TType(TAnyValue()))))
 
   override def layout(implicit ctx: Ctx): Doc = Text(ctx.name(ref))
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TVectorImpl.scala b/src/col/vct/col/ast/type/TVectorImpl.scala
index c921fc5ef9..b44351e0ff 100644
--- a/src/col/vct/col/ast/type/TVectorImpl.scala
+++ b/src/col/vct/col/ast/type/TVectorImpl.scala
@@ -4,7 +4,11 @@ import vct.col.ast.TVector
 import vct.col.ast.ops.TVectorOps
 import vct.col.print.{Ctx, Doc, Group, Text}
 
-trait TVectorImpl[G] extends TVectorOps[G] { this: TVector[G] =>
+trait TVectorImpl[G] extends TVectorOps[G] {
+  this: TVector[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Group(Text("vector") <> open <> Doc.arg(element) <> "," <> size.toString <> close)
-}
\ No newline at end of file
+    Group(
+      Text("vector") <> open <> Doc.arg(element) <> "," <> size.toString <>
+        close
+    )
+}
diff --git a/src/col/vct/col/ast/type/TVeyMontChannelImpl.scala b/src/col/vct/col/ast/type/TVeyMontChannelImpl.scala
index 498e9c7304..1fc0c0646c 100644
--- a/src/col/vct/col/ast/type/TVeyMontChannelImpl.scala
+++ b/src/col/vct/col/ast/type/TVeyMontChannelImpl.scala
@@ -4,7 +4,7 @@ import vct.col.ast.TVeyMontChannel
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TVeyMontChannelOps
 
-trait TVeyMontChannelImpl[G] extends TVeyMontChannelOps[G] { this: TVeyMontChannel[G] =>
-  override def layout(implicit ctx: Ctx): Doc =
-    Text(this.channelType)
-}
\ No newline at end of file
+trait TVeyMontChannelImpl[G] extends TVeyMontChannelOps[G] {
+  this: TVeyMontChannel[G] =>
+  override def layout(implicit ctx: Ctx): Doc = Text(this.channelType)
+}
diff --git a/src/col/vct/col/ast/type/TVoidImpl.scala b/src/col/vct/col/ast/type/TVoidImpl.scala
index aaadc4ea41..dae4d681e7 100644
--- a/src/col/vct/col/ast/type/TVoidImpl.scala
+++ b/src/col/vct/col/ast/type/TVoidImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TVoid
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TVoidOps
 
-trait TVoidImpl[G] extends TVoidOps[G] { this: TVoid[G] =>
+trait TVoidImpl[G] extends TVoidOps[G] {
+  this: TVoid[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("void")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/TZFractionImpl.scala b/src/col/vct/col/ast/type/TZFractionImpl.scala
index ec3eb85445..12f13268d7 100644
--- a/src/col/vct/col/ast/type/TZFractionImpl.scala
+++ b/src/col/vct/col/ast/type/TZFractionImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TZFraction
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.ast.ops.TZFractionOps
 
-trait TZFractionImpl[G] extends TZFractionOps[G] { this: TZFraction[G] =>
+trait TZFractionImpl[G] extends TZFractionOps[G] {
+  this: TZFraction[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("zfrac")
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/ast/type/typeclass/CompositeTypeImpl.scala b/src/col/vct/col/ast/type/typeclass/CompositeTypeImpl.scala
index bc78e64de1..324f956b48 100644
--- a/src/col/vct/col/ast/type/typeclass/CompositeTypeImpl.scala
+++ b/src/col/vct/col/ast/type/typeclass/CompositeTypeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.`type`.typeclass
 
 import vct.col.ast.CompositeType
 
-trait CompositeTypeImpl[G] { this: CompositeType[G] =>
+trait CompositeTypeImpl[G] {
+  this: CompositeType[G] =>
 
 }
diff --git a/src/col/vct/col/ast/type/typeclass/DeclaredTypeImpl.scala b/src/col/vct/col/ast/type/typeclass/DeclaredTypeImpl.scala
index 9d6e892977..201074fefd 100644
--- a/src/col/vct/col/ast/type/typeclass/DeclaredTypeImpl.scala
+++ b/src/col/vct/col/ast/type/typeclass/DeclaredTypeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.`type`.typeclass
 
 import vct.col.ast.DeclaredType
 
-trait DeclaredTypeImpl[G] { this: DeclaredType[G] =>
+trait DeclaredTypeImpl[G] {
+  this: DeclaredType[G] =>
 
 }
diff --git a/src/col/vct/col/ast/type/typeclass/FloatTypeImpl.scala b/src/col/vct/col/ast/type/typeclass/FloatTypeImpl.scala
index 5431475459..13095208d3 100644
--- a/src/col/vct/col/ast/type/typeclass/FloatTypeImpl.scala
+++ b/src/col/vct/col/ast/type/typeclass/FloatTypeImpl.scala
@@ -1,7 +1,14 @@
 package vct.col.ast.`type`.typeclass
 
 import vct.col.ast.`type`.TCFloats.fromTCFloat
-import vct.col.ast.{CPrimitiveType, CSpecificationType, FloatType, TCFloat, TFloat, Type}
+import vct.col.ast.{
+  CPrimitiveType,
+  CSpecificationType,
+  FloatType,
+  TCFloat,
+  TFloat,
+  Type,
+}
 import vct.col.origin.{DiagnosticOrigin, Origin}
 import vct.col.print.{Ctx, Doc, Text}
 import vct.col.typerules.CoercionUtils
@@ -11,62 +18,86 @@ import vct.col.resolve.lang.C
 // https://en.wikipedia.org/wiki/Double-precision_floating-point_format#IEEE_754_double-precision_binary_floating-point_format:_binary64
 object TFloats {
   // Integer part bit that is implicit, is included here.
-  def ieee754_32bit[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] = vct.col.ast.TFloat(8, 24)
-  def ieee754_64bit[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] = vct.col.ast.TFloat(11, 53)
-  def C_ieee754_32bit[G](implicit o: Origin = DiagnosticOrigin): TCFloat[G] = vct.col.ast.TCFloat(8, 24)
-  def C_ieee754_64bit[G](implicit o: Origin = DiagnosticOrigin): TCFloat[G] = vct.col.ast.TCFloat(11, 53)
+  def ieee754_32bit[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] =
+    vct.col.ast.TFloat(8, 24)
+  def ieee754_64bit[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] =
+    vct.col.ast.TFloat(11, 53)
+  def C_ieee754_32bit[G](implicit o: Origin = DiagnosticOrigin): TCFloat[G] =
+    vct.col.ast.TCFloat(8, 24)
+  def C_ieee754_64bit[G](implicit o: Origin = DiagnosticOrigin): TCFloat[G] =
+    vct.col.ast.TCFloat(11, 53)
 
   // Only returns a float, when one of the types is floating itself
   // Returns to biggest float, e.g. (float32, float64) should return float64
   def getFloatMax[G](ll: Type[G], rr: Type[G]): Option[FloatType[G]] = {
     val l = C.stripCPrimitiveType(ll)
     val r = C.stripCPrimitiveType(rr)
-    val promote = (l, r) match {
-      case (_: TFloat[G], _) => true
-      case (_, _: TFloat[G]) => true
-      case _ => false
-    }
+    val promote =
+      (l, r) match {
+        case (_: TFloat[G], _) => true
+        case (_, _: TFloat[G]) => true
+        case _ => false
+      }
     val promoting: FloatType[G] => FloatType[G] = {
-      case t: TCFloat[G] => if(promote) fromTCFloat(t) else t
+      case t: TCFloat[G] =>
+        if (promote)
+          fromTCFloat(t)
+        else
+          t
       case t: TFloat[G] => t
     }
 
     (l, r) match {
-      case (l: FloatType[G], r: FloatType[G]) if r.exponent == l.exponent && r.mantissa == l.mantissa => Some(promoting(l))
-      case (l: FloatType[G], r: FloatType[G]) if l.exponent < r.exponent && l.mantissa < r.mantissa => Some(promoting(r))
-      case (l: FloatType[G], r: FloatType[G]) if r.exponent < l.exponent && r.mantissa < l.mantissa => Some(promoting(l))
-      case (l: FloatType[G], r: FloatType[G]) => ??? // Assuming there is only one Float for each exponent, mantissa
+      case (l: FloatType[G], r: FloatType[G])
+          if r.exponent == l.exponent && r.mantissa == l.mantissa =>
+        Some(promoting(l))
+      case (l: FloatType[G], r: FloatType[G])
+          if l.exponent < r.exponent && l.mantissa < r.mantissa =>
+        Some(promoting(r))
+      case (l: FloatType[G], r: FloatType[G])
+          if r.exponent < l.exponent && r.mantissa < l.mantissa =>
+        Some(promoting(l))
+      case (l: FloatType[G], r: FloatType[G]) =>
+        ??? // Assuming there is only one Float for each exponent, mantissa
       // If one if them needs to be coerced, we coerce and try again
-      case (l: FloatType[G], r) => CoercionUtils.getCoercion(r, l).flatMap(c => getFloatMax(l, c.target))
-      case (l, r: FloatType[G]) => CoercionUtils.getCoercion(l, r).flatMap(c => getFloatMax(r, c.target))
+      case (l: FloatType[G], r) =>
+        CoercionUtils.getCoercion(r, l).flatMap(c => getFloatMax(l, c.target))
+      case (l, r: FloatType[G]) =>
+        CoercionUtils.getCoercion(l, r).flatMap(c => getFloatMax(r, c.target))
       case _ => None
     }
   }
 }
 
-trait FloatTypeImpl[G] { this: FloatType[G] =>
+trait FloatTypeImpl[G] {
+  this: FloatType[G] =>
   val exponent: Int
   val mantissa: Int
   assert(this.exponent > 0)
   assert(this.mantissa > 0)
 
-  def layoutFloat(implicit ctx: Ctx): Doc = Text(ctx.syntax match {
-    case Ctx.PVL => "float32"
-    case Ctx.Java => "float"
-    case _ => "float"
-  })
+  def layoutFloat(implicit ctx: Ctx): Doc =
+    Text(ctx.syntax match {
+      case Ctx.PVL => "float32"
+      case Ctx.Java => "float"
+      case _ => "float"
+    })
 
-  def layoutDouble(implicit ctx: Ctx): Doc = Text(ctx.syntax match {
-    case Ctx.PVL => "float64"
-    case Ctx.Java => "double"
-    case _ => "double"
-  })
+  def layoutDouble(implicit ctx: Ctx): Doc =
+    Text(ctx.syntax match {
+      case Ctx.PVL => "float64"
+      case Ctx.Java => "double"
+      case _ => "double"
+    })
 
   def is_ieee754_32bit: Boolean
   def is_ieee754_64bit: Boolean
 
   override def layout(implicit ctx: Ctx): Doc =
-    if (is_ieee754_32bit) layoutFloat
-    else if (is_ieee754_64bit) layoutDouble
-    else Text(s"??float_${exponent}_${mantissa}??")
+    if (is_ieee754_32bit)
+      layoutFloat
+    else if (is_ieee754_64bit)
+      layoutDouble
+    else
+      Text(s"??float_${exponent}_${mantissa}??")
 }
diff --git a/src/col/vct/col/ast/type/typeclass/IntTypeImpl.scala b/src/col/vct/col/ast/type/typeclass/IntTypeImpl.scala
index 50fbabf4c3..18f55ddf40 100644
--- a/src/col/vct/col/ast/type/typeclass/IntTypeImpl.scala
+++ b/src/col/vct/col/ast/type/typeclass/IntTypeImpl.scala
@@ -3,6 +3,7 @@ package vct.col.ast.`type`.typeclass
 import vct.col.ast.IntType
 import vct.col.print.{Ctx, Doc, Text}
 
-trait IntTypeImpl[G] { this: IntType[G] =>
+trait IntTypeImpl[G] {
+  this: IntType[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("int")
 }
diff --git a/src/col/vct/col/ast/type/typeclass/NumericTypeImpl.scala b/src/col/vct/col/ast/type/typeclass/NumericTypeImpl.scala
index 0eea7a7fe5..049fc6ab06 100644
--- a/src/col/vct/col/ast/type/typeclass/NumericTypeImpl.scala
+++ b/src/col/vct/col/ast/type/typeclass/NumericTypeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.`type`.typeclass
 
 import vct.col.ast.NumericType
 
-trait NumericTypeImpl[G] { this: NumericType[G] =>
+trait NumericTypeImpl[G] {
+  this: NumericType[G] =>
 
 }
diff --git a/src/col/vct/col/ast/type/typeclass/PrimitiveTypeImpl.scala b/src/col/vct/col/ast/type/typeclass/PrimitiveTypeImpl.scala
index a679e80da0..5f63e96f85 100644
--- a/src/col/vct/col/ast/type/typeclass/PrimitiveTypeImpl.scala
+++ b/src/col/vct/col/ast/type/typeclass/PrimitiveTypeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.`type`.typeclass
 
 import vct.col.ast.PrimitiveType
 
-trait PrimitiveTypeImpl[G] { this: PrimitiveType[G] =>
+trait PrimitiveTypeImpl[G] {
+  this: PrimitiveType[G] =>
 
 }
diff --git a/src/col/vct/col/ast/type/typeclass/SizedTypeImpl.scala b/src/col/vct/col/ast/type/typeclass/SizedTypeImpl.scala
index f897ed6394..cdde112818 100644
--- a/src/col/vct/col/ast/type/typeclass/SizedTypeImpl.scala
+++ b/src/col/vct/col/ast/type/typeclass/SizedTypeImpl.scala
@@ -2,6 +2,7 @@ package vct.col.ast.`type`.typeclass
 
 import vct.col.ast.SizedType
 
-trait SizedTypeImpl[G] { this: SizedType[G] =>
+trait SizedTypeImpl[G] {
+  this: SizedType[G] =>
 
 }
diff --git a/src/col/vct/col/ast/type/typeclass/TypeImpl.scala b/src/col/vct/col/ast/type/typeclass/TypeImpl.scala
index 05a839677b..b2bb1bc8ab 100644
--- a/src/col/vct/col/ast/type/typeclass/TypeImpl.scala
+++ b/src/col/vct/col/ast/type/typeclass/TypeImpl.scala
@@ -8,7 +8,8 @@ import vct.col.typerules.CoercionUtils
 import vct.col.print._
 import vct.col.ast.ops.TypeFamilyOps
 
-trait TypeImpl[G] extends TypeFamilyOps[G] { this: Type[G] =>
+trait TypeImpl[G] extends TypeFamilyOps[G] {
+  this: Type[G] =>
   def superTypeOf(other: Type[G]): Boolean =
     CoercionUtils.getCoercion(other, this).isDefined
 
@@ -16,44 +17,76 @@ trait TypeImpl[G] extends TypeFamilyOps[G] { this: Type[G] =>
 
   def asSeq: Option[TSeq[G]] = CoercionUtils.getAnySeqCoercion(this).map(_._2)
   def asSet: Option[TSet[G]] = CoercionUtils.getAnySetCoercion(this).map(_._2)
-  def asVector: Option[TVector[G]] = CoercionUtils.getAnyVectorCoercion(this).map(_._2)
+  def asVector: Option[TVector[G]] =
+    CoercionUtils.getAnyVectorCoercion(this).map(_._2)
   def asBag: Option[TBag[G]] = CoercionUtils.getAnyBagCoercion(this).map(_._2)
-  def asPointer: Option[TPointer[G]] = CoercionUtils.getAnyPointerCoercion(this).map(_._2)
-  def asArray: Option[TArray[G]] = CoercionUtils.getAnyArrayCoercion(this).map(_._2)
-  def asCArray: Option[CTArray[G]] = CoercionUtils.getAnyCArrayCoercion(this).map(_._2)
-  def asCPPArray: Option[CPPTArray[G]] = CoercionUtils.getAnyCPPArrayCoercion(this).map(_._2)
-  def asOption: Option[TOption[G]] = CoercionUtils.getAnyOptionCoercion(this).map(_._2)
+  def asPointer: Option[TPointer[G]] =
+    CoercionUtils.getAnyPointerCoercion(this).map(_._2)
+  def asArray: Option[TArray[G]] =
+    CoercionUtils.getAnyArrayCoercion(this).map(_._2)
+  def asCArray: Option[CTArray[G]] =
+    CoercionUtils.getAnyCArrayCoercion(this).map(_._2)
+  def asCPPArray: Option[CPPTArray[G]] =
+    CoercionUtils.getAnyCPPArrayCoercion(this).map(_._2)
+  def asOption: Option[TOption[G]] =
+    CoercionUtils.getAnyOptionCoercion(this).map(_._2)
   def asMap: Option[TMap[G]] = CoercionUtils.getAnyMapCoercion(this).map(_._2)
-  def asTuple: Option[TTuple[G]] = CoercionUtils.getAnyTupleCoercion(this).map(_._2)
-  def asMatrix: Option[TMatrix[G]] = CoercionUtils.getAnyMatrixCoercion(this).map(_._2)
-  def asModel: Option[TModel[G]] = CoercionUtils.getAnyModelCoercion(this).map(_._2)
-  def asClass: Option[TClass[G]] = CoercionUtils.getAnyClassCoercion(this).map(_._2)
-  def asEither: Option[TEither[G]] = CoercionUtils.getAnyEitherCoercion(this).map(_._2)
-  def asBitvec: Option[TSmtlibBitVector[G]] = CoercionUtils.getAnyBitvecCoercion(this).map(_._2)
-  def asSmtlibFloat: Option[TSmtlibFloatingPoint[G]] = CoercionUtils.getAnySmtlibFloatCoercion(this).map(_._2)
-  def asSmtlibArray: Option[TSmtlibArray[G]] = CoercionUtils.getAnySmtlibArrayCoercion(this).map(_._2)
-  def asSmtlibSeq: Option[TSmtlibSeq[G]] = CoercionUtils.getAnySmtlibSeqCoercion(this).map(_._2)
+  def asTuple: Option[TTuple[G]] =
+    CoercionUtils.getAnyTupleCoercion(this).map(_._2)
+  def asMatrix: Option[TMatrix[G]] =
+    CoercionUtils.getAnyMatrixCoercion(this).map(_._2)
+  def asModel: Option[TModel[G]] =
+    CoercionUtils.getAnyModelCoercion(this).map(_._2)
+  def asClass: Option[TClass[G]] =
+    CoercionUtils.getAnyClassCoercion(this).map(_._2)
+  def asEither: Option[TEither[G]] =
+    CoercionUtils.getAnyEitherCoercion(this).map(_._2)
+  def asBitvec: Option[TSmtlibBitVector[G]] =
+    CoercionUtils.getAnyBitvecCoercion(this).map(_._2)
+  def asSmtlibFloat: Option[TSmtlibFloatingPoint[G]] =
+    CoercionUtils.getAnySmtlibFloatCoercion(this).map(_._2)
+  def asSmtlibArray: Option[TSmtlibArray[G]] =
+    CoercionUtils.getAnySmtlibArrayCoercion(this).map(_._2)
+  def asSmtlibSeq: Option[TSmtlibSeq[G]] =
+    CoercionUtils.getAnySmtlibSeqCoercion(this).map(_._2)
   /*def asVector: Option[TVector] = optMatch(this) { case vec: TVector => vec }*/
 
   def particularize(substitutions: Map[Variable[G], Type[G]]): Type[G] = {
     case object Particularize extends NonLatchingRewriter[G, G] {
-      case object IdentitySuccessorsProvider extends SuccessorsProviderTrafo[G, G](allScopes.freeze) {
-        override def preTransform[I <: Declaration[G], O <: Declaration[G]](pre: I): Option[O] =
-          Some(pre.asInstanceOf[O])
+      case object IdentitySuccessorsProvider
+          extends SuccessorsProviderTrafo[G, G](allScopes.freeze) {
+        override def preTransform[I <: Declaration[G], O <: Declaration[G]](
+            pre: I
+        ): Option[O] = Some(pre.asInstanceOf[O])
       }
 
-      override def succProvider: SuccessorsProvider[G, G] = IdentitySuccessorsProvider
+      override def succProvider: SuccessorsProvider[G, G] =
+        IdentitySuccessorsProvider
 
-      override def dispatch(t: Type[G]): Type[G] = t match {
-        case TVar(Ref(v)) => substitutions(v)
-        case other => rewriteDefault(other)
-      }
+      override def dispatch(t: Type[G]): Type[G] =
+        t match {
+          case TVar(Ref(v)) => substitutions(v)
+          case other => rewriteDefault(other)
+        }
     }
     Particularize.dispatch(this)
   }
 
-  def layoutSplitDeclarator(implicit ctx: Ctx): (Doc, Doc) = (show, vct.col.print.Empty)
+  def layoutSplitDeclarator(implicit ctx: Ctx): (Doc, Doc) =
+    (show, vct.col.print.Empty)
 
-  protected def open(implicit ctx: Ctx): Doc = Text(if(ctx.syntax == Ctx.Silver) "[" else "<")
-  protected def close(implicit ctx: Ctx): Doc = Text(if(ctx.syntax == Ctx.Silver) "]" else ">")
+  protected def open(implicit ctx: Ctx): Doc =
+    Text(
+      if (ctx.syntax == Ctx.Silver)
+        "["
+      else
+        "<"
+    )
+  protected def close(implicit ctx: Ctx): Doc =
+    Text(
+      if (ctx.syntax == Ctx.Silver)
+        "]"
+      else
+        ">"
+    )
 }
diff --git a/src/col/vct/col/ast/unsorted/BipGlueImpl.scala b/src/col/vct/col/ast/unsorted/BipGlueImpl.scala
index 5760ae9551..850d29a775 100644
--- a/src/col/vct/col/ast/unsorted/BipGlueImpl.scala
+++ b/src/col/vct/col/ast/unsorted/BipGlueImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.BipGlue
 import vct.col.ast.ops.BipGlueOps
 import vct.col.print._
 
-trait BipGlueImpl[G] extends BipGlueOps[G] { this: BipGlue[G] =>
+trait BipGlueImpl[G] extends BipGlueOps[G] {
+  this: BipGlue[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/BipPortTypeImpl.scala b/src/col/vct/col/ast/unsorted/BipPortTypeImpl.scala
index a165517298..760fa87c43 100644
--- a/src/col/vct/col/ast/unsorted/BipPortTypeImpl.scala
+++ b/src/col/vct/col/ast/unsorted/BipPortTypeImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.BipPortType
 import vct.col.ast.ops.BipPortTypeFamilyOps
 import vct.col.print._
 
-trait BipPortTypeImpl[G] extends BipPortTypeFamilyOps[G] { this: BipPortType[G] =>
+trait BipPortTypeImpl[G] extends BipPortTypeFamilyOps[G] {
+  this: BipPortType[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/CFunctionTypeExtensionModifierImpl.scala b/src/col/vct/col/ast/unsorted/CFunctionTypeExtensionModifierImpl.scala
index e2e879ebb8..db6ad82180 100644
--- a/src/col/vct/col/ast/unsorted/CFunctionTypeExtensionModifierImpl.scala
+++ b/src/col/vct/col/ast/unsorted/CFunctionTypeExtensionModifierImpl.scala
@@ -5,9 +5,12 @@ import vct.col.ast.ops.CFunctionTypeExtensionModifierOps
 import vct.col.print.Doc.fold
 import vct.col.print._
 
-trait CFunctionTypeExtensionModifierImpl[G] extends CFunctionTypeExtensionModifierOps[G] { this: CFunctionTypeExtensionModifier[G] =>
+trait CFunctionTypeExtensionModifierImpl[G]
+    extends CFunctionTypeExtensionModifierOps[G] {
+  this: CFunctionTypeExtensionModifier[G] =>
   override def layout(implicit ctx: Ctx): Doc = {
-    val attr = extensions.collect{case a: CTypeAttribute[G] => a}.map(a => Text(a.name) <> "(" <> Doc.args(a.args) <> ")")
+    val attr = extensions.collect { case a: CTypeAttribute[G] => a }
+      .map(a => Text(a.name) <> "(" <> Doc.args(a.args) <> ")")
     Text("__attribute__ ((") <> fold(attr)(_ <+> _) <> "))"
   }
 }
diff --git a/src/col/vct/col/ast/unsorted/ChooseFreshImpl.scala b/src/col/vct/col/ast/unsorted/ChooseFreshImpl.scala
index dfa49c2323..0fe8ef860b 100644
--- a/src/col/vct/col/ast/unsorted/ChooseFreshImpl.scala
+++ b/src/col/vct/col/ast/unsorted/ChooseFreshImpl.scala
@@ -4,9 +4,9 @@ import vct.col.ast.{ChooseFresh, Type}
 import vct.col.ast.ops.ChooseFreshOps
 import vct.col.print._
 
-trait ChooseFreshImpl[G] extends ChooseFreshOps[G] { this: ChooseFresh[G] =>
-  override lazy val t: Type[G] =
-    xs.t.asSet.get.element
+trait ChooseFreshImpl[G] extends ChooseFreshOps[G] {
+  this: ChooseFresh[G] =>
+  override lazy val t: Type[G] = xs.t.asSet.get.element
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
diff --git a/src/col/vct/col/ast/unsorted/ChooseImpl.scala b/src/col/vct/col/ast/unsorted/ChooseImpl.scala
index 90cd37c70e..e6a89f6231 100644
--- a/src/col/vct/col/ast/unsorted/ChooseImpl.scala
+++ b/src/col/vct/col/ast/unsorted/ChooseImpl.scala
@@ -4,9 +4,9 @@ import vct.col.ast.{Choose, Type}
 import vct.col.ast.ops.ChooseOps
 import vct.col.print._
 
-trait ChooseImpl[G] extends ChooseOps[G] { this: Choose[G] =>
-  override lazy val t: Type[G] =
-    xs.t.asSet.get.element
+trait ChooseImpl[G] extends ChooseOps[G] {
+  this: Choose[G] =>
+  override lazy val t: Type[G] = xs.t.asSet.get.element
 
   override def precedence: Int = Precedence.ATOMIC
   override def layout(implicit ctx: Ctx): Doc =
diff --git a/src/col/vct/col/ast/unsorted/ChorPermImpl.scala b/src/col/vct/col/ast/unsorted/ChorPermImpl.scala
index 54fbfd2e88..74689eeb45 100644
--- a/src/col/vct/col/ast/unsorted/ChorPermImpl.scala
+++ b/src/col/vct/col/ast/unsorted/ChorPermImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{ChorPerm, TResource, Type}
 import vct.col.ast.ops.ChorPermOps
 import vct.col.print._
 
-trait ChorPermImpl[G] extends ChorPermOps[G] { this: ChorPerm[G] =>
+trait ChorPermImpl[G] extends ChorPermOps[G] {
+  this: ChorPerm[G] =>
   override def layout(implicit ctx: Ctx): Doc =
-    Text("Perm") <> "[" <> ctx.name(endpoint) <> "]" <> "(" <> loc <> ", " <> perm <> ")"
+    Text("Perm") <> "[" <> ctx.name(endpoint) <> "]" <> "(" <> loc <> ", " <>
+      perm <> ")"
 
   override def t: Type[G] = TResource()
 }
diff --git a/src/col/vct/col/ast/unsorted/CoerceDecreasePrecisionImpl.scala b/src/col/vct/col/ast/unsorted/CoerceDecreasePrecisionImpl.scala
index 63a9d2542e..c59f6f7056 100644
--- a/src/col/vct/col/ast/unsorted/CoerceDecreasePrecisionImpl.scala
+++ b/src/col/vct/col/ast/unsorted/CoerceDecreasePrecisionImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CoerceDecreasePrecision
 import vct.col.ast.ops.CoerceDecreasePrecisionOps
 import vct.col.print._
 
-trait CoerceDecreasePrecisionImpl[G] extends CoerceDecreasePrecisionOps[G] { this: CoerceDecreasePrecision[G] =>
+trait CoerceDecreasePrecisionImpl[G] extends CoerceDecreasePrecisionOps[G] {
+  this: CoerceDecreasePrecision[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/CoerceIncreasePrecisionImpl.scala b/src/col/vct/col/ast/unsorted/CoerceIncreasePrecisionImpl.scala
index 840db45313..b7ad3c115c 100644
--- a/src/col/vct/col/ast/unsorted/CoerceIncreasePrecisionImpl.scala
+++ b/src/col/vct/col/ast/unsorted/CoerceIncreasePrecisionImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.CoerceIncreasePrecision
 import vct.col.ast.ops.CoerceIncreasePrecisionOps
 import vct.col.print._
 
-trait CoerceIncreasePrecisionImpl[G] extends CoerceIncreasePrecisionOps[G] { this: CoerceIncreasePrecision[G] =>
+trait CoerceIncreasePrecisionImpl[G] extends CoerceIncreasePrecisionOps[G] {
+  this: CoerceIncreasePrecision[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/CommunicateStatementImpl.scala b/src/col/vct/col/ast/unsorted/CommunicateStatementImpl.scala
index 3fc866199a..f91db97077 100644
--- a/src/col/vct/col/ast/unsorted/CommunicateStatementImpl.scala
+++ b/src/col/vct/col/ast/unsorted/CommunicateStatementImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.CommunicateStatement
 import vct.col.ast.ops.CommunicateStatementOps
 import vct.col.print._
 
-trait CommunicateStatementImpl[G] extends CommunicateStatementOps[G] { this: CommunicateStatement[G] =>
-   override def layout(implicit ctx: Ctx): Doc = Text("/* Communicate container */") <+> inner
+trait CommunicateStatementImpl[G] extends CommunicateStatementOps[G] {
+  this: CommunicateStatement[G] =>
+  override def layout(implicit ctx: Ctx): Doc =
+    Text("/* Communicate container */") <+> inner
 }
diff --git a/src/col/vct/col/ast/unsorted/ConstructorImpl.scala b/src/col/vct/col/ast/unsorted/ConstructorImpl.scala
index 6f1a0a702a..23f656fc03 100644
--- a/src/col/vct/col/ast/unsorted/ConstructorImpl.scala
+++ b/src/col/vct/col/ast/unsorted/ConstructorImpl.scala
@@ -4,16 +4,20 @@ import vct.col.ast.{Constructor, Statement, TClass, TVar, Variable}
 import vct.col.ast.ops.ConstructorOps
 import vct.col.print._
 
-trait ConstructorImpl[G] extends ConstructorOps[G] { this: Constructor[G] =>
+trait ConstructorImpl[G] extends ConstructorOps[G] {
+  this: Constructor[G] =>
   override def pure: Boolean = false
-  override def returnType: TClass[G] = TClass(cls, cls.decl.typeArgs.map((v: Variable[G]) => TVar(v.ref)))
+  override def returnType: TClass[G] =
+    TClass(cls, cls.decl.typeArgs.map((v: Variable[G]) => TVar(v.ref)))
 
-   override def layout(implicit ctx: Ctx): Doc = {
-     Doc.stack(Seq(
-       contract,
-       Group(Text("constructor") <> DocUtil.javaGenericParams(typeArgs) <> "(" <> Doc.args(args) <> ")") <>
-         body.map(Text(" ") <> _).getOrElse(Text(";"))
-     ))
-   }
+  override def layout(implicit ctx: Ctx): Doc = {
+    Doc.stack(Seq(
+      contract,
+      Group(
+        Text("constructor") <> DocUtil.javaGenericParams(typeArgs) <> "(" <>
+          Doc.args(args) <> ")"
+      ) <> body.map(Text(" ") <> _).getOrElse(Text(";")),
+    ))
+  }
 
 }
diff --git a/src/col/vct/col/ast/unsorted/ConstructorInvocationImpl.scala b/src/col/vct/col/ast/unsorted/ConstructorInvocationImpl.scala
index e9538d70d6..cd0b8d4f52 100644
--- a/src/col/vct/col/ast/unsorted/ConstructorInvocationImpl.scala
+++ b/src/col/vct/col/ast/unsorted/ConstructorInvocationImpl.scala
@@ -6,20 +6,22 @@ import vct.col.print._
 
 import scala.util.Try
 
-trait ConstructorInvocationImpl[G] extends ConstructorInvocationOps[G] { this: ConstructorInvocation[G] =>
+trait ConstructorInvocationImpl[G] extends ConstructorInvocationOps[G] {
+  this: ConstructorInvocation[G] =>
 
   def cls: Class[G] = ref.decl.cls.decl
 
   override def typeEnv: Map[Variable[G], Type[G]] =
     (cls.typeArgs.zip(classTypeArgs) ++ ref.decl.typeArgs.zip(typeArgs)).toMap
 
-   override def layout(implicit ctx: Ctx): Doc = {
-     Doc.spread(Seq(
-       Text("new"),
-       DocUtil.javaGenericArgs(typeArgs),
-       Text(Try(cls).map(ctx.name(_)).getOrElse("?brokenref?")) <> DocUtil.javaGenericArgs(classTypeArgs) <>
-         "(" <> DocUtil.argsOutArgs(args, outArgs) <> ")" <>
-         DocUtil.givenYields(givenMap, yields)
-     ))
-   }
+  override def layout(implicit ctx: Ctx): Doc = {
+    Doc.spread(Seq(
+      Text("new"),
+      DocUtil.javaGenericArgs(typeArgs),
+      Text(Try(cls).map(ctx.name(_)).getOrElse("?brokenref?")) <>
+        DocUtil.javaGenericArgs(classTypeArgs) <> "(" <>
+        DocUtil.argsOutArgs(args, outArgs) <> ")" <>
+        DocUtil.givenYields(givenMap, yields),
+    ))
+  }
 }
diff --git a/src/col/vct/col/ast/unsorted/EnumConstantImpl.scala b/src/col/vct/col/ast/unsorted/EnumConstantImpl.scala
index c521a52c32..cd7b515e27 100644
--- a/src/col/vct/col/ast/unsorted/EnumConstantImpl.scala
+++ b/src/col/vct/col/ast/unsorted/EnumConstantImpl.scala
@@ -4,6 +4,8 @@ import vct.col.ast.EnumConstant
 import vct.col.ast.ops.{EnumConstantOps, EnumConstantFamilyOps}
 import vct.col.print._
 
-trait EnumConstantImpl[G] extends EnumConstantOps[G] with EnumConstantFamilyOps[G] { this: EnumConstant[G] =>
+trait EnumConstantImpl[G]
+    extends EnumConstantOps[G] with EnumConstantFamilyOps[G] {
+  this: EnumConstant[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/InstantiateImpl.scala b/src/col/vct/col/ast/unsorted/InstantiateImpl.scala
index 85fadd5742..4b96d1633a 100644
--- a/src/col/vct/col/ast/unsorted/InstantiateImpl.scala
+++ b/src/col/vct/col/ast/unsorted/InstantiateImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Expr, Instantiate}
 import vct.col.ast.ops.InstantiateOps
 import vct.col.print._
 
-trait InstantiateImpl[G] extends InstantiateOps[G] { this: Instantiate[G] =>
+trait InstantiateImpl[G] extends InstantiateOps[G] {
+  this: Instantiate[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
   override def expr: Expr[G] = this.out
 }
diff --git a/src/col/vct/col/ast/unsorted/InvokeConstructorImpl.scala b/src/col/vct/col/ast/unsorted/InvokeConstructorImpl.scala
index 96e38009da..fd06de55ce 100644
--- a/src/col/vct/col/ast/unsorted/InvokeConstructorImpl.scala
+++ b/src/col/vct/col/ast/unsorted/InvokeConstructorImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Class, InvokeConstructor, Type, Variable}
 import vct.col.ast.ops.InvokeConstructorOps
 import vct.col.print._
 
-trait InvokeConstructorImpl[G] extends InvokeConstructorOps[G] { this: InvokeConstructor[G] =>
+trait InvokeConstructorImpl[G] extends InvokeConstructorOps[G] {
+  this: InvokeConstructor[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 
   def cls: Class[G] = ref.decl.cls.decl
diff --git a/src/col/vct/col/ast/unsorted/JavaBipAnnotationImpl.scala b/src/col/vct/col/ast/unsorted/JavaBipAnnotationImpl.scala
index ac976973eb..f81566c34c 100644
--- a/src/col/vct/col/ast/unsorted/JavaBipAnnotationImpl.scala
+++ b/src/col/vct/col/ast/unsorted/JavaBipAnnotationImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaBipAnnotation
 import vct.col.ast.ops.JavaBipAnnotationOps
 import vct.col.print._
 
-trait JavaBipAnnotationImpl[G] extends JavaBipAnnotationOps[G] { this: JavaBipAnnotation[G] =>
+trait JavaBipAnnotationImpl[G] extends JavaBipAnnotationOps[G] {
+  this: JavaBipAnnotation[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/JavaBipGlueElementImpl.scala b/src/col/vct/col/ast/unsorted/JavaBipGlueElementImpl.scala
index ab83131df9..9c4ea622b1 100644
--- a/src/col/vct/col/ast/unsorted/JavaBipGlueElementImpl.scala
+++ b/src/col/vct/col/ast/unsorted/JavaBipGlueElementImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.JavaBipGlueElement
 import vct.col.ast.ops.JavaBipGlueElementFamilyOps
 import vct.col.print._
 
-trait JavaBipGlueElementImpl[G] extends JavaBipGlueElementFamilyOps[G] { this: JavaBipGlueElement[G] =>
+trait JavaBipGlueElementImpl[G] extends JavaBipGlueElementFamilyOps[G] {
+  this: JavaBipGlueElement[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/MessageImpl.scala b/src/col/vct/col/ast/unsorted/MessageImpl.scala
index 7a261fd264..e171997251 100644
--- a/src/col/vct/col/ast/unsorted/MessageImpl.scala
+++ b/src/col/vct/col/ast/unsorted/MessageImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Message, Type}
 import vct.col.ast.ops.MessageOps
 import vct.col.print._
 
-trait MessageImpl[G] extends MessageOps[G] { this: Message[G] =>
+trait MessageImpl[G] extends MessageOps[G] {
+  this: Message[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("\\msg")
   override def t: Type[G] = ref.decl.msg.t
 }
diff --git a/src/col/vct/col/ast/unsorted/OperatorImpl.scala b/src/col/vct/col/ast/unsorted/OperatorImpl.scala
index 4abbc6f620..bc671fa98d 100644
--- a/src/col/vct/col/ast/unsorted/OperatorImpl.scala
+++ b/src/col/vct/col/ast/unsorted/OperatorImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.Operator
 import vct.col.ast.ops.OperatorFamilyOps
 import vct.col.print._
 
-trait OperatorImpl[G] extends OperatorFamilyOps[G] { this: Operator[G] =>
+trait OperatorImpl[G] extends OperatorFamilyOps[G] {
+  this: Operator[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/OperatorLeftPlusImpl.scala b/src/col/vct/col/ast/unsorted/OperatorLeftPlusImpl.scala
index 8d29fdaa0f..d7245fec55 100644
--- a/src/col/vct/col/ast/unsorted/OperatorLeftPlusImpl.scala
+++ b/src/col/vct/col/ast/unsorted/OperatorLeftPlusImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.OperatorLeftPlus
 import vct.col.ast.ops.OperatorLeftPlusOps
 import vct.col.print._
 
-trait OperatorLeftPlusImpl[G] extends OperatorLeftPlusOps[G] { this: OperatorLeftPlus[G] =>
+trait OperatorLeftPlusImpl[G] extends OperatorLeftPlusOps[G] {
+  this: OperatorLeftPlus[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/OperatorRightPlusImpl.scala b/src/col/vct/col/ast/unsorted/OperatorRightPlusImpl.scala
index 093886cda6..6680a02bbd 100644
--- a/src/col/vct/col/ast/unsorted/OperatorRightPlusImpl.scala
+++ b/src/col/vct/col/ast/unsorted/OperatorRightPlusImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.OperatorRightPlus
 import vct.col.ast.ops.OperatorRightPlusOps
 import vct.col.print._
 
-trait OperatorRightPlusImpl[G] extends OperatorRightPlusOps[G] { this: OperatorRightPlus[G] =>
+trait OperatorRightPlusImpl[G] extends OperatorRightPlusOps[G] {
+  this: OperatorRightPlus[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/PVLBranchImpl.scala b/src/col/vct/col/ast/unsorted/PVLBranchImpl.scala
index 57c932f0de..3428a9b4ef 100644
--- a/src/col/vct/col/ast/unsorted/PVLBranchImpl.scala
+++ b/src/col/vct/col/ast/unsorted/PVLBranchImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.PVLBranch
 import vct.col.ast.ops.PVLBranchOps
 import vct.col.print._
 
-trait PVLBranchImpl[G] extends PVLBranchOps[G] { this: PVLBranch[G] =>
+trait PVLBranchImpl[G] extends PVLBranchOps[G] {
+  this: PVLBranch[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/PVLChannelInvariantImpl.scala b/src/col/vct/col/ast/unsorted/PVLChannelInvariantImpl.scala
index 15ea04cf9c..54bab5d79f 100644
--- a/src/col/vct/col/ast/unsorted/PVLChannelInvariantImpl.scala
+++ b/src/col/vct/col/ast/unsorted/PVLChannelInvariantImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.PVLChannelInvariant
 import vct.col.ast.ops.PVLChannelInvariantOps
 import vct.col.print._
 
-trait PVLChannelInvariantImpl[G] extends PVLChannelInvariantOps[G] { this: PVLChannelInvariant[G] =>
+trait PVLChannelInvariantImpl[G] extends PVLChannelInvariantOps[G] {
+  this: PVLChannelInvariant[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/PVLChorPermImpl.scala b/src/col/vct/col/ast/unsorted/PVLChorPermImpl.scala
index c89cdd41f6..385d0f6962 100644
--- a/src/col/vct/col/ast/unsorted/PVLChorPermImpl.scala
+++ b/src/col/vct/col/ast/unsorted/PVLChorPermImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{PVLChorPerm, TResource, Type}
 import vct.col.ast.ops.PVLChorPermOps
 import vct.col.print._
 
-trait PVLChorPermImpl[G] extends PVLChorPermOps[G] { this: PVLChorPerm[G] =>
+trait PVLChorPermImpl[G] extends PVLChorPermOps[G] {
+  this: PVLChorPerm[G] =>
   override def layout(implicit ctx: Ctx): Doc =
     Text("Perm") <> "[" <> endpoint <> "]" <> "(" <> loc <> ", " <> perm <> ")"
 
diff --git a/src/col/vct/col/ast/unsorted/PVLChorRunImpl.scala b/src/col/vct/col/ast/unsorted/PVLChorRunImpl.scala
index 32e9cf85fa..5e5376efbd 100644
--- a/src/col/vct/col/ast/unsorted/PVLChorRunImpl.scala
+++ b/src/col/vct/col/ast/unsorted/PVLChorRunImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.PVLChorRun
 import vct.col.ast.ops.PVLChorRunOps
 import vct.col.print._
 
-trait PVLChorRunImpl[G] extends PVLChorRunOps[G] { this: PVLChorRun[G] =>
+trait PVLChorRunImpl[G] extends PVLChorRunOps[G] {
+  this: PVLChorRun[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/PVLChorStatementImpl.scala b/src/col/vct/col/ast/unsorted/PVLChorStatementImpl.scala
index 87539d56cf..fde3de6ec1 100644
--- a/src/col/vct/col/ast/unsorted/PVLChorStatementImpl.scala
+++ b/src/col/vct/col/ast/unsorted/PVLChorStatementImpl.scala
@@ -1,35 +1,47 @@
 package vct.col.ast.unsorted
 
-import vct.col.ast.{Assign, ChorStatement, Expr, PVLChorStatement, PVLDeref, PVLEndpoint, PVLLocal}
+import vct.col.ast.{
+  Assign,
+  ChorStatement,
+  Expr,
+  PVLChorStatement,
+  PVLDeref,
+  PVLEndpoint,
+  PVLLocal,
+}
 import vct.col.ast.ops.PVLChorStatementOps
 import vct.col.check.{CheckContext, CheckError, PVLSeqAssignEndpoint}
 import vct.col.print._
 import vct.col.resolve.ctx.RefPVLEndpoint
 
-trait PVLChorStatementImpl[G] extends PVLChorStatementOps[G] { this: PVLChorStatement[G] =>
+trait PVLChorStatementImpl[G] extends PVLChorStatementOps[G] {
+  this: PVLChorStatement[G] =>
   assert(!inner.isInstanceOf[ChorStatement[_]])
 
   // override def layout(implicit ctx: Ctx): Doc = ???
 
   object assign {
     def apply(): Assign[G] = inner.asInstanceOf[Assign[G]]
-    def get: Option[Assign[G]] = inner match {
-      case assign: Assign[G] => Some(assign)
-      case _ => None
-    }
+    def get: Option[Assign[G]] =
+      inner match {
+        case assign: Assign[G] => Some(assign)
+        case _ => None
+      }
 
     def target: Expr[G] = assign().target
 
     def endpoint: Option[PVLEndpoint[G]] = endpointHelper(target)
 
-    def endpointHelper(expr: Expr[G]): Option[PVLEndpoint[G]] = expr match {
-      case PVLDeref(obj, _) => endpointHelper(obj)
-      case local: PVLLocal[G] => local.ref match {
-        case Some(RefPVLEndpoint(endpoint)) => Some(endpoint)
+    def endpointHelper(expr: Expr[G]): Option[PVLEndpoint[G]] =
+      expr match {
+        case PVLDeref(obj, _) => endpointHelper(obj)
+        case local: PVLLocal[G] =>
+          local.ref match {
+            case Some(RefPVLEndpoint(endpoint)) => Some(endpoint)
+            case _ => None
+          }
         case _ => None
       }
-      case _ => None
-    }
   }
 
   // TODO (RR): How to redo this error? Purely with permissions? Then it has to be a blame
diff --git a/src/col/vct/col/ast/unsorted/PVLEndpointImpl.scala b/src/col/vct/col/ast/unsorted/PVLEndpointImpl.scala
index 94a88bb08e..9aea9ecdf0 100644
--- a/src/col/vct/col/ast/unsorted/PVLEndpointImpl.scala
+++ b/src/col/vct/col/ast/unsorted/PVLEndpointImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{PVLEndpoint, TClass, Type}
 import vct.col.ast.ops.PVLEndpointOps
 import vct.col.print._
 
-trait PVLEndpointImpl[G] extends PVLEndpointOps[G] { this: PVLEndpoint[G] =>
+trait PVLEndpointImpl[G] extends PVLEndpointOps[G] {
+  this: PVLEndpoint[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 
   def t: TClass[G] = TClass(cls, typeArgs)
diff --git a/src/col/vct/col/ast/unsorted/PVLLoopImpl.scala b/src/col/vct/col/ast/unsorted/PVLLoopImpl.scala
index f13f13b723..216715f562 100644
--- a/src/col/vct/col/ast/unsorted/PVLLoopImpl.scala
+++ b/src/col/vct/col/ast/unsorted/PVLLoopImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.PVLLoop
 import vct.col.ast.ops.PVLLoopOps
 import vct.col.print._
 
-trait PVLLoopImpl[G] extends PVLLoopOps[G] { this: PVLLoop[G] =>
+trait PVLLoopImpl[G] extends PVLLoopOps[G] {
+  this: PVLLoop[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/PVLMessageImpl.scala b/src/col/vct/col/ast/unsorted/PVLMessageImpl.scala
index 891d5f142e..ec118ae033 100644
--- a/src/col/vct/col/ast/unsorted/PVLMessageImpl.scala
+++ b/src/col/vct/col/ast/unsorted/PVLMessageImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{PVLMessage, Type}
 import vct.col.ast.ops.PVLMessageOps
 import vct.col.print._
 
-trait PVLMessageImpl[G] extends PVLMessageOps[G] { this: PVLMessage[G] =>
+trait PVLMessageImpl[G] extends PVLMessageOps[G] {
+  this: PVLMessage[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("/* PVL */ \\msg")
   override def t: Type[G] = ref.get.msg.t
 }
diff --git a/src/col/vct/col/ast/unsorted/PVLReceiverImpl.scala b/src/col/vct/col/ast/unsorted/PVLReceiverImpl.scala
index 9766515fb6..d253e67177 100644
--- a/src/col/vct/col/ast/unsorted/PVLReceiverImpl.scala
+++ b/src/col/vct/col/ast/unsorted/PVLReceiverImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{PVLReceiver, Type}
 import vct.col.ast.ops.PVLReceiverOps
 import vct.col.print._
 
-trait PVLReceiverImpl[G] extends PVLReceiverOps[G] { this: PVLReceiver[G] =>
+trait PVLReceiverImpl[G] extends PVLReceiverOps[G] {
+  this: PVLReceiver[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("/* PVL */ \\receiver")
   override def t: Type[G] = ref.get.inferredReceiver.get.t
 }
diff --git a/src/col/vct/col/ast/unsorted/PVLSenderImpl.scala b/src/col/vct/col/ast/unsorted/PVLSenderImpl.scala
index 12e301a0b2..d18500cd6a 100644
--- a/src/col/vct/col/ast/unsorted/PVLSenderImpl.scala
+++ b/src/col/vct/col/ast/unsorted/PVLSenderImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{PVLSender, Type}
 import vct.col.ast.ops.PVLSenderOps
 import vct.col.print._
 
-trait PVLSenderImpl[G] extends PVLSenderOps[G] { this: PVLSender[G] =>
+trait PVLSenderImpl[G] extends PVLSenderOps[G] {
+  this: PVLSender[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("/* PVL */ \\sender")
   override def t: Type[G] = ref.get.inferredSender.get.t
 }
diff --git a/src/col/vct/col/ast/unsorted/RangeSetImpl.scala b/src/col/vct/col/ast/unsorted/RangeSetImpl.scala
index e1f07e6730..1ae2a71b96 100644
--- a/src/col/vct/col/ast/unsorted/RangeSetImpl.scala
+++ b/src/col/vct/col/ast/unsorted/RangeSetImpl.scala
@@ -4,9 +4,11 @@ import vct.col.ast.{RangeSet, TInt, TSet, Type}
 import vct.col.ast.ops.RangeSetOps
 import vct.col.print._
 
-trait RangeSetImpl[G] extends RangeSetOps[G] { this: RangeSet[G] =>
+trait RangeSetImpl[G] extends RangeSetOps[G] {
+  this: RangeSet[G] =>
   override def t: Type[G] = TSet(TInt())
 
   override def precedence: Int = Precedence.ATOMIC
-  override def layout(implicit ctx: Ctx): Doc = Text("{") <> from <+> ".." <+> to <> "}"
+  override def layout(implicit ctx: Ctx): Doc =
+    Text("{") <> from <+> ".." <+> to <> "}"
 }
diff --git a/src/col/vct/col/ast/unsorted/ReceiverImpl.scala b/src/col/vct/col/ast/unsorted/ReceiverImpl.scala
index d759b96e07..e3cff284b5 100644
--- a/src/col/vct/col/ast/unsorted/ReceiverImpl.scala
+++ b/src/col/vct/col/ast/unsorted/ReceiverImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Receiver, Type}
 import vct.col.ast.ops.ReceiverOps
 import vct.col.print._
 
-trait ReceiverImpl[G] extends ReceiverOps[G] { this: Receiver[G] =>
+trait ReceiverImpl[G] extends ReceiverOps[G] {
+  this: Receiver[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("\\receiver")
   override def t: Type[G] = ref.decl.receiver.get.decl.t
 }
diff --git a/src/col/vct/col/ast/unsorted/SenderImpl.scala b/src/col/vct/col/ast/unsorted/SenderImpl.scala
index 642c5ac5b3..b99b311f64 100644
--- a/src/col/vct/col/ast/unsorted/SenderImpl.scala
+++ b/src/col/vct/col/ast/unsorted/SenderImpl.scala
@@ -4,7 +4,8 @@ import vct.col.ast.{Sender, Type}
 import vct.col.ast.ops.SenderOps
 import vct.col.print._
 
-trait SenderImpl[G] extends SenderOps[G] { this: Sender[G] =>
+trait SenderImpl[G] extends SenderOps[G] {
+  this: Sender[G] =>
   override def layout(implicit ctx: Ctx): Doc = Text("\\sender")
   override def t: Type[G] = ref.decl.sender.get.decl.t
 }
diff --git a/src/col/vct/col/ast/unsorted/TEnumImpl.scala b/src/col/vct/col/ast/unsorted/TEnumImpl.scala
index 11ec4dd81a..dc08ad76ad 100644
--- a/src/col/vct/col/ast/unsorted/TEnumImpl.scala
+++ b/src/col/vct/col/ast/unsorted/TEnumImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TEnum
 import vct.col.ast.ops.TEnumOps
 import vct.col.print._
 
-trait TEnumImpl[G] extends TEnumOps[G] { this: TEnum[G] =>
+trait TEnumImpl[G] extends TEnumOps[G] {
+  this: TEnum[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/TPVLChoreographyImpl.scala b/src/col/vct/col/ast/unsorted/TPVLChoreographyImpl.scala
index bc0208e694..80785b2b0c 100644
--- a/src/col/vct/col/ast/unsorted/TPVLChoreographyImpl.scala
+++ b/src/col/vct/col/ast/unsorted/TPVLChoreographyImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.TPVLChoreography
 import vct.col.print._
 import vct.col.ast.ops.TPVLChoreographyOps
 
-trait TPVLChoreographyImpl[G] extends TPVLChoreographyOps[G] { this: TPVLChoreography[G] =>
+trait TPVLChoreographyImpl[G] extends TPVLChoreographyOps[G] {
+  this: TPVLChoreography[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/UnresolvedChorBranchImpl.scala b/src/col/vct/col/ast/unsorted/UnresolvedChorBranchImpl.scala
index f4364c3859..ff63e49419 100644
--- a/src/col/vct/col/ast/unsorted/UnresolvedChorBranchImpl.scala
+++ b/src/col/vct/col/ast/unsorted/UnresolvedChorBranchImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.UnresolvedChorBranch
 import vct.col.print._
 import vct.col.ast.ops.UnresolvedChorBranchOps
 
-trait UnresolvedChorBranchImpl[G] extends UnresolvedChorBranchOps[G] { this: UnresolvedChorBranch[G] =>
+trait UnresolvedChorBranchImpl[G] extends UnresolvedChorBranchOps[G] {
+  this: UnresolvedChorBranch[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/unsorted/UnresolvedChorLoopImpl.scala b/src/col/vct/col/ast/unsorted/UnresolvedChorLoopImpl.scala
index 4934a109ce..7e2903c7d6 100644
--- a/src/col/vct/col/ast/unsorted/UnresolvedChorLoopImpl.scala
+++ b/src/col/vct/col/ast/unsorted/UnresolvedChorLoopImpl.scala
@@ -4,6 +4,7 @@ import vct.col.ast.UnresolvedChorLoop
 import vct.col.print._
 import vct.col.ast.ops.UnresolvedChorLoopOps
 
-trait UnresolvedChorLoopImpl[G] extends UnresolvedChorLoopOps[G] { this: UnresolvedChorLoop[G] =>
+trait UnresolvedChorLoopImpl[G] extends UnresolvedChorLoopOps[G] {
+  this: UnresolvedChorLoop[G] =>
   // override def layout(implicit ctx: Ctx): Doc = ???
 }
diff --git a/src/col/vct/col/ast/util/CheckFoldUnfoldTarget.scala b/src/col/vct/col/ast/util/CheckFoldUnfoldTarget.scala
index f3801b1afb..e5ad2fedbf 100644
--- a/src/col/vct/col/ast/util/CheckFoldUnfoldTarget.scala
+++ b/src/col/vct/col/ast/util/CheckFoldUnfoldTarget.scala
@@ -3,46 +3,61 @@ package vct.col.ast.util
 import vct.col.ast
 import vct.col.ast.node.NodeFamilyImpl
 import vct.col.ast._
-import vct.col.check.{AbstractPredicate, CheckContext, CheckError, NotAPredicateApplication}
+import vct.col.check.{
+  AbstractPredicate,
+  CheckContext,
+  CheckError,
+  NotAPredicateApplication,
+}
 import vct.col.resolve.ctx._
 
 import scala.annotation.tailrec
 
-trait CheckFoldUnfoldTarget[G] extends NodeFamilyImpl[G] { this: NodeFamily[G] =>
+trait CheckFoldUnfoldTarget[G] extends NodeFamilyImpl[G] {
+  this: NodeFamily[G] =>
   def res: Expr[G]
 
-  private def checkNonAbstract(predicate: ast.AbstractPredicate[G], blame: Expr[G]): Option[CheckError] =
+  private def checkNonAbstract(
+      predicate: ast.AbstractPredicate[G],
+      blame: Expr[G],
+  ): Option[CheckError] =
     predicate.body match {
       case None => Some(AbstractPredicate(blame))
       case Some(_) => None
     }
 
   @tailrec
-  private def check(e: Expr[G]): Option[CheckError] = e match {
-    case Scale(_, res) => check(res)
-    case apply: ApplyAnyPredicate[G] => checkNonAbstract(apply.ref.decl, apply)
-    case inv: PVLInvocation[G] => inv.ref.get match {
-      case RefPredicate(decl) => checkNonAbstract(decl, inv)
-      case RefInstancePredicate(decl) => checkNonAbstract(decl, inv)
-      case _ => Some(NotAPredicateApplication(e))
-    }
-    case inv: JavaInvocation[G] => inv.ref.get match {
-      case RefPredicate(decl) => checkNonAbstract(decl, inv)
-      case RefInstancePredicate(decl) => checkNonAbstract(decl, inv)
-      case _ => Some(NotAPredicateApplication(e))
-    }
-    case inv: CInvocation[G] => inv.ref.get match {
-      case RefPredicate(decl) => checkNonAbstract(decl, inv)
-      case RefInstancePredicate(decl) => checkNonAbstract(decl, inv)
-      case _ => Some(NotAPredicateApplication(e))
-    }
-    case inv: CPPInvocation[G] => inv.ref.get match {
-      case RefPredicate(decl) => checkNonAbstract(decl, inv)
-      case RefInstancePredicate(decl) => checkNonAbstract(decl, inv)
+  private def check(e: Expr[G]): Option[CheckError] =
+    e match {
+      case Scale(_, res) => check(res)
+      case apply: ApplyAnyPredicate[G] =>
+        checkNonAbstract(apply.ref.decl, apply)
+      case inv: PVLInvocation[G] =>
+        inv.ref.get match {
+          case RefPredicate(decl) => checkNonAbstract(decl, inv)
+          case RefInstancePredicate(decl) => checkNonAbstract(decl, inv)
+          case _ => Some(NotAPredicateApplication(e))
+        }
+      case inv: JavaInvocation[G] =>
+        inv.ref.get match {
+          case RefPredicate(decl) => checkNonAbstract(decl, inv)
+          case RefInstancePredicate(decl) => checkNonAbstract(decl, inv)
+          case _ => Some(NotAPredicateApplication(e))
+        }
+      case inv: CInvocation[G] =>
+        inv.ref.get match {
+          case RefPredicate(decl) => checkNonAbstract(decl, inv)
+          case RefInstancePredicate(decl) => checkNonAbstract(decl, inv)
+          case _ => Some(NotAPredicateApplication(e))
+        }
+      case inv: CPPInvocation[G] =>
+        inv.ref.get match {
+          case RefPredicate(decl) => checkNonAbstract(decl, inv)
+          case RefInstancePredicate(decl) => checkNonAbstract(decl, inv)
+          case _ => Some(NotAPredicateApplication(e))
+        }
       case _ => Some(NotAPredicateApplication(e))
     }
-    case _ => Some(NotAPredicateApplication(e))
-  }
 
   override def check(context: CheckContext[G]): Seq[CheckError] =
     super.check(context) ++ check(res).toSeq
diff --git a/src/col/vct/col/ast/util/Declarator.scala b/src/col/vct/col/ast/util/Declarator.scala
index c75a210f6d..8e38abdaa6 100644
--- a/src/col/vct/col/ast/util/Declarator.scala
+++ b/src/col/vct/col/ast/util/Declarator.scala
@@ -4,13 +4,17 @@ import vct.col.ast.node.NodeImpl
 import vct.col.ast.{Declaration, Node}
 import vct.col.check.{CheckContext, DoesNotDefine, OutOfScopeError}
 
-trait Declarator[G] extends NodeImpl[G] { this: Node[G] =>
+trait Declarator[G] extends NodeImpl[G] {
+  this: Node[G] =>
   def declarations: Seq[Declaration[G]]
 
-  override def enterCheckContextScopes(context: CheckContext[G]): Seq[CheckContext.ScopeFrame[G]] =
-    context.withScope(declarations)
+  override def enterCheckContextScopes(
+      context: CheckContext[G]
+  ): Seq[CheckContext.ScopeFrame[G]] = context.withScope(declarations)
 
   def checkDefines(defn: Declaration[G], use: Node[G]): Seq[DoesNotDefine] =
-    if(declarations.contains(defn)) Nil
-    else Seq(DoesNotDefine(this, defn, use))
+    if (declarations.contains(defn))
+      Nil
+    else
+      Seq(DoesNotDefine(this, defn, use))
 }
diff --git a/src/col/vct/col/ast/util/ExpressionEqualityCheck.scala b/src/col/vct/col/ast/util/ExpressionEqualityCheck.scala
index 224be6edbb..ab806c1ca8 100644
--- a/src/col/vct/col/ast/util/ExpressionEqualityCheck.scala
+++ b/src/col/vct/col/ast/util/ExpressionEqualityCheck.scala
@@ -10,7 +10,9 @@ import scala.collection.mutable
 import scala.reflect.ClassTag
 
 object ExpressionEqualityCheck {
-  def apply[G](info: Option[AnnotationVariableInfo[G]] = None): ExpressionEqualityCheck[G] = new ExpressionEqualityCheck[G](info)
+  def apply[G](
+      info: Option[AnnotationVariableInfo[G]] = None
+  ): ExpressionEqualityCheck[G] = new ExpressionEqualityCheck[G](info)
 
   def isConstantInt[G](e: Expr[G]): Option[BigInt] = {
     ExpressionEqualityCheck().isConstantInt(e)
@@ -21,9 +23,11 @@ object ExpressionEqualityCheck {
   }
 }
 
-case class InconsistentVariableEquality(v: Local[_], x: BigInt, y: BigInt) extends UserError {
+case class InconsistentVariableEquality(v: Local[_], x: BigInt, y: BigInt)
+    extends UserError {
   override def code: String = "inconsistentVariableEquality"
-  override def text: String = s"Inconsistent variable equality: value of $v is required to be both $x and $y"
+  override def text: String =
+    s"Inconsistent variable equality: value of $v is required to be both $x and $y"
 }
 
 class ExpressionEqualityCheck[G](info: Option[AnnotationVariableInfo[G]]) {
@@ -38,111 +42,220 @@ class ExpressionEqualityCheck[G](info: Option[AnnotationVariableInfo[G]]) {
 
   def eucl_mod(a: BigInt, b: BigInt): BigInt = {
     val m = a % b
-    val absB = if(b > 0) b else -b
-    if(m <= 0) m + absB else m
+    val absB =
+      if (b > 0)
+        b
+      else
+        -b
+    if (m <= 0)
+      m + absB
+    else
+      m
   }
 
   def eucl_div(a: BigInt, b: BigInt): BigInt = {
     val m = a % b
     val d = a / b
-    val add = if (b > 0) -1 else 1
-    if (m <= 0) d + add else d
+    val add =
+      if (b > 0)
+        -1
+      else
+        1
+    if (m <= 0)
+      d + add
+    else
+      d
   }
 
-  def isConstantIntRecurse(e: Expr[G]): Option[BigInt] = e match {
-    case e: Local[G] =>
-      // Does it have a direct int value?
-      info.flatMap(_.variableValues.get(e)) match {
-        case Some(x) => Some(x)
-        case None =>
-          info.flatMap(_.variableEqualities.get(e)) match {
-            case None => None
-            case Some(equals) =>
-              for (eq <- equals) {
-                // Make sure we do not loop indefinitely by keep replacing the same expressions somehow
-                if (replacerDepthInt > max_depth) return None
-                replacerDepthInt += 1
-                val res = isConstantIntRecurse(eq)
-                if (res.isDefined) return res
-              }
-              None
-          }
-      }
+  def isConstantIntRecurse(e: Expr[G]): Option[BigInt] =
+    e match {
+      case e: Local[G] =>
+        // Does it have a direct int value?
+        info.flatMap(_.variableValues.get(e)) match {
+          case Some(x) => Some(x)
+          case None =>
+            info.flatMap(_.variableEqualities.get(e)) match {
+              case None => None
+              case Some(equals) =>
+                for (eq <- equals) {
+                  // Make sure we do not loop indefinitely by keep replacing the same expressions somehow
+                  if (replacerDepthInt > max_depth)
+                    return None
+                  replacerDepthInt += 1
+                  val res = isConstantIntRecurse(eq)
+                  if (res.isDefined)
+                    return res
+                }
+                None
+            }
+        }
 
-    case i: ConstantInt[G] => Some(i.value)
-    case Exp(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1.pow(i2.toInt)
-    case Plus(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 + i2
-    case AmbiguousPlus(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 + i2
-    case Minus(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 - i2
-    case AmbiguousMinus(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 - i2
-    case Mult(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 * i2
-    case AmbiguousMult(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 * i2
-    case FloorDiv(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield eucl_div(i1, i2)
-    case Mod(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield eucl_mod(i1, i2)
-    case TruncDiv(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 / i2
-    case TruncMod(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 % i2
-    case UMinus(e1) => for {i1 <- isConstantIntRecurse(e1)} yield -i1
-
-    case BitAnd(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 & i2
-    case ComputationalAnd(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 & i2
-    case AmbiguousComputationalAnd(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 & i2
-    case BitOr(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 | i2
-    case ComputationalOr(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 | i2
-    case AmbiguousComputationalOr(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 | i2
-    case BitXor(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 ^ i2
-    case ComputationalXor(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 ^ i2
-    case AmbiguousComputationalXor(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 ^ i2
-    case BitShl(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 << i2.toInt
-    case BitShr(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1 >> i2.toInt
-    case BitUShr(e1, e2) => for {i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)} yield i1.toInt >>> i2.toInt
-
-    case _ => None
-  }
+      case i: ConstantInt[G] => Some(i.value)
+      case Exp(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1.pow(i2.toInt)
+      case Plus(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 + i2
+      case AmbiguousPlus(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 + i2
+      case Minus(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 - i2
+      case AmbiguousMinus(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 - i2
+      case Mult(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 * i2
+      case AmbiguousMult(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 * i2
+      case FloorDiv(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield eucl_div(i1, i2)
+      case Mod(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield eucl_mod(i1, i2)
+      case TruncDiv(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 / i2
+      case TruncMod(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 % i2
+      case UMinus(e1) => for { i1 <- isConstantIntRecurse(e1) } yield -i1
+
+      case BitAnd(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 & i2
+      case ComputationalAnd(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 & i2
+      case AmbiguousComputationalAnd(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 & i2
+      case BitOr(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 | i2
+      case ComputationalOr(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 | i2
+      case AmbiguousComputationalOr(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 | i2
+      case BitXor(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 ^ i2
+      case ComputationalXor(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 ^ i2
+      case AmbiguousComputationalXor(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 ^ i2
+      case BitShl(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 << i2.toInt
+      case BitShr(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1 >> i2.toInt
+      case BitUShr(e1, e2) =>
+        for {
+          i1 <- isConstantIntRecurse(e1); i2 <- isConstantIntRecurse(e2)
+        } yield i1.toInt >>> i2.toInt
+
+      case _ => None
+    }
 
   def equalExpressions(lhs: Expr[G], rhs: Expr[G]): Boolean = {
     replacerDepth = 0
     equalExpressionsRecurse(lhs, rhs)
   }
 
-  def upperBound(e: Expr[G]): Option[BigInt] = {
-    getBound(e, isLower=false)
-  }
+  def upperBound(e: Expr[G]): Option[BigInt] = { getBound(e, isLower = false) }
 
-  def lowerBound(e: Expr[G]): Option[BigInt] = {
-    getBound(e, isLower=true)
-  }
+  def lowerBound(e: Expr[G]): Option[BigInt] = { getBound(e, isLower = true) }
 
   def getBound(e: Expr[G], isLower: Boolean): Option[BigInt] = {
-    isConstantInt(e).foreach{ i => return Some(i)}
-
-    val normalBound =  if(isLower) lowerBound _ else upperBound _
-    val reverseBound = if(isLower) upperBound _ else lowerBound _
+    isConstantInt(e).foreach { i => return Some(i) }
+
+    val normalBound =
+      if (isLower)
+        lowerBound _
+      else
+        upperBound _
+    val reverseBound =
+      if (isLower)
+        upperBound _
+      else
+        lowerBound _
 
     e match {
-      case v: Local[G] => info.foreach{ i => return if(isLower) i.lowerBound.get(v) else i.upperBound.get(v)  }
-      case Plus(e1, e2) => return for{
-        b1 <- normalBound(e1)
-        b2 <- normalBound(e2)
-      } yield b1+b2
-      case Minus(e1, e2) => return for{
-        b1 <- normalBound(e1)
-        b2 <- reverseBound(e2)
-      } yield b1-b2
+      case v: Local[G] =>
+        info.foreach { i =>
+          return if (isLower)
+            i.lowerBound.get(v)
+          else
+            i.upperBound.get(v)
+        }
+      case Plus(e1, e2) =>
+        return for {
+          b1 <- normalBound(e1)
+          b2 <- normalBound(e2)
+        } yield b1 + b2
+      case Minus(e1, e2) =>
+        return for {
+          b1 <- normalBound(e1)
+          b2 <- reverseBound(e2)
+        } yield b1 - b2
       case Mult(e1, e2) =>
-        isConstantInt(e1).foreach {
-          i => if(i>0) normalBound(e2) . foreach { b2 => return Some(i*b2) }
-            if(i<0) reverseBound(e2) . foreach { u2 => return Some(i*u2) }
-            if(i==0) return Some(0)
+        isConstantInt(e1).foreach { i =>
+          if (i > 0)
+            normalBound(e2).foreach { b2 => return Some(i * b2) }
+          if (i < 0)
+            reverseBound(e2).foreach { u2 => return Some(i * u2) }
+          if (i == 0)
+            return Some(0)
         }
 
-        isConstantInt(e2).foreach {
-          i => if(i>0) normalBound(e1) . foreach { b1 => return Some(i*b1) }
-            if(i<0) reverseBound(e1) . foreach { u1 => return Some(i*u1) }
-            if(i==0) return Some(0)
+        isConstantInt(e2).foreach { i =>
+          if (i > 0)
+            normalBound(e1).foreach { b1 => return Some(i * b1) }
+          if (i < 0)
+            reverseBound(e1).foreach { u1 => return Some(i * u1) }
+          if (i == 0)
+            return Some(0)
         }
 
-        normalBound(e1) . foreach{ b1 => normalBound(e2) . foreach { b2 => if(b1>0 && b2>0) return Some(b1*b2) } }
-        // THe other cases are to complicated, so we do not consider them
+        normalBound(e1).foreach { b1 =>
+          normalBound(e2).foreach { b2 =>
+            if (b1 > 0 && b2 > 0)
+              return Some(b1 * b2)
+          }
+        }
+      // THe other cases are to complicated, so we do not consider them
       case Mod(e1, e2) if isLower => return Some(0)
       case Mod(e1, e2) => isConstantInt(e2)
       case _ =>
@@ -159,12 +272,18 @@ class ExpressionEqualityCheck[G](info: Option[AnnotationVariableInfo[G]]) {
     }
     // Compare two variables, where we sometimes store information about
     (lhs, rhs) match {
-      case (v1: Local[G], v2: Local[G]) =>  info.foreach{ i => if(i.lessThanEqVars.contains(v1) && i.lessThanEqVars(v1).contains(v2)) return Some(true) }
+      case (v1: Local[G], v2: Local[G]) =>
+        info.foreach { i =>
+          if (
+            i.lessThanEqVars.contains(v1) && i.lessThanEqVars(v1).contains(v2)
+          )
+            return Some(true)
+        }
       case _ =>
     }
 
     // Compare upper and lower bounds of two variables
-    (upperBound(lhs),lowerBound(rhs)) match {
+    (upperBound(lhs), lowerBound(rhs)) match {
       case (Some(x), Some(y)) if x <= y => return Some(true)
       case _ =>
     }
@@ -172,13 +291,16 @@ class ExpressionEqualityCheck[G](info: Option[AnnotationVariableInfo[G]]) {
     None
   }
 
-  def isNonZero(e: Expr[G]):Boolean = e match {
-    case v: Local[G] => info.exists(_.variableNotZero.contains(v))
-    case _ => isConstantInt(e).getOrElse(0) != 0
-    case _ => lessThenEq(const(1)(e.o), e).getOrElse(false)
-  }
+  def isNonZero(e: Expr[G]): Boolean =
+    e match {
+      case v: Local[G] => info.exists(_.variableNotZero.contains(v))
+      case _ => isConstantInt(e).getOrElse(0) != 0
+      case _ => lessThenEq(const(1)(e.o), e).getOrElse(false)
+    }
 
-  def unfoldComm[B <: BinExpr[G]](e: Expr[G])(implicit tag: ClassTag[B]): Seq[Expr[G]] = {
+  def unfoldComm[B <: BinExpr[G]](
+      e: Expr[G]
+  )(implicit tag: ClassTag[B]): Seq[Expr[G]] = {
     e match {
       case e: B /* checked */ => unfoldComm[B](e.left) ++ unfoldComm[B](e.right)
       case _ => Seq(e)
@@ -190,14 +312,17 @@ class ExpressionEqualityCheck[G](info: Option[AnnotationVariableInfo[G]]) {
     (isConstantInt(lhs), isConstantInt(rhs)) match {
       case (Some(i1), Some(i2)) => return i1 == i2
       case (None, None) => ()
-      //If one is a constant expression, and the other is not, this cannot be the same
+      // If one is a constant expression, and the other is not, this cannot be the same
       case _ => return false
     }
 
-    def partitionOptionList[A,B](xs: Seq[A], f: A => Option[B]): (Seq[A], Seq[B]) = {
+    def partitionOptionList[A, B](
+        xs: Seq[A],
+        f: A => Option[B],
+    ): (Seq[A], Seq[B]) = {
       var resLeft: Seq[A] = Seq()
       var resRight: Seq[B] = Seq()
-      for(x <- xs){
+      for (x <- xs) {
         f(x) match {
           case Some(b) => resRight ++= Seq(b)
           case None => resLeft ++= Seq(x)
@@ -206,85 +331,106 @@ class ExpressionEqualityCheck[G](info: Option[AnnotationVariableInfo[G]]) {
       (resLeft, resRight)
     }
 
-    def commAssoc[B <: BinExpr[G]](e1: B, e2: B)(implicit tag: ClassTag[B]): Boolean = {
+    def commAssoc[B <: BinExpr[G]](e1: B, e2: B)(
+        implicit tag: ClassTag[B]
+    ): Boolean = {
       val e1s = unfoldComm[B](e1)
       val e2s = unfoldComm[B](e2)
 
       val (e1rest, e1Ints) = partitionOptionList(e1s, isConstantInt)
       val (e2rest, e2Ints) = partitionOptionList(e2s, isConstantInt)
 
-      if(e1rest.size != e2rest.size) return false
+      if (e1rest.size != e2rest.size)
+        return false
 
-      val res1: Boolean = e1 match {
-        case _: Plus[G] =>
-          e1Ints.sum == e2Ints.sum
-        case _: Mult[G] =>
-          e1Ints.product == e2Ints.product
+      val res1: Boolean =
+        e1 match {
+          case _: Plus[G] => e1Ints.sum == e2Ints.sum
+          case _: Mult[G] => e1Ints.product == e2Ints.product
           // Should not be reachable
-        case _ => ???
-      }
-      if(!res1) return false
+          case _ => ???
+        }
+      if (!res1)
+        return false
 
       var available: Seq[Expr[G]] = e2rest
 
-      for(x <- e1rest){
+      for (x <- e1rest) {
         var found = false
         val freezeAvailable = available
 
-        for(y <- freezeAvailable){
-          if(!found && equalExpressionsRecurse(x, y)){
+        for (y <- freezeAvailable) {
+          if (!found && equalExpressionsRecurse(x, y)) {
             found = true
             available = available.diff(Seq(y))
           }
         }
-        if(!found) return false
+        if (!found)
+          return false
       }
 
       true
     }
 
-    def comm(lhs1: Expr[G], lhs2: Expr[G], rhs1: Expr[G], rhs2: Expr[G]): Boolean =
-      equalExpressionsRecurse(lhs1, rhs1) && equalExpressionsRecurse(lhs2, rhs2) ||
-        equalExpressionsRecurse(lhs2, rhs1) && equalExpressionsRecurse(lhs1, rhs2)
+    def comm(
+        lhs1: Expr[G],
+        lhs2: Expr[G],
+        rhs1: Expr[G],
+        rhs2: Expr[G],
+    ): Boolean =
+      equalExpressionsRecurse(lhs1, rhs1) &&
+        equalExpressionsRecurse(lhs2, rhs2) ||
+        equalExpressionsRecurse(lhs2, rhs1) &&
+        equalExpressionsRecurse(lhs1, rhs2)
 
     (lhs, rhs) match {
       // Unsure if we could check/pattern match on this easier
       // Commutative operators
-      case (lhs@Plus(_, _), rhs@Plus(_, _)) => commAssoc[Plus[G]](lhs, rhs)
-      case (lhs@Mult(_, _), rhs@Mult(_, _)) => commAssoc[Mult[G]](lhs, rhs)
-      case (BitAnd(lhs1, lhs2), BitAnd(rhs1, rhs2)) => comm(lhs1, lhs2, rhs1, rhs2)
-      case (BitOr(lhs1, lhs2), BitOr(rhs1, rhs2)) => comm(lhs1, lhs2, rhs1, rhs2)
-      case (BitXor(lhs1, lhs2), BitXor(rhs1, rhs2)) => comm(lhs1, lhs2, rhs1, rhs2)
+      case (lhs @ Plus(_, _), rhs @ Plus(_, _)) => commAssoc[Plus[G]](lhs, rhs)
+      case (lhs @ Mult(_, _), rhs @ Mult(_, _)) => commAssoc[Mult[G]](lhs, rhs)
+      case (BitAnd(lhs1, lhs2), BitAnd(rhs1, rhs2)) =>
+        comm(lhs1, lhs2, rhs1, rhs2)
+      case (BitOr(lhs1, lhs2), BitOr(rhs1, rhs2)) =>
+        comm(lhs1, lhs2, rhs1, rhs2)
+      case (BitXor(lhs1, lhs2), BitXor(rhs1, rhs2)) =>
+        comm(lhs1, lhs2, rhs1, rhs2)
       case (And(lhs1, lhs2), And(rhs1, rhs2)) => comm(lhs1, lhs2, rhs1, rhs2)
       case (Or(lhs1, lhs2), Or(rhs1, rhs2)) => comm(lhs1, lhs2, rhs1, rhs2)
       case (Eq(lhs1, lhs2), Eq(rhs1, rhs2)) => comm(lhs1, lhs2, rhs1, rhs2)
       case (Neq(lhs1, lhs2), Neq(rhs1, rhs2)) => comm(lhs1, lhs2, rhs1, rhs2)
 
-      //Non commutative operators
+      // Non commutative operators
       case (e1: BinExpr[G], e2: BinExpr[G]) =>
-        equalExpressionsRecurse(e1.left, e2.left) && equalExpressionsRecurse(e1.right, e2.right)
+        equalExpressionsRecurse(e1.left, e2.left) &&
+        equalExpressionsRecurse(e1.right, e2.right)
 
       case (Star(lhs1, lhs2), Star(rhs1, rhs2)) =>
-        equalExpressionsRecurse(lhs1, rhs1) && equalExpressionsRecurse(lhs2, rhs2)
+        equalExpressionsRecurse(lhs1, rhs1) &&
+        equalExpressionsRecurse(lhs2, rhs2)
       case (Wand(lhs1, lhs2), Wand(rhs1, rhs2)) =>
-        equalExpressionsRecurse(lhs1, rhs1) && equalExpressionsRecurse(lhs2, rhs2)
+        equalExpressionsRecurse(lhs1, rhs1) &&
+        equalExpressionsRecurse(lhs2, rhs2)
       // Unary expressions
-      case (e1: UnExpr[G], e2: UnExpr[G]) => equalExpressionsRecurse(e1.arg, e2.arg)
+      case (e1: UnExpr[G], e2: UnExpr[G]) =>
+        equalExpressionsRecurse(e1.arg, e2.arg)
 
       // Variables
       case (name1: Local[G], name2: Local[G]) =>
-        if (name1 == name2) true
+        if (name1 == name2)
+          true
         else if (info.isDefined) {
           // Check if the variables are synonyms
-          (info.get.variableSynonyms.get(name1), info.get.variableSynonyms.get(name2)) match {
+          (
+            info.get.variableSynonyms.get(name1),
+            info.get.variableSynonyms.get(name2),
+          ) match {
             case (Some(x), Some(y)) => x == y
             case _ => false
           }
-        } else false
-      case (name1: Local[G], e2) =>
-        replaceVariable(name1, e2)
-      case (e1, name2: Local[G]) =>
-        replaceVariable(name2, e1)
+        } else
+          false
+      case (name1: Local[G], e2) => replaceVariable(name1, e2)
+      case (e1, name2: Local[G]) => replaceVariable(name2, e1)
 
       case (inv: MethodInvocation[G], _) if !inv.ref.decl.pure => false
       case (_, inv: MethodInvocation[G]) if !inv.ref.decl.pure => false
@@ -294,7 +440,6 @@ class ExpressionEqualityCheck[G](info: Option[AnnotationVariableInfo[G]]) {
     }
   }
 
-
   def replaceVariable(name: Local[G], other_e: Expr[G]): Boolean = {
     if (info.isDefined) {
       info.get.variableEqualities.get(name) match {
@@ -302,29 +447,33 @@ class ExpressionEqualityCheck[G](info: Option[AnnotationVariableInfo[G]]) {
         case Some(equals) =>
           for (eq <- equals) {
             // Make sure we do not loop indefinitely by keep replacing the same expressions somehow
-            if (replacerDepth > max_depth) return false
+            if (replacerDepth > max_depth)
+              return false
             replacerDepth += 1
-            if (equalExpressionsRecurse(eq, other_e)) return true
+            if (equalExpressionsRecurse(eq, other_e))
+              return true
           }
           false
       }
-    } else {
-      false
-    }
+    } else { false }
   }
 }
 
-case class AnnotationVariableInfo[G](variableEqualities: Map[Local[G], List[Expr[G]]], variableValues: Map[Local[G], BigInt],
-                                     variableSynonyms: Map[Local[G], Int], variableNotZero: Set[Local[G]],
-                                     lessThanEqVars: Map[Local[G], Set[Local[G]]],
-                                     upperBound: Map[Local[G], BigInt],
-                                     lowerBound: Map[Local[G], BigInt],
-                                     usefullConditions: mutable.ArrayBuffer[Expr[G]])
-
-/** This class gathers information about variables, such as:
-  * `requires x == 0` and stores that x is equal to the value 0.
-  * Which we can use in simplify steps
-  * This information is returned with ```getInfo(annotations: Iterable[Expr[G]])```
+case class AnnotationVariableInfo[G](
+    variableEqualities: Map[Local[G], List[Expr[G]]],
+    variableValues: Map[Local[G], BigInt],
+    variableSynonyms: Map[Local[G], Int],
+    variableNotZero: Set[Local[G]],
+    lessThanEqVars: Map[Local[G], Set[Local[G]]],
+    upperBound: Map[Local[G], BigInt],
+    lowerBound: Map[Local[G], BigInt],
+    usefullConditions: mutable.ArrayBuffer[Expr[G]],
+)
+
+/** This class gathers information about variables, such as: `requires x == 0`
+  * and stores that x is equal to the value 0. Which we can use in simplify
+  * steps This information is returned with ```getInfo(annotations:
+  * Iterable[Expr[G]])```
   */
 class AnnotationVariableInfoGetter[G]() {
 
@@ -338,7 +487,8 @@ class AnnotationVariableInfoGetter[G]() {
   var equalCheck: ExpressionEqualityCheck[G] = ExpressionEqualityCheck()
 
   // lessThanEqVars(v) = {a,b,c} Captures that variable v is less than or eq to {a,b,c}
-  val lessThanEqVars: mutable.Map[Local[G], mutable.Set[Local[G]]] = mutable.Map()
+  val lessThanEqVars: mutable.Map[Local[G], mutable.Set[Local[G]]] = mutable
+    .Map()
   // upperBound(v) = 5 Captures that variable v is less than or equal to 5
   val upperBound: mutable.Map[Local[G], BigInt] = mutable.Map()
   // lowerBound(v) = 5 Captures that variable v is greater than or equal to 5
@@ -347,77 +497,92 @@ class AnnotationVariableInfoGetter[G]() {
   val usefullConditions: mutable.ArrayBuffer[Expr[G]] = mutable.ArrayBuffer()
 
   def extractEqualities(e: Expr[G]): Unit = {
-    e match{
+    e match {
       case Eq(e1, e2) =>
-        (e1, e2) match{
-          case (v1: Local[G], v2: Local[G])  => addSynonym(v1, v2)
-          case (v1: Local[G], _)  => addName(v1, e2)
-          case (_, v2: Local[G])  => addName(v2, e1)
+        (e1, e2) match {
+          case (v1: Local[G], v2: Local[G]) => addSynonym(v1, v2)
+          case (v1: Local[G], _) => addName(v1, e2)
+          case (_, v2: Local[G]) => addName(v2, e1)
           case _ =>
         }
       case _ =>
     }
   }
 
-  def addLessEq(v: Local[G], i: BigInt): Unit ={
-    val value = upperBound.getOrElse(v,i).min(i)
+  def addLessEq(v: Local[G], i: BigInt): Unit = {
+    val value = upperBound.getOrElse(v, i).min(i)
     upperBound(v) = value
   }
 
-  def addGreaterEq(v: Local[G], i: BigInt): Unit ={
-    val value = lowerBound.getOrElse(v,i).max(i)
+  def addGreaterEq(v: Local[G], i: BigInt): Unit = {
+    val value = lowerBound.getOrElse(v, i).max(i)
     lowerBound(v) = value
   }
 
   def lt(e1: Expr[G], e2: Expr[G], equal: Boolean): Unit = {
     e1 match {
       // x <= i
-      case v1: Local[G] if equal => equalCheck.isConstantInt(e2).foreach{i =>
-        if(i < 0) variableNotZero.add(v1)
-        addLessEq(v1, i)
-      }
+      case v1: Local[G] if equal =>
+        equalCheck.isConstantInt(e2).foreach { i =>
+          if (i < 0)
+            variableNotZero.add(v1)
+          addLessEq(v1, i)
+        }
       // x < i
-      case v1: Local[G] if !equal => equalCheck.isConstantInt(e2).foreach{i =>
-        if(i <= 0) variableNotZero.add(v1)
-        addLessEq(v1, i-1)
-      }
+      case v1: Local[G] if !equal =>
+        equalCheck.isConstantInt(e2).foreach { i =>
+          if (i <= 0)
+            variableNotZero.add(v1)
+          addLessEq(v1, i - 1)
+        }
       case _ =>
     }
     e2 match {
       // i <= x
-      case v2: Local[G] if equal => equalCheck.isConstantInt(e1).foreach { i =>
-        if (i > 0) variableNotZero.add(v2)
-        addGreaterEq(v2, i)
-      }
+      case v2: Local[G] if equal =>
+        equalCheck.isConstantInt(e1).foreach { i =>
+          if (i > 0)
+            variableNotZero.add(v2)
+          addGreaterEq(v2, i)
+        }
       // i < x
-      case v2: Local[G] if !equal => equalCheck.isConstantInt(e1).foreach { i =>
-        if (i >= 0) variableNotZero.add(v2)
-        addGreaterEq(v2, i+1)
-      }
+      case v2: Local[G] if !equal =>
+        equalCheck.isConstantInt(e1).foreach { i =>
+          if (i >= 0)
+            variableNotZero.add(v2)
+          addGreaterEq(v2, i + 1)
+        }
       case _ =>
     }
 
     (e1, e2) match {
       // x < y
-      case (v1: Local[G], v2: Local[G]) => lessThanEqVars.getOrElseUpdate(v1, mutable.Set()).addOne(v2)
+      case (v1: Local[G], v2: Local[G]) =>
+        lessThanEqVars.getOrElseUpdate(v1, mutable.Set()).addOne(v2)
       case _ =>
     }
   }
 
   // n == m + 1 then m <= n
   def varEqVarPlusInt(v1: Local[G], v2: Local[G], i: BigInt): Unit = {
-    if (i>=0) lessThanEqVars.getOrElseUpdate(v2, mutable.Set()).addOne(v1)
-    if (i<=0) lessThanEqVars.getOrElseUpdate(v1, mutable.Set()).addOne(v2)
+    if (i >= 0)
+      lessThanEqVars.getOrElseUpdate(v2, mutable.Set()).addOne(v1)
+    if (i <= 0)
+      lessThanEqVars.getOrElseUpdate(v1, mutable.Set()).addOne(v2)
   }
 
   // n == m + k,
   // if k>=0 then m <= n
   // if k<=0 then n <= m
   def varEqVarPlusVar(n: Local[G], m: Local[G], k: Local[G]): Unit = {
-    if(lowerBound.contains(k) && lowerBound(k) >= 0) lessThanEqVars.getOrElseUpdate(m, mutable.Set()).addOne(n)
-    if(upperBound.contains(k) && upperBound(k) <= 0) lessThanEqVars.getOrElseUpdate(n, mutable.Set()).addOne(m)
-    if(lowerBound.contains(m) && lowerBound(m) >= 0) lessThanEqVars.getOrElseUpdate(k, mutable.Set()).addOne(n)
-    if(upperBound.contains(m) && upperBound(m) <= 0) lessThanEqVars.getOrElseUpdate(n, mutable.Set()).addOne(k)
+    if (lowerBound.contains(k) && lowerBound(k) >= 0)
+      lessThanEqVars.getOrElseUpdate(m, mutable.Set()).addOne(n)
+    if (upperBound.contains(k) && upperBound(k) <= 0)
+      lessThanEqVars.getOrElseUpdate(n, mutable.Set()).addOne(m)
+    if (lowerBound.contains(m) && lowerBound(m) >= 0)
+      lessThanEqVars.getOrElseUpdate(k, mutable.Set()).addOne(n)
+    if (upperBound.contains(m) && upperBound(m) <= 0)
+      lessThanEqVars.getOrElseUpdate(n, mutable.Set()).addOne(k)
   }
 
   def isBool[G](e: Expr[G]) = {
@@ -429,9 +594,11 @@ class AnnotationVariableInfoGetter[G]() {
   }
   def isSimpleExpr(e: Expr[G]): Boolean = {
     e match {
-      case e if(!isInt(e) && !isBool(e)) => false
-      case SeqMember(e1, Range(from, to)) => isSimpleExpr(e1) && isSimpleExpr(from) && isSimpleExpr(to)
-      case SetMember(e1, RangeSet(from, to)) => isSimpleExpr(e1) && isSimpleExpr(from) && isSimpleExpr(to)
+      case e if (!isInt(e) && !isBool(e)) => false
+      case SeqMember(e1, Range(from, to)) =>
+        isSimpleExpr(e1) && isSimpleExpr(from) && isSimpleExpr(to)
+      case SetMember(e1, RangeSet(from, to)) =>
+        isSimpleExpr(e1) && isSimpleExpr(from) && isSimpleExpr(to)
       case e: BinExpr[G] => isSimpleExpr(e.left) && isSimpleExpr(e.right)
       case _: Local[G] => true
       case _: Constant[G] => true
@@ -440,16 +607,24 @@ class AnnotationVariableInfoGetter[G]() {
   }
 
   def extractComparisons(e: Expr[G]): Unit = {
-    e match{
+    e match {
       case Neq(e1, e2) =>
         e1 match {
           // x != 0
-          case v1: Local[G] => equalCheck.isConstantInt(e2).foreach{i => if(i == 0) variableNotZero.add(v1)}
+          case v1: Local[G] =>
+            equalCheck.isConstantInt(e2).foreach { i =>
+              if (i == 0)
+                variableNotZero.add(v1)
+            }
           case _ =>
         }
         e2 match {
           // 0 != x
-          case v2: Local[G] => equalCheck.isConstantInt(e1).foreach { i => if (i == 0) variableNotZero.add(v2) }
+          case v2: Local[G] =>
+            equalCheck.isConstantInt(e1).foreach { i =>
+              if (i == 0)
+                variableNotZero.add(v2)
+            }
           case _ =>
         }
       case Less(e1, e2) => lt(e1, e2, equal = false)
@@ -463,12 +638,18 @@ class AnnotationVariableInfoGetter[G]() {
         lt(from, e1, equal = true)
         lt(e1, to, equal = false)
       // n == m + 1 then m < n
-      case Eq(v1: Local[G], Plus(v2: Local[G], i: ConstantInt[G])) => varEqVarPlusInt(v1, v2, i.value)
-      case Eq(v1: Local[G], Plus(i: ConstantInt[G], v2: Local[G])) => varEqVarPlusInt(v1, v2, i.value)
-      case Eq(Plus(v2: Local[G], i: ConstantInt[G]), v1: Local[G]) => varEqVarPlusInt(v1, v2, i.value)
-      case Eq(Plus(i: ConstantInt[G], v2: Local[G]), v1: Local[G]) => varEqVarPlusInt(v1, v2, i.value)
-      case Eq(v1: Local[G], Plus(v2: Local[G], v3: Local[G])) => varEqVarPlusVar(v1, v2, v3)
-      case Eq(Plus(v2: Local[G], v3: Local[G]), v1: Local[G]) => varEqVarPlusVar(v1, v2, v3)
+      case Eq(v1: Local[G], Plus(v2: Local[G], i: ConstantInt[G])) =>
+        varEqVarPlusInt(v1, v2, i.value)
+      case Eq(v1: Local[G], Plus(i: ConstantInt[G], v2: Local[G])) =>
+        varEqVarPlusInt(v1, v2, i.value)
+      case Eq(Plus(v2: Local[G], i: ConstantInt[G]), v1: Local[G]) =>
+        varEqVarPlusInt(v1, v2, i.value)
+      case Eq(Plus(i: ConstantInt[G], v2: Local[G]), v1: Local[G]) =>
+        varEqVarPlusInt(v1, v2, i.value)
+      case Eq(v1: Local[G], Plus(v2: Local[G], v3: Local[G])) =>
+        varEqVarPlusVar(v1, v2, v3)
+      case Eq(Plus(v2: Local[G], v3: Local[G]), v1: Local[G]) =>
+        varEqVarPlusVar(v1, v2, v3)
       case _ =>
     }
   }
@@ -485,22 +666,30 @@ class AnnotationVariableInfoGetter[G]() {
       case (None, Some(id2)) => variableSynonyms(v1) = id2
       // Merge the groups, give every synonym group member of id2 value id1
       case (Some(id1), Some(id2)) if id1 != id2 =>
-        variableSynonyms.mapValuesInPlace((_, group) => if (group == id2) id1 else group)
+        variableSynonyms.mapValuesInPlace((_, group) =>
+          if (group == id2)
+            id1
+          else
+            group
+        )
       case _ =>
     }
   }
 
   def addValue(v: Local[G], x: BigInt): Unit =
     variableValues.get(v) match {
-      case Some(y) => if (x!=y) throw InconsistentVariableEquality(v, x, y)
+      case Some(y) =>
+        if (x != y)
+          throw InconsistentVariableEquality(v, x, y)
       case None =>
         variableValues(v) = x
-        if(x!=0) variableNotZero.add(v)
+        if (x != 0)
+          variableNotZero.add(v)
         addLessEq(v, x)
         addGreaterEq(v, x)
     }
 
-  def addName(v: Local[G], expr: Expr[G]): Unit ={
+  def addName(v: Local[G], expr: Expr[G]): Unit = {
     // Add to constant list
     isConstantInt[G](expr) match {
       case Some(x) => addValue(v, x)
@@ -521,17 +710,22 @@ class AnnotationVariableInfoGetter[G]() {
     lowerBound.clear()
     usefullConditions.clear()
 
-    for(clause <- annotations){
-      extractEqualities(clause)
-    }
-
-    val res = AnnotationVariableInfo[G](variableEqualities.view.mapValues(_.toList).toMap, variableValues.toMap,
-      variableSynonyms.toMap, Set[Local[G]](), Map[Local[G], Set[Local[G]]](), Map[Local[G],BigInt](),
-      Map[Local[G],BigInt](), usefullConditions)
+    for (clause <- annotations) { extractEqualities(clause) }
+
+    val res = AnnotationVariableInfo[G](
+      variableEqualities.view.mapValues(_.toList).toMap,
+      variableValues.toMap,
+      variableSynonyms.toMap,
+      Set[Local[G]](),
+      Map[Local[G], Set[Local[G]]](),
+      Map[Local[G], BigInt](),
+      Map[Local[G], BigInt](),
+      usefullConditions,
+    )
     equalCheck = ExpressionEqualityCheck(Some(res))
 
-    for(clause <- annotations){
-      if(isSimpleExpr(clause)) {
+    for (clause <- annotations) {
+      if (isSimpleExpr(clause)) {
         extractComparisons(clause)
         usefullConditions.addOne(clause)
       }
@@ -539,16 +733,23 @@ class AnnotationVariableInfoGetter[G]() {
 
     distributeInfo()
 
-    AnnotationVariableInfo(variableEqualities.view.mapValues(_.toList).toMap, variableValues.toMap,
-      variableSynonyms.toMap, variableNotZero.toSet, lessThanEqVars.view.mapValues(_.toSet).toMap,
-      upperBound.toMap, lowerBound.toMap, usefullConditions)
+    AnnotationVariableInfo(
+      variableEqualities.view.mapValues(_.toList).toMap,
+      variableValues.toMap,
+      variableSynonyms.toMap,
+      variableNotZero.toSet,
+      lessThanEqVars.view.mapValues(_.toSet).toMap,
+      upperBound.toMap,
+      lowerBound.toMap,
+      usefullConditions,
+    )
   }
 
   def distributeInfo(): Unit = {
     // First check if expressions have become integers
-    for((name, equals) <- variableEqualities){
-      if(!variableValues.contains(name))
-        for(equal <- equals){
+    for ((name, equals) <- variableEqualities) {
+      if (!variableValues.contains(name))
+        for (equal <- equals) {
           equalCheck.isConstantInt(equal) match {
             case Some(x) => addValue(name, x)
             case None =>
@@ -558,41 +759,51 @@ class AnnotationVariableInfoGetter[G]() {
 
     // Group synonym sets
     val synonymSets: mutable.Map[Int, mutable.Set[Local[G]]] = mutable.Map()
-    variableSynonyms.foreach{ case (v, groupId) => synonymSets.getOrElse(groupId,mutable.Set()).add(v) }
+    variableSynonyms.foreach { case (v, groupId) =>
+      synonymSets.getOrElse(groupId, mutable.Set()).add(v)
+    }
 
     def hasValue(vars: mutable.Set[Local[G]]): Option[BigInt] = {
-      vars.foreach{v => if(variableValues.contains(v)) return variableValues.get(v) }
+      vars.foreach { v =>
+        if (variableValues.contains(v))
+          return variableValues.get(v)
+      }
       None
     }
 
-    def minOption(x: Option[BigInt], y: Option[BigInt]): Option[BigInt] = x.map{x => x.min(y.getOrElse(x))}.orElse(y)
-    def maxOption(x: Option[BigInt], y: Option[BigInt]): Option[BigInt] = x.map{x => x.max(y.getOrElse(x))}.orElse(y)
+    def minOption(x: Option[BigInt], y: Option[BigInt]): Option[BigInt] =
+      x.map { x => x.min(y.getOrElse(x)) }.orElse(y)
+    def maxOption(x: Option[BigInt], y: Option[BigInt]): Option[BigInt] =
+      x.map { x => x.max(y.getOrElse(x)) }.orElse(y)
 
-    synonymSets.foreach{ case (_, vars) =>
+    synonymSets.foreach { case (_, vars) =>
       // Redistribute values over synonyms
-      hasValue(vars).foreach{x => vars.foreach{addValue(_, x)}}
+      hasValue(vars).foreach { x => vars.foreach { addValue(_, x) } }
       // Redistribute not-zero over synonyms
-      if(vars.intersect(variableNotZero).nonEmpty) variableNotZero.addAll(vars)
+      if (vars.intersect(variableNotZero).nonEmpty)
+        variableNotZero.addAll(vars)
 
       // Redistribute bounds that were found over synonym set
       var min: Option[BigInt] = None
       var max: Option[BigInt] = None
-      vars.foreach{v =>
+      vars.foreach { v =>
         min = minOption(upperBound.get(v), min)
         max = maxOption(lowerBound.get(v), max)
       }
-      min.foreach{ x => vars.foreach{upperBound(_)=x}}
-      max.foreach{ x => vars.foreach{lowerBound(_)=x}}
+      min.foreach { x => vars.foreach { upperBound(_) = x } }
+      max.foreach { x => vars.foreach { lowerBound(_) = x } }
 
       // Collect all vars that are greater than
       val greaterVars: mutable.Set[Local[G]] = mutable.Set()
-      vars.foreach{ v =>
-        lessThanEqVars(v) . map{variableSynonyms(_)} . foreach{ i => greaterVars.addAll(synonymSets(i)) }
+      vars.foreach { v =>
+        lessThanEqVars(v).map { variableSynonyms(_) }.foreach { i =>
+          greaterVars.addAll(synonymSets(i))
+        }
       }
       // Redistribute all greater vars again
-      vars.foreach{ lessThanEqVars(_).addAll(greaterVars) }
+      vars.foreach { lessThanEqVars(_).addAll(greaterVars) }
 
-      }
+    }
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/check/Check.scala b/src/col/vct/col/check/Check.scala
index dc8dd734d3..fbd7accf79 100644
--- a/src/col/vct/col/check/Check.scala
+++ b/src/col/vct/col/check/Check.scala
@@ -13,7 +13,10 @@ import scala.collection.immutable.ListSet
 import scala.collection.mutable
 
 case object Check {
-  def inOrder(check1: => Seq[CheckError], check2: => Seq[CheckError]): Seq[CheckError] =
+  def inOrder(
+      check1: => Seq[CheckError],
+      check2: => Seq[CheckError],
+  ): Seq[CheckError] =
     check1 match {
       case Nil => check2
       case more => more
@@ -28,23 +31,41 @@ sealed trait CheckError {
       case TypeErrorText(expr, _) if expr.t.isInstanceOf[TNotAValue[_]] =>
         Seq(context(expr) -> s"This expression is not a value.")
       case TypeError(expr, expectedType) =>
-        Seq(context(expr) -> s"Expected the type of this expression to be `$expectedType`, but got ${expr.t}.")
+        Seq(
+          context(expr) ->
+            s"Expected the type of this expression to be `$expectedType`, but got ${expr.t}."
+        )
       case TypeErrorText(expr, expectedType) =>
-        Seq(context(expr) -> s"Expected the type of this expression to be $expectedType, but got ${expr.t}.")
-      case TypeErrorExplanation(expr, message) =>
-        Seq(context(expr) -> message)
+        Seq(
+          context(expr) ->
+            s"Expected the type of this expression to be $expectedType, but got ${expr.t}."
+        )
+      case TypeErrorExplanation(expr, message) => Seq(context(expr) -> message)
       case GenericTypeError(t, expectedType) =>
-        Seq(context(t) -> s"This type variable refers to a name that is not actually a type.")
+        Seq(
+          context(t) ->
+            s"This type variable refers to a name that is not actually a type."
+        )
       case OutOfScopeError(use, ref) =>
-        Seq(context(use) -> "This usage is out of scope,", context(ref.decl) -> "since it is declared here.")
+        Seq(
+          context(use) -> "This usage is out of scope,",
+          context(ref.decl) -> "since it is declared here.",
+        )
       case ThisOutsideScopeError(use) =>
-        Seq(context(use) -> "`this` may not occur outside the declaration it refers to.")
+        Seq(
+          context(use) ->
+            "`this` may not occur outside the declaration it refers to."
+        )
       case ThisInConstructorPre(use) =>
-        Seq(context(use) -> "`this` may not occur in the precondition of a constructor.")
+        Seq(
+          context(use) ->
+            "`this` may not occur in the precondition of a constructor."
+        )
       case OutOfWriteScopeError(reason, use, ref) =>
         Seq(
           context(use) -> "This may not be rewritten to, since ...",
-          context(reason) -> "declarations outside this node must not be altered, and ...",
+          context(reason) ->
+            "declarations outside this node must not be altered, and ...",
           context(ref.decl) -> "... it is declared here.",
         )
       case DoesNotDefine(declarator, declaration, use) =>
@@ -54,40 +75,72 @@ sealed trait CheckError {
           context(declarator.asInstanceOf[Node[_]]) -> "in this declarator.",
         )
       // TODO PB: these are kind of obsolete? maybe?
-      case IncomparableTypes(left, right) =>
-        ???
-      case TupleTypeCount(tup) =>
-        ???
+      case IncomparableTypes(left, right) => ???
+      case TupleTypeCount(tup) => ???
       case NotAPredicateApplication(res) =>
-        Seq(context(res) -> "This expression is not a (scaled) predicate application")
+        Seq(
+          context(res) ->
+            "This expression is not a (scaled) predicate application"
+        )
       case AbstractPredicate(res) =>
-        Seq(context(res) -> "This predicate is abstract, and hence cannot be meaningfully folded or unfolded")
+        Seq(
+          context(res) ->
+            "This predicate is abstract, and hence cannot be meaningfully folded or unfolded"
+        )
       case RedundantCatchClause(clause) =>
-        Seq(context(clause) -> "This catch clause is redundant, because it is subsumed by the caught types of earlier catch clauses in this block.")
+        Seq(
+          context(clause) ->
+            "This catch clause is redundant, because it is subsumed by the caught types of earlier catch clauses in this block."
+        )
       case ResultOutsidePostcondition(res) =>
         Seq(context(res) -> "\\result may only occur in the postcondition.")
       case ReturnOutsideMethod(ret) =>
         Seq(context(ret) -> "return may only occur in methods and procedures.")
       case FinalPermission(loc) =>
-        Seq(context(loc) -> "Specifying permission over final fields is not allowed, since they are treated as constants.")
+        Seq(
+          context(loc) ->
+            "Specifying permission over final fields is not allowed, since they are treated as constants."
+        )
       case PVLSeqAssignEndpoint(a) =>
-        Seq(context(a) -> "This dereference does not take place on one of the endpoints in the surrounding `seq_prog`.")
+        Seq(
+          context(a) ->
+            "This dereference does not take place on one of the endpoints in the surrounding `seq_prog`."
+        )
       case SeqProgStatement(s) =>
         Seq(context(s) -> "This statement is not allowed in `seq_prog`.")
       case SeqProgInstanceMethodArgs(m) =>
-        Seq(context(m) -> "An instance method in a `seq_prog` cannot have any arguments.")
+        Seq(
+          context(m) ->
+            "An instance method in a `seq_prog` cannot have any arguments."
+        )
       case SeqProgInstanceMethodBody(m) =>
-        Seq(context(m) -> "An instance method in a `seq_prog` must have a body.")
+        Seq(
+          context(m) -> "An instance method in a `seq_prog` must have a body."
+        )
       case SeqProgInstanceMethodNonVoid(m) =>
-        Seq(context(m) -> "An instance method in a `seq_prog` must have return type `void`.")
+        Seq(
+          context(m) ->
+            "An instance method in a `seq_prog` must have return type `void`."
+        )
       case SeqProgInvocation(s) =>
-        Seq(context(s) -> "Only invocations on `this` and endpoints are allowed.")
+        Seq(
+          context(s) -> "Only invocations on `this` and endpoints are allowed."
+        )
       case SeqProgReceivingEndpoint(e) =>
-        Seq(context(e) -> s"Can only refer to the receiving endpoint of this statement.")
+        Seq(
+          context(e) ->
+            s"Can only refer to the receiving endpoint of this statement."
+        )
       case SeqProgParticipant(s) =>
-        Seq(context(s) -> s"An endpoint is used in this branch which is not allowed to participate at this point in the program because of earlier branches.")
+        Seq(
+          context(s) ->
+            s"An endpoint is used in this branch which is not allowed to participate at this point in the program because of earlier branches."
+        )
       case SeqProgNoParticipant(s) =>
-        Seq(context(s) -> s"Unclear what the participating endpoint is in this statement")
+        Seq(
+          context(s) ->
+            s"Unclear what the participating endpoint is in this statement"
+        )
       case SeqProgEndpointAssign(a) =>
         Seq(context(a) -> s"Raw assignment to an endpoint is not allowed.")
       case SeqProgInstanceMethodPure(m) =>
@@ -100,28 +153,41 @@ sealed trait CheckError {
 case class TypeError(expr: Expr[_], expectedType: Type[_]) extends CheckError {
   val subcode = "type"
 }
-case class TypeErrorText(expr: Expr[_], expectedType: String) extends CheckError {
+case class TypeErrorText(expr: Expr[_], expectedType: String)
+    extends CheckError {
   val subcode = "type"
 }
-case class TypeErrorExplanation(expr: Node[_], message: String) extends CheckError {
+case class TypeErrorExplanation(expr: Node[_], message: String)
+    extends CheckError {
   val subcode = "type"
 }
-case class GenericTypeError(t: Type[_], expectedType: TType[_]) extends CheckError {
+case class GenericTypeError(t: Type[_], expectedType: TType[_])
+    extends CheckError {
   val subcode = "genericType"
 }
-case class OutOfScopeError[G](use: Node[G], ref: Ref[G, _ <: Declaration[G]]) extends CheckError {
+case class OutOfScopeError[G](use: Node[G], ref: Ref[G, _ <: Declaration[G]])
+    extends CheckError {
   val subcode = "outOfScope"
 }
-case class ThisOutsideScopeError[G](use: ThisDeclaration[G]) extends CheckError {
+case class ThisOutsideScopeError[G](use: ThisDeclaration[G])
+    extends CheckError {
   override def subcode: String = "thisOutOfScope"
 }
 case class ThisInConstructorPre[G](use: ThisObject[G]) extends CheckError {
   override def subcode: String = "thisInConsPre"
 }
-case class OutOfWriteScopeError[G](reason: Node[G], use: Node[G], ref: Ref[G, _ <: Declaration[G]]) extends CheckError {
+case class OutOfWriteScopeError[G](
+    reason: Node[G],
+    use: Node[G],
+    ref: Ref[G, _ <: Declaration[G]],
+) extends CheckError {
   val subcode = "outOfWriteScope"
 }
-case class DoesNotDefine(declarator: Declarator[_], declaration: Declaration[_], use: Node[_]) extends CheckError {
+case class DoesNotDefine(
+    declarator: Declarator[_],
+    declaration: Declaration[_],
+    use: Node[_],
+) extends CheckError {
   val subcode = "doesNotDefine"
 }
 case class IncomparableTypes(left: Expr[_], right: Expr[_]) extends CheckError {
@@ -148,10 +214,12 @@ case class ReturnOutsideMethod(ret: Return[_]) extends CheckError {
 case class FinalPermission(loc: FieldLocation[_]) extends CheckError {
   override def subcode: String = "finalPerm"
 }
-case class PVLSeqAssignEndpoint(assign: PVLChorStatement[_]) extends CheckError {
+case class PVLSeqAssignEndpoint(assign: PVLChorStatement[_])
+    extends CheckError {
   val subcode = "pvlSeqAssignEndpoint"
 }
-case class SeqProgInstanceMethodNonVoid(m: InstanceMethod[_]) extends CheckError {
+case class SeqProgInstanceMethodNonVoid(m: InstanceMethod[_])
+    extends CheckError {
   val subcode = "seqProgInstanceMethodNonVoid"
 }
 case class SeqProgInstanceMethodArgs(m: InstanceMethod[_]) extends CheckError {
@@ -183,37 +251,46 @@ case class SeqProgInstanceMethodPure(m: InstanceMethod[_]) extends CheckError {
 }
 
 case object CheckContext {
-  case class ScopeFrame[G](decls: Seq[Declaration[G]], scanLazily: Seq[Node[G]]) {
+  case class ScopeFrame[G](
+      decls: Seq[Declaration[G]],
+      scanLazily: Seq[Node[G]],
+  ) {
     private lazy val declSet = decls.toSet
-    private lazy val scannedDeclSet = scanLazily.flatMap(ResolveReferences.scanScope(TypeResolutionContext())).toSet
+    private lazy val scannedDeclSet =
+      scanLazily.flatMap(ResolveReferences.scanScope(TypeResolutionContext()))
+        .toSet
 
     def contains(decl: Declaration[G]): Boolean =
-      declSet.contains(decl) || (scanLazily.nonEmpty && scannedDeclSet.contains(decl))
+      declSet.contains(decl) ||
+        (scanLazily.nonEmpty && scannedDeclSet.contains(decl))
   }
 }
 
-case class CheckContext[G]
-(
-  scopes: Seq[CheckContext.ScopeFrame[G]] = Seq(),
-  undeclared: Seq[Seq[Declaration[G]]] = Nil,
-  roScopes: Int = 0, roScopeReason: Option[Node[G]] = None,
-  currentApplicable: Option[Applicable[G]] = None,
-  inPreCondition: Boolean = false,
-  inPostCondition: Boolean = false,
-  currentChoreography: Option[Choreography[G]] = None,
-  currentReceiverEndpoint: Option[Endpoint[G]] = None,
-  currentParticipatingEndpoints: Option[Set[Endpoint[G]]] = None,
-  declarationStack: Seq[Declaration[G]] = Nil,
+case class CheckContext[G](
+    scopes: Seq[CheckContext.ScopeFrame[G]] = Seq(),
+    undeclared: Seq[Seq[Declaration[G]]] = Nil,
+    roScopes: Int = 0,
+    roScopeReason: Option[Node[G]] = None,
+    currentApplicable: Option[Applicable[G]] = None,
+    inPreCondition: Boolean = false,
+    inPostCondition: Boolean = false,
+    currentChoreography: Option[Choreography[G]] = None,
+    currentReceiverEndpoint: Option[Endpoint[G]] = None,
+    currentParticipatingEndpoints: Option[Set[Endpoint[G]]] = None,
+    declarationStack: Seq[Declaration[G]] = Nil,
 ) {
   def withScope(decls: Seq[Declaration[G]]): Seq[CheckContext.ScopeFrame[G]] =
     scopes :+ CheckContext.ScopeFrame(decls, Nil)
 
-  /**
-   * In effect toScan is just scanned for LocalDecl's, and these are added to decls. We want to delay this, because
-   * the scanning operation is expensive, and for most of the transformation run the declaration is declared directly
-   * anyway.
-   */
-  def withScope(decls: Seq[Declaration[G]], toScan: Seq[Node[G]]): Seq[CheckContext.ScopeFrame[G]] =
+  /** In effect toScan is just scanned for LocalDecl's, and these are added to
+    * decls. We want to delay this, because the scanning operation is expensive,
+    * and for most of the transformation run the declaration is declared
+    * directly anyway.
+    */
+  def withScope(
+      decls: Seq[Declaration[G]],
+      toScan: Seq[Node[G]],
+  ): Seq[CheckContext.ScopeFrame[G]] =
     scopes :+ CheckContext.ScopeFrame(decls, toScan)
 
   def withDeclaration(decl: Declaration[G]): CheckContext[G] =
@@ -222,11 +299,9 @@ case class CheckContext[G]
   def withApplicable(applicable: Applicable[G]): CheckContext[G] =
     copy(currentApplicable = Some(applicable))
 
-  def withPostcondition: CheckContext[G] =
-    copy(inPostCondition = true)
+  def withPostcondition: CheckContext[G] = copy(inPostCondition = true)
 
-  def withPrecondition: CheckContext[G] =
-    copy(inPreCondition = true)
+  def withPrecondition: CheckContext[G] = copy(inPreCondition = true)
 
   def withUndeclared(decls: Seq[Declaration[G]]): CheckContext[G] =
     copy(undeclared = undeclared :+ decls)
@@ -237,11 +312,15 @@ case class CheckContext[G]
   def withReceiverEndpoint(endpoint: Endpoint[G]): CheckContext[G] =
     copy(currentReceiverEndpoint = Some(endpoint))
 
-  def withCurrentParticipatingEndpoints(endpoints: Seq[Endpoint[G]]): Option[Set[Endpoint[G]]] =
+  def withCurrentParticipatingEndpoints(
+      endpoints: Seq[Endpoint[G]]
+  ): Option[Set[Endpoint[G]]] =
     // ListSet to preserve insertion order
     Some(ListSet.from(endpoints))
 
-  def appendCurrentParticipatingEndpoints(newEndpoints: Seq[Endpoint[G]]): Option[Set[Endpoint[G]]] =
+  def appendCurrentParticipatingEndpoints(
+      newEndpoints: Seq[Endpoint[G]]
+  ): Option[Set[Endpoint[G]]] =
     // ListSet to preserve insertion order
     currentParticipatingEndpoints match {
       case None => withCurrentParticipatingEndpoints(newEndpoints)
@@ -249,23 +328,39 @@ case class CheckContext[G]
     }
 
   def inScope[Decl <: Declaration[G]](ref: Ref[G, Decl]): Boolean =
-    !undeclared.exists(_.contains(ref.decl)) && scopes.exists(_.contains(ref.decl))
+    !undeclared.exists(_.contains(ref.decl)) &&
+      scopes.exists(_.contains(ref.decl))
 
   def inWriteScope[Decl <: Declaration[G]](ref: Ref[G, Decl]): Boolean =
-    !undeclared.exists(_.contains(ref.decl)) && scopes.drop(roScopes).exists(_.contains(ref.decl))
+    !undeclared.exists(_.contains(ref.decl)) && scopes.drop(roScopes)
+      .exists(_.contains(ref.decl))
 
-  def checkInScope[Decl <: Declaration[G]](use: Node[G], ref: Ref[G, Decl]): Seq[CheckError] =
-    if(inScope(ref)) Nil
-    else Seq(OutOfScopeError(use, ref))
+  def checkInScope[Decl <: Declaration[G]](
+      use: Node[G],
+      ref: Ref[G, Decl],
+  ): Seq[CheckError] =
+    if (inScope(ref))
+      Nil
+    else
+      Seq(OutOfScopeError(use, ref))
 
-  def checkInWriteScope[Decl <: Declaration[G]](reason: Option[Node[G]], use: Node[G], ref: Ref[G, Decl]): Seq[CheckError] =
-    if (!inScope(ref)) Seq(OutOfScopeError(use, ref))
-    else if(!inWriteScope(ref)) Seq(OutOfWriteScopeError(reason.get, use, ref))
-    else Nil
+  def checkInWriteScope[Decl <: Declaration[G]](
+      reason: Option[Node[G]],
+      use: Node[G],
+      ref: Ref[G, Decl],
+  ): Seq[CheckError] =
+    if (!inScope(ref))
+      Seq(OutOfScopeError(use, ref))
+    else if (!inWriteScope(ref))
+      Seq(OutOfWriteScopeError(reason.get, use, ref))
+    else
+      Nil
 }
 
-case class UnreachableAfterTypeCheck(message: String, at: Node[_]) extends ASTStateError {
-  override def text: String = "A condition was reached that should have been excluded by the type check. " +
-    "Either a property of a node was queried before the type check, or the type check is missing a condition. " +
-    f"The node says: $message"
-}
\ No newline at end of file
+case class UnreachableAfterTypeCheck(message: String, at: Node[_])
+    extends ASTStateError {
+  override def text: String =
+    "A condition was reached that should have been excluded by the type check. " +
+      "Either a property of a node was queried before the type check, or the type check is missing a condition. " +
+      f"The node says: $message"
+}
diff --git a/src/col/vct/col/compare/Compare.scala b/src/col/vct/col/compare/Compare.scala
index 37f51f28ce..93a6836a1f 100644
--- a/src/col/vct/col/compare/Compare.scala
+++ b/src/col/vct/col/compare/Compare.scala
@@ -5,16 +5,26 @@ import vct.col.ast.{Declaration, Node}
 import scala.collection.mutable
 
 case object Compare {
-  def compare[L, R](left: Node[L], right: Node[R])(toNormalForm: PartialFunction[Node[L], Node[L]]): LazyList[CompareResult[L, R]] =
+  def compare[L, R](left: Node[L], right: Node[R])(
+      toNormalForm: PartialFunction[Node[L], Node[L]]
+  ): LazyList[CompareResult[L, R]] =
     underEquivalence(left.compare(right))(toNormalForm)
 
-  def underEquivalence[L, R](diffs: LazyList[CompareResult[L, R]])(toNormalForm: PartialFunction[Node[L], Node[L]]): LazyList[CompareResult[L, R]] =
+  def underEquivalence[L, R](diffs: LazyList[CompareResult[L, R]])(
+      toNormalForm: PartialFunction[Node[L], Node[L]]
+  ): LazyList[CompareResult[L, R]] =
     diffs.flatMap {
       case diff @ StructuralDifference(left, right) =>
-        (toNormalForm.lift(left), toNormalForm.lift(right.asInstanceOf[Node[L]]).asInstanceOf[Option[Node[R]]]) match {
+        (
+          toNormalForm.lift(left),
+          toNormalForm.lift(right.asInstanceOf[Node[L]])
+            .asInstanceOf[Option[Node[R]]],
+        ) match {
           case (None, None) => Seq(diff)
           case (maybeLeft, maybeRight) =>
-            compare(maybeLeft.getOrElse(left), maybeRight.getOrElse(right))(toNormalForm)
+            compare(maybeLeft.getOrElse(left), maybeRight.getOrElse(right))(
+              toNormalForm
+            )
         }
       case otherDiff => Seq(otherDiff)
     }
@@ -22,13 +32,21 @@ case object Compare {
   def equals[L, R](left: Node[L], right: Node[R]): Boolean =
     left.compare(right).isEmpty
 
-  def getIsomorphism[L, R](left: Node[L], right: Node[R], matchFreeVariables: Boolean = false): Either[Seq[(Node[L], Node[R])], Map[Declaration[L], Declaration[R]]] = {
+  def getIsomorphism[L, R](
+      left: Node[L],
+      right: Node[R],
+      matchFreeVariables: Boolean = false,
+  ): Either[Seq[(Node[L], Node[R])], Map[Declaration[L], Declaration[R]]] = {
     val isomorphism = mutable.Map[Declaration[L], Declaration[R]]()
     val valueSet = mutable.Set[Declaration[R]]()
     val irreconcilableDiffs = mutable.ArrayBuffer[(Node[L], Node[R])]()
     val boundVariables = mutable.Set[Declaration[L]]()
 
-    def define(left: Declaration[L], right: Declaration[R], mustMatch: Boolean): Unit = {
+    def define(
+        left: Declaration[L],
+        right: Declaration[R],
+        mustMatch: Boolean,
+    ): Unit = {
       if (mustMatch && left != right) {
         irreconcilableDiffs += ((left, right))
         return;
@@ -43,7 +61,12 @@ case object Compare {
     }
 
     left.compare(right).foreach {
-      case MatchingReference(left, right) => define(left, right, mustMatch = matchFreeVariables && !boundVariables.contains(left))
+      case MatchingReference(left, right) =>
+        define(
+          left,
+          right,
+          mustMatch = matchFreeVariables && !boundVariables.contains(left),
+        )
       case MatchingDeclaration(left, right) =>
         boundVariables.add(left)
         define(left, right, mustMatch = false)
@@ -51,10 +74,15 @@ case object Compare {
         irreconcilableDiffs += ((left, right))
     }
 
-    if(irreconcilableDiffs.isEmpty) Right(isomorphism.toMap)
-    else Left(irreconcilableDiffs.toSeq)
+    if (irreconcilableDiffs.isEmpty)
+      Right(isomorphism.toMap)
+    else
+      Left(irreconcilableDiffs.toSeq)
   }
 
-  def isIsomorphic[L, R](left: Node[L], right: Node[R], matchFreeVariables: Boolean = false): Boolean =
-    getIsomorphism(left, right, matchFreeVariables).isRight
+  def isIsomorphic[L, R](
+      left: Node[L],
+      right: Node[R],
+      matchFreeVariables: Boolean = false,
+  ): Boolean = getIsomorphism(left, right, matchFreeVariables).isRight
 }
diff --git a/src/col/vct/col/compare/CompareResult.scala b/src/col/vct/col/compare/CompareResult.scala
index b16f337a9a..56d4c26723 100644
--- a/src/col/vct/col/compare/CompareResult.scala
+++ b/src/col/vct/col/compare/CompareResult.scala
@@ -3,6 +3,11 @@ package vct.col.compare
 import vct.col.ast.{Declaration, Node}
 
 sealed trait CompareResult[L, R]
-case class MatchingDeclaration[L, R](left: Declaration[L], right: Declaration[R]) extends CompareResult[L, R]
-case class MatchingReference[L, R](left: Declaration[L], right: Declaration[R]) extends CompareResult[L, R]
-case class StructuralDifference[L, R](left: Node[L], right: Node[R]) extends CompareResult[L, R]
\ No newline at end of file
+case class MatchingDeclaration[L, R](
+    left: Declaration[L],
+    right: Declaration[R],
+) extends CompareResult[L, R]
+case class MatchingReference[L, R](left: Declaration[L], right: Declaration[R])
+    extends CompareResult[L, R]
+case class StructuralDifference[L, R](left: Node[L], right: Node[R])
+    extends CompareResult[L, R]
diff --git a/src/col/vct/col/debug/DebugRewriteState.scala b/src/col/vct/col/debug/DebugRewriteState.scala
index 784f765b8d..d493d638f1 100644
--- a/src/col/vct/col/debug/DebugRewriteState.scala
+++ b/src/col/vct/col/debug/DebugRewriteState.scala
@@ -3,4 +3,4 @@ package vct.col.debug
 sealed trait DebugRewriteState
 case object NotProcessed extends DebugRewriteState
 case object Succeeded extends DebugRewriteState
-case object Dropped extends DebugRewriteState
\ No newline at end of file
+case object Dropped extends DebugRewriteState
diff --git a/src/col/vct/col/err/ASTStateError.scala b/src/col/vct/col/err/ASTStateError.scala
index 96109391db..1b505d89ce 100644
--- a/src/col/vct/col/err/ASTStateError.scala
+++ b/src/col/vct/col/err/ASTStateError.scala
@@ -2,4 +2,4 @@ package vct.col.err
 
 import vct.result.VerificationError.SystemError
 
-abstract class ASTStateError extends SystemError
\ No newline at end of file
+abstract class ASTStateError extends SystemError
diff --git a/src/col/vct/col/err/ContextSensitiveNodeNotResolved.scala b/src/col/vct/col/err/ContextSensitiveNodeNotResolved.scala
index bae2b7abb7..91e50e9239 100644
--- a/src/col/vct/col/err/ContextSensitiveNodeNotResolved.scala
+++ b/src/col/vct/col/err/ContextSensitiveNodeNotResolved.scala
@@ -2,7 +2,8 @@ package vct.col.err
 
 import vct.col.ast.Expr
 
-case class ContextSensitiveNodeNotResolved(expr: Expr[_], message: String) extends ASTStateError {
+case class ContextSensitiveNodeNotResolved(expr: Expr[_], message: String)
+    extends ASTStateError {
   override def text: String =
     "A node was encountered of which the type is context-sensitive, but its context is not yet resolved. " +
       f"The node says: $message"
diff --git a/src/col/vct/col/err/InconsistentSuccessionTypes.scala b/src/col/vct/col/err/InconsistentSuccessionTypes.scala
index bf5f922e53..be16924ad9 100644
--- a/src/col/vct/col/err/InconsistentSuccessionTypes.scala
+++ b/src/col/vct/col/err/InconsistentSuccessionTypes.scala
@@ -4,13 +4,18 @@ import vct.col.ast.Declaration
 import vct.result.Message
 import vct.result.VerificationError.SystemError
 
-case class InconsistentSuccessionTypes(left: Declaration[_], right: Declaration[_]) extends SystemError {
+case class InconsistentSuccessionTypes(
+    left: Declaration[_],
+    right: Declaration[_],
+) extends SystemError {
   override def text: String = {
-    val leftContext = context[vct.col.util.CurrentRewriteProgramContext].getOrElse(left.o)
+    val leftContext = context[vct.col.util.CurrentRewriteProgramContext]
+      .getOrElse(left.o)
 
     Message.messagesInContext(
       leftContext -> "The kind of this declaration does not match ...",
-      right.highlight(right) -> "... the kind of this declaration, so it may not be succeeded by this declaration.",
+      right.highlight(right) ->
+        "... the kind of this declaration, so it may not be succeeded by this declaration.",
     )
   }
 }
diff --git a/src/col/vct/col/err/MistypedRef.scala b/src/col/vct/col/err/MistypedRef.scala
index 337167ce8f..3b0602546a 100644
--- a/src/col/vct/col/err/MistypedRef.scala
+++ b/src/col/vct/col/err/MistypedRef.scala
@@ -4,7 +4,8 @@ import vct.col.ast.Declaration
 
 import scala.reflect.ClassTag
 
-case class MistypedRef(received: Declaration[_], expected: ClassTag[_]) extends ASTStateError {
+case class MistypedRef(received: Declaration[_], expected: ClassTag[_])
+    extends ASTStateError {
   override def text: String =
     "A reference in the AST is referencing a declaration of the wrong kind.\n" +
       s"A ${expected.runtimeClass.getSimpleName} was expected here, but we got a ${received.getClass.getSimpleName}"
diff --git a/src/col/vct/col/err/NotResolved.scala b/src/col/vct/col/err/NotResolved.scala
index 3947cf661f..30cb3c94e8 100644
--- a/src/col/vct/col/err/NotResolved.scala
+++ b/src/col/vct/col/err/NotResolved.scala
@@ -5,7 +5,10 @@ import vct.col.ref.UnresolvedRef
 
 import scala.reflect.ClassTag
 
-case class NotResolved[G](ref: UnresolvedRef[G, _ <: Declaration[G]], expected: ClassTag[_]) extends ASTStateError {
+case class NotResolved[G](
+    ref: UnresolvedRef[G, _ <: Declaration[G]],
+    expected: ClassTag[_],
+) extends ASTStateError {
   override def text: String =
     "The declaration of an unresolved reference was queried, but it is not yet resolved.\n" +
       s"We expected the name `${ref.name}` to resolve to a ${expected.runtimeClass.getSimpleName}."
diff --git a/src/col/vct/col/feature/Feature.scala b/src/col/vct/col/feature/Feature.scala
index 1f9e34ff0e..7840e27f9d 100644
--- a/src/col/vct/col/feature/Feature.scala
+++ b/src/col/vct/col/feature/Feature.scala
@@ -33,9 +33,12 @@ case object Classes extends Feature // ClassToRef
 case object Pointers extends Feature // ~ImportADT?
 case object Arrays extends Feature // ~ImportADT?
 case object AmbiguousOperators extends Feature // Disambiguate
-case object SugarPermissionOperator extends Feature // DesugarPermissionOperators
-case object SugarCollectionOperator extends Feature // DesugarCollectionOperators
-case object ExpressionWithSideEffects extends Feature // ResolveExpressionSideEffects
+case object SugarPermissionOperator
+    extends Feature // DesugarPermissionOperators
+case object SugarCollectionOperator
+    extends Feature // DesugarCollectionOperators
+case object ExpressionWithSideEffects
+    extends Feature // ResolveExpressionSideEffects
 case object UnscopedDeclaration extends Feature // CollectLocalDeclarations
 case object LoopIterationContract extends Feature // IterationContractToParBlock
 case object ParallelRegion extends Feature // ParBlockEncoder
@@ -45,7 +48,8 @@ case object NonWhileLoop extends Feature // ForLoopToWhileLoop
 case object IntrinsicLocks extends Feature // EncodeIntrinsicLock
 case object WaitNotify extends Feature // EncodeIntrinsicLock
 case object Evaluation extends Feature // EvaluationTargetDummy
-case object ExceptionalLoopControl extends Feature // ContinueToBreak + EncodeBreakReturn
+case object ExceptionalLoopControl
+    extends Feature // ContinueToBreak + EncodeBreakReturn
 case object NonTrivialLabel extends Feature // EncodeBreakReturn
 case object SwitchStatement extends Feature // SwitchToGoto
 case object Exceptions extends Feature // EncodeTryThrowSignals
@@ -93,4 +97,4 @@ case object SmtDeclarations extends Feature
 case object SmtTypes extends Feature
 case object Methods extends Feature
 case object WhileLoops extends Feature
-case object RootStructure extends Feature
\ No newline at end of file
+case object RootStructure extends Feature
diff --git a/src/col/vct/col/feature/FeatureRainbow.scala b/src/col/vct/col/feature/FeatureRainbow.scala
index e6feec1a58..6251618f6d 100644
--- a/src/col/vct/col/feature/FeatureRainbow.scala
+++ b/src/col/vct/col/feature/FeatureRainbow.scala
@@ -15,704 +15,765 @@ class FeatureRainbow[G] {
   private var returnValues: Seq[Expr[G]] = Nil
 
   def scan(node: Node[G]): Unit =
-    node.transSubnodes.foreach(node => scanFlatly(node).foreach(f => {
-      features += f
-      examples.getOrElseUpdate(f, ArrayBuffer()) += node
-    }))
-
-  def scanFlatly(node: Node[G]): Seq[Feature] = Seq(node match {
-    case node: AmbiguousLocation[G] => AmbiguousOperators
-    case node: AmbiguousGreater[G] => AmbiguousOperators
-    case node: AmbiguousLess[G] => AmbiguousOperators
-    case node: AmbiguousGreaterEq[G] => AmbiguousOperators
-    case node: AmbiguousLessEq[G] => AmbiguousOperators
-
-    case node: ArrayLocation[G] => Arrays
-    case node: NewArray[G] => Arrays
-    case node: NewPointerArray[G] => Arrays
-    case node: ArraySubscript[G] => Arrays
-    case node: Length[G] => Arrays
-    case node: TArray[G] => Arrays
-
-    case node: Assign[G] => Assignment
-    case node: Havoc[G] => Assignment
-    case node: SilverLocalAssign[G] => Assignment
-
-    case node: ADTAxiom[G] => AxiomaticDataTypes
-    case node: ADTFunction[G] => AxiomaticDataTypes
-    case node: ADTFunctionInvocation[G] => AxiomaticDataTypes
-    case node: AxiomaticDataType[G] => AxiomaticDataTypes
-    case node: TAxiomatic[G] => AxiomaticDataTypes
-
-    case node: LiteralTuple[G] => AxiomaticLibraryType
-    case node: LiteralMap[G] => AxiomaticLibraryType
-    case node: OptSome[G] => AxiomaticLibraryType
-    case node: OptNone[G] => AxiomaticLibraryType
-    case node: EitherLeft[G] => AxiomaticLibraryType
-    case node: EitherRight[G] => AxiomaticLibraryType
-    case node: MapCons[G] => AxiomaticLibraryType
-    case node: MapEq[G] => AxiomaticLibraryType
-    case node: MapDisjoint[G] => AxiomaticLibraryType
-    case node: MapKeySet[G] => AxiomaticLibraryType
-    case node: MapValueSet[G] => AxiomaticLibraryType
-    case node: MapItemSet[G] => AxiomaticLibraryType
-    case node: MapRemove[G] => AxiomaticLibraryType
-    case node: MapMember[G] => AxiomaticLibraryType
-    case node: OptGet[G] => AxiomaticLibraryType
-    case node: OptGetOrElse[G] => AxiomaticLibraryType
-    case node: GetLeft[G] => AxiomaticLibraryType
-    case node: GetRight[G] => AxiomaticLibraryType
-    case node: IsLeft[G] => AxiomaticLibraryType
-    case node: IsRight[G] => AxiomaticLibraryType
-    case node: MapGet[G] => AxiomaticLibraryType
-    case node: TupGet[G] => AxiomaticLibraryType
-    case node: TFraction[G] => AxiomaticLibraryType
-    case node: TZFraction[G] => AxiomaticLibraryType
-    case node: TOption[G] => AxiomaticLibraryType
-    case node: TEither[G] => AxiomaticLibraryType
-    case node: TTuple[G] => AxiomaticLibraryType
-    case node: TMap[G] => AxiomaticLibraryType
-    case node: OptEmpty[G] => AxiomaticLibraryType
-    case node: OptNoneTyped[G] => AxiomaticLibraryType
-    case node: OptSomeTyped[G] => AxiomaticLibraryType
-    case node: TNull[G] => AxiomaticLibraryType
-
-    case node: Assert[G] => BasicStatement
-    case node: Assume[G] => BasicStatement
-    case node: Block[G] => BasicStatement
-    case node: Scope[G] => BasicStatement
-
-    case node: BitNot[G] => BitOperators
-    case node: BitAnd[G] => BitOperators
-    case node: BitOr[G] => BitOperators
-    case node: BitXor[G] => BitOperators
-    case node: BitShl[G] => BitOperators
-    case node: BitShr[G] => BitOperators
-    case node: BitUShr[G] => BitOperators
-
-    case node: Values[G] => BuiltinArrayOperators
-
-    case node: Deref[G] => Classes
-    case node: InstancePredicateApply[G] => Classes
-    case node: CoalesceInstancePredicateApply[G] => Classes
-    case node: InstanceFunctionInvocation[G] => Classes
-    case node: InstancePredicateLocation[G] => Classes
-    case node: NewObject[G] => Classes
-    case node: TClass[G] => Classes
-    case node: Class[G] => Classes
-    case node: FieldLocation[G] => Classes
-    case node: InvokeMethod[G] => Classes
-    case node: TAnyClass[G] => Classes
-    case node: ThisObject[G] => Classes
-    case node: InstanceField[G] => Classes
-
-    case node: ApplyCoercion[G] => Coercions
-    case node: CoerceBoolResource[G] => Coercions
-    case node: CoerceBoundIntFrac[G] => Coercions
-    case node: CoerceBoundIntZFrac[G] => Coercions
-    case node: CoerceClassAnyClass[G] => Coercions
-    case node: CoerceColToCPrimitive[G] => Coercions
-    case node: CoerceCPrimitiveToCol[G] => Coercions
-    case node: CoerceColToCPPPrimitive[G] => Coercions
-    case node: CoerceCPPPrimitiveToCol[G] => Coercions
-    case node: CoerceFloatRat[G] => Coercions
-    case node: CoerceFracZFrac[G] => Coercions
-    case node: CoerceIdentity[G] => Coercions
-    case node: CoerceIncreasePrecision[G] => Coercions
-    case node: CoerceIntRat[G] => Coercions
-    case node: CoerceJavaClassAnyClass[G] => Coercions
-    case node: CoerceJavaSupports[G] => Coercions
-    case node: CoerceJoinUnion[G] => Coercions
-    case node: CoerceMapBag[G] => Coercions
-    case node: CoerceMapEither[G] => Coercions
-    case node: CoerceMapMap[G] => Coercions
-    case node: CoerceMapMatrix[G] => Coercions
-    case node: CoerceMapOption[G] => Coercions
-    case node: CoerceMapSeq[G] => Coercions
-    case node: CoerceMapSet[G] => Coercions
-    case node: CoerceMapTuple[G] => Coercions
-    case node: CoerceMapType[G] => Coercions
-    case node: CoerceMapVector[G] => Coercions
-    case node: CoerceNothingSomething[G] => Coercions
-    case node: CoerceNullAnyClass[G] => Coercions
-    case node: CoerceNullArray[G] => Coercions
-    case node: CoerceNullClass[G] => Coercions
-    case node: CoerceNullJavaClass[G] => Coercions
-    case node: CoerceNullPointer[G] => Coercions
-    case node: CoerceNullRef[G] => Coercions
-    case node: CoerceRatZFrac[G] => Coercions
-    case node: CoerceSelectUnion[G] => Coercions
-    case node: CoerceSomethingAnyValue[G] => Coercions
-    case node: CoerceSupports[G] => Coercions
-    case node: CoerceUnboundInt[G] => Coercions
-    case node: CoerceWidenBound[G] => Coercions
-    case node: CoerceZFracFrac[G] => Coercions
-    case node: CoerceZFracRat[G] => Coercions
-    case node: CoercionSequence[G] => Coercions
-
-    case node: ComputationalOr[G] => ComputationalLogicOperator
-    case node: ComputationalXor[G] => ComputationalLogicOperator
-    case node: ComputationalAnd[G] => ComputationalLogicOperator
-
-    case node: AmbiguousThis[G] => ContextSensitiveNode
-    case node: AmbiguousResult[G] => ContextSensitiveNode
-
-    case node: ApplicableContract[G] => Contracts
-    case node: LoopInvariant[G] => Contracts
-    case node: SplitAccountedPredicate[G] => Contracts
-    case node: UnitAccountedPredicate[G] => Contracts
-
-    case node: CAnonymousFunctionDeclarator[G] => CSpecific
-    case node: CArrayDeclarator[G] => CSpecific
-    case node: CAtomic[G] => CSpecific
-    case node: CBool[G] => CSpecific
-    case node: CConst[G] => CSpecific
-    case node: CDeclaration[G] => CSpecific
-    case node: CDouble[G] => CSpecific
-    case node: CExtern[G] => CSpecific
-    case node: CFloat[G] => CSpecific
-    case node: CFunctionDefinition[G] => CSpecific
-    case node: CGlobalDeclaration[G] => CSpecific
-    case node: CInit[G] => CSpecific
-    case node: CInline[G] => CSpecific
-    case node: CInt[G] => CSpecific
-    case node: CInvocation[G] => CSpecific
-    case node: CLocal[G] => CSpecific
-    case node: CLocalDeclaration[G] => CSpecific
-    case node: CLong[G] => CSpecific
-    case node: CName[G] => CSpecific
-    case node: CParam[G] => CSpecific
-    case node: CPrimitiveType[G] => CSpecific
-    case node: CPure[G] => CSpecific
-    case node: CRestrict[G] => CSpecific
-    case node: CShort[G] => CSpecific
-    case node: CSigned[G] => CSpecific
-    case node: CSpecificationType[G] => CSpecific
-    case node: CStatic[G] => CSpecific
-    case node: CFieldAccess[G] => CSpecific
-    case node: CStructDeref[G] => CSpecific
-    case node: CTCudaVec[G] => CSpecific
-    case node: CTranslationUnit[G] => CSpecific
-    case node: CTypedef[G] => CSpecific
-    case node: CTypedefName[G] => CSpecific
-    case node: CTypedFunctionDeclarator[G] => CSpecific
-    case node: CTypeQualifierDeclarationSpecifier[G] => CSpecific
-    case node: CUDAKernel[G] => CSpecific
-    case node: CUnsigned[G] => CSpecific
-    case node: CVoid[G] => CSpecific
-    case node: CVolatile[G] => CSpecific
-    case node: GlobalThreadId[G] => CSpecific
-    case node: GpgpuAtomic[G] => CSpecific
-    case node: GpgpuBarrier[G] => CSpecific
-    case node: GpgpuCudaKernelInvocation[G] => CSpecific
-    case node: GPUGlobal[G] => CSpecific
-    case node: GpuGlobalMemoryFence[G] => CSpecific
-    case node: GPULocal[G] => CSpecific
-    case node: GpuLocalMemoryFence[G] => CSpecific
-    case node: GpuZeroMemoryFence[G] => CSpecific
-    case node: LocalThreadId[G] => CSpecific
-    case node: OpenCLKernel[G] => CSpecific
-    case node: SharedMemSize[G] => CSpecific
-
-    case node: CPPAddressingDeclarator[G] => CPPSpecific
-    case node: CPPArrayDeclarator[G] => CPPSpecific
-    case node: CPPBool[G] => CPPSpecific
-    case node: CPPClassMethodOrFieldAccess[G] => CPPSpecific
-    case node: CPPDeclaration[G] => CPPSpecific
-    case node: CPPExprOrTypeSpecifier[G] => CPPSpecific
-    case node: CPPFunctionDefinition[G] => CPPSpecific
-    case node: CPPGlobalDeclaration[G] => CPPSpecific
-    case node: CPPInit[G] => CPPSpecific
-    case node: CPPInline[G] => CPPSpecific
-    case node: CPPInt[G] => CPPSpecific
-    case node: CPPInvocation[G] => CPPSpecific
-    case node: CPPLambdaDeclarator[G] => CPPSpecific
-    case node: CPPLambdaDefinition[G] => CPPSpecific
-    case node: CPPLambdaRef[G] => CPPSpecific
-    case node: CPPLifetimeScope[G] => CPPSpecific
-    case node: CPPLocalDeclaration[G] => CPPSpecific
-    case node: CPPLocal[G] => CPPSpecific
-    case node: CPPLong[G] => CPPSpecific
-    case node: CPPName[G] => CPPSpecific
-    case node: CPPParam[G] => CPPSpecific
-    case node: CPPPrimitiveType[G] => CPPSpecific
-    case node: CPPPure[G] => CPPSpecific
-    case node: CPPShort[G] => CPPSpecific
-    case node: CPPSigned[G] => CPPSpecific
-    case node: CPPSpecificationType[G] => CPPSpecific
-    case node: CPPTArray[G] => CPPSpecific
-    case node: CPPTLambda[G] => CPPSpecific
-    case node: CPPTranslationUnit[G] => CPPSpecific
-    case node: CPPTypedefName[G] => CPPSpecific
-    case node: CPPTypedFunctionDeclarator[G] => CPPSpecific
-    case node: CPPUnsigned[G] => CPPSpecific
-    case node: CPPVoid[G] => CPPSpecific
-
-    case node: SYCLClassDefName[G] => CPPSpecific
-    case node: SYCLNDRange[G] => CPPSpecific
-    case node: SYCLRange[G] => CPPSpecific
-    case node: SYCLReadOnlyAccess[G] => CPPSpecific
-    case node: SYCLReadWriteAccess[G] => CPPSpecific
-    case node: SYCLTAccessMode[G] => CPPSpecific
-    case node: SYCLTAccessor[G] => CPPSpecific
-    case node: SYCLTBuffer[G] => CPPSpecific
-    case node: SYCLTEvent[G] => CPPSpecific
-    case node: SYCLTHandler[G] => CPPSpecific
-    case node: SYCLTItem[G] => CPPSpecific
-    case node: SYCLTLocalAccessor[G] => CPPSpecific
-    case node: SYCLTNDItem[G] => CPPSpecific
-    case node: SYCLTNDRange[G] => CPPSpecific
-    case node: SYCLTQueue[G] => CPPSpecific
-    case node: SYCLTRange[G] => CPPSpecific
-
-    case node: CurrentThreadId[G] => CurrentThread
-
-    case node: UntypedLiteralSeq[G] => DynamicallyTypedCollection
-    case node: UntypedLiteralSet[G] => DynamicallyTypedCollection
-    case node: UntypedLiteralBag[G] => DynamicallyTypedCollection
-
-    case node: Eval[G] => Evaluation
-
-    case node: Break[G] => ExceptionalLoopControl
-    case node: Continue[G] => ExceptionalLoopControl
-
-    case node: Throw[G] => Exceptions
-    case node: SignalsClause[G] => Exceptions
-
-    case node: TAny[G] => ExoticTypes
-    case node: TAnyValue[G] => ExoticTypes
-    case node: TNothing[G] => ExoticTypes
-    case node: TUnion[G] => ExoticTypes
-    case node: TBoundedInt[G] => ExoticTypes
-    case node: TNotAValue[G] => ExoticTypes
-
-    case node: Exp[G] => Exponents
-
-    case node: PreAssignExpression[G] => ExpressionWithSideEffects
-    case node: PostAssignExpression[G] => ExpressionWithSideEffects
-    case node: With[G] => ExpressionWithSideEffects
-    case node: Then[G] => ExpressionWithSideEffects
-    case node: ScopedExpr[G] => ExpressionWithSideEffects
-
-    case node: CastFloat[G] => Floats
-    case node: FloatValue[G] => Floats
-    case node: FloatType[G] => Floats
-
-    case node: Final[G] => FinalField
-
-    case node: Goto[G] => Gotos
-    case node: LabelDecl[G] => Gotos
-
-    case node: InlinePattern[G] => InlineQuantifierPattern
-
-    case node: Held[G] => IntrinsicLocks
-    case node: Synchronized[G] => IntrinsicLocks
-    case node: Lock[G] => IntrinsicLocks
-    case node: Unlock[G] => IntrinsicLocks
-    case node: Commit[G] => IntrinsicLocks
-    case node: Committed[G] => IntrinsicLocks
-
-    case node: JavaAbstract[G] => JavaSpecific
-    case node: JavaAnnotation[G] => JavaSpecific
-    case node: JavaAnnotationInterface[G] => JavaSpecific
-    case node: JavaAnnotationMethod[G] => JavaSpecific
-    case node: JavaClass[G] => JavaSpecific
-    case node: JavaConstructor[G] => JavaSpecific
-    case node: JavaDeref[G] => JavaSpecific
-    case node: JavaFields[G] => JavaSpecific
-    case node: JavaFinal[G] => JavaSpecific
-    case node: JavaImport[G] => JavaSpecific
-    case node: JavaInline[G] => JavaSpecific
-    case node: JavaInterface[G] => JavaSpecific
-    case node: JavaInvocation[G] => JavaSpecific
-    case node: JavaLiteralArray[G] => JavaSpecific
-    case node: JavaLocal[G] => JavaSpecific
-    case node: JavaLocalDeclaration[G] => JavaSpecific
-    case node: JavaLocalDeclarationStatement[G] => JavaSpecific
-    case node: JavaMethod[G] => JavaSpecific
-    case node: JavaName[G] => JavaSpecific
-    case node: JavaNamedType[G] => JavaSpecific
-    case node: JavaNamespace[G] => JavaSpecific
-    case node: JavaNative[G] => JavaSpecific
-    case node: JavaNewClass[G] => JavaSpecific
-    case node: JavaNewDefaultArray[G] => JavaSpecific
-    case node: JavaNewLiteralArray[G] => JavaSpecific
-    case node: JavaPrivate[G] => JavaSpecific
-    case node: JavaProtected[G] => JavaSpecific
-    case node: JavaPublic[G] => JavaSpecific
-    case node: JavaPure[G] => JavaSpecific
-    case node: JavaSharedInitialization[G] => JavaSpecific
-    case node: JavaStatic[G] => JavaSpecific
-    case node: JavaStrictFP[G] => JavaSpecific
-    case node: JavaSynchronized[G] => JavaSpecific
-    case node: JavaTClass[G] => JavaSpecific
-    case node: JavaTransient[G] => JavaSpecific
-    case node: JavaVariableDeclaration[G] => JavaSpecific
-    case node: JavaVolatile[G] => JavaSpecific
-
-    case node: IdleToken[G] => JavaThreads
-    case node: JoinToken[G] => JavaThreads
-    case node: RunMethod[G] => JavaThreads
-    case node: Fork[G] => JavaThreads
-    case node: Join[G] => JavaThreads
-
-    case node: IterationContract[G] => LoopIterationContract
-
-    case node: Wand[G] => MagicWand
-    case node: WandPackage[G] => MagicWand
-    case node: WandApply[G] => MagicWand
-
-    case node: VectorSum[G] => MatrixVector
-    case node: VectorCompare[G] => MatrixVector
-    case node: VectorRepeat[G] => MatrixVector
-    case node: MatrixSum[G] => MatrixVector
-    case node: MatrixCompare[G] => MatrixVector
-    case node: MatrixRepeat[G] => MatrixVector
-    case node: TMatrix[G] => MatrixVector
-
-    case node: InvokeProcedure[G] => Methods
-    case node: MethodInvocation[G] => Methods
-    case node: ProcedureInvocation[G] => Methods
-
-    case node: ModelDeref[G] => Models
-    case node: ModelLocation[G] => Models
-    case node: EmptyProcess[G] => Models
-    case node: ActionApply[G] => Models
-    case node: ProcessApply[G] => Models
-    case node: ProcessSeq[G] => Models
-    case node: ProcessChoice[G] => Models
-    case node: ProcessPar[G] => Models
-    case node: ProcessSelect[G] => Models
-    case node: ModelNew[G] => Models
-    case node: ModelState[G] => Models
-    case node: ModelAbstractState[G] => Models
-    case node: ModelCreate[G] => Models
-    case node: ModelDestroy[G] => Models
-    case node: ModelSplit[G] => Models
-    case node: ModelMerge[G] => Models
-    case node: ModelChoose[G] => Models
-    case node: ModelPerm[G] => Models
-    case node: ActionPerm[G] => Models
-    case node: ModelDo[G] => Models
-    case node: TProcess[G] => Models
-    case node: TModel[G] => Models
-    case node: ModelField[G] => Models
-    case node: ModelProcess[G] => Models
-    case node: ModelAction[G] => Models
-    case node: Model[G] => Models
-    case node: ThisModel[G] => Models
-
-    case node: IndetBranch[G] => NonTrivialBranch
-
-    case node: Sum[G] => NumericReductionOperator
-    case node: Product[G] => NumericReductionOperator
-
-    case node: ParInvariant[G] => ParallelRegion
-    case node: ParAtomic[G] => ParallelRegion
-    case node: ParBarrier[G] => ParallelRegion
-    case node: ParBlock[G] => ParallelRegion
-    case node: ScaleByParBlock[G] => ParallelRegion
-    case node: ParParallel[G] => ParallelRegion
-    case node: ParRegion[G] => ParallelRegion
-    case node: VecBlock[G] => ParallelRegion
-    case node: ParStatement[G] => ParallelRegion
-    case node: ParBlockDecl[G] => ParallelRegion
-    case node: ParInvariantDecl[G] => ParallelRegion
-    case node: IterVariable[G] => ParallelRegion
-
-    case node: Permutation[G] => PermutationOperator
-
-    case node: DerefPointer[G] => Pointers
-    case node: AddrOf[G] => Pointers
-    case node: PointerLocation[G] => Pointers
-    case node: PointerAdd[G] => Pointers
-    case node: PointerSubscript[G] => Pointers
-    case node: PointerBlockLength[G] => Pointers
-    case node: PointerBlockOffset[G] => Pointers
-    case node: PointerLength[G] => Pointers
-    case node: TPointer[G] => Pointers
-
-    case node: Extract[G] => ProofHelpers
-    case node: FramedProof[G] => ProofHelpers
-    case node: Refute[G] => ProofHelpers
-
-    case node: PVLConstructor[G] => PvlSpecific
-    case node: PVLDeref[G] => PvlSpecific
-    case node: PVLInvocation[G] => PvlSpecific
-    case node: PVLLocal[G] => PvlSpecific
-    case node: PVLNamedType[G] => PvlSpecific
-    case node: PVLNew[G] => PvlSpecific
-
-    case node: CurPerm[G] => Resources
-    case node: Exhale[G] => Resources
-    case node: Fold[G] => Resources
-    case node: Inhale[G] => Resources
-    case node: Null[G] => Resources
-    case node: Old[G] => Resources
-    case node: Perm[G] => Resources
-    case node: PredicateApply[G] => Resources
-    case node: PredicateLocation[G] => Resources
-    case node: SilverDeref[G] => Resources
-    case node: SilverField[G] => Resources
-    case node: SilverFieldAssign[G] => Resources
-    case node: SilverFieldLocation[G] => Resources
-    case node: SilverNull[G] => Resources
-    case node: Star[G] => Resources
-    case node: Starall[G] => Resources
-    case node: TRef[G] => Resources
-    case node: TResource[G] => Resources
-    case node: Unfold[G] => Resources
-    case node: Unfolding[G] => Resources
-    case node: Value[G] => Resources
-
-    case node: Program[G] => RootStructure
-    case node: Verification[G] => RootStructure
-    case node: VerificationContext[G] => RootStructure
-
-    case node: Send[G] => SendRecv
-    case node: Recv[G] => SendRecv
-    case node: SendDecl[G] => SendRecv
-
-    case node: Range[G] => SequenceRange
-
-    case node: BagAdd[G] => SilverAxiomaticLibraryType
-    case node: BagLargestCommon[G] => SilverAxiomaticLibraryType
-    case node: BagMemberCount[G] => SilverAxiomaticLibraryType
-    case node: BagMinus[G] => SilverAxiomaticLibraryType
-    case node: Concat[G] => SilverAxiomaticLibraryType
-    case node: Drop[G] => SilverAxiomaticLibraryType
-    case node: LiteralBag[G] => SilverAxiomaticLibraryType
-    case node: LiteralSeq[G] => SilverAxiomaticLibraryType
-    case node: LiteralSet[G] => SilverAxiomaticLibraryType
-    case node: SeqMember[G] => SilverAxiomaticLibraryType
-    case node: SeqSubscript[G] => SilverAxiomaticLibraryType
-    case node: VectorSubscript[G] => SilverAxiomaticLibraryType
-    case node: SeqUpdate[G] => SilverAxiomaticLibraryType
-    case node: SetIntersection[G] => SilverAxiomaticLibraryType
-    case node: SetMember[G] => SilverAxiomaticLibraryType
-    case node: SetMinus[G] => SilverAxiomaticLibraryType
-    case node: SetUnion[G] => SilverAxiomaticLibraryType
-    case node: SilverBagSize[G] => SilverAxiomaticLibraryType
-    case node: SilverMapSize[G] => SilverAxiomaticLibraryType
-    case node: SilverSeqSize[G] => SilverAxiomaticLibraryType
-    case node: SilverSetSize[G] => SilverAxiomaticLibraryType
-    case node: Size[G] => SilverAxiomaticLibraryType
-    case node: SubBag[G] => SilverAxiomaticLibraryType
-    case node: SubSet[G] => SilverAxiomaticLibraryType
-    case node: Take[G] => SilverAxiomaticLibraryType
-    case node: TBag[G] => SilverAxiomaticLibraryType
-    case node: TSeq[G] => SilverAxiomaticLibraryType
-    case node: TSet[G] => SilverAxiomaticLibraryType
-    case node: TVector[G] => SilverAxiomaticLibraryType
-
-    case node: SilverCurFieldPerm[G] => SilverSpecific
-    case node: SilverCurPredPerm[G] => SilverSpecific
-    case node: SilverPartialADTFunctionInvocation[G] => SilverSpecific
-    case node: SilverPartialTAxiomatic[G] => SilverSpecific
-    case node: SilverUntypedNonemptyLiteralMap[G] => SilverSpecific
-
-    case node: FunctionInvocation[G] => SmtDeclarations
-    case node: Variable[G] => SmtDeclarations
-
-    case node: And[G] => SmtOperators
-    case node: BooleanValue[G] => SmtOperators
-    case node: RatDiv[G] => SmtOperators
-    case node: Eq[G] => SmtOperators
-    case node: Exists[G] => SmtOperators
-    case node: FloorDiv[G] => SmtOperators
-    case node: FloatDiv[G] => SmtOperators
-    case node: Forall[G] => SmtOperators
-    case node: Greater[G] => SmtOperators
-    case node: GreaterEq[G] => SmtOperators
-    case node: Implies[G] => SmtOperators
-    case node: IntegerValue[G] => SmtOperators
-    case node: Less[G] => SmtOperators
-    case node: LessEq[G] => SmtOperators
-    case node: Let[G] => SmtOperators
-    case node: Local[G] => SmtOperators
-    case node: Minus[G] => SmtOperators
-    case node: Mod[G] => SmtOperators
-    case node: TruncMod[G] => SmtOperators
-    case node: TruncDiv[G] => SmtOperators
-    case node: Mult[G] => SmtOperators
-    case node: Neq[G] => SmtOperators
-    case node: NoPerm[G] => SmtOperators
-    case node: Not[G] => SmtOperators
-    case node: Or[G] => SmtOperators
-    case node: Plus[G] => SmtOperators
-    case node: Select[G] => SmtOperators
-    case node: SilverIntToRat[G] => SmtOperators
-    case node: UMinus[G] => SmtOperators
-    case node: WritePerm[G] => SmtOperators
-
-    case node: TBool[G] => SmtTypes
-    case node: TInt[G] => SmtTypes
-    case node: TRational[G] => SmtTypes
-
-    case node: SpecIgnoreStart[G] => SpecIgnore
-    case node: SpecIgnoreEnd[G] => SpecIgnore
-
-    case node: Any[G] => StarSubscript
-
-    case node: Cons[G] => SugarCollectionOperator
-    case node: Head[G] => SugarCollectionOperator
-    case node: Tail[G] => SugarCollectionOperator
-    case node: Slice[G] => SugarCollectionOperator
-    case node: RemoveAt[G] => SugarCollectionOperator
-    case node: Empty[G] => SugarCollectionOperator
-    case node: SubSetEq[G] => SugarCollectionOperator
-    case node: SubBagEq[G] => SugarCollectionOperator
-
-    case node: PointsTo[G] => SugarPermissionOperator
-    case node: Scale[G] => SugarPermissionOperator
-
-    case node: Switch[G] => SwitchStatement
-    case node: DefaultCase[G] => SwitchStatement
-    case node: Case[G] => SwitchStatement
-
-    case node: DecreasesClauseAssume[G] => TerminationMeasure
-    case node: DecreasesClauseNoRecursion[G] => TerminationMeasure
-    case node: DecreasesClauseTuple[G] => TerminationMeasure
-
-    case node: SimplificationRule[G] => TermRewriteRules
-    case node: FunctionOf[G] => TermRewriteRules
-
-    case node: TChar[G] => TextTypes
-    case node: TString[G] => TextTypes
-
-    case node: TryCatchFinally[G] => TryCatchStatement
-    case node: CatchClause[G] => TryCatchStatement
-
-    case node: TypeValue[G] => TypeValuesAndGenerics
-    case node: TypeOf[G] => TypeValuesAndGenerics
-    case node: InstanceOf[G] => TypeValuesAndGenerics
-    case node: Cast[G] => TypeValuesAndGenerics
-    case node: SubType[G] => TypeValuesAndGenerics
-    case node: SuperType[G] => TypeValuesAndGenerics
-    case node: TType[G] => TypeValuesAndGenerics
-    case node: TVar[G] => TypeValuesAndGenerics
-
-    case node: LocalDecl[G] => UnscopedDeclaration
-
-    case node: Wait[G] => WaitNotify
-    case node: Notify[G] => WaitNotify
-
-    case node: ReadPerm[G] => WildcardReadPermission
-
-    case node: AmbiguousComputationalAnd[G] =>
-      return AmbiguousOperators +: (
-        if(node.isBoolOp) Seq(ComputationalLogicOperator)
-        else Seq(BitOperators)
-      )
-    case node: AmbiguousComputationalOr[G] =>
-      return AmbiguousOperators +: (
-        if (node.isBoolOp) Seq(ComputationalLogicOperator)
-        else Seq(BitOperators)
-        )
-    case node: AmbiguousComputationalXor[G] =>
-      return AmbiguousOperators +: (
-        if (node.isBoolOp) Seq(ComputationalLogicOperator)
-        else Seq(BitOperators)
-        )
-    case node: AmbiguousMult[G] =>
-      return AmbiguousOperators +: (
-        if(node.isProcessOp) Seq(Models)
-        else Seq(SmtOperators)
-      )
-    case node: AmbiguousPlus[G] =>
-      return AmbiguousOperators +: (
-        if(node.isProcessOp) Seq(Models)
-        else if(node.isPointerOp) Seq(Pointers)
-        else Seq(SmtOperators)
-      )
-    case node: AmbiguousMinus[G] => AmbiguousOperators
-    case node: AmbiguousOr[G] =>
-      return AmbiguousOperators +: (
-        if(node.isProcessOp) Seq(Models)
-        else Seq(SmtOperators)
-      )
-    case node: AmbiguousSubscript[G] =>
-      return AmbiguousOperators +: (
-        if (node.isPointerOp) Seq(Pointers)
-        else if (node.isMapOp) Seq(AxiomaticLibraryType)
-        else if (node.isArrayOp) Seq(Arrays)
-        else Seq(SilverAxiomaticLibraryType)
-      )
-    case node: AmbiguousMember[G] =>
-      return AmbiguousOperators +: (
-        if (node.isMapOp) Seq(AxiomaticLibraryType)
-        else Seq(SilverAxiomaticLibraryType)
-      )
-
-    case node: Return[G] =>
-      returnValues :+= node.result
-      if (node.result == Void[G]()(DiagnosticOrigin)) return Seq(Methods)
-      else return Seq(NonVoidReturn, Methods)
-    case node: Branch[G] =>
-      node.branches match {
-        case Seq((_, _), (BooleanValue(true), _)) => BasicStatement
-        case _ => NonTrivialBranch
-      }
-    case node: Loop[G] => node match {
-      case Loop(Block(Nil), _, Block(Nil), _, _) => WhileLoops
-      case _ => NonWhileLoop
-    }
-    case node: Function[G] =>
-      return Seq(SmtDeclarations) ++
-        (if (node.inline) Seq(ApplicableToBeInlined) else Nil) ++
-        (if (node.typeArgs.nonEmpty) Seq(TypeValuesAndGenerics) else Nil)
-    case node: Procedure[G] =>
-      returnTypes :+= node.returnType
-      return Seq(Methods) ++
-        (if (node.inline) Seq(ApplicableToBeInlined) else Nil) ++
-        (if (node.typeArgs.nonEmpty) Seq(TypeValuesAndGenerics) else Nil) ++
-        (if (node.pure) Seq(MethodToBePurified) else Nil)
-    case node: Predicate[G] =>
-      return Seq(Resources) ++
-        (if (node.inline) Seq(ApplicableToBeInlined) else Nil)
-    case node: InstanceFunction[G] =>
-      return Seq(Classes) ++
-        (if (node.typeArgs.nonEmpty) Seq(TypeValuesAndGenerics) else Nil) ++
-        (if (node.inline) Seq(ApplicableToBeInlined) else Nil)
-    case node: InstanceMethod[G] =>
-      returnTypes :+= node.returnType
-      return Seq(Classes, Methods) ++
-        (if (node.typeArgs.nonEmpty) Seq(TypeValuesAndGenerics) else Nil) ++
-        (if (node.inline) Seq(ApplicableToBeInlined) else Nil) ++
-        (if (node.pure) Seq(MethodToBePurified) else Nil)
-    case node: InstancePredicate[G] =>
-      return Seq(Classes) ++
-        (if (node.inline) Seq(ApplicableToBeInlined) else Nil)
-    case node: Label[G] => node.stat match {
-      case Block(Nil) => Gotos
-      case _ => return Seq(NonTrivialLabel, Gotos)
-    }
-    case node: TVoid[G] =>
-      if (returnTypes.exists(_ eq node)) return Nil
-      else AxiomaticLibraryType
-    case node: Void[G] =>
-      if (returnValues.exists(_ eq node)) return Nil
-      else AxiomaticLibraryType
-
-    case node: ValidArray[G] => return Seq(SugarPermissionOperator, Arrays)
-    case node: ValidMatrix[G] => return Seq(SugarPermissionOperator, Arrays)
-    case node: PermPointer[G] => return Seq(SugarPermissionOperator, Pointers)
-    case node: PermPointerIndex[G] => return Seq(SugarPermissionOperator, Pointers)
-    case node: CLiteralArray[G] => return Seq(CSpecific, Arrays)
-    case node: CCast[G] => return Seq(CSpecific, TypeValuesAndGenerics)
-    case node: CChar[G] => return Seq(CSpecific, TextTypes)
-    case node: CDeclarationStatement[G] => return Seq(CSpecific, UnscopedDeclaration)
-    case node: CGoto[G] => return Seq(CSpecific, Gotos)
-    case node: CPointer[G] => return Seq(CSpecific, Pointers)
-    case node: CPointerDeclarator[G] => return Seq(CSpecific, Pointers)
-    case node: CPPLiteralArray[G] => return Seq(CPPSpecific, Arrays)
-    case node: CPPChar[G] => return Seq(CPPSpecific, TextTypes)
-    case node: CPPDeclarationStatement[G] => return Seq(CPPSpecific, UnscopedDeclaration)
-    case node: CPPPointer[G] => return Seq(CPPSpecific, Pointers)
-    case node: CPPReference[G] => return Seq(CPPSpecific, Pointers)
-    case node: Result[G] => return scanFlatly(node.applicable.decl)
-    case node: SilverNewRef[G] => return Seq(Assignment, Resources)
-
-    case _ => return Nil
-  })
+    node.transSubnodes.foreach(node =>
+      scanFlatly(node).foreach(f => {
+        features += f
+        examples.getOrElseUpdate(f, ArrayBuffer()) += node
+      })
+    )
+
+  def scanFlatly(node: Node[G]): Seq[Feature] =
+    Seq(node match {
+      case node: AmbiguousLocation[G] => AmbiguousOperators
+      case node: AmbiguousGreater[G] => AmbiguousOperators
+      case node: AmbiguousLess[G] => AmbiguousOperators
+      case node: AmbiguousGreaterEq[G] => AmbiguousOperators
+      case node: AmbiguousLessEq[G] => AmbiguousOperators
+
+      case node: ArrayLocation[G] => Arrays
+      case node: NewArray[G] => Arrays
+      case node: NewPointerArray[G] => Arrays
+      case node: ArraySubscript[G] => Arrays
+      case node: Length[G] => Arrays
+      case node: TArray[G] => Arrays
+
+      case node: Assign[G] => Assignment
+      case node: Havoc[G] => Assignment
+      case node: SilverLocalAssign[G] => Assignment
+
+      case node: ADTAxiom[G] => AxiomaticDataTypes
+      case node: ADTFunction[G] => AxiomaticDataTypes
+      case node: ADTFunctionInvocation[G] => AxiomaticDataTypes
+      case node: AxiomaticDataType[G] => AxiomaticDataTypes
+      case node: TAxiomatic[G] => AxiomaticDataTypes
+
+      case node: LiteralTuple[G] => AxiomaticLibraryType
+      case node: LiteralMap[G] => AxiomaticLibraryType
+      case node: OptSome[G] => AxiomaticLibraryType
+      case node: OptNone[G] => AxiomaticLibraryType
+      case node: EitherLeft[G] => AxiomaticLibraryType
+      case node: EitherRight[G] => AxiomaticLibraryType
+      case node: MapCons[G] => AxiomaticLibraryType
+      case node: MapEq[G] => AxiomaticLibraryType
+      case node: MapDisjoint[G] => AxiomaticLibraryType
+      case node: MapKeySet[G] => AxiomaticLibraryType
+      case node: MapValueSet[G] => AxiomaticLibraryType
+      case node: MapItemSet[G] => AxiomaticLibraryType
+      case node: MapRemove[G] => AxiomaticLibraryType
+      case node: MapMember[G] => AxiomaticLibraryType
+      case node: OptGet[G] => AxiomaticLibraryType
+      case node: OptGetOrElse[G] => AxiomaticLibraryType
+      case node: GetLeft[G] => AxiomaticLibraryType
+      case node: GetRight[G] => AxiomaticLibraryType
+      case node: IsLeft[G] => AxiomaticLibraryType
+      case node: IsRight[G] => AxiomaticLibraryType
+      case node: MapGet[G] => AxiomaticLibraryType
+      case node: TupGet[G] => AxiomaticLibraryType
+      case node: TFraction[G] => AxiomaticLibraryType
+      case node: TZFraction[G] => AxiomaticLibraryType
+      case node: TOption[G] => AxiomaticLibraryType
+      case node: TEither[G] => AxiomaticLibraryType
+      case node: TTuple[G] => AxiomaticLibraryType
+      case node: TMap[G] => AxiomaticLibraryType
+      case node: OptEmpty[G] => AxiomaticLibraryType
+      case node: OptNoneTyped[G] => AxiomaticLibraryType
+      case node: OptSomeTyped[G] => AxiomaticLibraryType
+      case node: TNull[G] => AxiomaticLibraryType
+
+      case node: Assert[G] => BasicStatement
+      case node: Assume[G] => BasicStatement
+      case node: Block[G] => BasicStatement
+      case node: Scope[G] => BasicStatement
+
+      case node: BitNot[G] => BitOperators
+      case node: BitAnd[G] => BitOperators
+      case node: BitOr[G] => BitOperators
+      case node: BitXor[G] => BitOperators
+      case node: BitShl[G] => BitOperators
+      case node: BitShr[G] => BitOperators
+      case node: BitUShr[G] => BitOperators
+
+      case node: Values[G] => BuiltinArrayOperators
+
+      case node: Deref[G] => Classes
+      case node: InstancePredicateApply[G] => Classes
+      case node: CoalesceInstancePredicateApply[G] => Classes
+      case node: InstanceFunctionInvocation[G] => Classes
+      case node: InstancePredicateLocation[G] => Classes
+      case node: NewObject[G] => Classes
+      case node: TClass[G] => Classes
+      case node: Class[G] => Classes
+      case node: FieldLocation[G] => Classes
+      case node: InvokeMethod[G] => Classes
+      case node: TAnyClass[G] => Classes
+      case node: ThisObject[G] => Classes
+      case node: InstanceField[G] => Classes
+
+      case node: ApplyCoercion[G] => Coercions
+      case node: CoerceBoolResource[G] => Coercions
+      case node: CoerceBoundIntFrac[G] => Coercions
+      case node: CoerceBoundIntZFrac[G] => Coercions
+      case node: CoerceClassAnyClass[G] => Coercions
+      case node: CoerceColToCPrimitive[G] => Coercions
+      case node: CoerceCPrimitiveToCol[G] => Coercions
+      case node: CoerceColToCPPPrimitive[G] => Coercions
+      case node: CoerceCPPPrimitiveToCol[G] => Coercions
+      case node: CoerceFloatRat[G] => Coercions
+      case node: CoerceFracZFrac[G] => Coercions
+      case node: CoerceIdentity[G] => Coercions
+      case node: CoerceIncreasePrecision[G] => Coercions
+      case node: CoerceIntRat[G] => Coercions
+      case node: CoerceJavaClassAnyClass[G] => Coercions
+      case node: CoerceJavaSupports[G] => Coercions
+      case node: CoerceJoinUnion[G] => Coercions
+      case node: CoerceMapBag[G] => Coercions
+      case node: CoerceMapEither[G] => Coercions
+      case node: CoerceMapMap[G] => Coercions
+      case node: CoerceMapMatrix[G] => Coercions
+      case node: CoerceMapOption[G] => Coercions
+      case node: CoerceMapSeq[G] => Coercions
+      case node: CoerceMapSet[G] => Coercions
+      case node: CoerceMapTuple[G] => Coercions
+      case node: CoerceMapType[G] => Coercions
+      case node: CoerceMapVector[G] => Coercions
+      case node: CoerceNothingSomething[G] => Coercions
+      case node: CoerceNullAnyClass[G] => Coercions
+      case node: CoerceNullArray[G] => Coercions
+      case node: CoerceNullClass[G] => Coercions
+      case node: CoerceNullJavaClass[G] => Coercions
+      case node: CoerceNullPointer[G] => Coercions
+      case node: CoerceNullRef[G] => Coercions
+      case node: CoerceRatZFrac[G] => Coercions
+      case node: CoerceSelectUnion[G] => Coercions
+      case node: CoerceSomethingAnyValue[G] => Coercions
+      case node: CoerceSupports[G] => Coercions
+      case node: CoerceUnboundInt[G] => Coercions
+      case node: CoerceWidenBound[G] => Coercions
+      case node: CoerceZFracFrac[G] => Coercions
+      case node: CoerceZFracRat[G] => Coercions
+      case node: CoercionSequence[G] => Coercions
+
+      case node: ComputationalOr[G] => ComputationalLogicOperator
+      case node: ComputationalXor[G] => ComputationalLogicOperator
+      case node: ComputationalAnd[G] => ComputationalLogicOperator
+
+      case node: AmbiguousThis[G] => ContextSensitiveNode
+      case node: AmbiguousResult[G] => ContextSensitiveNode
+
+      case node: ApplicableContract[G] => Contracts
+      case node: LoopInvariant[G] => Contracts
+      case node: SplitAccountedPredicate[G] => Contracts
+      case node: UnitAccountedPredicate[G] => Contracts
+
+      case node: CAnonymousFunctionDeclarator[G] => CSpecific
+      case node: CArrayDeclarator[G] => CSpecific
+      case node: CAtomic[G] => CSpecific
+      case node: CBool[G] => CSpecific
+      case node: CConst[G] => CSpecific
+      case node: CDeclaration[G] => CSpecific
+      case node: CDouble[G] => CSpecific
+      case node: CExtern[G] => CSpecific
+      case node: CFloat[G] => CSpecific
+      case node: CFunctionDefinition[G] => CSpecific
+      case node: CGlobalDeclaration[G] => CSpecific
+      case node: CInit[G] => CSpecific
+      case node: CInline[G] => CSpecific
+      case node: CInt[G] => CSpecific
+      case node: CInvocation[G] => CSpecific
+      case node: CLocal[G] => CSpecific
+      case node: CLocalDeclaration[G] => CSpecific
+      case node: CLong[G] => CSpecific
+      case node: CName[G] => CSpecific
+      case node: CParam[G] => CSpecific
+      case node: CPrimitiveType[G] => CSpecific
+      case node: CPure[G] => CSpecific
+      case node: CRestrict[G] => CSpecific
+      case node: CShort[G] => CSpecific
+      case node: CSigned[G] => CSpecific
+      case node: CSpecificationType[G] => CSpecific
+      case node: CStatic[G] => CSpecific
+      case node: CFieldAccess[G] => CSpecific
+      case node: CStructDeref[G] => CSpecific
+      case node: CTCudaVec[G] => CSpecific
+      case node: CTranslationUnit[G] => CSpecific
+      case node: CTypedef[G] => CSpecific
+      case node: CTypedefName[G] => CSpecific
+      case node: CTypedFunctionDeclarator[G] => CSpecific
+      case node: CTypeQualifierDeclarationSpecifier[G] => CSpecific
+      case node: CUDAKernel[G] => CSpecific
+      case node: CUnsigned[G] => CSpecific
+      case node: CVoid[G] => CSpecific
+      case node: CVolatile[G] => CSpecific
+      case node: GlobalThreadId[G] => CSpecific
+      case node: GpgpuAtomic[G] => CSpecific
+      case node: GpgpuBarrier[G] => CSpecific
+      case node: GpgpuCudaKernelInvocation[G] => CSpecific
+      case node: GPUGlobal[G] => CSpecific
+      case node: GpuGlobalMemoryFence[G] => CSpecific
+      case node: GPULocal[G] => CSpecific
+      case node: GpuLocalMemoryFence[G] => CSpecific
+      case node: GpuZeroMemoryFence[G] => CSpecific
+      case node: LocalThreadId[G] => CSpecific
+      case node: OpenCLKernel[G] => CSpecific
+      case node: SharedMemSize[G] => CSpecific
+
+      case node: CPPAddressingDeclarator[G] => CPPSpecific
+      case node: CPPArrayDeclarator[G] => CPPSpecific
+      case node: CPPBool[G] => CPPSpecific
+      case node: CPPClassMethodOrFieldAccess[G] => CPPSpecific
+      case node: CPPDeclaration[G] => CPPSpecific
+      case node: CPPExprOrTypeSpecifier[G] => CPPSpecific
+      case node: CPPFunctionDefinition[G] => CPPSpecific
+      case node: CPPGlobalDeclaration[G] => CPPSpecific
+      case node: CPPInit[G] => CPPSpecific
+      case node: CPPInline[G] => CPPSpecific
+      case node: CPPInt[G] => CPPSpecific
+      case node: CPPInvocation[G] => CPPSpecific
+      case node: CPPLambdaDeclarator[G] => CPPSpecific
+      case node: CPPLambdaDefinition[G] => CPPSpecific
+      case node: CPPLambdaRef[G] => CPPSpecific
+      case node: CPPLifetimeScope[G] => CPPSpecific
+      case node: CPPLocalDeclaration[G] => CPPSpecific
+      case node: CPPLocal[G] => CPPSpecific
+      case node: CPPLong[G] => CPPSpecific
+      case node: CPPName[G] => CPPSpecific
+      case node: CPPParam[G] => CPPSpecific
+      case node: CPPPrimitiveType[G] => CPPSpecific
+      case node: CPPPure[G] => CPPSpecific
+      case node: CPPShort[G] => CPPSpecific
+      case node: CPPSigned[G] => CPPSpecific
+      case node: CPPSpecificationType[G] => CPPSpecific
+      case node: CPPTArray[G] => CPPSpecific
+      case node: CPPTLambda[G] => CPPSpecific
+      case node: CPPTranslationUnit[G] => CPPSpecific
+      case node: CPPTypedefName[G] => CPPSpecific
+      case node: CPPTypedFunctionDeclarator[G] => CPPSpecific
+      case node: CPPUnsigned[G] => CPPSpecific
+      case node: CPPVoid[G] => CPPSpecific
+
+      case node: SYCLClassDefName[G] => CPPSpecific
+      case node: SYCLNDRange[G] => CPPSpecific
+      case node: SYCLRange[G] => CPPSpecific
+      case node: SYCLReadOnlyAccess[G] => CPPSpecific
+      case node: SYCLReadWriteAccess[G] => CPPSpecific
+      case node: SYCLTAccessMode[G] => CPPSpecific
+      case node: SYCLTAccessor[G] => CPPSpecific
+      case node: SYCLTBuffer[G] => CPPSpecific
+      case node: SYCLTEvent[G] => CPPSpecific
+      case node: SYCLTHandler[G] => CPPSpecific
+      case node: SYCLTItem[G] => CPPSpecific
+      case node: SYCLTLocalAccessor[G] => CPPSpecific
+      case node: SYCLTNDItem[G] => CPPSpecific
+      case node: SYCLTNDRange[G] => CPPSpecific
+      case node: SYCLTQueue[G] => CPPSpecific
+      case node: SYCLTRange[G] => CPPSpecific
+
+      case node: CurrentThreadId[G] => CurrentThread
+
+      case node: UntypedLiteralSeq[G] => DynamicallyTypedCollection
+      case node: UntypedLiteralSet[G] => DynamicallyTypedCollection
+      case node: UntypedLiteralBag[G] => DynamicallyTypedCollection
+
+      case node: Eval[G] => Evaluation
+
+      case node: Break[G] => ExceptionalLoopControl
+      case node: Continue[G] => ExceptionalLoopControl
+
+      case node: Throw[G] => Exceptions
+      case node: SignalsClause[G] => Exceptions
+
+      case node: TAny[G] => ExoticTypes
+      case node: TAnyValue[G] => ExoticTypes
+      case node: TNothing[G] => ExoticTypes
+      case node: TUnion[G] => ExoticTypes
+      case node: TBoundedInt[G] => ExoticTypes
+      case node: TNotAValue[G] => ExoticTypes
+
+      case node: Exp[G] => Exponents
+
+      case node: PreAssignExpression[G] => ExpressionWithSideEffects
+      case node: PostAssignExpression[G] => ExpressionWithSideEffects
+      case node: With[G] => ExpressionWithSideEffects
+      case node: Then[G] => ExpressionWithSideEffects
+      case node: ScopedExpr[G] => ExpressionWithSideEffects
+
+      case node: CastFloat[G] => Floats
+      case node: FloatValue[G] => Floats
+      case node: FloatType[G] => Floats
+
+      case node: Final[G] => FinalField
+
+      case node: Goto[G] => Gotos
+      case node: LabelDecl[G] => Gotos
+
+      case node: InlinePattern[G] => InlineQuantifierPattern
+
+      case node: Held[G] => IntrinsicLocks
+      case node: Synchronized[G] => IntrinsicLocks
+      case node: Lock[G] => IntrinsicLocks
+      case node: Unlock[G] => IntrinsicLocks
+      case node: Commit[G] => IntrinsicLocks
+      case node: Committed[G] => IntrinsicLocks
+
+      case node: JavaAbstract[G] => JavaSpecific
+      case node: JavaAnnotation[G] => JavaSpecific
+      case node: JavaAnnotationInterface[G] => JavaSpecific
+      case node: JavaAnnotationMethod[G] => JavaSpecific
+      case node: JavaClass[G] => JavaSpecific
+      case node: JavaConstructor[G] => JavaSpecific
+      case node: JavaDeref[G] => JavaSpecific
+      case node: JavaFields[G] => JavaSpecific
+      case node: JavaFinal[G] => JavaSpecific
+      case node: JavaImport[G] => JavaSpecific
+      case node: JavaInline[G] => JavaSpecific
+      case node: JavaInterface[G] => JavaSpecific
+      case node: JavaInvocation[G] => JavaSpecific
+      case node: JavaLiteralArray[G] => JavaSpecific
+      case node: JavaLocal[G] => JavaSpecific
+      case node: JavaLocalDeclaration[G] => JavaSpecific
+      case node: JavaLocalDeclarationStatement[G] => JavaSpecific
+      case node: JavaMethod[G] => JavaSpecific
+      case node: JavaName[G] => JavaSpecific
+      case node: JavaNamedType[G] => JavaSpecific
+      case node: JavaNamespace[G] => JavaSpecific
+      case node: JavaNative[G] => JavaSpecific
+      case node: JavaNewClass[G] => JavaSpecific
+      case node: JavaNewDefaultArray[G] => JavaSpecific
+      case node: JavaNewLiteralArray[G] => JavaSpecific
+      case node: JavaPrivate[G] => JavaSpecific
+      case node: JavaProtected[G] => JavaSpecific
+      case node: JavaPublic[G] => JavaSpecific
+      case node: JavaPure[G] => JavaSpecific
+      case node: JavaSharedInitialization[G] => JavaSpecific
+      case node: JavaStatic[G] => JavaSpecific
+      case node: JavaStrictFP[G] => JavaSpecific
+      case node: JavaSynchronized[G] => JavaSpecific
+      case node: JavaTClass[G] => JavaSpecific
+      case node: JavaTransient[G] => JavaSpecific
+      case node: JavaVariableDeclaration[G] => JavaSpecific
+      case node: JavaVolatile[G] => JavaSpecific
+
+      case node: IdleToken[G] => JavaThreads
+      case node: JoinToken[G] => JavaThreads
+      case node: RunMethod[G] => JavaThreads
+      case node: Fork[G] => JavaThreads
+      case node: Join[G] => JavaThreads
+
+      case node: IterationContract[G] => LoopIterationContract
+
+      case node: Wand[G] => MagicWand
+      case node: WandPackage[G] => MagicWand
+      case node: WandApply[G] => MagicWand
+
+      case node: VectorSum[G] => MatrixVector
+      case node: VectorCompare[G] => MatrixVector
+      case node: VectorRepeat[G] => MatrixVector
+      case node: MatrixSum[G] => MatrixVector
+      case node: MatrixCompare[G] => MatrixVector
+      case node: MatrixRepeat[G] => MatrixVector
+      case node: TMatrix[G] => MatrixVector
+
+      case node: InvokeProcedure[G] => Methods
+      case node: MethodInvocation[G] => Methods
+      case node: ProcedureInvocation[G] => Methods
+
+      case node: ModelDeref[G] => Models
+      case node: ModelLocation[G] => Models
+      case node: EmptyProcess[G] => Models
+      case node: ActionApply[G] => Models
+      case node: ProcessApply[G] => Models
+      case node: ProcessSeq[G] => Models
+      case node: ProcessChoice[G] => Models
+      case node: ProcessPar[G] => Models
+      case node: ProcessSelect[G] => Models
+      case node: ModelNew[G] => Models
+      case node: ModelState[G] => Models
+      case node: ModelAbstractState[G] => Models
+      case node: ModelCreate[G] => Models
+      case node: ModelDestroy[G] => Models
+      case node: ModelSplit[G] => Models
+      case node: ModelMerge[G] => Models
+      case node: ModelChoose[G] => Models
+      case node: ModelPerm[G] => Models
+      case node: ActionPerm[G] => Models
+      case node: ModelDo[G] => Models
+      case node: TProcess[G] => Models
+      case node: TModel[G] => Models
+      case node: ModelField[G] => Models
+      case node: ModelProcess[G] => Models
+      case node: ModelAction[G] => Models
+      case node: Model[G] => Models
+      case node: ThisModel[G] => Models
+
+      case node: IndetBranch[G] => NonTrivialBranch
+
+      case node: Sum[G] => NumericReductionOperator
+      case node: Product[G] => NumericReductionOperator
+
+      case node: ParInvariant[G] => ParallelRegion
+      case node: ParAtomic[G] => ParallelRegion
+      case node: ParBarrier[G] => ParallelRegion
+      case node: ParBlock[G] => ParallelRegion
+      case node: ScaleByParBlock[G] => ParallelRegion
+      case node: ParParallel[G] => ParallelRegion
+      case node: ParRegion[G] => ParallelRegion
+      case node: VecBlock[G] => ParallelRegion
+      case node: ParStatement[G] => ParallelRegion
+      case node: ParBlockDecl[G] => ParallelRegion
+      case node: ParInvariantDecl[G] => ParallelRegion
+      case node: IterVariable[G] => ParallelRegion
+
+      case node: Permutation[G] => PermutationOperator
+
+      case node: DerefPointer[G] => Pointers
+      case node: AddrOf[G] => Pointers
+      case node: PointerLocation[G] => Pointers
+      case node: PointerAdd[G] => Pointers
+      case node: PointerSubscript[G] => Pointers
+      case node: PointerBlockLength[G] => Pointers
+      case node: PointerBlockOffset[G] => Pointers
+      case node: PointerLength[G] => Pointers
+      case node: TPointer[G] => Pointers
+
+      case node: Extract[G] => ProofHelpers
+      case node: FramedProof[G] => ProofHelpers
+      case node: Refute[G] => ProofHelpers
+
+      case node: PVLConstructor[G] => PvlSpecific
+      case node: PVLDeref[G] => PvlSpecific
+      case node: PVLInvocation[G] => PvlSpecific
+      case node: PVLLocal[G] => PvlSpecific
+      case node: PVLNamedType[G] => PvlSpecific
+      case node: PVLNew[G] => PvlSpecific
+
+      case node: CurPerm[G] => Resources
+      case node: Exhale[G] => Resources
+      case node: Fold[G] => Resources
+      case node: Inhale[G] => Resources
+      case node: Null[G] => Resources
+      case node: Old[G] => Resources
+      case node: Perm[G] => Resources
+      case node: PredicateApply[G] => Resources
+      case node: PredicateLocation[G] => Resources
+      case node: SilverDeref[G] => Resources
+      case node: SilverField[G] => Resources
+      case node: SilverFieldAssign[G] => Resources
+      case node: SilverFieldLocation[G] => Resources
+      case node: SilverNull[G] => Resources
+      case node: Star[G] => Resources
+      case node: Starall[G] => Resources
+      case node: TRef[G] => Resources
+      case node: TResource[G] => Resources
+      case node: Unfold[G] => Resources
+      case node: Unfolding[G] => Resources
+      case node: Value[G] => Resources
+
+      case node: Program[G] => RootStructure
+      case node: Verification[G] => RootStructure
+      case node: VerificationContext[G] => RootStructure
+
+      case node: Send[G] => SendRecv
+      case node: Recv[G] => SendRecv
+      case node: SendDecl[G] => SendRecv
+
+      case node: Range[G] => SequenceRange
+
+      case node: BagAdd[G] => SilverAxiomaticLibraryType
+      case node: BagLargestCommon[G] => SilverAxiomaticLibraryType
+      case node: BagMemberCount[G] => SilverAxiomaticLibraryType
+      case node: BagMinus[G] => SilverAxiomaticLibraryType
+      case node: Concat[G] => SilverAxiomaticLibraryType
+      case node: Drop[G] => SilverAxiomaticLibraryType
+      case node: LiteralBag[G] => SilverAxiomaticLibraryType
+      case node: LiteralSeq[G] => SilverAxiomaticLibraryType
+      case node: LiteralSet[G] => SilverAxiomaticLibraryType
+      case node: SeqMember[G] => SilverAxiomaticLibraryType
+      case node: SeqSubscript[G] => SilverAxiomaticLibraryType
+      case node: VectorSubscript[G] => SilverAxiomaticLibraryType
+      case node: SeqUpdate[G] => SilverAxiomaticLibraryType
+      case node: SetIntersection[G] => SilverAxiomaticLibraryType
+      case node: SetMember[G] => SilverAxiomaticLibraryType
+      case node: SetMinus[G] => SilverAxiomaticLibraryType
+      case node: SetUnion[G] => SilverAxiomaticLibraryType
+      case node: SilverBagSize[G] => SilverAxiomaticLibraryType
+      case node: SilverMapSize[G] => SilverAxiomaticLibraryType
+      case node: SilverSeqSize[G] => SilverAxiomaticLibraryType
+      case node: SilverSetSize[G] => SilverAxiomaticLibraryType
+      case node: Size[G] => SilverAxiomaticLibraryType
+      case node: SubBag[G] => SilverAxiomaticLibraryType
+      case node: SubSet[G] => SilverAxiomaticLibraryType
+      case node: Take[G] => SilverAxiomaticLibraryType
+      case node: TBag[G] => SilverAxiomaticLibraryType
+      case node: TSeq[G] => SilverAxiomaticLibraryType
+      case node: TSet[G] => SilverAxiomaticLibraryType
+      case node: TVector[G] => SilverAxiomaticLibraryType
+
+      case node: SilverCurFieldPerm[G] => SilverSpecific
+      case node: SilverCurPredPerm[G] => SilverSpecific
+      case node: SilverPartialADTFunctionInvocation[G] => SilverSpecific
+      case node: SilverPartialTAxiomatic[G] => SilverSpecific
+      case node: SilverUntypedNonemptyLiteralMap[G] => SilverSpecific
+
+      case node: FunctionInvocation[G] => SmtDeclarations
+      case node: Variable[G] => SmtDeclarations
+
+      case node: And[G] => SmtOperators
+      case node: BooleanValue[G] => SmtOperators
+      case node: RatDiv[G] => SmtOperators
+      case node: Eq[G] => SmtOperators
+      case node: Exists[G] => SmtOperators
+      case node: FloorDiv[G] => SmtOperators
+      case node: FloatDiv[G] => SmtOperators
+      case node: Forall[G] => SmtOperators
+      case node: Greater[G] => SmtOperators
+      case node: GreaterEq[G] => SmtOperators
+      case node: Implies[G] => SmtOperators
+      case node: IntegerValue[G] => SmtOperators
+      case node: Less[G] => SmtOperators
+      case node: LessEq[G] => SmtOperators
+      case node: Let[G] => SmtOperators
+      case node: Local[G] => SmtOperators
+      case node: Minus[G] => SmtOperators
+      case node: Mod[G] => SmtOperators
+      case node: TruncMod[G] => SmtOperators
+      case node: TruncDiv[G] => SmtOperators
+      case node: Mult[G] => SmtOperators
+      case node: Neq[G] => SmtOperators
+      case node: NoPerm[G] => SmtOperators
+      case node: Not[G] => SmtOperators
+      case node: Or[G] => SmtOperators
+      case node: Plus[G] => SmtOperators
+      case node: Select[G] => SmtOperators
+      case node: SilverIntToRat[G] => SmtOperators
+      case node: UMinus[G] => SmtOperators
+      case node: WritePerm[G] => SmtOperators
+
+      case node: TBool[G] => SmtTypes
+      case node: TInt[G] => SmtTypes
+      case node: TRational[G] => SmtTypes
+
+      case node: SpecIgnoreStart[G] => SpecIgnore
+      case node: SpecIgnoreEnd[G] => SpecIgnore
+
+      case node: Any[G] => StarSubscript
+
+      case node: Cons[G] => SugarCollectionOperator
+      case node: Head[G] => SugarCollectionOperator
+      case node: Tail[G] => SugarCollectionOperator
+      case node: Slice[G] => SugarCollectionOperator
+      case node: RemoveAt[G] => SugarCollectionOperator
+      case node: Empty[G] => SugarCollectionOperator
+      case node: SubSetEq[G] => SugarCollectionOperator
+      case node: SubBagEq[G] => SugarCollectionOperator
+
+      case node: PointsTo[G] => SugarPermissionOperator
+      case node: Scale[G] => SugarPermissionOperator
+
+      case node: Switch[G] => SwitchStatement
+      case node: DefaultCase[G] => SwitchStatement
+      case node: Case[G] => SwitchStatement
+
+      case node: DecreasesClauseAssume[G] => TerminationMeasure
+      case node: DecreasesClauseNoRecursion[G] => TerminationMeasure
+      case node: DecreasesClauseTuple[G] => TerminationMeasure
+
+      case node: SimplificationRule[G] => TermRewriteRules
+      case node: FunctionOf[G] => TermRewriteRules
+
+      case node: TChar[G] => TextTypes
+      case node: TString[G] => TextTypes
+
+      case node: TryCatchFinally[G] => TryCatchStatement
+      case node: CatchClause[G] => TryCatchStatement
+
+      case node: TypeValue[G] => TypeValuesAndGenerics
+      case node: TypeOf[G] => TypeValuesAndGenerics
+      case node: InstanceOf[G] => TypeValuesAndGenerics
+      case node: Cast[G] => TypeValuesAndGenerics
+      case node: SubType[G] => TypeValuesAndGenerics
+      case node: SuperType[G] => TypeValuesAndGenerics
+      case node: TType[G] => TypeValuesAndGenerics
+      case node: TVar[G] => TypeValuesAndGenerics
+
+      case node: LocalDecl[G] => UnscopedDeclaration
+
+      case node: Wait[G] => WaitNotify
+      case node: Notify[G] => WaitNotify
+
+      case node: ReadPerm[G] => WildcardReadPermission
+
+      case node: AmbiguousComputationalAnd[G] =>
+        return AmbiguousOperators +:
+          (if (node.isBoolOp)
+             Seq(ComputationalLogicOperator)
+           else
+             Seq(BitOperators))
+      case node: AmbiguousComputationalOr[G] =>
+        return AmbiguousOperators +:
+          (if (node.isBoolOp)
+             Seq(ComputationalLogicOperator)
+           else
+             Seq(BitOperators))
+      case node: AmbiguousComputationalXor[G] =>
+        return AmbiguousOperators +:
+          (if (node.isBoolOp)
+             Seq(ComputationalLogicOperator)
+           else
+             Seq(BitOperators))
+      case node: AmbiguousMult[G] =>
+        return AmbiguousOperators +:
+          (if (node.isProcessOp)
+             Seq(Models)
+           else
+             Seq(SmtOperators))
+      case node: AmbiguousPlus[G] =>
+        return AmbiguousOperators +:
+          (if (node.isProcessOp)
+             Seq(Models)
+           else if (node.isPointerOp)
+             Seq(Pointers)
+           else
+             Seq(SmtOperators))
+      case node: AmbiguousMinus[G] => AmbiguousOperators
+      case node: AmbiguousOr[G] =>
+        return AmbiguousOperators +:
+          (if (node.isProcessOp)
+             Seq(Models)
+           else
+             Seq(SmtOperators))
+      case node: AmbiguousSubscript[G] =>
+        return AmbiguousOperators +:
+          (if (node.isPointerOp)
+             Seq(Pointers)
+           else if (node.isMapOp)
+             Seq(AxiomaticLibraryType)
+           else if (node.isArrayOp)
+             Seq(Arrays)
+           else
+             Seq(SilverAxiomaticLibraryType))
+      case node: AmbiguousMember[G] =>
+        return AmbiguousOperators +:
+          (if (node.isMapOp)
+             Seq(AxiomaticLibraryType)
+           else
+             Seq(SilverAxiomaticLibraryType))
+
+      case node: Return[G] =>
+        returnValues :+= node.result
+        if (node.result == Void[G]()(DiagnosticOrigin))
+          return Seq(Methods)
+        else
+          return Seq(NonVoidReturn, Methods)
+      case node: Branch[G] =>
+        node.branches match {
+          case Seq((_, _), (BooleanValue(true), _)) => BasicStatement
+          case _ => NonTrivialBranch
+        }
+      case node: Loop[G] =>
+        node match {
+          case Loop(Block(Nil), _, Block(Nil), _, _) => WhileLoops
+          case _ => NonWhileLoop
+        }
+      case node: Function[G] =>
+        return Seq(SmtDeclarations) ++
+          (if (node.inline)
+             Seq(ApplicableToBeInlined)
+           else
+             Nil) ++
+          (if (node.typeArgs.nonEmpty)
+             Seq(TypeValuesAndGenerics)
+           else
+             Nil)
+      case node: Procedure[G] =>
+        returnTypes :+= node.returnType
+        return Seq(Methods) ++
+          (if (node.inline)
+             Seq(ApplicableToBeInlined)
+           else
+             Nil) ++
+          (if (node.typeArgs.nonEmpty)
+             Seq(TypeValuesAndGenerics)
+           else
+             Nil) ++
+          (if (node.pure)
+             Seq(MethodToBePurified)
+           else
+             Nil)
+      case node: Predicate[G] =>
+        return Seq(Resources) ++
+          (if (node.inline)
+             Seq(ApplicableToBeInlined)
+           else
+             Nil)
+      case node: InstanceFunction[G] =>
+        return Seq(Classes) ++
+          (if (node.typeArgs.nonEmpty)
+             Seq(TypeValuesAndGenerics)
+           else
+             Nil) ++
+          (if (node.inline)
+             Seq(ApplicableToBeInlined)
+           else
+             Nil)
+      case node: InstanceMethod[G] =>
+        returnTypes :+= node.returnType
+        return Seq(Classes, Methods) ++
+          (if (node.typeArgs.nonEmpty)
+             Seq(TypeValuesAndGenerics)
+           else
+             Nil) ++
+          (if (node.inline)
+             Seq(ApplicableToBeInlined)
+           else
+             Nil) ++
+          (if (node.pure)
+             Seq(MethodToBePurified)
+           else
+             Nil)
+      case node: InstancePredicate[G] =>
+        return Seq(Classes) ++
+          (if (node.inline)
+             Seq(ApplicableToBeInlined)
+           else
+             Nil)
+      case node: Label[G] =>
+        node.stat match {
+          case Block(Nil) => Gotos
+          case _ => return Seq(NonTrivialLabel, Gotos)
+        }
+      case node: TVoid[G] =>
+        if (returnTypes.exists(_ eq node))
+          return Nil
+        else
+          AxiomaticLibraryType
+      case node: Void[G] =>
+        if (returnValues.exists(_ eq node))
+          return Nil
+        else
+          AxiomaticLibraryType
+
+      case node: ValidArray[G] => return Seq(SugarPermissionOperator, Arrays)
+      case node: ValidMatrix[G] => return Seq(SugarPermissionOperator, Arrays)
+      case node: PermPointer[G] => return Seq(SugarPermissionOperator, Pointers)
+      case node: PermPointerIndex[G] =>
+        return Seq(SugarPermissionOperator, Pointers)
+      case node: CLiteralArray[G] => return Seq(CSpecific, Arrays)
+      case node: CCast[G] => return Seq(CSpecific, TypeValuesAndGenerics)
+      case node: CChar[G] => return Seq(CSpecific, TextTypes)
+      case node: CDeclarationStatement[G] =>
+        return Seq(CSpecific, UnscopedDeclaration)
+      case node: CGoto[G] => return Seq(CSpecific, Gotos)
+      case node: CPointer[G] => return Seq(CSpecific, Pointers)
+      case node: CPointerDeclarator[G] => return Seq(CSpecific, Pointers)
+      case node: CPPLiteralArray[G] => return Seq(CPPSpecific, Arrays)
+      case node: CPPChar[G] => return Seq(CPPSpecific, TextTypes)
+      case node: CPPDeclarationStatement[G] =>
+        return Seq(CPPSpecific, UnscopedDeclaration)
+      case node: CPPPointer[G] => return Seq(CPPSpecific, Pointers)
+      case node: CPPReference[G] => return Seq(CPPSpecific, Pointers)
+      case node: Result[G] => return scanFlatly(node.applicable.decl)
+      case node: SilverNewRef[G] => return Seq(Assignment, Resources)
+
+      case _ => return Nil
+    })
 }
diff --git a/src/col/vct/col/origin/Blame.scala b/src/col/vct/col/origin/Blame.scala
index b4c003c562..068aa2f893 100644
--- a/src/col/vct/col/origin/Blame.scala
+++ b/src/col/vct/col/origin/Blame.scala
@@ -15,17 +15,23 @@ sealed trait ContractFailure {
 case class ContractFalse(node: Expr[_]) extends ContractFailure {
   override def code: String = "false"
   override def descCompletion: String = "this expression may be false"
-  override def inlineDescCompletion: String = s"${node.o.inlineContextText} may be false"
+  override def inlineDescCompletion: String =
+    s"${node.o.inlineContextText} may be false"
 }
-case class InsufficientPermissionToExhale(node: Expr[_]) extends ContractFailure {
+case class InsufficientPermissionToExhale(node: Expr[_])
+    extends ContractFailure {
   override def code: String = "perm"
-  override def descCompletion: String = "there might not be enough permission to exhale this amount"
-  override def inlineDescCompletion: String = s"there might be insufficient permission for ${node.o.inlineContextText}"
+  override def descCompletion: String =
+    "there might not be enough permission to exhale this amount"
+  override def inlineDescCompletion: String =
+    s"there might be insufficient permission for ${node.o.inlineContextText}"
 }
 case class NegativePermissionValue(node: Expr[_]) extends ContractFailure {
   override def code: String = "negativePermValue"
-  override def descCompletion: String = "the amount of permission in this permission predicate may be negative"
-  override def inlineDescCompletion: String = s"${node.o.inlineContextText} may be a negative permission amount"
+  override def descCompletion: String =
+    "the amount of permission in this permission predicate may be negative"
+  override def inlineDescCompletion: String =
+    s"${node.o.inlineContextText} may be a negative permission amount"
 }
 
 trait VerificationFailure {
@@ -51,16 +57,20 @@ object TableEntry {
     val result = new StringBuilder
 
     result.append("At").append(" ".repeat(posWidth - "At".length)).append(" ")
-    result.append("Code").append(" ".repeat(codeWidth - "Code".length)).append(" ")
-    result.append("Description").append(" ".repeat(descWidth - "Description".length)).append("\n")
+    result.append("Code").append(" ".repeat(codeWidth - "Code".length))
+      .append(" ")
+    result.append("Description")
+      .append(" ".repeat(descWidth - "Description".length)).append("\n")
 
     result.append("-" * posWidth).append(" ")
     result.append("-" * codeWidth).append(" ")
     result.append("-" * descWidth).append("\n")
 
-    for(entry <- entries) {
-      result.append(entry.position).append(" " * (posWidth - entry.position.length)).append(" ")
-      result.append(entry.code).append(" " * (codeWidth - entry.code.length)).append(" ")
+    for (entry <- entries) {
+      result.append(entry.position)
+        .append(" " * (posWidth - entry.position.length)).append(" ")
+      result.append(entry.code).append(" " * (codeWidth - entry.code.length))
+        .append(" ")
       result.append(entry.desc).append("\n")
     }
 
@@ -78,7 +88,8 @@ trait NodeVerificationFailure extends VerificationFailure {
 
   override def position: String = node.o.shortPositionText
   override def desc: String = node.o.messageInContext(descInContext + errUrl)
-  override def inlineDesc: String = inlineDescWithSource(node.o.inlineContextText)
+  override def inlineDesc: String =
+    inlineDescWithSource(node.o.inlineContextText)
 }
 
 trait WithContractFailure extends VerificationFailure {
@@ -107,96 +118,146 @@ sealed trait ExpectedErrorFailure extends VerificationFailure {
   def err: ExpectedError
 }
 
-case class ExpectedErrorTrippedTwice(err: ExpectedError, left: VerificationFailure, right: VerificationFailure) extends ExpectedErrorFailure {
+case class ExpectedErrorTrippedTwice(
+    err: ExpectedError,
+    left: VerificationFailure,
+    right: VerificationFailure,
+) extends ExpectedErrorFailure {
   override def code: String = "trippedTwice"
   override def position: String = err.errorRegion.shortPositionText
-  override def desc: String = err.errorRegion.messageInContext(s"The expected error with code `${err.errorCode}` occurred multiple times." + errUrl)
-  override def inlineDesc: String = s"The expected error with code `${err.errorCode}` occurred multiple times."
+  override def desc: String =
+    err.errorRegion.messageInContext(
+      s"The expected error with code `${err.errorCode}` occurred multiple times." +
+        errUrl
+    )
+  override def inlineDesc: String =
+    s"The expected error with code `${err.errorCode}` occurred multiple times."
 }
 
-case class ExpectedErrorNotTripped(err: ExpectedError) extends ExpectedErrorFailure {
+case class ExpectedErrorNotTripped(err: ExpectedError)
+    extends ExpectedErrorFailure {
   override def code: String = "notTripped"
   override def position: String = err.errorRegion.shortPositionText
-  override def desc: String = err.errorRegion.messageInContext(s"The expected error with code `${err.errorCode}` was not encountered." + errUrl)
-  override def inlineDesc: String = s"The expected error with code `${err.errorCode}` was not encountered."
+  override def desc: String =
+    err.errorRegion.messageInContext(
+      s"The expected error with code `${err.errorCode}` was not encountered." +
+        errUrl
+    )
+  override def inlineDesc: String =
+    s"The expected error with code `${err.errorCode}` was not encountered."
 }
 
 sealed trait AssignFailed extends NodeVerificationFailure
 
-case class AssignFieldFailed(node: SilverFieldAssign[_]) extends AssignFailed with NodeVerificationFailure {
+case class AssignFieldFailed(node: SilverFieldAssign[_])
+    extends AssignFailed with NodeVerificationFailure {
   override def code: String = "assignFieldFailed"
-  override def descInContext: String = "Insufficient permission to assign to field."
-  override def inlineDescWithSource(source: String): String = s"Insufficient permission for assignment `$source`."
+  override def descInContext: String =
+    "Insufficient permission to assign to field."
+  override def inlineDescWithSource(source: String): String =
+    s"Insufficient permission for assignment `$source`."
 }
 
-case class CopyStructFailed(node: Expr[_], field: String) extends AssignFailed with NodeVerificationFailure {
+case class CopyStructFailed(node: Expr[_], field: String)
+    extends AssignFailed with NodeVerificationFailure {
   override def code: String = "copyStructFailed"
-  override def descInContext: String = s"Insufficient read permission for field '$field' to copy struct."
-  override def inlineDescWithSource(source: String): String = s"Insufficient permission for assignment `$source`."
+  override def descInContext: String =
+    s"Insufficient read permission for field '$field' to copy struct."
+  override def inlineDescWithSource(source: String): String =
+    s"Insufficient permission for assignment `$source`."
 }
 
-case class CopyStructFailedBeforeCall(node: Expr[_], field: String) extends AssignFailed with FrontendInvocationError with NodeVerificationFailure {
+case class CopyStructFailedBeforeCall(node: Expr[_], field: String)
+    extends AssignFailed
+    with FrontendInvocationError
+    with NodeVerificationFailure {
   override def code: String = "copyStructFailedBeforeCall"
-  override def descInContext: String = s"Insufficient read permission for field '$field' to copy struct before call."
-  override def inlineDescWithSource(source: String): String = s"Insufficient permission for call `$source`."
+  override def descInContext: String =
+    s"Insufficient read permission for field '$field' to copy struct before call."
+  override def inlineDescWithSource(source: String): String =
+    s"Insufficient permission for call `$source`."
 }
 
-case class AssertFailed(failure: ContractFailure, node: Assert[_]) extends WithContractFailure {
+case class AssertFailed(failure: ContractFailure, node: Assert[_])
+    extends WithContractFailure {
   override def baseCode: String = "assertFailed"
   override def descInContext: String = "Assertion may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Assertion `$node` may fail, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Assertion `$node` may fail, since $failure."
 }
 case class RefuteFailed(node: Refute[_]) extends NodeVerificationFailure {
   override def code: String = "refuteFailed"
-  override def descInContext: String = "Assertion holds in all cases where it is reachable."
-  override def inlineDescWithSource(source: String): String = s"Assertion `$source` holds in all cases where it is reachable."
+  override def descInContext: String =
+    "Assertion holds in all cases where it is reachable."
+  override def inlineDescWithSource(source: String): String =
+    s"Assertion `$source` holds in all cases where it is reachable."
 }
-case class ExhaleFailed(failure: ContractFailure, node: Exhale[_]) extends WithContractFailure {
+case class ExhaleFailed(failure: ContractFailure, node: Exhale[_])
+    extends WithContractFailure {
   override def baseCode: String = "exhaleFailed"
   override def descInContext: String = "Exhale may fail, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may fail, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may fail, since $failure."
 }
-case class UnfoldFailed(failure: ContractFailure, node: Node[_]) extends WithContractFailure {
+case class UnfoldFailed(failure: ContractFailure, node: Node[_])
+    extends WithContractFailure {
   override def baseCode: String = "unfoldFailed"
   override def descInContext: String = "Unfold may fail, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may fail, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may fail, since $failure."
 }
-case class FoldFailed(failure: ContractFailure, node: Fold[_]) extends WithContractFailure {
+case class FoldFailed(failure: ContractFailure, node: Fold[_])
+    extends WithContractFailure {
   override def baseCode: String = "foldFailed"
   override def descInContext: String = "Fold may fail, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may fail, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may fail, since $failure."
 }
 trait PackageFailure extends VerificationFailure
-case class PackageThrows(node: WandPackage[_]) extends PackageFailure with NodeVerificationFailure {
+case class PackageThrows(node: WandPackage[_])
+    extends PackageFailure with NodeVerificationFailure {
   override def code: String = "packageThrows"
   override def descInContext: String = "Package proof may throw an exception"
-  override def inlineDescWithSource(source: String): String = s"`$node` may throw an exception."
+  override def inlineDescWithSource(source: String): String =
+    s"`$node` may throw an exception."
 }
-case class PackageFailed(failure: ContractFailure, node: WandPackage[_]) extends PackageFailure with WithContractFailure {
+case class PackageFailed(failure: ContractFailure, node: WandPackage[_])
+    extends PackageFailure with WithContractFailure {
   override def baseCode: String = "packageFailed"
   override def descInContext: String = "Package statement may fail, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may fail, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may fail, since $failure."
 }
-case class WandApplyFailed(failure: ContractFailure, node: WandApply[_]) extends WithContractFailure {
+case class WandApplyFailed(failure: ContractFailure, node: WandApply[_])
+    extends WithContractFailure {
   override def baseCode: String = "applyFailed"
   override def descInContext: String = "Wand apply may fail, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may fail, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may fail, since $failure."
 }
-case class SendFailed(failure: ContractFailure, node: Send[_]) extends WithContractFailure {
+case class SendFailed(failure: ContractFailure, node: Send[_])
+    extends WithContractFailure {
   override def baseCode: String = "sendFailed"
   override def descInContext: String = "Send may fail, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may fail, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may fail, since $failure."
 }
 sealed trait FramedProofFailure extends VerificationFailure
-case class FramedProofPreFailed(failure: ContractFailure, node: FramedProof[_]) extends FramedProofFailure with WithContractFailure {
+case class FramedProofPreFailed(failure: ContractFailure, node: FramedProof[_])
+    extends FramedProofFailure with WithContractFailure {
   override def baseCode: String = "framePre"
-  override def descInContext: String = "Precondition of framed statement may fail, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Precondition of `$node` may fail, since $failure."
+  override def descInContext: String =
+    "Precondition of framed statement may fail, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Precondition of `$node` may fail, since $failure."
 }
-case class FramedProofPostFailed(failure: ContractFailure, node: FramedProof[_]) extends FramedProofFailure with WithContractFailure {
+case class FramedProofPostFailed(failure: ContractFailure, node: FramedProof[_])
+    extends FramedProofFailure with WithContractFailure {
   override def baseCode: String = "framePost"
-  override def descInContext: String = "Postcondition of framed statement may fail, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Postcondition of `$node` may fail, since $failure."
+  override def descInContext: String =
+    "Postcondition of framed statement may fail, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Postcondition of `$node` may fail, since $failure."
 }
 
 sealed trait AccountedDirection
@@ -205,109 +266,178 @@ case object FailRight extends AccountedDirection
 
 sealed trait FrontendInvocationError extends VerificationFailure
 sealed trait InstanceInvocationFailure extends FrontendInvocationError
-case class InstanceNull(node: InvokingNode[_]) extends InstanceInvocationFailure with NodeVerificationFailure {
+case class InstanceNull(node: InvokingNode[_])
+    extends InstanceInvocationFailure with NodeVerificationFailure {
   override def code: String = "invocationObjectNull"
-  override def descInContext: String = "The object for this invocation may be null."
-  override def inlineDescWithSource(source: String): String = s"The object in the invocation `$source` may be null"
+  override def descInContext: String =
+    "The object for this invocation may be null."
+  override def inlineDescWithSource(source: String): String =
+    s"The object in the invocation `$source` may be null"
 }
 
 sealed trait InvocationFailure extends InstanceInvocationFailure
-case class PreconditionFailed(path: Seq[AccountedDirection], failure: ContractFailure, node: InvokingNode[_]) extends InvocationFailure with WithContractFailure {
+case class PreconditionFailed(
+    path: Seq[AccountedDirection],
+    failure: ContractFailure,
+    node: InvokingNode[_],
+) extends InvocationFailure with WithContractFailure {
   override def baseCode: String = "preFailed"
   override def descInContext: String = "Precondition may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Precondition of `$node` may not hold, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Precondition of `$node` may not hold, since $failure."
 }
-case class ContextEverywhereFailedInPre(failure: ContractFailure, node: InvokingNode[_]) extends InvocationFailure with WithContractFailure {
+case class ContextEverywhereFailedInPre(
+    failure: ContractFailure,
+    node: InvokingNode[_],
+) extends InvocationFailure with WithContractFailure {
   override def baseCode: String = "contextPreFailed"
-  override def descInContext: String = "Context may not hold in precondition, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Context of `$node` may not hold in the precondition, since $failure."
+  override def descInContext: String =
+    "Context may not hold in precondition, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Context of `$node` may not hold in the precondition, since $failure."
 }
-case class SYCLItemMethodPreconditionFailed(node: InvokingNode[_]) extends NodeVerificationFailure with FrontendInvocationError {
+case class SYCLItemMethodPreconditionFailed(node: InvokingNode[_])
+    extends NodeVerificationFailure with FrontendInvocationError {
   override def code: String = "syclItemMethodPreFailed"
   override def position: String = node.o.shortPositionText
-  override def descInContext: String = "The dimension parameter should be greater or equal to zero and smaller than the number of dimensions in the (nd_)item."
+  override def descInContext: String =
+    "The dimension parameter should be greater or equal to zero and smaller than the number of dimensions in the (nd_)item."
   override def inlineDescWithSource(source: String): String =
     s"The dimension parameter `$source` should be greater or equal to zero and smaller than the number of dimensions in the (nd_)item."
 }
 
-sealed trait CallableFailure extends ConstructorFailure with JavaConstructorFailure
+sealed trait CallableFailure
+    extends ConstructorFailure with JavaConstructorFailure
 sealed trait ContractedFailure extends CallableFailure
-case class PostconditionFailed(path: Seq[AccountedDirection], failure: ContractFailure, node: ContractApplicable[_]) extends ContractedFailure with SeqCallableFailure with WithContractFailure {
+case class PostconditionFailed(
+    path: Seq[AccountedDirection],
+    failure: ContractFailure,
+    node: ContractApplicable[_],
+) extends ContractedFailure with SeqCallableFailure with WithContractFailure {
   override def baseCode: String = "postFailed"
   override def descInContext: String = "Postcondition may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Postcondition of `$node` may not hold, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Postcondition of `$node` may not hold, since $failure."
 }
-case class TerminationMeasureFailed(applicable: ContractApplicable[_], apply: Invocation[_], measure: DecreasesClause[_]) extends ContractedFailure with SeqCallableFailure with VerificationFailure {
+case class TerminationMeasureFailed(
+    applicable: ContractApplicable[_],
+    apply: Invocation[_],
+    measure: DecreasesClause[_],
+) extends ContractedFailure with SeqCallableFailure with VerificationFailure {
   override def code: String = "decreasesFailed"
   override def position: String = measure.o.shortPositionText
-  override def desc: String = Message.messagesInContext(
-    applicable.o -> "Applicable may not terminate, since ...",
-    apply.o -> "... from this invocation ...",
-    measure.o -> "... this measure may not be bounded, or may not decrease.",
-  )
+  override def desc: String =
+    Message.messagesInContext(
+      applicable.o -> "Applicable may not terminate, since ...",
+      apply.o -> "... from this invocation ...",
+      measure.o -> "... this measure may not be bounded, or may not decrease.",
+    )
   override def inlineDesc: String =
     s"${apply.o.inlineContextText} may not terminate, since `${measure.o.inlineContextText}` is not decreased or not bounded"
 }
-case class ContextEverywhereFailedInPost(failure: ContractFailure, node: ContractApplicable[_]) extends ContractedFailure with SeqCallableFailure with WithContractFailure {
+case class ContextEverywhereFailedInPost(
+    failure: ContractFailure,
+    node: ContractApplicable[_],
+) extends ContractedFailure with SeqCallableFailure with WithContractFailure {
   override def baseCode: String = "contextPostFailed"
-  override def descInContext: String = "Context may not hold in postcondition, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Context of `$node` may not hold in the postcondition, since $failure."
+  override def descInContext: String =
+    "Context may not hold in postcondition, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Context of `$node` may not hold in the postcondition, since $failure."
 }
-case class AutoValueLeakCheckFailed(failure: ContractFailure, node: ContractApplicable[_]) extends ContractedFailure with SeqCallableFailure with WithContractFailure {
+case class AutoValueLeakCheckFailed(
+    failure: ContractFailure,
+    node: ContractApplicable[_],
+) extends ContractedFailure with SeqCallableFailure with WithContractFailure {
   override def baseCode: String = "autoValueLeak"
   override def descInContext: String = "The AutoValue leak check failed, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Some of the permission from `$node` was leaked before the postcondition was evaluated, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Some of the permission from `$node` was leaked before the postcondition was evaluated, since $failure."
 }
-case class SignalsFailed(failure: ContractFailure, node: AbstractMethod[_]) extends CallableFailure with WithContractFailure {
+case class SignalsFailed(failure: ContractFailure, node: AbstractMethod[_])
+    extends CallableFailure with WithContractFailure {
   override def baseCode: String = "signalsFailed"
   override def descInContext: String = "Signals clause may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Signals clause of `$node` may not hold, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Signals clause of `$node` may not hold, since $failure."
 }
-case class ExceptionNotInSignals(node: AbstractMethod[_]) extends CallableFailure with NodeVerificationFailure {
+case class ExceptionNotInSignals(node: AbstractMethod[_])
+    extends CallableFailure with NodeVerificationFailure {
   override def code: String = "extraExc"
-  override def descInContext: String = "Method may throw exception not included in signals clauses."
-  override def inlineDescWithSource(source: String): String = s"Method `$source` may throw exception not included in signals clauses."
+  override def descInContext: String =
+    "Method may throw exception not included in signals clauses."
+  override def inlineDescWithSource(source: String): String =
+    s"Method `$source` may throw exception not included in signals clauses."
 }
-case class SeqRunPreconditionFailed(path: Seq[AccountedDirection], failure: ContractFailure, node: ChorRun[_]) extends SeqRunFailure with WithContractFailure {
+case class SeqRunPreconditionFailed(
+    path: Seq[AccountedDirection],
+    failure: ContractFailure,
+    node: ChorRun[_],
+) extends SeqRunFailure with WithContractFailure {
   override def baseCode: String = "seqRunPreFailed"
   override def descInContext: String = "Precondition may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Precondition of `$node` may not hold, since $failure."
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Precondition of `$node` may not hold, since $failure."
 }
-case class SeqRunContextEverywhereFailedInPre(failure: ContractFailure, node: ChorRun[_]) extends SeqRunFailure with WithContractFailure {
+case class SeqRunContextEverywhereFailedInPre(
+    failure: ContractFailure,
+    node: ChorRun[_],
+) extends SeqRunFailure with WithContractFailure {
   override def baseCode: String = "seqRunContextPreFailed"
-  override def descInContext: String = "Context may not hold in precondition, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Context of `$node` may not hold in the precondition, since $failure."
+  override def descInContext: String =
+    "Context may not hold in precondition, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Context of `$node` may not hold in the precondition, since $failure."
 }
-case class SYCLKernelLambdaFailure(kernelFailure: KernelFailure) extends VerificationFailure {
+case class SYCLKernelLambdaFailure(kernelFailure: KernelFailure)
+    extends VerificationFailure {
   override def code: String = "syclKernelLambda" + kernelFailure.code.capitalize
   override def position: String = kernelFailure.position
   override def desc: String = kernelFailure.desc
   override def inlineDesc: String = kernelFailure.inlineDesc
 }
 sealed trait LoopInvariantFailure extends VerificationFailure
-case class LoopInvariantNotEstablished(failure: ContractFailure, node: LoopInvariant[_]) extends LoopInvariantFailure with WithContractFailure {
+case class LoopInvariantNotEstablished(
+    failure: ContractFailure,
+    node: LoopInvariant[_],
+) extends LoopInvariantFailure with WithContractFailure {
   override def baseCode: String = "invariantNotEstablished"
-  override def descInContext: String = "This invariant may not be established, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Invariant of `$node` may not be established, since $failure."
+  override def descInContext: String =
+    "This invariant may not be established, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Invariant of `$node` may not be established, since $failure."
 }
-case class LoopInvariantNotMaintained(failure: ContractFailure, node: LoopInvariant[_]) extends LoopInvariantFailure with WithContractFailure {
+case class LoopInvariantNotMaintained(
+    failure: ContractFailure,
+    node: LoopInvariant[_],
+) extends LoopInvariantFailure with WithContractFailure {
   override def baseCode: String = "notMaintained"
-  override def descInContext: String = "This invariant may not be maintained, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Invariant of `$node` may not be maintained, since $failure."
+  override def descInContext: String =
+    "This invariant may not be maintained, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Invariant of `$node` may not be maintained, since $failure."
 }
-case class LoopTerminationMeasureFailed(node: DecreasesClause[_]) extends LoopInvariantFailure with NodeVerificationFailure {
+case class LoopTerminationMeasureFailed(node: DecreasesClause[_])
+    extends LoopInvariantFailure with NodeVerificationFailure {
   override def code: String = "loopDecreasesFailed"
   override def position: String = node.o.shortPositionText
-  override def descInContext: String = "Loop may not terminate, since this measure may not be bounded, or may not decrease."
-  override def inlineDescWithSource(source: String): String = s"Loop may not terminate, since ${node.o.inlineContextText} may be unbounded or nondecreasing"
+  override def descInContext: String =
+    "Loop may not terminate, since this measure may not be bounded, or may not decrease."
+  override def inlineDescWithSource(source: String): String =
+    s"Loop may not terminate, since ${node.o.inlineContextText} may be unbounded or nondecreasing"
 }
-case class ReceiverNotInjective(quantifier: Starall[_], resource: Expr[_]) extends VerificationFailure with AnyStarError {
+case class ReceiverNotInjective(quantifier: Starall[_], resource: Expr[_])
+    extends VerificationFailure with AnyStarError {
   override def code: String = "notInjective"
-  override def desc: String = Message.messagesInContext(
-    quantifier.o -> "This quantifier causes the resources in its body to be quantified, ...",
-    resource.o   -> "... but this resource may not be unique with regards to the quantified variables.",
-  )
-  override def inlineDesc: String = s"The location of the permission predicate in ${resource.o.inlineContextText} may not be unique with regards to the quantified variables."
+  override def desc: String =
+    Message.messagesInContext(
+      quantifier.o ->
+        "This quantifier causes the resources in its body to be quantified, ...",
+      resource.o ->
+        "... but this resource may not be unique with regards to the quantified variables.",
+    )
+  override def inlineDesc: String =
+    s"The location of the permission predicate in ${resource.o.inlineContextText} may not be unique with regards to the quantified variables."
 
   override def position: String = resource.o.shortPositionText
 }
@@ -316,205 +446,299 @@ sealed trait DivByZero extends NodeVerificationFailure
 case class ScalarDivByZero(node: DividingExpr[_]) extends DivByZero {
   override def code: String = "divByZero"
   override def descInContext: String = "The divisor may be zero."
-  override def inlineDescWithSource(source: String): String = s"The divisor in `$source` may be zero."
+  override def inlineDescWithSource(source: String): String =
+    s"The divisor in `$source` may be zero."
 }
 
 case class VectorDivByZero(node: DividingExpr[_], i: Int) extends DivByZero {
   override def code: String = "vectorDivByZero"
-  override def descInContext: String = f"Element $i of the divisor vector may be zero."
-  override def inlineDescWithSource(source: String): String = s"Element $i of the divisor vector in `$source` may be zero."
+  override def descInContext: String =
+    f"Element $i of the divisor vector may be zero."
+  override def inlineDescWithSource(source: String): String =
+    s"Element $i of the divisor vector in `$source` may be zero."
 }
 
 sealed trait FrontendDerefError extends VerificationFailure
 sealed trait FrontendAdditiveError extends VerificationFailure
 sealed trait FrontendSubscriptError extends VerificationFailure
 
-case class PlusProviderNull(node: Node[_]) extends FrontendAdditiveError with NodeVerificationFailure {
+case class PlusProviderNull(node: Node[_])
+    extends FrontendAdditiveError with NodeVerificationFailure {
   override def code: String = "plusProviderNull"
-  override def descInContext: String = "This expression might be null, which is prohibited because it is the subject of a custom plus operation."
-  override def inlineDescWithSource(source: String): String = s"The expression in $source might be null, which is prohibited for a custom plus operation."
+  override def descInContext: String =
+    "This expression might be null, which is prohibited because it is the subject of a custom plus operation."
+  override def inlineDescWithSource(source: String): String =
+    s"The expression in $source might be null, which is prohibited for a custom plus operation."
 }
 
-case class PlusProviderInvocationFailed(innerFailure: WithContractFailure) extends FrontendAdditiveError with WithContractFailure {
+case class PlusProviderInvocationFailed(innerFailure: WithContractFailure)
+    extends FrontendAdditiveError with WithContractFailure {
   override def failure: ContractFailure = innerFailure.failure
   override def code: String = failure.code
   override def node: Node[_] = innerFailure.node
   override def baseCode: String = innerFailure.baseCode
   override def descInContext: String = innerFailure.descInContext
-  override def inlineDescWithSource(node: String, failure: String): String = innerFailure.inlineDescWithSource(node, failure)
+  override def inlineDescWithSource(node: String, failure: String): String =
+    innerFailure.inlineDescWithSource(node, failure)
 }
 
 sealed trait SeqCallableFailure extends VerificationFailure
 sealed trait SeqRunFailure extends SeqCallableFailure
 
 sealed trait EndpointFailure extends VerificationFailure
-case class EndpointPreconditionFailed(path: Seq[AccountedDirection], failure: ContractFailure, node: Endpoint[_]) extends EndpointFailure with WithContractFailure {
+case class EndpointPreconditionFailed(
+    path: Seq[AccountedDirection],
+    failure: ContractFailure,
+    node: Endpoint[_],
+) extends EndpointFailure with WithContractFailure {
   override def baseCode: String = "endpointPreFailed"
-  override def descInContext: String = "Precondition of constructor of this endpoint may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Precondition of `$node` may not hold, since $failure."
+  override def descInContext: String =
+    "Precondition of constructor of this endpoint may not hold, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Precondition of `$node` may not hold, since $failure."
 }
-case class EndpointContextEverywhereFailedInPre(failure: ContractFailure, node: Endpoint[_]) extends EndpointFailure with WithContractFailure {
+case class EndpointContextEverywhereFailedInPre(
+    failure: ContractFailure,
+    node: Endpoint[_],
+) extends EndpointFailure with WithContractFailure {
   override def baseCode: String = "endpointContextPreFailed"
-  override def descInContext: String = "Context may not hold in precondition of endpoint constructor, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"Context of `$node` may not hold in the precondition, since $failure."
+  override def descInContext: String =
+    "Context may not hold in precondition of endpoint constructor, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"Context of `$node` may not hold in the precondition, since $failure."
 }
 
 sealed trait FrontendIfFailure extends VerificationFailure
 sealed trait SeqBranchFailure extends FrontendIfFailure
 
-case class BranchUnanimityFailed(guard1: Node[_], guard2: Node[_]) extends SeqBranchFailure {
+case class BranchUnanimityFailed(guard1: Node[_], guard2: Node[_])
+    extends SeqBranchFailure {
   override def code: String = "branchNotUnanimous"
 
-  override def desc: String = Message.messagesInContext(
-    (guard1.o, "This condition..."),
-    (guard2.o, "...should agree with this condition, but this might not be the case")
-  )
+  override def desc: String =
+    Message.messagesInContext(
+      (guard1.o, "This condition..."),
+      (
+        guard2.o,
+        "...should agree with this condition, but this might not be the case",
+      ),
+    )
 
   override def position: String = guard1.o.shortPositionText
-  override def inlineDesc: String = "Two conditions in this branch might disagree."
+  override def inlineDesc: String =
+    "Two conditions in this branch might disagree."
 }
 
 sealed trait FrontEndLoopFailure extends VerificationFailure
 sealed trait SeqLoopFailure extends FrontEndLoopFailure
 
-case class LoopUnanimityNotEstablished(guard1: Node[_], guard2: Node[_]) extends SeqLoopFailure {
+case class LoopUnanimityNotEstablished(guard1: Node[_], guard2: Node[_])
+    extends SeqLoopFailure {
   override def code: String = "loopUnanimityNotEstablished"
 
-  override def desc: String = Message.messagesInContext(
-    (guard1.o, "This condition..."),
-    (guard2.o, "...should agree with this condition, but this could not be established before the loop.")
-  )
+  override def desc: String =
+    Message.messagesInContext(
+      (guard1.o, "This condition..."),
+      (
+        guard2.o,
+        "...should agree with this condition, but this could not be established before the loop.",
+      ),
+    )
 
   override def position: String = guard1.o.shortPositionText
-  override def inlineDesc: String = "The agreement of two conditions in this branch could not be established before the loop."
+  override def inlineDesc: String =
+    "The agreement of two conditions in this branch could not be established before the loop."
 }
 
-case class LoopUnanimityNotMaintained(guard1: Node[_], guard2: Node[_]) extends SeqLoopFailure {
+case class LoopUnanimityNotMaintained(guard1: Node[_], guard2: Node[_])
+    extends SeqLoopFailure {
   override def code: String = "loopUnanimityNotMaintained"
 
-  override def desc: String = Message.messagesInContext(
-    (guard1.o, "This condition..."),
-    (guard2.o, "...should agree with this condition, but this could not be maintained for an arbitrary loop iteration.")
-  )
+  override def desc: String =
+    Message.messagesInContext(
+      (guard1.o, "This condition..."),
+      (
+        guard2.o,
+        "...should agree with this condition, but this could not be maintained for an arbitrary loop iteration.",
+      ),
+    )
 
   override def position: String = guard1.o.shortPositionText
-  override def inlineDesc: String = "The agreement of two conditions in this branch could not be maintained for an arbitrary loop iteration."
+  override def inlineDesc: String =
+    "The agreement of two conditions in this branch could not be maintained for an arbitrary loop iteration."
 }
 
 sealed trait ChorStatementFailure extends VerificationFailure
 sealed trait ChorAssignFailure extends ChorStatementFailure
 
-case class SeqAssignInsufficientPermission(node: ChorStatement[_]) extends ChorAssignFailure with NodeVerificationFailure {
+case class SeqAssignInsufficientPermission(node: ChorStatement[_])
+    extends ChorAssignFailure with NodeVerificationFailure {
   override def code: String = "seqAssignPerm"
-  override def descInContext: String = "There may be insufficient permission to access this field on this endpoint."
-  override def inlineDescWithSource(source: String): String = s"There may be insufficient permission to access `$source`."
+  override def descInContext: String =
+    "There may be insufficient permission to access this field on this endpoint."
+  override def inlineDescWithSource(source: String): String =
+    s"There may be insufficient permission to access `$source`."
 }
 
 sealed trait PVLCommunicateFailure extends VerificationFailure
 sealed trait CommunicateFailure extends PVLCommunicateFailure
 
-case class ParticipantsNotDistinct(node: Communicate[_]) extends CommunicateFailure with NodeVerificationFailure {
+case class ParticipantsNotDistinct(node: Communicate[_])
+    extends CommunicateFailure with NodeVerificationFailure {
   override def code: String = "participantsNotDistinct"
-  override def descInContext: String = "The participants in this communicate statement might not be distinct."
-  override def inlineDescWithSource(source: String): String = s"The participants of `$source` might not be distinct."
+  override def descInContext: String =
+    "The participants in this communicate statement might not be distinct."
+  override def inlineDescWithSource(source: String): String =
+    s"The participants of `$source` might not be distinct."
 }
 
 sealed trait DerefInsufficientPermission extends FrontendDerefError
-case class InsufficientPermission(node: HeapDeref[_]) extends DerefInsufficientPermission with NodeVerificationFailure {
+case class InsufficientPermission(node: HeapDeref[_])
+    extends DerefInsufficientPermission with NodeVerificationFailure {
   override def code: String = "perm"
-  override def descInContext: String = "There may be insufficient permission to access this field here."
-  override def inlineDescWithSource(source: String): String = s"There may be insufficient permission to access `$source`."
+  override def descInContext: String =
+    "There may be insufficient permission to access this field here."
+  override def inlineDescWithSource(source: String): String =
+    s"There may be insufficient permission to access `$source`."
 }
-case class ModelInsufficientPermission(node: ModelDeref[_]) extends DerefInsufficientPermission with NodeVerificationFailure {
+case class ModelInsufficientPermission(node: ModelDeref[_])
+    extends DerefInsufficientPermission with NodeVerificationFailure {
   override def code: String = "modelPerm"
-  override def descInContext: String = "There may be insufficient permission to access this model field here."
-  override def inlineDescWithSource(source: String): String = s"There may be insufficient permission to access `$source`."
+  override def descInContext: String =
+    "There may be insufficient permission to access this model field here."
+  override def inlineDescWithSource(source: String): String =
+    s"There may be insufficient permission to access `$source`."
 }
 case class LabelNotReached(node: Old[_]) extends NodeVerificationFailure {
   override def code: String = "notReached"
-  override def descInContext: String = "The label mentioned in this old expression may not have been reached at the time the old expression is evaluated."
-  override def inlineDescWithSource(source: String): String = s"The label in `$source` may not have been reached at the time the old expression is evaluated."
+  override def descInContext: String =
+    "The label mentioned in this old expression may not have been reached at the time the old expression is evaluated."
+  override def inlineDescWithSource(source: String): String =
+    s"The label in `$source` may not have been reached at the time the old expression is evaluated."
 }
 sealed trait SeqBoundFailure extends FrontendSubscriptError with BuiltinError
-case class SeqBoundNegative(node: SeqSubscript[_]) extends SeqBoundFailure with NodeVerificationFailure {
+case class SeqBoundNegative(node: SeqSubscript[_])
+    extends SeqBoundFailure with NodeVerificationFailure {
   override def code: String = "indexNegative"
-  override def descInContext: String = "The index in this sequence subscript may be negative."
-  override def inlineDescWithSource(source: String): String = s"The index in `$source` may be negative."
+  override def descInContext: String =
+    "The index in this sequence subscript may be negative."
+  override def inlineDescWithSource(source: String): String =
+    s"The index in `$source` may be negative."
 }
-case class SeqBoundExceedsLength(node: SeqSubscript[_]) extends SeqBoundFailure with NodeVerificationFailure {
+case class SeqBoundExceedsLength(node: SeqSubscript[_])
+    extends SeqBoundFailure with NodeVerificationFailure {
   override def code: String = "indexExceedsLength"
-  override def descInContext: String = "The index in this sequence subscript may exceed the length of the sequence."
-  override def inlineDescWithSource(source: String): String = s"The index in `$source` may exceed the length of the sequence."
+  override def descInContext: String =
+    "The index in this sequence subscript may exceed the length of the sequence."
+  override def inlineDescWithSource(source: String): String =
+    s"The index in `$source` may exceed the length of the sequence."
 }
 case class SetEmpty(node: Expr[_]) extends NodeVerificationFailure {
   override def code: String = "setEmpty"
   override def descInContext: String = "This set may be empty."
-  override def inlineDescWithSource(source: String): String = s"`$source` may be empty."
+  override def inlineDescWithSource(source: String): String =
+    s"`$source` may be empty."
 }
 
 sealed trait VectorBoundFailure extends FrontendSubscriptError with BuiltinError
-case class VectorBoundNegative(node: Expr[_]) extends VectorBoundFailure with NodeVerificationFailure {
+case class VectorBoundNegative(node: Expr[_])
+    extends VectorBoundFailure with NodeVerificationFailure {
   override def code: String = "vecIndexNegative"
-  override def descInContext: String = "The index in this vector subscript may be negative."
-  override def inlineDescWithSource(source: String): String = s"The index in `$source` may be negative."
+  override def descInContext: String =
+    "The index in this vector subscript may be negative."
+  override def inlineDescWithSource(source: String): String =
+    s"The index in `$source` may be negative."
 }
-case class VectorBoundExceedsLength(node: Expr[_]) extends VectorBoundFailure with NodeVerificationFailure {
+case class VectorBoundExceedsLength(node: Expr[_])
+    extends VectorBoundFailure with NodeVerificationFailure {
   override def code: String = "vecIndexExceedsLength"
-  override def descInContext: String = "The index in this vector subscript may exceed the length of the vector."
-  override def inlineDescWithSource(source: String): String = s"The index in `$source` may exceed the length of the vector."
+  override def descInContext: String =
+    "The index in this vector subscript may exceed the length of the vector."
+  override def inlineDescWithSource(source: String): String =
+    s"The index in `$source` may exceed the length of the vector."
 }
 
-
 sealed trait ForkFailure extends VerificationFailure
-case class ForkNull(node: Fork[_]) extends ForkFailure with NodeVerificationFailure {
+case class ForkNull(node: Fork[_])
+    extends ForkFailure with NodeVerificationFailure {
   override def code: String = "forkNull"
   override def descInContext: String = "This runnable may be null."
-  override def inlineDescWithSource(source: String): String = s"The runnable in `$source` may be null."
+  override def inlineDescWithSource(source: String): String =
+    s"The runnable in `$source` may be null."
 }
-case class RunnableNotIdle(node: Fork[_]) extends ForkFailure with NodeVerificationFailure {
+case class RunnableNotIdle(node: Fork[_])
+    extends ForkFailure with NodeVerificationFailure {
   override def code: String = "running"
-  override def descInContext: String = "This runnable may not be idle. (Hint: make sure the constructor ensures idle(this))"
-  override def inlineDescWithSource(source: String): String = s"The runnable in `$source` may not be idle."
+  override def descInContext: String =
+    "This runnable may not be idle. (Hint: make sure the constructor ensures idle(this))"
+  override def inlineDescWithSource(source: String): String =
+    s"The runnable in `$source` may not be idle."
 }
-case class RunnablePreconditionNotEstablished(node: Fork[_], failure: ContractFailure) extends ForkFailure with WithContractFailure {
+case class RunnablePreconditionNotEstablished(
+    node: Fork[_],
+    failure: ContractFailure,
+) extends ForkFailure with WithContractFailure {
   override def baseCode: String = "forkPre"
-  override def descInContext: String = "The precondition of the runnable may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The precondition of the runnable in `$node` may not hold, since $failure."
+  override def descInContext: String =
+    "The precondition of the runnable may not hold, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The precondition of the runnable in `$node` may not hold, since $failure."
 }
 sealed trait JoinFailure extends VerificationFailure
-case class JoinNull(node: Join[_]) extends JoinFailure with NodeVerificationFailure {
+case class JoinNull(node: Join[_])
+    extends JoinFailure with NodeVerificationFailure {
   override def code: String = "joinNull"
   override def descInContext: String = "This runnable may be null."
-  override def inlineDescWithSource(source: String): String = s"The runnable in `$source` may be null."
+  override def inlineDescWithSource(source: String): String =
+    s"The runnable in `$source` may be null."
 }
-case class RunnableNotRunning(node: Join[_]) extends JoinFailure with NodeVerificationFailure {
+case class RunnableNotRunning(node: Join[_])
+    extends JoinFailure with NodeVerificationFailure {
   override def code: String = "idle"
   override def descInContext: String = "This runnable may not be running."
-  override def inlineDescWithSource(source: String): String = s"The runnable in `$source` may not be running."
+  override def inlineDescWithSource(source: String): String =
+    s"The runnable in `$source` may not be running."
 }
 
 sealed trait KernelFailure extends VerificationFailure
-case class KernelPostconditionFailed(failure: ContractFailure, eitherNode: Either[CGpgpuKernelSpecifier[_], CPPLambdaDefinition[_]]) extends KernelFailure with WithContractFailure {
+case class KernelPostconditionFailed(
+    failure: ContractFailure,
+    eitherNode: Either[CGpgpuKernelSpecifier[_], CPPLambdaDefinition[_]],
+) extends KernelFailure with WithContractFailure {
   override def baseCode: String = "postFailed"
-  override def descInContext: String = "The postcondition of this kernel may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The postcondition of `$node` may not hold, since $failure."
-  override def node: Node[_] = eitherNode match {
-    case Left(cgpuKernelSpec) => cgpuKernelSpec
-    case Right(cppLambdaDef) => cppLambdaDef
-  }
+  override def descInContext: String =
+    "The postcondition of this kernel may not hold, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The postcondition of `$node` may not hold, since $failure."
+  override def node: Node[_] =
+    eitherNode match {
+      case Left(cgpuKernelSpec) => cgpuKernelSpec
+      case Right(cppLambdaDef) => cppLambdaDef
+    }
 }
-case class KernelPredicateNotInjective(kernel: Either[CGpgpuKernelSpecifier[_], CPPLambdaDefinition[_]], predicate: Expr[_]) extends KernelFailure {
+case class KernelPredicateNotInjective(
+    kernel: Either[CGpgpuKernelSpecifier[_], CPPLambdaDefinition[_]],
+    predicate: Expr[_],
+) extends KernelFailure {
   override def code: String = "kernelNotInjective"
   override def position: String = predicate.o.shortPositionText
 
   override def desc: String = {
-    val kernelOrigin = kernel match {
-      case Left(cgpuKernelSpec) => cgpuKernelSpec.o
-      case Right(cppLambdaDef) => cppLambdaDef.o
-    }
+    val kernelOrigin =
+      kernel match {
+        case Left(cgpuKernelSpec) => cgpuKernelSpec.o
+        case Right(cppLambdaDef) => cppLambdaDef.o
+      }
     Message.messagesInContext(
-      (kernelOrigin, "This kernel causes the formulas in its body to be quantified over all threads, ..."),
-      (predicate.o, "... but this expression could not be simplified, and the Perm location is not injective in the thread variables." + errUrl),
+      (
+        kernelOrigin,
+        "This kernel causes the formulas in its body to be quantified over all threads, ...",
+      ),
+      (
+        predicate.o,
+        "... but this expression could not be simplified, and the Perm location is not injective in the thread variables." +
+          errUrl,
+      ),
     )
   }
 
@@ -523,62 +747,111 @@ case class KernelPredicateNotInjective(kernel: Either[CGpgpuKernelSpecifier[_],
 }
 
 sealed trait KernelBarrierFailure extends VerificationFailure
-case class KernelBarrierNotEstablished(failure: ContractFailure, node: GpgpuBarrier[_]) extends KernelBarrierFailure with WithContractFailure {
+case class KernelBarrierNotEstablished(
+    failure: ContractFailure,
+    node: GpgpuBarrier[_],
+) extends KernelBarrierFailure with WithContractFailure {
   override def baseCode: String = "notEstablished"
-  override def descInContext: String = "The precondition of this barrier may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The precondition of `$node` may not hold, since $failure."
+  override def descInContext: String =
+    "The precondition of this barrier may not hold, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The precondition of `$node` may not hold, since $failure."
 }
-case class KernelBarrierInconsistent(failure: ContractFailure, node: GpgpuBarrier[_]) extends KernelBarrierFailure with WithContractFailure {
+case class KernelBarrierInconsistent(
+    failure: ContractFailure,
+    node: GpgpuBarrier[_],
+) extends KernelBarrierFailure with WithContractFailure {
   override def baseCode: String = "inconsistent"
-  override def descInContext: String = "The precondition of this barrier is not consistent with the postcondition, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The precondition of `$node` is not consistent with its postcondition, since $failure."
+  override def descInContext: String =
+    "The precondition of this barrier is not consistent with the postcondition, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The precondition of `$node` is not consistent with its postcondition, since $failure."
 }
-case class KernelBarrierInvariantBroken(failure: ContractFailure, node: GpgpuBarrier[_]) extends KernelBarrierFailure with WithContractFailure {
+case class KernelBarrierInvariantBroken(
+    failure: ContractFailure,
+    node: GpgpuBarrier[_],
+) extends KernelBarrierFailure with WithContractFailure {
   override def baseCode: String = "barrierInvariant"
-  override def descInContext: String = "The barrier may not re-establish the used invariants, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may not re-established the used invariants, since $failure."
+  override def descInContext: String =
+    "The barrier may not re-establish the used invariants, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may not re-established the used invariants, since $failure."
 }
 
-case class ParInvariantNotEstablished(failure: ContractFailure, node: ParInvariant[_]) extends WithContractFailure {
+case class ParInvariantNotEstablished(
+    failure: ContractFailure,
+    node: ParInvariant[_],
+) extends WithContractFailure {
   override def baseCode: String = "notEstablished"
-  override def descInContext: String = "This parallel invariant may not be established, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may not be established, since $failure."
+  override def descInContext: String =
+    "This parallel invariant may not be established, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may not be established, since $failure."
 }
-case class ParInvariantNotMaintained(failure: ContractFailure, node: ParAtomic[_]) extends WithContractFailure {
+case class ParInvariantNotMaintained(
+    failure: ContractFailure,
+    node: ParAtomic[_],
+) extends WithContractFailure {
   override def baseCode: String = "notMaintained"
-  override def descInContext: String = "The parallel invariant may not be maintained, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may not be maintained, since $failure."
+  override def descInContext: String =
+    "The parallel invariant may not be maintained, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may not be maintained, since $failure."
 }
 sealed trait ParBarrierFailure extends VerificationFailure
-case class ParBarrierNotEstablished(failure: ContractFailure, node: ParBarrier[_]) extends ParBarrierFailure with WithContractFailure {
+case class ParBarrierNotEstablished(
+    failure: ContractFailure,
+    node: ParBarrier[_],
+) extends ParBarrierFailure with WithContractFailure {
   override def baseCode: String = "notEstablished"
-  override def descInContext: String = "The precondition of this barrier may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The precondition of `$node` may not hold, since $failure."
+  override def descInContext: String =
+    "The precondition of this barrier may not hold, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The precondition of `$node` may not hold, since $failure."
 }
-case class ParBarrierInconsistent(failure: ContractFailure, node: ParBarrier[_]) extends ParBarrierFailure with WithContractFailure {
+case class ParBarrierInconsistent(failure: ContractFailure, node: ParBarrier[_])
+    extends ParBarrierFailure with WithContractFailure {
   override def baseCode: String = "inconsistent"
-  override def descInContext: String = "The precondition of this barrier is not consistent with the postcondition, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The precondition of `$node` is not consistent with its postcondition, since $failure."
+  override def descInContext: String =
+    "The precondition of this barrier is not consistent with the postcondition, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The precondition of `$node` is not consistent with its postcondition, since $failure."
 }
-case class ParBarrierMayNotThrow(node: ParBarrier[_]) extends ParBarrierFailure with NodeVerificationFailure {
+case class ParBarrierMayNotThrow(node: ParBarrier[_])
+    extends ParBarrierFailure with NodeVerificationFailure {
   override def code: String = "barrierThrows"
-  override def descInContext: String = "The proof hint for this barrier may throw an exception."
-  override def inlineDescWithSource(source: String): String = s"The proof hint of `$source` may throw an exception."
+  override def descInContext: String =
+    "The proof hint for this barrier may throw an exception."
+  override def inlineDescWithSource(source: String): String =
+    s"The proof hint of `$source` may throw an exception."
 }
-case class ParBarrierInvariantBroken(failure: ContractFailure, node: ParBarrier[_]) extends ParBarrierFailure with WithContractFailure {
+case class ParBarrierInvariantBroken(
+    failure: ContractFailure,
+    node: ParBarrier[_],
+) extends ParBarrierFailure with WithContractFailure {
   override def baseCode: String = "barrierInvariant"
-  override def descInContext: String = "The barrier may not re-establish the used invariants, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may not re-established the used invariants, since $failure."
+  override def descInContext: String =
+    "The barrier may not re-establish the used invariants, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may not re-established the used invariants, since $failure."
 }
 
 sealed trait ParBlockFailure extends VerificationFailure
-case class ParPredicateNotInjective(block: ParBlock[_], predicate: Expr[_]) extends ParBlockFailure {
+case class ParPredicateNotInjective(block: ParBlock[_], predicate: Expr[_])
+    extends ParBlockFailure {
   override def code: String = "parNotInjective"
   override def position: String = predicate.o.shortPositionText
   override def desc: String =
     Message.messagesInContext(
-      (block.o, "This parallel block causes the formulas in its body to be quantified over all threads, ..."),
-      (predicate.o, "... but this expression could not be simplified, and the Perm location is not injective in the thread variables." + errUrl),
+      (
+        block.o,
+        "This parallel block causes the formulas in its body to be quantified over all threads, ...",
+      ),
+      (
+        predicate.o,
+        "... but this expression could not be simplified, and the Perm location is not injective in the thread variables." +
+          errUrl,
+      ),
     )
 
   override def inlineDesc: String =
@@ -586,78 +859,117 @@ case class ParPredicateNotInjective(block: ParBlock[_], predicate: Expr[_]) exte
 }
 
 sealed trait ParBlockContractFailure extends ParBlockFailure
-case class ParPreconditionFailed(failure: ContractFailure, node: ParRegion[_]) extends ParBlockContractFailure with WithContractFailure {
+case class ParPreconditionFailed(failure: ContractFailure, node: ParRegion[_])
+    extends ParBlockContractFailure with WithContractFailure {
   override def baseCode: String = "parPreFailed"
-  override def descInContext: String = "The precondition of this parallel region may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The precondition of `$node` may not hold, since $failure."
+  override def descInContext: String =
+    "The precondition of this parallel region may not hold, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The precondition of `$node` may not hold, since $failure."
 }
-case class ParBlockPostconditionFailed(failure: ContractFailure, node: ParBlock[_]) extends ParBlockContractFailure with WithContractFailure {
+case class ParBlockPostconditionFailed(
+    failure: ContractFailure,
+    node: ParBlock[_],
+) extends ParBlockContractFailure with WithContractFailure {
   override def baseCode: String = "parPostFailed"
-  override def descInContext: String = "The postcondition of this parallel block may not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The postcondition of `$node` may not hold, since $failure."
+  override def descInContext: String =
+    "The postcondition of this parallel block may not hold, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The postcondition of `$node` may not hold, since $failure."
 }
-case class ParBlockMayNotThrow(node: ParBlock[_]) extends ParBlockContractFailure with NodeVerificationFailure {
+case class ParBlockMayNotThrow(node: ParBlock[_])
+    extends ParBlockContractFailure with NodeVerificationFailure {
   override def code: String = "parThrows"
-  override def descInContext: String = s"The body of this parallel block may throw an exception."
-  override def inlineDescWithSource(source: String): String = s"The body of `$source` may throw an exception."
+  override def descInContext: String =
+    s"The body of this parallel block may throw an exception."
+  override def inlineDescWithSource(source: String): String =
+    s"The body of `$source` may throw an exception."
 }
 
-sealed trait BuiltinError extends FrontendDerefError with FrontendInvocationError
-case class OptionNone(node: OptGet[_]) extends BuiltinError with NodeVerificationFailure {
+sealed trait BuiltinError
+    extends FrontendDerefError with FrontendInvocationError
+case class OptionNone(node: OptGet[_])
+    extends BuiltinError with NodeVerificationFailure {
   override def code: String = "optNone"
   override def descInContext: String = "Option may be empty."
-  override def inlineDescWithSource(source: String): String = s"Option in `$source` may be empty."
+  override def inlineDescWithSource(source: String): String =
+    s"Option in `$source` may be empty."
 }
-case class NotRight(node: GetRight[_]) extends BuiltinError with NodeVerificationFailure {
+case class NotRight(node: GetRight[_])
+    extends BuiltinError with NodeVerificationFailure {
   override def code: String = "left"
   override def descInContext: String = "Either may be left."
-  override def inlineDescWithSource(source: String): String = s"Either in `$source` may be left."
+  override def inlineDescWithSource(source: String): String =
+    s"Either in `$source` may be left."
 }
-case class NotLeft(node: GetLeft[_]) extends BuiltinError with NodeVerificationFailure {
+case class NotLeft(node: GetLeft[_])
+    extends BuiltinError with NodeVerificationFailure {
   override def code: String = "right"
   override def descInContext: String = "Either may be right."
-  override def inlineDescWithSource(source: String): String = s"Either in `$source` may be right."
+  override def inlineDescWithSource(source: String): String =
+    s"Either in `$source` may be right."
 }
-case class MapKeyError(node: MapGet[_]) extends BuiltinError with FrontendSubscriptError with NodeVerificationFailure {
+case class MapKeyError(node: MapGet[_])
+    extends BuiltinError
+    with FrontendSubscriptError
+    with NodeVerificationFailure {
   override def code: String = "mapKey"
   override def descInContext: String = "Map may not contain this key."
-  override def inlineDescWithSource(source: String): String = s"Map in `$source` may not contain that key."
+  override def inlineDescWithSource(source: String): String =
+    s"Map in `$source` may not contain that key."
 }
-case class MallocSize(node: Expr[_]) extends BuiltinError with NodeVerificationFailure {
+case class MallocSize(node: Expr[_])
+    extends BuiltinError with NodeVerificationFailure {
   override def code: String = "mallocNegativeSize"
   override def descInContext: String = "Argument of malloc may be negative."
-  override def inlineDescWithSource(source: String): String = s"Size `$source` in malloc may be negative."
+  override def inlineDescWithSource(source: String): String =
+    s"Size `$source` in malloc may be negative."
 }
 
 sealed trait ArraySizeError extends VerificationFailure
 sealed trait ArraySubscriptError extends FrontendSubscriptError
 sealed trait ArrayLocationError extends ArraySubscriptError
 sealed trait AnyStarError extends VerificationFailure
-case class ArrayNull(node: Expr[_]) extends ArrayLocationError with BuiltinError with AnyStarError with NodeVerificationFailure {
+case class ArrayNull(node: Expr[_])
+    extends ArrayLocationError
+    with BuiltinError
+    with AnyStarError
+    with NodeVerificationFailure {
   override def code: String = "arrayNull"
   override def descInContext: String = "Array may be null."
-  override def inlineDescWithSource(source: String): String = s"Array `$source` may be null."
+  override def inlineDescWithSource(source: String): String =
+    s"Array `$source` may be null."
 }
-case class ArraySize(node: Expr[_]) extends ArraySizeError with NodeVerificationFailure {
+case class ArraySize(node: Expr[_])
+    extends ArraySizeError with NodeVerificationFailure {
   override def code: String = "arraySize"
   override def descInContext: String = "Array size may be negative."
-  override def inlineDescWithSource(source: String): String = s"Size of `$source` may be negative."
+  override def inlineDescWithSource(source: String): String =
+    s"Size of `$source` may be negative."
 }
-case class ArrayBounds(node: Node[_]) extends ArrayLocationError with NodeVerificationFailure {
+case class ArrayBounds(node: Node[_])
+    extends ArrayLocationError with NodeVerificationFailure {
   override def code: String = "arrayBounds"
-  override def descInContext: String = "Index may be negative, or exceed the length of the array."
-  override def inlineDescWithSource(source: String): String = s"Index `$source` may be negative, or exceed the length of the array."
+  override def descInContext: String =
+    "Index may be negative, or exceed the length of the array."
+  override def inlineDescWithSource(source: String): String =
+    s"Index `$source` may be negative, or exceed the length of the array."
 }
-case class ArrayInsufficientPermission(node: Expr[_]) extends ArraySubscriptError with NodeVerificationFailure {
+case class ArrayInsufficientPermission(node: Expr[_])
+    extends ArraySubscriptError with NodeVerificationFailure {
   override def code: String = "arrayPerm"
-  override def descInContext: String = "There may be insufficient permission to access the array."
-  override def inlineDescWithSource(source: String): String = s"There may be insufficient permission to access `$source`."
+  override def descInContext: String =
+    "There may be insufficient permission to access the array."
+  override def inlineDescWithSource(source: String): String =
+    s"There may be insufficient permission to access `$source`."
 }
 
 sealed trait ArrayValuesError extends NodeVerificationFailure {
   def node: Values[_]
-  override def descInContext: String = s"Array values invocation may fail, since $reason."
-  override def inlineDescWithSource(source: String): String = s"`$source` may fail, since $reason."
+  override def descInContext: String =
+    s"Array values invocation may fail, since $reason."
+  override def inlineDescWithSource(source: String): String =
+    s"`$source` may fail, since $reason."
   def reason: String
 }
 
@@ -675,95 +987,138 @@ case class ArrayValuesFromToOrder(node: Values[_]) extends ArrayValuesError {
 }
 case class ArrayValuesToLength(node: Values[_]) extends ArrayValuesError {
   override def code: String = "toLength"
-  override def reason = "the end of the range may exceed the length of the array"
+  override def reason =
+    "the end of the range may exceed the length of the array"
 }
 case class ArrayValuesPerm(node: Values[_]) extends ArrayValuesError {
   override def code: String = "valuesPerm"
-  override def reason = "there may be insufficient permission to access the array at the specified range"
+  override def reason =
+    "there may be insufficient permission to access the array at the specified range"
 }
 
 sealed trait PointerSubscriptError extends FrontendSubscriptError
-sealed trait PointerDerefError extends PointerSubscriptError with FrontendDerefError
+sealed trait PointerDerefError
+    extends PointerSubscriptError with FrontendDerefError
 sealed trait PointerLocationError extends PointerDerefError
 sealed trait PointerAddError extends FrontendAdditiveError
 sealed trait PointerFreeError extends FrontendInvocationError
 
-case class PointerOffsetNonZero(node: Expr[_]) extends PointerFreeError with NodeVerificationFailure {
+case class PointerOffsetNonZero(node: Expr[_])
+    extends PointerFreeError with NodeVerificationFailure {
   override def code: String = "ptrOffsetNonZero"
-  override def descInContext: String = "Free can only be called on pointers which are allocated and are at the start of the pointer block."
-  override def inlineDescWithSource(source: String): String = s"Pointer in `$source` cannot be freed due to invalid pointer block."
+  override def descInContext: String =
+    "Free can only be called on pointers which are allocated and are at the start of the pointer block."
+  override def inlineDescWithSource(source: String): String =
+    s"Pointer in `$source` cannot be freed due to invalid pointer block."
 }
 
-case class PointerInsufficientFreePermission(node: Expr[_]) extends PointerFreeError with NodeVerificationFailure {
+case class PointerInsufficientFreePermission(node: Expr[_])
+    extends PointerFreeError with NodeVerificationFailure {
   override def code: String = "ptrFreePerm"
-  override def descInContext: String = "Not enough permission to free the whole pointer block."
-  override def inlineDescWithSource(source: String): String = s"Pointer in `$source` cannot be freed due to insufficient permission."
+  override def descInContext: String =
+    "Not enough permission to free the whole pointer block."
+  override def inlineDescWithSource(source: String): String =
+    s"Pointer in `$source` cannot be freed due to insufficient permission."
 }
 
-case class GenericPointerFreeError(node: Expr[_]) extends PointerFreeError with NodeVerificationFailure {
+case class GenericPointerFreeError(node: Expr[_])
+    extends PointerFreeError with NodeVerificationFailure {
   override def code: String = "ptrFreeError"
   override def descInContext: String = "Pointer block cannot be freed."
-  override def inlineDescWithSource(source: String): String = s"Pointer in `$source` cannot be freed."
+  override def inlineDescWithSource(source: String): String =
+    s"Pointer in `$source` cannot be freed."
 }
 
-case class PointerInsufficientFreeFieldPermission(node: Expr[_], field: String) extends PointerFreeError with NodeVerificationFailure {
+case class PointerInsufficientFreeFieldPermission(node: Expr[_], field: String)
+    extends PointerFreeError with NodeVerificationFailure {
   override def code: String = "ptrFreeFieldError"
-  override def descInContext: String = s"Not enough permission to free the whole pointer block, since we miss permission for field `$field`"
-  override def inlineDescWithSource(source: String): String = s"Pointer in `$source` cannot be freed."
+  override def descInContext: String =
+    s"Not enough permission to free the whole pointer block, since we miss permission for field `$field`"
+  override def inlineDescWithSource(source: String): String =
+    s"Pointer in `$source` cannot be freed."
 }
 
-case class PointerNull(node: Expr[_]) extends PointerLocationError with PointerAddError with PointerFreeError with NodeVerificationFailure {
+case class PointerNull(node: Expr[_])
+    extends PointerLocationError
+    with PointerAddError
+    with PointerFreeError
+    with NodeVerificationFailure {
   override def code: String = "ptrNull"
   override def descInContext: String = "Pointer may be null."
-  override def inlineDescWithSource(source: String): String = s"Pointer in `$source` may be null."
+  override def inlineDescWithSource(source: String): String =
+    s"Pointer in `$source` may be null."
 }
-case class PointerBounds(node: Node[_]) extends PointerSubscriptError with PointerAddError with NodeVerificationFailure {
+case class PointerBounds(node: Node[_])
+    extends PointerSubscriptError
+    with PointerAddError
+    with NodeVerificationFailure {
   override def code: String = "ptrBlock"
-  override def descInContext: String = "The offset to the pointer may be outside the bounds of the allocated memory area that the pointer is in."
-  override def inlineDescWithSource(source: String): String = s"The offset in `$source` may be outside the bounds of the allocated memory area that the pointer is in."
+  override def descInContext: String =
+    "The offset to the pointer may be outside the bounds of the allocated memory area that the pointer is in."
+  override def inlineDescWithSource(source: String): String =
+    s"The offset in `$source` may be outside the bounds of the allocated memory area that the pointer is in."
 }
-case class PointerInsufficientPermission(node: Expr[_]) extends PointerDerefError with NodeVerificationFailure {
+case class PointerInsufficientPermission(node: Expr[_])
+    extends PointerDerefError with NodeVerificationFailure {
   override def code: String = "ptrPerm"
-  override def descInContext: String = "There may be insufficient permission to dereference the pointer."
-  override def inlineDescWithSource(source: String): String = s"There may be insufficient permission to dereference `$source`."
+  override def descInContext: String =
+    "There may be insufficient permission to dereference the pointer."
+  override def inlineDescWithSource(source: String): String =
+    s"There may be insufficient permission to dereference `$source`."
 }
 
 sealed trait LockRegionFailure extends VerificationFailure
 
 sealed trait LockFailure extends LockRegionFailure
-case class LockObjectNull(node: Node[_]) extends NodeVerificationFailure with LockFailure {
+case class LockObjectNull(node: Node[_])
+    extends NodeVerificationFailure with LockFailure {
   override def code: String = "lockNull"
   override def descInContext: String = "Lock target may be null"
-  override def inlineDescWithSource(source: String): String = s"Lock target in `$source` may be null."
+  override def inlineDescWithSource(source: String): String =
+    s"Lock target in `$source` may be null."
 }
-case class LockNotCommitted(node: Lock[_]) extends NodeVerificationFailure with LockFailure {
+case class LockNotCommitted(node: Lock[_])
+    extends NodeVerificationFailure with LockFailure {
   override def code: String = "lockNotCommitted"
-  override def descInContext: String = "Lock target may not yet have committed the lock invariant"
-  override def inlineDescWithSource(source: String): String = s"Lock target in `$source` may not yet have committed the lock invariant."
+  override def descInContext: String =
+    "Lock target may not yet have committed the lock invariant"
+  override def inlineDescWithSource(source: String): String =
+    s"Lock target in `$source` may not yet have committed the lock invariant."
 }
 
 sealed trait UnlockFailure extends LockRegionFailure
-case class UnlockInvariantFailed(node: Unlock[_], failure: ContractFailure) extends UnlockFailure with WithContractFailure {
+case class UnlockInvariantFailed(node: Unlock[_], failure: ContractFailure)
+    extends UnlockFailure with WithContractFailure {
   override def baseCode: String = "invariantFailed"
-  override def descInContext: String = "The lock invariant may not be exhaled here, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may fail, since $failure."
+  override def descInContext: String =
+    "The lock invariant may not be exhaled here, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may fail, since $failure."
 }
-case class LockTokenNotHeld(node: Unlock[_], failure: ContractFailure) extends UnlockFailure with WithContractFailure {
+case class LockTokenNotHeld(node: Unlock[_], failure: ContractFailure)
+    extends UnlockFailure with WithContractFailure {
   override def baseCode: String = "heldFailed"
-  override def descInContext: String = "The token that indicates the lock is locked (`held(obj)`) may not be exhaled here, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may fail, since the `held` resource may not be exhaled here, since $failure."
+  override def descInContext: String =
+    "The token that indicates the lock is locked (`held(obj)`) may not be exhaled here, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may fail, since the `held` resource may not be exhaled here, since $failure."
 }
 
 sealed trait ConstructorFailure extends VerificationFailure
-case class CommitFailed(node: Commit[_], failure: ContractFailure) extends ConstructorFailure with WithContractFailure {
+case class CommitFailed(node: Commit[_], failure: ContractFailure)
+    extends ConstructorFailure with WithContractFailure {
   override def baseCode: String = "commitFailed"
-  override def descInContext: String = "Committing the defined resources to the lock invariant may not be possible here, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"`$node` may not commit the defined resources to the lock invariant, since $failure."
+  override def descInContext: String =
+    "Committing the defined resources to the lock invariant may not be possible here, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"`$node` may not commit the defined resources to the lock invariant, since $failure."
 }
 
-case class NotifyFailed(node: Notify[_], failure: ContractFailure) extends WithContractFailure {
+case class NotifyFailed(node: Notify[_], failure: ContractFailure)
+    extends WithContractFailure {
   override def baseCode: String = "heldFailed"
-  override def descInContext: String = "The token that indicated the lock is locked (`held(obj)`) may not be asserted here, since"
+  override def descInContext: String =
+    "The token that indicated the lock is locked (`held(obj)`) may not be asserted here, since"
   override def inlineDescWithSource(node: String, failure: String): String =
     s"`$node` may fail, since the token that indicated the lock is locked (`held(obj)`) may not be asserted here, since $failure."
 }
@@ -771,18 +1126,22 @@ case class NotifyFailed(node: Notify[_], failure: ContractFailure) extends WithC
 case class ThrowNull(node: Throw[_]) extends NodeVerificationFailure {
   override def code: String = "null"
   override def descInContext: String = "The value thrown here may be null."
-  override def inlineDescWithSource(source: String): String = s"`$source` may throw null."
+  override def inlineDescWithSource(source: String): String =
+    s"`$source` may throw null."
 }
 
 case class ScaleNegative(node: Scale[_]) extends NodeVerificationFailure {
   override def code: String = "scaleNeg"
   override def descInContext: String = "The scale value here may be negative."
-  override def inlineDescWithSource(source: String): String = s"The scale in `$source` may be negative."
+  override def inlineDescWithSource(source: String): String =
+    s"The scale in `$source` may be negative."
 }
 
-case class NontrivialUnsatisfiable(node: ApplicableContract[_]) extends NodeVerificationFailure with BipConstructorFailure {
+case class NontrivialUnsatisfiable(node: ApplicableContract[_])
+    extends NodeVerificationFailure with BipConstructorFailure {
   override def code: String = "unsatisfiable"
-  override def descInContext: String = "The precondition of this contract may be unsatisfiable. If this is intentional, replace it with `requires false`."
+  override def descInContext: String =
+    "The precondition of this contract may be unsatisfiable. If this is intentional, replace it with `requires false`."
   override def inlineDescWithSource(source: String): String =
     s"The precondition in `$source` may be unsatisfiable."
 }
@@ -790,18 +1149,23 @@ case class NontrivialUnsatisfiable(node: ApplicableContract[_]) extends NodeVeri
 sealed trait UnsafeCoercion extends NodeVerificationFailure
 case class CoerceRatZFracFailed(node: Expr[_]) extends UnsafeCoercion {
   override def code: String = "ratZfrac"
-  override def descInContext: String = "Rational may exceed the bounds of zfrac: [0, 1]"
-  override def inlineDescWithSource(source: String): String = s"`$source` may exceed the bounds of zfrac: [0, 1]."
+  override def descInContext: String =
+    "Rational may exceed the bounds of zfrac: [0, 1]"
+  override def inlineDescWithSource(source: String): String =
+    s"`$source` may exceed the bounds of zfrac: [0, 1]."
 }
 case class CoerceRatFracFailed(node: Expr[_]) extends UnsafeCoercion {
   override def code: String = "ratFrac"
-  override def descInContext: String = "Rational may exceed the bounds of frac: (0, 1]"
-  override def inlineDescWithSource(source: String): String = s"`$source` may exceed the bounds of frac: (0, 1]."
+  override def descInContext: String =
+    "Rational may exceed the bounds of frac: (0, 1]"
+  override def inlineDescWithSource(source: String): String =
+    s"`$source` may exceed the bounds of frac: (0, 1]."
 }
 case class CoerceZFracFracFailed(node: Expr[_]) extends UnsafeCoercion {
   override def code: String = "zfracFrac"
   override def descInContext: String = "zfrac may be zero."
-  override def inlineDescWithSource(source: String): String = s"`$source` may be zero."
+  override def inlineDescWithSource(source: String): String =
+    s"`$source` may be zero."
 }
 
 sealed trait JavaAnnotationFailure extends VerificationFailure
@@ -811,7 +1175,8 @@ sealed trait JavaImplicitConstructorFailure extends VerificationFailure
 sealed trait BipConstructorFailure extends JavaConstructorFailure
 sealed trait BipTransitionFailure extends JavaAnnotationFailure
 
-sealed trait BipTransitionContractFailure extends BipTransitionFailure with WithContractFailure {
+sealed trait BipTransitionContractFailure
+    extends BipTransitionFailure with WithContractFailure {
   def transition: BipTransition[_]
   def failure: ContractFailure
 
@@ -826,71 +1191,115 @@ sealed trait BipTransitionContractFailure extends BipTransitionFailure with With
     )
 }
 
-case class BipComponentInvariantNotEstablished(failure: ContractFailure, node: BipConstructor[_]) extends BipConstructorFailure with WithContractFailure {
+case class BipComponentInvariantNotEstablished(
+    failure: ContractFailure,
+    node: BipConstructor[_],
+) extends BipConstructorFailure with WithContractFailure {
   override def baseCode: String = "bipComponentInvariantNotEstablished"
-  override def descInContext: String = "In this constructor the component invariant is not established, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The component invariant cannot be established in $node, since $failure"
+  override def descInContext: String =
+    "In this constructor the component invariant is not established, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The component invariant cannot be established in $node, since $failure"
 }
 
-case class BipStateInvariantNotEstablished(failure: ContractFailure, node: BipConstructor[_]) extends BipConstructorFailure with WithContractFailure {
+case class BipStateInvariantNotEstablished(
+    failure: ContractFailure,
+    node: BipConstructor[_],
+) extends BipConstructorFailure with WithContractFailure {
   override def baseCode: String = "bipStateInvariantNotEstablished"
-  override def descInContext: String = "In this constructor the invariant of the state is not established, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The state invariant is not established in $node, since $failure"
+  override def descInContext: String =
+    "In this constructor the invariant of the state is not established, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The state invariant is not established in $node, since $failure"
 }
 
-case class BipComponentInvariantNotMaintained(failure: ContractFailure, transition: BipTransition[_]) extends BipTransitionContractFailure {
+case class BipComponentInvariantNotMaintained(
+    failure: ContractFailure,
+    transition: BipTransition[_],
+) extends BipTransitionContractFailure {
   override def baseCode: String = "bipComponentInvariantNotMaintained"
-  override def descInContext: String = "the invariant of the component is not maintained, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The component invariant is not maintained in $node, since $failure"
+  override def descInContext: String =
+    "the invariant of the component is not maintained, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The component invariant is not maintained in $node, since $failure"
 }
 
-case class BipStateInvariantNotMaintained(failure: ContractFailure, transition: BipTransition[_]) extends BipTransitionContractFailure {
+case class BipStateInvariantNotMaintained(
+    failure: ContractFailure,
+    transition: BipTransition[_],
+) extends BipTransitionContractFailure {
   override def baseCode: String = "bipStateInvariantNotMaintained"
-  override def descInContext: String = "the invariant of the state is not maintained, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The state invariant is not maintained in $node, since $failure"
+  override def descInContext: String =
+    "the invariant of the state is not maintained, since"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The state invariant is not maintained in $node, since $failure"
 }
 
-case class BipTransitionPostconditionFailure(failure: ContractFailure, transition: BipTransition[_]) extends BipTransitionContractFailure {
+case class BipTransitionPostconditionFailure(
+    failure: ContractFailure,
+    transition: BipTransition[_],
+) extends BipTransitionContractFailure {
   override def baseCode: String = "bipTransitionPostconditionFailure"
   override def descInContext: String = "the postcondition does not hold, since"
-  override def inlineDescWithSource(node: String, failure: String): String = s"The postcondition of $node does not hold, since $failure"
+  override def inlineDescWithSource(node: String, failure: String): String =
+    s"The postcondition of $node does not hold, since $failure"
 }
 
-case class BipTransitionPreconditionUnsatisfiable(node: BipTransition[_]) extends BipTransitionFailure with NodeVerificationFailure {
+case class BipTransitionPreconditionUnsatisfiable(node: BipTransition[_])
+    extends BipTransitionFailure with NodeVerificationFailure {
   override def code: String = "bipTransitionPreconditionUnsatisfiable"
-  override def descInContext: String = "The precondition of this transition is unsatisfiable"
+  override def descInContext: String =
+    "The precondition of this transition is unsatisfiable"
 
-  override def inlineDescWithSource(source: String): String = s"Precondition unsatisfiable for transition `$source`"
+  override def inlineDescWithSource(source: String): String =
+    s"Precondition unsatisfiable for transition `$source`"
 }
 
-case class BipOutgoingDataPreconditionUnsatisfiable(node: BipOutgoingData[_]) extends JavaAnnotationFailure with NodeVerificationFailure {
+case class BipOutgoingDataPreconditionUnsatisfiable(node: BipOutgoingData[_])
+    extends JavaAnnotationFailure with NodeVerificationFailure {
   override def code: String = "bipOutgoingDataPreconditionUnsatisfiable"
-  override def descInContext: String = "The precondition of this outgoing data is unsatisfiable"
+  override def descInContext: String =
+    "The precondition of this outgoing data is unsatisfiable"
 
-  override def inlineDescWithSource(source: String): String = s"Precondition unsatisfiable for outgoing data `$source`"
+  override def inlineDescWithSource(source: String): String =
+    s"Precondition unsatisfiable for outgoing data `$source`"
 }
 
-case class BipGuardPreconditionUnsatisfiable(node: BipGuard[_]) extends JavaAnnotationFailure with NodeVerificationFailure {
+case class BipGuardPreconditionUnsatisfiable(node: BipGuard[_])
+    extends JavaAnnotationFailure with NodeVerificationFailure {
   override def code: String = "bipGuardPreconditionUnsatisfiable"
-  override def descInContext: String = "The precondition of this guard (consisting of only the component invariant) is unsatisfiable"
-  override def inlineDescWithSource(source: String): String = s"Precondition unsatisfiable for guard `$source`"
+  override def descInContext: String =
+    "The precondition of this guard (consisting of only the component invariant) is unsatisfiable"
+  override def inlineDescWithSource(source: String): String =
+    s"Precondition unsatisfiable for guard `$source`"
 }
 
 sealed trait BipGlueFailure extends VerificationFailure
 sealed trait BipSynchronizationFailure extends BipGlueFailure
-case class TransitionPreconditionFailed(synchronization: BipTransitionSynchronization[_], transition: BipTransition[_], failure: ContractFailure)
-  extends BipSynchronizationFailure with WithContractFailure {
+case class TransitionPreconditionFailed(
+    synchronization: BipTransitionSynchronization[_],
+    transition: BipTransition[_],
+    failure: ContractFailure,
+) extends BipSynchronizationFailure with WithContractFailure {
 
   override def node: Node[_] = transition.signature
   override def baseCode: String = "bipTransitionPreconditionFailed"
   override def desc: String =
     Message.messagesInContext(
-      (synchronization.o, s"In this context there is a synchronization, in which the following ${synchronization.transitions.size} transitions and ${synchronization.wires.size} data wires participate:") +:
-        (synchronization.transitions.zipWithIndex.map { case (t, i) => (t.decl.signature.o, s"transition ${i + 1},")} ++
-        synchronization.wires.zipWithIndex.map { case (w, i) => (w.o, s"data wire ${i + 1},") }) :+
-        (transition.signature.o, "the precondition of this transition does not hold, since") :+
-        (failure.node.o, s"${failure.descCompletion} $errUrl")
-      : _*
+      (
+        synchronization.o,
+        s"In this context there is a synchronization, in which the following ${synchronization
+            .transitions.size} transitions and ${synchronization.wires.size} data wires participate:",
+      ) +:
+        (synchronization.transitions.zipWithIndex.map { case (t, i) =>
+          (t.decl.signature.o, s"transition ${i + 1},")
+        } ++ synchronization.wires.zipWithIndex.map { case (w, i) =>
+          (w.o, s"data wire ${i + 1},")
+        }) :+
+        (
+          transition.signature.o,
+          "the precondition of this transition does not hold, since",
+        ) :+ (failure.node.o, s"${failure.descCompletion} $errUrl"): _*
     )
 
   // Unused
@@ -904,66 +1313,103 @@ trait Blame[-T <: VerificationFailure] {
   def blame(error: T): Unit
 }
 
-case class FilterExpectedErrorBlame(otherwise: Blame[VerificationFailure], expectedError: ExpectedError) extends Blame[VerificationFailure] {
+case class FilterExpectedErrorBlame(
+    otherwise: Blame[VerificationFailure],
+    expectedError: ExpectedError,
+) extends Blame[VerificationFailure] {
   override def blame(error: VerificationFailure): Unit =
-    if(expectedError.errorCode.r.matches(error.code)) {
+    if (expectedError.errorCode.r.matches(error.code)) {
       expectedError.trip(error)
-    } else {
-      otherwise.blame(error)
-    }
+    } else { otherwise.blame(error) }
 }
 
 case object BlamePathError extends SystemError {
-  override def text: String = "The accounting for a pre- or postcondition is wrong: the path is empty before the layered blames are resolved, or an empty path was expected but it is not."
+  override def text: String =
+    "The accounting for a pre- or postcondition is wrong: the path is empty before the layered blames are resolved, or an empty path was expected but it is not."
 }
 
 case object PostBlameSplit {
-  def apply[T >: PostconditionFailed <: VerificationFailure](blames: Map[AccountedDirection, Blame[PostconditionFailed]], default: Blame[T]): PostBlameSplit[T] =
-    new PostBlameSplit(blames, default)
-
-  def left[T >: PostconditionFailed <: VerificationFailure](left: Blame[PostconditionFailed], right: Blame[T]): PostBlameSplit[T] =
+  def apply[T >: PostconditionFailed <: VerificationFailure](
+      blames: Map[AccountedDirection, Blame[PostconditionFailed]],
+      default: Blame[T],
+  ): PostBlameSplit[T] = new PostBlameSplit(blames, default)
+
+  def left[T >: PostconditionFailed <: VerificationFailure](
+      left: Blame[PostconditionFailed],
+      right: Blame[T],
+  ): PostBlameSplit[T] =
     new PostBlameSplit(Map(FailLeft -> left, FailRight -> right), right)
 
-  def right[T >: PostconditionFailed <: VerificationFailure](left: Blame[T], right: Blame[PostconditionFailed]): PostBlameSplit[T] =
+  def right[T >: PostconditionFailed <: VerificationFailure](
+      left: Blame[T],
+      right: Blame[PostconditionFailed],
+  ): PostBlameSplit[T] =
     new PostBlameSplit(Map(FailLeft -> left, FailRight -> right), left)
 }
 
-case class PostBlameSplit[T >: PostconditionFailed <: VerificationFailure](blames: Map[AccountedDirection, Blame[PostconditionFailed]], default: Blame[T]) extends Blame[T] {
-  override def blame(error: T): Unit = error match {
-    case PostconditionFailed(path, failure, invokable) => path match {
-      case Nil => throw BlamePathError
-      case FailLeft +: tail => blames(FailLeft).blame(PostconditionFailed(tail, failure, invokable))
-      case FailRight +: tail => blames(FailRight).blame(PostconditionFailed(tail, failure, invokable))
+case class PostBlameSplit[T >: PostconditionFailed <: VerificationFailure](
+    blames: Map[AccountedDirection, Blame[PostconditionFailed]],
+    default: Blame[T],
+) extends Blame[T] {
+  override def blame(error: T): Unit =
+    error match {
+      case PostconditionFailed(path, failure, invokable) =>
+        path match {
+          case Nil => throw BlamePathError
+          case FailLeft +: tail =>
+            blames(FailLeft)
+              .blame(PostconditionFailed(tail, failure, invokable))
+          case FailRight +: tail =>
+            blames(FailRight)
+              .blame(PostconditionFailed(tail, failure, invokable))
+        }
+      case other => default.blame(other)
     }
-    case other => default.blame(other)
-  }
 }
 
 case object PreBlameSplit {
-  def apply[T >: PreconditionFailed <: VerificationFailure](blames: Map[AccountedDirection, Blame[PreconditionFailed]], default: Blame[T]): PreBlameSplit[T] =
-    new PreBlameSplit(blames, default)
-
-  def left[T >: PreconditionFailed <: VerificationFailure](left: Blame[PreconditionFailed], right: Blame[T]): PreBlameSplit[T] =
+  def apply[T >: PreconditionFailed <: VerificationFailure](
+      blames: Map[AccountedDirection, Blame[PreconditionFailed]],
+      default: Blame[T],
+  ): PreBlameSplit[T] = new PreBlameSplit(blames, default)
+
+  def left[T >: PreconditionFailed <: VerificationFailure](
+      left: Blame[PreconditionFailed],
+      right: Blame[T],
+  ): PreBlameSplit[T] =
     new PreBlameSplit(Map(FailLeft -> left, FailRight -> right), right)
 
-  def right[T >: PreconditionFailed <: VerificationFailure](left: Blame[T], right: Blame[PreconditionFailed]): PreBlameSplit[T] =
+  def right[T >: PreconditionFailed <: VerificationFailure](
+      left: Blame[T],
+      right: Blame[PreconditionFailed],
+  ): PreBlameSplit[T] =
     new PreBlameSplit(Map(FailLeft -> left, FailRight -> right), left)
 }
 
-case class PreBlameSplit[T >: PreconditionFailed <: VerificationFailure](blames: Map[AccountedDirection, Blame[PreconditionFailed]], default: Blame[T]) extends Blame[T] {
-  override def blame(error: T): Unit = error match {
-    case PreconditionFailed(path, failure, invokable) => path match {
-      case Nil =>
-        throw BlamePathError
-      case FailLeft +: tail => blames(FailLeft).blame(PreconditionFailed(tail, failure, invokable))
-      case FailRight +: tail => blames(FailRight).blame(PreconditionFailed(tail, failure, invokable))
+case class PreBlameSplit[T >: PreconditionFailed <: VerificationFailure](
+    blames: Map[AccountedDirection, Blame[PreconditionFailed]],
+    default: Blame[T],
+) extends Blame[T] {
+  override def blame(error: T): Unit =
+    error match {
+      case PreconditionFailed(path, failure, invokable) =>
+        path match {
+          case Nil => throw BlamePathError
+          case FailLeft +: tail =>
+            blames(FailLeft).blame(PreconditionFailed(tail, failure, invokable))
+          case FailRight +: tail =>
+            blames(FailRight)
+              .blame(PreconditionFailed(tail, failure, invokable))
+        }
+      case other => default.blame(other)
     }
-    case other => default.blame(other)
-  }
 }
 
-case class BlameUnreachable(message: String, failure: VerificationFailure) extends VerificationError.SystemError {
-  def text: String = s"An error condition was reached, which should be statically unreachable. $message. Inner failure:\n${failure.toString.split('\n').mkString(" > ", "\n > ", "")}"
+case class BlameUnreachable(message: String, failure: VerificationFailure)
+    extends VerificationError.SystemError {
+  def text: String =
+    s"An error condition was reached, which should be statically unreachable. $message. Inner failure:\n${failure
+        .toString.split('\n').mkString(" > ", "\n > ", "")}"
 }
 
 case class PanicBlame(message: String) extends Blame[VerificationFailure] {
@@ -971,40 +1417,110 @@ case class PanicBlame(message: String) extends Blame[VerificationFailure] {
     throw BlameUnreachable(message, error)
 }
 
-object NeverNone extends PanicBlame("get in `opt == none ? _ : get(opt)` should always be ok.")
-object FramedSeqIndex extends PanicBlame("access in `∀i. 0 <= i < |xs| ==> ...xs[i]...` should never be out of bounds")
-object FramedArrIndex extends PanicBlame("access in `∀i. 0 <= i < xs.length ==> Perm(xs[i], read) ** ...xs[i]...` should always be ok")
-object FramedVectorIndex extends PanicBlame("access in `∀i. 0 <= i < xs.length ==> ...xs[i]...` should never be out of bounds")
-object IteratedArrayInjective extends PanicBlame("access in `∀*i. 0 <= i < xs.length ==> Perm(xs[i], _)` should always be injective")
-object IteratedPtrInjective extends PanicBlame("access in `∀*i. Perm(xs[i], _)` should always be injective")
+object NeverNone
+    extends PanicBlame(
+      "get in `opt == none ? _ : get(opt)` should always be ok."
+    )
+object FramedSeqIndex
+    extends PanicBlame(
+      "access in `∀i. 0 <= i < |xs| ==> ...xs[i]...` should never be out of bounds"
+    )
+object FramedArrIndex
+    extends PanicBlame(
+      "access in `∀i. 0 <= i < xs.length ==> Perm(xs[i], read) ** ...xs[i]...` should always be ok"
+    )
+object FramedVectorIndex
+    extends PanicBlame(
+      "access in `∀i. 0 <= i < xs.length ==> ...xs[i]...` should never be out of bounds"
+    )
+object IteratedArrayInjective
+    extends PanicBlame(
+      "access in `∀*i. 0 <= i < xs.length ==> Perm(xs[i], _)` should always be injective"
+    )
+object IteratedPtrInjective
+    extends PanicBlame(
+      "access in `∀*i. Perm(xs[i], _)` should always be injective"
+    )
 object FramedArrLoc extends PanicBlame("Bounds and non-nullness are ensured.")
-object FramedArrLength extends PanicBlame("length query in `arr == null ? _ : arr.length` should always be ok.")
-object FramedPtrBlockLength extends PanicBlame("length query in `p == null ? _ : \\pointer_block_length(p)` should always be ok.")
-object FramedPtrBlockOffset extends PanicBlame("offset query in `p == null ? _ : \\pointer_block_offset(p)` should always be ok.")
-object FramedMapGet extends PanicBlame("access in `∀k. k \\in m.keys ==> ...m[k]...` should always be ok.")
-object FramedGetLeft extends PanicBlame("left in `e.isLeft ? e.left : ...` should always be ok.")
-object FramedGetRight extends PanicBlame("right in `e.isLeft ? ... : e.right` should always be ok.")
-object AbstractApplicable extends PanicBlame("the postcondition of an abstract applicable is not checked, and hence cannot fail.")
-object TriggerPatternBlame extends PanicBlame("patterns in a trigger are not evaluated, but schematic, so any blame in a trigger is never applied.")
-object TrueSatisfiable extends PanicBlame("`requires true` is always satisfiable.")
-object FramedPtrOffset extends PanicBlame("pointer arithmetic in (0 <= \\pointer_block_offset(p)+i < \\pointer_block_length(p)) ? p+i : _ should always be ok.")
-object FramedByForPerm extends PanicBlame("Heap value access should be ok inside a forperm that frames it.")
+object FramedArrLength
+    extends PanicBlame(
+      "length query in `arr == null ? _ : arr.length` should always be ok."
+    )
+object FramedPtrBlockLength
+    extends PanicBlame(
+      "length query in `p == null ? _ : \\pointer_block_length(p)` should always be ok."
+    )
+object FramedPtrBlockOffset
+    extends PanicBlame(
+      "offset query in `p == null ? _ : \\pointer_block_offset(p)` should always be ok."
+    )
+object FramedMapGet
+    extends PanicBlame(
+      "access in `∀k. k \\in m.keys ==> ...m[k]...` should always be ok."
+    )
+object FramedGetLeft
+    extends PanicBlame("left in `e.isLeft ? e.left : ...` should always be ok.")
+object FramedGetRight
+    extends PanicBlame(
+      "right in `e.isLeft ? ... : e.right` should always be ok."
+    )
+object AbstractApplicable
+    extends PanicBlame(
+      "the postcondition of an abstract applicable is not checked, and hence cannot fail."
+    )
+object TriggerPatternBlame
+    extends PanicBlame(
+      "patterns in a trigger are not evaluated, but schematic, so any blame in a trigger is never applied."
+    )
+object TrueSatisfiable
+    extends PanicBlame("`requires true` is always satisfiable.")
+object FramedPtrOffset
+    extends PanicBlame(
+      "pointer arithmetic in (0 <= \\pointer_block_offset(p)+i < \\pointer_block_length(p)) ? p+i : _ should always be ok."
+    )
+object FramedByForPerm
+    extends PanicBlame(
+      "Heap value access should be ok inside a forperm that frames it."
+    )
 
 object AssignLocalOk extends PanicBlame("Assigning to a local can never fail.")
-object DerefAssignTarget extends PanicBlame("Assigning to a field should trigger an error on the assignment, and not on the dereference.")
-object SubscriptAssignTarget extends PanicBlame("Assigning to a subscript should trigger an error on the assignment, and not on the subscript.")
-object DerefPerm extends PanicBlame("Dereferencing a field in a permission should trigger an error on the permission, not on the dereference.")
-object ArrayPerm extends PanicBlame("Subscripting an array in a permission should trigger an error on the permission, not on the dereference.")
-object UnresolvedDesignProblem extends PanicBlame("The design does not yet accommodate passing a meaningful blame here.")
-object PointsToDeref extends PanicBlame("The permission has already been ensured and thus cannot be insufficient.")
+object DerefAssignTarget
+    extends PanicBlame(
+      "Assigning to a field should trigger an error on the assignment, and not on the dereference."
+    )
+object SubscriptAssignTarget
+    extends PanicBlame(
+      "Assigning to a subscript should trigger an error on the assignment, and not on the subscript."
+    )
+object DerefPerm
+    extends PanicBlame(
+      "Dereferencing a field in a permission should trigger an error on the permission, not on the dereference."
+    )
+object ArrayPerm
+    extends PanicBlame(
+      "Subscripting an array in a permission should trigger an error on the permission, not on the dereference."
+    )
+object UnresolvedDesignProblem
+    extends PanicBlame(
+      "The design does not yet accommodate passing a meaningful blame here."
+    )
+object PointsToDeref
+    extends PanicBlame(
+      "The permission has already been ensured and thus cannot be insufficient."
+    )
 
-object JavaArrayInitializerBlame extends PanicBlame("The explicit initialization of an array in Java should never generate an assignment that exceeds the bounds of the array")
+object JavaArrayInitializerBlame
+    extends PanicBlame(
+      "The explicit initialization of an array in Java should never generate an assignment that exceeds the bounds of the array"
+    )
 
 object UnsafeDontCare {
-  case class Satisfiability(reason: String) extends UnsafeDontCare[NontrivialUnsatisfiable]
+  case class Satisfiability(reason: String)
+      extends UnsafeDontCare[NontrivialUnsatisfiable]
 }
 
-trait UnsafeDontCare[T <: VerificationFailure] extends Blame[T] with LazyLogging {
+trait UnsafeDontCare[T <: VerificationFailure]
+    extends Blame[T] with LazyLogging {
   def reason: String
 
   override def blame(error: T): Unit = {
@@ -1013,9 +1529,14 @@ trait UnsafeDontCare[T <: VerificationFailure] extends Blame[T] with LazyLogging
   }
 }
 
-case class NoContext(inner: Blame[PreconditionFailed]) extends Blame[InvocationFailure] {
-  override def blame(error: InvocationFailure): Unit = error match {
-    case pre: PreconditionFailed => inner.blame(pre)
-    case ctx: ContextEverywhereFailedInPre => PanicBlame("Function or method does not list any context_everywhere clauses, so cannot fail on a context_everywhere clause.").blame(ctx)
-  }
+case class NoContext(inner: Blame[PreconditionFailed])
+    extends Blame[InvocationFailure] {
+  override def blame(error: InvocationFailure): Unit =
+    error match {
+      case pre: PreconditionFailed => inner.blame(pre)
+      case ctx: ContextEverywhereFailedInPre =>
+        PanicBlame(
+          "Function or method does not list any context_everywhere clauses, so cannot fail on a context_everywhere clause."
+        ).blame(ctx)
+    }
 }
diff --git a/src/col/vct/col/origin/ExpectedError.scala b/src/col/vct/col/origin/ExpectedError.scala
index cbd027d683..f79e9dedf5 100644
--- a/src/col/vct/col/origin/ExpectedError.scala
+++ b/src/col/vct/col/origin/ExpectedError.scala
@@ -3,24 +3,31 @@ package vct.col.origin
 import com.typesafe.scalalogging.LazyLogging
 
 object ExpectedError {
-  def apply(errorCode: String, errorRegion: Origin, blame: Blame[ExpectedErrorFailure]): ExpectedError =
-    new ExpectedError(errorCode, errorRegion, blame)
+  def apply(
+      errorCode: String,
+      errorRegion: Origin,
+      blame: Blame[ExpectedErrorFailure],
+  ): ExpectedError = new ExpectedError(errorCode, errorRegion, blame)
 }
 
-class ExpectedError(val errorCode: String, val errorRegion: Origin, val blame: Blame[ExpectedErrorFailure]) extends LazyLogging {
+class ExpectedError(
+    val errorCode: String,
+    val errorRegion: Origin,
+    val blame: Blame[ExpectedErrorFailure],
+) extends LazyLogging {
   var tripped: Option[VerificationFailure] = None
 
   def trip(failure: VerificationFailure): Unit =
     tripped match {
       case None =>
-        logger.debug(s"Swallowing error code $errorCode at ${errorRegion.shortPositionText}")
+        logger.debug(
+          s"Swallowing error code $errorCode at ${errorRegion.shortPositionText}"
+        )
         tripped = Some(failure)
       case Some(leftFailure) =>
         blame.blame(ExpectedErrorTrippedTwice(this, leftFailure, failure))
     }
 
   def signalDone(): Unit =
-    if(tripped.isEmpty) {
-      blame.blame(ExpectedErrorNotTripped(this))
-    }
+    if (tripped.isEmpty) { blame.blame(ExpectedErrorNotTripped(this)) }
 }
diff --git a/src/col/vct/col/origin/HideDuringTriggerGeneration.scala b/src/col/vct/col/origin/HideDuringTriggerGeneration.scala
index 7db0dc4a24..e76f407dff 100644
--- a/src/col/vct/col/origin/HideDuringTriggerGeneration.scala
+++ b/src/col/vct/col/origin/HideDuringTriggerGeneration.scala
@@ -1,8 +1,7 @@
 package vct.col.origin
 
-/**
- * Attached to triggers that should be hidden during trigger generation. That is:
- * if there are only triggers with this attached, we should pretend that there
- * are no triggers yet.
- */
+/** Attached to triggers that should be hidden during trigger generation. That
+  * is: if there are only triggers with this attached, we should pretend that
+  * there are no triggers yet.
+  */
 object HideDuringTriggerGeneration extends OriginContent
diff --git a/src/col/vct/col/origin/Name.scala b/src/col/vct/col/origin/Name.scala
index ef64a10724..51bd43b0b1 100644
--- a/src/col/vct/col/origin/Name.scala
+++ b/src/col/vct/col/origin/Name.scala
@@ -6,8 +6,7 @@ sealed trait Name {
   def camel: String
   def ucamel: String
 
-  override def toString: String =
-    throw new UnsupportedOperationException()
+  override def toString: String = throw new UnsupportedOperationException()
 }
 
 object Name {
@@ -22,7 +21,9 @@ object Name {
     assert(parts.nonEmpty)
     override def snake: String = parts.map(_.toLowerCase).mkString("_")
     override def usnake: String = parts.map(_.toUpperCase).mkString("_")
-    override def camel: String = (parts.head.toLowerCase +: parts.tail.map(_.toLowerCase.capitalize)).mkString("")
+    override def camel: String =
+      (parts.head.toLowerCase +: parts.tail.map(_.toLowerCase.capitalize))
+        .mkString("")
     override def ucamel: String = camel.capitalize
   }
 
@@ -39,4 +40,4 @@ object Name {
     assert(parts.nonEmpty)
     parts.reduce(Join)
   }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/origin/Origin.scala b/src/col/vct/col/origin/Origin.scala
index ffab0b4f75..987b16e1f4 100644
--- a/src/col/vct/col/origin/Origin.scala
+++ b/src/col/vct/col/origin/Origin.scala
@@ -9,83 +9,95 @@ import vct.result.Message.HR
 import scala.collection.mutable.ArrayBuffer
 import scala.reflect.ClassTag
 
-case object Origin {
+case object Origin {}
 
-}
-
-/***
- * This trait is used to box information about Origins in a structured manner.
- */
+/** * This trait is used to box information about Origins in a structured
+  * manner.
+  */
 trait OriginContent {
-  /**
-   * Indicates the preferred name or required name for this node. The parts of a preferred name can be joined as
-   * desired for the kind of declaration.
-   */
+
+  /** Indicates the preferred name or required name for this node. The parts of
+    * a preferred name can be joined as desired for the kind of declaration.
+    */
   def name(tail: Origin): Option[Name] = None
 
-  /**
-   * The reason that this node exists, typeset in a user-friendly way. The contexts are stacked, so context (i)
-   * can say something about (i+1). For example: Seq("interpreted c source", "Interpreted from:", "c source"), or
-   * Seq("check_sat method for:", "pvl source"). For this method the messages can be multiline, but should not have
-   * a trailing or preceding newline.
-   */
+  /** The reason that this node exists, typeset in a user-friendly way. The
+    * contexts are stacked, so context (i) can say something about (i+1). For
+    * example: Seq("interpreted c source", "Interpreted from:", "c source"), or
+    * Seq("check_sat method for:", "pvl source"). For this method the messages
+    * can be multiline, but should not have a trailing or preceding newline.
+    */
   def context(tail: Origin): Option[Seq[String]] = None
 
-  /**
-   * Should have the same shape as the context method, but instead provides a sequence of breadcrumbs, e.g.:
-   * Seq("check_sat", "void test() { }")
-   * The part must not contain newlines. Consumers of the inline context should make sure to shorten breadcrumbs and
-   * add an ellipsis where approriate, whereas the definition should not try to shorten the breadcrumb (within reason).
-   */
-  def inlineContext(tail: Origin, compress: Boolean = true): Option[Seq[String]] = None
-
-  /**
-   * Short description of the source position indicated by this origin. This should refer to the oldest cq original
-   * position; not the most recent. If no OriginContent indicates a shortPosition, it should be assumed the node
-   * is generated apart from any source input.
-   */
+  /** Should have the same shape as the context method, but instead provides a
+    * sequence of breadcrumbs, e.g.: Seq("check_sat", "void test() { }") The
+    * part must not contain newlines. Consumers of the inline context should
+    * make sure to shorten breadcrumbs and add an ellipsis where approriate,
+    * whereas the definition should not try to shorten the breadcrumb (within
+    * reason).
+    */
+  def inlineContext(
+      tail: Origin,
+      compress: Boolean = true,
+  ): Option[Seq[String]] = None
+
+  /** Short description of the source position indicated by this origin. This
+    * should refer to the oldest cq original position; not the most recent. If
+    * no OriginContent indicates a shortPosition, it should be assumed the node
+    * is generated apart from any source input.
+    */
   def shortPosition(tail: Origin): Option[String] = None
 }
 
-/**
- * Leaf name provider, should consider modifiers like NamePrefix that follow it.
- */
+/** Leaf name provider, should consider modifiers like NamePrefix that follow
+  * it.
+  */
 trait NameStrategy extends OriginContent
 
 case class PreferredName(preferredName: Seq[String]) extends NameStrategy {
   override def name(tail: Origin): Option[Name] =
-    Some(Name.Preferred(
-      tail.span[NameStrategy]._1.originContents.collect {
-        case NamePrefix(prefix) => prefix
-      }.reverse ++ preferredName
-    ))
+    Some(Name.Preferred(tail.span[NameStrategy]._1.originContents.collect {
+      case NamePrefix(prefix) => prefix
+    }.reverse ++ preferredName))
 }
 
 case class NamePrefix(prefix: String) extends OriginContent
 
 case class RequiredName(requiredName: String) extends NameStrategy {
-  override def name(tail: Origin): Option[Name] = Some(Name.Required(requiredName))
+  override def name(tail: Origin): Option[Name] =
+    Some(Name.Required(requiredName))
 }
 
 case class IndirectName(name: Name) extends NameStrategy {
   override def name(tail: Origin): Option[Name] =
-    Some((prefix(tail).map(Seq(_)).getOrElse(Seq()) ++ Seq(name)).reduce(Name.Join))
+    Some(
+      (prefix(tail).map(Seq(_)).getOrElse(Seq()) ++ Seq(name)).reduce(Name.Join)
+    )
 
   def prefix(tail: Origin): Option[Name] = {
-    val prefix = tail.span[NameStrategy]._1.originContents.collect {
-      case NamePrefix(prefix) => prefix
-    }.reverse
-    if(prefix.isEmpty) None else Some(Name.Preferred(prefix))
+    val prefix =
+      tail.span[NameStrategy]._1.originContents.collect {
+        case NamePrefix(prefix) => prefix
+      }.reverse
+    if (prefix.isEmpty)
+      None
+    else
+      Some(Name.Preferred(prefix))
   }
 }
 
 object SourceName {
-  def stringToName(name: String): Name = Name.Preferred(
-    if (name.forall(c => !c.isLetter || c.isUpper)) name.split("[_]+").toIndexedSeq
-    else name.split("[_]+").toIndexedSeq.flatMap(splitNameRec))
+  def stringToName(name: String): Name =
+    Name.Preferred(
+      if (name.forall(c => !c.isLetter || c.isUpper))
+        name.split("[_]+").toIndexedSeq
+      else
+        name.split("[_]+").toIndexedSeq.flatMap(splitNameRec)
+    )
 
   private def splitNameRec(str: String): Seq[String] =
-    if (str.isEmpty) Nil
+    if (str.isEmpty)
+      Nil
     else {
       val (left, right) = str.tail.span(_.isLower)
       (str.head.toString + left) +: splitNameRec(right)
@@ -97,14 +109,17 @@ case class SourceName(name: String) extends NameStrategy {
     Some(SourceName.stringToName(name))
 }
 
-/**
- * Content that provides a bit of context here. By default, this assembles further context from the remaining
- * origin. contextHere and inlineContextHere may optionally consume some more contents, otherwise they can just
- * return the tail as is.
- */
+/** Content that provides a bit of context here. By default, this assembles
+  * further context from the remaining origin. contextHere and inlineContextHere
+  * may optionally consume some more contents, otherwise they can just return
+  * the tail as is.
+  */
 trait Context extends OriginContent {
   protected def contextHere(tail: Origin): (String, Origin)
-  protected def inlineContextHere(tail: Origin, compress: Boolean): (String, Origin)
+  protected def inlineContextHere(
+      tail: Origin,
+      compress: Boolean,
+  ): (String, Origin)
   protected def shortPositionHere(tail: Origin): (String, Origin)
 
   override def context(tail: Origin): Option[Seq[String]] = {
@@ -112,7 +127,10 @@ trait Context extends OriginContent {
     Some(head +: tailAfterContext.context.getOrElse(Nil))
   }
 
-  override def inlineContext(tail: Origin, compress: Boolean = true): Option[Seq[String]] = {
+  override def inlineContext(
+      tail: Origin,
+      compress: Boolean = true,
+  ): Option[Seq[String]] = {
     val (head, tailAfterContext) = inlineContextHere(tail, compress)
     Some(head +: tailAfterContext.inlineContext(compress).getOrElse(Nil))
   }
@@ -123,32 +141,48 @@ trait Context extends OriginContent {
   }
 }
 
-/**
- * One or two lowercase words define the context, inline context and short position.
- * For more extended explanations you should implement a case of Context yourself.
- */
+/** One or two lowercase words define the context, inline context and short
+  * position. For more extended explanations you should implement a case of
+  * Context yourself.
+  */
 case class LabelContext(label: String) extends Context {
-  override protected def contextHere(tail: Origin): (String, Origin) = (s"At $label:", tail)
-  override protected def inlineContextHere(tail: Origin, compress: Boolean): (String, Origin) = (label, tail)
-  override protected def shortPositionHere(tail: Origin): (String, Origin) = (label, tail)
+  override protected def contextHere(tail: Origin): (String, Origin) =
+    (s"At $label:", tail)
+  override protected def inlineContextHere(
+      tail: Origin,
+      compress: Boolean,
+  ): (String, Origin) = (label, tail)
+  override protected def shortPositionHere(tail: Origin): (String, Origin) =
+    (label, tail)
 }
 
 trait Source extends Context {
   def positionContext(position: PositionRange): String
-  def inlinePositionContext(position: PositionRange, compress: Boolean = true): String
+  def inlinePositionContext(
+      position: PositionRange,
+      compress: Boolean = true,
+  ): String
   protected def genericContext: String
   protected def genericInlineContext: String
   def genericShortPosition: String
 
-  override protected def contextHere(tail: Origin): (String, Origin) = (genericContext, tail)
-  override protected def inlineContextHere(tail: Origin, compress: Boolean): (String, Origin) = (genericInlineContext, tail)
-  override protected def shortPositionHere(tail: Origin): (String, Origin) = (genericShortPosition, tail)
+  override protected def contextHere(tail: Origin): (String, Origin) =
+    (genericContext, tail)
+  override protected def inlineContextHere(
+      tail: Origin,
+      compress: Boolean,
+  ): (String, Origin) = (genericInlineContext, tail)
+  override protected def shortPositionHere(tail: Origin): (String, Origin) =
+    (genericShortPosition, tail)
 }
 
 case class ReadableOrigin(readable: Readable) extends Source {
   def positionContext(position: PositionRange): String =
     genericContext + "\n" + HR + InputOrigin.contextLines(readable, position)
-  def inlinePositionContext(position: PositionRange, compress: Boolean): String = InputOrigin.inlineContext(readable, position, compress)
+  def inlinePositionContext(
+      position: PositionRange,
+      compress: Boolean,
+  ): String = InputOrigin.inlineContext(readable, position, compress)
   override def genericContext: String = s"At ${readable.fileName}"
   override def genericInlineContext: String = s"${readable.fileName}"
   override def genericShortPosition: String = s"${readable.fileName}"
@@ -156,27 +190,38 @@ case class ReadableOrigin(readable: Readable) extends Source {
 
 case class OriginFilename(filename: String) extends Source {
   def positionContext(position: PositionRange): String = genericContext
-  def inlinePositionContext(position: PositionRange, compress: Boolean): String = genericInlineContext
+  def inlinePositionContext(
+      position: PositionRange,
+      compress: Boolean,
+  ): String = genericInlineContext
   override def genericContext: String = s"At $filename"
   override def genericInlineContext: String = s"$filename"
   override def genericShortPosition: String = s"$filename"
 }
 
 case class InlineBipContext(bipContext: String) extends Source {
-  def positionContext(position: PositionRange): String = InputOrigin.contextLines(LiteralReadable("literal", bipContext), position)
-  def inlinePositionContext(position: PositionRange, compress: Boolean): String = InputOrigin.inlineContext(LiteralReadable("literal", bipContext), position)
+  def positionContext(position: PositionRange): String =
+    InputOrigin.contextLines(LiteralReadable("literal", bipContext), position)
+  def inlinePositionContext(
+      position: PositionRange,
+      compress: Boolean,
+  ): String =
+    InputOrigin.inlineContext(LiteralReadable("literal", bipContext), position)
   override def genericContext: String = s"From literal"
   override def genericInlineContext: String = "literal"
   override def genericShortPosition: String = "literal"
 }
 
-case class PositionRange(startLineIdx: Int, endLineIdx: Int, startEndColIdx: Option[(Int, Int)]) extends Context {
+case class PositionRange(
+    startLineIdx: Int,
+    endLineIdx: Int,
+    startEndColIdx: Option[(Int, Int)],
+) extends Context {
   def onlyPositionText: String =
     startEndColIdx match {
       case Some((startColIdx, endColIdx)) =>
-        s":${startLineIdx+1}:${startColIdx+1}-:${endLineIdx+1}:${endColIdx+1}"
-      case None =>
-        s":${startLineIdx+1}-:${endLineIdx+1}"
+        s":${startLineIdx + 1}:${startColIdx + 1}-:${endLineIdx + 1}:${endColIdx + 1}"
+      case None => s":${startLineIdx + 1}-:${endLineIdx + 1}"
     }
 
   override protected def contextHere(tail: Origin): (String, Origin) =
@@ -185,35 +230,39 @@ case class PositionRange(startLineIdx: Int, endLineIdx: Int, startEndColIdx: Opt
       case (_, None) => ("At broken position", tail)
     }
 
-  override protected def inlineContextHere(tail: Origin, compress: Boolean): (String, Origin) =
+  override protected def inlineContextHere(
+      tail: Origin,
+      compress: Boolean,
+  ): (String, Origin) =
     tail.spanFind[Source] match {
-      case (_, Some((source, tail))) => (source.inlinePositionContext(this, compress), tail)
+      case (_, Some((source, tail))) =>
+        (source.inlinePositionContext(this, compress), tail)
       case (_, None) => ("broken position", tail)
     }
 
   override protected def shortPositionHere(tail: Origin): (String, Origin) =
     tail.spanFind[Source] match {
-      case (_, Some((source, tail))) => (s"${source.genericShortPosition}$onlyPositionText", tail)
+      case (_, Some((source, tail))) =>
+        (s"${source.genericShortPosition}$onlyPositionText", tail)
       case (_, None) => ("broken position", tail)
     }
 }
 
-/**
- * A sequence of OriginContents. This sequence can be mutated (add, remove, replace) for convenience.
-* @param originContents The known origin contents at the time of Origin creation. Can be empty for a new Origin.
- */
-final case class Origin(originContents: Seq[OriginContent]) extends Blame[VerificationFailure] with HasContext {
+/** A sequence of OriginContents. This sequence can be mutated (add, remove,
+  * replace) for convenience.
+  * @param originContents
+  *   The known origin contents at the time of Origin creation. Can be empty for
+  *   a new Origin.
+  */
+final case class Origin(originContents: Seq[OriginContent])
+    extends Blame[VerificationFailure] with HasContext {
   def tail: Origin = Origin(originContents.tail)
 
   def find[T <: OriginContent](implicit tag: ClassTag[T]): Option[T] =
-    originContents.collectFirst {
-      case t: T => t
-    }
+    originContents.collectFirst { case t: T => t }
 
   def findAll[T <: OriginContent](implicit tag: ClassTag[T]): Seq[T] =
-    originContents.collect {
-      case t: T => t
-    }
+    originContents.collect { case t: T => t }
 
   def span[T <: OriginContent](implicit tag: ClassTag[T]): (Origin, Origin) = {
     val (left, right) = originContents.span {
@@ -224,7 +273,9 @@ final case class Origin(originContents: Seq[OriginContent]) extends Blame[Verifi
     (Origin(left), Origin(right))
   }
 
-  def spanFind[T <: OriginContent](implicit tag: ClassTag[T]): (Origin, Option[(T, Origin)]) = {
+  def spanFind[T <: OriginContent](
+      implicit tag: ClassTag[T]
+  ): (Origin, Option[(T, Origin)]) = {
     val (left, Origin(right)) = span[T]
 
     right.headOption match {
@@ -240,24 +291,22 @@ final case class Origin(originContents: Seq[OriginContent]) extends Blame[Verifi
     Origin(content +: originContents)
 
   def where(
-    context: String = null,
-    name: String = null,
-    prefix: String = null,
-    indirect: Name = null,
-  ): Origin = Origin(
-    Option(context).map(LabelContext).toSeq ++
-      Option(name).map(name => PreferredName(Seq(name))).toSeq ++
-      Option(indirect).map(name => IndirectName(name)).toSeq ++
-      Option(prefix).map(NamePrefix).to(Seq) ++
-      originContents
-  )
-
-  /**
-   * Do not use to indicate a preferred name. This is to indicate the formal
-   * source name in the input. Use where(name = ...) instead.
-   */
-  def sourceName(name: String): Origin =
-    withContent(SourceName(name))
+      context: String = null,
+      name: String = null,
+      prefix: String = null,
+      indirect: Name = null,
+  ): Origin =
+    Origin(
+      Option(context).map(LabelContext).toSeq ++ Option(name)
+        .map(name => PreferredName(Seq(name))).toSeq ++ Option(indirect)
+        .map(name => IndirectName(name)).toSeq ++ Option(prefix).map(NamePrefix)
+        .to(Seq) ++ originContents
+    )
+
+  /** Do not use to indicate a preferred name. This is to indicate the formal
+    * source name in the input. Use where(name = ...) instead.
+    */
+  def sourceName(name: String): Origin = withContent(SourceName(name))
 
 //  def addStartEndLines(startIdx: Int, endIdx: Int): Origin =
 //    withContent(StartEndLines(startIdx, endIdx))
@@ -266,7 +315,8 @@ final case class Origin(originContents: Seq[OriginContent]) extends Blame[Verifi
 //    withContent(OriginCols(cols))
 
   def getPreferredName: Option[Name] =
-    originContents.headOption.flatMap(_.name(tail).orElse(tail.getPreferredName))
+    originContents.headOption
+      .flatMap(_.name(tail).orElse(tail.getPreferredName))
 
   def getPreferredNameOrElse(name: Seq[String] = Seq("unknown")): Name =
     getPreferredName.getOrElse(Name.Preferred(name))
@@ -279,23 +329,25 @@ final case class Origin(originContents: Seq[OriginContent]) extends Blame[Verifi
     context.map(_.mkString("\n" + HR)).getOrElse("[unknown context]")
 
   def inlineContext(compress: Boolean = true): Option[Seq[String]] =
-    originContents.headOption.flatMap(_.inlineContext(tail, compress).orElse(tail.inlineContext(compress)))
+    originContents.headOption.flatMap(
+      _.inlineContext(tail, compress).orElse(tail.inlineContext(compress))
+    )
 
   def inlineContextText: String =
     inlineContext(true).map(_.mkString(" > ")).getOrElse("[unknown context]")
 
   def shortPosition: Option[String] =
-    originContents.headOption.flatMap(_.shortPosition(tail).orElse(tail.shortPosition))
+    originContents.headOption
+      .flatMap(_.shortPosition(tail).orElse(tail.shortPosition))
 
-  def shortPositionText: String =
-    shortPosition.getOrElse("[unknown position]")
+  def shortPositionText: String = shortPosition.getOrElse("[unknown position]")
 
   override def blame(error: VerificationFailure): Unit = {
     Logger("vct").error(error.toString)
   }
 
   def renderProgress(message: String, short: Boolean): ProgressRender =
-    if(short)
+    if (short)
       ProgressRender(s"$message `$inlineContextText`")
     else {
       val lines = messageInContext(message).split("\n").toSeq
@@ -314,36 +366,51 @@ object InputOrigin {
     // ANTLR points past the last line when pointing at an EOF immediately following a newline, hence the extra line.
     val lines = readable.readLines().map(_ + "  ") :+ " "
 
-    val clamp = (line: Int) => Math.max(0, Math.min(lines.size-1, line))
-    val clampCol = (line: Int, col: Int) => Math.max(0, Math.min(lines(line).length-1, col))
-    val numberedLine = (text: String, line: Int) => String.format("%" + f"$LINE_NUMBER_WIDTH" + "d  %s\n", Int.box(line+1), text.dropRight(2))
-    val replacementDash = (c: Char) => c match {
-      case '\t' => "\t" // perhaps derive the tab width from terminal information at some point
-      case _ => "-"
-    }
-    val replacementWhitespace = (c: Char) => c match {
-      case '\t' => "\t"
-      case _ => " "
-    }
+    val clamp = (line: Int) => Math.max(0, Math.min(lines.size - 1, line))
+    val clampCol =
+      (line: Int, col: Int) =>
+        Math.max(0, Math.min(lines(line).length - 1, col))
+    val numberedLine =
+      (text: String, line: Int) =>
+        String.format(
+          "%" + f"$LINE_NUMBER_WIDTH" + "d  %s\n",
+          Int.box(line + 1),
+          text.dropRight(2),
+        )
+    val replacementDash =
+      (c: Char) =>
+        c match {
+          case '\t' =>
+            "\t" // perhaps derive the tab width from terminal information at some point
+          case _ => "-"
+        }
+    val replacementWhitespace =
+      (c: Char) =>
+        c match {
+          case '\t' => "\t"
+          case _ => " "
+        }
 
     val startLineIdx = clamp(position.startLineIdx)
     val endLineIdx = clamp(position.endLineIdx)
-    val cols = position.startEndColIdx.map {
-      case (startColIdx, endColIdx) => (clampCol(startLineIdx, startColIdx), clampCol(endLineIdx, endColIdx))
+    val cols = position.startEndColIdx.map { case (startColIdx, endColIdx) =>
+      (clampCol(startLineIdx, startColIdx), clampCol(endLineIdx, endColIdx))
     }
 
     require(startLineIdx <= endLineIdx)
-    require(startLineIdx != endLineIdx || cols.isEmpty || cols.get._1 <= cols.get._2)
+    require(
+      startLineIdx != endLineIdx || cols.isEmpty || cols.get._1 <= cols.get._2
+    )
 
     val firstLineIdx = clamp(startLineIdx - CONTEXT)
     val startContextEnd = clamp(startLineIdx + CONTEXT) + 1
     val endContextStart = clamp(endLineIdx - CONTEXT)
-    val endContextEnd = Math.min(lines.size-1, endLineIdx + CONTEXT) + 1
+    val endContextEnd = Math.min(lines.size - 1, endLineIdx + CONTEXT) + 1
 
     val result = new StringBuilder
 
     // Print any context lines before the first line
-    for((line, idx) <- lines.zipWithIndex.slice(firstLineIdx, startLineIdx)) {
+    for ((line, idx) <- lines.zipWithIndex.slice(firstLineIdx, startLineIdx)) {
       result.append(numberedLine(line, idx))
     }
 
@@ -358,48 +425,54 @@ object InputOrigin {
         result.append("\n")
       case Some((startColIdx, endColIdx)) =>
         // Leave room for [ if we start at the first character
-        if(startColIdx != 0) result.append(" ")
+        if (startColIdx != 0)
+          result.append(" ")
 
         // Print whitespace, but leave room for [ just before the first character
-        lines(startLineIdx).take(startColIdx-1).map(replacementWhitespace).foreach(result.append)
+        lines(startLineIdx).take(startColIdx - 1).map(replacementWhitespace)
+          .foreach(result.append)
         result.append("[")
         // If [ stands in for a tab, follow it with a tab to align again. This is wrong when the tab normalizes to only one space. ¯\_(ツ)_/¯
-        if(lines(startLineIdx)(startColIdx) == '\t') result.append('\t')
+        if (lines(startLineIdx)(startColIdx) == '\t')
+          result.append('\t')
 
-        if(startLineIdx == endLineIdx) {
+        if (startLineIdx == endLineIdx) {
           // Print dashes until endColIdx, as the start and end line coincide.
-          lines(startLineIdx).slice(startColIdx, endColIdx).map(replacementDash).foreach(result.append)
+          lines(startLineIdx).slice(startColIdx, endColIdx).map(replacementDash)
+            .foreach(result.append)
         } else {
           // If the start and end line are inequal, print dashes until the end of the line.
-          lines(startLineIdx).drop(startColIdx).map(replacementDash).foreach(result.append)
+          lines(startLineIdx).drop(startColIdx).map(replacementDash)
+            .foreach(result.append)
         }
 
         result.append("\n")
     }
 
-    if(startContextEnd < endContextStart) {
+    if (startContextEnd < endContextStart) {
       // There are lines between the end of the starting context and the start of the ending context.
       // We have to print an ellipsis between them.
 
       // Print the tail of the start context
-      for((line, idx) <- lines.zipWithIndex.slice(startLineIdx, startContextEnd)) {
-        result.append(numberedLine(line, idx))
-      }
+      for (
+        (line, idx) <- lines.zipWithIndex.slice(startLineIdx, startContextEnd)
+      ) { result.append(numberedLine(line, idx)) }
 
       // An ellipsis inbetween...
       result.append(" " * LINE_NUMBER_WIDTH)
-      result.append(f"  ... (${endContextStart - startContextEnd} lines omitted)\n")
+      result
+        .append(f"  ... (${endContextStart - startContextEnd} lines omitted)\n")
 
       // And the start of the end context + the end line.
-      for((line, idx) <- lines.zipWithIndex.slice(endContextStart, endLineIdx+1)) {
-        result.append(numberedLine(line, idx))
-      }
+      for (
+        (line, idx) <- lines.zipWithIndex.slice(endContextStart, endLineIdx + 1)
+      ) { result.append(numberedLine(line, idx)) }
     } else {
       // The start context and end context connect, so just print lines up to and including the ending line
       // If the start and end line coincide, this just prints nothing.
-      for((line, idx) <- lines.zipWithIndex.slice(startLineIdx, endLineIdx+1)) {
-        result.append(numberedLine(line, idx))
-      }
+      for (
+        (line, idx) <- lines.zipWithIndex.slice(startLineIdx, endLineIdx + 1)
+      ) { result.append(numberedLine(line, idx)) }
     }
 
     // Indent for the ending context
@@ -411,22 +484,25 @@ object InputOrigin {
         lines(endLineIdx).toSeq.map(replacementDash).foreach(result.append)
         result.append("]\n")
       case Some((startColIdx, endColIdx)) =>
-        if(startLineIdx == endLineIdx) {
+        if (startLineIdx == endLineIdx) {
           // When the start and end line coincide, print whitespace before the dashes until the start column
-          lines(endLineIdx).take(startColIdx).map(replacementWhitespace).foreach(result.append)
-          lines(endLineIdx).slice(startColIdx, endColIdx).map(replacementDash).foreach(result.append)
+          lines(endLineIdx).take(startColIdx).map(replacementWhitespace)
+            .foreach(result.append)
+          lines(endLineIdx).slice(startColIdx, endColIdx).map(replacementDash)
+            .foreach(result.append)
         } else {
           // When the start and end line are distinct, just fill the line with dashes until the end column.
-          lines(endLineIdx).take(endColIdx).map(replacementDash).foreach(result.append)
+          lines(endLineIdx).take(endColIdx).map(replacementDash)
+            .foreach(result.append)
         }
 
         result.append("]\n")
     }
 
     // Finally, we have to print the tail of the end context.
-    for((line, idx) <- lines.zipWithIndex.slice(endLineIdx+1, endContextEnd)) {
-      result.append(numberedLine(line, idx))
-    }
+    for (
+      (line, idx) <- lines.zipWithIndex.slice(endLineIdx + 1, endContextEnd)
+    ) { result.append(numberedLine(line, idx)) }
 
     result.toString().stripTrailing()
   }
@@ -437,32 +513,42 @@ object InputOrigin {
   def compressInlineText(text: String): String = {
     val sanitized = sanitizeInlineText(text)
 
-    if(sanitized.length > MAX_INLINE_CONTEXT_WIDTH) {
+    if (sanitized.length > MAX_INLINE_CONTEXT_WIDTH) {
       val len = MAX_INLINE_CONTEXT_WIDTH - INLINE_CONTEXT_ELLIPSIS.length
       val startLen = len / 2
       val endLen = len - startLen
 
-      sanitizeInlineText(sanitized.take(startLen)) +
-        INLINE_CONTEXT_ELLIPSIS +
+      sanitizeInlineText(sanitized.take(startLen)) + INLINE_CONTEXT_ELLIPSIS +
         sanitizeInlineText(sanitized.takeRight(endLen))
-    } else {
-      sanitized
-    }
+    } else { sanitized }
   }
 
-  def inlineContext(readable: Readable, position: PositionRange, compress: Boolean = true): String = {
-    def compressF: String => String = if(compress) compressInlineText else identity[String]
-    readable.readLines().slice(position.startLineIdx, position.endLineIdx + 1) match {
+  def inlineContext(
+      readable: Readable,
+      position: PositionRange,
+      compress: Boolean = true,
+  ): String = {
+    def compressF: String => String =
+      if (compress)
+        compressInlineText
+      else
+        identity[String]
+    readable.readLines()
+      .slice(position.startLineIdx, position.endLineIdx + 1) match {
       case Nil => "(empty source region)"
-      case line +: Nil => position.startEndColIdx match {
-        case None => compressF(line)
-        case Some((start, end)) => compressF(line.slice(start, end))
-      }
+      case line +: Nil =>
+        position.startEndColIdx match {
+          case None => compressF(line)
+          case Some((start, end)) => compressF(line.slice(start, end))
+        }
       case first +: moreLines =>
         val (context, last) = (moreLines.init, moreLines.last)
         position.startEndColIdx match {
           case None => compressF((first +: context :+ last).mkString("\n"))
-          case Some((start, end)) => compressF((first.drop(start) +: context :+ last.take(end)).mkString("\n"))
+          case Some((start, end)) =>
+            compressF(
+              (first.drop(start) +: context :+ last.take(end)).mkString("\n")
+            )
         }
     }
   }
@@ -471,6 +557,5 @@ object InputOrigin {
 case class BlameCollector() extends Blame[VerificationFailure] {
   val errs: ArrayBuffer[VerificationFailure] = ArrayBuffer()
 
-  override def blame(error: VerificationFailure): Unit =
-    errs += error
-}
\ No newline at end of file
+  override def blame(error: VerificationFailure): Unit = errs += error
+}
diff --git a/src/col/vct/col/print/Ctx.scala b/src/col/vct/col/print/Ctx.scala
index ca694ebb34..1962f9f8d6 100644
--- a/src/col/vct/col/print/Ctx.scala
+++ b/src/col/vct/col/print/Ctx.scala
@@ -17,11 +17,11 @@ object Ctx {
 }
 
 case class Ctx(
-  syntax: Ctx.Syntax = Ctx.PVL,
-  width: Int = 120,
-  tabWidth: Int = 4,
-  names: Map[Declaration[_], String] = Map.empty,
-  inSpec: Boolean = false,
+    syntax: Ctx.Syntax = Ctx.PVL,
+    width: Int = 120,
+    tabWidth: Int = 4,
+    names: Map[Declaration[_], String] = Map.empty,
+    inSpec: Boolean = false,
 ) {
   def namesIn[G](node: Node[G]): Ctx =
     copy(names = {
@@ -31,9 +31,14 @@ case class Ctx(
     })
 
   def name(decl: Declaration[_]): String = {
-    val name = names.getOrElse(decl, s"${decl.o.getPreferredNameOrElse().ucamel}_${decl.hashCode()}")
-    if((inSpec || syntax == Ctx.PVL) && Keywords.SPEC.contains(name)) "`" + name + "`"
-    else name
+    val name = names.getOrElse(
+      decl,
+      s"${decl.o.getPreferredNameOrElse().ucamel}_${decl.hashCode()}",
+    )
+    if ((inSpec || syntax == Ctx.PVL) && Keywords.SPEC.contains(name))
+      "`" + name + "`"
+    else
+      name
   }
 
   def name(ref: Ref[_, _ <: Declaration[_]]): String =
diff --git a/src/col/vct/col/print/Doc.scala b/src/col/vct/col/print/Doc.scala
index e433e1dd54..31310bdd4d 100644
--- a/src/col/vct/col/print/Doc.scala
+++ b/src/col/vct/col/print/Doc.scala
@@ -7,9 +7,10 @@ import java.lang
 import scala.annotation.tailrec
 
 object Show {
-  def lazily(f: Ctx => Doc): Show = new Show {
-    override def show(implicit ctx: Ctx): Doc = f(ctx)
-  }
+  def lazily(f: Ctx => Doc): Show =
+    new Show {
+      override def show(implicit ctx: Ctx): Doc = f(ctx)
+    }
 }
 
 trait Show {
@@ -29,8 +30,7 @@ case object Doc {
   def fold(docs: Iterable[Show])(f: (Doc, Doc) => Doc)(implicit ctx: Ctx): Doc =
     docs.map(_.show).filter(_.nonEmpty).reduceLeftOption(f).getOrElse(Empty)
 
-  def spread(docs: Iterable[Show])(implicit ctx: Ctx): Doc =
-    fold(docs)(_ <+> _)
+  def spread(docs: Iterable[Show])(implicit ctx: Ctx): Doc = fold(docs)(_ <+> _)
 
   def rspread(docs: Iterable[Show])(implicit ctx: Ctx): Doc =
     fold(docs.map(_.show <+> Empty))(_ <> _)
@@ -38,65 +38,64 @@ case object Doc {
   def lspread(docs: Iterable[Show])(implicit ctx: Ctx): Doc =
     fold(docs.map(Empty <+> _.show))(_ <> _)
 
-  def stack(docs: Iterable[Show])(implicit ctx: Ctx): Doc =
-    fold(docs)(_ <+/> _)
+  def stack(docs: Iterable[Show])(implicit ctx: Ctx): Doc = fold(docs)(_ <+/> _)
 
   def arg(doc: Show)(implicit ctx: Ctx): Doc =
     Nest(NonWsLine <> doc) <> NonWsLine
 
   def args(docs: Iterable[Show])(implicit ctx: Ctx): Doc =
-    if(docs.nonEmpty) arg(fold(docs)(_ <> "," <+/> _))
-    else Empty
+    if (docs.nonEmpty)
+      arg(fold(docs)(_ <> "," <+/> _))
+    else
+      Empty
 
   def inlineSpec(doc: Show)(implicit ctx: Ctx): Doc =
-    if(ctx.syntax == Ctx.PVL) doc.show
-    else if(ctx.inSpec) doc.show
+    if (ctx.syntax == Ctx.PVL)
+      doc.show
+    else if (ctx.inSpec)
+      doc.show
     else {
       val d = doc.show(ctx.copy(inSpec = true))
-      if(d.nonEmpty) Text("/*@") <+> d <+> "@*/"
-      else Empty
+      if (d.nonEmpty)
+        Text("/*@") <+> d <+> "@*/"
+      else
+        Empty
     }
 
   def spec(doc: Show)(implicit ctx: Ctx): Doc =
-    if (ctx.syntax == Ctx.PVL) doc.show
-    else if (ctx.inSpec) doc.show
+    if (ctx.syntax == Ctx.PVL)
+      doc.show
+    else if (ctx.inSpec)
+      doc.show
     else {
       val d = doc.show(ctx.copy(inSpec = true))
-      if (d.nonEmpty) Text("/*@") <+/> d <+/> "@*/"
-      else Empty
+      if (d.nonEmpty)
+        Text("/*@") <+/> d <+/> "@*/"
+      else
+        Empty
     }
 }
 
-/**
-  * This is an implementation of A prettier printer by Philip Wadler, accessible here:
-  * https://homepages.inf.ed.ac.uk/wadler/papers/prettier/prettier.pdf
+/** This is an implementation of A prettier printer by Philip Wadler, accessible
+  * here: https://homepages.inf.ed.ac.uk/wadler/papers/prettier/prettier.pdf
   *
   * We've made a couple modifications to suit our purposes:
   *
-  * (1) There is a newline that is not flattened into a space, but into no text, to support our layout for invocations
-  *     that are split over lines:
-  *     e.g.:
+  * (1) There is a newline that is not flattened into a space, but into no text,
+  * to support our layout for invocations that are split over lines: e.g.:
   *
-  *     someMethod(
-  *         1,
-  *         2,
-  *         3
-  *     )
+  * someMethod( 1, 2, 3 )
   *
-  *     would otherwise be flattened into someMethod( 1, 2, 3 ), so the initial and last newline are non-whitespace
-  *     newlines:
+  * would otherwise be flattened into someMethod( 1, 2, 3 ), so the initial and
+  * last newline are non-whitespace newlines:
   *
-  *     someMethod(`</>`
-  *       1,`<+/>`
-  *       2,`<+/>`
-  *       3,`</>`
-  *     )
-  * (2) Group is an explicit data structure, as defined: Group(x) = flatten x <|> x. Note that contrary to the canonical
-  *     definition, <+/> does not introduce an alternative - it is typically grouped in a larger expression, to prefer
-  *     splitting larger trees over lines.
-  * (3) be includes additional state to track whether an element needs to be flattened.
-  * (4) NodeDoc associates a node in the AST with a Doc in the rendered tree, for additional post-processing of the
-  *     layout.
+  * someMethod(`</>` 1,`<+/>` 2,`<+/>` 3,`</>` ) (2) Group is an explicit data
+  * structure, as defined: Group(x) = flatten x <|> x. Note that contrary to the
+  * canonical definition, <+/> does not introduce an alternative - it is
+  * typically grouped in a larger expression, to prefer splitting larger trees
+  * over lines. (3) be includes additional state to track whether an element
+  * needs to be flattened. (4) NodeDoc associates a node in the AST with a Doc
+  * in the rendered tree, for additional post-processing of the layout.
   */
 sealed trait Doc extends Show {
   def show(implicit ctx: Ctx): Doc = this
@@ -113,90 +112,118 @@ sealed trait Doc extends Show {
   def <>>(other: String)(implicit ctx: Ctx): Doc = this <>> Text(other)
 
   sealed trait Elem {
-    def write(a: Appendable): Unit = this match {
-      case EText(text) => a.append(text)
-      case ELine(indent) => a.append("\n").append(" ".repeat(indent))
-      case EStart(_) =>
-      case EEnd(_) =>
-    }
+    def write(a: Appendable): Unit =
+      this match {
+        case EText(text) => a.append(text)
+        case ELine(indent) => a.append("\n").append(" ".repeat(indent))
+        case EStart(_) =>
+        case EEnd(_) =>
+      }
   }
   case class EText(text: String) extends Elem
   case class ELine(indent: Int) extends Elem
   case class EStart(node: Node[_]) extends Elem {
     override def hashCode(): Int = System.identityHashCode(node)
-    override def equals(obj: Any): Boolean = obj match {
-      case EStart(other) => node.eq(other)
-      case _ => false
-    }
+    override def equals(obj: Any): Boolean =
+      obj match {
+        case EStart(other) => node.eq(other)
+        case _ => false
+      }
   }
   case class EEnd(node: Node[_]) extends Elem {
     override def hashCode(): Int = System.identityHashCode(node) ^ 1
-    override def equals(obj: Any): Boolean = obj match {
-      case EEnd(other) => node.eq(other)
-      case _ => false
-    }
+    override def equals(obj: Any): Boolean =
+      obj match {
+        case EEnd(other) => node.eq(other)
+        case _ => false
+      }
   }
 
-
-  def lazyListLen(list: LazyList[Elem]): Int = list match {
-    case LazyList() => 0
-    case EText(text) #:: tail => text.length + lazyListLen(tail)
-    case EStart(_) #:: tail => lazyListLen(tail)
-    case EEnd(_) #:: tail => lazyListLen(tail)
-    case ELine(indent) #:: tail => 1 + indent + lazyListLen(tail)
-  }
+  def lazyListLen(list: LazyList[Elem]): Int =
+    list match {
+      case LazyList() => 0
+      case EText(text) #:: tail => text.length + lazyListLen(tail)
+      case EStart(_) #:: tail => lazyListLen(tail)
+      case EEnd(_) #:: tail => lazyListLen(tail)
+      case ELine(indent) #:: tail => 1 + indent + lazyListLen(tail)
+    }
 
   @tailrec
-  private def fits(spent: Int, elems: LazyList[Elem])(implicit ctx: Ctx): Boolean = elems match {
-    case _ if spent > ctx.width => false
-    case LazyList() => true
-    case EText(t) #:: elems => fits(spent + t.length, elems)
-    case ELine(_) #:: _ => true
-    case EStart(_) #:: tail => fits(spent, tail)
-    case EEnd(_) #:: tail => fits(spent, tail)
-  }
-
-  private def better(spent: Int, x: LazyList[Elem], y: LazyList[Elem])(implicit ctx: Ctx): LazyList[Elem] =
-    if(fits(spent, x)) x else y
+  private def fits(spent: Int, elems: LazyList[Elem])(
+      implicit ctx: Ctx
+  ): Boolean =
+    elems match {
+      case _ if spent > ctx.width => false
+      case LazyList() => true
+      case EText(t) #:: elems => fits(spent + t.length, elems)
+      case ELine(_) #:: _ => true
+      case EStart(_) #:: tail => fits(spent, tail)
+      case EEnd(_) #:: tail => fits(spent, tail)
+    }
 
-  private def be(spent: Int, docs: Seq[(Int, Boolean, Seq[Node[_]], Doc)])(implicit ctx: Ctx): LazyList[Elem] = docs match {
-    case Nil => LazyList.empty
-    case (_, _, nes, Empty) +: docs => nes.map(EEnd).to(LazyList) #::: be(spent, docs)
-    case (i, f, nes, NodeDoc(node, x)) +: docs => EStart(node) #:: be(spent, (i, f, nes :+ node, x) +: docs)
-    case (i, f, nes, Cons(x, y)) +: docs => be(spent, (i, f, Nil, x) +: (i, f, nes, y) +: docs)
-    case (i, f, nes, Nest(x)) +: docs => be(spent, (i+ctx.tabWidth, f, nes, x) +: docs)
-    case (_, _, nes, Text(t)) +: docs => EText(t) #:: nes.map(EEnd).to(LazyList) #::: be(spent + t.length, docs)
-    case (i, false, nes, Line | NonWsLine) +: docs => ELine(i) #:: nes.map(EEnd).to(LazyList) #::: be(i, docs)
-    case (_, true, nes, Line) +: docs => EText(" ") #:: nes.map(EEnd).to(LazyList) #::: be(spent + 1, docs)
-    case (_, true, nes, NonWsLine) +: docs => nes.map(EEnd).to(LazyList) #::: be(spent, docs)
-    case (i, true, nes, Group(x)) +: docs => be(spent, (i, true, nes, x) +: docs)
-    case (i, false, nes, Group(x)) +: docs => better(
-      spent,
-      be(spent, (i, true, nes, x) +: docs),
-      be(spent, (i, false, nes, x) +: docs),
-    )
-  }
+  private def better(spent: Int, x: LazyList[Elem], y: LazyList[Elem])(
+      implicit ctx: Ctx
+  ): LazyList[Elem] =
+    if (fits(spent, x))
+      x
+    else
+      y
+
+  private def be(spent: Int, docs: Seq[(Int, Boolean, Seq[Node[_]], Doc)])(
+      implicit ctx: Ctx
+  ): LazyList[Elem] =
+    docs match {
+      case Nil => LazyList.empty
+      case (_, _, nes, Empty) +: docs =>
+        nes.map(EEnd).to(LazyList) #::: be(spent, docs)
+      case (i, f, nes, NodeDoc(node, x)) +: docs =>
+        EStart(node) #:: be(spent, (i, f, nes :+ node, x) +: docs)
+      case (i, f, nes, Cons(x, y)) +: docs =>
+        be(spent, (i, f, Nil, x) +: (i, f, nes, y) +: docs)
+      case (i, f, nes, Nest(x)) +: docs =>
+        be(spent, (i + ctx.tabWidth, f, nes, x) +: docs)
+      case (_, _, nes, Text(t)) +: docs =>
+        EText(t) #:: nes.map(EEnd).to(LazyList) #::: be(spent + t.length, docs)
+      case (i, false, nes, Line | NonWsLine) +: docs =>
+        ELine(i) #:: nes.map(EEnd).to(LazyList) #::: be(i, docs)
+      case (_, true, nes, Line) +: docs =>
+        EText(" ") #:: nes.map(EEnd).to(LazyList) #::: be(spent + 1, docs)
+      case (_, true, nes, NonWsLine) +: docs =>
+        nes.map(EEnd).to(LazyList) #::: be(spent, docs)
+      case (i, true, nes, Group(x)) +: docs =>
+        be(spent, (i, true, nes, x) +: docs)
+      case (i, false, nes, Group(x)) +: docs =>
+        better(
+          spent,
+          be(spent, (i, true, nes, x) +: docs),
+          be(spent, (i, false, nes, x) +: docs),
+        )
+    }
 
   def pretty(implicit ctx: Ctx): LazyList[Elem] =
     be(0, Seq((0, false, Nil, this)))
 
-  def nonEmpty: Boolean = this match {
-    case Empty => false
-    case NonWsLine => true
-    case Line => true
-    case Cons(left, right) => left.nonEmpty || right.nonEmpty
-    case Text(text) => text.nonEmpty
-    case Nest(doc) => doc.nonEmpty
-    case Group(doc) => doc.nonEmpty
-    case NodeDoc(_, doc) => doc.nonEmpty
-  }
-
-  def splitOn[A](list: LazyList[A])(predicate: A => Boolean): LazyList[LazyList[A]] = {
-    def loop(l: LazyList[A], acc: LazyList[A]): LazyList[LazyList[A]] = l match {
-      case LazyList() => LazyList(acc)
-      case h #:: t if predicate(h) => acc #:: loop(t, LazyList(h))
-      case h #:: t => loop(t, acc :+ h)
+  def nonEmpty: Boolean =
+    this match {
+      case Empty => false
+      case NonWsLine => true
+      case Line => true
+      case Cons(left, right) => left.nonEmpty || right.nonEmpty
+      case Text(text) => text.nonEmpty
+      case Nest(doc) => doc.nonEmpty
+      case Group(doc) => doc.nonEmpty
+      case NodeDoc(_, doc) => doc.nonEmpty
     }
+
+  def splitOn[A](
+      list: LazyList[A]
+  )(predicate: A => Boolean): LazyList[LazyList[A]] = {
+    def loop(l: LazyList[A], acc: LazyList[A]): LazyList[LazyList[A]] =
+      l match {
+        case LazyList() => LazyList(acc)
+        case h #:: t if predicate(h) => acc #:: loop(t, LazyList(h))
+        case h #:: t => loop(t, acc :+ h)
+      }
     loop(list, LazyList())
   }
 
@@ -209,13 +236,12 @@ sealed trait Doc extends Show {
       case other => other
     })
 
-
-
   def highlight(node: Node[_])(implicit ctx: Ctx): String = {
-    val lineNumber = (line: Int) => String.format("%" + f"$LINE_NUMBER_WIDTH" + "d ", line)
+    val lineNumber =
+      (line: Int) => String.format("%" + f"$LINE_NUMBER_WIDTH" + "d ", line)
 
     val sb = new lang.StringBuilder()
-    val (prefix, rest)= lines.zipWithIndex.span(!_._1.contains(EStart(node)))
+    val (prefix, rest) = lines.zipWithIndex.span(!_._1.contains(EStart(node)))
     val (highlightInit, rest1) = rest.span(!_._1.contains(EEnd(node)))
     if (rest1.isEmpty) {
       sb.append("⋱\n")
@@ -233,18 +259,30 @@ sealed trait Doc extends Show {
       lineWithIndex._1.foreach(_.write(sb))
       sb.append("\n")
     }
-    val indicatorStart = lazyListLen(highlight.map(_._1).head.takeWhile(_ != EStart(node)))
-    val indicatorEnd = lazyListLen(highlight.map(_._1).head.takeWhile(_ != EEnd(node)))
-    sb.append(" ".repeat(indicatorStart + LINE_NUMBER_WIDTH)).append("[").append("-".repeat(indicatorEnd-indicatorStart))
+    val indicatorStart = lazyListLen(
+      highlight.map(_._1).head.takeWhile(_ != EStart(node))
+    )
+    val indicatorEnd = lazyListLen(
+      highlight.map(_._1).head.takeWhile(_ != EEnd(node))
+    )
+    sb.append(" ".repeat(indicatorStart + LINE_NUMBER_WIDTH)).append("[")
+      .append("-".repeat(indicatorEnd - indicatorStart))
     highlight.foreach { lineWithIndex =>
       sb.append("\n")
       sb.append(lineNumber(lineWithIndex._2 + 1))
       lineWithIndex._1.foreach(_.write(sb))
     }
-    val endIndicatorStart = if (highlight.size == 1) indicatorStart else 0
-    val endIndicatorEnd = lazyListLen(highlight.map(_._1).last.takeWhile(_ != EEnd(node)))
+    val endIndicatorStart =
+      if (highlight.size == 1)
+        indicatorStart
+      else
+        0
+    val endIndicatorEnd = lazyListLen(
+      highlight.map(_._1).last.takeWhile(_ != EEnd(node))
+    )
     sb.append("\n")
-    sb.append(" ".repeat(endIndicatorStart + LINE_NUMBER_WIDTH + 1)).append("-".repeat(endIndicatorEnd - endIndicatorStart)).append("]")
+    sb.append(" ".repeat(endIndicatorStart + LINE_NUMBER_WIDTH + 1))
+      .append("-".repeat(endIndicatorEnd - endIndicatorStart)).append("]")
     suffix.take(2).foreach { lineWithIndex =>
       sb.append("\n")
       sb.append(lineNumber(lineWithIndex._2 + 1))
diff --git a/src/col/vct/col/print/DocUtil.scala b/src/col/vct/col/print/DocUtil.scala
index 4b1a3b1002..c350806442 100644
--- a/src/col/vct/col/print/DocUtil.scala
+++ b/src/col/vct/col/print/DocUtil.scala
@@ -9,34 +9,73 @@ object DocUtil {
     AstBuildHelpers.unfoldStar(e).map(_.show)
 
   def splitClauses(e: AccountedPredicate[_])(implicit ctx: Ctx): Seq[Doc] =
-    AstBuildHelpers.unfoldPredicate(e).flatMap(AstBuildHelpers.unfoldStar).map(_.show)
+    AstBuildHelpers.unfoldPredicate(e).flatMap(AstBuildHelpers.unfoldStar)
+      .map(_.show)
 
   def clauses(key: String, e: Expr[_])(implicit ctx: Ctx): Doc =
-    Doc.stack(splitClauses(e).map(Text(key) <+> _ <> (if(ctx.syntax == Ctx.Silver) "" else ";")))
+    Doc.stack(splitClauses(e).map(
+      Text(key) <+> _ <>
+        (if (ctx.syntax == Ctx.Silver)
+           ""
+         else
+           ";")
+    ))
 
   def clauses(key: String, e: AccountedPredicate[_])(implicit ctx: Ctx): Doc =
-    Doc.stack(splitClauses(e).map(Text(key) <+> _ <> (if(ctx.syntax == Ctx.Silver) "" else ";")))
-
-  def givenYieldsMapping(keyword: String, mapping: Seq[(Doc, Doc)])(implicit ctx: Ctx): Doc =
-    if(mapping.isEmpty) Empty
-    else Nest(Line <> Group(Text(keyword) <+> "{" <> Doc.args(mapping.map(p => p._1 <+> "=" <+> p._2)) <> "}"))
-
-  def givenYields[G](given: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])])(implicit ctx: Ctx): Doc =
-    Doc.inlineSpec(Show.lazily(givenYieldsMapping("given", given.map { case (ref, e) => Text(ctx.name(ref)) -> e.show })(_))) <>
-      Doc.inlineSpec(Show.lazily(givenYieldsMapping("yields", yields.map { case (e, ref) => e.show -> Text(ctx.name(ref)) })(_)))
-
-  def argsOutArgs[G](args: Seq[Expr[G]], outArgs: Seq[Expr[G]])(implicit ctx: Ctx): Doc = outArgs match {
-    case Seq() => Doc.args(args)
-    case _ => Doc.args(args) <> ";" <+> Doc.args(outArgs)
-  }
-
-  def javaGenericArgs[G](args: Seq[Type[G]])(implicit ctx: Ctx): Doc = args match {
-    case Seq() => Empty
-    case _ => Text("<") <> Doc.args(args) <> ">"
-  }
-
-  def javaGenericParams[G](args: Seq[Variable[G]])(implicit ctx: Ctx): Doc = args match {
-    case Seq() => Empty
-    case _ => Text("<") <> Doc.args(args) <> ">"
-  }
+    Doc.stack(splitClauses(e).map(
+      Text(key) <+> _ <>
+        (if (ctx.syntax == Ctx.Silver)
+           ""
+         else
+           ";")
+    ))
+
+  def givenYieldsMapping(keyword: String, mapping: Seq[(Doc, Doc)])(
+      implicit ctx: Ctx
+  ): Doc =
+    if (mapping.isEmpty)
+      Empty
+    else
+      Nest(
+        Line <> Group(
+          Text(keyword) <+> "{" <>
+            Doc.args(mapping.map(p => p._1 <+> "=" <+> p._2)) <> "}"
+        )
+      )
+
+  def givenYields[G](
+      given: Seq[(Ref[G, Variable[G]], Expr[G])],
+      yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+  )(implicit ctx: Ctx): Doc =
+    Doc.inlineSpec(Show.lazily(
+      givenYieldsMapping(
+        "given",
+        given.map { case (ref, e) => Text(ctx.name(ref)) -> e.show },
+      )(_)
+    )) <> Doc.inlineSpec(Show.lazily(
+      givenYieldsMapping(
+        "yields",
+        yields.map { case (e, ref) => e.show -> Text(ctx.name(ref)) },
+      )(_)
+    ))
+
+  def argsOutArgs[G](args: Seq[Expr[G]], outArgs: Seq[Expr[G]])(
+      implicit ctx: Ctx
+  ): Doc =
+    outArgs match {
+      case Seq() => Doc.args(args)
+      case _ => Doc.args(args) <> ";" <+> Doc.args(outArgs)
+    }
+
+  def javaGenericArgs[G](args: Seq[Type[G]])(implicit ctx: Ctx): Doc =
+    args match {
+      case Seq() => Empty
+      case _ => Text("<") <> Doc.args(args) <> ">"
+    }
+
+  def javaGenericParams[G](args: Seq[Variable[G]])(implicit ctx: Ctx): Doc =
+    args match {
+      case Seq() => Empty
+      case _ => Text("<") <> Doc.args(args) <> ">"
+    }
 }
diff --git a/src/col/vct/col/print/Keywords.scala b/src/col/vct/col/print/Keywords.scala
index 66b6e2455e..9bb78ca3c5 100644
--- a/src/col/vct/col/print/Keywords.scala
+++ b/src/col/vct/col/print/Keywords.scala
@@ -2,47 +2,304 @@ package vct.col.print
 
 object Keywords {
   val SPEC: Set[String] = Set(
-    "inline", "assert", "true", "false", "package", "resource", "process", "frac", "zfrac", "bool", "ref",
-    "rational", "seq", "set", "bag", "pointer", "map", "option", "either", "tuple", "type", "any",
-    "nothing", "string", "pure", "thread_local", "bip_annotation", "with", "then", "given", "yields",
-    "axiom", "model", "adt", "prover_type", "prover_function", "modifies", "accessible", "requires",
-    "ensures", "context_everywhere", "context", "loop_invariant", "kernel_invariant", "lock_invariant",
-    "signals", "decreases", "apply", "fold", "unfold", "open", "close", "assume", "inhale", "exhale",
-    "label", "extract", "frame", "outline", "refute", "witness", "ghost", "send", "to", "recv", "from",
-    "transfer", "csl_subject", "spec_ignore", "action", "atomic", "commit", "Reducible", "AddsTo", "APerm",
-    "ArrayPerm", "Contribution", "held", "committed", "HPerm", "idle", "perm", "Perm", "PointsTo",
-    "running", "Some", "Left", "Right", "Value", "none", "None", "write", "read", "empty",
+    "inline",
+    "assert",
+    "true",
+    "false",
+    "package",
+    "resource",
+    "process",
+    "frac",
+    "zfrac",
+    "bool",
+    "ref",
+    "rational",
+    "seq",
+    "set",
+    "bag",
+    "pointer",
+    "map",
+    "option",
+    "either",
+    "tuple",
+    "type",
+    "any",
+    "nothing",
+    "string",
+    "pure",
+    "thread_local",
+    "bip_annotation",
+    "with",
+    "then",
+    "given",
+    "yields",
+    "axiom",
+    "model",
+    "adt",
+    "prover_type",
+    "prover_function",
+    "modifies",
+    "accessible",
+    "requires",
+    "ensures",
+    "context_everywhere",
+    "context",
+    "loop_invariant",
+    "kernel_invariant",
+    "lock_invariant",
+    "signals",
+    "decreases",
+    "apply",
+    "fold",
+    "unfold",
+    "open",
+    "close",
+    "assume",
+    "inhale",
+    "exhale",
+    "label",
+    "extract",
+    "frame",
+    "outline",
+    "refute",
+    "witness",
+    "ghost",
+    "send",
+    "to",
+    "recv",
+    "from",
+    "transfer",
+    "csl_subject",
+    "spec_ignore",
+    "action",
+    "atomic",
+    "commit",
+    "Reducible",
+    "AddsTo",
+    "APerm",
+    "ArrayPerm",
+    "Contribution",
+    "held",
+    "committed",
+    "HPerm",
+    "idle",
+    "perm",
+    "Perm",
+    "PointsTo",
+    "running",
+    "Some",
+    "Left",
+    "Right",
+    "Value",
+    "none",
+    "None",
+    "write",
+    "read",
+    "empty",
   )
 
   val PVL: Set[String] = Set(
-    "inline", "assert", "package", "enum", "class", "seq_program", "seq_run", "kernel", "barrier",
-    "invariant", "constructor", "run", "thread", "endpoint", "if", "else", "while", "for", "goto",
-    "return", "vec", "par", "and", "parallel", "sequential", "block", "lock", "unlock", "wait", "notify",
-    "fork", "join", "communicate", "this", "null", "true", "false", "current_thread", "global", "local",
-    "static", "final", "unfolding", "in", "new", "id", "boolean", "void", "int", "char", "float32",
+    "inline",
+    "assert",
+    "package",
+    "enum",
+    "class",
+    "seq_program",
+    "seq_run",
+    "kernel",
+    "barrier",
+    "invariant",
+    "constructor",
+    "run",
+    "thread",
+    "endpoint",
+    "if",
+    "else",
+    "while",
+    "for",
+    "goto",
+    "return",
+    "vec",
+    "par",
+    "and",
+    "parallel",
+    "sequential",
+    "block",
+    "lock",
+    "unlock",
+    "wait",
+    "notify",
+    "fork",
+    "join",
+    "communicate",
+    "this",
+    "null",
+    "true",
+    "false",
+    "current_thread",
+    "global",
+    "local",
+    "static",
+    "final",
+    "unfolding",
+    "in",
+    "new",
+    "id",
+    "boolean",
+    "void",
+    "int",
+    "char",
+    "float32",
     "float64",
   )
 
   val JAVA: Set[String] = Set(
-    "abstract", "assert", "boolean", "break", "byte", "case", "catch", "char", "class", "const",
-    "continue", "default", "do", "double", "else", "enum", "extends", "final", "finally", "float", "for",
-    "if", "goto", "implements", "import", "instanceof", "int", "interface", "long", "native", "new",
-    "package", "private", "protected", "public", "return", "short", "static", "strictfp", "super",
-    "switch", "synchronized", "this", "throw", "throws", "transient", "try", "void", "volatile", "while",
+    "abstract",
+    "assert",
+    "boolean",
+    "break",
+    "byte",
+    "case",
+    "catch",
+    "char",
+    "class",
+    "const",
+    "continue",
+    "default",
+    "do",
+    "double",
+    "else",
+    "enum",
+    "extends",
+    "final",
+    "finally",
+    "float",
+    "for",
+    "if",
+    "goto",
+    "implements",
+    "import",
+    "instanceof",
+    "int",
+    "interface",
+    "long",
+    "native",
+    "new",
+    "package",
+    "private",
+    "protected",
+    "public",
+    "return",
+    "short",
+    "static",
+    "strictfp",
+    "super",
+    "switch",
+    "synchronized",
+    "this",
+    "throw",
+    "throws",
+    "transient",
+    "try",
+    "void",
+    "volatile",
+    "while",
   )
 
   val C_CPP_GPGPU: Set[String] = Set(
-    "_Alignas", "_Alignof", "_Atomic", "_Bool", "_Complex", "_Generic", "_Imaginary", "_Noreturn",
-    "_Static_assert", "_Thread_local", "__cuda_kernel__", "__opencl_kernel__", "__vercors_atomic__",
-    "__vercors_barrier__", "__vercors_global_mem_fence__", "__vercors_global_memory__",
-    "__vercors_local_mem_fence__", "__vercors_local_memory__", "_thread_local", "alignas", "alignof",
-    "asm", "auto", "bool", "break", "case", "catch", "char", "char16_t", "char32_t", "class", "const",
-    "const_cast", "constexpr", "continue", "decltype", "default", "delete", "do", "double", "dynamic_cast",
-    "else", "enum", "explicit", "export", "extern", "false", "final", "float", "for", "friend", "goto",
-    "if", "inline", "int", "long", "mutable", "namespace", "new", "noexcept", "nullptr", "operator",
-    "override", "private", "protected", "public", "register", "reinterpret_cast", "restrict", "return",
-    "short", "signed", "sizeof", "static", "static_assert", "static_cast", "struct", "switch", "template",
-    "this", "throw", "true", "try", "typedef", "typeid", "typename", "union", "unsigned", "using",
-    "virtual", "void", "volatile", "wchar_t", "while",
+    "_Alignas",
+    "_Alignof",
+    "_Atomic",
+    "_Bool",
+    "_Complex",
+    "_Generic",
+    "_Imaginary",
+    "_Noreturn",
+    "_Static_assert",
+    "_Thread_local",
+    "__cuda_kernel__",
+    "__opencl_kernel__",
+    "__vercors_atomic__",
+    "__vercors_barrier__",
+    "__vercors_global_mem_fence__",
+    "__vercors_global_memory__",
+    "__vercors_local_mem_fence__",
+    "__vercors_local_memory__",
+    "_thread_local",
+    "alignas",
+    "alignof",
+    "asm",
+    "auto",
+    "bool",
+    "break",
+    "case",
+    "catch",
+    "char",
+    "char16_t",
+    "char32_t",
+    "class",
+    "const",
+    "const_cast",
+    "constexpr",
+    "continue",
+    "decltype",
+    "default",
+    "delete",
+    "do",
+    "double",
+    "dynamic_cast",
+    "else",
+    "enum",
+    "explicit",
+    "export",
+    "extern",
+    "false",
+    "final",
+    "float",
+    "for",
+    "friend",
+    "goto",
+    "if",
+    "inline",
+    "int",
+    "long",
+    "mutable",
+    "namespace",
+    "new",
+    "noexcept",
+    "nullptr",
+    "operator",
+    "override",
+    "private",
+    "protected",
+    "public",
+    "register",
+    "reinterpret_cast",
+    "restrict",
+    "return",
+    "short",
+    "signed",
+    "sizeof",
+    "static",
+    "static_assert",
+    "static_cast",
+    "struct",
+    "switch",
+    "template",
+    "this",
+    "throw",
+    "true",
+    "try",
+    "typedef",
+    "typeid",
+    "typename",
+    "union",
+    "unsigned",
+    "using",
+    "virtual",
+    "void",
+    "volatile",
+    "wchar_t",
+    "while",
   )
 }
diff --git a/src/col/vct/col/print/Namer.scala b/src/col/vct/col/print/Namer.scala
index 35f7b925a7..5f6da6a18f 100644
--- a/src/col/vct/col/print/Namer.scala
+++ b/src/col/vct/col/print/Namer.scala
@@ -9,104 +9,109 @@ case class Namer[G](syntax: Ctx.Syntax) {
   private val stack = ScopedStack[Node[G]]()
   private val names = mutable.Map[(scala.Any, String, Int), Declaration[G]]()
 
-  private val keywords: Set[String] = syntax match {
-    case Ctx.PVL => Keywords.PVL
-    case Ctx.Silver => Set()
-    case Ctx.Java => Keywords.JAVA
-    case Ctx.C => Keywords.C_CPP_GPGPU
-    case Ctx.CPP => Keywords.C_CPP_GPGPU
-    case Ctx.Cuda => Keywords.C_CPP_GPGPU
-    case Ctx.OpenCL => Keywords.C_CPP_GPGPU
-  }
+  private val keywords: Set[String] =
+    syntax match {
+      case Ctx.PVL => Keywords.PVL
+      case Ctx.Silver => Set()
+      case Ctx.Java => Keywords.JAVA
+      case Ctx.C => Keywords.C_CPP_GPGPU
+      case Ctx.CPP => Keywords.C_CPP_GPGPU
+      case Ctx.Cuda => Keywords.C_CPP_GPGPU
+      case Ctx.OpenCL => Keywords.C_CPP_GPGPU
+    }
 
   def nearest(f: PartialFunction[Node[G], Unit]): Seq[Node[G]] =
     stack.toSeq.filter(n => f.isDefinedAt(n))
 
-  private def nearestClass = nearest {
-    case _: Class[G] | _: JavaClass[G] | _: Choreography[G] | _: JavaInterface[G] | _: JavaAnnotationInterface[G] => ()
-  }
+  private def nearestClass =
+    nearest {
+      case _: Class[G] | _: JavaClass[G] | _: Choreography[G] |
+          _: JavaInterface[G] | _: JavaAnnotationInterface[G] =>
+        ()
+    }
 
-  private def nearestVariableScope = nearest {
-    case _: ParBlock[G] => ()
-    case _: VecBlock[G] => ()
-    case _: CatchClause[G] => ()
-    case _: Scope[G] => ()
-    case _: SignalsClause[G] => ()
-    case _: AxiomaticDataType[G] => ()
-    case _: JavaClass[G] => ()
-    case _: JavaInterface[G] => ()
-    case _: Predicate[G] => ()
-    case _: InstancePredicate[G] => ()
-    case _: ModelProcess[G] => ()
-    case _: ModelAction[G] => ()
-    case _: ADTFunction[G] => ()
-    case _: Function[G] => ()
-    case _: Procedure[G] => ()
-    case _: InstanceFunction[G] => ()
-    case _: InstanceMethod[G] => ()
-    case _: Constructor[G] => ()
-    case _: JavaConstructor[G] => ()
-    case _: JavaMethod[G] => ()
-    case _: PVLConstructor[G] => ()
-    case _: Forall[G] => ()
-    case _: Starall[G] => ()
-    case _: Exists[G] => ()
-    case _: Sum[G] => ()
-    case _: Product[G] => ()
-    case _: Let[G] => ()
-    case _: ScopedExpr[G] => ()
-    case _: ForPerm[G] => ()
-  }
+  private def nearestVariableScope =
+    nearest {
+      case _: ParBlock[G] => ()
+      case _: VecBlock[G] => ()
+      case _: CatchClause[G] => ()
+      case _: Scope[G] => ()
+      case _: SignalsClause[G] => ()
+      case _: AxiomaticDataType[G] => ()
+      case _: JavaClass[G] => ()
+      case _: JavaInterface[G] => ()
+      case _: Predicate[G] => ()
+      case _: InstancePredicate[G] => ()
+      case _: ModelProcess[G] => ()
+      case _: ModelAction[G] => ()
+      case _: ADTFunction[G] => ()
+      case _: Function[G] => ()
+      case _: Procedure[G] => ()
+      case _: InstanceFunction[G] => ()
+      case _: InstanceMethod[G] => ()
+      case _: Constructor[G] => ()
+      case _: JavaConstructor[G] => ()
+      case _: JavaMethod[G] => ()
+      case _: PVLConstructor[G] => ()
+      case _: Forall[G] => ()
+      case _: Starall[G] => ()
+      case _: Exists[G] => ()
+      case _: Sum[G] => ()
+      case _: Product[G] => ()
+      case _: Let[G] => ()
+      case _: ScopedExpr[G] => ()
+      case _: ForPerm[G] => ()
+    }
 
-  private def nearestCallable = nearest {
-    case _: Function[G] => ()
-    case _: Procedure[G] => ()
-    case _: InstanceFunction[G] => ()
-    case _: InstanceMethod[G] => ()
-    case _: Constructor[G] => ()
-    case _: JavaMethod[G] => ()
-    case _: JavaAnnotationMethod[G] => ()
-    case _: JavaConstructor[G] => ()
-    case _: PVLConstructor[G] => ()
-    case _: CFunctionDefinition[G] => ()
-    case _: CPPFunctionDefinition[G] => ()
-  }
+  private def nearestCallable =
+    nearest {
+      case _: Function[G] => ()
+      case _: Procedure[G] => ()
+      case _: InstanceFunction[G] => ()
+      case _: InstanceMethod[G] => ()
+      case _: Constructor[G] => ()
+      case _: JavaMethod[G] => ()
+      case _: JavaAnnotationMethod[G] => ()
+      case _: JavaConstructor[G] => ()
+      case _: PVLConstructor[G] => ()
+      case _: CFunctionDefinition[G] => ()
+      case _: CPPFunctionDefinition[G] => ()
+    }
 
   def unpackName(name: String): (String, Int) = {
     val m = "^(.*?)([1-9][0-9]*)?$".r.findFirstMatchIn(name).get
     if (Option(m.group(2)).isDefined) {
       (m.group(1), Integer.parseInt(m.group(2)))
-    } else {
-      (m.group(1), 0)
-    }
+    } else { (m.group(1), 0) }
   }
 
   def packName(name: String, index: Int): String =
-    if (index == 0) name
-    else s"$name$index"
+    if (index == 0)
+      name
+    else
+      s"$name$index"
 
   def nameKeyed(keys: Seq[scala.Any], decl: Declaration[G]): Unit = {
-    if(keys.isEmpty) {
+    if (keys.isEmpty) {
       // Refuse to name this declaration, it is unclear how to distinguish them.
       return
     }
 
     val name = decl.o.getPreferredNameOrElse()
     var (baseName, index) = unpackName(decl match {
-      case declaration: GlobalDeclaration[_] => declaration match {
-        case _: Applicable[_] => name.camel
-        case _ => name.ucamel
-      }
+      case declaration: GlobalDeclaration[_] =>
+        declaration match {
+          case _: Applicable[_] => name.camel
+          case _ => name.ucamel
+        }
       case constant: EnumConstant[_] => name.usnake
       case decl: LabelDecl[_] => name.usnake
       case _ => name.camel
     })
 
-    if(index == 0 && keywords.contains(baseName)) {
-      index = 1
-    }
+    if (index == 0 && keywords.contains(baseName)) { index = 1 }
 
-    while(keys.exists(key => names.contains((key, baseName, index)))) {
+    while (keys.exists(key => names.contains((key, baseName, index)))) {
       index += 1
     }
 
@@ -117,27 +122,43 @@ case class Namer[G](syntax: Ctx.Syntax) {
     stack.having(node) { node.subnodes.foreach(name) }
 
     node match {
-      case decl: GlobalDeclaration[G] => nameKeyed(nearest { case _: Program[G] => () }, decl)
+      case decl: GlobalDeclaration[G] =>
+        nameKeyed(nearest { case _: Program[G] => () }, decl)
       case decl: ClassDeclaration[G] => nameKeyed(nearestClass, decl)
-      case decl: ADTDeclaration[G] => nameKeyed(if(syntax == Ctx.Silver) Seq(3) else nearest { case _: AxiomaticDataType[G] => () }, decl)
-      case decl: ModelDeclaration[G] => nameKeyed(nearest { case _: Model[G] => () }, decl)
-      case decl: EnumConstant[G] => nameKeyed(nearest { case _: Enum[G] => () }, decl)
+      case decl: ADTDeclaration[G] =>
+        nameKeyed(
+          if (syntax == Ctx.Silver)
+            Seq(3)
+          else
+            nearest { case _: AxiomaticDataType[G] => () },
+          decl,
+        )
+      case decl: ModelDeclaration[G] =>
+        nameKeyed(nearest { case _: Model[G] => () }, decl)
+      case decl: EnumConstant[G] =>
+        nameKeyed(nearest { case _: Enum[G] => () }, decl)
       case decl: Variable[G] => nameKeyed(nearestVariableScope, decl)
       case decl: LabelDecl[G] => nameKeyed(nearestCallable, decl)
-      case decl: SendDecl[G] => nameKeyed(nearest { case _: ParBlock[G] | _: Loop[G] => () }, decl)
-      case decl: ParBlockDecl[G] => nameKeyed(nearest { case _: ParBlock[G] => () }, decl)
-      case decl: ParInvariantDecl[G] => nameKeyed(nearest { case _: ParInvariant[G] => () }, decl)
+      case decl: SendDecl[G] =>
+        nameKeyed(nearest { case _: ParBlock[G] | _: Loop[G] => () }, decl)
+      case decl: ParBlockDecl[G] =>
+        nameKeyed(nearest { case _: ParBlock[G] => () }, decl)
+      case decl: ParInvariantDecl[G] =>
+        nameKeyed(nearest { case _: ParInvariant[G] => () }, decl)
       case decl: CLocalDeclaration[G] => nameKeyed(nearestVariableScope, decl)
       case decl: CParam[G] => nameKeyed(nearestCallable, decl)
       case decl: CPPLocalDeclaration[G] => nameKeyed(nearestVariableScope, decl)
       case decl: CPPParam[G] => nameKeyed(nearestCallable, decl)
       case decl: JavaLocalDeclaration[G] => nameKeyed(nearestCallable, decl)
-      case decl: Endpoint[G] => nameKeyed(nearest { case _: Choreography[G] => () }, decl)
+      case decl: Endpoint[G] =>
+        nameKeyed(nearest { case _: Choreography[G] => () }, decl)
       case decl: JavaParam[G] => nameKeyed(nearestCallable, decl)
       case _ =>
     }
   }
 
   def finish: Map[Declaration[G], String] =
-    Map(names.map { case (_, name, index) -> decl => decl -> packName(name, index) }.toSeq: _*)
+    Map(names.map { case (_, name, index) -> decl =>
+      decl -> packName(name, index)
+    }.toSeq: _*)
 }
diff --git a/src/col/vct/col/ref/DirectRef.scala b/src/col/vct/col/ref/DirectRef.scala
index d74930525a..34ecda9c3e 100644
--- a/src/col/vct/col/ref/DirectRef.scala
+++ b/src/col/vct/col/ref/DirectRef.scala
@@ -5,9 +5,12 @@ import vct.col.err.MistypedRef
 
 import scala.reflect.ClassTag
 
-class DirectRef[G, Decl <: Declaration[G]](genericDecl: Declaration[G])(implicit tag: ClassTag[Decl]) extends Ref[G, Decl] {
-  override def decl: Decl = genericDecl match {
-    case decl: /*tagged*/ Decl => decl
-    case other => throw MistypedRef(other, tag)
-  }
+class DirectRef[G, Decl <: Declaration[G]](genericDecl: Declaration[G])(
+    implicit tag: ClassTag[Decl]
+) extends Ref[G, Decl] {
+  override def decl: Decl =
+    genericDecl match {
+      case decl: /*tagged*/ Decl => decl
+      case other => throw MistypedRef(other, tag)
+    }
 }
diff --git a/src/col/vct/col/ref/LazyRef.scala b/src/col/vct/col/ref/LazyRef.scala
index 5fa43eebe9..b79cde7821 100644
--- a/src/col/vct/col/ref/LazyRef.scala
+++ b/src/col/vct/col/ref/LazyRef.scala
@@ -6,7 +6,11 @@ import vct.col.ref
 
 import scala.reflect.ClassTag
 
-class LazyRef[G, Decl <: Declaration[G]](lazyDecl: => Declaration[G], eqMeasure: Option[Any] = None)(implicit tag: ClassTag[Decl]) extends Ref[G, Decl] {
+class LazyRef[G, Decl <: Declaration[G]](
+    lazyDecl: => Declaration[G],
+    eqMeasure: Option[Any] = None,
+)(implicit tag: ClassTag[Decl])
+    extends Ref[G, Decl] {
   // Sometimes Nothing ends up in Decl, which is never useful, so we try to crash a bit earlier when that happens.
   require(tag != ClassTag.Nothing)
 
@@ -29,14 +33,15 @@ class LazyRef[G, Decl <: Declaration[G]](lazyDecl: => Declaration[G], eqMeasure:
         computeDecl = null
         _eqMeasure = None
         decl
-      case other =>
-        throw MistypedRef(other, tag)
+      case other => throw MistypedRef(other, tag)
     }
   }
 
-  override def equals(obj: Any): Boolean = obj match {
-    case other: LazyRef[G, Decl] if _eqMeasure.nonEmpty && other._eqMeasure.nonEmpty =>
-      _eqMeasure.get == other._eqMeasure.get
-    case other => super.equals(other)
-  }
+  override def equals(obj: Any): Boolean =
+    obj match {
+      case other: LazyRef[G, Decl]
+          if _eqMeasure.nonEmpty && other._eqMeasure.nonEmpty =>
+        _eqMeasure.get == other._eqMeasure.get
+      case other => super.equals(other)
+    }
 }
diff --git a/src/col/vct/col/ref/Ref.scala b/src/col/vct/col/ref/Ref.scala
index c17751b49c..bad778ecaf 100644
--- a/src/col/vct/col/ref/Ref.scala
+++ b/src/col/vct/col/ref/Ref.scala
@@ -5,50 +5,63 @@ import vct.col.ast.Declaration
 import scala.reflect.ClassTag
 import scala.runtime.ScalaRunTime
 
-/** NB: While Ref's can be stricter than just any Declaration (e.g. Ref[Function]), we can construct any variant with
-  * just a Declaration. This is because:
-  * - We cannot prove that the successor of a Declaration is of the correct type when we construct it: then it wouldn't
-  * be lazy and we wouldn't be able to cross-reference declarations out of AST order.
-  * - We do not want to cast or check refs to be of the correct kind every time we want to use it.
-  * The most acceptable solution is then to pretend to have a safe interface that returns a declaration of the right
-  * kind, but quietly check the type on first access.
+/** NB: While Ref's can be stricter than just any Declaration (e.g.
+  * Ref[Function]), we can construct any variant with just a Declaration. This
+  * is because:
+  *   - We cannot prove that the successor of a Declaration is of the correct
+  *     type when we construct it: then it wouldn't be lazy and we wouldn't be
+  *     able to cross-reference declarations out of AST order.
+  *   - We do not want to cast or check refs to be of the correct kind every
+  *     time we want to use it. The most acceptable solution is then to pretend
+  *     to have a safe interface that returns a declaration of the right kind,
+  *     but quietly check the type on first access.
   */
 trait Ref[G, Decl <: Declaration[G]] {
   def decl: Decl
 
   def tryResolve(resolver: String => Declaration[G]): Unit = {}
 
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case other: Ref[G, _] => decl == other.decl
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match { case other: Ref[G, _] => decl == other.decl }
 
-  /**
-   * LazyRef tries very hard to not actually compute the declaration if it doesn't have to. To be able to compare
-   * resolved and unresolved declarations amongst each other, the hashCode cannot be meaningful. Typically Ref's do
-   * not end up in datastructures like Maps by themselves: it is probably usually either the Declaration directly, or
-   * a composite Expression, in which case the shape will likely be sufficiently different sufficiently often.
-   */
+  /** LazyRef tries very hard to not actually compute the declaration if it
+    * doesn't have to. To be able to compare resolved and unresolved
+    * declarations amongst each other, the hashCode cannot be meaningful.
+    * Typically Ref's do not end up in datastructures like Maps by themselves:
+    * it is probably usually either the Declaration directly, or a composite
+    * Expression, in which case the shape will likely be sufficiently different
+    * sufficiently often.
+    */
   override final def hashCode(): Int = 0
 
-  def asTransmutable[Decl2[_] <: Declaration[_]](implicit witness: Decl <:< Decl2[G]): Ref.TransmutableRef[G, Decl2] =
-    new Ref.TransmutableRef(decl)
+  def asTransmutable[Decl2[_] <: Declaration[_]](
+      implicit witness: Decl <:< Decl2[G]
+  ): Ref.TransmutableRef[G, Decl2] = new Ref.TransmutableRef(decl)
 }
 
 object Ref {
-  val EXC_MESSAGE = "The AST is in an invalid state: a Ref contains a declaration of the wrong kind."
+  val EXC_MESSAGE =
+    "The AST is in an invalid state: a Ref contains a declaration of the wrong kind."
 
-  def unapply[G, Decl <: Declaration[G]](obj: Ref[G, Decl]): Some[Decl] = Some(obj.decl)
+  def unapply[G, Decl <: Declaration[G]](obj: Ref[G, Decl]): Some[Decl] =
+    Some(obj.decl)
 
   class TransmutableRef[G, Decl[_] <: Declaration[_]](decl: => Decl[G]) {
-    def asRegular[Decl2 <: Declaration[G]](implicit witness: Decl[G] <:< Decl2, tag: ClassTag[Decl2]): Ref[G, Decl2] =
-      new LazyRef(decl)
+    def asRegular[Decl2 <: Declaration[G]](
+        implicit witness: Decl[G] <:< Decl2,
+        tag: ClassTag[Decl2],
+    ): Ref[G, Decl2] = new LazyRef(decl)
 
-    def unsafeTransmuteGeneration[Post]: TransmutableRef[Post, Decl] = asInstanceOf[TransmutableRef[Post, Decl]]
+    def unsafeTransmuteGeneration[Post]: TransmutableRef[Post, Decl] =
+      asInstanceOf[TransmutableRef[Post, Decl]]
   }
 
-  def transmute
-    [Pre, Post, Decl[_] <: Declaration[_], DPre <: Declaration[Pre], DPost <: Declaration[Post]]
-    (ref: Ref[Pre, DPre])
-    (implicit w1: DPre <:< Decl[Pre], w2: Decl[Post] <:< DPost, tag: ClassTag[DPost])
-    : Ref[Post, DPost] = ref.asTransmutable[Decl].unsafeTransmuteGeneration.asRegular
-}
\ No newline at end of file
+  def transmute[Pre, Post, Decl[_] <: Declaration[_], DPre <: Declaration[
+    Pre
+  ], DPost <: Declaration[Post]](ref: Ref[Pre, DPre])(
+      implicit w1: DPre <:< Decl[Pre],
+      w2: Decl[Post] <:< DPost,
+      tag: ClassTag[DPost],
+  ): Ref[Post, DPost] =
+    ref.asTransmutable[Decl].unsafeTransmuteGeneration.asRegular
+}
diff --git a/src/col/vct/col/ref/UnresolvedRef.scala b/src/col/vct/col/ref/UnresolvedRef.scala
index 279912c3b6..00f9a8b2e9 100644
--- a/src/col/vct/col/ref/UnresolvedRef.scala
+++ b/src/col/vct/col/ref/UnresolvedRef.scala
@@ -6,19 +6,22 @@ import vct.col.ref
 
 import scala.reflect.ClassTag
 
-class UnresolvedRef[G, Decl <: Declaration[G]](val name: String)(implicit tag: ClassTag[Decl]) extends Ref[G, Decl] {
+class UnresolvedRef[G, Decl <: Declaration[G]](val name: String)(
+    implicit tag: ClassTag[Decl]
+) extends Ref[G, Decl] {
   private var resolvedDecl: Option[Declaration[G]] = None
 
-  override def tryResolve(resolver: String => Declaration[G]): Unit = resolve(resolver(name))
+  override def tryResolve(resolver: String => Declaration[G]): Unit =
+    resolve(resolver(name))
 
   def resolve(decl: Declaration[G]): Unit = resolvedDecl = Some(decl)
 
   def isResolved: Boolean = resolvedDecl.isDefined
 
-  def decl: Decl = resolvedDecl match {
-    case None =>
-      throw NotResolved(this, tag)
-    case Some(decl: /*tagged*/ Decl) => decl
-    case Some(other) => throw MistypedRef(other, tag)
-  }
+  def decl: Decl =
+    resolvedDecl match {
+      case None => throw NotResolved(this, tag)
+      case Some(decl: /*tagged*/ Decl) => decl
+      case Some(other) => throw MistypedRef(other, tag)
+    }
 }
diff --git a/src/col/vct/col/resolve/ResolutionError.scala b/src/col/vct/col/resolve/ResolutionError.scala
index 0527f91dd2..61bef3850e 100644
--- a/src/col/vct/col/resolve/ResolutionError.scala
+++ b/src/col/vct/col/resolve/ResolutionError.scala
@@ -6,82 +6,129 @@ import vct.result.VerificationError.{SystemError, UserError}
 
 trait ResolutionError extends UserError
 
-case class MultipleForwardDeclarationContractError(declaration: GlobalDeclaration[_]) extends ResolutionError {
+case class MultipleForwardDeclarationContractError(
+    declaration: GlobalDeclaration[_]
+) extends ResolutionError {
   override def code: String = "multipleForwardDeclarationContract"
 
-  override def text: String = declaration.o.messageInContext("Cannot simultaneously bind a contract to multiple global declarations.")
+  override def text: String =
+    declaration.o.messageInContext(
+      "Cannot simultaneously bind a contract to multiple global declarations."
+    )
 }
 
-case class NoSuchNameError(kind: String, name: String, use: Node[_]) extends ResolutionError {
-  override def text: String = use.o.messageInContext(s"Could not find $kind named $name.")
+case class NoSuchNameError(kind: String, name: String, use: Node[_])
+    extends ResolutionError {
+  override def text: String =
+    use.o.messageInContext(s"Could not find $kind named $name.")
   override def code: String = "noSuchName"
 }
 
 case class NoSuchConstructor(use: Node[_]) extends ResolutionError {
-  override def text: String = use.o.messageInContext("Could not find a constructor matching the supplied arguments.")
+  override def text: String =
+    use.o.messageInContext(
+      "Could not find a constructor matching the supplied arguments."
+    )
   override def code: String = "noSuchConstructor"
 }
 
 case class NameLost(o: Origin) extends SystemError {
-  override def text: String = o.messageInContext("The origin of this node no longer carries its original name.")
+  override def text: String =
+    o.messageInContext(
+      "The origin of this node no longer carries its original name."
+    )
 }
 
-case class AnonymousMethodsUnsupported(decl: CDeclarator[_]) extends ResolutionError {
-  override def text: String = decl.o.messageInContext("Anonymous function declarations are not supported.")
+case class AnonymousMethodsUnsupported(decl: CDeclarator[_])
+    extends ResolutionError {
+  override def text: String =
+    decl.o
+      .messageInContext("Anonymous function declarations are not supported.")
   override def code: String = "anonFunction"
 }
 
 case class HasNoFields(obj: Expr[_]) extends ResolutionError {
-  override def text: String = obj.o.messageInContext("This object has no fields.")
+  override def text: String =
+    obj.o.messageInContext("This object has no fields.")
   override def code: String = "hasNoFields"
 }
 
 case class NotApplicable(obj: Expr[_]) extends ResolutionError {
-  override def text: String = obj.o.messageInContext("It is not possible to call this object")
+  override def text: String =
+    obj.o.messageInContext("It is not possible to call this object")
   override def code: String = "notApplicable"
 }
 
-case class ResultOutsideMethod(res: AmbiguousResult[_]) extends ResolutionError {
-  override def text: String = res.o.messageInContext("\\result may not occur outside a method.")
+case class ResultOutsideMethod(res: AmbiguousResult[_])
+    extends ResolutionError {
+  override def text: String =
+    res.o.messageInContext("\\result may not occur outside a method.")
   override def code: String = "resultOutsideMethod"
 }
 
 case class NoGivenYields(invocation: Node[_]) extends ResolutionError {
   override def code: String = "noGivenYields"
-  override def text: String = invocation.o.messageInContext("This kind of application or invocation does not take parameters via given or yields.")
+  override def text: String =
+    invocation.o.messageInContext(
+      "This kind of application or invocation does not take parameters via given or yields."
+    )
 }
 
-case class WrongArrayInitializer(initializer: JavaLiteralArray[_]) extends ResolutionError {
+case class WrongArrayInitializer(initializer: JavaLiteralArray[_])
+    extends ResolutionError {
   override def code: String = "wrongArrayInit"
-  override def text: String = initializer.o.messageInContext("This initializer does not initialize an array type.")
+  override def text: String =
+    initializer.o
+      .messageInContext("This initializer does not initialize an array type.")
 }
 
-case class OverlappingJavaImports[G](ns: JavaNamespace[G], kind: String, importedName: String) extends ResolutionError {
+case class OverlappingJavaImports[G](
+    ns: JavaNamespace[G],
+    kind: String,
+    importedName: String,
+) extends ResolutionError {
   override def code: String = "overlappingJavaImports"
-  override def text: String = ns.o.messageInContext(s"The $kind name $importedName is provided by multiple imports in this namespace")
+  override def text: String =
+    ns.o.messageInContext(
+      s"The $kind name $importedName is provided by multiple imports in this namespace"
+    )
 }
 
 case class WrongThisPosition[G](diz: AmbiguousThis[G]) extends ResolutionError {
   override def code: String = "wrongThisPosition"
-  override def text: String = diz.o.messageInContext("The `this` keyword does not refer to anything in this position.")
+  override def text: String =
+    diz.o.messageInContext(
+      "The `this` keyword does not refer to anything in this position."
+    )
 }
 
-case class ForbiddenEndpointNameType(endpoint: Node[_]) extends ResolutionError {
+case class ForbiddenEndpointNameType(endpoint: Node[_])
+    extends ResolutionError {
   override def code: String = "forbiddenEndpointNameType"
-  override def text: String = endpoint.o.messageInContext(s"In this endpoint position, a name is referred that is not an endpoint")
+  override def text: String =
+    endpoint.o.messageInContext(
+      s"In this endpoint position, a name is referred that is not an endpoint"
+    )
 }
 
-case class ForbiddenEndpointType(endpoint: PVLEndpoint[_]) extends ResolutionError {
+case class ForbiddenEndpointType(endpoint: PVLEndpoint[_])
+    extends ResolutionError {
   override def code: String = "forbiddenEndpointType"
-  override def text: String = endpoint.o.messageInContext(s"This endpoint is not of class type")
+  override def text: String =
+    endpoint.o.messageInContext(s"This endpoint is not of class type")
 }
 
-case class ConstructorNotFound(endpoint: PVLEndpoint[_]) extends ResolutionError {
+case class ConstructorNotFound(endpoint: PVLEndpoint[_])
+    extends ResolutionError {
   override def code: String = "constructorNotFound"
-  override def text: String = endpoint.o.messageInContext(s"Could not find a constructor that matches the types of the arguments of this endpoint.")
+  override def text: String =
+    endpoint.o.messageInContext(
+      s"Could not find a constructor that matches the types of the arguments of this endpoint."
+    )
 }
 
 case class UnassignableField(node: Node[_]) extends ResolutionError {
   override def code: String = "unassignableField"
-  override def text: String = node.o.messageInContext(s"The field in this node is not assignable")
+  override def text: String =
+    node.o.messageInContext(s"The field in this node is not assignable")
 }
diff --git a/src/col/vct/col/resolve/Resolve.scala b/src/col/vct/col/resolve/Resolve.scala
index 66de804612..1bd8310820 100644
--- a/src/col/vct/col/resolve/Resolve.scala
+++ b/src/col/vct/col/resolve/Resolve.scala
@@ -11,8 +11,23 @@ import vct.col.resolve.ResolveReferences.scanScope
 import vct.col.ref.Ref
 import vct.col.resolve.ctx._
 import vct.col.resolve.lang.{C, CPP, Java, LLVM, PVL, Spec}
-import vct.col.resolve.Resolve.{MalformedBipAnnotation, SpecContractParser, SpecExprParser, getLit, isBip}
-import vct.col.resolve.lang.JavaAnnotationData.{BipComponent, BipData, BipGuard, BipInvariant, BipPort, BipPure, BipStatePredicate, BipTransition}
+import vct.col.resolve.Resolve.{
+  MalformedBipAnnotation,
+  SpecContractParser,
+  SpecExprParser,
+  getLit,
+  isBip,
+}
+import vct.col.resolve.lang.JavaAnnotationData.{
+  BipComponent,
+  BipData,
+  BipGuard,
+  BipInvariant,
+  BipPort,
+  BipPure,
+  BipStatePredicate,
+  BipTransition,
+}
 import vct.col.rewrite.InitialGeneration
 import vct.result.VerificationError.{Unreachable, UserError}
 
@@ -26,45 +41,55 @@ case object Resolve {
   }
 
   trait SpecContractParser {
-    def parse[G](input: LlvmFunctionContract[G], o: Origin): ApplicableContract[G]
+    def parse[G](
+        input: LlvmFunctionContract[G],
+        o: Origin,
+    ): ApplicableContract[G]
 
     def parse[G](input: LlvmGlobal[G], o: Origin): Seq[GlobalDeclaration[G]]
   }
 
-  def extractLiteral(e: Expr[_]): Option[String] = e match {
-    case JavaStringValue(guardName, _) =>
-      Some(guardName)
-    case local @ JavaLocal(_) =>
-      local.ref match {
-        case Some(RefJavaField(decls, id)) =>
-          decls.decls(id).init match {
-            case Some(JavaStringValue(data, _)) => Some(data)
-            case _ => None
-          }
-        case _ => None
-      }
-    case _ => None
-  }
+  def extractLiteral(e: Expr[_]): Option[String] =
+    e match {
+      case JavaStringValue(guardName, _) => Some(guardName)
+      case local @ JavaLocal(_) =>
+        local.ref match {
+          case Some(RefJavaField(decls, id)) =>
+            decls.decls(id).init match {
+              case Some(JavaStringValue(data, _)) => Some(data)
+              case _ => None
+            }
+          case _ => None
+        }
+      case _ => None
+    }
 
   case class MalformedBipAnnotation(n: Node[_], err: String) extends UserError {
     override def code: String = "badBipAnnotation"
-    override def text: String = n.o.messageInContext(s"Malformed JavaBIP annotation: $err")
+    override def text: String =
+      n.o.messageInContext(s"Malformed JavaBIP annotation: $err")
   }
 
   case class UnexpectedComplicatedExpression(e: Expr[_]) extends UserError {
     override def code: String = "unexpectedComplicatedExpression"
-    override def text: String = e.o.messageInContext("This expression must either be a string literal or trivially resolve to one")
+    override def text: String =
+      e.o.messageInContext(
+        "This expression must either be a string literal or trivially resolve to one"
+      )
   }
 
   def getLit(e: Expr[_]): String =
     extractLiteral(e).getOrElse(throw UnexpectedComplicatedExpression(e))
 
-  def isBip(node: Node[_], `type`: String): Boolean = node match {
-    case JavaAnnotation(JavaTClass(r, _), _) => isBip(r.decl, `type`)
-    case c: JavaClassOrInterface[_] => c.modifiers.contains(JavaBipAnnotation[InitialGeneration]()(DiagnosticOrigin)) && c.name == `type`
-    case _ => false
-  }
-
+  def isBip(node: Node[_], `type`: String): Boolean =
+    node match {
+      case JavaAnnotation(JavaTClass(r, _), _) => isBip(r.decl, `type`)
+      case c: JavaClassOrInterface[_] =>
+        c.modifiers
+          .contains(JavaBipAnnotation[InitialGeneration]()(DiagnosticOrigin)) &&
+        c.name == `type`
+      case _ => false
+    }
 
 }
 
@@ -75,8 +100,15 @@ case object ResolveTypes {
     case class Path(root: java.nio.file.Path) extends JavaClassPathEntry
   }
 
-  def resolve[G](program: Program[G], externalJavaLoader: Option[ExternalJavaLoader] = None, javaClassPath: Seq[JavaClassPathEntry]): Seq[GlobalDeclaration[G]] = {
-    val ctx = TypeResolutionContext[G](externalJavaLoader = externalJavaLoader, javaClassPath = javaClassPath)
+  def resolve[G](
+      program: Program[G],
+      externalJavaLoader: Option[ExternalJavaLoader] = None,
+      javaClassPath: Seq[JavaClassPathEntry],
+  ): Seq[GlobalDeclaration[G]] = {
+    val ctx = TypeResolutionContext[G](
+      externalJavaLoader = externalJavaLoader,
+      javaClassPath = javaClassPath,
+    )
     resolve(program, ctx)
     ctx.externallyLoadedElements.toSeq
   }
@@ -87,202 +119,309 @@ case object ResolveTypes {
     resolveOne(node, ctx)
   }
 
-  def scanImport[G](imp: JavaImport[G], ctx: TypeResolutionContext[G]): Seq[Referrable[G]] /* importable? */ = imp match {
-    case imp @ JavaImport(/* static = */ true, JavaName(fullyQualifiedTypeName :+ staticMember), /* star = */ false) =>
-      val staticType = Java.findJavaTypeName(fullyQualifiedTypeName, ctx)
-        .getOrElse(throw NoSuchNameError("class", fullyQualifiedTypeName.mkString("."), imp))
-      Seq(Java.findStaticMember(staticType, staticMember)
-        .getOrElse(throw NoSuchNameError("static member", (fullyQualifiedTypeName :+ staticMember).mkString("."), imp)))
-    case imp @ JavaImport(/* static = */ true, JavaName(fullyQualifiedTypeName), /* star = */ true) =>
-      val typeName = Java.findJavaTypeName(fullyQualifiedTypeName, ctx)
-        .getOrElse(throw NoSuchNameError("class", fullyQualifiedTypeName.mkString("."), imp))
-      Java.getStaticMembers(typeName)
-    // Non-static imports are resolved on demand
-    case _ => Seq()
-  }
+  def scanImport[G](
+      imp: JavaImport[G],
+      ctx: TypeResolutionContext[G],
+  ): Seq[Referrable[G]] /* importable? */ =
+    imp match {
+      case imp @ JavaImport(
+            /* static = */ true,
+            JavaName(fullyQualifiedTypeName :+ staticMember), /* star = */ false,
+          ) =>
+        val staticType = Java.findJavaTypeName(fullyQualifiedTypeName, ctx)
+          .getOrElse(
+            throw NoSuchNameError(
+              "class",
+              fullyQualifiedTypeName.mkString("."),
+              imp,
+            )
+          )
+        Seq(Java.findStaticMember(staticType, staticMember).getOrElse(
+          throw NoSuchNameError(
+            "static member",
+            (fullyQualifiedTypeName :+ staticMember).mkString("."),
+            imp,
+          )
+        ))
+      case imp @ JavaImport(
+            /* static = */ true,
+            JavaName(fullyQualifiedTypeName), /* star = */ true,
+          ) =>
+        val typeName = Java.findJavaTypeName(fullyQualifiedTypeName, ctx)
+          .getOrElse(
+            throw NoSuchNameError(
+              "class",
+              fullyQualifiedTypeName.mkString("."),
+              imp,
+            )
+          )
+        Java.getStaticMembers(typeName)
+      // Non-static imports are resolved on demand
+      case _ => Seq()
+    }
 
-  def enterContext[G](node: Node[G], ctx: TypeResolutionContext[G]): TypeResolutionContext[G] = node match {
-    case Program(decls) =>
-      ctx.copy(stack=decls.flatMap(Referrable.from) +: ctx.stack)
-    case ns: JavaNamespace[G] =>
-      // Static imports need to be imported at this stage, because they influence how names are resolved.
-      // E.g.: in the expression f.g, f is either a 1) variable, 2) parameter or 3) field. If none of those, it must be a
-      // 4) statically imported field or typename, or 5) a non-static imported typename. If it's not that, it's a package name.
-      // ctx.stack needs to be modified for this, and hence this importing is done in enterContext instead of in resolveOne.
-      val ctxWithNs = ctx.copy(namespace=Some(ns))
-      ctxWithNs.copy(stack=(ns.declarations.flatMap(Referrable.from) ++ ns.imports.flatMap(scanImport(_, ctxWithNs))) +: ctx.stack)
-    case Scope(locals, body) => ctx
-      .copy(stack = ((locals ++ scanScope(ctx)(body)).flatMap(Referrable.from)) +: ctx.stack)
-    case decl: Declarator[G] =>
-      ctx.copy(stack=decl.declarations.flatMap(Referrable.from) +: ctx.stack)
-    case _ => ctx
-  }
+  def enterContext[G](
+      node: Node[G],
+      ctx: TypeResolutionContext[G],
+  ): TypeResolutionContext[G] =
+    node match {
+      case Program(decls) =>
+        ctx.copy(stack = decls.flatMap(Referrable.from) +: ctx.stack)
+      case ns: JavaNamespace[G] =>
+        // Static imports need to be imported at this stage, because they influence how names are resolved.
+        // E.g.: in the expression f.g, f is either a 1) variable, 2) parameter or 3) field. If none of those, it must be a
+        // 4) statically imported field or typename, or 5) a non-static imported typename. If it's not that, it's a package name.
+        // ctx.stack needs to be modified for this, and hence this importing is done in enterContext instead of in resolveOne.
+        val ctxWithNs = ctx.copy(namespace = Some(ns))
+        ctxWithNs.copy(stack =
+          (ns.declarations.flatMap(Referrable.from) ++
+            ns.imports.flatMap(scanImport(_, ctxWithNs))) +: ctx.stack
+        )
+      case Scope(locals, body) =>
+        ctx.copy(stack =
+          ((locals ++ scanScope(ctx)(body)).flatMap(Referrable.from)) +:
+            ctx.stack
+        )
+      case decl: Declarator[G] =>
+        ctx
+          .copy(stack = decl.declarations.flatMap(Referrable.from) +: ctx.stack)
+      case _ => ctx
+    }
 
-  def resolveOne[G](node: Node[G], ctx: TypeResolutionContext[G]): Unit = node match {
-    case javaClass @ JavaNamedType(genericNames) =>
-      val names = genericNames.map(_._1)
-      javaClass.ref = Some(Java.findJavaTypeName(names, ctx)
-        .getOrElse(throw NoSuchNameError("class", names.mkString("."), javaClass)))
-    case t @ JavaTClass(ref, _) =>
-      ref.tryResolve(name => ???)
-    case t @ CTypedefName(name) =>
-      t.ref = Some(C.findCTypeName(name, ctx).getOrElse(
-        throw NoSuchNameError("typedef", name, t)
-      ))
-    case t@CStructSpecifier(name) =>
-      t.ref = Some(C.findCStruct(name, ctx).getOrElse(
-        throw NoSuchNameError("struct", name, t)
-      ))
-    case t@CPPTypedefName(nestedName, _) =>
-      t.ref = Some(CPP.findCPPTypeName(nestedName, ctx).getOrElse(
-        throw NoSuchNameError("class, struct, or namespace", nestedName, t)
-      ))
-    case t @ PVLNamedType(name, typeArgs) =>
-      t.ref = Some(PVL.findTypeName(name, ctx).getOrElse(
-        throw NoSuchNameError("class", name, t)))
-    case t @ TModel(ref) =>
-      ref.tryResolve(name => Spec.findModel(name, ctx).getOrElse(throw NoSuchNameError("model", name, t)))
-    case t @ TClass(ref, _) =>
-      ref.tryResolve(name => Spec.findClass(name, ctx).getOrElse(throw NoSuchNameError("class", name, t)))
-    case t @ TAxiomatic(ref, _) =>
-      ref.tryResolve(name => Spec.findAdt(name, ctx).getOrElse(throw NoSuchNameError("adt", name, t)))
-    case t @ SilverPartialTAxiomatic(ref, partialTypeArgs) =>
-      ref.tryResolve(name => Spec.findAdt(name, ctx).getOrElse(throw NoSuchNameError("adt", name, t)))
-      partialTypeArgs.foreach(mapping => mapping._1.tryResolve(name => Spec.findAdtTypeArg(ref.decl, name).getOrElse(throw NoSuchNameError("type variable", name, t))))
-    case local: JavaLocal[G] =>
-      Java.findJavaName(local.name, fromStaticContext = false, ctx) match {
-        case Some(
-        _: RefVariable[G] | _: RefJavaField[G] | _: RefJavaLocalDeclaration[G] | // Regular names
-        _ // Statically imported, or regular previously imported typename
-        ) => // Nothing to do. Local will get properly resolved next phase
-        case None =>
-          // Unknown what this local refers though. Try importing it as a type; otherwise, it's the start of a package
-          Java.findJavaTypeName(Seq(local.name), ctx) match {
-            case Some(_) => // already imported so nothing to do
-            case None =>
-              local.ref = Some(RefUnloadedJavaNamespace(Seq(local.name)))
+  def resolveOne[G](node: Node[G], ctx: TypeResolutionContext[G]): Unit =
+    node match {
+      case javaClass @ JavaNamedType(genericNames) =>
+        val names = genericNames.map(_._1)
+        javaClass.ref = Some(Java.findJavaTypeName(names, ctx).getOrElse(
+          throw NoSuchNameError("class", names.mkString("."), javaClass)
+        ))
+      case t @ JavaTClass(ref, _) => ref.tryResolve(name => ???)
+      case t @ CTypedefName(name) =>
+        t.ref = Some(
+          C.findCTypeName(name, ctx)
+            .getOrElse(throw NoSuchNameError("typedef", name, t))
+        )
+      case t @ CStructSpecifier(name) =>
+        t.ref = Some(
+          C.findCStruct(name, ctx)
+            .getOrElse(throw NoSuchNameError("struct", name, t))
+        )
+      case t @ CPPTypedefName(nestedName, _) =>
+        t.ref = Some(CPP.findCPPTypeName(nestedName, ctx).getOrElse(
+          throw NoSuchNameError("class, struct, or namespace", nestedName, t)
+        ))
+      case t @ PVLNamedType(name, typeArgs) =>
+        t.ref = Some(
+          PVL.findTypeName(name, ctx)
+            .getOrElse(throw NoSuchNameError("class", name, t))
+        )
+      case t @ TModel(ref) =>
+        ref.tryResolve(name =>
+          Spec.findModel(name, ctx)
+            .getOrElse(throw NoSuchNameError("model", name, t))
+        )
+      case t @ TClass(ref, _) =>
+        ref.tryResolve(name =>
+          Spec.findClass(name, ctx)
+            .getOrElse(throw NoSuchNameError("class", name, t))
+        )
+      case t @ TAxiomatic(ref, _) =>
+        ref.tryResolve(name =>
+          Spec.findAdt(name, ctx)
+            .getOrElse(throw NoSuchNameError("adt", name, t))
+        )
+      case t @ SilverPartialTAxiomatic(ref, partialTypeArgs) =>
+        ref.tryResolve(name =>
+          Spec.findAdt(name, ctx)
+            .getOrElse(throw NoSuchNameError("adt", name, t))
+        )
+        partialTypeArgs.foreach(mapping =>
+          mapping._1.tryResolve(name =>
+            Spec.findAdtTypeArg(ref.decl, name)
+              .getOrElse(throw NoSuchNameError("type variable", name, t))
+          )
+        )
+      case local: JavaLocal[G] =>
+        Java.findJavaName(local.name, fromStaticContext = false, ctx) match {
+          case Some(
+                _: RefVariable[G] | _: RefJavaField[G] |
+                _: RefJavaLocalDeclaration[G] | // Regular names
+                _ // Statically imported, or regular previously imported typename
+              ) => // Nothing to do. Local will get properly resolved next phase
+          case None =>
+            // Unknown what this local refers though. Try importing it as a type; otherwise, it's the start of a package
+            Java.findJavaTypeName(Seq(local.name), ctx) match {
+              case Some(_) => // already imported so nothing to do
+              case None =>
+                local.ref = Some(RefUnloadedJavaNamespace(Seq(local.name)))
+            }
+        }
+      case deref: JavaDeref[G] =>
+        val ref =
+          deref.obj match {
+            case javalocal: JavaLocal[G] => javalocal.ref
+            case javaderef: JavaDeref[G] => javaderef.ref
+            case _ => None
           }
-      }
-    case deref: JavaDeref[G] =>
-      val ref = deref.obj match {
-        case javalocal : JavaLocal[G] =>  javalocal.ref
-        case javaderef : JavaDeref[G] => javaderef.ref
-        case _ => None
-      }
-      ref match {
-        case Some(RefUnloadedJavaNamespace(names)) =>
-          Java.findJavaTypeName(names :+ deref.field, ctx) match {
-            case Some(_) => // already imported so nothing to do
-            case None =>
-              deref.ref = Some(RefUnloadedJavaNamespace(names :+ deref.field))
+        ref match {
+          case Some(RefUnloadedJavaNamespace(names)) =>
+            Java.findJavaTypeName(names :+ deref.field, ctx) match {
+              case Some(_) => // already imported so nothing to do
+              case None =>
+                deref.ref = Some(RefUnloadedJavaNamespace(names :+ deref.field))
+            }
+          case _ => // we did not find a package so we don't do anything
+        }
+      case endpoint: PVLEndpoint[G] =>
+        endpoint.cls.tryResolve(name =>
+          PVL.findTypeName(name, ctx) match {
+            case Some(RefClass(cls: Class[G])) => cls
+            case Some(_) => throw ForbiddenEndpointType(endpoint)
+            case None => throw NoSuchNameError("class", name, endpoint)
           }
-        case _ => // we did not find a package so we don't do anything
-      }
-    case endpoint: PVLEndpoint[G] =>
-      endpoint.cls.tryResolve(name => PVL.findTypeName(name, ctx) match {
-        case Some(RefClass(cls: Class[G])) => cls
-        case Some(_) => throw ForbiddenEndpointType(endpoint)
-        case None => throw NoSuchNameError("class", name, endpoint)
-      })
-
-    case _ =>
-  }
+        )
+
+      case _ =>
+    }
 }
 
 case object ResolveReferences extends LazyLogging {
-  def resolve[G](program: Program[G], jp: SpecExprParser, lsp: SpecContractParser): Seq[CheckError] = {
+  def resolve[G](
+      program: Program[G],
+      jp: SpecExprParser,
+      lsp: SpecContractParser,
+  ): Seq[CheckError] = {
     resolve(program, ReferenceResolutionContext[G](jp, lsp))
   }
 
-  def resolve[G](node: Node[G], ctxIn: ReferenceResolutionContext[G]): Seq[CheckError] = {
-    val ctx = resolveFlatlyTopDown(node, ctxIn) match {
-      case Left(errs) => return errs
-      case Right(ctx) => ctx
-    }
+  def resolve[G](
+      node: Node[G],
+      ctxIn: ReferenceResolutionContext[G],
+  ): Seq[CheckError] = {
+    val ctx =
+      resolveFlatlyTopDown(node, ctxIn) match {
+        case Left(errs) => return errs
+        case Right(ctx) => ctx
+      }
 
-    val childErrors = node match {
-      case l @ Let(binding, value, main) =>
-        val innerCtx = enterContext(node, ctx).withCheckContext(l.enterCheckContext(ctx.checkContext))
-        resolve(binding, innerCtx) ++
-        resolve(value, ctx) ++
-        resolve(main, innerCtx)
-      case _ =>
-        val innerCtx = enterContext(node, ctx)
-        node.checkContextRecursor(ctx.checkContext, { (ctx, node) =>
-          resolve(node, innerCtx.withCheckContext(ctx))
-        }).flatten
-    }
+    val childErrors =
+      node match {
+        case l @ Let(binding, value, main) =>
+          val innerCtx = enterContext(node, ctx)
+            .withCheckContext(l.enterCheckContext(ctx.checkContext))
+          resolve(binding, innerCtx) ++ resolve(value, ctx) ++
+            resolve(main, innerCtx)
+        case _ =>
+          val innerCtx = enterContext(node, ctx)
+          node.checkContextRecursor(
+            ctx.checkContext,
+            { (ctx, node) => resolve(node, innerCtx.withCheckContext(ctx)) },
+          ).flatten
+      }
 
-    if(childErrors.nonEmpty) childErrors
+    if (childErrors.nonEmpty)
+      childErrors
     else {
       resolveFlatly(node, ctx)
       node.check(ctx.checkContext)
     }
   }
 
-  def resolveFlatlyTopDown[G](node: Node[G], ctx: ReferenceResolutionContext[G]): Either[Seq[CheckError], ReferenceResolutionContext[G]] = node match {
-    case f: CFunctionDefinition[G] if f.specs.collectFirst{case _: CGpgpuKernelSpecifier[G] => ()}.isDefined =>
-      Right(ctx.copy(inGpuKernel = true))
-    case p: Program[G] =>
-      p.declarations.foreach {
-        case glob: LlvmGlobal[G] =>
-          val decls = ctx.llvmSpecParser.parse(glob, glob.o)
-          glob.data = Some(decls)
-        case _ =>
-      }
-      Right(ctx)
+  def resolveFlatlyTopDown[G](
+      node: Node[G],
+      ctx: ReferenceResolutionContext[G],
+  ): Either[Seq[CheckError], ReferenceResolutionContext[G]] =
+    node match {
+      case f: CFunctionDefinition[G] if f.specs.collectFirst {
+            case _: CGpgpuKernelSpecifier[G] => ()
+          }.isDefined =>
+        Right(ctx.copy(inGpuKernel = true))
+      case p: Program[G] =>
+        p.declarations.foreach {
+          case glob: LlvmGlobal[G] =>
+            val decls = ctx.llvmSpecParser.parse(glob, glob.o)
+            glob.data = Some(decls)
+          case _ =>
+        }
+        Right(ctx)
 
-    case _ => Right(ctx)
-  }
+      case _ => Right(ctx)
+    }
 
-  def scanScope[G](ctx: TypeResolutionContext[G])(node: Node[G]): Seq[Declaration[G]] = node match {
-    case _: Scope[G] => Nil
-    // Remove shared memory locations from the body level of a GPU kernel, we want to reason about them at the top level
-    case CDeclarationStatement(decl) if !(ctx.inGpuKernel && decl.decl.specs.collectFirst{case GPULocal() => ()}.isDefined)
-    => Seq(decl)
-    case CPPDeclarationStatement(decl) => Seq(decl)
-    case JavaLocalDeclarationStatement(decl) => Seq(decl)
-    case LocalDecl(v) => Seq(v)
-    case other => other.subnodes.flatMap(scanScope(ctx))
-  }
+  def scanScope[G](
+      ctx: TypeResolutionContext[G]
+  )(node: Node[G]): Seq[Declaration[G]] =
+    node match {
+      case _: Scope[G] => Nil
+      // Remove shared memory locations from the body level of a GPU kernel, we want to reason about them at the top level
+      case CDeclarationStatement(decl)
+          if !(ctx.inGpuKernel &&
+            decl.decl.specs.collectFirst { case GPULocal() => () }.isDefined) =>
+        Seq(decl)
+      case CPPDeclarationStatement(decl) => Seq(decl)
+      case JavaLocalDeclarationStatement(decl) => Seq(decl)
+      case LocalDecl(v) => Seq(v)
+      case other => other.subnodes.flatMap(scanScope(ctx))
+    }
 
-  def scanLabels[G](node: Node[G]): Seq[Declaration[G]] = node.transSubnodes.collect {
-    case decl: LabelDecl[G] => decl
-    case decl: SendDecl[G] => decl
-  }
+  def scanLabels[G](node: Node[G]): Seq[Declaration[G]] =
+    node.transSubnodes.collect {
+      case decl: LabelDecl[G] => decl
+      case decl: SendDecl[G] => decl
+    }
 
-  def scanBlocks[G](node: ParRegion[G]): Seq[ParBlock[G]] = node match {
-    case ParParallel(regions) => regions.flatMap(scanBlocks)
-    case ParSequential(regions) => regions.flatMap(scanBlocks)
-    case block: ParBlock[G] => Seq(block)
-  }
+  def scanBlocks[G](node: ParRegion[G]): Seq[ParBlock[G]] =
+    node match {
+      case ParParallel(regions) => regions.flatMap(scanBlocks)
+      case ParSequential(regions) => regions.flatMap(scanBlocks)
+      case block: ParBlock[G] => Seq(block)
+    }
 
-  def scanShared[G](node: Node[G]): Seq[Declaration[G]] = node.transSubnodes.collect {
-    case decl: CLocalDeclaration[G] if decl.decl.specs.collectFirst{case GPULocal() => ()}.isDefined => decl
-  }
+  def scanShared[G](node: Node[G]): Seq[Declaration[G]] =
+    node.transSubnodes.collect {
+      case decl: CLocalDeclaration[G] if decl.decl.specs.collectFirst {
+            case GPULocal() => ()
+          }.isDefined =>
+        decl
+    }
 
-  def scanJavaBipGuards[G](nodes: Seq[Declaration[G]]): Seq[(Expr[G], JavaMethod[G])] = nodes.collect {
-    case m: JavaMethod[G] if BipGuard.getName(m).isDefined => (BipGuard.getName(m).get, m)
-  }
+  def scanJavaBipGuards[G](
+      nodes: Seq[Declaration[G]]
+  ): Seq[(Expr[G], JavaMethod[G])] =
+    nodes.collect {
+      case m: JavaMethod[G] if BipGuard.getName(m).isDefined =>
+        (BipGuard.getName(m).get, m)
+    }
 
-  def scanJavaBipStatePredicates[G](nodes: Seq[JavaModifier[G]]): Seq[(Expr[G], JavaAnnotation[G])] = nodes.collect {
-    case ann: JavaAnnotation[G] if isBip(ann, "StatePredicate") => (ann.expect("state"), ann)
-  }
+  def scanJavaBipStatePredicates[G](
+      nodes: Seq[JavaModifier[G]]
+  ): Seq[(Expr[G], JavaAnnotation[G])] =
+    nodes.collect {
+      case ann: JavaAnnotation[G] if isBip(ann, "StatePredicate") =>
+        (ann.expect("state"), ann)
+    }
 
-  def enterContext[G](node: Node[G], ctx: ReferenceResolutionContext[G], inGPUKernel: Boolean = false): ReferenceResolutionContext[G] = (node match {
-    case ns: JavaNamespace[G] => ctx
-      .copy(currentJavaNamespace=Some(ns))
-      .copy(stack = ns.imports.flatMap(ResolveTypes.scanImport[G](_, ctx.asTypeResolutionContext)) +: ctx.stack)
-      .declare(ns.declarations)
-    case cls: JavaClassOrInterface[G] => {
-      val newCtx = ctx
-        .copy(currentJavaClass = Some(cls))
-        .copy(currentThis = Some(RefJavaClass(cls)))
-        .declare(cls.decls)
-        .declareJavaBipGuards(scanJavaBipGuards(cls.decls))
-        .declareJavaBipStatePredicates(scanJavaBipStatePredicates(cls.modifiers))
-
-      /* JavaBIP _name keys_ of guard annotations/states cut in line because transitions need to refer to them,
+  def enterContext[G](
+      node: Node[G],
+      ctx: ReferenceResolutionContext[G],
+      inGPUKernel: Boolean = false,
+  ): ReferenceResolutionContext[G] =
+    (node match {
+      case ns: JavaNamespace[G] =>
+        ctx.copy(currentJavaNamespace = Some(ns)).copy(stack =
+          ns.imports.flatMap(
+            ResolveTypes.scanImport[G](_, ctx.asTypeResolutionContext)
+          ) +: ctx.stack
+        ).declare(ns.declarations)
+      case cls: JavaClassOrInterface[G] => {
+        val newCtx = ctx.copy(currentJavaClass = Some(cls))
+          .copy(currentThis = Some(RefJavaClass(cls))).declare(cls.decls)
+          .declareJavaBipGuards(scanJavaBipGuards(cls.decls))
+          .declareJavaBipStatePredicates(scanJavaBipStatePredicates(
+            cls.modifiers
+          ))
+
+        /* JavaBIP _name keys_ of guard annotations/states cut in line because transitions need to refer to them,
           _by string value_. So they are fully resolved before proceeding.
           E.g. the following two annotations on a method are considered equivalent by the current JavaBIP engine implementation,
           given that INIT is some static final field containing "initState":
@@ -290,429 +429,735 @@ case object ResolveReferences extends LazyLogging {
           @Transition(source = "initState", ...)
           To make this stringly lookup work, state predicate names & guard names must be resolved before
           anything else in java classes
-          */
-      newCtx.javaBipGuards.keys.map(resolve(_, newCtx))
-      newCtx.javaBipStatePredicates.keys.map(resolve(_, newCtx))
-      newCtx
-    }
-    case deref: JavaDeref[G] => return ctx
-      .copy(topLevelJavaDeref = ctx.topLevelJavaDeref.orElse(Some(deref)))
-    case cls: Class[G] => ctx
-      .copy(currentThis=Some(RefClass(cls)))
-      .declare(cls.declarations)
-      // Ensure occurrences of type variables within the class that defines them are ignored when substituting
-      .appendTypeEnv(cls.typeArgs.map(v => (v, TVar[G](v.ref))).toMap)
-    case adt: AxiomaticDataType[G] => ctx
-      // Ensure occurrences of type variables within the adt that defines them are ignored when substituting
-      .declare(adt.declarations)
-      .appendTypeEnv(adt.typeArgs.map(v => (v, TVar[G](v.ref))).toMap)
-    case chor: Choreography[G] => ctx
-      .copy(currentThis = Some(RefChoreography(chor)))
-      .declare(chor.decls)
-      .declare(chor.endpoints)
-      .declare(chor.params)
-    case chor: PVLChoreography[G] => ctx
-      .copy(currentThis = Some(RefPVLChoreography(chor)))
-      .declare(chor.args)
-      .declare(chor.declarations)
-    case channelInv: PVLChannelInvariant[G] => ctx
-      .copy(currentCommunicate = Some(channelInv.comm.asInstanceOf[PVLCommunicate[G]]))
-    case method: JavaMethod[G] => ctx
-      .copy(currentResult=Some(RefJavaMethod(method)))
-      .copy(inStaticJavaContext=method.modifiers.collectFirst { case _: JavaStatic[_] => () }.nonEmpty)
-      .declare(method.declarations ++ method.body.map(scanLabels).getOrElse(Nil))
-    case fields: JavaFields[G] => ctx
-      .copy(currentInitializerType=Some(fields.t))
-      .copy(inStaticJavaContext=fields.modifiers.collectFirst { case _: JavaStatic[_] => () }.nonEmpty)
-    case init: JavaSharedInitialization[G] => ctx
-      .copy(inStaticJavaContext=init.isStatic)
-    case locals: JavaLocalDeclaration[G] => ctx
-      .copy(currentInitializerType=Some(locals.t))
-    case decl: JavaVariableDeclaration[G] => ctx
-      .copy(currentInitializerType=ctx.currentInitializerType.map(t => FuncTools.repeat((t: Type[G]) => TArray(t), decl.moreDims, t)))
-    case arr: JavaNewLiteralArray[G] => ctx
-      .copy(currentInitializerType=Some(FuncTools.repeat((t: Type[G]) => TArray(t), arr.dims, arr.baseType)))
-    case init: JavaLiteralArray[G] => ctx
-      .copy(currentInitializerType=Some(ctx.currentInitializerType.get match {
-        case TArray(elem) => elem
-        case _ => throw WrongArrayInitializer(init)
-      }))
-    case func: CFunctionDefinition[G] =>
-      var res = ctx
-        .copy(currentResult=Some(RefCFunctionDefinition(func)))
-        .declare(C.paramsFromDeclarator(func.declarator) ++ scanLabels(func.body) ++ func.contract.givenArgs ++ func.contract.yieldsArgs)
-      if(func.specs.collectFirst{case _: CGpgpuKernelSpecifier[G] => ()}.isDefined)
-        res = res.declare(scanShared(func.body))
-      res
-    case func: CGlobalDeclaration[G] =>
-      if(func.decl.contract.nonEmpty && func.decl.inits.size > 1) {
-        throw MultipleForwardDeclarationContractError(func)
+         */
+        newCtx.javaBipGuards.keys.map(resolve(_, newCtx))
+        newCtx.javaBipStatePredicates.keys.map(resolve(_, newCtx))
+        newCtx
       }
-      func.decl.inits.zipWithIndex.foldLeft(
-        ctx.declare(func.decl.contract.givenArgs ++ func.decl.contract.yieldsArgs)
-      ) {
-        case (ctx, (init, idx)) =>
+      case deref: JavaDeref[G] =>
+        return ctx
+          .copy(topLevelJavaDeref = ctx.topLevelJavaDeref.orElse(Some(deref)))
+      case cls: Class[G] =>
+        ctx.copy(currentThis = Some(RefClass(cls))).declare(cls.declarations)
+          // Ensure occurrences of type variables within the class that defines them are ignored when substituting
+          .appendTypeEnv(cls.typeArgs.map(v => (v, TVar[G](v.ref))).toMap)
+      case adt: AxiomaticDataType[G] =>
+        ctx
+          // Ensure occurrences of type variables within the adt that defines them are ignored when substituting
+          .declare(adt.declarations)
+          .appendTypeEnv(adt.typeArgs.map(v => (v, TVar[G](v.ref))).toMap)
+      case chor: Choreography[G] =>
+        ctx.copy(currentThis = Some(RefChoreography(chor))).declare(chor.decls)
+          .declare(chor.endpoints).declare(chor.params)
+      case chor: PVLChoreography[G] =>
+        ctx.copy(currentThis = Some(RefPVLChoreography(chor)))
+          .declare(chor.args).declare(chor.declarations)
+      case channelInv: PVLChannelInvariant[G] =>
+        ctx.copy(currentCommunicate =
+          Some(channelInv.comm.asInstanceOf[PVLCommunicate[G]])
+        )
+      case method: JavaMethod[G] =>
+        ctx.copy(currentResult = Some(RefJavaMethod(method)))
+          .copy(inStaticJavaContext =
+            method.modifiers.collectFirst { case _: JavaStatic[_] => () }
+              .nonEmpty
+          ).declare(
+            method.declarations ++ method.body.map(scanLabels).getOrElse(Nil)
+          )
+      case fields: JavaFields[G] =>
+        ctx.copy(currentInitializerType = Some(fields.t))
+          .copy(inStaticJavaContext =
+            fields.modifiers.collectFirst { case _: JavaStatic[_] => () }
+              .nonEmpty
+          )
+      case init: JavaSharedInitialization[G] =>
+        ctx.copy(inStaticJavaContext = init.isStatic)
+      case locals: JavaLocalDeclaration[G] =>
+        ctx.copy(currentInitializerType = Some(locals.t))
+      case decl: JavaVariableDeclaration[G] =>
+        ctx.copy(currentInitializerType =
+          ctx.currentInitializerType.map(t =>
+            FuncTools.repeat((t: Type[G]) => TArray(t), decl.moreDims, t)
+          )
+        )
+      case arr: JavaNewLiteralArray[G] =>
+        ctx.copy(currentInitializerType =
+          Some(
+            FuncTools.repeat((t: Type[G]) => TArray(t), arr.dims, arr.baseType)
+          )
+        )
+      case init: JavaLiteralArray[G] =>
+        ctx.copy(currentInitializerType =
+          Some(ctx.currentInitializerType.get match {
+            case TArray(elem) => elem
+            case _ => throw WrongArrayInitializer(init)
+          })
+        )
+      case func: CFunctionDefinition[G] =>
+        var res = ctx.copy(currentResult = Some(RefCFunctionDefinition(func)))
+          .declare(
+            C.paramsFromDeclarator(func.declarator) ++ scanLabels(func.body) ++
+              func.contract.givenArgs ++ func.contract.yieldsArgs
+          )
+        if (
+          func.specs.collectFirst { case _: CGpgpuKernelSpecifier[G] => () }
+            .isDefined
+        )
+          res = res.declare(scanShared(func.body))
+        res
+      case func: CGlobalDeclaration[G] =>
+        if (func.decl.contract.nonEmpty && func.decl.inits.size > 1) {
+          throw MultipleForwardDeclarationContractError(func)
+        }
+        func.decl.inits.zipWithIndex.foldLeft(ctx.declare(
+          func.decl.contract.givenArgs ++ func.decl.contract.yieldsArgs
+        )) { case (ctx, (init, idx)) =>
           val info = C.getDeclaratorInfo(init.decl)
-          ctx
-            .declare(info.params.getOrElse(Nil))
-            .copy(currentResult=info.params.map(_ => RefCGlobalDeclaration(func, idx)))
-      }
-    case func: CPPFunctionDefinition[G] =>
-      ctx
-        .copy(currentResult = Some(RefCPPFunctionDefinition(func)))
-        .declare(CPP.paramsFromDeclarator(func.declarator) ++ scanLabels(func.body) ++ func.contract.givenArgs ++ func.contract.yieldsArgs)
-    case func: CPPGlobalDeclaration[G] =>
-      if (func.decl.contract.nonEmpty && func.decl.inits.size > 1) {
-        throw MultipleForwardDeclarationContractError(func)
-      }
-      func.decl.inits.zipWithIndex.foldLeft(
-        ctx.declare(func.decl.contract.givenArgs ++ func.decl.contract.yieldsArgs)
-      ) {
-        case (ctx, (init, idx)) =>
+          ctx.declare(info.params.getOrElse(Nil)).copy(currentResult =
+            info.params.map(_ => RefCGlobalDeclaration(func, idx))
+          )
+        }
+      case func: CPPFunctionDefinition[G] =>
+        ctx.copy(currentResult = Some(RefCPPFunctionDefinition(func))).declare(
+          CPP.paramsFromDeclarator(func.declarator) ++ scanLabels(func.body) ++
+            func.contract.givenArgs ++ func.contract.yieldsArgs
+        )
+      case func: CPPGlobalDeclaration[G] =>
+        if (func.decl.contract.nonEmpty && func.decl.inits.size > 1) {
+          throw MultipleForwardDeclarationContractError(func)
+        }
+        func.decl.inits.zipWithIndex.foldLeft(ctx.declare(
+          func.decl.contract.givenArgs ++ func.decl.contract.yieldsArgs
+        )) { case (ctx, (init, idx)) =>
           val info = CPP.getDeclaratorInfo(init.decl)
-          ctx
-            .declare(info.params.getOrElse(Nil))
-            .copy(currentResult = info.params.map(_ => RefCPPGlobalDeclaration(func, idx)))
-      }
-    case func: CPPLambdaDefinition[G] =>
-      ctx.declare(CPP.paramsFromDeclarator(func.declarator) ++ scanLabels(func.body) ++ func.contract.givenArgs ++ func.contract.yieldsArgs)
-    case func: LlvmFunctionDefinition[G] => ctx
-      .copy(currentResult = Some(RefLlvmFunctionDefinition(func)))
-    case func: LlvmSpecFunction[G] => ctx
-      .copy(currentResult = Some(RefLlvmSpecFunction(func)))
-      .declare(func.args)
-    case par: ParStatement[G] => ctx
-      .declare(scanBlocks(par.impl).map(_.decl))
-    case Scope(locals, body) => ctx
-      .declare(locals ++ scanScope(ctx.asTypeResolutionContext)(body))
-    case app: ContractApplicable[G] => ctx
-      .copy(currentResult = Some(Referrable.from(app).head.asInstanceOf[ResultTarget[G]] /* PB TODO: ew */))
-      .declare(app.declarations ++ app.body.map(scanLabels).getOrElse(Nil))
-    case app: Applicable[G] => ctx
-      .declare(app.declarations ++ app.body.map(scanLabels).getOrElse(Nil))
-    case declarator: Declarator[G] => ctx
-      .declare(declarator.declarations)
-    case _ => ctx
-  }).copy(topLevelJavaDeref = None)
-
-  def resolveFlatly[G](node: Node[G], ctx: ReferenceResolutionContext[G]): Unit = node match {
-    case local@CLocal(name) =>
-      local.ref = Some(C.findCName(name, ctx).getOrElse(throw NoSuchNameError("local", name, local)))
-    case local@CPPLocal(name, arg) =>
-      local.ref = Some(CPP.findCPPName(name, ctx).headOption.getOrElse(throw NoSuchNameError("local", name, local)))
-    case local @ JavaLocal(name) =>
-      val start: Option[JavaNameTarget[G]] = if (ctx.javaBipGuardsEnabled) {
-        Java.findJavaBipGuard(ctx, name).map(RefJavaBipGuard(_))
-      } else { None }
-      local.ref = Some(start.orElse(
-        Java.findJavaName(name, fromStaticContext = ctx.inStaticJavaContext, ctx.asTypeResolutionContext)
-          .orElse(Java.findJavaTypeName(Seq(name), ctx.asTypeResolutionContext) match {
-            case Some(target: JavaNameTarget[G]) => Some(target)
-            case Some(_) | None => None
-          }))
-          .getOrElse(
-            if (ctx.topLevelJavaDeref.isEmpty) throw NoSuchNameError("local", name, local)
-            else RefUnloadedJavaNamespace(Seq(name))))
-    case local @ PVLLocal(name) =>
-      local.ref = Some(PVL.findName(name, ctx).getOrElse(throw NoSuchNameError("local", name, local)))
-    case local@Local(ref) =>
-      ref.tryResolve(name => Spec.findLocal(name, ctx).getOrElse(throw NoSuchNameError("local", name, local)))
-    case local@TVar(ref) =>
-      ref.tryResolve(name => Spec.findLocal(name, ctx).getOrElse(throw NoSuchNameError("type variable", name, local)))
-    case funcOf@FunctionOf(v, vars) =>
-      v.tryResolve(name => Spec.findLocal(name, ctx).getOrElse(throw NoSuchNameError("local", name, funcOf)))
-      vars.foreach(v => v.tryResolve(name => Spec.findLocal(name, ctx).getOrElse(throw NoSuchNameError("local", name, funcOf))))
-    case local@SilverLocalAssign(ref, _) =>
-      ref.tryResolve(name => Spec.findLocal(name, ctx).getOrElse(throw NoSuchNameError("local", name, local)))
-    case local@PVLEndpointName(name) => PVL.findName(name, ctx) match {
-      case Some(ref: RefPVLEndpoint[G]) => local.ref = Some(ref)
-      case Some(_) => throw ForbiddenEndpointNameType(local)
-      case None => throw NoSuchNameError("endpoint", name, local)
-    }
-    case endpoint: PVLEndpoint[G] =>
-      endpoint.ref = Some(PVL.findConstructor(TClass(endpoint.cls.decl.ref[Class[G]], Seq()), Seq(), endpoint.args).getOrElse(throw ConstructorNotFound(endpoint)))
-    case deref@CStructDeref(struct, field) =>
-      deref.ref = Some(C.findPointerDeref(struct, field, ctx, deref.blame).getOrElse(throw NoSuchNameError("field", field, deref)))
-    case deref@CFieldAccess(obj, field) =>
-      deref.ref = Some(C.findDeref(obj, field, ctx, deref.blame).getOrElse(throw NoSuchNameError("field", field, deref)))
-    case deref@CPPClassMethodOrFieldAccess(obj, methodOrFieldName) =>
-      deref.ref = Some(CPP.findDeref(obj, methodOrFieldName, ctx, deref.blame).headOption.getOrElse(throw NoSuchNameError("field or instance method", methodOrFieldName, deref)))
-    case deref@JavaDeref(obj, field) =>
-      deref.ref = Some(Java.findDeref(obj, field, ctx, deref.blame).getOrElse(throw NoSuchNameError("field", field, deref)))
-      if (ctx.topLevelJavaDeref.contains(deref) && (deref.ref match {
-        case Some(RefUnloadedJavaNamespace(_)) => true
-        case _ => false
-      })) throw NoSuchNameError("field", field, deref)
-    case deref @ PVLDeref(obj, field) =>
-      deref.ref = Some(PVL.findDeref(obj, field, ctx, deref.blame).getOrElse(throw NoSuchNameError("field", field, deref)))
-    case deref@Deref(obj, field) =>
-      field.tryResolve(name => Spec.findField(obj, name).getOrElse(throw NoSuchNameError("field", name, deref)))
-    case deref@ModelDeref(obj, field) =>
-      field.tryResolve(name => Spec.findModelField(obj, name).getOrElse(throw NoSuchNameError("field", name, deref)))
-    case deref@SilverDeref(_, field) =>
-      field.tryResolve(name => Spec.findSilverField(name, ctx).getOrElse(throw NoSuchNameError("field", name, deref)))
-    case deref@SilverFieldLocation(_, field) =>
-      field.tryResolve(name => Spec.findSilverField(name, ctx).getOrElse(throw NoSuchNameError("field", name, deref)))
-    case deref@SilverCurFieldPerm(_, field) =>
-      field.tryResolve(name => Spec.findSilverField(name, ctx).getOrElse(throw NoSuchNameError("field", name, deref)))
-    case deref@SilverFieldAssign(_, field, _) =>
-      field.tryResolve(name => Spec.findSilverField(name, ctx).getOrElse(throw NoSuchNameError("field", name, deref)))
-
-    case inv@CInvocation(obj, _, givenMap, yields) =>
-      inv.ref = Some(C.resolveInvocation(obj, ctx))
-      Spec.resolveGiven(givenMap, inv.ref.get, inv)
-      Spec.resolveYields(ctx, yields, inv.ref.get, inv)
-    case inv@CPPInvocation(obj, args, givenMap, yields) =>
-      inv.ref = Some(CPP.resolveInvocation(obj, args, ctx))
-      Spec.resolveGiven(givenMap, inv.ref.get, inv)
-      Spec.resolveYields(ctx, yields, inv.ref.get, inv)
-    case inv@GpgpuCudaKernelInvocation(name, blocks, threads, args, givenMap, yields) =>
-      val kernel = C.findCName(name, ctx).getOrElse(throw NoSuchNameError("kernel", name, inv))
-      inv.ref = Some(kernel match {
-        case target: CInvocationTarget[G] => target
-        case _ => throw NotApplicable(inv)
-      })
-      Spec.resolveGiven(givenMap, inv.ref.get, inv)
-      Spec.resolveYields(ctx, yields, inv.ref.get, inv)
-    case inv@JavaInvocation(obj, _, method, args, givenMap, yields) =>
-      inv.ref = Some((obj match {
-        case Some(obj) => Java.findMethod(ctx, obj, method, args, inv.blame)
-        case None => Java.findMethod(ctx, method, args)
-      }).getOrElse(throw NoSuchNameError("method", method, inv)))
-      Spec.resolveGiven(givenMap, inv.ref.get, inv)
-      Spec.resolveYields(ctx, yields, inv.ref.get, inv)
-    case inv@JavaNewClass(args, typeArgs, name, givenMap, yields) =>
-      inv.ref = Some(Java.findConstructor(name, args).getOrElse(throw NoSuchConstructor(inv)))
-      Spec.resolveGiven(givenMap, inv.ref.get, inv)
-      Spec.resolveYields(ctx, yields, inv.ref.get, inv)
-    case inv@PVLInvocation(None, method, args, typeArgs, givenMap, yields) =>
-      inv.ref = Some(PVL.findMethod(method, args, typeArgs, ctx).getOrElse(throw NoSuchNameError("method", method, inv)))
-      Spec.resolveGiven(givenMap, inv.ref.get, inv)
-      Spec.resolveYields(ctx, yields, inv.ref.get, inv)
-    case inv@PVLInvocation(Some(obj), method, args, typeArgs, givenMap, yields) =>
-      inv.ref = Some(PVL.findInstanceMethod(obj, method, args, typeArgs, inv.blame).getOrElse(throw NoSuchNameError("method", method, inv)))
-      Spec.resolveGiven(givenMap, inv.ref.get, inv)
-      Spec.resolveYields(ctx, yields, inv.ref.get, inv)
-    case inv@PVLNew(t, typeArgs, args, givenMap, yields) =>
-      inv.ref = Some(PVL.findConstructor(t, typeArgs, args).getOrElse(throw NoSuchConstructor(inv)))
-      Spec.resolveGiven(givenMap, inv.ref.get, inv)
-      Spec.resolveYields(ctx, yields, inv.ref.get, inv)
-    case n@NewObject(ref) =>
-      ref.tryResolve(name => Spec.findClass(name, ctx.asTypeResolutionContext).getOrElse(throw NoSuchNameError("class", name, n)))
-    case n@ModelNew(ref) =>
-      ref.tryResolve(name => Spec.findModel(name, ctx.asTypeResolutionContext).getOrElse(throw NoSuchNameError("model", name, n)))
-    case n@SilverNewRef(target, fields) =>
-      target.tryResolve(name => Spec.findLocal(name, ctx).getOrElse(throw NoSuchNameError("local", name, n)))
-      fields.foreach(_.tryResolve(name => Spec.findSilverField(name, ctx).getOrElse(throw NoSuchNameError("field", name, n))))
-    case inv@ADTFunctionInvocation(typeArgs, ref, args) =>
-      typeArgs match {
-        case Some((adt, typeArgs)) =>
-          // Fully-qualified external invocation
-          adt.tryResolve(name => Spec.findAdt(name, ctx.asTypeResolutionContext).getOrElse(throw NoSuchNameError("adt", name, inv)))
-          ref.tryResolve(name => Spec.findAdtFunction(adt.decl, name).getOrElse(throw NoSuchNameError("function", name, inv)))
-        case None =>
-          // Non-qualified internal invocation
-          ???
-      }
-    case inv@SilverPartialADTFunctionInvocation(name, args, partialTypeArgs) =>
-      inv.ref = Some(Spec.findAdtFunction(name, ctx).getOrElse(throw NoSuchNameError("function", name, inv)))
-      partialTypeArgs.foreach(mapping => mapping._1.tryResolve(name => Spec.findAdtTypeArg(inv.adt, name).getOrElse(throw NoSuchNameError("type variable", name, inv))))
-    case inv @ InvokeProcedure(ref, _, _, _, givenMap, yields) =>
-      ref.tryResolve(name => Spec.findProcedure(name, ctx).getOrElse(throw NoSuchNameError("procedure", name, inv)))
-      Spec.resolveGiven(givenMap, RefProcedure(ref.decl), inv)
-      Spec.resolveYields(ctx, yields, RefProcedure(ref.decl), inv)
-    case inv @ ProcedureInvocation(ref, _, _, _, givenMap, yields) =>
-      ref.tryResolve(name => Spec.findProcedure(name, ctx).getOrElse(throw NoSuchNameError("procedure", name, inv)))
-      Spec.resolveGiven(givenMap, RefProcedure(ref.decl), inv)
-      Spec.resolveYields(ctx, yields, RefProcedure(ref.decl), inv)
-    case inv@FunctionInvocation(ref, _, _, givenMap, yields) =>
-      ref.tryResolve(name => Spec.findFunction(name, ctx).getOrElse(throw NoSuchNameError("function", name, inv)))
-      Spec.resolveGiven(givenMap, RefFunction(ref.decl), inv)
-      Spec.resolveYields(ctx, yields, RefFunction(ref.decl), inv)
-    case inv@PredicateApply(ref, _, _) =>
-      ref.tryResolve(name => Spec.findPredicate(name, ctx).getOrElse(throw NoSuchNameError("predicate", name, inv)))
-    case inv@SilverCurPredPerm(ref, _) =>
-      ref.tryResolve(name => Spec.findPredicate(name, ctx).getOrElse(throw NoSuchNameError("predicate", name, inv)))
-    case inv @ InvokeMethod(obj, ref, _, _, _, givenMap, yields) =>
-      ref.tryResolve(name => Spec.findMethod(obj, name).getOrElse(throw NoSuchNameError("method", name, inv)))
-      Spec.resolveGiven(givenMap, RefInstanceMethod(ref.decl), inv)
-      Spec.resolveYields(ctx, yields, RefInstanceMethod(ref.decl), inv)
-    case inv @ MethodInvocation(obj, ref, _, _, _, givenMap, yields) =>
-      ref.tryResolve(name => Spec.findMethod(obj, name).getOrElse(throw NoSuchNameError("method", name, inv)))
-      Spec.resolveGiven(givenMap, RefInstanceMethod(ref.decl), inv)
-      Spec.resolveYields(ctx, yields, RefInstanceMethod(ref.decl), inv)
-    case inv@InstanceFunctionInvocation(obj, ref, _, _, givenMap, yields) =>
-      ref.tryResolve(name => Spec.findInstanceFunction(obj, name).getOrElse(throw NoSuchNameError("function", name, inv)))
-    case inv@InstancePredicateApply(obj, ref, _, _) =>
-      ref.tryResolve(name => Spec.findInstancePredicate(obj, name).getOrElse(throw NoSuchNameError("predicate", name, inv)))
-    case inv @ CoalesceInstancePredicateApply(obj, ref, _, _) =>
-      ref.tryResolve(name => Spec.findInstancePredicate(obj, name).getOrElse(throw NoSuchNameError("predicate", name, inv)))
-
-    case defn: CFunctionDefinition[G] =>
-      defn.ref = C.findForwardDeclaration(defn.declarator, ctx)
-    case decl: CInit[G] =>
-      decl.ref = C.findDefinition(decl.decl, ctx)
-
-    case defn: CPPFunctionDefinition[G] =>
-      defn.ref = CPP.findForwardDeclaration(defn.declarator, ctx)
-    case decl: CPPInit[G] =>
-      decl.ref = CPP.findDefinition(decl.decl, ctx)
-
-    case goto@CGoto(name) =>
-      goto.ref = Some(Spec.findLabel(name, ctx).getOrElse(throw NoSuchNameError("label", name, goto)))
-    case goto@Goto(lbl) =>
-      lbl.tryResolve(name => Spec.findLabel(name, ctx).getOrElse(throw NoSuchNameError("label", name, goto)))
-    case brk@Break(Some(lbl)) =>
-      lbl.tryResolve(name => Spec.findLabel(name, ctx).getOrElse(throw NoSuchNameError("label", name, brk)))
-    case cont@Continue(Some(lbl)) =>
-      lbl.tryResolve(name => Spec.findLabel(name, ctx).getOrElse(throw NoSuchNameError("label", name, cont)))
-    case old@Old(_, Some(lbl)) =>
-      lbl.tryResolve(name => Spec.findLabel(name, ctx).getOrElse(throw NoSuchNameError("label", name, old)))
-
-    case recv@Recv(ref) =>
-      ref.tryResolve(name => Spec.findSend(name, ctx).getOrElse(throw NoSuchNameError("send statement", name, recv)))
-
-    case res@AmbiguousResult() =>
-      res.ref = Some(ctx.currentResult.getOrElse(throw ResultOutsideMethod(res)))
-    case diz@AmbiguousThis() =>
-      diz.ref = Some(ctx.currentThis.getOrElse(throw WrongThisPosition(diz)))
-
-    case proc: ModelProcess[G] =>
-      proc.modifies.foreach(_.tryResolve(name => Spec.findModelField(name, ctx)
-        .getOrElse(throw NoSuchNameError("field", name, proc))))
-      proc.accessible.foreach(_.tryResolve(name => Spec.findModelField(name, ctx)
-        .getOrElse(throw NoSuchNameError("field", name, proc))))
-    case act: ModelAction[G] =>
-      act.modifies.foreach(_.tryResolve(name => Spec.findModelField(name, ctx)
-        .getOrElse(throw NoSuchNameError("field", name, act))))
-      act.accessible.foreach(_.tryResolve(name => Spec.findModelField(name, ctx)
-        .getOrElse(throw NoSuchNameError("field", name, act))))
-
-    case inv@ProcessApply(ref, _) =>
-      ref.tryResolve(name => ???)
-    case inv@ActionApply(ref, _) =>
-      ref.tryResolve(name => ???)
-
-    case atomic@ParAtomic(invs, _) =>
-      invs.foreach(_.tryResolve(name => Spec.findParInvariant(name, ctx)
-        .getOrElse(throw NoSuchNameError("invariant", name, atomic))))
-    case barrier@ParBarrier(block, invs, _, _, _) =>
-      block.tryResolve(name => Spec.findParBlock(name, ctx)
-        .getOrElse(throw NoSuchNameError("block", name, barrier)))
-      invs.foreach(_.tryResolve(name => Spec.findParInvariant(name, ctx)
-        .getOrElse(throw NoSuchNameError("invariant", name, barrier))))
-
-    case arr@JavaLiteralArray(_) =>
-      arr.typeContext = Some(ctx.currentInitializerType.get match {
-        case t@TArray(_) => t
-        case _ => throw WrongArrayInitializer(arr)
-      })
-
-    case ann@JavaAnnotation(_, _) if isBip(ann, "Transition") =>
-      val guard: Option[Expr[G]] = ann.get("guard").map { g =>
-        val expr: Expr[G] = ctx.javaParser.parse(getLit(g), g.o)
-        // TODO: What about check errors here?
-        resolve(expr, ctx.enableJavaBipGuards())
-        expr
-      }
+          ctx.declare(info.params.getOrElse(Nil)).copy(currentResult =
+            info.params.map(_ => RefCPPGlobalDeclaration(func, idx))
+          )
+        }
+      case func: CPPLambdaDefinition[G] =>
+        ctx.declare(
+          CPP.paramsFromDeclarator(func.declarator) ++ scanLabels(func.body) ++
+            func.contract.givenArgs ++ func.contract.yieldsArgs
+        )
+      case func: LlvmFunctionDefinition[G] =>
+        ctx.copy(currentResult = Some(RefLlvmFunctionDefinition(func)))
+      case func: LlvmSpecFunction[G] =>
+        ctx.copy(currentResult = Some(RefLlvmSpecFunction(func)))
+          .declare(func.args)
+      case par: ParStatement[G] => ctx.declare(scanBlocks(par.impl).map(_.decl))
+      case Scope(locals, body) =>
+        ctx.declare(locals ++ scanScope(ctx.asTypeResolutionContext)(body))
+      case app: ContractApplicable[G] =>
+        ctx.copy(currentResult =
+          Some(
+            Referrable.from(app).head
+              .asInstanceOf[ResultTarget[G]] /* PB TODO: ew */
+          )
+        ).declare(app.declarations ++ app.body.map(scanLabels).getOrElse(Nil))
+      case app: Applicable[G] =>
+        ctx.declare(app.declarations ++ app.body.map(scanLabels).getOrElse(Nil))
+      case declarator: Declarator[G] => ctx.declare(declarator.declarations)
+      case _ => ctx
+    }).copy(topLevelJavaDeref = None)
 
-      def extractExpr(s: Option[Expr[_]]): (String, Origin) = s match {
-        case None => ("true", ann.o)
-        case Some(s @ JavaStringValue(data, _)) => (data, s.o)
-        case Some(n) => throw MalformedBipAnnotation(n, "pre- and post-conditions must be string literals")
-      }
+  def resolveFlatly[G](
+      node: Node[G],
+      ctx: ReferenceResolutionContext[G],
+  ): Unit =
+    node match {
+      case local @ CLocal(name) =>
+        local.ref = Some(
+          C.findCName(name, ctx)
+            .getOrElse(throw NoSuchNameError("local", name, local))
+        )
+      case local @ CPPLocal(name, arg) =>
+        local.ref = Some(
+          CPP.findCPPName(name, ctx).headOption
+            .getOrElse(throw NoSuchNameError("local", name, local))
+        )
+      case local @ JavaLocal(name) =>
+        val start: Option[JavaNameTarget[G]] =
+          if (ctx.javaBipGuardsEnabled) {
+            Java.findJavaBipGuard(ctx, name).map(RefJavaBipGuard(_))
+          } else { None }
+        local.ref = Some(
+          start.orElse(
+            Java.findJavaName(
+              name,
+              fromStaticContext = ctx.inStaticJavaContext,
+              ctx.asTypeResolutionContext,
+            ).orElse(
+              Java
+                .findJavaTypeName(
+                  Seq(name),
+                  ctx.asTypeResolutionContext,
+                ) match {
+                case Some(target: JavaNameTarget[G]) => Some(target)
+                case Some(_) | None => None
+              }
+            )
+          ).getOrElse(
+            if (ctx.topLevelJavaDeref.isEmpty)
+              throw NoSuchNameError("local", name, local)
+            else
+              RefUnloadedJavaNamespace(Seq(name))
+          )
+        )
+      case local @ PVLLocal(name) =>
+        local.ref = Some(
+          PVL.findName(name, ctx)
+            .getOrElse(throw NoSuchNameError("local", name, local))
+        )
+      case local @ Local(ref) =>
+        ref.tryResolve(name =>
+          Spec.findLocal(name, ctx)
+            .getOrElse(throw NoSuchNameError("local", name, local))
+        )
+      case local @ TVar(ref) =>
+        ref.tryResolve(name =>
+          Spec.findLocal(name, ctx)
+            .getOrElse(throw NoSuchNameError("type variable", name, local))
+        )
+      case funcOf @ FunctionOf(v, vars) =>
+        v.tryResolve(name =>
+          Spec.findLocal(name, ctx)
+            .getOrElse(throw NoSuchNameError("local", name, funcOf))
+        )
+        vars.foreach(v =>
+          v.tryResolve(name =>
+            Spec.findLocal(name, ctx)
+              .getOrElse(throw NoSuchNameError("local", name, funcOf))
+          )
+        )
+      case local @ SilverLocalAssign(ref, _) =>
+        ref.tryResolve(name =>
+          Spec.findLocal(name, ctx)
+            .getOrElse(throw NoSuchNameError("local", name, local))
+        )
+      case local @ PVLEndpointName(name) =>
+        PVL.findName(name, ctx) match {
+          case Some(ref: RefPVLEndpoint[G]) => local.ref = Some(ref)
+          case Some(_) => throw ForbiddenEndpointNameType(local)
+          case None => throw NoSuchNameError("endpoint", name, local)
+        }
+      case endpoint: PVLEndpoint[G] =>
+        endpoint.ref = Some(
+          PVL.findConstructor(
+            TClass(endpoint.cls.decl.ref[Class[G]], Seq()),
+            Seq(),
+            endpoint.args,
+          ).getOrElse(throw ConstructorNotFound(endpoint))
+        )
+      case deref @ CStructDeref(struct, field) =>
+        deref.ref = Some(
+          C.findPointerDeref(struct, field, ctx, deref.blame)
+            .getOrElse(throw NoSuchNameError("field", field, deref))
+        )
+      case deref @ CFieldAccess(obj, field) =>
+        deref.ref = Some(
+          C.findDeref(obj, field, ctx, deref.blame)
+            .getOrElse(throw NoSuchNameError("field", field, deref))
+        )
+      case deref @ CPPClassMethodOrFieldAccess(obj, methodOrFieldName) =>
+        deref.ref = Some(
+          CPP.findDeref(obj, methodOrFieldName, ctx, deref.blame).headOption
+            .getOrElse(
+              throw NoSuchNameError(
+                "field or instance method",
+                methodOrFieldName,
+                deref,
+              )
+            )
+        )
+      case deref @ JavaDeref(obj, field) =>
+        deref.ref = Some(
+          Java.findDeref(obj, field, ctx, deref.blame)
+            .getOrElse(throw NoSuchNameError("field", field, deref))
+        )
+        if (
+          ctx.topLevelJavaDeref.contains(deref) &&
+          (deref.ref match {
+            case Some(RefUnloadedJavaNamespace(_)) => true
+            case _ => false
+          })
+        )
+          throw NoSuchNameError("field", field, deref)
+      case deref @ PVLDeref(obj, field) =>
+        deref.ref = Some(
+          PVL.findDeref(obj, field, ctx, deref.blame)
+            .getOrElse(throw NoSuchNameError("field", field, deref))
+        )
+      case deref @ Deref(obj, field) =>
+        field.tryResolve(name =>
+          Spec.findField(obj, name)
+            .getOrElse(throw NoSuchNameError("field", name, deref))
+        )
+      case deref @ ModelDeref(obj, field) =>
+        field.tryResolve(name =>
+          Spec.findModelField(obj, name)
+            .getOrElse(throw NoSuchNameError("field", name, deref))
+        )
+      case deref @ SilverDeref(_, field) =>
+        field.tryResolve(name =>
+          Spec.findSilverField(name, ctx)
+            .getOrElse(throw NoSuchNameError("field", name, deref))
+        )
+      case deref @ SilverFieldLocation(_, field) =>
+        field.tryResolve(name =>
+          Spec.findSilverField(name, ctx)
+            .getOrElse(throw NoSuchNameError("field", name, deref))
+        )
+      case deref @ SilverCurFieldPerm(_, field) =>
+        field.tryResolve(name =>
+          Spec.findSilverField(name, ctx)
+            .getOrElse(throw NoSuchNameError("field", name, deref))
+        )
+      case deref @ SilverFieldAssign(_, field, _) =>
+        field.tryResolve(name =>
+          Spec.findSilverField(name, ctx)
+            .getOrElse(throw NoSuchNameError("field", name, deref))
+        )
 
-      val (r, ro) = extractExpr(ann.get("requires"))
-      val requires: Expr[G] = ctx.javaParser.parse(r, ro)
-      resolve(requires, ctx)
-
-      val (e, eo) = extractExpr(ann.get("ensures"))
-      val ensures: Expr[G] = ctx.javaParser.parse(e, eo)
-      resolve(ensures, ctx)
-
-      val name = getLit(ann.expect("name"))
-      val source = getLit(ann.expect("source"))
-      val target = getLit(ann.expect("target"))
-      ann.data = Some(BipTransition[G](name,
-        Java.findJavaBipStatePredicate(ctx, source),
-        Java.findJavaBipStatePredicate(ctx, target),
-        ann.get("guard").map(getLit(_)),
-        guard, requires, ensures)(ann.o))
-
-    case ann@JavaAnnotation(_, _) if isBip(ann, "Invariant") =>
-      val expr: Expr[G] = ctx.javaParser.parse(getLit(ann.expect("value")), ann.expect("value").o)
-      resolve(expr, ctx)
-      ann.data = Some(BipInvariant(expr))
-
-    case ann@JavaAnnotation(_, _) if isBip(ann, "StatePredicate") =>
-      val expr: Expr[G] = ctx.javaParser.parse(getLit(ann.expect("expr")), ann.expect("expr").o)
-      resolve(expr, ctx) // TODO (RR): Throwing away errors here?
-      ann.data = Some(BipStatePredicate(getLit(ann.expect("state")), expr)(ann.o))
-
-    case ann@JavaAnnotation(_, _) if isBip(ann, "ComponentType") =>
-      ann.data = Some(BipComponent(getLit(ann.expect("name")),
-        Java.findJavaBipStatePredicate(ctx, getLit(ann.expect("initial")))))
-
-    case ann@JavaAnnotation(_, _) if isBip(ann, "Data") =>
-      ann.data = Some(BipData(getLit(ann.expect("name")))(ann.o))
-
-    case ann@JavaAnnotation(_, _) if isBip(ann, "Guard") =>
-      ann.data = Some(BipGuard(getLit(ann.expect("name"))))
-
-    case ann: JavaAnnotation[G] if isBip(ann, "Port") =>
-      val portType: BipPortType[G] = ann.expect("type") match {
-        case p @ JavaDeref(_, "enforceable") => BipEnforceable[G]()(p.o)
-        case p @ JavaDeref(_, "spontaneous") => BipSpontaneous[G]()(p.o)
-        case p @ JavaDeref(_, "internal") => BipInternal[G]()(p.o)
-        case e => throw MalformedBipAnnotation(e, "Can be either PortType.enforceable, spontaneous, or internal")
-      }
-      ann.data = Some(BipPort[G](getLit(ann.expect("name")), portType)(ann.o))
-
-    case ann: JavaAnnotation[G] if isBip(ann, "Pure") =>
-      ann.data = Some(BipPure[G]())
-
-    case portName @ JavaBipGlueName(JavaTClass(Ref(cls: JavaClass[G]), Nil), name) =>
-      portName.data = Some((cls, getLit(name)))
-
-    case contract: LlvmFunctionContract[G] =>
-      val applicableContract = ctx.llvmSpecParser.parse(contract, contract.o)
-      contract.data = Some(applicableContract)
-      resolve(applicableContract, ctx)
-    case local: LlvmLocal[G] =>
-      local.ref = ctx.currentResult.get match {
-        case RefLlvmFunctionDefinition(decl) =>
-          decl.contract.variableRefs.find(ref => ref._1 == local.name) match {
-            case Some(ref) => Some(ref._2)
-            case None => throw NoSuchNameError("local", local.name, local)
+      case inv @ CInvocation(obj, _, givenMap, yields) =>
+        inv.ref = Some(C.resolveInvocation(obj, ctx))
+        Spec.resolveGiven(givenMap, inv.ref.get, inv)
+        Spec.resolveYields(ctx, yields, inv.ref.get, inv)
+      case inv @ CPPInvocation(obj, args, givenMap, yields) =>
+        inv.ref = Some(CPP.resolveInvocation(obj, args, ctx))
+        Spec.resolveGiven(givenMap, inv.ref.get, inv)
+        Spec.resolveYields(ctx, yields, inv.ref.get, inv)
+      case inv @ GpgpuCudaKernelInvocation(
+            name,
+            blocks,
+            threads,
+            args,
+            givenMap,
+            yields,
+          ) =>
+        val kernel = C.findCName(name, ctx)
+          .getOrElse(throw NoSuchNameError("kernel", name, inv))
+        inv.ref = Some(kernel match {
+          case target: CInvocationTarget[G] => target
+          case _ => throw NotApplicable(inv)
+        })
+        Spec.resolveGiven(givenMap, inv.ref.get, inv)
+        Spec.resolveYields(ctx, yields, inv.ref.get, inv)
+      case inv @ JavaInvocation(obj, _, method, args, givenMap, yields) =>
+        inv.ref = Some(
+          (obj match {
+            case Some(obj) => Java.findMethod(ctx, obj, method, args, inv.blame)
+            case None => Java.findMethod(ctx, method, args)
+          }).getOrElse(throw NoSuchNameError("method", method, inv))
+        )
+        Spec.resolveGiven(givenMap, inv.ref.get, inv)
+        Spec.resolveYields(ctx, yields, inv.ref.get, inv)
+      case inv @ JavaNewClass(args, typeArgs, name, givenMap, yields) =>
+        inv.ref = Some(
+          Java.findConstructor(name, args)
+            .getOrElse(throw NoSuchConstructor(inv))
+        )
+        Spec.resolveGiven(givenMap, inv.ref.get, inv)
+        Spec.resolveYields(ctx, yields, inv.ref.get, inv)
+      case inv @ PVLInvocation(
+            None,
+            method,
+            args,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        inv.ref = Some(
+          PVL.findMethod(method, args, typeArgs, ctx)
+            .getOrElse(throw NoSuchNameError("method", method, inv))
+        )
+        Spec.resolveGiven(givenMap, inv.ref.get, inv)
+        Spec.resolveYields(ctx, yields, inv.ref.get, inv)
+      case inv @ PVLInvocation(
+            Some(obj),
+            method,
+            args,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        inv.ref = Some(
+          PVL.findInstanceMethod(obj, method, args, typeArgs, inv.blame)
+            .getOrElse(throw NoSuchNameError("method", method, inv))
+        )
+        Spec.resolveGiven(givenMap, inv.ref.get, inv)
+        Spec.resolveYields(ctx, yields, inv.ref.get, inv)
+      case inv @ PVLNew(t, typeArgs, args, givenMap, yields) =>
+        inv.ref = Some(
+          PVL.findConstructor(t, typeArgs, args)
+            .getOrElse(throw NoSuchConstructor(inv))
+        )
+        Spec.resolveGiven(givenMap, inv.ref.get, inv)
+        Spec.resolveYields(ctx, yields, inv.ref.get, inv)
+      case n @ NewObject(ref) =>
+        ref.tryResolve(name =>
+          Spec.findClass(name, ctx.asTypeResolutionContext)
+            .getOrElse(throw NoSuchNameError("class", name, n))
+        )
+      case n @ ModelNew(ref) =>
+        ref.tryResolve(name =>
+          Spec.findModel(name, ctx.asTypeResolutionContext)
+            .getOrElse(throw NoSuchNameError("model", name, n))
+        )
+      case n @ SilverNewRef(target, fields) =>
+        target.tryResolve(name =>
+          Spec.findLocal(name, ctx)
+            .getOrElse(throw NoSuchNameError("local", name, n))
+        )
+        fields.foreach(
+          _.tryResolve(name =>
+            Spec.findSilverField(name, ctx)
+              .getOrElse(throw NoSuchNameError("field", name, n))
+          )
+        )
+      case inv @ ADTFunctionInvocation(typeArgs, ref, args) =>
+        typeArgs match {
+          case Some((adt, typeArgs)) =>
+            // Fully-qualified external invocation
+            adt.tryResolve(name =>
+              Spec.findAdt(name, ctx.asTypeResolutionContext)
+                .getOrElse(throw NoSuchNameError("adt", name, inv))
+            )
+            ref.tryResolve(name =>
+              Spec.findAdtFunction(adt.decl, name)
+                .getOrElse(throw NoSuchNameError("function", name, inv))
+            )
+          case None =>
+            // Non-qualified internal invocation
+            ???
+        }
+      case inv @ SilverPartialADTFunctionInvocation(
+            name,
+            args,
+            partialTypeArgs,
+          ) =>
+        inv.ref = Some(
+          Spec.findAdtFunction(name, ctx)
+            .getOrElse(throw NoSuchNameError("function", name, inv))
+        )
+        partialTypeArgs.foreach(mapping =>
+          mapping._1.tryResolve(name =>
+            Spec.findAdtTypeArg(inv.adt, name)
+              .getOrElse(throw NoSuchNameError("type variable", name, inv))
+          )
+        )
+      case inv @ InvokeProcedure(ref, _, _, _, givenMap, yields) =>
+        ref.tryResolve(name =>
+          Spec.findProcedure(name, ctx)
+            .getOrElse(throw NoSuchNameError("procedure", name, inv))
+        )
+        Spec.resolveGiven(givenMap, RefProcedure(ref.decl), inv)
+        Spec.resolveYields(ctx, yields, RefProcedure(ref.decl), inv)
+      case inv @ ProcedureInvocation(ref, _, _, _, givenMap, yields) =>
+        ref.tryResolve(name =>
+          Spec.findProcedure(name, ctx)
+            .getOrElse(throw NoSuchNameError("procedure", name, inv))
+        )
+        Spec.resolveGiven(givenMap, RefProcedure(ref.decl), inv)
+        Spec.resolveYields(ctx, yields, RefProcedure(ref.decl), inv)
+      case inv @ FunctionInvocation(ref, _, _, givenMap, yields) =>
+        ref.tryResolve(name =>
+          Spec.findFunction(name, ctx)
+            .getOrElse(throw NoSuchNameError("function", name, inv))
+        )
+        Spec.resolveGiven(givenMap, RefFunction(ref.decl), inv)
+        Spec.resolveYields(ctx, yields, RefFunction(ref.decl), inv)
+      case inv @ PredicateApply(ref, _, _) =>
+        ref.tryResolve(name =>
+          Spec.findPredicate(name, ctx)
+            .getOrElse(throw NoSuchNameError("predicate", name, inv))
+        )
+      case inv @ SilverCurPredPerm(ref, _) =>
+        ref.tryResolve(name =>
+          Spec.findPredicate(name, ctx)
+            .getOrElse(throw NoSuchNameError("predicate", name, inv))
+        )
+      case inv @ InvokeMethod(obj, ref, _, _, _, givenMap, yields) =>
+        ref.tryResolve(name =>
+          Spec.findMethod(obj, name)
+            .getOrElse(throw NoSuchNameError("method", name, inv))
+        )
+        Spec.resolveGiven(givenMap, RefInstanceMethod(ref.decl), inv)
+        Spec.resolveYields(ctx, yields, RefInstanceMethod(ref.decl), inv)
+      case inv @ MethodInvocation(obj, ref, _, _, _, givenMap, yields) =>
+        ref.tryResolve(name =>
+          Spec.findMethod(obj, name)
+            .getOrElse(throw NoSuchNameError("method", name, inv))
+        )
+        Spec.resolveGiven(givenMap, RefInstanceMethod(ref.decl), inv)
+        Spec.resolveYields(ctx, yields, RefInstanceMethod(ref.decl), inv)
+      case inv @ InstanceFunctionInvocation(obj, ref, _, _, givenMap, yields) =>
+        ref.tryResolve(name =>
+          Spec.findInstanceFunction(obj, name)
+            .getOrElse(throw NoSuchNameError("function", name, inv))
+        )
+      case inv @ InstancePredicateApply(obj, ref, _, _) =>
+        ref.tryResolve(name =>
+          Spec.findInstancePredicate(obj, name)
+            .getOrElse(throw NoSuchNameError("predicate", name, inv))
+        )
+      case inv @ CoalesceInstancePredicateApply(obj, ref, _, _) =>
+        ref.tryResolve(name =>
+          Spec.findInstancePredicate(obj, name)
+            .getOrElse(throw NoSuchNameError("predicate", name, inv))
+        )
+
+      case defn: CFunctionDefinition[G] =>
+        defn.ref = C.findForwardDeclaration(defn.declarator, ctx)
+      case decl: CInit[G] => decl.ref = C.findDefinition(decl.decl, ctx)
+
+      case defn: CPPFunctionDefinition[G] =>
+        defn.ref = CPP.findForwardDeclaration(defn.declarator, ctx)
+      case decl: CPPInit[G] => decl.ref = CPP.findDefinition(decl.decl, ctx)
+
+      case goto @ CGoto(name) =>
+        goto.ref = Some(
+          Spec.findLabel(name, ctx)
+            .getOrElse(throw NoSuchNameError("label", name, goto))
+        )
+      case goto @ Goto(lbl) =>
+        lbl.tryResolve(name =>
+          Spec.findLabel(name, ctx)
+            .getOrElse(throw NoSuchNameError("label", name, goto))
+        )
+      case brk @ Break(Some(lbl)) =>
+        lbl.tryResolve(name =>
+          Spec.findLabel(name, ctx)
+            .getOrElse(throw NoSuchNameError("label", name, brk))
+        )
+      case cont @ Continue(Some(lbl)) =>
+        lbl.tryResolve(name =>
+          Spec.findLabel(name, ctx)
+            .getOrElse(throw NoSuchNameError("label", name, cont))
+        )
+      case old @ Old(_, Some(lbl)) =>
+        lbl.tryResolve(name =>
+          Spec.findLabel(name, ctx)
+            .getOrElse(throw NoSuchNameError("label", name, old))
+        )
+
+      case recv @ Recv(ref) =>
+        ref.tryResolve(name =>
+          Spec.findSend(name, ctx)
+            .getOrElse(throw NoSuchNameError("send statement", name, recv))
+        )
+
+      case res @ AmbiguousResult() =>
+        res.ref = Some(
+          ctx.currentResult.getOrElse(throw ResultOutsideMethod(res))
+        )
+      case diz @ AmbiguousThis() =>
+        diz.ref = Some(ctx.currentThis.getOrElse(throw WrongThisPosition(diz)))
+
+      case proc: ModelProcess[G] =>
+        proc.modifies.foreach(
+          _.tryResolve(name =>
+            Spec.findModelField(name, ctx)
+              .getOrElse(throw NoSuchNameError("field", name, proc))
+          )
+        )
+        proc.accessible.foreach(
+          _.tryResolve(name =>
+            Spec.findModelField(name, ctx)
+              .getOrElse(throw NoSuchNameError("field", name, proc))
+          )
+        )
+      case act: ModelAction[G] =>
+        act.modifies.foreach(
+          _.tryResolve(name =>
+            Spec.findModelField(name, ctx)
+              .getOrElse(throw NoSuchNameError("field", name, act))
+          )
+        )
+        act.accessible.foreach(
+          _.tryResolve(name =>
+            Spec.findModelField(name, ctx)
+              .getOrElse(throw NoSuchNameError("field", name, act))
+          )
+        )
+
+      case inv @ ProcessApply(ref, _) => ref.tryResolve(name => ???)
+      case inv @ ActionApply(ref, _) => ref.tryResolve(name => ???)
+
+      case atomic @ ParAtomic(invs, _) =>
+        invs.foreach(
+          _.tryResolve(name =>
+            Spec.findParInvariant(name, ctx)
+              .getOrElse(throw NoSuchNameError("invariant", name, atomic))
+          )
+        )
+      case barrier @ ParBarrier(block, invs, _, _, _) =>
+        block.tryResolve(name =>
+          Spec.findParBlock(name, ctx)
+            .getOrElse(throw NoSuchNameError("block", name, barrier))
+        )
+        invs.foreach(
+          _.tryResolve(name =>
+            Spec.findParInvariant(name, ctx)
+              .getOrElse(throw NoSuchNameError("invariant", name, barrier))
+          )
+        )
+
+      case arr @ JavaLiteralArray(_) =>
+        arr.typeContext = Some(ctx.currentInitializerType.get match {
+          case t @ TArray(_) => t
+          case _ => throw WrongArrayInitializer(arr)
+        })
+
+      case ann @ JavaAnnotation(_, _) if isBip(ann, "Transition") =>
+        val guard: Option[Expr[G]] = ann.get("guard").map { g =>
+          val expr: Expr[G] = ctx.javaParser.parse(getLit(g), g.o)
+          // TODO: What about check errors here?
+          resolve(expr, ctx.enableJavaBipGuards())
+          expr
+        }
+
+        def extractExpr(s: Option[Expr[_]]): (String, Origin) =
+          s match {
+            case None => ("true", ann.o)
+            case Some(s @ JavaStringValue(data, _)) => (data, s.o)
+            case Some(n) =>
+              throw MalformedBipAnnotation(
+                n,
+                "pre- and post-conditions must be string literals",
+              )
           }
-        case RefLlvmSpecFunction(_) =>
-          Some(Spec.findLocal(local.name, ctx).getOrElse(throw NoSuchNameError("local", local.name, local)).ref)
-        case _ => None
-      }
-    case inv: LlvmAmbiguousFunctionInvocation[G] =>
-      inv.ref = LLVM.findCallable(inv.name, ctx) match {
-        case Some(callable) => Some(callable.ref)
-        case None => throw NoSuchNameError("function", inv.name, inv)
-      }
-    case glob: LlvmGlobal[G] =>
-      glob.data.get.foreach(resolve(_, ctx))
-    case comm: PVLCommunicate[G] =>
-      /* Endpoint contexts for communicate are resolved early, because otherwise \sender, \receiver, \msg cannot be typed.
-       */
-      def getEndpoints[G](expr: Expr[G]): Seq[PVLEndpoint[G]] =
-        mutable.LinkedHashSet.from(expr.collect { case name: PVLLocal[G] => name.ref.get }.collect { case RefPVLEndpoint(endpoint) => endpoint }).toSeq
-
-      def getEndpoint[G](expr: Expr[G]): PVLEndpoint[G] = getEndpoints(expr) match {
-        case Seq(endpoint) => endpoint
-        // TODO (RR): Proper error
-        case Seq() => throw new Exception(expr.o.messageInContext("No endpoints in expr"))
-        case _ => throw new Exception(expr.o.messageInContext("Too many endpoints possible"))
-      }
-      comm.inferredSender = comm.sender.map(_.ref.get.decl).orElse(Some(getEndpoint(comm.msg)))
-      comm.inferredReceiver = comm.receiver.map(_.ref.get.decl).orElse(Some(getEndpoint(comm.target)))
-    case sender: PVLSender[G] => sender.ref = Some(ctx.currentCommunicate.get)
-    case receiver: PVLReceiver[G] => receiver.ref = Some(ctx.currentCommunicate.get)
-    case msg: PVLMessage[G] => msg.ref = Some(ctx.currentCommunicate.get)
-    case _ =>
-  }
+
+        val (r, ro) = extractExpr(ann.get("requires"))
+        val requires: Expr[G] = ctx.javaParser.parse(r, ro)
+        resolve(requires, ctx)
+
+        val (e, eo) = extractExpr(ann.get("ensures"))
+        val ensures: Expr[G] = ctx.javaParser.parse(e, eo)
+        resolve(ensures, ctx)
+
+        val name = getLit(ann.expect("name"))
+        val source = getLit(ann.expect("source"))
+        val target = getLit(ann.expect("target"))
+        ann.data = Some(
+          BipTransition[G](
+            name,
+            Java.findJavaBipStatePredicate(ctx, source),
+            Java.findJavaBipStatePredicate(ctx, target),
+            ann.get("guard").map(getLit(_)),
+            guard,
+            requires,
+            ensures,
+          )(ann.o)
+        )
+
+      case ann @ JavaAnnotation(_, _) if isBip(ann, "Invariant") =>
+        val expr: Expr[G] = ctx.javaParser
+          .parse(getLit(ann.expect("value")), ann.expect("value").o)
+        resolve(expr, ctx)
+        ann.data = Some(BipInvariant(expr))
+
+      case ann @ JavaAnnotation(_, _) if isBip(ann, "StatePredicate") =>
+        val expr: Expr[G] = ctx.javaParser
+          .parse(getLit(ann.expect("expr")), ann.expect("expr").o)
+        resolve(expr, ctx) // TODO (RR): Throwing away errors here?
+        ann.data = Some(
+          BipStatePredicate(getLit(ann.expect("state")), expr)(ann.o)
+        )
+
+      case ann @ JavaAnnotation(_, _) if isBip(ann, "ComponentType") =>
+        ann.data = Some(BipComponent(
+          getLit(ann.expect("name")),
+          Java.findJavaBipStatePredicate(ctx, getLit(ann.expect("initial"))),
+        ))
+
+      case ann @ JavaAnnotation(_, _) if isBip(ann, "Data") =>
+        ann.data = Some(BipData(getLit(ann.expect("name")))(ann.o))
+
+      case ann @ JavaAnnotation(_, _) if isBip(ann, "Guard") =>
+        ann.data = Some(BipGuard(getLit(ann.expect("name"))))
+
+      case ann: JavaAnnotation[G] if isBip(ann, "Port") =>
+        val portType: BipPortType[G] =
+          ann.expect("type") match {
+            case p @ JavaDeref(_, "enforceable") => BipEnforceable[G]()(p.o)
+            case p @ JavaDeref(_, "spontaneous") => BipSpontaneous[G]()(p.o)
+            case p @ JavaDeref(_, "internal") => BipInternal[G]()(p.o)
+            case e =>
+              throw MalformedBipAnnotation(
+                e,
+                "Can be either PortType.enforceable, spontaneous, or internal",
+              )
+          }
+        ann.data = Some(BipPort[G](getLit(ann.expect("name")), portType)(ann.o))
+
+      case ann: JavaAnnotation[G] if isBip(ann, "Pure") =>
+        ann.data = Some(BipPure[G]())
+
+      case portName @ JavaBipGlueName(
+            JavaTClass(Ref(cls: JavaClass[G]), Nil),
+            name,
+          ) =>
+        portName.data = Some((cls, getLit(name)))
+
+      case contract: LlvmFunctionContract[G] =>
+        val applicableContract = ctx.llvmSpecParser.parse(contract, contract.o)
+        contract.data = Some(applicableContract)
+        resolve(applicableContract, ctx)
+      case local: LlvmLocal[G] =>
+        local.ref =
+          ctx.currentResult.get match {
+            case RefLlvmFunctionDefinition(decl) =>
+              decl.contract.variableRefs
+                .find(ref => ref._1 == local.name) match {
+                case Some(ref) => Some(ref._2)
+                case None => throw NoSuchNameError("local", local.name, local)
+              }
+            case RefLlvmSpecFunction(_) =>
+              Some(
+                Spec.findLocal(local.name, ctx)
+                  .getOrElse(throw NoSuchNameError("local", local.name, local))
+                  .ref
+              )
+            case _ => None
+          }
+      case inv: LlvmAmbiguousFunctionInvocation[G] =>
+        inv.ref =
+          LLVM.findCallable(inv.name, ctx) match {
+            case Some(callable) => Some(callable.ref)
+            case None => throw NoSuchNameError("function", inv.name, inv)
+          }
+      case glob: LlvmGlobal[G] => glob.data.get.foreach(resolve(_, ctx))
+      case comm: PVLCommunicate[G] =>
+        /* Endpoint contexts for communicate are resolved early, because otherwise \sender, \receiver, \msg cannot be typed.
+         */
+        def getEndpoints[G](expr: Expr[G]): Seq[PVLEndpoint[G]] =
+          mutable.LinkedHashSet.from(
+            expr.collect { case name: PVLLocal[G] => name.ref.get }.collect {
+              case RefPVLEndpoint(endpoint) => endpoint
+            }
+          ).toSeq
+
+        def getEndpoint[G](expr: Expr[G]): PVLEndpoint[G] =
+          getEndpoints(expr) match {
+            case Seq(endpoint) => endpoint
+            // TODO (RR): Proper error
+            case Seq() =>
+              throw new Exception(
+                expr.o.messageInContext("No endpoints in expr")
+              )
+            case _ =>
+              throw new Exception(
+                expr.o.messageInContext("Too many endpoints possible")
+              )
+          }
+        comm.inferredSender = comm.sender.map(_.ref.get.decl)
+          .orElse(Some(getEndpoint(comm.msg)))
+        comm.inferredReceiver = comm.receiver.map(_.ref.get.decl)
+          .orElse(Some(getEndpoint(comm.target)))
+      case sender: PVLSender[G] => sender.ref = Some(ctx.currentCommunicate.get)
+      case receiver: PVLReceiver[G] =>
+        receiver.ref = Some(ctx.currentCommunicate.get)
+      case msg: PVLMessage[G] => msg.ref = Some(ctx.currentCommunicate.get)
+      case _ =>
+    }
 }
diff --git a/src/col/vct/col/resolve/ctx/ReferenceResolutionContext.scala b/src/col/vct/col/resolve/ctx/ReferenceResolutionContext.scala
index 6962ce1b7c..8a7e0c2a3e 100644
--- a/src/col/vct/col/resolve/ctx/ReferenceResolutionContext.scala
+++ b/src/col/vct/col/resolve/ctx/ReferenceResolutionContext.scala
@@ -9,59 +9,74 @@ import vct.col.util.SuccessionMap
 import scala.collection.immutable.{HashMap, ListMap}
 import scala.collection.mutable
 
-case class ReferenceResolutionContext[G]
-(
-  javaParser: SpecExprParser,
-  llvmSpecParser: SpecContractParser,
-  stack: Seq[Seq[Referrable[G]]] = Nil,
-  topLevelJavaDeref: Option[JavaDeref[G]] = None,
-  externallyLoadedElements: mutable.ArrayBuffer[GlobalDeclaration[G]] = mutable.ArrayBuffer[GlobalDeclaration[G]](),
-  checkContext: CheckContext[G] = CheckContext[G](),
-  currentJavaNamespace: Option[JavaNamespace[G]] = None,
-  currentJavaClass: Option[JavaClassOrInterface[G]] = None,
-  currentThis: Option[ThisTarget[G]] = None,
-  currentResult: Option[ResultTarget[G]] = None,
-  currentInitializerType: Option[Type[G]] = None,
-  currentCommunicate: Option[PVLCommunicate[G]] = None,
-  inStaticJavaContext: Boolean = false,
-  inGpuKernel: Boolean = false,
-  javaBipStatePredicates: ListMap[Expr[G], JavaAnnotation[G]] = ListMap[Expr[G], JavaAnnotation[G]](),
-  javaBipGuards: ListMap[Expr[G], JavaMethod[G]] = ListMap[Expr[G], JavaMethod[G]](),
-  // When true and resolving a local, guard names should also be considered
-  javaBipGuardsEnabled: Boolean = false,
-  typeEnv: Map[Variable[G], Type[G]] = Map.empty[Variable[G], Type[G]],
+case class ReferenceResolutionContext[G](
+    javaParser: SpecExprParser,
+    llvmSpecParser: SpecContractParser,
+    stack: Seq[Seq[Referrable[G]]] = Nil,
+    topLevelJavaDeref: Option[JavaDeref[G]] = None,
+    externallyLoadedElements: mutable.ArrayBuffer[GlobalDeclaration[G]] =
+      mutable.ArrayBuffer[GlobalDeclaration[G]](),
+    checkContext: CheckContext[G] = CheckContext[G](),
+    currentJavaNamespace: Option[JavaNamespace[G]] = None,
+    currentJavaClass: Option[JavaClassOrInterface[G]] = None,
+    currentThis: Option[ThisTarget[G]] = None,
+    currentResult: Option[ResultTarget[G]] = None,
+    currentInitializerType: Option[Type[G]] = None,
+    currentCommunicate: Option[PVLCommunicate[G]] = None,
+    inStaticJavaContext: Boolean = false,
+    inGpuKernel: Boolean = false,
+    javaBipStatePredicates: ListMap[Expr[G], JavaAnnotation[G]] =
+      ListMap[Expr[G], JavaAnnotation[G]](),
+    javaBipGuards: ListMap[Expr[G], JavaMethod[G]] =
+      ListMap[Expr[G], JavaMethod[G]](),
+    // When true and resolving a local, guard names should also be considered
+    javaBipGuardsEnabled: Boolean = false,
+    typeEnv: Map[Variable[G], Type[G]] = Map.empty[Variable[G], Type[G]],
 ) {
   def asTypeResolutionContext: TypeResolutionContext[G] =
-    TypeResolutionContext(stack, currentJavaNamespace, None, Nil, inGpuKernel, externallyLoadedElements)
+    TypeResolutionContext(
+      stack,
+      currentJavaNamespace,
+      None,
+      Nil,
+      inGpuKernel,
+      externallyLoadedElements,
+    )
 
   def declare(decls: Seq[Declaration[G]]): ReferenceResolutionContext[G] =
     copy(stack = decls.flatMap(Referrable.from) +: stack)
 
   def withCheckContext(ctx: CheckContext[G]): ReferenceResolutionContext[G] = {
     val filter = ctx.undeclared.flatten.flatMap(Referrable.from).toSet
-    copy(
-      checkContext = ctx,
-      stack = stack.map(_.filter(!filter.contains(_)))
-    )
+    copy(checkContext = ctx, stack = stack.map(_.filter(!filter.contains(_))))
   }
 
   /* State predicates names are saved as expr's here because at the time this method is called, fields are not yet resolved.
      E.g. if in the code it says "@Guard(name = INIT)", where INIT is some static field, in the ast INIT is a LocalVariable.
      It is only after recursively visiting this annotation that INIT is resolved to a static field. So we save the expr
      here so we can later use the resolved value, instead of directly using an unresolved local.
-  */
+   */
   def declareJavaBipStatePredicates(ps: Seq[(Expr[G], JavaAnnotation[G])]) =
     copy(javaBipStatePredicates = javaBipStatePredicates ++ ps.toMap)
 
   /* Guard names are explicitly saved as expr's instead of String. See comment at declareJavaBipStatePredicates. */
-  def declareJavaBipGuards(gs: Seq[(Expr[G], JavaMethod[G])]): ReferenceResolutionContext[G] =
+  def declareJavaBipGuards(
+      gs: Seq[(Expr[G], JavaMethod[G])]
+  ): ReferenceResolutionContext[G] =
     copy(javaBipGuards = javaBipGuards ++ gs.toMap)
 
-  def enableJavaBipGuards(): ReferenceResolutionContext[G] = copy(javaBipGuardsEnabled = true)
+  def enableJavaBipGuards(): ReferenceResolutionContext[G] =
+    copy(javaBipGuardsEnabled = true)
 
   def currentPkg: Option[JavaName[G]] = currentJavaNamespace.flatMap(_.pkg)
-  def currentFqn: Option[JavaName[G]] = currentPkg.map(pkg => JavaName(pkg.names ++ currentJavaClass.map(cls => Seq(cls.name)).getOrElse(Seq()))(DiagnosticOrigin))
+  def currentFqn: Option[JavaName[G]] =
+    currentPkg.map(pkg =>
+      JavaName(
+        pkg.names ++ currentJavaClass.map(cls => Seq(cls.name)).getOrElse(Seq())
+      )(DiagnosticOrigin)
+    )
 
-  def appendTypeEnv(typeEnv: Map[Variable[G], Type[G]]): ReferenceResolutionContext[G] =
-    copy(typeEnv = this.typeEnv ++ typeEnv)
+  def appendTypeEnv(
+      typeEnv: Map[Variable[G], Type[G]]
+  ): ReferenceResolutionContext[G] = copy(typeEnv = this.typeEnv ++ typeEnv)
 }
diff --git a/src/col/vct/col/resolve/ctx/Referrable.scala b/src/col/vct/col/resolve/ctx/Referrable.scala
index 563c721a89..b146df4d06 100644
--- a/src/col/vct/col/resolve/ctx/Referrable.scala
+++ b/src/col/vct/col/resolve/ctx/Referrable.scala
@@ -5,214 +5,241 @@ import vct.col.origin.SourceName
 import vct.col.resolve.NameLost
 import vct.col.resolve.lang.{C, CPP}
 
-/**
- * Collection of all things that can be cross-referenced in the AST. This includes all declarations, indices at
- * multi-declarations, references to implicitly defined constructs, built-in fields and methods, etc. Referrables are
- * briefly used while resolving the AST, and are almost immediately replaced by instances of [[vct.col.ref.Ref]]. See
- * also [[vct.col.resolve.ResolveTypes]] and [[vct.col.resolve.ResolveReferences]].
- * @tparam G The generation marker
- */
+/** Collection of all things that can be cross-referenced in the AST. This
+  * includes all declarations, indices at multi-declarations, references to
+  * implicitly defined constructs, built-in fields and methods, etc. Referrables
+  * are briefly used while resolving the AST, and are almost immediately
+  * replaced by instances of [[vct.col.ref.Ref]]. See also
+  * [[vct.col.resolve.ResolveTypes]] and [[vct.col.resolve.ResolveReferences]].
+  * @tparam G
+  *   The generation marker
+  */
 sealed trait Referrable[G] {
-  def name: String = this match {
-    case RefCTranslationUnit(_) => ""
-    case RefCParam(decl) => C.nameFromDeclarator(decl.declarator)
-    case RefCFunctionDefinition(decl) => C.nameFromDeclarator(decl.declarator)
-    case RefCGlobalDeclaration(decls, initIdx) => C.nameFromDeclarator(decls.decl.inits(initIdx).decl)
-    case RefCLocalDeclaration(decls, initIdx) => C.nameFromDeclarator(decls.decl.inits(initIdx).decl)
-    case RefCPPTranslationUnit(_) => ""
-    case RefCPPParam(decl) => CPP.nameFromDeclarator(decl.declarator)
-    case RefCPPFunctionDefinition(decl) => CPP.nameFromDeclarator(decl.declarator)
-    case RefCPPGlobalDeclaration(decls, initIdx) => CPP.nameFromDeclarator(decls.decl.inits(initIdx).decl)
-    case RefCPPCustomType(typeName) => typeName
-    case RefCPPLambdaDefinition(decl) => ""
-    case RefCPPLocalDeclaration(decls, initIdx) => CPP.nameFromDeclarator(decls.decl.inits(initIdx).decl)
-    case RefSYCLAccessMode(decl) => decl.name
-    case RefSYCLConstructorDefinition(typ) => typ.namespacePath
-    case RefJavaNamespace(_) => ""
-    case RefUnloadedJavaNamespace(_) => ""
-    case RefCStruct(decl: CGlobalDeclaration[_]) => decl.decl match {
-      case CDeclaration(_, _, Seq(defn: CStructDeclaration[G]), Seq()) => defn.name.getOrElse("")
-      case _ => ???
-    }
-    case RefCStruct(_) => ???
-    case RefTypeDef(decl: CGlobalDeclaration[_]) =>
-      C.nameFromDeclarator(decl.decl.inits.head.decl)
-    case RefTypeDef(_) => ???
-    case RefCStructField(decls, idx) => C.nameFromDeclarator(decls.decls(idx))
-    case RefOpenCLVectorMembers(idxs) => "s" ++ idxs.map { i => f"$i%x"}.mkString
-    case RefJavaClass(decl) => decl.name
-    case RefSilverField(decl) => Referrable.originName(decl)
-    case RefSimplificationRule(decl) => Referrable.originName(decl)
-    case RefAxiomaticDataType(decl) => Referrable.originName(decl)
-    case RefFunction(decl) => Referrable.originName(decl)
-    case RefProcedure(decl) => Referrable.originName(decl)
-    case RefVeSUVMainMethod(_) => ""
-    case RefPredicate(decl) => Referrable.originName(decl)
-    case RefClass(decl) => Referrable.originName(decl)
-    case RefModel(decl) => Referrable.originName(decl)
-    case RefEnum(decl) => Referrable.originName(decl)
-    case RefEnumConstant(_, decl) => Referrable.originName(decl)
-    case RefJavaSharedInitialization(decl) => ""
-    case RefJavaField(decls, idx) => decls.decls(idx).name
-    case RefJavaLocalDeclaration(decls, idx) => decls.decls(idx).name
-    case RefJavaConstructor(decl) => decl.name
-    case RefJavaMethod(decl) => decl.name
-    case RefJavaParam(decl) => decl.name
-    case RefJavaAnnotationMethod(decl) => decl.name
-    case RefInstanceFunction(decl) => Referrable.originName(decl)
-    case RefInstanceMethod(decl) => Referrable.originName(decl)
-    case RefInstanceOperatorMethod(decl) => Referrable.originName(decl)
-    case RefInstanceOperatorFunction(decl) => Referrable.originName(decl)
-    case RefInstancePredicate(decl) => Referrable.originName(decl)
-    case RefField(decl) => Referrable.originName(decl)
-    case RefVariable(decl) => Referrable.originName(decl)
-    case RefLabelDecl(decl) => Referrable.originName(decl)
-    case RefSendDecl(decl) => Referrable.originName(decl)
-    case RefRunMethod(_) => ""
-    case RefParBlockDecl(decl) => Referrable.originNameOrEmpty(decl)
-    case RefParInvariantDecl(decl) => Referrable.originNameOrEmpty(decl)
-    case RefADTAxiom(decl) => Referrable.originName(decl)
-    case RefADTFunction(decl) => Referrable.originName(decl)
-    case RefModelField(decl) => Referrable.originName(decl)
-    case RefModelProcess(decl) => Referrable.originName(decl)
-    case RefModelAction(decl) => Referrable.originName(decl)
-    case RefChoreography(decl) => Referrable.originName(decl)
-    case RefEndpoint(decl) => Referrable.originName(decl)
-    case RefProverType(decl) => Referrable.originName(decl)
-    case RefProverFunction(decl) => Referrable.originName(decl)
-    case RefJavaBipGuard(decl) => Referrable.originName(decl)
-    case RefLlvmFunctionDefinition(decl) => Referrable.originName(decl)
-    case RefLlvmGlobal(decl, i) => Referrable.originName(decl.data.get(i))
-    case RefLlvmSpecFunction(decl) => Referrable.originName(decl)
-    case RefBipComponent(decl) => Referrable.originName(decl)
-    case RefBipGlue(decl) => ""
-    case RefBipGuard(decl) => Referrable.originName(decl)
-    case RefBipIncomingData(decl) => Referrable.originName(decl)
-    case RefBipOutgoingData(decl) => Referrable.originName(decl)
-    case RefBipPort(decl) => Referrable.originName(decl)
-    case RefBipPortSynchronization(decl) => ""
-    case RefBipStatePredicate(decl) => Referrable.originName(decl)
-    case RefBipTransition(decl) => Referrable.originName(decl)
-    case RefBipTransitionSynchronization(decl) => ""
-    case RefBipConstructor(decl) => Referrable.originName(decl)
-    case RefHeapVariable(decl) => Referrable.originName(decl)
-    case RefPVLEndpoint(decl) => decl.name
-    case RefPVLChoreography(decl) => decl.name
-    case RefPVLChorRun(_) => ""
+  def name: String =
+    this match {
+      case RefCTranslationUnit(_) => ""
+      case RefCParam(decl) => C.nameFromDeclarator(decl.declarator)
+      case RefCFunctionDefinition(decl) => C.nameFromDeclarator(decl.declarator)
+      case RefCGlobalDeclaration(decls, initIdx) =>
+        C.nameFromDeclarator(decls.decl.inits(initIdx).decl)
+      case RefCLocalDeclaration(decls, initIdx) =>
+        C.nameFromDeclarator(decls.decl.inits(initIdx).decl)
+      case RefCPPTranslationUnit(_) => ""
+      case RefCPPParam(decl) => CPP.nameFromDeclarator(decl.declarator)
+      case RefCPPFunctionDefinition(decl) =>
+        CPP.nameFromDeclarator(decl.declarator)
+      case RefCPPGlobalDeclaration(decls, initIdx) =>
+        CPP.nameFromDeclarator(decls.decl.inits(initIdx).decl)
+      case RefCPPCustomType(typeName) => typeName
+      case RefCPPLambdaDefinition(decl) => ""
+      case RefCPPLocalDeclaration(decls, initIdx) =>
+        CPP.nameFromDeclarator(decls.decl.inits(initIdx).decl)
+      case RefSYCLAccessMode(decl) => decl.name
+      case RefSYCLConstructorDefinition(typ) => typ.namespacePath
+      case RefJavaNamespace(_) => ""
+      case RefUnloadedJavaNamespace(_) => ""
+      case RefCStruct(decl: CGlobalDeclaration[_]) =>
+        decl.decl match {
+          case CDeclaration(_, _, Seq(defn: CStructDeclaration[G]), Seq()) =>
+            defn.name.getOrElse("")
+          case _ => ???
+        }
+      case RefCStruct(_) => ???
+      case RefTypeDef(decl: CGlobalDeclaration[_]) =>
+        C.nameFromDeclarator(decl.decl.inits.head.decl)
+      case RefTypeDef(_) => ???
+      case RefCStructField(decls, idx) => C.nameFromDeclarator(decls.decls(idx))
+      case RefOpenCLVectorMembers(idxs) =>
+        "s" ++ idxs.map { i => f"$i%x" }.mkString
+      case RefJavaClass(decl) => decl.name
+      case RefSilverField(decl) => Referrable.originName(decl)
+      case RefSimplificationRule(decl) => Referrable.originName(decl)
+      case RefAxiomaticDataType(decl) => Referrable.originName(decl)
+      case RefFunction(decl) => Referrable.originName(decl)
+      case RefProcedure(decl) => Referrable.originName(decl)
+      case RefVeSUVMainMethod(_) => ""
+      case RefPredicate(decl) => Referrable.originName(decl)
+      case RefClass(decl) => Referrable.originName(decl)
+      case RefModel(decl) => Referrable.originName(decl)
+      case RefEnum(decl) => Referrable.originName(decl)
+      case RefEnumConstant(_, decl) => Referrable.originName(decl)
+      case RefJavaSharedInitialization(decl) => ""
+      case RefJavaField(decls, idx) => decls.decls(idx).name
+      case RefJavaLocalDeclaration(decls, idx) => decls.decls(idx).name
+      case RefJavaConstructor(decl) => decl.name
+      case RefJavaMethod(decl) => decl.name
+      case RefJavaParam(decl) => decl.name
+      case RefJavaAnnotationMethod(decl) => decl.name
+      case RefInstanceFunction(decl) => Referrable.originName(decl)
+      case RefInstanceMethod(decl) => Referrable.originName(decl)
+      case RefInstanceOperatorMethod(decl) => Referrable.originName(decl)
+      case RefInstanceOperatorFunction(decl) => Referrable.originName(decl)
+      case RefInstancePredicate(decl) => Referrable.originName(decl)
+      case RefField(decl) => Referrable.originName(decl)
+      case RefVariable(decl) => Referrable.originName(decl)
+      case RefLabelDecl(decl) => Referrable.originName(decl)
+      case RefSendDecl(decl) => Referrable.originName(decl)
+      case RefRunMethod(_) => ""
+      case RefParBlockDecl(decl) => Referrable.originNameOrEmpty(decl)
+      case RefParInvariantDecl(decl) => Referrable.originNameOrEmpty(decl)
+      case RefADTAxiom(decl) => Referrable.originName(decl)
+      case RefADTFunction(decl) => Referrable.originName(decl)
+      case RefModelField(decl) => Referrable.originName(decl)
+      case RefModelProcess(decl) => Referrable.originName(decl)
+      case RefModelAction(decl) => Referrable.originName(decl)
+      case RefChoreography(decl) => Referrable.originName(decl)
+      case RefEndpoint(decl) => Referrable.originName(decl)
+      case RefProverType(decl) => Referrable.originName(decl)
+      case RefProverFunction(decl) => Referrable.originName(decl)
+      case RefJavaBipGuard(decl) => Referrable.originName(decl)
+      case RefLlvmFunctionDefinition(decl) => Referrable.originName(decl)
+      case RefLlvmGlobal(decl, i) => Referrable.originName(decl.data.get(i))
+      case RefLlvmSpecFunction(decl) => Referrable.originName(decl)
+      case RefBipComponent(decl) => Referrable.originName(decl)
+      case RefBipGlue(decl) => ""
+      case RefBipGuard(decl) => Referrable.originName(decl)
+      case RefBipIncomingData(decl) => Referrable.originName(decl)
+      case RefBipOutgoingData(decl) => Referrable.originName(decl)
+      case RefBipPort(decl) => Referrable.originName(decl)
+      case RefBipPortSynchronization(decl) => ""
+      case RefBipStatePredicate(decl) => Referrable.originName(decl)
+      case RefBipTransition(decl) => Referrable.originName(decl)
+      case RefBipTransitionSynchronization(decl) => ""
+      case RefBipConstructor(decl) => Referrable.originName(decl)
+      case RefHeapVariable(decl) => Referrable.originName(decl)
+      case RefPVLEndpoint(decl) => decl.name
+      case RefPVLChoreography(decl) => decl.name
+      case RefPVLChorRun(_) => ""
 
-    case RefJavaBipGlueContainer() => ""
-    case PVLBuiltinInstanceMethod(_) => ""
-    case BuiltinField(_) => ""
-    case BuiltinInstanceMethod(_) => ""
-    case RefPVLConstructor(decl) => ""
-    case ImplicitDefaultJavaConstructor(_) => ""
-    case ImplicitDefaultPVLConstructor(_) => ""
-    case RefCudaThreadIdx() => "threadIdx"
-    case RefCudaBlockDim() => "blockDim"
-    case RefCudaBlockIdx() => "blockIdx"
-    case RefCudaGridDim() => "gridDim"
-    case RefCudaVecX(_) => "x"
-    case RefCudaVecY(_) => "y"
-    case RefCudaVecZ(_) => "z"
-    case RefJavaBipStatePredicate(name, _) => name
-    case ImplicitDefaultJavaBipStatePredicate(name) => name
-  }
+      case RefJavaBipGlueContainer() => ""
+      case PVLBuiltinInstanceMethod(_) => ""
+      case BuiltinField(_) => ""
+      case BuiltinInstanceMethod(_) => ""
+      case RefPVLConstructor(decl) => ""
+      case ImplicitDefaultJavaConstructor(_) => ""
+      case ImplicitDefaultPVLConstructor(_) => ""
+      case RefCudaThreadIdx() => "threadIdx"
+      case RefCudaBlockDim() => "blockDim"
+      case RefCudaBlockIdx() => "blockIdx"
+      case RefCudaGridDim() => "gridDim"
+      case RefCudaVecX(_) => "x"
+      case RefCudaVecY(_) => "y"
+      case RefCudaVecZ(_) => "z"
+      case RefJavaBipStatePredicate(name, _) => name
+      case ImplicitDefaultJavaBipStatePredicate(name) => name
+    }
 }
 
 case object Referrable {
-  def from[G](decl: Declaration[G]): Seq[Referrable[G]] = Seq[Referrable[G]](decl match {
-    case decl: CTranslationUnit[G] => RefCTranslationUnit(decl)
-    case decl: CParam[G] => RefCParam(decl)
-    case decl: CFunctionDefinition[G] => RefCFunctionDefinition(decl)
-    case decl: CStructMemberDeclarator[G] => return decl.decls.indices.map(RefCStructField(decl, _))
-    case decl: CGlobalDeclaration[G] => decl.decl match {
-      case CDeclaration(_, _, Seq(_ :CStructDeclaration[G]), Seq()) => RefCStruct(decl)
-      case CDeclaration(_, _, CTypedef() +: _, _) => RefTypeDef(decl)
-      case _ => return decl.decl.inits.indices.map(RefCGlobalDeclaration(decl, _))
-    }
-    case decl: CPPTranslationUnit[G] => RefCPPTranslationUnit(decl)
-    case decl: CPPParam[G] => RefCPPParam(decl)
-    case decl: CPPFunctionDefinition[G] => RefCPPFunctionDefinition(decl)
-    case decl: CPPGlobalDeclaration[G] => return decl.decl.inits.indices.map(RefCPPGlobalDeclaration(decl, _))
-    case decl: JavaNamespace[G] => RefJavaNamespace(decl)
-    case decl: JavaClass[G] => RefJavaClass(decl)
-    case decl: JavaInterface[G] => RefJavaClass(decl)
-    case decl: JavaAnnotationInterface[G] => RefJavaClass(decl)
-    case decl: SilverField[G] => RefSilverField(decl)
-    case decl: SimplificationRule[G] => RefSimplificationRule(decl)
-    case decl: AxiomaticDataType[G] => RefAxiomaticDataType(decl)
-    case decl: Function[G] => RefFunction(decl)
-    case decl: Procedure[G] => RefProcedure(decl)
-    case decl: VeSUVMainMethod[G] => RefVeSUVMainMethod(decl)
-    case decl: Predicate[G] => RefPredicate(decl)
-    case decl: Class[G] => RefClass(decl)
-    case decl: Model[G] => RefModel(decl)
-    case decl: Enum[G] => RefEnum(decl)
-    case decl: EnumConstant[G] => RefEnumConstant(None, decl)
-    case decl: JavaSharedInitialization[G] => RefJavaSharedInitialization(decl)
-    case decl: JavaFields[G] => return decl.decls.indices.map(RefJavaField(decl, _))
-    case decl: JavaConstructor[G] => RefJavaConstructor(decl)
-    case decl: JavaMethod[G] => RefJavaMethod(decl)
-    case decl: JavaParam[G] => RefJavaParam(decl)
-    case decl: JavaAnnotationMethod[G] => RefJavaAnnotationMethod(decl)
-    case decl: InstanceFunction[G] => RefInstanceFunction(decl)
-    case decl: InstanceMethod[G] => RefInstanceMethod(decl)
-    case decl: InstanceOperatorMethod[G] => RefInstanceOperatorMethod(decl)
-    case decl: InstanceOperatorFunction[G] => RefInstanceOperatorFunction(decl)
-    case decl: InstancePredicate[G] => RefInstancePredicate(decl)
-    case decl: InstanceField[G] => RefField(decl)
-    case decl: Variable[G] => RefVariable(decl)
-    case decl: LabelDecl[G] => RefLabelDecl(decl)
-    case decl: SendDecl[G] => RefSendDecl(decl)
-    case decl: RunMethod[G] => RefRunMethod(decl)
-    case decl: ParBlockDecl[G] => RefParBlockDecl(decl)
-    case decl: ParInvariantDecl[G] => RefParInvariantDecl(decl)
-    case decl: ADTAxiom[G] => RefADTAxiom(decl)
-    case decl: ADTFunction[G] => RefADTFunction(decl)
-    case decl: ModelField[G] => RefModelField(decl)
-    case decl: ModelProcess[G] => RefModelProcess(decl)
-    case decl: ModelAction[G] => RefModelAction(decl)
-    case decl: CLocalDeclaration[G] => return decl.decl.inits.indices.map(RefCLocalDeclaration(decl, _))
-    case decl: CPPLocalDeclaration[G] => return decl.decl.inits.indices.map(RefCPPLocalDeclaration(decl, _))
-    case decl: JavaLocalDeclaration[G] => return decl.decls.indices.map(RefJavaLocalDeclaration(decl, _))
-    case decl: PVLConstructor[G] => RefPVLConstructor(decl)
-    case decl: Choreography[G] => RefChoreography(decl)
-    case decl: Endpoint[G] => RefEndpoint(decl)
-    case decl: LlvmFunctionDefinition[G] => RefLlvmFunctionDefinition(decl)
-    case decl: LlvmGlobal[G] => decl.data match {
-      case Some(data) => return data.indices.map(RefLlvmGlobal(decl, _))
-      case None => RefLlvmGlobal(decl, -1)
-    }
-    case decl: LlvmSpecFunction[G] => RefLlvmSpecFunction(decl)
-    case decl: ProverType[G] => RefProverType(decl)
-    case decl: ProverFunction[G] => RefProverFunction(decl)
-    case decl: JavaBipGlueContainer[G] => RefJavaBipGlueContainer()
-    case decl: BipComponent[G] => RefBipComponent(decl)
-    case decl: BipGlue[G] => RefBipGlue(decl)
-    case decl: BipGuard[G] => RefBipGuard(decl)
-    case decl: BipIncomingData[G] => RefBipIncomingData(decl)
-    case decl: BipOutgoingData[G] => RefBipOutgoingData(decl)
-    case decl: BipPort[G] => RefBipPort(decl)
-    case decl: BipPortSynchronization[G] => RefBipPortSynchronization(decl)
-    case decl: BipStatePredicate[G] => RefBipStatePredicate(decl)
-    case decl: BipTransition[G] => RefBipTransition(decl)
-    case decl: BipTransitionSynchronization[G] => RefBipTransitionSynchronization(decl)
-    case decl: BipConstructor[G] => RefBipConstructor(decl)
-    case decl: HeapVariable[G] => RefHeapVariable(decl)
-    case decl: PVLEndpoint[G] => RefPVLEndpoint(decl)
-    case decl: PVLChoreography[G] => RefPVLChoreography(decl)
-    case decl: PVLChorRun[G] => RefPVLChorRun(decl)
-  })
+  def from[G](decl: Declaration[G]): Seq[Referrable[G]] =
+    Seq[Referrable[G]](decl match {
+      case decl: CTranslationUnit[G] => RefCTranslationUnit(decl)
+      case decl: CParam[G] => RefCParam(decl)
+      case decl: CFunctionDefinition[G] => RefCFunctionDefinition(decl)
+      case decl: CStructMemberDeclarator[G] =>
+        return decl.decls.indices.map(RefCStructField(decl, _))
+      case decl: CGlobalDeclaration[G] =>
+        decl.decl match {
+          case CDeclaration(_, _, Seq(_: CStructDeclaration[G]), Seq()) =>
+            RefCStruct(decl)
+          case CDeclaration(_, _, CTypedef() +: _, _) => RefTypeDef(decl)
+          case _ =>
+            return decl.decl.inits.indices.map(RefCGlobalDeclaration(decl, _))
+        }
+      case decl: CPPTranslationUnit[G] => RefCPPTranslationUnit(decl)
+      case decl: CPPParam[G] => RefCPPParam(decl)
+      case decl: CPPFunctionDefinition[G] => RefCPPFunctionDefinition(decl)
+      case decl: CPPGlobalDeclaration[G] =>
+        return decl.decl.inits.indices.map(RefCPPGlobalDeclaration(decl, _))
+      case decl: JavaNamespace[G] => RefJavaNamespace(decl)
+      case decl: JavaClass[G] => RefJavaClass(decl)
+      case decl: JavaInterface[G] => RefJavaClass(decl)
+      case decl: JavaAnnotationInterface[G] => RefJavaClass(decl)
+      case decl: SilverField[G] => RefSilverField(decl)
+      case decl: SimplificationRule[G] => RefSimplificationRule(decl)
+      case decl: AxiomaticDataType[G] => RefAxiomaticDataType(decl)
+      case decl: Function[G] => RefFunction(decl)
+      case decl: Procedure[G] => RefProcedure(decl)
+      case decl: VeSUVMainMethod[G] => RefVeSUVMainMethod(decl)
+      case decl: Predicate[G] => RefPredicate(decl)
+      case decl: Class[G] => RefClass(decl)
+      case decl: Model[G] => RefModel(decl)
+      case decl: Enum[G] => RefEnum(decl)
+      case decl: EnumConstant[G] => RefEnumConstant(None, decl)
+      case decl: JavaSharedInitialization[G] =>
+        RefJavaSharedInitialization(decl)
+      case decl: JavaFields[G] =>
+        return decl.decls.indices.map(RefJavaField(decl, _))
+      case decl: JavaConstructor[G] => RefJavaConstructor(decl)
+      case decl: JavaMethod[G] => RefJavaMethod(decl)
+      case decl: JavaParam[G] => RefJavaParam(decl)
+      case decl: JavaAnnotationMethod[G] => RefJavaAnnotationMethod(decl)
+      case decl: InstanceFunction[G] => RefInstanceFunction(decl)
+      case decl: InstanceMethod[G] => RefInstanceMethod(decl)
+      case decl: InstanceOperatorMethod[G] => RefInstanceOperatorMethod(decl)
+      case decl: InstanceOperatorFunction[G] =>
+        RefInstanceOperatorFunction(decl)
+      case decl: InstancePredicate[G] => RefInstancePredicate(decl)
+      case decl: InstanceField[G] => RefField(decl)
+      case decl: Variable[G] => RefVariable(decl)
+      case decl: LabelDecl[G] => RefLabelDecl(decl)
+      case decl: SendDecl[G] => RefSendDecl(decl)
+      case decl: RunMethod[G] => RefRunMethod(decl)
+      case decl: ParBlockDecl[G] => RefParBlockDecl(decl)
+      case decl: ParInvariantDecl[G] => RefParInvariantDecl(decl)
+      case decl: ADTAxiom[G] => RefADTAxiom(decl)
+      case decl: ADTFunction[G] => RefADTFunction(decl)
+      case decl: ModelField[G] => RefModelField(decl)
+      case decl: ModelProcess[G] => RefModelProcess(decl)
+      case decl: ModelAction[G] => RefModelAction(decl)
+      case decl: CLocalDeclaration[G] =>
+        return decl.decl.inits.indices.map(RefCLocalDeclaration(decl, _))
+      case decl: CPPLocalDeclaration[G] =>
+        return decl.decl.inits.indices.map(RefCPPLocalDeclaration(decl, _))
+      case decl: JavaLocalDeclaration[G] =>
+        return decl.decls.indices.map(RefJavaLocalDeclaration(decl, _))
+      case decl: PVLConstructor[G] => RefPVLConstructor(decl)
+      case decl: Choreography[G] => RefChoreography(decl)
+      case decl: Endpoint[G] => RefEndpoint(decl)
+      case decl: LlvmFunctionDefinition[G] => RefLlvmFunctionDefinition(decl)
+      case decl: LlvmGlobal[G] =>
+        decl.data match {
+          case Some(data) => return data.indices.map(RefLlvmGlobal(decl, _))
+          case None => RefLlvmGlobal(decl, -1)
+        }
+      case decl: LlvmSpecFunction[G] => RefLlvmSpecFunction(decl)
+      case decl: ProverType[G] => RefProverType(decl)
+      case decl: ProverFunction[G] => RefProverFunction(decl)
+      case decl: JavaBipGlueContainer[G] => RefJavaBipGlueContainer()
+      case decl: BipComponent[G] => RefBipComponent(decl)
+      case decl: BipGlue[G] => RefBipGlue(decl)
+      case decl: BipGuard[G] => RefBipGuard(decl)
+      case decl: BipIncomingData[G] => RefBipIncomingData(decl)
+      case decl: BipOutgoingData[G] => RefBipOutgoingData(decl)
+      case decl: BipPort[G] => RefBipPort(decl)
+      case decl: BipPortSynchronization[G] => RefBipPortSynchronization(decl)
+      case decl: BipStatePredicate[G] => RefBipStatePredicate(decl)
+      case decl: BipTransition[G] => RefBipTransition(decl)
+      case decl: BipTransitionSynchronization[G] =>
+        RefBipTransitionSynchronization(decl)
+      case decl: BipConstructor[G] => RefBipConstructor(decl)
+      case decl: HeapVariable[G] => RefHeapVariable(decl)
+      case decl: PVLEndpoint[G] => RefPVLEndpoint(decl)
+      case decl: PVLChoreography[G] => RefPVLChoreography(decl)
+      case decl: PVLChorRun[G] => RefPVLChorRun(decl)
+    })
 
-  def originName(decl: Declaration[_]): String = decl.o.find[SourceName] match {
-    case Some(SourceName(name)) => name
-    case _ => throw NameLost(decl.o)
-  }
+  def originName(decl: Declaration[_]): String =
+    decl.o.find[SourceName] match {
+      case Some(SourceName(name)) => name
+      case _ => throw NameLost(decl.o)
+    }
 
-  def originNameOrEmpty(decl: Declaration[_]): String = decl.o.find[SourceName] match {
-    case Some(SourceName(name)) => name
-    case _ => ""
-  }
+  def originNameOrEmpty(decl: Declaration[_]): String =
+    decl.o.find[SourceName] match {
+      case Some(SourceName(name)) => name
+      case _ => ""
+    }
 }
 
 /*
@@ -225,19 +252,31 @@ sealed trait CTypeNameTarget[G] extends Referrable[G]
 sealed trait CStructTarget[G] extends Referrable[G]
 sealed trait CPPTypeNameTarget[G] extends Referrable[G]
 sealed trait PVLTypeNameTarget[G] extends Referrable[G]
-sealed trait SpecTypeNameTarget[G] extends JavaTypeNameTarget[G] with CTypeNameTarget[G] with CPPTypeNameTarget[G] with PVLTypeNameTarget[G]
+sealed trait SpecTypeNameTarget[G]
+    extends JavaTypeNameTarget[G]
+    with CTypeNameTarget[G]
+    with CPPTypeNameTarget[G]
+    with PVLTypeNameTarget[G]
 
 sealed trait JavaNameTarget[G] extends Referrable[G]
 sealed trait CNameTarget[G] extends Referrable[G]
 sealed trait CPPNameTarget[G] extends Referrable[G]
 sealed trait PVLNameTarget[G] extends Referrable[G]
-sealed trait SpecNameTarget[G] extends CNameTarget[G] with CPPNameTarget[G] with JavaNameTarget[G] with PVLNameTarget[G]
+sealed trait SpecNameTarget[G]
+    extends CNameTarget[G]
+    with CPPNameTarget[G]
+    with JavaNameTarget[G]
+    with PVLNameTarget[G]
 
 sealed trait CDerefTarget[G] extends Referrable[G]
 sealed trait CPPDerefTarget[G] extends Referrable[G]
 sealed trait JavaDerefTarget[G] extends Referrable[G]
 sealed trait PVLDerefTarget[G] extends Referrable[G]
-sealed trait SpecDerefTarget[G] extends CDerefTarget[G] with CPPDerefTarget[G] with JavaDerefTarget[G] with PVLDerefTarget[G]
+sealed trait SpecDerefTarget[G]
+    extends CDerefTarget[G]
+    with CPPDerefTarget[G]
+    with JavaDerefTarget[G]
+    with PVLDerefTarget[G]
 
 sealed trait JavaInvocationTarget[G] extends Referrable[G]
 sealed trait CInvocationTarget[G] extends Referrable[G]
@@ -245,11 +284,13 @@ sealed trait CPPInvocationTarget[G] extends Referrable[G]
 sealed trait PVLInvocationTarget[G] extends Referrable[G]
 sealed trait LlvmInvocationTarget[G] extends Referrable[G]
 sealed trait SpecInvocationTarget[G]
-  extends JavaInvocationTarget[G]
+    extends JavaInvocationTarget[G]
     with CNameTarget[G]
-    with CDerefTarget[G] with CInvocationTarget[G]
+    with CDerefTarget[G]
+    with CInvocationTarget[G]
     with CPPNameTarget[G]
-    with CPPDerefTarget[G] with CPPInvocationTarget[G]
+    with CPPDerefTarget[G]
+    with CPPInvocationTarget[G]
     with PVLInvocationTarget[G]
     with LlvmInvocationTarget[G]
 
@@ -262,68 +303,159 @@ sealed trait PVLConstructorTarget[G] extends Referrable[G]
 
 sealed trait JavaBipStatePredicateTarget[G] extends Referrable[G]
 
-case class RefCTranslationUnit[G](decl: CTranslationUnit[G]) extends Referrable[G]
-case class RefCParam[G](decl: CParam[G]) extends Referrable[G] with CNameTarget[G]
-case class RefOpenCLVectorLiteralCInvocationTarget[G](size: BigInt, innerType: Type[G]) extends CInvocationTarget[G]
-case class RefCFunctionDefinition[G](decl: CFunctionDefinition[G]) extends Referrable[G] with CNameTarget[G] with CInvocationTarget[G] with ResultTarget[G]
-case class RefCGlobalDeclaration[G](decls: CGlobalDeclaration[G], initIdx: Int) extends Referrable[G] with CNameTarget[G] with CInvocationTarget[G] with ResultTarget[G]
-case class RefCLocalDeclaration[G](decls: CLocalDeclaration[G], initIdx: Int) extends Referrable[G] with CNameTarget[G]
-case class RefCPPTranslationUnit[G](decl: CPPTranslationUnit[G]) extends Referrable[G]
-case class RefCPPParam[G](decl: CPPParam[G]) extends Referrable[G] with CPPNameTarget[G]
-case class RefCPPFunctionDefinition[G](decl: CPPFunctionDefinition[G]) extends Referrable[G] with CPPNameTarget[G] with CPPInvocationTarget[G] with ResultTarget[G]
-case class RefCPPLambdaDefinition[G](decl: CPPLambdaDefinition[G]) extends Referrable[G] with CPPInvocationTarget[G] with CPPTypeNameTarget[G]
-case class RefCPPCustomType[G](typeName: String) extends Referrable[G] with CPPTypeNameTarget[G]
-case class RefCPPGlobalDeclaration[G](decls: CPPGlobalDeclaration[G], initIdx: Int) extends Referrable[G] with CPPNameTarget[G] with CPPInvocationTarget[G] with CPPDerefTarget[G] with ResultTarget[G]
-case class RefCPPLocalDeclaration[G](decls: CPPLocalDeclaration[G], initIdx: Int) extends Referrable[G] with CPPNameTarget[G]
-case class RefSYCLAccessMode[G](decl: SYCLAccessMode[G]) extends Referrable[G] with CPPNameTarget[G]
-case class RefSYCLConstructorDefinition[G](typ: SYCLTConstructableClass[G]) extends Referrable[G] with CPPNameTarget[G] with CPPInvocationTarget[G]
+case class RefCTranslationUnit[G](decl: CTranslationUnit[G])
+    extends Referrable[G]
+case class RefCParam[G](decl: CParam[G])
+    extends Referrable[G] with CNameTarget[G]
+case class RefOpenCLVectorLiteralCInvocationTarget[G](
+    size: BigInt,
+    innerType: Type[G],
+) extends CInvocationTarget[G]
+case class RefCFunctionDefinition[G](decl: CFunctionDefinition[G])
+    extends Referrable[G]
+    with CNameTarget[G]
+    with CInvocationTarget[G]
+    with ResultTarget[G]
+case class RefCGlobalDeclaration[G](decls: CGlobalDeclaration[G], initIdx: Int)
+    extends Referrable[G]
+    with CNameTarget[G]
+    with CInvocationTarget[G]
+    with ResultTarget[G]
+case class RefCLocalDeclaration[G](decls: CLocalDeclaration[G], initIdx: Int)
+    extends Referrable[G] with CNameTarget[G]
+case class RefCPPTranslationUnit[G](decl: CPPTranslationUnit[G])
+    extends Referrable[G]
+case class RefCPPParam[G](decl: CPPParam[G])
+    extends Referrable[G] with CPPNameTarget[G]
+case class RefCPPFunctionDefinition[G](decl: CPPFunctionDefinition[G])
+    extends Referrable[G]
+    with CPPNameTarget[G]
+    with CPPInvocationTarget[G]
+    with ResultTarget[G]
+case class RefCPPLambdaDefinition[G](decl: CPPLambdaDefinition[G])
+    extends Referrable[G] with CPPInvocationTarget[G] with CPPTypeNameTarget[G]
+case class RefCPPCustomType[G](typeName: String)
+    extends Referrable[G] with CPPTypeNameTarget[G]
+case class RefCPPGlobalDeclaration[G](
+    decls: CPPGlobalDeclaration[G],
+    initIdx: Int,
+) extends Referrable[G]
+    with CPPNameTarget[G]
+    with CPPInvocationTarget[G]
+    with CPPDerefTarget[G]
+    with ResultTarget[G]
+case class RefCPPLocalDeclaration[G](
+    decls: CPPLocalDeclaration[G],
+    initIdx: Int,
+) extends Referrable[G] with CPPNameTarget[G]
+case class RefSYCLAccessMode[G](decl: SYCLAccessMode[G])
+    extends Referrable[G] with CPPNameTarget[G]
+case class RefSYCLConstructorDefinition[G](typ: SYCLTConstructableClass[G])
+    extends Referrable[G] with CPPNameTarget[G] with CPPInvocationTarget[G]
 case class RefJavaNamespace[G](decl: JavaNamespace[G]) extends Referrable[G]
-case class RefUnloadedJavaNamespace[G](names: Seq[String]) extends Referrable[G] with JavaNameTarget[G] with JavaDerefTarget[G]
-case class RefTypeDef[G](decl: CGlobalDeclaration[G]) extends Referrable[G] with CTypeNameTarget[G] with CNameTarget[G]
-case class RefCStruct[G](decl: CGlobalDeclaration[G]) extends Referrable[G] with CStructTarget[G] with CNameTarget[G] with CDerefTarget[G]
-case class RefCStructField[G](decls: CStructMemberDeclarator[G], idx: Int) extends Referrable[G] with CNameTarget[G] with CDerefTarget[G]
-case class RefOpenCLVectorMembers[G](idx: Seq[BigInt]) extends Referrable[G] with CDerefTarget[G]
-case class RefJavaClass[G](decl: JavaClassOrInterface[G]) extends Referrable[G] with JavaTypeNameTarget[G] with JavaNameTarget[G] with JavaDerefTarget[G] with ThisTarget[G]
+case class RefUnloadedJavaNamespace[G](names: Seq[String])
+    extends Referrable[G] with JavaNameTarget[G] with JavaDerefTarget[G]
+case class RefTypeDef[G](decl: CGlobalDeclaration[G])
+    extends Referrable[G] with CTypeNameTarget[G] with CNameTarget[G]
+case class RefCStruct[G](decl: CGlobalDeclaration[G])
+    extends Referrable[G]
+    with CStructTarget[G]
+    with CNameTarget[G]
+    with CDerefTarget[G]
+case class RefCStructField[G](decls: CStructMemberDeclarator[G], idx: Int)
+    extends Referrable[G] with CNameTarget[G] with CDerefTarget[G]
+case class RefOpenCLVectorMembers[G](idx: Seq[BigInt])
+    extends Referrable[G] with CDerefTarget[G]
+case class RefJavaClass[G](decl: JavaClassOrInterface[G])
+    extends Referrable[G]
+    with JavaTypeNameTarget[G]
+    with JavaNameTarget[G]
+    with JavaDerefTarget[G]
+    with ThisTarget[G]
 case class RefSilverField[G](decl: SilverField[G]) extends Referrable[G]
-case class RefSimplificationRule[G](decl: SimplificationRule[G]) extends Referrable[G]
-case class RefAxiomaticDataType[G](decl: AxiomaticDataType[G]) extends Referrable[G] with SpecTypeNameTarget[G] with SpecNameTarget[G] with JavaDerefTarget[G]
-case class RefFunction[G](decl: Function[G]) extends Referrable[G] with SpecInvocationTarget[G] with ResultTarget[G]
-case class RefProcedure[G](decl: Procedure[G]) extends Referrable[G] with SpecInvocationTarget[G] with ResultTarget[G]
-case class RefVeSUVMainMethod[G](decl: VeSUVMainMethod[G]) extends Referrable[G] with SpecInvocationTarget[G] with ResultTarget[G]
-case class RefPredicate[G](decl: Predicate[G]) extends Referrable[G] with SpecInvocationTarget[G]
-case class RefClass[G](decl: Class[G]) extends Referrable[G] with PVLTypeNameTarget[G] with SpecNameTarget[G] with ThisTarget[G]
-case class RefModel[G](decl: Model[G]) extends Referrable[G] with SpecTypeNameTarget[G] with ThisTarget[G] with PVLConstructorTarget[G] with JavaConstructorTarget[G]
-case class RefEnum[G](decl: Enum[G]) extends Referrable[G] with SpecTypeNameTarget[G] with SpecNameTarget[G]
-case class RefEnumConstant[G](enum: Option[Enum[G]], decl: EnumConstant[G]) extends Referrable[G] with SpecDerefTarget[G] with SpecNameTarget[G]
-case class RefJavaSharedInitialization[G](decl: JavaSharedInitialization[G]) extends Referrable[G]
-case class RefJavaField[G](decls: JavaFields[G], idx: Int) extends Referrable[G] with JavaNameTarget[G] with JavaDerefTarget[G]
-case class RefJavaLocalDeclaration[G](decls: JavaLocalDeclaration[G], idx: Int) extends Referrable[G] with JavaNameTarget[G]
-case class RefJavaConstructor[G](decl: JavaConstructor[G]) extends Referrable[G] with JavaConstructorTarget[G]
-case class RefJavaMethod[G](decl: JavaMethod[G]) extends Referrable[G] with JavaInvocationTarget[G] with ResultTarget[G]
-case class RefJavaParam[G](decl: JavaParam[G]) extends Referrable[G] with JavaNameTarget[G]
-case class RefJavaAnnotationMethod[G](decl: JavaAnnotationMethod[G]) extends Referrable[G] with JavaInvocationTarget[G] with ResultTarget[G]
-case class RefInstanceFunction[G](decl: InstanceFunction[G]) extends Referrable[G] with SpecInvocationTarget[G] with ResultTarget[G]
-case class RefInstanceMethod[G](decl: InstanceMethod[G]) extends Referrable[G] with SpecInvocationTarget[G] with ResultTarget[G]
-case class RefInstanceOperatorMethod[G](decl: InstanceOperatorMethod[G]) extends Referrable[G] with ResultTarget[G]
-case class RefInstanceOperatorFunction[G](decl: InstanceOperatorFunction[G]) extends Referrable[G] with ResultTarget[G]
-case class RefInstancePredicate[G](decl: InstancePredicate[G]) extends Referrable[G] with SpecInvocationTarget[G]
-case class RefField[G](decl: InstanceField[G]) extends Referrable[G] with PVLNameTarget[G] with PVLDerefTarget[G]
-case class RefVariable[G](decl: Variable[G]) extends Referrable[G] with SpecNameTarget[G] with SpecTypeNameTarget[G]
+case class RefSimplificationRule[G](decl: SimplificationRule[G])
+    extends Referrable[G]
+case class RefAxiomaticDataType[G](decl: AxiomaticDataType[G])
+    extends Referrable[G]
+    with SpecTypeNameTarget[G]
+    with SpecNameTarget[G]
+    with JavaDerefTarget[G]
+case class RefFunction[G](decl: Function[G])
+    extends Referrable[G] with SpecInvocationTarget[G] with ResultTarget[G]
+case class RefProcedure[G](decl: Procedure[G])
+    extends Referrable[G] with SpecInvocationTarget[G] with ResultTarget[G]
+case class RefVeSUVMainMethod[G](decl: VeSUVMainMethod[G])
+    extends Referrable[G] with SpecInvocationTarget[G] with ResultTarget[G]
+case class RefPredicate[G](decl: Predicate[G])
+    extends Referrable[G] with SpecInvocationTarget[G]
+case class RefClass[G](decl: Class[G])
+    extends Referrable[G]
+    with PVLTypeNameTarget[G]
+    with SpecNameTarget[G]
+    with ThisTarget[G]
+case class RefModel[G](decl: Model[G])
+    extends Referrable[G]
+    with SpecTypeNameTarget[G]
+    with ThisTarget[G]
+    with PVLConstructorTarget[G]
+    with JavaConstructorTarget[G]
+case class RefEnum[G](decl: Enum[G])
+    extends Referrable[G] with SpecTypeNameTarget[G] with SpecNameTarget[G]
+case class RefEnumConstant[G](enum: Option[Enum[G]], decl: EnumConstant[G])
+    extends Referrable[G] with SpecDerefTarget[G] with SpecNameTarget[G]
+case class RefJavaSharedInitialization[G](decl: JavaSharedInitialization[G])
+    extends Referrable[G]
+case class RefJavaField[G](decls: JavaFields[G], idx: Int)
+    extends Referrable[G] with JavaNameTarget[G] with JavaDerefTarget[G]
+case class RefJavaLocalDeclaration[G](decls: JavaLocalDeclaration[G], idx: Int)
+    extends Referrable[G] with JavaNameTarget[G]
+case class RefJavaConstructor[G](decl: JavaConstructor[G])
+    extends Referrable[G] with JavaConstructorTarget[G]
+case class RefJavaMethod[G](decl: JavaMethod[G])
+    extends Referrable[G] with JavaInvocationTarget[G] with ResultTarget[G]
+case class RefJavaParam[G](decl: JavaParam[G])
+    extends Referrable[G] with JavaNameTarget[G]
+case class RefJavaAnnotationMethod[G](decl: JavaAnnotationMethod[G])
+    extends Referrable[G] with JavaInvocationTarget[G] with ResultTarget[G]
+case class RefInstanceFunction[G](decl: InstanceFunction[G])
+    extends Referrable[G] with SpecInvocationTarget[G] with ResultTarget[G]
+case class RefInstanceMethod[G](decl: InstanceMethod[G])
+    extends Referrable[G] with SpecInvocationTarget[G] with ResultTarget[G]
+case class RefInstanceOperatorMethod[G](decl: InstanceOperatorMethod[G])
+    extends Referrable[G] with ResultTarget[G]
+case class RefInstanceOperatorFunction[G](decl: InstanceOperatorFunction[G])
+    extends Referrable[G] with ResultTarget[G]
+case class RefInstancePredicate[G](decl: InstancePredicate[G])
+    extends Referrable[G] with SpecInvocationTarget[G]
+case class RefField[G](decl: InstanceField[G])
+    extends Referrable[G] with PVLNameTarget[G] with PVLDerefTarget[G]
+case class RefVariable[G](decl: Variable[G])
+    extends Referrable[G] with SpecNameTarget[G] with SpecTypeNameTarget[G]
 case class RefLabelDecl[G](decl: LabelDecl[G]) extends Referrable[G]
 case class RefSendDecl[G](decl: SendDecl[G]) extends Referrable[G]
 case class RefRunMethod[G](decl: RunMethod[G]) extends Referrable[G]
 case class RefParBlockDecl[G](decl: ParBlockDecl[G]) extends Referrable[G]
-case class RefParInvariantDecl[G](decl: ParInvariantDecl[G]) extends Referrable[G]
+case class RefParInvariantDecl[G](decl: ParInvariantDecl[G])
+    extends Referrable[G]
 case class RefADTAxiom[G](decl: ADTAxiom[G]) extends Referrable[G]
-case class RefADTFunction[G](decl: ADTFunction[G]) extends Referrable[G] with SpecInvocationTarget[G]
-case class RefModelField[G](decl: ModelField[G]) extends Referrable[G] with SpecDerefTarget[G] with SpecNameTarget[G]
-case class RefModelProcess[G](decl: ModelProcess[G]) extends Referrable[G] with SpecInvocationTarget[G]
-case class RefModelAction[G](decl: ModelAction[G]) extends Referrable[G] with SpecInvocationTarget[G]
-case class RefPVLConstructor[G](decl: PVLConstructor[G]) extends Referrable[G] with PVLConstructorTarget[G]
-case class RefJavaBipStatePredicate[G](state: String, decl: JavaAnnotation[G]) extends Referrable[G] with JavaBipStatePredicateTarget[G]
-case class RefJavaBipGuard[G](decl: JavaMethod[G]) extends Referrable[G] with JavaNameTarget[G]
-case class RefJavaBipGlueContainer[G]() extends Referrable[G] // Bip glue jobs are not actually referrable
-case class RefLlvmFunctionDefinition[G](decl: LlvmFunctionDefinition[G]) extends Referrable[G] with LlvmInvocationTarget[G] with ResultTarget[G]
+case class RefADTFunction[G](decl: ADTFunction[G])
+    extends Referrable[G] with SpecInvocationTarget[G]
+case class RefModelField[G](decl: ModelField[G])
+    extends Referrable[G] with SpecDerefTarget[G] with SpecNameTarget[G]
+case class RefModelProcess[G](decl: ModelProcess[G])
+    extends Referrable[G] with SpecInvocationTarget[G]
+case class RefModelAction[G](decl: ModelAction[G])
+    extends Referrable[G] with SpecInvocationTarget[G]
+case class RefPVLConstructor[G](decl: PVLConstructor[G])
+    extends Referrable[G] with PVLConstructorTarget[G]
+case class RefJavaBipStatePredicate[G](state: String, decl: JavaAnnotation[G])
+    extends Referrable[G] with JavaBipStatePredicateTarget[G]
+case class RefJavaBipGuard[G](decl: JavaMethod[G])
+    extends Referrable[G] with JavaNameTarget[G]
+case class RefJavaBipGlueContainer[G]()
+    extends Referrable[G] // Bip glue jobs are not actually referrable
+case class RefLlvmFunctionDefinition[G](decl: LlvmFunctionDefinition[G])
+    extends Referrable[G] with LlvmInvocationTarget[G] with ResultTarget[G]
 case class RefLlvmGlobal[G](decl: LlvmGlobal[G], idx: Int) extends Referrable[G]
 case class RefBipComponent[G](decl: BipComponent[G]) extends Referrable[G]
 case class RefBipGlue[G](decl: BipGlue[G]) extends Referrable[G]
@@ -331,31 +463,47 @@ case class RefBipGuard[G](decl: BipGuard[G]) extends Referrable[G]
 case class RefBipIncomingData[G](decl: BipIncomingData[G]) extends Referrable[G]
 case class RefBipOutgoingData[G](decl: BipOutgoingData[G]) extends Referrable[G]
 case class RefBipPort[G](decl: BipPort[G]) extends Referrable[G]
-case class RefBipPortSynchronization[G](decl: BipPortSynchronization[G]) extends Referrable[G]
-case class RefBipStatePredicate[G](decl: BipStatePredicate[G]) extends Referrable[G]
+case class RefBipPortSynchronization[G](decl: BipPortSynchronization[G])
+    extends Referrable[G]
+case class RefBipStatePredicate[G](decl: BipStatePredicate[G])
+    extends Referrable[G]
 case class RefBipTransition[G](decl: BipTransition[G]) extends Referrable[G]
-case class RefBipTransitionSynchronization[G](decl: BipTransitionSynchronization[G]) extends Referrable[G]
+case class RefBipTransitionSynchronization[G](
+    decl: BipTransitionSynchronization[G]
+) extends Referrable[G]
 case class RefBipConstructor[G](decl: BipConstructor[G]) extends Referrable[G]
 case class RefHeapVariable[G](decl: HeapVariable[G]) extends Referrable[G]
-case class RefPVLEndpoint[G](decl: PVLEndpoint[G]) extends Referrable[G] with PVLNameTarget[G]
-case class RefPVLChoreography[G](decl: PVLChoreography[G]) extends Referrable[G] with ThisTarget[G]
+case class RefPVLEndpoint[G](decl: PVLEndpoint[G])
+    extends Referrable[G] with PVLNameTarget[G]
+case class RefPVLChoreography[G](decl: PVLChoreography[G])
+    extends Referrable[G] with ThisTarget[G]
 case class RefPVLChorRun[G](decl: PVLChorRun[G]) extends Referrable[G]
 
-case class RefLlvmSpecFunction[G](decl: LlvmSpecFunction[G]) extends Referrable[G] with LlvmInvocationTarget[G] with ResultTarget[G]
-case class RefChoreography[G](decl: Choreography[G]) extends Referrable[G] with ThisTarget[G]
+case class RefLlvmSpecFunction[G](decl: LlvmSpecFunction[G])
+    extends Referrable[G] with LlvmInvocationTarget[G] with ResultTarget[G]
+case class RefChoreography[G](decl: Choreography[G])
+    extends Referrable[G] with ThisTarget[G]
 case class RefEndpoint[G](decl: Endpoint[G]) extends Referrable[G]
-case class RefProverType[G](decl: ProverType[G]) extends Referrable[G] with SpecTypeNameTarget[G]
-case class RefProverFunction[G](decl: ProverFunction[G]) extends Referrable[G] with SpecInvocationTarget[G]
+case class RefProverType[G](decl: ProverType[G])
+    extends Referrable[G] with SpecTypeNameTarget[G]
+case class RefProverFunction[G](decl: ProverFunction[G])
+    extends Referrable[G] with SpecInvocationTarget[G]
 
-case class BuiltinField[G](f: Expr[G] => Expr[G]) extends Referrable[G] with SpecDerefTarget[G]
-case class BuiltinInstanceMethod[G](f: Expr[G] => Seq[Expr[G]] => Expr[G]) extends Referrable[G] with SpecInvocationTarget[G]
+case class BuiltinField[G](f: Expr[G] => Expr[G])
+    extends Referrable[G] with SpecDerefTarget[G]
+case class BuiltinInstanceMethod[G](f: Expr[G] => Seq[Expr[G]] => Expr[G])
+    extends Referrable[G] with SpecInvocationTarget[G]
 
-case class PVLBuiltinInstanceMethod[G](f: Expr[G] => Seq[Expr[G]] => Expr[G]) extends Referrable[G] with PVLInvocationTarget[G]
+case class PVLBuiltinInstanceMethod[G](f: Expr[G] => Seq[Expr[G]] => Expr[G])
+    extends Referrable[G] with PVLInvocationTarget[G]
 
-case class ImplicitDefaultJavaConstructor[G](cls: JavaClass[G]) extends Referrable[G] with JavaConstructorTarget[G]
-case class ImplicitDefaultPVLConstructor[G](cls: Class[G]) extends Referrable[G] with PVLConstructorTarget[G]
+case class ImplicitDefaultJavaConstructor[G](cls: JavaClass[G])
+    extends Referrable[G] with JavaConstructorTarget[G]
+case class ImplicitDefaultPVLConstructor[G](cls: Class[G])
+    extends Referrable[G] with PVLConstructorTarget[G]
 
-case class ImplicitDefaultJavaBipStatePredicate[G](state: String) extends Referrable[G] with JavaBipStatePredicateTarget[G]
+case class ImplicitDefaultJavaBipStatePredicate[G](state: String)
+    extends Referrable[G] with JavaBipStatePredicateTarget[G]
 
 sealed trait RefCudaVec[G] extends Referrable[G] with CNameTarget[G]
 case class RefCudaThreadIdx[G]() extends RefCudaVec[G]
diff --git a/src/col/vct/col/resolve/ctx/TypeResolutionContext.scala b/src/col/vct/col/resolve/ctx/TypeResolutionContext.scala
index 9f4b37b8ef..841f337de6 100644
--- a/src/col/vct/col/resolve/ctx/TypeResolutionContext.scala
+++ b/src/col/vct/col/resolve/ctx/TypeResolutionContext.scala
@@ -6,12 +6,12 @@ import vct.col.resolve.ResolveTypes.JavaClassPathEntry
 
 import scala.collection.mutable
 
-case class TypeResolutionContext[G]
-(
-  stack: Seq[Seq[Referrable[G]]] = Nil,
-  namespace: Option[JavaNamespace[G]] = None,
-  externalJavaLoader: Option[ExternalJavaLoader] = None,
-  javaClassPath: Seq[JavaClassPathEntry] = Nil,
-  inGpuKernel: Boolean = false,
-  externallyLoadedElements: mutable.ArrayBuffer[GlobalDeclaration[G]] = mutable.ArrayBuffer[GlobalDeclaration[G]](),
+case class TypeResolutionContext[G](
+    stack: Seq[Seq[Referrable[G]]] = Nil,
+    namespace: Option[JavaNamespace[G]] = None,
+    externalJavaLoader: Option[ExternalJavaLoader] = None,
+    javaClassPath: Seq[JavaClassPathEntry] = Nil,
+    inGpuKernel: Boolean = false,
+    externallyLoadedElements: mutable.ArrayBuffer[GlobalDeclaration[G]] =
+      mutable.ArrayBuffer[GlobalDeclaration[G]](),
 )
diff --git a/src/col/vct/col/resolve/lang/C.scala b/src/col/vct/col/resolve/lang/C.scala
index d00f634d58..720f63286e 100644
--- a/src/col/vct/col/resolve/lang/C.scala
+++ b/src/col/vct/col/resolve/lang/C.scala
@@ -45,98 +45,150 @@ case object C {
   case object LP64 extends DataModel
   case object LLP64 extends DataModel
 
-  def INT_TYPE_TO_SIZE(dm: DataModel): Map[Seq[CDeclarationSpecifier[_]], Int] = Map(
-    (Seq(CShort()) -> 16),
-    (Seq(CShort(), CInt()) -> 16),
-    (Seq(CInt()) -> 32),
-    (Seq(CLong()) -> 64),
-    (Seq(CLong(), CInt()) -> (if(dm == LP64) 64 else 32)),
-    (Seq(CLong(), CLong()) -> 64),
-    (Seq(CLong(), CLong(), CInt()) -> 64),
-  )
-
-  case class DeclaratorInfo[G](params: Option[Seq[CParam[G]]], typeOrReturnType: Type[G] => Type[G], name: String)
+  def INT_TYPE_TO_SIZE(dm: DataModel): Map[Seq[CDeclarationSpecifier[_]], Int] =
+    Map(
+      (Seq(CShort()) -> 16),
+      (Seq(CShort(), CInt()) -> 16),
+      (Seq(CInt()) -> 32),
+      (Seq(CLong()) -> 64),
+      (Seq(CLong(), CInt()) ->
+        (if (dm == LP64)
+           64
+         else
+           32)),
+      (Seq(CLong(), CLong()) -> 64),
+      (Seq(CLong(), CLong(), CInt()) -> 64),
+    )
 
-  def getDeclaratorInfo[G](decl: CDeclarator[G]): DeclaratorInfo[G] = decl match {
-    case CPointerDeclarator(pointers, inner) =>
-      val innerInfo = getDeclaratorInfo(inner)
-      DeclaratorInfo(
-        innerInfo.params,
-        t => innerInfo.typeOrReturnType(FuncTools.repeat[Type[G]](CTPointer(_), pointers.size, t)),
-        innerInfo.name)
-    case c @ CArrayDeclarator(_, size, inner) =>
-      val innerInfo = getDeclaratorInfo(inner)
-      DeclaratorInfo(innerInfo.params, t => innerInfo.typeOrReturnType(CTArray(size, t)(c.blame)), innerInfo.name)
-    case CPointerDeclarator(pointers, inner) =>
-      val innerInfo = getDeclaratorInfo(inner)
-      DeclaratorInfo(
-        innerInfo.params,
-        t => innerInfo.typeOrReturnType(FuncTools.repeat[Type[G]](CTPointer(_), pointers.size, t)),
-        innerInfo.name)
-    case CTypeExtensionDeclarator(Seq(CTypeAttribute(name, Seq(size))), inner) if name == "vector_size" || name == "__vector_size__" =>
-      val innerInfo = getDeclaratorInfo(inner)
-      DeclaratorInfo(
-        innerInfo.params,
-        t => CTVector(size, innerInfo.typeOrReturnType(t))(decl.o),
-        innerInfo.name)
-    case typeExtension@CTypeExtensionDeclarator(_, _) => throw CTypeNotSupported(Some(typeExtension))
-    case CTypedFunctionDeclarator(params, _, inner) =>
-      val innerInfo = getDeclaratorInfo(inner)
-      DeclaratorInfo(params=Some(params), typeOrReturnType=(t => t), innerInfo.name)
-    case CAnonymousFunctionDeclarator(Nil, inner) =>
-      val innerInfo = getDeclaratorInfo(inner)
-      DeclaratorInfo(params=Some(Nil), typeOrReturnType=(t => t), innerInfo.name)
-    case decl @ CAnonymousFunctionDeclarator(_, _) =>
-      throw AnonymousMethodsUnsupported(decl)
-    case CName(name) => DeclaratorInfo(params=None, typeOrReturnType=(t => t), name)
-  }
+  case class DeclaratorInfo[G](
+      params: Option[Seq[CParam[G]]],
+      typeOrReturnType: Type[G] => Type[G],
+      name: String,
+  )
 
-  def getSpecs[G](decl: CDeclarator[G], acc: Seq[CDeclarationSpecifier[G]] = Nil): Seq[CDeclarationSpecifier[G]] = decl match {
-    case CTypeExtensionDeclarator(extensions, inner) => getSpecs(inner, acc :+ CFunctionTypeExtensionModifier(extensions))
-    case _ => acc
-  }
+  def getDeclaratorInfo[G](decl: CDeclarator[G]): DeclaratorInfo[G] =
+    decl match {
+      case CPointerDeclarator(pointers, inner) =>
+        val innerInfo = getDeclaratorInfo(inner)
+        DeclaratorInfo(
+          innerInfo.params,
+          t =>
+            innerInfo.typeOrReturnType(
+              FuncTools.repeat[Type[G]](CTPointer(_), pointers.size, t)
+            ),
+          innerInfo.name,
+        )
+      case c @ CArrayDeclarator(_, size, inner) =>
+        val innerInfo = getDeclaratorInfo(inner)
+        DeclaratorInfo(
+          innerInfo.params,
+          t => innerInfo.typeOrReturnType(CTArray(size, t)(c.blame)),
+          innerInfo.name,
+        )
+      case CPointerDeclarator(pointers, inner) =>
+        val innerInfo = getDeclaratorInfo(inner)
+        DeclaratorInfo(
+          innerInfo.params,
+          t =>
+            innerInfo.typeOrReturnType(
+              FuncTools.repeat[Type[G]](CTPointer(_), pointers.size, t)
+            ),
+          innerInfo.name,
+        )
+      case CTypeExtensionDeclarator(Seq(CTypeAttribute(name, Seq(size))), inner)
+          if name == "vector_size" || name == "__vector_size__" =>
+        val innerInfo = getDeclaratorInfo(inner)
+        DeclaratorInfo(
+          innerInfo.params,
+          t => CTVector(size, innerInfo.typeOrReturnType(t))(decl.o),
+          innerInfo.name,
+        )
+      case typeExtension @ CTypeExtensionDeclarator(_, _) =>
+        throw CTypeNotSupported(Some(typeExtension))
+      case CTypedFunctionDeclarator(params, _, inner) =>
+        val innerInfo = getDeclaratorInfo(inner)
+        DeclaratorInfo(
+          params = Some(params),
+          typeOrReturnType = (t => t),
+          innerInfo.name,
+        )
+      case CAnonymousFunctionDeclarator(Nil, inner) =>
+        val innerInfo = getDeclaratorInfo(inner)
+        DeclaratorInfo(
+          params = Some(Nil),
+          typeOrReturnType = (t => t),
+          innerInfo.name,
+        )
+      case decl @ CAnonymousFunctionDeclarator(_, _) =>
+        throw AnonymousMethodsUnsupported(decl)
+      case CName(name) =>
+        DeclaratorInfo(params = None, typeOrReturnType = (t => t), name)
+    }
 
-  def getTypeFromTypeDef[G](decl: CDeclaration[G], context: Option[Node[G]] = None): Type[G] = {
-    val specs: Seq[CDeclarationSpecifier[G]] = decl.specs match {
-      case CTypedef() +: remaining => remaining
-      case _ => ???
+  def getSpecs[G](
+      decl: CDeclarator[G],
+      acc: Seq[CDeclarationSpecifier[G]] = Nil,
+  ): Seq[CDeclarationSpecifier[G]] =
+    decl match {
+      case CTypeExtensionDeclarator(extensions, inner) =>
+        getSpecs(inner, acc :+ CFunctionTypeExtensionModifier(extensions))
+      case _ => acc
     }
 
+  def getTypeFromTypeDef[G](
+      decl: CDeclaration[G],
+      context: Option[Node[G]] = None,
+  ): Type[G] = {
+    val specs: Seq[CDeclarationSpecifier[G]] =
+      decl.specs match {
+        case CTypedef() +: remaining => remaining
+        case _ => ???
+      }
+
     // Need to get specifications from the init (can only have one init as typedef), since it can contain GCC Type extensions
     getPrimitiveType(getSpecs(decl.inits.head.decl) ++ specs, context)
   }
 
+  def getPrimitiveType[G](
+      specs: Seq[CDeclarationSpecifier[G]],
+      context: Option[Node[G]] = None,
+  ): Type[G] = {
+    val vectorSize: Option[Expr[G]] =
+      specs.collect { case ext: CFunctionTypeExtensionModifier[G] =>
+        ext.extensions
+      } match {
+        case Seq(Seq(CTypeAttribute(name, Seq(size: Expr[G]))))
+            if name == "__vector_size__" || name == "vector_size" =>
+          Some(size)
+        case Seq() => None
+        case _ => throw CTypeNotSupported(context)
+      }
 
-  def getPrimitiveType[G](specs: Seq[CDeclarationSpecifier[G]], context: Option[Node[G]] = None): Type[G] = {
-    val vectorSize: Option[Expr[G]] = specs.collect { case ext: CFunctionTypeExtensionModifier[G] => ext.extensions} match {
-      case Seq(Seq(CTypeAttribute(name, Seq(size: Expr[G])))) if name == "__vector_size__" || name == "vector_size" => Some(size)
-      case Seq() => None
-      case _ => throw CTypeNotSupported(context)
-    }
-
-    val filteredSpecs = specs.filter { case _: CFunctionTypeExtensionModifier[G] => false; case _ => true }
-      .collect { case spec: CTypeSpecifier[G] => spec }
+    val filteredSpecs = specs.filter {
+      case _: CFunctionTypeExtensionModifier[G] => false; case _ => true
+    }.collect { case spec: CTypeSpecifier[G] => spec }
 
-    val t: Type[G] = filteredSpecs match {
-      case Seq(CVoid()) => TVoid()
-      case Seq(CChar()) => TChar()
-      case CUnsigned() +: t if INTEGER_LIKE_TYPES.contains(t) => TCInt()
-      case CSigned() +: t if INTEGER_LIKE_TYPES.contains(t) => TCInt()
-      case t if C.INTEGER_LIKE_TYPES.contains(t) => TCInt()
-      case Seq(CFloat()) => C_ieee754_32bit()
-      case Seq(CDouble()) => C_ieee754_64bit()
-      case Seq(CLong(), CDouble()) => C_ieee754_64bit()
-      case Seq(CBool()) => TBool()
-      case Seq(defn @ CTypedefName(_)) =>
-        defn.ref.get match {
-          case RefTypeDef(decl) => getTypeFromTypeDef(decl.decl)
-          case _ => ???
-        }
-      case Seq(CSpecificationType(typ)) => typ
-      case Seq(defn @ CStructSpecifier(_)) => CTStruct(defn.ref.get.decl.ref)
-      case spec +: _ => throw CTypeNotSupported(context.orElse(Some(spec)))
-      case _ => throw CTypeNotSupported(context)
-    }
+    val t: Type[G] =
+      filteredSpecs match {
+        case Seq(CVoid()) => TVoid()
+        case Seq(CChar()) => TChar()
+        case CUnsigned() +: t if INTEGER_LIKE_TYPES.contains(t) => TCInt()
+        case CSigned() +: t if INTEGER_LIKE_TYPES.contains(t) => TCInt()
+        case t if C.INTEGER_LIKE_TYPES.contains(t) => TCInt()
+        case Seq(CFloat()) => C_ieee754_32bit()
+        case Seq(CDouble()) => C_ieee754_64bit()
+        case Seq(CLong(), CDouble()) => C_ieee754_64bit()
+        case Seq(CBool()) => TBool()
+        case Seq(defn @ CTypedefName(_)) =>
+          defn.ref.get match {
+            case RefTypeDef(decl) => getTypeFromTypeDef(decl.decl)
+            case _ => ???
+          }
+        case Seq(CSpecificationType(typ)) => typ
+        case Seq(defn @ CStructSpecifier(_)) => CTStruct(defn.ref.get.decl.ref)
+        case spec +: _ => throw CTypeNotSupported(context.orElse(Some(spec)))
+        case _ => throw CTypeNotSupported(context)
+      }
     vectorSize match {
       case None => t
       case Some(size) => CTVector(size, t)
@@ -146,67 +198,99 @@ case object C {
   def nameFromDeclarator(declarator: CDeclarator[_]): String =
     getDeclaratorInfo(declarator).name
 
-  def typeOrReturnTypeFromDeclaration[G](specs: Seq[CDeclarationSpecifier[G]], decl: CDeclarator[G]): Type[G] =
-    getDeclaratorInfo(decl).typeOrReturnType(CPrimitiveType(specs))
+  def typeOrReturnTypeFromDeclaration[G](
+      specs: Seq[CDeclarationSpecifier[G]],
+      decl: CDeclarator[G],
+  ): Type[G] = getDeclaratorInfo(decl).typeOrReturnType(CPrimitiveType(specs))
 
   def paramsFromDeclarator[G](declarator: CDeclarator[G]): Seq[CParam[G]] =
     getDeclaratorInfo(declarator).params.get
 
-  def findCTypeName[G](name: String, ctx: TypeResolutionContext[G]): Option[CTypeNameTarget[G]] =
+  def findCTypeName[G](
+      name: String,
+      ctx: TypeResolutionContext[G],
+  ): Option[CTypeNameTarget[G]] =
     ctx.stack.flatten.collectFirst {
       case target: CTypeNameTarget[G] if target.name == name => target
     }
 
-  def findCStruct[G](name: String, ctx: TypeResolutionContext[G]): Option[RefCStruct[G]] =
+  def findCStruct[G](
+      name: String,
+      ctx: TypeResolutionContext[G],
+  ): Option[RefCStruct[G]] =
     ctx.stack.flatten.collectFirst {
       case target: RefCStruct[G] if target.name == name => target
     }
 
-  def findCName[G](name: String, ctx: ReferenceResolutionContext[G]): Option[CNameTarget[G]] =
+  def findCName[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[CNameTarget[G]] =
     name match {
       case "threadIdx" => Some(RefCudaThreadIdx())
       case "blockDim" => Some(RefCudaBlockDim())
       case "blockIdx" => Some(RefCudaBlockIdx())
       case "gridDim" => Some(RefCudaGridDim())
-      case _ => ctx.stack.flatten.collectFirst {
-        case target: CNameTarget[G] if target.name == name => target
-      }
+      case _ =>
+        ctx.stack.flatten.collectFirst {
+          case target: CNameTarget[G] if target.name == name => target
+        }
     }
 
-  def findForwardDeclaration[G](declarator: CDeclarator[G], ctx: ReferenceResolutionContext[G]): Option[RefCGlobalDeclaration[G]] =
+  def findForwardDeclaration[G](
+      declarator: CDeclarator[G],
+      ctx: ReferenceResolutionContext[G],
+  ): Option[RefCGlobalDeclaration[G]] =
     ctx.stack.flatten.collectFirst {
-      case target: RefCGlobalDeclaration[G] if target.name == nameFromDeclarator(declarator) => target
+      case target: RefCGlobalDeclaration[G]
+          if target.name == nameFromDeclarator(declarator) =>
+        target
     }
 
-  def findDefinition[G](declarator: CDeclarator[G], ctx: ReferenceResolutionContext[G]): Option[RefCFunctionDefinition[G]] =
+  def findDefinition[G](
+      declarator: CDeclarator[G],
+      ctx: ReferenceResolutionContext[G],
+  ): Option[RefCFunctionDefinition[G]] =
     ctx.stack.flatten.collectFirst {
-      case target: RefCFunctionDefinition[G] if target.name == nameFromDeclarator(declarator) => target
+      case target: RefCFunctionDefinition[G]
+          if target.name == nameFromDeclarator(declarator) =>
+        target
     }
 
-  def stripCPrimitiveType[G](t: Type[G]): Type[G] = t match {
-    case CPrimitiveType(specs) => getPrimitiveType(specs)
-    case _ => t
-  }
-
+  def stripCPrimitiveType[G](t: Type[G]): Type[G] =
+    t match {
+      case CPrimitiveType(specs) => getPrimitiveType(specs)
+      case _ => t
+    }
 
-  def findPointerDeref[G](obj: Expr[G], name: String, ctx: ReferenceResolutionContext[G], blame: Blame[BuiltinError]): Option[CDerefTarget[G]] =
+  def findPointerDeref[G](
+      obj: Expr[G],
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+      blame: Blame[BuiltinError],
+  ): Option[CDerefTarget[G]] =
     stripCPrimitiveType(obj.t) match {
-      case CTPointer(innerType: TNotAValue[G]) => innerType.decl.get match {
-        case RefCStruct(decl) => getCStructDeref(decl, name)
-        case _ => None
-      }
+      case CTPointer(innerType: TNotAValue[G]) =>
+        innerType.decl.get match {
+          case RefCStruct(decl) => getCStructDeref(decl, name)
+          case _ => None
+        }
       case CTPointer(struct: CTStruct[G]) =>
         getCStructDeref(struct.ref.decl, name)
-      case CTArray(_, innerType: TNotAValue[G]) => innerType.decl.get match {
-        case RefCStruct(decl) => getCStructDeref(decl, name)
-        case _ => None
-      }
+      case CTArray(_, innerType: TNotAValue[G]) =>
+        innerType.decl.get match {
+          case RefCStruct(decl) => getCStructDeref(decl, name)
+          case _ => None
+        }
       case CTArray(_, struct: CTStruct[G]) =>
         getCStructDeref(struct.ref.decl, name)
       case _ => None
     }
 
-  def getCStructDeref[G](decl: CGlobalDeclaration[G], name: String): Option[CDerefTarget[G]] =
+  def getCStructDeref[G](
+      decl: CGlobalDeclaration[G],
+      name: String,
+  ): Option[CDerefTarget[G]] =
     decl.decl match {
       case CDeclaration(_, _, Seq(CStructDeclaration(_, decls)), Seq()) =>
         decls.flatMap(Referrable.from).collectFirst {
@@ -215,51 +299,71 @@ case object C {
       case _ => None
     }
 
-  def openCLVectorAccessString[G](access: String, typeSize: BigInt): Option[Seq[BigInt]] = access match {
-    case "lo" if typeSize % 2 == 0 => Some(Seq.tabulate(typeSize.toInt/2)(i => i))
-    case "hi" if typeSize % 2 == 0 => Some(Seq.tabulate(typeSize.toInt/2)(i => i + typeSize/2))
-    case "even" if typeSize % 2 == 0 => Some(Seq.tabulate(typeSize.toInt/2)(i => 2*i))
-    case "odd" if typeSize % 2 == 0 => Some(Seq.tabulate(typeSize.toInt/2)(i => 2*i+1))
-    case s if s.head == 's' && s.tail.nonEmpty =>
-      val hexToInt = (i: Char) => i match {
-        case i if i.isDigit => BigInt(i - '0'.toInt)
-        case i if i >= 'a' && i <= 'f' => BigInt(i.toInt - 'a'.toInt + 10)
-        case i if i >= 'A' && i <= 'F' => BigInt(i.toInt - 'A'.toInt + 10)
-        case _ => return None
-      }
-      val res = access.tail.map(hexToInt)
-      if(res.forall(p => p < typeSize))
-        Some(res)
-      else
-        None
-    case _ =>
-      val xyzwToInt = (i: Char) => i match {
-        case 'x' => BigInt(0)
-        case 'y' => BigInt(1)
-        case 'z' => BigInt(2)
-        case 'w' => BigInt(3)
-        case _ => return None
-      }
-      val res = access.map(xyzwToInt)
-      if(res.forall(p => p < typeSize))
-        Some(res)
-      else
-        None
-  }
+  def openCLVectorAccessString[G](
+      access: String,
+      typeSize: BigInt,
+  ): Option[Seq[BigInt]] =
+    access match {
+      case "lo" if typeSize % 2 == 0 =>
+        Some(Seq.tabulate(typeSize.toInt / 2)(i => i))
+      case "hi" if typeSize % 2 == 0 =>
+        Some(Seq.tabulate(typeSize.toInt / 2)(i => i + typeSize / 2))
+      case "even" if typeSize % 2 == 0 =>
+        Some(Seq.tabulate(typeSize.toInt / 2)(i => 2 * i))
+      case "odd" if typeSize % 2 == 0 =>
+        Some(Seq.tabulate(typeSize.toInt / 2)(i => 2 * i + 1))
+      case s if s.head == 's' && s.tail.nonEmpty =>
+        val hexToInt =
+          (i: Char) =>
+            i match {
+              case i if i.isDigit => BigInt(i - '0'.toInt)
+              case i if i >= 'a' && i <= 'f' => BigInt(i.toInt - 'a'.toInt + 10)
+              case i if i >= 'A' && i <= 'F' => BigInt(i.toInt - 'A'.toInt + 10)
+              case _ => return None
+            }
+        val res = access.tail.map(hexToInt)
+        if (res.forall(p => p < typeSize))
+          Some(res)
+        else
+          None
+      case _ =>
+        val xyzwToInt =
+          (i: Char) =>
+            i match {
+              case 'x' => BigInt(0)
+              case 'y' => BigInt(1)
+              case 'z' => BigInt(2)
+              case 'w' => BigInt(3)
+              case _ => return None
+            }
+        val res = access.map(xyzwToInt)
+        if (res.forall(p => p < typeSize))
+          Some(res)
+        else
+          None
+    }
 
-  def findDeref[G](obj: Expr[G], name: String, ctx: ReferenceResolutionContext[G], blame: Blame[BuiltinError]): Option[CDerefTarget[G]] =
+  def findDeref[G](
+      obj: Expr[G],
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+      blame: Blame[BuiltinError],
+  ): Option[CDerefTarget[G]] =
     (stripCPrimitiveType(obj.t) match {
-      case t: TNotAValue[G] => t.decl.get match {
-        case RefAxiomaticDataType(decl) => decl.decls.flatMap(Referrable.from).collectFirst {
-          case ref: RefADTFunction[G] if ref.name == name => ref
+      case t: TNotAValue[G] =>
+        t.decl.get match {
+          case RefAxiomaticDataType(decl) =>
+            decl.decls.flatMap(Referrable.from).collectFirst {
+              case ref: RefADTFunction[G] if ref.name == name => ref
+            }
+          case RefCStruct(decl: CGlobalDeclaration[G]) =>
+            getCStructDeref(decl, name)
+          case _ => None
         }
-        case RefCStruct(decl: CGlobalDeclaration[G]) => getCStructDeref(decl, name)
-        case _ => None
-      }
-      case struct: CTStruct[G] =>
-        getCStructDeref(struct.ref.decl, name)
+      case struct: CTStruct[G] => getCStructDeref(struct.ref.decl, name)
       case CTCudaVec() =>
-        val ref = obj.asInstanceOf[CLocal[G]].ref.get.asInstanceOf[RefCudaVec[G]]
+        val ref = obj.asInstanceOf[CLocal[G]].ref.get
+          .asInstanceOf[RefCudaVec[G]]
         name match {
           case "x" => Some(RefCudaVecX(ref))
           case "y" => Some(RefCudaVecY(ref))
@@ -271,14 +375,19 @@ case object C {
       case _ => None
     }).orElse(Spec.builtinField(obj, name, blame))
 
-  def resolveInvocation[G](obj: Expr[G], ctx: ReferenceResolutionContext[G]): CInvocationTarget[G] =
+  def resolveInvocation[G](
+      obj: Expr[G],
+      ctx: ReferenceResolutionContext[G],
+  ): CInvocationTarget[G] =
     obj.t match {
-      case t: TNotAValue[G] => t.decl.get match {
-        case target: CInvocationTarget[G] => target
-        case _ => throw NotApplicable(obj)
-      }
+      case t: TNotAValue[G] =>
+        t.decl.get match {
+          case target: CInvocationTarget[G] => target
+          case _ => throw NotApplicable(obj)
+        }
       // OpenCL overloads vector literals as function invocations..
-      case CPrimitiveType(CSpecificationType(v: TOpenCLVector[G]) +: _) => RefOpenCLVectorLiteralCInvocationTarget[G](v.size, v.innerType)
+      case CPrimitiveType(CSpecificationType(v: TOpenCLVector[G]) +: _) =>
+        RefOpenCLVectorLiteralCInvocationTarget[G](v.size, v.innerType)
       case _ => throw NotApplicable(obj)
     }
 }
diff --git a/src/col/vct/col/resolve/lang/CPP.scala b/src/col/vct/col/resolve/lang/CPP.scala
index 2805d6ee71..515eb67262 100644
--- a/src/col/vct/col/resolve/lang/CPP.scala
+++ b/src/col/vct/col/resolve/lang/CPP.scala
@@ -40,51 +40,85 @@ case object CPP {
     for (prefix <- NUMBER_LIKE_PREFIXES; t <- NUMBER_LIKE_TYPES)
       yield prefix ++ t
 
-  case class DeclaratorInfo[G](params: Option[Seq[CPPParam[G]]], typeOrReturnType: Type[G] => Type[G], name: String, isReference: Boolean = false)
+  case class DeclaratorInfo[G](
+      params: Option[Seq[CPPParam[G]]],
+      typeOrReturnType: Type[G] => Type[G],
+      name: String,
+      isReference: Boolean = false,
+  )
 
-  def getDeclaratorInfo[G](decl: CPPDeclarator[G], isParam: Boolean = false): DeclaratorInfo[G] = decl match {
-    case CPPAddressingDeclarator(operators, inner) =>
-      val innerInfo = getDeclaratorInfo(inner)
-      if (isParam && operators.size == 1 && operators.head.isInstanceOf[CPPReference[G]]) {
-        // Pass by reference parameter, so & can be ignored
+  def getDeclaratorInfo[G](
+      decl: CPPDeclarator[G],
+      isParam: Boolean = false,
+  ): DeclaratorInfo[G] =
+    decl match {
+      case CPPAddressingDeclarator(operators, inner) =>
+        val innerInfo = getDeclaratorInfo(inner)
+        if (
+          isParam && operators.size == 1 &&
+          operators.head.isInstanceOf[CPPReference[G]]
+        ) {
+          // Pass by reference parameter, so & can be ignored
+          DeclaratorInfo(
+            innerInfo.params,
+            t => innerInfo.typeOrReturnType(t),
+            innerInfo.name,
+            isReference = true,
+          )
+        } else if (
+          operators.collectFirst({ case x: CPPReference[G] => x }).isDefined
+        ) {
+          // Do not support multiple &, or & later in the sequence
+          throw CPPTypeNotSupported(Some(decl))
+        } else {
+          DeclaratorInfo(
+            innerInfo.params,
+            t =>
+              innerInfo.typeOrReturnType(
+                FuncTools.repeat[Type[G]](TPointer(_), operators.size, t)
+              ),
+            innerInfo.name,
+          )
+        }
+      case array @ CPPArrayDeclarator(size, inner) =>
+        val innerInfo = getDeclaratorInfo(inner)
         DeclaratorInfo(
           innerInfo.params,
-          t => innerInfo.typeOrReturnType(t),
+          t => innerInfo.typeOrReturnType(CPPTArray(size, t)(array.blame)),
           innerInfo.name,
-          isReference = true
         )
-      } else if (operators.collectFirst({ case x: CPPReference[G] => x }).isDefined) {
-        // Do not support multiple &, or & later in the sequence
-        throw CPPTypeNotSupported(Some(decl))
-      } else {
+      case CPPTypedFunctionDeclarator(params, _, inner) =>
+        val innerInfo = getDeclaratorInfo(inner)
         DeclaratorInfo(
-          innerInfo.params,
-          t => innerInfo.typeOrReturnType(FuncTools.repeat[Type[G]](TPointer(_), operators.size, t)),
-          innerInfo.name)
-      }
-    case array@CPPArrayDeclarator(size, inner) =>
-      val innerInfo = getDeclaratorInfo(inner)
-      DeclaratorInfo(innerInfo.params, t => innerInfo.typeOrReturnType(CPPTArray(size, t)(array.blame)), innerInfo.name)
-    case CPPTypedFunctionDeclarator(params, _, inner) =>
-      val innerInfo = getDeclaratorInfo(inner)
-      DeclaratorInfo(params = Some(params), typeOrReturnType = t => t, innerInfo.name)
-    case CPPLambdaDeclarator(params) =>
-      DeclaratorInfo(params = Some(params), typeOrReturnType = t => t, "")
-    case CPPName(name) =>
-      DeclaratorInfo(params = None, typeOrReturnType = t => t, name)
-  }
+          params = Some(params),
+          typeOrReturnType = t => t,
+          innerInfo.name,
+        )
+      case CPPLambdaDeclarator(params) =>
+        DeclaratorInfo(params = Some(params), typeOrReturnType = t => t, "")
+      case CPPName(name) =>
+        DeclaratorInfo(params = None, typeOrReturnType = t => t, name)
+    }
 
-  def getBaseTypeFromSpecs[G](specs: Seq[CPPDeclarationSpecifier[G]], context: Option[Node[G]] = None): Type[G] =
+  def getBaseTypeFromSpecs[G](
+      specs: Seq[CPPDeclarationSpecifier[G]],
+      context: Option[Node[G]] = None,
+  ): Type[G] =
     specs.collect { case spec: CPPTypeSpecifier[G] => spec } match {
       case Seq(CPPVoid()) => TVoid()
       case Seq(CPPChar()) => TChar()
       case t if CPP.NUMBER_LIKE_SPECIFIERS.contains(t) => TCInt()
-      case Seq(CPPSpecificationType(t@TCFloat(_, _))) => t
+      case Seq(CPPSpecificationType(t @ TCFloat(_, _))) => t
       case Seq(CPPBool()) => TBool()
       case Seq(SYCLClassDefName("event", Seq())) => SYCLTEvent()
       case Seq(SYCLClassDefName("handler", Seq())) => SYCLTHandler()
       case Seq(SYCLClassDefName("queue", Seq())) => SYCLTQueue()
-      case Seq(SYCLClassDefName(name, Seq(CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None)))) =>
+      case Seq(
+            SYCLClassDefName(
+              name,
+              Seq(CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None)),
+            )
+          ) =>
         name match {
           case "item" => SYCLTItem(dim.intValue)
           case "nd_item" => SYCLTNDItem(dim.intValue)
@@ -92,7 +126,15 @@ case object CPP {
           case "nd_range" => SYCLTNDRange(dim.intValue)
           case _ => throw CPPTypeNotSupported(context)
         }
-      case Seq(SYCLClassDefName(name, Seq(CPPExprOrTypeSpecifier(None, Some(typ)), CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None)))) =>
+      case Seq(
+            SYCLClassDefName(
+              name,
+              Seq(
+                CPPExprOrTypeSpecifier(None, Some(typ)),
+                CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None),
+              ),
+            )
+          ) =>
         val baseType = getBaseTypeFromSpecs(Seq(typ))
         name match {
           case "buffer" => SYCLTBuffer(baseType, dim.intValue)
@@ -100,31 +142,50 @@ case object CPP {
           case "local_accessor" => SYCLTLocalAccessor(baseType, dim.intValue)
           case _ => throw CPPTypeNotSupported(context)
         }
-      case Seq(SYCLClassDefName("accessor", Seq(CPPExprOrTypeSpecifier(None, Some(typ)), CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None), CPPExprOrTypeSpecifier(None, Some(SYCLClassDefName(accessMode, Nil)))))) =>
+      case Seq(
+            SYCLClassDefName(
+              "accessor",
+              Seq(
+                CPPExprOrTypeSpecifier(None, Some(typ)),
+                CPPExprOrTypeSpecifier(Some(CIntegerValue(dim)), None),
+                CPPExprOrTypeSpecifier(
+                  None,
+                  Some(SYCLClassDefName(accessMode, Nil)),
+                ),
+              ),
+            )
+          ) =>
         val baseType = getBaseTypeFromSpecs(Seq(typ))
         accessMode match {
-          case "access_mode::read_write" => SYCLTAccessor(baseType, dim.intValue)
-          case "access_mode::read" => SYCLTAccessor(baseType, dim.intValue, readOnly = true)
+          case "access_mode::read_write" =>
+            SYCLTAccessor(baseType, dim.intValue)
+          case "access_mode::read" =>
+            SYCLTAccessor(baseType, dim.intValue, readOnly = true)
           case _ => throw CPPTypeNotSupported(context)
         }
       case Seq(CPPTypedefName("VERCORS::LAMBDA", _)) => CPPTLambda()
-      case Seq(defn@CPPTypedefName(_, _)) => Types.notAValue(defn.ref.get)
+      case Seq(defn @ CPPTypedefName(_, _)) => Types.notAValue(defn.ref.get)
       case Seq(CPPSpecificationType(typ)) => typ
       case spec +: _ => throw CPPTypeNotSupported(context.orElse(Some(spec)))
       case _ => throw CPPTypeNotSupported(context)
     }
 
-  def unwrappedType[G](t: Type[G]): Type[G] = t match {
-    case CPPPrimitiveType(specs) => getBaseTypeFromSpecs(specs)
-    case _ => t
-  }
+  def unwrappedType[G](t: Type[G]): Type[G] =
+    t match {
+      case CPPPrimitiveType(specs) => getBaseTypeFromSpecs(specs)
+      case _ => t
+    }
 
   def nameFromDeclarator(declarator: CPPDeclarator[_]): String =
     getDeclaratorInfo(declarator).name
 
-  def typeOrReturnTypeFromDeclarator[G](specs: Seq[CPPDeclarationSpecifier[G]], decl: CPPDeclarator[G]): Type[G] = {
+  def typeOrReturnTypeFromDeclarator[G](
+      specs: Seq[CPPDeclarationSpecifier[G]],
+      decl: CPPDeclarator[G],
+  ): Type[G] = {
     getDeclaratorInfo(decl).typeOrReturnType(CPPPrimitiveType(specs)) match {
-      case CPPPrimitiveType(returnedSpecs) => getBaseTypeFromSpecs(returnedSpecs)
+      case CPPPrimitiveType(returnedSpecs) =>
+        getBaseTypeFromSpecs(returnedSpecs)
       case x => x
     }
 
@@ -133,18 +194,27 @@ case object CPP {
   def paramsFromDeclarator[G](declarator: CPPDeclarator[G]): Seq[CPPParam[G]] =
     getDeclaratorInfo(declarator).params.get
 
-  def findCPPTypeName[G](name: String, ctx: TypeResolutionContext[G]): Option[CPPTypeNameTarget[G]] = name match {
-    case "VERCORS::LAMBDA" | "VERCORS::ARRAY" => Some(RefCPPCustomType(name))
-    case _ => ctx.stack.flatten.collectFirst {
-      case target: CPPTypeNameTarget[G] if target.name == name => target
+  def findCPPTypeName[G](
+      name: String,
+      ctx: TypeResolutionContext[G],
+  ): Option[CPPTypeNameTarget[G]] =
+    name match {
+      case "VERCORS::LAMBDA" | "VERCORS::ARRAY" => Some(RefCPPCustomType(name))
+      case _ =>
+        ctx.stack.flatten.collectFirst {
+          case target: CPPTypeNameTarget[G] if target.name == name => target
+        }
     }
-  }
 
-  def findCPPName[G](name: String, ctx: ReferenceResolutionContext[G]): Seq[CPPNameTarget[G]] = {
+  def findCPPName[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Seq[CPPNameTarget[G]] = {
     val targets = ctx.stack.flatten.collect {
       case target: CPPNameTarget[G] if target.name == name => target
     }
-    if (targets.nonEmpty) return targets
+    if (targets.nonEmpty)
+      return targets
 
     name match {
       case "sycl::read_write" => Seq(RefSYCLAccessMode(SYCLReadWriteAccess()))
@@ -152,94 +222,144 @@ case object CPP {
       case "sycl::range" => Seq(RefSYCLConstructorDefinition(SYCLTRange()))
       case "sycl::nd_range" => Seq(RefSYCLConstructorDefinition(SYCLTNDRange()))
       case "sycl::buffer" => Seq(RefSYCLConstructorDefinition(SYCLTBuffer()))
-      case "sycl::accessor" => Seq(RefSYCLConstructorDefinition(SYCLTAccessor()))
-      case "sycl::local_accessor" => Seq(RefSYCLConstructorDefinition(SYCLTLocalAccessor()))
+      case "sycl::accessor" =>
+        Seq(RefSYCLConstructorDefinition(SYCLTAccessor()))
+      case "sycl::local_accessor" =>
+        Seq(RefSYCLConstructorDefinition(SYCLTLocalAccessor()))
       case _ => Seq()
     }
   }
 
-  def findDeref[G](obj: Expr[G], name: String, ctx: ReferenceResolutionContext[G], blame: Blame[BuiltinError]): Seq[CPPDerefTarget[G]] =
+  def findDeref[G](
+      obj: Expr[G],
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+      blame: Blame[BuiltinError],
+  ): Seq[CPPDerefTarget[G]] =
     CPP.unwrappedType(obj.t) match {
-      case t: TNotAValue[G] => t.decl.get match {
-        case RefAxiomaticDataType(decl) => decl.decls.flatMap(Referrable.from).collect {
-          case ref: RefADTFunction[G] if ref.name == name => ref
+      case t: TNotAValue[G] =>
+        t.decl.get match {
+          case RefAxiomaticDataType(decl) =>
+            decl.decls.flatMap(Referrable.from).collect {
+              case ref: RefADTFunction[G] if ref.name == name => ref
+            }
+          case _ => Nil
         }
-        case _ => Nil
-      }
-      case t: SYCLTClass[G] => findCPPName(t.namespacePath + "::" + name, ctx).collect({
-        case decl: CPPDerefTarget[G] if decl.isInstanceOf[CPPInvocationTarget[G]] => decl
-      })
+      case t: SYCLTClass[G] =>
+        findCPPName(t.namespacePath + "::" + name, ctx).collect({
+          case decl: CPPDerefTarget[G]
+              if decl.isInstanceOf[CPPInvocationTarget[G]] =>
+            decl
+        })
       case _ => Spec.builtinField(obj, name, blame).toSeq
     }
 
-  def findForwardDeclaration[G](declarator: CPPDeclarator[G], ctx: ReferenceResolutionContext[G]): Option[RefCPPGlobalDeclaration[G]] =
+  def findForwardDeclaration[G](
+      declarator: CPPDeclarator[G],
+      ctx: ReferenceResolutionContext[G],
+  ): Option[RefCPPGlobalDeclaration[G]] =
     ctx.stack.flatten.collectFirst {
-      case target: RefCPPGlobalDeclaration[G] if target.name == nameFromDeclarator(declarator) => target
+      case target: RefCPPGlobalDeclaration[G]
+          if target.name == nameFromDeclarator(declarator) =>
+        target
     }
 
-  def findDefinition[G](declarator: CPPDeclarator[G], ctx: ReferenceResolutionContext[G]): Option[RefCPPFunctionDefinition[G]] =
+  def findDefinition[G](
+      declarator: CPPDeclarator[G],
+      ctx: ReferenceResolutionContext[G],
+  ): Option[RefCPPFunctionDefinition[G]] =
     ctx.stack.flatten.collectFirst {
-      case target: RefCPPFunctionDefinition[G] if target.name == nameFromDeclarator(declarator) => target
+      case target: RefCPPFunctionDefinition[G]
+          if target.name == nameFromDeclarator(declarator) =>
+        target
     }
 
-  def getParamTypes[G](ref: CPPInvocationTarget[G]): Seq[Type[G]] = ref match {
-    case globalDeclRef: RefCPPGlobalDeclaration[G] if globalDeclRef.decls.decl.inits.size == 1 =>
-      paramsFromDeclarator(globalDeclRef.decls.decl.inits.head.decl).map(param => getBaseTypeFromSpecs(param.specifiers))
-    case functionDeclRef: RefCPPFunctionDefinition[G] =>
-      paramsFromDeclarator(functionDeclRef.decl.declarator).map(param => getBaseTypeFromSpecs(param.specifiers))
-    case functionRef: RefFunction[G] => functionRef.decl.args.map(variable => variable.t)
-    case procedureRef: RefProcedure[G] => procedureRef.decl.args.map(variable => variable.t)
-    case predicateRef: RefPredicate[G] => predicateRef.decl.args.map(variable => variable.t)
-    case instanceFunctionRef: RefInstanceFunction[G] => instanceFunctionRef.decl.args.map(variable => variable.t)
-    case instanceMethodRef: RefInstanceMethod[G] => instanceMethodRef.decl.args.map(variable => variable.t)
-    case instancePredicateRef: RefInstancePredicate[G] => instancePredicateRef.decl.args.map(variable => variable.t)
-    case aDTFunctionRef: RefADTFunction[G] => aDTFunctionRef.decl.args.map(variable => variable.t)
-    case modelProcessRef: RefModelProcess[G] => modelProcessRef.decl.args.map(variable => variable.t)
-    case modelActionRef: RefModelAction[G] => modelActionRef.decl.args.map(variable => variable.t)
-    case proverFunctionRef: RefProverFunction[G] => proverFunctionRef.decl.args.map(variable => variable.t)
-    case _ => Seq()
-  }
+  def getParamTypes[G](ref: CPPInvocationTarget[G]): Seq[Type[G]] =
+    ref match {
+      case globalDeclRef: RefCPPGlobalDeclaration[G]
+          if globalDeclRef.decls.decl.inits.size == 1 =>
+        paramsFromDeclarator(globalDeclRef.decls.decl.inits.head.decl)
+          .map(param => getBaseTypeFromSpecs(param.specifiers))
+      case functionDeclRef: RefCPPFunctionDefinition[G] =>
+        paramsFromDeclarator(functionDeclRef.decl.declarator)
+          .map(param => getBaseTypeFromSpecs(param.specifiers))
+      case functionRef: RefFunction[G] =>
+        functionRef.decl.args.map(variable => variable.t)
+      case procedureRef: RefProcedure[G] =>
+        procedureRef.decl.args.map(variable => variable.t)
+      case predicateRef: RefPredicate[G] =>
+        predicateRef.decl.args.map(variable => variable.t)
+      case instanceFunctionRef: RefInstanceFunction[G] =>
+        instanceFunctionRef.decl.args.map(variable => variable.t)
+      case instanceMethodRef: RefInstanceMethod[G] =>
+        instanceMethodRef.decl.args.map(variable => variable.t)
+      case instancePredicateRef: RefInstancePredicate[G] =>
+        instancePredicateRef.decl.args.map(variable => variable.t)
+      case aDTFunctionRef: RefADTFunction[G] =>
+        aDTFunctionRef.decl.args.map(variable => variable.t)
+      case modelProcessRef: RefModelProcess[G] =>
+        modelProcessRef.decl.args.map(variable => variable.t)
+      case modelActionRef: RefModelAction[G] =>
+        modelActionRef.decl.args.map(variable => variable.t)
+      case proverFunctionRef: RefProverFunction[G] =>
+        proverFunctionRef.decl.args.map(variable => variable.t)
+      case _ => Seq()
+    }
 
-  def resolveInvocation[G](applicable: Expr[G], args: Seq[Expr[G]], ctx: ReferenceResolutionContext[G]): CPPInvocationTarget[G] =
+  def resolveInvocation[G](
+      applicable: Expr[G],
+      args: Seq[Expr[G]],
+      ctx: ReferenceResolutionContext[G],
+  ): CPPInvocationTarget[G] =
     applicable.t match {
-      case t: TNotAValue[G] => (t.decl.get, applicable) match {
-        // Do not check arguments for BuiltinInstanceMethods as we do not know the argument types
-        case (target: BuiltinInstanceMethod[G], _) => target
-        // Resolve the SYCL constructor
-        case (RefSYCLConstructorDefinition(typ), CPPLocal(_, genericArgs)) => typ.findConstructor(genericArgs, args) match {
-          case Some(constructorRef) => constructorRef
-          case None => throw NotApplicable(applicable)
+      case t: TNotAValue[G] =>
+        (t.decl.get, applicable) match {
+          // Do not check arguments for BuiltinInstanceMethods as we do not know the argument types
+          case (target: BuiltinInstanceMethod[G], _) => target
+          // Resolve the SYCL constructor
+          case (RefSYCLConstructorDefinition(typ), CPPLocal(_, genericArgs)) =>
+            typ.findConstructor(genericArgs, args) match {
+              case Some(constructorRef) => constructorRef
+              case None => throw NotApplicable(applicable)
+            }
+          // The previously found method is already the correct one
+          case (target: CPPInvocationTarget[G], _)
+              if Util.compatTypes(args, getParamTypes(target)) =>
+            target
+          case (_, local @ CPPLocal(name, genericArgs)) =>
+            // Currently linked method does not have correct params
+            // So find all declarations with correct name and see if there is
+            // an alternative whose parameters do match the arguments
+            val allDecls = findCPPName(name, ctx).collect({
+              case decl: CPPInvocationTarget[G] => decl
+            })
+            val foundMatch: CPPInvocationTarget[G] =
+              findAlternativeInvocationTarget(applicable, args, allDecls)
+            local.ref = Some(foundMatch.asInstanceOf[CPPNameTarget[G]])
+            t.decl = Some(foundMatch)
+            foundMatch
+          case (_, deref @ CPPClassMethodOrFieldAccess(classInstance, name)) =>
+            // Currently linked method does not have correct params
+            // So find all declarations with correct name and see if there is
+            // an alternative whose parameters do match the arguments
+            val allDecls = findDeref(classInstance, name, ctx, deref.blame)
+              .collect({ case target: CPPInvocationTarget[G] => target })
+            val foundMatch: CPPInvocationTarget[G] =
+              findAlternativeInvocationTarget(applicable, args, allDecls)
+            deref.ref = Some(foundMatch.asInstanceOf[CPPDerefTarget[G]])
+            t.decl = Some(foundMatch)
+            foundMatch
+          case _ => throw NotApplicable(applicable)
         }
-        // The previously found method is already the correct one
-        case (target: CPPInvocationTarget[G], _) if Util.compatTypes(args, getParamTypes(target)) => target
-        case (_, local@CPPLocal(name, genericArgs)) =>
-          // Currently linked method does not have correct params
-          // So find all declarations with correct name and see if there is
-          // an alternative whose parameters do match the arguments
-          val allDecls = findCPPName(name, ctx).collect({case decl: CPPInvocationTarget[G] => decl})
-          val foundMatch: CPPInvocationTarget[G] = findAlternativeInvocationTarget(applicable, args, allDecls)
-          local.ref = Some(foundMatch.asInstanceOf[CPPNameTarget[G]])
-          t.decl = Some(foundMatch)
-          foundMatch
-        case (_, deref@CPPClassMethodOrFieldAccess(classInstance, name)) =>
-          // Currently linked method does not have correct params
-          // So find all declarations with correct name and see if there is
-          // an alternative whose parameters do match the arguments
-          val allDecls = findDeref(classInstance, name, ctx, deref.blame).collect({
-            case target: CPPInvocationTarget[G] => target
-          })
-          val foundMatch: CPPInvocationTarget[G] = findAlternativeInvocationTarget(applicable, args, allDecls)
-          deref.ref = Some(foundMatch.asInstanceOf[CPPDerefTarget[G]])
-          t.decl = Some(foundMatch)
-          foundMatch
-        case _ => throw NotApplicable(applicable)
-      }
       case _ => throw NotApplicable(applicable)
     }
 
-  private def findAlternativeInvocationTarget[G](applicable: Expr[G], args: Seq[Expr[G]], decls: Seq[CPPInvocationTarget[G]]): CPPInvocationTarget[G] = {
-    decls.find(
-      value => Util.compatTypes(args, getParamTypes(value))
-    ).getOrElse(throw NotApplicable(applicable))
+  private def findAlternativeInvocationTarget[G](
+      applicable: Expr[G],
+      args: Seq[Expr[G]],
+      decls: Seq[CPPInvocationTarget[G]],
+  ): CPPInvocationTarget[G] = {
+    decls.find(value => Util.compatTypes(args, getParamTypes(value)))
+      .getOrElse(throw NotApplicable(applicable))
   }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/resolve/lang/Java.scala b/src/col/vct/col/resolve/lang/Java.scala
index 7e66877936..b65ced5463 100644
--- a/src/col/vct/col/resolve/lang/Java.scala
+++ b/src/col/vct/col/resolve/lang/Java.scala
@@ -4,7 +4,69 @@ import com.typesafe.scalalogging.LazyLogging
 import hre.util.FuncTools
 import vct.col.ast.`type`.typeclass.TFloats
 import vct.col.ast.lang.java.JavaAnnotationEx
-import vct.col.ast.{ApplicableContract, AxiomaticDataType, BipPortType, Block, EmptyProcess, Expr, JavaAnnotation, JavaAnnotationInterface, JavaClass, JavaClassDeclaration, JavaClassOrInterface, JavaConstructor, JavaFields, JavaFinal, JavaImport, JavaInterface, JavaMethod, JavaModifier, JavaName, JavaNamedType, JavaNamespace, JavaParam, JavaStatic, JavaTClass, JavaVariableDeclaration, JavaWildcard, LiteralBag, LiteralMap, LiteralSeq, LiteralSet, Node, Null, OptNone, TAnyClass, TArray, TBag, TBool, TChar, TClass, TEnum, TFloat, TInt, TMap, TModel, TNotAValue, TNull, TOption, TPointer, TProcess, TRational, TRef, TSeq, TSet, TString, TUnion, TVoid, TZFraction, Type, UnitAccountedPredicate, Variable, Void}
+import vct.col.ast.{
+  ApplicableContract,
+  AxiomaticDataType,
+  BipPortType,
+  Block,
+  EmptyProcess,
+  Expr,
+  JavaAnnotation,
+  JavaAnnotationInterface,
+  JavaClass,
+  JavaClassDeclaration,
+  JavaClassOrInterface,
+  JavaConstructor,
+  JavaFields,
+  JavaFinal,
+  JavaImport,
+  JavaInterface,
+  JavaMethod,
+  JavaModifier,
+  JavaName,
+  JavaNamedType,
+  JavaNamespace,
+  JavaParam,
+  JavaStatic,
+  JavaTClass,
+  JavaVariableDeclaration,
+  JavaWildcard,
+  LiteralBag,
+  LiteralMap,
+  LiteralSeq,
+  LiteralSet,
+  Node,
+  Null,
+  OptNone,
+  TAnyClass,
+  TArray,
+  TBag,
+  TBool,
+  TChar,
+  TClass,
+  TEnum,
+  TFloat,
+  TInt,
+  TMap,
+  TModel,
+  TNotAValue,
+  TNull,
+  TOption,
+  TPointer,
+  TProcess,
+  TRational,
+  TRef,
+  TSeq,
+  TSet,
+  TString,
+  TUnion,
+  TVoid,
+  TZFraction,
+  Type,
+  UnitAccountedPredicate,
+  Variable,
+  Void,
+}
 import vct.col.origin._
 import vct.col.ref.Ref
 import vct.col.resolve.Resolve.{getLit, isBip}
@@ -23,15 +85,24 @@ import scala.collection.mutable
 import scala.reflect.ClassTag
 
 case object Java extends LazyLogging {
-  case class UnexpectedJreDefinition(expectedKind: String, fullyQualifiedName: Seq[String]) extends UserError {
-    override def text: String = s"Did not get a $expectedKind when resolving $fullyQualifiedName"
+  case class UnexpectedJreDefinition(
+      expectedKind: String,
+      fullyQualifiedName: Seq[String],
+  ) extends UserError {
+    override def text: String =
+      s"Did not get a $expectedKind when resolving $fullyQualifiedName"
     override def code: String = "unexpectedJreDefinition"
   }
 
   object JRESource extends Source {
-    override def positionContext(position: PositionRange): String = genericContext
-    override def inlinePositionContext(position: PositionRange, compress: Boolean): String = genericInlineContext
-    override protected def genericContext: String = "At node loaded reflectively from the JRE"
+    override def positionContext(position: PositionRange): String =
+      genericContext
+    override def inlinePositionContext(
+        position: PositionRange,
+        compress: Boolean,
+    ): String = genericInlineContext
+    override protected def genericContext: String =
+      "At node loaded reflectively from the JRE"
     override protected def genericInlineContext: String = "JRE"
     override def genericShortPosition: String = "JRE"
   }
@@ -39,30 +110,47 @@ case object Java extends LazyLogging {
   private def JavaSystemOrigin(): Origin = Origin(Seq(JRESource))
 
   private implicit val o: Origin = DiagnosticOrigin
-  def JAVA_LANG_OBJECT[G]: JavaNamedType[G] = JavaNamedType(Seq(("java", None), ("lang", None), ("Object", None)))
-  def JAVA_LANG_ANNOTATION_ANNOTATION[G]: JavaNamedType[G] = JavaNamedType(Seq(("java", None), ("lang", None), ("annotation", None), ("Annotation", None)))
-  def JAVA_LANG_STRING_TYPE[G]: JavaNamedType[G] = JavaNamedType(Seq(("java", None), ("lang", None), ("String", None)))
+  def JAVA_LANG_OBJECT[G]: JavaNamedType[G] =
+    JavaNamedType(Seq(("java", None), ("lang", None), ("Object", None)))
+  def JAVA_LANG_ANNOTATION_ANNOTATION[G]: JavaNamedType[G] =
+    JavaNamedType(Seq(
+      ("java", None),
+      ("lang", None),
+      ("annotation", None),
+      ("Annotation", None),
+    ))
+  def JAVA_LANG_STRING_TYPE[G]: JavaNamedType[G] =
+    JavaNamedType(Seq(("java", None), ("lang", None), ("String", None)))
   def JAVA_LANG_STRING_NAME[G]: JavaName[G] = JavaName(JAVA_LANG_STRING)
   def JAVA_LANG_CLASS: Seq[String] = JAVA_LANG :+ "Class"
   def JAVA_LANG_STRING: Seq[String] = JAVA_LANG :+ "String"
   def JAVA_LANG: Seq[String] = Seq("java", "lang")
 
   implicit class ModifiersHelpers[G](modifiers: Seq[JavaModifier[G]]) {
-    def all[T <: JavaModifier[G]](implicit tag: ClassTag[T]): Seq[T] = modifiers.collect { case t: T => t }
-    def first[T <: JavaModifier[G]](implicit tag: ClassTag[T]): Option[T] = modifiers.collectFirst { case t: T => t }
-    def is[T <: JavaModifier[G]](implicit tag: ClassTag[T]): Boolean = first[T].nonEmpty
-    def isNot[T <: JavaModifier[G]](implicit tag: ClassTag[T]): Boolean = first[T].isEmpty
+    def all[T <: JavaModifier[G]](implicit tag: ClassTag[T]): Seq[T] =
+      modifiers.collect { case t: T => t }
+    def first[T <: JavaModifier[G]](implicit tag: ClassTag[T]): Option[T] =
+      modifiers.collectFirst { case t: T => t }
+    def is[T <: JavaModifier[G]](implicit tag: ClassTag[T]): Boolean =
+      first[T].nonEmpty
+    def isNot[T <: JavaModifier[G]](implicit tag: ClassTag[T]): Boolean =
+      first[T].isEmpty
   }
 
-  def findLoadedJavaTypeName[G](potentialFQName: Seq[String], ctx: TypeResolutionContext[G]): Option[JavaTypeNameTarget[G]] = {
-    (ctx.stack.lastOption.getOrElse(Seq()) ++ ctx.externallyLoadedElements.flatMap(Referrable.from)).foreach {
+  def findLoadedJavaTypeName[G](
+      potentialFQName: Seq[String],
+      ctx: TypeResolutionContext[G],
+  ): Option[JavaTypeNameTarget[G]] = {
+    (ctx.stack.lastOption.getOrElse(Seq()) ++
+      ctx.externallyLoadedElements.flatMap(Referrable.from)).foreach {
       case RefJavaNamespace(ns: JavaNamespace[G]) =>
-        for(decl <- ns.declarations) {
+        for (decl <- ns.declarations) {
           Referrable.from(decl).foreach {
             case target: JavaTypeNameTarget[G] =>
-              if(ns.pkg.map(_.names).getOrElse(Nil) :+ target.name == potentialFQName) {
-                return Some(target)
-              }
+              if (
+                ns.pkg.map(_.names).getOrElse(Nil) :+ target.name ==
+                  potentialFQName
+              ) { return Some(target) }
             case _ =>
           }
         }
@@ -72,15 +160,21 @@ case object Java extends LazyLogging {
     None
   }
 
-  def findLoadedJavaTypeNamesInPackage[G](pkg: Seq[String], ctx: TypeResolutionContext[G]): Seq[JavaTypeNameTarget[G]] =
-    (ctx.stack.last ++ ctx.externallyLoadedElements.flatMap(Referrable.from)).collect {
-      case RefJavaNamespace(ns: JavaNamespace[G]) if ns.pkg.map(_.names).getOrElse(Nil) == pkg =>
-        ns.declarations.flatMap(Referrable.from(_)).collect {
-          case target: JavaTypeNameTarget[G] => target
-        }
-    }.flatten
+  def findLoadedJavaTypeNamesInPackage[G](
+      pkg: Seq[String],
+      ctx: TypeResolutionContext[G],
+  ): Seq[JavaTypeNameTarget[G]] =
+    (ctx.stack.last ++ ctx.externallyLoadedElements.flatMap(Referrable.from))
+      .collect {
+        case RefJavaNamespace(ns: JavaNamespace[G])
+            if ns.pkg.map(_.names).getOrElse(Nil) == pkg =>
+          ns.declarations.flatMap(Referrable.from(_)).collect {
+            case target: JavaTypeNameTarget[G] => target
+          }
+      }.flatten
 
-  private val currentlyLoading = mutable.Map[Seq[String], mutable.ArrayBuffer[JavaNamedType[_ <: Any]]]()
+  private val currentlyLoading = mutable
+    .Map[Seq[String], mutable.ArrayBuffer[JavaNamedType[_ <: Any]]]()
 
   def lazyType[G](t: reflect.Type, ctx: TypeResolutionContext[G]): Type[G] =
     t match {
@@ -88,7 +182,12 @@ case object Java extends LazyLogging {
         // Blatantly assume generic types are always classes applied to some type arguments
         val name = t.getRawType.asInstanceOf[Class[_]].getName
         // TODO: DiagnosticOrigin makes no sense here
-        lazyType(name, t.getActualTypeArguments.map(translateRuntimeType(_)(DiagnosticOrigin, ctx)).toIndexedSeq, ctx)
+        lazyType(
+          name,
+          t.getActualTypeArguments
+            .map(translateRuntimeType(_)(DiagnosticOrigin, ctx)).toIndexedSeq,
+          ctx,
+        )
       case t: java.lang.Class[_] =>
         val name = t.getName
         lazyType(name, Seq(), ctx)
@@ -98,29 +197,47 @@ case object Java extends LazyLogging {
         throw Unreachable(???)
     }
 
-  def lazyType[G](name: String, typeArgs: Seq[Type[G]], ctx: TypeResolutionContext[G]): Type[G] =
-    lazyType(name.split('.').toIndexedSeq, typeArgs, ctx)
-
-  def lazyType[G](name: Seq[String], typeArgs: Seq[Type[G]], ctx: TypeResolutionContext[G]): Type[G] = {
-    val result = JavaNamedType[G](name.init.map((_, None)) :+ (name.last, Some(typeArgs)))
+  def lazyType[G](
+      name: String,
+      typeArgs: Seq[Type[G]],
+      ctx: TypeResolutionContext[G],
+  ): Type[G] = lazyType(name.split('.').toIndexedSeq, typeArgs, ctx)
+
+  def lazyType[G](
+      name: Seq[String],
+      typeArgs: Seq[Type[G]],
+      ctx: TypeResolutionContext[G],
+  ): Type[G] = {
+    val result = JavaNamedType[G](
+      name.init.map((_, None)) :+ (name.last, Some(typeArgs))
+    )
 
     currentlyLoading.get(name) match {
       case Some(lazyQueue) => lazyQueue += result
-      case None => result.ref = Some(findJavaTypeName(name, ctx).getOrElse(
-        throw Unreachable(s"Invalid JRE: The type `${name.mkString(".")}` built in to the JRE could not be loaded.")))
+      case None =>
+        result.ref = Some(findJavaTypeName(name, ctx).getOrElse(
+          throw Unreachable(
+            s"Invalid JRE: The type `${name.mkString(".")}` built in to the JRE could not be loaded."
+          )
+        ))
     }
 
     result
   }
 
-  def findRuntimeJavaType[G](potentialFQName: Seq[String], ctx: TypeResolutionContext[G]): Option[JavaClassOrInterface[G]] = {
-    if(currentlyLoading.contains(potentialFQName))
+  def findRuntimeJavaType[G](
+      potentialFQName: Seq[String],
+      ctx: TypeResolutionContext[G],
+  ): Option[JavaClassOrInterface[G]] = {
+    if (currentlyLoading.contains(potentialFQName))
       throw Unreachable("Aborting cyclic loading of classes from Java runtime")
 
     implicit val o: Origin = JavaSystemOrigin()
     currentlyLoading(potentialFQName) = mutable.ArrayBuffer()
 
-    logger.warn(s"Attempting to load a shim of ${potentialFQName.mkString(".")} via reflection.")
+    logger.warn(
+      s"Attempting to load a shim of ${potentialFQName.mkString(".")} via reflection."
+    )
 
     try {
       val classLoader = this.getClass.getClassLoader
@@ -128,13 +245,21 @@ case object Java extends LazyLogging {
 
       val colClass = translateRuntimeClass(cls)(o, ctx)
 
-      ctx.externallyLoadedElements += new JavaNamespace(Some(JavaName(potentialFQName.init)), Nil, Seq(colClass))
+      ctx.externallyLoadedElements += new JavaNamespace(
+        Some(JavaName(potentialFQName.init)),
+        Nil,
+        Seq(colClass),
+      )
 
-      for(t <- currentlyLoading.remove(potentialFQName).get) {
-        ((t : JavaNamedType[_]).unsafeTransmuteGeneration[JavaNamedType, G] : JavaNamedType[G]).ref = Some(RefJavaClass(colClass))
+      for (t <- currentlyLoading.remove(potentialFQName).get) {
+        ((t: JavaNamedType[_])
+          .unsafeTransmuteGeneration[JavaNamedType, G]: JavaNamedType[G]).ref =
+          Some(RefJavaClass(colClass))
       }
 
-      logger.warn(s"No specification was found for class ${potentialFQName.mkString(".")}, so a shim was loaded from the JRE.")
+      logger.warn(
+        s"No specification was found for class ${potentialFQName.mkString(".")}, so a shim was loaded from the JRE."
+      )
 
       Some(colClass)
     } catch {
@@ -144,40 +269,63 @@ case object Java extends LazyLogging {
     }
   }
 
-  def findRuntimeJavaTypesInPackage[G](pkg: Seq[String], ctx: TypeResolutionContext[G]): Seq[JavaClassOrInterface[G]] = {
+  def findRuntimeJavaTypesInPackage[G](
+      pkg: Seq[String],
+      ctx: TypeResolutionContext[G],
+  ): Seq[JavaClassOrInterface[G]] = {
     // TODO...
     Nil
   }
 
-  def translateRuntimeType[G](t: reflect.Type)(implicit o: Origin, ctx: TypeResolutionContext[G]): Type[G] = t match {
-    case java.lang.Boolean.TYPE => TBool()
-    case java.lang.Character.TYPE => TChar()
-    case java.lang.Byte.TYPE => TInt()
-    case java.lang.Short.TYPE => TInt()
-    case java.lang.Integer.TYPE => TInt()
-    case java.lang.Long.TYPE => TInt()
-    case java.lang.Float.TYPE => float
-    case java.lang.Double.TYPE => double
-    case java.lang.Void.TYPE => TVoid()
-    case arr: reflect.GenericArrayType => TArray(translateRuntimeType(arr.getGenericComponentType))
-    case t: reflect.WildcardType => JavaWildcard()
-    case t: reflect.Type => lazyType(t, ctx)
-  }
+  def translateRuntimeType[G](
+      t: reflect.Type
+  )(implicit o: Origin, ctx: TypeResolutionContext[G]): Type[G] =
+    t match {
+      case java.lang.Boolean.TYPE => TBool()
+      case java.lang.Character.TYPE => TChar()
+      case java.lang.Byte.TYPE => TInt()
+      case java.lang.Short.TYPE => TInt()
+      case java.lang.Integer.TYPE => TInt()
+      case java.lang.Long.TYPE => TInt()
+      case java.lang.Float.TYPE => float
+      case java.lang.Double.TYPE => double
+      case java.lang.Void.TYPE => TVoid()
+      case arr: reflect.GenericArrayType =>
+        TArray(translateRuntimeType(arr.getGenericComponentType))
+      case t: reflect.WildcardType => JavaWildcard()
+      case t: reflect.Type => lazyType(t, ctx)
+    }
 
-  def translateRuntimeParameter[G](param: Parameter, t: reflect.Type)(implicit o: Origin, ctx: TypeResolutionContext[G]): JavaParam[G] = {
-    new JavaParam(Seq(), param.getName, translateRuntimeType(t))(o.where(name = param.getName))
+  def translateRuntimeParameter[G](
+      param: Parameter,
+      t: reflect.Type,
+  )(implicit o: Origin, ctx: TypeResolutionContext[G]): JavaParam[G] = {
+    new JavaParam(Seq(), param.getName, translateRuntimeType(t))(
+      o.where(name = param.getName)
+    )
   }
 
-  def translateTypeParameter[G](param: TypeVariable[_])(implicit o: Origin, ctx: TypeResolutionContext[G]): Variable[G] = {
+  def translateTypeParameter[G](
+      param: TypeVariable[_]
+  )(implicit o: Origin, ctx: TypeResolutionContext[G]): Variable[G] = {
     // Guess that bound 0 is the one we want
-    val bound = param.getBounds()(0) match {
-      case cls: Class[_] => JavaTClass(translateRuntimeClass(cls).ref[JavaClassOrInterface[G]], Seq()) // Pretty sure the seq is not always empty here
-      case typeVar: TypeVariable[_] => ??? // We need some extra state here to find where this type var comes from
-    }
+    val bound =
+      param.getBounds()(0) match {
+        case cls: Class[_] =>
+          JavaTClass(
+            translateRuntimeClass(cls).ref[JavaClassOrInterface[G]],
+            Seq(),
+          ) // Pretty sure the seq is not always empty here
+        case typeVar: TypeVariable[_] =>
+          ??? // We need some extra state here to find where this type var comes from
+      }
     new Variable(bound)(o.where(name = param.getName))
   }
 
-  def translateRuntimeClass[G](cls: Class[_])(implicit o: Origin, ctx: TypeResolutionContext[G]): JavaClassOrInterface[G] = {
+  def translateRuntimeClass[G](cls: Class[_])(
+      implicit o: Origin,
+      ctx: TypeResolutionContext[G],
+  ): JavaClassOrInterface[G] = {
     val cons = cls.getConstructors.map(cons => {
       new JavaConstructor(
         modifiers = Nil,
@@ -185,58 +333,94 @@ case object Java extends LazyLogging {
         parameters = {
           val params = cons.getParameters.toIndexedSeq
           val types = cons.getGenericParameterTypes.toIndexedSeq
-          params.zip(types).map { case (p, t) => translateRuntimeParameter[G](p, t) }
+          params.zip(types).map { case (p, t) =>
+            translateRuntimeParameter[G](p, t)
+          }
         },
         typeParameters = Nil,
         signals = Nil,
         body = Block(Nil),
-        contract = ApplicableContract(UnitAccountedPredicate(tt), UnitAccountedPredicate(tt), tt, Nil, Nil, Nil, None)(TrueSatisfiable),
+        contract =
+          ApplicableContract(
+            UnitAccountedPredicate(tt),
+            UnitAccountedPredicate(tt),
+            tt,
+            Nil,
+            Nil,
+            Nil,
+            None,
+          )(TrueSatisfiable),
       )(o.where(name = cls.getSimpleName))
     })
 
     val methods = cls.getMethods.map(method => {
       new JavaMethod(
-        modifiers = if((method.getModifiers & Modifier.STATIC) != 0) Seq(JavaStatic[G]()) else Nil,
+        modifiers =
+          if ((method.getModifiers & Modifier.STATIC) != 0)
+            Seq(JavaStatic[G]())
+          else
+            Nil,
         returnType = translateRuntimeType(method.getGenericReturnType),
         dims = 0,
         name = method.getName,
         parameters = {
           val params = method.getParameters.toIndexedSeq
           val types = method.getGenericParameterTypes.toIndexedSeq
-          params.zip(types).map { case (p, t) => translateRuntimeParameter[G](p, t) }
+          params.zip(types).map { case (p, t) =>
+            translateRuntimeParameter[G](p, t)
+          }
         },
         typeParameters = Nil,
         signals = Nil,
         body = None,
-        contract = ApplicableContract(UnitAccountedPredicate(tt), UnitAccountedPredicate(tt), tt, Nil, Nil, Nil, None)(TrueSatisfiable),
+        contract =
+          ApplicableContract(
+            UnitAccountedPredicate(tt),
+            UnitAccountedPredicate(tt),
+            tt,
+            Nil,
+            Nil,
+            Nil,
+            None,
+          )(TrueSatisfiable),
       )(AbstractApplicable)(o.where(name = method.getName))
     })
 
     val fields = cls.getFields.map(field => {
       new JavaFields(
         modifiers =
-          (if((field.getModifiers & Modifier.STATIC) != 0) Seq(JavaStatic[G]()) else Nil) ++
-            (if((field.getModifiers & Modifier.FINAL) != 0) Seq(JavaFinal[G]()) else Nil),
+          (if ((field.getModifiers & Modifier.STATIC) != 0)
+             Seq(JavaStatic[G]())
+           else
+             Nil) ++
+            (if ((field.getModifiers & Modifier.FINAL) != 0)
+               Seq(JavaFinal[G]())
+             else
+               Nil),
         t = translateRuntimeType(field.getType),
         decls = Seq(JavaVariableDeclaration[G](field.getName, 0, None)),
       )
     })
 
-    val typeParameters = cls.getTypeParameters.map(translateTypeParameter(_)(o, ctx))
+    val typeParameters = cls.getTypeParameters
+      .map(translateTypeParameter(_)(o, ctx))
 
-    if(cls.isAnnotation) {
+    if (cls.isAnnotation) {
       new JavaAnnotationInterface[G](
         name = cls.getName.split('.').last,
         modifiers = Nil,
-        ext = cls.getGenericInterfaces.toIndexedSeq.map(cls => lazyType(cls, ctx))(0),
+        ext =
+          cls.getGenericInterfaces.toIndexedSeq
+            .map(cls => lazyType(cls, ctx))(0),
         decls = fields.toIndexedSeq ++ cons.toIndexedSeq ++ methods.toIndexedSeq,
       )(o.where(name = cls.getName.split('.').last))
-    } else if(cls.isInterface) {
+    } else if (cls.isInterface) {
       new JavaInterface[G](
         name = cls.getName.split('.').last,
         modifiers = Nil,
         typeParams = typeParameters,
-        ext = cls.getGenericInterfaces.toIndexedSeq.map(cls => lazyType(cls, ctx)),
+        ext = cls.getGenericInterfaces.toIndexedSeq
+          .map(cls => lazyType(cls, ctx)),
         decls = fields.toIndexedSeq ++ cons.toIndexedSeq ++ methods.toIndexedSeq,
       )(o.where(name = cls.getName.split('.').last))
     } else {
@@ -245,120 +429,172 @@ case object Java extends LazyLogging {
         modifiers = Nil,
         typeParams = typeParameters,
         intrinsicLockInvariant = `tt`,
-        ext = Option(cls.getGenericSuperclass).map(cls => lazyType(cls, ctx)).getOrElse(JAVA_LANG_OBJECT),
-        imp = cls.getGenericInterfaces.toIndexedSeq.map(cls => lazyType(cls, ctx)),
+        ext = Option(cls.getGenericSuperclass).map(cls => lazyType(cls, ctx))
+          .getOrElse(JAVA_LANG_OBJECT),
+        imp = cls.getGenericInterfaces.toIndexedSeq
+          .map(cls => lazyType(cls, ctx)),
         decls = fields.toIndexedSeq ++ cons.toIndexedSeq ++ methods.toIndexedSeq,
       )(o.where(name = cls.getName.split('.').last))
     }
   }
 
-  /**
-   * Attempt to find a class by its fully qualified name.
-   * @param name Fully qualified name of the class
-   * @param ctx Queried for the external class loader, and the source class paths
-   */
-  def findLibraryJavaType[G](name: Seq[String], ctx: TypeResolutionContext[G]): Option[JavaTypeNameTarget[G]] =
+  /** Attempt to find a class by its fully qualified name.
+    * @param name
+    *   Fully qualified name of the class
+    * @param ctx
+    *   Queried for the external class loader, and the source class paths
+    */
+  def findLibraryJavaType[G](
+      name: Seq[String],
+      ctx: TypeResolutionContext[G],
+  ): Option[JavaTypeNameTarget[G]] =
     ctx.externalJavaLoader.flatMap { loader =>
-      FuncTools.firstOption(ctx.javaClassPath, (classPath: ResolveTypes.JavaClassPathEntry) => {
-        // We have an external class loader and a class path.
-        val maybeBasePath: Option[Path] = classPath match {
-          case JavaClassPathEntry.SourcePackageRoot =>
-            // Try to derive the base path, by the path of the current source file and the package.
-            // E.g. /root/pkg/a/Cls.java declaring package pkg.a; -> /root
-            for {
-              ns <- ctx.namespace
-              readableOrigin <- ns.o.find[ReadableOrigin]
-              readable <- Some(readableOrigin.readable)
-              file <- readable.underlyingPath
-              baseFile <- ns.pkg.getOrElse(JavaName(Nil)).names.foldRight[Option[Path]](Option(file.getParent)) {
-                case (name, Some(file)) if file.getFileName.toString == name => Option(file.getParent)
-                case _ => None
-              }
-            } yield baseFile
-          case JavaClassPathEntry.Path(root) => Some(root)
-        }
-
-        for {
-          basePath <- maybeBasePath
-          ns <- loader.load[G](basePath, name)
-          cls <- ns.declarations.flatMap(Referrable.from).collectFirst {
-            case ref: JavaTypeNameTarget[G] if ref.name == name.last =>
-              ctx.externallyLoadedElements += ns
-              ResolveTypes.resolve(ns, ctx)
-              ref
-          }
-        } yield cls
-      })
+      FuncTools.firstOption(
+        ctx.javaClassPath,
+        (classPath: ResolveTypes.JavaClassPathEntry) => {
+          // We have an external class loader and a class path.
+          val maybeBasePath: Option[Path] =
+            classPath match {
+              case JavaClassPathEntry.SourcePackageRoot =>
+                // Try to derive the base path, by the path of the current source file and the package.
+                // E.g. /root/pkg/a/Cls.java declaring package pkg.a; -> /root
+                for {
+                  ns <- ctx.namespace
+                  readableOrigin <- ns.o.find[ReadableOrigin]
+                  readable <- Some(readableOrigin.readable)
+                  file <- readable.underlyingPath
+                  baseFile <-
+                    ns.pkg.getOrElse(JavaName(Nil)).names
+                      .foldRight[Option[Path]](Option(file.getParent)) {
+                        case (name, Some(file))
+                            if file.getFileName.toString == name =>
+                          Option(file.getParent)
+                        case _ => None
+                      }
+                } yield baseFile
+              case JavaClassPathEntry.Path(root) => Some(root)
+            }
+
+          for {
+            basePath <- maybeBasePath
+            ns <- loader.load[G](basePath, name)
+            cls <- ns.declarations.flatMap(Referrable.from).collectFirst {
+              case ref: JavaTypeNameTarget[G] if ref.name == name.last =>
+                ctx.externallyLoadedElements += ns
+                ResolveTypes.resolve(ns, ctx)
+                ref
+            }
+          } yield cls
+        },
+      )
     }
 
-  def findJavaTypeName[G](names: Seq[String], ctx: TypeResolutionContext[G]): Option[JavaTypeNameTarget[G]] = {
-    val potentialFQNames: Seq[Seq[String]] = names match {
-      case Seq(singleName) =>
-        val inThisPackage = ctx.namespace match {
-          case Some(ns) => ns.pkg match {
-            case Some(pkg) => pkg.names :+ singleName
-            case None => Seq(singleName)
-          }
-          case None => Nil
-        }
-        val fromImport = ctx.namespace match {
-          case Some(ns) => ns.imports.collect {
-            case JavaImport(false, name, /*star = */ true) => name.names :+ singleName
-            case JavaImport(false, name, /*star = */ false) if name.names.last == singleName => name.names
-          }
-          case None => Nil
-        }
-        val fromPredef = Seq("java", "lang", singleName)
-        fromImport :+ inThisPackage :+ fromPredef
-      case moreNames => Seq(moreNames)
-    }
+  def findJavaTypeName[G](
+      names: Seq[String],
+      ctx: TypeResolutionContext[G],
+  ): Option[JavaTypeNameTarget[G]] = {
+    val potentialFQNames: Seq[Seq[String]] =
+      names match {
+        case Seq(singleName) =>
+          val inThisPackage =
+            ctx.namespace match {
+              case Some(ns) =>
+                ns.pkg match {
+                  case Some(pkg) => pkg.names :+ singleName
+                  case None => Seq(singleName)
+                }
+              case None => Nil
+            }
+          val fromImport =
+            ctx.namespace match {
+              case Some(ns) =>
+                ns.imports.collect {
+                  case JavaImport(false, name, /*star = */ true) =>
+                    name.names :+ singleName
+                  case JavaImport(false, name, /*star = */ false)
+                      if name.names.last == singleName =>
+                    name.names
+                }
+              case None => Nil
+            }
+          val fromPredef = Seq("java", "lang", singleName)
+          fromImport :+ inThisPackage :+ fromPredef
+        case moreNames => Seq(moreNames)
+      }
 
     FuncTools.firstOption(potentialFQNames, findJavaTypeInStack[G](_, ctx))
-      .orElse(FuncTools.firstOption(potentialFQNames, findLoadedJavaTypeName[G](_, ctx)))
-      .orElse(FuncTools.firstOption(potentialFQNames, findLibraryJavaType[G](_, ctx)))
-      .orElse(FuncTools.firstOption(potentialFQNames, findRuntimeJavaType[G](_, ctx)).map(RefJavaClass[G]))
+      .orElse(FuncTools.firstOption(
+        potentialFQNames,
+        findLoadedJavaTypeName[G](_, ctx),
+      )).orElse(FuncTools.firstOption(
+        potentialFQNames,
+        findLibraryJavaType[G](_, ctx),
+      )).orElse(
+        FuncTools.firstOption(potentialFQNames, findRuntimeJavaType[G](_, ctx))
+          .map(RefJavaClass[G])
+      )
   }
 
-
-  def findJavaTypeInStack[G](name: Seq[String], ctx: TypeResolutionContext[G]): Option[JavaTypeNameTarget[G]] = {
-      ctx.stack.flatten.collectFirst{
-        case ref: JavaTypeNameTarget[G] if Seq(ref.name) == name => ref
-      }
+  def findJavaTypeInStack[G](
+      name: Seq[String],
+      ctx: TypeResolutionContext[G],
+  ): Option[JavaTypeNameTarget[G]] = {
+    ctx.stack.flatten.collectFirst {
+      case ref: JavaTypeNameTarget[G] if Seq(ref.name) == name => ref
+    }
   }
 
-  def allowedFromStaticContext[G](target: JavaNameTarget[G]): Boolean = target match {
-    case RefAxiomaticDataType(_) => true
-    case RefClass(_) => true // PB: except maybe in non-static inner classes?
-    case RefEnum(_) => true
-    case RefEnumConstant(_, _) => true
-    case RefJavaClass(decl) => true
-    case RefUnloadedJavaNamespace(names) => true
-
-    case RefJavaField(decls, _) => decls.modifiers.is[JavaStatic[G]]
-    case RefModelField(_) => false
-    case RefJavaBipGuard(_) => false
-
-    case RefVariable(_) => true
-    case RefJavaLocalDeclaration(_, _) => true
-    case RefJavaParam(_) => true
-  }
+  def allowedFromStaticContext[G](target: JavaNameTarget[G]): Boolean =
+    target match {
+      case RefAxiomaticDataType(_) => true
+      case RefClass(_) => true // PB: except maybe in non-static inner classes?
+      case RefEnum(_) => true
+      case RefEnumConstant(_, _) => true
+      case RefJavaClass(decl) => true
+      case RefUnloadedJavaNamespace(names) => true
+
+      case RefJavaField(decls, _) => decls.modifiers.is[JavaStatic[G]]
+      case RefModelField(_) => false
+      case RefJavaBipGuard(_) => false
+
+      case RefVariable(_) => true
+      case RefJavaLocalDeclaration(_, _) => true
+      case RefJavaParam(_) => true
+    }
 
-  def findJavaName[G](name: String, fromStaticContext: Boolean, ctx: TypeResolutionContext[G]): Option[JavaNameTarget[G]] = {
+  def findJavaName[G](
+      name: String,
+      fromStaticContext: Boolean,
+      ctx: TypeResolutionContext[G],
+  ): Option[JavaNameTarget[G]] = {
     ctx.stack.flatten.collectFirst {
-      case target: JavaNameTarget[G] if target.name == name && (!fromStaticContext || allowedFromStaticContext(target)) => target
+      case target: JavaNameTarget[G]
+          if target.name == name &&
+            (!fromStaticContext || allowedFromStaticContext(target)) =>
+        target
     }.orElse(ctx.namespace.flatMap(ns => {
       // PB: I optionified this, but not entirely sure what the intention is here.
-      def classOrEnum(target: JavaTypeNameTarget[G]): Option[JavaNameTarget[G]] = target match {
-        case r @ RefJavaClass(_) => Some(r)
-        case r @ RefEnum(_) => Some(r)
-        case _ => None
-      }
-      val potentialRefs: Seq[JavaNameTarget[G]] = ns.imports.collect {
-        case JavaImport(/* static = */ false, JavaName(fqn), /* star = */ false) if fqn.last == name =>
-          findJavaTypeName(fqn, ctx).flatMap(classOrEnum)
-        case JavaImport(/* static = */ false, JavaName(pkg), /* star = */ true) =>
-          findJavaTypeName(pkg :+ name, ctx).flatMap(classOrEnum)
-      }.flatten
+      def classOrEnum(
+          target: JavaTypeNameTarget[G]
+      ): Option[JavaNameTarget[G]] =
+        target match {
+          case r @ RefJavaClass(_) => Some(r)
+          case r @ RefEnum(_) => Some(r)
+          case _ => None
+        }
+      val potentialRefs: Seq[JavaNameTarget[G]] =
+        ns.imports.collect {
+          case JavaImport(
+                /* static = */ false,
+                JavaName(fqn), /* star = */ false,
+              ) if fqn.last == name =>
+            findJavaTypeName(fqn, ctx).flatMap(classOrEnum)
+          case JavaImport(
+                /* static = */ false,
+                JavaName(pkg), /* star = */ true,
+              ) =>
+            findJavaTypeName(pkg :+ name, ctx).flatMap(classOrEnum)
+        }.flatten
 
       potentialRefs match {
         // If we find only one, or none, then that's good
@@ -369,114 +605,219 @@ case object Java extends LazyLogging {
     }))
   }
 
-  def findDeref[G](obj: Expr[G], name: String, ctx: ReferenceResolutionContext[G], blame: Blame[BuiltinError]): Option[JavaDerefTarget[G]] =
+  def findDeref[G](
+      obj: Expr[G],
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+      blame: Blame[BuiltinError],
+  ): Option[JavaDerefTarget[G]] =
     ((obj.t match {
-      case t: TNotAValue[G] => t.decl.get match {
-        case RefUnloadedJavaNamespace(pkg) =>
-          Some(findJavaTypeName(pkg :+ name, ctx.asTypeResolutionContext)
-            .getOrElse(RefUnloadedJavaNamespace(pkg :+ name)))
-        case RefJavaClass(decl) =>
-          decl.decls.flatMap(Referrable.from).collectFirst {
-            case ref @ RefJavaField(decls, idx) if ref.name == name && ref.decls.modifiers.is[JavaStatic[G]] => ref
-          }
-        case RefEnum(enum) =>
-          enum.getConstant(name)
-        case _ => None
-      }
-      case TModel(Ref(model)) => model.declarations.flatMap(Referrable.from).collectFirst {
-        case ref @ RefModelField(_) if ref.name == name => ref
-      }
-      case JavaTClass(Ref(cls), _) => cls.decls.flatMap(Referrable.from).collectFirst {
-        case ref @ RefJavaField(_, _) if ref.name == name && !ref.decls.modifiers.is[JavaStatic[G]] => ref
-      }
+      case t: TNotAValue[G] =>
+        t.decl.get match {
+          case RefUnloadedJavaNamespace(pkg) =>
+            Some(
+              findJavaTypeName(pkg :+ name, ctx.asTypeResolutionContext)
+                .getOrElse(RefUnloadedJavaNamespace(pkg :+ name))
+            )
+          case RefJavaClass(decl) =>
+            decl.decls.flatMap(Referrable.from).collectFirst {
+              case ref @ RefJavaField(decls, idx)
+                  if ref.name == name &&
+                    ref.decls.modifiers.is[JavaStatic[G]] =>
+                ref
+            }
+          case RefEnum(enum) => enum.getConstant(name)
+          case _ => None
+        }
+      case TModel(Ref(model)) =>
+        model.declarations.flatMap(Referrable.from).collectFirst {
+          case ref @ RefModelField(_) if ref.name == name => ref
+        }
+      case JavaTClass(Ref(cls), _) =>
+        cls.decls.flatMap(Referrable.from).collectFirst {
+          case ref @ RefJavaField(_, _)
+              if ref.name == name && !ref.decls.modifiers.is[JavaStatic[G]] =>
+            ref
+        }
       case _ => None
-    }) : Option[JavaDerefTarget[G]]).orElse[JavaDerefTarget[G]](Spec.builtinField(obj, name, blame))
-
-  def findMethodInClass[G](cls: JavaClassOrInterface[G], fromStaticContext: Boolean, method: String, args: Seq[Expr[G]]): Option[JavaInvocationTarget[G]] =
+    }): Option[JavaDerefTarget[G]])
+      .orElse[JavaDerefTarget[G]](Spec.builtinField(obj, name, blame))
+
+  def findMethodInClass[G](
+      cls: JavaClassOrInterface[G],
+      fromStaticContext: Boolean,
+      method: String,
+      args: Seq[Expr[G]],
+  ): Option[JavaInvocationTarget[G]] =
     cls.decls.flatMap(Referrable.from).collectFirst {
-      case ref: RefJavaMethod[G] if ref.name == method && Util.compatJavaParams(args, ref.decl.parameters) && (!fromStaticContext || ref.decl.modifiers.is[JavaStatic[G]]) => ref
-      case ref: RefJavaAnnotationMethod[G] if ref.name == method && args.isEmpty && !fromStaticContext => ref
-      case ref: RefInstanceFunction[G] if ref.name == method && Util.compat(args, ref.decl.args) && !fromStaticContext => ref
-      case ref: RefInstanceMethod[G] if ref.name == method && Util.compat(args, ref.decl.args) && !fromStaticContext => ref
-      case ref: RefInstancePredicate[G] if ref.name == method && Util.compat(args, ref.decl.args) && !fromStaticContext => ref
+      case ref: RefJavaMethod[G]
+          if ref.name == method &&
+            Util.compatJavaParams(args, ref.decl.parameters) &&
+            (!fromStaticContext || ref.decl.modifiers.is[JavaStatic[G]]) =>
+        ref
+      case ref: RefJavaAnnotationMethod[G]
+          if ref.name == method && args.isEmpty && !fromStaticContext =>
+        ref
+      case ref: RefInstanceFunction[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) &&
+            !fromStaticContext =>
+        ref
+      case ref: RefInstanceMethod[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) &&
+            !fromStaticContext =>
+        ref
+      case ref: RefInstancePredicate[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) &&
+            !fromStaticContext =>
+        ref
     }
 
   @tailrec
-  final def findMethodOnType[G](ctx: ReferenceResolutionContext[G], t: Type[G], method: String, args: Seq[Expr[G]]): Option[JavaInvocationTarget[G]] =
+  final def findMethodOnType[G](
+      ctx: ReferenceResolutionContext[G],
+      t: Type[G],
+      method: String,
+      args: Seq[Expr[G]],
+  ): Option[JavaInvocationTarget[G]] =
     t match {
-      case TModel(ref) => ref.decl.declarations.flatMap(Referrable.from).collectFirst {
-        case ref: RefModelAction[G] if ref.name == method => ref
-        case ref: RefModelProcess[G] if ref.name == method => ref
-      }
-      case JavaTClass(Ref(cls), Nil) => findMethodInClass(cls, fromStaticContext = false, method, args)
-      case TUnion(ts) => findMethodOnType(ctx, Types.leastCommonSuperType(ts), method, args)
-      case TNotAValue(RefJavaClass(cls: JavaClassOrInterface[G @unchecked])) => findMethodInClass[G](cls, fromStaticContext = true, method, args)
-      case TNotAValue(RefAxiomaticDataType(adt: AxiomaticDataType[G @unchecked])) => adt.decls.flatMap(Referrable.from).collectFirst {
-        case ref: RefADTFunction[G] if ref.name == method && Util.compat(args, ref.decl.args) => ref
-      }
+      case TModel(ref) =>
+        ref.decl.declarations.flatMap(Referrable.from).collectFirst {
+          case ref: RefModelAction[G] if ref.name == method => ref
+          case ref: RefModelProcess[G] if ref.name == method => ref
+        }
+      case JavaTClass(Ref(cls), Nil) =>
+        findMethodInClass(cls, fromStaticContext = false, method, args)
+      case TUnion(ts) =>
+        findMethodOnType(ctx, Types.leastCommonSuperType(ts), method, args)
+      case TNotAValue(RefJavaClass(cls: JavaClassOrInterface[G @unchecked])) =>
+        findMethodInClass[G](cls, fromStaticContext = true, method, args)
+      case TNotAValue(
+            RefAxiomaticDataType(adt: AxiomaticDataType[G @unchecked])
+          ) =>
+        adt.decls.flatMap(Referrable.from).collectFirst {
+          case ref: RefADTFunction[G]
+              if ref.name == method && Util.compat(args, ref.decl.args) =>
+            ref
+        }
       case _ => None
     }
 
-  def findMethod[G](ctx: ReferenceResolutionContext[G], obj: Expr[G], method: String, args: Seq[Expr[G]], blame: Blame[BuiltinError]): Option[JavaInvocationTarget[G]] =
-    findMethodOnType(ctx, obj.t, method, args).orElse(Spec.builtinInstanceMethod(obj, method, blame))
-
-  def matchesStatic(ctx: ReferenceResolutionContext[_], modifiers: Seq[JavaModifier[_]]): Boolean =
-    !ctx.inStaticJavaContext || modifiers.collectFirst { case _: JavaStatic[_] => () }.nonEmpty
-
-  def findMethod[G](ctx: ReferenceResolutionContext[G], method: String, args: Seq[Expr[G]]): Option[JavaInvocationTarget[G]] = {
-    val selectMatchingSignature: PartialFunction[Referrable[G], JavaInvocationTarget[G]] = {
-      case ref: RefJavaMethod[G] if ref.name == method && Util.compatJavaParams(args, ref.decl.parameters) && matchesStatic(ctx, ref.decl.modifiers) => ref
-      case ref: RefInstanceFunction[G] if ref.name == method && Util.compat(args, ref.decl.args) && !ctx.inStaticJavaContext => ref
-      case ref: RefInstanceMethod[G] if ref.name == method && Util.compat(args, ref.decl.args) && !ctx.inStaticJavaContext => ref
-      case ref: RefInstancePredicate[G] if ref.name == method && Util.compat(args, ref.decl.args) && !ctx.inStaticJavaContext => ref
-      case ref: RefFunction[G] if ref.name == method && Util.compat(args, ref.decl.args) => ref
-      case ref: RefProcedure[G] if ref.name == method && Util.compat(args, ref.decl.args) => ref
-      case ref: RefPredicate[G] if ref.name == method && Util.compat(args, ref.decl.args) => ref
-      case ref: RefADTFunction[G] if ref.name == method && Util.compat(args, ref.decl.args) => ref
-      case ref: RefModelProcess[G] if ref.name == method && Util.compat(args, ref.decl.args) => ref
-      case ref: RefModelAction[G] if ref.name == method && Util.compat(args, ref.decl.args) => ref
-      case ref: RefProverFunction[G] if ref.name == method && Util.compat(args, ref.decl.args) => ref
+  def findMethod[G](
+      ctx: ReferenceResolutionContext[G],
+      obj: Expr[G],
+      method: String,
+      args: Seq[Expr[G]],
+      blame: Blame[BuiltinError],
+  ): Option[JavaInvocationTarget[G]] =
+    findMethodOnType(ctx, obj.t, method, args)
+      .orElse(Spec.builtinInstanceMethod(obj, method, blame))
+
+  def matchesStatic(
+      ctx: ReferenceResolutionContext[_],
+      modifiers: Seq[JavaModifier[_]],
+  ): Boolean =
+    !ctx.inStaticJavaContext || modifiers.collectFirst {
+      case _: JavaStatic[_] => ()
+    }.nonEmpty
+
+  def findMethod[G](
+      ctx: ReferenceResolutionContext[G],
+      method: String,
+      args: Seq[Expr[G]],
+  ): Option[JavaInvocationTarget[G]] = {
+    val selectMatchingSignature
+        : PartialFunction[Referrable[G], JavaInvocationTarget[G]] = {
+      case ref: RefJavaMethod[G]
+          if ref.name == method &&
+            Util.compatJavaParams(args, ref.decl.parameters) &&
+            matchesStatic(ctx, ref.decl.modifiers) =>
+        ref
+      case ref: RefInstanceFunction[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) &&
+            !ctx.inStaticJavaContext =>
+        ref
+      case ref: RefInstanceMethod[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) &&
+            !ctx.inStaticJavaContext =>
+        ref
+      case ref: RefInstancePredicate[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) &&
+            !ctx.inStaticJavaContext =>
+        ref
+      case ref: RefFunction[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) =>
+        ref
+      case ref: RefProcedure[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) =>
+        ref
+      case ref: RefPredicate[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) =>
+        ref
+      case ref: RefADTFunction[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) =>
+        ref
+      case ref: RefModelProcess[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) =>
+        ref
+      case ref: RefModelAction[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) =>
+        ref
+      case ref: RefProverFunction[G]
+          if ref.name == method && Util.compat(args, ref.decl.args) =>
+        ref
     }
 
-    ctx.stack.flatten.collectFirst(selectMatchingSignature).orElse(ctx.currentJavaNamespace.flatMap(ns => {
-      // First find all classes that belong to each import that we can use
-      val potentialClasses: Seq[JavaTypeNameTarget[G]] = ns.imports.collect {
-        case JavaImport(true, importName, /* star = */ false) if importName.names.last == method => importName.names.init
-        case JavaImport(true, importName, /* star = */ true) => importName.names
-      }.flatMap(findJavaTypeName(_, ctx.asTypeResolutionContext))
-
-      // From each class, get the method we are looking for
-      potentialClasses.collect({
-        case RefJavaClass(cls: JavaClass[G]) => cls.getMethods(method)
-      }).filter(_.nonEmpty) match { // Discard any classes that have no matches
-        // If we find only one set of methods, or no sets at all, then that's good.
-        // Just pick the one that matches the signature we're looking for
-        case Seq(methods) => methods.collectFirst(selectMatchingSignature)
-        case Nil => None
-        // If there where multiple classes that had matching definitions, then we error out,
-        // because untangling that is not yet supported
-        case _ => throw OverlappingJavaImports(ns, "method", method)
-      }
-    }))
+    ctx.stack.flatten.collectFirst(selectMatchingSignature)
+      .orElse(ctx.currentJavaNamespace.flatMap(ns => {
+        // First find all classes that belong to each import that we can use
+        val potentialClasses: Seq[JavaTypeNameTarget[G]] = ns.imports.collect {
+          case JavaImport(true, importName, /* star = */ false)
+              if importName.names.last == method =>
+            importName.names.init
+          case JavaImport(true, importName, /* star = */ true) =>
+            importName.names
+        }.flatMap(findJavaTypeName(_, ctx.asTypeResolutionContext))
+
+        // From each class, get the method we are looking for
+        potentialClasses.collect({ case RefJavaClass(cls: JavaClass[G]) =>
+          cls.getMethods(method)
+        }).filter(_.nonEmpty) match { // Discard any classes that have no matches
+          // If we find only one set of methods, or no sets at all, then that's good.
+          // Just pick the one that matches the signature we're looking for
+          case Seq(methods) => methods.collectFirst(selectMatchingSignature)
+          case Nil => None
+          // If there where multiple classes that had matching definitions, then we error out,
+          // because untangling that is not yet supported
+          case _ => throw OverlappingJavaImports(ns, "method", method)
+        }
+      }))
   }
 
-  def findConstructor[G](t: Type[G], args: Seq[Expr[G]]): Option[JavaConstructorTarget[G]] = t match {
-    case JavaTClass(Ref(cls: JavaClass[G]), _) =>
-      val definedConstructor = cls.decls.collectFirst {
-        case cons: JavaConstructor[G] if Util.compatJavaParams(args, cons.parameters) => RefJavaConstructor(cons)
-      }
-
-      args match {
-        case Nil => definedConstructor.orElse(Some(ImplicitDefaultJavaConstructor(cls)))
-        case _ => definedConstructor
-      }
-    case TModel(Ref(model)) if args.isEmpty =>
-      Some(RefModel(model))
-    case _ => None
-  }
+  def findConstructor[G](
+      t: Type[G],
+      args: Seq[Expr[G]],
+  ): Option[JavaConstructorTarget[G]] =
+    t match {
+      case JavaTClass(Ref(cls: JavaClass[G]), _) =>
+        val definedConstructor = cls.decls.collectFirst {
+          case cons: JavaConstructor[G]
+              if Util.compatJavaParams(args, cons.parameters) =>
+            RefJavaConstructor(cons)
+        }
 
+        args match {
+          case Nil =>
+            definedConstructor.orElse(Some(ImplicitDefaultJavaConstructor(cls)))
+          case _ => definedConstructor
+        }
+      case TModel(Ref(model)) if args.isEmpty => Some(RefModel(model))
+      case _ => None
+    }
 
-  def findJavaBipStatePredicate[G](ctx: ReferenceResolutionContext[G], state: String): JavaBipStatePredicateTarget[G] = {
+  def findJavaBipStatePredicate[G](
+      ctx: ReferenceResolutionContext[G],
+      state: String,
+  ): JavaBipStatePredicateTarget[G] = {
     val m = ctx.javaBipStatePredicates.map { case (k, v) => (getLit(k), v) }
     m.get(state) match {
       case Some(ann) => RefJavaBipStatePredicate(state, ann)
@@ -484,54 +825,70 @@ case object Java extends LazyLogging {
     }
   }
 
-  def findJavaBipGuard[G](ctx: ReferenceResolutionContext[G], name: String): Option[JavaMethod[G]] =
+  def findJavaBipGuard[G](
+      ctx: ReferenceResolutionContext[G],
+      name: String,
+  ): Option[JavaMethod[G]] =
     ctx.javaBipGuards.map { case (k, v) => (getLit(k), v) }.get(name)
 
-  def getStaticMembers[G](javaTypeName: JavaTypeNameTarget[G]): Seq[Referrable[G]] = javaTypeName match {
-    case RefJavaClass(cls) => cls.decls.collect {
-        case decl: JavaClassDeclaration[G] if decl.isStatic => Referrable.from(decl)
-      }.flatten
-    case RefEnum(enum) => enum.constants.map(RefEnumConstant(Some(enum), _))
-    case _ => Nil // PB: I guess? Maybe we should support "ghost static importing" adt functions and whatnot :)
-  }
+  def getStaticMembers[G](
+      javaTypeName: JavaTypeNameTarget[G]
+  ): Seq[Referrable[G]] =
+    javaTypeName match {
+      case RefJavaClass(cls) =>
+        cls.decls.collect {
+          case decl: JavaClassDeclaration[G] if decl.isStatic =>
+            Referrable.from(decl)
+        }.flatten
+      case RefEnum(enum) => enum.constants.map(RefEnumConstant(Some(enum), _))
+      case _ =>
+        Nil // PB: I guess? Maybe we should support "ghost static importing" adt functions and whatnot :)
+    }
 
-  def findStaticMember[G](javaTypeName: JavaTypeNameTarget[G], name: String): Option[Referrable[G]] =
-    getStaticMembers(javaTypeName).find(_.name == name)
+  def findStaticMember[G](
+      javaTypeName: JavaTypeNameTarget[G],
+      name: String,
+  ): Option[Referrable[G]] = getStaticMembers(javaTypeName).find(_.name == name)
 
   case class WrongTypeForDefaultValue(t: Type[_]) extends UserError {
     override def code: String = "wrongDefaultType"
     override def text: String =
-      t.o.messageInContext(s"The type `$t` has no defined default value in VerCors.")
+      t.o.messageInContext(
+        s"The type `$t` has no defined default value in VerCors."
+      )
   }
 
-  def zeroValue[G](t: Type[G]): Expr[G] = t match {
-    case TArray(_) => Null()
-    case TPointer(_) => Null()
-    case TSeq(element) => LiteralSeq(element, Nil)
-    case TSet(element) => LiteralSet(element, Nil)
-    case TBag(element) => LiteralBag(element, Nil)
-    case TOption(_) => OptNone()
-    case TMap(key, value) => LiteralMap(key, value, Nil)
-    case TVoid() => Void()
-    case TNull() => Null()
-    case TBool() => ff
-    case TString() => Null()
-    case TRef() => Null()
-    case TProcess() => EmptyProcess()
-    case TInt() => const(0)
-    case t: TFloat[G] => const(0)
-    case TRational() => const(0)
-    case TZFraction() => const(0)
-    case TClass(_, _) => Null()
-    case JavaTClass(_, _) => Null()
-    case TEnum(_) => Null()
-    case TAnyClass() => Null()
-
-    case t => throw WrongTypeForDefaultValue(t)
-  }
+  def zeroValue[G](t: Type[G]): Expr[G] =
+    t match {
+      case TArray(_) => Null()
+      case TPointer(_) => Null()
+      case TSeq(element) => LiteralSeq(element, Nil)
+      case TSet(element) => LiteralSet(element, Nil)
+      case TBag(element) => LiteralBag(element, Nil)
+      case TOption(_) => OptNone()
+      case TMap(key, value) => LiteralMap(key, value, Nil)
+      case TVoid() => Void()
+      case TNull() => Null()
+      case TBool() => ff
+      case TString() => Null()
+      case TRef() => Null()
+      case TProcess() => EmptyProcess()
+      case TInt() => const(0)
+      case t: TFloat[G] => const(0)
+      case TRational() => const(0)
+      case TZFraction() => const(0)
+      case TClass(_, _) => Null()
+      case JavaTClass(_, _) => Null()
+      case TEnum(_) => Null()
+      case TAnyClass() => Null()
+
+      case t => throw WrongTypeForDefaultValue(t)
+    }
 
-  def double[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] = TFloats.ieee754_64bit
-  def float[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] = TFloats.ieee754_32bit
+  def double[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] =
+    TFloats.ieee754_64bit
+  def float[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] =
+    TFloats.ieee754_32bit
 }
 
 sealed trait JavaAnnotationData[G]
@@ -539,60 +896,78 @@ case object JavaAnnotationData {
 
   case object BipTransition {
     def get[G](m: JavaMethod[G]): Seq[BipTransition[G]] =
-      m.modifiers.collect { case ja @ JavaAnnotationEx(_, _, b: BipTransition[G]) => b }
+      m.modifiers.collect {
+        case ja @ JavaAnnotationEx(_, _, b: BipTransition[G]) => b
+      }
   }
-  final case class BipTransition[G](portName: String,
-                                    source: JavaBipStatePredicateTarget[G],
-                                    target: JavaBipStatePredicateTarget[G],
-                                    guardText: Option[String], guard: Option[Expr[G]], requires: Expr[G], ensures: Expr[G]
-                                   )(implicit val o: Origin) extends JavaAnnotationData[G]
-
+  final case class BipTransition[G](
+      portName: String,
+      source: JavaBipStatePredicateTarget[G],
+      target: JavaBipStatePredicateTarget[G],
+      guardText: Option[String],
+      guard: Option[Expr[G]],
+      requires: Expr[G],
+      ensures: Expr[G],
+  )(implicit val o: Origin)
+      extends JavaAnnotationData[G]
 
   case object BipInvariant {
     def get[G](jc: JavaClassOrInterface[G]): Option[BipInvariant[G]] =
-      jc.modifiers
-        .collect { case ja @ JavaAnnotation(_, _) if ja.data.isDefined => ja.data.get }
-        .collectFirst { case bi: BipInvariant[G] => bi }
+      jc.modifiers.collect {
+        case ja @ JavaAnnotation(_, _) if ja.data.isDefined => ja.data.get
+      }.collectFirst { case bi: BipInvariant[G] => bi }
 
   }
   final case class BipInvariant[G](expr: Expr[G]) extends JavaAnnotationData[G]
 
   case object BipPort {
     def getAll[G](c: JavaClass[G]): Seq[BipPort[G]] =
-      c.modifiers.collect { case JavaAnnotationEx(_, _, bp: BipPort[G]) => bp}
+      c.modifiers.collect { case JavaAnnotationEx(_, _, bp: BipPort[G]) => bp }
   }
-  final case class BipPort[G](name: String, portType: BipPortType[G])(implicit val o: Origin) extends JavaAnnotationData[G]
+  final case class BipPort[G](name: String, portType: BipPortType[G])(
+      implicit val o: Origin
+  ) extends JavaAnnotationData[G]
 
   case object BipComponent {
     def get[G](jc: JavaClassOrInterface[G]): Option[BipComponent[G]] =
-      jc.modifiers
-        .collect { case ja @ JavaAnnotation(_, _) if ja.data.isDefined => ja.data.get }
-        .collectFirst { case bct: BipComponent[G] => bct }
+      jc.modifiers.collect {
+        case ja @ JavaAnnotation(_, _) if ja.data.isDefined => ja.data.get
+      }.collectFirst { case bct: BipComponent[G] => bct }
   }
-  final case class BipComponent[G](name: String, initial: JavaBipStatePredicateTarget[G]) extends JavaAnnotationData[G]
+  final case class BipComponent[G](
+      name: String,
+      initial: JavaBipStatePredicateTarget[G],
+  ) extends JavaAnnotationData[G]
 
   case object BipStatePredicate {
     def getAll[G](c: JavaClass[G]): Seq[BipStatePredicate[G]] =
-      c.modifiers.collect { case JavaAnnotationEx(_, _, bsp: BipStatePredicate[G]) => bsp}
+      c.modifiers.collect {
+        case JavaAnnotationEx(_, _, bsp: BipStatePredicate[G]) => bsp
+      }
   }
-  final case class BipStatePredicate[G](name: String, expr: Expr[G])(implicit val o: Origin) extends JavaAnnotationData[G]
+  final case class BipStatePredicate[G](name: String, expr: Expr[G])(
+      implicit val o: Origin
+  ) extends JavaAnnotationData[G]
 
   case object BipData {
     def get[G](node: Node[G]): Option[BipData[G]] = {
-      val modifiers = node match {
-        case p: JavaParam[G] => p.modifiers
-        case m: JavaMethod[G] => m.modifiers
-        case _ => return None
+      val modifiers =
+        node match {
+          case p: JavaParam[G] => p.modifiers
+          case m: JavaMethod[G] => m.modifiers
+          case _ => return None
+        }
+      modifiers.collectFirst { case JavaAnnotationEx(_, _, d @ BipData(_)) =>
+        d.asInstanceOf[BipData[G]]
       }
-      modifiers.collectFirst { case JavaAnnotationEx(_, _, d @ BipData(_)) => d.asInstanceOf[BipData[G]] }
     }
   }
-  final case class BipData[G](name: String)(implicit val o: Origin) extends JavaAnnotationData[G]
+  final case class BipData[G](name: String)(implicit val o: Origin)
+      extends JavaAnnotationData[G]
 
   case object BipGuard {
     def get[G](m: JavaMethod[G]): Option[JavaAnnotation[G]] =
-      m.modifiers
-        .collect { case ja @ JavaAnnotation(_, _) => (ja, ja.data) }
+      m.modifiers.collect { case ja @ JavaAnnotation(_, _) => (ja, ja.data) }
         .collectFirst { case (ja, Some(_: BipGuard[G])) => ja }
 
     def getName[G](method: JavaMethod[G]): Option[Expr[G]] =
@@ -604,7 +979,9 @@ case object JavaAnnotationData {
 
   case object BipPure {
     def isPure[G](m: JavaMethod[G]): Boolean =
-      m.modifiers.collectFirst { case ja @ JavaAnnotationEx(_, _, BipPure()) => ja }.isDefined
+      m.modifiers.collectFirst { case ja @ JavaAnnotationEx(_, _, BipPure()) =>
+        ja
+      }.isDefined
   }
   final case class BipPure[G]() extends JavaAnnotationData[G]
 }
diff --git a/src/col/vct/col/resolve/lang/LLVM.scala b/src/col/vct/col/resolve/lang/LLVM.scala
index f042692cb6..e010a9aaec 100644
--- a/src/col/vct/col/resolve/lang/LLVM.scala
+++ b/src/col/vct/col/resolve/lang/LLVM.scala
@@ -7,7 +7,10 @@ import vct.col.resolve.ctx._
 
 object LLVM {
 
-  def findCallable[G](name: String, ctx: ReferenceResolutionContext[G]): Option[LlvmCallable[G]] = {
+  def findCallable[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[LlvmCallable[G]] = {
     // look in context
     val callable = ctx.stack.flatten.map {
       case RefLlvmGlobal(decl, i) =>
@@ -20,16 +23,16 @@ object LLVM {
     // if not present in context, might find it in the call site of the current function definition
     callable match {
       case Some(callable) => Some(callable)
-      case None => ctx.currentResult.get match {
-        case RefLlvmFunctionDefinition(decl) =>
-          decl.contract.invokableRefs.find(ref => ref._1 == name) match {
-            case Some(ref) => Some(ref._2.decl)
-            case None => None
-          }
-        case _ => None
-      }
+      case None =>
+        ctx.currentResult.get match {
+          case RefLlvmFunctionDefinition(decl) =>
+            decl.contract.invokableRefs.find(ref => ref._1 == name) match {
+              case Some(ref) => Some(ref._2.decl)
+              case None => None
+            }
+          case _ => None
+        }
     }
   }
 
-
 }
diff --git a/src/col/vct/col/resolve/lang/PVL.scala b/src/col/vct/col/resolve/lang/PVL.scala
index 9a75e57bb8..9a8593e5a4 100644
--- a/src/col/vct/col/resolve/lang/PVL.scala
+++ b/src/col/vct/col/resolve/lang/PVL.scala
@@ -7,15 +7,23 @@ import vct.col.ref.Ref
 import vct.col.resolve.ctx._
 
 case object PVL {
-  def findConstructor[G](t: Type[G], typeArgs: Seq[Type[G]], args: Seq[Expr[G]]): Option[PVLConstructorTarget[G]] = {
+  def findConstructor[G](
+      t: Type[G],
+      typeArgs: Seq[Type[G]],
+      args: Seq[Expr[G]],
+  ): Option[PVLConstructorTarget[G]] = {
     t match {
       case t @ TClass(Ref(cls), _) =>
         val resolvedCons = cls.decls.collectFirst {
-          case cons: PVLConstructor[G] if Util.compat(t.typeEnv, args, typeArgs, cons.args, cons.typeArgs) => RefPVLConstructor(cons)
+          case cons: PVLConstructor[G]
+              if Util
+                .compat(t.typeEnv, args, typeArgs, cons.args, cons.typeArgs) =>
+            RefPVLConstructor(cons)
         }
 
         args match {
-          case Nil => resolvedCons.orElse(Some(ImplicitDefaultPVLConstructor(cls)))
+          case Nil =>
+            resolvedCons.orElse(Some(ImplicitDefaultPVLConstructor(cls)))
           case _ => resolvedCons
         }
       case TModel(Ref(model)) if args.isEmpty => Some(RefModel(model))
@@ -23,12 +31,18 @@ case object PVL {
     }
   }
 
-  def findTypeName[G](name: String, ctx: TypeResolutionContext[G]): Option[PVLTypeNameTarget[G]] =
+  def findTypeName[G](
+      name: String,
+      ctx: TypeResolutionContext[G],
+  ): Option[PVLTypeNameTarget[G]] =
     ctx.stack.flatten.collectFirst {
       case target: PVLTypeNameTarget[G] if target.name == name => target
     }
 
-  def findName[G](name: String, ctx: ReferenceResolutionContext[G]): Option[PVLNameTarget[G]] =
+  def findName[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[PVLNameTarget[G]] =
     ctx.stack.flatten.collectFirst {
       case target: PVLNameTarget[G] if target.name == name => target
     }
@@ -38,62 +52,134 @@ case object PVL {
       case ref: RefField[G] if ref.name == name => ref
     }
 
-  def findDeref[G](obj: Expr[G], name: String, ctx: ReferenceResolutionContext[G], blame: Blame[BuiltinError]): Option[PVLDerefTarget[G]] =
+  def findDeref[G](
+      obj: Expr[G],
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+      blame: Blame[BuiltinError],
+  ): Option[PVLDerefTarget[G]] =
     obj.t match {
-      case TNotAValue(RefEnum(enum)) => enum.constants.flatMap(Referrable.from).collectFirst {
-        case ref: RefEnumConstant[G @unchecked] if ref.name == name => ref.copy(enum = Some(enum))
-      }
+      case TNotAValue(RefEnum(enum)) =>
+        enum.constants.flatMap(Referrable.from).collectFirst {
+          case ref: RefEnumConstant[G @unchecked] if ref.name == name =>
+            ref.copy(enum = Some(enum))
+        }
       case _: TNotAValue[G] => Spec.builtinField(obj, name, blame)
-      case TModel(ref) => ref.decl.declarations.flatMap(Referrable.from).collectFirst {
-        case ref: RefModelField[G] if ref.name == name => ref
-      }
+      case TModel(ref) =>
+        ref.decl.declarations.flatMap(Referrable.from).collectFirst {
+          case ref: RefModelField[G] if ref.name == name => ref
+        }
       case TClass(ref, _) => findDerefOfClass(ref.decl, name)
       case _ => Spec.builtinField(obj, name, blame)
     }
 
-  def findInstanceMethod[G](obj: Expr[G], method: String, args: Seq[Expr[G]], typeArgs: Seq[Type[G]], blame: Blame[BuiltinError]): Option[PVLInvocationTarget[G]] =
+  def findInstanceMethod[G](
+      obj: Expr[G],
+      method: String,
+      args: Seq[Expr[G]],
+      typeArgs: Seq[Type[G]],
+      blame: Blame[BuiltinError],
+  ): Option[PVLInvocationTarget[G]] =
     obj.t match {
-      case t: TNotAValue[G] => t.decl.get match {
-        case RefAxiomaticDataType(decl) => decl.declarations.flatMap(Referrable.from).collectFirst {
-          case ref: RefADTFunction[G] if ref.name == method => ref
+      case t: TNotAValue[G] =>
+        t.decl.get match {
+          case RefAxiomaticDataType(decl) =>
+            decl.declarations.flatMap(Referrable.from).collectFirst {
+              case ref: RefADTFunction[G] if ref.name == method => ref
+            }
+          case _ => Spec.builtinInstanceMethod(obj, method, blame)
+        }
+      case TModel(ref) =>
+        ref.decl.declarations.flatMap(Referrable.from).collectFirst {
+          case ref: RefModelAction[G] if ref.name == method => ref
+          case ref: RefModelProcess[G] if ref.name == method => ref
+        }.orElse(Spec.builtinInstanceMethod(obj, method, blame))
+      case t @ TClass(ref, _) =>
+        ref.decl.declarations.flatMap(Referrable.from).collectFirst {
+          case ref: RefInstanceFunction[G]
+              if ref.name == method &&
+                Util.compat(t.typeEnv, args, typeArgs, ref.decl) =>
+            ref
+          case ref: RefInstanceMethod[G]
+              if ref.name == method &&
+                Util.compat(t.typeEnv, args, typeArgs, ref.decl) =>
+            ref
+          case ref: RefInstancePredicate[G]
+              if ref.name == method &&
+                Util.compat(t.typeEnv, args, ref.decl.args) =>
+            ref
         }
-        case _ => Spec.builtinInstanceMethod(obj, method, blame)
-      }
-      case TModel(ref) => ref.decl.declarations.flatMap(Referrable.from).collectFirst {
-        case ref: RefModelAction[G] if ref.name == method => ref
-        case ref: RefModelProcess[G] if ref.name == method => ref
-      }.orElse(Spec.builtinInstanceMethod(obj, method, blame))
-      case t @ TClass(ref, _) => ref.decl.declarations.flatMap(Referrable.from).collectFirst {
-        case ref: RefInstanceFunction[G] if ref.name == method && Util.compat(t.typeEnv, args, typeArgs, ref.decl) => ref
-        case ref: RefInstanceMethod[G] if ref.name == method && Util.compat(t.typeEnv, args, typeArgs, ref.decl) => ref
-        case ref: RefInstancePredicate[G] if ref.name == method && Util.compat(t.typeEnv, args, ref.decl.args) => ref
-      }
-      case _ => PVL.builtinInstanceMethod(obj, method, args).orElse(Spec.builtinInstanceMethod(obj, method, blame))
+      case _ =>
+        PVL.builtinInstanceMethod(obj, method, args)
+          .orElse(Spec.builtinInstanceMethod(obj, method, blame))
     }
 
-  def findMethod[G](method: String, args: Seq[Expr[G]], typeArgs: Seq[Type[G]], ctx: ReferenceResolutionContext[G]): Option[PVLInvocationTarget[G]] =
+  def findMethod[G](
+      method: String,
+      args: Seq[Expr[G]],
+      typeArgs: Seq[Type[G]],
+      ctx: ReferenceResolutionContext[G],
+  ): Option[PVLInvocationTarget[G]] =
     ctx.stack.flatten.collectFirst {
-      case ref: RefFunction[G] if ref.name == method && Util.compat(ctx.typeEnv, args, typeArgs, ref.decl) => ref
-      case ref: RefProcedure[G] if ref.name == method && Util.compat(ctx.typeEnv, args, typeArgs, ref.decl) => ref
-      case ref: RefPredicate[G] if ref.name == method && Util.compat(ctx.typeEnv, args, ref.decl.args) => ref
-      case ref: RefInstanceFunction[G] if ref.name == method && Util.compat(ctx.typeEnv, args, typeArgs, ref.decl) => ref
-      case ref: RefInstanceMethod[G] if ref.name == method && Util.compat(ctx.typeEnv, args, typeArgs, ref.decl) => ref
-      case ref: RefInstancePredicate[G] if ref.name == method && Util.compat(ctx.typeEnv, args, ref.decl.args) => ref
-      case ref: RefADTFunction[G] if ref.name == method && Util.compat(ctx.typeEnv, args, ref.decl.args) => ref
-      case ref: RefModelProcess[G] if ref.name == method && Util.compat(ctx.typeEnv, args, ref.decl.args) => ref
-      case ref: RefModelAction[G] if ref.name == method && Util.compat(ctx.typeEnv, args, ref.decl.args) => ref
-      case ref: RefProverFunction[G] if ref.name == method && Util.compat(ctx.typeEnv, args, ref.decl.args) => ref
+      case ref: RefFunction[G]
+          if ref.name == method &&
+            Util.compat(ctx.typeEnv, args, typeArgs, ref.decl) =>
+        ref
+      case ref: RefProcedure[G]
+          if ref.name == method &&
+            Util.compat(ctx.typeEnv, args, typeArgs, ref.decl) =>
+        ref
+      case ref: RefPredicate[G]
+          if ref.name == method &&
+            Util.compat(ctx.typeEnv, args, ref.decl.args) =>
+        ref
+      case ref: RefInstanceFunction[G]
+          if ref.name == method &&
+            Util.compat(ctx.typeEnv, args, typeArgs, ref.decl) =>
+        ref
+      case ref: RefInstanceMethod[G]
+          if ref.name == method &&
+            Util.compat(ctx.typeEnv, args, typeArgs, ref.decl) =>
+        ref
+      case ref: RefInstancePredicate[G]
+          if ref.name == method &&
+            Util.compat(ctx.typeEnv, args, ref.decl.args) =>
+        ref
+      case ref: RefADTFunction[G]
+          if ref.name == method &&
+            Util.compat(ctx.typeEnv, args, ref.decl.args) =>
+        ref
+      case ref: RefModelProcess[G]
+          if ref.name == method &&
+            Util.compat(ctx.typeEnv, args, ref.decl.args) =>
+        ref
+      case ref: RefModelAction[G]
+          if ref.name == method &&
+            Util.compat(ctx.typeEnv, args, ref.decl.args) =>
+        ref
+      case ref: RefProverFunction[G]
+          if ref.name == method &&
+            Util.compat(ctx.typeEnv, args, ref.decl.args) =>
+        ref
     }
 
-  def builtinInstanceMethod[G](obj: Expr[G], method: String, args: Seq[Expr[G]]): Option[PVLBuiltinInstanceMethod[G]] = {
+  def builtinInstanceMethod[G](
+      obj: Expr[G],
+      method: String,
+      args: Seq[Expr[G]],
+  ): Option[PVLBuiltinInstanceMethod[G]] = {
     implicit val o: Origin = obj.o
     Some((obj.t, method, args) match {
-      case (TFloat(_, _), "toFloat32", Seq()) => PVLBuiltinInstanceMethod[G](obj => _ => CastFloat(obj, PVL.float32))
-      case (TFloat(_, _), "toFloat64", Seq()) => PVLBuiltinInstanceMethod[G](obj => _ => CastFloat(obj, PVL.float64))
+      case (TFloat(_, _), "toFloat32", Seq()) =>
+        PVLBuiltinInstanceMethod[G](obj => _ => CastFloat(obj, PVL.float32))
+      case (TFloat(_, _), "toFloat64", Seq()) =>
+        PVLBuiltinInstanceMethod[G](obj => _ => CastFloat(obj, PVL.float64))
       case _ => return None
     })
   }
 
-  def float32[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] = TFloats.ieee754_32bit
-  def float64[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] = TFloats.ieee754_64bit
+  def float32[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] =
+    TFloats.ieee754_32bit
+  def float64[G](implicit o: Origin = DiagnosticOrigin): TFloat[G] =
+    TFloats.ieee754_64bit
 }
diff --git a/src/col/vct/col/resolve/lang/Spec.scala b/src/col/vct/col/resolve/lang/Spec.scala
index e5324bf877..df62509925 100644
--- a/src/col/vct/col/resolve/lang/Spec.scala
+++ b/src/col/vct/col/resolve/lang/Spec.scala
@@ -8,54 +8,77 @@ import vct.col.resolve.ctx._
 import vct.result.VerificationError.UserError
 
 case object Spec {
-  def getContract[G](target: Referrable[G], blame: Node[G]): ApplicableContract[G] = target match {
-    case RefFunction(decl) => decl.contract
-    case RefProcedure(decl) => decl.contract
-    case RefInstanceFunction(decl) => decl.contract
-    case RefInstanceMethod(decl) => decl.contract
-    case RefCLocalDeclaration(decls, _) => decls.decl.contract
-    case RefCGlobalDeclaration(decls, _) => decls.decl.contract
-    case RefCFunctionDefinition(decl) => decl.contract
-    case RefCPPLocalDeclaration(decls, _) => decls.decl.contract
-    case RefCPPGlobalDeclaration(decls, _) => decls.decl.contract
-    case RefCPPFunctionDefinition(decl) => decl.contract
-    case RefCPPLambdaDefinition(decl) => decl.contract
-    case RefJavaConstructor(decl) => decl.contract
-    case RefJavaMethod(decl) => decl.contract
-    case RefPVLConstructor(decl) => decl.contract
-    case other => throw NoGivenYields(blame)
-  }
+  def getContract[G](
+      target: Referrable[G],
+      blame: Node[G],
+  ): ApplicableContract[G] =
+    target match {
+      case RefFunction(decl) => decl.contract
+      case RefProcedure(decl) => decl.contract
+      case RefInstanceFunction(decl) => decl.contract
+      case RefInstanceMethod(decl) => decl.contract
+      case RefCLocalDeclaration(decls, _) => decls.decl.contract
+      case RefCGlobalDeclaration(decls, _) => decls.decl.contract
+      case RefCFunctionDefinition(decl) => decl.contract
+      case RefCPPLocalDeclaration(decls, _) => decls.decl.contract
+      case RefCPPGlobalDeclaration(decls, _) => decls.decl.contract
+      case RefCPPFunctionDefinition(decl) => decl.contract
+      case RefCPPLambdaDefinition(decl) => decl.contract
+      case RefJavaConstructor(decl) => decl.contract
+      case RefJavaMethod(decl) => decl.contract
+      case RefPVLConstructor(decl) => decl.contract
+      case other => throw NoGivenYields(blame)
+    }
 
-  def resolveGiven[G](givenMap: Seq[(Ref[G, Variable[G]], Expr[G])], target: Referrable[G], blame: Node[G]): Unit =
-    if(givenMap.nonEmpty) {
+  def resolveGiven[G](
+      givenMap: Seq[(Ref[G, Variable[G]], Expr[G])],
+      target: Referrable[G],
+      blame: Node[G],
+  ): Unit =
+    if (givenMap.nonEmpty) {
       val contract = getContract(target, blame)
       val args = contract.givenArgs.flatMap(Referrable.from)
-      givenMap.foreach {
-        case (arg, _) => arg.tryResolve(name => args.collectFirst {
-          case ref: RefVariable[G] if ref.name == name => ref.decl
-        }.getOrElse(throw NoSuchNameError("'given' argument", name, blame)))
+      givenMap.foreach { case (arg, _) =>
+        arg.tryResolve(name =>
+          args.collectFirst {
+            case ref: RefVariable[G] if ref.name == name => ref.decl
+          }.getOrElse(throw NoSuchNameError("'given' argument", name, blame))
+        )
       }
     }
 
-  def resolveYields[G](ctx: ReferenceResolutionContext[G], yields: Seq[(Expr[G], Ref[G, Variable[G]])], target: Referrable[G], blame: Node[G]): Unit =
-    if(yields.nonEmpty) {
+  def resolveYields[G](
+      ctx: ReferenceResolutionContext[G],
+      yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+      target: Referrable[G],
+      blame: Node[G],
+  ): Unit =
+    if (yields.nonEmpty) {
       val contract = getContract(target, blame)
       val args = contract.yieldsArgs.flatMap(Referrable.from)
-      yields.foreach {
-        case (_, res) =>
-          res.tryResolve(name => args.collectFirst {
+      yields.foreach { case (_, res) =>
+        res.tryResolve(name =>
+          args.collectFirst {
             case ref: RefVariable[G] if ref.name == name => ref.decl
-          }.getOrElse(throw NoSuchNameError("'yields' argument", name, blame)))
+          }.getOrElse(throw NoSuchNameError("'yields' argument", name, blame))
+        )
       }
     }
 
-  case class BuiltinArgumentCountError(obj: Expr[_], expected: Int) extends UserError {
+  case class BuiltinArgumentCountError(obj: Expr[_], expected: Int)
+      extends UserError {
     override def text: String =
-      obj.o.messageInContext(s"Builtin method invocation has wrong argument count: expected $expected argument(s).")
+      obj.o.messageInContext(
+        s"Builtin method invocation has wrong argument count: expected $expected argument(s)."
+      )
     override def code: String = "builtinArgCount"
   }
 
-  def builtinField[G](obj: Expr[G], field: String, blame: Blame[BuiltinError]): Option[BuiltinField[G]] = {
+  def builtinField[G](
+      obj: Expr[G],
+      field: String,
+      blame: Blame[BuiltinError],
+  ): Option[BuiltinField[G]] = {
     implicit val o: Origin = obj.o
     Some(BuiltinField((obj.t, field) match {
       case (TArray(_), "length") => Length(_)(blame)
@@ -85,120 +108,203 @@ case object Spec {
     }))
   }
 
-  def argCount[G](n: Int)(f: Expr[G] => Seq[Expr[G]] => Expr[G]): Expr[G] => Seq[Expr[G]] => Expr[G] =
-    obj => args =>
-      if(args.size == n) f(obj)(args)
-      else throw BuiltinArgumentCountError(obj, n)
-
-  def builtinInstanceMethod[G](obj: Expr[G], method: String, blame: Blame[BuiltinError]): Option[BuiltinInstanceMethod[G]] = {
+  def argCount[G](
+      n: Int
+  )(f: Expr[G] => Seq[Expr[G]] => Expr[G]): Expr[G] => Seq[Expr[G]] => Expr[G] =
+    obj =>
+      args =>
+        if (args.size == n)
+          f(obj)(args)
+        else
+          throw BuiltinArgumentCountError(obj, n)
+
+  def builtinInstanceMethod[G](
+      obj: Expr[G],
+      method: String,
+      blame: Blame[BuiltinError],
+  ): Option[BuiltinInstanceMethod[G]] = {
     implicit val o: Origin = obj.o
     Some(BuiltinInstanceMethod((obj.t, method) match {
-      case (t: TNotAValue[G], _) => (t.decl.get, method) match {
-        case (RefModel(model), "create") => _ => _ => ModelNew(model.ref)
-        case (_, _) => return None
-      }
-
-      case (TModel(_), "state") => argCount(2)(obj => args => ModelState(obj, args(0), args(1)))
-      case (TModel(_), "abstractState") => argCount(1)(obj => args => ModelAbstractState(obj, args.head))
-      case (TModel(_), "create") => argCount(1)(obj => args => ModelCreate(obj, args.head))
+      case (t: TNotAValue[G], _) =>
+        (t.decl.get, method) match {
+          case (RefModel(model), "create") => _ => _ => ModelNew(model.ref)
+          case (_, _) => return None
+        }
+
+      case (TModel(_), "state") =>
+        argCount(2)(obj => args => ModelState(obj, args(0), args(1)))
+      case (TModel(_), "abstractState") =>
+        argCount(1)(obj => args => ModelAbstractState(obj, args.head))
+      case (TModel(_), "create") =>
+        argCount(1)(obj => args => ModelCreate(obj, args.head))
       case (TModel(_), "destroy") => argCount(0)(obj => _ => ModelDestroy(obj))
-      case (TModel(_), "split") => argCount(4)(obj => args => ModelSplit(obj, args(0), args(1), args(2), args(3)))
-      case (TModel(_), "merge") => argCount(4)(obj => args => ModelMerge(obj, args(0), args(1), args(2), args(3)))
-      case (TModel(_), "choose") => argCount(3)(obj => args => ModelChoose(obj, args(0), args(1), args(2)))
-
-      case (TSeq(_), "removeAt") => argCount(1)(obj => args => RemoveAt(obj, args.head))
-      case (TSeq(_), "concat") => argCount(1)(obj => args => Concat(obj, args.head))
-      case (TSeq(_), "prepend") => argCount(1)(obj => args => Cons(obj, args.head))
+      case (TModel(_), "split") =>
+        argCount(4)(obj =>
+          args => ModelSplit(obj, args(0), args(1), args(2), args(3))
+        )
+      case (TModel(_), "merge") =>
+        argCount(4)(obj =>
+          args => ModelMerge(obj, args(0), args(1), args(2), args(3))
+        )
+      case (TModel(_), "choose") =>
+        argCount(3)(obj => args => ModelChoose(obj, args(0), args(1), args(2)))
+
+      case (TSeq(_), "removeAt") =>
+        argCount(1)(obj => args => RemoveAt(obj, args.head))
+      case (TSeq(_), "concat") =>
+        argCount(1)(obj => args => Concat(obj, args.head))
+      case (TSeq(_), "prepend") =>
+        argCount(1)(obj => args => Cons(obj, args.head))
       case (TSeq(_), "drop") => argCount(1)(obj => args => Drop(obj, args.head))
       case (TSeq(_), "take") => argCount(1)(obj => args => Take(obj, args.head))
-      case (TSeq(_), "slice") => argCount(2)(obj => args => Slice(obj, args(0), args(1)))
-      case (TSeq(_), "update") => argCount(2)(obj => args => SeqUpdate(obj, args(0), args(1)))
-      case (TSeq(_), "contains") => argCount(1)(obj => args => SeqMember(args.head, obj))
-
-      case (TSet(_), "intersect") => argCount(1)(obj => args => SetIntersection(obj, args.head))
-      case (TSet(_), "contains") => argCount(1)(obj => args => SetMember(args.head, obj))
-      case (TSet(_), "difference") => argCount(1)(obj => args => SetMinus(obj, args.head))
-      case (TSet(_), "union") => argCount(1)(obj => args => SetUnion(obj, args.head))
-      case (TSet(_), "strictSubsetOf") => argCount(1)(obj => args => SubSet(obj, args.head))
-      case (TSet(_), "subsetOf") => argCount(1)(obj => args => SubSetEq(obj, args.head))
-
-      case (TBag(_), "sum") => argCount(1)(obj => args => BagAdd(obj, args.head))
-      case (TBag(_), "intersect") => argCount(1)(obj => args => BagLargestCommon(obj, args.head))
-      case (TBag(_), "count") => argCount(1)(obj => args => BagMemberCount(args.head, obj))
-      case (TBag(_), "difference") => argCount(1)(obj => args => BagMinus(obj, args.head))
-      case (TBag(_), "subbagOf") => argCount(1)(obj => args => SubBagEq(obj, args.head))
-      case (TBag(_), "strictSubbagOf") => argCount(1)(obj => args => SubBag(obj, args.head))
-
-      case (TMap(_, _), "add") => argCount(2)(obj => args => MapCons(obj, args(0), args(1)))
-      case (TMap(_, _), "remove") => argCount(1)(obj => args => MapRemove(obj, args.head))
-      case (TMap(_, _), "get") => argCount(1)(obj => args => MapGet(obj, args.head)(blame))
-      case (TMap(_, _), "equals") => argCount(1)(obj => args => MapEq(obj, args.head))
-      case (TMap(_, _), "disjoint") => argCount(1)(obj => args => MapDisjoint(obj, args.head))
-
-      case (TOption(_), "getOrElse") => argCount(1)(obj => args => OptGetOrElse(obj, args.head))
+      case (TSeq(_), "slice") =>
+        argCount(2)(obj => args => Slice(obj, args(0), args(1)))
+      case (TSeq(_), "update") =>
+        argCount(2)(obj => args => SeqUpdate(obj, args(0), args(1)))
+      case (TSeq(_), "contains") =>
+        argCount(1)(obj => args => SeqMember(args.head, obj))
+
+      case (TSet(_), "intersect") =>
+        argCount(1)(obj => args => SetIntersection(obj, args.head))
+      case (TSet(_), "contains") =>
+        argCount(1)(obj => args => SetMember(args.head, obj))
+      case (TSet(_), "difference") =>
+        argCount(1)(obj => args => SetMinus(obj, args.head))
+      case (TSet(_), "union") =>
+        argCount(1)(obj => args => SetUnion(obj, args.head))
+      case (TSet(_), "strictSubsetOf") =>
+        argCount(1)(obj => args => SubSet(obj, args.head))
+      case (TSet(_), "subsetOf") =>
+        argCount(1)(obj => args => SubSetEq(obj, args.head))
+
+      case (TBag(_), "sum") =>
+        argCount(1)(obj => args => BagAdd(obj, args.head))
+      case (TBag(_), "intersect") =>
+        argCount(1)(obj => args => BagLargestCommon(obj, args.head))
+      case (TBag(_), "count") =>
+        argCount(1)(obj => args => BagMemberCount(args.head, obj))
+      case (TBag(_), "difference") =>
+        argCount(1)(obj => args => BagMinus(obj, args.head))
+      case (TBag(_), "subbagOf") =>
+        argCount(1)(obj => args => SubBagEq(obj, args.head))
+      case (TBag(_), "strictSubbagOf") =>
+        argCount(1)(obj => args => SubBag(obj, args.head))
+
+      case (TMap(_, _), "add") =>
+        argCount(2)(obj => args => MapCons(obj, args(0), args(1)))
+      case (TMap(_, _), "remove") =>
+        argCount(1)(obj => args => MapRemove(obj, args.head))
+      case (TMap(_, _), "get") =>
+        argCount(1)(obj => args => MapGet(obj, args.head)(blame))
+      case (TMap(_, _), "equals") =>
+        argCount(1)(obj => args => MapEq(obj, args.head))
+      case (TMap(_, _), "disjoint") =>
+        argCount(1)(obj => args => MapDisjoint(obj, args.head))
+
+      case (TOption(_), "getOrElse") =>
+        argCount(1)(obj => args => OptGetOrElse(obj, args.head))
 
       case (_, _) => return None
     }))
   }
 
-  def findLabel[G](name: String, ctx: ReferenceResolutionContext[G]): Option[LabelDecl[G]] =
+  def findLabel[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[LabelDecl[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefLabelDecl(decl) if ref.name == name => decl
     }
 
-  def findSend[G](name: String, ctx: ReferenceResolutionContext[G]): Option[SendDecl[G]] =
+  def findSend[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[SendDecl[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefSendDecl(decl) if ref.name == name => decl
     }
 
-  def findLocal[G](name: String, ctx: ReferenceResolutionContext[G]): Option[Variable[G]] =
+  def findLocal[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[Variable[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefVariable(decl) if ref.name == name => decl
     }
 
-  def findClass[G](name: String, ctx: TypeResolutionContext[G]): Option[Class[G]] =
+  def findClass[G](
+      name: String,
+      ctx: TypeResolutionContext[G],
+  ): Option[Class[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefClass(decl) if ref.name == name => decl
     }
 
-  def findModel[G](name: String, ctx: TypeResolutionContext[G]): Option[Model[G]] =
+  def findModel[G](
+      name: String,
+      ctx: TypeResolutionContext[G],
+  ): Option[Model[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefModel(decl) if ref.name == name => decl
     }
 
-  def findModelField[G](name: String, ctx: ReferenceResolutionContext[G]): Option[ModelField[G]] =
+  def findModelField[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[ModelField[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefModelField(decl) if ref.name == name => decl
     }
 
-  def findParBlock[G](name: String, ctx: ReferenceResolutionContext[G]): Option[ParBlockDecl[G]] =
+  def findParBlock[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[ParBlockDecl[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefParBlockDecl(decl) if ref.name == name => decl
     }
 
-  def findParInvariant[G](name: String, ctx: ReferenceResolutionContext[G]): Option[ParInvariantDecl[G]] =
+  def findParInvariant[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[ParInvariantDecl[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefParInvariantDecl(decl) if ref.name == name => decl
     }
 
-  def findAdt[G](name: String, ctx: TypeResolutionContext[G]): Option[AxiomaticDataType[G]] =
+  def findAdt[G](
+      name: String,
+      ctx: TypeResolutionContext[G],
+  ): Option[AxiomaticDataType[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefAxiomaticDataType(decl) if ref.name == name => decl
     }
 
-  def findAdtFunction[G](decl: AxiomaticDataType[G], name: String): Option[ADTFunction[G]] =
+  def findAdtFunction[G](
+      decl: AxiomaticDataType[G],
+      name: String,
+  ): Option[ADTFunction[G]] =
     decl.decls.flatMap(Referrable.from).collectFirst {
       case ref @ RefADTFunction(f) if ref.name == name => f
     }
 
-  def findAdtFunction[G](adtName: String, functionName: String, ctx: ReferenceResolutionContext[G]): Option[ADTFunction[G]] = {
+  def findAdtFunction[G](
+      adtName: String,
+      functionName: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[ADTFunction[G]] = {
     ctx.stack.flatten.collectFirst {
       case ref @ RefAxiomaticDataType(adt) if ref.name == adtName => adt
     }.flatMap(findAdtFunction(_, functionName))
   }
 
-  def findAdtFunction[G](name: String, ctx: ReferenceResolutionContext[G]): Option[(AxiomaticDataType[G], ADTFunction[G])] = {
-    for(adt <- ctx.stack.flatten.collect { case RefAxiomaticDataType(adt) => adt }) {
+  def findAdtFunction[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[(AxiomaticDataType[G], ADTFunction[G])] = {
+    for (
+      adt <- ctx.stack.flatten.collect { case RefAxiomaticDataType(adt) => adt }
+    ) {
       findAdtFunction(adt, name) match {
         case Some(func) => return Some((adt, func))
         case None =>
@@ -208,70 +314,97 @@ case object Spec {
     None
   }
 
-  def findProcedure[G](name: String, ctx: ReferenceResolutionContext[G]): Option[Procedure[G]] =
+  def findProcedure[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[Procedure[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefProcedure(decl) if ref.name == name => decl
     }
 
-  def findFunction[G](name: String, ctx: ReferenceResolutionContext[G]): Option[Function[G]] =
+  def findFunction[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[Function[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefFunction(decl) if ref.name == name => decl
     }
 
-  def findPredicate[G](name: String, ctx: ReferenceResolutionContext[G]): Option[Predicate[G]] =
+  def findPredicate[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[Predicate[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefPredicate(decl) if ref.name == name => decl
     }
 
-  def findSilverField[G](name: String, ctx: ReferenceResolutionContext[G]): Option[SilverField[G]] =
+  def findSilverField[G](
+      name: String,
+      ctx: ReferenceResolutionContext[G],
+  ): Option[SilverField[G]] =
     ctx.stack.flatten.collectFirst {
       case ref @ RefSilverField(decl) if ref.name == name => decl
     }
 
   def findMethod[G](obj: Expr[G], name: String): Option[InstanceMethod[G]] =
     obj.t match {
-      case TClass(Ref(cls), _) => cls.decls.flatMap(Referrable.from).collectFirst {
-        case ref @ RefInstanceMethod(decl) if ref.name == name => decl
-      }
+      case TClass(Ref(cls), _) =>
+        cls.decls.flatMap(Referrable.from).collectFirst {
+          case ref @ RefInstanceMethod(decl) if ref.name == name => decl
+        }
       case _ => None
     }
 
-  def findInstanceFunction[G](obj: Expr[G], name: String): Option[InstanceFunction[G]] =
+  def findInstanceFunction[G](
+      obj: Expr[G],
+      name: String,
+  ): Option[InstanceFunction[G]] =
     obj.t match {
-      case TClass(Ref(cls), _) => cls.decls.flatMap(Referrable.from).collectFirst {
-        case ref @ RefInstanceFunction(decl) if ref.name == name => decl
-      }
+      case TClass(Ref(cls), _) =>
+        cls.decls.flatMap(Referrable.from).collectFirst {
+          case ref @ RefInstanceFunction(decl) if ref.name == name => decl
+        }
       case _ => None
     }
 
-  def findInstancePredicate[G](obj: Expr[G], name: String): Option[InstancePredicate[G]] =
+  def findInstancePredicate[G](
+      obj: Expr[G],
+      name: String,
+  ): Option[InstancePredicate[G]] =
     obj.t match {
-      case TClass(Ref(cls), _) => cls.decls.flatMap(Referrable.from).collectFirst {
-        case ref @ RefInstancePredicate(decl) if ref.name == name => decl
-      }
-      case JavaTClass(Ref(cls), _) => cls.decls.flatMap(Referrable.from).collectFirst {
-        case ref @ RefInstancePredicate(decl) if ref.name == name => decl
-      }
+      case TClass(Ref(cls), _) =>
+        cls.decls.flatMap(Referrable.from).collectFirst {
+          case ref @ RefInstancePredicate(decl) if ref.name == name => decl
+        }
+      case JavaTClass(Ref(cls), _) =>
+        cls.decls.flatMap(Referrable.from).collectFirst {
+          case ref @ RefInstancePredicate(decl) if ref.name == name => decl
+        }
       case _ => None
     }
 
   def findField[G](obj: Expr[G], name: String): Option[InstanceField[G]] =
     obj.t match {
-      case TClass(Ref(cls), _) => cls.decls.flatMap(Referrable.from).collectFirst {
-        case ref @ RefField(decl) if ref.name == name => decl
-      }
+      case TClass(Ref(cls), _) =>
+        cls.decls.flatMap(Referrable.from).collectFirst {
+          case ref @ RefField(decl) if ref.name == name => decl
+        }
       case _ => None
     }
 
   def findModelField[G](obj: Expr[G], name: String): Option[ModelField[G]] =
     obj.t match {
-      case TModel(Ref(model)) => model.declarations.flatMap(Referrable.from).collectFirst {
-        case ref @ RefModelField(decl) if ref.name == name => decl
-      }
+      case TModel(Ref(model)) =>
+        model.declarations.flatMap(Referrable.from).collectFirst {
+          case ref @ RefModelField(decl) if ref.name == name => decl
+        }
       case _ => None
     }
 
-  def findAdtTypeArg[G](adt: AxiomaticDataType[G], name: String): Option[Variable[G]] =
+  def findAdtTypeArg[G](
+      adt: AxiomaticDataType[G],
+      name: String,
+  ): Option[Variable[G]] =
     adt.typeArgs.flatMap(Referrable.from).collectFirst {
       case ref @ RefVariable(decl) if ref.name == name => decl
     }
diff --git a/src/col/vct/col/resolve/lang/Util.scala b/src/col/vct/col/resolve/lang/Util.scala
index 3dbf845e66..5f5bbe91f2 100644
--- a/src/col/vct/col/resolve/lang/Util.scala
+++ b/src/col/vct/col/resolve/lang/Util.scala
@@ -3,34 +3,64 @@ package vct.col.resolve.lang
 import vct.col.ast.{ContractApplicable, Expr, JavaParam, Type, Variable}
 
 case object Util {
-  def compatJavaParams[G](args: Seq[Expr[G]], params: Seq[JavaParam[G]]): Boolean =
-    compatTypes(args, params.map(_.t))
+  def compatJavaParams[G](
+      args: Seq[Expr[G]],
+      params: Seq[JavaParam[G]],
+  ): Boolean = compatTypes(args, params.map(_.t))
 
   def compat[G](args: Seq[Expr[G]], params: Seq[Variable[G]]): Boolean =
     compatTypes(args, params.map(_.t))
 
-  def compat[G](typeEnv: Map[Variable[G], Type[G]], args: Seq[Expr[G]], params: Seq[Variable[G]]): Boolean =
-    compatTypes(typeEnv, args, params.map(_.t))
+  def compat[G](
+      typeEnv: Map[Variable[G], Type[G]],
+      args: Seq[Expr[G]],
+      params: Seq[Variable[G]],
+  ): Boolean = compatTypes(typeEnv, args, params.map(_.t))
 
   def compatTypes[G](args: Seq[Expr[G]], types: Seq[Type[G]]): Boolean =
     compatTypes[G](Map.empty[Variable[G], Type[G]], args, types)
 
-  def compatTypes[G](typeEnv: Map[Variable[G], Type[G]], args: Seq[Expr[G]], types: Seq[Type[G]]): Boolean =
-    args.size == types.size && types.zip(args).forall {
-      case (t, e) => t.particularize(typeEnv).superTypeOf(e.t)
+  def compatTypes[G](
+      typeEnv: Map[Variable[G], Type[G]],
+      args: Seq[Expr[G]],
+      types: Seq[Type[G]],
+  ): Boolean =
+    args.size == types.size && types.zip(args).forall { case (t, e) =>
+      t.particularize(typeEnv).superTypeOf(e.t)
     }
 
-  def compat[G](args: Seq[Expr[G]], typeArgs: Seq[Type[G]], genericInvokable: ContractApplicable[G]): Boolean =
+  def compat[G](
+      args: Seq[Expr[G]],
+      typeArgs: Seq[Type[G]],
+      genericInvokable: ContractApplicable[G],
+  ): Boolean =
     compat[G](Map.empty[Variable[G], Type[G]], args, typeArgs, genericInvokable)
 
-  def compat[G](typeEnv: Map[Variable[G], Type[G]], args: Seq[Expr[G]], typeArgs: Seq[Type[G]], genericInvokable: ContractApplicable[G]): Boolean =
-    compat(typeEnv, args, typeArgs, genericInvokable.args, genericInvokable.typeArgs)
+  def compat[G](
+      typeEnv: Map[Variable[G], Type[G]],
+      args: Seq[Expr[G]],
+      typeArgs: Seq[Type[G]],
+      genericInvokable: ContractApplicable[G],
+  ): Boolean =
+    compat(
+      typeEnv,
+      args,
+      typeArgs,
+      genericInvokable.args,
+      genericInvokable.typeArgs,
+    )
 
-  def compat[G](typeEnv: Map[Variable[G], Type[G]], args: Seq[Expr[G]], typeArgs: Seq[Type[G]], params: Seq[Variable[G]], typeParams: Seq[Variable[G]]): Boolean = {
+  def compat[G](
+      typeEnv: Map[Variable[G], Type[G]],
+      args: Seq[Expr[G]],
+      typeArgs: Seq[Type[G]],
+      params: Seq[Variable[G]],
+      typeParams: Seq[Variable[G]],
+  ): Boolean = {
     val env = typeEnv ++ typeParams.zip(typeArgs).toMap
     args.size == params.size && typeArgs.size == typeParams.size &&
-      params.zip(args).forall {
-        case (v, e) => v.t.particularize(env).superTypeOf(e.t)
-      }
+    params.zip(args).forall { case (v, e) =>
+      v.t.particularize(env).superTypeOf(e.t)
+    }
   }
 }
diff --git a/src/col/vct/col/rewrite/NonLatchingRewriter.scala b/src/col/vct/col/rewrite/NonLatchingRewriter.scala
index 4f35df0503..4331b3d127 100644
--- a/src/col/vct/col/rewrite/NonLatchingRewriter.scala
+++ b/src/col/vct/col/rewrite/NonLatchingRewriter.scala
@@ -5,7 +5,8 @@ import vct.col.ast.rewrite.BaseNonLatchingRewriter
 import vct.col.util.CurrentRewriteProgramContext
 import vct.result.VerificationError
 
-class NonLatchingRewriter[Pre, Post]() extends BaseNonLatchingRewriter[Pre, Post] {
+class NonLatchingRewriter[Pre, Post]()
+    extends BaseNonLatchingRewriter[Pre, Post] {
   override def dispatch(program: Program[Pre]): Program[Post] =
     VerificationError.withContext(CurrentRewriteProgramContext(program)) {
       program.rewriteDefault()
@@ -13,4 +14,4 @@ class NonLatchingRewriter[Pre, Post]() extends BaseNonLatchingRewriter[Pre, Post
 
   override def dispatch(decl: Declaration[Pre]): Unit =
     allScopes.anySucceed(decl, decl.rewriteDefault())
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/rewrite/Rewriter.scala b/src/col/vct/col/rewrite/Rewriter.scala
index ec41101c1e..6a8f1061d5 100644
--- a/src/col/vct/col/rewrite/Rewriter.scala
+++ b/src/col/vct/col/rewrite/Rewriter.scala
@@ -2,6 +2,7 @@ package vct.col.rewrite
 
 import vct.col.ast._
 
-class Rewriter[Pre <: Generation] extends NonLatchingRewriter[Pre, Rewritten[Pre]] {
+class Rewriter[Pre <: Generation]
+    extends NonLatchingRewriter[Pre, Rewritten[Pre]] {
   type Post = Rewritten[Pre]
 }
diff --git a/src/col/vct/col/rewrite/RewriterBuilder.scala b/src/col/vct/col/rewrite/RewriterBuilder.scala
index 007b58db4e..99c8893a76 100644
--- a/src/col/vct/col/rewrite/RewriterBuilder.scala
+++ b/src/col/vct/col/rewrite/RewriterBuilder.scala
@@ -2,27 +2,26 @@ package vct.col.rewrite
 
 import vct.col.ast.AbstractRewriter
 
-/**
- * Defines how to construct a [[Rewriter]] for the transformation stage.
- *
- * If the rewriter needs arguments, refer to [[RewriterBuilderArg]]
- *
- * `key` is a short (user-facing) camelCase identifier for the rewriter.
- *
- * `desc` is a one-sentence description of the rewriter.
- *
- * `apply` defines how to construct the rewriter. Note that for case classes the companion object already defines
- * `apply` implicitly:
- *
- * {{{
- * case object Test extends RewriterBuilder {
- *   def key: String = ???
- *   def desc: String = ???
- * }
- *
- * case class Test[Pre <: Generation]() extends Rewriter[Pre]
- * }}}
- */
+/** Defines how to construct a [[Rewriter]] for the transformation stage.
+  *
+  * If the rewriter needs arguments, refer to [[RewriterBuilderArg]]
+  *
+  * `key` is a short (user-facing) camelCase identifier for the rewriter.
+  *
+  * `desc` is a one-sentence description of the rewriter.
+  *
+  * `apply` defines how to construct the rewriter. Note that for case classes
+  * the companion object already defines `apply` implicitly:
+  *
+  * {{{
+  * case object Test extends RewriterBuilder {
+  *   def key: String = ???
+  *   def desc: String = ???
+  * }
+  *
+  * case class Test[Pre <: Generation]() extends Rewriter[Pre]
+  * }}}
+  */
 trait RewriterBuilder {
   def apply[Pre <: Generation](): AbstractRewriter[Pre, _ <: Generation]
   def key: String
diff --git a/src/col/vct/col/rewrite/RewriterBuilderArg.scala b/src/col/vct/col/rewrite/RewriterBuilderArg.scala
index 1a3b5747b4..9e0c8c20f7 100644
--- a/src/col/vct/col/rewrite/RewriterBuilderArg.scala
+++ b/src/col/vct/col/rewrite/RewriterBuilderArg.scala
@@ -2,52 +2,60 @@ package vct.col.rewrite
 
 import vct.col.ast.AbstractRewriter
 
-/**
- * Defines how to construct a [[Rewriter]] for the transformation stage, when the rewriter takes an argument.
- *
- * Similarly to [[RewriterBuilder]], for case classes this shape of `apply` is implicitly defined:
- *
- * {{{
- * case object Test extends RewriterBuilderArg[Int] {
- *   def key: String = ???
- *   def desc: String = ???
- * }
- *
- * case class Test[Pre <: Generation](x: Int) extends Rewriter[Pre]
- * }}}
- *
- * @tparam T The type of the argument the rewriter takes.
- */
+/** Defines how to construct a [[Rewriter]] for the transformation stage, when
+  * the rewriter takes an argument.
+  *
+  * Similarly to [[RewriterBuilder]], for case classes this shape of `apply` is
+  * implicitly defined:
+  *
+  * {{{
+  * case object Test extends RewriterBuilderArg[Int] {
+  *   def key: String = ???
+  *   def desc: String = ???
+  * }
+  *
+  * case class Test[Pre <: Generation](x: Int) extends Rewriter[Pre]
+  * }}}
+  *
+  * @tparam T
+  *   The type of the argument the rewriter takes.
+  */
 trait RewriterBuilderArg[T] {
   def apply[Pre <: Generation](x: T): AbstractRewriter[Pre, _ <: Generation]
   def key: String
   def desc: String
 
-  /**
-   * Constructs a [[RewriterBuilder]] with the argument to the rewriter pinned.
-   * @param x The pinned parameter.
-   */
+  /** Constructs a [[RewriterBuilder]] with the argument to the rewriter pinned.
+    * @param x
+    *   The pinned parameter.
+    */
   def withArg(x: T): RewriterBuilder =
     new RewriterBuilder {
-      override def apply[Pre <: Generation](): AbstractRewriter[Pre, _ <: Generation] = RewriterBuilderArg.this.apply(x)
+      override def apply[Pre <: Generation]()
+          : AbstractRewriter[Pre, _ <: Generation] =
+        RewriterBuilderArg.this.apply(x)
       override def key: String = RewriterBuilderArg.this.key
       override def desc: String = RewriterBuilderArg.this.desc
     }
 }
 
-/**
- * As RewriterBuilderArg, but with 2 parameters.
- * @tparam T
- * @tparam U
- */
+/** As RewriterBuilderArg, but with 2 parameters.
+  * @tparam T
+  * @tparam U
+  */
 trait RewriterBuilderArg2[T, U] {
-  def apply[Pre <: Generation](t: T, u: U): AbstractRewriter[Pre, _ <: Generation]
+  def apply[Pre <: Generation](
+      t: T,
+      u: U,
+  ): AbstractRewriter[Pre, _ <: Generation]
   def key: String
   def desc: String
 
   def withArg(t: T, u: U): RewriterBuilder =
     new RewriterBuilder {
-      override def apply[Pre <: Generation](): AbstractRewriter[Pre, _ <: Generation] = RewriterBuilderArg2.this.apply(t, u)
+      override def apply[Pre <: Generation]()
+          : AbstractRewriter[Pre, _ <: Generation] =
+        RewriterBuilderArg2.this.apply(t, u)
       override def key: String = RewriterBuilderArg2.this.key
       override def desc: String = RewriterBuilderArg2.this.desc
     }
diff --git a/src/col/vct/col/rewrite/SuccessorProvider.scala b/src/col/vct/col/rewrite/SuccessorProvider.scala
index b95f7ff75e..4ca3a9b086 100644
--- a/src/col/vct/col/rewrite/SuccessorProvider.scala
+++ b/src/col/vct/col/rewrite/SuccessorProvider.scala
@@ -5,9 +5,12 @@ import vct.col.ref.{LazyRef, Ref}
 
 import scala.reflect.ClassTag
 
-trait SuccessorProvider[Pre, Post, PreDecl <: Declaration[Pre], PostDecl <: Declaration[Post]] {
+trait SuccessorProvider[Pre, Post, PreDecl <: Declaration[
+  Pre
+], PostDecl <: Declaration[Post]] {
   def computeSucc(decl: PreDecl): Option[PostDecl]
 
-  def succ[RefDecl <: Declaration[Post]](decl: PreDecl)(implicit tag: ClassTag[RefDecl]): Ref[Post, RefDecl] =
-    new LazyRef(computeSucc(decl).get)
+  def succ[RefDecl <: Declaration[Post]](decl: PreDecl)(
+      implicit tag: ClassTag[RefDecl]
+  ): Ref[Post, RefDecl] = new LazyRef(computeSucc(decl).get)
 }
diff --git a/src/col/vct/col/serialize/NodeMessageView.scala b/src/col/vct/col/serialize/NodeMessageView.scala
index 4171a439d9..fad708d3ae 100644
--- a/src/col/vct/col/serialize/NodeMessageView.scala
+++ b/src/col/vct/col/serialize/NodeMessageView.scala
@@ -4,7 +4,8 @@ import com.google.protobuf.CodedOutputStream
 import vct.col.ast.{Declaration, Node}
 import vct.serialize.StreamingOpaqueMessageBytes
 
-class NodeMessageView[G](node: Node[G], decls: Map[Declaration[G], Long]) extends StreamingOpaqueMessageBytes {
+class NodeMessageView[G](node: Node[G], decls: Map[Declaration[G], Long])
+    extends StreamingOpaqueMessageBytes {
   lazy val message: scalapb.GeneratedMessage = node.serializeFamily(decls)
 
   override def streamTo(output: CodedOutputStream): Unit =
diff --git a/src/col/vct/col/serialize/SerializeBlame.scala b/src/col/vct/col/serialize/SerializeBlame.scala
index e309225b8d..cd19ca94e1 100644
--- a/src/col/vct/col/serialize/SerializeBlame.scala
+++ b/src/col/vct/col/serialize/SerializeBlame.scala
@@ -6,8 +6,11 @@ import vct.col.ast.{serialize => ser}
 import scala.annotation.unused
 
 object SerializeBlame {
-  def deserialize[T <: VerificationFailure](@unused blame: ser.Blame, origin: Origin): Blame[T] =
-    origin
+  def deserialize[T <: VerificationFailure](
+      @unused
+      blame: ser.Blame,
+      origin: Origin,
+  ): Blame[T] = origin
 
   def serialize(blame: Blame[_]): ser.Blame =
     ser.Blame(ser.Blame.Blame.BlameInput(ser.BlameInput()))
diff --git a/src/col/vct/col/serialize/SerializeOrigin.scala b/src/col/vct/col/serialize/SerializeOrigin.scala
index 9e6c837110..86e479728c 100644
--- a/src/col/vct/col/serialize/SerializeOrigin.scala
+++ b/src/col/vct/col/serialize/SerializeOrigin.scala
@@ -6,24 +6,56 @@ import vct.col.origin._
 import scala.annotation.unused
 
 object SerializeOrigin {
-  def deserialize(@unused origin: ser.Origin): Origin =
+  def deserialize(
+      @unused
+      origin: ser.Origin
+  ): Origin =
     Origin(origin.content.map(_.content).map {
       case ser.OriginContent.Content.SourceName(name) => SourceName(name.name)
-      case ser.OriginContent.Content.PreferredName(name) => PreferredName(name.preferredName)
-      case ser.OriginContent.Content.Context(context) => DeserializedContext(context.context, context.inlineContext, context.shortPosition)
+      case ser.OriginContent.Content.PreferredName(name) =>
+        PreferredName(name.preferredName)
+      case ser.OriginContent.Content.Context(context) =>
+        DeserializedContext(
+          context.context,
+          context.inlineContext,
+          context.shortPosition,
+        )
     })
 
-  def serialize(@unused origin: Origin): ser.Origin =
-    ser.Origin(origin.originContents.flatMap {
-      case SourceName(name) => Seq(ser.OriginContent.Content.SourceName(ser.SourceName(name)))
-      case PreferredName(preferredName) => Seq(ser.OriginContent.Content.PreferredName(ser.PreferredName(preferredName)))
-      case DeserializedContext(context, inlineContext, shortPosition) => Seq(ser.OriginContent.Content.Context(ser.Context(context, inlineContext, shortPosition)))
-      case _ => Nil
-    }.map(ser.OriginContent(_)))
+  def serialize(
+      @unused
+      origin: Origin
+  ): ser.Origin =
+    ser.Origin(
+      origin.originContents.flatMap {
+        case SourceName(name) =>
+          Seq(ser.OriginContent.Content.SourceName(ser.SourceName(name)))
+        case PreferredName(preferredName) =>
+          Seq(
+            ser.OriginContent.Content
+              .PreferredName(ser.PreferredName(preferredName))
+          )
+        case DeserializedContext(context, inlineContext, shortPosition) =>
+          Seq(
+            ser.OriginContent.Content
+              .Context(ser.Context(context, inlineContext, shortPosition))
+          )
+        case _ => Nil
+      }.map(ser.OriginContent(_))
+    )
 }
 
-case class DeserializedContext(context: String, inlineContext: String, shortPosition: String) extends Context {
-  override protected def contextHere(tail: Origin): (String, Origin) = (context, tail)
-  override protected def inlineContextHere(tail: Origin, compress: Boolean): (String, Origin) = (inlineContext, tail)
-  override protected def shortPositionHere(tail: Origin): (String, Origin) = (shortPosition, tail)
+case class DeserializedContext(
+    context: String,
+    inlineContext: String,
+    shortPosition: String,
+) extends Context {
+  override protected def contextHere(tail: Origin): (String, Origin) =
+    (context, tail)
+  override protected def inlineContextHere(
+      tail: Origin,
+      compress: Boolean,
+  ): (String, Origin) = (inlineContext, tail)
+  override protected def shortPositionHere(tail: Origin): (String, Origin) =
+    (shortPosition, tail)
 }
diff --git a/src/col/vct/col/structure/family.scala b/src/col/vct/col/structure/family.scala
index 441cc09dca..f23b373d01 100644
--- a/src/col/vct/col/structure/family.scala
+++ b/src/col/vct/col/structure/family.scala
@@ -1,3 +1,3 @@
 package vct.col.structure
 
-class family extends scala.annotation.Annotation
\ No newline at end of file
+class family extends scala.annotation.Annotation
diff --git a/src/col/vct/col/typerules/CoercingRewriter.scala b/src/col/vct/col/typerules/CoercingRewriter.scala
index ef76470d38..baf88034cf 100644
--- a/src/col/vct/col/typerules/CoercingRewriter.scala
+++ b/src/col/vct/col/typerules/CoercingRewriter.scala
@@ -12,20 +12,26 @@ import vct.col.util.AstBuildHelpers._
 import vct.col.util.SuccessionMap
 import vct.result.VerificationError.{SystemError, Unreachable}
 
-case class NopCoercingRewriter[Pre <: Generation]() extends CoercingRewriter[Pre]() {
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = e
+case class NopCoercingRewriter[Pre <: Generation]()
+    extends CoercingRewriter[Pre]() {
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] = e
 }
 
 case object CoercingRewriter {
   sealed trait CoercionError extends SystemError {
     override def text: String =
       messageContext(
-        "Internal type error: CoercionErrors must not bubble. " + (this match {
-          case IncoercibleDummy => "(No alternative matched, see stack trace)"
-          case Incoercible(e, target) => s"Expression `$e` could not be coerced to `$target``"
-          case IncoercibleText(e, target) => s"Expression `$e` could not be coerced to $target."
-          case IncoercibleExplanation(e, message) => s"At `$e`: $message"
-        })
+        "Internal type error: CoercionErrors must not bubble. " +
+          (this match {
+            case IncoercibleDummy => "(No alternative matched, see stack trace)"
+            case Incoercible(e, target) =>
+              s"Expression `$e` could not be coerced to `$target``"
+            case IncoercibleText(e, target) =>
+              s"Expression `$e` could not be coerced to $target."
+            case IncoercibleExplanation(e, message) => s"At `$e`: $message"
+          })
       )
   }
 
@@ -33,46 +39,66 @@ case object CoercingRewriter {
 
   case class Incoercible(e: Expr[_], target: Type[_]) extends CoercionError
 
-  case class IncoercibleText(e: Expr[_], targetText: String) extends CoercionError
+  case class IncoercibleText(e: Expr[_], targetText: String)
+      extends CoercionError
 
-  case class IncoercibleExplanation(blame: Node[_], message: String) extends CoercionError
+  case class IncoercibleExplanation(blame: Node[_], message: String)
+      extends CoercionError
 
   private def coercionOrigin(of: Expr[_]): Origin = of.o.where(name = "unknown")
 }
 
-abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewriter[Pre, Rewritten[Pre]] with LazyLogging {
+abstract class CoercingRewriter[Pre <: Generation]()
+    extends BaseCoercingRewriter[Pre, Rewritten[Pre]] with LazyLogging {
   import CoercingRewriter._
 
   type Post = Rewritten[Pre]
 
-  val coercedDeclaration: SuccessionMap[Declaration[Pre], Declaration[Pre]] = SuccessionMap()
+  val coercedDeclaration: SuccessionMap[Declaration[Pre], Declaration[Pre]] =
+    SuccessionMap()
 
-  class CoercedSuccessorsProvider extends SuccessorsProviderTrafo[Pre, Pre](null) {
-    override def preTransform[I <: Declaration[Pre], O <: Declaration[Pre]](pre: I): Option[O] =
-      Some(coercedDeclaration(pre).asInstanceOf[O])
+  class CoercedSuccessorsProvider
+      extends SuccessorsProviderTrafo[Pre, Pre](null) {
+    override def preTransform[I <: Declaration[Pre], O <: Declaration[Pre]](
+        pre: I
+    ): Option[O] = Some(coercedDeclaration(pre).asInstanceOf[O])
   }
 
   override def succProvider: SuccessorsProvider[Pre, Post] =
     SuccessorsProviderChain(new CoercedSuccessorsProvider, allScopes.freeze)
 
-  /**
-    * Apply a particular coercion to an expression.
-    * SAFETY: all promoting coercions must be injective; otherwise the default mapping coercion of sets is unsound.
-    * @param e the expression to coerce
-    * @param coercion the coercion
-    * @return the coerced expression
+  /** Apply a particular coercion to an expression. SAFETY: all promoting
+    * coercions must be injective; otherwise the default mapping coercion of
+    * sets is unsound.
+    * @param e
+    *   the expression to coerce
+    * @param coercion
+    *   the coercion
+    * @return
+    *   the coerced expression
     */
-  def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = {
+  def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] = {
     coercion match {
       case CoerceIdentity(_) => e
-      case CoercionSequence(cs) => cs.foldLeft(e) { case (e, c) => applyCoercion(e, c) }
+      case CoercionSequence(cs) =>
+        cs.foldLeft(e) { case (e, c) => applyCoercion(e, c) }
       case CoerceNothingSomething(_) => e
       case CoerceSomethingAny(_) => e
       case CoerceSomethingAnyValue(_) => e
       case CoerceMapOption(inner, _, target) =>
-        Select(OptEmpty(e), OptNoneTyped(dispatch(target)), OptSomeTyped(dispatch(target), applyCoercion(OptGet(e)(NeverNone), inner)))
+        Select(
+          OptEmpty(e),
+          OptNoneTyped(dispatch(target)),
+          OptSomeTyped(
+            dispatch(target),
+            applyCoercion(OptGet(e)(NeverNone), inner),
+          ),
+        )
       case CoerceMapEither((innerLeft, innerRight), _, _) =>
-        Select(IsRight(e),
+        Select(
+          IsRight(e),
           EitherRight(applyCoercion(GetRight(e)(FramedGetRight), innerRight)),
           EitherLeft(applyCoercion(GetLeft(e)(FramedGetLeft), innerLeft)),
         )
@@ -89,16 +115,20 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
             returnType = TSeq(dispatch(target)),
             args = Seq(v),
             ensures = UnitAccountedPredicate(
-              Eq(Size(v.get), Size(result)) &&
-              Forall(Seq(i), Seq(Seq(result_i)),
+              Eq(Size(v.get), Size(result)) && Forall(
+                Seq(i),
+                Seq(Seq(result_i)),
                 (const[Post](0) <= i.get && i.get < Size(result)) ==>
-                  (result_i === applyCoercion(v_i, inner)))
+                  (result_i === applyCoercion(v_i, inner)),
+              )
             ),
           )
         })
 
         globalDeclarations.declare(f)
-        FunctionInvocation[Post](f.ref, Seq(e), Nil, Nil, Nil)(PanicBlame("default coercion for seq<_> requires nothing."))
+        FunctionInvocation[Post](f.ref, Seq(e), Nil, Nil, Nil)(PanicBlame(
+          "default coercion for seq<_> requires nothing."
+        ))
       case CoerceMapSet(inner, source, target) =>
         val f: Function[Post] = withResult((result: Result[Post]) => {
           val v = new Variable(TSet(dispatch(source)))
@@ -110,15 +140,22 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
             returnType = TSet(dispatch(target)),
             args = Seq(v),
             ensures = UnitAccountedPredicate(
-              Eq(Size(result), Size(v.get)) &&
-                Forall(Seq(elem), Seq(Seq(SetMember(elem.get, result))),
-                  Eq(SetMember(applyCoercion(elem.get, inner), result), SetMember(elem.get, v.get)))
+              Eq(Size(result), Size(v.get)) && Forall(
+                Seq(elem),
+                Seq(Seq(SetMember(elem.get, result))),
+                Eq(
+                  SetMember(applyCoercion(elem.get, inner), result),
+                  SetMember(elem.get, v.get),
+                ),
+              )
             ),
           )
         })
 
         globalDeclarations.declare(f)
-        FunctionInvocation[Post](f.ref, Seq(e), Nil, Nil, Nil)(PanicBlame("Default coercion for set<_> requires nothing."))
+        FunctionInvocation[Post](f.ref, Seq(e), Nil, Nil, Nil)(PanicBlame(
+          "Default coercion for set<_> requires nothing."
+        ))
       case CoerceMapBag(inner, source, target) =>
         val f: Function[Post] = withResult((result: Result[Post]) => {
           val v = new Variable(TBag(dispatch(source)))
@@ -130,18 +167,28 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
             returnType = TBag(dispatch(target)),
             args = Seq(v),
             ensures = UnitAccountedPredicate(
-              Eq(Size(result), Size(v.get)) &&
-                Forall(Seq(elem), Seq(Seq(BagMemberCount(elem.get, result))),
-                  Eq(BagMemberCount(applyCoercion(elem.get, inner), result), BagMemberCount(elem.get, v.get)))
+              Eq(Size(result), Size(v.get)) && Forall(
+                Seq(elem),
+                Seq(Seq(BagMemberCount(elem.get, result))),
+                Eq(
+                  BagMemberCount(applyCoercion(elem.get, inner), result),
+                  BagMemberCount(elem.get, v.get),
+                ),
+              )
             ),
           )
         })
 
         globalDeclarations.declare(f)
-        FunctionInvocation[Post](f.ref, Seq(e), Nil, Nil, Nil)(PanicBlame("Default coercion for bag<_> requires nothing."))
-      case CoerceMapMatrix(inner, source, target) =>
-        ???
-      case CoerceMapMap(inner, (sourceKey, sourceValue), (targetKey, targetValue)) =>
+        FunctionInvocation[Post](f.ref, Seq(e), Nil, Nil, Nil)(PanicBlame(
+          "Default coercion for bag<_> requires nothing."
+        ))
+      case CoerceMapMatrix(inner, source, target) => ???
+      case CoerceMapMap(
+            inner,
+            (sourceKey, sourceValue),
+            (targetKey, targetValue),
+          ) =>
         val f: Function[Post] = withResult((result: Result[Post]) => {
           val v = new Variable(TMap(dispatch(sourceKey), dispatch(sourceValue)))
           val k = new Variable(dispatch(sourceKey))
@@ -152,22 +199,39 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
             returnType = TMap(dispatch(targetKey), dispatch(targetValue)),
             args = Seq(v),
             ensures = UnitAccountedPredicate(
-              Eq(MapKeySet(result), MapKeySet(v.get)) &&
-                Forall(Seq(k), Seq(Seq(MapGet(result, k.get)(TriggerPatternBlame))),
-                  SetMember(k.get, MapKeySet(result)) ==> Eq(MapGet(result, k.get)(FramedMapGet), MapGet(v.get, k.get)(FramedMapGet)))
+              Eq(MapKeySet(result), MapKeySet(v.get)) && Forall(
+                Seq(k),
+                Seq(Seq(MapGet(result, k.get)(TriggerPatternBlame))),
+                SetMember(k.get, MapKeySet(result)) ==> Eq(
+                  MapGet(result, k.get)(FramedMapGet),
+                  MapGet(v.get, k.get)(FramedMapGet),
+                ),
+              )
             ),
           )
         })
 
         globalDeclarations.declare(f)
-        FunctionInvocation[Post](f.ref, Seq(e), Nil, Nil, Nil)(PanicBlame("Default coercion for map<_, _> requires nothing."))
+        FunctionInvocation[Post](f.ref, Seq(e), Nil, Nil, Nil)(PanicBlame(
+          "Default coercion for map<_, _> requires nothing."
+        ))
       case CoerceMapTuple(inner, sourceTypes, targetTypes) =>
-        LiteralTuple(targetTypes.map(dispatch), inner.zipWithIndex.map { case (c, i) => applyCoercion(TupGet(e, i), c) })
-      case CoerceMapType(inner, source, target) =>
-        ???
-      case CoerceMapVector(inner, sourceVectorElement, targetVectorElement, size) =>
+        LiteralTuple(
+          targetTypes.map(dispatch),
+          inner.zipWithIndex.map { case (c, i) =>
+            applyCoercion(TupGet(e, i), c)
+          },
+        )
+      case CoerceMapType(inner, source, target) => ???
+      case CoerceMapVector(
+            inner,
+            sourceVectorElement,
+            targetVectorElement,
+            size,
+          ) =>
         val f: Function[Post] = withResult((result: Result[Post]) => {
-          val v = new Variable[Post](TVector(size, dispatch(sourceVectorElement)))
+          val v =
+            new Variable[Post](TVector(size, dispatch(sourceVectorElement)))
           val i = new Variable[Post](TInt())
           val result_i = VectorSubscript(result, i.get)(FramedVectorIndex)
           val v_i = VectorSubscript(v.get, i.get)(FramedVectorIndex)
@@ -177,16 +241,22 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
             contractBlame = TrueSatisfiable,
             returnType = TVector(size, dispatch(targetVectorElement)),
             args = Seq(v),
-            ensures = UnitAccountedPredicate(
-                Forall(Seq(i), Seq(Seq(result_i)),
-                  (const[Post](0) <= i.get && i.get < const(size)) ==>
-                    (result_i === applyCoercion(v_i, inner)))
-            ),
-          )(o.where(name= "CoerceMapVector<" + sourceVectorElement.toString + "," + targetVectorElement.toString + ">"))
+            ensures = UnitAccountedPredicate(Forall(
+              Seq(i),
+              Seq(Seq(result_i)),
+              (const[Post](0) <= i.get && i.get < const(size)) ==>
+                (result_i === applyCoercion(v_i, inner)),
+            )),
+          )(o.where(name =
+            "CoerceMapVector<" + sourceVectorElement.toString + "," +
+              targetVectorElement.toString + ">"
+          ))
         })
 
         globalDeclarations.declare(f)
-        FunctionInvocation[Post](f.ref, Seq(e), Nil, Nil, Nil)(PanicBlame("default coercion for vector<_> requires nothing."))
+        FunctionInvocation[Post](f.ref, Seq(e), Nil, Nil, Nil)(PanicBlame(
+          "default coercion for vector<_> requires nothing."
+        ))
 
       case CoerceBoolResource() => e
       case CoerceResourceResourceVal() => e
@@ -234,62 +304,64 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
     }
   }
 
-  def coerceAny(node: NodeFamily[Pre]): NodeFamily[Pre] = node match {
-    case node: Verification[Pre] => node
-    case node: VerificationContext[Pre] => node
-    case node: Program[Pre] => node
-    case node: Statement[Pre] => coerce(node)
-    case node: Expr[Pre] => coerce(node)
-    case node: Type[Pre] => node
-    case node: DecreasesClause[Pre] => node
-    case node: AccountedPredicate[Pre] => node
-    case node: ApplicableContract[Pre] => node
-    case node: LoopContract[Pre] => node
-    case node: ParRegion[Pre] => coerce(node)
-    case node: CatchClause[Pre] => node
-    case node: SignalsClause[Pre] => node
-    case node: FieldFlag[Pre] => node
-    case node: IterVariable[Pre] => node
-    case node: CDeclaration[Pre] => node
-    case node: CDeclarator[Pre] => node
-    case node: CDeclarationSpecifier[Pre] => node
-    case node: CTypeExtensions[Pre] => node
-    case node: CTypeQualifier[Pre] => node
-    case node: CPointer[Pre] => node
-    case node: CInit[Pre] => node
-    case node: CPPDeclarator[Pre] => node
-    case node: CPPDeclarationSpecifier[Pre] => node
-    case node: CPPDeclaration[Pre] => node
-    case node: CPPAddressing[Pre] => node
-    case node: CPPInit[Pre] => node
-    case node: CPPExprOrTypeSpecifier[Pre] => node
-    case node: GpuMemoryFence[Pre] => node
-    case node: JavaModifier[Pre] => node
-    case node: JavaImport[Pre] => node
-    case node: JavaName[Pre] => node
-    case node: JavaVariableDeclaration[Pre] => node
-    case node: Coercion[Pre] => node
-    case node: Location[Pre] => node
-    case node: Operator[Pre] => node
-    case node: BipPortType[Pre] => node
-    case node: JavaBipGlueName[Pre] => node
-    case node: JavaBipGlueElement[Pre] => node
-    case node: BipGlueRequires[Pre] => node
-    case node: BipGlueAccepts[Pre] => node
-    case node: BipGlueDataWire[Pre] => node
-    case node: BipTransitionSignature[Pre] => node
-    case node: LlvmFunctionContract[Pre] => node
-    case node: LlvmLoopContract[Pre] => node
-    case node: ProverLanguage[Pre] => node
-    case node: SmtlibFunctionSymbol[Pre] => node
-    case node: ChorRun[Pre] => node
-    case node: ChorGuard[Pre] => coerce(node)
-    case node: PVLEndpointName[Pre] => coerce(node)
-    case node: EndpointName[Pre] => coerce(node)
-  }
+  def coerceAny(node: NodeFamily[Pre]): NodeFamily[Pre] =
+    node match {
+      case node: Verification[Pre] => node
+      case node: VerificationContext[Pre] => node
+      case node: Program[Pre] => node
+      case node: Statement[Pre] => coerce(node)
+      case node: Expr[Pre] => coerce(node)
+      case node: Type[Pre] => node
+      case node: DecreasesClause[Pre] => node
+      case node: AccountedPredicate[Pre] => node
+      case node: ApplicableContract[Pre] => node
+      case node: LoopContract[Pre] => node
+      case node: ParRegion[Pre] => coerce(node)
+      case node: CatchClause[Pre] => node
+      case node: SignalsClause[Pre] => node
+      case node: FieldFlag[Pre] => node
+      case node: IterVariable[Pre] => node
+      case node: CDeclaration[Pre] => node
+      case node: CDeclarator[Pre] => node
+      case node: CDeclarationSpecifier[Pre] => node
+      case node: CTypeExtensions[Pre] => node
+      case node: CTypeQualifier[Pre] => node
+      case node: CPointer[Pre] => node
+      case node: CInit[Pre] => node
+      case node: CPPDeclarator[Pre] => node
+      case node: CPPDeclarationSpecifier[Pre] => node
+      case node: CPPDeclaration[Pre] => node
+      case node: CPPAddressing[Pre] => node
+      case node: CPPInit[Pre] => node
+      case node: CPPExprOrTypeSpecifier[Pre] => node
+      case node: GpuMemoryFence[Pre] => node
+      case node: JavaModifier[Pre] => node
+      case node: JavaImport[Pre] => node
+      case node: JavaName[Pre] => node
+      case node: JavaVariableDeclaration[Pre] => node
+      case node: Coercion[Pre] => node
+      case node: Location[Pre] => node
+      case node: Operator[Pre] => node
+      case node: BipPortType[Pre] => node
+      case node: JavaBipGlueName[Pre] => node
+      case node: JavaBipGlueElement[Pre] => node
+      case node: BipGlueRequires[Pre] => node
+      case node: BipGlueAccepts[Pre] => node
+      case node: BipGlueDataWire[Pre] => node
+      case node: BipTransitionSignature[Pre] => node
+      case node: LlvmFunctionContract[Pre] => node
+      case node: LlvmLoopContract[Pre] => node
+      case node: ProverLanguage[Pre] => node
+      case node: SmtlibFunctionSymbol[Pre] => node
+      case node: ChorRun[Pre] => node
+      case node: ChorGuard[Pre] => coerce(node)
+      case node: PVLEndpointName[Pre] => coerce(node)
+      case node: EndpointName[Pre] => coerce(node)
+    }
 
   def preCoerce(decl: Declaration[Pre]): Declaration[Pre] = decl
-  def postCoerce(decl: Declaration[Pre]): Unit = allScopes.anySucceed(decl, decl.rewriteDefault())
+  def postCoerce(decl: Declaration[Pre]): Unit =
+    allScopes.anySucceed(decl, decl.rewriteDefault())
   override final def dispatch(decl: Declaration[Pre]): Unit = {
     val coercedDecl = coerce(preCoerce(decl))
     coercedDeclaration(decl) = coercedDecl
@@ -300,33 +372,55 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
     throw Unreachable("Coercions are rewritten by the Expr dispatch")
   }
 
-  def coerce(value: Expr[Pre], target: Type[Pre], canCDemote: Boolean = false): Expr[Pre] =
-    ApplyCoercion(value, CoercionUtils.getAnyCoercion(value.t, target) match {
-      case Some(coercion) if canCDemote || coercion.isCPromoting => coercion
-      case _ => throw Incoercible(value, target)
-    })(coercionOrigin(value))
+  def coerce(
+      value: Expr[Pre],
+      target: Type[Pre],
+      canCDemote: Boolean = false,
+  ): Expr[Pre] =
+    ApplyCoercion(
+      value,
+      CoercionUtils.getAnyCoercion(value.t, target) match {
+        case Some(coercion) if canCDemote || coercion.isCPromoting => coercion
+        case _ => throw Incoercible(value, target)
+      },
+    )(coercionOrigin(value))
 
   def coerceArgs(args: Seq[Expr[Pre]], app: Applicable[Pre]): Seq[Expr[Pre]] =
-    args.zip(app.args).map {
-      case (value, arg) => coerce(value, arg.t)
-    }
-
-  def coerceArgs(args: Seq[Expr[Pre]], app: ContractApplicable[Pre], typeEnv: Map[Variable[Pre], Type[Pre]] = Map.empty, canCDemote: Boolean = false): Seq[Expr[Pre]] =
-    args.zip(app.args).map {
-      case (value, arg) => coerce(value, arg.t.particularize(typeEnv), canCDemote)
+    args.zip(app.args).map { case (value, arg) => coerce(value, arg.t) }
+
+  def coerceArgs(
+      args: Seq[Expr[Pre]],
+      app: ContractApplicable[Pre],
+      typeEnv: Map[Variable[Pre], Type[Pre]] = Map.empty,
+      canCDemote: Boolean = false,
+  ): Seq[Expr[Pre]] =
+    args.zip(app.args).map { case (value, arg) =>
+      coerce(value, arg.t.particularize(typeEnv), canCDemote)
     }
 
-  def coerceGiven(givenMap: Seq[(Ref[Pre, Variable[Pre]], Expr[Pre])], canCDemote: Boolean = false): Seq[(Ref[Pre, Variable[Pre]], Expr[Pre])] =
-    givenMap.map {
-      case (Ref(v), e) => (v.ref, coerce(e, v.t, canCDemote))
-    }
-
-  def coerceYields(yields: Seq[(Expr[Pre], Ref[Pre, Variable[Pre]])], blame: => Expr[_]): Seq[(Expr[Pre], Ref[Pre, Variable[Pre]])] =
-    yields.map {
-      case (target, Ref(yieldArg)) => CoercionUtils.getCoercion[Pre](yieldArg.t, target.t) match {
-        case None => throw IncoercibleExplanation(blame, "The target for a yielded argument does not exactly match the yields type.")
+  def coerceGiven(
+      givenMap: Seq[(Ref[Pre, Variable[Pre]], Expr[Pre])],
+      canCDemote: Boolean = false,
+  ): Seq[(Ref[Pre, Variable[Pre]], Expr[Pre])] =
+    givenMap.map { case (Ref(v), e) => (v.ref, coerce(e, v.t, canCDemote)) }
+
+  def coerceYields(
+      yields: Seq[(Expr[Pre], Ref[Pre, Variable[Pre]])],
+      blame: => Expr[_],
+  ): Seq[(Expr[Pre], Ref[Pre, Variable[Pre]])] =
+    yields.map { case (target, Ref(yieldArg)) =>
+      CoercionUtils.getCoercion[Pre](yieldArg.t, target.t) match {
+        case None =>
+          throw IncoercibleExplanation(
+            blame,
+            "The target for a yielded argument does not exactly match the yields type.",
+          )
         case Some(CoerceIdentity(_)) => (target, yieldArg.ref)
-        case Some(_) => throw IncoercibleExplanation(blame, "The target for a yielded argument does not exactly match the yields type.")
+        case Some(_) =>
+          throw IncoercibleExplanation(
+            blame,
+            "The target for a yielded argument does not exactly match the yields type.",
+          )
       }
     }
 
@@ -336,12 +430,15 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
   def int(e: Expr[Pre]): Expr[Pre] = coerce(e, TInt[Pre]())
   def string(e: Expr[Pre]): Expr[Pre] = coerce(e, TString[Pre]())
   def float(e: Expr[Pre]): Expr[Pre] =
-    firstOk(e, "Expected float",
+    firstOk(
+      e,
+      "Expected float",
       coerce(e, TFloats.ieee754_32bit[Pre]),
-      coerce(e, TFloats.ieee754_64bit[Pre])
+      coerce(e, TFloats.ieee754_64bit[Pre]),
     )
   def floatOp2[T](e: BinExpr[Pre], f: (Expr[Pre], Expr[Pre]) => T): T = {
-    val max = TFloats.getFloatMax(e.left.t, e.right.t).getOrElse(TFloats.ieee754_64bit[Pre])
+    val max = TFloats.getFloatMax(e.left.t, e.right.t)
+      .getOrElse(TFloats.ieee754_64bit[Pre])
     f(coerce(e.left, max), coerce(e.right, max))
   }
   def process(e: Expr[Pre]): Expr[Pre] = coerce(e, TProcess[Pre]())
@@ -349,99 +446,132 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
   def cls(e: Expr[Pre]): Expr[Pre] = coerce(e, TAnyClass[Pre]())
   def option(e: Expr[Pre]): (Expr[Pre], TOption[Pre]) =
     CoercionUtils.getAnyOptionCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"option")
     }
   def tuple(e: Expr[Pre]): (Expr[Pre], TTuple[Pre]) =
     CoercionUtils.getAnyTupleCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"tuple")
     }
   def seq(e: Expr[Pre]): (Expr[Pre], TSeq[Pre]) =
     CoercionUtils.getAnySeqCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"sequence")
     }
   def set(e: Expr[Pre]): (Expr[Pre], TSet[Pre]) =
     CoercionUtils.getAnySetCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"set")
     }
   def vector(e: Expr[Pre]): (Expr[Pre], TVector[Pre]) =
     CoercionUtils.getAnyVectorCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"vector")
     }
-  def vectorType(e: Expr[Pre], elementType: Type[Pre], typeName: String): (Expr[Pre], TVector[Pre]) =
+  def vectorType(
+      e: Expr[Pre],
+      elementType: Type[Pre],
+      typeName: String,
+  ): (Expr[Pre], TVector[Pre]) =
     CoercionUtils.getAnyVectorCoercion(e.t) match {
       case Some((coercionOuter, t)) =>
         CoercionUtils.getCoercion(t.element, elementType) match {
           case Some(CoerceIdentity(_)) => (e, TVector(t.size, elementType))
           case Some(coercionInner) =>
-            val c = CoerceMapVector(coercionInner, t.element, elementType, t.size)(coercionOrigin(e))
-            (ApplyCoercion(e, c)(coercionOrigin(e)), TVector(t.size, elementType))
+            val c =
+              CoerceMapVector(coercionInner, t.element, elementType, t.size)(
+                coercionOrigin(e)
+              )
+            (
+              ApplyCoercion(e, c)(coercionOrigin(e)),
+              TVector(t.size, elementType),
+            )
           case None => throw IncoercibleText(e, s"$typeName vector")
         }
       case None => throw IncoercibleText(e, s"$typeName vector")
     }
-  def vectorInt(e: Expr[Pre]): (Expr[Pre], TVector[Pre]) = vectorType(e, TInt(), "int")
+  def vectorInt(e: Expr[Pre]): (Expr[Pre], TVector[Pre]) =
+    vectorType(e, TInt(), "int")
   def vectorFloat(e: Expr[Pre]): (Expr[Pre], TVector[Pre]) =
-    firstOk(e, "Expected float vector",
-    vectorType(e, TFloats.ieee754_32bit[Pre], "float"),
-    vectorType(e, TFloats.ieee754_64bit[Pre], "float")
+    firstOk(
+      e,
+      "Expected float vector",
+      vectorType(e, TFloats.ieee754_32bit[Pre], "float"),
+      vectorType(e, TFloats.ieee754_64bit[Pre], "float"),
     )
-  def vectorRational(e: Expr[Pre]): (Expr[Pre], TVector[Pre]) = vectorType(e, TRational(), "rational")
+  def vectorRational(e: Expr[Pre]): (Expr[Pre], TVector[Pre]) =
+    vectorType(e, TRational(), "rational")
   def bag(e: Expr[Pre]): (Expr[Pre], TBag[Pre]) =
     CoercionUtils.getAnyBagCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"bag")
     }
   def map(e: Expr[Pre]): (Expr[Pre], TMap[Pre]) =
     CoercionUtils.getAnyMapCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"map")
     }
   def sized(e: Expr[Pre]): (Expr[Pre], SizedType[Pre]) =
     CoercionUtils.getAnySizedCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"collection type")
     }
   def array(e: Expr[Pre]): (Expr[Pre], TArray[Pre]) =
     CoercionUtils.getAnyArrayCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"array")
     }
   def arrayMatrix(e: Expr[Pre]): (Expr[Pre], TArray[Pre]) =
     CoercionUtils.getAnyMatrixArrayCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"two-dimensional array")
     }
   def pointer(e: Expr[Pre]): (Expr[Pre], TPointer[Pre]) =
     CoercionUtils.getAnyPointerCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"pointer")
     }
   def matrix(e: Expr[Pre]): (Expr[Pre], TMatrix[Pre]) =
     CoercionUtils.getAnyMatrixCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"matrix")
     }
   def model(e: Expr[Pre]): (Expr[Pre], TModel[Pre]) =
     CoercionUtils.getAnyModelCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"model")
     }
   def either(e: Expr[Pre]): (Expr[Pre], TEither[Pre]) =
     CoercionUtils.getAnyEitherCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"either")
     }
   def bitvec(e: Expr[Pre]): (Expr[Pre], TSmtlibBitVector[Pre]) =
     CoercionUtils.getAnyBitvecCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"(_ BitVec ?)")
     }
-  def bitvec2[T](e1: Expr[Pre], e2: Expr[Pre], f: (Expr[Pre], Expr[Pre]) => T): T = {
+  def bitvec2[T](
+      e1: Expr[Pre],
+      e2: Expr[Pre],
+      f: (Expr[Pre], Expr[Pre]) => T,
+  ): T = {
     val (e1c, t) = bitvec(e1)
     val e2c = coerce(e2, t)
     f(e1c, e2c)
@@ -449,32 +579,51 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
   def vectorIntOp2[T](e: BinExpr[Pre], f: (Expr[Pre], Expr[Pre]) => T): T = {
     implicit val o: Origin = e.o
     val (left, right) = (vectorInt(e.left), vectorInt(e.right))
-    if (left._2.size != right._2.size) throw IncoercibleText(e, "This expression does not have a matching vector lengths")
+    if (left._2.size != right._2.size)
+      throw IncoercibleText(
+        e,
+        "This expression does not have a matching vector lengths",
+      )
     f(left._1, right._1)
   }
   def vectorFloatOp2[T](e: BinExpr[Pre], f: (Expr[Pre], Expr[Pre]) => T): T = {
     implicit val o: Origin = e.o
     val (left, right) = (vectorFloat(e.left), vectorFloat(e.right))
-    if (left._2.size != right._2.size) throw IncoercibleText(e, "This expression does not have a matching vector lengths")
+    if (left._2.size != right._2.size)
+      throw IncoercibleText(
+        e,
+        "This expression does not have a matching vector lengths",
+      )
     f(left._1, right._1)
   }
   def vectorOp2[T](e: BinExpr[Pre], f: (Expr[Pre], Expr[Pre]) => T): T = {
     implicit val o: Origin = e.o
-    val (left, right) =
-      firstOk(e, s"Expected both operands to be of type vector[integer or float or rational], but got ${e.left.t} and ${e.right.t}.",
-        (vectorInt(e.left), vectorInt(e.right)),
-        (vectorFloat(e.left), vectorFloat(e.right)),
-        (vectorRational(e.left), vectorRational(e.right)),
+    val (left, right) = firstOk(
+      e,
+      s"Expected both operands to be of type vector[integer or float or rational], but got ${e
+          .left.t} and ${e.right.t}.",
+      (vectorInt(e.left), vectorInt(e.right)),
+      (vectorFloat(e.left), vectorFloat(e.right)),
+      (vectorRational(e.left), vectorRational(e.right)),
+    )
+    if (left._2.size != right._2.size)
+      throw IncoercibleText(
+        e,
+        "This expression does not have a matching vector lengths",
       )
-    if (left._2.size != right._2.size) throw IncoercibleText(e, "This expression does not have a matching vector lengths")
     f(left._1, right._1)
   }
   def fp(e: Expr[Pre]): (Expr[Pre], TSmtlibFloatingPoint[Pre]) =
     CoercionUtils.getAnySmtlibFloatCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"(_ FloatingPoint ? ?)")
     }
-  def fp2[T](e1: Expr[Pre], e2: Expr[Pre], f: (Expr[Pre], Expr[Pre]) => T): T = {
+  def fp2[T](
+      e1: Expr[Pre],
+      e2: Expr[Pre],
+      f: (Expr[Pre], Expr[Pre]) => T,
+  ): T = {
     val (e1c, t) = fp(e1)
     val e2c = coerce(e2, t)
     f(e1c, e2c)
@@ -483,91 +632,98 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
   def smtstr(e: Expr[Pre]): Expr[Pre] = coerce(e, TSmtlibString())
   def smtarr(e: Expr[Pre]): (Expr[Pre], TSmtlibArray[Pre]) =
     CoercionUtils.getAnySmtlibArrayCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"(Array ? ?)")
     }
   def z3seq(e: Expr[Pre]): (Expr[Pre], TSmtlibSeq[Pre]) =
     CoercionUtils.getAnySmtlibSeqCoercion(e.t) match {
-      case Some((coercion, t)) => (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
+      case Some((coercion, t)) =>
+        (ApplyCoercion(e, coercion)(coercionOrigin(e)), t)
       case None => throw IncoercibleText(e, s"(Seq ?)")
     }
 
   def arity(t: TClass[Pre]): TClass[Pre] =
-    if (t.cls.decl.typeArgs.length == t.typeArgs.length) t
-    else throw IncoercibleExplanation(t, s"type has ${t.typeArgs.length} type arguments, but class definition has ${t.cls.decl.typeArgs.length} type arguments")
+    if (t.cls.decl.typeArgs.length == t.typeArgs.length)
+      t
+    else
+      throw IncoercibleExplanation(
+        t,
+        s"type has ${t.typeArgs.length} type arguments, but class definition has ${t
+            .cls.decl.typeArgs.length} type arguments",
+      )
 
   def arity(inv: Invocation[Pre]): Invocation[Pre] = {
     if (inv.ref.decl.typeArgs.length != inv.typeArgs.length) {
-      throw IncoercibleExplanation(inv, s"expected ${inv.ref.decl.typeArgs.length} type arguments, got ${inv.typeArgs.length} type arguments")
+      throw IncoercibleExplanation(
+        inv,
+        s"expected ${inv.ref.decl.typeArgs.length} type arguments, got ${inv.typeArgs.length} type arguments",
+      )
     }
     if (inv.ref.decl.args.length != inv.args.length) {
-      throw IncoercibleExplanation(inv, s"expected ${inv.ref.decl.typeArgs.length} type arguments, got ${inv.typeArgs.length} type arguments")
+      throw IncoercibleExplanation(
+        inv,
+        s"expected ${inv.ref.decl.typeArgs.length} type arguments, got ${inv.typeArgs.length} type arguments",
+      )
     }
     inv
   }
 
-  def firstOkHelper[T](thing: Either[Seq[CoercionError], T], onError: => T): Either[Seq[CoercionError], T] =
+  def firstOkHelper[T](
+      thing: Either[Seq[CoercionError], T],
+      onError: => T,
+  ): Either[Seq[CoercionError], T] =
     thing match {
-      case Left(errs) => try {
-        Right(onError)
-      } catch {
-        case err: CoercionError => Left(errs :+ err)
-      }
+      case Left(errs) =>
+        try { Right(onError) }
+        catch { case err: CoercionError => Left(errs :+ err) }
       case Right(value) => Right(value)
     }
 
   implicit class FirstOkHelper[T](res: Either[Seq[CoercionError], T]) {
     def onCoercionError(f: => T): Either[Seq[CoercionError], T] =
       res match {
-        case Left(errs) => try {
-          Right(f)
-        } catch {
-          case err: CoercionError => Left(errs :+ err)
-        }
+        case Left(errs) =>
+          try { Right(f) }
+          catch { case err: CoercionError => Left(errs :+ err) }
         case Right(value) => Right(value)
       }
   }
 
-  def firstOk[T](expr: Expr[Pre], message: => String,
-                  alt1: => T = throw IncoercibleDummy,
-                  alt2: => T = throw IncoercibleDummy,
-                  alt3: => T = throw IncoercibleDummy,
-                  alt4: => T = throw IncoercibleDummy,
-                  alt5: => T = throw IncoercibleDummy,
-                  alt6: => T = throw IncoercibleDummy,
-                  alt7: => T = throw IncoercibleDummy,
-                  alt8: => T = throw IncoercibleDummy,
-                  alt9: => T = throw IncoercibleDummy,
-                  alt10: => T = throw IncoercibleDummy,
-                  alt11: => T = throw IncoercibleDummy,
-                  alt12: => T = throw IncoercibleDummy) : T = {
-    Left(Nil)
-      .onCoercionError(alt1)
-      .onCoercionError(alt2)
-      .onCoercionError(alt3)
-      .onCoercionError(alt4)
-      .onCoercionError(alt5)
-      .onCoercionError(alt6)
-      .onCoercionError(alt7)
-      .onCoercionError(alt8)
-      .onCoercionError(alt9)
-      .onCoercionError(alt10)
-      .onCoercionError(alt11)
-      .onCoercionError(alt12)
-    match {
+  def firstOk[T](
+      expr: Expr[Pre],
+      message: => String,
+      alt1: => T = throw IncoercibleDummy,
+      alt2: => T = throw IncoercibleDummy,
+      alt3: => T = throw IncoercibleDummy,
+      alt4: => T = throw IncoercibleDummy,
+      alt5: => T = throw IncoercibleDummy,
+      alt6: => T = throw IncoercibleDummy,
+      alt7: => T = throw IncoercibleDummy,
+      alt8: => T = throw IncoercibleDummy,
+      alt9: => T = throw IncoercibleDummy,
+      alt10: => T = throw IncoercibleDummy,
+      alt11: => T = throw IncoercibleDummy,
+      alt12: => T = throw IncoercibleDummy,
+  ): T = {
+    Left(Nil).onCoercionError(alt1).onCoercionError(alt2).onCoercionError(alt3)
+      .onCoercionError(alt4).onCoercionError(alt5).onCoercionError(alt6)
+      .onCoercionError(alt7).onCoercionError(alt8).onCoercionError(alt9)
+      .onCoercionError(alt10).onCoercionError(alt11)
+      .onCoercionError(alt12) match {
       case Left(errs) =>
-        for(err <- errs) {
-          logger.debug(err.text)
-        }
+        for (err <- errs) { logger.debug(err.text) }
         throw IncoercibleExplanation(expr, message)
       case Right(value) => value
     }
   }
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case ApplyCoercion(e, coercion) => applyCoercion(dispatch(e), coercion)(e.o)
-    case e => e.rewriteDefault()
-  }
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case ApplyCoercion(e, coercion) =>
+        applyCoercion(dispatch(e), coercion)(e.o)
+      case e => e.rewriteDefault()
+    }
 
   def coerce(e: Expr[Pre]): Expr[Pre] = {
     implicit val o: Origin = e.o
@@ -577,288 +733,438 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
 
       case ActionApply(action, args) =>
         ActionApply(action, coerceArgs(args, action.decl))
-      case ActionPerm(loc, perm) =>
-        ActionPerm(loc, rat(perm))
-      case AddrOf(e) =>
-        AddrOf(e)
-      case ADTFunctionInvocation(typeArgs, ref, args) => typeArgs match {
-        case Some((adt, typeArgs)) =>
-          ADTFunctionInvocation(Some((adt, typeArgs)), ref, args.zip(ref.decl.args).map {
-            case (value, arg) =>
-              try {
-                coerce(value, arg.t.particularize(adt.decl.typeArgs.zip(typeArgs).toMap))
-              } catch {
-                case x: CoercionError =>
-                  println(x.text)
-                  ???
-              }
-          })
-        case None =>
-          ADTFunctionInvocation(None, ref, coerceArgs(args, ref.decl))
-      }
+      case ActionPerm(loc, perm) => ActionPerm(loc, rat(perm))
+      case AddrOf(e) => AddrOf(e)
+      case ADTFunctionInvocation(typeArgs, ref, args) =>
+        typeArgs match {
+          case Some((adt, typeArgs)) =>
+            ADTFunctionInvocation(
+              Some((adt, typeArgs)),
+              ref,
+              args.zip(ref.decl.args).map { case (value, arg) =>
+                try {
+                  coerce(
+                    value,
+                    arg.t.particularize(adt.decl.typeArgs.zip(typeArgs).toMap),
+                  )
+                } catch {
+                  case x: CoercionError =>
+                    println(x.text)
+                    ???
+                }
+              },
+            )
+          case None =>
+            ADTFunctionInvocation(None, ref, coerceArgs(args, ref.decl))
+        }
       case AmbiguousComputationalAnd(left, right) =>
-        firstOk(e, s"Expected both operands to be of type integer or boolean, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected both operands to be of type integer or boolean, but got ${left
+              .t} and ${right.t}.",
           AmbiguousComputationalAnd(int(left), int(right)),
           AmbiguousComputationalAnd(bool(left), bool(right)),
         )
       case AmbiguousComputationalOr(left, right) =>
-        firstOk(e, s"Expected both operands to be of type integer or boolean, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected both operands to be of type integer or boolean, but got ${left
+              .t} and ${right.t}.",
           AmbiguousComputationalOr(int(left), int(right)),
           AmbiguousComputationalOr(bool(left), bool(right)),
         )
       case AmbiguousComputationalXor(left, right) =>
-        firstOk(e, s"Expected both operands to be of type integer or boolean, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected both operands to be of type integer or boolean, but got ${left
+              .t} and ${right.t}.",
           AmbiguousComputationalXor(int(left), int(right)),
           AmbiguousComputationalXor(bool(left), bool(right)),
         )
-      case div@AmbiguousDiv(left, right) =>
-        firstOk(e, s"Expected both operands to be int, float, vector[int] or vector[float], but got ${left.t} and ${right.t}.",
+      case div @ AmbiguousDiv(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be int, float, vector[int] or vector[float], but got ${left
+              .t} and ${right.t}.",
           AmbiguousDiv(int(left), int(right))(div.blame),
-          floatOp2(div, (l,r) => AmbiguousDiv(l, r)(div.blame)),
-          vectorIntOp2(div, (l,r) => AmbiguousDiv(l ,r)(div.blame)),
-          vectorFloatOp2(div, (l,r) => AmbiguousDiv(l ,r)(div.blame)),
+          floatOp2(div, (l, r) => AmbiguousDiv(l, r)(div.blame)),
+          vectorIntOp2(div, (l, r) => AmbiguousDiv(l, r)(div.blame)),
+          vectorFloatOp2(div, (l, r) => AmbiguousDiv(l, r)(div.blame)),
         )
       case AmbiguousEq(left, right, vectorInnerType) =>
         val sharedType = Types.leastCommonSuperType(left.t, right.t)
-        AmbiguousEq(coerce(left, sharedType), coerce(right, sharedType), vectorInnerType)
-      case g@AmbiguousGreater(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, a set, or a bag, but got ${left.t} and ${right.t}.",
+        AmbiguousEq(
+          coerce(left, sharedType),
+          coerce(right, sharedType),
+          vectorInnerType,
+        )
+      case g @ AmbiguousGreater(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, a set, or a bag, but got ${left
+              .t} and ${right.t}.",
           AmbiguousGreater(int(left), int(right)),
-          floatOp2(g, (l,r) => AmbiguousGreater(l, r)),
+          floatOp2(g, (l, r) => AmbiguousGreater(l, r)),
           AmbiguousGreater(rat(left), rat(right)), {
             val (coercedLeft, leftSet) = set(left)
             val (coercedRight, rightSet) = set(right)
-            val sharedType = Types.leastCommonSuperType(leftSet.element, rightSet.element)
-            AmbiguousGreater(coerce(coercedLeft, TSet(sharedType)), coerce(coercedRight, TSet(sharedType)))
+            val sharedType = Types
+              .leastCommonSuperType(leftSet.element, rightSet.element)
+            AmbiguousGreater(
+              coerce(coercedLeft, TSet(sharedType)),
+              coerce(coercedRight, TSet(sharedType)),
+            )
           }, {
             val (coercedLeft, leftBag) = bag(left)
             val (coercedRight, rightBag) = bag(right)
-            val sharedType = Types.leastCommonSuperType(leftBag.element, rightBag.element)
-            AmbiguousGreater(coerce(coercedLeft, TBag(sharedType)), coerce(coercedRight, TBag(sharedType)))
+            val sharedType = Types
+              .leastCommonSuperType(leftBag.element, rightBag.element)
+            AmbiguousGreater(
+              coerce(coercedLeft, TBag(sharedType)),
+              coerce(coercedRight, TBag(sharedType)),
+            )
           },
         )
-      case g@AmbiguousGreaterEq(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, a set, or a bag, but got ${left.t} and ${right.t}.",
+      case g @ AmbiguousGreaterEq(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, a set, or a bag, but got ${left
+              .t} and ${right.t}.",
           AmbiguousGreaterEq(int(left), int(right)),
-          floatOp2(g, (l,r) => AmbiguousGreaterEq(l, r)),
+          floatOp2(g, (l, r) => AmbiguousGreaterEq(l, r)),
           AmbiguousGreaterEq(rat(left), rat(right)), {
             val (coercedLeft, leftSet) = set(left)
             val (coercedRight, rightSet) = set(right)
-            val sharedType = Types.leastCommonSuperType(leftSet.element, rightSet.element)
-            AmbiguousGreaterEq(coerce(coercedLeft, TSet(sharedType)), coerce(coercedRight, TSet(sharedType)))
+            val sharedType = Types
+              .leastCommonSuperType(leftSet.element, rightSet.element)
+            AmbiguousGreaterEq(
+              coerce(coercedLeft, TSet(sharedType)),
+              coerce(coercedRight, TSet(sharedType)),
+            )
           }, {
             val (coercedLeft, leftBag) = bag(left)
             val (coercedRight, rightBag) = bag(right)
-            val sharedType = Types.leastCommonSuperType(leftBag.element, rightBag.element)
-            AmbiguousGreaterEq(coerce(coercedLeft, TBag(sharedType)), coerce(coercedRight, TBag(sharedType)))
+            val sharedType = Types
+              .leastCommonSuperType(leftBag.element, rightBag.element)
+            AmbiguousGreaterEq(
+              coerce(coercedLeft, TBag(sharedType)),
+              coerce(coercedRight, TBag(sharedType)),
+            )
           },
         )
-      case l@AmbiguousLess(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, a set, or a bag, but got ${left.t} and ${right.t}.",
+      case l @ AmbiguousLess(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, a set, or a bag, but got ${left
+              .t} and ${right.t}.",
           AmbiguousLess(int(left), int(right)),
-          floatOp2(l, (l,r) => AmbiguousLess(l, r)),
+          floatOp2(l, (l, r) => AmbiguousLess(l, r)),
           AmbiguousLess(rat(left), rat(right)), {
             val (coercedLeft, leftSet) = set(left)
             val (coercedRight, rightSet) = set(right)
-            val sharedType = Types.leastCommonSuperType(leftSet.element, rightSet.element)
-            AmbiguousLess(coerce(coercedLeft, TSet(sharedType)), coerce(coercedRight, TSet(sharedType)))
+            val sharedType = Types
+              .leastCommonSuperType(leftSet.element, rightSet.element)
+            AmbiguousLess(
+              coerce(coercedLeft, TSet(sharedType)),
+              coerce(coercedRight, TSet(sharedType)),
+            )
           }, {
             val (coercedLeft, leftBag) = bag(left)
             val (coercedRight, rightBag) = bag(right)
-            val sharedType = Types.leastCommonSuperType(leftBag.element, rightBag.element)
-            AmbiguousLess(coerce(coercedLeft, TBag(sharedType)), coerce(coercedRight, TBag(sharedType)))
+            val sharedType = Types
+              .leastCommonSuperType(leftBag.element, rightBag.element)
+            AmbiguousLess(
+              coerce(coercedLeft, TBag(sharedType)),
+              coerce(coercedRight, TBag(sharedType)),
+            )
           },
         )
-      case l@AmbiguousLessEq(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, a set, or a bag, but got ${left.t} and ${right.t}.",
+      case l @ AmbiguousLessEq(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, a set, or a bag, but got ${left
+              .t} and ${right.t}.",
           AmbiguousLessEq(int(left), int(right)),
-          floatOp2(l, (l,r) => AmbiguousLessEq(l, r)),
+          floatOp2(l, (l, r) => AmbiguousLessEq(l, r)),
           AmbiguousLessEq(rat(left), rat(right)), {
             val (coercedLeft, leftSet) = set(left)
             val (coercedRight, rightSet) = set(right)
-            val sharedType = Types.leastCommonSuperType(leftSet.element, rightSet.element)
-            AmbiguousLessEq(coerce(coercedLeft, TSet(sharedType)), coerce(coercedRight, TSet(sharedType)))
+            val sharedType = Types
+              .leastCommonSuperType(leftSet.element, rightSet.element)
+            AmbiguousLessEq(
+              coerce(coercedLeft, TSet(sharedType)),
+              coerce(coercedRight, TSet(sharedType)),
+            )
           }, {
             val (coercedLeft, leftBag) = bag(left)
             val (coercedRight, rightBag) = bag(right)
-            val sharedType = Types.leastCommonSuperType(leftBag.element, rightBag.element)
-            AmbiguousLessEq(coerce(coercedLeft, TBag(sharedType)), coerce(coercedRight, TBag(sharedType)))
+            val sharedType = Types
+              .leastCommonSuperType(leftBag.element, rightBag.element)
+            AmbiguousLessEq(
+              coerce(coercedLeft, TBag(sharedType)),
+              coerce(coercedRight, TBag(sharedType)),
+            )
           },
         )
       case minus @ AmbiguousMinus(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, a numeric vector, a set or a bag; or a pointer and integer, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, a numeric vector, a set or a bag; or a pointer and integer, but got ${left
+              .t} and ${right.t}.",
           Minus(int(left), int(right)),
-          floatOp2(minus, (l,r) => Minus(l, r)),
-          Minus(rat(left), rat(right)), {
-            vectorOp2(minus, (l,r) => AmbiguousMinus(l,r)(minus.blame))
-          },
+          floatOp2(minus, (l, r) => Minus(l, r)),
+          Minus(rat(left), rat(right)),
+          { vectorOp2(minus, (l, r) => AmbiguousMinus(l, r)(minus.blame)) },
           AmbiguousMinus(pointer(left)._1, int(right))(minus.blame), {
             val (coercedLeft, TSet(elementLeft)) = set(left)
             val (coercedRight, TSet(elementRight)) = set(right)
-            val sharedType = Types.leastCommonSuperType(elementLeft, elementRight)
-            AmbiguousMinus(coerce(coercedLeft, TSet(sharedType)), coerce(coercedRight, TSet(sharedType)))(minus.blame)
+            val sharedType = Types
+              .leastCommonSuperType(elementLeft, elementRight)
+            AmbiguousMinus(
+              coerce(coercedLeft, TSet(sharedType)),
+              coerce(coercedRight, TSet(sharedType)),
+            )(minus.blame)
           }, {
             val (coercedLeft, TBag(elementLeft)) = bag(left)
             val (coercedRight, TBag(elementRight)) = bag(right)
-            val sharedType = Types.leastCommonSuperType(elementLeft, elementRight)
-            AmbiguousMinus(coerce(coercedLeft, TBag(sharedType)), coerce(coercedRight, TBag(sharedType)))(minus.blame)
-          }
+            val sharedType = Types
+              .leastCommonSuperType(elementLeft, elementRight)
+            AmbiguousMinus(
+              coerce(coercedLeft, TBag(sharedType)),
+              coerce(coercedRight, TBag(sharedType)),
+            )(minus.blame)
+          },
         )
       case AmbiguousMember(x, xs) =>
-        firstOk(xs, s"Expected collection to be a sequence, set, bag or map, but got ${xs.t}.", {
-          val (coercedXs, TSeq(element)) = seq(xs)
-          val sharedType = Types.leastCommonSuperType(x.t, element)
-          AmbiguousMember(coerce(x, sharedType), coerce(coercedXs, TSeq(sharedType)))
-        }, {
-          val (coercedXs, TSet(element)) = set(xs)
-          val sharedType = Types.leastCommonSuperType(x.t, element)
-          AmbiguousMember(coerce(x, sharedType), coerce(coercedXs, TSet(sharedType)))
-        }, {
-          val (coercedXs, TBag(element)) = bag(xs)
-          val sharedType = Types.leastCommonSuperType(x.t, element)
-          AmbiguousMember(coerce(x, sharedType), coerce(coercedXs, TBag(sharedType)))
-        }, {
-          val (coercedXs, TMap(element, _)) = map(xs)
-          AmbiguousMember(coerce(x, element), coercedXs)
-        })
-      case mod@AmbiguousMod(left, right) =>
-        firstOk(e, s"Expected both operands to be ints or vector[int], but got ${left.t} and ${right.t}.",
+        firstOk(
+          xs,
+          s"Expected collection to be a sequence, set, bag or map, but got ${xs.t}.", {
+            val (coercedXs, TSeq(element)) = seq(xs)
+            val sharedType = Types.leastCommonSuperType(x.t, element)
+            AmbiguousMember(
+              coerce(x, sharedType),
+              coerce(coercedXs, TSeq(sharedType)),
+            )
+          }, {
+            val (coercedXs, TSet(element)) = set(xs)
+            val sharedType = Types.leastCommonSuperType(x.t, element)
+            AmbiguousMember(
+              coerce(x, sharedType),
+              coerce(coercedXs, TSet(sharedType)),
+            )
+          }, {
+            val (coercedXs, TBag(element)) = bag(xs)
+            val sharedType = Types.leastCommonSuperType(x.t, element)
+            AmbiguousMember(
+              coerce(x, sharedType),
+              coerce(coercedXs, TBag(sharedType)),
+            )
+          }, {
+            val (coercedXs, TMap(element, _)) = map(xs)
+            AmbiguousMember(coerce(x, element), coercedXs)
+          },
+        )
+      case mod @ AmbiguousMod(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be ints or vector[int], but got ${left
+              .t} and ${right.t}.",
           AmbiguousMod(int(left), int(right))(mod.blame),
-          vectorIntOp2(mod, (l,r) => AmbiguousMod(l ,r)(mod.blame))
+          vectorIntOp2(mod, (l, r) => AmbiguousMod(l, r)(mod.blame)),
         )
-      case mult@AmbiguousMult(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, a numeric vector, a process, a set or a bag but got ${left.t} and ${right.t}.",
+      case mult @ AmbiguousMult(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, a numeric vector, a process, a set or a bag but got ${left
+              .t} and ${right.t}.",
           AmbiguousMult(int(left), int(right)),
-          floatOp2(mult, (l,r) => AmbiguousMult(l, r)),
-          AmbiguousMult(rat(left), rat(right)), {
-            vectorOp2(mult, (l,r) => AmbiguousMult(l,r))
-          },
+          floatOp2(mult, (l, r) => AmbiguousMult(l, r)),
+          AmbiguousMult(rat(left), rat(right)),
+          { vectorOp2(mult, (l, r) => AmbiguousMult(l, r)) },
           AmbiguousMult(process(left), process(right)), {
             val (coercedLeft, TSet(elementLeft)) = set(left)
             val (coercedRight, TSet(elementRight)) = set(right)
-            val sharedType = Types.leastCommonSuperType(elementLeft, elementRight)
-            AmbiguousMult(coerce(coercedLeft, TSet(sharedType)), coerce(coercedRight, TSet(sharedType)))
+            val sharedType = Types
+              .leastCommonSuperType(elementLeft, elementRight)
+            AmbiguousMult(
+              coerce(coercedLeft, TSet(sharedType)),
+              coerce(coercedRight, TSet(sharedType)),
+            )
           }, {
             val (coercedLeft, TBag(elementLeft)) = bag(left)
             val (coercedRight, TBag(elementRight)) = bag(right)
-            val sharedType = Types.leastCommonSuperType(elementLeft, elementRight)
-            AmbiguousMult(coerce(coercedLeft, TBag(sharedType)), coerce(coercedRight, TBag(sharedType)))
-          }
+            val sharedType = Types
+              .leastCommonSuperType(elementLeft, elementRight)
+            AmbiguousMult(
+              coerce(coercedLeft, TBag(sharedType)),
+              coerce(coercedRight, TBag(sharedType)),
+            )
+          },
         )
       case AmbiguousNeq(left, right, vectorInnerType) =>
         val sharedType = Types.leastCommonSuperType(left.t, right.t)
-        AmbiguousNeq(coerce(left, sharedType), coerce(right, sharedType), vectorInnerType)
+        AmbiguousNeq(
+          coerce(left, sharedType),
+          coerce(right, sharedType),
+          vectorInnerType,
+        )
       case AmbiguousOr(left, right) =>
-        firstOk(e, s"Expected both operands to be boolean or a process, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected both operands to be boolean or a process, but got ${left
+              .t} and ${right.t}.",
           AmbiguousOr(bool(left), bool(right)),
           AmbiguousOr(process(left), process(right)),
         )
       case plus @ AmbiguousPlus(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, a process, a sequence, set, bag, numeric vector, or string; or a pointer and integer, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, a process, a sequence, set, bag, numeric vector, or string; or a pointer and integer, but got ${left
+              .t} and ${right.t}.",
           AmbiguousPlus(int(left), int(right))(plus.blame),
-          floatOp2(plus, (l,r) => AmbiguousPlus(l, r)(plus.blame)),
+          floatOp2(plus, (l, r) => AmbiguousPlus(l, r)(plus.blame)),
           AmbiguousPlus(rat(left), rat(right))(plus.blame),
           AmbiguousPlus(process(left), process(right))(plus.blame),
           AmbiguousPlus(string(left), string(right))(plus.blame),
           AmbiguousPlus(pointer(left)._1, int(right))(plus.blame), {
             val (coercedLeft, TSeq(elementLeft)) = seq(left)
             val (coercedRight, TSeq(elementRight)) = seq(right)
-            val sharedType = Types.leastCommonSuperType(elementLeft, elementRight)
-            AmbiguousPlus(coerce(coercedLeft, TSeq(sharedType)), coerce(coercedRight, TSeq(sharedType)))(plus.blame)
+            val sharedType = Types
+              .leastCommonSuperType(elementLeft, elementRight)
+            AmbiguousPlus(
+              coerce(coercedLeft, TSeq(sharedType)),
+              coerce(coercedRight, TSeq(sharedType)),
+            )(plus.blame)
           }, {
             val (coercedLeft, TSet(elementLeft)) = set(left)
             val (coercedRight, TSet(elementRight)) = set(right)
-            val sharedType = Types.leastCommonSuperType(elementLeft, elementRight)
-            AmbiguousPlus(coerce(coercedLeft, TSet(sharedType)), coerce(coercedRight, TSet(sharedType)))(plus.blame)
+            val sharedType = Types
+              .leastCommonSuperType(elementLeft, elementRight)
+            AmbiguousPlus(
+              coerce(coercedLeft, TSet(sharedType)),
+              coerce(coercedRight, TSet(sharedType)),
+            )(plus.blame)
           }, {
             val (coercedLeft, TBag(elementLeft)) = bag(left)
             val (coercedRight, TBag(elementRight)) = bag(right)
-            val sharedType = Types.leastCommonSuperType(elementLeft, elementRight)
-            AmbiguousPlus(coerce(coercedLeft, TBag(sharedType)), coerce(coercedRight, TBag(sharedType)))(plus.blame)
-          }, {
-            vectorOp2(plus, (l,r) => AmbiguousPlus(l,r)(plus.blame))
-          }, {
+            val sharedType = Types
+              .leastCommonSuperType(elementLeft, elementRight)
+            AmbiguousPlus(
+              coerce(coercedLeft, TBag(sharedType)),
+              coerce(coercedRight, TBag(sharedType)),
+            )(plus.blame)
+          },
+          { vectorOp2(plus, (l, r) => AmbiguousPlus(l, r)(plus.blame)) }, {
             val validOperators = plus.getValidOperatorsOf(OperatorLeftPlus())
             validOperators match {
-              case Some(Seq(op)) => AmbiguousPlus(cls(left), coerce(right, op.args.head.t))(plus.blame)
-              case _ => throw IncoercibleText(left, "This expression does not have a matching custom plus operator")
+              case Some(Seq(op)) =>
+                AmbiguousPlus(cls(left), coerce(right, op.args.head.t))(
+                  plus.blame
+                )
+              case _ =>
+                throw IncoercibleText(
+                  left,
+                  "This expression does not have a matching custom plus operator",
+                )
             }
           }, {
             // TODO: Definition of operators should be type checked for arity
             val validOperators = plus.getValidOperatorsOf(OperatorRightPlus())
             validOperators match {
-              case Some(Seq(op)) => AmbiguousPlus(cls(right), coerce(left, op.args.head.t))(plus.blame)
-              case _ => throw IncoercibleText(right, "This expression does not have a matching custom right plus operator")
+              case Some(Seq(op)) =>
+                AmbiguousPlus(cls(right), coerce(left, op.args.head.t))(
+                  plus.blame
+                )
+              case _ =>
+                throw IncoercibleText(
+                  right,
+                  "This expression does not have a matching custom right plus operator",
+                )
             }
-          }
+          },
         )
       case AmbiguousResult() => e
       case sub @ AmbiguousSubscript(collection, index) =>
-        firstOk(e, s"Expected collection to be a sequence, vector, array, pointer or map, but got ${collection.t}.",
+        firstOk(
+          e,
+          s"Expected collection to be a sequence, vector, array, pointer or map, but got ${collection.t}.",
           AmbiguousSubscript(seq(collection)._1, int(index))(sub.blame),
           AmbiguousSubscript(vector(collection)._1, int(index))(sub.blame),
           AmbiguousSubscript(array(collection)._1, int(index))(sub.blame),
           AmbiguousSubscript(pointer(collection)._1, int(index))(sub.blame),
-          AmbiguousSubscript(map(collection)._1, coerce(index, map(collection)._2.key))(sub.blame),
+          AmbiguousSubscript(
+            map(collection)._1,
+            coerce(index, map(collection)._2.key),
+          )(sub.blame),
         )
       case AmbiguousThis() => e
-      case div@AmbiguousTruncDiv(left, right) =>
-        firstOk(e, s"Expected both operands to be int, float, vector[int] or vector[float], but got ${left.t} and ${right.t}.",
+      case div @ AmbiguousTruncDiv(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be int, float, vector[int] or vector[float], but got ${left
+              .t} and ${right.t}.",
           AmbiguousTruncDiv(int(left), int(right))(div.blame),
-          floatOp2(div, (l,r) => AmbiguousTruncDiv(l, r)(div.blame)),
-          vectorIntOp2(div, (l,r) => AmbiguousTruncDiv(l ,r)(div.blame)),
-          vectorFloatOp2(div, (l,r) => AmbiguousTruncDiv(l ,r)(div.blame)),
+          floatOp2(div, (l, r) => AmbiguousTruncDiv(l, r)(div.blame)),
+          vectorIntOp2(div, (l, r) => AmbiguousTruncDiv(l, r)(div.blame)),
+          vectorFloatOp2(div, (l, r) => AmbiguousTruncDiv(l, r)(div.blame)),
         )
-      case mod@AmbiguousTruncMod(left, right) =>
-        firstOk(e, s"Expected both operands to be ints or vector[int], but got ${left.t} and ${right.t}.",
+      case mod @ AmbiguousTruncMod(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be ints or vector[int], but got ${left
+              .t} and ${right.t}.",
           AmbiguousTruncMod(int(left), int(right))(mod.blame),
-          vectorIntOp2(mod, (l,r) => AmbiguousTruncMod(l ,r)(mod.blame))
+          vectorIntOp2(mod, (l, r) => AmbiguousTruncMod(l, r)(mod.blame)),
         )
-      case And(left, right) =>
-        And(bool(left), bool(right))
-      case any @ Any() =>
-        Any()(any.blame)
+      case And(left, right) => And(bool(left), bool(right))
+      case any @ Any() => Any()(any.blame)
       case a @ ArraySubscript(arr, index) =>
         ArraySubscript(array(arr)._1, int(index))(a.blame)
       case BagAdd(xs, ys) =>
         val (left, TBag(leftT)) = bag(xs)
         val (right, TBag(rightT)) = bag(ys)
         val sharedElement = Types.leastCommonSuperType(leftT, rightT)
-        BagAdd(coerce(left, TBag(sharedElement)), coerce(right, TBag(sharedElement)))
+        BagAdd(
+          coerce(left, TBag(sharedElement)),
+          coerce(right, TBag(sharedElement)),
+        )
       case BagLargestCommon(xs, ys) =>
         val (left, TBag(leftT)) = bag(xs)
         val (right, TBag(rightT)) = bag(ys)
         val sharedElement = Types.leastCommonSuperType(leftT, rightT)
-        BagLargestCommon(coerce(left, TBag(sharedElement)), coerce(right, TBag(sharedElement)))
+        BagLargestCommon(
+          coerce(left, TBag(sharedElement)),
+          coerce(right, TBag(sharedElement)),
+        )
       case BagMemberCount(x, xs) =>
         val (coercedBag, TBag(element)) = bag(xs)
         val sharedType = Types.leastCommonSuperType(x.t, element)
-        BagMemberCount(coerce(x, sharedType), coerce(coercedBag, TBag(sharedType)))
+        BagMemberCount(
+          coerce(x, sharedType),
+          coerce(coercedBag, TBag(sharedType)),
+        )
       case BagMinus(xs, ys) =>
         val (left, TBag(leftT)) = bag(xs)
         val (right, TBag(rightT)) = bag(ys)
         val sharedElement = Types.leastCommonSuperType(leftT, rightT)
-        BagMinus(coerce(left, TBag(sharedElement)), coerce(right, TBag(sharedElement)))
+        BagMinus(
+          coerce(left, TBag(sharedElement)),
+          coerce(right, TBag(sharedElement)),
+        )
       case bgi @ BipGuardInvocation(obj, ref) =>
         BipGuardInvocation(cls(obj), ref)
-      case BitAnd(left, right) =>
-        BitAnd(int(left), int(right))
-      case BitNot(arg) =>
-        BitNot(int(arg))
-      case BitOr(left, right) =>
-        BitOr(int(left), int(right))
-      case BitShl(left, right) =>
-        BitShl(int(left), int(right))
-      case BitShr(left, right) =>
-        BitShr(int(left), int(right))
-      case BitUShr(left, right) =>
-        BitUShr(int(left), int(right))
-      case BitXor(left, right) =>
-        BitXor(int(left), int(right))
-      case Cast(value, typeValue) =>
-        Cast(value, typeValue)
+      case BitAnd(left, right) => BitAnd(int(left), int(right))
+      case BitNot(arg) => BitNot(int(arg))
+      case BitOr(left, right) => BitOr(int(left), int(right))
+      case BitShl(left, right) => BitShl(int(left), int(right))
+      case BitShr(left, right) => BitShr(int(left), int(right))
+      case BitUShr(left, right) => BitUShr(int(left), int(right))
+      case BitXor(left, right) => BitXor(int(left), int(right))
+      case Cast(value, typeValue) => Cast(value, typeValue)
       case CastFloat(e, t) =>
-        firstOk(e, s"Can only cast between integer and float or float and float.",
+        firstOk(
+          e,
+          s"Can only cast between integer and float or float and float.",
           CastFloat(float(e), t),
           CastFloat(int(e), t),
         )
@@ -866,16 +1172,13 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case c @ CharValue(_) => c
       case inv @ CInvocation(applicable, args, givenArgs, yields) =>
         CInvocation(applicable, args, givenArgs, yields)(inv.blame)
-      case choose @ Choose(xs) =>
-        Choose(set(xs)._1)(choose.blame)
-      case choose @ ChooseFresh(xs) =>
-        ChooseFresh(set(xs)._1)(choose.blame)
-      case p @ ChorPerm(endpoint, loc, perm) => ChorPerm(endpoint, loc, rat(perm))
-      case CLiteralArray(exprs) =>
-        CLiteralArray(exprs)
+      case choose @ Choose(xs) => Choose(set(xs)._1)(choose.blame)
+      case choose @ ChooseFresh(xs) => ChooseFresh(set(xs)._1)(choose.blame)
+      case p @ ChorPerm(endpoint, loc, perm) =>
+        ChorPerm(endpoint, loc, rat(perm))
+      case CLiteralArray(exprs) => CLiteralArray(exprs)
       case CLocal(name) => e
-      case c @ Committed(obj) =>
-        Committed(cls(obj))(c.blame)
+      case c @ Committed(obj) => Committed(cls(obj))(c.blame)
       case ComputationalAnd(left, right) =>
         ComputationalAnd(bool(left), bool(right))
       case ComputationalOr(left, right) =>
@@ -891,121 +1194,184 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
         val (coercedXs, TSeq(element)) = seq(xs)
         val sharedType = Types.leastCommonSuperType(x.t, element)
         Cons(coerce(x, sharedType), coerce(xs, TSeq(sharedType)))
-      case cfa@CPPClassMethodOrFieldAccess(classInstance, methodOrFieldName) => CPPClassMethodOrFieldAccess(classInstance, methodOrFieldName)(cfa.blame)
-      case defn@CPPLambdaDefinition(contract, declarator, body) =>
+      case cfa @ CPPClassMethodOrFieldAccess(
+            classInstance,
+            methodOrFieldName,
+          ) =>
+        CPPClassMethodOrFieldAccess(classInstance, methodOrFieldName)(cfa.blame)
+      case defn @ CPPLambdaDefinition(contract, declarator, body) =>
         CPPLambdaDefinition(contract, declarator, body)(defn.blame)
       case CPPLambdaRef() => e
-      case inv@CPPInvocation(applicable, args, givenArgs, yields) =>
+      case inv @ CPPInvocation(applicable, args, givenArgs, yields) =>
         CPPInvocation(applicable, args, givenArgs, yields)(inv.blame)
-      case CPPLiteralArray(exprs) =>
-        CPPLiteralArray(exprs)
+      case CPPLiteralArray(exprs) => CPPLiteralArray(exprs)
       case CPPLocal(_, _) => e
       case SYCLReadWriteAccess() => e
       case SYCLReadOnlyAccess() => e
       case SYCLRange(dims) => SYCLRange(dims)
-      case SYCLNDRange(globalRange, localRange) => SYCLNDRange(globalRange, localRange)
+      case SYCLNDRange(globalRange, localRange) =>
+        SYCLNDRange(globalRange, localRange)
       case StringConcat(left, right) =>
         StringConcat(string(left), string(right))
-      case inv @ ConstructorInvocation(ref, classTypeArgs, args, outArgs, typeArgs, givenMap, yields) =>
-        arity(ConstructorInvocation(ref, classTypeArgs, coerceArgs(args, ref.decl, inv.typeEnv, canCDemote = true), outArgs, typeArgs, coerceGiven(givenMap, canCDemote = true), coerceYields(yields, args.head))(inv.blame))
+      case inv @ ConstructorInvocation(
+            ref,
+            classTypeArgs,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        arity(
+          ConstructorInvocation(
+            ref,
+            classTypeArgs,
+            coerceArgs(args, ref.decl, inv.typeEnv, canCDemote = true),
+            outArgs,
+            typeArgs,
+            coerceGiven(givenMap, canCDemote = true),
+            coerceYields(yields, args.head),
+          )(inv.blame)
+        )
       case acc @ CFieldAccess(struct, field) =>
         CFieldAccess(struct, field)(acc.blame)
       case deref @ CStructDeref(struct, field) =>
         CStructDeref(struct, field)(deref.blame)
-      case CurPerm(loc) =>
-        CurPerm(loc)
-      case CurrentThreadId() =>
-        CurrentThreadId()
-      //case deref @ DerefVeyMontThread(ref) =>
-        //DerefVeyMontThread( TVeyMontThread[Pre](ref))
-      case deref @ Deref(obj, ref) =>
-        Deref(cls(obj), ref)(deref.blame)
-      case deref @ DerefHeapVariable(ref) =>
-        DerefHeapVariable(ref)(deref.blame)
-      case deref @ DerefPointer(p) =>
-        DerefPointer(pointer(p)._1)(deref.blame)
-      case Drop(xs, count) =>
-        Drop(seq(xs)._1, int(count))
-      case Empty(obj) =>
-        Empty(sized(obj)._1)
+      case CurPerm(loc) => CurPerm(loc)
+      case CurrentThreadId() => CurrentThreadId()
+      // case deref @ DerefVeyMontThread(ref) =>
+      // DerefVeyMontThread( TVeyMontThread[Pre](ref))
+      case deref @ Deref(obj, ref) => Deref(cls(obj), ref)(deref.blame)
+      case deref @ DerefHeapVariable(ref) => DerefHeapVariable(ref)(deref.blame)
+      case deref @ DerefPointer(p) => DerefPointer(pointer(p)._1)(deref.blame)
+      case Drop(xs, count) => Drop(seq(xs)._1, int(count))
+      case Empty(obj) => Empty(sized(obj)._1)
       case EmptyProcess() => EmptyProcess()
       case use @ EnumUse(enum, const) => use
       case Eq(left, right) =>
         val sharedType = Types.leastCommonSuperType(left.t, right.t)
         Eq(coerce(left, sharedType), coerce(right, sharedType))
-      case EitherLeft(e) =>
-        EitherLeft(e)
-      case EitherRight(e) =>
-        EitherRight(e)
+      case EitherLeft(e) => EitherLeft(e)
+      case EitherRight(e) => EitherRight(e)
       case EndpointName(ref) => EndpointName(ref)
       case Exists(bindings, triggers, body) =>
         Exists(bindings, triggers, bool(body))
-      case exp@Exp(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
+      case exp @ Exp(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
           Exp(int(left), int(right)),
-          floatOp2(exp, (l,r) => Exp(l, r)),
+          floatOp2(exp, (l, r) => Exp(l, r)),
           Exp(rat(left), rat(right)),
         )
-      case div@FloatDiv(left, right) =>
-        floatOp2(div, (l,r) => FloatDiv(l, r)(div.blame))
-      case div @ FloorDiv(left, right) => FloorDiv(int(left), int(right))(div.blame)
+      case div @ FloatDiv(left, right) =>
+        floatOp2(div, (l, r) => FloatDiv(l, r)(div.blame))
+      case div @ FloorDiv(left, right) =>
+        FloorDiv(int(left), int(right))(div.blame)
       case Forall(bindings, triggers, body) =>
         Forall(bindings, triggers, bool(body))
-      case ForPerm(bindings, loc, body) =>
-        ForPerm(bindings, loc, bool(body))
+      case ForPerm(bindings, loc, body) => ForPerm(bindings, loc, bool(body))
       case ForPermWithValue(binding, body) =>
         ForPermWithValue(binding, bool(body))
       case inv @ FunctionInvocation(ref, args, typeArgs, givenMap, yields) =>
-        arity(FunctionInvocation(ref, coerceArgs(args, ref.decl, inv.typeEnv, canCDemote=true), typeArgs, coerceGiven(givenMap, canCDemote=true), coerceYields(yields, inv))(inv.blame))
-      case get @ GetLeft(e) =>
-        GetLeft(either(e)._1)(get.blame)
-      case get @ GetRight(e) =>
-        GetRight(either(e)._1)(get.blame)
-      case GlobalThreadId() =>
-        GlobalThreadId()
-      case e @ GpgpuCudaKernelInvocation(kernel, blocks, threads, args, givenArgs, yields) =>
-        GpgpuCudaKernelInvocation(kernel, int(blocks), int(threads), args, givenArgs, yields)(e.blame)
-      case g@Greater(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
+        arity(
+          FunctionInvocation(
+            ref,
+            coerceArgs(args, ref.decl, inv.typeEnv, canCDemote = true),
+            typeArgs,
+            coerceGiven(givenMap, canCDemote = true),
+            coerceYields(yields, inv),
+          )(inv.blame)
+        )
+      case get @ GetLeft(e) => GetLeft(either(e)._1)(get.blame)
+      case get @ GetRight(e) => GetRight(either(e)._1)(get.blame)
+      case GlobalThreadId() => GlobalThreadId()
+      case e @ GpgpuCudaKernelInvocation(
+            kernel,
+            blocks,
+            threads,
+            args,
+            givenArgs,
+            yields,
+          ) =>
+        GpgpuCudaKernelInvocation(
+          kernel,
+          int(blocks),
+          int(threads),
+          args,
+          givenArgs,
+          yields,
+        )(e.blame)
+      case g @ Greater(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
           Greater(int(left), int(right)),
-          floatOp2(g, (l,r) => Greater(l, r)),
+          floatOp2(g, (l, r) => Greater(l, r)),
           Greater(rat(left), rat(right)),
         )
-      case g@GreaterEq(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
+      case g @ GreaterEq(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
           GreaterEq(int(left), int(right)),
-          floatOp2(g, (l,r) => GreaterEq(l, r)),
+          floatOp2(g, (l, r) => GreaterEq(l, r)),
           GreaterEq(rat(left), rat(right)),
         )
-      case head @ Head(xs) =>
-        Head(seq(xs)._1)(head.blame)
-      case Held(obj) =>
-        Held(cls(obj))
-      case IdleToken(thread) =>
-        IdleToken(cls(thread))
-      case Implies(left, right) =>
-        Implies(bool(left), res(right))
-      case FunctionOf(e, ref) =>
-        FunctionOf(e, ref)
+      case head @ Head(xs) => Head(seq(xs)._1)(head.blame)
+      case Held(obj) => Held(cls(obj))
+      case IdleToken(thread) => IdleToken(cls(thread))
+      case Implies(left, right) => Implies(bool(left), res(right))
+      case FunctionOf(e, ref) => FunctionOf(e, ref)
       case f @ FreePointer(p) => FreePointer(pointer(p)._1)(f.blame)
       case InlinePattern(inner, parent, group) =>
         InlinePattern(inner, parent, group)
-      case inv @ InstanceFunctionInvocation(obj, ref, args, typeArgs, givenMap, yields) =>
-        arity(InstanceFunctionInvocation(cls(obj), ref, coerceArgs(args, ref.decl, inv.typeEnv, canCDemote=true), typeArgs, coerceGiven(givenMap, canCDemote=true), coerceYields(yields, inv))(inv.blame))
-      case InstanceOf(value, typeValue) =>
-        InstanceOf(value, typeValue)
+      case inv @ InstanceFunctionInvocation(
+            obj,
+            ref,
+            args,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        arity(
+          InstanceFunctionInvocation(
+            cls(obj),
+            ref,
+            coerceArgs(args, ref.decl, inv.typeEnv, canCDemote = true),
+            typeArgs,
+            coerceGiven(givenMap, canCDemote = true),
+            coerceYields(yields, inv),
+          )(inv.blame)
+        )
+      case InstanceOf(value, typeValue) => InstanceOf(value, typeValue)
       case InstancePredicateApply(obj, ref, args, perm) =>
-        InstancePredicateApply(cls(obj), ref, coerceArgs(args, ref.decl), rat(perm))
+        InstancePredicateApply(
+          cls(obj),
+          ref,
+          coerceArgs(args, ref.decl),
+          rat(perm),
+        )
       case CoalesceInstancePredicateApply(obj, ref, args, perm) =>
-        CoalesceInstancePredicateApply(cls(obj), ref, coerceArgs(args, ref.decl), rat(perm))
-      case IsLeft(e) =>
-        IsLeft(either(e)._1)
-      case IsRight(e) =>
-        IsRight(either(e)._1)
+        CoalesceInstancePredicateApply(
+          cls(obj),
+          ref,
+          coerceArgs(args, ref.decl),
+          rat(perm),
+        )
+      case IsLeft(e) => IsLeft(either(e)._1)
+      case IsRight(e) => IsRight(either(e)._1)
       case deref @ JavaDeref(obj, field) => e
-      case inv @ JavaInvocation(obj, typeParams, method, arguments, givenArgs, yields) => e
-      case JavaLiteralArray(exprs) =>
-        JavaLiteralArray(exprs)
+      case inv @ JavaInvocation(
+            obj,
+            typeParams,
+            method,
+            arguments,
+            givenArgs,
+            yields,
+          ) =>
+        e
+      case JavaLiteralArray(exprs) => JavaLiteralArray(exprs)
       case JavaLocal(name) => e
       case JavaNewClass(args, typeArgs, name, givenMap, yields) => e
       case JavaNewDefaultArray(baseType, specifiedDims, moreDims) => e
@@ -1013,19 +1379,21 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case str @ JavaStringValue(_, _) => str
       case sizeof @ SizeOf(_) => sizeof
       case str @ StringValue(_) => str
-      case JoinToken(thread) =>
-        JoinToken(cls(thread))
-      case length @ Length(arr) =>
-        Length(array(arr)._1)(length.blame)
+      case JoinToken(thread) => JoinToken(cls(thread))
+      case length @ Length(arr) => Length(array(arr)._1)(length.blame)
       case Less(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
           Less(int(left), int(right)),
           Less(rat(left), rat(right)),
         )
-      case l@LessEq(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
+      case l @ LessEq(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
           LessEq(int(left), int(right)),
-          floatOp2(l, (l,r) => LessEq(l, r)),
+          floatOp2(l, (l, r) => LessEq(l, r)),
           LessEq(rat(left), rat(right)),
         )
       case Let(binding, value, main) =>
@@ -1033,9 +1401,13 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case LiteralBag(element, values) =>
         LiteralBag(element, values.map(coerce(_, element)))
       case LiteralMap(k, v, values) =>
-        LiteralMap(k, v, values.map {
-          case (valueK, valueV) => (coerce(valueK, k), coerce(valueV, v))
-        })
+        LiteralMap(
+          k,
+          v,
+          values.map { case (valueK, valueV) =>
+            (coerce(valueK, k), coerce(valueV, v))
+          },
+        )
       case LiteralSeq(element, values) =>
         LiteralSeq(element, values.map(coerce(_, element)))
       case LiteralSet(element, values) =>
@@ -1043,102 +1415,147 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case LiteralVector(element, values) =>
         LiteralVector(element, values.map(coerce(_, element)))
       case LiteralTuple(ts, values) =>
-        LiteralTuple(ts, values.zip(ts).map {
-          case (v, t) => coerce(v, t)
-        })
-      case Local(ref) =>
-        Local(ref)
-      case LocalThreadId() =>
-        LocalThreadId()
+        LiteralTuple(ts, values.zip(ts).map { case (v, t) => coerce(v, t) })
+      case Local(ref) => Local(ref)
+      case LocalThreadId() => LocalThreadId()
       case MapCons(m, k, v) =>
         val (coercedMap, mapType) = map(m)
         val sharedType = Types.leastCommonSuperType(mapType.value, v.t)
-        MapCons(coerce(coercedMap, TMap(mapType.key, sharedType)), coerce(k, mapType.key), coerce(v, sharedType))
+        MapCons(
+          coerce(coercedMap, TMap(mapType.key, sharedType)),
+          coerce(k, mapType.key),
+          coerce(v, sharedType),
+        )
       case MapDisjoint(left, right) =>
         val (coercedLeft, leftType) = map(left)
         val (coercedRight, rightType) = map(right)
 
-        if(leftType.key != rightType.key)
-          throw IncoercibleExplanation(e, s"Expected both operands to have a map type of which the key type is equal, " +
-            s"but got ${leftType.key} and ${rightType.key}")
+        if (leftType.key != rightType.key)
+          throw IncoercibleExplanation(
+            e,
+            s"Expected both operands to have a map type of which the key type is equal, " +
+              s"but got ${leftType.key} and ${rightType.key}",
+          )
 
-        val sharedType = Types.leastCommonSuperType(leftType.value, rightType.value)
+        val sharedType = Types
+          .leastCommonSuperType(leftType.value, rightType.value)
         val mapType = TMap(leftType.key, sharedType)
         MapDisjoint(coerce(coercedLeft, mapType), coerce(coercedRight, mapType))
       case MapEq(left, right) =>
         val (coercedLeft, leftType) = map(left)
         val (coercedRight, rightType) = map(right)
 
-        if(leftType.key != rightType.key)
-          throw IncoercibleExplanation(e, s"Expected both operands to have a map type of which the key type is equal, " +
-            s"but got ${leftType.key} and ${rightType.key}")
+        if (leftType.key != rightType.key)
+          throw IncoercibleExplanation(
+            e,
+            s"Expected both operands to have a map type of which the key type is equal, " +
+              s"but got ${leftType.key} and ${rightType.key}",
+          )
 
-        val sharedType = Types.leastCommonSuperType(leftType.value, rightType.value)
+        val sharedType = Types
+          .leastCommonSuperType(leftType.value, rightType.value)
         val mapType = TMap(leftType.key, sharedType)
         MapEq(coerce(coercedLeft, mapType), coerce(coercedRight, mapType))
       case get @ MapGet(m, k) =>
         val (coercedMap, mapType) = map(m)
         MapGet(coercedMap, coerce(k, mapType.key))(get.blame)
-      case MapItemSet(m) =>
-        MapItemSet(map(m)._1)
-      case MapKeySet(m) =>
-        MapKeySet(map(m)._1)
+      case MapItemSet(m) => MapItemSet(map(m)._1)
+      case MapKeySet(m) => MapKeySet(map(m)._1)
       case MapMember(x, xs) =>
         val (coercedMap, mapType) = map(xs)
         MapMember(coerce(x, mapType.key), coercedMap)
       case MapRemove(m, k) =>
         val (coercedMap, mapType) = map(m)
         MapRemove(coercedMap, coerce(k, mapType.key))
-      case MapValueSet(m) =>
-        MapValueSet(map(m)._1)
+      case MapValueSet(m) => MapValueSet(map(m)._1)
       case MatrixCompare(left, right) =>
         val (coercedLeft, leftType) = matrix(left)
         val (coercedRight, rightType) = matrix(right)
-        val sharedType = Types.leastCommonSuperType(leftType.element, rightType.element)
-        MatrixCompare(coerce(coercedLeft, TMatrix(sharedType)), coerce(coercedRight, TMatrix(sharedType)))
-      case MatrixRepeat(e) =>
-        MatrixRepeat(e)
+        val sharedType = Types
+          .leastCommonSuperType(leftType.element, rightType.element)
+        MatrixCompare(
+          coerce(coercedLeft, TMatrix(sharedType)),
+          coerce(coercedRight, TMatrix(sharedType)),
+        )
+      case MatrixRepeat(e) => MatrixRepeat(e)
       case MatrixSum(indices, mat) =>
-        MatrixSum(coerce(indices, TSeq[Pre](TInt())), coerce(mat, TSeq[Pre](TRational())))
-      case inv @ MethodInvocation(obj, ref, args, outArgs, typeArgs, givenMap, yields) =>
-        arity(MethodInvocation(obj, ref, coerceArgs(args, ref.decl, inv.typeEnv, canCDemote=true), outArgs, typeArgs, coerceGiven(givenMap, canCDemote=true), coerceYields(yields, inv))(inv.blame))
+        MatrixSum(
+          coerce(indices, TSeq[Pre](TInt())),
+          coerce(mat, TSeq[Pre](TRational())),
+        )
+      case inv @ MethodInvocation(
+            obj,
+            ref,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        arity(
+          MethodInvocation(
+            obj,
+            ref,
+            coerceArgs(args, ref.decl, inv.typeEnv, canCDemote = true),
+            outArgs,
+            typeArgs,
+            coerceGiven(givenMap, canCDemote = true),
+            coerceYields(yields, inv),
+          )(inv.blame)
+        )
       case minus @ Minus(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
           Minus(int(left), int(right)),
-          floatOp2(minus, (l,r) => Minus(l, r)),
+          floatOp2(minus, (l, r) => Minus(l, r)),
           Minus(rat(left), rat(right)),
         )
       case div @ Mod(left, right) => Mod(int(left), int(right))(div.blame)
       case ModelAbstractState(m, state) =>
         ModelAbstractState(model(m)._1, bool(state))
       case ModelChoose(m, perm, totalProcess, choice) =>
-        ModelChoose(model(m)._1, rat(perm), process(totalProcess), process(choice))
-      case ModelCreate(m, init) =>
-        ModelCreate(model(m)._1, process(init))
+        ModelChoose(
+          model(m)._1,
+          rat(perm),
+          process(totalProcess),
+          process(choice),
+        )
+      case ModelCreate(m, init) => ModelCreate(model(m)._1, process(init))
       case deref @ ModelDeref(obj, ref) =>
         ModelDeref(model(obj)._1, ref)(deref.blame)
-      case ModelDestroy(m) =>
-        ModelDestroy(model(m)._1)
+      case ModelDestroy(m) => ModelDestroy(model(m)._1)
       case ModelMerge(m, leftPerm, leftProcess, rightPerm, rightProcess) =>
-        ModelMerge(model(m)._1, rat(leftPerm), process(leftProcess), rat(rightPerm), process(rightProcess))
-      case ModelNew(ref) =>
-        ModelNew(ref)
-      case ModelPerm(loc, perm) =>
-        ModelPerm(loc, rat(perm))
+        ModelMerge(
+          model(m)._1,
+          rat(leftPerm),
+          process(leftProcess),
+          rat(rightPerm),
+          process(rightProcess),
+        )
+      case ModelNew(ref) => ModelNew(ref)
+      case ModelPerm(loc, perm) => ModelPerm(loc, rat(perm))
       case ModelSplit(m, leftPerm, leftProcess, rightPerm, rightProcess) =>
-        ModelSplit(model(m)._1, rat(leftPerm), process(leftProcess), rat(rightPerm), process(rightProcess))
+        ModelSplit(
+          model(m)._1,
+          rat(leftPerm),
+          process(leftProcess),
+          rat(rightPerm),
+          process(rightProcess),
+        )
       case ModelState(m, perm, state) =>
         ModelState(model(m)._1, rat(perm), process(state))
       case mult @ Mult(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
           Mult(int(left), int(right)),
-          floatOp2(mult, (l,r) => Mult(l, r)),
+          floatOp2(mult, (l, r) => Mult(l, r)),
           Mult(rat(left), rat(right)),
         )
       case NdIndex(indices, dimensions) =>
         NdIndex(indices.map(int), dimensions.map(int))
-      case NdLength(dimensions) =>
-        NdLength(dimensions.map(int))
+      case NdLength(dimensions) => NdLength(dimensions.map(int))
       case NdPartialIndex(indices, linearIndex, dimensions) =>
         NdPartialIndex(indices.map(int), int(linearIndex), dimensions.map(int))
       case Neq(left, right) =>
@@ -1146,38 +1563,28 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
         Neq(coerce(left, sharedType), coerce(right, sharedType))
       case na @ NewArray(element, dims, moreDims, initialize) =>
         NewArray(element, dims.map(int), moreDims, initialize)(na.blame)
-      case na@NewPointerArray(element, size) =>
+      case na @ NewPointerArray(element, size) =>
         NewPointerArray(element, size)(na.blame)
-      case NewObject(cls) =>
-        NewObject(cls)
-      case NoPerm() =>
-        NoPerm()
-      case Not(arg) =>
-        Not(bool(arg))
-      case Null() =>
-        Null()
-      case old @ Old(expr, at) =>
-        Old(expr, at)(old.blame)
-      case OptEmpty(opt) =>
-        OptEmpty(option(opt)._1)
-      case get @ OptGet(opt) =>
-        OptGet(option(opt)._1)(get.blame)
+      case NewObject(cls) => NewObject(cls)
+      case NoPerm() => NoPerm()
+      case Not(arg) => Not(bool(arg))
+      case Null() => Null()
+      case old @ Old(expr, at) => Old(expr, at)(old.blame)
+      case OptEmpty(opt) => OptEmpty(option(opt)._1)
+      case get @ OptGet(opt) => OptGet(option(opt)._1)(get.blame)
       case OptGetOrElse(opt, alt) =>
         val (coercedOpt, optType) = option(opt)
         val sharedType = Types.leastCommonSuperType(alt.t, optType.element)
-        OptGetOrElse(coerce(coercedOpt, TOption(sharedType)), coerce(alt, sharedType))
-      case OptNone() =>
-        OptNone()
-      case OptNoneTyped(t) =>
-        OptNoneTyped(t)
-      case OptSome(e) =>
-        OptSome(e)
-      case OptSomeTyped(t, e) =>
-        OptSomeTyped(t, coerce(e, t))
-      case Or(left, right) =>
-        Or(bool(left), bool(right))
-      case Perm(loc, perm) =>
-        Perm(loc, rat(perm))
+        OptGetOrElse(
+          coerce(coercedOpt, TOption(sharedType)),
+          coerce(alt, sharedType),
+        )
+      case OptNone() => OptNone()
+      case OptNoneTyped(t) => OptNoneTyped(t)
+      case OptSome(e) => OptSome(e)
+      case OptSomeTyped(t, e) => OptSomeTyped(t, coerce(e, t))
+      case Or(left, right) => Or(bool(left), bool(right))
+      case Perm(loc, perm) => Perm(loc, rat(perm))
       case PermPointer(p, len, perm) =>
         PermPointer(pointer(p)._1, int(len), rat(perm))
       case PermPointerIndex(p, idx, perm) =>
@@ -1185,12 +1592,18 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case Permutation(left, right) =>
         val (coercedLeft, leftType) = seq(left)
         val (coercedRight, rightType) = seq(right)
-        val sharedType = Types.leastCommonSuperType(leftType.element, rightType.element)
-        Permutation(coerce(left, TSeq(sharedType)), coerce(right, TSeq(sharedType)))
+        val sharedType = Types
+          .leastCommonSuperType(leftType.element, rightType.element)
+        Permutation(
+          coerce(left, TSeq(sharedType)),
+          coerce(right, TSeq(sharedType)),
+        )
       case plus @ Plus(left, right) =>
-        firstOk(e, s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected both operands to be numeric, but got ${left.t} and ${right.t}.",
           Plus(int(left), int(right)),
-          floatOp2(plus, (l,r) => Plus(l, r)),
+          floatOp2(plus, (l, r) => Plus(l, r)),
           Plus(rat(left), rat(right)),
         )
       case add @ PointerAdd(p, offset) =>
@@ -1199,8 +1612,7 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
         PointerBlockLength(pointer(p)._1)(len.blame)
       case off @ PointerBlockOffset(p) =>
         PointerBlockOffset(pointer(p)._1)(off.blame)
-      case len @ PointerLength(p) =>
-        PointerLength(pointer(p)._1)(len.blame)
+      case len @ PointerLength(p) => PointerLength(pointer(p)._1)(len.blame)
       case get @ PointerSubscript(p, index) =>
         PointerSubscript(pointer(p)._1, int(index))(get.blame)
       case PointsTo(loc, perm, value) =>
@@ -1208,67 +1620,89 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case PolarityDependent(onInhale, onExhale) =>
         PolarityDependent(res(onInhale), res(onExhale))
       case ass @ PostAssignExpression(target, value) =>
-        PostAssignExpression(target, coerce(value, target.t, canCDemote=true))(ass.blame)
+        PostAssignExpression(
+          target,
+          coerce(value, target.t, canCDemote = true),
+        )(ass.blame)
       case ass @ PreAssignExpression(target, value) =>
-        PreAssignExpression(target, coerce(value, target.t, canCDemote=true))(ass.blame)
+        PreAssignExpression(target, coerce(value, target.t, canCDemote = true))(
+          ass.blame
+        )
       case PredicateApply(ref, args, perm) =>
         PredicateApply(ref, coerceArgs(args, ref.decl), rat(perm))
-      case inv @ ProcedureInvocation(ref, args, outArgs, typeArgs, givenMap, yields) =>
-        arity(ProcedureInvocation(ref, coerceArgs(args, ref.decl, inv.typeEnv, canCDemote=true), outArgs, typeArgs, coerceGiven(givenMap, canCDemote=true), coerceYields(yields, inv))(inv.blame))
+      case inv @ ProcedureInvocation(
+            ref,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        arity(
+          ProcedureInvocation(
+            ref,
+            coerceArgs(args, ref.decl, inv.typeEnv, canCDemote = true),
+            outArgs,
+            typeArgs,
+            coerceGiven(givenMap, canCDemote = true),
+            coerceYields(yields, inv),
+          )(inv.blame)
+        )
       case inv @ LlvmFunctionInvocation(ref, args, givenMap, yields) =>
         LlvmFunctionInvocation(ref, args, givenMap, yields)(inv.blame)
-      case inv @ LlvmAmbiguousFunctionInvocation(name, args, givenMap, yields) =>
+      case inv @ LlvmAmbiguousFunctionInvocation(
+            name,
+            args,
+            givenMap,
+            yields,
+          ) =>
         LlvmAmbiguousFunctionInvocation(name, args, givenMap, yields)(inv.blame)
       case ProcessApply(process, args) =>
         ProcessApply(process, coerceArgs(args, process.decl))
       case ProcessChoice(left, right) =>
         ProcessChoice(process(left), process(right))
-      case ProcessPar(left, right) =>
-        ProcessPar(process(left), process(right))
+      case ProcessPar(left, right) => ProcessPar(process(left), process(right))
       case ProcessSelect(cond, whenTrue, whenFalse) =>
         ProcessSelect(bool(cond), process(whenTrue), process(whenFalse))
-      case ProcessSeq(left, right) =>
-        ProcessSeq(process(left), process(right))
+      case ProcessSeq(left, right) => ProcessSeq(process(left), process(right))
       case Product(bindings, condition, main) =>
         Product(bindings, bool(condition), int(main))
       case ProverFunctionInvocation(ref, args) =>
         ProverFunctionInvocation(ref, coerceArgs(args, ref.decl))
-      case p @ PVLChorPerm(endpoint, loc, perm) => PVLChorPerm(endpoint, loc, rat(perm))
+      case p @ PVLChorPerm(endpoint, loc, perm) =>
+        PVLChorPerm(endpoint, loc, rat(perm))
       case PVLDeref(obj, field) => e
       case PVLInvocation(obj, method, args, typeArgs, givenArgs, yields) => e
       case PVLLocal(name) => e
       case PVLNew(t, typeArgs, args, givenMap, yields) => e
-      case Range(from, to) =>
-        Range(int(from), int(to))
-      case RangeSet(from, to) =>
-        RangeSet(int(from), int(to))
-      case div@RatDiv(left, right) =>
-        firstOk(e, s"Expected both operands to be rational.",
+      case Range(from, to) => Range(int(from), int(to))
+      case RangeSet(from, to) => RangeSet(int(from), int(to))
+      case div @ RatDiv(left, right) =>
+        firstOk(
+          e,
+          s"Expected both operands to be rational.",
           // PB: horrible hack: Div ends up being silver.PermDiv, which expects an integer divisor. In other cases,
           // we just hope the silver type-check doesn't complain, since in z3 it is uniformly `/` for mixed integers
           // and rationals.
           RatDiv(rat(left), int(right))(div.blame),
           RatDiv(rat(left), rat(right))(div.blame),
         )
-      case ReadPerm() =>
-        ReadPerm()
-      case RemoveAt(xs, i) =>
-        RemoveAt(seq(xs)._1, int(i))
+      case ReadPerm() => ReadPerm()
+      case RemoveAt(xs, i) => RemoveAt(seq(xs)._1, int(i))
       case ResourceOfResourceValue(r) =>
         ResourceOfResourceValue(coerce(r, TResourceVal()))
-      case ResourceValue(r) =>
-        ResourceValue(res(r))
-      case Result(ref) =>
-        Result(ref)
-      case s @ Scale(scale, r) =>
-        Scale(rat(scale), res(r))(s.blame)
-      case ScaleByParBlock(ref, r) =>
-        ScaleByParBlock(ref, res(r))
-      case ScopedExpr(locals, body) =>
-        ScopedExpr(locals, body)
+      case ResourceValue(r) => ResourceValue(res(r))
+      case Result(ref) => Result(ref)
+      case s @ Scale(scale, r) => Scale(rat(scale), res(r))(s.blame)
+      case ScaleByParBlock(ref, r) => ScaleByParBlock(ref, res(r))
+      case ScopedExpr(locals, body) => ScopedExpr(locals, body)
       case Select(condition, whenTrue, whenFalse) =>
         val sharedType = Types.leastCommonSuperType(whenTrue.t, whenFalse.t)
-        Select(bool(condition), coerce(whenTrue, sharedType), coerce(whenFalse, sharedType))
+        Select(
+          bool(condition),
+          coerce(whenTrue, sharedType),
+          coerce(whenFalse, sharedType),
+        )
       case SeqMember(x, xs) =>
         val (coercedSeq, seqType) = seq(xs)
         val sharedType = Types.leastCommonSuperType(x.t, seqType.element)
@@ -1278,12 +1712,19 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case update @ SeqUpdate(xs, i, x) =>
         val (coercedSeq, seqType) = seq(xs)
         val sharedType = Types.leastCommonSuperType(x.t, seqType.element)
-        SeqUpdate(coerce(coercedSeq, TSeq(sharedType)), int(i), coerce(x, sharedType))
+        SeqUpdate(
+          coerce(coercedSeq, TSeq(sharedType)),
+          int(i),
+          coerce(x, sharedType),
+        )
       case SetIntersection(xs, ys) =>
         val (left, TSet(leftT)) = set(xs)
         val (right, TSet(rightT)) = set(ys)
         val sharedElement = Types.leastCommonSuperType(leftT, rightT)
-        SetIntersection(coerce(left, TSet(sharedElement)), coerce(right, TSet(sharedElement)))
+        SetIntersection(
+          coerce(left, TSet(sharedElement)),
+          coerce(right, TSet(sharedElement)),
+        )
       case SetMember(x, xs) =>
         val (coercedSet, setType) = set(xs)
         val sharedType = Types.leastCommonSuperType(x.t, setType.element)
@@ -1292,42 +1733,41 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
         val (left, TSet(leftT)) = set(xs)
         val (right, TSet(rightT)) = set(ys)
         val sharedElement = Types.leastCommonSuperType(leftT, rightT)
-        SetMinus(coerce(left, TSet(sharedElement)), coerce(right, TSet(sharedElement)))
+        SetMinus(
+          coerce(left, TSet(sharedElement)),
+          coerce(right, TSet(sharedElement)),
+        )
       case SetUnion(xs, ys) =>
         val (left, TSet(leftT)) = set(xs)
         val (right, TSet(rightT)) = set(ys)
         val sharedElement = Types.leastCommonSuperType(leftT, rightT)
-        SetUnion(coerce(left, TSet(sharedElement)), coerce(right, TSet(sharedElement)))
+        SetUnion(
+          coerce(left, TSet(sharedElement)),
+          coerce(right, TSet(sharedElement)),
+        )
       case SharedMemSize(xs) =>
-        firstOk(e, s"Expected operand to be a pointer or array, but got ${xs.t}.",
+        firstOk(
+          e,
+          s"Expected operand to be a pointer or array, but got ${xs.t}.",
           SharedMemSize(array(xs)._1),
           SharedMemSize(pointer(xs)._1),
         )
-      case SilverBagSize(xs) =>
-        SilverBagSize(bag(xs)._1)
-      case SilverCurFieldPerm(obj, field) =>
-        SilverCurFieldPerm(ref(obj), field)
+      case SilverBagSize(xs) => SilverBagSize(bag(xs)._1)
+      case SilverCurFieldPerm(obj, field) => SilverCurFieldPerm(ref(obj), field)
       case SilverCurPredPerm(ref, args) =>
         SilverCurPredPerm(ref, coerceArgs(args, ref.decl))
       case deref @ SilverDeref(obj, field) =>
         SilverDeref(ref(obj), field)(deref.blame)
-      case SilverIntToRat(perm) =>
-        SilverIntToRat(int(perm))
-      case SilverMapSize(xs) =>
-        SilverMapSize(map(xs)._1)
-      case SilverNull() =>
-        SilverNull()
+      case SilverIntToRat(perm) => SilverIntToRat(int(perm))
+      case SilverMapSize(xs) => SilverMapSize(map(xs)._1)
+      case SilverNull() => SilverNull()
       case SilverPartialADTFunctionInvocation(name, args, partialTypeArgs) => e
-      case SilverSetSize(xs) =>
-        SilverSetSize(set(xs)._1)
-      case SilverSeqSize(xs) =>
-        SilverSeqSize(seq(xs)._1)
+      case SilverSetSize(xs) => SilverSetSize(set(xs)._1)
+      case SilverSeqSize(xs) => SilverSeqSize(seq(xs)._1)
       case SilverUntypedNonemptyLiteralMap(values) =>
         SilverUntypedNonemptyLiteralMap(values)
-      case Size(obj) =>
-        Size(sized(obj)._1)
-      case Slice(xs, from, to) =>
-        Slice(seq(xs)._1, int(from), int(to))
+      case Size(obj) => Size(sized(obj)._1)
+      case Slice(xs, from, to) => Slice(seq(xs)._1, int(from), int(to))
       case SmtlibBitvecLiteral(data) => SmtlibBitvecLiteral(data)
       case SmtlibBvAdd(left, right) => bitvec2(left, right, SmtlibBvAdd(_, _))
       case SmtlibBvAnd(left, right) => bitvec2(left, right, SmtlibBvAnd(_, _))
@@ -1342,9 +1782,17 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case SmtlibBvURem(left, right) => bitvec2(left, right, SmtlibBvURem(_, _))
       case SmtlibConcat(left, right) => bitvec2(left, right, SmtlibConcat(_, _))
       case SmtlibExtract(inclusiveEndIndexFromRight, startIndexFromRight, bv) =>
-        SmtlibExtract(inclusiveEndIndexFromRight, startIndexFromRight, bitvec(bv)._1)
+        SmtlibExtract(
+          inclusiveEndIndexFromRight,
+          startIndexFromRight,
+          bitvec(bv)._1,
+        )
       case SmtlibFp(sign, exponent, mantissa) =>
-        SmtlibFp(coerce(sign, TSmtlibBitVector(1)), bitvec(exponent)._1, bitvec(mantissa)._1)
+        SmtlibFp(
+          coerce(sign, TSmtlibBitVector(1)),
+          bitvec(exponent)._1,
+          bitvec(mantissa)._1,
+        )
       case SmtlibFpAbs(arg) => SmtlibFpAbs(fp(arg)._1)
       case SmtlibFpAdd(left, right) => fp2(left, right, SmtlibFpAdd(_, _))
       case SmtlibFpCast(arg, exponentBits, mantissaAndSignBits) =>
@@ -1380,35 +1828,46 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case SmtlibFpToSInt(arg, bits) => SmtlibFpToSInt(fp(arg)._1, bits)
       case SmtlibFpToUInt(arg, bits) => SmtlibFpToUInt(fp(arg)._1, bits)
       case SmtlibIsInt(arg) =>
-        firstOk(e, s"Expected operand to be floating, but got ${arg.t}.",
+        firstOk(
+          e,
+          s"Expected operand to be floating, but got ${arg.t}.",
           SmtlibIsInt(float(arg)),
           SmtlibIsInt(rat(arg)),
         )
       case SmtlibToInt(arg) => SmtlibToInt(rat(arg))
       case SmtlibToReal(arg) => SmtlibToReal(int(arg))
       case pow @ SmtlibPow(left, right) =>
-        firstOk(e, s"Expected args to be numerical, but got ${left.t} and ${right.t}.",
+        firstOk(
+          e,
+          s"Expected args to be numerical, but got ${left.t} and ${right.t}.",
           SmtlibPow(int(left), int(right)),
-          floatOp2(pow, (l,r) => SmtlibPow(l, r)),
+          floatOp2(pow, (l, r) => SmtlibPow(l, r)),
           SmtlibPow(rat(left), rat(right)),
         )
       case SmtlibLiteralString(data) => SmtlibLiteralString(data)
       case SmtlibReAll() => SmtlibReAll()
       case SmtlibReAllChar() => SmtlibReAllChar()
       case SmtlibReComp(arg) => SmtlibReComp(reglan(arg))
-      case SmtlibReConcat(left, right) => SmtlibReConcat(reglan(left), reglan(right))
-      case SmtlibReContains(re, str) => SmtlibReContains(reglan(re), smtstr(str))
-      case SmtlibReDiff(left, right) => SmtlibReDiff(reglan(left), reglan(right))
+      case SmtlibReConcat(left, right) =>
+        SmtlibReConcat(reglan(left), reglan(right))
+      case SmtlibReContains(re, str) =>
+        SmtlibReContains(reglan(re), smtstr(str))
+      case SmtlibReDiff(left, right) =>
+        SmtlibReDiff(reglan(left), reglan(right))
       case SmtlibReFromStr(arg) => SmtlibReFromStr(smtstr(arg))
-      case SmtlibReInter(left, right) => SmtlibReInter(reglan(left), reglan(right))
+      case SmtlibReInter(left, right) =>
+        SmtlibReInter(reglan(left), reglan(right))
       case SmtlibReNone() => SmtlibReNone()
       case SmtlibReOpt(arg) => SmtlibReOpt(reglan(arg))
       case SmtlibRePlus(arg) => SmtlibRePlus(reglan(arg))
-      case SmtlibReRange(left, right) => SmtlibReRange(smtstr(left), smtstr(right))
+      case SmtlibReRange(left, right) =>
+        SmtlibReRange(smtstr(left), smtstr(right))
       case SmtlibReRepeat(count, arg) => SmtlibReRepeat(count, reglan(arg))
-      case SmtlibReRepeatRange(from, to, arg) => SmtlibReRepeatRange(from, to, reglan(arg))
+      case SmtlibReRepeatRange(from, to, arg) =>
+        SmtlibReRepeatRange(from, to, reglan(arg))
       case SmtlibReStar(arg) => SmtlibReStar(reglan(arg))
-      case SmtlibReUnion(left, right) => SmtlibReUnion(reglan(left), reglan(right))
+      case SmtlibReUnion(left, right) =>
+        SmtlibReUnion(reglan(left), reglan(right))
       case SmtlibRNA() => SmtlibRNA()
       case SmtlibRNE() => SmtlibRNE()
       case SmtlibRTN() => SmtlibRTN()
@@ -1419,85 +1878,111 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
         SmtlibSelect(e, i.zip(t.index).map { case (e, t) => coerce(e, t) })
       case SmtlibStore(arr, i, x) =>
         val (e, t) = smtarr(arr)
-        SmtlibStore(e, i.zip(t.index).map { case (e, t) => coerce(e, t) }, coerce(x, t.value))
+        SmtlibStore(
+          e,
+          i.zip(t.index).map { case (e, t) => coerce(e, t) },
+          coerce(x, t.value),
+        )
       case SmtlibStrAt(str, i) => SmtlibStrAt(smtstr(str), int(i))
-      case SmtlibStrConcat(left, right) => SmtlibStrConcat(smtstr(left), smtstr(right))
-      case SmtlibStrContains(left, right) => SmtlibStrContains(smtstr(left), smtstr(right))
+      case SmtlibStrConcat(left, right) =>
+        SmtlibStrConcat(smtstr(left), smtstr(right))
+      case SmtlibStrContains(left, right) =>
+        SmtlibStrContains(smtstr(left), smtstr(right))
       case SmtlibStrFromCode(arg) => SmtlibStrFromCode(int(arg))
       case SmtlibStrFromInt(arg) => SmtlibStrFromInt(int(arg))
-      case SmtlibStrIndexOf(haystack, needle, fromIndex) => SmtlibStrIndexOf(smtstr(haystack), smtstr(needle), int(fromIndex))
+      case SmtlibStrIndexOf(haystack, needle, fromIndex) =>
+        SmtlibStrIndexOf(smtstr(haystack), smtstr(needle), int(fromIndex))
       case SmtlibStrIsDigit(arg) => SmtlibStrIsDigit(smtstr(arg))
       case SmtlibStrLen(arg) => SmtlibStrLen(smtstr(arg))
-      case SmtlibStrLeq(left, right) => SmtlibStrLeq(smtstr(left), smtstr(right))
+      case SmtlibStrLeq(left, right) =>
+        SmtlibStrLeq(smtstr(left), smtstr(right))
       case SmtlibStrLt(left, right) => SmtlibStrLt(smtstr(left), smtstr(right))
-      case SmtlibStrPrefixOf(left, right) => SmtlibStrPrefixOf(smtstr(left), smtstr(right))
-      case SmtlibStrReplace(haystack, needle, replacement) => SmtlibStrReplace(smtstr(haystack), smtstr(needle), smtstr(replacement))
-      case SmtlibStrReplaceAll(haystack, needle, replacement) => SmtlibStrReplaceAll(smtstr(haystack), smtstr(needle), smtstr(replacement))
-      case SmtlibStrReplaceRe(haystack, re, replacement) => SmtlibStrReplaceRe(smtstr(haystack), reglan(re), smtstr(replacement))
-      case SmtlibStrReplaceReAll(haystack, re, replacement) => SmtlibStrReplaceReAll(smtstr(haystack), reglan(re), smtstr(replacement))
-      case SmtlibStrSuffixOf(left, right) => SmtlibStrSuffixOf(smtstr(left), smtstr(right))
+      case SmtlibStrPrefixOf(left, right) =>
+        SmtlibStrPrefixOf(smtstr(left), smtstr(right))
+      case SmtlibStrReplace(haystack, needle, replacement) =>
+        SmtlibStrReplace(smtstr(haystack), smtstr(needle), smtstr(replacement))
+      case SmtlibStrReplaceAll(haystack, needle, replacement) =>
+        SmtlibStrReplaceAll(
+          smtstr(haystack),
+          smtstr(needle),
+          smtstr(replacement),
+        )
+      case SmtlibStrReplaceRe(haystack, re, replacement) =>
+        SmtlibStrReplaceRe(smtstr(haystack), reglan(re), smtstr(replacement))
+      case SmtlibStrReplaceReAll(haystack, re, replacement) =>
+        SmtlibStrReplaceReAll(smtstr(haystack), reglan(re), smtstr(replacement))
+      case SmtlibStrSuffixOf(left, right) =>
+        SmtlibStrSuffixOf(smtstr(left), smtstr(right))
       case SmtlibStrToCode(arg) => SmtlibStrToCode(smtstr(arg))
       case SmtlibStrToInt(arg) => SmtlibStrToInt(smtstr(arg))
       case SmtlibSubstr(str, i, n) => SmtlibSubstr(smtstr(str), int(i), int(n))
-      case SmtlibToFp(bv, e, m) => SmtlibToFp(coerce(bv, TSmtlibBitVector(e + m)), e, m)
-      case Star(left, right) =>
-        Star(res(left), res(right))
+      case SmtlibToFp(bv, e, m) =>
+        SmtlibToFp(coerce(bv, TSmtlibBitVector(e + m)), e, m)
+      case Star(left, right) => Star(res(left), res(right))
       case starall @ Starall(bindings, triggers, body) =>
         Starall(bindings, triggers, res(body))(starall.blame)
       case SubBag(left, right) =>
         val (coercedLeft, leftBag) = bag(left)
         val (coercedRight, rightBag) = bag(right)
-        val sharedType = Types.leastCommonSuperType(leftBag.element, rightBag.element)
-        SubBag(coerce(coercedLeft, TBag(sharedType)), coerce(coercedRight, TBag(sharedType)))
+        val sharedType = Types
+          .leastCommonSuperType(leftBag.element, rightBag.element)
+        SubBag(
+          coerce(coercedLeft, TBag(sharedType)),
+          coerce(coercedRight, TBag(sharedType)),
+        )
       case SubBagEq(left, right) =>
         val (coercedLeft, leftBag) = bag(left)
         val (coercedRight, rightBag) = bag(right)
-        val sharedType = Types.leastCommonSuperType(leftBag.element, rightBag.element)
-        SubBagEq(coerce(coercedLeft, TBag(sharedType)), coerce(coercedRight, TBag(sharedType)))
+        val sharedType = Types
+          .leastCommonSuperType(leftBag.element, rightBag.element)
+        SubBagEq(
+          coerce(coercedLeft, TBag(sharedType)),
+          coerce(coercedRight, TBag(sharedType)),
+        )
       case SubSet(left, right) =>
         val (coercedLeft, leftSet) = set(left)
         val (coercedRight, rightSet) = set(right)
-        val sharedType = Types.leastCommonSuperType(leftSet.element, rightSet.element)
-        SubSet(coerce(coercedLeft, TSet(sharedType)), coerce(coercedRight, TSet(sharedType)))
+        val sharedType = Types
+          .leastCommonSuperType(leftSet.element, rightSet.element)
+        SubSet(
+          coerce(coercedLeft, TSet(sharedType)),
+          coerce(coercedRight, TSet(sharedType)),
+        )
       case SubSetEq(left, right) =>
         val (coercedLeft, leftSet) = set(left)
         val (coercedRight, rightSet) = set(right)
-        val sharedType = Types.leastCommonSuperType(leftSet.element, rightSet.element)
-        SubSetEq(coerce(coercedLeft, TSet(sharedType)), coerce(coercedRight, TSet(sharedType)))
-      case SubType(left, right) =>
-        SubType(left, right)
+        val sharedType = Types
+          .leastCommonSuperType(leftSet.element, rightSet.element)
+        SubSetEq(
+          coerce(coercedLeft, TSet(sharedType)),
+          coerce(coercedRight, TSet(sharedType)),
+        )
+      case SubType(left, right) => SubType(left, right)
       case Sum(bindings, condition, main) =>
         Sum(bindings, bool(condition), int(main))
-      case SuperType(left, right) =>
-        SuperType(left, right)
-      case Tail(xs) =>
-        Tail(seq(xs)._1)
-      case Take(xs, count) =>
-        Take(seq(xs)._1, int(count))
-      case Then(value, post) =>
-        Then(value, post)
-      case ThisModel(ref) =>
-        ThisModel(ref)
-      case ThisChoreography(ref) =>
-        ThisChoreography(ref)
-      case ThisObject(ref) =>
-        ThisObject(ref)
-      case div@TruncMod(left, right) => TruncMod(int(left), int(right))(div.blame)
-      case div@TruncDiv(left, right) => TruncDiv(int(left), int(right))(div.blame)
-      case TupGet(tup, index) =>
-        TupGet(tuple(tup)._1, index)
-      case TypeOf(expr) =>
-        TypeOf(expr)
-      case TypeValue(value) =>
-        TypeValue(value)
+      case SuperType(left, right) => SuperType(left, right)
+      case Tail(xs) => Tail(seq(xs)._1)
+      case Take(xs, count) => Take(seq(xs)._1, int(count))
+      case Then(value, post) => Then(value, post)
+      case ThisModel(ref) => ThisModel(ref)
+      case ThisChoreography(ref) => ThisChoreography(ref)
+      case ThisObject(ref) => ThisObject(ref)
+      case div @ TruncMod(left, right) =>
+        TruncMod(int(left), int(right))(div.blame)
+      case div @ TruncDiv(left, right) =>
+        TruncDiv(int(left), int(right))(div.blame)
+      case TupGet(tup, index) => TupGet(tuple(tup)._1, index)
+      case TypeOf(expr) => TypeOf(expr)
+      case TypeValue(value) => TypeValue(value)
       case UMinus(arg) =>
-        firstOk(e, s"Expected operand to be numeric, but got ${arg.t}.",
+        firstOk(
+          e,
+          s"Expected operand to be numeric, but got ${arg.t}.",
           UMinus(int(arg)),
           UMinus(float(arg)),
           UMinus(rat(arg)),
         )
-      case u @ Unfolding(pred, body) =>
-        Unfolding(res(pred), body)(u.blame)
+      case u @ Unfolding(pred, body) => Unfolding(res(pred), body)(u.blame)
       case UntypedLiteralBag(values) =>
         val sharedType = Types.leastCommonSuperType(values.map(_.t))
         UntypedLiteralBag(values.map(coerce(_, sharedType)))
@@ -1507,70 +1992,82 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case UntypedLiteralSet(values) =>
         val sharedType = Types.leastCommonSuperType(values.map(_.t))
         UntypedLiteralSet(values.map(coerce(_, sharedType)))
-      case ValidArray(arr, len) =>
-        ValidArray(array(arr)._1, int(len))
+      case ValidArray(arr, len) => ValidArray(array(arr)._1, int(len))
       case ValidMatrix(mat, w, h) =>
         ValidMatrix(arrayMatrix(mat)._1, int(w), int(h))
       case value: BooleanValue[Pre] => e
       case value: CIntegerValue[Pre] => e
       case value: IntegerValue[Pre] => e
       case value: FloatValue[Pre] => e
-      case value @ Value(loc) =>
-        Value(loc)
-      case value @ AutoValue(loc) =>
-        value
+      case value @ Value(loc) => Value(loc)
+      case value @ AutoValue(loc) => value
       case values @ Values(arr, from, to) =>
         Values(array(arr)._1, int(from), int(to))(values.blame)
       case VectorCompare(left, right) =>
         val (coercedLeft, leftType) = seq(left)
         val (coercedRight, rightType) = seq(right)
-        val sharedType = Types.leastCommonSuperType(leftType.element, rightType.element)
+        val sharedType = Types
+          .leastCommonSuperType(leftType.element, rightType.element)
         val seqType = TSeq(sharedType)
-        VectorCompare(coerce(coercedLeft, seqType), coerce(coercedRight, seqType))
+        VectorCompare(
+          coerce(coercedLeft, seqType),
+          coerce(coercedRight, seqType),
+        )
       case VectorEq(left, right) =>
         val (coercedLeft, leftType) = vector(left)
         val (coercedRight, rightType) = vector(right)
 
-        if(leftType.size != rightType.size)
-          throw IncoercibleExplanation(e, s"Expected both operands to have a vector type of equal size, " +
-            s"but got ${leftType} and ${rightType}")
+        if (leftType.size != rightType.size)
+          throw IncoercibleExplanation(
+            e,
+            s"Expected both operands to have a vector type of equal size, " +
+              s"but got ${leftType} and ${rightType}",
+          )
 
-        val sharedType = Types.leastCommonSuperType(leftType.element, rightType.element)
+        val sharedType = Types
+          .leastCommonSuperType(leftType.element, rightType.element)
         val vectorType = TVector(leftType.size, sharedType)
         VectorEq(coerce(left, vectorType), coerce(right, vectorType))
-      case div @ VectorFloatDiv(_, _) => vectorFloatOp2(div, (l,r) => VectorFloatDiv(l,r)(div.blame))
-      case div @ VectorFloorDiv(_, _) => vectorIntOp2(div, (l,r) => VectorFloorDiv(l,r)(div.blame))
+      case div @ VectorFloatDiv(_, _) =>
+        vectorFloatOp2(div, (l, r) => VectorFloatDiv(l, r)(div.blame))
+      case div @ VectorFloorDiv(_, _) =>
+        vectorIntOp2(div, (l, r) => VectorFloorDiv(l, r)(div.blame))
       case minus @ VectorMinus(_, _) =>
-        vectorOp2(minus, (l,r) => VectorMinus(l,r))
-      case mod@ VectorMod(_, _) => vectorIntOp2(mod, (l,r) => VectorMod(l,r)(mod.blame))
+        vectorOp2(minus, (l, r) => VectorMinus(l, r))
+      case mod @ VectorMod(_, _) =>
+        vectorIntOp2(mod, (l, r) => VectorMod(l, r)(mod.blame))
       case mult @ VectorMult(_, _) =>
-        vectorOp2(mult, (l,r) => VectorMult(l,r))
+        vectorOp2(mult, (l, r) => VectorMult(l, r))
       case VectorNeq(left, right) =>
         val sharedType = Types.leastCommonSuperType(left.t, right.t)
         VectorNeq(coerce(left, sharedType), coerce(right, sharedType))
       case plus @ VectorPlus(_, _) =>
-        vectorOp2(plus, (l,r) => VectorPlus(l,r))
-      case VectorRepeat(e) =>
-        VectorRepeat(e)
+        vectorOp2(plus, (l, r) => VectorPlus(l, r))
+      case VectorRepeat(e) => VectorRepeat(e)
       case get @ VectorSubscript(xs, index) =>
         VectorSubscript(vector(xs)._1, int(index))(get.blame)
       case VectorSum(indices, vec) =>
-        VectorSum(coerce(indices, TSeq[Pre](TInt())), coerce(vec, TSeq[Pre](TRational())))
-      case div @ VectorTruncDiv(_, _) => vectorIntOp2(div, (l,r) => VectorTruncDiv(l,r)(div.blame))
-      case mod @ VectorTruncMod(_, _) => vectorIntOp2(mod, (l,r) => VectorTruncMod(l,r)(mod.blame))
-      case Void() =>
-        Void()
-      case Wand(left, right) =>
-        Wand(res(left), res(right))
-      case With(pre, value) =>
-        With(pre, value)
-      case WritePerm() =>
-        WritePerm()
-      case Z3ArrayConst(domain, codomain, value) => Z3ArrayConst(domain, codomain, coerce(value, codomain))
+        VectorSum(
+          coerce(indices, TSeq[Pre](TInt())),
+          coerce(vec, TSeq[Pre](TRational())),
+        )
+      case div @ VectorTruncDiv(_, _) =>
+        vectorIntOp2(div, (l, r) => VectorTruncDiv(l, r)(div.blame))
+      case mod @ VectorTruncMod(_, _) =>
+        vectorIntOp2(mod, (l, r) => VectorTruncMod(l, r)(mod.blame))
+      case Void() => Void()
+      case Wand(left, right) => Wand(res(left), res(right))
+      case With(pre, value) => With(pre, value)
+      case WritePerm() => WritePerm()
+      case Z3ArrayConst(domain, codomain, value) =>
+        Z3ArrayConst(domain, codomain, coerce(value, codomain))
       case Z3ArrayMap(ref, arg +: args) =>
         val (_, TSmtlibArray(keyType, _)) = smtarr(arg)
         val ts = ref.ref.decl.args.map(_.t).map(TSmtlibArray(keyType, _))
-        Z3ArrayMap(ref, (arg +: args).zip(ts).map { case (e, t) => coerce(e, t) })
+        Z3ArrayMap(
+          ref,
+          (arg +: args).zip(ts).map { case (e, t) => coerce(e, t) },
+        )
       case Z3ArrayMap(ref, _) => Z3ArrayMap(ref, Nil)
       case Z3ArrayOfFunction(ref) => Z3ArrayOfFunction(ref)
       case Z3BvNand(left, right) => bitvec2(left, right, Z3BvNand(_, _))
@@ -1581,31 +2078,53 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case Z3BvSub(left, right) => bitvec2(left, right, Z3BvSub(_, _))
       case Z3BvXnor(left, right) => bitvec2(left, right, Z3BvXnor(_, _))
       case Z3SeqAt(seq, offset) => Z3SeqAt(z3seq(seq)._1, int(offset))
-      case Z3SeqConcat(left, right) => Z3SeqConcat(z3seq(left)._1, z3seq(right)._1)
-      case Z3SeqContains(seq, subseq) => Z3SeqContains(z3seq(seq)._1, z3seq(subseq)._1)
+      case Z3SeqConcat(left, right) =>
+        Z3SeqConcat(z3seq(left)._1, z3seq(right)._1)
+      case Z3SeqContains(seq, subseq) =>
+        Z3SeqContains(z3seq(seq)._1, z3seq(subseq)._1)
       case Z3SeqEmpty(elementType) => Z3SeqEmpty(elementType)
-      case Z3SeqExtract(seq, offset, len) => Z3SeqExtract(z3seq(seq)._1, int(offset), int(len))
+      case Z3SeqExtract(seq, offset, len) =>
+        Z3SeqExtract(z3seq(seq)._1, int(offset), int(len))
       case Z3SeqFoldl(f, base, seq) =>
         val (cseq, seqt) = z3seq(seq)
-        Z3SeqFoldl(coerce(f, TSmtlibArray(Seq(base.t, seqt.element), base.t)), base, cseq)
+        Z3SeqFoldl(
+          coerce(f, TSmtlibArray(Seq(base.t, seqt.element), base.t)),
+          base,
+          cseq,
+        )
       case Z3SeqFoldlI(f, offset, base, seq) =>
         val (cseq, seqt) = z3seq(seq)
-        Z3SeqFoldlI(coerce(f, TSmtlibArray(Seq(TInt(), base.t, seqt.element), base.t)), int(offset), base, cseq)
+        Z3SeqFoldlI(
+          coerce(f, TSmtlibArray(Seq(TInt(), base.t, seqt.element), base.t)),
+          int(offset),
+          base,
+          cseq,
+        )
       case Z3SeqLen(arg) => Z3SeqLen(z3seq(arg)._1)
       case Z3SeqMap(f, seq) =>
         val (cf, arrt) = smtarr(f)
-        if(arrt.index.size != 1) coerce(f, TSmtlibArray(Seq(TAnyValue()), arrt.value))
+        if (arrt.index.size != 1)
+          coerce(f, TSmtlibArray(Seq(TAnyValue()), arrt.value))
         Z3SeqMap(cf, coerce(seq, TSmtlibSeq(arrt.index.head)))
       case Z3SeqMapI(f, offset, seq) =>
         val (cf, arrt) = smtarr(f)
-        if(arrt.index.size != 2) coerce(f, TSmtlibArray(Seq(TInt(), TAnyValue()), arrt.value))
+        if (arrt.index.size != 2)
+          coerce(f, TSmtlibArray(Seq(TInt(), TAnyValue()), arrt.value))
         Z3SeqMapI(cf, int(offset), coerce(seq, TSmtlibSeq(arrt.index(1))))
       case Z3SeqNth(seq, offset) => Z3SeqNth(z3seq(seq)._1, int(offset))
-      case Z3SeqPrefixOf(pre, subseq) => Z3SeqPrefixOf(z3seq(pre)._1, z3seq(subseq)._1)
-      case Z3SeqReplace(haystack, needle, replacement) => Z3SeqReplace(z3seq(haystack)._1, z3seq(needle)._1, z3seq(replacement)._1)
-      case Z3SeqSuffixOf(post, seq) => Z3SeqSuffixOf(z3seq(post)._1, z3seq(seq)._1)
+      case Z3SeqPrefixOf(pre, subseq) =>
+        Z3SeqPrefixOf(z3seq(pre)._1, z3seq(subseq)._1)
+      case Z3SeqReplace(haystack, needle, replacement) =>
+        Z3SeqReplace(
+          z3seq(haystack)._1,
+          z3seq(needle)._1,
+          z3seq(replacement)._1,
+        )
+      case Z3SeqSuffixOf(post, seq) =>
+        Z3SeqSuffixOf(z3seq(post)._1, z3seq(seq)._1)
       case Z3SeqUnit(arg) => Z3SeqUnit(arg)
-      case Z3TransitiveClosure(ref, args) => Z3TransitiveClosure(ref, coerceArgs(args, ref.ref.decl))
+      case Z3TransitiveClosure(ref, args) =>
+        Z3TransitiveClosure(ref, coerceArgs(args, ref.ref.decl))
       case localIncoming: BipLocalIncomingData[Pre] => localIncoming
       case glue: JavaBipGlue[Pre] => glue
       case LlvmLocal(name) => e
@@ -1623,14 +2142,17 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
     stat match {
       case a @ Assert(assn) => Assert(res(assn))(a.blame)
       case a @ Assign(target, value) =>
-        try { Assign(target, coerce(value, target.t, canCDemote=true))(a.blame) } catch {
+        try {
+          Assign(target, coerce(value, target.t, canCDemote = true))(a.blame)
+        } catch {
           case err: Incoercible =>
             println(err.text)
             throw err
         }
       case Assume(assn) => Assume(bool(assn))
       case Block(statements) => Block(statements)
-      case Branch(branches) => Branch(branches.map { case (cond, effect) => (bool(cond), effect) })
+      case Branch(branches) =>
+        Branch(branches.map { case (cond, effect) => (bool(cond), effect) })
       case Break(label) => Break(label)
       case Case(pattern) => Case(pattern)
       case CDeclarationStatement(decl) => CDeclarationStatement(decl)
@@ -1645,69 +2167,147 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case Extract(body) => Extract(body)
       case f @ Fold(assn) => Fold(res(assn))(f.blame)
       case f @ Fork(obj) => Fork(cls(obj))(f.blame)
-      case proof @ FramedProof(pre, body, post) => FramedProof(res(pre), body, res(post))(proof.blame)
+      case proof @ FramedProof(pre, body, post) =>
+        FramedProof(res(pre), body, res(post))(proof.blame)
       case Goto(lbl) => Goto(lbl)
       case GpgpuAtomic(impl, before, after) => GpgpuAtomic(impl, before, after)
-      case b @ GpgpuBarrier(requires, ensures, specifier) => GpgpuBarrier(res(requires), res(ensures), specifier)(b.blame)
+      case b @ GpgpuBarrier(requires, ensures, specifier) =>
+        GpgpuBarrier(res(requires), res(ensures), specifier)(b.blame)
       case Havoc(loc) => Havoc(loc)
       case IndetBranch(branches) => IndetBranch(branches)
       case Inhale(assn) => Inhale(res(assn))
       case Instantiate(cls, dest) => Instantiate(cls, dest)
-      case inv @ InvokeConstructor(ref, classTypeArgs, out, args, outArgs, typeArgs, givenMap, yields) =>
+      case inv @ InvokeConstructor(
+            ref,
+            classTypeArgs,
+            out,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
         val cls = TClass(ref.decl.cls, classTypeArgs)
-        InvokeConstructor(ref, classTypeArgs, out, coerceArgs(args, ref.decl, inv.typeEnv, canCDemote = true), outArgs, typeArgs, coerceGiven(givenMap, canCDemote = true), coerceYields(yields, args.head))(inv.blame)
-      case inv @ InvokeProcedure(ref, args, outArgs, typeArgs, givenMap, yields) =>
-        InvokeProcedure(ref, coerceArgs(args, ref.decl, inv.typeEnv, canCDemote=true), outArgs, typeArgs, coerceGiven(givenMap,canCDemote=true), coerceYields(yields, args.head))(inv.blame)
-      case inv @ InvokeMethod(obj, ref, args, outArgs, typeArgs, givenMap, yields) =>
-        InvokeMethod(cls(obj), ref, coerceArgs(args, ref.decl, inv.typeEnv, canCDemote=true), outArgs, typeArgs, coerceGiven(givenMap,canCDemote=true), coerceYields(yields, args.head))(inv.blame)
-      case JavaLocalDeclarationStatement(decl) => JavaLocalDeclarationStatement(decl)
+        InvokeConstructor(
+          ref,
+          classTypeArgs,
+          out,
+          coerceArgs(args, ref.decl, inv.typeEnv, canCDemote = true),
+          outArgs,
+          typeArgs,
+          coerceGiven(givenMap, canCDemote = true),
+          coerceYields(yields, args.head),
+        )(inv.blame)
+      case inv @ InvokeProcedure(
+            ref,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        InvokeProcedure(
+          ref,
+          coerceArgs(args, ref.decl, inv.typeEnv, canCDemote = true),
+          outArgs,
+          typeArgs,
+          coerceGiven(givenMap, canCDemote = true),
+          coerceYields(yields, args.head),
+        )(inv.blame)
+      case inv @ InvokeMethod(
+            obj,
+            ref,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        InvokeMethod(
+          cls(obj),
+          ref,
+          coerceArgs(args, ref.decl, inv.typeEnv, canCDemote = true),
+          outArgs,
+          typeArgs,
+          coerceGiven(givenMap, canCDemote = true),
+          coerceYields(yields, args.head),
+        )(inv.blame)
+      case JavaLocalDeclarationStatement(decl) =>
+        JavaLocalDeclarationStatement(decl)
       case j @ Join(obj) => Join(cls(obj))(j.blame)
       case Label(decl, stat) => Label(decl, stat)
       case LocalDecl(local) => LocalDecl(local)
       case l @ Lock(obj) => Lock(cls(obj))(l.blame)
-      case Loop(init, cond, update, contract, body) => Loop(init, bool(cond), update, contract, body)
-      case LlvmLoop(cond, contract, body) => LlvmLoop(bool(cond), contract, body)
-      case ModelDo(model, perm, after, action, impl) => ModelDo(model, rat(perm), after, action, impl)
+      case Loop(init, cond, update, contract, body) =>
+        Loop(init, bool(cond), update, contract, body)
+      case LlvmLoop(cond, contract, body) =>
+        LlvmLoop(bool(cond), contract, body)
+      case ModelDo(model, perm, after, action, impl) =>
+        ModelDo(model, rat(perm), after, action, impl)
       case n @ Notify(obj) => Notify(cls(obj))(n.blame)
       case at @ ParAtomic(inv, content) => ParAtomic(inv, content)(at.blame)
-      case bar @ ParBarrier(block, invs, requires, ensures, content) => ParBarrier(block, invs, res(requires), res(ensures), content)(bar.blame)
-      case p @ ParInvariant(decl, inv, content) => ParInvariant(decl, res(inv), content)(p.blame)
+      case bar @ ParBarrier(block, invs, requires, ensures, content) =>
+        ParBarrier(block, invs, res(requires), res(ensures), content)(bar.blame)
+      case p @ ParInvariant(decl, inv, content) =>
+        ParInvariant(decl, res(inv), content)(p.blame)
       case ParStatement(impl) => ParStatement(impl)
       case RangedFor(iter, contract, body) => RangedFor(iter, contract, body)
       case Recv(ref) => Recv(ref)
       case r @ Refute(assn) => Refute(res(assn))(r.blame)
-      case Return(result) => Return(result) // TODO coerce return, make AmbiguousReturn?
+      case Return(result) =>
+        Return(result) // TODO coerce return, make AmbiguousReturn?
       case Scope(locals, body) => Scope(locals, body)
-      case send @ Send(decl, offset, resource) => Send(decl, offset, res(resource))(send.blame)
-      case ass @ SilverFieldAssign(obj, field, value) => SilverFieldAssign(ref(obj), field, coerce(value, field.decl.t))(ass.blame)
-      case SilverLocalAssign(v, value) => SilverLocalAssign(v, coerce(value, v.decl.t))
+      case send @ Send(decl, offset, resource) =>
+        Send(decl, offset, res(resource))(send.blame)
+      case ass @ SilverFieldAssign(obj, field, value) =>
+        SilverFieldAssign(ref(obj), field, coerce(value, field.decl.t))(
+          ass.blame
+        )
+      case SilverLocalAssign(v, value) =>
+        SilverLocalAssign(v, coerce(value, v.decl.t))
       case SilverNewRef(v, fields) => SilverNewRef(v, fields)
       case SpecIgnoreEnd() => SpecIgnoreEnd()
       case SpecIgnoreStart() => SpecIgnoreStart()
       case Switch(expr, body) => Switch(expr, body)
       case s @ Synchronized(obj, body) => Synchronized(cls(obj), body)(s.blame)
       case t @ Throw(obj) => Throw(cls(obj))(t.blame)
-      case TryCatchFinally(body, after, catches) => TryCatchFinally(body, after, catches)
+      case TryCatchFinally(body, after, catches) =>
+        TryCatchFinally(body, after, catches)
       case u @ Unfold(assn) => Unfold(res(assn))(u.blame)
       case u @ Unlock(obj) => Unlock(cls(obj))(u.blame)
-      case VecBlock(iters, requires, ensures, content) => VecBlock(iters, res(requires), res(ensures), content)
+      case VecBlock(iters, requires, ensures, content) =>
+        VecBlock(iters, res(requires), res(ensures), content)
       case w @ Wait(obj) => Wait(cls(obj))(w.blame)
       case w @ WandApply(assn) => WandApply(res(assn))(w.blame)
       case w @ WandPackage(expr, stat) => WandPackage(res(expr), stat)(w.blame)
-      case VeyMontAssignExpression(t,a) => VeyMontAssignExpression(t,a)
-      case CommunicateX(r,s,t,a) => CommunicateX(r,s,t,a)
-      case c @ PVLCommunicate(receiver, target, sender, msg) if target.t == msg.t => PVLCommunicate(receiver, target, sender, msg)(c.blame)
-      case comm@PVLCommunicate(receiver, target, sender, msg) => throw IncoercibleExplanation(comm, s"The message should have type ${target.t}, but actually has type ${msg.t}.")
+      case VeyMontAssignExpression(t, a) => VeyMontAssignExpression(t, a)
+      case CommunicateX(r, s, t, a) => CommunicateX(r, s, t, a)
+      case c @ PVLCommunicate(receiver, target, sender, msg)
+          if target.t == msg.t =>
+        PVLCommunicate(receiver, target, sender, msg)(c.blame)
+      case comm @ PVLCommunicate(receiver, target, sender, msg) =>
+        throw IncoercibleExplanation(
+          comm,
+          s"The message should have type ${target.t}, but actually has type ${msg.t}.",
+        )
       case PVLChannelInvariant(comm, inv) => PVLChannelInvariant(comm, res(inv))
       case s: PVLChorStatement[Pre] => s
       case s: ChorBranch[Pre] => s
       case s: ChorLoop[Pre] => s
       case c: ChorStatement[Pre] => c
       case c: CommunicateStatement[Pre] => c
-      case branch@UnresolvedChorBranch(branches) => UnresolvedChorBranch(branches.map { case (cond, effect) => (bool(cond), effect) })(branch.blame)
-      case branch@PVLBranch(branches) => PVLBranch(branches.map { case (cond, effect) => (bool(cond), effect) })(branch.blame)
-      case loop@UnresolvedChorLoop(cond, contract, body) => UnresolvedChorLoop(bool(cond), contract, body)(loop.blame)
-      case loop@PVLLoop(init, cond, update, contract, body) => PVLLoop(init, bool(cond), update, contract, body)(loop.blame)
+      case branch @ UnresolvedChorBranch(branches) =>
+        UnresolvedChorBranch(branches.map { case (cond, effect) =>
+          (bool(cond), effect)
+        })(branch.blame)
+      case branch @ PVLBranch(branches) =>
+        PVLBranch(branches.map { case (cond, effect) => (bool(cond), effect) })(
+          branch.blame
+        )
+      case loop @ UnresolvedChorLoop(cond, contract, body) =>
+        UnresolvedChorLoop(bool(cond), contract, body)(loop.blame)
+      case loop @ PVLLoop(init, cond, update, contract, body) =>
+        PVLLoop(init, bool(cond), update, contract, body)(loop.blame)
     }
   }
 
@@ -1718,128 +2318,185 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
         new CTranslationUnit(unit.declarations)
       case unit: CPPTranslationUnit[Pre] =>
         new CPPTranslationUnit(unit.declarations)
-      case variable: HeapVariable[Pre] =>
-        new HeapVariable(variable.t)
+      case variable: HeapVariable[Pre] => new HeapVariable(variable.t)
       case rule: SimplificationRule[Pre] =>
         new SimplificationRule[Pre](bool(rule.axiom))
-      case dataType: AxiomaticDataType[Pre] =>
-        dataType
+      case dataType: AxiomaticDataType[Pre] => dataType
       case clazz: Class[Pre] =>
-        new Class[Pre](clazz.typeArgs, clazz.decls, clazz.supports, res(clazz.intrinsicLockInvariant))
-      case enum: Enum[Pre] =>
-        enum
-      case enumConstant: EnumConstant[Pre] =>
-        enumConstant
-      case model: Model[Pre] =>
-        model
+        new Class[Pre](
+          clazz.typeArgs,
+          clazz.decls,
+          clazz.supports,
+          res(clazz.intrinsicLockInvariant),
+        )
+      case enum: Enum[Pre] => enum
+      case enumConstant: EnumConstant[Pre] => enumConstant
+      case model: Model[Pre] => model
       case function: Function[Pre] =>
-        new Function[Pre](function.returnType, function.args, function.typeArgs, function.body.map(coerce(_, function.returnType)), function.contract, function.inline, function.threadLocal)(function.blame)
-      case procedure: Procedure[Pre] =>
-        procedure
-      case main_method: VeSUVMainMethod[Pre] =>
-        main_method
+        new Function[Pre](
+          function.returnType,
+          function.args,
+          function.typeArgs,
+          function.body.map(coerce(_, function.returnType)),
+          function.contract,
+          function.inline,
+          function.threadLocal,
+        )(function.blame)
+      case procedure: Procedure[Pre] => procedure
+      case main_method: VeSUVMainMethod[Pre] => main_method
       case predicate: Predicate[Pre] =>
-        new Predicate[Pre](predicate.args, predicate.body.map(res), predicate.threadLocal, predicate.inline)
-      case definition: CFunctionDefinition[Pre] =>
-        definition
-      case declaration: CGlobalDeclaration[Pre] =>
-        declaration
-      case declaration: CStructMemberDeclarator[Pre] =>
-        declaration
-      case cons: Constructor[Pre] =>
-        cons
-      case definition: CPPFunctionDefinition[Pre] =>
-        definition
-      case declaration: CPPGlobalDeclaration[Pre] =>
-        declaration
-      case namespace: JavaNamespace[Pre] =>
-        namespace
+        new Predicate[Pre](
+          predicate.args,
+          predicate.body.map(res),
+          predicate.threadLocal,
+          predicate.inline,
+        )
+      case definition: CFunctionDefinition[Pre] => definition
+      case declaration: CGlobalDeclaration[Pre] => declaration
+      case declaration: CStructMemberDeclarator[Pre] => declaration
+      case cons: Constructor[Pre] => cons
+      case definition: CPPFunctionDefinition[Pre] => definition
+      case declaration: CPPGlobalDeclaration[Pre] => declaration
+      case namespace: JavaNamespace[Pre] => namespace
       case clazz: JavaClass[Pre] =>
-        new JavaClass[Pre](clazz.name, clazz.modifiers, clazz.typeParams, res(clazz.intrinsicLockInvariant), clazz.ext, clazz.imp, clazz.decls)(clazz.blame)
-      case interface: JavaInterface[Pre] =>
-        interface
-      case interface: JavaAnnotationInterface[Pre] =>
-        interface
-      case field: SilverField[Pre] =>
-        field
+        new JavaClass[Pre](
+          clazz.name,
+          clazz.modifiers,
+          clazz.typeParams,
+          res(clazz.intrinsicLockInvariant),
+          clazz.ext,
+          clazz.imp,
+          clazz.decls,
+        )(clazz.blame)
+      case interface: JavaInterface[Pre] => interface
+      case interface: JavaAnnotationInterface[Pre] => interface
+      case field: SilverField[Pre] => field
       case function: InstanceFunction[Pre] =>
-        new InstanceFunction[Pre](function.returnType, function.args, function.typeArgs, function.body.map(coerce(_, function.returnType)), function.contract, function.inline, function.threadLocal)(function.blame)
-      case method: InstanceMethod[Pre] =>
-        method
+        new InstanceFunction[Pre](
+          function.returnType,
+          function.args,
+          function.typeArgs,
+          function.body.map(coerce(_, function.returnType)),
+          function.contract,
+          function.inline,
+          function.threadLocal,
+        )(function.blame)
+      case method: InstanceMethod[Pre] => method
       case predicate: InstancePredicate[Pre] =>
-        new InstancePredicate[Pre](predicate.args, predicate.body.map(res), predicate.threadLocal, predicate.inline)
-      case field: InstanceField[Pre] =>
-        field
-      case method: RunMethod[Pre] =>
-        method
-      case method: InstanceOperatorMethod[Pre] =>
-        method
+        new InstancePredicate[Pre](
+          predicate.args,
+          predicate.body.map(res),
+          predicate.threadLocal,
+          predicate.inline,
+        )
+      case field: InstanceField[Pre] => field
+      case method: RunMethod[Pre] => method
+      case method: InstanceOperatorMethod[Pre] => method
       case function: InstanceOperatorFunction[Pre] =>
-        new InstanceOperatorFunction[Pre](function.returnType, function.operator, function.args, function.body.map(coerce(_, function.returnType)), function.contract, function.inline, function.threadLocal)(function.o)
-      case initialization: JavaSharedInitialization[Pre] =>
-        initialization
+        new InstanceOperatorFunction[Pre](
+          function.returnType,
+          function.operator,
+          function.args,
+          function.body.map(coerce(_, function.returnType)),
+          function.contract,
+          function.inline,
+          function.threadLocal,
+        )(function.o)
+      case initialization: JavaSharedInitialization[Pre] => initialization
       case fields: JavaFields[Pre] =>
-        new JavaFields[Pre](fields.modifiers, fields.t, fields.decls.map {
-          case JavaVariableDeclaration(name, dims, None) => JavaVariableDeclaration(name, dims, None)
-          case JavaVariableDeclaration(name, dims, Some(v)) =>
-            JavaVariableDeclaration(name, dims, Some(coerce(v, FuncTools.repeat[Type[Pre]](TArray(_), dims, fields.t))))
-        })
-      case constructor: JavaConstructor[Pre] =>
-        constructor
-      case method: JavaMethod[Pre] =>
-        method
-      case param: JavaParam[Pre] =>
-        param
-      case method: JavaAnnotationMethod[Pre] =>
-        method
-      case constructor: PVLConstructor[Pre] =>
-        constructor
-      case field: ModelField[Pre] =>
-        field
+        new JavaFields[Pre](
+          fields.modifiers,
+          fields.t,
+          fields.decls.map {
+            case JavaVariableDeclaration(name, dims, None) =>
+              JavaVariableDeclaration(name, dims, None)
+            case JavaVariableDeclaration(name, dims, Some(v)) =>
+              JavaVariableDeclaration(
+                name,
+                dims,
+                Some(coerce(
+                  v,
+                  FuncTools.repeat[Type[Pre]](TArray(_), dims, fields.t),
+                )),
+              )
+          },
+        )
+      case constructor: JavaConstructor[Pre] => constructor
+      case method: JavaMethod[Pre] => method
+      case param: JavaParam[Pre] => param
+      case method: JavaAnnotationMethod[Pre] => method
+      case constructor: PVLConstructor[Pre] => constructor
+      case field: ModelField[Pre] => field
       case proc: ModelProcess[Pre] =>
-        new ModelProcess[Pre](proc.args, process(proc.impl), bool(proc.requires), bool(proc.ensures), proc.modifies, proc.accessible)(proc.blame)
+        new ModelProcess[Pre](
+          proc.args,
+          process(proc.impl),
+          bool(proc.requires),
+          bool(proc.ensures),
+          proc.modifies,
+          proc.accessible,
+        )(proc.blame)
       case action: ModelAction[Pre] =>
-        new ModelAction[Pre](action.args, bool(action.requires), bool(action.ensures), action.modifies, action.accessible)
-      case axiom: ADTAxiom[Pre] =>
-        new ADTAxiom[Pre](bool(axiom.axiom))
-      case function: ADTFunction[Pre] =>
-        function
-      case variable: Variable[Pre] =>
-        variable
-      case decl: LabelDecl[Pre] =>
-        decl
-      case decl: SendDecl[Pre] =>
-        decl
-      case decl: ParBlockDecl[Pre] =>
-        decl
-      case decl: ParInvariantDecl[Pre] =>
-        decl
-      case param: CParam[Pre] =>
-        param
-      case decl: CLocalDeclaration[Pre] =>
-        decl
-      case param: CPPParam[Pre] =>
-        param
-      case decl: CPPLocalDeclaration[Pre] =>
-        decl
+        new ModelAction[Pre](
+          action.args,
+          bool(action.requires),
+          bool(action.ensures),
+          action.modifies,
+          action.accessible,
+        )
+      case axiom: ADTAxiom[Pre] => new ADTAxiom[Pre](bool(axiom.axiom))
+      case function: ADTFunction[Pre] => function
+      case variable: Variable[Pre] => variable
+      case decl: LabelDecl[Pre] => decl
+      case decl: SendDecl[Pre] => decl
+      case decl: ParBlockDecl[Pre] => decl
+      case decl: ParInvariantDecl[Pre] => decl
+      case param: CParam[Pre] => param
+      case decl: CLocalDeclaration[Pre] => decl
+      case param: CPPParam[Pre] => param
+      case decl: CPPLocalDeclaration[Pre] => decl
       case declaration: JavaLocalDeclaration[Pre] =>
-        new JavaLocalDeclaration[Pre](declaration.modifiers, declaration.t, declaration.decls.map {
-          case JavaVariableDeclaration(name, dims, None) => JavaVariableDeclaration(name, dims, None)
-          case JavaVariableDeclaration(name, dims, Some(v)) =>
-            JavaVariableDeclaration(name, dims, Some(coerce(v, FuncTools.repeat[Type[Pre]](TArray(_), dims, declaration.t))))
-        })
+        new JavaLocalDeclaration[Pre](
+          declaration.modifiers,
+          declaration.t,
+          declaration.decls.map {
+            case JavaVariableDeclaration(name, dims, None) =>
+              JavaVariableDeclaration(name, dims, None)
+            case JavaVariableDeclaration(name, dims, Some(v)) =>
+              JavaVariableDeclaration(
+                name,
+                dims,
+                Some(coerce(
+                  v,
+                  FuncTools.repeat[Type[Pre]](TArray(_), dims, declaration.t),
+                )),
+              )
+          },
+        )
       case chor: Choreography[Pre] => chor
-      case endpoint: Endpoint[Pre] => new Endpoint(endpoint.cls, endpoint.typeArgs, endpoint.constructor, endpoint.args)(endpoint.blame)
-      case bc: BipConstructor[Pre] => new BipConstructor(bc.args, bc.body, bc.requires)(bc.blame)
+      case endpoint: Endpoint[Pre] =>
+        new Endpoint(
+          endpoint.cls,
+          endpoint.typeArgs,
+          endpoint.constructor,
+          endpoint.args,
+        )(endpoint.blame)
+      case bc: BipConstructor[Pre] =>
+        new BipConstructor(bc.args, bc.body, bc.requires)(bc.blame)
       case bc: BipComponent[Pre] =>
         new BipComponent(bc.fqn, res(bc.invariant), bc.initial)
-      case bsp: BipStatePredicate[Pre] =>
-        new BipStatePredicate(bool(bsp.expr))
+      case bsp: BipStatePredicate[Pre] => new BipStatePredicate(bool(bsp.expr))
       case trans: BipTransition[Pre] =>
-        new BipTransition(trans.signature, trans.port, trans.source, trans.target, trans.data, trans.guard,
+        new BipTransition(
+          trans.signature,
+          trans.port,
+          trans.source,
+          trans.target,
+          trans.data,
+          trans.guard,
           bool(trans.requires),
           bool(trans.ensures),
-          trans.body
+          trans.body,
         )(trans.blame)
       case data: BipIncomingData[Pre] => data
       case data: BipOutgoingData[Pre] => data
@@ -1854,23 +2511,58 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case typ: ProverType[Pre] => typ
       case func: ProverFunction[Pre] => func
       case function: LlvmSpecFunction[Pre] =>
-        new LlvmSpecFunction[Pre](function.name, function.returnType, function.args, function.typeArgs, function.body.map(coerce(_, function.returnType)), function.contract, function.inline, function.threadLocal)(function.blame)
+        new LlvmSpecFunction[Pre](
+          function.name,
+          function.returnType,
+          function.args,
+          function.typeArgs,
+          function.body.map(coerce(_, function.returnType)),
+          function.contract,
+          function.inline,
+          function.threadLocal,
+        )(function.blame)
       case glob: LlvmGlobal[Pre] => glob
       case endpoint: PVLEndpoint[Pre] => endpoint
       case seqProg: PVLChoreography[Pre] => seqProg
       case seqRun: PVLChorRun[Pre] => seqRun
-      case c: Communicate[Pre] if c.target.t == c.msg.t => new Communicate(res(c.invariant), c.receiver, c.target, c.sender, c.msg)(c.blame)
-      case c: Communicate[Pre] => throw IncoercibleExplanation(c, s"The message should have type ${c.target.t}, but actually has type ${c.msg.t}.")
-      }
+      case c: Communicate[Pre] if c.target.t == c.msg.t =>
+        new Communicate(
+          res(c.invariant),
+          c.receiver,
+          c.target,
+          c.sender,
+          c.msg,
+        )(c.blame)
+      case c: Communicate[Pre] =>
+        throw IncoercibleExplanation(
+          c,
+          s"The message should have type ${c.target.t}, but actually has type ${c.msg.t}.",
+        )
+    }
   }
 
   def coerce(region: ParRegion[Pre]): ParRegion[Pre] = {
     implicit val o: Origin = region.o
     region match {
       case region @ ParParallel(regions) => ParParallel(regions)(region.blame)
-      case region @ ParSequential(regions) => ParSequential(regions)(region.blame)
-      case region @ ParBlock(decl, iters, context_everywhere, requires, ensures, content) =>
-        ParBlock(decl, iters, res(context_everywhere), res(requires), res(ensures), content)(region.blame)
+      case region @ ParSequential(regions) =>
+        ParSequential(regions)(region.blame)
+      case region @ ParBlock(
+            decl,
+            iters,
+            context_everywhere,
+            requires,
+            ensures,
+            content,
+          ) =>
+        ParBlock(
+          decl,
+          iters,
+          res(context_everywhere),
+          res(requires),
+          res(ensures),
+          content,
+        )(region.blame)
     }
   }
 
@@ -1893,10 +2585,11 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
   }
 
   // PB: types may very well contain expressions eventually, but for now they don't.
-  def coerce(node: Type[Pre]): Type[Pre] = node match {
-    case t @ TClass(cls, args) => arity(TClass(cls, args))
-    case _ => node
-  }
+  def coerce(node: Type[Pre]): Type[Pre] =
+    node match {
+      case t @ TClass(cls, args) => arity(TClass(cls, args))
+      case _ => node
+    }
 
   def coerce(node: LoopContract[Pre]): LoopContract[Pre] = {
     implicit val o: Origin = node.o
@@ -1904,7 +2597,9 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case li @ LoopInvariant(invariant, decreases) =>
         LoopInvariant(res(invariant), decreases)(li.blame)
       case ic @ IterationContract(requires, ensures, context_everywhere) =>
-        IterationContract(res(requires), res(ensures), res(context_everywhere))(ic.blame)
+        IterationContract(res(requires), res(ensures), res(context_everywhere))(
+          ic.blame
+        )
     }
   }
 
@@ -1929,26 +2624,41 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
   def coerce(node: DecreasesClause[Pre]): DecreasesClause[Pre] = {
     implicit val o: Origin = node.o
     node match {
-      case DecreasesClauseAssume() =>
-        DecreasesClauseAssume()
-      case DecreasesClauseNoRecursion() =>
-        DecreasesClauseNoRecursion()
+      case DecreasesClauseAssume() => DecreasesClauseAssume()
+      case DecreasesClauseNoRecursion() => DecreasesClauseNoRecursion()
       case DecreasesClauseTuple(exprs) =>
-        DecreasesClauseTuple(exprs.map(int))  // Since we currently only support integers
+        DecreasesClauseTuple(
+          exprs.map(int)
+        ) // Since we currently only support integers
     }
   }
 
   def coerce(node: ApplicableContract[Pre]): ApplicableContract[Pre] = {
     implicit val o: Origin = node.o
-    val ApplicableContract(requires, ensures, context_everywhere, signals, givenArgs, yieldsArgs, decreases) = node
-    ApplicableContract(requires, ensures, res(context_everywhere), signals, givenArgs, yieldsArgs, decreases)(node.blame)
+    val ApplicableContract(
+      requires,
+      ensures,
+      context_everywhere,
+      signals,
+      givenArgs,
+      yieldsArgs,
+      decreases,
+    ) = node
+    ApplicableContract(
+      requires,
+      ensures,
+      res(context_everywhere),
+      signals,
+      givenArgs,
+      yieldsArgs,
+      decreases,
+    )(node.blame)
   }
 
   def coerce(node: AccountedPredicate[Pre]): AccountedPredicate[Pre] = {
     implicit val o: Origin = node.o
     node match {
-      case UnitAccountedPredicate(pred) =>
-        UnitAccountedPredicate(res(pred))
+      case UnitAccountedPredicate(pred) => UnitAccountedPredicate(res(pred))
       case SplitAccountedPredicate(left, right) =>
         SplitAccountedPredicate(left, right)
     }
@@ -1956,21 +2666,15 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
 
   def coerce(node: FieldFlag[Pre]): FieldFlag[Pre] = {
     implicit val o: Origin = node.o
-    node match {
-      case value: Final[_] => value
-    }
+    node match { case value: Final[_] => value }
   }
 
-
   def coerce(node: Location[Pre]): Location[Pre] = {
     implicit val o: Origin = node.o
     node match {
-      case HeapVariableLocation(ref) =>
-        HeapVariableLocation(ref)
-      case FieldLocation(obj, field) =>
-        FieldLocation(cls(obj), field)
-      case ModelLocation(obj, field) =>
-        ModelLocation(model(obj)._1, field)
+      case HeapVariableLocation(ref) => HeapVariableLocation(ref)
+      case FieldLocation(obj, field) => FieldLocation(cls(obj), field)
+      case ModelLocation(obj, field) => ModelLocation(model(obj)._1, field)
       case SilverFieldLocation(obj, field) =>
         SilverFieldLocation(ref(obj), field)
       case a @ ArrayLocation(arrayObj, subscript) =>
@@ -1980,9 +2684,12 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case PredicateLocation(predicate, args) =>
         PredicateLocation(predicate, coerceArgs(args, predicate.decl))
       case InstancePredicateLocation(predicate, obj, args) =>
-        InstancePredicateLocation(predicate, cls(obj), coerceArgs(args, predicate.decl))
-      case al @ AmbiguousLocation(expr) =>
-        AmbiguousLocation(expr)(al.blame)
+        InstancePredicateLocation(
+          predicate,
+          cls(obj),
+          coerceArgs(args, predicate.decl),
+        )
+      case al @ AmbiguousLocation(expr) => AmbiguousLocation(expr)(al.blame)
       case patLoc @ InLinePatternLocation(loc, pat) =>
         InLinePatternLocation(loc, pat)
     }
@@ -2031,7 +2738,9 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
     }
   }
 
-  def coerce(node: CStructMemberDeclarator[Pre]): CStructMemberDeclarator[Pre] = {
+  def coerce(
+      node: CStructMemberDeclarator[Pre]
+  ): CStructMemberDeclarator[Pre] = {
     implicit val o: Origin = node.o
     val CStructMemberDeclarator(specs, decls) = node
     CStructMemberDeclarator(specs, decls)
@@ -2045,10 +2754,7 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
 
   def coerce(node: CTypeExtensions[Pre]): CTypeExtensions[Pre] = {
     implicit val o: Origin = node.o
-    node match {
-      case CTypeAttribute(name, args) =>
-        CTypeAttribute(name, args)
-    }
+    node match { case CTypeAttribute(name, args) => CTypeAttribute(name, args) }
   }
 
   def coerce(node: CDeclarator[Pre]): CDeclarator[Pre] = {
@@ -2062,8 +2768,7 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
         CTypedFunctionDeclarator(params, varargs, inner)
       case CAnonymousFunctionDeclarator(params, inner) =>
         CAnonymousFunctionDeclarator(params, inner)
-      case CName(name) =>
-        CName(name)
+      case CName(name) => CName(name)
     }
   }
 
@@ -2097,14 +2802,14 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
         CPPArrayDeclarator(size.map(int), inner)(array.blame)
       case CPPTypedFunctionDeclarator(params, varargs, inner) =>
         CPPTypedFunctionDeclarator(params, varargs, inner)
-      case CPPLambdaDeclarator(params) =>
-        CPPLambdaDeclarator(params)
-      case CPPName(name) =>
-        CPPName(name)
+      case CPPLambdaDeclarator(params) => CPPLambdaDeclarator(params)
+      case CPPName(name) => CPPName(name)
     }
   }
 
-  def coerce(node: CPPDeclarationSpecifier[Pre]): CPPDeclarationSpecifier[Pre] = {
+  def coerce(
+      node: CPPDeclarationSpecifier[Pre]
+  ): CPPDeclarationSpecifier[Pre] = {
     implicit val o: Origin = node.o
     node match {
       case CPPPure() => CPPPure()
@@ -2175,14 +2880,17 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
       case js @ JavaSynchronized() => JavaSynchronized()(js.blame)
       case JavaTransient() => JavaTransient()
       case JavaVolatile() => JavaVolatile()
-      case annotation @ JavaAnnotation(name, args) => JavaAnnotation(name, args)(annotation.blame)
+      case annotation @ JavaAnnotation(name, args) =>
+        JavaAnnotation(name, args)(annotation.blame)
       case JavaPure() => JavaPure()
       case JavaInline() => JavaInline()
       case JavaBipAnnotation() => JavaBipAnnotation()
     }
   }
 
-  def coerce(node: JavaVariableDeclaration[Pre]): JavaVariableDeclaration[Pre] = {
+  def coerce(
+      node: JavaVariableDeclaration[Pre]
+  ): JavaVariableDeclaration[Pre] = {
     implicit val o: Origin = node.o
     val JavaVariableDeclaration(name, dim, init) = node
     JavaVariableDeclaration(name, dim, init)
@@ -2199,13 +2907,14 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
   def coerce(node: BipPortType[Pre]): BipPortType[Pre] = {
     implicit val o: Origin = node.o
     node match {
-      case BipEnforceable() =>  BipEnforceable()
+      case BipEnforceable() => BipEnforceable()
       case BipSpontaneous() => BipSpontaneous()
       case BipInternal() => BipInternal()
     }
   }
 
-  def coerce(node: BipTransitionSignature[Pre]): BipTransitionSignature[Pre] = node
+  def coerce(node: BipTransitionSignature[Pre]): BipTransitionSignature[Pre] =
+    node
   def coerce(node: BipGlueDataWire[Pre]): BipGlueDataWire[Pre] = node
   def coerce(node: BipGlueRequires[Pre]): BipGlueRequires[Pre] = node
   def coerce(node: BipGlueAccepts[Pre]): BipGlueAccepts[Pre] = node
@@ -2220,10 +2929,12 @@ abstract class CoercingRewriter[Pre <: Generation]() extends BaseCoercingRewrite
   def coerce(node: SmtlibFunctionSymbol[Pre]): SmtlibFunctionSymbol[Pre] = node
 
   def coerce(node: ChorRun[Pre]): ChorRun[Pre] = node
-  def coerce(node: ChorGuard[Pre]): ChorGuard[Pre] = node match {
-    case EndpointGuard(endpoint, cond) => EndpointGuard(endpoint, bool(cond))(node.o)
-    case UnpointedGuard(cond) => UnpointedGuard(bool(cond))(node.o)
-  }
+  def coerce(node: ChorGuard[Pre]): ChorGuard[Pre] =
+    node match {
+      case EndpointGuard(endpoint, cond) =>
+        EndpointGuard(endpoint, bool(cond))(node.o)
+      case UnpointedGuard(cond) => UnpointedGuard(bool(cond))(node.o)
+    }
 
   def coerce(node: PVLEndpointName[Pre]): PVLEndpointName[Pre] = node
   def coerce(node: EndpointName[Pre]): EndpointName[Pre] = node
diff --git a/src/col/vct/col/typerules/CoercionUtils.scala b/src/col/vct/col/typerules/CoercionUtils.scala
index 5f5dfa0c64..47295af0af 100644
--- a/src/col/vct/col/typerules/CoercionUtils.scala
+++ b/src/col/vct/col/typerules/CoercionUtils.scala
@@ -13,26 +13,42 @@ case object CoercionUtils {
   def getCoercion[G](source: Type[G], target: Type[G]): Option[Coercion[G]] =
     getAnyCoercion(source, target).filter(_.isCPromoting)
 
-  def getAnyCoercion[G](source: Type[G], target: Type[G]): Option[Coercion[G]] = {
+  def getAnyCoercion[G](
+      source: Type[G],
+      target: Type[G],
+  ): Option[Coercion[G]] = {
     Some((source, target) match {
       case (_: TNotAValue[_], _) => return None
       case (_, _: TNotAValue[_]) => return None
 
-      case (source, target) if source == target => return Some(CoerceIdentity(source))
+      case (source, target) if source == target =>
+        return Some(CoerceIdentity(source))
       case (TNothing(), _) => CoerceNothingSomething(target)
       case (_, TAny()) => CoerceSomethingAny(source)
 
-      case (TResource(), TAnyValue()) => CoercionSequence(Seq(CoerceResourceResourceVal(), CoerceSomethingAnyValue(TResourceVal())))
+      case (TResource(), TAnyValue()) =>
+        CoercionSequence(Seq(
+          CoerceResourceResourceVal(),
+          CoerceSomethingAnyValue(TResourceVal()),
+        ))
       case (TResource(), TResourceVal()) => CoerceResourceResourceVal()
       case (TResourceVal(), TResource()) => CoerceResourceValResource()
       case (TBool(), TResource()) => CoerceBoolResource()
-      case (TBool(), TResourceVal()) => CoercionSequence(Seq(CoerceBoolResource(), CoerceResourceResourceVal()))
+      case (TBool(), TResourceVal()) =>
+        CoercionSequence(Seq(CoerceBoolResource(), CoerceResourceResourceVal()))
 
       case (_, TAnyValue()) => CoerceSomethingAnyValue(source)
 
       case (source @ TOption(innerSource), target @ TOption(innerTarget)) =>
-        CoerceMapOption(getAnyCoercion(innerSource, innerTarget).getOrElse(return None), innerSource, innerTarget)
-      case (source @ TTuple(Seq(leftSource, rightSource)), target @ TTuple(Seq(leftTarget, rightTarget))) =>
+        CoerceMapOption(
+          getAnyCoercion(innerSource, innerTarget).getOrElse(return None),
+          innerSource,
+          innerTarget,
+        )
+      case (
+            source @ TTuple(Seq(leftSource, rightSource)),
+            target @ TTuple(Seq(leftTarget, rightTarget)),
+          ) =>
         CoerceMapTuple(
           inner = Seq(
             getAnyCoercion(leftSource, leftTarget).getOrElse(return None),
@@ -41,30 +57,68 @@ case object CoercionUtils {
           sourceTypes = Seq(leftSource, rightSource),
           targetTypes = Seq(leftTarget, rightTarget),
         )
-      case (source @ TEither(leftSource, rightSource), target @ TEither(leftTarget, rightTarget)) =>
+      case (
+            source @ TEither(leftSource, rightSource),
+            target @ TEither(leftTarget, rightTarget),
+          ) =>
         CoerceMapEither(
-          (getAnyCoercion(leftSource, leftTarget).getOrElse(return None), getAnyCoercion(rightSource, rightTarget).getOrElse(return None)),
+          (
+            getAnyCoercion(leftSource, leftTarget).getOrElse(return None),
+            getAnyCoercion(rightSource, rightTarget).getOrElse(return None),
+          ),
           (leftSource, rightSource),
           (leftTarget, rightTarget),
         )
       case (TSeq(innerSource), TSeq(innerTarget)) =>
-        CoerceMapSeq(getAnyCoercion(innerSource, innerTarget).getOrElse(return None), innerSource, innerTarget)
+        CoerceMapSeq(
+          getAnyCoercion(innerSource, innerTarget).getOrElse(return None),
+          innerSource,
+          innerTarget,
+        )
       case (TSet(innerSource), TSet(innerTarget)) =>
-        CoerceMapSet(getPromotion(innerSource, innerTarget).getOrElse(return None), innerSource, innerTarget)
-      case (TVector(sizeSource, innerSource), TVector(sizeTarget, innerTarget)) if sizeSource == sizeTarget =>
-        CoerceMapVector(getPromotion(innerSource, innerTarget).getOrElse(return None), innerSource, innerTarget, sizeTarget)
+        CoerceMapSet(
+          getPromotion(innerSource, innerTarget).getOrElse(return None),
+          innerSource,
+          innerTarget,
+        )
+      case (TVector(sizeSource, innerSource), TVector(sizeTarget, innerTarget))
+          if sizeSource == sizeTarget =>
+        CoerceMapVector(
+          getPromotion(innerSource, innerTarget).getOrElse(return None),
+          innerSource,
+          innerTarget,
+          sizeTarget,
+        )
       case (TBag(innerSource), TBag(innerTarget)) =>
-        CoerceMapBag(getPromotion(innerSource, innerTarget).getOrElse(return None), innerSource, innerTarget)
+        CoerceMapBag(
+          getPromotion(innerSource, innerTarget).getOrElse(return None),
+          innerSource,
+          innerTarget,
+        )
       case (TMatrix(innerSource), TMatrix(innerTarget)) =>
-        CoerceMapMatrix(getAnyCoercion(innerSource, innerTarget).getOrElse(return None), innerSource, innerTarget)
-      case (TMap(sourceKey, innerSource), TMap(targetKey, innerTarget)) if sourceKey == targetKey =>
-        CoerceMapMap(getAnyCoercion(innerSource, innerTarget).getOrElse(return None), (sourceKey, innerSource), (sourceKey, innerTarget))
+        CoerceMapMatrix(
+          getAnyCoercion(innerSource, innerTarget).getOrElse(return None),
+          innerSource,
+          innerTarget,
+        )
+      case (TMap(sourceKey, innerSource), TMap(targetKey, innerTarget))
+          if sourceKey == targetKey =>
+        CoerceMapMap(
+          getAnyCoercion(innerSource, innerTarget).getOrElse(return None),
+          (sourceKey, innerSource),
+          (sourceKey, innerTarget),
+        )
       case (TType(innerSource), TType(innerTarget)) =>
-        CoerceMapType(getAnyCoercion(innerSource, innerTarget).getOrElse(return None), innerSource, innerTarget)
+        CoerceMapType(
+          getAnyCoercion(innerSource, innerTarget).getOrElse(return None),
+          innerSource,
+          innerTarget,
+        )
 
       case (TNull(), TRef()) => CoerceNullRef()
       case (TNull(), TArray(target)) => CoerceNullArray(target)
-      case (TNull(), TClass(target, typeArgs)) => CoerceNullClass(target, typeArgs)
+      case (TNull(), TClass(target, typeArgs)) =>
+        CoerceNullClass(target, typeArgs)
       case (TNull(), JavaTClass(target, _)) => CoerceNullJavaClass(target)
       case (TNull(), TAnyClass()) => CoerceNullAnyClass()
       case (TNull(), TPointer(target)) => CoerceNullPointer(target)
@@ -75,86 +129,135 @@ case object CoercionUtils {
         CoerceCArrayPointer(element)
       case (CPPTArray(_, innerType), TArray(element)) if element == innerType =>
         CoerceCPPArrayPointer(element)
-      case (source@CTVector(_, innerType), TVector(rSize, element)) if element == innerType && source.intSize == rSize =>
+      case (source @ CTVector(_, innerType), TVector(rSize, element))
+          if element == innerType && source.intSize == rSize =>
         CoerceCVectorVector(rSize, element)
-      case (source@TOpenCLVector(lSize, innerType), TVector(rSize, element)) if element == innerType && lSize == rSize =>
+      case (source @ TOpenCLVector(lSize, innerType), TVector(rSize, element))
+          if element == innerType && lSize == rSize =>
         CoerceCVectorVector(rSize, element)
-      case (CTPointer(innerType), TPointer(element)) => //if element == innerType =>
+      case (
+            CTPointer(innerType),
+            TPointer(element),
+          ) => // if element == innerType =>
         getAnyCoercion(element, innerType).getOrElse(return None)
-      case (TPointer(element), CTPointer(innerType)) => //if element == innerType =>
+      case (
+            TPointer(element),
+            CTPointer(innerType),
+          ) => // if element == innerType =>
         getAnyCoercion(element, innerType).getOrElse(return None)
       case (CTArray(_, innerType), CTPointer(element)) =>
-        if(element == innerType){
-          CoerceCArrayPointer(innerType)
-        } else {
+        if (element == innerType) { CoerceCArrayPointer(innerType) }
+        else {
           CoercionSequence(Seq(
             CoerceCArrayPointer(element),
-            getAnyCoercion(element, innerType).getOrElse(return None)
+            getAnyCoercion(element, innerType).getOrElse(return None),
           ))
         }
       case (TFraction(), TZFraction()) => CoerceFracZFrac()
-      case (TFraction(), TRational()) => CoercionSequence(Seq(CoerceFracZFrac(), CoerceZFracRat()))
+      case (TFraction(), TRational()) =>
+        CoercionSequence(Seq(CoerceFracZFrac(), CoerceZFracRat()))
       case (TZFraction(), TRational()) => CoerceZFracRat()
       case (source: FloatType[G], TRational()) => CoerceFloatRat(source)
 
-      case (source @ TFloat(exponentL, mantissaL), target @ TFloat(exponentR, mantissaR)) if exponentL <= exponentR && mantissaL <= mantissaR =>
+      case (
+            source @ TFloat(exponentL, mantissaL),
+            target @ TFloat(exponentR, mantissaR),
+          ) if exponentL <= exponentR && mantissaL <= mantissaR =>
         CoerceIncreasePrecision(source, target)
-      case (source@TCFloat(exponentL, mantissaL), target@TCFloat(exponentR, mantissaR)) if exponentL <= exponentR && mantissaL <= mantissaR =>
+      case (
+            source @ TCFloat(exponentL, mantissaL),
+            target @ TCFloat(exponentR, mantissaR),
+          ) if exponentL <= exponentR && mantissaL <= mantissaR =>
         CoerceIncreasePrecision(source, target)
-      case (source@TCFloat(_, _), target@TCFloat(_, _)) =>
+      case (source @ TCFloat(_, _), target @ TCFloat(_, _)) =>
         CoerceDecreasePrecision(source, target)
       // Allow to go from C float to normal float and C Int to Int
-      case (source@TCFloat(exponentL, mantissaL), target@TFloat(exponentR, mantissaR)) if exponentL == exponentR && mantissaL == mantissaR =>
+      case (
+            source @ TCFloat(exponentL, mantissaL),
+            target @ TFloat(exponentR, mantissaR),
+          ) if exponentL == exponentR && mantissaL == mantissaR =>
         CoerceCFloatFloat(source, target)
-      case (source@TCFloat(exponentL, mantissaL), target@TFloat(exponentR, mantissaR)) if exponentL < exponentR && mantissaL < mantissaR =>
+      case (
+            source @ TCFloat(exponentL, mantissaL),
+            target @ TFloat(exponentR, mantissaR),
+          ) if exponentL < exponentR && mantissaL < mantissaR =>
         val coercedCFloat = TCFloat[G](exponentR, mantissaR)
-        CoercionSequence(Seq(CoerceIncreasePrecision(source, coercedCFloat), CoerceCFloatFloat(coercedCFloat, target)))
-      case (source@TCFloat(_, _), target@TFloat(exponentR, mantissaR)) =>
+        CoercionSequence(Seq(
+          CoerceIncreasePrecision(source, coercedCFloat),
+          CoerceCFloatFloat(coercedCFloat, target),
+        ))
+      case (source @ TCFloat(_, _), target @ TFloat(exponentR, mantissaR)) =>
         val coercedCFloat = TCFloat[G](exponentR, mantissaR)
-        CoercionSequence(Seq(CoerceDecreasePrecision(source, coercedCFloat), CoerceCFloatFloat(coercedCFloat, target)))
+        CoercionSequence(Seq(
+          CoerceDecreasePrecision(source, coercedCFloat),
+          CoerceCFloatFloat(coercedCFloat, target),
+        ))
       case (TCInt(), TInt()) => CoerceCIntInt()
 
-      case (TBoundedInt(gte, lt), TFraction()) if gte >= 1 && lt <= 2 => CoerceBoundIntFrac()
-      case (source @ TBoundedInt(gte, lt), TZFraction()) if gte >= 0 && lt <= 2 => CoerceBoundIntZFrac(source)
-      case (source @ TBoundedInt(_, _), target: TFloat[G]) => CoerceBoundIntFloat(source, target)
+      case (TBoundedInt(gte, lt), TFraction()) if gte >= 1 && lt <= 2 =>
+        CoerceBoundIntFrac()
+      case (source @ TBoundedInt(gte, lt), TZFraction())
+          if gte >= 0 && lt <= 2 =>
+        CoerceBoundIntZFrac(source)
+      case (source @ TBoundedInt(_, _), target: TFloat[G]) =>
+        CoerceBoundIntFloat(source, target)
 
-      case (source @ TBoundedInt(gte, lt), target @ TBoundedInt(t_gte, t_lt)) if t_gte <= gte && t_lt >= lt =>
+      case (source @ TBoundedInt(gte, lt), target @ TBoundedInt(t_gte, t_lt))
+          if t_gte <= gte && t_lt >= lt =>
         CoerceWidenBound(source, target)
-      case (source: TBoundedInt[G], target: TInt[G]) => CoerceUnboundInt(source, target)
-      case (source: TBoundedInt[G], TRational()) => CoercionSequence(Seq(CoerceUnboundInt(source, TInt()), CoerceIntRat()))
+      case (source: TBoundedInt[G], target: TInt[G]) =>
+        CoerceUnboundInt(source, target)
+      case (source: TBoundedInt[G], TRational()) =>
+        CoercionSequence(Seq(CoerceUnboundInt(source, TInt()), CoerceIntRat()))
       case (_: IntType[G], TRational()) => CoerceIntRat()
 
-      case (source @ TClass(sourceClass, Seq()), target @ TClass(targetClass, Seq()))
-        if source.transSupportArrows.exists { case (_, supp) => supp.cls.decl == targetClass.decl } =>
+      case (
+            source @ TClass(sourceClass, Seq()),
+            target @ TClass(targetClass, Seq()),
+          ) if source.transSupportArrows.exists { case (_, supp) =>
+            supp.cls.decl == targetClass.decl
+          } =>
         CoerceSupports(sourceClass, targetClass)
 
       case (source @ TClass(sourceClass, typeArgs), TAnyClass()) =>
         CoerceClassAnyClass(sourceClass, typeArgs)
 
-      case (source @ JavaTClass(sourceClass, Nil), target @ JavaTClass(targetClass, Nil))
-        if sourceClass.decl.transSupportArrows(Set.empty).exists { case (_, supp) => supp == targetClass.decl } =>
+      case (
+            source @ JavaTClass(sourceClass, Nil),
+            target @ JavaTClass(targetClass, Nil),
+          ) if sourceClass.decl.transSupportArrows(Set.empty).exists {
+            case (_, supp) => supp == targetClass.decl
+          } =>
         CoerceJavaSupports(sourceClass, targetClass)
 
       case (source @ JavaTClass(sourceClass, Nil), TAnyClass()) =>
         CoerceJavaClassAnyClass(sourceClass)
 
       case (source @ TUnion(ts), target) =>
-        CoerceJoinUnion(ts.map(getAnyCoercion(_, target)).map {
-          case Some(coercion) => coercion
-          case None => return None
-        }, source.types, target)
+        CoerceJoinUnion(
+          ts.map(getAnyCoercion(_, target)).map {
+            case Some(coercion) => coercion
+            case None => return None
+          },
+          source.types,
+          target,
+        )
       case (source, target @ TUnion(ts)) =>
-        return ts.map(getAnyCoercion(source, _)).zipWithIndex.collectFirst {
-          case (Some(coercion), index) =>
+        return ts.map(getAnyCoercion(source, _)).zipWithIndex
+          .collectFirst { case (Some(coercion), index) =>
             CoerceSelectUnion(coercion, source, target.types, index)
-        }
+          }
       case (source @ TCFloat(_, _), TCInt()) => CoerceCFloatCInt(source)
-      case (TCInt() , target @ TCFloat(_, _)) => CoerceCIntCFloat(target)
+      case (TCInt(), target @ TCFloat(_, _)) => CoerceCIntCFloat(target)
 
-      case (source @ TCFloat(_, _), TInt()) => CoercionSequence(Seq(CoerceCFloatCInt(source), CoerceCIntInt()))
-      case (TCInt() , target @ TFloat(exponent, mantissa)) =>
+      case (source @ TCFloat(_, _), TInt()) =>
+        CoercionSequence(Seq(CoerceCFloatCInt(source), CoerceCIntInt()))
+      case (TCInt(), target @ TFloat(exponent, mantissa)) =>
         val coercedCFloat = TCFloat[G](exponent, mantissa)
-        CoercionSequence(Seq(CoerceCIntCFloat(coercedCFloat), CoerceCFloatFloat(coercedCFloat, target)))
+        CoercionSequence(Seq(
+          CoerceCIntCFloat(coercedCFloat),
+          CoerceCFloatFloat(coercedCFloat, target),
+        ))
       case (source @ CPrimitiveType(specs), target) =>
         specs.collectFirst { case spec: CSpecificationType[G] => spec } match {
           case Some(CSpecificationType(t)) =>
@@ -175,8 +278,9 @@ case object CoercionUtils {
           case None => return None
         }
 
-      case (source@CPPPrimitiveType(specs), target) =>
-        specs.collectFirst { case spec: CPPSpecificationType[G] => spec } match {
+      case (source @ CPPPrimitiveType(specs), target) =>
+        specs
+          .collectFirst { case spec: CPPSpecificationType[G] => spec } match {
           case Some(CPPSpecificationType(t)) =>
             CoercionSequence(Seq(
               CoerceCPPPrimitiveToCol(source, t),
@@ -185,8 +289,9 @@ case object CoercionUtils {
           case None => return None
         }
 
-      case (source, target@CPPPrimitiveType(specs)) =>
-        specs.collectFirst { case spec: CPPSpecificationType[G] => spec } match {
+      case (source, target @ CPPPrimitiveType(specs)) =>
+        specs
+          .collectFirst { case spec: CPPSpecificationType[G] => spec } match {
           case Some(CPPSpecificationType(t)) =>
             CoercionSequence(Seq(
               getAnyCoercion(source, t).getOrElse(return None),
@@ -195,12 +300,12 @@ case object CoercionUtils {
           case None => return None
         }
 
-
       // Something with TVar?
 
       // Unsafe coercions
       case (TRational(), TZFraction()) => CoerceRatZFrac()
-      case (TRational(), TFraction()) => CoercionSequence(Seq(CoerceRatZFrac(), CoerceZFracFrac()))
+      case (TRational(), TFraction()) =>
+        CoercionSequence(Seq(CoerceRatZFrac(), CoerceZFracFrac()))
       case (TZFraction(), TFraction()) => CoerceZFracFrac()
 
       case (_, _) => return None
@@ -213,231 +318,325 @@ case object CoercionUtils {
       case _ => None
     }
 
-  def getAnyCCoercion[G](source: Type[G]): Option[(Coercion[G], Type[G])] = source match {
-    case t: CPrimitiveType[G] =>
-      t.specifiers.collectFirst { case spec: CSpecificationType[G] => spec }.map {
-        case CSpecificationType(inner) => (CoerceCPrimitiveToCol(t, inner), inner)
-      }
-    case _ => None
-  }
+  def getAnyCCoercion[G](source: Type[G]): Option[(Coercion[G], Type[G])] =
+    source match {
+      case t: CPrimitiveType[G] =>
+        t.specifiers.collectFirst { case spec: CSpecificationType[G] => spec }
+          .map { case CSpecificationType(inner) =>
+            (CoerceCPrimitiveToCol(t, inner), inner)
+          }
+      case _ => None
+    }
 
-  def chainCCoercion[G, T](source: CPrimitiveType[G], next: Type[G] => Option[(Coercion[G], T)]): Option[(Coercion[G], T)] =
+  def chainCCoercion[G, T](
+      source: CPrimitiveType[G],
+      next: Type[G] => Option[(Coercion[G], T)],
+  ): Option[(Coercion[G], T)] =
     getAnyCCoercion(source) match {
-      case Some(inner) => next(inner._2) match {
-        case Some((coercion, finalType)) =>
-          Some((CoercionSequence(Seq(coercion, inner._1)), finalType))
-        case None => None
-      }
+      case Some(inner) =>
+        next(inner._2) match {
+          case Some((coercion, finalType)) =>
+            Some((CoercionSequence(Seq(coercion, inner._1)), finalType))
+          case None => None
+        }
       case None => None
     }
 
-  def getAnyCPPCoercion[G](source: Type[G]): Option[(Coercion[G], Type[G])] = source match {
-    case t: CPPPrimitiveType[G] =>
-      t.specifiers.collectFirst { case spec: CPPSpecificationType[G] => spec }.map {
-        case CPPSpecificationType(inner) => (CoerceCPPPrimitiveToCol(t, inner), inner)
-      }
-    case _ => None
-  }
+  def getAnyCPPCoercion[G](source: Type[G]): Option[(Coercion[G], Type[G])] =
+    source match {
+      case t: CPPPrimitiveType[G] =>
+        t.specifiers.collectFirst { case spec: CPPSpecificationType[G] => spec }
+          .map { case CPPSpecificationType(inner) =>
+            (CoerceCPPPrimitiveToCol(t, inner), inner)
+          }
+      case _ => None
+    }
 
-  def chainCPPCoercion[G, T](source: CPPPrimitiveType[G], next: Type[G] => Option[(Coercion[G], T)]): Option[(Coercion[G], T)] =
+  def chainCPPCoercion[G, T](
+      source: CPPPrimitiveType[G],
+      next: Type[G] => Option[(Coercion[G], T)],
+  ): Option[(Coercion[G], T)] =
     getAnyCPPCoercion(source) match {
-      case Some(inner) => next(inner._2) match {
-        case Some((coercion, finalType)) =>
-          Some((CoercionSequence(Seq(coercion, inner._1)), finalType))
-        case None => None
-      }
+      case Some(inner) =>
+        next(inner._2) match {
+          case Some((coercion, finalType)) =>
+            Some((CoercionSequence(Seq(coercion, inner._1)), finalType))
+          case None => None
+        }
       case None => None
     }
 
-  def getAnySeqCoercion[G](source: Type[G]): Option[(Coercion[G], TSeq[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnySeqCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnySeqCoercion)
-    case t: TSeq[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnySeqCoercion[G](source: Type[G]): Option[(Coercion[G], TSeq[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnySeqCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnySeqCoercion)
+      case t: TSeq[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnySetCoercion[G](source: Type[G]): Option[(Coercion[G], TSet[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnySetCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnySetCoercion)
-    case t: TSet[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnySetCoercion[G](source: Type[G]): Option[(Coercion[G], TSet[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnySetCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnySetCoercion)
+      case t: TSet[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyVectorCoercion[G](source: Type[G]): Option[(Coercion[G], TVector[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyVectorCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyVectorCoercion)
-    case t: CTVector[G] => Some((CoerceCVectorVector(t.intSize, t.innerType), TVector(t.intSize, t.innerType)()))
-    case t: TOpenCLVector[G] => Some((CoerceCVectorVector(t.size, t.innerType), TVector(t.size, t.innerType)()))
-    case t: TVector[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyVectorCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TVector[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyVectorCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyVectorCoercion)
+      case t: CTVector[G] =>
+        Some((
+          CoerceCVectorVector(t.intSize, t.innerType),
+          TVector(t.intSize, t.innerType)(),
+        ))
+      case t: TOpenCLVector[G] =>
+        Some((
+          CoerceCVectorVector(t.size, t.innerType),
+          TVector(t.size, t.innerType)(),
+        ))
+      case t: TVector[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyBagCoercion[G](source: Type[G]): Option[(Coercion[G], TBag[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyBagCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyBagCoercion)
-    case t: TBag[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyBagCoercion[G](source: Type[G]): Option[(Coercion[G], TBag[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyBagCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyBagCoercion)
+      case t: TBag[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnySizedCoercion[G](source: Type[G]): Option[(Coercion[G], SizedType[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnySizedCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnySizedCoercion)
-    case t: TSeq[G] => Some((CoerceIdentity(source), t))
-    case t: TSet[G] => Some((CoerceIdentity(source), t))
-    case t: TBag[G] => Some((CoerceIdentity(source), t))
-    case t: TMap[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnySizedCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], SizedType[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnySizedCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnySizedCoercion)
+      case t: TSeq[G] => Some((CoerceIdentity(source), t))
+      case t: TSet[G] => Some((CoerceIdentity(source), t))
+      case t: TBag[G] => Some((CoerceIdentity(source), t))
+      case t: TMap[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyPointerCoercion[G](source: Type[G]): Option[(Coercion[G], TPointer[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyPointerCoercion)
-    case t: TPointer[G] => Some((CoerceIdentity(source), t))
-    case t: CTPointer[G] => Some((CoerceIdentity(source), TPointer(t.innerType)))
-    case t: CTArray[G] => Some((CoerceCArrayPointer(t.innerType), TPointer(t.innerType)))
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyPointerCoercion)
-    case t: CPPTArray[G] => Some((CoerceCPPArrayPointer(t.innerType), TPointer(t.innerType)))
-    case _: TNull[G] =>
-      val t = TPointer[G](TAnyValue())
-      Some((CoerceNullPointer(t), t))
-    case _ => None
-  }
+  def getAnyPointerCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TPointer[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyPointerCoercion)
+      case t: TPointer[G] => Some((CoerceIdentity(source), t))
+      case t: CTPointer[G] =>
+        Some((CoerceIdentity(source), TPointer(t.innerType)))
+      case t: CTArray[G] =>
+        Some((CoerceCArrayPointer(t.innerType), TPointer(t.innerType)))
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyPointerCoercion)
+      case t: CPPTArray[G] =>
+        Some((CoerceCPPArrayPointer(t.innerType), TPointer(t.innerType)))
+      case _: TNull[G] =>
+        val t = TPointer[G](TAnyValue())
+        Some((CoerceNullPointer(t), t))
+      case _ => None
+    }
 
-  def getAnyCArrayCoercion[G](source: Type[G]): Option[(Coercion[G], CTArray[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyCArrayCoercion)
-    case t: CTArray[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyCArrayCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], CTArray[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyCArrayCoercion)
+      case t: CTArray[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyCPPArrayCoercion[G](source: Type[G]): Option[(Coercion[G], CPPTArray[G])] = source match {
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyCPPArrayCoercion)
-    case t: CPPTArray[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyCPPArrayCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], CPPTArray[G])] =
+    source match {
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyCPPArrayCoercion)
+      case t: CPPTArray[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyArrayCoercion[G](source: Type[G]): Option[(Coercion[G], TArray[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyArrayCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyArrayCoercion)
-    case acc: SYCLTAccessor[G] => Some((
-      CoerceIdentity(source),
-      FuncTools.repeat(TArray[G](_), acc.dimCount, acc.typ).asInstanceOf[TArray[G]]
-    ))
-    case acc: SYCLTLocalAccessor[G] => Some((
-      CoerceIdentity(source),
-      FuncTools.repeat(TArray[G](_), acc.dimCount, acc.typ).asInstanceOf[TArray[G]]
-    ))
-    case t: TArray[G] => Some((CoerceIdentity(source), t))
-    case _: TNull[G] =>
-      val t = TArray[G](TAnyValue())
-      Some((CoerceNullArray(t), t))
-    case _ => None
-  }
+  def getAnyArrayCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TArray[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyArrayCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyArrayCoercion)
+      case acc: SYCLTAccessor[G] =>
+        Some((
+          CoerceIdentity(source),
+          FuncTools.repeat(TArray[G](_), acc.dimCount, acc.typ)
+            .asInstanceOf[TArray[G]],
+        ))
+      case acc: SYCLTLocalAccessor[G] =>
+        Some((
+          CoerceIdentity(source),
+          FuncTools.repeat(TArray[G](_), acc.dimCount, acc.typ)
+            .asInstanceOf[TArray[G]],
+        ))
+      case t: TArray[G] => Some((CoerceIdentity(source), t))
+      case _: TNull[G] =>
+        val t = TArray[G](TAnyValue())
+        Some((CoerceNullArray(t), t))
+      case _ => None
+    }
 
-  def getAnyMatrixArrayCoercion[G](source: Type[G]): Option[(Coercion[G], TArray[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyMatrixArrayCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyMatrixArrayCoercion)
-    case acc: SYCLTAccessor[G] if acc.dimCount >= 2 => Some((
-      CoerceIdentity(source),
-      FuncTools.repeat(TArray[G](_), acc.dimCount, acc.typ).asInstanceOf[TArray[G]]
-    ))
-    case acc: SYCLTLocalAccessor[G] if acc.dimCount >= 2 => Some((
-      CoerceIdentity(source),
-      FuncTools.repeat(TArray[G](_), acc.dimCount, acc.typ).asInstanceOf[TArray[G]]
-    ))
-    case t @ TArray(TArray(_)) => Some((CoerceIdentity(source), t))
-    case TArray(TNull()) => Some(???)
-    case TNull() =>
-      val t = TArray[G](TArray[G](TAnyValue()))
-      Some((CoerceNullArray(t), t))
-    case _ => None
-  }
+  def getAnyMatrixArrayCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TArray[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyMatrixArrayCoercion)
+      case t: CPPPrimitiveType[G] =>
+        chainCPPCoercion(t, getAnyMatrixArrayCoercion)
+      case acc: SYCLTAccessor[G] if acc.dimCount >= 2 =>
+        Some((
+          CoerceIdentity(source),
+          FuncTools.repeat(TArray[G](_), acc.dimCount, acc.typ)
+            .asInstanceOf[TArray[G]],
+        ))
+      case acc: SYCLTLocalAccessor[G] if acc.dimCount >= 2 =>
+        Some((
+          CoerceIdentity(source),
+          FuncTools.repeat(TArray[G](_), acc.dimCount, acc.typ)
+            .asInstanceOf[TArray[G]],
+        ))
+      case t @ TArray(TArray(_)) => Some((CoerceIdentity(source), t))
+      case TArray(TNull()) => Some(???)
+      case TNull() =>
+        val t = TArray[G](TArray[G](TAnyValue()))
+        Some((CoerceNullArray(t), t))
+      case _ => None
+    }
 
-  def getAnyOptionCoercion[G](source: Type[G]): Option[(Coercion[G], TOption[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyOptionCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyOptionCoercion)
-    case t: TOption[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyOptionCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TOption[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyOptionCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyOptionCoercion)
+      case t: TOption[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyMapCoercion[G](source: Type[G]): Option[(Coercion[G], TMap[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyMapCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyMapCoercion)
-    case t: TMap[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyMapCoercion[G](source: Type[G]): Option[(Coercion[G], TMap[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyMapCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyMapCoercion)
+      case t: TMap[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyTupleCoercion[G](source: Type[G]): Option[(Coercion[G], TTuple[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyTupleCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyTupleCoercion)
-    case t: TTuple[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyTupleCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TTuple[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyTupleCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyTupleCoercion)
+      case t: TTuple[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyMatrixCoercion[G](source: Type[G]): Option[(Coercion[G], TMatrix[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyMatrixCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyMatrixCoercion)
-    case t: TMatrix[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyMatrixCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TMatrix[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyMatrixCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyMatrixCoercion)
+      case t: TMatrix[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyModelCoercion[G](source: Type[G]): Option[(Coercion[G], TModel[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyModelCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyModelCoercion)
-    case t: TModel[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyModelCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TModel[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyModelCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyModelCoercion)
+      case t: TModel[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyClassCoercion[G](source: Type[G]): Option[(Coercion[G], TClass[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyClassCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyClassCoercion)
-    case t: TClass[G] => Some((CoerceIdentity(source), t))
-
-    case t: TUnion[G] =>
-      val superType = Types.leastCommonSuperType(t.types)
-      getAnyClassCoercion(superType) match {
-        case Some((coercion, target)) =>
-          val joinedCoercion = CoercionSequence(Seq(
-            CoerceJoinUnion(t.types.map(getCoercion(_, superType).get), t.types, superType),
-            coercion,
-          ))
-          Some((joinedCoercion, target))
-        case None => None
-      }
+  def getAnyClassCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TClass[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyClassCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyClassCoercion)
+      case t: TClass[G] => Some((CoerceIdentity(source), t))
+
+      case t: TUnion[G] =>
+        val superType = Types.leastCommonSuperType(t.types)
+        getAnyClassCoercion(superType) match {
+          case Some((coercion, target)) =>
+            val joinedCoercion = CoercionSequence(Seq(
+              CoerceJoinUnion(
+                t.types.map(getCoercion(_, superType).get),
+                t.types,
+                superType,
+              ),
+              coercion,
+            ))
+            Some((joinedCoercion, target))
+          case None => None
+        }
 
-    case _ => None
-  }
+      case _ => None
+    }
 
-  def getAnyEitherCoercion[G](source: Type[G]): Option[(Coercion[G], TEither[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyEitherCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyEitherCoercion)
-    case t: TEither[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyEitherCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TEither[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyEitherCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyEitherCoercion)
+      case t: TEither[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnyBitvecCoercion[G](source: Type[G]): Option[(Coercion[G], TSmtlibBitVector[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnyBitvecCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyBitvecCoercion)
-    case t: TSmtlibBitVector[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnyBitvecCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TSmtlibBitVector[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnyBitvecCoercion)
+      case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnyBitvecCoercion)
+      case t: TSmtlibBitVector[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnySmtlibFloatCoercion[G](source: Type[G]): Option[(Coercion[G], TSmtlibFloatingPoint[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnySmtlibFloatCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnySmtlibFloatCoercion)
-    case t: TSmtlibFloatingPoint[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnySmtlibFloatCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TSmtlibFloatingPoint[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnySmtlibFloatCoercion)
+      case t: CPPPrimitiveType[G] =>
+        chainCPPCoercion(t, getAnySmtlibFloatCoercion)
+      case t: TSmtlibFloatingPoint[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnySmtlibArrayCoercion[G](source: Type[G]): Option[(Coercion[G], TSmtlibArray[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnySmtlibArrayCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnySmtlibArrayCoercion)
-    case t: TSmtlibArray[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
+  def getAnySmtlibArrayCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TSmtlibArray[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnySmtlibArrayCoercion)
+      case t: CPPPrimitiveType[G] =>
+        chainCPPCoercion(t, getAnySmtlibArrayCoercion)
+      case t: TSmtlibArray[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
 
-  def getAnySmtlibSeqCoercion[G](source: Type[G]): Option[(Coercion[G], TSmtlibSeq[G])] = source match {
-    case t: CPrimitiveType[G] => chainCCoercion(t, getAnySmtlibSeqCoercion)
-    case t: CPPPrimitiveType[G] => chainCPPCoercion(t, getAnySmtlibSeqCoercion)
-    case t: TSmtlibSeq[G] => Some((CoerceIdentity(source), t))
-    case _ => None
-  }
-}
\ No newline at end of file
+  def getAnySmtlibSeqCoercion[G](
+      source: Type[G]
+  ): Option[(Coercion[G], TSmtlibSeq[G])] =
+    source match {
+      case t: CPrimitiveType[G] => chainCCoercion(t, getAnySmtlibSeqCoercion)
+      case t: CPPPrimitiveType[G] =>
+        chainCPPCoercion(t, getAnySmtlibSeqCoercion)
+      case t: TSmtlibSeq[G] => Some((CoerceIdentity(source), t))
+      case _ => None
+    }
+}
diff --git a/src/col/vct/col/typerules/Types.scala b/src/col/vct/col/typerules/Types.scala
index 8a43c6321a..c06bdb2e45 100644
--- a/src/col/vct/col/typerules/Types.scala
+++ b/src/col/vct/col/typerules/Types.scala
@@ -16,79 +16,90 @@ object Types {
   def leastCommonSuperType[G](ts: Seq[Type[G]]): Type[G] =
     ts.foldLeft[Type[G]](TNothing())(leastCommonSuperType[G])
 
-  def leastCommonSuperType[G](left: Type[G], right: Type[G]): Type[G] = (left, right) match {
-    // The result for NotAValue should not matter, since they should be filtered out by LangSpecificToCol.
-    case (left: TNotAValue[_], _) => left
-    case (_, right: TNotAValue[_]) => right
+  def leastCommonSuperType[G](left: Type[G], right: Type[G]): Type[G] =
+    (left, right) match {
+      // The result for NotAValue should not matter, since they should be filtered out by LangSpecificToCol.
+      case (left: TNotAValue[_], _) => left
+      case (_, right: TNotAValue[_]) => right
 
-    // Any other types are below Any, so we can safely default to that from here.
-    // First the simple case where either type is a supertype of the other
-    case (left, right) if left.superTypeOf(right) => left
-    case (left, right) if right.superTypeOf(left) => right
+      // Any other types are below Any, so we can safely default to that from here.
+      // First the simple case where either type is a supertype of the other
+      case (left, right) if left.superTypeOf(right) => left
+      case (left, right) if right.superTypeOf(left) => right
 
-    // Covariant types can apply the least common supertype in their type argument
-    case (TOption(left), TOption(right)) =>
-      TOption(leastCommonSuperType(left, right))
-    case (TEither(leftLeft, leftRight), TEither(rightLeft, rightRight)) =>
-      TEither(
-        leastCommonSuperType(leftLeft, rightLeft),
-        leastCommonSuperType(leftRight, rightRight),
-      )
-    case (TTuple(left), TTuple(right)) if left.size == right.size =>
-      TTuple(left.zip(right).map { case (l, r) => leastCommonSuperType(l, r) })
-    case (TSeq(left), TSeq(right)) =>
-      TSeq(leastCommonSuperType(left, right))
-    case (TSet(left), TSet(right)) =>
-      TSet(leastCommonSuperType(left, right))
-    case (TVector(sizeLeft, left), TVector(sizeRight, right)) if sizeLeft == sizeRight =>
-      TVector(sizeLeft, leastCommonSuperType(left, right))()
-    case (TBag(left), TBag(right)) =>
-      TBag(leastCommonSuperType(left, right))
-    case (TMatrix(left), TMatrix(right)) =>
-      TMatrix(leastCommonSuperType(left, right))
-    case (TMap(leftK, leftV), TMap(rightK, rightV)) =>
-      // Map is not covariant in the key, so if the keys are inequal the best we can do is Any
-      if(leftK == rightK) TMap(leftK, leastCommonSuperType(leftV, rightV))
-      else TAnyValue()
-    case (TType(left), TType(right)) =>
-      TType(leastCommonSuperType(left, right))
+      // Covariant types can apply the least common supertype in their type argument
+      case (TOption(left), TOption(right)) =>
+        TOption(leastCommonSuperType(left, right))
+      case (TEither(leftLeft, leftRight), TEither(rightLeft, rightRight)) =>
+        TEither(
+          leastCommonSuperType(leftLeft, rightLeft),
+          leastCommonSuperType(leftRight, rightRight),
+        )
+      case (TTuple(left), TTuple(right)) if left.size == right.size =>
+        TTuple(left.zip(right).map { case (l, r) =>
+          leastCommonSuperType(l, r)
+        })
+      case (TSeq(left), TSeq(right)) => TSeq(leastCommonSuperType(left, right))
+      case (TSet(left), TSet(right)) => TSet(leastCommonSuperType(left, right))
+      case (TVector(sizeLeft, left), TVector(sizeRight, right))
+          if sizeLeft == sizeRight =>
+        TVector(sizeLeft, leastCommonSuperType(left, right))()
+      case (TBag(left), TBag(right)) => TBag(leastCommonSuperType(left, right))
+      case (TMatrix(left), TMatrix(right)) =>
+        TMatrix(leastCommonSuperType(left, right))
+      case (TMap(leftK, leftV), TMap(rightK, rightV)) =>
+        // Map is not covariant in the key, so if the keys are inequal the best we can do is Any
+        if (leftK == rightK)
+          TMap(leftK, leastCommonSuperType(leftV, rightV))
+        else
+          TAnyValue()
+      case (TType(left), TType(right)) =>
+        TType(leastCommonSuperType(left, right))
 
-    case (left @ TClass(_, _), right @ TClass(_, _)) =>
-      val leftArrows = left.transSupportArrows
-      val rightArrows = right.transSupportArrows
-      // Shared support are classes where there is an incoming left-arrow and right-arrow
-      // If left supports right (or vice-versa), there would be a problem, since right will not have a self-arrow
-      // However, this is caught by the simple sub-typing relation above already.
-      val shared = leftArrows.collect { case (_, sup) if rightArrows.exists { case (_, rsup) => rsup == sup } => sup }
-      // We are not interested in types that occur above shared types
-      val nonBottom = leftArrows.intersect(rightArrows).map { case (sub, sup) => sup }
-      val classes = (shared.toSet -- nonBottom.toSet).toSeq
-      classes match {
-        case Nil => TAnyClass()
-        case Seq(t) => t
-        case other => TUnion(other)
-      }
+      case (left @ TClass(_, _), right @ TClass(_, _)) =>
+        val leftArrows = left.transSupportArrows
+        val rightArrows = right.transSupportArrows
+        // Shared support are classes where there is an incoming left-arrow and right-arrow
+        // If left supports right (or vice-versa), there would be a problem, since right will not have a self-arrow
+        // However, this is caught by the simple sub-typing relation above already.
+        val shared = leftArrows.collect {
+          case (_, sup) if rightArrows.exists { case (_, rsup) =>
+                rsup == sup
+              } =>
+            sup
+        }
+        // We are not interested in types that occur above shared types
+        val nonBottom = leftArrows.intersect(rightArrows).map {
+          case (sub, sup) => sup
+        }
+        val classes = (shared.toSet -- nonBottom.toSet).toSeq
+        classes match {
+          case Nil => TAnyClass()
+          case Seq(t) => t
+          case other => TUnion(other)
+        }
 
-    case (TClass(_, _), TAnyClass()) | (TAnyClass(), TClass(_, _)) =>
-      TAnyClass()
+      case (TClass(_, _), TAnyClass()) | (TAnyClass(), TClass(_, _)) =>
+        TAnyClass()
 
-    // TODO similar stuff for JavaClass
+      // TODO similar stuff for JavaClass
 
-    case (TUnion(left), TUnion(right)) => TUnion((left ++ right).distinct)
-    case (TUnion(left), right) => TUnion((left :+ right).distinct)
-    case (left, TUnion(right)) => TUnion((left +: right).distinct)
+      case (TUnion(left), TUnion(right)) => TUnion((left ++ right).distinct)
+      case (TUnion(left), right) => TUnion((left :+ right).distinct)
+      case (left, TUnion(right)) => TUnion((left +: right).distinct)
 
-    case (TBoundedInt(leftGte, leftLt), TBoundedInt(rightGte, rightLt)) =>
-      TBoundedInt(leftGte.min(rightGte), leftLt.max(rightLt))
+      case (TBoundedInt(leftGte, leftLt), TBoundedInt(rightGte, rightLt)) =>
+        TBoundedInt(leftGte.min(rightGte), leftLt.max(rightLt))
 
-    // Unrelated types below rational are simply a rational
-    case (left, right) if TRational().superTypeOf(left) && TRational().superTypeOf(right) =>
-      TRational()
+      // Unrelated types below rational are simply a rational
+      case (left, right)
+          if TRational().superTypeOf(left) && TRational().superTypeOf(right) =>
+        TRational()
 
-    case (left, right) if TAnyValue().superTypeOf(left) && TAnyValue().superTypeOf(right) =>
-      TAnyValue()
+      case (left, right)
+          if TAnyValue().superTypeOf(left) && TAnyValue().superTypeOf(right) =>
+        TAnyValue()
 
-    case (_, _) =>
-      TAny()
-  }
-}
\ No newline at end of file
+      case (_, _) => TAny()
+    }
+}
diff --git a/src/col/vct/col/util/AstBuildHelpers.scala b/src/col/vct/col/util/AstBuildHelpers.scala
index 33da4dd2b5..0618c8caaa 100644
--- a/src/col/vct/col/util/AstBuildHelpers.scala
+++ b/src/col/vct/col/util/AstBuildHelpers.scala
@@ -8,46 +8,51 @@ import vct.col.ref.{DirectRef, Ref}
 import vct.col.rewrite.Rewritten
 import vct.result.VerificationError.{Unreachable, UserError}
 
-/**
- * Collection of general AST building utilities. This is meant to organically grow, so add helpers as you see fit.
- */
+/** Collection of general AST building utilities. This is meant to organically
+  * grow, so add helpers as you see fit.
+  */
 object AstBuildHelpers {
   val ZERO: BigInt = BigInt(0)
   val ONE: BigInt = BigInt(1)
 
-  case class NumericDividingError(left: Expr[_], right: Expr[_]) extends UserError {
-    override def text: String = f"Expected types to numeric, but got: ${left.t} and ${right.t} for $left and $right"
+  case class NumericDividingError(left: Expr[_], right: Expr[_])
+      extends UserError {
+    override def text: String =
+      f"Expected types to numeric, but got: ${left.t} and ${right.t} for $left and $right"
     override def code: String = "numericDividingError"
   }
 
-  /**
-   * <strong>IMPORTANT</strong>: operators that end with a colon (`:`) are <strong>right-associative</strong>. For example:
-   *
-   * {{{
-   * trait Exp {
-   *   // wrong assumption: this /: right is Divide(this, right)
-   *   def /:(right: Exp) = Divide(this, right)
-   * }
-   *
-   * case class Number(x: Int) extends Exp
-   * case class Divide(left: Exp, right: Exp)
-   *
-   * val one = Number(1)
-   * val two = Number(2)
-   * assert( (one /: two) == Divide(two, one) ) // !!!
-   * assert( (one /: two) == two./:(one) )
-   * }}}
-   *
-   * Also take into account how scala defines
-   * <a href="https://docs.scala-lang.org/tour/operators.html#precedence">operator precedence</a>
-   * when using or defining operators here. The precedence generally does <strong>not</strong> match e.g. the syntax
-   * of PVL.
-   */
+  /** <strong>IMPORTANT</strong>: operators that end with a colon (`:`) are
+    * <strong>right-associative</strong>. For example:
+    *
+    * {{{
+    * trait Exp {
+    *   // wrong assumption: this /: right is Divide(this, right)
+    *   def /:(right: Exp) = Divide(this, right)
+    * }
+    *
+    * case class Number(x: Int) extends Exp
+    * case class Divide(left: Exp, right: Exp)
+    *
+    * val one = Number(1)
+    * val two = Number(2)
+    * assert( (one /: two) == Divide(two, one) ) // !!!
+    * assert( (one /: two) == two./:(one) )
+    * }}}
+    *
+    * Also take into account how scala defines <a
+    * href="https://docs.scala-lang.org/tour/operators.html#precedence">operator
+    * precedence</a> when using or defining operators here. The precedence
+    * generally does <strong>not</strong> match e.g. the syntax of PVL.
+    */
   implicit class ExprBuildHelpers[G](left: Expr[G]) {
     def +(right: Expr[G])(implicit origin: Origin): Plus[G] = Plus(left, right)
-    def -(right: Expr[G])(implicit origin: Origin): Minus[G] = Minus(left, right)
+    def -(right: Expr[G])(implicit origin: Origin): Minus[G] =
+      Minus(left, right)
     def *(right: Expr[G])(implicit origin: Origin): Mult[G] = Mult(left, right)
-    def /(right: Expr[G])(implicit origin: Origin, blame: Blame[DivByZero]):  DividingExpr[G] = {
+    def /(
+        right: Expr[G]
+    )(implicit origin: Origin, blame: Blame[DivByZero]): DividingExpr[G] = {
       (left.t, right.t) match {
         case (_: IntType[G], _: IntType[G]) => FloorDiv(left, right)(blame)
         case (_: FloatType[G], _: FloatType[G]) => FloatDiv(left, right)(blame)
@@ -56,217 +61,481 @@ object AstBuildHelpers {
         case _ => throw NumericDividingError(left, right)
       }
     }
-    def /:/(right: Expr[G])(implicit origin: Origin, blame: Blame[DivByZero]): RatDiv[G] = RatDiv(left, right)(blame)
-    def %(right: Expr[G])(implicit origin: Origin, blame: Blame[DivByZero]): Mod[G] = Mod(left, right)(blame)
+    def /:/(
+        right: Expr[G]
+    )(implicit origin: Origin, blame: Blame[DivByZero]): RatDiv[G] =
+      RatDiv(left, right)(blame)
+    def %(
+        right: Expr[G]
+    )(implicit origin: Origin, blame: Blame[DivByZero]): Mod[G] =
+      Mod(left, right)(blame)
 
     def ===(right: Expr[G])(implicit origin: Origin): Eq[G] = Eq(left, right)
     def !==(right: Expr[G])(implicit origin: Origin): Neq[G] = Neq(left, right)
     def <(right: Expr[G])(implicit origin: Origin): Less[G] = Less(left, right)
-    def >(right: Expr[G])(implicit origin: Origin): Greater[G] = Greater(left, right)
-    def <=(right: Expr[G])(implicit origin: Origin): LessEq[G] = LessEq(left, right)
-    def >=(right: Expr[G])(implicit origin: Origin): GreaterEq[G] = GreaterEq(left, right)
+    def >(right: Expr[G])(implicit origin: Origin): Greater[G] =
+      Greater(left, right)
+    def <=(right: Expr[G])(implicit origin: Origin): LessEq[G] =
+      LessEq(left, right)
+    def >=(right: Expr[G])(implicit origin: Origin): GreaterEq[G] =
+      GreaterEq(left, right)
 
     def unary_!(implicit origin: Origin): Not[G] = Not(left)
     def &&(right: Expr[G])(implicit origin: Origin): And[G] = And(left, right)
     def ||(right: Expr[G])(implicit origin: Origin): Or[G] = Or(left, right)
     def &*(right: Expr[G])(implicit origin: Origin): Star[G] = Star(left, right)
 
-    def ==>(right: Expr[G])(implicit origin: Origin): Implies[G] = Implies(left, right)
+    def ==>(right: Expr[G])(implicit origin: Origin): Implies[G] =
+      Implies(left, right)
 
-    def ~>(field: SilverField[G])(implicit blame: Blame[InsufficientPermission], origin: Origin): SilverDeref[G] = SilverDeref[G](left, field.ref)(blame)
+    def ~>(field: SilverField[G])(
+        implicit blame: Blame[InsufficientPermission],
+        origin: Origin,
+    ): SilverDeref[G] = SilverDeref[G](left, field.ref)(blame)
 
-    def @@(index: Expr[G])(implicit blame: Blame[SeqBoundFailure], origin: Origin): SeqSubscript[G] = SeqSubscript(left, index)(blame)
+    def @@(
+        index: Expr[G]
+    )(implicit blame: Blame[SeqBoundFailure], origin: Origin): SeqSubscript[G] =
+      SeqSubscript(left, index)(blame)
   }
 
   implicit class VarBuildHelpers[G](left: Variable[G]) {
     def get(implicit origin: Origin): Local[G] = Local(new DirectRef(left))
-    def <~(right: Expr[G])(implicit origin: Origin): SilverLocalAssign[G] = SilverLocalAssign(new DirectRef(left), right)
+    def <~(right: Expr[G])(implicit origin: Origin): SilverLocalAssign[G] =
+      SilverLocalAssign(new DirectRef(left), right)
   }
 
   implicit class FieldBuildHelpers[G](left: SilverDeref[G]) {
-    def <~(right: Expr[G])(implicit blame: Blame[AssignFailed], origin: Origin): SilverFieldAssign[G] = SilverFieldAssign(left.obj, left.field, right)(blame)
+    def <~(right: Expr[G])(
+        implicit blame: Blame[AssignFailed],
+        origin: Origin,
+    ): SilverFieldAssign[G] =
+      SilverFieldAssign(left.obj, left.field, right)(blame)
   }
 
-  implicit class ApplicableBuildHelpers[Pre, Post](applicable: Applicable[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Variable[Post]] = rewriter.variables.dispatch(applicable.args),
-               ): Applicable[Post] = applicable match {
-      case inlineable: InlineableApplicable[Pre] =>
-        new InlineableApplicableBuildHelpers(inlineable).rewrite(args = args)
-      case function: ADTFunction[Pre] =>
-        function.rewrite(args = args)
-      case process: ModelProcess[Pre] =>
-        process.rewrite(args = args)
-      case action: ModelAction[Pre] =>
-        action.rewrite(args = args)
-      case llvm: LlvmFunctionDefinition[Pre] =>
-        llvm.rewrite(args = args)
-      case prover: ProverFunction[Pre] =>
-        prover.rewrite(args = args)
-    }
+  implicit class ApplicableBuildHelpers[Pre, Post](applicable: Applicable[Pre])(
+      implicit rewriter: AbstractRewriter[Pre, Post]
+  ) {
+    def rewrite(
+        args: => Seq[Variable[Post]] = rewriter.variables
+          .dispatch(applicable.args)
+    ): Applicable[Post] =
+      applicable match {
+        case inlineable: InlineableApplicable[Pre] =>
+          new InlineableApplicableBuildHelpers(inlineable).rewrite(args = args)
+        case function: ADTFunction[Pre] => function.rewrite(args = args)
+        case process: ModelProcess[Pre] => process.rewrite(args = args)
+        case action: ModelAction[Pre] => action.rewrite(args = args)
+        case llvm: LlvmFunctionDefinition[Pre] => llvm.rewrite(args = args)
+        case prover: ProverFunction[Pre] => prover.rewrite(args = args)
+      }
   }
 
-  implicit class InlineableApplicableBuildHelpers[Pre, Post](inlineable: InlineableApplicable[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Variable[Post]] = rewriter.variables.dispatch(inlineable.args),
-                inline: => Boolean = inlineable.inline,
-               ): InlineableApplicable[Post] = inlineable match {
-      case pred: AbstractPredicate[Pre] =>
-        new PredicateBuildHelpers(pred).rewrite(args = args, inline = inline)
-      case contracted: ContractApplicable[Pre] =>
-        new ContractApplicableBuildHelpers(contracted).rewrite(args = args, inline = inline)
-    }
+  implicit class InlineableApplicableBuildHelpers[Pre, Post](
+      inlineable: InlineableApplicable[Pre]
+  )(implicit rewriter: AbstractRewriter[Pre, Post]) {
+    def rewrite(
+        args: => Seq[Variable[Post]] = rewriter.variables
+          .dispatch(inlineable.args),
+        inline: => Boolean = inlineable.inline,
+    ): InlineableApplicable[Post] =
+      inlineable match {
+        case pred: AbstractPredicate[Pre] =>
+          new PredicateBuildHelpers(pred).rewrite(args = args, inline = inline)
+        case contracted: ContractApplicable[Pre] =>
+          new ContractApplicableBuildHelpers(contracted)
+            .rewrite(args = args, inline = inline)
+      }
   }
 
-  implicit class ContractApplicableBuildHelpers[Pre, Post](contracted: ContractApplicable[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Variable[Post]] = rewriter.variables.dispatch(contracted.args),
-                returnType: => Type[Post] = rewriter.dispatch(contracted.returnType),
-                typeArgs: => Seq[Variable[Post]] = rewriter.variables.dispatch(contracted.typeArgs),
-                contract: => ApplicableContract[Post] = rewriter.dispatch(contracted.contract),
-                inline: => Boolean = contracted.inline,
-               ): ContractApplicable[Post] = contracted match {
-      case function: Function[Pre] =>
-        function.rewrite(args = args, returnType = returnType, typeArgs = typeArgs, inline = Some(inline), contract = contract)
-      case function: InstanceFunction[Pre] =>
-        function.rewrite(args = args, returnType = returnType, typeArgs = typeArgs, inline = Some(inline), contract = contract)
-      case function: InstanceOperatorFunction[Pre] =>
-        function.rewrite(args = args, returnType = returnType, inline = Some(inline), contract = contract)
-      case function: LlvmSpecFunction[Pre] =>
-        function.rewrite(args = args, returnType = returnType, typeArgs = typeArgs, inline = Some(inline), contract = contract)
-      case method: AbstractMethod[Pre] =>
-        new MethodBuildHelpers(method).rewrite(args = args, returnType = returnType, typeArgs = typeArgs, inline = inline, contract = contract)
-    }
+  implicit class ContractApplicableBuildHelpers[Pre, Post](
+      contracted: ContractApplicable[Pre]
+  )(implicit rewriter: AbstractRewriter[Pre, Post]) {
+    def rewrite(
+        args: => Seq[Variable[Post]] = rewriter.variables
+          .dispatch(contracted.args),
+        returnType: => Type[Post] = rewriter.dispatch(contracted.returnType),
+        typeArgs: => Seq[Variable[Post]] = rewriter.variables
+          .dispatch(contracted.typeArgs),
+        contract: => ApplicableContract[Post] = rewriter
+          .dispatch(contracted.contract),
+        inline: => Boolean = contracted.inline,
+    ): ContractApplicable[Post] =
+      contracted match {
+        case function: Function[Pre] =>
+          function.rewrite(
+            args = args,
+            returnType = returnType,
+            typeArgs = typeArgs,
+            inline = Some(inline),
+            contract = contract,
+          )
+        case function: InstanceFunction[Pre] =>
+          function.rewrite(
+            args = args,
+            returnType = returnType,
+            typeArgs = typeArgs,
+            inline = Some(inline),
+            contract = contract,
+          )
+        case function: InstanceOperatorFunction[Pre] =>
+          function.rewrite(
+            args = args,
+            returnType = returnType,
+            inline = Some(inline),
+            contract = contract,
+          )
+        case function: LlvmSpecFunction[Pre] =>
+          function.rewrite(
+            args = args,
+            returnType = returnType,
+            typeArgs = typeArgs,
+            inline = Some(inline),
+            contract = contract,
+          )
+        case method: AbstractMethod[Pre] =>
+          new MethodBuildHelpers(method).rewrite(
+            args = args,
+            returnType = returnType,
+            typeArgs = typeArgs,
+            inline = inline,
+            contract = contract,
+          )
+      }
   }
 
-  implicit class MethodBuildHelpers[Pre, Post](method: AbstractMethod[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Variable[Post]] = rewriter.variables.dispatch(method.args),
-                returnType: => Type[Post] = rewriter.dispatch(method.returnType),
-                outArgs: => Seq[Variable[Post]] = rewriter.variables.dispatch(method.outArgs),
-                body: => Option[Statement[Post]] = method.body.map(rewriter.dispatch),
-                contract: => ApplicableContract[Post] = rewriter.dispatch(method.contract),
-                typeArgs: => Seq[Variable[Post]] = rewriter.variables.dispatch(method.typeArgs),
-                inline: => Boolean = method.inline,
-                pure: => Boolean = method.pure,
-                blame: Blame[CallableFailure] = method.blame,
-               ): AbstractMethod[Post] = method match {
-      case procedure: Procedure[Pre] =>
-        procedure.rewrite(args = args, returnType = returnType, body = body, inline = Some(inline), contract = contract, typeArgs = typeArgs, outArgs = outArgs, pure = Some(pure), blame = blame)
-      case method: InstanceMethod[Pre] =>
-        method.rewrite(args = args, returnType = returnType, body = body, inline = Some(inline), contract = contract, typeArgs = typeArgs, outArgs = outArgs, pure = Some(pure), blame = blame)
-      case method: InstanceOperatorMethod[Pre] =>
-        method.rewrite(returnType = returnType, operator = rewriter.dispatch(method.operator), args = args, body = body, contract = contract, inline = Some(inline), pure = Some(pure), blame = blame)
-      case cons: Constructor[Pre] =>
-        cons.rewrite(args = args, outArgs = outArgs, typeArgs = typeArgs, body = body, contract = contract, inline = Some(inline), blame = blame)
-    }
+  implicit class MethodBuildHelpers[Pre, Post](method: AbstractMethod[Pre])(
+      implicit rewriter: AbstractRewriter[Pre, Post]
+  ) {
+    def rewrite(
+        args: => Seq[Variable[Post]] = rewriter.variables.dispatch(method.args),
+        returnType: => Type[Post] = rewriter.dispatch(method.returnType),
+        outArgs: => Seq[Variable[Post]] = rewriter.variables
+          .dispatch(method.outArgs),
+        body: => Option[Statement[Post]] = method.body.map(rewriter.dispatch),
+        contract: => ApplicableContract[Post] = rewriter
+          .dispatch(method.contract),
+        typeArgs: => Seq[Variable[Post]] = rewriter.variables
+          .dispatch(method.typeArgs),
+        inline: => Boolean = method.inline,
+        pure: => Boolean = method.pure,
+        blame: Blame[CallableFailure] = method.blame,
+    ): AbstractMethod[Post] =
+      method match {
+        case procedure: Procedure[Pre] =>
+          procedure.rewrite(
+            args = args,
+            returnType = returnType,
+            body = body,
+            inline = Some(inline),
+            contract = contract,
+            typeArgs = typeArgs,
+            outArgs = outArgs,
+            pure = Some(pure),
+            blame = blame,
+          )
+        case method: InstanceMethod[Pre] =>
+          method.rewrite(
+            args = args,
+            returnType = returnType,
+            body = body,
+            inline = Some(inline),
+            contract = contract,
+            typeArgs = typeArgs,
+            outArgs = outArgs,
+            pure = Some(pure),
+            blame = blame,
+          )
+        case method: InstanceOperatorMethod[Pre] =>
+          method.rewrite(
+            returnType = returnType,
+            operator = rewriter.dispatch(method.operator),
+            args = args,
+            body = body,
+            contract = contract,
+            inline = Some(inline),
+            pure = Some(pure),
+            blame = blame,
+          )
+        case cons: Constructor[Pre] =>
+          cons.rewrite(
+            args = args,
+            outArgs = outArgs,
+            typeArgs = typeArgs,
+            body = body,
+            contract = contract,
+            inline = Some(inline),
+            blame = blame,
+          )
+      }
   }
 
-  implicit class FunctionBuildHelpers[Pre, Post](function: AbstractFunction[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Variable[Post]] = rewriter.variables.dispatch(function.args),
-                returnType: => Type[Post] = rewriter.dispatch(function.returnType),
-                body: => Option[Expr[Post]] = function.body.map(rewriter.dispatch),
-                contract: => ApplicableContract[Post] = rewriter.dispatch(function.contract),
-                typeArgs: => Seq[Variable[Post]] = rewriter.variables.dispatch(function.typeArgs),
-                inline: => Boolean = function.inline,
-                threadLocal: => Boolean = function.threadLocal,
-                blame: => Blame[ContractedFailure] = function.blame,
-               ): ContractApplicable[Post] = function match {
-      case function: Function[Pre] =>
-        function.rewrite(args = args, returnType = returnType, body = body, inline = Some(inline), threadLocal = Some(threadLocal), contract = contract, typeArgs = typeArgs, blame = blame)
-      case function: InstanceFunction[Pre] =>
-        function.rewrite(args = args, returnType = returnType, body = body, inline = Some(inline), threadLocal = Some(threadLocal), contract = contract, typeArgs = typeArgs, blame = blame)
-      case function: InstanceOperatorFunction[Pre] =>
-        function.rewrite(returnType = returnType, args = args, body = body, contract = contract, inline = Some(inline), threadLocal = Some(threadLocal), blame = blame)
-      case function: LlvmSpecFunction[Pre] =>
-        function.rewrite(returnType = returnType, args = args, body = body, contract = contract, inline = Some(inline), threadLocal = Some(threadLocal), blame = blame)
-    }
+  implicit class FunctionBuildHelpers[Pre, Post](
+      function: AbstractFunction[Pre]
+  )(implicit rewriter: AbstractRewriter[Pre, Post]) {
+    def rewrite(
+        args: => Seq[Variable[Post]] = rewriter.variables
+          .dispatch(function.args),
+        returnType: => Type[Post] = rewriter.dispatch(function.returnType),
+        body: => Option[Expr[Post]] = function.body.map(rewriter.dispatch),
+        contract: => ApplicableContract[Post] = rewriter
+          .dispatch(function.contract),
+        typeArgs: => Seq[Variable[Post]] = rewriter.variables
+          .dispatch(function.typeArgs),
+        inline: => Boolean = function.inline,
+        threadLocal: => Boolean = function.threadLocal,
+        blame: => Blame[ContractedFailure] = function.blame,
+    ): ContractApplicable[Post] =
+      function match {
+        case function: Function[Pre] =>
+          function.rewrite(
+            args = args,
+            returnType = returnType,
+            body = body,
+            inline = Some(inline),
+            threadLocal = Some(threadLocal),
+            contract = contract,
+            typeArgs = typeArgs,
+            blame = blame,
+          )
+        case function: InstanceFunction[Pre] =>
+          function.rewrite(
+            args = args,
+            returnType = returnType,
+            body = body,
+            inline = Some(inline),
+            threadLocal = Some(threadLocal),
+            contract = contract,
+            typeArgs = typeArgs,
+            blame = blame,
+          )
+        case function: InstanceOperatorFunction[Pre] =>
+          function.rewrite(
+            returnType = returnType,
+            args = args,
+            body = body,
+            contract = contract,
+            inline = Some(inline),
+            threadLocal = Some(threadLocal),
+            blame = blame,
+          )
+        case function: LlvmSpecFunction[Pre] =>
+          function.rewrite(
+            returnType = returnType,
+            args = args,
+            body = body,
+            contract = contract,
+            inline = Some(inline),
+            threadLocal = Some(threadLocal),
+            blame = blame,
+          )
+      }
   }
 
-  implicit class PredicateBuildHelpers[Pre, Post](predicate: AbstractPredicate[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Variable[Post]] = rewriter.variables.dispatch(predicate.args),
-                inline: => Boolean = predicate.inline,
-                threadLocal: => Boolean = predicate.threadLocal,
-               ): AbstractPredicate[Post] = predicate match {
-      case predicate: Predicate[Pre] =>
-        predicate.rewrite(args = args, inline = Some(inline), threadLocal = Some(threadLocal))
-      case predicate: InstancePredicate[Pre] =>
-        predicate.rewrite(args = args, inline = Some(inline), threadLocal = Some(threadLocal))
-    }
+  implicit class PredicateBuildHelpers[Pre, Post](
+      predicate: AbstractPredicate[Pre]
+  )(implicit rewriter: AbstractRewriter[Pre, Post]) {
+    def rewrite(
+        args: => Seq[Variable[Post]] = rewriter.variables
+          .dispatch(predicate.args),
+        inline: => Boolean = predicate.inline,
+        threadLocal: => Boolean = predicate.threadLocal,
+    ): AbstractPredicate[Post] =
+      predicate match {
+        case predicate: Predicate[Pre] =>
+          predicate.rewrite(
+            args = args,
+            inline = Some(inline),
+            threadLocal = Some(threadLocal),
+          )
+        case predicate: InstancePredicate[Pre] =>
+          predicate.rewrite(
+            args = args,
+            inline = Some(inline),
+            threadLocal = Some(threadLocal),
+          )
+      }
   }
 
-  implicit class ApplyBuildHelpers[Pre, Post](apply: Apply[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch)): Apply[Post] = apply match {
-      case inv: ADTFunctionInvocation[Pre] =>
-        inv.rewrite(args = args)
-      case inv: ProverFunctionInvocation[Pre] =>
-        inv.rewrite(args = args)
-      case inv: LlvmFunctionInvocation[Pre] =>
-        inv.rewrite(args = args)
-      case apply: ApplyAnyPredicate[Pre] =>
-        new ApplyAnyPredicateBuildHelpers(apply).rewrite(args = args)
-      case inv: Invocation[Pre] =>
-        new InvocationBuildHelpers(inv).rewrite(args = args)
-    }
+  implicit class ApplyBuildHelpers[Pre, Post](apply: Apply[Pre])(
+      implicit rewriter: AbstractRewriter[Pre, Post]
+  ) {
+    def rewrite(
+        args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch)
+    ): Apply[Post] =
+      apply match {
+        case inv: ADTFunctionInvocation[Pre] => inv.rewrite(args = args)
+        case inv: ProverFunctionInvocation[Pre] => inv.rewrite(args = args)
+        case inv: LlvmFunctionInvocation[Pre] => inv.rewrite(args = args)
+        case apply: ApplyAnyPredicate[Pre] =>
+          new ApplyAnyPredicateBuildHelpers(apply).rewrite(args = args)
+        case inv: Invocation[Pre] =>
+          new InvocationBuildHelpers(inv).rewrite(args = args)
+      }
   }
 
-  implicit class ApplyAnyPredicateBuildHelpers[Pre, Post](apply: ApplyAnyPredicate[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch), perm: => Expr[Post] = rewriter.dispatch(apply.perm)): ApplyAnyPredicate[Post] = apply match {
-      case inv: PredicateApply[Pre] =>
-        inv.rewrite(args = args, perm = perm)
-      case inv: InstancePredicateApply[Pre] =>
-        inv.rewrite(args = args, perm = perm)
-      case inv: CoalesceInstancePredicateApply[Pre] =>
-        inv.rewrite(args = args, perm = perm)
-    }
+  implicit class ApplyAnyPredicateBuildHelpers[Pre, Post](
+      apply: ApplyAnyPredicate[Pre]
+  )(implicit rewriter: AbstractRewriter[Pre, Post]) {
+    def rewrite(
+        args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch),
+        perm: => Expr[Post] = rewriter.dispatch(apply.perm),
+    ): ApplyAnyPredicate[Post] =
+      apply match {
+        case inv: PredicateApply[Pre] => inv.rewrite(args = args, perm = perm)
+        case inv: InstancePredicateApply[Pre] =>
+          inv.rewrite(args = args, perm = perm)
+        case inv: CoalesceInstancePredicateApply[Pre] =>
+          inv.rewrite(args = args, perm = perm)
+      }
   }
 
-  implicit class InvocationBuildHelpers[Pre, Post](apply: Invocation[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch), givenMap: => Seq[(Ref[Post, Variable[Post]], Expr[Post])] = apply.givenMap.map { case (Ref(v), e) => (rewriter.succ(v), rewriter.dispatch(e)) }, yields: Seq[(Expr[Post], Ref[Post, Variable[Post]])] = apply.yields.map { case (a, b) => (rewriter.dispatch(a), rewriter.succ(b.decl)) }): Invocation[Post] = apply match {
-      case apply: AnyFunctionInvocation[Pre] =>
-        new ApplyAnyFunctionBuildHelpers(apply).rewrite(args = args, givenMap = givenMap, yields = yields)
-      case apply: AnyMethodInvocation[Pre] =>
-        new ApplyAnyMethodBuildHelpers(apply).rewrite(args = args, givenMap = givenMap, yields = yields)
-    }
+  implicit class InvocationBuildHelpers[Pre, Post](apply: Invocation[Pre])(
+      implicit rewriter: AbstractRewriter[Pre, Post]
+  ) {
+    def rewrite(
+        args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch),
+        givenMap: => Seq[(Ref[Post, Variable[Post]], Expr[Post])] = apply
+          .givenMap.map { case (Ref(v), e) =>
+            (rewriter.succ(v), rewriter.dispatch(e))
+          },
+        yields: Seq[(Expr[Post], Ref[Post, Variable[Post]])] = apply.yields
+          .map { case (a, b) => (rewriter.dispatch(a), rewriter.succ(b.decl)) },
+    ): Invocation[Post] =
+      apply match {
+        case apply: AnyFunctionInvocation[Pre] =>
+          new ApplyAnyFunctionBuildHelpers(apply)
+            .rewrite(args = args, givenMap = givenMap, yields = yields)
+        case apply: AnyMethodInvocation[Pre] =>
+          new ApplyAnyMethodBuildHelpers(apply)
+            .rewrite(args = args, givenMap = givenMap, yields = yields)
+      }
   }
 
-  implicit class ApplyAnyFunctionBuildHelpers[Pre, Post](apply: AnyFunctionInvocation[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch), typeArgs: => Seq[Type[Post]] = apply.typeArgs.map(rewriter.dispatch), givenMap: => Seq[(Ref[Post, Variable[Post]], Expr[Post])] = apply.givenMap.map { case (Ref(v), e) => (rewriter.succ(v), rewriter.dispatch(e)) }, yields: Seq[(Expr[Post], Ref[Post, Variable[Post]])] = apply.yields.map { case (a, b) => (rewriter.dispatch(a), rewriter.succ(b.decl)) }): AnyFunctionInvocation[Post] = apply match {
-      case inv: FunctionInvocation[Pre] =>
-        inv.rewrite(args = args, typeArgs = typeArgs, givenMap = givenMap, yields = yields)
-      case inv: InstanceFunctionInvocation[Pre] =>
-        inv.rewrite(args = args, typeArgs = typeArgs, givenMap = givenMap, yields = yields)
-    }
+  implicit class ApplyAnyFunctionBuildHelpers[Pre, Post](
+      apply: AnyFunctionInvocation[Pre]
+  )(implicit rewriter: AbstractRewriter[Pre, Post]) {
+    def rewrite(
+        args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch),
+        typeArgs: => Seq[Type[Post]] = apply.typeArgs.map(rewriter.dispatch),
+        givenMap: => Seq[(Ref[Post, Variable[Post]], Expr[Post])] = apply
+          .givenMap.map { case (Ref(v), e) =>
+            (rewriter.succ(v), rewriter.dispatch(e))
+          },
+        yields: Seq[(Expr[Post], Ref[Post, Variable[Post]])] = apply.yields
+          .map { case (a, b) => (rewriter.dispatch(a), rewriter.succ(b.decl)) },
+    ): AnyFunctionInvocation[Post] =
+      apply match {
+        case inv: FunctionInvocation[Pre] =>
+          inv.rewrite(
+            args = args,
+            typeArgs = typeArgs,
+            givenMap = givenMap,
+            yields = yields,
+          )
+        case inv: InstanceFunctionInvocation[Pre] =>
+          inv.rewrite(
+            args = args,
+            typeArgs = typeArgs,
+            givenMap = givenMap,
+            yields = yields,
+          )
+      }
   }
 
-  implicit class ApplyAnyMethodBuildHelpers[Pre, Post](apply: AnyMethodInvocation[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch), outArgs: => Seq[Expr[Post]] = apply.outArgs.map(rewriter.dispatch), typeArgs: => Seq[Type[Post]] = apply.typeArgs.map(rewriter.dispatch), givenMap: => Seq[(Ref[Post, Variable[Post]], Expr[Post])] = apply.givenMap.map { case (Ref(v), e) => (rewriter.succ(v), rewriter.dispatch(e)) }, yields: => Seq[(Expr[Post], Ref[Post, Variable[Post]])] = apply.yields.map { case (a, b) => (rewriter.dispatch(a), rewriter.succ(b.decl)) }): AnyMethodInvocation[Post] = apply match {
-      case inv: ProcedureInvocation[Pre] =>
-        inv.rewrite(args = args, outArgs = outArgs, typeArgs = typeArgs, givenMap = givenMap, yields = yields)
-      case inv: MethodInvocation[Pre] =>
-        inv.rewrite(args = args, outArgs = outArgs, typeArgs = typeArgs, givenMap = givenMap, yields = yields)
-      case inv: ConstructorInvocation[Pre] =>
-        inv.rewrite(args = args, outArgs = outArgs, typeArgs = typeArgs, givenMap = givenMap, yields = yields)
-    }
+  implicit class ApplyAnyMethodBuildHelpers[Pre, Post](
+      apply: AnyMethodInvocation[Pre]
+  )(implicit rewriter: AbstractRewriter[Pre, Post]) {
+    def rewrite(
+        args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch),
+        outArgs: => Seq[Expr[Post]] = apply.outArgs.map(rewriter.dispatch),
+        typeArgs: => Seq[Type[Post]] = apply.typeArgs.map(rewriter.dispatch),
+        givenMap: => Seq[(Ref[Post, Variable[Post]], Expr[Post])] = apply
+          .givenMap.map { case (Ref(v), e) =>
+            (rewriter.succ(v), rewriter.dispatch(e))
+          },
+        yields: => Seq[(Expr[Post], Ref[Post, Variable[Post]])] = apply.yields
+          .map { case (a, b) => (rewriter.dispatch(a), rewriter.succ(b.decl)) },
+    ): AnyMethodInvocation[Post] =
+      apply match {
+        case inv: ProcedureInvocation[Pre] =>
+          inv.rewrite(
+            args = args,
+            outArgs = outArgs,
+            typeArgs = typeArgs,
+            givenMap = givenMap,
+            yields = yields,
+          )
+        case inv: MethodInvocation[Pre] =>
+          inv.rewrite(
+            args = args,
+            outArgs = outArgs,
+            typeArgs = typeArgs,
+            givenMap = givenMap,
+            yields = yields,
+          )
+        case inv: ConstructorInvocation[Pre] =>
+          inv.rewrite(
+            args = args,
+            outArgs = outArgs,
+            typeArgs = typeArgs,
+            givenMap = givenMap,
+            yields = yields,
+          )
+      }
   }
 
-  implicit class InvocationStatementBuildHelpers[Pre, Post](apply: InvocationStatement[Pre])(implicit rewriter: AbstractRewriter[Pre, Post]) {
-    def rewrite(args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch), outArgs: => Seq[Expr[Post]] = apply.outArgs.map(rewriter.dispatch), typeArgs: => Seq[Type[Post]] = apply.typeArgs.map(rewriter.dispatch), givenMap: => Seq[(Ref[Post, Variable[Post]], Expr[Post])] = apply.givenMap.map { case (Ref(v), e) => (rewriter.succ(v), rewriter.dispatch(e)) }, yields: => Seq[(Expr[Post], Ref[Post, Variable[Post]])] = apply.yields.map { case (a, b) => (rewriter.dispatch(a), rewriter.succ(b.decl)) }): InvocationStatement[Post] = apply match {
-      case inv: InvokeProcedure[Pre] =>
-        inv.rewrite(args = args, outArgs = outArgs, typeArgs = typeArgs, givenMap = givenMap, yields = yields)
-      case inv: InvokeMethod[Pre] =>
-        inv.rewrite(args = args, outArgs = outArgs, typeArgs = typeArgs, givenMap = givenMap, yields = yields)
-      case inv: InvokeConstructor[Pre] =>
-        inv.rewrite(args = args, outArgs = outArgs, typeArgs = typeArgs, givenMap = givenMap, yields = yields)
-    }
+  implicit class InvocationStatementBuildHelpers[Pre, Post](
+      apply: InvocationStatement[Pre]
+  )(implicit rewriter: AbstractRewriter[Pre, Post]) {
+    def rewrite(
+        args: => Seq[Expr[Post]] = apply.args.map(rewriter.dispatch),
+        outArgs: => Seq[Expr[Post]] = apply.outArgs.map(rewriter.dispatch),
+        typeArgs: => Seq[Type[Post]] = apply.typeArgs.map(rewriter.dispatch),
+        givenMap: => Seq[(Ref[Post, Variable[Post]], Expr[Post])] = apply
+          .givenMap.map { case (Ref(v), e) =>
+            (rewriter.succ(v), rewriter.dispatch(e))
+          },
+        yields: => Seq[(Expr[Post], Ref[Post, Variable[Post]])] = apply.yields
+          .map { case (a, b) => (rewriter.dispatch(a), rewriter.succ(b.decl)) },
+    ): InvocationStatement[Post] =
+      apply match {
+        case inv: InvokeProcedure[Pre] =>
+          inv.rewrite(
+            args = args,
+            outArgs = outArgs,
+            typeArgs = typeArgs,
+            givenMap = givenMap,
+            yields = yields,
+          )
+        case inv: InvokeMethod[Pre] =>
+          inv.rewrite(
+            args = args,
+            outArgs = outArgs,
+            typeArgs = typeArgs,
+            givenMap = givenMap,
+            yields = yields,
+          )
+        case inv: InvokeConstructor[Pre] =>
+          inv.rewrite(
+            args = args,
+            outArgs = outArgs,
+            typeArgs = typeArgs,
+            givenMap = givenMap,
+            yields = yields,
+          )
+      }
   }
 
-  private def constOrigin(value: scala.Any): Origin = Origin(Seq(LabelContext(s"constant ${value}")))
+  private def constOrigin(value: scala.Any): Origin =
+    Origin(Seq(LabelContext(s"constant ${value}")))
 
   def tt[G]: BooleanValue[G] = BooleanValue(true)(constOrigin(true))
   def ff[G]: BooleanValue[G] = BooleanValue(false)(constOrigin(false))
 
-  def const[G](i: Int)(implicit o: Origin): IntegerValue[G] =
-    IntegerValue(i)
+  def const[G](i: Int)(implicit o: Origin): IntegerValue[G] = IntegerValue(i)
 
-  def const[G](i: BigInt)(implicit o: Origin): IntegerValue[G] =
-    IntegerValue(i)
+  def const[G](i: BigInt)(implicit o: Origin): IntegerValue[G] = IntegerValue(i)
 
   def c_const[G](i: Int)(implicit o: Origin): CIntegerValue[G] =
     CIntegerValue(i)
@@ -274,26 +543,38 @@ object AstBuildHelpers {
   def c_const[G](i: BigInt)(implicit o: Origin): CIntegerValue[G] =
     CIntegerValue(i)
 
-  def contract[G]
-              (blame: Blame[NontrivialUnsatisfiable],
-               requires: AccountedPredicate[G] = UnitAccountedPredicate(tt[G])(constOrigin(true)),
-               ensures: AccountedPredicate[G] = UnitAccountedPredicate(tt[G])(constOrigin(true)),
-               contextEverywhere: Expr[G] = tt[G],
-               signals: Seq[SignalsClause[G]] = Nil,
-               givenArgs: Seq[Variable[G]] = Nil, yieldsArgs: Seq[Variable[G]] = Nil,
-               decreases: Option[DecreasesClause[G]] = None,
-              )
-              (implicit o: Origin): ApplicableContract[G] =
-    ApplicableContract(requires, ensures, contextEverywhere, signals, givenArgs, yieldsArgs, decreases)(blame)
-
-  def loopInvariant[G]
-                   (blame: Blame[LoopInvariantFailure],
-                    invariant: Expr[G] = null,
-                    decreases: Option[DecreasesClause[G]] = None)
-                   (implicit o: Origin): LoopContract[G] =
+  def contract[G](
+      blame: Blame[NontrivialUnsatisfiable],
+      requires: AccountedPredicate[G] =
+        UnitAccountedPredicate(tt[G])(constOrigin(true)),
+      ensures: AccountedPredicate[G] =
+        UnitAccountedPredicate(tt[G])(constOrigin(true)),
+      contextEverywhere: Expr[G] = tt[G],
+      signals: Seq[SignalsClause[G]] = Nil,
+      givenArgs: Seq[Variable[G]] = Nil,
+      yieldsArgs: Seq[Variable[G]] = Nil,
+      decreases: Option[DecreasesClause[G]] = None,
+  )(implicit o: Origin): ApplicableContract[G] =
+    ApplicableContract(
+      requires,
+      ensures,
+      contextEverywhere,
+      signals,
+      givenArgs,
+      yieldsArgs,
+      decreases,
+    )(blame)
+
+  def loopInvariant[G](
+      blame: Blame[LoopInvariantFailure],
+      invariant: Expr[G] = null,
+      decreases: Option[DecreasesClause[G]] = None,
+  )(implicit o: Origin): LoopContract[G] =
     LoopInvariant(invariant, decreases)(blame)
 
-  def withResult[G, T <: ContractApplicable[G]](builder: Result[G] => T)(implicit o: Origin): T = {
+  def withResult[G, T <: ContractApplicable[G]](
+      builder: Result[G] => T
+  )(implicit o: Origin): T = {
     val box = SuccessionMap[Unit, ContractApplicable[G]]()
     val result = Result[G](box.ref(()))
     val applicable = builder(result)
@@ -301,141 +582,176 @@ object AstBuildHelpers {
     applicable
   }
 
-  def procedure[G]
-               (blame: Blame[CallableFailure],
-                contractBlame: Blame[NontrivialUnsatisfiable],
-                returnType: Type[G] = TVoid[G](),
-                args: Seq[Variable[G]] = Nil, outArgs: Seq[Variable[G]] = Nil, typeArgs: Seq[Variable[G]] = Nil,
-                body: Option[Statement[G]] = None,
-                requires: AccountedPredicate[G] = UnitAccountedPredicate(tt[G])(constOrigin(true)),
-                ensures: AccountedPredicate[G] = UnitAccountedPredicate(tt[G])(constOrigin(true)),
-                contextEverywhere: Expr[G] = tt[G],
-                signals: Seq[SignalsClause[G]] = Nil,
-                givenArgs: Seq[Variable[G]] = Nil, yieldsArgs: Seq[Variable[G]] = Nil,
-                decreases: Option[DecreasesClause[G]] = None,
-                inline: Boolean = false, pure: Boolean = false)
-               (implicit o: Origin): Procedure[G] =
-    new Procedure(returnType, args, outArgs, typeArgs, body,
-      ApplicableContract(requires, ensures, contextEverywhere, signals, givenArgs, yieldsArgs, decreases)(contractBlame),
-      inline, pure)(blame)
-
-  def function[G]
-              (blame: Blame[ContractedFailure],
-               contractBlame: Blame[NontrivialUnsatisfiable],
-               returnType: Type[G] = TVoid(),
-               args: Seq[Variable[G]] = Nil, typeArgs: Seq[Variable[G]] = Nil,
-               body: Option[Expr[G]] = None,
-               requires: AccountedPredicate[G] = UnitAccountedPredicate(tt[G])(constOrigin(true)),
-               ensures: AccountedPredicate[G] = UnitAccountedPredicate(tt[G])(constOrigin(true)),
-               contextEverywhere: Expr[G] = tt[G],
-               signals: Seq[SignalsClause[G]] = Nil,
-               givenArgs: Seq[Variable[G]] = Nil, yieldsArgs: Seq[Variable[G]] = Nil,
-               decreases: Option[DecreasesClause[G]] = Some(DecreasesClauseNoRecursion[G]()(constOrigin("decreases"))),
-               inline: Boolean = false)(implicit o: Origin): Function[G] =
-    new Function(returnType, args, typeArgs, body,
-      ApplicableContract(requires, ensures, contextEverywhere, signals, givenArgs, yieldsArgs, decreases)(contractBlame),
-      inline)(blame)
-
-  def functionInvocation[G]
-                        (blame: Blame[InvocationFailure],
-                         ref: Ref[G, Function[G]],
-                         args: Seq[Expr[G]] = Nil,
-                         typeArgs: Seq[Type[G]] = Nil,
-                         givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = Nil,
-                         yields: Seq[(Expr[G], Ref[G, Variable[G]])] = Nil)(implicit o: Origin): FunctionInvocation[G] =
+  def procedure[G](
+      blame: Blame[CallableFailure],
+      contractBlame: Blame[NontrivialUnsatisfiable],
+      returnType: Type[G] = TVoid[G](),
+      args: Seq[Variable[G]] = Nil,
+      outArgs: Seq[Variable[G]] = Nil,
+      typeArgs: Seq[Variable[G]] = Nil,
+      body: Option[Statement[G]] = None,
+      requires: AccountedPredicate[G] =
+        UnitAccountedPredicate(tt[G])(constOrigin(true)),
+      ensures: AccountedPredicate[G] =
+        UnitAccountedPredicate(tt[G])(constOrigin(true)),
+      contextEverywhere: Expr[G] = tt[G],
+      signals: Seq[SignalsClause[G]] = Nil,
+      givenArgs: Seq[Variable[G]] = Nil,
+      yieldsArgs: Seq[Variable[G]] = Nil,
+      decreases: Option[DecreasesClause[G]] = None,
+      inline: Boolean = false,
+      pure: Boolean = false,
+  )(implicit o: Origin): Procedure[G] =
+    new Procedure(
+      returnType,
+      args,
+      outArgs,
+      typeArgs,
+      body,
+      ApplicableContract(
+        requires,
+        ensures,
+        contextEverywhere,
+        signals,
+        givenArgs,
+        yieldsArgs,
+        decreases,
+      )(contractBlame),
+      inline,
+      pure,
+    )(blame)
+
+  def function[G](
+      blame: Blame[ContractedFailure],
+      contractBlame: Blame[NontrivialUnsatisfiable],
+      returnType: Type[G] = TVoid(),
+      args: Seq[Variable[G]] = Nil,
+      typeArgs: Seq[Variable[G]] = Nil,
+      body: Option[Expr[G]] = None,
+      requires: AccountedPredicate[G] =
+        UnitAccountedPredicate(tt[G])(constOrigin(true)),
+      ensures: AccountedPredicate[G] =
+        UnitAccountedPredicate(tt[G])(constOrigin(true)),
+      contextEverywhere: Expr[G] = tt[G],
+      signals: Seq[SignalsClause[G]] = Nil,
+      givenArgs: Seq[Variable[G]] = Nil,
+      yieldsArgs: Seq[Variable[G]] = Nil,
+      decreases: Option[DecreasesClause[G]] = Some(
+        DecreasesClauseNoRecursion[G]()(constOrigin("decreases"))
+      ),
+      inline: Boolean = false,
+  )(implicit o: Origin): Function[G] =
+    new Function(
+      returnType,
+      args,
+      typeArgs,
+      body,
+      ApplicableContract(
+        requires,
+        ensures,
+        contextEverywhere,
+        signals,
+        givenArgs,
+        yieldsArgs,
+        decreases,
+      )(contractBlame),
+      inline,
+    )(blame)
+
+  def functionInvocation[G](
+      blame: Blame[InvocationFailure],
+      ref: Ref[G, Function[G]],
+      args: Seq[Expr[G]] = Nil,
+      typeArgs: Seq[Type[G]] = Nil,
+      givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = Nil,
+      yields: Seq[(Expr[G], Ref[G, Variable[G]])] = Nil,
+  )(implicit o: Origin): FunctionInvocation[G] =
     FunctionInvocation(ref, args, typeArgs, givenMap, yields)(blame)
 
-  def methodInvocation[G]
-                      (blame: Blame[InstanceInvocationFailure],
-                       obj: Expr[G],
-                       ref: Ref[G, InstanceMethod[G]],
-                       args: Seq[Expr[G]] = Nil,
-                       outArgs: Seq[Expr[G]] = Nil,
-                       typeArgs: Seq[Type[G]] = Nil,
-                       givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = Nil,
-                       yields: Seq[(Expr[G], Ref[G, Variable[G]])] = Nil)(implicit o: Origin): MethodInvocation[G] =
+  def methodInvocation[G](
+      blame: Blame[InstanceInvocationFailure],
+      obj: Expr[G],
+      ref: Ref[G, InstanceMethod[G]],
+      args: Seq[Expr[G]] = Nil,
+      outArgs: Seq[Expr[G]] = Nil,
+      typeArgs: Seq[Type[G]] = Nil,
+      givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = Nil,
+      yields: Seq[(Expr[G], Ref[G, Variable[G]])] = Nil,
+  )(implicit o: Origin): MethodInvocation[G] =
     MethodInvocation(obj, ref, args, outArgs, typeArgs, givenMap, yields)(blame)
 
-  def procedureInvocation[G]
-                         (blame: Blame[InvocationFailure],
-                          ref: Ref[G, Procedure[G]],
-                          args: Seq[Expr[G]] = Nil,
-                          outArgs: Seq[Expr[G]] = Nil,
-                          typeArgs: Seq[Type[G]] = Nil,
-                          givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = Nil,
-                          yields: Seq[(Expr[G], Ref[G, Variable[G]])] = Nil)(implicit o: Origin): ProcedureInvocation[G] =
+  def procedureInvocation[G](
+      blame: Blame[InvocationFailure],
+      ref: Ref[G, Procedure[G]],
+      args: Seq[Expr[G]] = Nil,
+      outArgs: Seq[Expr[G]] = Nil,
+      typeArgs: Seq[Type[G]] = Nil,
+      givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = Nil,
+      yields: Seq[(Expr[G], Ref[G, Variable[G]])] = Nil,
+  )(implicit o: Origin): ProcedureInvocation[G] =
     ProcedureInvocation(ref, args, outArgs, typeArgs, givenMap, yields)(blame)
 
-  def constructorInvocation[G]
-                         (blame: Blame[InvocationFailure],
-                          ref: Ref[G, Constructor[G]],
-                          classTypeArgs: Seq[Type[G]] = Nil,
-                          args: Seq[Expr[G]] = Nil,
-                          outArgs: Seq[Expr[G]] = Nil,
-                          typeArgs: Seq[Type[G]] = Nil,
-                          givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = Nil,
-                          yields: Seq[(Expr[G], Ref[G, Variable[G]])] = Nil)(implicit o: Origin): ConstructorInvocation[G] =
-    ConstructorInvocation(ref, classTypeArgs, args, outArgs, typeArgs, givenMap, yields)(blame)
-
-  private def GeneratedQuantifier: Origin = Origin(
-    Seq(
-      PreferredName(Seq("i")),
-      LabelContext("generated quantifier"),
-    )
-  )
-
-  def starall[G]
-             (blame: Blame[ReceiverNotInjective],
-              t: Type[G],
-              body: Local[G] => Expr[G],
-              triggers: Local[G] => Seq[Seq[Expr[G]]] = (_: Local[G]) => Nil,
-             ): Starall[G] = {
+  def constructorInvocation[G](
+      blame: Blame[InvocationFailure],
+      ref: Ref[G, Constructor[G]],
+      classTypeArgs: Seq[Type[G]] = Nil,
+      args: Seq[Expr[G]] = Nil,
+      outArgs: Seq[Expr[G]] = Nil,
+      typeArgs: Seq[Type[G]] = Nil,
+      givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = Nil,
+      yields: Seq[(Expr[G], Ref[G, Variable[G]])] = Nil,
+  )(implicit o: Origin): ConstructorInvocation[G] =
+    ConstructorInvocation(
+      ref,
+      classTypeArgs,
+      args,
+      outArgs,
+      typeArgs,
+      givenMap,
+      yields,
+    )(blame)
+
+  private def GeneratedQuantifier: Origin =
+    Origin(Seq(PreferredName(Seq("i")), LabelContext("generated quantifier")))
+
+  def starall[G](
+      blame: Blame[ReceiverNotInjective],
+      t: Type[G],
+      body: Local[G] => Expr[G],
+      triggers: Local[G] => Seq[Seq[Expr[G]]] = (_: Local[G]) => Nil,
+  ): Starall[G] = {
     implicit val o: Origin = GeneratedQuantifier
     val i_var = new Variable[G](t)
     val i = Local[G](i_var.ref)
-    Starall(
-      bindings = Seq(i_var),
-      triggers = triggers(i),
-      body = body(i),
-    )(blame)
+    Starall(bindings = Seq(i_var), triggers = triggers(i), body = body(i))(
+      blame
+    )
   }
 
-  def forall[G]
-            (t: Type[G],
-             body: Local[G] => Expr[G],
-             triggers: Local[G] => Seq[Seq[Expr[G]]] = (_: Local[G]) => Nil,
-            ): Forall[G] = {
+  def forall[G](
+      t: Type[G],
+      body: Local[G] => Expr[G],
+      triggers: Local[G] => Seq[Seq[Expr[G]]] = (_: Local[G]) => Nil,
+  ): Forall[G] = {
     implicit val o: Origin = GeneratedQuantifier
     val i_var = new Variable[G](t)
     val i = Local[G](i_var.ref)
-    Forall(
-      bindings = Seq(i_var),
-      triggers = triggers(i),
-      body = body(i),
-    )
+    Forall(bindings = Seq(i_var), triggers = triggers(i), body = body(i))
   }
 
-  def foralls[G]
-            (ts: Seq[Type[G]],
-             body: Seq[Local[G]] => Expr[G],
-             triggers: Seq[Local[G]] => Seq[Seq[Expr[G]]] = (_: Seq[Local[G]]) => Nil,
-            ): Forall[G] = {
+  def foralls[G](
+      ts: Seq[Type[G]],
+      body: Seq[Local[G]] => Expr[G],
+      triggers: Seq[Local[G]] => Seq[Seq[Expr[G]]] = (_: Seq[Local[G]]) => Nil,
+  ): Forall[G] = {
     implicit val o: Origin = GeneratedQuantifier
     val i_vars: Seq[Variable[G]] = ts.map(new Variable[G](_))
     val is: Seq[Local[G]] = i_vars.map((x: Variable[G]) => Local[G](x.ref))
-    Forall(
-      bindings = i_vars,
-      triggers = triggers(is),
-      body = body(is),
-    )
+    Forall(bindings = i_vars, triggers = triggers(is), body = body(is))
   }
 
-  private def GeneratedLet: Origin = Origin(
-    Seq(
-      PreferredName(Seq("x")),
-      LabelContext("generated let"),
-    )
-  )
+  private def GeneratedLet: Origin =
+    Origin(Seq(PreferredName(Seq("x")), LabelContext("generated let")))
 
   def let[G](t: Type[G], x: Expr[G], body: Local[G] => Expr[G]): Let[G] = {
     implicit val o: Origin = GeneratedQuantifier
@@ -444,69 +760,113 @@ object AstBuildHelpers {
     Let(x_var, x, body(x_local))
   }
 
-  def assignLocal[G](local: Local[G], value: Expr[G])(implicit o: Origin): Assign[G] =
-    Assign(local, value)(AssignLocalOk)
+  def assignLocal[G](local: Local[G], value: Expr[G])(
+      implicit o: Origin
+  ): Assign[G] = Assign(local, value)(AssignLocalOk)
 
-  def assignField[G](obj: Expr[G], field: Ref[G, InstanceField[G]], value: Expr[G], blame: Blame[AssignFailed])(implicit o: Origin): Assign[G] =
+  def assignField[G](
+      obj: Expr[G],
+      field: Ref[G, InstanceField[G]],
+      value: Expr[G],
+      blame: Blame[AssignFailed],
+  )(implicit o: Origin): Assign[G] =
     Assign(Deref(obj, field)(DerefAssignTarget), value)(blame)
 
-  def fieldPerm[G](obj: Expr[G], field: Ref[G, InstanceField[G]], amount: Expr[G])(implicit o: Origin): Perm[G] =
-    Perm(FieldLocation(obj, field), amount)
-
-  def arrayPerm[G](arr: Expr[G], index: Expr[G], amount: Expr[G], arrayLocationError: Blame[ArrayLocationError])(implicit o: Origin): Perm[G] =
+  def fieldPerm[G](
+      obj: Expr[G],
+      field: Ref[G, InstanceField[G]],
+      amount: Expr[G],
+  )(implicit o: Origin): Perm[G] = Perm(FieldLocation(obj, field), amount)
+
+  def arrayPerm[G](
+      arr: Expr[G],
+      index: Expr[G],
+      amount: Expr[G],
+      arrayLocationError: Blame[ArrayLocationError],
+  )(implicit o: Origin): Perm[G] =
     Perm(ArrayLocation(arr, index)(arrayLocationError), amount)
 
   def foldAnd[G](exprs: Iterable[Expr[G]])(implicit o: Origin): Expr[G] =
     exprs.reduceOption(And(_, _)).getOrElse(tt)
 
-  def implies[G](conds: Seq[Expr[G]], body: Expr[G])(implicit o: Origin): Expr[G] = conds match {
-    case Nil => body
-    case conds => Implies(foldAnd(conds), body)
-  }
+  def implies[G](conds: Seq[Expr[G]], body: Expr[G])(
+      implicit o: Origin
+  ): Expr[G] =
+    conds match {
+      case Nil => body
+      case conds => Implies(foldAnd(conds), body)
+    }
 
-  def unfoldPredicate[G](p: AccountedPredicate[G]): Seq[Expr[G]] = p match {
-    case UnitAccountedPredicate(pred) => Seq(pred)
-    case SplitAccountedPredicate(left, right) => unfoldPredicate(left) ++ unfoldPredicate(right)
-  }
+  def unfoldPredicate[G](p: AccountedPredicate[G]): Seq[Expr[G]] =
+    p match {
+      case UnitAccountedPredicate(pred) => Seq(pred)
+      case SplitAccountedPredicate(left, right) =>
+        unfoldPredicate(left) ++ unfoldPredicate(right)
+    }
 
-  def mapPredicate[G1, G2](p: AccountedPredicate[G1], f: Expr[G1] => Expr[G2]): AccountedPredicate[G2] = p match {
-    case UnitAccountedPredicate(pred) => UnitAccountedPredicate(f(pred))(p.o)
-    case SplitAccountedPredicate(left, right) => SplitAccountedPredicate(mapPredicate(left, f), mapPredicate(right, f))(p.o)
-  }
+  def mapPredicate[G1, G2](
+      p: AccountedPredicate[G1],
+      f: Expr[G1] => Expr[G2],
+  ): AccountedPredicate[G2] =
+    p match {
+      case UnitAccountedPredicate(pred) => UnitAccountedPredicate(f(pred))(p.o)
+      case SplitAccountedPredicate(left, right) =>
+        SplitAccountedPredicate(mapPredicate(left, f), mapPredicate(right, f))(
+          p.o
+        )
+    }
 
-  def unfoldImplies[G](expr: Expr[G]): (Seq[Expr[G]], Expr[G]) = expr match {
-    case Implies(left, right) =>
-      val (antecedent, consequent) = AstBuildHelpers.unfoldImplies(right)
-      (unfoldStar(left) ++ antecedent, consequent)
-    case other => (Nil, other)
-  }
+  def unfoldImplies[G](expr: Expr[G]): (Seq[Expr[G]], Expr[G]) =
+    expr match {
+      case Implies(left, right) =>
+        val (antecedent, consequent) = AstBuildHelpers.unfoldImplies(right)
+        (unfoldStar(left) ++ antecedent, consequent)
+      case other => (Nil, other)
+    }
 
-  def unfoldStar[G](expr: Expr[G]): Seq[Expr[G]] = expr match {
-    case Star(left, right) => AstBuildHelpers.unfoldStar(left) ++ AstBuildHelpers.unfoldStar(right)
-    case And(left, right) => AstBuildHelpers.unfoldStar(left) ++ AstBuildHelpers.unfoldStar(right)
-    case BooleanValue(true) => Nil
-    case other => Seq(other)
-  }
+  def unfoldStar[G](expr: Expr[G]): Seq[Expr[G]] =
+    expr match {
+      case Star(left, right) =>
+        AstBuildHelpers.unfoldStar(left) ++ AstBuildHelpers.unfoldStar(right)
+      case And(left, right) =>
+        AstBuildHelpers.unfoldStar(left) ++ AstBuildHelpers.unfoldStar(right)
+      case BooleanValue(true) => Nil
+      case other => Seq(other)
+    }
 
   // For if you want to be fussy about origins
-  def mapUnfoldedStar[G1, G2](expr: Expr[G1], f: Expr[G1] => Expr[G2]): Expr[G2] = expr match {
-    case Star(left, right) => Star(mapUnfoldedStar(left, f), mapUnfoldedStar(right, f))(expr.o)
-    case And(left, right) => And(mapUnfoldedStar(left, f), mapUnfoldedStar(right, f))(expr.o)
-    case other => f(other)
-  }
+  def mapUnfoldedStar[G1, G2](
+      expr: Expr[G1],
+      f: Expr[G1] => Expr[G2],
+  ): Expr[G2] =
+    expr match {
+      case Star(left, right) =>
+        Star(mapUnfoldedStar(left, f), mapUnfoldedStar(right, f))(expr.o)
+      case And(left, right) =>
+        And(mapUnfoldedStar(left, f), mapUnfoldedStar(right, f))(expr.o)
+      case other => f(other)
+    }
 
   def foldStar[G](exprs: Seq[Expr[G]])(implicit o: Origin): Expr[G] =
     exprs.reduceOption(Star(_, _)).getOrElse(tt)
 
-  def foldStar[G](predicate: AccountedPredicate[G])(implicit o: Origin): Expr[G] = predicate match {
-    case UnitAccountedPredicate(pred) => pred
-    case SplitAccountedPredicate(left, right) => Star(foldStar(left), foldStar(right))
-  }
+  def foldStar[G](
+      predicate: AccountedPredicate[G]
+  )(implicit o: Origin): Expr[G] =
+    predicate match {
+      case UnitAccountedPredicate(pred) => pred
+      case SplitAccountedPredicate(left, right) =>
+        Star(foldStar(left), foldStar(right))
+    }
 
-  def foldPredicate[G](exprs: Seq[Expr[G]])(implicit o: Origin): AccountedPredicate[G] = exprs match {
-    case x :: Seq() => UnitAccountedPredicate(x)
-    case x :: xs => SplitAccountedPredicate(UnitAccountedPredicate(x), foldPredicate(xs))
-  }
+  def foldPredicate[G](
+      exprs: Seq[Expr[G]]
+  )(implicit o: Origin): AccountedPredicate[G] =
+    exprs match {
+      case x :: Seq() => UnitAccountedPredicate(x)
+      case x :: xs =>
+        SplitAccountedPredicate(UnitAccountedPredicate(x), foldPredicate(xs))
+    }
 
   def foldOr[G](exprs: Seq[Expr[G]])(implicit o: Origin): Expr[G] =
     exprs.reduceOption(Or(_, _)).getOrElse(ff)
@@ -514,17 +874,19 @@ object AstBuildHelpers {
   def foldAnd[G](exprs: Seq[Expr[G]])(implicit o: Origin): Expr[G] =
     exprs.reduceOption(And(_, _)).getOrElse(tt)
 
-  def loop[G](cond: Expr[G],
-              body: Statement[G],
-              init: Statement[G] = null,
-              update: Statement[G] = null,
-              contract: LoopContract[G] = null
-              )(implicit o: Origin): Loop[G] =
+  def loop[G](
+      cond: Expr[G],
+      body: Statement[G],
+      init: Statement[G] = null,
+      update: Statement[G] = null,
+      contract: LoopContract[G] = null,
+  )(implicit o: Origin): Loop[G] =
     Loop(
       init = Option(init).getOrElse(Block(Seq())),
-      contract = Option(contract).getOrElse(loopInvariant(blame = PanicBlame("Trivial contract"))),
+      contract = Option(contract)
+        .getOrElse(loopInvariant(blame = PanicBlame("Trivial contract"))),
       cond = cond,
       body = body,
-      update = Option(update).getOrElse(Block(Seq()))
+      update = Option(update).getOrElse(Block(Seq())),
     )
 }
diff --git a/src/col/vct/col/util/ConstructingSuccessorOfContext.scala b/src/col/vct/col/util/ConstructingSuccessorOfContext.scala
index 31c07f0c3d..1ff67bd63f 100644
--- a/src/col/vct/col/util/ConstructingSuccessorOfContext.scala
+++ b/src/col/vct/col/util/ConstructingSuccessorOfContext.scala
@@ -4,8 +4,12 @@ import vct.col.ast.Declaration
 import vct.col.print.Doc
 import vct.result.{Message, VerificationError}
 
-case class ConstructingSuccessorOfContext(decl: Declaration[_]) extends VerificationError.Context {
-  override def tryMessageContext(message: String, err: VerificationError): Option[String] =
+case class ConstructingSuccessorOfContext(decl: Declaration[_])
+    extends VerificationError.Context {
+  override def tryMessageContext(
+      message: String,
+      err: VerificationError,
+  ): Option[String] =
     err.context[CurrentRewriteProgramContext].map { ctx =>
       ctx.program.highlight(decl).messageInContext(message)
     }
diff --git a/src/col/vct/col/util/CurrentCheckNodeContext.scala b/src/col/vct/col/util/CurrentCheckNodeContext.scala
index 12dad08564..016d34839b 100644
--- a/src/col/vct/col/util/CurrentCheckNodeContext.scala
+++ b/src/col/vct/col/util/CurrentCheckNodeContext.scala
@@ -4,8 +4,12 @@ import vct.col.ast.Node
 import vct.col.print.Doc
 import vct.result.VerificationError
 
-case class CurrentCheckNodeContext(node: Node[_]) extends VerificationError.Context {
-  override def tryMessageContext(message: String, err: VerificationError): Option[String] =
+case class CurrentCheckNodeContext(node: Node[_])
+    extends VerificationError.Context {
+  override def tryMessageContext(
+      message: String,
+      err: VerificationError,
+  ): Option[String] =
     err.context[CurrentCheckProgramContext].map { ctx =>
       ctx.program.highlight(node).messageInContext(message)
     }
diff --git a/src/col/vct/col/util/CurrentCheckProgramContext.scala b/src/col/vct/col/util/CurrentCheckProgramContext.scala
index 6b7844d581..169441c425 100644
--- a/src/col/vct/col/util/CurrentCheckProgramContext.scala
+++ b/src/col/vct/col/util/CurrentCheckProgramContext.scala
@@ -4,4 +4,5 @@ import vct.col.ast.Program
 import vct.col.print.Doc
 import vct.result.VerificationError
 
-case class CurrentCheckProgramContext(program: Program[_]) extends CurrentProgramContext
\ No newline at end of file
+case class CurrentCheckProgramContext(program: Program[_])
+    extends CurrentProgramContext
diff --git a/src/col/vct/col/util/CurrentRewriteNodeContext.scala b/src/col/vct/col/util/CurrentRewriteNodeContext.scala
index 9aff76973c..95620f80c5 100644
--- a/src/col/vct/col/util/CurrentRewriteNodeContext.scala
+++ b/src/col/vct/col/util/CurrentRewriteNodeContext.scala
@@ -4,8 +4,12 @@ import vct.col.ast.Node
 import vct.col.print.Doc
 import vct.result.VerificationError
 
-case class CurrentRewriteNodeContext(node: Node[_]) extends VerificationError.Context {
-  override def tryMessageContext(message: String, err: VerificationError): Option[String] =
+case class CurrentRewriteNodeContext(node: Node[_])
+    extends VerificationError.Context {
+  override def tryMessageContext(
+      message: String,
+      err: VerificationError,
+  ): Option[String] =
     err.context[CurrentRewriteProgramContext].map { ctx =>
       ctx.program.highlight(node).messageInContext(message)
     }
diff --git a/src/col/vct/col/util/CurrentRewriteProgramContext.scala b/src/col/vct/col/util/CurrentRewriteProgramContext.scala
index d529e68400..1e8a3f7d07 100644
--- a/src/col/vct/col/util/CurrentRewriteProgramContext.scala
+++ b/src/col/vct/col/util/CurrentRewriteProgramContext.scala
@@ -4,4 +4,5 @@ import vct.col.ast.Program
 import vct.col.print.Doc
 import vct.result.VerificationError
 
-case class CurrentRewriteProgramContext(program: Program[_]) extends CurrentProgramContext
\ No newline at end of file
+case class CurrentRewriteProgramContext(program: Program[_])
+    extends CurrentProgramContext
diff --git a/src/col/vct/col/util/DeclarationBox.scala b/src/col/vct/col/util/DeclarationBox.scala
index b4b1ff81ef..59c7e64e7b 100644
--- a/src/col/vct/col/util/DeclarationBox.scala
+++ b/src/col/vct/col/util/DeclarationBox.scala
@@ -5,7 +5,9 @@ import vct.col.ref.{LazyRef, Ref}
 
 import scala.reflect.ClassTag
 
-case class DeclarationBox[G, Decl <: Declaration[G]]()(implicit tag: ClassTag[Decl]) {
+case class DeclarationBox[G, Decl <: Declaration[G]]()(
+    implicit tag: ClassTag[Decl]
+) {
   private var decl: Option[Decl] = None
 
   def ref: Ref[G, Decl] = new LazyRef(decl.get)
diff --git a/src/col/vct/col/util/EqualityMeasure.scala b/src/col/vct/col/util/EqualityMeasure.scala
index ca7095b645..29628720d6 100644
--- a/src/col/vct/col/util/EqualityMeasure.scala
+++ b/src/col/vct/col/util/EqualityMeasure.scala
@@ -2,20 +2,26 @@ package vct.col.util
 
 import vct.col.ast.Declaration
 
-case class EqualityMeasure[Pre, Post, PreDecl <: Declaration[Pre], PostDecl <: Declaration[Post]](scopes: FrozenScopes[Pre, Post, PreDecl, PostDecl], decl: PreDecl) {
-  override def equals(obj: Any): Boolean = obj match {
-    case other: EqualityMeasure[Pre, Post, PreDecl, PostDecl] =>
-      decl == other.decl &&
+case class EqualityMeasure[Pre, Post, PreDecl <: Declaration[
+  Pre
+], PostDecl <: Declaration[Post]](
+    scopes: FrozenScopes[Pre, Post, PreDecl, PostDecl],
+    decl: PreDecl,
+) {
+  override def equals(obj: Any): Boolean =
+    obj match {
+      case other: EqualityMeasure[Pre, Post, PreDecl, PostDecl] =>
+        decl == other.decl &&
         // Assumption: the pre-declaration must occur in one of the maps for both frozenscopes, we don't care about
         // the equality value if they don't end up there (since that's a bug).
         // We can ignore identical maps in the tails, since whether the declaration is in there does not matter
         // Non-identical maps in the init must not contain the pre-declaration, since the successor will not be visible
         // to the other frozen scope stack, and hence the post-declaration cannot be equal.
-        scopes.scopes.reverse.zip(other.scopes.scopes.reverse).dropWhile { case (l, r) => l == r }.forall {
-          case (l, r) => !l.contains(decl) && !r.contains(decl)
-        }
-    case _ => false
-  }
+        scopes.scopes.reverse.zip(other.scopes.scopes.reverse).dropWhile {
+          case (l, r) => l == r
+        }.forall { case (l, r) => !l.contains(decl) && !r.contains(decl) }
+      case _ => false
+    }
 
   override def hashCode(): Int = 0
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/util/FrozenScopes.scala b/src/col/vct/col/util/FrozenScopes.scala
index 8f99752558..962b19e523 100644
--- a/src/col/vct/col/util/FrozenScopes.scala
+++ b/src/col/vct/col/util/FrozenScopes.scala
@@ -9,22 +9,33 @@ import vct.result.VerificationError
 import scala.collection.mutable
 import scala.reflect.ClassTag
 
-/**
- * When constructing a lazy reference, it is important that the stack of scopes is recorded *before* we enter a lazy
- * context. For example, this is wrong:
- *
- * new LazyRef(successors.toSeq.collectFirst(_(decl)).get)
- *
- * since everything between the LazyRef parentheses is evaluated lazily, and only the value of successors is captured
- * in the closure.
- */
-class FrozenScopes[Pre, Post, PreDecl <: Declaration[Pre], PostDecl <: Declaration[Post]](val scopes: Seq[mutable.Map[PreDecl, PostDecl]]) extends SuccessorProvider[Pre, Post, PreDecl, PostDecl] {
-  override def computeSucc(decl: PreDecl): Option[PostDecl] = scopes.collectFirst { case m if m.contains(decl) => m(decl) }
+/** When constructing a lazy reference, it is important that the stack of scopes
+  * is recorded *before* we enter a lazy context. For example, this is wrong:
+  *
+  * new LazyRef(successors.toSeq.collectFirst(_(decl)).get)
+  *
+  * since everything between the LazyRef parentheses is evaluated lazily, and
+  * only the value of successors is captured in the closure.
+  */
+class FrozenScopes[Pre, Post, PreDecl <: Declaration[
+  Pre
+], PostDecl <: Declaration[Post]](
+    val scopes: Seq[mutable.Map[PreDecl, PostDecl]]
+) extends SuccessorProvider[Pre, Post, PreDecl, PostDecl] {
+  override def computeSucc(decl: PreDecl): Option[PostDecl] =
+    scopes.collectFirst { case m if m.contains(decl) => m(decl) }
 
-  override def succ[RefDecl <: Declaration[Post]](decl: PreDecl)(implicit tag: ClassTag[RefDecl]): Ref[Post, RefDecl] =
+  override def succ[RefDecl <: Declaration[Post]](
+      decl: PreDecl
+  )(implicit tag: ClassTag[RefDecl]): Ref[Post, RefDecl] =
     VerificationError.withContext(ConstructingSuccessorOfContext(decl)) {
       TimeTravel.cause { causeIdx =>
-        new LazyRef(computeSucc(decl).getOrElse(TimeTravel.badEffect(causeIdx, throw Scopes.NoSuccessor(decl))), Some(EqualityMeasure(this, decl)))
+        new LazyRef(
+          computeSucc(decl).getOrElse(
+            TimeTravel.badEffect(causeIdx, throw Scopes.NoSuccessor(decl))
+          ),
+          Some(EqualityMeasure(this, decl)),
+        )
       }
     }
-}
\ No newline at end of file
+}
diff --git a/src/col/vct/col/util/Scopes.scala b/src/col/vct/col/util/Scopes.scala
index fb06620546..80a9bcf968 100644
--- a/src/col/vct/col/util/Scopes.scala
+++ b/src/col/vct/col/util/Scopes.scala
@@ -13,21 +13,33 @@ import scala.reflect.ClassTag
 import scala.util.Try
 
 object Scopes {
-  case class WrongDeclarationCount(kind: ClassTag[_], count: Int) extends SystemError {
+  case class WrongDeclarationCount(kind: ClassTag[_], count: Int)
+      extends SystemError {
     override def text: String =
-      messageContext(s"Expected exactly one declaration of kind ${kind.runtimeClass.getSimpleName}, but got $count.")
+      messageContext(
+        s"Expected exactly one declaration of kind ${kind.runtimeClass.getSimpleName}, but got $count."
+      )
   }
 
   case class NoScope(kind: ClassTag[_]) extends SystemError {
     override def text: String =
-      messageContext(s"There is no scope to place a declaration of kind ${kind.runtimeClass.getSimpleName} in.")
+      messageContext(
+        s"There is no scope to place a declaration of kind ${kind.runtimeClass.getSimpleName} in."
+      )
   }
 
-  case class DuplicateSuccessor(pre: Declaration[_], firstPost: Declaration[_], secondPost: Declaration[_]) extends SystemError {
+  case class DuplicateSuccessor(
+      pre: Declaration[_],
+      firstPost: Declaration[_],
+      secondPost: Declaration[_],
+  ) extends SystemError {
     override def text: String =
       Message.messagesInContext(
-        firstPost.highlight(firstPost) -> "This declaration already succeeds ...",
-        context[CurrentProgramContext].map(_.program).getOrElse(pre).highlight(pre) -> "... this declaration, but is additionally succeeded by ...",
+        firstPost.highlight(firstPost) ->
+          "This declaration already succeeds ...",
+        context[CurrentProgramContext].map(_.program).getOrElse(pre)
+          .highlight(pre) ->
+          "... this declaration, but is additionally succeeded by ...",
         secondPost.highlight(secondPost) -> "... this declaration.",
       )
   }
@@ -40,24 +52,36 @@ object Scopes {
         val predProgram = getContext[CurrentRewriteProgramContext].program
         val predDecl = getContext[ConstructingSuccessorOfContext].decl
         Message.messagesInContext(
-          (predProgram.highlight(predDecl), "A reference to the successor of this declaration was made, ..."),
-          (useProgram.highlight(useNode), "... but it has no successor in this position.")
+          (
+            predProgram.highlight(predDecl),
+            "A reference to the successor of this declaration was made, ...",
+          ),
+          (
+            useProgram.highlight(useNode),
+            "... but it has no successor in this position.",
+          ),
         )
       } getOrElse {
-        pre.o.messageInContext("A reference to the successor of this declaration was made, but it has no successor.")
+        pre.o.messageInContext(
+          "A reference to the successor of this declaration was made, but it has no successor."
+        )
       }
     }
   }
 }
 
-case class Scopes[Pre, Post, PreDecl <: Declaration[Pre], PostDecl <: Declaration[Post]]()(implicit tag: ClassTag[PostDecl]) {
-  private val successors: ScopedStack[mutable.Map[PreDecl, PostDecl]] = ScopedStack()
-  private val collectionBuffer: ScopedStack[mutable.ArrayBuffer[PostDecl]] = ScopedStack()
+case class Scopes[Pre, Post, PreDecl <: Declaration[
+  Pre
+], PostDecl <: Declaration[Post]]()(implicit tag: ClassTag[PostDecl]) {
+  private val successors: ScopedStack[mutable.Map[PreDecl, PostDecl]] =
+    ScopedStack()
+  private val collectionBuffer: ScopedStack[mutable.ArrayBuffer[PostDecl]] =
+    ScopedStack()
 
-  def freeze: FrozenScopes[Pre, Post, PreDecl, PostDecl] = new FrozenScopes(successors.toSeq)
+  def freeze: FrozenScopes[Pre, Post, PreDecl, PostDecl] =
+    new FrozenScopes(successors.toSeq)
 
-  def scope[T](f: => T): T =
-    successors.having(mutable.Map())(f)
+  def scope[T](f: => T): T = successors.having(mutable.Map())(f)
 
   def isEmpty: Boolean = collectionBuffer.isEmpty
   def nonEmpty: Boolean = !isEmpty
@@ -70,8 +94,7 @@ case class Scopes[Pre, Post, PreDecl <: Declaration[Pre], PostDecl <: Declaratio
     (buffer.toSeq, result)
   }
 
-  def collectScoped[T](f: => T): (Seq[PostDecl], T) =
-    scope { collect(f) }
+  def collectScoped[T](f: => T): (Seq[PostDecl], T) = scope { collect(f) }
 
   def declare[T <: PostDecl](decl: T): T = {
     collectionBuffer.topOption match {
@@ -80,19 +103,25 @@ case class Scopes[Pre, Post, PreDecl <: Declaration[Pre], PostDecl <: Declaratio
     }
   }
 
-  def succeedOnly[T <: PostDecl](pre: PreDecl, post: T)(implicit tag: ClassTag[T]): T =
+  def succeedOnly[T <: PostDecl](pre: PreDecl, post: T)(
+      implicit tag: ClassTag[T]
+  ): T =
     successors.topOption match {
       case Some(map) if !map.contains(pre) => map(pre) = post; post
       case Some(map) => throw DuplicateSuccessor(pre, map(pre), post)
       case None => throw NoScope(tag)
     }
 
-  def succeed[T <: PostDecl](pre: PreDecl, post: T)(implicit tag: ClassTag[T]): T = {
+  def succeed[T <: PostDecl](pre: PreDecl, post: T)(
+      implicit tag: ClassTag[T]
+  ): T = {
     declare(post)
     succeedOnly(pre, post)
   }
 
-  def dispatch(decl: PreDecl)(implicit rw: AbstractRewriter[Pre, Post]): PostDecl = {
+  def dispatch(
+      decl: PreDecl
+  )(implicit rw: AbstractRewriter[Pre, Post]): PostDecl = {
     val result = collect { rw.dispatch(decl.asInstanceOf[Declaration[Pre]]) }
     result._1 match {
       case Seq(decl) => decl
@@ -100,9 +129,17 @@ case class Scopes[Pre, Post, PreDecl <: Declaration[Pre], PostDecl <: Declaratio
     }
   }
 
-  def dispatch(decls: Iterable[PreDecl])(implicit rw: AbstractRewriter[Pre, Post]): Seq[PostDecl] =
-    collect { decls.foreach((decl: PreDecl) => rw.dispatch(decl.asInstanceOf[Declaration[Pre]])) }._1
+  def dispatch(
+      decls: Iterable[PreDecl]
+  )(implicit rw: AbstractRewriter[Pre, Post]): Seq[PostDecl] =
+    collect {
+      decls.foreach((decl: PreDecl) =>
+        rw.dispatch(decl.asInstanceOf[Declaration[Pre]])
+      )
+    }._1
 
-  def dispatch[PreRefDecl <: PreDecl, PostRefDecl <: PostDecl](ref: Ref[Pre, PreRefDecl])(implicit tag: ClassTag[PostRefDecl]): Ref[Post, PostRefDecl] =
+  def dispatch[PreRefDecl <: PreDecl, PostRefDecl <: PostDecl](
+      ref: Ref[Pre, PreRefDecl]
+  )(implicit tag: ClassTag[PostRefDecl]): Ref[Post, PostRefDecl] =
     freeze.succ(ref.decl)
 }
diff --git a/src/col/vct/col/util/Substitute.scala b/src/col/vct/col/util/Substitute.scala
index 43ce32e24a..9f54a1e9da 100644
--- a/src/col/vct/col/util/Substitute.scala
+++ b/src/col/vct/col/util/Substitute.scala
@@ -4,36 +4,44 @@ import vct.col.ast._
 import vct.col.origin.Origin
 import vct.col.rewrite.NonLatchingRewriter
 
-/**
- * Apply a substitution map to expressions
- */
-case class Substitute[G](subs: Map[Expr[G], Expr[G]],
-                         typeSubs: Map[TVar[G], Type[G]] = Map.empty[TVar[G], Type[G]],
-                         bindingSubs: Map[Variable[G], Variable[G]] = Map.empty[Variable[G], Variable[G]],
-                         originTrafo: Origin => Origin = identity)
-  extends NonLatchingRewriter[G, G] {
-
-  case class SuccOrIdentity() extends SuccessorsProviderTrafo[G, G](allScopes.freeze) {
-    override def postTransform[T <: Declaration[G]](pre: Declaration[G], post: Option[T]): Option[T] =
-      Some(post.getOrElse(pre.asInstanceOf[T]))
+/** Apply a substitution map to expressions
+  */
+case class Substitute[G](
+    subs: Map[Expr[G], Expr[G]],
+    typeSubs: Map[TVar[G], Type[G]] = Map.empty[TVar[G], Type[G]],
+    bindingSubs: Map[Variable[G], Variable[G]] = Map
+      .empty[Variable[G], Variable[G]],
+    originTrafo: Origin => Origin = identity,
+) extends NonLatchingRewriter[G, G] {
+
+  case class SuccOrIdentity()
+      extends SuccessorsProviderTrafo[G, G](allScopes.freeze) {
+    override def postTransform[T <: Declaration[G]](
+        pre: Declaration[G],
+        post: Option[T],
+    ): Option[T] = Some(post.getOrElse(pre.asInstanceOf[T]))
   }
 
   override def succProvider: SuccessorsProvider[G, G] = SuccOrIdentity()
 
   override def dispatch(o: Origin): Origin = originTrafo(o)
 
-  override def dispatch(e: Expr[G]): Expr[G] = e match {
-    case expr if subs.contains(expr) => subs(expr)
-    case other => other.rewriteDefault()
-  }
-
-  override def dispatch(t: Type[G]): Type[G] = t match {
-    case v @ TVar(_) if typeSubs.contains(v) => dispatch(typeSubs(v))
-    case other => other.rewriteDefault()
-  }
-
-  override def dispatch(v: Declaration[G]): Unit = v match {
-    case decl: Variable[G] if bindingSubs.contains(decl) => dispatch(bindingSubs(decl))
-    case other => super.dispatch(other)
-  }
+  override def dispatch(e: Expr[G]): Expr[G] =
+    e match {
+      case expr if subs.contains(expr) => subs(expr)
+      case other => other.rewriteDefault()
+    }
+
+  override def dispatch(t: Type[G]): Type[G] =
+    t match {
+      case v @ TVar(_) if typeSubs.contains(v) => dispatch(typeSubs(v))
+      case other => other.rewriteDefault()
+    }
+
+  override def dispatch(v: Declaration[G]): Unit =
+    v match {
+      case decl: Variable[G] if bindingSubs.contains(decl) =>
+        dispatch(bindingSubs(decl))
+      case other => super.dispatch(other)
+    }
 }
diff --git a/src/col/vct/col/util/SuccessionMap.scala b/src/col/vct/col/util/SuccessionMap.scala
index c93cd9d94d..01b7c4aaea 100644
--- a/src/col/vct/col/util/SuccessionMap.scala
+++ b/src/col/vct/col/util/SuccessionMap.scala
@@ -13,16 +13,17 @@ import scala.reflect.ClassTag
 
 case object SuccessionMap {
   case class Scope(var idx: Int = 0, var triggerIdx: Option[Int] = None) {
-    def next(): Int = this.synchronized {
-      val result = idx
+    def next(): Int =
+      this.synchronized {
+        val result = idx
 
-      if(triggerIdx.nonEmpty && triggerIdx.get == result) {
-        throw MissingPredecessor
-      }
+        if (triggerIdx.nonEmpty && triggerIdx.get == result) {
+          throw MissingPredecessor
+        }
 
-      idx += 1
-      result
-    }
+        idx += 1
+        result
+      }
   }
 
   val scopes: ScopedStack[Scope] = ScopedStack()
@@ -50,15 +51,21 @@ case object SuccessionMap {
   }
 
   case object NonDeterminsticEvaluation extends SystemError {
-    override def text: String = "We tried to derive the creation of a reference pointing to a successor that will not be populated, " +
-      "but the second computation does not yield the same error. Is the function supplied to breakOnMissingPredecessor not deterministic?"
+    override def text: String =
+      "We tried to derive the creation of a reference pointing to a successor that will not be populated, " +
+        "but the second computation does not yield the same error. Is the function supplied to breakOnMissingPredecessor not deterministic?"
   }
 
   case object MissingPredecessor extends SystemError {
-    override def text: String = "Stack trace for the location that creates a reference for a successor that will not be populated."
+    override def text: String =
+      "Stack trace for the location that creates a reference for a successor that will not be populated."
   }
 
-  case class NoSuchSuccessor[K, V <: Declaration[_]](map: SuccessionMap[K, V], missingKey: K, debugIdx: Int) extends SystemError {
+  case class NoSuchSuccessor[K, V <: Declaration[_]](
+      map: SuccessionMap[K, V],
+      missingKey: K,
+      debugIdx: Int,
+  ) extends SystemError {
     override def text: String = s"Key not found: $missingKey"
   }
 }
@@ -67,39 +74,44 @@ case class SuccessionMap[K, V <: Declaration[_]]() {
   private val collapsedStorage: mutable.HashMap[K, V] = mutable.HashMap()
 
   private val storages: ArrayBuffer[mutable.HashMap[K, V]] = ArrayBuffer()
-  private val localStorage: ThreadLocal[mutable.HashMap[K, V]] =
-    ThreadLocal.withInitial(() => storages.synchronized {
-      val store = mutable.HashMap[K, V]()
-      storages += store
-      store
-    })
+  private val localStorage: ThreadLocal[mutable.HashMap[K, V]] = ThreadLocal
+    .withInitial(() =>
+      storages.synchronized {
+        val store = mutable.HashMap[K, V]()
+        storages += store
+        store
+      }
+    )
 
   // Hint to GC: move as much data as possible out of pinned ThreadLocal
   override def finalize(): Unit = collapse()
 
   private def storage: mutable.HashMap[K, V] = localStorage.get()
 
-  private def collapse(): Unit = storages.synchronized {
-    for(storage <- storages) {
-      collapsedStorage.addAll(storage)
-      storage.clear()
+  private def collapse(): Unit =
+    storages.synchronized {
+      for (storage <- storages) {
+        collapsedStorage.addAll(storage)
+        storage.clear()
+      }
     }
-  }
 
-  def get(k: K): Option[V] = storages.synchronized {
-    collapse()
-    collapsedStorage.get(k)
-  }
+  def get(k: K): Option[V] =
+    storages.synchronized {
+      collapse()
+      collapsedStorage.get(k)
+    }
 
   def apply(k: K): V = get(k).get
 
-  def getOrElseUpdate(k: K, v: => V): V = storages.synchronized {
-    get(k).getOrElse {
-      val computed = v
-      storage(k) = computed
-      computed
+  def getOrElseUpdate(k: K, v: => V): V =
+    storages.synchronized {
+      get(k).getOrElse {
+        val computed = v
+        storage(k) = computed
+        computed
+      }
     }
-  }
 
   def update(k: K, v: V): Unit = {
     k match {
@@ -112,14 +124,15 @@ case class SuccessionMap[K, V <: Declaration[_]]() {
 
   def contains(k: K): Boolean = get(k).isDefined
 
-  def ref[G, V2 <: Declaration[G]](k: K)(implicit tag: ClassTag[V2], witness: V <:< Declaration[G]): LazyRef[G, V2] = {
+  def ref[G, V2 <: Declaration[G]](k: K)(
+      implicit tag: ClassTag[V2],
+      witness: V <:< Declaration[G],
+  ): LazyRef[G, V2] = {
     val debugIdx = SuccessionMap.scopes.topOption.map(_.next()).getOrElse(-1)
 
-    new LazyRef[G, V2](
-      get(k) match {
-        case Some(value) => value
-        case None => throw NoSuchSuccessor(this, k, debugIdx)
-      }
-    )
+    new LazyRef[G, V2](get(k) match {
+      case Some(value) => value
+      case None => throw NoSuchSuccessor(this, k, debugIdx)
+    })
   }
 }
diff --git a/src/helpers/scala/meta/ResultStream.scala b/src/helpers/scala/meta/ResultStream.scala
index 9434a6d2b1..6420f782a2 100644
--- a/src/helpers/scala/meta/ResultStream.scala
+++ b/src/helpers/scala/meta/ResultStream.scala
@@ -9,10 +9,10 @@ import scala.meta.dialects.Scala213
 import scala.util.Using
 
 object ResultStream {
-  /**
-   * Forwards all writes to the inner Appendable, but stores the two last written
-   * characters.
-   */
+
+  /** Forwards all writes to the inner Appendable, but stores the two last
+    * written characters.
+    */
   class MiniContextAppendable(inner: Appendable) extends Appendable {
     private var last: Char = ' '
     private var prelast: Char = ' '
@@ -24,10 +24,10 @@ object ResultStream {
       _position += cs.length()
       inner.append(cs)
 
-      if(cs.length() > 1) {
+      if (cs.length() > 1) {
         prelast = cs.charAt(cs.length() - 2)
         last = cs.charAt(cs.length() - 1)
-      } else if(cs.length() > 0) {
+      } else if (cs.length() > 0) {
         prelast = last
         last = cs.charAt(cs.length() - 1)
       }
@@ -35,14 +35,14 @@ object ResultStream {
     }
 
     override def append(cs: CharSequence, start: Int, end: Int): Appendable = {
-      if(end > start)
+      if (end > start)
         _position += end - start
       inner.append(cs, start, end)
 
-      if(end - start > 1) {
+      if (end - start > 1) {
         prelast = cs.charAt(end - 2)
         last = cs.charAt(end - 1)
-      } else if(end - start > 0) {
+      } else if (end - start > 0) {
         prelast = last
         last = cs.charAt(end - 1)
       }
@@ -58,8 +58,7 @@ object ResultStream {
       this
     }
 
-    def miniContext: String =
-      s"$prelast$last"
+    def miniContext: String = s"$prelast$last"
   }
 
   def newline(out: Appendable, indentation: Int): Unit = {
@@ -77,14 +76,18 @@ object ResultStream {
   def write(out: Appendable, result: Result): Unit =
     write(new MiniContextAppendable(out), result, 0)
 
-  /**
-   * @see [[Result.toString]]
-   */
-  def write(out: MiniContextAppendable, result: Result, indentation: Int): Unit =
+  /** @see
+    *   [[Result.toString]]
+    */
+  def write(
+      out: MiniContextAppendable,
+      result: Result,
+      indentation: Int,
+  ): Unit =
     result match {
       case None =>
       case Str(text) => out.append(text)
-      case Sequence(xs@_*) => xs.foreach(write(out, _, indentation))
+      case Sequence(xs @ _*) => xs.foreach(write(out, _, indentation))
       case Repeat(first +: tail, sep) =>
         write(out, first, indentation)
         tail.foreach { x =>
@@ -98,15 +101,16 @@ object ResultStream {
       case Newline(res) =>
         newline(out, indentation)
         write(out, res, indentation)
-      case Meta(_, res) =>
-        write(out, res, indentation)
+      case Meta(_, res) => write(out, res, indentation)
       case Wrap(prefix, res, suffix) =>
         val text = res.toString
-        if(text.nonEmpty) {
-          out.append(prefix).append(text).append(suffix)
-        }
+        if (text.nonEmpty) { out.append(prefix).append(text).append(suffix) }
       case Function(fn) =>
-        if(fn.getClass.getName.startsWith("scala.meta.internal.prettyprinters.TreeSyntax$SyntaxInstances$$Lambda$")) {
+        if (
+          fn.getClass.getName.startsWith(
+            "scala.meta.internal.prettyprinters.TreeSyntax$SyntaxInstances$$Lambda$"
+          )
+        ) {
           // Currently the only instance: prepends a space if the surrounding output is dangerous.
           // Luckily it considers only the preceding two characters, so that's all the buffer we'll store
           val sb = new StringBuilder(out.miniContext)
diff --git a/src/helpers/vct/col/ast/helpers/defn/Constants.scala b/src/helpers/vct/col/ast/helpers/defn/Constants.scala
index 0267d9ed49..3e36978740 100644
--- a/src/helpers/vct/col/ast/helpers/defn/Constants.scala
+++ b/src/helpers/vct/col/ast/helpers/defn/Constants.scala
@@ -28,19 +28,23 @@ object Constants {
   val LeftObj: Term = q"_root_.scala.util.Left"
   val RightObj: Term = q"_root_.scala.util.Right"
 
-  val copyByteStringFrom: Term = q"_root_.com.google.protobuf.ByteString.copyFrom"
+  val copyByteStringFrom: Term =
+    q"_root_.com.google.protobuf.ByteString.copyFrom"
 
   val Node: Type = typ(RootNodeName)
   val Declaration: Type = typ(DeclarationName)
-  val ExprName: structure.Name = structure.Name(Seq("_root_", "vct", "col", "ast", "Expr"))
+  val ExprName: structure.Name = structure
+    .Name(Seq("_root_", "vct", "col", "ast", "Expr"))
   val Expr: Type = typ(ExprName)
   val Coercion: Type = t"_root_.vct.col.ast.Coercion"
-  val ApplyCoercionPat: (Pat, Pat) => Pat = (e, c) => p"_root_.vct.col.ast.ApplyCoercion($e, $c)"
+  val ApplyCoercionPat: (Pat, Pat) => Pat =
+    (e, c) => p"_root_.vct.col.ast.ApplyCoercion($e, $c)"
   val Origin: Type = t"_root_.vct.col.origin.Origin"
   val OriginObj: Term = q"_root_.vct.col.origin.Origin"
   val Blame: Type = t"_root_.vct.col.origin.Blame"
   val VerificationFailure: Type = t"_root_.vct.col.origin.VerificationFailure"
-  val InconsistentSuccessionTypesObj: Term = q"_root_.vct.col.err.InconsistentSuccessionTypes"
+  val InconsistentSuccessionTypesObj: Term =
+    q"_root_.vct.col.err.InconsistentSuccessionTypes"
   val RefType: Type = t"_root_.vct.col.ref.Ref"
   val LazyRef: Type = t"_root_.vct.col.ref.LazyRef"
 
diff --git a/src/helpers/vct/col/ast/helpers/defn/Naming.scala b/src/helpers/vct/col/ast/helpers/defn/Naming.scala
index 0cda3a8543..455b42735d 100644
--- a/src/helpers/vct/col/ast/helpers/defn/Naming.scala
+++ b/src/helpers/vct/col/ast/helpers/defn/Naming.scala
@@ -1,6 +1,14 @@
 package vct.col.ast.helpers.defn
 
-import vct.col.ast.helpers.defn.Constants.{ComparePackage, DeclarePackage, DeserializePackage, RefType, RewritePackage, SerializePackage, SubnodesPackage}
+import vct.col.ast.helpers.defn.Constants.{
+  ComparePackage,
+  DeclarePackage,
+  DeserializePackage,
+  RefType,
+  RewritePackage,
+  SerializePackage,
+  SubnodesPackage,
+}
 import vct.col.ast.structure
 import vct.col.ast.structure.NodeDefinition
 
@@ -13,43 +21,51 @@ object Naming {
     }
 
   def typ(name: structure.Name): Type =
-    if(name.parts.size == 1) Type.Name(name.base)
-    else Type.Select(term(name.initName), Type.Name(name.base))
+    if (name.parts.size == 1)
+      Type.Name(name.base)
+    else
+      Type.Select(term(name.initName), Type.Name(name.base))
 
   def typ(node: structure.NodeDefinition): Type = typ(node.name)
 
-  def typ(t: structure.Type, g: Type): Type = t match {
-    case structure.Type.Node(name) => t"${typ(name)}[$g]"
-    case structure.Type.Declaration(name) => t"${typ(name)}[$g]"
-    case structure.Type.DeclarationSeq(name) => t"_root_.scala.Seq[${typ(name)}[$g]]"
-    case structure.Type.Ref(node) => t"$RefType[$g, ${typ(node.name)}[$g]]"
-    case structure.Type.MultiRef(node) => t"$RefType[$g, ${typ(node.name)}[$g]]"
-    case structure.Type.Tuple(args) => t"(..${args.toList.map(typ(_, g))})"
-    case structure.Type.Seq(arg) => t"_root_.scala.Seq[${typ(arg, g)}]"
-    case structure.Type.Option(arg) => t"_root_.scala.Option[${typ(arg, g)}]"
-    case structure.Type.Either(left, right) => t"_root_.scala.util.Either[${typ(left, g)}, ${typ(right, g)}]"
-    case structure.Type.Nothing => t"_root_.scala.Nothing"
-    case structure.Type.Unit => t"_root_.scala.Unit"
-    case structure.Type.String => t"_root_.java.lang.String"
-    case structure.Type.BigInt => t"_root_.scala.BigInt"
-    case structure.Type.BigDecimal => t"_root_.scala.BigDecimal"
-    case structure.Type.BitString => t"_root_.hre.data.BitString"
-    case structure.Type.ExpectedError => t"_root_.vct.col.origin.ExpectedError"
-    case structure.Type.Boolean => t"_root_.scala.Boolean"
-    case structure.Type.Byte => t"_root_.scala.Byte"
-    case structure.Type.Short => t"_root_.scala.Short"
-    case structure.Type.Int => t"_root_.scala.Int"
-    case structure.Type.Long => t"_root_.scala.Long"
-    case structure.Type.Float => t"_root_.scala.Float"
-    case structure.Type.Double => t"_root_.scala.Double"
-    case structure.Type.Char => t"_root_.scala.Char"
-  }
+  def typ(t: structure.Type, g: Type): Type =
+    t match {
+      case structure.Type.Node(name) => t"${typ(name)}[$g]"
+      case structure.Type.Declaration(name) => t"${typ(name)}[$g]"
+      case structure.Type.DeclarationSeq(name) =>
+        t"_root_.scala.Seq[${typ(name)}[$g]]"
+      case structure.Type.Ref(node) => t"$RefType[$g, ${typ(node.name)}[$g]]"
+      case structure.Type.MultiRef(node) =>
+        t"$RefType[$g, ${typ(node.name)}[$g]]"
+      case structure.Type.Tuple(args) => t"(..${args.toList.map(typ(_, g))})"
+      case structure.Type.Seq(arg) => t"_root_.scala.Seq[${typ(arg, g)}]"
+      case structure.Type.Option(arg) => t"_root_.scala.Option[${typ(arg, g)}]"
+      case structure.Type.Either(left, right) =>
+        t"_root_.scala.util.Either[${typ(left, g)}, ${typ(right, g)}]"
+      case structure.Type.Nothing => t"_root_.scala.Nothing"
+      case structure.Type.Unit => t"_root_.scala.Unit"
+      case structure.Type.String => t"_root_.java.lang.String"
+      case structure.Type.BigInt => t"_root_.scala.BigInt"
+      case structure.Type.BigDecimal => t"_root_.scala.BigDecimal"
+      case structure.Type.BitString => t"_root_.hre.data.BitString"
+      case structure.Type.ExpectedError =>
+        t"_root_.vct.col.origin.ExpectedError"
+      case structure.Type.Boolean => t"_root_.scala.Boolean"
+      case structure.Type.Byte => t"_root_.scala.Byte"
+      case structure.Type.Short => t"_root_.scala.Short"
+      case structure.Type.Int => t"_root_.scala.Int"
+      case structure.Type.Long => t"_root_.scala.Long"
+      case structure.Type.Float => t"_root_.scala.Float"
+      case structure.Type.Double => t"_root_.scala.Double"
+      case structure.Type.Char => t"_root_.scala.Char"
+    }
 
-  def packageFromRoot(t: Term): Term.Ref = t match {
-    case name: Term.Name => q"_root_.$name"
-    case Term.Select(base, name) => q"${packageFromRoot(base)}.$name"
-    case _ => ???
-  }
+  def packageFromRoot(t: Term): Term.Ref =
+    t match {
+      case name: Term.Name => q"_root_.$name"
+      case Term.Select(base, name) => q"${packageFromRoot(base)}.$name"
+      case _ => ???
+    }
 
   def scopes(family: String): Term.Name =
     Term.Name(family.charAt(0).toLower.toString + family.substring(1) + "s")
@@ -61,26 +77,38 @@ object Naming {
     structure.Name(pkg :+ baseName)
   }
 
-  def scalapbType(node: structure.Name): Type =
-    typ(scalapbName(node))
+  def scalapbType(node: structure.Name): Type = typ(scalapbName(node))
 
   def opsTrait(node: NodeDefinition) = Type.Name(node.name.base + "Ops")
   def opsFamilyTrait(node: structure.Name) = Type.Name(node.base + "FamilyOps")
 
   def compareTrait(node: NodeDefinition) = Type.Name(node.name.base + "Compare")
-  def compareType(node: NodeDefinition) = t"${packageFromRoot(ComparePackage)}.${compareTrait(node)}"
+  def compareType(node: NodeDefinition) =
+    t"${packageFromRoot(ComparePackage)}.${compareTrait(node)}"
   def rewriteTrait(node: NodeDefinition) = Type.Name(node.name.base + "Rewrite")
-  def rewriteType(node: NodeDefinition) = t"${packageFromRoot(RewritePackage)}.${rewriteTrait(node)}"
-  def subnodesTrait(node: NodeDefinition) = Type.Name(node.name.base + "Subnodes")
-  def subnodesType(node: NodeDefinition) = t"${packageFromRoot(SubnodesPackage)}.${subnodesTrait(node)}"
-  def serializeTrait(node: NodeDefinition) = Type.Name(node.name.base + "Serialize")
-  def serializeType(node: NodeDefinition) = t"${packageFromRoot(SerializePackage)}.${serializeTrait(node)}"
+  def rewriteType(node: NodeDefinition) =
+    t"${packageFromRoot(RewritePackage)}.${rewriteTrait(node)}"
+  def subnodesTrait(node: NodeDefinition) =
+    Type.Name(node.name.base + "Subnodes")
+  def subnodesType(node: NodeDefinition) =
+    t"${packageFromRoot(SubnodesPackage)}.${subnodesTrait(node)}"
+  def serializeTrait(node: NodeDefinition) =
+    Type.Name(node.name.base + "Serialize")
+  def serializeType(node: NodeDefinition) =
+    t"${packageFromRoot(SerializePackage)}.${serializeTrait(node)}"
   def deserializeName(node: structure.Name) = "Deserialize" + node.base
-  def deserializeFamilyName(node: structure.Name) = "DeserializeFamily" + node.base
-  def deserializeType(node: NodeDefinition) = Type.Name(deserializeName(node.name))
-  def deserializeObjectName(node: NodeDefinition) = Term.Name(deserializeName(node.name))
-  def deserializeObject(node: structure.Name) = q"${packageFromRoot(DeserializePackage)}.${Term.Name(deserializeName(node))}"
-  def deserializeFamilyObject(name: structure.Name) = q"${packageFromRoot(DeserializePackage)}.${Term.Name(deserializeFamilyName(name))}"
-  def declareTrait(node: structure.Name) = Type.Name(node.base + "FamilyDeclare")
-  def declareType(node: structure.Name) = t"${packageFromRoot(DeclarePackage)}.${declareTrait(node)}"
+  def deserializeFamilyName(node: structure.Name) =
+    "DeserializeFamily" + node.base
+  def deserializeType(node: NodeDefinition) =
+    Type.Name(deserializeName(node.name))
+  def deserializeObjectName(node: NodeDefinition) =
+    Term.Name(deserializeName(node.name))
+  def deserializeObject(node: structure.Name) =
+    q"${packageFromRoot(DeserializePackage)}.${Term.Name(deserializeName(node))}"
+  def deserializeFamilyObject(name: structure.Name) =
+    q"${packageFromRoot(DeserializePackage)}.${Term.Name(deserializeFamilyName(name))}"
+  def declareTrait(node: structure.Name) =
+    Type.Name(node.base + "FamilyDeclare")
+  def declareType(node: structure.Name) =
+    t"${packageFromRoot(DeclarePackage)}.${declareTrait(node)}"
 }
diff --git a/src/helpers/vct/col/ast/helpers/defn/Proto.scala b/src/helpers/vct/col/ast/helpers/defn/Proto.scala
index 5890e9ffc6..574bdf8892 100644
--- a/src/helpers/vct/col/ast/helpers/defn/Proto.scala
+++ b/src/helpers/vct/col/ast/helpers/defn/Proto.scala
@@ -16,9 +16,9 @@ object Proto {
     "no_default_values_in_constructor" -> "true",
   )
 
-  val OPAQUE_SUBMESSAGES_OPTIONS: Map[String, String] = STANDARD_OPTIONS ++ ListMap(
-    "bytes_type" -> "\"_root_.vct.serialize.OpaqueMessageBytes\"",
-  )
+  val OPAQUE_SUBMESSAGES_OPTIONS: Map[String, String] =
+    STANDARD_OPTIONS ++
+      ListMap("bytes_type" -> "\"_root_.vct.serialize.OpaqueMessageBytes\"")
 
   def renderOptions(options: Map[String, String]): String =
     s"""option (scalapb.options) = {
@@ -26,25 +26,27 @@ object Proto {
        |};""".stripMargin
 
   sealed trait PrimitiveType {
-    def write(out: Appendable): Unit = this match {
-      case Int => out.append("sint32")
-      case Float => out.append("float")
-      case Long => out.append("sint64")
-      case Double => out.append("double")
-      case Bool => out.append("bool")
-      case String => out.append("string")
-      case Bytes => out.append("bytes")
-      case t: NamedType =>
-        for(part <- t.fqName) {
-          out.append('.')
-          out.append(part)
-        }
-    }
+    def write(out: Appendable): Unit =
+      this match {
+        case Int => out.append("sint32")
+        case Float => out.append("float")
+        case Long => out.append("sint64")
+        case Double => out.append("double")
+        case Bool => out.append("bool")
+        case String => out.append("string")
+        case Bytes => out.append("bytes")
+        case t: NamedType =>
+          for (part <- t.fqName) {
+            out.append('.')
+            out.append(part)
+          }
+      }
 
-    def opaqueNodes: PrimitiveType = this match {
-      case FamilyType(_) => Bytes
-      case other => other
-    }
+    def opaqueNodes: PrimitiveType =
+      this match {
+        case FamilyType(_) => Bytes
+        case other => other
+      }
   }
 
   case object Int extends PrimitiveType
@@ -54,7 +56,9 @@ object Proto {
   case object Bool extends PrimitiveType
   case object String extends PrimitiveType
   case object Bytes extends PrimitiveType
-  sealed trait NamedType extends PrimitiveType { def fqName: Seq[String] }
+  sealed trait NamedType extends PrimitiveType {
+    def fqName: Seq[String]
+  }
   case class StandardType(fqName: Seq[String]) extends NamedType
   case class AuxType(fqName: Seq[String]) extends NamedType
   case class FamilyType(fqName: Seq[String]) extends NamedType
@@ -66,25 +70,28 @@ object Proto {
   sealed trait Type {
     def t: PrimitiveType
 
-    def write(out: Appendable): Unit = this match {
-      case Option(t) => out.append("optional "); t.write(out)
-      case Repeated(t) => out.append("repeated "); t.write(out)
-      case Required(t) => out.append("required "); t.write(out)
-      case UnspecifiedArity(t) => t.write(out)
-    }
+    def write(out: Appendable): Unit =
+      this match {
+        case Option(t) => out.append("optional "); t.write(out)
+        case Repeated(t) => out.append("repeated "); t.write(out)
+        case Required(t) => out.append("required "); t.write(out)
+        case UnspecifiedArity(t) => t.write(out)
+      }
 
-    def writeOption(out: Appendable): Unit = this match {
-      case Repeated(Int) | Repeated(Long) | Repeated(Bool) =>
-        out.append(" [packed = true]")
-      case _ => // Do nothing
-    }
+    def writeOption(out: Appendable): Unit =
+      this match {
+        case Repeated(Int) | Repeated(Long) | Repeated(Bool) =>
+          out.append(" [packed = true]")
+        case _ => // Do nothing
+      }
 
-    def map(f: PrimitiveType => PrimitiveType): Type = this match {
-      case Option(t) => Option(f(t))
-      case Repeated(t) => Repeated(f(t))
-      case Required(t) => Required(f(t))
-      case UnspecifiedArity(t) => UnspecifiedArity(f(t))
-    }
+    def map(f: PrimitiveType => PrimitiveType): Type =
+      this match {
+        case Option(t) => Option(f(t))
+        case Repeated(t) => Repeated(f(t))
+        case Required(t) => Required(f(t))
+        case UnspecifiedArity(t) => UnspecifiedArity(f(t))
+      }
   }
 
   case class Option(t: PrimitiveType) extends Type
@@ -103,33 +110,30 @@ object Proto {
       out.append(";")
     }
 
-    def opaqueNodes: Field =
-      copy(t = t.map(_.opaqueNodes))
+    def opaqueNodes: Field = copy(t = t.map(_.opaqueNodes))
   }
 
   sealed trait MessageBody {
     def fields: Seq[Field]
 
     def namedTypes: Seq[NamedType] =
-      fields.collect {
-        case Field(_, _, Type(name: NamedType)) => name
-      }
+      fields.collect { case Field(_, _, Type(name: NamedType)) => name }
 
     private def writeFields(out: Appendable, indent: String): Unit =
-      for(field <- fields) {
+      for (field <- fields) {
         out.append(indent)
         field.write(out)
         out.append("\n")
       }
 
-    def write(out: Appendable): Unit = this match {
-      case MessageFields(_) =>
-        writeFields(out, "  ")
-      case MessageOneOf(oneOfName, _) =>
-        out.append("  oneof ").append(oneOfName).append(" {\n")
-        writeFields(out, "    ")
-        out.append("  }\n")
-    }
+    def write(out: Appendable): Unit =
+      this match {
+        case MessageFields(_) => writeFields(out, "  ")
+        case MessageOneOf(oneOfName, _) =>
+          out.append("  oneof ").append(oneOfName).append(" {\n")
+          writeFields(out, "    ")
+          out.append("  }\n")
+      }
 
     def opaqueNodes: MessageBody
   }
@@ -138,7 +142,8 @@ object Proto {
     def opaqueNodes: MessageFields = copy(fields = fields.map(_.opaqueNodes))
   }
 
-  case class MessageOneOf(oneOfName: String, fields: Seq[Field]) extends MessageBody {
+  case class MessageOneOf(oneOfName: String, fields: Seq[Field])
+      extends MessageBody {
     def opaqueNodes: MessageOneOf = copy(fields = fields.map(_.opaqueNodes))
   }
 
@@ -151,8 +156,7 @@ object Proto {
       out.append("}\n")
     }
 
-    def opaqueNodes: Message =
-      copy(body = body.opaqueNodes)
+    def opaqueNodes: Message = copy(body = body.opaqueNodes)
 
     def namedTypes: Seq[NamedType] = body.namedTypes
 
@@ -160,48 +164,63 @@ object Proto {
   }
 
   object Source {
-    def apply(imports: Seq[Seq[String]], options: String, message: Message): Source =
-      Source(imports, options, Seq(message))
+    def apply(
+        imports: Seq[Seq[String]],
+        options: String,
+        message: Message,
+    ): Source = Source(imports, options, Seq(message))
   }
 
-  case class Source(imports: Seq[Seq[String]], options: String, messages: Seq[Message]) {
+  case class Source(
+      imports: Seq[Seq[String]],
+      options: String,
+      messages: Seq[Message],
+  ) {
     require(messages.nonEmpty)
 
     def write(out: Appendable): Unit = {
       out.append("syntax = \"proto2\";\n")
       out.append("\n")
 
-      if(messages.exists(_.name.size > 1)) {
-        val pkg = messages.collectFirst { case msg if msg.name.size > 1 => msg.name.init }.get
-
-        val wrongPackageMessages = messages.filter(msg => msg.name.size != pkg.size + 1 || msg.name.init != pkg)
-        require(wrongPackageMessages.isEmpty,
-          out.append(s"Messages rendered jointly in one source must have the same package. Wrong: ${
-            wrongPackageMessages.map(_.name.mkString(".")).mkString("{", ", ", "}")}"))
+      if (messages.exists(_.name.size > 1)) {
+        val pkg =
+          messages.collectFirst {
+            case msg if msg.name.size > 1 => msg.name.init
+          }.get
+
+        val wrongPackageMessages = messages
+          .filter(msg => msg.name.size != pkg.size + 1 || msg.name.init != pkg)
+        require(
+          wrongPackageMessages.isEmpty,
+          out.append(
+            s"Messages rendered jointly in one source must have the same package. Wrong: ${wrongPackageMessages
+                .map(_.name.mkString(".")).mkString("{", ", ", "}")}"
+          ),
+        )
 
         out.append("package ").append(pkg.mkString(".")).append(";\n")
         out.append("\n")
       }
 
-      if(imports.nonEmpty) {
-        for(imp <- imports) {
-          out.append("import \"").append(imp.mkString("/")).append(".proto\";\n")
+      if (imports.nonEmpty) {
+        for (imp <- imports) {
+          out.append("import \"").append(imp.mkString("/"))
+            .append(".proto\";\n")
         }
         out.append("\n")
       }
 
-      if(!options.isBlank) {
+      if (!options.isBlank) {
         out.append(options)
         out.append("\n")
       }
 
-      for(message <- messages) {
+      for (message <- messages) {
         out.append("\n")
         message.write(out)
       }
     }
 
-    def opaqueNodes: Source =
-      copy(messages = messages.map(_.opaqueNodes))
+    def opaqueNodes: Source = copy(messages = messages.map(_.opaqueNodes))
   }
 }
diff --git a/src/helpers/vct/col/ast/helpers/defn/ProtoNaming.scala b/src/helpers/vct/col/ast/helpers/defn/ProtoNaming.scala
index dede529183..6d231d8830 100644
--- a/src/helpers/vct/col/ast/helpers/defn/ProtoNaming.scala
+++ b/src/helpers/vct/col/ast/helpers/defn/ProtoNaming.scala
@@ -12,7 +12,8 @@ object ProtoNaming {
 
   @tailrec
   def explodeCamel(name: String, acc: Seq[String] = Nil): Seq[String] = {
-    if (name.isEmpty) return acc
+    if (name.isEmpty)
+      return acc
 
     val (leftUpper, rem0) = name.span(_.isUpper)
 
@@ -22,7 +23,10 @@ object ProtoNaming {
       explodeCamel(rem1, acc :+ (leftUpper + leftLower).toLowerCase)
     } else {
       // ADTFunctionInvocation -> ADT +: explodeCamel("FunctionInvocation")
-      explodeCamel(s"${leftUpper.last}${rem0}", acc :+ leftUpper.init.toLowerCase)
+      explodeCamel(
+        s"${leftUpper.last}${rem0}",
+        acc :+ leftUpper.init.toLowerCase,
+      )
     }
   }
 
@@ -37,19 +41,18 @@ object ProtoNaming {
     val parts = explode(name)
     if (bannedParts.contains(parts))
       "vct" +: parts
-    else parts
+    else
+      parts
   }
 
-  def snake(name: String): String =
-    parts(name).mkString("_")
+  def snake(name: String): String = parts(name).mkString("_")
 
   def camel(name: String): String = {
     val ps = parts(name)
     (ps.head +: ps.tail.map(_.capitalize)).mkString("")
   }
 
-  def ucamel(name: String): String =
-    camel(name).capitalize
+  def ucamel(name: String): String = camel(name).capitalize
 
   def getTypeName(t: structure.Name): Seq[String] =
     t.parts.tail.init.map(snake) :+ ucamel(t.parts.last)
@@ -67,114 +70,155 @@ object ProtoNaming {
 
   case class TypeResult(t: Type, auxs: Seq[Message] = Nil)
 
-  def typeText(t: structure.Type): String = t match {
-    case structure.Type.Node(name) => name.tailName.parts.flatMap(parts).map(_.capitalize).mkString("")
-    case structure.Type.Declaration(name) => typeText(structure.Type.Node(name))
-    case structure.Type.DeclarationSeq(name) => typeText(structure.Type.Seq(structure.Type.Node(name)))
-    case structure.Type.Ref(node) => s"Ref_${typeText(node)}"
-    case structure.Type.MultiRef(node) => s"Ref_${typeText(node)}"
-    case structure.Type.Tuple(args) => s"Tuple${args.size}_${args.map(typeText).mkString("_")}"
-    case structure.Type.Option(arg) => s"Option_${typeText(arg)}"
-    case structure.Type.Seq(arg) => s"Seq_${typeText(arg)}"
-    case structure.Type.Either(left, right) => s"Either_${typeText(left)}_${typeText(right)}"
-    case other: structure.Type.PrimitiveType => other.getClass.getSimpleName.replace("$", "")
-  }
+  def typeText(t: structure.Type): String =
+    t match {
+      case structure.Type.Node(name) =>
+        name.tailName.parts.flatMap(parts).map(_.capitalize).mkString("")
+      case structure.Type.Declaration(name) =>
+        typeText(structure.Type.Node(name))
+      case structure.Type.DeclarationSeq(name) =>
+        typeText(structure.Type.Seq(structure.Type.Node(name)))
+      case structure.Type.Ref(node) => s"Ref_${typeText(node)}"
+      case structure.Type.MultiRef(node) => s"Ref_${typeText(node)}"
+      case structure.Type.Tuple(args) =>
+        s"Tuple${args.size}_${args.map(typeText).mkString("_")}"
+      case structure.Type.Option(arg) => s"Option_${typeText(arg)}"
+      case structure.Type.Seq(arg) => s"Seq_${typeText(arg)}"
+      case structure.Type.Either(left, right) =>
+        s"Either_${typeText(left)}_${typeText(right)}"
+      case other: structure.Type.PrimitiveType =>
+        other.getClass.getSimpleName.replace("$", "")
+    }
 
-  private val _getTupleAux = mutable.Map[Seq[structure.Type], PrimitiveTypeResult]()
+  private val _getTupleAux = mutable
+    .Map[Seq[structure.Type], PrimitiveTypeResult]()
 
   def getTupleAux(ts: Seq[structure.Type]): PrimitiveTypeResult =
-    _getTupleAux.getOrElseUpdate(ts, {
-      val fieldTypeResults = ts.map(getType)
-      val auxs = fieldTypeResults.flatMap(_.auxs)
-      val fieldTypes = fieldTypeResults.map(_.t)
-      val fields = MessageFields(fieldTypes.zipWithIndex.map {
-        case (t, i) => Field(s"v${i + 1}", i + 1, t)
-      })
-      val message = Message(auxBase :+ typeText(structure.Type.Tuple(ts)), fields)
-      PrimitiveTypeResult(AuxType(message.name), auxs :+ message)
-    })
+    _getTupleAux.getOrElseUpdate(
+      ts, {
+        val fieldTypeResults = ts.map(getType)
+        val auxs = fieldTypeResults.flatMap(_.auxs)
+        val fieldTypes = fieldTypeResults.map(_.t)
+        val fields = MessageFields(fieldTypes.zipWithIndex.map { case (t, i) =>
+          Field(s"v${i + 1}", i + 1, t)
+        })
+        val message = Message(
+          auxBase :+ typeText(structure.Type.Tuple(ts)),
+          fields,
+        )
+        PrimitiveTypeResult(AuxType(message.name), auxs :+ message)
+      },
+    )
 
   private val _getOptionAux = mutable.Map[structure.Type, PrimitiveTypeResult]()
 
   def getOptionAux(t: structure.Type): PrimitiveTypeResult =
-    _getOptionAux.getOrElseUpdate(t, {
-      val typeResult = getPrimitiveType(t)
-      val field = Field("value", 1, Option(typeResult.t))
-      val message = Message(auxBase :+ ("Option_" + typeText(t)), MessageFields(Seq(field)))
-      PrimitiveTypeResult(AuxType(message.name), typeResult.auxs :+ message)
-    })
+    _getOptionAux.getOrElseUpdate(
+      t, {
+        val typeResult = getPrimitiveType(t)
+        val field = Field("value", 1, Option(typeResult.t))
+        val message = Message(
+          auxBase :+ ("Option_" + typeText(t)),
+          MessageFields(Seq(field)),
+        )
+        PrimitiveTypeResult(AuxType(message.name), typeResult.auxs :+ message)
+      },
+    )
 
   private val _getSeqAux = mutable.Map[structure.Type, PrimitiveTypeResult]()
 
   def getSeqAux(t: structure.Type): PrimitiveTypeResult =
-    _getSeqAux.getOrElseUpdate(t, {
-      val typeResult = getPrimitiveType(t)
-      val field = Field("value", 1, Repeated(typeResult.t))
-      val message = Message(auxBase :+ ("Seq_" + typeText(t)), MessageFields(Seq(field)))
-      PrimitiveTypeResult(AuxType(message.name), typeResult.auxs :+ message)
-    })
-
-  private val _getEitherAux = mutable.Map[(structure.Type, structure.Type), PrimitiveTypeResult]()
-
-  def getEitherAux(left: structure.Type, right: structure.Type): PrimitiveTypeResult =
-    _getEitherAux.getOrElseUpdate((left, right), {
-      val leftTypeResult = getPrimitiveType(left)
-      val rightTypeResult = getPrimitiveType(right)
-      val leftField = Field("left", 1, Required(leftTypeResult.t))
-      val rightField = Field("right", 2, Required(rightTypeResult.t))
-      val fields = MessageOneOf("either", Seq(leftField, rightField))
-      val message = Message(auxBase :+ s"Either_${typeText(left)}_${typeText(right)}", fields)
-      PrimitiveTypeResult(
-        AuxType(message.name),
-        (leftTypeResult.auxs ++ rightTypeResult.auxs) :+ message,
-      )
-    })
+    _getSeqAux.getOrElseUpdate(
+      t, {
+        val typeResult = getPrimitiveType(t)
+        val field = Field("value", 1, Repeated(typeResult.t))
+        val message = Message(
+          auxBase :+ ("Seq_" + typeText(t)),
+          MessageFields(Seq(field)),
+        )
+        PrimitiveTypeResult(AuxType(message.name), typeResult.auxs :+ message)
+      },
+    )
+
+  private val _getEitherAux = mutable
+    .Map[(structure.Type, structure.Type), PrimitiveTypeResult]()
+
+  def getEitherAux(
+      left: structure.Type,
+      right: structure.Type,
+  ): PrimitiveTypeResult =
+    _getEitherAux.getOrElseUpdate(
+      (left, right), {
+        val leftTypeResult = getPrimitiveType(left)
+        val rightTypeResult = getPrimitiveType(right)
+        val leftField = Field("left", 1, Required(leftTypeResult.t))
+        val rightField = Field("right", 2, Required(rightTypeResult.t))
+        val fields = MessageOneOf("either", Seq(leftField, rightField))
+        val message = Message(
+          auxBase :+ s"Either_${typeText(left)}_${typeText(right)}",
+          fields,
+        )
+        PrimitiveTypeResult(
+          AuxType(message.name),
+          (leftTypeResult.auxs ++ rightTypeResult.auxs) :+ message,
+        )
+      },
+    )
 
   def getStandardType(name: String): PrimitiveTypeResult =
     PrimitiveTypeResult(StandardType(auxBase :+ name))
 
-  private val _getPrimitiveType = mutable.Map[structure.Type, PrimitiveTypeResult]()
+  private val _getPrimitiveType = mutable
+    .Map[structure.Type, PrimitiveTypeResult]()
 
   def getPrimitiveType(t: structure.Type): PrimitiveTypeResult =
-    _getPrimitiveType.getOrElseUpdate(t, {
-      t match {
-        case structure.Type.Node(name) =>
-          PrimitiveTypeResult(FamilyType(getTypeName(name)))
-        case structure.Type.Declaration(name) =>
-          PrimitiveTypeResult(FamilyType(getTypeName(name)))
-        case structure.Type.Ref(_) | structure.Type.MultiRef(_) => getStandardType("Ref")
-        case structure.Type.Tuple(args) => getTupleAux(args)
-
-        case structure.Type.Nothing => PrimitiveTypeResult(Bool)
-        case structure.Type.Unit => PrimitiveTypeResult(Bool)
-        case structure.Type.String => PrimitiveTypeResult(String)
-        case structure.Type.BigInt => getStandardType("BigInt")
-        case structure.Type.BigDecimal => getStandardType("BigDecimal")
-        case structure.Type.BitString => getStandardType("BitString")
-        case structure.Type.ExpectedError => getStandardType("ExpectedError")
-        case structure.Type.Boolean => PrimitiveTypeResult(Bool)
-        case structure.Type.Byte => PrimitiveTypeResult(Int)
-        case structure.Type.Short => PrimitiveTypeResult(Int)
-        case structure.Type.Int => PrimitiveTypeResult(Int)
-        case structure.Type.Long => PrimitiveTypeResult(Long)
-        case structure.Type.Float => PrimitiveTypeResult(Float)
-        case structure.Type.Double => PrimitiveTypeResult(Double)
-        case structure.Type.Char => PrimitiveTypeResult(Int)
-
-        case structure.Type.Seq(t) => getSeqAux(t)
-        case structure.Type.DeclarationSeq(name) => getSeqAux(structure.Type.Declaration(name))
-        case structure.Type.Option(t) => getOptionAux(t)
-        case structure.Type.Either(left, right) => getEitherAux(left, right)
-      }
-    })
+    _getPrimitiveType.getOrElseUpdate(
+      t, {
+        t match {
+          case structure.Type.Node(name) =>
+            PrimitiveTypeResult(FamilyType(getTypeName(name)))
+          case structure.Type.Declaration(name) =>
+            PrimitiveTypeResult(FamilyType(getTypeName(name)))
+          case structure.Type.Ref(_) | structure.Type.MultiRef(_) =>
+            getStandardType("Ref")
+          case structure.Type.Tuple(args) => getTupleAux(args)
+
+          case structure.Type.Nothing => PrimitiveTypeResult(Bool)
+          case structure.Type.Unit => PrimitiveTypeResult(Bool)
+          case structure.Type.String => PrimitiveTypeResult(String)
+          case structure.Type.BigInt => getStandardType("BigInt")
+          case structure.Type.BigDecimal => getStandardType("BigDecimal")
+          case structure.Type.BitString => getStandardType("BitString")
+          case structure.Type.ExpectedError => getStandardType("ExpectedError")
+          case structure.Type.Boolean => PrimitiveTypeResult(Bool)
+          case structure.Type.Byte => PrimitiveTypeResult(Int)
+          case structure.Type.Short => PrimitiveTypeResult(Int)
+          case structure.Type.Int => PrimitiveTypeResult(Int)
+          case structure.Type.Long => PrimitiveTypeResult(Long)
+          case structure.Type.Float => PrimitiveTypeResult(Float)
+          case structure.Type.Double => PrimitiveTypeResult(Double)
+          case structure.Type.Char => PrimitiveTypeResult(Int)
+
+          case structure.Type.Seq(t) => getSeqAux(t)
+          case structure.Type.DeclarationSeq(name) =>
+            getSeqAux(structure.Type.Declaration(name))
+          case structure.Type.Option(t) => getOptionAux(t)
+          case structure.Type.Either(left, right) => getEitherAux(left, right)
+        }
+      },
+    )
 
   private val _getType = mutable.Map[structure.Type, TypeResult]()
 
   def getType(t: structure.Type): TypeResult =
-    _getType.getOrElseUpdate(t, t match {
-      case structure.Type.Seq(t) => getPrimitiveType(t).result(Repeated)
-      case structure.Type.DeclarationSeq(name) => getPrimitiveType(structure.Type.Declaration(name)).result(Repeated)
-      case structure.Type.Option(t) => getPrimitiveType(t).result(Option)
-      case _ => getPrimitiveType(t).result(Required)
-    })
+    _getType.getOrElseUpdate(
+      t,
+      t match {
+        case structure.Type.Seq(t) => getPrimitiveType(t).result(Repeated)
+        case structure.Type.DeclarationSeq(name) =>
+          getPrimitiveType(structure.Type.Declaration(name)).result(Repeated)
+        case structure.Type.Option(t) => getPrimitiveType(t).result(Option)
+        case _ => getPrimitiveType(t).result(Required)
+      },
+    )
 }
diff --git a/src/helpers/vct/col/ast/helpers/defn/Simplify.scala b/src/helpers/vct/col/ast/helpers/defn/Simplify.scala
index 2c1ca19197..85f8af0fc8 100644
--- a/src/helpers/vct/col/ast/helpers/defn/Simplify.scala
+++ b/src/helpers/vct/col/ast/helpers/defn/Simplify.scala
@@ -9,84 +9,94 @@ import scala.meta._
 object Simplify {
   def simplify(t: Term): Term = simplifyFlatly(recurse(t))
 
-  private def recurse(term: Term): Term = term match {
-    // Exception: immediately push .to(LazyList) inwards, since we can further simplify the subterms.
-    case q"(if($cond) $whenTrue else $whenFalse).to(${`LazyListObj`})" =>
-      simplify(q"if($cond) $whenTrue.to($LazyListObj) else $whenFalse.to($LazyListObj)")
-
-    case q"if($cond) $whenTrue else $whenFalse" =>
-      q"if(${simplify(cond)}) ${simplify(whenTrue)} else ${simplify(whenFalse)}"
-    case q"$xs.flatMap($arg => $exp)" =>
-      q"${simplify(xs)}.flatMap($arg => ${simplify(exp)})"
-    case q"$zipped.flatMap({ case ($l, $r) => $exp })" =>
-      q"${simplify(zipped)}.flatMap({ case ($l, $r) => ${simplify(exp)} })"
-    case q"$xs.map($arg => $exp)" =>
-      q"${simplify(xs)}.map($arg => ${simplify(exp)})"
-    case q"$zipped.map({ case ($l, $r) => $exp })" =>
-      q"${simplify(zipped)}.map({ case ($l, $r) => ${simplify(exp)} })"
-    case q"$zipped.forall({ case($l, $r) => $exp })" =>
-      q"${simplify(zipped)}.forall({ case($l, $r) => ${simplify(exp)} })"
-    case q"$_.LazyList(..$terms)" => q"$LazyListObj(..${terms.map(simplify)})"
-    case q"$_.Seq(..$terms)" => q"$SeqObj(..${terms.map(simplify)})"
-    case q"$l #:: $r" => q"${simplify(l)} #:: ${simplify(r)}"
-    case q"$l #::: $r" => q"${simplify(l)} #::: ${simplify(r)}"
-    case q"$l ++ $r" => q"${simplify(l)} ++ ${simplify(r)}"
-    case q"$l && $r" => q"${simplify(l)} && ${simplify(r)}"
-    case q"$l || $r" => q"${simplify(l)} || ${simplify(r)}"
-    case q"$l == $r" => q"${simplify(l)} == ${simplify(r)}"
-    case q"$l.$r" => q"${simplify(l)}.$r"
-    case q"($l, $r)" => q"(${simplify(l)}, ${simplify(r)})"
-    case q"$inner.to($_.LazyList)" => q"${simplify(inner)}.to($LazyListObj)"
-    case q"$l.zip($r)" => q"${simplify(l)}.zip(${simplify(r)})"
-
-    case q"$_.Seq.empty[$_]" => term
-    case _: Term.Name | q"true" | q"false" | q"this" => term
-    case q"$_.compare($_)" => term
-    case q"$_.MatchingDeclaration(..$_)" => term
-    case q"$_.MatchingReference(..$_)" => term
-    case q"$_.StructuralDifference(..$_)" => term
-    case other =>
-      println(s"[warn] [ColHelper] Not recursing simplifier into unknown term $term")
-      other
-  }
+  private def recurse(term: Term): Term =
+    term match {
+      // Exception: immediately push .to(LazyList) inwards, since we can further simplify the subterms.
+      case q"(if($cond) $whenTrue else $whenFalse).to(${`LazyListObj`})" =>
+        simplify(
+          q"if($cond) $whenTrue.to($LazyListObj) else $whenFalse.to($LazyListObj)"
+        )
+
+      case q"if($cond) $whenTrue else $whenFalse" =>
+        q"if(${simplify(cond)}) ${simplify(whenTrue)} else ${simplify(whenFalse)}"
+      case q"$xs.flatMap($arg => $exp)" =>
+        q"${simplify(xs)}.flatMap($arg => ${simplify(exp)})"
+      case q"$zipped.flatMap({ case ($l, $r) => $exp })" =>
+        q"${simplify(zipped)}.flatMap({ case ($l, $r) => ${simplify(exp)} })"
+      case q"$xs.map($arg => $exp)" =>
+        q"${simplify(xs)}.map($arg => ${simplify(exp)})"
+      case q"$zipped.map({ case ($l, $r) => $exp })" =>
+        q"${simplify(zipped)}.map({ case ($l, $r) => ${simplify(exp)} })"
+      case q"$zipped.forall({ case($l, $r) => $exp })" =>
+        q"${simplify(zipped)}.forall({ case($l, $r) => ${simplify(exp)} })"
+      case q"$_.LazyList(..$terms)" => q"$LazyListObj(..${terms.map(simplify)})"
+      case q"$_.Seq(..$terms)" => q"$SeqObj(..${terms.map(simplify)})"
+      case q"$l #:: $r" => q"${simplify(l)} #:: ${simplify(r)}"
+      case q"$l #::: $r" => q"${simplify(l)} #::: ${simplify(r)}"
+      case q"$l ++ $r" => q"${simplify(l)} ++ ${simplify(r)}"
+      case q"$l && $r" => q"${simplify(l)} && ${simplify(r)}"
+      case q"$l || $r" => q"${simplify(l)} || ${simplify(r)}"
+      case q"$l == $r" => q"${simplify(l)} == ${simplify(r)}"
+      case q"$l.$r" => q"${simplify(l)}.$r"
+      case q"($l, $r)" => q"(${simplify(l)}, ${simplify(r)})"
+      case q"$inner.to($_.LazyList)" => q"${simplify(inner)}.to($LazyListObj)"
+      case q"$l.zip($r)" => q"${simplify(l)}.zip(${simplify(r)})"
+
+      case q"$_.Seq.empty[$_]" => term
+      case _: Term.Name | q"true" | q"false" | q"this" => term
+      case q"$_.compare($_)" => term
+      case q"$_.MatchingDeclaration(..$_)" => term
+      case q"$_.MatchingReference(..$_)" => term
+      case q"$_.StructuralDifference(..$_)" => term
+      case other =>
+        println(
+          s"[warn] [ColHelper] Not recursing simplifier into unknown term $term"
+        )
+        other
+    }
 
   @tailrec
-  private def simplifyFlatly(term: Term): Term = simplifyFlatly(term match {
-    case q"true && $bool" => bool
-    case q"$bool && true" => bool
-    case q"false && $bool" => q"false"
-    case q"$bool && false" => q"false"
-
-    case q"true || $bool" => q"true"
-    case q"$bool || true" => q"true"
-    case q"false || $bool" => bool
-    case q"$bool || false" => bool
-
-    case q"$_.LazyList() #::: $xs" => xs
-    case q"$xs #::: $_.LazyList()" => xs
-    case q"$_.Seq.empty[$_] ++ $xs" => xs
-    case q"$xs ++ $_.Seq.empty[$_]" => xs
-
-    case q"if(true) $whenTrue else $_" => whenTrue
-    case q"if(false) $_ else $whenFalse" => whenFalse
-
-    case q"$_.flatMap({ case ($l, $r) => $_.LazyList() })" => q"$LazyListObj()"
-    case q"$_.flatMap($_ => $_.Seq.empty[$t])" => q"$SeqObj.empty[$t]"
-    case q"$xs.flatMap($arg => $_.Seq($y))" => q"$xs.map($arg => $y)"
-    case q"$_.forall({ case ($l, $r) => true })" => q"true"
-
-    case q"if($cond) $whenTrue else $whenFalse" if whenTrue.getClass == whenFalse.getClass && whenTrue.show[Structure] == whenFalse.show[Structure] =>
-      whenTrue
-
-    case q"$xs.map(${Term.Param(_, Term.Name(x), _, _)} => ${Term.Name(y)})" if x == y =>
-      xs
-
-    case q"($a #::: $b) #::: $c" => q"$a #::: $b #::: $c"
-    case q"$a ++ ($b ++ $c)" => q"$a ++ $b ++ $c"
-
-    case q"$_.LazyList($x) #::: $xs" => q"$x #:: $xs"
-    case q"$_.Seq($x) ++ $xs" => q"$x +: $xs"
-
-    case other => return other
-  })
+  private def simplifyFlatly(term: Term): Term =
+    simplifyFlatly(term match {
+      case q"true && $bool" => bool
+      case q"$bool && true" => bool
+      case q"false && $bool" => q"false"
+      case q"$bool && false" => q"false"
+
+      case q"true || $bool" => q"true"
+      case q"$bool || true" => q"true"
+      case q"false || $bool" => bool
+      case q"$bool || false" => bool
+
+      case q"$_.LazyList() #::: $xs" => xs
+      case q"$xs #::: $_.LazyList()" => xs
+      case q"$_.Seq.empty[$_] ++ $xs" => xs
+      case q"$xs ++ $_.Seq.empty[$_]" => xs
+
+      case q"if(true) $whenTrue else $_" => whenTrue
+      case q"if(false) $_ else $whenFalse" => whenFalse
+
+      case q"$_.flatMap({ case ($l, $r) => $_.LazyList() })" =>
+        q"$LazyListObj()"
+      case q"$_.flatMap($_ => $_.Seq.empty[$t])" => q"$SeqObj.empty[$t]"
+      case q"$xs.flatMap($arg => $_.Seq($y))" => q"$xs.map($arg => $y)"
+      case q"$_.forall({ case ($l, $r) => true })" => q"true"
+
+      case q"if($cond) $whenTrue else $whenFalse"
+          if whenTrue.getClass == whenFalse.getClass &&
+            whenTrue.show[Structure] == whenFalse.show[Structure] =>
+        whenTrue
+
+      case q"$xs.map(${Term.Param(_, Term.Name(x), _, _)} => ${Term.Name(y)})"
+          if x == y =>
+        xs
+
+      case q"($a #::: $b) #::: $c" => q"$a #::: $b #::: $c"
+      case q"$a ++ ($b ++ $c)" => q"$a ++ $b ++ $c"
+
+      case q"$_.LazyList($x) #::: $xs" => q"$x #:: $xs"
+      case q"$_.Seq($x) ++ $xs" => q"$x +: $xs"
+
+      case other => return other
+    })
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/AbstractRewriter.scala b/src/helpers/vct/col/ast/helpers/generator/AbstractRewriter.scala
index d3daaa3dd1..9e80121191 100644
--- a/src/helpers/vct/col/ast/helpers/generator/AbstractRewriter.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/AbstractRewriter.scala
@@ -9,11 +9,21 @@ import java.nio.file.Path
 import scala.meta._
 
 class AbstractRewriter extends AllFamiliesGenerator {
-  override def generate(out: Path, declaredFamilies: Seq[structure.Name], structuralFamilies: Seq[structure.Name]): Unit =
-    ResultStream.write(out.resolve("AbstractRewriter.scala"), getArw(declaredFamilies, structuralFamilies))
+  override def generate(
+      out: Path,
+      declaredFamilies: Seq[structure.Name],
+      structuralFamilies: Seq[structure.Name],
+  ): Unit =
+    ResultStream.write(
+      out.resolve("AbstractRewriter.scala"),
+      getArw(declaredFamilies, structuralFamilies),
+    )
 
   // TODO: anySucc should probably use the succProvider - how?
-  def getArw(declaredFamilies: Seq[structure.Name], structuralFamilies: Seq[structure.Name]): Source =
+  def getArw(
+      declaredFamilies: Seq[structure.Name],
+      structuralFamilies: Seq[structure.Name],
+  ): Source =
     source"""
       package vct.col.ast
 
diff --git a/src/helpers/vct/col/ast/helpers/generator/AllFrozenScopes.scala b/src/helpers/vct/col/ast/helpers/generator/AllFrozenScopes.scala
index c685c7807f..cc87d17d19 100644
--- a/src/helpers/vct/col/ast/helpers/generator/AllFrozenScopes.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/AllFrozenScopes.scala
@@ -9,8 +9,15 @@ import java.nio.file.Path
 import scala.meta._
 
 class AllFrozenScopes extends AllFamiliesGenerator {
-  override def generate(out: Path,  declaredFamilies: Seq[structure.Name], structuralFamilies: Seq[structure.Name]): Unit =
-    ResultStream.write(out.resolve("AllFrozenScopes.scala"), allFrozenScopes(declaredFamilies))
+  override def generate(
+      out: Path,
+      declaredFamilies: Seq[structure.Name],
+      structuralFamilies: Seq[structure.Name],
+  ): Unit =
+    ResultStream.write(
+      out.resolve("AllFrozenScopes.scala"),
+      allFrozenScopes(declaredFamilies),
+    )
 
   def allFrozenScopes(declaredFamilies: Seq[structure.Name]): Source =
     source"""
@@ -19,7 +26,9 @@ class AllFrozenScopes extends AllFamiliesGenerator {
       class AllFrozenScopes[Pre, Post](`~scopes`: $AllScopes[Pre, Post]) extends ${Init(t"$SuccessorsProvider[Pre, Post]", Name.Anonymous(), List.empty)} {
         override def equals(`~obj`: $Any): $Boolean = `~obj` match {
           case other: $AllFrozenScopes[_, _] =>
-            ${declaredFamilies.map(name => q"this.${scopes(name.base)} == other.${scopes(name.base)}").reduce[Term] { case (l, r) => q"$l && $r" } }
+            ${declaredFamilies
+        .map(name => q"this.${scopes(name.base)} == other.${scopes(name.base)}")
+        .reduce[Term] { case (l, r) => q"$l && $r" }}
           case _ => false
         }
 
diff --git a/src/helpers/vct/col/ast/helpers/generator/AllScopes.scala b/src/helpers/vct/col/ast/helpers/generator/AllScopes.scala
index 904330915f..e3a5b85b90 100644
--- a/src/helpers/vct/col/ast/helpers/generator/AllScopes.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/AllScopes.scala
@@ -9,8 +9,13 @@ import java.nio.file.Path
 import scala.meta._
 
 class AllScopes extends AllFamiliesGenerator {
-  override def generate(out: Path, declaredFamilies: Seq[structure.Name], structuralFamilies: Seq[structure.Name]): Unit =
-    ResultStream.write(out.resolve("AllScopes.scala"), allScopes(declaredFamilies))
+  override def generate(
+      out: Path,
+      declaredFamilies: Seq[structure.Name],
+      structuralFamilies: Seq[structure.Name],
+  ): Unit =
+    ResultStream
+      .write(out.resolve("AllScopes.scala"), allScopes(declaredFamilies))
 
   def allScopes(declaredFamilies: Seq[structure.Name]): Source =
     source"""
@@ -20,14 +25,15 @@ class AllScopes extends AllFamiliesGenerator {
         def freeze: $AllFrozenScopes[Pre, Post] = new $AllFrozenScopes(this)
 
         def anyDeclare[T <: $Declaration[Post]](`~decl`: T): T =
-          ${Term.Match(q"`~decl`", declaredFamilies.map(name =>
-            Case(p"decl: ${typ(name)}[Post]", None, q"${scopes(name.base)}.declare(decl); `~decl`")
-          ).toList)}
+          ${Term.Match(q"`~decl`", declaredFamilies.map(name => Case(p"decl: ${typ(name)}[Post]", None, q"${scopes(name.base)}.declare(decl); `~decl`")).toList)}
 
         def anySucceedOnly[T <: $Declaration[Post]](`~pre`: $Declaration[Pre], `~post`: T)(implicit tag: $ClassTag[T]): T =
-          ${Term.Match(q"(`~pre`, `~post`)", declaredFamilies.map(name =>
-            Case(p"(pre: ${typ(name)}[Pre], post: ${typ(name)}[Post])", None, q"${scopes(name.base)}.succeedOnly(pre, post); `~post`")
-          ).toList :+ Case(p"(pre, post)", None, q"throw $InconsistentSuccessionTypesObj(pre, post)"))}
+          ${Term.Match(
+        q"(`~pre`, `~post`)",
+        declaredFamilies.map(name =>
+          Case(p"(pre: ${typ(name)}[Pre], post: ${typ(name)}[Post])", None, q"${scopes(name.base)}.succeedOnly(pre, post); `~post`")
+        ).toList :+ Case(p"(pre, post)", None, q"throw $InconsistentSuccessionTypesObj(pre, post)"),
+      )}
 
         def anySucceed[T <: $Declaration[Post]](`~pre`: $Declaration[Pre], `~post`: T)(implicit tag: $ClassTag[T]): T = {
           anyDeclare(`~post`)
@@ -44,4 +50,4 @@ class AllScopes extends AllFamiliesGenerator {
         """).toList}
       }
     """
-}
\ No newline at end of file
+}
diff --git a/src/helpers/vct/col/ast/helpers/generator/BaseCoercingRewriter.scala b/src/helpers/vct/col/ast/helpers/generator/BaseCoercingRewriter.scala
index 3a05a6db70..045c517e98 100644
--- a/src/helpers/vct/col/ast/helpers/generator/BaseCoercingRewriter.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/BaseCoercingRewriter.scala
@@ -1,6 +1,13 @@
 package vct.col.ast.helpers.generator
 
-import vct.col.ast.helpers.defn.Constants.{AbstractRewriter, ApplyCoercionPat, Coercion, Expr, ExprName, Origin}
+import vct.col.ast.helpers.defn.Constants.{
+  AbstractRewriter,
+  ApplyCoercionPat,
+  Coercion,
+  Expr,
+  ExprName,
+  Origin,
+}
 import vct.col.ast.helpers.defn.Naming.typ
 import vct.col.ast.structure
 import vct.col.ast.structure.AllFamiliesGenerator
@@ -9,8 +16,13 @@ import java.nio.file.Path
 import scala.meta._
 
 class BaseCoercingRewriter extends AllFamiliesGenerator {
-  override def generate(out: Path, declaredFamilies: Seq[structure.Name], structuralFamilies: Seq[structure.Name]): Unit =
-    ResultStream.write(out.resolve("BaseCoercingRewriter.scala"), crw(structuralFamilies))
+  override def generate(
+      out: Path,
+      declaredFamilies: Seq[structure.Name],
+      structuralFamilies: Seq[structure.Name],
+  ): Unit =
+    ResultStream
+      .write(out.resolve("BaseCoercingRewriter.scala"), crw(structuralFamilies))
 
   def crw(families: Seq[structure.Name]): Source =
     source"""
@@ -27,8 +39,10 @@ class BaseCoercingRewriter extends AllFamiliesGenerator {
     """
 
   def dispatch(family: structure.Name): Defn.Def =
-    if(family == ExprName) dispatchExpr
-    else dispatchNonExpr(family)
+    if (family == ExprName)
+      dispatchExpr
+    else
+      dispatchNonExpr(family)
 
   def dispatchExpr: Defn.Def =
     q"""
diff --git a/src/helpers/vct/col/ast/helpers/generator/BaseNonLatchingRewriter.scala b/src/helpers/vct/col/ast/helpers/generator/BaseNonLatchingRewriter.scala
index 99d25b8a94..3ee6b5721c 100644
--- a/src/helpers/vct/col/ast/helpers/generator/BaseNonLatchingRewriter.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/BaseNonLatchingRewriter.scala
@@ -9,10 +9,20 @@ import java.nio.file.Path
 import scala.meta._
 
 class BaseNonLatchingRewriter extends AllFamiliesGenerator {
-  override def generate(out: Path, declaredFamilies: Seq[structure.Name], structuralFamilies: Seq[structure.Name]): Unit =
-    ResultStream.write(out.resolve("BaseNonLatchingRewriter.scala"), rw(declaredFamilies, structuralFamilies))
+  override def generate(
+      out: Path,
+      declaredFamilies: Seq[structure.Name],
+      structuralFamilies: Seq[structure.Name],
+  ): Unit =
+    ResultStream.write(
+      out.resolve("BaseNonLatchingRewriter.scala"),
+      rw(declaredFamilies, structuralFamilies),
+    )
 
-  def rw(declaredFamilies: Seq[structure.Name], structuralFamilies: Seq[structure.Name]): Source =
+  def rw(
+      declaredFamilies: Seq[structure.Name],
+      structuralFamilies: Seq[structure.Name],
+  ): Source =
     source"""
       package vct.col.ast.rewrite
 
diff --git a/src/helpers/vct/col/ast/helpers/generator/Compare.scala b/src/helpers/vct/col/ast/helpers/generator/Compare.scala
index 5b177d54b9..4928efb198 100644
--- a/src/helpers/vct/col/ast/helpers/generator/Compare.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/Compare.scala
@@ -1,6 +1,15 @@
 package vct.col.ast.helpers.generator
 
-import vct.col.ast.helpers.defn.Constants.{ComparePackage, CompareResult, LazyList, LazyListObj, MatchingDeclarationObj, MatchingReferenceObj, Node, StructuralDifferenceObj}
+import vct.col.ast.helpers.defn.Constants.{
+  ComparePackage,
+  CompareResult,
+  LazyList,
+  LazyListObj,
+  MatchingDeclarationObj,
+  MatchingReferenceObj,
+  Node,
+  StructuralDifferenceObj,
+}
 import vct.col.ast.helpers.defn.Naming.{compareTrait, typ}
 import vct.col.ast.helpers.defn.Simplify.simplify
 import vct.col.ast.structure
@@ -13,7 +22,8 @@ import scala.util.Using
 
 class Compare extends NodeGenerator {
   override def generate(out: Path, node: NodeDefinition): Unit =
-    ResultStream.write(out.resolve(s"${node.name.base}Compare.scala"), getTree(node))
+    ResultStream
+      .write(out.resolve(s"${node.name.base}Compare.scala"), getTree(node))
 
   def getTree(node: NodeDefinition): Source = {
     source"""
@@ -35,33 +45,30 @@ class Compare extends NodeGenerator {
     val refs = compareRefs(left, right, node)
     val subnodes = compareSubnodes(left, right, node)
 
-    simplify(
-      q"""
-        if($valuesEqual) ${
-          if(node.kind == DeclaredNode) q"$MatchingDeclarationObj($left, $right) #:: $refs #::: $subnodes"
-          else q"$refs #::: $subnodes"
-        } else $LazyListObj($StructuralDifferenceObj($left, $right))
-      """
-    )
+    simplify(q"""
+        if($valuesEqual) ${if (node.kind == DeclaredNode)
+        q"$MatchingDeclarationObj($left, $right) #:: $refs #::: $subnodes"
+      else
+        q"$refs #::: $subnodes"} else $LazyListObj($StructuralDifferenceObj($left, $right))
+      """)
   }
 
   def compareValues(left: Term, right: Term, node: NodeDefinition): Term =
-    node.fields.map {
-      case (fieldName, t) =>
-        val field = Term.Name(fieldName)
-        compareValues(q"$left.$field", q"$right.$field", t)
+    node.fields.map { case (fieldName, t) =>
+      val field = Term.Name(fieldName)
+      compareValues(q"$left.$field", q"$right.$field", t)
     }.reduceOption((l, r) => q"$l && $r").getOrElse(q"true")
 
   def compareValues(left: Term, right: Term, t: structure.Type): Term =
     t match {
-      case structure.Type.Node(_) |
-           structure.Type.Declaration(_) => q"true"
+      case structure.Type.Node(_) | structure.Type.Declaration(_) => q"true"
 
       case structure.Type.Ref(_) | structure.Type.MultiRef(_) => q"true"
 
       case _: structure.Type.PrimitiveType => q"$left == $right"
 
-      case structure.Type.Option(t) => q"$left.isEmpty == $right.isEmpty && ($left.isEmpty || ${compareValues(q"$left.get", q"$right.get", t)})"
+      case structure.Type.Option(t) =>
+        q"$left.isEmpty == $right.isEmpty && ($left.isEmpty || ${compareValues(q"$left.get", q"$right.get", t)})"
 
       case structure.Type.Either(l, r) =>
         q"""
@@ -73,62 +80,76 @@ class Compare extends NodeGenerator {
         """
 
       case structure.Type.Tuple(ts) =>
-        ts.zipWithIndex.map {
-          case (t, i) =>
-            val field = Term.Name(s"_${i+1}")
-            compareValues(q"$left.$field", q"$right.$field", t)
+        ts.zipWithIndex.map { case (t, i) =>
+          val field = Term.Name(s"_${i + 1}")
+          compareValues(q"$left.$field", q"$right.$field", t)
         }.reduce((l, r) => q"$l && $r")
 
-      case structure.Type.Seq(t) => q"$left.size == $right.size && $left.zip($right).forall { case (l0, r0) => ${compareValues(q"l0", q"r0", t)} }"
+      case structure.Type.Seq(t) =>
+        q"$left.size == $right.size && $left.zip($right).forall { case (l0, r0) => ${compareValues(q"l0", q"r0", t)} }"
       case structure.Type.DeclarationSeq(_) => q"$left.size == $right.size"
     }
 
   def compareRefs(left: Term, right: Term, node: NodeDefinition): Term =
-    node.fields.foldRight[Term](q"$LazyListObj()") {
-      case ((field, t), acc) =>
-        val fieldValues = compareRefs(q"$left.${Term.Name(field)}", q"$right.${Term.Name(field)}", t)
-        q"$fieldValues #::: $acc"
+    node.fields.foldRight[Term](q"$LazyListObj()") { case ((field, t), acc) =>
+      val fieldValues = compareRefs(
+        q"$left.${Term.Name(field)}",
+        q"$right.${Term.Name(field)}",
+        t,
+      )
+      q"$fieldValues #::: $acc"
     }
 
   def compareRefs(left: Term, right: Term, t: structure.Type): Term =
     t match {
-      case structure.Type.Node(_) | structure.Type.Declaration(_) | structure.Type.DeclarationSeq(_) => q"$LazyListObj()"
-      case structure.Type.Ref(_) | structure.Type.MultiRef(_) => q"$LazyListObj($MatchingReferenceObj($left.decl, $right.decl))"
+      case structure.Type.Node(_) | structure.Type.Declaration(_) | structure
+            .Type.DeclarationSeq(_) =>
+        q"$LazyListObj()"
+      case structure.Type.Ref(_) | structure.Type.MultiRef(_) =>
+        q"$LazyListObj($MatchingReferenceObj($left.decl, $right.decl))"
       case _: structure.Type.PrimitiveType => q"$LazyListObj()"
-      case structure.Type.Option(t) => q"if($left.isDefined) ${compareRefs(q"$left.get", q"$right.get", t)} else $LazyListObj()"
+      case structure.Type.Option(t) =>
+        q"if($left.isDefined) ${compareRefs(q"$left.get", q"$right.get", t)} else $LazyListObj()"
       case structure.Type.Either(l, r) =>
         q"if($left.isLeft) ${compareRefs(q"$left.left", q"$right.left", l)} else ${compareRefs(q"$left.right", q"$right.right", r)}"
       case structure.Type.Tuple(ts) =>
-        ts.zipWithIndex.map {
-          case (t, i) =>
-            val field = Term.Name(s"_${i+1}")
-            compareRefs(q"$left.$field", q"$right.$field", t)
+        ts.zipWithIndex.map { case (t, i) =>
+          val field = Term.Name(s"_${i + 1}")
+          compareRefs(q"$left.$field", q"$right.$field", t)
         }.reduce((l, r) => q"$l #::: $r")
-      case structure.Type.Seq(t) => q"$left.zip($right).to($LazyListObj).flatMap { case (l0, r0) => ${compareRefs(q"l0", q"r0", t)} }"
+      case structure.Type.Seq(t) =>
+        q"$left.zip($right).to($LazyListObj).flatMap { case (l0, r0) => ${compareRefs(q"l0", q"r0", t)} }"
     }
 
   def compareSubnodes(left: Term, right: Term, node: NodeDefinition): Term =
-    node.fields.foldRight[Term](q"$LazyListObj()") {
-      case ((field, t), acc) =>
-        val fieldValues = compareSubnodes(q"$left.${Term.Name(field)}", q"$right.${Term.Name(field)}", t)
-        q"$fieldValues #::: $acc"
+    node.fields.foldRight[Term](q"$LazyListObj()") { case ((field, t), acc) =>
+      val fieldValues = compareSubnodes(
+        q"$left.${Term.Name(field)}",
+        q"$right.${Term.Name(field)}",
+        t,
+      )
+      q"$fieldValues #::: $acc"
     }
 
   def compareSubnodes(left: Term, right: Term, t: structure.Type): Term =
     t match {
-      case structure.Type.Node(_) | structure.Type.Declaration(_) => q"$left.compare($right)"
-      case structure.Type.Ref(_) | structure.Type.MultiRef(_) => q"$LazyListObj()"
+      case structure.Type.Node(_) | structure.Type.Declaration(_) =>
+        q"$left.compare($right)"
+      case structure.Type.Ref(_) | structure.Type.MultiRef(_) =>
+        q"$LazyListObj()"
       case _: structure.Type.PrimitiveType => q"$LazyListObj()"
-      case structure.Type.Option(t) => q"if($left.isDefined) ${compareSubnodes(q"$left.get", q"$right.get", t)} else $LazyListObj()"
+      case structure.Type.Option(t) =>
+        q"if($left.isDefined) ${compareSubnodes(q"$left.get", q"$right.get", t)} else $LazyListObj()"
       case structure.Type.Either(l, r) =>
         q"if($left.isLeft) ${compareSubnodes(q"$left.left", q"$right.left", l)} else ${compareSubnodes(q"$left.right", q"$right.right", r)}"
       case structure.Type.Tuple(ts) =>
-        ts.zipWithIndex.map {
-          case (t, i) =>
-            val field = Term.Name(s"_${i+1}")
-            compareSubnodes(q"$left.$field", q"$right.$field", t)
+        ts.zipWithIndex.map { case (t, i) =>
+          val field = Term.Name(s"_${i + 1}")
+          compareSubnodes(q"$left.$field", q"$right.$field", t)
         }.reduce((l, r) => q"$l #::: $r")
-      case structure.Type.Seq(t) => q"$left.zip($right).to($LazyListObj).flatMap { case (l0, r0) => ${compareSubnodes(q"l0", q"r0", t)} }"
-      case structure.Type.DeclarationSeq(t) => q"$left.zip($right).to($LazyListObj).flatMap { case (l0, r0) => l0.compare(r0) }"
+      case structure.Type.Seq(t) =>
+        q"$left.zip($right).to($LazyListObj).flatMap { case (l0, r0) => ${compareSubnodes(q"l0", q"r0", t)} }"
+      case structure.Type.DeclarationSeq(t) =>
+        q"$left.zip($right).to($LazyListObj).flatMap { case (l0, r0) => l0.compare(r0) }"
     }
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/DeclareFamily.scala b/src/helpers/vct/col/ast/helpers/generator/DeclareFamily.scala
index 3ff210c43d..9e9397d316 100644
--- a/src/helpers/vct/col/ast/helpers/generator/DeclareFamily.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/DeclareFamily.scala
@@ -9,9 +9,17 @@ import java.nio.file.Path
 import scala.meta._
 
 class DeclareFamily extends FamilyGenerator {
-  override def generate(out: Path, family: structure.Name, kind: NodeKind, nodes: Seq[structure.Name]): Unit =
-    if(kind == DeclaredNode) {
-      ResultStream.write(out.resolve(s"${family.base}FamilyDeclare.scala"), getDeclare(family))
+  override def generate(
+      out: Path,
+      family: structure.Name,
+      kind: NodeKind,
+      nodes: Seq[structure.Name],
+  ): Unit =
+    if (kind == DeclaredNode) {
+      ResultStream.write(
+        out.resolve(s"${family.base}FamilyDeclare.scala"),
+        getDeclare(family),
+      )
     }
 
   def getDeclare(name: structure.Name): Source =
diff --git a/src/helpers/vct/col/ast/helpers/generator/Deserialize.scala b/src/helpers/vct/col/ast/helpers/generator/Deserialize.scala
index 96413ec22a..e74528ce42 100644
--- a/src/helpers/vct/col/ast/helpers/generator/Deserialize.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/Deserialize.scala
@@ -3,14 +3,23 @@ package vct.col.ast.helpers.generator
 import vct.col.ast.helpers.defn.Constants._
 import vct.col.ast.helpers.defn.Naming._
 import vct.col.ast.helpers.defn.{Proto, ProtoNaming}
-import vct.col.ast.structure.{DeclaredNode, NodeDefinition, NodeGenerator, NodeKind, Type => ST}
+import vct.col.ast.structure.{
+  DeclaredNode,
+  NodeDefinition,
+  NodeGenerator,
+  NodeKind,
+  Type => ST,
+}
 
 import java.nio.file.Path
 import scala.meta._
 
 class Deserialize extends NodeGenerator {
   override def generate(out: Path, node: NodeDefinition): Unit =
-    ResultStream.write(out.resolve("Deserialize" + node.name.base + ".scala"), deserialize(node))
+    ResultStream.write(
+      out.resolve("Deserialize" + node.name.base + ".scala"),
+      deserialize(node),
+    )
 
   def deserialize(node: NodeDefinition): Source =
     source"""
@@ -23,16 +32,16 @@ class Deserialize extends NodeGenerator {
     """
 
   def deserializeNode(term: Term, node: NodeDefinition): Term = {
-    val fields = node.fields.map {
-      case (name, structuralType) =>
+    val fields =
+      node.fields.map { case (name, structuralType) =>
         val scalapbName = ProtoNaming.camel(ProtoNaming.snake(name))
         val fieldTerm = q"$term.${Term.Name(scalapbName)}"
         val protoType = ProtoNaming.getType(structuralType).t
         deserializeTerm(fieldTerm, protoType, structuralType)
-    }.toList
+      }.toList
 
     val instance =
-      if(node.blameType.isEmpty)
+      if (node.blameType.isEmpty)
         q"new ${t"${typ(node)}[G]"}(..$fields)($SerializeOrigin.deserialize($term.origin))"
       else
         q"""
@@ -42,7 +51,7 @@ class Deserialize extends NodeGenerator {
           }
         """
 
-    if(node.kind == DeclaredNode)
+    if (node.kind == DeclaredNode)
       q"{ val res = $instance; decls($term.id) = res; res }"
     else
       instance
@@ -55,24 +64,29 @@ class Deserialize extends NodeGenerator {
     throw new IllegalArgumentException()
   }
 
-  def deserializeTerm(term: Term, protoType: Proto.Type, structuralType: ST): Term =
+  def deserializeTerm(
+      term: Term,
+      protoType: Proto.Type,
+      structuralType: ST,
+  ): Term =
     (protoType, structuralType) match {
-      case (Proto.Required(pt), st) =>
-        deserializeTerm(term, pt, st)
+      case (Proto.Required(pt), st) => deserializeTerm(term, pt, st)
       case (Proto.Option(pt), ST.Option(st)) =>
         q"$term.map(`~x` => ${deserializeTerm(q"`~x`", pt, st)})"
       case (Proto.Repeated(pt), ST.Seq(st)) =>
         q"$term.map(`~x` => ${deserializeTerm(q"`~x`", pt, st)})"
       case (Proto.Repeated(_), ST.DeclarationSeq(name)) =>
         q"$term.map(`~x` => ${deserializeFamilyObject(name)}.deserialize[G](`~x`.parseAs[${scalapbType(name)}], decls))"
-      case (pt, st) =>
-        err(pt, st)
+      case (pt, st) => err(pt, st)
     }
 
-  def deserializeTerm(term: Term, protoType: Proto.PrimitiveType, structuralType: ST): Term =
+  def deserializeTerm(
+      term: Term,
+      protoType: Proto.PrimitiveType,
+      structuralType: ST,
+  ): Term =
     (protoType, structuralType) match {
-      case (_, ST.Seq(ST.ExpectedError)) =>
-        q"$SeqObj.empty"
+      case (_, ST.Seq(ST.ExpectedError)) => q"$SeqObj.empty"
 
       case (Proto.FamilyType(_), ST.Node(name)) =>
         q"${deserializeFamilyObject(name)}.deserialize[G]($term.parseAs[${scalapbType(name)}], decls)"
@@ -83,16 +97,9 @@ class Deserialize extends NodeGenerator {
       case (Proto.StandardType(_), ST.MultiRef(node)) =>
         q"new ${Init(t"$LazyRef[G, ${typ(node.name)}[G]]", Name.Anonymous(), List(List(q"decls($term.id)")))}"
       case (Proto.AuxType(_), ST.Tuple(args)) =>
-        q"(..${
-          args.zipWithIndex.map {
-            case (structuralType, index) =>
-              deserializeTerm(
-                q"$term.${Term.Name(s"v${index + 1}")}",
-                ProtoNaming.getType(structuralType).t,
-                structuralType
-              )
-          }.toList
-        })"
+        q"(..${args.zipWithIndex.map { case (structuralType, index) =>
+            deserializeTerm(q"$term.${Term.Name(s"v${index + 1}")}", ProtoNaming.getType(structuralType).t, structuralType)
+          }.toList})"
       case (Proto.AuxType(_), ST.Seq(structuralType)) =>
         q"$term.value.map(`~x` => ${deserializeTerm(q"`~x`", ProtoNaming.getType(structuralType).t, structuralType)})"
       case (Proto.AuxType(_), ST.DeclarationSeq(name)) =>
@@ -104,38 +111,25 @@ class Deserialize extends NodeGenerator {
           if($term.either.isLeft) ${deserializeTerm(q"$term.left.get.value", ProtoNaming.getPrimitiveType(left).t, left)}
           else ${deserializeTerm(q"$term.right.get.value", ProtoNaming.getPrimitiveType(right).t, right)}
         """
-      case (Proto.Bool, ST.Nothing) =>
-        q"???"
-      case (Proto.Bool, ST.Unit) =>
-        q"()"
-      case (Proto.String, ST.String) =>
-        term
+      case (Proto.Bool, ST.Nothing) => q"???"
+      case (Proto.Bool, ST.Unit) => q"()"
+      case (Proto.String, ST.String) => term
       case (Proto.StandardType(_), ST.BigInt) =>
         q"new $BigInt(new $BigInteger($term.data.toByteArray))"
       case (Proto.StandardType(_), ST.BigDecimal) =>
         q"new $BigDecimal(new $JBigDecimal(new $BigInteger($term.unscaledValue.data.toByteArray), $term.scale))"
       case (Proto.StandardType(_), ST.BitString) =>
         q"new $BitString($term.data.toByteArray, $term.skipAtLastByte)"
-      case (Proto.StandardType(_), ST.ExpectedError) =>
-        q"???"
-      case (Proto.Bool, ST.Boolean) =>
-        term
-      case (Proto.Int, ST.Byte) =>
-        q"$term.toByte"
-      case (Proto.Int, ST.Short) =>
-        q"$term.toShort"
-      case (Proto.Int, ST.Int) =>
-        term
-      case (Proto.Long, ST.Long) =>
-        term
-      case (Proto.Float, ST.Float) =>
-        term
-      case (Proto.Double, ST.Double) =>
-        term
-      case (Proto.Int, ST.Char) =>
-        q"$term.toChar"
-      case (pt, st) =>
-        err(pt, st)
+      case (Proto.StandardType(_), ST.ExpectedError) => q"???"
+      case (Proto.Bool, ST.Boolean) => term
+      case (Proto.Int, ST.Byte) => q"$term.toByte"
+      case (Proto.Int, ST.Short) => q"$term.toShort"
+      case (Proto.Int, ST.Int) => term
+      case (Proto.Long, ST.Long) => term
+      case (Proto.Float, ST.Float) => term
+      case (Proto.Double, ST.Double) => term
+      case (Proto.Int, ST.Char) => q"$term.toChar"
+      case (pt, st) => err(pt, st)
     }
 
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/DeserializeFamily.scala b/src/helpers/vct/col/ast/helpers/generator/DeserializeFamily.scala
index 301b582b49..d074374663 100644
--- a/src/helpers/vct/col/ast/helpers/generator/DeserializeFamily.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/DeserializeFamily.scala
@@ -8,8 +8,16 @@ import java.nio.file.Path
 import scala.meta._
 
 class DeserializeFamily extends FamilyGenerator {
-  override def generate(out: Path, family: Name, kind: NodeKind, nodes: Seq[Name]): Unit =
-    ResultStream.write(out.resolve("DeserializeFamily" + family.base + ".scala"), deserializeFamily(family, nodes))
+  override def generate(
+      out: Path,
+      family: Name,
+      kind: NodeKind,
+      nodes: Seq[Name],
+  ): Unit =
+    ResultStream.write(
+      out.resolve("DeserializeFamily" + family.base + ".scala"),
+      deserializeFamily(family, nodes),
+    )
 
   def deserializeFamily(name: Name, nodes: Seq[Name]): Source =
     source"""
@@ -17,16 +25,25 @@ class DeserializeFamily extends FamilyGenerator {
 
       object ${Term.Name(deserializeFamilyName(name))} {
         def deserialize[G](node: ${scalapbType(name)}, decls: $MutMap[$Long, $Declaration[G]]): ${typ(name)}[G] =
-          ${if(nodes == Seq(name)) q"${Term.Name(deserializeName(name))}.deserialize[G](node, decls)" else deserializeOneof(q"node.v", name, nodes)}
+          ${if (nodes == Seq(name))
+        q"${Term.Name(deserializeName(name))}.deserialize[G](node, decls)"
+      else
+        deserializeOneof(q"node.v", name, nodes)}
       }
     """
 
   def deserializeOneof(term: Term, name: Name, nodes: Seq[Name]): Term =
     Term.Match(
       q"$term.number: @_root_.scala.annotation.switch",
-      nodes.zipWithIndex.map { case (node, index) => deserializeCase(term, node, number = index+1) }.toList,
+      nodes.zipWithIndex.map { case (node, index) =>
+        deserializeCase(term, node, number = index + 1)
+      }.toList,
     )
 
   def deserializeCase(term: Term, node: Name, number: Int): Case =
-    Case(Lit.Int(number), None, q"${deserializeObject(node)}.deserialize[G]($term.value.asInstanceOf[${scalapbType(node)}], decls)")
+    Case(
+      Lit.Int(number),
+      None,
+      q"${deserializeObject(node)}.deserialize[G]($term.value.asInstanceOf[${scalapbType(node)}], decls)",
+    )
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/ImplTrait.scala b/src/helpers/vct/col/ast/helpers/generator/ImplTrait.scala
index f7b4d58645..408e526ab3 100644
--- a/src/helpers/vct/col/ast/helpers/generator/ImplTrait.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/ImplTrait.scala
@@ -32,65 +32,59 @@ class ImplTrait extends ImplTraitGenerator {
   // Parsing rules
   val stableId = s"(?:$id(?:$period$id)*)"
   val selectorRule = s"(?:$underscore|$id)"
-  val selectors = s"(?:$selectorRule|$acc_open$selectorRule(?:$comma$selectorRule)*$acc_close)"
+  val selectors =
+    s"(?:$selectorRule|$acc_open$selectorRule(?:$comma$selectorRule)*$acc_close)"
   val importExprRule = s"(?:$stableId$period$selectors)"
   val importRule = s"(?:$kwd_import($importExprRule(?:$comma$importExprRule)*))"
 
   val lazyTyp = s"(?:$w[^\\s]+$w)"
   val traitParents = s"(?:$lazyTyp($kwd_with$lazyTyp)*)"
-  val traitRule = s"(?:$kwd_trait$id$brack_open$kwd_gen$brack_close(($kwd_extends$traitParents)?$acc_open))"
+  val traitRule =
+    s"(?:$kwd_trait$id$brack_open$kwd_gen$brack_close(($kwd_extends$traitParents)?$acc_open))"
 
   val `import`: Regex = importRule.r
   val `trait`: Regex = traitRule.r
   val importExpr: Regex = importExprRule.r
   val selector: Regex = selectorRule.r
 
-  /**
-   * This method is fragile: we attempt to do some useful fixing up by applying
-   * a regex to find import lines and the declaration line. If the file becomes
-   * invalid or we make wrong conclusions that's ok: the user can fix it. The
-   * method won't do anything if the string {NodeName}Ops already occurs.
-   *
-   * I think this method should be removed once all forks/branches are in line
-   * with extending the correct Ops traits, and only leave generate (which
-   * should always be correct).
-   */
+  /** This method is fragile: we attempt to do some useful fixing up by applying
+    * a regex to find import lines and the declaration line. If the file becomes
+    * invalid or we make wrong conclusions that's ok: the user can fix it. The
+    * method won't do anything if the string {NodeName}Ops already occurs.
+    *
+    * I think this method should be removed once all forks/branches are in line
+    * with extending the correct Ops traits, and only leave generate (which
+    * should always be correct).
+    */
   def fix(p: Path, opsNames: Seq[String]): Unit = {
-    if(opsNames.isEmpty)
+    if (opsNames.isEmpty)
       return // obsolete or renamed impl, don't try anything.
 
     val data = Files.readString(p)
 
-    if(opsNames.forall(name => data.contains(name)))
+    if (opsNames.forall(name => data.contains(name)))
       return // exit early if most likely the file is already fixed
 
     val maybeTraitMatch = `trait`.findFirstMatchIn(data)
 
-    if(maybeTraitMatch.isEmpty)
+    if (maybeTraitMatch.isEmpty)
       return // silently fail if we can't detect a trait
 
     val traitMatch = maybeTraitMatch.get
 
-    val exts: Seq[String] =
-      Option(traitMatch.group(2))
-        .map(
-          _.strip()
-            .split("\\s+")
-            .to(List)
-            .map(_.strip())
-            .filterNot(_ == "extends")
-            .filterNot(_ == "with")
-        )
-        .getOrElse(Nil)
+    val exts: Seq[String] = Option(traitMatch.group(2)).map(
+      _.strip().split("\\s+").to(List).map(_.strip()).filterNot(_ == "extends")
+        .filterNot(_ == "with")
+    ).getOrElse(Nil)
 
     val opsExts = opsNames.map(_ + "[G]")
 
-    if(opsExts.forall(ext => exts.contains(ext)))
+    if (opsExts.forall(ext => exts.contains(ext)))
       return
 
     val allImportLines = `import`.findAllMatchIn(data).toSeq
 
-    if(traitMatch.start < allImportLines.lastOption.map(_.end).getOrElse(-1))
+    if (traitMatch.start < allImportLines.lastOption.map(_.end).getOrElse(-1))
       return // the trait is defined before the last import: give up
 
     // Decide whether the ops thing is already included. Might happen if you
@@ -103,18 +97,25 @@ class ImplTrait extends ImplTraitGenerator {
         val pkg = parts.init
         val select = selector.findAllIn(parts.last).map(_.strip()).toSeq
 
-        if(pkg == Seq("vct", "col", "ast", "ops") && (select.contains("_") || opsNames.forall(name => select.contains(name)))) {
-          mkImport = false
-        }
+        if (
+          pkg == Seq("vct", "col", "ast", "ops") &&
+          (select.contains("_") ||
+            opsNames.forall(name => select.contains(name)))
+        ) { mkImport = false }
       }
     }
 
     val outExts = exts ++ opsExts.filterNot(ext => exts.contains(ext))
     val outImport =
-      if(mkImport) {
-        val selector = if(opsNames.size == 1) opsNames.head else opsNames.mkString("{", ", ", "}")
+      if (mkImport) {
+        val selector =
+          if (opsNames.size == 1)
+            opsNames.head
+          else
+            opsNames.mkString("{", ", ", "}")
         s"import vct.col.ast.ops.$selector"
-      } else ""
+      } else
+        ""
 
     // Time to be careful: re-output the entire file except bits we for sure
     // can do ourselves
@@ -147,22 +148,34 @@ class ImplTrait extends ImplTraitGenerator {
     }
   }
 
-  def generate(p: Path, node: String, concrete: Boolean, family: Boolean): Unit = {
+  def generate(
+      p: Path,
+      node: String,
+      concrete: Boolean,
+      family: Boolean,
+  ): Unit = {
     Using(Files.newBufferedWriter(p)) { writer =>
       val ext =
-        if (concrete && family) s"${node}Ops[G] with ${node}FamilyOps[G]"
-        else if (concrete) s"${node}Ops[G]"
-        else if (family) s"${node}FamilyOps[G]"
-        else "???"
+        if (concrete && family)
+          s"${node}Ops[G] with ${node}FamilyOps[G]"
+        else if (concrete)
+          s"${node}Ops[G]"
+        else if (family)
+          s"${node}FamilyOps[G]"
+        else
+          "???"
 
       val opsImport =
-        if (concrete && family) s"{${node}Ops, ${node}FamilyOps}"
-        else if(concrete) s"${node}Ops"
-        else if(family) s"${node}FamilyOps"
-        else "???"
-
-      writer.write(
-        s"""|package vct.col.ast.unsorted
+        if (concrete && family)
+          s"{${node}Ops, ${node}FamilyOps}"
+        else if (concrete)
+          s"${node}Ops"
+        else if (family)
+          s"${node}FamilyOps"
+        else
+          "???"
+
+      writer.write(s"""|package vct.col.ast.unsorted
             |
             |import vct.col.ast.$node
             |import vct.col.ast.ops.$opsImport
@@ -171,8 +184,7 @@ class ImplTrait extends ImplTraitGenerator {
             |trait ${node}Impl[G] extends $ext { this: $node[G] =>
             |  // override def layout(implicit ctx: Ctx): Doc = ???
             |}
-            |""".stripMargin
-      )
+            |""".stripMargin)
     }
   }
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/MegaCol.scala b/src/helpers/vct/col/ast/helpers/generator/MegaCol.scala
index ce6510809a..617490140a 100644
--- a/src/helpers/vct/col/ast/helpers/generator/MegaCol.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/MegaCol.scala
@@ -16,13 +16,18 @@ class MegaCol extends AllNodesGenerator {
 
     val messages =
       definitions.map(node => genNode.message(node)) ++
-        families.flatMap(family => genFamily.message(family._1, family._2.map(_.name)).toSeq) ++
-        genAux.messages(definitions)
+        families.flatMap(family =>
+          genFamily.message(family._1, family._2.map(_.name)).toSeq
+        ) ++ genAux.messages(definitions)
 
     Files.createDirectories(out.resolve(Paths.get("vct", "col", "ast")))
-    Using(Files.newBufferedWriter(out.resolve(Paths.get("vct", "col", "ast", "col.proto")))) { writer =>
+    Using(Files.newBufferedWriter(
+      out.resolve(Paths.get("vct", "col", "ast", "col.proto"))
+    )) { writer =>
       Proto.Source(
-        messages.flatMap(_.namedTypes.collect { case t: Proto.StandardType => t.fqName }).distinct,
+        messages.flatMap(_.namedTypes.collect { case t: Proto.StandardType =>
+          t.fqName
+        }).distinct,
         options = "",
         messages = messages,
       ).write(writer)
diff --git a/src/helpers/vct/col/ast/helpers/generator/Ops.scala b/src/helpers/vct/col/ast/helpers/generator/Ops.scala
index 03c972facf..93d882b9d3 100644
--- a/src/helpers/vct/col/ast/helpers/generator/Ops.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/Ops.scala
@@ -9,7 +9,8 @@ import scala.meta._
 
 class Ops extends NodeGenerator {
   override def generate(out: Path, node: NodeDefinition): Unit =
-    ResultStream.write(out.resolve(s"${node.name.base}Ops.scala"),
+    ResultStream.write(
+      out.resolve(s"${node.name.base}Ops.scala"),
       source"""
         package $OpsPackage
 
@@ -19,6 +20,6 @@ class Ops extends NodeGenerator {
           with ${Init(t"${subnodesType(node)}[G]", Name.Anonymous(), Nil)}
           with ${Init(t"${serializeType(node)}[G]", Name.Anonymous(), Nil)}
         { this: ${typ(node)}[G] => }
-      """
+      """,
     )
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/OpsFamily.scala b/src/helpers/vct/col/ast/helpers/generator/OpsFamily.scala
index 2504d02936..70f672f400 100644
--- a/src/helpers/vct/col/ast/helpers/generator/OpsFamily.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/OpsFamily.scala
@@ -1,7 +1,18 @@
 package vct.col.ast.helpers.generator
 
-import vct.col.ast.helpers.defn.Constants.{AbstractRewriter, OpsPackage, Declaration, Long, Map}
-import vct.col.ast.helpers.defn.Naming.{declareType, opsFamilyTrait, scalapbType, typ}
+import vct.col.ast.helpers.defn.Constants.{
+  AbstractRewriter,
+  OpsPackage,
+  Declaration,
+  Long,
+  Map,
+}
+import vct.col.ast.helpers.defn.Naming.{
+  declareType,
+  opsFamilyTrait,
+  scalapbType,
+  typ,
+}
 import vct.col.ast.structure
 import vct.col.ast.structure.{DeclaredNode, FamilyGenerator, StructuralNode}
 
@@ -9,8 +20,14 @@ import java.nio.file.Path
 import scala.meta._
 
 class OpsFamily extends FamilyGenerator {
-  override def generate(out: Path, family: structure.Name, kind: structure.NodeKind, nodes: Seq[structure.Name]): Unit =
-    ResultStream.write(out.resolve(s"${family.base}FamilyOps.scala"),
+  override def generate(
+      out: Path,
+      family: structure.Name,
+      kind: structure.NodeKind,
+      nodes: Seq[structure.Name],
+  ): Unit =
+    ResultStream.write(
+      out.resolve(s"${family.base}FamilyOps.scala"),
       source"""
         package $OpsPackage
 
@@ -20,14 +37,13 @@ class OpsFamily extends FamilyGenerator {
           override def rewriteDefault[Post]()(implicit rw: $AbstractRewriter[G, Post]): ${typ(family)}[Post]
           override def serializeFamily(decls: $Map[$Declaration[G], $Long]): ${scalapbType(family)}
         }
-      """
+      """,
     )
 
   def templates(name: structure.Name, kind: structure.NodeKind): List[Init] =
     kind match {
       case StructuralNode => List.empty
-      case DeclaredNode => List(
-        Init(t"${declareType(name)}[G]", Name.Anonymous(), List.empty),
-      )
+      case DeclaredNode =>
+        List(Init(t"${declareType(name)}[G]", Name.Anonymous(), List.empty))
     }
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/ProtoAuxTypes.scala b/src/helpers/vct/col/ast/helpers/generator/ProtoAuxTypes.scala
index 33742500dc..065e466f0d 100644
--- a/src/helpers/vct/col/ast/helpers/generator/ProtoAuxTypes.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/ProtoAuxTypes.scala
@@ -8,27 +8,26 @@ import scala.util.Using
 
 class ProtoAuxTypes extends AllNodesGenerator {
   def messages(definitions: Seq[NodeDefinition]): Seq[Proto.Message] =
-    definitions
-      .flatMap(_.fields)
-      .map(_._2)
-      .map(ProtoNaming.getType)
-      .flatMap(_.auxs)
-      .distinct
-      .sortBy(_.name.headOption)
+    definitions.flatMap(_.fields).map(_._2).map(ProtoNaming.getType)
+      .flatMap(_.auxs).distinct.sortBy(_.name.headOption)
 
   override def generate(out: Path, definitions: Seq[NodeDefinition]): Unit = {
     val auxs = messages(definitions).map(_.opaqueNodes)
 
-    for(aux <- auxs) {
+    for (aux <- auxs) {
       val dir = aux.name.init.foldLeft(out)(_.resolve(_))
       Files.createDirectories(dir)
 
-      Using(Files.newBufferedWriter(dir.resolve(aux.name.last + ".proto"))) { writer =>
-        Proto.Source(
-          Seq("scalapb", "scalapb") +: aux.imports,
-          Proto.renderOptions(Proto.OPAQUE_SUBMESSAGES_OPTIONS.updated("package_name", ProtoNaming.scalaPackageOption(aux.name))),
-          aux,
-        ).write(writer)
+      Using(Files.newBufferedWriter(dir.resolve(aux.name.last + ".proto"))) {
+        writer =>
+          Proto.Source(
+            Seq("scalapb", "scalapb") +: aux.imports,
+            Proto.renderOptions(Proto.OPAQUE_SUBMESSAGES_OPTIONS.updated(
+              "package_name",
+              ProtoNaming.scalaPackageOption(aux.name),
+            )),
+            aux,
+          ).write(writer)
       }
     }
   }
diff --git a/src/helpers/vct/col/ast/helpers/generator/ProtoFamily.scala b/src/helpers/vct/col/ast/helpers/generator/ProtoFamily.scala
index e0591c797d..cc5d5bb9c4 100644
--- a/src/helpers/vct/col/ast/helpers/generator/ProtoFamily.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/ProtoFamily.scala
@@ -8,33 +8,46 @@ import scala.util.Using
 
 class ProtoFamily extends FamilyGenerator {
   def message(family: Name, nodes: Seq[Name]): Option[Proto.Message] = {
-    if(nodes == Seq(family))
+    if (nodes == Seq(family))
       return None
 
     val fqNames = nodes.map(ProtoNaming.getTypeName)
     val name = ProtoNaming.getTypeName(family)
 
-    Some(Proto.Message(name, Proto.MessageOneOf(
-      oneOfName = "v",
-      fields = fqNames.zipWithIndex.map {
-        case (name, idx) => Proto.Field(
-          name = ProtoNaming.snake(name.last),
-          index = idx + 1,
-          t = Proto.UnspecifiedArity(Proto.FamilyType(name))
-        )
-      }
-    )))
+    Some(Proto.Message(
+      name,
+      Proto.MessageOneOf(
+        oneOfName = "v",
+        fields = fqNames.zipWithIndex.map { case (name, idx) =>
+          Proto.Field(
+            name = ProtoNaming.snake(name.last),
+            index = idx + 1,
+            t = Proto.UnspecifiedArity(Proto.FamilyType(name)),
+          )
+        },
+      ),
+    ))
   }
 
-  override def generate(out: Path, family: Name, kind: NodeKind, nodes: Seq[Name]): Unit = {
+  override def generate(
+      out: Path,
+      family: Name,
+      kind: NodeKind,
+      nodes: Seq[Name],
+  ): Unit = {
     message(family, nodes).foreach { message =>
       val dir = message.name.init.foldLeft(out)(_.resolve(_))
       Files.createDirectories(dir)
 
-      Using(Files.newBufferedWriter(dir.resolve(message.name.last + ".proto"))) { writer =>
+      Using(
+        Files.newBufferedWriter(dir.resolve(message.name.last + ".proto"))
+      ) { writer =>
         Proto.Source(
           imports = Seq("scalapb", "scalapb") +: message.imports,
-          options = Proto.renderOptions(Proto.STANDARD_OPTIONS.updated("package_name", ProtoNaming.scalaPackageOption(message.name))),
+          options = Proto.renderOptions(Proto.STANDARD_OPTIONS.updated(
+            "package_name",
+            ProtoNaming.scalaPackageOption(message.name),
+          )),
           message = message,
         ).write(writer)
       }
diff --git a/src/helpers/vct/col/ast/helpers/generator/ProtoNode.scala b/src/helpers/vct/col/ast/helpers/generator/ProtoNode.scala
index 85ab611d75..bc6a343293 100644
--- a/src/helpers/vct/col/ast/helpers/generator/ProtoNode.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/ProtoNode.scala
@@ -1,7 +1,12 @@
 package vct.col.ast.helpers.generator
 
 import vct.col.ast.helpers.defn.{Proto, ProtoNaming}
-import vct.col.ast.structure.{DeclaredNode, NodeDefinition, NodeGenerator, StructuralNode}
+import vct.col.ast.structure.{
+  DeclaredNode,
+  NodeDefinition,
+  NodeGenerator,
+  StructuralNode,
+}
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Path}
@@ -14,17 +19,23 @@ class ProtoNode extends NodeGenerator {
     val fields = node.fields.map(_._1).zip(typeResults).map {
       case (name, res) => ProtoNaming.snake(name) -> res.t
     }
-    val blame = "blame" -> Proto.Required(Proto.StandardType(Proto.auxBase :+ "Blame"))
-    val origin = "origin" -> Proto.Required(Proto.StandardType(Proto.auxBase :+ "Origin"))
+    val blame =
+      "blame" -> Proto.Required(Proto.StandardType(Proto.auxBase :+ "Blame"))
+    val origin =
+      "origin" -> Proto.Required(Proto.StandardType(Proto.auxBase :+ "Origin"))
 
     val allFieldDecls =
-      (if(node.kind == DeclaredNode) Seq(id) else Nil) ++
-        fields ++
-        (if(node.blameType.isDefined) Seq(blame) else Nil) ++
-        Seq(origin)
+      (if (node.kind == DeclaredNode)
+         Seq(id)
+       else
+         Nil) ++ fields ++
+        (if (node.blameType.isDefined)
+           Seq(blame)
+         else
+           Nil) ++ Seq(origin)
 
-    val allFields = allFieldDecls.zipWithIndex.map {
-      case (name -> t, idx) => Proto.Field(name, idx+1, t)
+    val allFields = allFieldDecls.zipWithIndex.map { case (name -> t, idx) =>
+      Proto.Field(name, idx + 1, t)
     }
 
     val name = ProtoNaming.getTypeName(node.name)
@@ -36,15 +47,19 @@ class ProtoNode extends NodeGenerator {
 
     val source = Proto.Source(
       Seq("scalapb", "scalapb") +: message.imports,
-      Proto.renderOptions(Proto.OPAQUE_SUBMESSAGES_OPTIONS.updated("package_name", ProtoNaming.scalaPackageOption(message.name))),
+      Proto.renderOptions(
+        Proto.OPAQUE_SUBMESSAGES_OPTIONS
+          .updated("package_name", ProtoNaming.scalaPackageOption(message.name))
+      ),
       message,
     )
 
     val dir = message.name.init.foldLeft(out)(_.resolve(_))
     Files.createDirectories(dir)
 
-    Using(Files.newBufferedWriter(dir.resolve(message.name.last + ".proto"), StandardCharsets.UTF_8)) { writer =>
-      source.write(writer)
-    }
+    Using(Files.newBufferedWriter(
+      dir.resolve(message.name.last + ".proto"),
+      StandardCharsets.UTF_8,
+    )) { writer => source.write(writer) }
   }
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/Rewrite.scala b/src/helpers/vct/col/ast/helpers/generator/Rewrite.scala
index e5316d03e1..4ba174d880 100644
--- a/src/helpers/vct/col/ast/helpers/generator/Rewrite.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/Rewrite.scala
@@ -11,7 +11,8 @@ import scala.meta._
 
 class Rewrite extends NodeGenerator {
   override def generate(out: Path, node: NodeDefinition): Unit =
-    ResultStream.write(out.resolve(s"${node.name.base}Rewrite.scala"), getTree(node))
+    ResultStream
+      .write(out.resolve(s"${node.name.base}Rewrite.scala"), getTree(node))
 
   def getTree(node: NodeDefinition): Tree =
     source"""
@@ -27,17 +28,13 @@ class Rewrite extends NodeGenerator {
     """
 
   def args(node: NodeDefinition): List[Term.Param] = {
-    val fieldParams = node.fields.map {
-      case (name, t) => arg(name, t)
-    }
+    val fieldParams = node.fields.map { case (name, t) => arg(name, t) }
 
     val originParam = param"o: $Origin = null"
 
     (node.blameType match {
-      case Some(blameType) =>
-        fieldParams :+ blameArg(blameType) :+ originParam
-      case None =>
-        fieldParams :+ originParam
+      case Some(blameType) => fieldParams :+ blameArg(blameType) :+ originParam
+      case None => fieldParams :+ originParam
     }).toList
   }
 
@@ -45,8 +42,7 @@ class Rewrite extends NodeGenerator {
     t match {
       case _: structure.Type.ValueType =>
         param"${Name(name)}: => Option[${typ(t, t"Post")}] = None"
-      case _ =>
-        param"${Name(name)}: => ${typ(t, t"Post")} = null"
+      case _ => param"${Name(name)}: => ${typ(t, t"Post")} = null"
     }
 
   def blameArg(blameType: structure.Name): Term.Param =
@@ -54,8 +50,7 @@ class Rewrite extends NodeGenerator {
 
   def scopes(node: NodeDefinition, make: Term): Term =
     node.scopes.foldLeft[Term](make) {
-      case (acc, structure.Type.Declaration(name)) =>
-        q"""
+      case (acc, structure.Type.Declaration(name)) => q"""
           `~rw`.${Naming.scopes(name.base)}.scope {
             $acc
           }
@@ -63,23 +58,29 @@ class Rewrite extends NodeGenerator {
     }
 
   def make(node: NodeDefinition): Term = {
-    val fieldValues = node.fields.map {
-      case (name, t) => makeField(name, t)
-    }
-
-    val valuess = node.blameType match {
-      case Some(_) =>
-        List(fieldValues.toList, List(q"if(blame ne null) blame else `~rw`.dispatch(this.blame)"), List(q"if(o ne null) o else `~rw`.dispatch(this.o)"))
-      case None =>
-        List(fieldValues.toList, List(q"if(o ne null) o else `~rw`.dispatch(this.o)"))
-    }
+    val fieldValues = node.fields.map { case (name, t) => makeField(name, t) }
+
+    val valuess =
+      node.blameType match {
+        case Some(_) =>
+          List(
+            fieldValues.toList,
+            List(q"if(blame ne null) blame else `~rw`.dispatch(this.blame)"),
+            List(q"if(o ne null) o else `~rw`.dispatch(this.o)"),
+          )
+        case None =>
+          List(
+            fieldValues.toList,
+            List(q"if(o ne null) o else `~rw`.dispatch(this.o)"),
+          )
+      }
 
     q"new ${Init(typ(node.name), Name.Anonymous(), valuess)}"
   }
 
   def makeField(fieldName: String, t: structure.Type): Term = {
     val field = Term.Name(fieldName)
-    if(t.isInstanceOf[structure.Type.ValueType])
+    if (t.isInstanceOf[structure.Type.ValueType])
       q"$field.getOrElse(${rewriteDefault(q"this.$field", t)})"
     else
       q"_root_.scala.Predef.locally({ val `~x` = $field; if(`~x` ne null) `~x` else ${rewriteDefault(q"this.$field", t)} })"
@@ -88,23 +89,27 @@ class Rewrite extends NodeGenerator {
   def rewriteDefault(term: Term, t: structure.Type): Term =
     t match {
       case structure.Type.Node(_) => q"`~rw`.dispatch($term)"
-      case structure.Type.Declaration(name) => q"`~rw`.${Naming.scopes(name.base)}.dispatch($term)"
-      case structure.Type.DeclarationSeq(name) => q"`~rw`.${Naming.scopes(name.base)}.dispatch($term)"
+      case structure.Type.Declaration(name) =>
+        q"`~rw`.${Naming.scopes(name.base)}.dispatch($term)"
+      case structure.Type.DeclarationSeq(name) =>
+        q"`~rw`.${Naming.scopes(name.base)}.dispatch($term)"
       case structure.Type.Ref(kind) =>
         q"`~rw`.porcelainRefSucc[${typ(kind.name)}[Post]]($term).getOrElse(`~rw`.succ[${typ(kind.name)}[Post]]($term.decl))"
       case structure.Type.MultiRef(kind) =>
         q"`~rw`.porcelainRefSucc[${typ(kind.name)}[Post]]($term).getOrElse(`~rw`.anySucc[${typ(kind.name)}[Post]]($term.decl))"
       case _: structure.Type.PrimitiveType => term
-      case structure.Type.Option(t) => q"$term.map(`~x` => ${rewriteDefault(q"`~x`", t)})"
+      case structure.Type.Option(t) =>
+        q"$term.map(`~x` => ${rewriteDefault(q"`~x`", t)})"
       case structure.Type.Either(l, r) =>
         q"$term.fold(`~x` => $LeftObj(${rewriteDefault(q"`~x`", l)}), `~x` => $RightObj(${rewriteDefault(q"`~x`", r)}))"
-      case structure.Type.Seq(t) => q"$term.map(`~x` => ${rewriteDefault(q"`~x`", t)})"
+      case structure.Type.Seq(t) =>
+        q"$term.map(`~x` => ${rewriteDefault(q"`~x`", t)})"
       case structure.Type.Tuple(ts) =>
-        val elems = ts.zipWithIndex.map {
-          case (t, i) =>
-            val field = Term.Name(s"_${i+1}")
+        val elems =
+          ts.zipWithIndex.map { case (t, i) =>
+            val field = Term.Name(s"_${i + 1}")
             rewriteDefault(q"$term.$field", t)
-        }.toList
+          }.toList
 
         q"(..$elems)"
     }
diff --git a/src/helpers/vct/col/ast/helpers/generator/RewriteHelpers.scala b/src/helpers/vct/col/ast/helpers/generator/RewriteHelpers.scala
index ca63eba1b1..5239dc8466 100644
--- a/src/helpers/vct/col/ast/helpers/generator/RewriteHelpers.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/RewriteHelpers.scala
@@ -7,19 +7,20 @@ import scala.meta._
 
 class RewriteHelpers extends AllNodesGenerator {
   override def generate(out: Path, definitions: Seq[NodeDefinition]): Unit =
-    ResultStream.write(out.resolve("RewriteHelpers.scala"),
+    ResultStream.write(
+      out.resolve("RewriteHelpers.scala"),
       source"""
         package vct.col.ast
 
         @deprecated("node.rewrite(...) methods are defined directly on nodes now, so importing this does nothing.")
         object RewriteHelpers {
           ..${definitions.map(defn => {
-            q"""
+          q"""
               @deprecated("node.rewrite(...) methods are defined directly on nodes now, so importing this does nothing.")
               object ${Term.Name("Rewrite" + defn.name.base)}
             """
-          }).toList}
+        }).toList}
         }
-      """
+      """,
     )
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/Serialize.scala b/src/helpers/vct/col/ast/helpers/generator/Serialize.scala
index 7a1ab74276..38d8544138 100644
--- a/src/helpers/vct/col/ast/helpers/generator/Serialize.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/Serialize.scala
@@ -4,14 +4,20 @@ import vct.col.ast.helpers.defn.Constants._
 import vct.col.ast.helpers.defn.Naming._
 import vct.col.ast.helpers.defn.{Naming, Proto, ProtoNaming}
 import vct.col.ast.structure
-import vct.col.ast.structure.{DeclaredNode, NodeDefinition, NodeGenerator, Type => ST}
+import vct.col.ast.structure.{
+  DeclaredNode,
+  NodeDefinition,
+  NodeGenerator,
+  Type => ST,
+}
 
 import java.nio.file.Path
 import scala.meta._
 
 class Serialize extends NodeGenerator {
   override def generate(out: Path, node: NodeDefinition): Unit =
-    ResultStream.write(out.resolve(s"${node.name.base}Serialize.scala"), serialize(node))
+    ResultStream
+      .write(out.resolve(s"${node.name.base}Serialize.scala"), serialize(node))
 
   def serialize(node: NodeDefinition): Source =
     source"""
@@ -39,9 +45,17 @@ class Serialize extends NodeGenerator {
       """
 
   def data(node: NodeDefinition): Seq[Term] = {
-    val id = if(node.kind == DeclaredNode) Seq(q"decls(this)") else Nil
+    val id =
+      if (node.kind == DeclaredNode)
+        Seq(q"decls(this)")
+      else
+        Nil
     val fields = node.fields.map { case (name, t) => serializeField(name, t) }
-    val blame = if(node.blameType.isDefined) Seq(q"$SerializeBlame.serialize(this.blame)") else Nil
+    val blame =
+      if (node.blameType.isDefined)
+        Seq(q"$SerializeBlame.serialize(this.blame)")
+      else
+        Nil
     val origin = Seq(q"$SerializeOrigin.serialize(this.o)")
 
     id ++ fields ++ blame ++ origin
@@ -60,24 +74,30 @@ class Serialize extends NodeGenerator {
     serializeTerm(value, structureType, protoType)
   }
 
-  def serializeTerm(term: Term, structureType: structure.Type, protoType: Proto.Type): Term =
+  def serializeTerm(
+      term: Term,
+      structureType: structure.Type,
+      protoType: Proto.Type,
+  ): Term =
     (structureType, protoType) match {
-      case (st, Proto.Required(pt)) =>
-        serializeTerm(term, st, pt)
+      case (st, Proto.Required(pt)) => serializeTerm(term, st, pt)
       case (ST.Option(st), Proto.Option(pt)) =>
         q"$term.map(`~x` => ${serializeTerm(q"`~x`", st, pt)})"
       case (ST.Seq(st), Proto.Repeated(pt)) =>
         q"$term.map(`~x` => ${serializeTerm(q"`~x`", st, pt)})"
       case (ST.DeclarationSeq(name), Proto.Repeated(pt)) =>
         q"$term.map(`~x` => new $NodeMessageView(`~x`, decls))"
-      case (st, pt) =>
-        err(st, pt)
+      case (st, pt) => err(st, pt)
     }
 
   def mk(name: Seq[String], args: Term*): Term =
     q"new ${typ(structure.Name(ProtoNaming.scalaPackage(name) :+ name.last))}(..${args.toList})"
 
-  def serializeTerm(term: Term, structureType: ST, protoType: Proto.PrimitiveType): Term =
+  def serializeTerm(
+      term: Term,
+      structureType: ST,
+      protoType: Proto.PrimitiveType,
+  ): Term =
     (structureType, protoType) match {
       case (ST.Node(_), Proto.FamilyType(_)) =>
         q"new $NodeMessageView($term, decls)"
@@ -90,54 +110,62 @@ class Serialize extends NodeGenerator {
       case (ST.MultiRef(_), Proto.StandardType(name)) =>
         mk(name, q"decls($term.decl)")
       case (ST.Tuple(args), Proto.AuxType(name)) =>
-        mk(name, args.zipWithIndex.map { case (structureType, idx) =>
-          val protoType = ProtoNaming.getType(structureType).t
-          val field = Term.Name(s"_${idx+1}")
-          serializeTerm(q"$term.$field", structureType, protoType)
-        }: _*)
+        mk(
+          name,
+          args.zipWithIndex.map { case (structureType, idx) =>
+            val protoType = ProtoNaming.getType(structureType).t
+            val field = Term.Name(s"_${idx + 1}")
+            serializeTerm(q"$term.$field", structureType, protoType)
+          }: _*
+        )
       case (ST.Seq(structureType), Proto.AuxType(name)) =>
         val protoType = ProtoNaming.getType(structureType).t
-        mk(name, q"$term.map(`~x` => ${serializeTerm(q"`~x`", structureType, protoType)})")
+        mk(
+          name,
+          q"$term.map(`~x` => ${serializeTerm(q"`~x`", structureType, protoType)})",
+        )
       case (ST.Option(structureType), Proto.AuxType(name)) =>
         val protoType = ProtoNaming.getType(structureType).t
-        mk(name, q"$term.map(`~x` => ${serializeTerm(q"`~x`", structureType, protoType)})")
+        mk(
+          name,
+          q"$term.map(`~x` => ${serializeTerm(q"`~x`", structureType, protoType)})",
+        )
       case (ST.Either(left, right), Proto.AuxType(name)) =>
-        mk(name, q"""
+        mk(
+          name,
+          q"""
           $term.fold(
             `~x` => ${mk(name :+ "V" :+ "Left", serializeTerm(q"`~x`", left, ProtoNaming.getPrimitiveType(left).t))},
             `~x` => ${mk(name :+ "V" :+ "Right", serializeTerm(q"`~x`", right, ProtoNaming.getPrimitiveType(right).t))},
           )
-        """)
-      case (ST.Nothing, Proto.Bool) =>
-        term
-      case (ST.Unit, Proto.Bool) =>
-        q"true"
-      case (ST.String, Proto.String) =>
-        term
+        """,
+        )
+      case (ST.Nothing, Proto.Bool) => term
+      case (ST.Unit, Proto.Bool) => q"true"
+      case (ST.String, Proto.String) => term
       case (ST.BigInt, Proto.StandardType(name)) =>
         mk(name, q"$copyByteStringFrom($term.toByteArray)")
       case (ST.BigDecimal, Proto.StandardType(name)) =>
-        mk(name, q"$term.scale", serializeTerm(q"$term.underlying.unscaledValue", ST.BigInt, ProtoNaming.getStandardType("BigInt").t))
+        mk(
+          name,
+          q"$term.scale",
+          serializeTerm(
+            q"$term.underlying.unscaledValue",
+            ST.BigInt,
+            ProtoNaming.getStandardType("BigInt").t,
+          ),
+        )
       case (ST.BitString, Proto.StandardType(name)) =>
         mk(name, q"$copyByteStringFrom($term.rawData)", q"$term.skipAtLastByte")
-      case (ST.ExpectedError, Proto.StandardType(name)) =>
-        mk(name)
-      case (ST.Boolean, Proto.Bool) =>
-        term
-      case (ST.Byte, Proto.Int) =>
-        term
-      case (ST.Short, Proto.Int) =>
-        term
-      case (ST.Int, Proto.Int) =>
-        term
-      case (ST.Long, Proto.Long) =>
-        term
-      case (ST.Float, Proto.Float) =>
-        term
-      case (ST.Double, Proto.Double) =>
-        term
-      case (ST.Char, Proto.Int) =>
-        term
+      case (ST.ExpectedError, Proto.StandardType(name)) => mk(name)
+      case (ST.Boolean, Proto.Bool) => term
+      case (ST.Byte, Proto.Int) => term
+      case (ST.Short, Proto.Int) => term
+      case (ST.Int, Proto.Int) => term
+      case (ST.Long, Proto.Long) => term
+      case (ST.Float, Proto.Float) => term
+      case (ST.Double, Proto.Double) => term
+      case (ST.Char, Proto.Int) => term
       case (st, pt) => err(st, pt)
     }
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/Subnodes.scala b/src/helpers/vct/col/ast/helpers/generator/Subnodes.scala
index 36e69d39fb..ba39fa60ff 100644
--- a/src/helpers/vct/col/ast/helpers/generator/Subnodes.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/Subnodes.scala
@@ -11,7 +11,8 @@ import scala.meta._
 
 class Subnodes extends NodeGenerator {
   override def generate(out: Path, node: NodeDefinition): Unit =
-    ResultStream.write(out.resolve(s"${node.name.base}Subnodes.scala"), subnodes(node))
+    ResultStream
+      .write(out.resolve(s"${node.name.base}Subnodes.scala"), subnodes(node))
 
   def subnodes(node: NodeDefinition): Source =
     source"""
@@ -23,40 +24,33 @@ class Subnodes extends NodeGenerator {
       }
     """
 
-  def noNodes: Term =
-    q"$SeqObj.empty[$Node[G]]"
+  def noNodes: Term = q"$SeqObj.empty[$Node[G]]"
 
   def concat(terms: Seq[Term]): Term =
     terms.reduceOption((l, r) => q"$l ++ $r").getOrElse(noNodes)
 
   def subnodesFields(node: NodeDefinition): Term =
-    concat(node.fields.map {
-      case (name, t) =>
-        val term = q"this.${Term.Name(name)}"
-        subnodes(term, t)
+    concat(node.fields.map { case (name, t) =>
+      val term = q"this.${Term.Name(name)}"
+      subnodes(term, t)
     })
 
   def subnodes(term: Term, typ: structure.Type): Term =
     typ match {
-      case _: Type.Node | _: Type.Declaration =>
-        q"$SeqObj($term)"
-      case _: Type.DeclarationSeq =>
-        term
+      case _: Type.Node | _: Type.Declaration => q"$SeqObj($term)"
+      case _: Type.DeclarationSeq => term
       case _: Type.Ref => noNodes
       case _: Type.MultiRef => noNodes
       case Type.Tuple(ts) =>
-        concat(ts.zipWithIndex.map {
-          case (typ, i) =>
-            val field = Term.Name(s"_${i+1}")
-            subnodes(q"$term.$field", typ)
+        concat(ts.zipWithIndex.map { case (typ, i) =>
+          val field = Term.Name(s"_${i + 1}")
+          subnodes(q"$term.$field", typ)
         })
-      case Type.Seq(arg) =>
-        q"$term.flatMap(`x` => ${subnodes(q"`x`", arg)})"
+      case Type.Seq(arg) => q"$term.flatMap(`x` => ${subnodes(q"`x`", arg)})"
       case Type.Option(arg) =>
         q"if($term.isDefined) ${subnodes(q"$term.get", arg)} else $noNodes"
       case Type.Either(left, right) =>
         q"if($term.isLeft) ${subnodes(q"$term.left", left)} else ${subnodes(q"$term.right", right)}"
-      case _: Type.PrimitiveType =>
-        noNodes
+      case _: Type.PrimitiveType => noNodes
     }
 }
diff --git a/src/helpers/vct/col/ast/helpers/generator/SuccessorsProvider.scala b/src/helpers/vct/col/ast/helpers/generator/SuccessorsProvider.scala
index 0fa9834b3a..48aa1e1f3c 100644
--- a/src/helpers/vct/col/ast/helpers/generator/SuccessorsProvider.scala
+++ b/src/helpers/vct/col/ast/helpers/generator/SuccessorsProvider.scala
@@ -9,8 +9,13 @@ import java.nio.file.Path
 import scala.meta._
 
 class SuccessorsProvider extends AllFamiliesGenerator {
-  override def generate(out: Path, declaredFamilies: Seq[structure.Name], structuralFamilies: Seq[structure.Name]): Unit =
-    ResultStream.write(out.resolve("SuccessorsProvider.scala"), source(declaredFamilies))
+  override def generate(
+      out: Path,
+      declaredFamilies: Seq[structure.Name],
+      structuralFamilies: Seq[structure.Name],
+  ): Unit =
+    ResultStream
+      .write(out.resolve("SuccessorsProvider.scala"), source(declaredFamilies))
 
   def source(declaredFamilies: Seq[structure.Name]): Source =
     source"""
@@ -25,9 +30,7 @@ class SuccessorsProvider extends AllFamiliesGenerator {
     q"""
       trait SuccessorsProvider[Pre, Post] {
         def anySucc[RefDecl <: $Declaration[Post]](`~decl`: $Declaration[Pre])(implicit tag: $ClassTag[RefDecl]): $RefType[Post, RefDecl] =
-          ${Term.Match(q"`~decl`", declaredFamilies.map(name =>
-            Case(p"(decl: ${typ(name)}[Pre])", None, q"succ(decl)")
-          ).toList)}
+          ${Term.Match(q"`~decl`", declaredFamilies.map(name => Case(p"(decl: ${typ(name)}[Pre])", None, q"succ(decl)")).toList)}
 
         ..${declaredFamilies.map(name => q"""
           def computeSucc(decl: ${typ(name)}[Pre]): $OptionType[${typ(name)}[Post]]
@@ -40,7 +43,9 @@ class SuccessorsProvider extends AllFamiliesGenerator {
       }
     """
 
-  def successorsProviderChain(declaredFamilies: Seq[structure.Name]): Defn.Class =
+  def successorsProviderChain(
+      declaredFamilies: Seq[structure.Name]
+  ): Defn.Class =
     q"""
       case class SuccessorsProviderChain[A, B, C](left: $SuccessorsProvider[A, B], right: $SuccessorsProvider[B, C]) extends ${Init(t"SuccessorsProvider[A, C]", Name.Anonymous(), List.empty)} {
         ..${declaredFamilies.map(name => q"""
@@ -50,7 +55,9 @@ class SuccessorsProvider extends AllFamiliesGenerator {
       }
     """
 
-  def successorsProviderTrafo(declaredFamilies: Seq[structure.Name]): Defn.Class =
+  def successorsProviderTrafo(
+      declaredFamilies: Seq[structure.Name]
+  ): Defn.Class =
     q"""
       abstract class SuccessorsProviderTrafo[Pre, Post](inner: $SuccessorsProvider[Pre, Post]) extends ${Init(t"$SuccessorsProvider[Pre, Post]", Name.Anonymous(), List.empty)} {
         def preTransform[I <: $Declaration[Pre], O <: $Declaration[Post]](pre: I): $OptionType[O] = None
diff --git a/src/hre/hre/cache/Cache.scala b/src/hre/hre/cache/Cache.scala
index fc6a0826ba..eb9c10de7a 100644
--- a/src/hre/hre/cache/Cache.scala
+++ b/src/hre/hre/cache/Cache.scala
@@ -14,29 +14,39 @@ case object Cache {
   private def hash(keys: Seq[String]): String = {
     val hashes = ("" +: keys).map(_.getBytes).map(sha256)
 
-    val res = hashes.tail.foldLeft(hashes.head) {
-      case (acc, hash) => sha256(acc ++ hash)
-    }
+    val res =
+      hashes.tail.foldLeft(hashes.head) { case (acc, hash) =>
+        sha256(acc ++ hash)
+      }
 
     res.map("%02x" format _).mkString("")
   }
 
   private var variateTempDir: Option[Path] = None
 
-  /**
-   * Get or create a platform-appropriate cache data directory, keyed by a sequence of keys. If variate is set, the
-   * returned directory will be unique for this JVM instance / VerCors run, rather than unique for the set of keys.
-   * @param variate Whether or not this process should be considered unique in the cache
-   * @param keys The set of keys to determine the cache directory by.
-   * @return The path to the cache directory
-   */
+  /** Get or create a platform-appropriate cache data directory, keyed by a
+    * sequence of keys. If variate is set, the returned directory will be unique
+    * for this JVM instance / VerCors run, rather than unique for the set of
+    * keys.
+    * @param variate
+    *   Whether or not this process should be considered unique in the cache
+    * @param keys
+    *   The set of keys to determine the cache directory by.
+    * @return
+    *   The path to the cache directory
+    */
   def getDirectory(variate: Boolean, keys: Seq[String]): Path = {
-    if(variate) {
-      if(variateTempDir.isEmpty)
-        variateTempDir = Some(Files.createTempDirectory("vercors").toAbsolutePath)
+    if (variate) {
+      if (variateTempDir.isEmpty)
+        variateTempDir = Some(
+          Files.createTempDirectory("vercors").toAbsolutePath
+        )
       variateTempDir.get
     } else {
-      Paths.get(AppDirsFactory.getInstance().getUserCacheDir("vercors", hash(keys), "utwente"))
+      Paths.get(
+        AppDirsFactory.getInstance()
+          .getUserCacheDir("vercors", hash(keys), "utwente")
+      )
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/hre/hre/data/BitString.scala b/src/hre/hre/data/BitString.scala
index b4071d2e30..3a43176d11 100644
--- a/src/hre/hre/data/BitString.scala
+++ b/src/hre/hre/data/BitString.scala
@@ -2,19 +2,51 @@ package hre.data
 
 object BitString {
   def apply(input: String): BitString = {
-    val bytes = if(input.length % 8 == 0) input.length / 8 else input.length / 8 + 1
-    val skip = if(input.length % 8 == 0) 0 else 8 - (input.length % 8)
+    val bytes =
+      if (input.length % 8 == 0)
+        input.length / 8
+      else
+        input.length / 8 + 1
+    val skip =
+      if (input.length % 8 == 0)
+        0
+      else
+        8 - (input.length % 8)
     val buf = new Array[Byte](bytes)
-    for(i <- 0 until bytes) {
+    for (i <- 0 until bytes) {
       val value =
-        (if(input(i*8+0) == '1') -128 else 0) +
-          (if(input(i*8+1) == '1') 64 else 0) +
-          (if(input(i*8+2) == '1') 32 else 0) +
-          (if(input(i*8+3) == '1') 16 else 0) +
-          (if(input(i*8+4) == '1') 8 else 0) +
-          (if(input(i*8+5) == '1') 4 else 0) +
-          (if(input(i*8+6) == '1') 2 else 0) +
-          (if(input(i*8+7) == '1') 1 else 0)
+        (if (input(i * 8 + 0) == '1')
+           -128
+         else
+           0) +
+          (if (input(i * 8 + 1) == '1')
+             64
+           else
+             0) +
+          (if (input(i * 8 + 2) == '1')
+             32
+           else
+             0) +
+          (if (input(i * 8 + 3) == '1')
+             16
+           else
+             0) +
+          (if (input(i * 8 + 4) == '1')
+             8
+           else
+             0) +
+          (if (input(i * 8 + 5) == '1')
+             4
+           else
+             0) +
+          (if (input(i * 8 + 6) == '1')
+             2
+           else
+             0) +
+          (if (input(i * 8 + 7) == '1')
+             1
+           else
+             0)
 
       buf(i) = value.toByte
     }
@@ -22,13 +54,17 @@ object BitString {
   }
 }
 
-class BitString(val rawData: Array[Byte], val skipAtLastByte: Int) extends Seq[Boolean] { bitString =>
+class BitString(val rawData: Array[Byte], val skipAtLastByte: Int)
+    extends Seq[Boolean] {
+  bitString =>
 
   require(0 <= skipAtLastByte && skipAtLastByte < 8)
 
   def toSmt: String =
-    if(skipAtLastByte == 0 || skipAtLastByte == 4) toHexSmt
-    else toBinSmt
+    if (skipAtLastByte == 0 || skipAtLastByte == 4)
+      toHexSmt
+    else
+      toBinSmt
 
   def toHexSmt: String = {
     val digit = "0123456789abcdef"
@@ -43,12 +79,10 @@ class BitString(val rawData: Array[Byte], val skipAtLastByte: Int) extends Seq[B
     if (rawData.length > 0) {
       val b = rawData.last
 
-      if(skipAtLastByte == 0) {
+      if (skipAtLastByte == 0) {
         sb += digit((b >> 4) & 0xf)
         sb += digit((b >> 0) & 0xf)
-      } else {
-        sb += digit((b >> 4) & 0xf)
-      }
+      } else { sb += digit((b >> 4) & 0xf) }
     }
 
     sb.result()
@@ -58,7 +92,7 @@ class BitString(val rawData: Array[Byte], val skipAtLastByte: Int) extends Seq[B
     val bit = "01"
     val sb = new StringBuilder("#b")
 
-    for(i <- 0 until rawData.length - 1) {
+    for (i <- 0 until rawData.length - 1) {
       val b = rawData(i)
       sb += bit((b >> 7) & 1)
       sb += bit((b >> 6) & 1)
@@ -70,9 +104,9 @@ class BitString(val rawData: Array[Byte], val skipAtLastByte: Int) extends Seq[B
       sb += bit((b >> 0) & 1)
     }
 
-    if(rawData.length > 0) {
+    if (rawData.length > 0) {
       val b = rawData.last
-      for(offset <- (skipAtLastByte until 8).reverse) {
+      for (offset <- (skipAtLastByte until 8).reverse) {
         sb += bit((b >> offset) & 1)
       }
     }
@@ -81,7 +115,7 @@ class BitString(val rawData: Array[Byte], val skipAtLastByte: Int) extends Seq[B
   }
 
   override def apply(i: Int): Boolean = {
-    if(i < 0 || i >= length)
+    if (i < 0 || i >= length)
       throw new IndexOutOfBoundsException(i)
 
     (rawData(i / 8) >> (i % 8)) > 0
@@ -94,12 +128,9 @@ class BitString(val rawData: Array[Byte], val skipAtLastByte: Int) extends Seq[B
 
     override def hasNext: Boolean = index < bitString.length
     override def next(): Boolean =
-      try {
-        bitString(index)
-      } finally {
-        index += 1
-      }
+      try { bitString(index) }
+      finally { index += 1 }
   }
 
   override def iterator: Iterator[Boolean] = new BitStringIterator
-}
\ No newline at end of file
+}
diff --git a/src/hre/hre/debug/TimeTravel.scala b/src/hre/hre/debug/TimeTravel.scala
index 831be75cfa..42c204e3dd 100644
--- a/src/hre/hre/debug/TimeTravel.scala
+++ b/src/hre/hre/debug/TimeTravel.scala
@@ -4,20 +4,22 @@ import hre.util.ScopedStack
 import vct.result.VerificationError
 import vct.result.VerificationError.SystemError
 
-/**
- * Thread-local counter that can associate errors with counted causes.
- */
+/** Thread-local counter that can associate errors with counted causes.
+  */
 object TimeTravel {
-  case class RepeatUntilCause(causeIndex: Long, exception: VerificationError) extends SystemError {
+  case class RepeatUntilCause(causeIndex: Long, exception: VerificationError)
+      extends SystemError {
     override def text: String = exception.text
   }
 
   case class CauseWithBadEffect(effect: VerificationError) extends SystemError {
-    override def text: String = s"This trace causes an error later on: \n${effect.getMessage}"
+    override def text: String =
+      s"This trace causes an error later on: \n${effect.getMessage}"
   }
 
   private val causeIndex: ThreadLocal[Long] = ThreadLocal.withInitial(() => 0L)
-  private val repeatingUntil: ScopedStack[(Long, VerificationError)] = ScopedStack()
+  private val repeatingUntil: ScopedStack[(Long, VerificationError)] =
+    ScopedStack()
 
   private def nextIndex(): Long = {
     val index = causeIndex.get()
@@ -27,15 +29,13 @@ object TimeTravel {
 
   def safelyRepeatable[T](f: => T): T = {
     val start = causeIndex.get()
-    try {
-      f
-    } catch {
+    try { f }
+    catch {
       case r @ RepeatUntilCause(idx, t) if idx >= start =>
         t.contexts ++= r.contexts
         causeIndex.set(start)
-        try {
-          repeatingUntil.having((idx, t)) { f }
-        } catch {
+        try { repeatingUntil.having((idx, t)) { f } }
+        catch {
           case c @ CauseWithBadEffect(effect) =>
             effect.contexts ++= c.contexts
             throw c
@@ -45,17 +45,12 @@ object TimeTravel {
 
   def cause[T](f: Long => T): T = {
     val idx = nextIndex()
-    if(repeatingUntil.topOption.exists(_._1 == idx)) {
+    if (repeatingUntil.topOption.exists(_._1 == idx)) {
       throw CauseWithBadEffect(repeatingUntil.top._2)
-    } else {
-      f(idx)
-    }
+    } else { f(idx) }
   }
 
   def badEffect[T](idx: Long, f: => Nothing): Nothing =
-    try {
-      f
-    } catch {
-      case t: VerificationError => throw RepeatUntilCause(idx, t)
-    }
+    try { f }
+    catch { case t: VerificationError => throw RepeatUntilCause(idx, t) }
 }
diff --git a/src/hre/hre/io/InMemoryCachedReadable.scala b/src/hre/hre/io/InMemoryCachedReadable.scala
index 16692895ca..6588657233 100644
--- a/src/hre/hre/io/InMemoryCachedReadable.scala
+++ b/src/hre/hre/io/InMemoryCachedReadable.scala
@@ -13,7 +13,12 @@ trait InMemoryCachedReadable extends Readable {
       Watch.enroll(this)
       val scanner = new Scanner(getReaderImpl)
       scanner.useDelimiter("\\A")
-      cache = Some(if (scanner.hasNext()) scanner.next() else "")
+      cache = Some(
+        if (scanner.hasNext())
+          scanner.next()
+        else
+          ""
+      )
     }
 
   override protected def getReader: Reader = {
@@ -29,9 +34,7 @@ trait InMemoryCachedReadable extends Readable {
   protected var linesCache: Option[Seq[String]] = None
 
   override def readLines(): Seq[String] = {
-    if(linesCache.isEmpty) {
-      linesCache = Some(super.readLines())
-    }
+    if (linesCache.isEmpty) { linesCache = Some(super.readLines()) }
     linesCache.get
   }
 
diff --git a/src/hre/hre/io/InterruptibleInputStream.scala b/src/hre/hre/io/InterruptibleInputStream.scala
index 0c517e769b..1e035e716b 100644
--- a/src/hre/hre/io/InterruptibleInputStream.scala
+++ b/src/hre/hre/io/InterruptibleInputStream.scala
@@ -7,7 +7,9 @@ object InterruptibleInputStream {
   val BUFFER_BLOCKS = 2
 }
 
-class InterruptibleInputStream(val underlying: InputStream) extends InputStream { outer =>
+class InterruptibleInputStream(val underlying: InputStream)
+    extends InputStream {
+  outer =>
   import InterruptibleInputStream._
 
   private def BUFFER_SIZE = BLOCK_SIZE * BUFFER_BLOCKS
@@ -25,100 +27,92 @@ class InterruptibleInputStream(val underlying: InputStream) extends InputStream
 
   class TransferThread extends Thread {
     override def run(): Unit =
-      while(!eof) {
-        if(outer.synchronized(spaceAvailable) >= BLOCK_SIZE) {
-          val toRead = outer.synchronized(Math.min(BLOCK_SIZE, BUFFER_SIZE - writeCursor))
+      while (!eof) {
+        if (outer.synchronized(spaceAvailable) >= BLOCK_SIZE) {
+          val toRead = outer
+            .synchronized(Math.min(BLOCK_SIZE, BUFFER_SIZE - writeCursor))
           val res = underlying.read(buffer, writeCursor, toRead)
 
-          if(res == -1) {
-            eof = true
-          } else {
-            writeCursor = (writeCursor + res) % BUFFER_SIZE
-          }
+          if (res == -1) { eof = true }
+          else { writeCursor = (writeCursor + res) % BUFFER_SIZE }
 
           outer.synchronized(outer.notifyAll())
-        } else {
-          outer.synchronized(outer.wait())
-        }
+        } else { outer.synchronized(outer.wait()) }
       }
   }
 
-  override final def read: Int = synchronized {
-    while(true) {
-      if(available > 0) {
-        val result = buffer(readCursor)
-        readCursor = (readCursor + 1) % BUFFER_SIZE
-        notifyAll()
-        return result
-      } else if(eof) {
-        return -1
-      } else {
-        wait()
+  override final def read: Int =
+    synchronized {
+      while (true) {
+        if (available > 0) {
+          val result = buffer(readCursor)
+          readCursor = (readCursor + 1) % BUFFER_SIZE
+          notifyAll()
+          return result
+        } else if (eof) { return -1 }
+        else { wait() }
       }
-    }
-
-    ???
-  }
 
-  override def read(bufferOut: Array[Byte], off: Int, len: Int): Int = synchronized {
-    var written = 0
+      ???
+    }
 
-    while(written < len) {
-      if(writeCursor > readCursor) {
-        val toCopy = Math.min(writeCursor - readCursor, len - written)
-        System.arraycopy(buffer, readCursor, bufferOut, off + written, toCopy)
-        readCursor += toCopy
-        notifyAll()
-        written += toCopy
-      } else if(writeCursor < readCursor) {
-        val toCopy = Math.min(BUFFER_SIZE - readCursor, len - written)
-        System.arraycopy(buffer, readCursor, bufferOut, off + written, toCopy)
-        readCursor = (readCursor + toCopy) % BUFFER_SIZE
-        notifyAll()
-        written += toCopy
-      } else if(eof) {
-        return if (written == 0) -1 else written
-      } else if(written > 0) {
-        return written
-      } else {
-        wait()
+  override def read(bufferOut: Array[Byte], off: Int, len: Int): Int =
+    synchronized {
+      var written = 0
+
+      while (written < len) {
+        if (writeCursor > readCursor) {
+          val toCopy = Math.min(writeCursor - readCursor, len - written)
+          System.arraycopy(buffer, readCursor, bufferOut, off + written, toCopy)
+          readCursor += toCopy
+          notifyAll()
+          written += toCopy
+        } else if (writeCursor < readCursor) {
+          val toCopy = Math.min(BUFFER_SIZE - readCursor, len - written)
+          System.arraycopy(buffer, readCursor, bufferOut, off + written, toCopy)
+          readCursor = (readCursor + toCopy) % BUFFER_SIZE
+          notifyAll()
+          written += toCopy
+        } else if (eof) {
+          return if (written == 0)
+            -1
+          else
+            written
+        } else if (written > 0) { return written }
+        else { wait() }
       }
-    }
 
-    written
-  }
+      written
+    }
 
   override def skip(n: Long): Long = {
     var skipped = 0L
 
-    while(skipped < n) {
+    while (skipped < n) {
       val avail = available
-      if(avail > 0 && avail < n - skipped) {
+      if (avail > 0 && avail < n - skipped) {
         skipped += avail
         readCursor = writeCursor
         notifyAll()
-      } else if(avail > 0) {
+      } else if (avail > 0) {
         readCursor = (readCursor + (n - skipped).toInt) % BUFFER_SIZE
         notifyAll()
         skipped = n
-      } else if(eof) {
-        return skipped
-      } else {
-        wait()
-      }
+      } else if (eof) { return skipped }
+      else { wait() }
     }
 
     skipped
   }
 
   override def available: Int =
-    if(writeCursor >= readCursor)
+    if (writeCursor >= readCursor)
       writeCursor - readCursor
     else
       (writeCursor - readCursor) + BUFFER_SIZE
 
   def spaceAvailable: Int =
-    if(readCursor > writeCursor)
+    if (readCursor > writeCursor)
       readCursor - writeCursor - 1
     else
       (readCursor - writeCursor - 1) + BUFFER_SIZE
diff --git a/src/hre/hre/io/LiteralReadable.scala b/src/hre/hre/io/LiteralReadable.scala
index 132b0896fb..9d0682920a 100644
--- a/src/hre/hre/io/LiteralReadable.scala
+++ b/src/hre/hre/io/LiteralReadable.scala
@@ -5,8 +5,7 @@ import java.io.{Reader, StringReader}
 case class LiteralReadable(fileName: String, data: String) extends Readable {
   override def isRereadable: Boolean = true
 
-  override protected def getReader: Reader =
-    new StringReader(data)
+  override protected def getReader: Reader = new StringReader(data)
 
   override def enroll(watch: Watch): Unit = {
     // A literal string cannot change, so there is nothing to do.
diff --git a/src/hre/hre/io/RWFile.scala b/src/hre/hre/io/RWFile.scala
index 3011f3ff70..c7071e0277 100644
--- a/src/hre/hre/io/RWFile.scala
+++ b/src/hre/hre/io/RWFile.scala
@@ -4,7 +4,8 @@ import java.io.{Reader, Writer}
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Path}
 
-case class RWFile(file: Path, doWatch: Boolean = true) extends InMemoryCachedReadable with Writeable {
+case class RWFile(file: Path, doWatch: Boolean = true)
+    extends InMemoryCachedReadable with Writeable {
   override def underlyingPath: Option[Path] = Some(file)
   override def fileName: String = file.toString
   override def isRereadable: Boolean = true
@@ -19,7 +20,8 @@ case class RWFile(file: Path, doWatch: Boolean = true) extends InMemoryCachedRea
   }
 
   override def enroll(watch: Watch): Unit = {
-    if(doWatch) watch.enroll(file)
+    if (doWatch)
+      watch.enroll(file)
     watch.invalidate(this)
   }
 }
diff --git a/src/hre/hre/io/Readable.scala b/src/hre/hre/io/Readable.scala
index 20128cbc44..e7b7767468 100644
--- a/src/hre/hre/io/Readable.scala
+++ b/src/hre/hre/io/Readable.scala
@@ -18,18 +18,18 @@ trait Readable {
   def read[T](f: Reader => T): T = {
     Watch.enroll(this)
     val r = getReader
-    try {
-      f(r)
-    } finally {
-      r.close()
-    }
+    try { f(r) }
+    finally { r.close() }
   }
 
   def readToCompletion(): String =
     read { reader =>
       val scanner = new Scanner(reader)
       scanner.useDelimiter("\\A")
-      if(scanner.hasNext()) scanner.next() else ""
+      if (scanner.hasNext())
+        scanner.next()
+      else
+        ""
     }
 
   def readLines(): Seq[String] =
@@ -42,23 +42,28 @@ trait Readable {
       var previousPosition = 0
       var position = 0
 
-      while(length > 0) {
+      while (length > 0) {
         val token = new StringBuilder
 
-        while(position < length && buffer(position) != '\n')
+        while (position < length && buffer(position) != '\n')
           position += 1
 
-        while(length > 0 && position == length) {
-          token.append(CharBuffer.wrap(buffer, previousPosition, position - previousPosition))
+        while (length > 0 && position == length) {
+          token.append(
+            CharBuffer
+              .wrap(buffer, previousPosition, position - previousPosition)
+          )
           length = reader.read(buffer)
           previousPosition = 0
           position = 0
 
-          while(position < length && buffer(position) != '\n')
+          while (position < length && buffer(position) != '\n')
             position += 1
         }
 
-        token.append(CharBuffer.wrap(buffer, previousPosition, position - previousPosition))
+        token.append(
+          CharBuffer.wrap(buffer, previousPosition, position - previousPosition)
+        )
         result += token.toString()
         position += 1
         previousPosition = position
diff --git a/src/hre/hre/io/ReaderReadable.scala b/src/hre/hre/io/ReaderReadable.scala
index 1e8e899822..927d8a6208 100644
--- a/src/hre/hre/io/ReaderReadable.scala
+++ b/src/hre/hre/io/ReaderReadable.scala
@@ -1,10 +1,10 @@
 package hre.io
 import java.io.Reader
 
-/**
- * Constructs a readable from a [[java.io.Reader]]. If this reader is for a file, use [[RWFile]] instead: otherwise
- * it will mess up the watch file tracking.
- */
+/** Constructs a readable from a [[java.io.Reader]]. If this reader is for a
+  * file, use [[RWFile]] instead: otherwise it will mess up the watch file
+  * tracking.
+  */
 case class ReaderReadable(fileName: String, reader: Reader) extends Readable {
   override def isRereadable: Boolean = false
 
diff --git a/src/hre/hre/io/Watch.scala b/src/hre/hre/io/Watch.scala
index 4b53d6f645..993496f4e1 100644
--- a/src/hre/hre/io/Watch.scala
+++ b/src/hre/hre/io/Watch.scala
@@ -3,37 +3,45 @@ package hre.io
 import com.typesafe.scalalogging.LazyLogging
 import sun.misc.{Signal, SignalHandler}
 
-import java.nio.file.{ClosedWatchServiceException, FileSystem, FileSystems, Path, StandardWatchEventKinds, WatchEvent, WatchKey, WatchService}
+import java.nio.file.{
+  ClosedWatchServiceException,
+  FileSystem,
+  FileSystems,
+  Path,
+  StandardWatchEventKinds,
+  WatchEvent,
+  WatchKey,
+  WatchService,
+}
 import java.util.concurrent.TimeUnit
 import scala.collection.mutable
 import scala.jdk.CollectionConverters.CollectionHasAsScala
 import scala.util.control.Breaks.{break, breakable}
 
-/**
- * Watch facilitates that VerCors can automatically re-run when external input
- * changes. Implementors of [[Readable]] can vary how we detect external
- * changes, but typically we just listen to the change of a file just before
- * VerCors reads it.
- */
+/** Watch facilitates that VerCors can automatically re-run when external input
+  * changes. Implementors of [[Readable]] can vary how we detect external
+  * changes, but typically we just listen to the change of a file just before
+  * VerCors reads it.
+  */
 object Watch {
   private var currentWatch: Option[Watch] = None
 
   def booleanWithWatch[T](doWatch: Boolean, default: T)(f: => T): T =
-    if(doWatch) {
+    if (doWatch) {
       val watch = new Watch(Thread.currentThread())
       currentWatch = Some(watch)
       val sigint = new Signal("INT")
-      val previousHandler = Signal.handle(sigint, _ => Watch.currentWatch.get.mainThread.interrupt())
+      val previousHandler = Signal
+        .handle(sigint, _ => Watch.currentWatch.get.mainThread.interrupt())
 
       var result: T = default
 
       try {
-        while(true) {
-          try {
-            result = f
-          } catch {
+        while (true) {
+          try { result = f }
+          catch {
             case _: InterruptedException =>
-              // f was interrupted - wait until something changes.
+            // f was interrupted - wait until something changes.
           }
           watch.await()
         }
@@ -47,16 +55,15 @@ object Watch {
         Signal.handle(sigint, previousHandler)
         currentWatch = None
       }
-    } else {
-      f
-    }
+    } else { f }
 
   def enroll(readable: Readable): Unit = {
     currentWatch.foreach { watch => readable.enroll(watch) }
   }
 }
 
-class Watch(val mainThread: Thread) extends LazyLogging { watch =>
+class Watch(val mainThread: Thread) extends LazyLogging {
+  watch =>
   private val watchServices = mutable.Map[FileSystem, WatchService]()
   private val watchedDirs = mutable.Set[Path]()
   private val watchedFiles = mutable.Set[Path]()
@@ -69,13 +76,12 @@ class Watch(val mainThread: Thread) extends LazyLogging { watch =>
 
   private var debounceInterrupt = true
 
-  def watchCount: Int =
-    watchedFiles.size
+  def watchCount: Int = watchedFiles.size
 
   def enroll(dirtyPath: Path): Unit = {
     val path = dirtyPath.toAbsolutePath.normalize()
     val parent = Option(path.getParent).getOrElse(path)
-    if(!watchedDirs.contains(parent)) {
+    if (!watchedDirs.contains(parent)) {
       watchedDirs += parent
       val fs = parent.getFileSystem
       val ws = watchServices.getOrElseUpdate(fs, fs.newWatchService())
@@ -98,10 +104,10 @@ class Watch(val mainThread: Thread) extends LazyLogging { watch =>
     val parent = key.watchable().asInstanceOf[Path]
     val events = key.pollEvents().asScala.toSeq
     key.reset()
-    for(event <- events) {
+    for (event <- events) {
       val relPath = event.context().asInstanceOf[Path]
       val path = parent.resolve(relPath)
-      if(watchedFiles.contains(path) || watchedFiles.contains(parent)) {
+      if (watchedFiles.contains(path) || watchedFiles.contains(parent)) {
         return true
       }
     }
@@ -109,59 +115,64 @@ class Watch(val mainThread: Thread) extends LazyLogging { watch =>
     false
   }
 
-  private def fileWatchThread() = new Thread {
-    override def run(): Unit = try {
-      watchServices.values.toSeq match {
-        case Nil => return
-        case Seq(ws) =>
-          // Typical: normally all plain files belong to one file system.
-          while(!isWatchedFile(ws.take())) {}
-        case watchServices =>
-          breakable {
-            while (true) {
-              // We spend approximately 0.1s per pass over all [[WatchService]]s
-              for (ws <- watchServices) {
-                val key = Option(ws.poll(100_000 / watchServices.size, TimeUnit.MICROSECONDS))
-
-                key match {
-                  case Some(key) if isWatchedFile(key) => break()
-                  case _ => // continue
+  private def fileWatchThread() =
+    new Thread {
+      override def run(): Unit =
+        try {
+          watchServices.values.toSeq match {
+            case Nil => return
+            case Seq(ws) =>
+              // Typical: normally all plain files belong to one file system.
+              while (!isWatchedFile(ws.take())) {}
+            case watchServices =>
+              breakable {
+                while (true) {
+                  // We spend approximately 0.1s per pass over all [[WatchService]]s
+                  for (ws <- watchServices) {
+                    val key = Option(ws.poll(
+                      100_000 / watchServices.size,
+                      TimeUnit.MICROSECONDS,
+                    ))
+
+                    key match {
+                      case Some(key) if isWatchedFile(key) => break()
+                      case _ => // continue
+                    }
+                  }
                 }
               }
-            }
           }
-      }
-      watch.signal()
-    } catch {
-      case _: InterruptedException => // do nothing
-      case _: ClosedWatchServiceException => // do nothing
+          watch.signal()
+        } catch {
+          case _: InterruptedException => // do nothing
+          case _: ClosedWatchServiceException => // do nothing
+        }
     }
-  }
 
-  private def stdinWatchThread() = new Thread {
-    override def run(): Unit = try {
-      var res = System.in.read()
+  private def stdinWatchThread() =
+    new Thread {
+      override def run(): Unit =
+        try {
+          var res = System.in.read()
 
-      while(res != -1 && res != '\n'.toInt) {
-        res = System.in.read()
-      }
+          while (res != -1 && res != '\n'.toInt) { res = System.in.read() }
 
-      if(res == '\n'.toInt) {
-        watch.signal()
-      }
-    } catch {
-      case _: InterruptedException => // do nothing
+          if (res == '\n'.toInt) { watch.signal() }
+        } catch {
+          case _: InterruptedException => // do nothing
+        }
     }
-  }
 
-  private def disableDebounceThread() = new Thread {
-    override def run(): Unit = try {
-      Thread.sleep(1000)
-      debounceInterrupt = false
-    } catch {
-      case _: InterruptedException => // do nothing
+  private def disableDebounceThread() =
+    new Thread {
+      override def run(): Unit =
+        try {
+          Thread.sleep(1000)
+          debounceInterrupt = false
+        } catch {
+          case _: InterruptedException => // do nothing
+        }
     }
-  }
 
   private def addThread(t: Thread): Unit = {
     threads = t +: threads
@@ -170,33 +181,26 @@ class Watch(val mainThread: Thread) extends LazyLogging { watch =>
     t.start()
   }
 
-  private def signal(): Unit = synchronized {
-    triggered = true
-    notifyAll()
-  }
+  private def signal(): Unit =
+    synchronized {
+      triggered = true
+      notifyAll()
+    }
 
   private def reset(): Unit = {
-    for(ws <- watchServices.values) {
-      ws.close()
-    }
+    for (ws <- watchServices.values) { ws.close() }
 
     watchServices.clear()
     watchedDirs.clear()
     watchedFiles.clear()
 
-    for(inv <- toInvalidate) {
-      inv.invalidate()
-    }
+    for (inv <- toInvalidate) { inv.invalidate() }
 
     toInvalidate = Nil
 
-    for(thread <- threads) {
-      thread.interrupt()
-    }
+    for (thread <- threads) { thread.interrupt() }
 
-    for(thread <- threads) {
-      thread.join()
-    }
+    for (thread <- threads) { thread.join() }
 
     threads = Nil
 
@@ -205,28 +209,28 @@ class Watch(val mainThread: Thread) extends LazyLogging { watch =>
     debounceInterrupt = true
   }
 
-  def await(): Unit = synchronized {
-    addThread(fileWatchThread())
-    addThread(stdinWatchThread())
+  def await(): Unit =
+    synchronized {
+      addThread(fileWatchThread())
+      addThread(stdinWatchThread())
 
-    addThread(disableDebounceThread())
+      addThread(disableDebounceThread())
 
-    logger.info(s"[Waiting for $watchCount external inputs to change - press ENTER to run again manually]")
+      logger.info(
+        s"[Waiting for $watchCount external inputs to change - press ENTER to run again manually]"
+      )
 
-    while(!triggered) {
-      try {
-        wait()
-      } catch {
-        case _: InterruptedException =>
-          if(debounceInterrupt) {
-            logger.info(s"[Press Ctrl+C again to exit VerCors]")
-            debounceInterrupt = false
-          } else {
-            throw new InterruptedException()
-          }
+      while (!triggered) {
+        try { wait() }
+        catch {
+          case _: InterruptedException =>
+            if (debounceInterrupt) {
+              logger.info(s"[Press Ctrl+C again to exit VerCors]")
+              debounceInterrupt = false
+            } else { throw new InterruptedException() }
+        }
       }
-    }
 
-    reset()
-  }
-}
\ No newline at end of file
+      reset()
+    }
+}
diff --git a/src/hre/hre/io/Writeable.scala b/src/hre/hre/io/Writeable.scala
index 7a763c5937..9c2657f76f 100644
--- a/src/hre/hre/io/Writeable.scala
+++ b/src/hre/hre/io/Writeable.scala
@@ -8,10 +8,7 @@ trait Writeable {
 
   def write[T](f: Writer => T): T = {
     val writer = getWriter
-    try {
-      f(writer)
-    } finally {
-      writer.close()
-    }
+    try { f(writer) }
+    finally { writer.close() }
   }
 }
diff --git a/src/hre/hre/log/LogHistory.scala b/src/hre/hre/log/LogHistory.scala
index 259f4165df..778383719b 100644
--- a/src/hre/hre/log/LogHistory.scala
+++ b/src/hre/hre/log/LogHistory.scala
@@ -12,12 +12,12 @@ object LogHistory {
 
 class LogHistory extends AppenderBase[ILoggingEvent] {
   override def append(e: ILoggingEvent): Unit = {
-    if(!e.getMessage.isBlank)
-      LogHistory.messages.append(new String(enc.encode(e), StandardCharsets.UTF_8))
+    if (!e.getMessage.isBlank)
+      LogHistory.messages
+        .append(new String(enc.encode(e), StandardCharsets.UTF_8))
   }
 
   var enc: Encoder[ILoggingEvent] = null
 
-  def setEncoder(encoder: Encoder[ILoggingEvent]): Unit =
-    enc = encoder
+  def setEncoder(encoder: Encoder[ILoggingEvent]): Unit = enc = encoder
 }
diff --git a/src/hre/hre/perf/Profile.scala b/src/hre/hre/perf/Profile.scala
index 43e2ce8ada..fbf7cace60 100644
--- a/src/hre/hre/perf/Profile.scala
+++ b/src/hre/hre/perf/Profile.scala
@@ -11,9 +11,14 @@ case object Profile {
   private var currentProfile: Option[Profile] = None
 
   def install(profile: Boolean): Unit =
-    if(profile) currentProfile = Some(Profile())
-
-  def update(stack: Seq[String], ownUsage: ResourceUsage, doUpdateChildUsage: Boolean): Unit =
+    if (profile)
+      currentProfile = Some(Profile())
+
+  def update(
+      stack: Seq[String],
+      ownUsage: ResourceUsage,
+      doUpdateChildUsage: Boolean,
+  ): Unit =
     currentProfile.foreach(_.update(stack, ownUsage, doUpdateChildUsage))
 
   def finish(): Unit = {
@@ -44,35 +49,39 @@ case class Profile() {
 
   private val samples = mutable.ArrayBuffer[Sample]()
 
-  def update(stack: Seq[String], ownUsage: ResourceUsage, doUpdateChildUsage: Boolean): Unit = synchronized {
-    val deltaChild = if (doUpdateChildUsage) {
-      val childUsage = ResourceUsage.getAggregateChildren
-      val deltaChild = childUsage - lastChildUsage
-      lastChildUsage = childUsage
-      deltaChild
-    } else {
-      ResourceUsage.zero
+  def update(
+      stack: Seq[String],
+      ownUsage: ResourceUsage,
+      doUpdateChildUsage: Boolean,
+  ): Unit =
+    synchronized {
+      val deltaChild =
+        if (doUpdateChildUsage) {
+          val childUsage = ResourceUsage.getAggregateChildren
+          val deltaChild = childUsage - lastChildUsage
+          lastChildUsage = childUsage
+          deltaChild
+        } else { ResourceUsage.zero }
+
+      val deltaAgg = deltaChild + ownUsage
+
+      val locations = stack.map(loc)
+
+      samples += Sample(
+        locationId = locations,
+        value = Seq(
+          deltaAgg.userTime + deltaAgg.systemTime,
+          deltaAgg.userTime,
+          deltaAgg.systemTime,
+          ownUsage.userTime,
+          ownUsage.systemTime,
+          deltaChild.userTime,
+          deltaChild.systemTime,
+          ownUsage.wallTime,
+        ),
+      )
     }
 
-    val deltaAgg = deltaChild + ownUsage
-
-    val locations = stack.map(loc)
-
-    samples += Sample(
-      locationId = locations,
-      value = Seq(
-        deltaAgg.userTime + deltaAgg.systemTime,
-        deltaAgg.userTime,
-        deltaAgg.systemTime,
-        ownUsage.userTime,
-        ownUsage.systemTime,
-        deltaChild.userTime,
-        deltaChild.systemTime,
-        ownUsage.wallTime,
-      ),
-    )
-  }
-
   def finish(): Unit = {
     val result = perftools.profiles.Profile(
       sampleType = valueTypes,
@@ -84,7 +93,8 @@ case class Profile() {
       timeNanos = epochStartNanos,
       defaultSampleType = builder.str("agg"),
     )
-    val out = new GZIPOutputStream(Files.newOutputStream(Paths.get("profile.pprof.gz")))
+    val out =
+      new GZIPOutputStream(Files.newOutputStream(Paths.get("profile.pprof.gz")))
     result.writeTo(out)
     out.close()
   }
diff --git a/src/hre/hre/perf/ProfileBuilder.scala b/src/hre/hre/perf/ProfileBuilder.scala
index 5036bac1cb..94441247cf 100644
--- a/src/hre/hre/perf/ProfileBuilder.scala
+++ b/src/hre/hre/perf/ProfileBuilder.scala
@@ -9,10 +9,12 @@ class ProfileBuilder {
   private val stringTable = mutable.ArrayBuffer[String]("")
 
   def str(s: String): Long =
-    stringIndex.getOrElseUpdate(s, {
-      stringTable += s
-      stringIndex.size
-    })
+    stringIndex.getOrElseUpdate(
+      s, {
+        stringTable += s
+        stringIndex.size
+      },
+    )
 
   def finishStringTable(): Seq[String] = stringTable.toIndexedSeq
 
@@ -21,15 +23,16 @@ class ProfileBuilder {
   private val functionTable = mutable.ArrayBuffer[Function]()
 
   def loc(s: String): Long =
-    locationIndex.getOrElseUpdate(s, {
-      val id = functionTable.size + 1
-      functionTable += Function(id = id, name = str(s))
-      locationTable += Location(id = id, line = Seq(Line(functionId = id)))
-      id
-    })
+    locationIndex.getOrElseUpdate(
+      s, {
+        val id = functionTable.size + 1
+        functionTable += Function(id = id, name = str(s))
+        locationTable += Location(id = id, line = Seq(Line(functionId = id)))
+        id
+      },
+    )
 
   def finishLocationTable(): Seq[Location] = locationTable.toIndexedSeq
   def finishFunctionTable(): Seq[Function] = functionTable.toIndexedSeq
 
-
 }
diff --git a/src/hre/hre/perf/ResourceUsage.scala b/src/hre/hre/perf/ResourceUsage.scala
index fa3fb6342c..dd662eb782 100644
--- a/src/hre/hre/perf/ResourceUsage.scala
+++ b/src/hre/hre/perf/ResourceUsage.scala
@@ -17,11 +17,18 @@ object ResourceUsage {
       case Platform.Unix | Platform.Mac =>
         try {
           val usage = new RUsage()
-          if (LibC.INSTANCE.getrusage(who, usage) != 0) return fallback()
-          ResourceUsage(usage.ru_utime.toUsec, usage.ru_stime.toUsec, usage.ru_inblock, usage.ru_oublock, usage.ru_nvcsw, usage.ru_nivcsw, System.nanoTime() / 1000L - boot)
-        } catch {
-          case _: UnsatisfiedLinkError => fallback()
-        }
+          if (LibC.INSTANCE.getrusage(who, usage) != 0)
+            return fallback()
+          ResourceUsage(
+            usage.ru_utime.toUsec,
+            usage.ru_stime.toUsec,
+            usage.ru_inblock,
+            usage.ru_oublock,
+            usage.ru_nvcsw,
+            usage.ru_nivcsw,
+            System.nanoTime() / 1000L - boot,
+          )
+        } catch { case _: UnsatisfiedLinkError => fallback() }
       case _ => fallback()
     }
   }
@@ -34,13 +41,13 @@ object ResourceUsage {
 }
 
 case class ResourceUsage(
-  userTime: Microseconds,
-  systemTime: Microseconds,
-  readBlocks: Long,
-  writtenBlocks: Long,
-  voluntaryContextSwitches: Long,
-  involuntaryContextSwitches: Long,
-  wallTime: Microseconds,
+    userTime: Microseconds,
+    systemTime: Microseconds,
+    readBlocks: Long,
+    writtenBlocks: Long,
+    voluntaryContextSwitches: Long,
+    involuntaryContextSwitches: Long,
+    wallTime: Microseconds,
 ) {
   override def toString: String =
     s"user=${userTime}μs sys=${systemTime}μs in=${readBlocks}blocks out=${writtenBlocks}blocks voluntaryYield=${voluntaryContextSwitches} involuntaryYield=${involuntaryContextSwitches}"
@@ -51,8 +58,14 @@ case class ResourceUsage(
       systemTime = op(systemTime, other.systemTime),
       readBlocks = op(readBlocks, other.readBlocks),
       writtenBlocks = op(writtenBlocks, other.writtenBlocks),
-      voluntaryContextSwitches = op(voluntaryContextSwitches, other.voluntaryContextSwitches),
-      involuntaryContextSwitches = op(involuntaryContextSwitches, other.involuntaryContextSwitches),
+      voluntaryContextSwitches = op(
+        voluntaryContextSwitches,
+        other.voluntaryContextSwitches,
+      ),
+      involuntaryContextSwitches = op(
+        involuntaryContextSwitches,
+        other.involuntaryContextSwitches,
+      ),
       wallTime = op(wallTime, other.wallTime),
     )
     assert(result.userTime >= 0)
@@ -72,4 +85,4 @@ case class ResourceUsage(
 
   def -(other: ResourceUsage): ResourceUsage = applyOp(_ - _)(other)
   def +(other: ResourceUsage): ResourceUsage = applyOp(_ + _)(other)
-}
\ No newline at end of file
+}
diff --git a/src/hre/hre/platform/Platform.scala b/src/hre/hre/platform/Platform.scala
index 1ed04b56f2..5669eeb59b 100644
--- a/src/hre/hre/platform/Platform.scala
+++ b/src/hre/hre/platform/Platform.scala
@@ -10,16 +10,22 @@ case object Platform {
   case object Mac extends Platform
 
   case class UnknownPlatform(name: String) extends UserError {
-    override def text: String = s"Unknown platform: $name. Please specify paths to binaries for z3 and boogie."
+    override def text: String =
+      s"Unknown platform: $name. Please specify paths to binaries for z3 and boogie."
     override def code: String = "unknownPlatform"
   }
 
   val getCurrent: Platform = {
     val name = System.getProperty("os.name").toLowerCase
-    if(name.contains("win")) Platform.Windows
-    else if(name.contains("linux")) Platform.Unix
-    else if(name.contains("nix")) Platform.Unix
-    else if(name.contains("mac")) Platform.Mac
-    else throw UnknownPlatform(name)
+    if (name.contains("win"))
+      Platform.Windows
+    else if (name.contains("linux"))
+      Platform.Unix
+    else if (name.contains("nix"))
+      Platform.Unix
+    else if (name.contains("mac"))
+      Platform.Mac
+    else
+      throw UnknownPlatform(name)
   }
 }
diff --git a/src/hre/hre/progress/Layout.scala b/src/hre/hre/progress/Layout.scala
index 2960b555ef..64360ed6d2 100644
--- a/src/hre/hre/progress/Layout.scala
+++ b/src/hre/hre/progress/Layout.scala
@@ -13,30 +13,38 @@ case object Layout extends LazyLogging {
     AnsiConsole.systemInstall()
   }
 
-  private def wantProgress: Boolean = AnsiConsole.out().getType match {
-    case AnsiType.Native | AnsiType.VirtualTerminal | AnsiType.Emulation => true
-    case AnsiType.Unsupported | AnsiType.Redirected => forceProgress
-  }
+  private def wantProgress: Boolean =
+    AnsiConsole.out().getType match {
+      case AnsiType.Native | AnsiType.VirtualTerminal | AnsiType.Emulation =>
+        true
+      case AnsiType.Unsupported | AnsiType.Redirected => forceProgress
+    }
 
-  private def wantPrettyProgress: Boolean = AnsiConsole.out().getType match {
-    case AnsiType.Native | AnsiType.VirtualTerminal | AnsiType.Emulation => true
-    case AnsiType.Unsupported | AnsiType.Redirected => false
-  }
+  private def wantPrettyProgress: Boolean =
+    AnsiConsole.out().getType match {
+      case AnsiType.Native | AnsiType.VirtualTerminal | AnsiType.Emulation =>
+        true
+      case AnsiType.Unsupported | AnsiType.Redirected => false
+    }
 
-  def maxWidth: Int = (AnsiConsole.out().getTerminalWidth match {
-    case 0 => 80
-    case other => other
-  }) - 2
+  def maxWidth: Int =
+    (AnsiConsole.out().getTerminalWidth match {
+      case 0 => 80
+      case other => other
+    }) - 2
 
   def maxHeight: Int = 32
 
-  def esc(command: Char, args: String = ""): String =
-    "\u001b[" + args + command
+  def esc(command: Char, args: String = ""): String = "\u001b[" + args + command
 
   def osc(command: String, arg: String): String =
     "\u001b]" + command + ";" + arg + "\u001b\\"
 
-  def upBy(n: Int): String = if(n==0) "" else esc('A', n.toString)
+  def upBy(n: Int): String =
+    if (n == 0)
+      ""
+    else
+      esc('A', n.toString)
 
   def clearLine: String = esc('K')
   def clearToEnd: String = esc('J', "0")
@@ -50,64 +58,71 @@ case object Layout extends LazyLogging {
 
   def undoProgressMessage: String =
     if (wantProgress) {
-      if (wantPrettyProgress) {
-        upBy(printedLines) + clearToEnd
-      } else {
-        "\r" + " ".repeat(maxWidth) + "\r"
-      }
-    } else ""
+      if (wantPrettyProgress) { upBy(printedLines) + clearToEnd }
+      else { "\r" + " ".repeat(maxWidth) + "\r" }
+    } else
+      ""
 
   def progressEstimate: Double = TaskRegistry.getRootTask.progress
 
-  def progressBadge: String =
-    f"[${progressEstimate * 100}%.1f%%]"
+  def progressBadge: String = f"[${progressEstimate * 100}%.1f%%]"
 
   def progressBar: String = {
     val prefix = progressBadge + " ["
     val postfix = "]"
     val maxProgressBarWidth = maxWidth - prefix.length - postfix.length
     val bumpedProgress = progressEstimate * 0.99 + 0.01
-    val progress = (bumpedProgress * maxProgressBarWidth * PROGRESS_BLOCKS.length).toInt
+    val progress =
+      (bumpedProgress * maxProgressBarWidth * PROGRESS_BLOCKS.length).toInt
     val fullBlocks = progress / PROGRESS_BLOCKS.length
     val halfBlockIdx = progress % PROGRESS_BLOCKS.length
 
-    prefix + (
-      if (halfBlockIdx == 0) PROGRESS_BLOCKS.last.toString.repeat(fullBlocks) + " ".repeat(maxProgressBarWidth - fullBlocks)
-      else PROGRESS_BLOCKS.last.toString.repeat(fullBlocks) + PROGRESS_BLOCKS(halfBlockIdx) + " ".repeat(maxProgressBarWidth - fullBlocks - 1)
-    ) + postfix
+    prefix +
+      (if (halfBlockIdx == 0)
+         PROGRESS_BLOCKS.last.toString.repeat(fullBlocks) +
+           " ".repeat(maxProgressBarWidth - fullBlocks)
+       else
+         PROGRESS_BLOCKS.last.toString.repeat(fullBlocks) +
+           PROGRESS_BLOCKS(halfBlockIdx) +
+           " ".repeat(maxProgressBarWidth - fullBlocks - 1)) + postfix
   }
 
   def updateProgressMessage(): Unit =
-    currentProgressMessage = if (TaskRegistry.rootTask.nonEmpty && TaskRegistry.getRootTask.nonEmpty) {
-      if (wantProgress) {
-        if (wantPrettyProgress) {
-          val lines = TaskRegistry.getRootTask.render(maxWidth, maxHeight-1)
-          progressMessageLines = lines.size + 1
-          (progressBar +: lines).mkString("", f"%n", f"%n")
-        } else {
-          val lines = TaskRegistry.getRootTask.render(maxWidth, 1)
-          s"$progressBadge ${lines.last}"
-        }
-      } else ""
-    } else {
-      progressMessageLines = 0
-      ""
-    }
+    currentProgressMessage =
+      if (TaskRegistry.rootTask.nonEmpty && TaskRegistry.getRootTask.nonEmpty) {
+        if (wantProgress) {
+          if (wantPrettyProgress) {
+            val lines = TaskRegistry.getRootTask.render(maxWidth, maxHeight - 1)
+            progressMessageLines = lines.size + 1
+            (progressBar +: lines).mkString("", f"%n", f"%n")
+          } else {
+            val lines = TaskRegistry.getRootTask.render(maxWidth, 1)
+            s"$progressBadge ${lines.last}"
+          }
+        } else
+          ""
+      } else {
+        progressMessageLines = 0
+        ""
+      }
 
-  /**
-   * Print an updated progress message to stdout
-   * @return whether the number of printed progress lines changed
-   */
-  def update(): Boolean = synchronized {
-    val lastPrintedLines = printedLines
-    updateProgressMessage()
-    logger.info("")
-    printedLines > lastPrintedLines
-  }
+  /** Print an updated progress message to stdout
+    * @return
+    *   whether the number of printed progress lines changed
+    */
+  def update(): Boolean =
+    synchronized {
+      val lastPrintedLines = printedLines
+      updateProgressMessage()
+      logger.info("")
+      printedLines > lastPrintedLines
+    }
 
-  def commitProgressMessage(outputBeforeProgress: String): String = synchronized {
-    val toPrint = undoProgressMessage + outputBeforeProgress + currentProgressMessage
-    printedLines = progressMessageLines
-    toPrint
-  }
+  def commitProgressMessage(outputBeforeProgress: String): String =
+    synchronized {
+      val toPrint =
+        undoProgressMessage + outputBeforeProgress + currentProgressMessage
+      printedLines = progressMessageLines
+      toPrint
+    }
 }
diff --git a/src/hre/hre/progress/Progress.scala b/src/hre/hre/progress/Progress.scala
index 1a5f1c7f2b..4d229197d6 100644
--- a/src/hre/hre/progress/Progress.scala
+++ b/src/hre/hre/progress/Progress.scala
@@ -17,29 +17,31 @@ case object Progress {
     Profile.install(profile)
   }
 
-  def finish(): Unit = synchronized {
-    blockLayoutUpdateTask.foreach(_.cancel())
-    blockLayoutUpdateTimer.foreach { timer =>
-      timer.purge()
-      timer.cancel()
+  def finish(): Unit =
+    synchronized {
+      blockLayoutUpdateTask.foreach(_.cancel())
+      blockLayoutUpdateTimer.foreach { timer =>
+        timer.purge()
+        timer.cancel()
+      }
+      blockLayoutUpdateTimer = None
+      TaskRegistry.finish()
+      Layout.update()
+      Profile.finish()
     }
-    blockLayoutUpdateTimer = None
-    TaskRegistry.finish()
-    Layout.update()
-    Profile.finish()
-  }
 
-  def abort(): Unit = synchronized {
-    blockLayoutUpdateTask.foreach(_.cancel())
-    blockLayoutUpdateTimer.foreach { timer =>
-      timer.purge()
-      timer.cancel()
+  def abort(): Unit =
+    synchronized {
+      blockLayoutUpdateTask.foreach(_.cancel())
+      blockLayoutUpdateTimer.foreach { timer =>
+        timer.purge()
+        timer.cancel()
+      }
+      blockLayoutUpdateTimer = None
+      TaskRegistry.abort()
+      Layout.update()
+      Profile.finish()
     }
-    blockLayoutUpdateTimer = None
-    TaskRegistry.abort()
-    Layout.update()
-    Profile.finish()
-  }
 
   private var blockLayoutUpdateTimer: Option[Timer] = None
   private var blockLayoutUpdateTask: Option[TimerTask] = None
@@ -51,69 +53,73 @@ case object Progress {
     blockLayoutUpdateTask.foreach(_.cancel())
     blockLayoutUpdateTimer.get.purge()
     blockLayoutUpdateTask = Some(new TimerTask {
-      override def run(): Unit = Progress.synchronized {
-        if (newLayoutAfterTimeout) {
-          val printedLinesDidChange = Layout.update()
-          newLayoutAfterTimeout = false
-          delayNextUpdate(longDelay = printedLinesDidChange)
-        } else {
-          blockLayoutUpdate = false
+      override def run(): Unit =
+        Progress.synchronized {
+          if (newLayoutAfterTimeout) {
+            val printedLinesDidChange = Layout.update()
+            newLayoutAfterTimeout = false
+            delayNextUpdate(longDelay = printedLinesDidChange)
+          } else { blockLayoutUpdate = false }
         }
-      }
     })
-    val updateInterval = if(longDelay) UPDATE_INTERAL_LONG_MS else UPDATE_INTERVAL_MS
-    blockLayoutUpdateTimer.get.schedule(blockLayoutUpdateTask.get, updateInterval)
+    val updateInterval =
+      if (longDelay)
+        UPDATE_INTERAL_LONG_MS
+      else
+        UPDATE_INTERVAL_MS
+    blockLayoutUpdateTimer.get
+      .schedule(blockLayoutUpdateTask.get, updateInterval)
   }
 
-  def update(): Unit = Progress.synchronized {
-    if(blockLayoutUpdate) {
-      newLayoutAfterTimeout = true
-    } else {
-      val printedLinesDidChange = Layout.update()
-      newLayoutAfterTimeout = false
-      delayNextUpdate(longDelay = printedLinesDidChange)
+  def update(): Unit =
+    Progress.synchronized {
+      if (blockLayoutUpdate) { newLayoutAfterTimeout = true }
+      else {
+        val printedLinesDidChange = Layout.update()
+        newLayoutAfterTimeout = false
+        delayNextUpdate(longDelay = printedLinesDidChange)
+      }
     }
-  }
 
   private def tryWeight(xs: IterableOnce[_]): Option[Double] =
-    if(xs.knownSize > 0) Some(1.0 / xs.knownSize)
-    else None
+    if (xs.knownSize > 0)
+      Some(1.0 / xs.knownSize)
+    else
+      None
 
   def foreach[T](xs: IterableOnce[T], desc: T => String)(f: T => Unit): Unit =
-    if(TaskRegistry.enabled) {
+    if (TaskRegistry.enabled) {
       val superTask = TaskRegistry.currentTaskInThread
       xs.iterator.foreach(x => {
-        SimpleNamedTask(superTask, desc(x), tryWeight(xs)).frame {
-          f(x)
-        }
+        SimpleNamedTask(superTask, desc(x), tryWeight(xs)).frame { f(x) }
       })
-    } else {
-      xs.iterator.foreach(f)
-    }
+    } else { xs.iterator.foreach(f) }
 
-  def map[T, S](xs: IterableOnce[T], desc: T => String)(f: T => S): IterableOnce[S] =
-    if(TaskRegistry.enabled) {
+  def map[T, S](xs: IterableOnce[T], desc: T => String)(
+      f: T => S
+  ): IterableOnce[S] =
+    if (TaskRegistry.enabled) {
       val superTask = TaskRegistry.currentTaskInThread
       xs.iterator.map(x => {
-        SimpleNamedTask(superTask, desc(x), tryWeight(xs)).frame {
-          f(x)
-        }
+        SimpleNamedTask(superTask, desc(x), tryWeight(xs)).frame { f(x) }
       })
-    } else {
-      xs.iterator.map(f)
-    }
+    } else { xs.iterator.map(f) }
 
   def stages[T](names: Seq[(String, Int)])(f: (() => Unit) => T): T =
-    if(TaskRegistry.enabled) {
+    if (TaskRegistry.enabled) {
       val sum = names.map(_._2).sum
       val weights = names.map(_._2.toDouble / sum)
-      NameSequenceTask(TaskRegistry.currentTaskInThread, names.map(_._1), weights).scope(f)
+      NameSequenceTask(
+        TaskRegistry.currentTaskInThread,
+        names.map(_._1),
+        weights,
+      ).scope(f)
     } else
       f(() => {})
 
   def dynamicMessages[T](count: Int)(f: (String => Unit) => T): T =
-    if(TaskRegistry.enabled)
+    if (TaskRegistry.enabled)
       UpdateableTask(TaskRegistry.currentTaskInThread, Some(count)).scope(f)
     else
       f(_ => {})
-}
\ No newline at end of file
+}
diff --git a/src/hre/hre/progress/ProgressAwareLogbackLayout.scala b/src/hre/hre/progress/ProgressAwareLogbackLayout.scala
index a5532eb51c..37a8a97962 100644
--- a/src/hre/hre/progress/ProgressAwareLogbackLayout.scala
+++ b/src/hre/hre/progress/ProgressAwareLogbackLayout.scala
@@ -16,14 +16,12 @@ class ProgressAwareLogbackLayout extends LayoutBase[ILoggingEvent] {
     System.out.flush()
     val message = event.getFormattedMessage
     val baseMessage =
-      if(message.isBlank)
+      if (message.isBlank)
         ""
-      else if(message.contains('\n'))
-        event.getFormattedMessage.strip +
-          CoreConstants.LINE_SEPARATOR
+      else if (message.contains('\n'))
+        event.getFormattedMessage.strip + CoreConstants.LINE_SEPARATOR
       else
-        s"[${event.getLevel}] " +
-          event.getFormattedMessage +
+        s"[${event.getLevel}] " + event.getFormattedMessage +
           CoreConstants.LINE_SEPARATOR
 
     Layout.commitProgressMessage(baseMessage + tpc.convert(event))
diff --git a/src/hre/hre/progress/ProgressLogicError.scala b/src/hre/hre/progress/ProgressLogicError.scala
index 64f04c3e2f..fdfcb97d0b 100644
--- a/src/hre/hre/progress/ProgressLogicError.scala
+++ b/src/hre/hre/progress/ProgressLogicError.scala
@@ -2,6 +2,9 @@ package hre.progress
 
 import vct.result.VerificationError.SystemError
 
-class ProgressLogicError(trail: Seq[String], amount: Double) extends SystemError {
-  override def text: String = s"The amount of progress ($amount) exceeds the range [0; 1] at trail: ${trail.reverse.mkString(" > ")}"
+class ProgressLogicError(trail: Seq[String], amount: Double)
+    extends SystemError {
+  override def text: String =
+    s"The amount of progress ($amount) exceeds the range [0; 1] at trail: ${trail
+        .reverse.mkString(" > ")}"
 }
diff --git a/src/hre/hre/progress/ProgressRender.scala b/src/hre/hre/progress/ProgressRender.scala
index fdb547fea5..0376817060 100644
--- a/src/hre/hre/progress/ProgressRender.scala
+++ b/src/hre/hre/progress/ProgressRender.scala
@@ -12,27 +12,30 @@ case object ProgressRender {
   val BRANCH = "├"
   val HOOK = "└"
 
-  def apply(label: String): ProgressRender =
-    ProgressRender(Seq(label), 0)
+  def apply(label: String): ProgressRender = ProgressRender(Seq(label), 0)
 }
 
 case class ProgressRender(lines: Seq[String], primaryLineIndex: Int) {
   def prefix(prefix: String): ProgressRender =
-    copy(lines = lines.take(primaryLineIndex) ++ Seq(prefix + lines(primaryLineIndex)) ++ lines.drop(primaryLineIndex+1))
+    copy(lines =
+      lines.take(primaryLineIndex) ++ Seq(prefix + lines(primaryLineIndex)) ++
+        lines.drop(primaryLineIndex + 1)
+    )
 
   def postfix(postfix: String): ProgressRender =
-    copy(lines = lines.take(primaryLineIndex) ++ Seq(lines(primaryLineIndex) + postfix) ++ lines.drop(primaryLineIndex+1))
+    copy(lines =
+      lines.take(primaryLineIndex) ++ Seq(lines(primaryLineIndex) + postfix) ++
+        lines.drop(primaryLineIndex + 1)
+    )
 
   def subRenders(renders: Seq[(String, ProgressRender)]): ProgressRender = {
-    val prefixedInit = renders.init.map {
-      case (badge, unbadgedRender) =>
-        val render = unbadgedRender.prefix(badge)
-        render.lines.zipWithIndex.map {
-          case (line, idx) if idx == render.primaryLineIndex =>
-            BRANCH + HORIZONTAL_LINE + " " + line
-          case (line, _) =>
-            VERTICAL_LINE + " " + " " + line
-        }
+    val prefixedInit = renders.init.map { case (badge, unbadgedRender) =>
+      val render = unbadgedRender.prefix(badge)
+      render.lines.zipWithIndex.map {
+        case (line, idx) if idx == render.primaryLineIndex =>
+          BRANCH + HORIZONTAL_LINE + " " + line
+        case (line, _) => VERTICAL_LINE + " " + " " + line
+      }
     }
 
     val prefixedLast = {
@@ -43,11 +46,13 @@ case class ProgressRender(lines: Seq[String], primaryLineIndex: Int) {
           VERTICAL_LINE + " " + " " + line
         case (line, idx) if idx == render.primaryLineIndex =>
           HOOK + HORIZONTAL_LINE + " " + line
-        case (line, _) =>
-          " ".repeat(3) + line
+        case (line, _) => " ".repeat(3) + line
       }
     }
 
-    ProgressRender(lines ++ prefixedInit.flatten ++ prefixedLast, primaryLineIndex)
+    ProgressRender(
+      lines ++ prefixedInit.flatten ++ prefixedLast,
+      primaryLineIndex,
+    )
   }
-}
\ No newline at end of file
+}
diff --git a/src/hre/hre/progress/TaskRegistry.scala b/src/hre/hre/progress/TaskRegistry.scala
index 5ae1d66839..1913fb6150 100644
--- a/src/hre/hre/progress/TaskRegistry.scala
+++ b/src/hre/hre/progress/TaskRegistry.scala
@@ -8,55 +8,60 @@ import scala.collection.mutable.ArrayBuffer
 case object TaskRegistry {
   private var mainThreadId = -1L
   private var mainThreadRootTask: Option[RootTask] = None
-  val threadTaskStack: ThreadLocal[ArrayBuffer[AbstractTask]] = ThreadLocal.withInitial(() => ArrayBuffer())
+  val threadTaskStack: ThreadLocal[ArrayBuffer[AbstractTask]] = ThreadLocal
+    .withInitial(() => ArrayBuffer())
 
   def enabled: Boolean = mainThreadRootTask.isDefined
 
-  def install(): Unit = synchronized {
-    mainThreadId = Thread.currentThread().getId
-    mainThreadRootTask = Some(RootTask())
-    getRootTask.start()
-  }
+  def install(): Unit =
+    synchronized {
+      mainThreadId = Thread.currentThread().getId
+      mainThreadRootTask = Some(RootTask())
+      getRootTask.start()
+    }
 
-  def finish(): Unit = synchronized {
-    getRootTask.end()
-    mainThreadRootTask = None
-  }
+  def finish(): Unit =
+    synchronized {
+      getRootTask.end()
+      mainThreadRootTask = None
+    }
 
-  def abort(): Unit = synchronized {
-    mainThreadRootTask.foreach(_.abort())
-    mainThreadRootTask = None
-  }
+  def abort(): Unit =
+    synchronized {
+      mainThreadRootTask.foreach(_.abort())
+      mainThreadRootTask = None
+    }
 
   def isMainThread: Boolean = Thread.currentThread().getId == mainThreadId
   def rootTask: Option[RootTask] = mainThreadRootTask
   def getRootTask: RootTask = rootTask.get
 
-  /**
-   * SAFETY: If called from a non-main thread, a task with an explicit superTask must be started first. This is for
-   * example the case when a thread is started as Progress.{foreach,map}(xs.par, _) { ... }: the superTask is
-   * established in the thread setting up the parallel run.
-   */
-  def currentTaskInThread: AbstractTask =
-    threadTaskStack.get().last
+  /** SAFETY: If called from a non-main thread, a task with an explicit
+    * superTask must be started first. This is for example the case when a
+    * thread is started as Progress.{foreach,map}(xs.par, _) { ... }: the
+    * superTask is established in the thread setting up the parallel run.
+    */
+  def currentTaskInThread: AbstractTask = threadTaskStack.get().last
 
   def push(task: AbstractTask): Unit =
-    if(enabled)
+    if (enabled)
       threadTaskStack.get() += task
 
   def pop(task: AbstractTask): Unit =
-    if(enabled)
-      if(Thread.currentThread().getId == task.getOwnerThread) {
+    if (enabled)
+      if (Thread.currentThread().getId == task.getOwnerThread) {
         assert(threadTaskStack.get().lastOption.contains(task))
         threadTaskStack.get() -= task
       }
 
   def ownUsage(): ResourceUsage =
-    if(enabled) {
-      if(isMainThread) ResourceUsage.getProcess
-      else ResourceUsage.getCallingThread
-    }
-    else ResourceUsage.zero
+    if (enabled) {
+      if (isMainThread)
+        ResourceUsage.getProcess
+      else
+        ResourceUsage.getCallingThread
+    } else
+      ResourceUsage.zero
 
   def reportUsage(usage: ResourceUsage, trail: Seq[String]): Unit =
     Profile.update(trail, usage, doUpdateChildUsage = isMainThread)
diff --git a/src/hre/hre/progress/task/AbstractTask.scala b/src/hre/hre/progress/task/AbstractTask.scala
index ce82a35291..3bf3f10d3b 100644
--- a/src/hre/hre/progress/task/AbstractTask.scala
+++ b/src/hre/hre/progress/task/AbstractTask.scala
@@ -17,23 +17,30 @@ abstract class AbstractTask {
   def progressWeight: Option[Double] = None
   protected var progressDone: Double = 0.0
 
-  def progress: Double = synchronized {
-    val subtaksProgress = subTasks.map(t => t.progressWeight -> t.progress)
-    val knownWeightProgress = subtaksProgress.collect { case Some(weight) -> progress => weight * progress }.sum[Double]
-    val knownDone = progressDone + knownWeightProgress
-    val unknownWeightProgress = subtaksProgress.collect { case None -> progress => progress }.sortBy(-_)
-    val result = unknownWeightProgress.foldLeft(knownDone) {
-      case (progress, subtaskProgress) => progress + ((1.0 - progress) * 0.1 * subtaskProgress)
-    }
+  def progress: Double =
+    synchronized {
+      val subtaksProgress = subTasks.map(t => t.progressWeight -> t.progress)
+      val knownWeightProgress = subtaksProgress.collect {
+        case Some(weight) -> progress => weight * progress
+      }.sum[Double]
+      val knownDone = progressDone + knownWeightProgress
+      val unknownWeightProgress = subtaksProgress.collect {
+        case None -> progress => progress
+      }.sortBy(-_)
+      val result =
+        unknownWeightProgress.foldLeft(knownDone) {
+          case (progress, subtaskProgress) =>
+            progress + ((1.0 - progress) * 0.1 * subtaskProgress)
+        }
 
-    if(result < 0.0 - EPILSON || result > 1.0 + EPILSON) {
-      throw new ProgressLogicError(profilingTrail, result)
-    }
+      if (result < 0.0 - EPILSON || result > 1.0 + EPILSON) {
+        throw new ProgressLogicError(profilingTrail, result)
+      }
 
-    if(result > 1.0) {
-      1.0
-    } else result
-  }
+      if (result > 1.0) { 1.0 }
+      else
+        result
+    }
 
   private var ownerThread = -1L
   def getOwnerThread: Long = ownerThread
@@ -41,21 +48,23 @@ abstract class AbstractTask {
   def superTaskOrRoot: Option[AbstractTask]
 
   def profilingBreadcrumb: String
-  def profilingTrail: Seq[String] = profilingBreadcrumb +: superTaskOrRoot.toSeq.flatMap(_.profilingTrail)
+  def profilingTrail: Seq[String] =
+    profilingBreadcrumb +: superTaskOrRoot.toSeq.flatMap(_.profilingTrail)
 
   def renderHere: ProgressRender
   def renderHereShort: ProgressRender = renderHere
 
-  def poll(): ResourceUsage = synchronized {
-    if(Thread.currentThread().getId != ownerThread)
-      return TaskRegistry.ownUsage()
+  def poll(): ResourceUsage =
+    synchronized {
+      if (Thread.currentThread().getId != ownerThread)
+        return TaskRegistry.ownUsage()
 
-    val usage = TaskRegistry.ownUsage()
-    val delta = usage - startUsage.get - usageReported
-    TaskRegistry.reportUsage(delta, profilingTrail)
-    usageReported += delta
-    usage
-  }
+      val usage = TaskRegistry.ownUsage()
+      val delta = usage - startUsage.get - usageReported
+      TaskRegistry.reportUsage(delta, profilingTrail)
+      usageReported += delta
+      usage
+    }
 
   def start(): Unit = {
     ownerThread = Thread.currentThread().getId
@@ -86,7 +95,8 @@ abstract class AbstractTask {
         superTask.synchronized {
           superTask.subTasks -= this
           superTask.usageReported += usageReported
-          superTask.progressDone += progressWeight.getOrElse(0.1 * (1.0 - superTask.progressDone))
+          superTask.progressDone +=
+            progressWeight.getOrElse(0.1 * (1.0 - superTask.progressDone))
         }
     }
 
@@ -105,61 +115,62 @@ abstract class AbstractTask {
     end()
   }
 
-  private def renderProgressWith(depthForDetail: Int): ProgressRender = synchronized {
-    val here = if(depthForDetail <= 0) renderHere else renderHereShort
-    val sub = subTasks.toIndexedSeq
-
-    sub match {
-      case Nil =>
-        here
-      case Seq(sub) =>
-        val subRender = sub.renderProgressWith(depthForDetail - 1)
-        if(subRender.lines.size == 1)
-          here.postfix(ProgressRender.JOIN + subRender.lines.head)
-        else if(here.lines.size == 1 && subRender.primaryLineIndex == 0)
-          subRender.prefix(here.lines.head + ProgressRender.JOIN)
+  private def renderProgressWith(depthForDetail: Int): ProgressRender =
+    synchronized {
+      val here =
+        if (depthForDetail <= 0)
+          renderHere
         else
-          here.subRenders(Seq(f"[${sub.progress * 100}%.1f%%] " -> subRender))
-      case subs =>
-        here.subRenders(subs.map { sub =>
-          f"[${sub.progress * 100}%.1f%%] " -> sub.renderProgressWith(depthForDetail - 1)
-        })
+          renderHereShort
+      val sub = subTasks.toIndexedSeq
+
+      sub match {
+        case Nil => here
+        case Seq(sub) =>
+          val subRender = sub.renderProgressWith(depthForDetail - 1)
+          if (subRender.lines.size == 1)
+            here.postfix(ProgressRender.JOIN + subRender.lines.head)
+          else if (here.lines.size == 1 && subRender.primaryLineIndex == 0)
+            subRender.prefix(here.lines.head + ProgressRender.JOIN)
+          else
+            here.subRenders(Seq(f"[${sub.progress * 100}%.1f%%] " -> subRender))
+        case subs =>
+          here.subRenders(subs.map { sub =>
+            f"[${sub.progress * 100}%.1f%%] " ->
+              sub.renderProgressWith(depthForDetail - 1)
+          })
+      }
     }
-  }
 
   def render(maxWidth: Int, maxHeight: Int): Seq[String] = {
-    val progress = (0 until 10).to(LazyList).map(renderProgressWith).collectFirst {
-      case render if render.lines.size <= maxHeight => render
-    }.getOrElse(renderProgressWith(1000))
-
-    progress.lines
-      .takeRight(maxHeight)
-      .map { line =>
-        if(line.length <= maxWidth) line
-        else {
-          val avail = maxWidth - ProgressRender.ELLIPSIS.length
-          val split = avail * 2 / 3
-          line.take(split) + ProgressRender.ELLIPSIS + line.takeRight(avail - split)
-        }
+    val progress = (0 until 10).to(LazyList).map(renderProgressWith)
+      .collectFirst { case render if render.lines.size <= maxHeight => render }
+      .getOrElse(renderProgressWith(1000))
+
+    progress.lines.takeRight(maxHeight).map { line =>
+      if (line.length <= maxWidth)
+        line
+      else {
+        val avail = maxWidth - ProgressRender.ELLIPSIS.length
+        val split = avail * 2 / 3
+        line.take(split) + ProgressRender.ELLIPSIS +
+          line.takeRight(avail - split)
       }
+    }
   }
 
   def nonEmpty: Boolean = synchronized { subTasks.nonEmpty }
 
   def frame[T](f: => T): T = {
     start()
-    try {
-      f
-    } finally {
-      end()
-    }
+    try { f }
+    finally { end() }
   }
 
   def frame1[I, O](f: I => O): I => O =
-    (i) => try {
-      start()
-      f(i)
-    } finally {
-      end()
-    }
-}
\ No newline at end of file
+    (i) =>
+      try {
+        start()
+        f(i)
+      } finally { end() }
+}
diff --git a/src/hre/hre/progress/task/NameSequenceTask.scala b/src/hre/hre/progress/task/NameSequenceTask.scala
index 288c6b626c..c75712f377 100644
--- a/src/hre/hre/progress/task/NameSequenceTask.scala
+++ b/src/hre/hre/progress/task/NameSequenceTask.scala
@@ -1,7 +1,11 @@
 package hre.progress.task
 import hre.progress.ProgressRender
 
-case class NameSequenceTask(superTask: AbstractTask, var names: Seq[String], var progressWeights: Seq[Double] = Nil) extends Task {
+case class NameSequenceTask(
+    superTask: AbstractTask,
+    var names: Seq[String],
+    var progressWeights: Seq[Double] = Nil,
+) extends Task {
   override def profilingBreadcrumb: String = names.head
   override def renderHere: ProgressRender = ProgressRender(names.head)
 
@@ -9,17 +13,18 @@ case class NameSequenceTask(superTask: AbstractTask, var names: Seq[String], var
 
   def scope[T](f: (() => Unit) => T): T = {
     start()
-    try {
-      f(next)
-    } finally {
-      end()
-    }
+    try { f(next) }
+    finally { end() }
   }
 
   private def next(): Unit = {
     end()
     names = names.tail
-    progressWeights = if(progressWeights.isEmpty) Nil else progressWeights.tail
+    progressWeights =
+      if (progressWeights.isEmpty)
+        Nil
+      else
+        progressWeights.tail
     progressDone = 0.0
     start()
   }
diff --git a/src/hre/hre/progress/task/RootTask.scala b/src/hre/hre/progress/task/RootTask.scala
index 8bf29c1be1..e2dc76b707 100644
--- a/src/hre/hre/progress/task/RootTask.scala
+++ b/src/hre/hre/progress/task/RootTask.scala
@@ -9,8 +9,6 @@ case class RootTask() extends AbstractTask {
   override def end(): Unit = {
     poll()
     val stack = TaskRegistry.threadTaskStack.get()
-    if(stack.lastOption.contains(this)) {
-      stack.remove(stack.length - 1)
-    }
+    if (stack.lastOption.contains(this)) { stack.remove(stack.length - 1) }
   }
 }
diff --git a/src/hre/hre/progress/task/SimpleNamedTask.scala b/src/hre/hre/progress/task/SimpleNamedTask.scala
index 5d367c32b6..2c8ea839a0 100644
--- a/src/hre/hre/progress/task/SimpleNamedTask.scala
+++ b/src/hre/hre/progress/task/SimpleNamedTask.scala
@@ -1,7 +1,11 @@
 package hre.progress.task
 import hre.progress.ProgressRender
 
-case class SimpleNamedTask(superTask: AbstractTask, name: String, override val progressWeight: Option[Double] = None) extends Task {
+case class SimpleNamedTask(
+    superTask: AbstractTask,
+    name: String,
+    override val progressWeight: Option[Double] = None,
+) extends Task {
   override def profilingBreadcrumb: String = name
   override def renderHere: ProgressRender = ProgressRender(name)
 }
diff --git a/src/hre/hre/progress/task/UpdateableTask.scala b/src/hre/hre/progress/task/UpdateableTask.scala
index b485cb3d3e..f956dc846e 100644
--- a/src/hre/hre/progress/task/UpdateableTask.scala
+++ b/src/hre/hre/progress/task/UpdateableTask.scala
@@ -1,25 +1,33 @@
 package hre.progress.task
 import hre.progress.ProgressRender
 
-case class UpdateableTask(superTask: AbstractTask, approxUpdates: Option[Int] = None) extends Task {
+case class UpdateableTask(
+    superTask: AbstractTask,
+    approxUpdates: Option[Int] = None,
+) extends Task {
   private var currentName: Option[String] = None
   private var updatesDone = 0
 
   override def progressWeight: Option[Double] =
-    approxUpdates.map(approxUpdates => if(updatesDone < approxUpdates) 1.0 / approxUpdates else 0.0)
+    approxUpdates.map(approxUpdates =>
+      if (updatesDone < approxUpdates)
+        1.0 / approxUpdates
+      else
+        0.0
+    )
 
   override def profilingBreadcrumb: String = currentName.get
   override def renderHere: ProgressRender = ProgressRender(currentName.get)
 
   def scope[T](f: (String => Unit) => T): T =
-    try {
-      f(update)
-    } finally {
-      if(currentName.isDefined) end()
+    try { f(update) }
+    finally {
+      if (currentName.isDefined)
+        end()
     }
 
   private def update(name: String): Unit = {
-    if(currentName.isDefined) {
+    if (currentName.isDefined) {
       end()
       progressDone = 0.0
     }
diff --git a/src/hre/hre/resource/ResourceUtil.scala b/src/hre/hre/resource/ResourceUtil.scala
index a3b64881c0..16fe60faae 100644
--- a/src/hre/hre/resource/ResourceUtil.scala
+++ b/src/hre/hre/resource/ResourceUtil.scala
@@ -8,26 +8,28 @@ import java.nio.file.{Path, Paths}
 
 case object ResourceUtil {
   case class NoSuchResource(path: String) extends SystemError {
-    override def text: String = s"Could not find required resource at path $path"
+    override def text: String =
+      s"Could not find required resource at path $path"
   }
 
-  def getResource(path: String): Path = try {
-    Option(getClass.getResource(path)) match {
-      case Some(url) => Paths.get(url.toURI)
-      case None => throw NoSuchResource(path)
-    }
-  } catch {
-    case _: URISyntaxException => throw NoSuchResource(path)
-  }
+  def getResource(path: String): Path =
+    try {
+      Option(getClass.getResource(path)) match {
+        case Some(url) => Paths.get(url.toURI)
+        case None => throw NoSuchResource(path)
+      }
+    } catch { case _: URISyntaxException => throw NoSuchResource(path) }
 
-  def getPlatformDep(tail: String): Path = Platform.getCurrent match {
-    case Platform.Windows => getResource(s"/win/$tail")
-    case Platform.Unix => getResource(s"/unix/$tail")
-    case Platform.Mac => getResource(s"/darwin/$tail")
-  }
+  def getPlatformDep(tail: String): Path =
+    Platform.getCurrent match {
+      case Platform.Windows => getResource(s"/win/$tail")
+      case Platform.Unix => getResource(s"/unix/$tail")
+      case Platform.Mac => getResource(s"/darwin/$tail")
+    }
 
-  def getPlatformBinary(tail: String): Path = Platform.getCurrent match {
-    case Platform.Windows => getPlatformDep(tail + ".exe")
-    case _ => getPlatformDep(tail)
-  }
+  def getPlatformBinary(tail: String): Path =
+    Platform.getCurrent match {
+      case Platform.Windows => getPlatformDep(tail + ".exe")
+      case _ => getPlatformDep(tail)
+    }
 }
diff --git a/src/hre/hre/stages/Stages.scala b/src/hre/hre/stages/Stages.scala
index 9c3ca815e5..97380ef3b8 100644
--- a/src/hre/hre/stages/Stages.scala
+++ b/src/hre/hre/stages/Stages.scala
@@ -9,20 +9,23 @@ trait Stage[-Input, +Output] {
 
   def run(in: Input): Output
 
-  def thenRun[NewOutput](stage: Stage[Output, NewOutput]): Stages[Input, NewOutput] =
-    UnitStages(this).thenRun(stage)
+  def thenRun[NewOutput](
+      stage: Stage[Output, NewOutput]
+  ): Stages[Input, NewOutput] = UnitStages(this).thenRun(stage)
 
-  def thenRun[NewOutput](stages: Stages[Output, NewOutput]): Stages[Input, NewOutput] =
-    UnitStages(this).thenRun(stages)
+  def thenRun[NewOutput](
+      stages: Stages[Output, NewOutput]
+  ): Stages[Input, NewOutput] = UnitStages(this).thenRun(stages)
 
-  def saveInput: Stages[Input, (_ >: Input, Output)] = SaveInputStage(UnitStages(this))
+  def saveInput: Stages[Input, (_ >: Input, Output)] =
+    SaveInputStage(UnitStages(this))
 
   def transform[Output2](f: Output => Output2): Stages[Input, Output2] = {
     UnitStages(this).thenRun(FunctionStage(f))
   }
 
   def also(f: => Unit): Stages[Input, Output] = {
-   UnitStages(this).thenRun(FunctionStage[Output, Output](x => { f; x }))
+    UnitStages(this).thenRun(FunctionStage[Output, Output](x => { f; x }))
   }
 
   def preprocess[Input2](f: Input2 => Input): Stages[Input2, Output] =
@@ -37,8 +40,9 @@ case class IdentityStage[T]() extends Stage[T, T] {
   override def progressWeight: Int = 0
 }
 
-abstract class WrapStage[InnerInput, InnerOutput, OuterInput, OuterOutput](stage: Stage[InnerInput, InnerOutput])
-  extends Stage[OuterInput, OuterOutput] {
+abstract class WrapStage[InnerInput, InnerOutput, OuterInput, OuterOutput](
+    stage: Stage[InnerInput, InnerOutput]
+) extends Stage[OuterInput, OuterOutput] {
   override def friendlyName: String = stage.friendlyName
 
   override def progressWeight: Int = stage.progressWeight
@@ -50,14 +54,25 @@ abstract class WrapStage[InnerInput, InnerOutput, OuterInput, OuterOutput](stage
 }
 
 object Stages {
-  def saveInput[Input, Output](stages: Stages[Input, Output]): Stages[Input, (Input, Output)] = SaveInputStage(stages)
-
-  def skipIf[Input](condition: Boolean, stages: Stages[Input, Unit]): Stages[Input, Unit] = SkipIf(condition, stages)
-
-  def branch[Input, Output](condition: Boolean, tt: Stages[Input, Output], ff: Stages[Input, Output]): Branch[Input, Output] = Branch[Input, Output](condition, tt, ff)
-
-  def preprocess[Input2, Input, Output](f: Input2 => Input, stages: Stages[Input, Output]): Stages[Input2, Output] =
-    UnitStages(FunctionStage(f)).thenRun(stages)
+  def saveInput[Input, Output](
+      stages: Stages[Input, Output]
+  ): Stages[Input, (Input, Output)] = SaveInputStage(stages)
+
+  def skipIf[Input](
+      condition: Boolean,
+      stages: Stages[Input, Unit],
+  ): Stages[Input, Unit] = SkipIf(condition, stages)
+
+  def branch[Input, Output](
+      condition: Boolean,
+      tt: Stages[Input, Output],
+      ff: Stages[Input, Output],
+  ): Branch[Input, Output] = Branch[Input, Output](condition, tt, ff)
+
+  def preprocess[Input2, Input, Output](
+      f: Input2 => Input,
+      stages: Stages[Input, Output],
+  ): Stages[Input2, Output] = UnitStages(FunctionStage(f)).thenRun(stages)
 }
 
 trait Stages[-Input, +Output] {
@@ -67,26 +82,28 @@ trait Stages[-Input, +Output] {
       Progress.stages(flatNames) { progressNext =>
         var cur: Any = in
 
-        for((stage, idx) <- stages.zipWithIndex) {
-          if(idx > 0) progressNext()
+        for ((stage, idx) <- stages.zipWithIndex) {
+          if (idx > 0)
+            progressNext()
           cur = stage.run(cur)
         }
 
         Right(cur.asInstanceOf[Output])
       }
-    } catch {
-      case err: VerificationError => Left(err)
-    }
+    } catch { case err: VerificationError => Left(err) }
 
   def collect: Seq[Stage[Nothing, Any]]
 
-  def flatNames: Seq[(String, Int)] = collect.map(s => s.friendlyName -> s.progressWeight)
+  def flatNames: Seq[(String, Int)] =
+    collect.map(s => s.friendlyName -> s.progressWeight)
 
-  def thenRun[NewOutput](stage: Stage[Output, NewOutput]): Stages[Input, NewOutput] =
-    thenRun(UnitStages(stage))
+  def thenRun[NewOutput](
+      stage: Stage[Output, NewOutput]
+  ): Stages[Input, NewOutput] = thenRun(UnitStages(stage))
 
-  def thenRun[NewOutput](stages: Stages[Output, NewOutput]): Stages[Input, NewOutput] =
-    StagesPair(this, stages)
+  def thenRun[NewOutput](
+      stages: Stages[Output, NewOutput]
+  ): Stages[Input, NewOutput] = StagesPair(this, stages)
 
   def transform[Output2](f: Output => Output2): Stages[Input, Output2] =
     thenRun(FunctionStage(f))
@@ -101,16 +118,22 @@ case class FunctionStage[T, S](f: T => S) extends Stage[T, S] {
   override def run(in: T): S = f(in)
 }
 
-case class UnitStages[-Input, +Output](stage: Stage[Input, Output]) extends Stages[Input, Output] {
+case class UnitStages[-Input, +Output](stage: Stage[Input, Output])
+    extends Stages[Input, Output] {
   override def collect: Seq[Stage[Nothing, Any]] = Seq(stage)
 }
 
-case class StagesPair[-Input, Mid, +Output](left: Stages[Input, Mid], right: Stages[Mid, Output]) extends Stages[Input, Output] {
+case class StagesPair[-Input, Mid, +Output](
+    left: Stages[Input, Mid],
+    right: Stages[Mid, Output],
+) extends Stages[Input, Output] {
   override def collect: Seq[Stage[Nothing, Any]] = left.collect ++ right.collect
 }
 
-case class SaveInputStage[Input, Output](stages: Stages[Input, Output]) extends Stages[Input, (Input, Output)] {
-  case class RetainInput[Input, Output](stage: Stage[Input, Output]) extends WrapStage[Input, Output, Input, (Input, Output)](stage) {
+case class SaveInputStage[Input, Output](stages: Stages[Input, Output])
+    extends Stages[Input, (Input, Output)] {
+  case class RetainInput[Input, Output](stage: Stage[Input, Output])
+      extends WrapStage[Input, Output, Input, (Input, Output)](stage) {
     var in: Option[Input] = None
     override def zoomIn(in: Input): Input = {
       this.in = Some(in)
@@ -119,7 +142,8 @@ case class SaveInputStage[Input, Output](stages: Stages[Input, Output]) extends
     override def zoomOut(out: Output): (Input, Output) = (in.get, out)
   }
 
-  case class Map_2[Left, Input, Output](stage: Stage[Input, Output]) extends WrapStage[Input, Output, (Left, Input), (Left, Output)](stage) {
+  case class Map_2[Left, Input, Output](stage: Stage[Input, Output])
+      extends WrapStage[Input, Output, (Left, Input), (Left, Output)](stage) {
     var left: Option[Left] = None
     override def zoomIn(in: (Left, Input)): Input = {
       left = Some(in._1)
@@ -128,21 +152,34 @@ case class SaveInputStage[Input, Output](stages: Stages[Input, Output]) extends
     override def zoomOut(out: Output): (Left, Output) = (left.get, out)
   }
 
-  override def collect: Seq[Stage[Nothing, Any]] = stages.collect match {
-    case Seq() => Seq()
-    case Seq(stage) => Seq(RetainInput[Nothing, Any](stage).asInstanceOf[Stage[Nothing, Any]])
-    case stage +: stages =>
-      RetainInput[Nothing, Any](stage).asInstanceOf[Stage[Nothing, Any]] +: stages.map(Map_2[Nothing, Nothing, Any])
-  }
+  override def collect: Seq[Stage[Nothing, Any]] =
+    stages.collect match {
+      case Seq() => Seq()
+      case Seq(stage) =>
+        Seq(RetainInput[Nothing, Any](stage).asInstanceOf[Stage[Nothing, Any]])
+      case stage +: stages =>
+        RetainInput[Nothing, Any](stage).asInstanceOf[Stage[Nothing, Any]] +:
+          stages.map(Map_2[Nothing, Nothing, Any])
+    }
 }
 
-case class SkipIf[Input](condition: Boolean, stages: Stages[Input, Unit]) extends Stages[Input, Unit] {
+case class SkipIf[Input](condition: Boolean, stages: Stages[Input, Unit])
+    extends Stages[Input, Unit] {
   override def collect: Seq[Stage[Nothing, Any]] =
-    if(condition)
+    if (condition)
       Seq(FunctionStage((_: Input) => ()))
-    else stages.collect
+    else
+      stages.collect
 }
 
-case class Branch[Input, Output](condition: Boolean, tt: Stages[Input, Output], ff: Stages[Input, Output]) extends Stages[Input, Output] {
-  override def collect: Seq[Stage[Nothing, Any]] = if(condition) tt.collect else ff.collect
+case class Branch[Input, Output](
+    condition: Boolean,
+    tt: Stages[Input, Output],
+    ff: Stages[Input, Output],
+) extends Stages[Input, Output] {
+  override def collect: Seq[Stage[Nothing, Any]] =
+    if (condition)
+      tt.collect
+    else
+      ff.collect
 }
diff --git a/src/hre/hre/util/FuncTools.scala b/src/hre/hre/util/FuncTools.scala
index 454ffc3dc2..20286a0498 100644
--- a/src/hre/hre/util/FuncTools.scala
+++ b/src/hre/hre/util/FuncTools.scala
@@ -1,12 +1,14 @@
 package hre.util
 
 case object FuncTools {
-  def repeat[T](f: T => T, n: Int, arg: T): T =
-    (0 until n).foldLeft(arg)((res, _) => f(res))
+  def repeat[T](f: T => T, n: Int, arg: T): T = (0 until n)
+    .foldLeft(arg)((res, _) => f(res))
 
   def firstOption[T](options: Seq[Option[T]]): Option[T] =
     options.foldLeft(Option.empty[T])(_ orElse _)
 
-  def firstOption[In, Out](data: Seq[In], func: Function[In, Option[Out]]): Option[Out] =
-    data.foldLeft(Option.empty[Out])(_ orElse func(_))
+  def firstOption[In, Out](
+      data: Seq[In],
+      func: Function[In, Option[Out]],
+  ): Option[Out] = data.foldLeft(Option.empty[Out])(_ orElse func(_))
 }
diff --git a/src/hre/hre/util/Interrupt.scala b/src/hre/hre/util/Interrupt.scala
index 172efd625b..f330b289bb 100644
--- a/src/hre/hre/util/Interrupt.scala
+++ b/src/hre/hre/util/Interrupt.scala
@@ -2,7 +2,5 @@ package hre.util
 
 object Interrupt {
   def check(): Unit =
-    if(Thread.interrupted()) {
-      throw new InterruptedException()
-    }
+    if (Thread.interrupted()) { throw new InterruptedException() }
 }
diff --git a/src/hre/hre/util/Notifier.scala b/src/hre/hre/util/Notifier.scala
index 4d5d2aa6e0..26eafca845 100644
--- a/src/hre/hre/util/Notifier.scala
+++ b/src/hre/hre/util/Notifier.scala
@@ -10,12 +10,13 @@ import java.nio.file.{Files, Paths}
 import java.util.regex.Pattern
 
 object Notifier {
-  def notify(title: String, message: String): Boolean = Platform.getCurrent match {
-    case Platform.Windows => notifyWindows10(title, message)
-    case Platform.Mac => notifyMacOS(title, message)
-    case Platform.Unix => notifyLibnotify(title, message)
-    case _ => false
-  }
+  def notify(title: String, message: String): Boolean =
+    Platform.getCurrent match {
+      case Platform.Windows => notifyWindows10(title, message)
+      case Platform.Mac => notifyMacOS(title, message)
+      case Platform.Unix => notifyLibnotify(title, message)
+      case _ => false
+    }
 
   def notifyLibnotify(title: String, message: String): Boolean = {
     if (commandExists("notify-send")) {
@@ -24,21 +25,21 @@ object Notifier {
         case 0 => true
         case _ => false
       }
-    } else {
-      false
-    }
+    } else { false }
   }
 
   def notifyMacOS(title: String, message: String): Boolean = {
     if (commandExists("osascript")) {
-      val cmd = Seq("osascript", "-e", s"""display notification "$message" with title "$title"""")
+      val cmd = Seq(
+        "osascript",
+        "-e",
+        s"""display notification "$message" with title "$title"""",
+      )
       cmd ! ProcessLogger(_ => (), _ => ()) match {
         case 0 => true
         case _ => false
       }
-    } else {
-      false
-    }
+    } else { false }
   }
 
   val powershellNotificationScript: String =
@@ -73,9 +74,7 @@ object Notifier {
   def notifyWindows10(title: String, message: String): Boolean = {
     // Only allow safe characters
     val ok = (x: String) => Pattern.matches("[a-zA-Z ]*", x)
-    if (!ok(title) || !ok(message)) {
-      return false
-    }
+    if (!ok(title) || !ok(message)) { return false }
 
     // Script comes from: https://gist.github.com/Windos/9aa6a684ac583e0d38a8fa68196bc2dc
     val script = powershellNotificationScript.format(title, message)
@@ -86,8 +85,7 @@ object Notifier {
   }
 
   def commandExists(cmd: String): Boolean = {
-    System.getenv().asScala.getOrElse("PATH", "")
-      .split(PATH_SEPARATOR)
+    System.getenv().asScala.getOrElse("PATH", "").split(PATH_SEPARATOR)
       .exists(path => {
         val p = Paths.get(path).resolve(cmd)
         Files.exists(p) && !Files.isDirectory(p) && Files.isExecutable(p)
diff --git a/src/hre/hre/util/ScopedStack.scala b/src/hre/hre/util/ScopedStack.scala
index 2a96e7b48a..1270cd14a1 100644
--- a/src/hre/hre/util/ScopedStack.scala
+++ b/src/hre/hre/util/ScopedStack.scala
@@ -14,7 +14,8 @@ case object ScopedStack {
 }
 
 case class ScopedStack[T]() {
-  private val stacks: ThreadLocal[mutable.Stack[T]] = ThreadLocal.withInitial(() => mutable.Stack())
+  private val stacks: ThreadLocal[mutable.Stack[T]] = ThreadLocal
+    .withInitial(() => mutable.Stack())
 
   def stack: mutable.Stack[T] = stacks.get()
 
@@ -32,10 +33,7 @@ case class ScopedStack[T]() {
 
   def having[R](x: T)(f: => R): R = {
     stack.push(x)
-    try {
-      f
-    } finally {
-      stack.pop()
-    }
+    try { f }
+    finally { stack.pop() }
   }
 }
diff --git a/src/hre/hre/util/Time.scala b/src/hre/hre/util/Time.scala
index 2b935ec3df..48dd4ed049 100644
--- a/src/hre/hre/util/Time.scala
+++ b/src/hre/hre/util/Time.scala
@@ -10,7 +10,8 @@ object Time {
   def formatTime(): String = formatTime(java.time.Instant.now())
 
   def formatTime(when: Instant): String = {
-    val formatter = DateTimeFormatter.ofPattern("HH:mm:ss").withZone(ZoneId.systemDefault())
+    val formatter = DateTimeFormatter.ofPattern("HH:mm:ss")
+      .withZone(ZoneId.systemDefault())
     formatter.format(when)
   }
 }
diff --git a/src/hre/vct/result/HasContext.scala b/src/hre/vct/result/HasContext.scala
index 17897b7737..4760be848d 100644
--- a/src/hre/vct/result/HasContext.scala
+++ b/src/hre/vct/result/HasContext.scala
@@ -3,9 +3,9 @@ package vct.result
 import vct.result.Message.{BOLD_HR, HR}
 
 trait HasContext {
-  /**
-   * May contain newlines, but must not start or end with newlines.
-   */
+
+  /** May contain newlines, but must not start or end with newlines.
+    */
   def contextText: String
 
   def bareMessageInContext(message: String): String =
@@ -13,4 +13,4 @@ trait HasContext {
 
   def messageInContext(message: String): String =
     BOLD_HR + bareMessageInContext(message) + "\n" + BOLD_HR
-}
\ No newline at end of file
+}
diff --git a/src/hre/vct/result/Message.scala b/src/hre/vct/result/Message.scala
index 3592802bed..c344cbb286 100644
--- a/src/hre/vct/result/Message.scala
+++ b/src/hre/vct/result/Message.scala
@@ -2,11 +2,11 @@ package vct.result
 
 case object Message {
   val BOLD_HR = "======================================\n"
-  val HR =      "--------------------------------------\n"
+  val HR = "--------------------------------------\n"
 
   def messagesInContext(messages: (HasContext, String)*): String =
-    messages.zipWithIndex.map {
-      case ((origin, message), idx) =>
-        origin.bareMessageInContext(s"[${idx + 1}/${messages.size}] $message") + "\n"
+    messages.zipWithIndex.map { case ((origin, message), idx) =>
+      origin.bareMessageInContext(s"[${idx + 1}/${messages.size}] $message") +
+        "\n"
     }.mkString(BOLD_HR, HR, BOLD_HR)
 }
diff --git a/src/hre/vct/result/VerificationError.scala b/src/hre/vct/result/VerificationError.scala
index 8811276f66..1c23ac98fd 100644
--- a/src/hre/vct/result/VerificationError.scala
+++ b/src/hre/vct/result/VerificationError.scala
@@ -12,15 +12,15 @@ sealed abstract class VerificationError extends RuntimeException {
   val contexts: ArrayBuffer[VerificationError.Context] = ArrayBuffer()
 
   def context[T](implicit tag: ClassTag[T]): Option[T] = {
-    contexts.collectFirst {
-      case x : T =>
-        x
-    }
+    contexts.collectFirst { case x: T => x }
   }
 
   def getContext[T](implicit tag: ClassTag[T]): T = context[T].get
 
-  def messageContext(message: String, backupContext: String => String = identity): String =
+  def messageContext(
+      message: String,
+      backupContext: String => String = identity,
+  ): String =
     // PB: note: the innermost context is added to contexts first, so we end up trying to use the most specific context
     // for rendering the message context first, which is what we want.
     contexts.foldLeft[Option[String]](None) {
@@ -51,14 +51,16 @@ object VerificationError {
   }
 
   trait Context {
-    def tryMessageContext(message: String, err: VerificationError): Option[String] = None
+    def tryMessageContext(
+        message: String,
+        err: VerificationError,
+    ): Option[String] = None
   }
 
   def withContext[T](ctx: Context)(f: => T): T = {
-    try {
-      f
-    } catch {
-      case e : VerificationError =>
+    try { f }
+    catch {
+      case e: VerificationError =>
         e.contexts += ctx
         throw e
       case NonFatal(e) =>
@@ -68,4 +70,4 @@ object VerificationError {
         throw crash
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/vct/cache/Caches.scala b/src/main/vct/cache/Caches.scala
index 4d4c8af261..b68a7d079e 100644
--- a/src/main/vct/cache/Caches.scala
+++ b/src/main/vct/cache/Caches.scala
@@ -9,25 +9,27 @@ import java.nio.file.Path
 case object Caches extends LazyLogging {
   // Val's, so that multiple VerCors runs in one JVM (e.g. tests) benefit from a shared cache even when the cache is
   // variate.
-  lazy val getLibraryCache: Path = getDirectory(BuildInfo.currentCommit).resolve("library")
+  lazy val getLibraryCache: Path = getDirectory(BuildInfo.currentCommit)
+    .resolve("library")
 
-  lazy val getCarbonDirectory: Path = getViperDirectory(BuildInfo.carbonCommit).resolve("carbon").resolve("verified")
-  lazy val getSiliconDirectory: Path = getViperDirectory(BuildInfo.siliconCommit).resolve("silicon").resolve("verified")
+  lazy val getCarbonDirectory: Path = getViperDirectory(BuildInfo.carbonCommit)
+    .resolve("carbon").resolve("verified")
+  lazy val getSiliconDirectory: Path = getViperDirectory(
+    BuildInfo.siliconCommit
+  ).resolve("silicon").resolve("verified")
 
   private def getDirectory(keys: String*): Path = {
     val variate = BuildInfo.gitHasChanges != "false"
 
-    if(variate) {
-      logger.warn("Caching is enabled, but results will be discarded, since there were uncommitted changes at compilation time.")
+    if (variate) {
+      logger.warn(
+        "Caching is enabled, but results will be discarded, since there were uncommitted changes at compilation time."
+      )
     }
 
     Cache.getDirectory(variate, keys)
   }
 
   private def getViperDirectory(backendCommit: String): Path =
-    getDirectory(
-      BuildInfo.currentCommit,
-      BuildInfo.silverCommit,
-      backendCommit,
-    )
+    getDirectory(BuildInfo.currentCommit, BuildInfo.silverCommit, backendCommit)
 }
diff --git a/src/main/vct/debug/CrashReport.scala b/src/main/vct/debug/CrashReport.scala
index 71bcd2275d..cefc796523 100644
--- a/src/main/vct/debug/CrashReport.scala
+++ b/src/main/vct/debug/CrashReport.scala
@@ -11,32 +11,38 @@ import java.nio.charset.StandardCharsets
 object CrashReport {
   val GITHUB_URI = "https://github.com/utwente-fmt/vercors/issues/new"
 
-  private def enc(s: String): String = URLEncoder.encode(s, StandardCharsets.UTF_8)
-
-  def makeGithubLink(err: Throwable, args: Array[String], options: Options): String = {
+  private def enc(s: String): String =
+    URLEncoder.encode(s, StandardCharsets.UTF_8)
+
+  def makeGithubLink(
+      err: Throwable,
+      args: Array[String],
+      options: Options,
+  ): String = {
     var (title, body) = make(err, args, options)
 
     var uri: String = ""
     var lastBody: String = ""
 
     do {
-      val params = s"labels=${enc("A-Bug")}&title=${enc(title)}&body=${enc(body)}"
+      val params =
+        s"labels=${enc("A-Bug")}&title=${enc(title)}&body=${enc(body)}"
       uri = GITHUB_URI + "?" + params
       lastBody = body
       body = body.replaceFirst("\n[^\n]*$", "")
-    } while(uri.length > 8000 && body.length < lastBody.length)
+    } while (uri.length > 8000 && body.length < lastBody.length)
 
     uri
   }
 
-  def make(err: Throwable, args: Array[String], options: Options): (String, String) =
-    s"Crash report: ${err.getMessage.take(100)}" -> (
-      makeError(err) +
-        makeVersion() +
-        makeOptions(args) +
-        makeInputs(options) +
-        makeLog()
-    )
+  def make(
+      err: Throwable,
+      args: Array[String],
+      options: Options,
+  ): (String, String) =
+    s"Crash report: ${err.getMessage.take(100)}" ->
+      (makeError(err) + makeVersion() + makeOptions(args) +
+        makeInputs(options) + makeLog())
 
   def makeError(err: Throwable): String =
     s"""# Crash Message
@@ -48,16 +54,18 @@ object CrashReport {
        |""".stripMargin
 
   def makeStackTrace(elems: Array[StackTraceElement]): String = {
-    if(elems.length < 15)
+    if (elems.length < 15)
       elems.map(elem => s"  at $elem").mkString("\n")
     else
-      (elems.take(12).map(elem => s"  at $elem") ++ Seq("  ...") ++ elems.takeRight(2).map(elem => s"  at $elem")).mkString("\n")
+      (elems.take(12).map(elem => s"  at $elem") ++ Seq("  ...") ++
+        elems.takeRight(2).map(elem => s"  at $elem")).mkString("\n")
   }
 
   def makeVersion(): String =
     s"""# Version Information
        |* ${BuildInfo.name} version `${BuildInfo.version}`
-       |* At commit ${BuildInfo.currentCommit} from branch `${BuildInfo.currentBranch}` (changes=${BuildInfo.gitHasChanges})
+       |* At commit ${BuildInfo.currentCommit} from branch `${BuildInfo
+        .currentBranch}` (changes=${BuildInfo.gitHasChanges})
        |
        |""".stripMargin
 
@@ -74,7 +82,7 @@ object CrashReport {
        |""".stripMargin
 
   def makeInput(readable: Readable): String =
-    if(readable.isRereadable)
+    if (readable.isRereadable)
       s"""<details>
          |<summary>${readable.fileName}</summary>
          |
diff --git a/src/main/vct/importer/JavaLibraryLoader.scala b/src/main/vct/importer/JavaLibraryLoader.scala
index 40b5e9a98e..e7f652cf81 100644
--- a/src/main/vct/importer/JavaLibraryLoader.scala
+++ b/src/main/vct/importer/JavaLibraryLoader.scala
@@ -13,14 +13,23 @@ import vct.parsers.parser.ColJavaParser
 import java.io.File.{separator => FILE_SEPARATOR}
 import java.nio.file.Path
 
-case class JavaLibraryLoader(blameProvider: BlameProvider, debugOptions: DebugOptions) extends ExternalJavaLoader {
-  override def load[G](base: Path, name: Seq[String]): Option[JavaNamespace[G]] = try {
-    val f = RWFile(base.resolve((name.init :+ name.last + ".java").mkString(FILE_SEPARATOR)))
-    parser.ColJavaParser(debugOptions, blameProvider).parse[G](f).decls match {
-      case Seq(ns: JavaNamespace[G]) => Some(ns)
-      case _ => None
-    }
-  } catch {
-    case _: FileNotFound => None
-  }
+case class JavaLibraryLoader(
+    blameProvider: BlameProvider,
+    debugOptions: DebugOptions,
+) extends ExternalJavaLoader {
+  override def load[G](
+      base: Path,
+      name: Seq[String],
+  ): Option[JavaNamespace[G]] =
+    try {
+      val f = RWFile(
+        base
+          .resolve((name.init :+ name.last + ".java").mkString(FILE_SEPARATOR))
+      )
+      parser.ColJavaParser(debugOptions, blameProvider).parse[G](f)
+        .decls match {
+        case Seq(ns: JavaNamespace[G]) => Some(ns)
+        case _ => None
+      }
+    } catch { case _: FileNotFound => None }
 }
diff --git a/src/main/vct/importer/PathAdtImporter.scala b/src/main/vct/importer/PathAdtImporter.scala
index 9fd927594e..27ea298d35 100644
--- a/src/main/vct/importer/PathAdtImporter.scala
+++ b/src/main/vct/importer/PathAdtImporter.scala
@@ -7,7 +7,9 @@ import vct.parsers.debug.DebugOptions
 
 import java.nio.file.Path
 
-case class PathAdtImporter(basePath: Path, debugOptions: DebugOptions) extends ImportADTImporter {
+case class PathAdtImporter(basePath: Path, debugOptions: DebugOptions)
+    extends ImportADTImporter {
   override def loadAdt[G](name: String): Program[G] =
-    Util.loadPVLLibraryFile(RWFile(basePath.resolve(name + ".pvl")), debugOptions)
+    Util
+      .loadPVLLibraryFile(RWFile(basePath.resolve(name + ".pvl")), debugOptions)
 }
diff --git a/src/main/vct/importer/Util.scala b/src/main/vct/importer/Util.scala
index 7781b8cbfb..c007cf334b 100644
--- a/src/main/vct/importer/Util.scala
+++ b/src/main/vct/importer/Util.scala
@@ -25,10 +25,14 @@ case object Util extends LazyLogging {
   case class LibraryFileError(error: VerificationFailure) extends UserError {
     override def code: String = "lib"
     override def text: String =
-      "A verification condition failed inside a file loaded as a library file, which is never supposed to happen. The internal error is:\n" + error.toString
+      "A verification condition failed inside a file loaded as a library file, which is never supposed to happen. The internal error is:\n" +
+        error.toString
   }
 
-  def loadPVLLibraryFile[G](readable: Readable, debugOptions: DebugOptions): Program[G] = {
+  def loadPVLLibraryFile[G](
+      readable: Readable,
+      debugOptions: DebugOptions,
+  ): Program[G] = {
     logger.debug("Loading PVL library file: " + readable.fileName)
 
     val text = readable.readToCompletion()
@@ -36,10 +40,19 @@ case object Util extends LazyLogging {
     val pinnedLibrary = cacheDir.resolve("library.in")
     val result = cacheDir.resolve("library.colpb")
 
-    if(!Files.exists(cacheDir) || RWFile(pinnedLibrary, doWatch = false).readToCompletion() != text) {
-      val res = parser.ColPVLParser(debugOptions, ConstantBlameProvider(LibraryFileBlame)).parse(readable)
-      val context = Resolution(ConstantBlameProvider(LibraryFileBlame), debugOptions).run(res)
-      val unambiguousProgram: Program[_] = Disambiguate().dispatch(context.tasks.head.program)
+    if (
+      !Files.exists(cacheDir) ||
+      RWFile(pinnedLibrary, doWatch = false).readToCompletion() != text
+    ) {
+      val res = parser
+        .ColPVLParser(debugOptions, ConstantBlameProvider(LibraryFileBlame))
+        .parse(readable)
+      val context = Resolution(
+        ConstantBlameProvider(LibraryFileBlame),
+        debugOptions,
+      ).run(res)
+      val unambiguousProgram: Program[_] = Disambiguate()
+        .dispatch(context.tasks.head.program)
 
       Files.createDirectories(cacheDir)
       Using(Files.newOutputStream(pinnedLibrary)) { out =>
@@ -52,7 +65,8 @@ case object Util extends LazyLogging {
     }
 
     Using(Files.newInputStream(result)) { in =>
-      Deserialize.deserializeProgram[G](vct.col.ast.serialize.Program.parseFrom(in), 0)
+      Deserialize
+        .deserializeProgram[G](vct.col.ast.serialize.Program.parseFrom(in), 0)
     }.get
   }
 
@@ -62,12 +76,23 @@ case object Util extends LazyLogging {
     override def text: String = error
   }
 
-  def loadJavaClass[G](readable: Readable, debugOptions: DebugOptions): JavaClass[G] =
-    parser.ColJavaParser(debugOptions, ConstantBlameProvider(LibraryFileBlame)).parse(readable).decls match {
-      case Seq(javaNamespace: JavaNamespace[G @unchecked]) => javaNamespace.declarations match {
-        case Seq(javaClass: JavaClass[G]) => javaClass
-        case seq => throw JavaLoadError("Expected to load exactly one Java class but found " + seq.size)
-      }
-      case seq => throw JavaLoadError("Expected to load exactly one Java name space but found " + seq.size)
+  def loadJavaClass[G](
+      readable: Readable,
+      debugOptions: DebugOptions,
+  ): JavaClass[G] =
+    parser.ColJavaParser(debugOptions, ConstantBlameProvider(LibraryFileBlame))
+      .parse(readable).decls match {
+      case Seq(javaNamespace: JavaNamespace[G @unchecked]) =>
+        javaNamespace.declarations match {
+          case Seq(javaClass: JavaClass[G]) => javaClass
+          case seq =>
+            throw JavaLoadError(
+              "Expected to load exactly one Java class but found " + seq.size
+            )
+        }
+      case seq =>
+        throw JavaLoadError(
+          "Expected to load exactly one Java name space but found " + seq.size
+        )
     }
 }
diff --git a/src/main/vct/main/Main.scala b/src/main/vct/main/Main.scala
index 048258bfa2..50a7e6f497 100644
--- a/src/main/vct/main/Main.scala
+++ b/src/main/vct/main/Main.scala
@@ -22,72 +22,78 @@ case object Main extends LazyLogging {
   val EXIT_CODE_VERIFICATION_FAILURE = 1
   val EXIT_CODE_ERROR = 2
 
-  case class TemporarilyUnsupported(feature: String, examples: Seq[Node[_]]) extends UserError {
+  case class TemporarilyUnsupported(feature: String, examples: Seq[Node[_]])
+      extends UserError {
     override def code: String = "unsupported"
     override def text: String =
-      examples.head.o.messageInContext(
-        s"The feature `$feature` is temporarily unsupported.")
+      examples.head.o
+        .messageInContext(s"The feature `$feature` is temporarily unsupported.")
   }
 
-  /**
-   * The main entry point of the VerCors verifier.
-   *
-   * Parses the options, and decides from there what to do.
-   * The exit code of VerCors determines the verification result: zero means all proof goals succeeded.
-   *
-   * @param args The command line argument
-   */
-  def main(args: Array[String]): Unit = try {
-    Options.parse(args) match {
-      case None => System.exit(EXIT_CODE_ERROR)
-      case Some(options) =>
-        try {
-          System.exit(runOptions(options))
-        } catch {
-          case NonFatal(err) =>
-            logger.error(CollectString(stream => err.printStackTrace(stream)))
-            logger.error("!*!*!*!*!*!*!*!*!*!*!*!")
-            logger.error("! VerCors has crashed !")
-            logger.error("!*!*!*!*!*!*!*!*!*!*!*!")
-            logger.error("")
-            logger.error("Please report this as a bug here:")
-            logger.error(CrashReport.makeGithubLink(err, args, options))
-            System.exit(EXIT_CODE_ERROR)
-        }
+  /** The main entry point of the VerCors verifier.
+    *
+    * Parses the options, and decides from there what to do. The exit code of
+    * VerCors determines the verification result: zero means all proof goals
+    * succeeded.
+    *
+    * @param args
+    *   The command line argument
+    */
+  def main(args: Array[String]): Unit =
+    try {
+      Options.parse(args) match {
+        case None => System.exit(EXIT_CODE_ERROR)
+        case Some(options) =>
+          try { System.exit(runOptions(options)) }
+          catch {
+            case NonFatal(err) =>
+              logger.error(CollectString(stream => err.printStackTrace(stream)))
+              logger.error("!*!*!*!*!*!*!*!*!*!*!*!")
+              logger.error("! VerCors has crashed !")
+              logger.error("!*!*!*!*!*!*!*!*!*!*!*!")
+              logger.error("")
+              logger.error("Please report this as a bug here:")
+              logger.error(CrashReport.makeGithubLink(err, args, options))
+              System.exit(EXIT_CODE_ERROR)
+          }
+      }
+    } catch {
+      case t: Throwable =>
+        logger.error(s"Unrecoverable error: ${t.getMessage}", t)
+        throw t
     }
-  } catch {
-    case t: Throwable =>
-      logger.error(s"Unrecoverable error: ${t.getMessage}", t)
-      throw t
-  }
 
-  /**
-   * Decide what to do from the parsed options.
-   *
-   * If the help flag is enabled, the usage is printed.
-   * Sets up the logging levels in slf4j, and enables progress logging.
-   * Finally the method switches on the mode enabled in the options, deferring to the appropriate object in [[vct.main.modes]]
-   *
-   * @param options The parsed command line arguments. VerCors is not meant to be invoked with e.g. a tweaked [[Options]]
-   *                object. Rather, refer to [[Verify.verifyWithSilicon]] or [[vct.main.stages.Stages]]
-   * @return The exit code, zero on verification success.
-   */
+  /** Decide what to do from the parsed options.
+    *
+    * If the help flag is enabled, the usage is printed. Sets up the logging
+    * levels in slf4j, and enables progress logging. Finally the method switches
+    * on the mode enabled in the options, deferring to the appropriate object in
+    * [[vct.main.modes]]
+    *
+    * @param options
+    *   The parsed command line arguments. VerCors is not meant to be invoked
+    *   with e.g. a tweaked [[Options]] object. Rather, refer to
+    *   [[Verify.verifyWithSilicon]] or [[vct.main.stages.Stages]]
+    * @return
+    *   The exit code, zero on verification success.
+    */
   def runOptions(options: Options): Int = {
-    if(options.help) {
+    if (options.help) {
       println(OParser.usage(Options.parser(hide = !options.showHidden)))
       return 0
     }
 
-    for((key, logLevel) <- options.logLevels) {
-      LoggerFactory.getLogger(key).asInstanceOf[Logger].setLevel(logLevel match {
-        case Verbosity.Off => Level.OFF
-        case Verbosity.Error => Level.ERROR
-        case Verbosity.Warning => Level.WARN
-        case Verbosity.Info => Level.INFO
-        case Verbosity.Debug => Level.DEBUG
-        case Verbosity.Trace => Level.TRACE
-        case Verbosity.All => Level.ALL
-      })
+    for ((key, logLevel) <- options.logLevels) {
+      LoggerFactory.getLogger(key).asInstanceOf[Logger]
+        .setLevel(logLevel match {
+          case Verbosity.Off => Level.OFF
+          case Verbosity.Error => Level.ERROR
+          case Verbosity.Warning => Level.WARN
+          case Verbosity.Info => Level.INFO
+          case Verbosity.Debug => Level.DEBUG
+          case Verbosity.Trace => Level.TRACE
+          case Verbosity.All => Level.ALL
+        })
     }
 
     Layout.install(options.progress)
@@ -96,9 +102,11 @@ case object Main extends LazyLogging {
     // This causes data read between the start of reading and the interrupt to be lost.
     System.setIn(new InterruptibleInputStream(System.in))
 
-    Runtime.getRuntime.addShutdownHook(new Thread("[VerCors] Shutdown hook to abort progress on exit") {
-      override def run(): Unit = Progress.abort()
-    })
+    Runtime.getRuntime.addShutdownHook(
+      new Thread("[VerCors] Shutdown hook to abort progress on exit") {
+        override def run(): Unit = Progress.abort()
+      }
+    )
 
     try {
       Watch.booleanWithWatch(options.watch, default = EXIT_CODE_SUCCESS) {
@@ -106,7 +114,8 @@ case object Main extends LazyLogging {
         try {
           options.mode match {
             case Mode.Verify =>
-              logger.info(s"Starting verification at ${hre.util.Time.formatTime()}")
+              logger
+                .info(s"Starting verification at ${hre.util.Time.formatTime()}")
               Verify.runOptions(options)
             case Mode.HelpVerifyPasses =>
               logger.info("Available passes:")
@@ -115,8 +124,7 @@ case object Main extends LazyLogging {
                 logger.info(s"    ${pass.desc}")
               }
               EXIT_CODE_SUCCESS
-            case Mode.VeyMont =>
-              VeyMont.runOptions(options)
+            case Mode.VeyMont => VeyMont.runOptions(options)
             case Mode.VeSUV =>
               logger.info("Starting transformation")
               VeSUV.runOptions(options)
@@ -124,20 +132,18 @@ case object Main extends LazyLogging {
               logger.info("Starting control flow graph transformation")
               CFG.runOptions(options)
           }
-        } finally {
-          Progress.finish()
-        }
+        } finally { Progress.finish() }
       }
     } finally {
       val thisThread = Thread.currentThread()
-      Thread.getAllStackTraces.keySet()
-        .stream()
-        .filter(_ != thisThread)
-        .filter(!_.isDaemon)
-        .forEach { thread =>
-          logger.warn(s"Non-daemon thread ${thread.getThreadGroup.getName}.${thread.getName} (#${thread.getId}) is still running")
-          logger.warn("Due to this VerCors will not exit and sit idly until that thread is done. You may want to stop the program manually.")
+      Thread.getAllStackTraces.keySet().stream().filter(_ != thisThread)
+        .filter(!_.isDaemon).forEach { thread =>
+          logger.warn(s"Non-daemon thread ${thread.getThreadGroup
+              .getName}.${thread.getName} (#${thread.getId}) is still running")
+          logger.warn(
+            "Due to this VerCors will not exit and sit idly until that thread is done. You may want to stop the program manually."
+          )
         }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/vct/main/modes/CFG.scala b/src/main/vct/main/modes/CFG.scala
index f28983a80a..2ba6befeba 100644
--- a/src/main/vct/main/modes/CFG.scala
+++ b/src/main/vct/main/modes/CFG.scala
@@ -9,9 +9,10 @@ import vct.parsers.transform.ConstantBlameProvider
 import vct.result.VerificationError.{SystemError, UserError}
 
 case object CFG extends LazyLogging {
-  def runOptions(options: Options) : Int = {
+  def runOptions(options: Options): Int = {
     val collector = BlameCollector()
-    val stages = Stages.cfgTransformationOfOptions(options, ConstantBlameProvider(collector))
+    val stages = Stages
+      .cfgTransformationOfOptions(options, ConstantBlameProvider(collector))
     stages.run(options.inputs) match {
       case Left(err: UserError) => EXIT_CODE_ERROR
       case Left(err: SystemError) => throw err
diff --git a/src/main/vct/main/modes/VeSUV.scala b/src/main/vct/main/modes/VeSUV.scala
index e55f034f3a..f460b9281a 100644
--- a/src/main/vct/main/modes/VeSUV.scala
+++ b/src/main/vct/main/modes/VeSUV.scala
@@ -9,9 +9,10 @@ import vct.parsers.transform.ConstantBlameProvider
 import vct.result.VerificationError.{SystemError, UserError}
 
 case object VeSUV extends LazyLogging {
-  def runOptions(options: Options) : Int = {
+  def runOptions(options: Options): Int = {
     val collector = BlameCollector()
-    val stages = Stages.vesuvOfOptions(options, ConstantBlameProvider(collector))
+    val stages = Stages
+      .vesuvOfOptions(options, ConstantBlameProvider(collector))
     stages.run(options.inputs) match {
       case Left(_: UserError) => EXIT_CODE_ERROR
       case Left(err: SystemError) => throw err
diff --git a/src/main/vct/main/modes/Verify.scala b/src/main/vct/main/modes/Verify.scala
index 2307279432..974731d263 100644
--- a/src/main/vct/main/modes/Verify.scala
+++ b/src/main/vct/main/modes/Verify.scala
@@ -8,7 +8,11 @@ import sun.misc.{Signal, SignalHandler}
 import vct.col.origin.{BlameCollector, TableEntry, VerificationFailure}
 import vct.col.rewrite.bip.BIP
 import vct.col.rewrite.bip.BIP.Standalone.VerificationReport
-import vct.main.Main.{EXIT_CODE_ERROR, EXIT_CODE_SUCCESS, EXIT_CODE_VERIFICATION_FAILURE}
+import vct.main.Main.{
+  EXIT_CODE_ERROR,
+  EXIT_CODE_SUCCESS,
+  EXIT_CODE_VERIFICATION_FAILURE,
+}
 import vct.main.stages.Stages
 import vct.options.types.PathOrStd
 import vct.parsers.transform.ConstantBlameProvider
@@ -19,7 +23,10 @@ import viper.silicon.logger.SymbExLogger
 import java.time.Duration
 
 case object Verify extends LazyLogging {
-  def verifyWithSilicon(inputs: Seq[Readable]): Either[VerificationError, (Seq[VerificationFailure], VerificationReport)] = {
+  def verifyWithSilicon(inputs: Seq[Readable]): Either[
+    VerificationError,
+    (Seq[VerificationFailure], VerificationReport),
+  ] = {
     val collector = BlameCollector()
     val bipResults = BIP.VerificationResults()
     val stages = Stages.silicon(ConstantBlameProvider(collector), bipResults)
@@ -30,7 +37,10 @@ case object Verify extends LazyLogging {
     }
   }
 
-  def verifyWithCarbon(inputs: Seq[Readable]): Either[VerificationError, (Seq[VerificationFailure], VerificationReport)] = {
+  def verifyWithCarbon(inputs: Seq[Readable]): Either[
+    VerificationError,
+    (Seq[VerificationFailure], VerificationReport),
+  ] = {
     val collector = BlameCollector()
     val bipResults = BIP.VerificationResults()
     val stages = Stages.carbon(ConstantBlameProvider(collector), bipResults)
@@ -41,10 +51,14 @@ case object Verify extends LazyLogging {
     }
   }
 
-  def verifyWithOptions(options: Options, inputs: Seq[Readable]): Either[VerificationError, (Seq[VerificationFailure], BIP.Standalone.VerificationReport)] = {
+  def verifyWithOptions(options: Options, inputs: Seq[Readable]): Either[
+    VerificationError,
+    (Seq[VerificationFailure], BIP.Standalone.VerificationReport),
+  ] = {
     val collector = BlameCollector()
     val bipResults = BIP.VerificationResults()
-    val stages = Stages.ofOptions(options, ConstantBlameProvider(collector), bipResults)
+    val stages = Stages
+      .ofOptions(options, ConstantBlameProvider(collector), bipResults)
     logger.debug("Stages: " ++ stages.flatNames.map(_._1).mkString(", "))
     stages.run(inputs) match {
       case Left(error) => Left(error)
@@ -52,23 +66,28 @@ case object Verify extends LazyLogging {
     }
   }
 
-  /**
-   * Runs a normal verification run from the command line options.
-   *
-   * After some setup, most of the meat is in [[Stages.ofOptions]].
-   *
-   * @param options The command line options.
-   * @return The exit code, zero on verification success.
-   */
+  /** Runs a normal verification run from the command line options.
+    *
+    * After some setup, most of the meat is in [[Stages.ofOptions]].
+    *
+    * @param options
+    *   The command line options.
+    * @return
+    *   The exit code, zero on verification success.
+    */
   def runOptions(options: Options): Int = {
     try {
       // Wrapped in try because this seems to crash on windows
-      Signal.handle(new Signal("USR1"), _ => SiliconLogListener.synchronized {
-        SiliconLogListener.logs.toSeq match {
-          case Nil => logger.warn("Silicon is idle.")
-          case listeners => listeners.foreach(_.printDetailedState())
-        }
-      })
+      Signal.handle(
+        new Signal("USR1"),
+        _ =>
+          SiliconLogListener.synchronized {
+            SiliconLogListener.logs.toSeq match {
+              case Nil => logger.warn("Silicon is idle.")
+              case listeners => listeners.foreach(_.printDetailedState())
+            }
+          },
+      )
     } catch {
       // Could not register USR1 debug hook. This is expected behaviour on windows.
       case _: IllegalArgumentException =>
@@ -81,33 +100,42 @@ case object Verify extends LazyLogging {
         case Left(err: VerificationError.UserError) =>
           logger.error(err.text)
           EXIT_CODE_ERROR
-        case Left(err: VerificationError.SystemError) =>
-          throw err
+        case Left(err: VerificationError.SystemError) => throw err
         case Right((Nil, report)) =>
-          if(options.skipBackend){
-            logger.info("Verification skipped.")
-          } else {
-            logger.info("Verification completed successfully.")
-          }
+          if (options.skipBackend) { logger.info("Verification skipped.") }
+          else { logger.info("Verification completed successfully.") }
           friendlyHandleBipReport(report, options.bipReportFile)
           EXIT_CODE_SUCCESS
         case Right((fails, report)) =>
-          if (options.more || fails.size <= 2) fails.foreach(fail => logger.error(fail.desc))
+          if (options.more || fails.size <= 2)
+            fails.foreach(fail => logger.error(fail.desc))
           else {
-            logger.info("Printing verification results as a compressed table. Run with `--more` for verbose verification results.")
+            logger.info(
+              "Printing verification results as a compressed table. Run with `--more` for verbose verification results."
+            )
             logger.error(TableEntry.render(fails.map(_.asTableEntry)))
           }
           friendlyHandleBipReport(report, options.bipReportFile)
           EXIT_CODE_VERIFICATION_FAILURE
       }
     } finally {
-      logger.info(s"Finished verification at ${Time.formatTime()} (duration: ${Time.formatDuration(Duration.between(start, java.time.Instant.now()))})")
+      logger.info(
+        s"Finished verification at ${Time.formatTime()} (duration: ${Time
+            .formatDuration(Duration.between(start, java.time.Instant.now()))})"
+      )
     }
   }
 
-  def friendlyHandleBipReport(report: VerificationReport, path: Option[PathOrStd]): Unit = (report, path) match {
-    case (report, _) if report.isEmpty() =>
-    case (report, Some(path)) => path.write(w => w.write(report.toJson()))
-    case (report, None) => logger.warn("JavaBIP verification report was produced, but no output path was specified. Use `--bip-report-file` to specify an output. See `--help` for more info.")
-  }
+  def friendlyHandleBipReport(
+      report: VerificationReport,
+      path: Option[PathOrStd],
+  ): Unit =
+    (report, path) match {
+      case (report, _) if report.isEmpty() =>
+      case (report, Some(path)) => path.write(w => w.write(report.toJson()))
+      case (report, None) =>
+        logger.warn(
+          "JavaBIP verification report was produced, but no output path was specified. Use `--bip-report-file` to specify an output. See `--help` for more info."
+        )
+    }
 }
diff --git a/src/main/vct/main/modes/VeyMont.scala b/src/main/vct/main/modes/VeyMont.scala
index e68e24b894..be1007d178 100644
--- a/src/main/vct/main/modes/VeyMont.scala
+++ b/src/main/vct/main/modes/VeyMont.scala
@@ -11,7 +11,8 @@ import vct.result.VerificationError
 import vct.result.VerificationError.UserError
 
 object VeyMont extends LazyLogging {
-  case class ChoreographyVerificationError(failures: Seq[VerificationFailure]) extends UserError {
+  case class ChoreographyVerificationError(failures: Seq[VerificationFailure])
+      extends UserError {
     override def text: String = {
       val fails = failures.map(_.desc).mkString("\n")
       s"Verification of the input choreography failed because of the following failures:\n$fails"
@@ -20,7 +21,8 @@ object VeyMont extends LazyLogging {
     override def code: String = "veymont:choreographyVerificationFailed"
   }
 
-  case class ImplementationVerificationError(failures: Seq[VerificationFailure]) extends UserError {
+  case class ImplementationVerificationError(failures: Seq[VerificationFailure])
+      extends UserError {
     override def text: String = {
       val fails = failures.map(_.desc).mkString("\n")
       s"Verification of the generated implementation failed because of the following failuers:\n$fails"
@@ -29,13 +31,14 @@ object VeyMont extends LazyLogging {
     override def code: String = "veymont:implementationVerificationFailed"
   }
 
-  case class NoVerificationFailures(collector: BlameCollector, error: Seq[VerificationFailure] => UserError) extends Stage[Unit, Unit] {
+  case class NoVerificationFailures(
+      collector: BlameCollector,
+      error: Seq[VerificationFailure] => UserError,
+  ) extends Stage[Unit, Unit] {
     override def friendlyName: String = "noVerificationErrors"
     override def progressWeight: Int = 1
     override def run(in: Unit): Unit =
-      if (collector.errs.nonEmpty) {
-        throw error(collector.errs.toSeq)
-      }
+      if (collector.errs.nonEmpty) { throw error(collector.errs.toSeq) }
   }
 
   def runOptions(options: Options): Int = {
@@ -54,4 +57,3 @@ object VeyMont extends LazyLogging {
   }
 
 }
-
diff --git a/src/main/vct/main/stages/Backend.scala b/src/main/vct/main/stages/Backend.scala
index 9b9622cf7d..eccdc2cbdc 100644
--- a/src/main/vct/main/stages/Backend.scala
+++ b/src/main/vct/main/stages/Backend.scala
@@ -20,50 +20,72 @@ import scala.util.Using
 
 case object Backend {
 
-  def ofOptions(options: Options): Backend = options.backend match {
-    case types.Backend.Silicon =>
-      val printRawQuantifier = options.siliconPrintQuantifierStats match {
-        case Some(freq) => Seq(
-          "smt.qi.profile" -> "true",
-          "smt.qi.profile_freq" -> s"$freq"
+  def ofOptions(options: Options): Backend =
+    options.backend match {
+      case types.Backend.Silicon =>
+        val printRawQuantifier =
+          options.siliconPrintQuantifierStats match {
+            case Some(freq) =>
+              Seq("smt.qi.profile" -> "true", "smt.qi.profile_freq" -> s"$freq")
+            case None => Seq()
+          }
+        val z3LogFile =
+          options.devSiliconZ3LogFile match {
+            case Some(p) =>
+              Seq(
+                "trace" -> "true",
+                "proof" -> "true",
+                "trace-file-name" -> ("\"" + p.toString + "\""),
+              )
+            case None => Seq()
+          }
+        val numberOfParallelVerifiers =
+          if (
+            options.devSiliconZ3LogFile.isDefined ||
+            options.siliconPrintQuantifierStats.isDefined
+          ) { Some(1) }
+          else { options.devSiliconNumVerifiers }
+        SilverBackend(
+          Silicon(
+            z3Settings = (printRawQuantifier ++ z3LogFile).toMap,
+            z3Path = options.z3Path,
+            numberOfParallelVerifiers = numberOfParallelVerifiers,
+            timeoutValue = options.devSiliconAssertTimeout,
+            totalTimeOut = options.devSiliconTotalTimeout,
+            proverLogFile = options.devViperProverLogFile,
+            printQuantifierStatistics =
+              options.siliconPrintQuantifierStats.isDefined,
+            reportOnNoProgress = options.devSiliconReportOnNoProgress,
+            traceBranchConditions = options.devSiliconTraceBranchConditions,
+            branchConditionReportInterval =
+              options.devSiliconBranchConditionReportInterval,
+            options = options.backendFlags,
+          ),
+          options.backendFile,
+          if (options.devCache)
+            Some(Caches.getSiliconDirectory)
+          else
+            None,
+          options.skipBackend,
         )
-        case None => Seq()
-      }
-      val z3LogFile = options.devSiliconZ3LogFile match {
-        case Some(p) => Seq(
-          "trace" -> "true",
-          "proof" -> "true",
-          "trace-file-name" -> ("\"" + p.toString + "\"")
+
+      case types.Backend.Carbon =>
+        SilverBackend(
+          Carbon(
+            z3Path = options.z3Path,
+            boogiePath = options.boogiePath,
+            printFile = options.devViperProverLogFile,
+            proverLogFile = options.devCarbonBoogieLogFile,
+            options = options.backendFlags,
+          ),
+          options.backendFile,
+          if (options.devCache)
+            Some(Caches.getSiliconDirectory)
+          else
+            None,
+          options.skipBackend,
         )
-        case None => Seq()
-      }
-      val numberOfParallelVerifiers =
-        if (options.devSiliconZ3LogFile.isDefined || options.siliconPrintQuantifierStats.isDefined) { Some(1) }
-        else { options.devSiliconNumVerifiers }
-      SilverBackend(Silicon(
-        z3Settings = (printRawQuantifier ++ z3LogFile).toMap,
-        z3Path = options.z3Path,
-        numberOfParallelVerifiers = numberOfParallelVerifiers,
-        timeoutValue = options.devSiliconAssertTimeout,
-        totalTimeOut = options.devSiliconTotalTimeout,
-        proverLogFile = options.devViperProverLogFile,
-        printQuantifierStatistics = options.siliconPrintQuantifierStats.isDefined,
-        reportOnNoProgress = options.devSiliconReportOnNoProgress,
-        traceBranchConditions = options.devSiliconTraceBranchConditions,
-        branchConditionReportInterval = options.devSiliconBranchConditionReportInterval,
-        options = options.backendFlags,
-      ), options.backendFile, if(options.devCache) Some(Caches.getSiliconDirectory) else None
-       , options.skipBackend)
-
-    case types.Backend.Carbon => SilverBackend(Carbon(
-      z3Path = options.z3Path,
-      boogiePath = options.boogiePath,
-      printFile = options.devViperProverLogFile,
-      proverLogFile = options.devCarbonBoogieLogFile,
-      options = options.backendFlags,
-    ), options.backendFile, if(options.devCache) Some(Caches.getSiliconDirectory) else None
-     , options.skipBackend)
-  }
+    }
 }
 
 trait Backend extends Stage[Verification[_ <: Generation], Seq[ExpectedError]] {
@@ -74,7 +96,10 @@ trait Backend extends Stage[Verification[_ <: Generation], Seq[ExpectedError]] {
 
   def cacheDirectory: Option[Path]
 
-  def cachedDefinitelyVerifiesOrElseUpdate(colProgram: Program[_], update: => Boolean): Unit = {
+  def cachedDefinitelyVerifiesOrElseUpdate(
+      colProgram: Program[_],
+      update: => Boolean,
+  ): Unit = {
     val baseDir = cacheDirectory.getOrElse {
       // There is no cache directory: not allowed to skip the update
       update
@@ -90,40 +115,55 @@ trait Backend extends Stage[Verification[_ <: Generation], Seq[ExpectedError]] {
     val path = baseDir.resolve("%02x" format program.hashCode())
     val programFile = path.resolve("program.colpb")
 
-    if(Files.exists(path)) {
+    if (Files.exists(path)) {
       // The result is potentially cached in programFile
-      val cachedProgram = Using(Files.newInputStream(programFile)) { is =>
-        vct.col.ast.serialize.Program.parseFrom(is)
-      }
+      val cachedProgram =
+        Using(Files.newInputStream(programFile)) { is =>
+          vct.col.ast.serialize.Program.parseFrom(is)
+        }
 
-      if(cachedProgram != program) {
+      if (cachedProgram != program) {
         // Unlikely: in case of a hash collision, just run the verification (permanently unlucky)
         update
       }
     } else if (update) {
       // If the result is not even potentially cached, run update, and if the program definitely verifies, store the result.
       path.toFile.mkdirs()
-      Using(Files.newOutputStream(programFile)) { os =>
-        program.writeTo(os)
-      }
+      Using(Files.newOutputStream(programFile)) { os => program.writeTo(os) }
     }
   }
 
   override def run(in: Verification[_ <: Generation]): Seq[ExpectedError] = {
     val stages = Seq("Translation" -> 1, "Proving" -> 10)
 
-    Progress.stages(if(skipVerification) stages.init else stages) { next =>
+    Progress.stages(
+      if (skipVerification)
+        stages.init
+      else
+        stages
+    ) { next =>
       val intermediates: Seq[(Program[_ <: Generation], Intermediate)] =
-        Progress.map[(VerificationContext[_ <: Generation], Int), (Program[_ <: Generation], Intermediate)](
-          in.tasks.zipWithIndex.par, t => s"Task ${t._2 + 1}") {  case (task, idx) =>
-          (task.program, transform(task.program, idx))}.iterator.to(Seq)
+        Progress
+          .map[
+            (VerificationContext[_ <: Generation], Int),
+            (Program[_ <: Generation], Intermediate),
+          ](in.tasks.zipWithIndex.par, t => s"Task ${t._2 + 1}") {
+            case (task, idx) => (task.program, transform(task.program, idx))
+          }.iterator.to(Seq)
 
-      if(skipVerification) return Seq()
+      if (skipVerification)
+        return Seq()
 
       next()
 
-      Progress.foreach[((Program[_ <: Generation], Intermediate), Int)](intermediates.zipWithIndex.par, t => s"Task ${t._2 + 1}") { case (intermediate, _) =>
-        cachedDefinitelyVerifiesOrElseUpdate(intermediate._1, verify(intermediate._2))
+      Progress.foreach[((Program[_ <: Generation], Intermediate), Int)](
+        intermediates.zipWithIndex.par,
+        t => s"Task ${t._2 + 1}",
+      ) { case (intermediate, _) =>
+        cachedDefinitelyVerifiesOrElseUpdate(
+          intermediate._1,
+          verify(intermediate._2),
+        )
       }
 
       in.expectedErrors
@@ -136,16 +176,28 @@ trait Backend extends Stage[Verification[_ <: Generation], Seq[ExpectedError]] {
 }
 
 trait Intermediate
-case class SilverIntermediate(intermediate: (silver.Program, Map[Int, vct.col.ast.Node[_]])) extends Intermediate
-
-case class SilverBackend(backend: viper.SilverBackend, output: Option[Path] = None, cacheDirectory: Option[Path] = None, override val skipVerification: Boolean = false) extends Backend {
-  override def transform(program: Program[_ <: Generation], idx: Int): Intermediate =
-    SilverIntermediate(backend.transform(program, output.map(p => p.resolveSibling(p.getFileName.toString + s"-$idx.vpr"))))
+case class SilverIntermediate(
+    intermediate: (silver.Program, Map[Int, vct.col.ast.Node[_]])
+) extends Intermediate
+
+case class SilverBackend(
+    backend: viper.SilverBackend,
+    output: Option[Path] = None,
+    cacheDirectory: Option[Path] = None,
+    override val skipVerification: Boolean = false,
+) extends Backend {
+  override def transform(
+      program: Program[_ <: Generation],
+      idx: Int,
+  ): Intermediate =
+    SilverIntermediate(backend.transform(
+      program,
+      output.map(p => p.resolveSibling(p.getFileName.toString + s"-$idx.vpr")),
+    ))
 
   override def verify(intermediate: Intermediate): Boolean = {
     val SilverIntermediate(intermediateProgram) = intermediate
     backend.submit(intermediateProgram)
   }
 
-
-}
\ No newline at end of file
+}
diff --git a/src/main/vct/main/stages/ExpectedErrors.scala b/src/main/vct/main/stages/ExpectedErrors.scala
index 442a0f393e..3e32e97514 100644
--- a/src/main/vct/main/stages/ExpectedErrors.scala
+++ b/src/main/vct/main/stages/ExpectedErrors.scala
@@ -6,14 +6,12 @@ import vct.options.Options
 
 case object ExpectedErrors {
   // Just to be uniform with the other stages
-  def ofOptions(options: Options): ExpectedErrors =
-    ExpectedErrors()
+  def ofOptions(options: Options): ExpectedErrors = ExpectedErrors()
 }
 
 case class ExpectedErrors() extends Stage[Seq[ExpectedError], Unit] {
   override def friendlyName: String = "Check inverted errors"
   override def progressWeight: Int = 1
 
-  override def run(in: Seq[ExpectedError]): Unit =
-    in.foreach(_.signalDone())
+  override def run(in: Seq[ExpectedError]): Unit = in.foreach(_.signalDone())
 }
diff --git a/src/main/vct/main/stages/GenerateRASI.scala b/src/main/vct/main/stages/GenerateRASI.scala
index 2c5af6d79c..060aaf609f 100644
--- a/src/main/vct/main/stages/GenerateRASI.scala
+++ b/src/main/vct/main/stages/GenerateRASI.scala
@@ -4,7 +4,13 @@ import hre.stages.Stage
 import vct.col.ast.{InstanceField, InstanceMethod, InstancePredicate, Node}
 import vct.col.rewrite.Generation
 import vct.options.Options
-import vct.rewrite.rasi.{ConcreteVariable, FieldVariable, IndexedVariable, RASIGenerator, SizeVariable}
+import vct.rewrite.rasi.{
+  ConcreteVariable,
+  FieldVariable,
+  IndexedVariable,
+  RASIGenerator,
+  SizeVariable,
+}
 
 import java.nio.file.Path
 
@@ -14,36 +20,71 @@ case object GenerateRASI {
   }
 }
 
-case class GenerateRASI(vars: Option[Seq[String]], out: Path) extends Stage[Node[_ <: Generation], Unit] {
+case class GenerateRASI(vars: Option[Seq[String]], out: Path)
+    extends Stage[Node[_ <: Generation], Unit] {
 
-  override def friendlyName: String = "Generate reachable abstract states invariant"
+  override def friendlyName: String =
+    "Generate reachable abstract states invariant"
 
   override def progressWeight: Int = 0
 
   override def run(in1: Node[_ <: Generation]): Unit = {
     val in = in1.asInstanceOf[Node[Generation]]
-    val main_method = in.transSubnodes.collectFirst{ case m: InstanceMethod[_] if m.o.getPreferredName.get.snake.equals("main") => m }.get
-    val variables: Set[ConcreteVariable[Generation]] = vars.getOrElse(Seq()).map(s => resolve_variable(in, s)).toSet
-    val parameter_invariant: InstancePredicate[Generation] = get_parameter_invariant(in)
+    val main_method =
+      in.transSubnodes.collectFirst {
+        case m: InstanceMethod[_]
+            if m.o.getPreferredName.get.snake.equals("main") =>
+          m
+      }.get
+    val variables: Set[ConcreteVariable[Generation]] =
+      vars.getOrElse(Seq()).map(s => resolve_variable(in, s)).toSet
+    val parameter_invariant: InstancePredicate[Generation] =
+      get_parameter_invariant(in)
     new RASIGenerator().test(main_method, variables, parameter_invariant, out)
   }
 
-  private def resolve_variable(in: Node[Generation], name: String): ConcreteVariable[Generation] = {
+  private def resolve_variable(
+      in: Node[Generation],
+      name: String,
+  ): ConcreteVariable[Generation] = {
     if (name.contains("|")) {
       val var_name = name.substring(1, name.length - 1)
-      return SizeVariable(in.transSubnodes.collectFirst{ case f: InstanceField[_] if f.o.getPreferredName.get.snake.equals(var_name) => f }.get)
+      return SizeVariable(in.transSubnodes.collectFirst {
+        case f: InstanceField[_]
+            if f.o.getPreferredName.get.snake.equals(var_name) =>
+          f
+      }.get)
     }
     val name_len = name.indexOf("[")
-    val var_name = if (name_len == -1) name else name.substring(0, name_len)
-    val index: Option[Integer] = if (name_len == -1) None else Some(Integer.valueOf(name.substring(name_len + 1, name.length - 1)))
-    val instance_field = in.transSubnodes.collectFirst{ case f: InstanceField[_] if f.o.getPreferredName.get.snake.equals(var_name) => f }.get
+    val var_name =
+      if (name_len == -1)
+        name
+      else
+        name.substring(0, name_len)
+    val index: Option[Integer] =
+      if (name_len == -1)
+        None
+      else
+        Some(Integer.valueOf(name.substring(name_len + 1, name.length - 1)))
+    val instance_field =
+      in.transSubnodes.collectFirst {
+        case f: InstanceField[_]
+            if f.o.getPreferredName.get.snake.equals(var_name) =>
+          f
+      }.get
     index match {
       case Some(i) => IndexedVariable(instance_field, i)
       case None => FieldVariable(instance_field)
     }
   }
 
-  private def get_parameter_invariant(in: Node[Generation]): InstancePredicate[Generation] = {
-    in.transSubnodes.collectFirst{ case p: InstancePredicate[_] if p.o.getPreferredName.get.snake.equals("parameter_invariant") => p }.get
+  private def get_parameter_invariant(
+      in: Node[Generation]
+  ): InstancePredicate[Generation] = {
+    in.transSubnodes.collectFirst {
+      case p: InstancePredicate[_]
+          if p.o.getPreferredName.get.snake.equals("parameter_invariant") =>
+        p
+    }.get
   }
 }
diff --git a/src/main/vct/main/stages/Output.scala b/src/main/vct/main/stages/Output.scala
index ff7641b9a8..9b8e435b42 100644
--- a/src/main/vct/main/stages/Output.scala
+++ b/src/main/vct/main/stages/Output.scala
@@ -16,70 +16,87 @@ import java.nio.file.{Files, Path}
 /* TODO (RR): I messed this up for VeyMont & VeSUV, need to coordinate with Philip to get it in a nice shape
       Philip does use the splitting up feature, so I'd need to rework that either into Output or into a separate stage
       Also the writing to file feature he relies on.
-*/
-
+ */
 
 case object Output {
-  def vesuvOfOptions[G <: Generation](options: Options): Stages[ParseResult[G], Unit] = {
+  def vesuvOfOptions[G <: Generation](
+      options: Options
+  ): Stages[ParseResult[G], Unit] = {
 //    FunctionStage((pr: ParseResult[_ <: Generation]) => Program(pr.decls)(DiagnosticOrigin)(DiagnosticOrigin))
 //      .thenRun(??? /* Output(options.vesuvOutput, Ctx.PVL) */)
     ???
   }
 
-  def veymontOfOptions(options: Options): Stage[Verification[_ <: Generation], Seq[LiteralReadable]] =
+  def veymontOfOptions(
+      options: Options
+  ): Stage[Verification[_ <: Generation], Seq[LiteralReadable]] =
     Output(options.veymontOutput, Ctx.PVL, false)
 }
 
-case class Output(out: Option[Path], syntax: Ctx.Syntax, splitDecls: Boolean) extends Stage[Verification[_ <: Generation], Seq[LiteralReadable]] with LazyLogging {
+case class Output(out: Option[Path], syntax: Ctx.Syntax, splitDecls: Boolean)
+    extends Stage[Verification[_ <: Generation], Seq[LiteralReadable]]
+    with LazyLogging {
   override def friendlyName: String = "Saving Output"
 
   override def progressWeight: Int = 1
 
-  def extension(syntax: Ctx.Syntax): String = syntax match {
-    case Ctx.PVL => "pvl"
-    case Ctx.Silver => "vpr"
-    case Ctx.Java => "java"
-    case Ctx.C => "c"
-    case Ctx.CPP => "cpp"
-    case Ctx.Cuda => "cu"
-    case Ctx.OpenCL => "cl"
-  }
+  def extension(syntax: Ctx.Syntax): String =
+    syntax match {
+      case Ctx.PVL => "pvl"
+      case Ctx.Silver => "vpr"
+      case Ctx.Java => "java"
+      case Ctx.C => "c"
+      case Ctx.CPP => "cpp"
+      case Ctx.Cuda => "cu"
+      case Ctx.OpenCL => "cl"
+    }
 
   override def run(in: Verification[_ <: Generation]): Seq[LiteralReadable] = {
     val namer = Namer[Generation](syntax)
-    in.tasks.foreach(t => namer.name(t.program.asInstanceOf[Program[Generation]]))
+    in.tasks
+      .foreach(t => namer.name(t.program.asInstanceOf[Program[Generation]]))
     val names = namer.finish
-    val ctx = Ctx(syntax = syntax, names = names.asInstanceOf[Map[Declaration[_], String]])
+    val ctx = Ctx(
+      syntax = syntax,
+      names = names.asInstanceOf[Map[Declaration[_], String]],
+    )
 
-    val txts: Seq[LiteralReadable] = if (splitDecls) {
-      in.asInstanceOf[Program[_]].declarations.zipWithIndex.map { case (decl, i) =>
-        val name = names.getOrElse(decl.asInstanceOf, s"unknown$i")
-        val fileName = s"${name}.${extension(syntax)}"
+    val txts: Seq[LiteralReadable] =
+      if (splitDecls) {
+        in.asInstanceOf[Program[_]].declarations.zipWithIndex.map {
+          case (decl, i) =>
+            val name = names.getOrElse(decl.asInstanceOf, s"unknown$i")
+            val fileName = s"${name}.${extension(syntax)}"
+            val buf = new StringBuffer()
+            decl.write(buf)(ctx)
+            LiteralReadable(buf.toString, fileName)
+        }
+      } else {
         val buf = new StringBuffer()
-        decl.write(buf)(ctx)
-        LiteralReadable(buf.toString, fileName)
+        in.write(buf)(ctx)
+        val path = s"unknown.${extension(syntax)}"
+        Seq(LiteralReadable(buf.toString, path))
       }
-    } else {
-      val buf = new StringBuffer()
-      in.write(buf)(ctx)
-      val path = s"unknown.${extension(syntax)}"
-      Seq(LiteralReadable(buf.toString, path))
-    }
 
     (out, txts) match {
       case (Some(p), Seq()) =>
-        logger.warn("Output stage was executed without any declarations to print")
+        logger
+          .warn("Output stage was executed without any declarations to print")
         Files.write(p, "".getBytes(StandardCharsets.UTF_8))
       case (Some(p), Seq(txt)) =>
         logger.info(s"Writing ${txt.fileName} to $p")
         Files.write(p, txt.data.getBytes(StandardCharsets.UTF_8))
-      case (Some(p), txts) => txts.foreach { txt =>
-        logger.info(s"Writing ${txt.fileName} to $p")
-        Files.write(p.resolve(txt.fileName), txt.data.getBytes(StandardCharsets.UTF_8))
-      }
+      case (Some(p), txts) =>
+        txts.foreach { txt =>
+          logger.info(s"Writing ${txt.fileName} to $p")
+          Files.write(
+            p.resolve(txt.fileName),
+            txt.data.getBytes(StandardCharsets.UTF_8),
+          )
+        }
       case _ =>
     }
 
     txts
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/vct/main/stages/Parsing.scala b/src/main/vct/main/stages/Parsing.scala
index b2c070f247..3e8317ce40 100644
--- a/src/main/vct/main/stages/Parsing.scala
+++ b/src/main/vct/main/stages/Parsing.scala
@@ -9,7 +9,16 @@ import vct.main.stages.Parsing.{Language, UnknownFileExtension}
 import vct.options.Options
 import vct.parsers._
 import vct.parsers.debug.DebugOptions
-import vct.parsers.parser.{ColCPPParser, ColCParser, ColIPPParser, ColIParser, ColJavaParser, ColLLVMParser, ColPVLParser, ColSystemCParser}
+import vct.parsers.parser.{
+  ColCPPParser,
+  ColCParser,
+  ColIPPParser,
+  ColIParser,
+  ColJavaParser,
+  ColLLVMParser,
+  ColPVLParser,
+  ColSystemCParser,
+}
 import vct.parsers.transform.BlameProvider
 import vct.resources.Resources
 import vct.result.VerificationError.UserError
@@ -47,11 +56,15 @@ case object Parsing {
   }
 
   case class UnknownFileExtension(extension: String) extends UserError {
-    override def text: String = s"Unknown file extension: $extension. Try altering the extension of the file, or specify a language explicitly with --lang."
+    override def text: String =
+      s"Unknown file extension: $extension. Try altering the extension of the file, or specify a language explicitly with --lang."
     override def code: String = "unknownExt"
   }
 
-  def ofOptions[G <: Generation](options: Options, blameProvider: BlameProvider): Parsing[G] =
+  def ofOptions[G <: Generation](
+      options: Options,
+      blameProvider: BlameProvider,
+  ): Parsing[G] =
     Parsing(
       blameProvider = blameProvider,
       debugOptions = options.getParserDebugOptions,
@@ -63,43 +76,67 @@ case object Parsing {
     )
 }
 
-case class Parsing[G <: Generation]
-(
-  blameProvider: BlameProvider,
-  forceLanguage: Option[Language] = None,
-  debugOptions: DebugOptions = DebugOptions.NONE,
-  cc: Path = Resources.getCcPath,
-  cSystemInclude: Path = Resources.getCIncludePath,
-  cOtherIncludes: Seq[Path] = Nil,
-  cDefines: Map[String, String] = Map.empty,
-  ccpp: Path = Resources.getCPPcPath,
-  cppSystemInclude: Path = Resources.getCPPIncludePath,
-  cppOtherIncludes: Seq[Path] = Nil,
-  cppDefines: Map[String, String] = Map.empty,
+case class Parsing[G <: Generation](
+    blameProvider: BlameProvider,
+    forceLanguage: Option[Language] = None,
+    debugOptions: DebugOptions = DebugOptions.NONE,
+    cc: Path = Resources.getCcPath,
+    cSystemInclude: Path = Resources.getCIncludePath,
+    cOtherIncludes: Seq[Path] = Nil,
+    cDefines: Map[String, String] = Map.empty,
+    ccpp: Path = Resources.getCPPcPath,
+    cppSystemInclude: Path = Resources.getCPPIncludePath,
+    cppOtherIncludes: Seq[Path] = Nil,
+    cppDefines: Map[String, String] = Map.empty,
 ) extends Stage[Seq[Readable], ParseResult[G]] {
   override def friendlyName: String = "Parsing"
   override def progressWeight: Int = 4
 
   override def run(in: Seq[Readable]): ParseResult[G] =
-    ParseResult.reduce(Progress.map(in, (r: Readable) => r.fileName) { readable =>
-      val language = forceLanguage
-        .orElse(Language.fromFilename(readable.fileName))
-        .getOrElse(throw UnknownFileExtension(readable.fileName))
+    ParseResult.reduce(
+      Progress.map(in, (r: Readable) => r.fileName) { readable =>
+        val language = forceLanguage
+          .orElse(Language.fromFilename(readable.fileName))
+          .getOrElse(throw UnknownFileExtension(readable.fileName))
 
-      val origin = Origin(Seq(ReadableOrigin(readable)))
+        val origin = Origin(Seq(ReadableOrigin(readable)))
 
-      val parser = language match {
-        case Language.C => ColCParser(debugOptions, blameProvider, cc, cSystemInclude, Option(Paths.get(readable.fileName).getParent).toSeq ++ cOtherIncludes, cDefines)
-        case Language.InterpretedC => ColIParser(debugOptions, blameProvider, cOrigin = None)
-        case Language.CPP => ColCPPParser(debugOptions, blameProvider, ccpp, cppSystemInclude, Option(Paths.get(readable.fileName).getParent).toSeq ++ cppOtherIncludes, cppDefines)
-        case Language.InterpretedCPP => ColIPPParser(debugOptions, blameProvider, cppOrigin = None)
-        case Language.Java => ColJavaParser(debugOptions, blameProvider)
-        case Language.PVL => ColPVLParser(debugOptions, blameProvider)
-        case Language.Silver => ColSilverParser(blameProvider)
-        case Language.SystemC => new ColSystemCParser(Resources.getSystemCConfig)
-        case Language.LLVM => ColLLVMParser(debugOptions, blameProvider, Resources.getVCLLVM)
-      }
+        val parser =
+          language match {
+            case Language.C =>
+              ColCParser(
+                debugOptions,
+                blameProvider,
+                cc,
+                cSystemInclude,
+                Option(Paths.get(readable.fileName).getParent).toSeq ++
+                  cOtherIncludes,
+                cDefines,
+              )
+            case Language.InterpretedC =>
+              ColIParser(debugOptions, blameProvider, cOrigin = None)
+            case Language.CPP =>
+              ColCPPParser(
+                debugOptions,
+                blameProvider,
+                ccpp,
+                cppSystemInclude,
+                Option(Paths.get(readable.fileName).getParent).toSeq ++
+                  cppOtherIncludes,
+                cppDefines,
+              )
+            case Language.InterpretedCPP =>
+              ColIPPParser(debugOptions, blameProvider, cppOrigin = None)
+            case Language.Java => ColJavaParser(debugOptions, blameProvider)
+            case Language.PVL => ColPVLParser(debugOptions, blameProvider)
+            case Language.Silver => ColSilverParser(blameProvider)
+            case Language.SystemC =>
+              new ColSystemCParser(Resources.getSystemCConfig)
+            case Language.LLVM =>
+              ColLLVMParser(debugOptions, blameProvider, Resources.getVCLLVM)
+          }
 
-      parser.parse[G](readable)
-    }.iterator.to(Seq))
+        parser.parse[G](readable)
+      }.iterator.to(Seq)
+    )
 }
diff --git a/src/main/vct/main/stages/PrintCFG.scala b/src/main/vct/main/stages/PrintCFG.scala
index bc4adbd6b9..54bf7f7eeb 100644
--- a/src/main/vct/main/stages/PrintCFG.scala
+++ b/src/main/vct/main/stages/PrintCFG.scala
@@ -22,7 +22,12 @@ case class PrintCFG(out: Path) extends Stage[Node[_ <: Generation], Unit] {
 
   override def run(in1: Node[_ <: Generation]): Unit = {
     // TODO: Is there a better way to find a "main" method?
-    val main_method = in1.transSubnodes.collectFirst{ case m: InstanceMethod[_] if m.o.getPreferredName.get.snake.equals("main") => m }.get
+    val main_method =
+      in1.transSubnodes.collectFirst {
+        case m: InstanceMethod[_]
+            if m.o.getPreferredName.get.snake.equals("main") =>
+          m
+      }.get
     CFGPrinter().print_ast_as_cfg(main_method, out)
   }
 }
diff --git a/src/main/vct/main/stages/Resolution.scala b/src/main/vct/main/stages/Resolution.scala
index eeea43af13..64aa310b13 100644
--- a/src/main/vct/main/stages/Resolution.scala
+++ b/src/main/vct/main/stages/Resolution.scala
@@ -3,11 +3,29 @@ package vct.main.stages
 import com.typesafe.scalalogging.LazyLogging
 import hre.io.LiteralReadable
 import hre.stages.Stage
-import vct.col.ast.{AddrOf, ApplicableContract, CGlobalDeclaration, Expr, GlobalDeclaration, LlvmFunctionContract, LlvmGlobal, Program, Refute, Verification, VerificationContext}
+import vct.col.ast.{
+  AddrOf,
+  ApplicableContract,
+  CGlobalDeclaration,
+  Expr,
+  GlobalDeclaration,
+  LlvmFunctionContract,
+  LlvmGlobal,
+  Program,
+  Refute,
+  Verification,
+  VerificationContext,
+}
 import org.antlr.v4.runtime.CharStreams
 import vct.col.ast._
 import vct.col.check.CheckError
-import vct.col.origin.{FileSpanningOrigin, InlineBipContext, Origin, OriginFilename, ReadableOrigin}
+import vct.col.origin.{
+  FileSpanningOrigin,
+  InlineBipContext,
+  Origin,
+  OriginFilename,
+  ReadableOrigin,
+}
 import vct.col.resolve.{Resolve, ResolveReferences, ResolveTypes}
 import vct.col.rewrite.Generation
 import vct.col.rewrite.bip.IsolateBipGlue
@@ -29,18 +47,25 @@ import java.nio.file.NoSuchFileException
 
 case object Resolution {
   case class InputResolutionError(errors: Seq[CheckError]) extends UserError {
-    override def code: String = s"resolutionError:${errors.map(_.subcode).mkString(",")}"
+    override def code: String =
+      s"resolutionError:${errors.map(_.subcode).mkString(",")}"
     override def text: String = errors.map(_.message(_.o)).mkString("\n")
   }
 
-  def ofOptions[G <: Generation](options: Options, blameProvider: BlameProvider): Resolution[G] =
+  def ofOptions[G <: Generation](
+      options: Options,
+      blameProvider: BlameProvider,
+  ): Resolution[G] =
     Resolution(
       blameProvider = blameProvider,
       parserDebugOptions = options.getParserDebugOptions,
       classPath = options.classPath.map {
-        case ClassPathEntry.DefaultJre => ResolveTypes.JavaClassPathEntry.Path(Resources.getJrePath)
-        case ClassPathEntry.SourcePackageRoot => ResolveTypes.JavaClassPathEntry.SourcePackageRoot
-        case ClassPathEntry.SourcePath(root) => ResolveTypes.JavaClassPathEntry.Path(root)
+        case ClassPathEntry.DefaultJre =>
+          ResolveTypes.JavaClassPathEntry.Path(Resources.getJrePath)
+        case ClassPathEntry.SourcePackageRoot =>
+          ResolveTypes.JavaClassPathEntry.SourcePackageRoot
+        case ClassPathEntry.SourcePath(root) =>
+          ResolveTypes.JavaClassPathEntry.Path(root)
       },
       options.veymontGeneratePermissions,
       options.devVeymontAllowAssign,
@@ -53,39 +78,49 @@ case class SpecExprParseError(msg: String) extends UserError {
   override def text: String = msg
 }
 
-case class MyLocalJavaParser(blameProvider: BlameProvider, debugOptions: DebugOptions) extends Resolve.SpecExprParser {
+case class MyLocalJavaParser(
+    blameProvider: BlameProvider,
+    debugOptions: DebugOptions,
+) extends Resolve.SpecExprParser {
   override def parse[G](input: String, o: Origin): Expr[G] = {
     val sr = LiteralReadable("<string data>", input)
     val cjp = parser.ColJavaParser(debugOptions, blameProvider)
     val x = cjp.parseExpr[G](sr)
-    if (x._2.nonEmpty) {
-      throw SpecExprParseError("...")
-    }
+    if (x._2.nonEmpty) { throw SpecExprParseError("...") }
     x._1
   }
 }
 
-case class MyLocalLLVMSpecParser(blameProvider: BlameProvider, debugOptions: DebugOptions) extends Resolve.SpecContractParser {
-  override def parse[G](input: LlvmFunctionContract[G], o: Origin): ApplicableContract[G] =
+case class MyLocalLLVMSpecParser(
+    blameProvider: BlameProvider,
+    debugOptions: DebugOptions,
+) extends Resolve.SpecContractParser {
+  override def parse[G](
+      input: LlvmFunctionContract[G],
+      o: Origin,
+  ): ApplicableContract[G] =
     parser.ColLLVMContractParser(debugOptions, blameProvider)
       .parseFunctionContract[G](new StringReader(input.value), o)._1
 
-  override def parse[G](input: LlvmGlobal[G], o: Origin): Seq[GlobalDeclaration[G]] =
+  override def parse[G](
+      input: LlvmGlobal[G],
+      o: Origin,
+  ): Seq[GlobalDeclaration[G]] =
     parser.ColLLVMContractParser(debugOptions, blameProvider)
       .parseReader[G](new StringReader(input.value), o).decls
 }
 
-case class Resolution[G <: Generation]
-(
-  blameProvider: BlameProvider,
-  parserDebugOptions: DebugOptions,
-  classPath: Seq[ResolveTypes.JavaClassPathEntry] = Seq(
-    ResolveTypes.JavaClassPathEntry.Path(Resources.getJrePath),
-    ResolveTypes.JavaClassPathEntry.SourcePackageRoot
-  ),
-  veymontGeneratePermissions: Boolean = false,
-  veymontAllowAssign: Boolean = false,
-) extends Stage[ParseResult[G], Verification[_ <: Generation]] with LazyLogging {
+case class Resolution[G <: Generation](
+    blameProvider: BlameProvider,
+    parserDebugOptions: DebugOptions,
+    classPath: Seq[ResolveTypes.JavaClassPathEntry] = Seq(
+      ResolveTypes.JavaClassPathEntry.Path(Resources.getJrePath),
+      ResolveTypes.JavaClassPathEntry.SourcePackageRoot,
+    ),
+    veymontGeneratePermissions: Boolean = false,
+    veymontAllowAssign: Boolean = false,
+) extends Stage[ParseResult[G], Verification[_ <: Generation]]
+    with LazyLogging {
   override def friendlyName: String = "Name Resolution"
 
   override def progressWeight: Int = 1
@@ -95,15 +130,26 @@ case class Resolution[G <: Generation]
 
     val parsedProgram = Program(in.decls)(blameProvider())
     val isolatedBipProgram = IsolateBipGlue.isolate(parsedProgram)
-    val extraDecls = ResolveTypes.resolve(isolatedBipProgram, Some(JavaLibraryLoader(blameProvider, parserDebugOptions)), classPath)
-    val joinedProgram = Program(isolatedBipProgram.declarations ++ extraDecls)(blameProvider())
+    val extraDecls = ResolveTypes.resolve(
+      isolatedBipProgram,
+      Some(JavaLibraryLoader(blameProvider, parserDebugOptions)),
+      classPath,
+    )
+    val joinedProgram =
+      Program(isolatedBipProgram.declarations ++ extraDecls)(blameProvider())
     val typedProgram = LangTypesToCol().dispatch(joinedProgram)
-    ResolveReferences.resolve(typedProgram, MyLocalJavaParser(blameProvider, parserDebugOptions), MyLocalLLVMSpecParser(blameProvider, parserDebugOptions)) match {
+    ResolveReferences.resolve(
+      typedProgram,
+      MyLocalJavaParser(blameProvider, parserDebugOptions),
+      MyLocalLLVMSpecParser(blameProvider, parserDebugOptions),
+    ) match {
       case Nil => // ok
-      case some =>
-        throw InputResolutionError(some)
+      case some => throw InputResolutionError(some)
     }
-    val resolvedProgram = LangSpecificToCol(veymontGeneratePermissions, veymontAllowAssign).dispatch(typedProgram)
+    val resolvedProgram = LangSpecificToCol(
+      veymontGeneratePermissions,
+      veymontAllowAssign,
+    ).dispatch(typedProgram)
     resolvedProgram.check match {
       case Nil => // ok
       // PB: This explicitly allows LangSpecificToCol to generate invalid ASTs, and will blame the input for them. The
diff --git a/src/main/vct/main/stages/Stages.scala b/src/main/vct/main/stages/Stages.scala
index 22d8c4d5aa..beba65e6b2 100644
--- a/src/main/vct/main/stages/Stages.scala
+++ b/src/main/vct/main/stages/Stages.scala
@@ -20,42 +20,50 @@ import com.typesafe.scalalogging.LazyLogging
 import scala.collection.mutable
 
 case object Stages extends LazyLogging {
-  def silicon(blameProvider: BlameProvider, bipResults: BIP.VerificationResults): Stages[Seq[Readable], Unit] = {
+  def silicon(
+      blameProvider: BlameProvider,
+      bipResults: BIP.VerificationResults,
+  ): Stages[Seq[Readable], Unit] = {
     Parsing(blameProvider)
       .thenRun(Resolution(blameProvider, vct.parsers.debug.DebugOptions.NONE))
       .thenRun(SilverTransformation(bipResults = bipResults))
-      .thenRun(SilverBackend(Silicon()))
-      .thenRun(ExpectedErrors())
+      .thenRun(SilverBackend(Silicon())).thenRun(ExpectedErrors())
   }
 
-  def carbon(blameProvider: BlameProvider, bipResults: BIP.VerificationResults): Stages[Seq[Readable], Unit] = {
+  def carbon(
+      blameProvider: BlameProvider,
+      bipResults: BIP.VerificationResults,
+  ): Stages[Seq[Readable], Unit] = {
     Parsing(blameProvider)
       .thenRun(Resolution(blameProvider, vct.parsers.debug.DebugOptions.NONE))
       .thenRun(SilverTransformation(bipResults = bipResults))
-      .thenRun(SilverBackend(Carbon()))
-      .thenRun(ExpectedErrors())
+      .thenRun(SilverBackend(Carbon())).thenRun(ExpectedErrors())
   }
 
-  /**
-   * Constructs a normal verification run from the command line options.
-   *
-   * A normal verification run consists of five stages:
-   * <ul>
-   *   <li>[[Parsing]], which transforms a set of input files to parse trees, and transforms the parse trees to an
-   *   unresolved abstract syntax tree (AST).</li>
-   *   <li>[[Resolution]], which resolves names in the AST and translates them to cross-references.</li>
-   *   <li>[[Transformation]], which reduces the number of features in the AST so that the verification backend
-   *   supports all the different kinds of nodes still present.</li>
-   *   <li>[[Backend]], which takes in a wildly simplified AST, and verifies the specified properties. Any specified
-   *   properties that do not hold are reported to the respective [[vct.col.origin.Blame]] members of the nodes.</li>
-   *   <li>[[ExpectedErrors]], which turns the absence of expected errors into errors.</li>
-   * </ul>
-   *
-   * @param options
-   * @param blameProvider
-   * @return
-   */
-  def ofOptions(options: Options, blameProvider: BlameProvider, bipResults: BIP.VerificationResults): Stages[Seq[Readable], Unit] = {
+  /** Constructs a normal verification run from the command line options.
+    *
+    * A normal verification run consists of five stages: <ul> <li>[[Parsing]],
+    * which transforms a set of input files to parse trees, and transforms the
+    * parse trees to an unresolved abstract syntax tree (AST).</li>
+    * <li>[[Resolution]], which resolves names in the AST and translates them to
+    * cross-references.</li> <li>[[Transformation]], which reduces the number of
+    * features in the AST so that the verification backend supports all the
+    * different kinds of nodes still present.</li> <li>[[Backend]], which takes
+    * in a wildly simplified AST, and verifies the specified properties. Any
+    * specified properties that do not hold are reported to the respective
+    * [[vct.col.origin.Blame]] members of the nodes.</li>
+    * <li>[[ExpectedErrors]], which turns the absence of expected errors into
+    * errors.</li> </ul>
+    *
+    * @param options
+    * @param blameProvider
+    * @return
+    */
+  def ofOptions(
+      options: Options,
+      blameProvider: BlameProvider,
+      bipResults: BIP.VerificationResults,
+  ): Stages[Seq[Readable], Unit] = {
     Parsing.ofOptions(options, blameProvider)
       .thenRun(Resolution.ofOptions(options, blameProvider))
       .thenRun(Transformation.ofOptions(options, bipResults))
@@ -64,31 +72,39 @@ case object Stages extends LazyLogging {
   }
 
   def veymontOfOptions(options: Options): Stages[Seq[Readable], Unit] = {
-    val choreographyStage: Stages[Seq[Readable], Verification[_ <: Generation]] = {
+    val choreographyStage
+        : Stages[Seq[Readable], Verification[_ <: Generation]] = {
       val collector = BlameCollector()
       val bipResults = BIP.VerificationResults()
       val blameProvider = ConstantBlameProvider(collector)
 
-      IdentityStage().also(logger.info("VeyMont choreography verifier & code generator"))
-        .thenRun(Parsing.ofOptions(options, blameProvider).also(logger.info("Finished parsing")))
-        .thenRun(Resolution.ofOptions(options, blameProvider))
-        .thenRun(
-          saveInput[Verification[_ <: Generation], Any](
-            branch(!options.veymontSkipChoreographyVerification,
-              IdentityStage().also(logger.info("Verifying choreography with VerCors"))
-                .thenRun(Transformation.ofOptions(options, bipResults))
-                .thenRun(Backend.ofOptions(options))
-                .thenRun(ExpectedErrors.ofOptions(options))
-                .thenRun(VeyMont.NoVerificationFailures(collector, VeyMont.ChoreographyVerificationError)),
-              IdentityStage().also(logger.warn("Skipping verifying choreography with VerCors"))
-            ))
-        ).transform(_._1)
+      IdentityStage()
+        .also(logger.info("VeyMont choreography verifier & code generator"))
+        .thenRun(Parsing.ofOptions(options, blameProvider).also(logger.info(
+          "Finished parsing"
+        ))).thenRun(Resolution.ofOptions(options, blameProvider))
+        .thenRun(saveInput[Verification[_ <: Generation], Any](branch(
+          !options.veymontSkipChoreographyVerification,
+          IdentityStage()
+            .also(logger.info("Verifying choreography with VerCors"))
+            .thenRun(Transformation.ofOptions(options, bipResults))
+            .thenRun(Backend.ofOptions(options))
+            .thenRun(ExpectedErrors.ofOptions(options))
+            .thenRun(VeyMont.NoVerificationFailures(
+              collector,
+              VeyMont.ChoreographyVerificationError,
+            )),
+          IdentityStage()
+            .also(logger.warn("Skipping verifying choreography with VerCors")),
+        ))).transform(_._1)
     }
 
-    val generationStage: Stages[Verification[_ <: Generation], Seq[LiteralReadable]] = {
+    val generationStage
+        : Stages[Verification[_ <: Generation], Seq[LiteralReadable]] = {
       IdentityStage().also(logger.info("Generating endpoint implementations"))
-        .thenRun(Transformation.veymontImplementationGenerationOfOptions(options))
-        .thenRun(Output.veymontOfOptions(options))
+        .thenRun(Transformation.veymontImplementationGenerationOfOptions(
+          options
+        )).thenRun(Output.veymontOfOptions(options))
     }
 
     val implementationVerificationStage = {
@@ -101,29 +117,36 @@ case object Stages extends LazyLogging {
         .thenRun(Transformation.ofOptions(options, bipResults))
         .thenRun(Backend.ofOptions(options))
         .thenRun(ExpectedErrors.ofOptions(options))
-        .thenRun(VeyMont.NoVerificationFailures(collector, VeyMont.ImplementationVerificationError))
+        .thenRun(VeyMont.NoVerificationFailures(
+          collector,
+          VeyMont.ImplementationVerificationError,
+        ))
     }
 
-    choreographyStage
-      .thenRun(generationStage)
+    choreographyStage.thenRun(generationStage)
       .thenRun(implementationVerificationStage)
   }
 
-  def vesuvOfOptions(options: Options, blameProvider: BlameProvider) : Stages[Seq[Readable], Unit] = {
+  def vesuvOfOptions(
+      options: Options,
+      blameProvider: BlameProvider,
+  ): Stages[Seq[Readable], Unit] = {
     if (options.vesuvGenerateRasi) {
       Parsing.ofOptions(options, blameProvider)
         .thenRun(Resolution.ofOptions(options, blameProvider))
         .thenRun(GenerateRASI.ofOptions(options))
-    }
-    else {
+    } else {
       Parsing.ofOptions(options, blameProvider)
         .thenRun(Output.vesuvOfOptions(options))
     }
   }
 
-  def cfgTransformationOfOptions(options: Options, blameProvider: BlameProvider): Stages[Seq[Readable], Unit] = {
+  def cfgTransformationOfOptions(
+      options: Options,
+      blameProvider: BlameProvider,
+  ): Stages[Seq[Readable], Unit] = {
     Parsing.ofOptions(options, blameProvider)
       .thenRun(Resolution.ofOptions(options, blameProvider))
       .thenRun(PrintCFG.ofOptions(options))
   }
-}
\ No newline at end of file
+}
diff --git a/src/main/vct/main/stages/Transformation.scala b/src/main/vct/main/stages/Transformation.scala
index 4de63ef48e..36fab123a0 100644
--- a/src/main/vct/main/stages/Transformation.scala
+++ b/src/main/vct/main/stages/Transformation.scala
@@ -18,48 +18,94 @@ import vct.rewrite.lang.NoSupportSelfLoop
 import vct.col.rewrite.veymont.StructureCheck
 import vct.importer.{PathAdtImporter, Util}
 import vct.main.Main.TemporarilyUnsupported
-import vct.main.stages.Transformation.{PassEventHandler, TransformationCheckError}
+import vct.main.stages.Transformation.{
+  PassEventHandler,
+  TransformationCheckError,
+}
 import vct.options.Options
 import vct.options.types.{Backend, PathOrStd}
 import vct.resources.Resources
 import vct.result.VerificationError.SystemError
 import vct.rewrite.adt.ImportSetCompat
-import vct.rewrite.{EncodeAutoValue, EncodeRange, EncodeResourceValues, ExplicitResourceValues, HeapVariableToRef, MonomorphizeClass, SmtlibToProverTypes}
+import vct.rewrite.{
+  EncodeAutoValue,
+  EncodeRange,
+  EncodeResourceValues,
+  ExplicitResourceValues,
+  HeapVariableToRef,
+  MonomorphizeClass,
+  SmtlibToProverTypes,
+}
 import vct.rewrite.lang.ReplaceSYCLTypes
-import vct.rewrite.veymont.{DeduplicateChorGuards, EncodeChannels, EncodeChorBranchUnanimity, EncodeChoreography, EncodeChoreographyParameters, EncodeEndpointInequalities, EncodeUnpointedGuard, GenerateChoreographyPermissions, GenerateImplementation, InferEndpointContexts, SpecializeEndpointClasses, SplitChorGuards}
+import vct.rewrite.veymont.{
+  DeduplicateChorGuards,
+  EncodeChannels,
+  EncodeChorBranchUnanimity,
+  EncodeChoreography,
+  EncodeChoreographyParameters,
+  EncodeEndpointInequalities,
+  EncodeUnpointedGuard,
+  GenerateChoreographyPermissions,
+  GenerateImplementation,
+  InferEndpointContexts,
+  SpecializeEndpointClasses,
+  SplitChorGuards,
+}
 
 import java.nio.file.Path
 
 object Transformation extends LazyLogging {
-  case class TransformationCheckError(pass: RewriterBuilder, errors: Seq[(Program[_], CheckError)]) extends SystemError {
+  case class TransformationCheckError(
+      pass: RewriterBuilder,
+      errors: Seq[(Program[_], CheckError)],
+  ) extends SystemError {
     override def text: String =
-      s"The ${pass.key} rewrite caused the AST to no longer typecheck:\n" + errors.map {
-        case (program, err) => err.message(program.highlight)
-      }.mkString("\n")
+      s"The ${pass.key} rewrite caused the AST to no longer typecheck:\n" +
+        errors.map { case (program, err) => err.message(program.highlight) }
+          .mkString("\n")
   }
 
-  private def writeOutFunctions(event: TransformationEvent, m: Map[String, PathOrStd]): Seq[PassEventHandler] = m.toSeq.map { case (key, out) =>
-    (passes, currentEvent, currentKey, program: Verification[_ <: Generation]) => {
-      if (key == currentKey && event == currentEvent) {
-        out.write { writer =>
-          program.write(writer)(Ctx().namesIn(program))
+  private def writeOutFunctions(
+      event: TransformationEvent,
+      m: Map[String, PathOrStd],
+  ): Seq[PassEventHandler] =
+    m.toSeq.map { case (key, out) =>
+      (
+          passes,
+          currentEvent,
+          currentKey,
+          program: Verification[_ <: Generation],
+      ) => {
+        if (key == currentKey && event == currentEvent) {
+          out.write { writer => program.write(writer)(Ctx().namesIn(program)) }
         }
       }
     }
-  }
 
-  private def reportIntermediateProgram(out: Path, stageKey: String): PassEventHandler = {
+  private def reportIntermediateProgram(
+      out: Path,
+      stageKey: String,
+  ): PassEventHandler = {
     out.toFile.mkdirs()
     (passes, event, pass, program) => {
-      val i = passes.map(_.key).indexOf(pass) * 2 + (if(event == before) 0 else 1)
-      val target = PathOrStd.Path(out.resolve(f"$stageKey-$i%03d-$event-$pass.col"))
+      val i =
+        passes.map(_.key).indexOf(pass) * 2 +
+          (if (event == before)
+             0
+           else
+             1)
+      val target = PathOrStd
+        .Path(out.resolve(f"$stageKey-$i%03d-$event-$pass.col"))
       target.write { writer => program.write(writer)(Ctx().namesIn(program)) }
     }
   }
 
   def simplifierFor(path: PathOrStd, options: Options): RewriterBuilder =
     ApplyTermRewriter.BuilderFor(
-      ruleNodes = Util.loadPVLLibraryFile[InitialGeneration](path, options.getParserDebugOptions).declarations.collect {
+      ruleNodes = Util.loadPVLLibraryFile[InitialGeneration](
+        path,
+        options.getParserDebugOptions,
+      ).declarations.collect {
         case rule: SimplificationRule[InitialGeneration] => rule
       },
       debugIn = options.devSimplifyDebugIn,
@@ -70,56 +116,87 @@ object Transformation extends LazyLogging {
       debugFilterRule = options.devSimplifyDebugFilterRule,
     )
 
-  def ofOptions(options: Options, bipResults: BIP.VerificationResults = BIP.VerificationResults()): Transformation =
+  def ofOptions(
+      options: Options,
+      bipResults: BIP.VerificationResults = BIP.VerificationResults(),
+  ): Transformation =
     options.backend match {
       case Backend.Silicon | Backend.Carbon =>
         SilverTransformation(
-          adtImporter = PathAdtImporter(options.adtPath, options.getParserDebugOptions),
-          onPassEvent = options.outputIntermediatePrograms.map(p => reportIntermediateProgram(p, "verify")).toSeq ++
-            writeOutFunctions(Transformation.before, options.outputBeforePass) ++
-            writeOutFunctions(Transformation.after, options.outputAfterPass),
-          simplifyBeforeRelations = options.simplifyPaths.map(simplifierFor(_, options)),
-          simplifyAfterRelations = options.simplifyPathsAfterRelations.map(simplifierFor(_, options)),
+          adtImporter = PathAdtImporter(
+            options.adtPath,
+            options.getParserDebugOptions,
+          ),
+          onPassEvent =
+            options.outputIntermediatePrograms
+              .map(p => reportIntermediateProgram(p, "verify")).toSeq ++
+              writeOutFunctions(
+                Transformation.before,
+                options.outputBeforePass,
+              ) ++
+              writeOutFunctions(Transformation.after, options.outputAfterPass),
+          simplifyBeforeRelations = options.simplifyPaths
+            .map(simplifierFor(_, options)),
+          simplifyAfterRelations = options.simplifyPathsAfterRelations
+            .map(simplifierFor(_, options)),
           checkSat = options.devCheckSat,
           inferHeapContextIntoFrame = options.inferHeapContextIntoFrame,
           bipResults = bipResults,
-          splitVerificationByProcedure = options.devSplitVerificationByProcedure,
+          splitVerificationByProcedure =
+            options.devSplitVerificationByProcedure,
           veymontGeneratePermissions = options.veymontGeneratePermissions,
         )
     }
 
-  def veymontImplementationGenerationOfOptions(options: Options): Transformation =
+  def veymontImplementationGenerationOfOptions(
+      options: Options
+  ): Transformation =
     VeyMontImplementationGeneration(
-      importer = PathAdtImporter(options.veymontResourcePath, options.getParserDebugOptions),
-      onPassEvent = options.outputIntermediatePrograms.map(p => reportIntermediateProgram(p, "generate")).toSeq ++
-        writeOutFunctions(before, options.outputBeforePass) ++
-        writeOutFunctions(after, options.outputAfterPass),
+      importer = PathAdtImporter(
+        options.veymontResourcePath,
+        options.getParserDebugOptions,
+      ),
+      onPassEvent =
+        options.outputIntermediatePrograms
+          .map(p => reportIntermediateProgram(p, "generate")).toSeq ++
+          writeOutFunctions(before, options.outputBeforePass) ++
+          writeOutFunctions(after, options.outputAfterPass),
     )
 
   sealed trait TransformationEvent
   case object before extends TransformationEvent
   case object after extends TransformationEvent
-  type PassEventHandler = (Seq[RewriterBuilder], TransformationEvent, String, Verification[_ <: Generation]) => Unit
+  type PassEventHandler =
+    (
+        Seq[RewriterBuilder],
+        TransformationEvent,
+        String,
+        Verification[_ <: Generation],
+    ) => Unit
 }
 
-/**
- * Executes a sequence of rewriters. Currently the only concrete implementation is [[SilverTransformation]].
- *
- * Refer to [[RewriterBuilder]] and [[RewriterBuilderArg]] for information on how to use a [[Rewriter]] in the
- * pass chain.
- *
- * @param onPassEvent Execute a handler before/after a pass is executed.
- * @param passes The list of rewrite passes to execute.
- */
-class Transformation
-(
-  val onPassEvent: Seq[PassEventHandler],
-  val passes: Seq[RewriterBuilder],
-) extends Stage[Verification[_ <: Generation], Verification[_ <: Generation]] with LazyLogging {
+/** Executes a sequence of rewriters. Currently the only concrete implementation
+  * is [[SilverTransformation]].
+  *
+  * Refer to [[RewriterBuilder]] and [[RewriterBuilderArg]] for information on
+  * how to use a [[Rewriter]] in the pass chain.
+  *
+  * @param onPassEvent
+  *   Execute a handler before/after a pass is executed.
+  * @param passes
+  *   The list of rewrite passes to execute.
+  */
+class Transformation(
+    val onPassEvent: Seq[PassEventHandler],
+    val passes: Seq[RewriterBuilder],
+) extends Stage[Verification[_ <: Generation], Verification[_ <: Generation]]
+    with LazyLogging {
   override def friendlyName: String = "Transformation"
   override def progressWeight: Int = 10
 
-  override def run(input: Verification[_ <: Generation]): Verification[_ <: Generation] = {
+  override def run(
+      input: Verification[_ <: Generation]
+  ): Verification[_ <: Generation] = {
     val tempUnsupported = Set[feature.Feature](
       feature.MatrixVector,
       feature.NumericReductionOperator,
@@ -128,7 +205,10 @@ class Transformation
 
     feature.Feature.examples(input).foreach {
       case (feature, examples) if tempUnsupported.contains(feature) =>
-        throw TemporarilyUnsupported(feature.getClass.getSimpleName.stripSuffix("$"), examples.toSeq)
+        throw TemporarilyUnsupported(
+          feature.getClass.getSimpleName.stripSuffix("$"),
+          examples.toSeq,
+        )
       case (_, _) =>
     }
 
@@ -136,19 +216,24 @@ class Transformation
       var result: Verification[_ <: Generation] = input
 
       Progress.foreach(passes, (pass: RewriterBuilder) => pass.key) { pass =>
-        onPassEvent.foreach { action => action(passes, Transformation.before, pass.key, result) }
-
-        result = try {
-          pass().dispatch(result)
-        } catch {
-          case c @ CauseWithBadEffect(effect) =>
-            logger.error(s"An error occurred in pass ${pass.key}")
-            throw c
+        onPassEvent.foreach { action =>
+          action(passes, Transformation.before, pass.key, result)
         }
 
-        onPassEvent.foreach { action => action(passes, Transformation.after, pass.key, result) }
+        result =
+          try { pass().dispatch(result) }
+          catch {
+            case c @ CauseWithBadEffect(effect) =>
+              logger.error(s"An error occurred in pass ${pass.key}")
+              throw c
+          }
+
+        onPassEvent.foreach { action =>
+          action(passes, Transformation.after, pass.key, result)
+        }
 
-        result.tasks.map(_.program).flatMap(program => program.check.map(program -> _)) match {
+        result.tasks.map(_.program)
+          .flatMap(program => program.check.map(program -> _)) match {
           case Nil => // ok
           case errors => throw TransformationCheckError(pass, errors)
         }
@@ -169,191 +254,199 @@ class Transformation
   }
 }
 
-/**
- * Defines the rewrite chain appropriate for the Viper backends: Silicon and Carbon.
- *
- * @param adtImporter Decides how to import the definition of the built-in axiomatically-defined datatypes.
- * @param onBeforePassKey Execute a side effect just before a rewrite pass is executed.
- * @param onAfterPassKey Execute a side effect just after a rewrite pass is executed. The consistency check is done
- *                       before the side effect is performed.
- * @param simplifyBeforeRelations The list of passes to execute at the appropriate point for simplification, just before
- *                                quantified integer relations are simplified.
- * @param simplifyAfterRelations The list of passes to execute at the appropriate point for simplification, just after
- *                               quantified integer relations are simplified.
- * @param checkSat Check that non-trivial contracts are satisfiable.
- */
-case class SilverTransformation
-(
-  adtImporter: ImportADTImporter = PathAdtImporter(Resources.getAdtPath, vct.parsers.debug.DebugOptions.NONE),
-  override val onPassEvent: Seq[PassEventHandler] = Nil,
-  simplifyBeforeRelations: Seq[RewriterBuilder] = Options().simplifyPaths.map(Transformation.simplifierFor(_, Options())),
-  simplifyAfterRelations: Seq[RewriterBuilder] = Options().simplifyPathsAfterRelations.map(Transformation.simplifierFor(_, Options())),
-  inferHeapContextIntoFrame: Boolean = true,
-  bipResults: BIP.VerificationResults,
-  checkSat: Boolean = true,
-  splitVerificationByProcedure: Boolean = false,
-  veymontGeneratePermissions: Boolean = false,
-) extends Transformation(onPassEvent, Seq(
-    // Replace leftover SYCL types
-    ReplaceSYCLTypes,
-    CFloatIntCoercion,
-
-    ComputeBipGlue,
-    InstantiateBipSynchronizations,
-    EncodeBipPermissions,
-    EncodeBip.withArg(bipResults),
-
-    // Remove the java.lang.Object -> java.lang.Object inheritance loop
-    NoSupportSelfLoop,
-
-    // Delete stuff that may be declared unsupported at a later stage
-    FilterSpecIgnore,
-
-    // Normalize AST
-    // Make sure Disambiguate comes after CFloatIntCoercion, so CInts are gone
-    Disambiguate, // Resolve overloaded operators (+, subscript, etc.)
-    DisambiguateLocation, // Resolve location type
-    EncodeRangedFor,
-
-    // VeyMont sequential program encoding
-    SplitChorGuards,
-    EncodeUnpointedGuard,
-    DeduplicateChorGuards,
-    InferEndpointContexts,
-    GenerateChoreographyPermissions.withArg(veymontGeneratePermissions),
-    EncodeChorBranchUnanimity,
-    EncodeEndpointInequalities,
-    EncodeChoreography,
-
-    EncodeString, // Encode spec string as seq<int>
-    EncodeChar,
-
-    CollectLocalDeclarations, // all decls in Scope
-    DesugarPermissionOperators, // no PointsTo, \pointer, etc.
-    ReadToValue, // resolve wildcard into fractional permission
-    TrivialAddrOf,
-    DesugarCoalescingOperators, // no ?.
-    PinCollectionTypes, // no anonymous sequences, sets, etc.
-    QuantifySubscriptAny, // no arr[*]
-    IterationContractToParBlock,
-    PropagateContextEverywhere, // inline context_everywhere into loop invariants
-    EncodeArrayValues, // maybe don't target shift lemmas on generated function for \values
-    GivenYieldsToArgs,
-
-    CheckProcessAlgebra,
-    EncodeCurrentThread,
-    EncodeIntrinsicLock,
-    EncodeForkJoin,
-    InlineApplicables,
-    PureMethodsToFunctions,
-    RefuteToInvertedAssert,
-    ExplicitResourceValues,
-    EncodeResourceValues,
-
-    // Encode parallel blocks
-    EncodeSendRecv,
-    ParBlockEncoder,
-
-    // Extract explicitly extracted code sections, which ban continue/break/return/goto outside them.
-    SpecifyImplicitLabels,
-    EncodeExtract,
-
-    // Encode exceptional behaviour (no more continue/break/return/try/throw)
-    SwitchToGoto,
-    ContinueToBreak,
-    EncodeBreakReturn,
-
-    ) ++ simplifyBeforeRelations ++ Seq(
-    SimplifyQuantifiedRelations,
-    SimplifyNestedQuantifiers,
-    TupledQuantifiers,
-    ) ++ simplifyAfterRelations ++ Seq(
-    UntupledQuantifiers,
-
-    // Encode proof helpers
-    EncodeProofHelpers.withArg(inferHeapContextIntoFrame),
-    ImportSetCompat.withArg(adtImporter),
-
-    // Make final fields constant functions. Explicitly before ResolveExpressionSideEffects, because that pass will
-    // flatten out functions in the rhs of assignments, making it harder to detect final field assignments where the
-    // value is pure and therefore be put in the contract of the constant function.
-    ConstantifyFinalFields,
-
-    // Resolve side effects including method invocations, for encodetrythrowsignals.
-    ResolveExpressionSideChecks,
-    ResolveExpressionSideEffects,
-    EncodeTryThrowSignals,
-
-    ResolveScale,
-    MonomorphizeClass,
-    // No more classes
-    ClassToRef,
-    HeapVariableToRef,
-
-    CheckContractSatisfiability.withArg(checkSat),
-
-    DesugarCollectionOperators,
-    EncodeNdIndex,
-
-    ExtractInlineQuantifierPatterns,
-    // Translate internal types to domains
-    FloatToRat,
-    SmtlibToProverTypes,
-    EnumToDomain,
-    ImportArray.withArg(adtImporter),
-    ImportPointer.withArg(adtImporter),
-    ImportVector.withArg(adtImporter),
-    ImportMapCompat.withArg(adtImporter),
-    ImportEither.withArg(adtImporter),
-    ImportTuple.withArg(adtImporter),
-    ImportOption.withArg(adtImporter),
-    ImportFrac.withArg(adtImporter),
-    ImportNothing.withArg(adtImporter),
-    ImportVoid.withArg(adtImporter),
-    ImportNull.withArg(adtImporter),
-    ImportAny.withArg(adtImporter),
-    ImportViperOrder.withArg(adtImporter),
-    EncodeRange.withArg(adtImporter),
-
-    // After Disambiguate and  ImportVector
-    TruncDivMod,
-
-    // All locations with a value should now be SilverField
-    EncodeForPermWithValue,
-    EncodeAutoValue,
-
-    ExtractInlineQuantifierPatterns,
-    RewriteTriggerADTFunctions,
-    MonomorphizeContractApplicables,
-
-    // Silver compat (basically no new nodes)
-    FinalizeArguments,
-    ExplicitADTTypeArgs,
-    ForLoopToWhileLoop,
-    BranchToIfElse,
-    EvaluationTargetDummy,
-
-    // Final translation to rigid silver nodes
-    SilverIntRatCoercion,
-    // PB TODO: PinSilverNodes has now become a collection of Silver oddities, it should be more structured / split out.
-    PinSilverNodes,
-
-    Explode.withArg(splitVerificationByProcedure),
-  ))
-
-case class VeyMontImplementationGeneration(importer: ImportADTImporter = PathAdtImporter(Resources.getVeymontPath, vct.parsers.debug.DebugOptions.NONE),
-                                           override val onPassEvent: Seq[PassEventHandler] = Nil)
-  extends Transformation(onPassEvent, Seq(
-    SplitChorGuards,
-    EncodeUnpointedGuard,
-    DeduplicateChorGuards,
-    SpecializeEndpointClasses,
-    InferEndpointContexts,
-    EncodeChannels.withArg(importer),
-//    EncodeChoreographyParameters,
-    GenerateImplementation,
-    PrettifyBlocks,
-  ))
-
-
+/** Defines the rewrite chain appropriate for the Viper backends: Silicon and
+  * Carbon.
+  *
+  * @param adtImporter
+  *   Decides how to import the definition of the built-in axiomatically-defined
+  *   datatypes.
+  * @param onBeforePassKey
+  *   Execute a side effect just before a rewrite pass is executed.
+  * @param onAfterPassKey
+  *   Execute a side effect just after a rewrite pass is executed. The
+  *   consistency check is done before the side effect is performed.
+  * @param simplifyBeforeRelations
+  *   The list of passes to execute at the appropriate point for simplification,
+  *   just before quantified integer relations are simplified.
+  * @param simplifyAfterRelations
+  *   The list of passes to execute at the appropriate point for simplification,
+  *   just after quantified integer relations are simplified.
+  * @param checkSat
+  *   Check that non-trivial contracts are satisfiable.
+  */
+case class SilverTransformation(
+    adtImporter: ImportADTImporter = PathAdtImporter(
+      Resources.getAdtPath,
+      vct.parsers.debug.DebugOptions.NONE,
+    ),
+    override val onPassEvent: Seq[PassEventHandler] = Nil,
+    simplifyBeforeRelations: Seq[RewriterBuilder] = Options().simplifyPaths
+      .map(Transformation.simplifierFor(_, Options())),
+    simplifyAfterRelations: Seq[RewriterBuilder] = Options()
+      .simplifyPathsAfterRelations
+      .map(Transformation.simplifierFor(_, Options())),
+    inferHeapContextIntoFrame: Boolean = true,
+    bipResults: BIP.VerificationResults,
+    checkSat: Boolean = true,
+    splitVerificationByProcedure: Boolean = false,
+    veymontGeneratePermissions: Boolean = false,
+) extends Transformation(
+      onPassEvent,
+      Seq(
+        // Replace leftover SYCL types
+        ReplaceSYCLTypes,
+        CFloatIntCoercion,
+        ComputeBipGlue,
+        InstantiateBipSynchronizations,
+        EncodeBipPermissions,
+        EncodeBip.withArg(bipResults),
+
+        // Remove the java.lang.Object -> java.lang.Object inheritance loop
+        NoSupportSelfLoop,
+
+        // Delete stuff that may be declared unsupported at a later stage
+        FilterSpecIgnore,
+
+        // Normalize AST
+        // Make sure Disambiguate comes after CFloatIntCoercion, so CInts are gone
+        Disambiguate, // Resolve overloaded operators (+, subscript, etc.)
+        DisambiguateLocation, // Resolve location type
+        EncodeRangedFor,
+
+        // VeyMont sequential program encoding
+        SplitChorGuards,
+        EncodeUnpointedGuard,
+        DeduplicateChorGuards,
+        InferEndpointContexts,
+        GenerateChoreographyPermissions.withArg(veymontGeneratePermissions),
+        EncodeChorBranchUnanimity,
+        EncodeEndpointInequalities,
+        EncodeChoreography,
+        EncodeString, // Encode spec string as seq<int>
+        EncodeChar,
+        CollectLocalDeclarations, // all decls in Scope
+        DesugarPermissionOperators, // no PointsTo, \pointer, etc.
+        ReadToValue, // resolve wildcard into fractional permission
+        TrivialAddrOf,
+        DesugarCoalescingOperators, // no ?.
+        PinCollectionTypes, // no anonymous sequences, sets, etc.
+        QuantifySubscriptAny, // no arr[*]
+        IterationContractToParBlock,
+        PropagateContextEverywhere, // inline context_everywhere into loop invariants
+        EncodeArrayValues, // maybe don't target shift lemmas on generated function for \values
+        GivenYieldsToArgs,
+        CheckProcessAlgebra,
+        EncodeCurrentThread,
+        EncodeIntrinsicLock,
+        EncodeForkJoin,
+        InlineApplicables,
+        PureMethodsToFunctions,
+        RefuteToInvertedAssert,
+        ExplicitResourceValues,
+        EncodeResourceValues,
+
+        // Encode parallel blocks
+        EncodeSendRecv,
+        ParBlockEncoder,
+
+        // Extract explicitly extracted code sections, which ban continue/break/return/goto outside them.
+        SpecifyImplicitLabels,
+        EncodeExtract,
+
+        // Encode exceptional behaviour (no more continue/break/return/try/throw)
+        SwitchToGoto,
+        ContinueToBreak,
+        EncodeBreakReturn,
+      ) ++ simplifyBeforeRelations ++ Seq(
+        SimplifyQuantifiedRelations,
+        SimplifyNestedQuantifiers,
+        TupledQuantifiers,
+      ) ++ simplifyAfterRelations ++ Seq(
+        UntupledQuantifiers,
+
+        // Encode proof helpers
+        EncodeProofHelpers.withArg(inferHeapContextIntoFrame),
+        ImportSetCompat.withArg(adtImporter),
+
+        // Make final fields constant functions. Explicitly before ResolveExpressionSideEffects, because that pass will
+        // flatten out functions in the rhs of assignments, making it harder to detect final field assignments where the
+        // value is pure and therefore be put in the contract of the constant function.
+        ConstantifyFinalFields,
+
+        // Resolve side effects including method invocations, for encodetrythrowsignals.
+        ResolveExpressionSideChecks,
+        ResolveExpressionSideEffects,
+        EncodeTryThrowSignals,
+        ResolveScale,
+        MonomorphizeClass,
+        // No more classes
+        ClassToRef,
+        HeapVariableToRef,
+        CheckContractSatisfiability.withArg(checkSat),
+        DesugarCollectionOperators,
+        EncodeNdIndex,
+        ExtractInlineQuantifierPatterns,
+        // Translate internal types to domains
+        FloatToRat,
+        SmtlibToProverTypes,
+        EnumToDomain,
+        ImportArray.withArg(adtImporter),
+        ImportPointer.withArg(adtImporter),
+        ImportVector.withArg(adtImporter),
+        ImportMapCompat.withArg(adtImporter),
+        ImportEither.withArg(adtImporter),
+        ImportTuple.withArg(adtImporter),
+        ImportOption.withArg(adtImporter),
+        ImportFrac.withArg(adtImporter),
+        ImportNothing.withArg(adtImporter),
+        ImportVoid.withArg(adtImporter),
+        ImportNull.withArg(adtImporter),
+        ImportAny.withArg(adtImporter),
+        ImportViperOrder.withArg(adtImporter),
+        EncodeRange.withArg(adtImporter),
+
+        // After Disambiguate and  ImportVector
+        TruncDivMod,
+
+        // All locations with a value should now be SilverField
+        EncodeForPermWithValue,
+        EncodeAutoValue,
+        ExtractInlineQuantifierPatterns,
+        RewriteTriggerADTFunctions,
+        MonomorphizeContractApplicables,
+
+        // Silver compat (basically no new nodes)
+        FinalizeArguments,
+        ExplicitADTTypeArgs,
+        ForLoopToWhileLoop,
+        BranchToIfElse,
+        EvaluationTargetDummy,
+
+        // Final translation to rigid silver nodes
+        SilverIntRatCoercion,
+        // PB TODO: PinSilverNodes has now become a collection of Silver oddities, it should be more structured / split out.
+        PinSilverNodes,
+        Explode.withArg(splitVerificationByProcedure),
+      ),
+    )
 
+case class VeyMontImplementationGeneration(
+    importer: ImportADTImporter = PathAdtImporter(
+      Resources.getVeymontPath,
+      vct.parsers.debug.DebugOptions.NONE,
+    ),
+    override val onPassEvent: Seq[PassEventHandler] = Nil,
+) extends Transformation(
+      onPassEvent,
+      Seq(
+        SplitChorGuards,
+        EncodeUnpointedGuard,
+        DeduplicateChorGuards,
+        SpecializeEndpointClasses,
+        InferEndpointContexts,
+        EncodeChannels.withArg(importer),
+//    EncodeChoreographyParameters,
+        GenerateImplementation,
+        PrettifyBlocks,
+      ),
+    )
diff --git a/src/main/vct/options/BashCompletion.scala b/src/main/vct/options/BashCompletion.scala
index 2b18426bfd..5f1678c1c6 100644
--- a/src/main/vct/options/BashCompletion.scala
+++ b/src/main/vct/options/BashCompletion.scala
@@ -14,7 +14,8 @@ case object BashCompletion {
   private val abbrSymbol = tOptDef.info.decl(TermName("_shortOpt")).asTerm
 
   def abbr[A, C](opt: OptionDef[A, C]): Option[String] =
-    mirror.reflect(opt).reflectField(abbrSymbol).get.asInstanceOf[Option[String]]
+    mirror.reflect(opt).reflectField(abbrSymbol).get
+      .asInstanceOf[Option[String]]
 
   def main(args: Array[String]): Unit = {
     val (parser, tags) = Options.constructParser(hide = true)
@@ -26,7 +27,7 @@ case object BashCompletion {
     var languageOpts = Seq.empty[String]
     var unknownOpts = Seq.empty[String]
 
-    for(option <- parser.toList if option.name.nonEmpty) {
+    for (option <- parser.toList if option.name.nonEmpty) {
       val opts = Seq("--" + option.name) ++ abbr(option).map("-" + _).toSeq
 
       // We only add types that have exactly one argument, and we can for sure know all the suggestions we should make.
@@ -48,7 +49,8 @@ case object BashCompletion {
       }
     }
 
-    println("""
+    println(
+      """
       |__vercors()
       |{
       |local cur prev pathOpts pathOrStdOpts stringOpts backendOpts languageOpts unknownOpts
@@ -89,7 +91,8 @@ case object BashCompletion {
         unknownOpts.mkString("|"),
         Backend.options.keys.mkString(" "),
         ReadLanguage.options.keys.mkString(" "),
-        (pathOpts ++ pathOrStdOpts ++ stringOpts ++ backendOpts ++ languageOpts ++ unknownOpts).mkString(" "),
+        (pathOpts ++ pathOrStdOpts ++ stringOpts ++ backendOpts ++
+          languageOpts ++ unknownOpts).mkString(" "),
       ).strip()
     )
   }
diff --git a/src/main/vct/options/Options.scala b/src/main/vct/options/Options.scala
index 566ab6e757..79e522f5e8 100644
--- a/src/main/vct/options/Options.scala
+++ b/src/main/vct/options/Options.scala
@@ -17,16 +17,24 @@ case object Options {
   def parser(hide: Boolean = true): OParser[Unit, Options] =
     constructParser(hide)._1
 
-  def constructParser(hide: Boolean): (OParser[Unit, Options], Map[String, ClassTag[_]]) = {
+  def constructParser(
+      hide: Boolean
+  ): (OParser[Unit, Options], Map[String, ClassTag[_]]) = {
     import builder._
 
     implicit class Hideable[A, C](opt: OParser[A, C]) {
-      def maybeHidden(): OParser[A, C] = if(hide) opt.hidden() else opt
+      def maybeHidden(): OParser[A, C] =
+        if (hide)
+          opt.hidden()
+        else
+          opt
     }
 
     val tags: mutable.Map[String, ClassTag[_]] = mutable.Map()
 
-    def opt[T: scopt.Read](name: String)(implicit tag: ClassTag[T]): OParser[T, Options] = {
+    def opt[T: scopt.Read](
+        name: String
+    )(implicit tag: ClassTag[T]): OParser[T, Options] = {
       val parser = builder.opt[T](name)
       tags(parser.toList.head.name) = tag
       parser
@@ -36,134 +44,145 @@ case object Options {
     implicit val readLanguage: scopt.Read[Language] = ReadLanguage.read
     import vct.options.types.Verbosity.read
 
-    implicit val readPathOrStd: scopt.Read[PathOrStd] =
-      scopt.Read.reads {
-        case "-" => PathOrStd.StdInOrOut
-        case other => PathOrStd.Path(Paths.get(other))
-      }
+    implicit val readPathOrStd: scopt.Read[PathOrStd] = scopt.Read.reads {
+      case "-" => PathOrStd.StdInOrOut
+      case other => PathOrStd.Path(Paths.get(other))
+    }
 
     implicit val readPath: scopt.Read[Path] = scopt.Read.reads(Paths.get(_))
 
     val parser = OParser.sequence(
       programName(BuildInfo.name),
       head(BuildInfo.name, BuildInfo.version),
-
-      opt[Unit]("help").abbr("h")
-        .action((_, c) => c.copy(help = true))
+      opt[Unit]("help").abbr("h").action((_, c) => c.copy(help = true))
         .text("Prints this usage text"),
-      opt[Unit]("help-hidden")
-        .action((_, c) => c.copy(showHidden = true))
-        .text("Show hidden options (intended for VerCors experts, proceed with caution!)"),
+      opt[Unit]("help-hidden").action((_, c) => c.copy(showHidden = true)).text(
+        "Show hidden options (intended for VerCors experts, proceed with caution!)"
+      ),
       version("version").text("Prints version and build information"),
-      opt[Unit]("help-passes")
-        .action((_, c) => c.copy(mode = Mode.HelpVerifyPasses))
-        .text("Lists the pass keys available for options that take a pass key."),
-      opt[Unit]("quiet").abbr("q")
-        .action((_, c) => c.copy(logLevels = c.logLevels ++ Seq(("vct", Verbosity.Error), ("viper.api", Verbosity.Error))))
-        .text("Instruct VerCors to only log errors."),
-      opt[Unit]("verbose").abbr("v")
-        .action((_, c) => c.copy(logLevels = c.logLevels ++ Seq(("vct", Verbosity.Debug), ("viper.api", Verbosity.Debug))))
-        .text("Instruct VerCors to output debug information"),
-      opt[Unit]("progress").abbr("p")
-        .action((_, c) => c.copy(progress = true))
+      opt[Unit]("help-passes").action((_, c) =>
+        c.copy(mode = Mode.HelpVerifyPasses)
+      ).text("Lists the pass keys available for options that take a pass key."),
+      opt[Unit]("quiet").abbr("q").action((_, c) =>
+        c.copy(logLevels =
+          c.logLevels ++
+            Seq(("vct", Verbosity.Error), ("viper.api", Verbosity.Error))
+        )
+      ).text("Instruct VerCors to only log errors."),
+      opt[Unit]("verbose").abbr("v").action((_, c) =>
+        c.copy(logLevels =
+          c.logLevels ++
+            Seq(("vct", Verbosity.Debug), ("viper.api", Verbosity.Debug))
+        )
+      ).text("Instruct VerCors to output debug information"),
+      opt[Unit]("progress").abbr("p").action((_, c) => c.copy(progress = true))
         .text("Print progress information, even if stdout is not a tty."),
-      opt[Unit]("profile")
-        .action((_, c) => c.copy(profile = true))
-        .text("Output profiling information in the current directory in the pprof format (https://github.com/google/pprof)"),
-      opt[Unit]("watch").abbr("w")
-        .action((_, c) => c.copy(watch = true))
-        .text("Run VerCors in an infinite loop, waiting for external changes between each run."),
-
-      opt[(String, Verbosity)]("dev-log-verbosity").unbounded().maybeHidden().keyValueName("<loggerKey>", "<verbosity>")
+      opt[Unit]("profile").action((_, c) => c.copy(profile = true)).text(
+        "Output profiling information in the current directory in the pprof format (https://github.com/google/pprof)"
+      ),
+      opt[Unit]("watch").abbr("w").action((_, c) => c.copy(watch = true)).text(
+        "Run VerCors in an infinite loop, waiting for external changes between each run."
+      ),
+      opt[(String, Verbosity)]("dev-log-verbosity").unbounded().maybeHidden()
+        .keyValueName("<loggerKey>", "<verbosity>")
         .action((tup, c) => c.copy(logLevels = c.logLevels :+ tup))
         .text("Set the log level for a custom logger key"),
-
       note(""),
       note("Verification Mode"),
-      opt[Unit]("verify")
-        .action((_, c) => c.copy(mode = Mode.Verify))
-        .text("Enable verification mode: instruct VerCors to verify the given files (default)"),
-
-      opt[Unit]("more").abbr("m")
-        .action((_, c) => c.copy(more = true))
+      opt[Unit]("verify").action((_, c) => c.copy(mode = Mode.Verify)).text(
+        "Enable verification mode: instruct VerCors to verify the given files (default)"
+      ),
+      opt[Unit]("more").abbr("m").action((_, c) => c.copy(more = true))
         .text("Always print the maximum amount of information about errors."),
       opt[Language]("lang").valueName(ReadLanguage.valueName)
-        .action((lang, c) => c.copy(language = Some(lang)))
-        .text("Do not detect the language from the file extension, but force a specific language parser for all files"),
+        .action((lang, c) => c.copy(language = Some(lang))).text(
+          "Do not detect the language from the file extension, but force a specific language parser for all files"
+        ),
       opt[Backend]("backend").valueName(Backend.valueName)
         .action((backend, c) => c.copy(backend = backend))
         .text("Set the backend to verify with (default: silicon)"),
       opt[Path]("backend-file-base").valueName("<path>")
         .action((backendFile, c) => c.copy(backendFile = Some(backendFile)))
-        .text("In addition to verification, output the resulting ASTs for the backend to files, appended with -<number>.<extension>"),
-      opt[Unit]("backend-debug")
-        .action((_, c) => c.copy(logLevels = c.logLevels :+ ("viper", Verbosity.Debug)))
-        .text("Instruct the backend to print as much debugging information as possible"),
-
-      opt[(String, PathOrStd)]("output-after-pass").unbounded().keyValueName("<pass>", "<path>")
-        .action((output, c) => c.copy(outputAfterPass = c.outputAfterPass ++ Map(output)))
-        .text("Print the AST after a pass key"),
-      opt[(String, PathOrStd)]("output-before-pass").unbounded().keyValueName("<pass>", "<path>")
-        .action((output, c) => c.copy(outputBeforePass = c.outputBeforePass ++ Map(output)))
-        .text("Print the AST before a pass key"),
-      opt[Unit]("trace-col")
-        .action((_, c) => c.copy(outputIntermediatePrograms = Some(Paths.get("tmp", "cols"))))
-        .text("Writes all intermediate ASTs, labeled by pass, to tmp/cols/"),
+        .text(
+          "In addition to verification, output the resulting ASTs for the backend to files, appended with -<number>.<extension>"
+        ),
+      opt[Unit]("backend-debug").action((_, c) =>
+        c.copy(logLevels = c.logLevels :+ ("viper", Verbosity.Debug))
+      ).text(
+        "Instruct the backend to print as much debugging information as possible"
+      ),
+      opt[(String, PathOrStd)]("output-after-pass").unbounded()
+        .keyValueName("<pass>", "<path>").action((output, c) =>
+          c.copy(outputAfterPass = c.outputAfterPass ++ Map(output))
+        ).text("Print the AST after a pass key"),
+      opt[(String, PathOrStd)]("output-before-pass").unbounded()
+        .keyValueName("<pass>", "<path>").action((output, c) =>
+          c.copy(outputBeforePass = c.outputBeforePass ++ Map(output))
+        ).text("Print the AST before a pass key"),
+      opt[Unit]("trace-col").action((_, c) =>
+        c.copy(outputIntermediatePrograms = Some(Paths.get("tmp", "cols")))
+      ).text("Writes all intermediate ASTs, labeled by pass, to tmp/cols/"),
       opt[Path]("trace-col-in")
-        .action((p, c) => c.copy(outputIntermediatePrograms = Some(p)))
-        .text("Writes all intermediate ASTs, labeled by pass, to a given folder"),
-
+        .action((p, c) => c.copy(outputIntermediatePrograms = Some(p))).text(
+          "Writes all intermediate ASTs, labeled by pass, to a given folder"
+        ),
       opt[String]("backend-option").unbounded().keyName("<option>,...")
         .action((opt, c) => c.copy(backendFlags = c.backendFlags :+ opt))
         .text("Provide custom flags to Viper"),
-      opt[Unit]("skip-backend")
-        .action((_, c) => c.copy(skipBackend = true))
-        .text("Stop VerCors successfully before the backend is used to verify the program"),
+      opt[Unit]("skip-backend").action((_, c) => c.copy(skipBackend = true))
+        .text(
+          "Stop VerCors successfully before the backend is used to verify the program"
+        ),
       opt[Unit]("skip-translation")
-        .action((_, c) => c.copy(skipTranslation = true))
-        .text("Stop VerCors successfully immediately after the file is parsed and resolved, and do no further processing"),
+        .action((_, c) => c.copy(skipTranslation = true)).text(
+          "Stop VerCors successfully immediately after the file is parsed and resolved, and do no further processing"
+        ),
       opt[String]("skip-translation-after").valueName("<pass>")
-        .action((pass, c) => c.copy(skipTranslationAfter = Some(pass)))
-        .text("Stop VerCors successfully after executing the transformation pass with the supplied key"),
+        .action((pass, c) => c.copy(skipTranslationAfter = Some(pass))).text(
+          "Stop VerCors successfully after executing the transformation pass with the supplied key"
+        ),
       opt[String]("skip-pass").unbounded().valueName("<pass>")
         .action((pass, c) => c.copy(skipPass = c.skipPass + pass))
         .text("Skip the passes that have the supplied keys"),
-
-      opt[Int]("silicon-print-quantifier-stats").valueName("<amount>")
-        .action((amount, c) => c.copy(siliconPrintQuantifierStats = Some(amount)))
-        .text("Print quantifier instantiation statistics from Z3 via silicon, every <amount> instantiations, every 5 seconds. Implies --dev-silicon-num-verifiers 1"),
-      opt[Unit]("silicon-quiet")
-        .action((_, c) => c.copy(
+      opt[Int]("silicon-print-quantifier-stats").valueName("<amount>").action(
+        (amount, c) => c.copy(siliconPrintQuantifierStats = Some(amount))
+      ).text(
+        "Print quantifier instantiation statistics from Z3 via silicon, every <amount> instantiations, every 5 seconds. Implies --dev-silicon-num-verifiers 1"
+      ),
+      opt[Unit]("silicon-quiet").action((_, c) =>
+        c.copy(
           devSiliconReportOnNoProgress = false,
           devSiliconTraceBranchConditions = false,
-          devSiliconBranchConditionReportInterval = None))
-        .text("Disable various diagnostics of the silicon backend."),
-
+          devSiliconBranchConditionReportInterval = None,
+        )
+      ).text("Disable various diagnostics of the silicon backend."),
       opt[PathOrStd]("bip-report-file").valueName("<path>")
-        .action((p, c) => c.copy(bipReportFile = Some(p)))
-        .text("Write JavaBIP verification report to file, or standard out if \"-\" is used"),
-
+        .action((p, c) => c.copy(bipReportFile = Some(p))).text(
+          "Write JavaBIP verification report to file, or standard out if \"-\" is used"
+        ),
       opt[Unit]("no-infer-heap-context-into-frame")
-        .action((_, c) => c.copy(inferHeapContextIntoFrame = false))
-        .text("Disables smart inference of contextual heap into frame statements using `forperm`"),
-
+        .action((_, c) => c.copy(inferHeapContextIntoFrame = false)).text(
+          "Disables smart inference of contextual heap into frame statements using `forperm`"
+        ),
       opt[Unit]("dev-parsing-ambiguities").maybeHidden()
         .action((_, c) => c.copy(devParserReportAmbiguities = true))
         .text("Report instances of ambiguities in the parsed inputs"),
       opt[Unit]("dev-parsing-sensitivities").maybeHidden()
         .action((_, c) => c.copy(devParserReportContextSensitivities = true))
         .text("Report instances of context sensitivities in the parsed inputs"),
-
       opt[Unit]("dev-abrupt-exc").maybeHidden()
-        .action((_, c) => c.copy(devAbruptExc = true))
-        .text("Encode all abrupt control flow using exception, even when not necessary"),
+        .action((_, c) => c.copy(devAbruptExc = true)).text(
+          "Encode all abrupt control flow using exception, even when not necessary"
+        ),
       opt[Unit]("dev-no-sat").maybeHidden()
         .action((_, c) => c.copy(devCheckSat = false))
         .text("Do not check the satisfiability of contracts in the input"),
-
-      opt[String]("dev-simplify-debug-in").unbounded().maybeHidden().valueName("<declaration>")
-        .action((decl, c) => c.copy(devSimplifyDebugIn = c.devSimplifyDebugIn :+ decl))
-        .text("Debug simplifications below a declaration preferredName (recommended to inspect --output-before-pass simplify=-)"),
+      opt[String]("dev-simplify-debug-in").unbounded().maybeHidden()
+        .valueName("<declaration>").action((decl, c) =>
+          c.copy(devSimplifyDebugIn = c.devSimplifyDebugIn :+ decl)
+        ).text(
+          "Debug simplifications below a declaration preferredName (recommended to inspect --output-before-pass simplify=-)"
+        ),
       opt[Unit]("dev-simplify-debug-match").maybeHidden()
         .action((_, c) => c.copy(devSimplifyDebugMatch = true))
         .text("Debug matched expressions in simplifications"),
@@ -174,8 +193,9 @@ case object Options {
         .action((_, c) => c.copy(devSimplifyDebugNoMatch = true))
         .text("Debug expressions that do not match in simplifications"),
       opt[String]("dev-simplify-debug-filter-input-kind").maybeHidden()
-        .action((kind, c) => c.copy(devSimplifyDebugFilterInputKind = Some(kind)))
-        .text("Debug only expressions of a certain kind by simple class name"),
+        .action((kind, c) =>
+          c.copy(devSimplifyDebugFilterInputKind = Some(kind))
+        ).text("Debug only expressions of a certain kind by simple class name"),
       opt[String]("dev-simplify-debug-filter-rule").maybeHidden()
         .action((rule, c) => c.copy(devSimplifyDebugFilterRule = Some(rule)))
         .text("Debug only applications of a particular rule, by name"),
@@ -183,72 +203,88 @@ case object Options {
         .action((_, c) => c.copy(devCache = true))
         .text("Cache verification results (slow, experimental)"),
       opt[Unit]("dev-split-verification-by-procedure").maybeHidden()
-        .action((_, c) => c.copy(devSplitVerificationByProcedure = true))
-        .text("Invoke separate instances of the backend for each procedure at the end of the rewrite chain (slow, experimental)"),
-
+        .action((_, c) => c.copy(devSplitVerificationByProcedure = true)).text(
+          "Invoke separate instances of the backend for each procedure at the end of the rewrite chain (slow, experimental)"
+        ),
       opt[Int]("dev-silicon-num-verifiers").maybeHidden()
         .action((amount, c) => c.copy(devSiliconNumVerifiers = Some(amount)))
-        .text("Indicate the number of verifiers for silicon to use. In practice the number of silicon threads equals this number + 1"),
+        .text(
+          "Indicate the number of verifiers for silicon to use. In practice the number of silicon threads equals this number + 1"
+        ),
       opt[Int]("dev-silicon-branch-condition-report-interval").maybeHidden()
-        .action((interval, c) => c.copy(devSiliconBranchConditionReportInterval = Some(interval)))
-        .text("The interval of branch trace records at which to report the current path condition"),
+        .action((interval, c) =>
+          c.copy(devSiliconBranchConditionReportInterval = Some(interval))
+        ).text(
+          "The interval of branch trace records at which to report the current path condition"
+        ),
       opt[Unit]("dev-silicon-no-branch-condition-report").maybeHidden()
-        .action((_, c) => c.copy(devSiliconBranchConditionReportInterval = None))
-        .text("Do not report the current branch condition at an interval"),
+        .action((_, c) =>
+          c.copy(devSiliconBranchConditionReportInterval = None)
+        ).text("Do not report the current branch condition at an interval"),
       opt[Unit]("dev-silicon-trace-branch-conditions").maybeHidden()
-        .action((_, c) => c.copy(devSiliconTraceBranchConditions = true, devSiliconBranchConditionReportInterval = None))
-        .text("Trace all branch condition records, rendered as a tree"),
+        .action((_, c) =>
+          c.copy(
+            devSiliconTraceBranchConditions = true,
+            devSiliconBranchConditionReportInterval = None,
+          )
+        ).text("Trace all branch condition records, rendered as a tree"),
       opt[Unit]("dev-silicon-no-report-on-no-progress").maybeHidden()
-        .action((_, c) => c.copy(devSiliconReportOnNoProgress = false))
-        .text("Do not report the current state of silicon when no progress is made for some time"),
-
-      opt[Int]("dev-assert-timeout").maybeHidden()
-        .action((amount, c) => c.copy(devSiliconAssertTimeout = amount))
-        .text("Indicate, in seconds, the timeout value for a single assert statement. If the verification gets stuck " +
-          "on a single SMT check for longer than this timeout, the verification will fail."),
-
-      opt[Int]("dev-total-timeout").maybeHidden()
-        .action((amount, c) => c.copy(devSiliconTotalTimeout = amount))
-        .text("Indicate, in seconds, the timeout value for the backend verification. If the verification gets stuck " +
-          "for longer than this timeout, the verification will timeout."),
-
+        .action((_, c) => c.copy(devSiliconReportOnNoProgress = false)).text(
+          "Do not report the current state of silicon when no progress is made for some time"
+        ),
+      opt[Int]("dev-assert-timeout").maybeHidden().action((amount, c) =>
+        c.copy(devSiliconAssertTimeout = amount)
+      ).text(
+        "Indicate, in seconds, the timeout value for a single assert statement. If the verification gets stuck " +
+          "on a single SMT check for longer than this timeout, the verification will fail."
+      ),
+      opt[Int]("dev-total-timeout").maybeHidden().action((amount, c) =>
+        c.copy(devSiliconTotalTimeout = amount)
+      ).text(
+        "Indicate, in seconds, the timeout value for the backend verification. If the verification gets stuck " +
+          "for longer than this timeout, the verification will timeout."
+      ),
       opt[Path]("dev-silicon-z3-log-file").maybeHidden()
         .action((p, c) => c.copy(devSiliconZ3LogFile = Some(p)))
         .text("Path for z3 to write smt2 log file to"),
-
       opt[Path]("dev-carbon-boogie-log-file").maybeHidden()
         .action((p, c) => c.copy(devCarbonBoogieLogFile = Some(p)))
         .text("Path for boogie to write smt2 log file to"),
-
       opt[Path]("dev-viper-prover-log-file").maybeHidden()
-        .action((p, c) => c.copy(devViperProverLogFile = Some(p)))
-        .text("Path for viper to write boogie or smt2 input file to, depending on selected backend"),
-
+        .action((p, c) => c.copy(devViperProverLogFile = Some(p))).text(
+          "Path for viper to write boogie or smt2 input file to, depending on selected backend"
+        ),
       opt[Map[String, String]]("c-define").valueName("<macro>=<defn>,...")
         .action((defines, c) => c.copy(cDefine = defines))
         .text("Pass -D options to the C preprocessor"),
-
       opt[Seq[PathOrStd]]("paths-simplify").valueName("<simplify.pvl>,...")
-        .action((paths, c) => c.copy(simplifyPaths = paths))
-        .text("Specify a chain of files to use that contain axiomatic simplification rules"),
-      opt[Seq[PathOrStd]]("paths-simplify-after-relations").valueName("<simplify.pvl>,...")
-        .action((paths, c) => c.copy(simplifyPathsAfterRelations = paths))
-        .text("Specify a chain of files to use the contain axiomatic simplification rules, which will be applied after quantified integer relations are simplified"),
-
+        .action((paths, c) => c.copy(simplifyPaths = paths)).text(
+          "Specify a chain of files to use that contain axiomatic simplification rules"
+        ),
+      opt[Seq[PathOrStd]]("paths-simplify-after-relations")
+        .valueName("<simplify.pvl>,...")
+        .action((paths, c) => c.copy(simplifyPathsAfterRelations = paths)).text(
+          "Specify a chain of files to use the contain axiomatic simplification rules, which will be applied after quantified integer relations are simplified"
+        ),
       opt[Path]("path-adt").valueName("<path>")
-        .action((path, c) => c.copy(adtPath = path))
-        .text("Use a custom directory that contains definitions for all internal types encoded as axiomatic datatypes (array, option, any, etc.)"),
+        .action((path, c) => c.copy(adtPath = path)).text(
+          "Use a custom directory that contains definitions for all internal types encoded as axiomatic datatypes (array, option, any, etc.)"
+        ),
       opt[Path]("path-cc").valueName("<path>")
         .action((path, c) => c.copy(cc = path))
         .text("Set the C compiler to use for preprocessing"),
       opt[Path]("path-c-system").valueName("<path>")
         .action((path, c) => c.copy(cIncludePath = path))
         .text("Set the include path for system headers (-isystem)"),
-      opt[Unit]("no-std-class-path")
-        .action((_, c) => c.copy(classPath = c.classPath.collect { case ClassPathEntry.SourcePath(p) => ClassPathEntry.SourcePath(p) }))
-        .text("Remove the @jre (the default path to specified classes in the java runtime) and @source (the sources root computed via the package entry of submitted sources) entry"),
-      opt[ClassPathEntry]("class-path").valueName("<path>|@jre|@source").unbounded()
-        .action((cp, c) => c.copy(classPath = c.classPath :+ cp))
+      opt[Unit]("no-std-class-path").action((_, c) =>
+        c.copy(classPath = c.classPath.collect {
+          case ClassPathEntry.SourcePath(p) => ClassPathEntry.SourcePath(p)
+        })
+      ).text(
+        "Remove the @jre (the default path to specified classes in the java runtime) and @source (the sources root computed via the package entry of submitted sources) entry"
+      ),
+      opt[ClassPathEntry]("class-path").valueName("<path>|@jre|@source")
+        .unbounded().action((cp, c) => c.copy(classPath = c.classPath :+ cp))
         .text("Add an entry to the sources class path"),
       opt[Path]("path-z3").valueName("<path>")
         .action((path, c) => c.copy(z3Path = path))
@@ -259,62 +295,58 @@ case object Options {
       opt[Path]("path-c-preprocessor").valueName("<path>")
         .action((path, c) => c.copy(cPreprocessorPath = path))
         .text("Set the location of the C preprocessor binary"),
-
       note(""),
       note("VeyMont Mode"),
-      opt[Unit]("veymont")
-        .action((_, c) => c.copy(mode = Mode.VeyMont))
-        .text("Enable VeyMont mode: decompose the global program from the input files into several local programs that can be executed in parallel")
-        .children(
-          opt[Path]("veymont-output").valueName("<path>")
-            .action((path, c) => c.copy(veymontOutput = Some(path))),
-          opt[Path]("veymont-resource-path").valueName("<path>")
-            .action((path, c) => c.copy(veymontResourcePath = path)),
-          opt[Unit]("veymont-skip-choreography-verification")
-            .action((_, c) => c.copy(veymontSkipChoreographyVerification = true))
-        ),
+      opt[Unit]("veymont").action((_, c) => c.copy(mode = Mode.VeyMont)).text(
+        "Enable VeyMont mode: decompose the global program from the input files into several local programs that can be executed in parallel"
+      ).children(
+        opt[Path]("veymont-output").valueName("<path>")
+          .action((path, c) => c.copy(veymontOutput = Some(path))),
+        opt[Path]("veymont-resource-path").valueName("<path>")
+          .action((path, c) => c.copy(veymontResourcePath = path)),
+        opt[Unit]("veymont-skip-choreography-verification")
+          .action((_, c) => c.copy(veymontSkipChoreographyVerification = true)),
+      ),
       opt[Unit]("veymont-generate-permissions")
-        .action((_, c) => c.copy(veymontGeneratePermissions = true))
-        .text("Generate permissions for the entire sequential program in the style of VeyMont 1.4"),
+        .action((_, c) => c.copy(veymontGeneratePermissions = true)).text(
+          "Generate permissions for the entire sequential program in the style of VeyMont 1.4"
+        ),
       opt[Unit]("dev-veymont-allow-assign").maybeHidden()
         .action((p, c) => c.copy(devVeymontAllowAssign = true))
         .text("Do not error when plain assignment is used in seq_programs"),
-
-
       note(""),
       note("VeSUV Mode"),
-      opt[Unit]("vesuv")
-        .action((_, c) => c.copy(mode = Mode.VeSUV))
-        .text("Enable VeSUV mode: transform SystemC designs to PVL to be deductively verified")
-        .children(
-          opt[Path]("vesuv-output").required().valueName("<path>")
-            .action((path, c) => c.copy(vesuvOutput = path))
-            .text("Output file for the result of the transformation"),
-          opt[Unit]("generate-rasi").action((_, c) => c.copy(vesuvGenerateRasi = true))
-            .text("Instead of transforming a SystemC design to PVL, generate a global invariant for a PVL program")
-            .children(
+      opt[Unit]("vesuv").action((_, c) => c.copy(mode = Mode.VeSUV)).text(
+        "Enable VeSUV mode: transform SystemC designs to PVL to be deductively verified"
+      ).children(
+        opt[Path]("vesuv-output").required().valueName("<path>")
+          .action((path, c) => c.copy(vesuvOutput = path))
+          .text("Output file for the result of the transformation"),
+        opt[Unit]("generate-rasi")
+          .action((_, c) => c.copy(vesuvGenerateRasi = true)).text(
+            "Instead of transforming a SystemC design to PVL, generate a global invariant for a PVL program"
+          ).children(
             opt[Seq[String]]("rasi-vars").valueName("<var1>,...")
               .action((vars, c) => c.copy(vesuvRasiVariables = Some(vars)))
-              .text("[WIP] Preliminary selection mechanism for RASI variables; might be replaced later")
-          )
-        ),
-
+              .text(
+                "[WIP] Preliminary selection mechanism for RASI variables; might be replaced later"
+              )
+          ),
+      ),
       note(""),
       note("Control flow graph"),
-      opt[Unit]("build-cfg")
-        .action((_, c) => c.copy(mode = Mode.CFG))
-        .text("Instead of verifying a program, build its control flow graph for further analysis")
-        .children(
-          opt[Path]("cfg-output").required().valueName("<path>")
-            .action((path, c) => c.copy(cfgOutput = path))
-            .text("Output file for the control flow graph in .dot format")
-        ),
-
+      opt[Unit]("build-cfg").action((_, c) => c.copy(mode = Mode.CFG)).text(
+        "Instead of verifying a program, build its control flow graph for further analysis"
+      ).children(
+        opt[Path]("cfg-output").required().valueName("<path>")
+          .action((path, c) => c.copy(cfgOutput = path))
+          .text("Output file for the control flow graph in .dot format")
+      ),
       note(""),
       note(""),
       arg[PathOrStd]("<path>...").unbounded().optional()
         .action((path, c) => c.copy(inputs = c.inputs :+ path))
-        .text("List of input files to process")
+        .text("List of input files to process"),
     )
 
     (parser, tags.toMap)
@@ -324,109 +356,102 @@ case object Options {
     OParser.parse(parser(), args, Options())
 }
 
-/**
- * Stores all command line options values, nicely parsed.
- *
- * Components of VerCors, in particular rewrite passes, must not be passed this object directly. Instead, duplicate
- * the option as a parameter to e.g. the rewrite pass class, then pass in the option in
- * [[vct.main.stages.SilverTransformation]].
- */
-case class Options
-(
-  help: Boolean = false,
-  showHidden: Boolean = false,
-
-  mode: Mode = Mode.Verify,
-  inputs: Seq[PathOrStd] = Nil,
-  logLevels: Seq[(String, Verbosity)] = Seq(
-    ("vct", Verbosity.Info),
-    ("viper", Verbosity.Off),
-    ("viper.api", Verbosity.Info),
-  ),
-  progress: Boolean = false,
-  profile: Boolean = false,
-  watch: Boolean = false,
-  more: Boolean = false,
-
-  // Verify Options
-  language: Option[Language] = None,
-  backend: Backend = Backend.Silicon,
-  backendFile: Option[Path] = None,
-
-  outputAfterPass: Map[String, PathOrStd] = Map.empty,
-  outputBeforePass: Map[String, PathOrStd] = Map.empty,
-  outputIntermediatePrograms: Option[Path] = None,
-
-  backendFlags: Seq[String] = Nil,
-  skipBackend: Boolean = false,
-  skipTranslation: Boolean = false,
-  skipTranslationAfter: Option[String] = None,
-  skipPass: Set[String] = Set.empty,
-
-  cDefine: Map[String, String] = Map.empty,
-
-  simplifyPaths: Seq[PathOrStd] = Seq("pushin", "simplify").map(name => PathOrStd.Path(Resources.getSimplificationPath(name))),
-  simplifyPathsAfterRelations: Seq[PathOrStd] = Seq("simplify").map(name => PathOrStd.Path(Resources.getSimplificationPath(name))),
-  adtPath: Path = Resources.getAdtPath,
-  cc: Path = Resources.getCcPath,
-  cIncludePath: Path = Resources.getCIncludePath,
-  ccpp: Path = Resources.getCPPcPath,
-  cppIncludePath: Path = Resources.getCPPIncludePath,
-  classPath: Seq[ClassPathEntry] = Seq(ClassPathEntry.DefaultJre, ClassPathEntry.SourcePackageRoot),
-  z3Path: Path = viper.api.Resources.getZ3Path,
-  boogiePath: Path = viper.api.Resources.getBoogiePath,
-  cPreprocessorPath: Path = Resources.getCcPath,
-
-  siliconPrintQuantifierStats: Option[Int] = None,
-
-  bipReportFile: Option[PathOrStd] = None,
-
-  inferHeapContextIntoFrame: Boolean = true,
-
-  // Verify options - hidden
-  devParserReportAmbiguities: Boolean = false,
-  devParserReportContextSensitivities: Boolean = false,
-  devAbruptExc: Boolean = false,
-  devCheckSat: Boolean = true,
-  devSimplifyDebugIn: Seq[String] = Nil,
-  devSimplifyDebugMatch: Boolean = false,
-  devSimplifyDebugMatchShort: Boolean = true,
-  devSimplifyDebugNoMatch: Boolean = false,
-  devSimplifyDebugFilterInputKind: Option[String] = None,
-  devSimplifyDebugFilterRule: Option[String] = None,
-  devCache: Boolean = false,
-  devSplitVerificationByProcedure: Boolean = false,
-
-  devSiliconNumVerifiers: Option[Int] = None,
-  devSiliconZ3LogFile: Option[Path] = None,
-  devSiliconAssertTimeout: Int = 30,
-  devSiliconTotalTimeout: Int = 0,
-  devSiliconReportOnNoProgress: Boolean = true,
-  devSiliconBranchConditionReportInterval: Option[Int] = Some(1000),
-  devSiliconTraceBranchConditions: Boolean = false,
-
-  devCarbonBoogieLogFile: Option[Path] = None,
-
-  devViperProverLogFile: Option[Path] = None,
-
-  // VeyMont options
-  veymontOutput: Option[Path] = None,
-  veymontResourcePath: Path = Resources.getVeymontPath,
-  veymontGeneratePermissions: Boolean = false,
-  veymontSkipChoreographyVerification: Boolean = false,
-  devVeymontAllowAssign: Boolean = false,
-
-  // VeSUV options
-  vesuvOutput: Path = null,
-  vesuvGenerateRasi: Boolean = false,
-  vesuvRasiVariables: Option[Seq[String]] = None,
-
-  // Control flow graph options
-  cfgOutput: Path = null,
+/** Stores all command line options values, nicely parsed.
+  *
+  * Components of VerCors, in particular rewrite passes, must not be passed this
+  * object directly. Instead, duplicate the option as a parameter to e.g. the
+  * rewrite pass class, then pass in the option in
+  * [[vct.main.stages.SilverTransformation]].
+  */
+case class Options(
+    help: Boolean = false,
+    showHidden: Boolean = false,
+    mode: Mode = Mode.Verify,
+    inputs: Seq[PathOrStd] = Nil,
+    logLevels: Seq[(String, Verbosity)] = Seq(
+      ("vct", Verbosity.Info),
+      ("viper", Verbosity.Off),
+      ("viper.api", Verbosity.Info),
+    ),
+    progress: Boolean = false,
+    profile: Boolean = false,
+    watch: Boolean = false,
+    more: Boolean = false,
+
+    // Verify Options
+    language: Option[Language] = None,
+    backend: Backend = Backend.Silicon,
+    backendFile: Option[Path] = None,
+    outputAfterPass: Map[String, PathOrStd] = Map.empty,
+    outputBeforePass: Map[String, PathOrStd] = Map.empty,
+    outputIntermediatePrograms: Option[Path] = None,
+    backendFlags: Seq[String] = Nil,
+    skipBackend: Boolean = false,
+    skipTranslation: Boolean = false,
+    skipTranslationAfter: Option[String] = None,
+    skipPass: Set[String] = Set.empty,
+    cDefine: Map[String, String] = Map.empty,
+    simplifyPaths: Seq[PathOrStd] = Seq("pushin", "simplify")
+      .map(name => PathOrStd.Path(Resources.getSimplificationPath(name))),
+    simplifyPathsAfterRelations: Seq[PathOrStd] = Seq("simplify")
+      .map(name => PathOrStd.Path(Resources.getSimplificationPath(name))),
+    adtPath: Path = Resources.getAdtPath,
+    cc: Path = Resources.getCcPath,
+    cIncludePath: Path = Resources.getCIncludePath,
+    ccpp: Path = Resources.getCPPcPath,
+    cppIncludePath: Path = Resources.getCPPIncludePath,
+    classPath: Seq[ClassPathEntry] = Seq(
+      ClassPathEntry.DefaultJre,
+      ClassPathEntry.SourcePackageRoot,
+    ),
+    z3Path: Path = viper.api.Resources.getZ3Path,
+    boogiePath: Path = viper.api.Resources.getBoogiePath,
+    cPreprocessorPath: Path = Resources.getCcPath,
+    siliconPrintQuantifierStats: Option[Int] = None,
+    bipReportFile: Option[PathOrStd] = None,
+    inferHeapContextIntoFrame: Boolean = true,
+
+    // Verify options - hidden
+    devParserReportAmbiguities: Boolean = false,
+    devParserReportContextSensitivities: Boolean = false,
+    devAbruptExc: Boolean = false,
+    devCheckSat: Boolean = true,
+    devSimplifyDebugIn: Seq[String] = Nil,
+    devSimplifyDebugMatch: Boolean = false,
+    devSimplifyDebugMatchShort: Boolean = true,
+    devSimplifyDebugNoMatch: Boolean = false,
+    devSimplifyDebugFilterInputKind: Option[String] = None,
+    devSimplifyDebugFilterRule: Option[String] = None,
+    devCache: Boolean = false,
+    devSplitVerificationByProcedure: Boolean = false,
+    devSiliconNumVerifiers: Option[Int] = None,
+    devSiliconZ3LogFile: Option[Path] = None,
+    devSiliconAssertTimeout: Int = 30,
+    devSiliconTotalTimeout: Int = 0,
+    devSiliconReportOnNoProgress: Boolean = true,
+    devSiliconBranchConditionReportInterval: Option[Int] = Some(1000),
+    devSiliconTraceBranchConditions: Boolean = false,
+    devCarbonBoogieLogFile: Option[Path] = None,
+    devViperProverLogFile: Option[Path] = None,
+
+    // VeyMont options
+    veymontOutput: Option[Path] = None,
+    veymontResourcePath: Path = Resources.getVeymontPath,
+    veymontGeneratePermissions: Boolean = false,
+    veymontSkipChoreographyVerification: Boolean = false,
+    devVeymontAllowAssign: Boolean = false,
+
+    // VeSUV options
+    vesuvOutput: Path = null,
+    vesuvGenerateRasi: Boolean = false,
+    vesuvRasiVariables: Option[Seq[String]] = None,
+
+    // Control flow graph options
+    cfgOutput: Path = null,
 ) {
   def getParserDebugOptions: vct.parsers.debug.DebugOptions =
     vct.parsers.debug.DebugOptions(
       reportAmbiguities = devParserReportAmbiguities,
       reportContextSensitivity = devParserReportContextSensitivities,
     )
-}
\ No newline at end of file
+}
diff --git a/src/main/vct/options/types/Backend.scala b/src/main/vct/options/types/Backend.scala
index 56586e7680..11168410e7 100644
--- a/src/main/vct/options/types/Backend.scala
+++ b/src/main/vct/options/types/Backend.scala
@@ -10,4 +10,4 @@ case object Backend extends ReadEnum[Backend] {
 
   case object Silicon extends Backend
   case object Carbon extends Backend
-}
\ No newline at end of file
+}
diff --git a/src/main/vct/options/types/ClassPathEntry.scala b/src/main/vct/options/types/ClassPathEntry.scala
index a7ff0b27aa..87d086ab2a 100644
--- a/src/main/vct/options/types/ClassPathEntry.scala
+++ b/src/main/vct/options/types/ClassPathEntry.scala
@@ -16,4 +16,4 @@ case object ClassPathEntry extends scopt.Read[ClassPathEntry] {
   case object DefaultJre extends ClassPathEntry
   case object SourcePackageRoot extends ClassPathEntry
   case class SourcePath(root: Path) extends ClassPathEntry
-}
\ No newline at end of file
+}
diff --git a/src/main/vct/options/types/PathOrStd.scala b/src/main/vct/options/types/PathOrStd.scala
index 6a65f47784..c5aa7d12c3 100644
--- a/src/main/vct/options/types/PathOrStd.scala
+++ b/src/main/vct/options/types/PathOrStd.scala
@@ -7,40 +7,49 @@ import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Path}
 
 sealed trait PathOrStd extends InMemoryCachedReadable with Writeable {
-  override def underlyingPath: Option[Path] = this match {
-    case PathOrStd.Path(path) => Some(path)
-    case PathOrStd.StdInOrOut => None
-  }
+  override def underlyingPath: Option[Path] =
+    this match {
+      case PathOrStd.Path(path) => Some(path)
+      case PathOrStd.StdInOrOut => None
+    }
 
-  override def fileName: String = this match {
-    case PathOrStd.Path(path) => path.toString
-    case PathOrStd.StdInOrOut => "<stdio>"
-  }
+  override def fileName: String =
+    this match {
+      case PathOrStd.Path(path) => path.toString
+      case PathOrStd.StdInOrOut => "<stdio>"
+    }
 
-  override def isRereadable: Boolean = this match {
-    case PathOrStd.Path(_) => true
-    case PathOrStd.StdInOrOut => false
-  }
+  override def isRereadable: Boolean =
+    this match {
+      case PathOrStd.Path(_) => true
+      case PathOrStd.StdInOrOut => false
+    }
 
-  override protected def getReaderImpl: Reader = this match {
-    case PathOrStd.Path(path) => Files.newBufferedReader(path, StandardCharsets.UTF_8)
-    case PathOrStd.StdInOrOut => new InputStreamReader(System.in, StandardCharsets.UTF_8)
-  }
+  override protected def getReaderImpl: Reader =
+    this match {
+      case PathOrStd.Path(path) =>
+        Files.newBufferedReader(path, StandardCharsets.UTF_8)
+      case PathOrStd.StdInOrOut =>
+        new InputStreamReader(System.in, StandardCharsets.UTF_8)
+    }
 
   override protected def getWriter: Writer = {
     invalidate()
     this match {
-      case PathOrStd.Path(path) => Files.newBufferedWriter(path, StandardCharsets.UTF_8)
-      case PathOrStd.StdInOrOut => new OutputStreamWriter(System.out, StandardCharsets.UTF_8)
+      case PathOrStd.Path(path) =>
+        Files.newBufferedWriter(path, StandardCharsets.UTF_8)
+      case PathOrStd.StdInOrOut =>
+        new OutputStreamWriter(System.out, StandardCharsets.UTF_8)
     }
   }
 
-  override def enroll(watch: Watch): Unit = this match {
-    case PathOrStd.Path(path) =>
-      watch.enroll(path)
-      watch.invalidate(this)
-    case PathOrStd.StdInOrOut => // do nothing
-  }
+  override def enroll(watch: Watch): Unit =
+    this match {
+      case PathOrStd.Path(path) =>
+        watch.enroll(path)
+        watch.invalidate(this)
+      case PathOrStd.StdInOrOut => // do nothing
+    }
 }
 
 case object PathOrStd {
diff --git a/src/main/vct/options/types/ReadEnum.scala b/src/main/vct/options/types/ReadEnum.scala
index 35cecc3b7d..f77fc98522 100644
--- a/src/main/vct/options/types/ReadEnum.scala
+++ b/src/main/vct/options/types/ReadEnum.scala
@@ -8,6 +8,5 @@ trait ReadEnum[T] extends scopt.Read[T] {
   override def arity: Int = 1
   override def reads: String => T = options(_)
 
-  def valueName: String =
-    options.keys.mkString("{", "|", "}")
+  def valueName: String = options.keys.mkString("{", "|", "}")
 }
diff --git a/src/main/vct/options/types/Verbosity.scala b/src/main/vct/options/types/Verbosity.scala
index 1c831f29e3..f1b8c0b0eb 100644
--- a/src/main/vct/options/types/Verbosity.scala
+++ b/src/main/vct/options/types/Verbosity.scala
@@ -20,4 +20,4 @@ case object Verbosity extends ReadEnum[Verbosity] {
   case object Debug extends Verbosity
   case object Trace extends Verbosity
   case object All extends Verbosity
-}
\ No newline at end of file
+}
diff --git a/src/parsers/vct/parsers/AntlrParser.scala b/src/parsers/vct/parsers/AntlrParser.scala
index 146dae4810..b88a2f884e 100644
--- a/src/parsers/vct/parsers/AntlrParser.scala
+++ b/src/parsers/vct/parsers/AntlrParser.scala
@@ -1,11 +1,29 @@
 package vct.parsers
 import org.antlr.v4.runtime
 import org.antlr.v4.runtime.atn.PredictionMode
-import org.antlr.v4.runtime.{CharStream, CharStreams, CommonTokenStream, Token, TokenStream}
+import org.antlr.v4.runtime.{
+  CharStream,
+  CharStreams,
+  CommonTokenStream,
+  Token,
+  TokenStream,
+}
 import vct.col.ast.GlobalDeclaration
-import vct.col.origin.{Blame, ExpectedError, Origin, ReadableOrigin, VerificationFailure}
+import vct.col.origin.{
+  Blame,
+  ExpectedError,
+  Origin,
+  ReadableOrigin,
+  VerificationFailure,
+}
 import vct.parsers.debug.DebugOptions
-import vct.parsers.err.{FileNotFound, ParseError, ParseErrorStrategy, ParseErrors, ParseMatchError}
+import vct.parsers.err.{
+  FileNotFound,
+  ParseError,
+  ParseErrorStrategy,
+  ParseErrors,
+  ParseMatchError,
+}
 import vct.parsers.transform.{BlameProvider, OriginProvider, ToCol}
 import vct.result.VerificationError.UserError
 import hre.io.Readable
@@ -26,8 +44,15 @@ abstract class AntlrParser extends Parser {
   def expectedErrorEnd: Int
   def newParser(tokenStream: TokenStream): Parser
   def parseMain(parser: Parser): MainContext
-  def newConverter[G](baseOrigin: Origin, expectedErrors: Seq[(Token, Token, ExpectedError)], tokenStream: TokenStream): Converter[G]
-  def mainToResult[G](converter: Converter[G], main: MainContext): Seq[GlobalDeclaration[_ <: Any]]
+  def newConverter[G](
+      baseOrigin: Origin,
+      expectedErrors: Seq[(Token, Token, ExpectedError)],
+      tokenStream: TokenStream,
+  ): Converter[G]
+  def mainToResult[G](
+      converter: Converter[G],
+      main: MainContext,
+  ): Seq[GlobalDeclaration[_ <: Any]]
 
   def blameProvider: BlameProvider
   def debugOptions: DebugOptions
@@ -37,7 +62,11 @@ abstract class AntlrParser extends Parser {
     override def text: String = "There is no scope to close here."
   }
 
-  def collectParseErrors(lexer: Lexer, parser: Parser, baseOrigin: Origin): CollectingErrorListener = {
+  def collectParseErrors(
+      lexer: Lexer,
+      parser: Parser,
+      baseOrigin: Origin,
+  ): CollectingErrorListener = {
     parser.setErrorHandler(ParseErrorStrategy())
     parser.removeErrorListeners()
     lexer.removeErrorListeners()
@@ -47,27 +76,34 @@ abstract class AntlrParser extends Parser {
     ec
   }
 
-  def getExpectedErrors(lexer: CommonTokenStream, baseOrigin: Origin): Seq[(Token, Token, ExpectedError)] = {
+  def getExpectedErrors(
+      lexer: CommonTokenStream,
+      baseOrigin: Origin,
+  ): Seq[(Token, Token, ExpectedError)] = {
     lexer.fill()
     var startStack: Seq[(String, Token)] = Nil
     var errors = Seq.empty[(Token, Token, ExpectedError)]
 
-    for(token <- lexer.getTokens.asScala.filter(_.getChannel == expectedErrorChannel)) {
-      if(token.getType == expectedErrorStart) {
-        val code = token.getText
-          .replace("/*", "")
-          .replace("*/", "")
-          .replace("[/expect", "")
-          .replace("]", "")
-          .strip()
+    for (
+      token <- lexer.getTokens.asScala
+        .filter(_.getChannel == expectedErrorChannel)
+    ) {
+      if (token.getType == expectedErrorStart) {
+        val code = token.getText.replace("/*", "").replace("*/", "")
+          .replace("[/expect", "").replace("]", "").strip()
         startStack :+= (code, token)
       }
 
-      if(token.getType == expectedErrorEnd) {
-        if(startStack.isEmpty) throw UnbalancedExpectedError(token)
+      if (token.getType == expectedErrorEnd) {
+        if (startStack.isEmpty)
+          throw UnbalancedExpectedError(token)
         val (code, start) = startStack.last
         startStack = startStack.init
-        val err = ExpectedError(code, OriginProvider(baseOrigin, start, token), blameProvider(start, token))
+        val err = ExpectedError(
+          code,
+          OriginProvider(baseOrigin, start, token),
+          blameProvider(start, token),
+        )
         errors :+= (start, token, err)
       }
     }
@@ -75,16 +111,31 @@ abstract class AntlrParser extends Parser {
     errors.sortBy(_._1.getTokenIndex)
   }
 
-  protected def getErrorsFor[T](origin: Origin, parser: runtime.Parser, lexer: runtime.Lexer)(f: => T): Either[Seq[ParseError], T] = Right(f)
-  protected def noErrorsOrThrow[T](origin: Origin, parser: runtime.Parser, lexer: runtime.Lexer)(f: => T): T = f
-
-  def parseAntlrStreamOrThrow[Ctx, G, Out](stream: runtime.CharStream, baseOrigin: Origin = Origin(Nil))(parseCtx: Parser => Ctx, convert: (Converter[G], Ctx) => Out): (Out, Seq[ExpectedError]) = {
+  protected def getErrorsFor[T](
+      origin: Origin,
+      parser: runtime.Parser,
+      lexer: runtime.Lexer,
+  )(f: => T): Either[Seq[ParseError], T] = Right(f)
+  protected def noErrorsOrThrow[T](
+      origin: Origin,
+      parser: runtime.Parser,
+      lexer: runtime.Lexer,
+  )(f: => T): T = f
+
+  def parseAntlrStreamOrThrow[Ctx, G, Out](
+      stream: runtime.CharStream,
+      baseOrigin: Origin = Origin(Nil),
+  )(
+      parseCtx: Parser => Ctx,
+      convert: (Converter[G], Ctx) => Out,
+  ): (Out, Seq[ExpectedError]) = {
     val lexer = newLexer(stream)
     val tokenStream = new CommonTokenStream(lexer)
     val parser = newParser(tokenStream)
 
-    if(debugOptions.fullContextEnabled)
-      parser.getInterpreter.setPredictionMode(PredictionMode.LL_EXACT_AMBIG_DETECTION)
+    if (debugOptions.fullContextEnabled)
+      parser.getInterpreter
+        .setPredictionMode(PredictionMode.LL_EXACT_AMBIG_DETECTION)
 
     val parseErrors = collectParseErrors(lexer, parser, baseOrigin)
     val expectedErrors = getExpectedErrors(tokenStream, baseOrigin)
@@ -101,29 +152,55 @@ abstract class AntlrParser extends Parser {
         convert(newConverter(baseOrigin, expectedErrors, tokenStream), main),
         expectedErrors.map(_._3),
       )
-    } catch {
-      case m: MatchError =>
-        throw ParseMatchError(m.getMessage())
-    }
+    } catch { case m: MatchError => throw ParseMatchError(m.getMessage()) }
   }
 
-  def parseReaderOrThrow[Ctx, G, Out](reader: Reader, baseOrigin: Origin = Origin(Nil))(parseCtx: Parser => Ctx, convert: (Converter[G], Ctx) => Out): (Out, Seq[ExpectedError]) =
-    parseAntlrStreamOrThrow(CharStreams.fromReader(reader), baseOrigin)(parseCtx, convert)
-
-  def parseOrThrow[Ctx, G, Out](readable: Readable, baseOrigin: Origin = Origin(Nil))(parseCtx: Parser => Ctx, convert: (Converter[G], Ctx) => Out): (Out, Seq[ExpectedError]) =
+  def parseReaderOrThrow[Ctx, G, Out](
+      reader: Reader,
+      baseOrigin: Origin = Origin(Nil),
+  )(
+      parseCtx: Parser => Ctx,
+      convert: (Converter[G], Ctx) => Out,
+  ): (Out, Seq[ExpectedError]) =
+    parseAntlrStreamOrThrow(CharStreams.fromReader(reader), baseOrigin)(
+      parseCtx,
+      convert,
+    )
+
+  def parseOrThrow[Ctx, G, Out](
+      readable: Readable,
+      baseOrigin: Origin = Origin(Nil),
+  )(
+      parseCtx: Parser => Ctx,
+      convert: (Converter[G], Ctx) => Out,
+  ): (Out, Seq[ExpectedError]) =
     try {
       readable.read { reader =>
-        parseReaderOrThrow(reader, baseOrigin.withContent(ReadableOrigin(readable)))(parseCtx, convert)
+        parseReaderOrThrow(
+          reader,
+          baseOrigin.withContent(ReadableOrigin(readable)),
+        )(parseCtx, convert)
       }
     } catch {
-      case _: FileNotFoundException | _: NoSuchFileException => throw FileNotFound(readable.fileName)
+      case _: FileNotFoundException | _: NoSuchFileException =>
+        throw FileNotFound(readable.fileName)
     }
 
-  def parseAntlrStream[G](stream: runtime.CharStream, baseOrigin: Origin = Origin(Nil)): ParseResult[G] = {
-    val (result, expectedErrors) = parseAntlrStreamOrThrow(stream, baseOrigin)(parser => parseMain(parser), mainToResult[G])
+  def parseAntlrStream[G](
+      stream: runtime.CharStream,
+      baseOrigin: Origin = Origin(Nil),
+  ): ParseResult[G] = {
+    val (result, expectedErrors) =
+      parseAntlrStreamOrThrow(stream, baseOrigin)(
+        parser => parseMain(parser),
+        mainToResult[G],
+      )
     ParseResult(result.asInstanceOf[Seq[GlobalDeclaration[G]]], expectedErrors)
   }
 
-  override def parseReader[G](reader: Reader, baseOrigin: Origin = Origin(Nil)): ParseResult[G] =
+  override def parseReader[G](
+      reader: Reader,
+      baseOrigin: Origin = Origin(Nil),
+  ): ParseResult[G] =
     parseAntlrStream(CharStreams.fromReader(reader), baseOrigin)
 }
diff --git a/src/parsers/vct/parsers/CollectingErrorListener.scala b/src/parsers/vct/parsers/CollectingErrorListener.scala
index 54a6817a61..524bffdad2 100644
--- a/src/parsers/vct/parsers/CollectingErrorListener.scala
+++ b/src/parsers/vct/parsers/CollectingErrorListener.scala
@@ -2,9 +2,18 @@ package vct.parsers
 
 import com.typesafe.scalalogging.LazyLogging
 import org.antlr.v4.runtime
-import org.antlr.v4.runtime.atn.{ATNConfigSet, ATNState, SingletonPredictionContext}
+import org.antlr.v4.runtime.atn.{
+  ATNConfigSet,
+  ATNState,
+  SingletonPredictionContext,
+}
 import org.antlr.v4.runtime.dfa.DFA
-import org.antlr.v4.runtime.{ANTLRErrorListener, RecognitionException, Recognizer, Token}
+import org.antlr.v4.runtime.{
+  ANTLRErrorListener,
+  RecognitionException,
+  Recognizer,
+  Token,
+}
 import vct.col.origin.{Origin, PositionRange}
 import vct.parsers.debug.{ATNTools, DebugOptions}
 import vct.parsers.err.ParseError
@@ -14,26 +23,39 @@ import java.util
 import scala.jdk.CollectionConverters.CollectionHasAsScala
 import scala.jdk.StreamConverters._
 
-case class CollectingErrorListener(baseOrigin: Origin, debugOptions: DebugOptions) extends ANTLRErrorListener with LazyLogging {
+case class CollectingErrorListener(
+    baseOrigin: Origin,
+    debugOptions: DebugOptions,
+) extends ANTLRErrorListener with LazyLogging {
   var errors: Seq[ParseError] = Nil
 
-  override def syntaxError(recognizer: Recognizer[_, _], anyToken: Any,
-                           line: Int, charPositionInLine: Int, message: String, e: RecognitionException): Unit = {
+  override def syntaxError(
+      recognizer: Recognizer[_, _],
+      anyToken: Any,
+      line: Int,
+      charPositionInLine: Int,
+      message: String,
+      e: RecognitionException,
+  ): Unit = {
     anyToken match {
       case token: Token if anyToken != null =>
         errors :+= ParseError(OriginProvider(baseOrigin, token, token), message)
       case _ =>
-        errors :+= ParseError(OriginProvider(baseOrigin, line-1, line-1, Some((charPositionInLine-1, charPositionInLine-1))), message)
+        errors :+= ParseError(
+          OriginProvider(
+            baseOrigin,
+            line - 1,
+            line - 1,
+            Some((charPositionInLine - 1, charPositionInLine - 1)),
+          ),
+          message,
+        )
     }
 
     currentFullContext = None
   }
 
-  case class FullContext(
-    parser: runtime.Parser,
-    dfa: DFA,
-    startIndex: Int,
-  ) {
+  case class FullContext(parser: runtime.Parser, dfa: DFA, startIndex: Int) {
     var startTime: Long = -1
     var stopTime: Long = -1
     var stopIndex: Int = -1
@@ -48,23 +70,26 @@ case class CollectingErrorListener(baseOrigin: Origin, debugOptions: DebugOption
       val startLineIdx = start.getLine - 1
       val startColIdx = start.getCharPositionInLine
       val endLineIdx = stop.getLine - 1
-      val endColIdx = stop.getCharPositionInLine + stop.getStopIndex - stop.getStartIndex + 1
-      baseOrigin.withContent(PositionRange(startLineIdx, endLineIdx, Some((startColIdx, endColIdx))))
+      val endColIdx =
+        stop.getCharPositionInLine + stop.getStopIndex - stop.getStartIndex + 1
+      baseOrigin.withContent(
+        PositionRange(startLineIdx, endLineIdx, Some((startColIdx, endColIdx)))
+      )
     }
 
-
     def report(): Unit = {
       val time = f"${(stopTime - startTime) / 1_000_000_000.0}%.2f"
 
       val message = new StringBuilder
-      message ++= s"Prediction of rule ${parser.getRuleNames()(ruleIndex)} required full context and took ${time}s:\n"
+      message ++=
+        s"Prediction of rule ${parser.getRuleNames()(ruleIndex)} required full context and took ${time}s:\n"
 
       val ruleState = parser.getATN.ruleToStartState(ruleIndex)
 
-      for((trans, alt) <- decisionState.getTransitions.zipWithIndex) {
-        if(!conflictingBeforeFullContext.get(alt+1))
+      for ((trans, alt) <- decisionState.getTransitions.zipWithIndex) {
+        if (!conflictingBeforeFullContext.get(alt + 1))
           message ++= "    "
-        else if(!conflictingAfterFullContext.get(alt+1))
+        else if (!conflictingAfterFullContext.get(alt + 1))
           message ++= "[x] "
         else
           message ++= " >  "
@@ -88,15 +113,12 @@ case class CollectingErrorListener(baseOrigin: Origin, debugOptions: DebugOption
       startIndex: Int,
       stopIndex: Int,
       conflictingAlts: util.BitSet,
-      configs: ATNConfigSet
+      configs: ATNConfigSet,
   ): Unit = {
-    if(!debugOptions.fullContextEnabled) return
+    if (!debugOptions.fullContextEnabled)
+      return
 
-    currentFullContext = Some(FullContext(
-      parser,
-      dfa,
-      startIndex,
-    ))
+    currentFullContext = Some(FullContext(parser, dfa, startIndex))
 
     currentFullContext.get.ruleIndex = parser.getRuleContext.getRuleIndex
     currentFullContext.get.conflictingBeforeFullContext = conflictingAlts
@@ -110,16 +132,17 @@ case class CollectingErrorListener(baseOrigin: Origin, debugOptions: DebugOption
       stopIndex: Int,
       exact: Boolean,
       ambigAlts: util.BitSet,
-      configs: ATNConfigSet
+      configs: ATNConfigSet,
   ): Unit = {
-    if(!debugOptions.fullContextEnabled) return
+    if (!debugOptions.fullContextEnabled)
+      return
 
     currentFullContext.get.decisionState = dfa.atnStartState
     currentFullContext.get.conflictingAfterFullContext = ambigAlts
     currentFullContext.get.stopIndex = stopIndex
     currentFullContext.get.stopTime = System.nanoTime()
 
-    if(debugOptions.reportAmbiguities)
+    if (debugOptions.reportAmbiguities)
       currentFullContext.get.report()
 
     currentFullContext = None
@@ -131,9 +154,10 @@ case class CollectingErrorListener(baseOrigin: Origin, debugOptions: DebugOption
       startIndex: Int,
       stopIndex: Int,
       prediction: Int,
-      configs: ATNConfigSet
+      configs: ATNConfigSet,
   ): Unit = {
-    if(!debugOptions.fullContextEnabled) return
+    if (!debugOptions.fullContextEnabled)
+      return
 
     currentFullContext.get.decisionState = dfa.atnStartState
     currentFullContext.get.conflictingAfterFullContext = new util.BitSet()
@@ -141,7 +165,7 @@ case class CollectingErrorListener(baseOrigin: Origin, debugOptions: DebugOption
     currentFullContext.get.stopIndex = stopIndex
     currentFullContext.get.stopTime = System.nanoTime()
 
-    if(debugOptions.reportContextSensitivity)
+    if (debugOptions.reportContextSensitivity)
       currentFullContext.get.report()
 
     currentFullContext = None
diff --git a/src/parsers/vct/parsers/ParseResult.scala b/src/parsers/vct/parsers/ParseResult.scala
index 21fbee5180..79fdbde9cb 100644
--- a/src/parsers/vct/parsers/ParseResult.scala
+++ b/src/parsers/vct/parsers/ParseResult.scala
@@ -5,10 +5,18 @@ import vct.col.origin.ExpectedError
 
 case object ParseResult {
   def reduce[G](parses: Seq[ParseResult[G]]): ParseResult[G] =
-    parses.reduceOption((l, r) => (l, r) match {
-      case (ParseResult(declsLeft, expectedLeft), ParseResult(declsRight, expectedRight)) =>
-        ParseResult(declsLeft ++ declsRight, expectedLeft ++ expectedRight)
-    }).getOrElse(ParseResult(Nil, Nil))
+    parses.reduceOption((l, r) =>
+      (l, r) match {
+        case (
+              ParseResult(declsLeft, expectedLeft),
+              ParseResult(declsRight, expectedRight),
+            ) =>
+          ParseResult(declsLeft ++ declsRight, expectedLeft ++ expectedRight)
+      }
+    ).getOrElse(ParseResult(Nil, Nil))
 }
 
-case class ParseResult[G](decls: Seq[GlobalDeclaration[G]], expectedErrors: Seq[ExpectedError])
\ No newline at end of file
+case class ParseResult[G](
+    decls: Seq[GlobalDeclaration[G]],
+    expectedErrors: Seq[ExpectedError],
+)
diff --git a/src/parsers/vct/parsers/Parser.scala b/src/parsers/vct/parsers/Parser.scala
index 58f741c7e3..fc3bbfb6b7 100644
--- a/src/parsers/vct/parsers/Parser.scala
+++ b/src/parsers/vct/parsers/Parser.scala
@@ -6,7 +6,12 @@ import org.antlr.v4.runtime.atn.PredictionMode
 import org.antlr.v4.runtime.{CharStreams, CommonTokenStream, Token}
 import vct.col.origin.{ExpectedError, Origin, ReadableOrigin}
 import vct.parsers.debug.{ATNTools, DebugOptions}
-import vct.parsers.err.{FileNotFound, ParseError, ParseErrorStrategy, ParseErrors}
+import vct.parsers.err.{
+  FileNotFound,
+  ParseError,
+  ParseErrorStrategy,
+  ParseErrors,
+}
 import vct.parsers.transform.{BlameProvider, OriginProvider}
 import vct.result.VerificationError.UserError
 
@@ -15,12 +20,20 @@ import java.nio.file.NoSuchFileException
 import scala.jdk.CollectionConverters._
 
 abstract class Parser {
-  def parseReader[G](reader: Reader, baseOrigin: Origin = Origin(Nil)): ParseResult[G]
+  def parseReader[G](
+      reader: Reader,
+      baseOrigin: Origin = Origin(Nil),
+  ): ParseResult[G]
 
-  def parse[G](readable: Readable, baseOrigin: Origin = Origin(Nil)): ParseResult[G] =
+  def parse[G](
+      readable: Readable,
+      baseOrigin: Origin = Origin(Nil),
+  ): ParseResult[G] =
     try {
-      readable.read(parseReader(_, baseOrigin.withContent(ReadableOrigin(readable))))
+      readable
+        .read(parseReader(_, baseOrigin.withContent(ReadableOrigin(readable))))
     } catch {
-      case _: FileNotFoundException | _: NoSuchFileException => throw FileNotFound(readable.fileName)
+      case _: FileNotFoundException | _: NoSuchFileException =>
+        throw FileNotFound(readable.fileName)
     }
-}
\ No newline at end of file
+}
diff --git a/src/parsers/vct/parsers/ProgressTokenStream.scala b/src/parsers/vct/parsers/ProgressTokenStream.scala
index a477085d6f..83d33fb4e8 100644
--- a/src/parsers/vct/parsers/ProgressTokenStream.scala
+++ b/src/parsers/vct/parsers/ProgressTokenStream.scala
@@ -3,18 +3,24 @@ package vct.parsers
 import hre.progress.task.AbstractTask
 import hre.progress.{Progress, ProgressRender, TaskRegistry}
 import org.antlr.v4.runtime.misc.Interval
-import org.antlr.v4.runtime.{BufferedTokenStream, RuleContext, Token, TokenSource, TokenStream}
+import org.antlr.v4.runtime.{
+  BufferedTokenStream,
+  RuleContext,
+  Token,
+  TokenSource,
+  TokenStream,
+}
 import vct.col.origin.Origin
 import vct.parsers.transform.OriginProvider
 
 object ProgressTokenStream {
-  class Task(override val superTask: AbstractTask, baseOrigin: Origin) extends hre.progress.task.Task {
+  class Task(override val superTask: AbstractTask, baseOrigin: Origin)
+      extends hre.progress.task.Task {
     var token: Option[Token] = None
 
     override def profilingBreadcrumb: String =
       token match {
-        case None =>
-          "Unknown"
+        case None => "Unknown"
         case Some(token) =>
           val o = OriginProvider(baseOrigin, token, token)
           o.shortPositionText
@@ -22,17 +28,19 @@ object ProgressTokenStream {
 
     override def renderHere: ProgressRender =
       token match {
-        case None =>
-          ProgressRender("Unknown")
+        case None => ProgressRender("Unknown")
         case Some(token) =>
           val o = OriginProvider(baseOrigin, token, token)
           o.renderProgress(s"At ${o.shortPositionText}", short = false)
       }
 
-    override def renderHereShort: ProgressRender = ProgressRender(profilingBreadcrumb)
+    override def renderHereShort: ProgressRender =
+      ProgressRender(profilingBreadcrumb)
   }
 
-  def apply[T](baseOrigin: Origin, stream: BufferedTokenStream)(f: TokenStream => T): T =
+  def apply[T](baseOrigin: Origin, stream: BufferedTokenStream)(
+      f: TokenStream => T
+  ): T =
     Progress.stages(Seq("Lexing" -> 1, "Parsing" -> 3)) { nextStage =>
       stream.fill()
       nextStage()
@@ -43,14 +51,17 @@ object ProgressTokenStream {
     }
 }
 
-private class ProgressTokenStream(stream: BufferedTokenStream, task: ProgressTokenStream.Task) extends TokenStream {
+private class ProgressTokenStream(
+    stream: BufferedTokenStream,
+    task: ProgressTokenStream.Task,
+) extends TokenStream {
 
   private var maxIndex = 0
 
   private def update[T](f: => T): T = {
     val result = f
 
-    if(stream.index() > maxIndex)
+    if (stream.index() > maxIndex)
       maxIndex = stream.index()
 
     result
@@ -62,7 +73,8 @@ private class ProgressTokenStream(stream: BufferedTokenStream, task: ProgressTok
   override def getText(interval: Interval): String = stream.getText(interval)
   override def getText: String = stream.getText
   override def getText(ctx: RuleContext): String = stream.getText(ctx)
-  override def getText(start: Token, stop: Token): String = stream.getText(start, stop)
+  override def getText(start: Token, stop: Token): String =
+    stream.getText(start, stop)
   override def consume(): Unit = update(stream.consume())
   override def LA(i: Int): Int = update(stream.LA(i))
   override def mark(): Int = stream.mark()
diff --git a/src/parsers/vct/parsers/debug/ATNTools.scala b/src/parsers/vct/parsers/debug/ATNTools.scala
index 6353724198..ad3570fb5b 100644
--- a/src/parsers/vct/parsers/debug/ATNTools.scala
+++ b/src/parsers/vct/parsers/debug/ATNTools.scala
@@ -11,7 +11,10 @@ import scala.util.Using
 object ATNTools {
   type Recognizer = ANTLRRecognizer[_, _ <: ATNSimulator]
 
-  def vertexNameAttrs(recognizer: Recognizer, state: ATNState): (String, String) =
+  def vertexNameAttrs(
+      recognizer: Recognizer,
+      state: ATNState,
+  ): (String, String) =
     state match {
       case start: RuleStartState =>
         val name = recognizer.getRuleNames()(start.ruleIndex)
@@ -19,27 +22,28 @@ object ATNTools {
       case end: RuleStopState =>
         val name = recognizer.getRuleNames()(end.ruleIndex)
         (s"end${name.capitalize}", "[color=red]")
-      case start: BlockStartState =>
-        (s"${start.endState.stateNumber}#{", "")
-      case end: BlockEndState =>
-        (s"${end.stateNumber}#}", "")
-      case other =>
-        (s"#${other.stateNumber}", "")
+      case start: BlockStartState => (s"${start.endState.stateNumber}#{", "")
+      case end: BlockEndState => (s"${end.stateNumber}#}", "")
+      case other => (s"#${other.stateNumber}", "")
     }
 
-  def outputGraph(recognizer: Recognizer, edges: Seq[(ATNState, RegLang, ATNState)], out: Appendable): Unit = {
+  def outputGraph(
+      recognizer: Recognizer,
+      edges: Seq[(ATNState, RegLang, ATNState)],
+      out: Appendable,
+  ): Unit = {
     out.append("digraph {\n")
 
     val vertices = edges.flatMap(e => Seq(e._1, e._3)).distinct
 
-    for(vertex <- vertices) {
+    for (vertex <- vertices) {
       val (name, attrs) = vertexNameAttrs(recognizer, vertex)
       out.append(s"  \"$name\" $attrs\n")
     }
 
     out.append("  \n")
 
-    for(edge <- edges) {
+    for (edge <- edges) {
       val start = vertexNameAttrs(recognizer, edge._1)._1
       val end = vertexNameAttrs(recognizer, edge._3)._1
       out.append(s"  \"$start\" -> \"$end\" [label=\"${edge._2}\"]\n")
@@ -54,35 +58,39 @@ object ATNTools {
       case other => Antlr(recognizer, other)
     }
 
-  def getEdges(recognizer: Recognizer, from: ATNState, expandRules: Set[Int] = Set.empty): Seq[(ATNState, RegLang, ATNState)] = {
+  def getEdges(
+      recognizer: Recognizer,
+      from: ATNState,
+      expandRules: Set[Int] = Set.empty,
+  ): Seq[(ATNState, RegLang, ATNState)] = {
     val toExplore = mutable.Set(from)
     val explored = mutable.Set[ATNState]()
     val edges = mutable.ArrayBuffer[(ATNState, RegLang, ATNState)]()
 
-    while(toExplore.nonEmpty) {
+    while (toExplore.nonEmpty) {
       val s = toExplore.head
       toExplore.remove(s)
       explored += s
 
-      val follow = s match {
-        case r: RuleStopState if !expandRules.contains(r.ruleIndex) => false
-        case _ => true
-      }
+      val follow =
+        s match {
+          case r: RuleStopState if !expandRules.contains(r.ruleIndex) => false
+          case _ => true
+        }
 
       if (follow) {
         for (trans <- s.getTransitions) {
-          val target = trans match {
-            case rule: RuleTransition if !expandRules.contains(rule.ruleIndex) =>
-              rule.followState
-            case other =>
-              other.target
-          }
+          val target =
+            trans match {
+              case rule: RuleTransition
+                  if !expandRules.contains(rule.ruleIndex) =>
+                rule.followState
+              case other => other.target
+            }
 
           edges += ((s, transitionLanguage(recognizer, trans), target))
 
-          if (!explored.contains(target)) {
-            toExplore += target
-          }
+          if (!explored.contains(target)) { toExplore += target }
         }
       }
     }
@@ -90,16 +98,21 @@ object ATNTools {
     edges.toSeq
   }
 
-  class LanguageGraph(val recognizer: Recognizer, val s0: ATNState, val accept: ATNState, edges: Iterable[(ATNState, RegLang, ATNState)]) {
+  class LanguageGraph(
+      val recognizer: Recognizer,
+      val s0: ATNState,
+      val accept: ATNState,
+      edges: Iterable[(ATNState, RegLang, ATNState)],
+  ) {
     // only read or removed from
     private final val EMPTY_MAP = mutable.Map[ATNState, RegLang]()
 
-    private val inEdge: mutable.Map[ATNState, mutable.Map[ATNState, RegLang]] = mutable.Map()
-    private val outEdge: mutable.Map[ATNState, mutable.Map[ATNState, RegLang]] = mutable.Map()
+    private val inEdge: mutable.Map[ATNState, mutable.Map[ATNState, RegLang]] =
+      mutable.Map()
+    private val outEdge: mutable.Map[ATNState, mutable.Map[ATNState, RegLang]] =
+      mutable.Map()
 
-    for((start, lang, end) <- edges) {
-      addEdge(start, lang, end)
-    }
+    for ((start, lang, end) <- edges) { addEdge(start, lang, end) }
 
     def addEdge(start: ATNState, lang: RegLang, end: ATNState): Unit = {
       val startOut = outEdge.getOrElseUpdate(start, mutable.Map())
@@ -112,40 +125,45 @@ object ATNTools {
     def delete(state: ATNState): Unit = {
       require(s0 != state && accept != state)
 
-      val (selfLoops, inEdges) = inEdge.remove(state).getOrElse(EMPTY_MAP).toSeq.partition(_._1 == state)
-      val outEdges = outEdge.remove(state).getOrElse(EMPTY_MAP).toSeq.filterNot(_._1 == state)
+      val (selfLoops, inEdges) = inEdge.remove(state).getOrElse(EMPTY_MAP).toSeq
+        .partition(_._1 == state)
+      val outEdges = outEdge.remove(state).getOrElse(EMPTY_MAP).toSeq
+        .filterNot(_._1 == state)
 
-      for((start, _) <- inEdges) outEdge.getOrElse(start, EMPTY_MAP).remove(state)
-      for((end, _) <- outEdges) inEdge.getOrElse(end, EMPTY_MAP).remove(state)
+      for ((start, _) <- inEdges)
+        outEdge.getOrElse(start, EMPTY_MAP).remove(state)
+      for ((end, _) <- outEdges)
+        inEdge.getOrElse(end, EMPTY_MAP).remove(state)
 
       val selfLoopLang = Star(Alts(Seqn() +: selfLoops.map(_._2): _*))
 
-      for((start, inLang) <- inEdges; (end, outLang) <- outEdges) {
+      for ((start, inLang) <- inEdges; (end, outLang) <- outEdges) {
         addEdge(start, Seqn(inLang, selfLoopLang, outLang), end)
       }
     }
 
     def output(path: Path): Unit = {
       Using(Files.newBufferedWriter(path)) { w =>
-        outputGraph(recognizer, outEdge.toSeq.flatMap {
-          case (start, ends) =>
-            ends.map {
-              case (end, lang) =>
-                (start, lang, end)
-            }
-        }, w)
+        outputGraph(
+          recognizer,
+          outEdge.toSeq.flatMap { case (start, ends) =>
+            ends.map { case (end, lang) => (start, lang, end) }
+          },
+          w,
+        )
       }
     }
 
     def compact(): Unit = {
       output(Paths.get(s"tmp/${recognizer.getRuleNames()(s0.ruleIndex)}-0.dot"))
 
-      for((state, i) <- inEdge.keys.toSeq.zipWithIndex) {
-        if(state != s0 && state != accept) {
-          delete(state)
-        }
+      for ((state, i) <- inEdge.keys.toSeq.zipWithIndex) {
+        if (state != s0 && state != accept) { delete(state) }
 
-        output(Paths.get(s"tmp/${recognizer.getRuleNames()(s0.ruleIndex)}-${i+1}.dot"))
+        output(
+          Paths
+            .get(s"tmp/${recognizer.getRuleNames()(s0.ruleIndex)}-${i + 1}.dot")
+        )
       }
     }
 
@@ -159,23 +177,30 @@ object ATNTools {
       val goAccept = getLang(s0, accept)
       val goReject = getLang(accept, s0)
 
-      val endAtReject = Star(Alts(stayReject, Seqn(goAccept, Star(stayAccept), goReject)))
+      val endAtReject = Star(
+        Alts(stayReject, Seqn(goAccept, Star(stayAccept), goReject))
+      )
       Seqn(endAtReject, goAccept, Star(stayAccept)).simplify
     }
   }
 
-  def language(recognizer: Recognizer, from: ATNState, accept: ATNState): RegLang =
-    new LanguageGraph(recognizer, from, accept, getEdges(recognizer, from)).asRegLang()
-
-  /**
-   * Reconstructs an ATN graph as a dot file for a given parse rule
-   * Argument 1: class of the parser to analyze (e.g. vct.antlr4.generated.CParser)
-   * Argument 2: parse rule to derive the ATN of (e.g. initializerList)
-   * Argument 3: output file in DOT/graphviz format (e.g. initializerList.dot)
-   */
+  def language(
+      recognizer: Recognizer,
+      from: ATNState,
+      accept: ATNState,
+  ): RegLang =
+    new LanguageGraph(recognizer, from, accept, getEdges(recognizer, from))
+      .asRegLang()
+
+  /** Reconstructs an ATN graph as a dot file for a given parse rule Argument 1:
+    * class of the parser to analyze (e.g. vct.antlr4.generated.CParser)
+    * Argument 2: parse rule to derive the ATN of (e.g. initializerList)
+    * Argument 3: output file in DOT/graphviz format (e.g. initializerList.dot)
+    */
   def main(args: Array[String]): Unit = {
     val parserClass = getClass.getClassLoader.loadClass(args(0))
-    val parser = parserClass.getConstructor(classOf[TokenStream]).newInstance(null).asInstanceOf[Recognizer]
+    val parser = parserClass.getConstructor(classOf[TokenStream])
+      .newInstance(null).asInstanceOf[Recognizer]
     val ruleIndex = parser.getRuleIndexMap.get(args(1))
     val state = parser.getATN.ruleToStartState(ruleIndex)
     val edges = getEdges(parser, state)
diff --git a/src/parsers/vct/parsers/debug/DebugOptions.scala b/src/parsers/vct/parsers/debug/DebugOptions.scala
index ce61366f42..447c675f79 100644
--- a/src/parsers/vct/parsers/debug/DebugOptions.scala
+++ b/src/parsers/vct/parsers/debug/DebugOptions.scala
@@ -1,13 +1,16 @@
 package vct.parsers.debug
 
 object DebugOptions {
-  def NONE: DebugOptions = DebugOptions(reportAmbiguities = false, reportContextSensitivity = false)
-  def ALL: DebugOptions = DebugOptions(reportAmbiguities = true, reportContextSensitivity = true)
+  def NONE: DebugOptions =
+    DebugOptions(reportAmbiguities = false, reportContextSensitivity = false)
+  def ALL: DebugOptions =
+    DebugOptions(reportAmbiguities = true, reportContextSensitivity = true)
 }
 
 case class DebugOptions(
-  reportAmbiguities: Boolean,
-  reportContextSensitivity: Boolean,
+    reportAmbiguities: Boolean,
+    reportContextSensitivity: Boolean,
 ) {
-  def fullContextEnabled: Boolean = reportContextSensitivity || reportAmbiguities
+  def fullContextEnabled: Boolean =
+    reportContextSensitivity || reportAmbiguities
 }
diff --git a/src/parsers/vct/parsers/debug/Grammar.scala b/src/parsers/vct/parsers/debug/Grammar.scala
index 68f89ccc2e..eb56ac5f7a 100644
--- a/src/parsers/vct/parsers/debug/Grammar.scala
+++ b/src/parsers/vct/parsers/debug/Grammar.scala
@@ -14,20 +14,18 @@ trait RenderExp {
   def bind(minPrecedence: Int): String = {
     val (text, precedence) = render
 
-    if(precedence < minPrecedence)
+    if (precedence < minPrecedence)
       s"($text)"
     else
       text
   }
 
-  override def toString: String =
-    render._1
+  override def toString: String = render._1
 }
 
-/**
- * Data structure to represent regular expressions with added node to represent arbitrary (potentially non-regular)
- * antlr expressions.
- */
+/** Data structure to represent regular expressions with added node to represent
+  * arbitrary (potentially non-regular) antlr expressions.
+  */
 sealed trait RegLang extends RenderExp {
   private def collectSeqn(buf: ArrayBuffer[RegLang]): Unit =
     this match {
@@ -53,41 +51,65 @@ sealed trait RegLang extends RenderExp {
     buf.toSeq
   }
 
-  def simplify: RegLang = this match {
-    case tok: Antlr => tok
-    case Seqn(_ @ _*) => flatSeqn match {
-      case Nil => Seqn()
-      case one :: Nil => one
-      case more if more.contains(Alts()) => Alts()
-      case more => Seqn(more: _*)
-    }
-    case Alts(_ @ _*) => flatAlts match {
-      case Nil => Alts()
-      case one :: Nil => one
-      case more => Alts(more: _*)
-    }
-    case Star(lang) => lang.simplify match {
-      case Seqn() => Seqn()
-      case Alts(alts @ _*) => alts.filter(_ != Seqn()) match {
-        case Nil => Seqn()
-        case more => Star(Alts(more: _*))
-      }
-      case other => Star(other)
+  def simplify: RegLang =
+    this match {
+      case tok: Antlr => tok
+      case Seqn(_ @_*) =>
+        flatSeqn match {
+          case Nil => Seqn()
+          case one :: Nil => one
+          case more if more.contains(Alts()) => Alts()
+          case more => Seqn(more: _*)
+        }
+      case Alts(_ @_*) =>
+        flatAlts match {
+          case Nil => Alts()
+          case one :: Nil => one
+          case more => Alts(more: _*)
+        }
+      case Star(lang) =>
+        lang.simplify match {
+          case Seqn() => Seqn()
+          case Alts(alts @ _*) =>
+            alts.filter(_ != Seqn()) match {
+              case Nil => Seqn()
+              case more => Star(Alts(more: _*))
+            }
+          case other => Star(other)
+        }
     }
-  }
 }
 
 object Antlr {
-  def apply(recognizer: Recognizer[_, _ <: ATNSimulator], transition: Transition): Antlr =
+  def apply(
+      recognizer: Recognizer[_, _ <: ATNSimulator],
+      transition: Transition,
+  ): Antlr =
     transition match {
       case _: EpsilonTransition => new Antlr("ε", 100)
       case t: RangeTransition => new Antlr(t.toString, 70)
-      case t: RuleTransition => new Antlr(recognizer.getRuleNames()(t.ruleIndex), 100)
-      case t: PredicateTransition => new Antlr(s"{parser.sempred(_, ${t.ruleIndex}, ${t.predIndex})}?", 70)
-      case t: AtomTransition => new Antlr(recognizer.getVocabulary.getDisplayName(t.label), 100)
-      case t: ActionTransition => new Antlr(s"{parser.action(_, ${t.ruleIndex}, ${t.actionIndex})}", 70)
-      case t: NotSetTransition => new Antlr(t.label().toList.asScala.map(recognizer.getVocabulary.getDisplayName(_)).mkString("~(", "|", ")"), 70)
-      case t: SetTransition => new Antlr(t.label().toList.asScala.map(recognizer.getVocabulary.getDisplayName(_)).mkString("(", "|", ")"), 70)
+      case t: RuleTransition =>
+        new Antlr(recognizer.getRuleNames()(t.ruleIndex), 100)
+      case t: PredicateTransition =>
+        new Antlr(s"{parser.sempred(_, ${t.ruleIndex}, ${t.predIndex})}?", 70)
+      case t: AtomTransition =>
+        new Antlr(recognizer.getVocabulary.getDisplayName(t.label), 100)
+      case t: ActionTransition =>
+        new Antlr(s"{parser.action(_, ${t.ruleIndex}, ${t.actionIndex})}", 70)
+      case t: NotSetTransition =>
+        new Antlr(
+          t.label().toList.asScala
+            .map(recognizer.getVocabulary.getDisplayName(_))
+            .mkString("~(", "|", ")"),
+          70,
+        )
+      case t: SetTransition =>
+        new Antlr(
+          t.label().toList.asScala
+            .map(recognizer.getVocabulary.getDisplayName(_))
+            .mkString("(", "|", ")"),
+          70,
+        )
       case t: WildcardTransition => new Antlr(t.toString, 100)
       case t: PrecedencePredicateTransition => new Antlr(s"{$t}?", 70)
       case other => new Antlr(other.toString, 0)
@@ -100,18 +122,19 @@ case class Antlr(text: String, precedence: Int) extends RegLang {
 
 case class Seqn(langs: RegLang*) extends RegLang {
   @tailrec
-  private def renderSeqnWithPlus(s: StringBuilder, langs: Seq[RegLang]): Unit = langs match {
-    case Nil =>
-    case Star(x) :: y :: tail if x == y =>
-      s.append(x.bind(50)).append("+ ")
-      renderSeqnWithPlus(s, tail)
-    case Star(x @ Seqn(xs @ _*)) :: tail if tail.startsWith(xs) =>
-      s.append(x.bind(50)).append("+ ")
-      renderSeqnWithPlus(s, tail.drop(xs.size))
-    case x :: tail =>
-      s.append(x.bind(50)).append(" ")
-      renderSeqnWithPlus(s, tail)
-  }
+  private def renderSeqnWithPlus(s: StringBuilder, langs: Seq[RegLang]): Unit =
+    langs match {
+      case Nil =>
+      case Star(x) :: y :: tail if x == y =>
+        s.append(x.bind(50)).append("+ ")
+        renderSeqnWithPlus(s, tail)
+      case Star(x @ Seqn(xs @ _*)) :: tail if tail.startsWith(xs) =>
+        s.append(x.bind(50)).append("+ ")
+        renderSeqnWithPlus(s, tail.drop(xs.size))
+      case x :: tail =>
+        s.append(x.bind(50)).append(" ")
+        renderSeqnWithPlus(s, tail)
+    }
 
   override def render: (String, Int) =
     langs match {
@@ -125,18 +148,20 @@ case class Seqn(langs: RegLang*) extends RegLang {
 }
 
 case class Alts(langs: RegLang*) extends RegLang {
-  override def render: (String, Int) = langs match {
-    case Nil => "{false}?" -> 100
-    case lang :: Nil => lang.render
-    case langs if langs.contains(Seqn()) => langs.filterNot(_ == Seqn()) match {
-      case Nil => "()" -> 100
-      case lang :: Nil => s"${lang.bind(80)}?" -> 80
-      case langs => langs.map(_.bind(0)).mkString("(", " | ", ")?") -> 0
+  override def render: (String, Int) =
+    langs match {
+      case Nil => "{false}?" -> 100
+      case lang :: Nil => lang.render
+      case langs if langs.contains(Seqn()) =>
+        langs.filterNot(_ == Seqn()) match {
+          case Nil => "()" -> 100
+          case lang :: Nil => s"${lang.bind(80)}?" -> 80
+          case langs => langs.map(_.bind(0)).mkString("(", " | ", ")?") -> 0
+        }
+      case langs => langs.mkString(" | ") -> 0
     }
-    case langs => langs.mkString(" | ") -> 0
-  }
 }
 
 case class Star(lang: RegLang) extends RegLang {
   override def render: (String, Int) = s"${lang.bind(80)}*" -> 80
-}
\ No newline at end of file
+}
diff --git a/src/parsers/vct/parsers/debug/ParseAllExamples.scala b/src/parsers/vct/parsers/debug/ParseAllExamples.scala
index 3b6c286d1a..5d9270492f 100644
--- a/src/parsers/vct/parsers/debug/ParseAllExamples.scala
+++ b/src/parsers/vct/parsers/debug/ParseAllExamples.scala
@@ -14,9 +14,13 @@ import scala.jdk.StreamConverters.StreamHasToScala
 
 object ParseAllExamples {
   def track[T <: Parser](read: hre.io.Readable, recognizer: T): T = {
-    recognizer.getInterpreter.setPredictionMode(PredictionMode.LL_EXACT_AMBIG_DETECTION)
+    recognizer.getInterpreter
+      .setPredictionMode(PredictionMode.LL_EXACT_AMBIG_DETECTION)
     recognizer.removeErrorListeners()
-    recognizer.addErrorListener(CollectingErrorListener(Origin(Seq(ReadableOrigin(read))), DebugOptions.ALL))
+    recognizer.addErrorListener(CollectingErrorListener(
+      Origin(Seq(ReadableOrigin(read))),
+      DebugOptions.ALL,
+    ))
     recognizer
   }
 
@@ -26,56 +30,106 @@ object ParseAllExamples {
     f.read { reader =>
       ext match {
         case "pvl" =>
-          track(f, new PVLParser(new CommonTokenStream(new LangPVLLexer(CharStreams.fromReader(reader))))).program()
+          track(
+            f,
+            new PVLParser(new CommonTokenStream(new LangPVLLexer(
+              CharStreams.fromReader(reader)
+            ))),
+          ).program()
         case "java" =>
-          track(f, new JavaParser(new CommonTokenStream(new LangJavaLexer(CharStreams.fromReader(reader))))).compilationUnit()
+          track(
+            f,
+            new JavaParser(new CommonTokenStream(new LangJavaLexer(
+              CharStreams.fromReader(reader)
+            ))),
+          ).compilationUnit()
         case "c" | "cu" | "cl" | "h" =>
-          val interp = new ProcessBuilder("clang", "-E", "-nostdinc", "-nocudainc", "-nocudalib", "--cuda-host-only", "-o", tmp.toString, path.toString)
+          val interp =
+            new ProcessBuilder(
+              "clang",
+              "-E",
+              "-nostdinc",
+              "-nocudainc",
+              "-nocudalib",
+              "--cuda-host-only",
+              "-o",
+              tmp.toString,
+              path.toString,
+            )
           interp.start().waitFor()
           RWFile(tmp).read { reader =>
-            track(RWFile(tmp), new CParser(new CommonTokenStream(new LangCLexer(CharStreams.fromReader(reader))))).compilationUnit()
+            track(
+              RWFile(tmp),
+              new CParser(new CommonTokenStream(new LangCLexer(
+                CharStreams.fromReader(reader)
+              ))),
+            ).compilationUnit()
           }
         case "cpp" =>
-          val interp = new ProcessBuilder("clang", "-E", "-nostdinc", "-nocudainc", "-nocudalib", "--cuda-host-only", "-o", tmp.toString, path.toString)
+          val interp =
+            new ProcessBuilder(
+              "clang",
+              "-E",
+              "-nostdinc",
+              "-nocudainc",
+              "-nocudalib",
+              "--cuda-host-only",
+              "-o",
+              tmp.toString,
+              path.toString,
+            )
           interp.start().waitFor()
           RWFile(tmp).read { reader =>
-            track(RWFile(tmp), new CPPParser(new CommonTokenStream(new LangCPPLexer(CharStreams.fromReader(reader))))).translationUnit()
+            track(
+              RWFile(tmp),
+              new CPPParser(new CommonTokenStream(new LangCPPLexer(
+                CharStreams.fromReader(reader)
+              ))),
+            ).translationUnit()
           }
       }
     }
   }
 
-  val ALLOWED_EXTS =
-    Set("pvl", "java", "c", "cu", "cl", "h", "cpp")
+  val ALLOWED_EXTS = Set("pvl", "java", "c", "cu", "cl", "h", "cpp")
 
   def getExt(path: Path): Option[String] = {
     val parts = path.getFileName.toString.split('.')
-    if(parts.length == 2 && !parts.head.isBlank) {
+    if (parts.length == 2 && !parts.head.isBlank) {
       val ext = parts(1)
       Some(ext).filter(ALLOWED_EXTS.contains)
     } else
       None
   }
 
-  /**
-   * Parse all files in a given directory, or just one file.
-   * Argument 1: file or directory to parse files from (optional, default: examples)
-   * Argument 2: set of extensions to filter for (optional, default: pvl,java,c,cu,cl,h,cpp)
-   */
+  /** Parse all files in a given directory, or just one file. Argument 1: file
+    * or directory to parse files from (optional, default: examples) Argument 2:
+    * set of extensions to filter for (optional, default:
+    * pvl,java,c,cu,cl,h,cpp)
+    */
   def main(args: Array[String]): Unit = {
-    val basePath = if(args.isDefinedAt(0)) args(0) else "examples"
-    val exts = if(args.isDefinedAt(1)) args(1).split(',').toSet else ALLOWED_EXTS
+    val basePath =
+      if (args.isDefinedAt(0))
+        args(0)
+      else
+        "examples"
+    val exts =
+      if (args.isDefinedAt(1))
+        args(1).split(',').toSet
+      else
+        ALLOWED_EXTS
 
     val paths = Files.walk(Paths.get(basePath)).toScala(Seq)
-    val files = paths.collect { case path if getExt(path).nonEmpty && exts.contains(getExt(path).get) => getExt(path).get -> path }
-    for((ext -> file, i) <- files.sortBy(_._2.toString).zipWithIndex) {
-      println(s"[${i+1}/${files.size}] $file")
+    val files = paths.collect {
+      case path if getExt(path).nonEmpty && exts.contains(getExt(path).get) =>
+        getExt(path).get -> path
+    }
+    for ((ext -> file, i) <- files.sortBy(_._2.toString).zipWithIndex) {
+      println(s"[${i + 1}/${files.size}] $file")
       tryParse(file, ext)
     }
     System.gc()
     println("[waiting - connect e.g. VisualVM for memory diagnostics]")
-    synchronized {
-      wait()
-    }
+    synchronized { wait() }
   }
 }
diff --git a/src/parsers/vct/parsers/debug/ProfilingPredictionContextCache.scala b/src/parsers/vct/parsers/debug/ProfilingPredictionContextCache.scala
index a94fb494f6..1fdcafdb02 100644
--- a/src/parsers/vct/parsers/debug/ProfilingPredictionContextCache.scala
+++ b/src/parsers/vct/parsers/debug/ProfilingPredictionContextCache.scala
@@ -27,9 +27,7 @@ class ProfilingPredictionContextCache extends PredictionContextCache {
 
   override def get(ctx: PredictionContext): PredictionContext = {
     val res = super.get(ctx)
-    if(res ne null) {
-      hits(ctx) += 1
-    }
+    if (res ne null) { hits(ctx) += 1 }
     res
   }
 }
diff --git a/src/parsers/vct/parsers/err/ParseError.scala b/src/parsers/vct/parsers/err/ParseError.scala
index 9164f85cd9..c143fc1050 100644
--- a/src/parsers/vct/parsers/err/ParseError.scala
+++ b/src/parsers/vct/parsers/err/ParseError.scala
@@ -3,12 +3,18 @@ package vct.parsers.err
 import vct.col.origin._
 import vct.result.{Message, VerificationError}
 
-case class ParseError(origin: Origin, message: String) extends VerificationError.UserError {
-  override def text: String = origin.messageInContext(f"Parsing failed: $message")
+case class ParseError(origin: Origin, message: String)
+    extends VerificationError.UserError {
+  override def text: String =
+    origin.messageInContext(f"Parsing failed: $message")
   override def code: String = "parseError"
 }
 
-case class ParseErrors(errors: Seq[ParseError]) extends VerificationError.UserError {
-  override def text: String = Message.messagesInContext(errors.map(err => err.origin -> s"Parsing failed: ${err.message}"): _*)
+case class ParseErrors(errors: Seq[ParseError])
+    extends VerificationError.UserError {
+  override def text: String =
+    Message.messagesInContext(
+      errors.map(err => err.origin -> s"Parsing failed: ${err.message}"): _*
+    )
   override def code: String = "parseError"
-}
\ No newline at end of file
+}
diff --git a/src/parsers/vct/parsers/parser/ColCPPParser.scala b/src/parsers/vct/parsers/parser/ColCPPParser.scala
index dd36ff58f7..ed79ea1e8d 100644
--- a/src/parsers/vct/parsers/parser/ColCPPParser.scala
+++ b/src/parsers/vct/parsers/parser/ColCPPParser.scala
@@ -11,24 +11,33 @@ import vct.parsers.transform.BlameProvider
 import vct.parsers.{ParseResult, Parser}
 import vct.result.VerificationError.{Unreachable, UserError}
 
-import java.io.{FileNotFoundException, InputStreamReader, OutputStreamWriter, Reader, StringWriter}
+import java.io.{
+  FileNotFoundException,
+  InputStreamReader,
+  OutputStreamWriter,
+  Reader,
+  StringWriter,
+}
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, NoSuchFileException, Path, Paths}
 
 case object CPPParser {
-  case class PreprocessorError(fileName: String, errorCode: Int, error: String) extends UserError {
+  case class PreprocessorError(fileName: String, errorCode: Int, error: String)
+      extends UserError {
     override def code: String = "preprocessorError"
     override def text: String =
       s"Preprocesing file $fileName failed with exit code $errorCode:\n$error"
   }
 }
 
-case class ColCPPParser(debugOptions: DebugOptions,
-                        blameProvider: BlameProvider,
-                        cc: Path,
-                        systemInclude: Path,
-                        otherIncludes: Seq[Path],
-                        defines: Map[String, String]) extends Parser with LazyLogging {
+case class ColCPPParser(
+    debugOptions: DebugOptions,
+    blameProvider: BlameProvider,
+    cc: Path,
+    systemInclude: Path,
+    otherIncludes: Seq[Path],
+    defines: Map[String, String],
+) extends Parser with LazyLogging {
 
   def interpret(input: String, output: String): Process = {
     var command = Seq(cc.toString, "-C", "-E")
@@ -43,25 +52,30 @@ case class ColCPPParser(debugOptions: DebugOptions,
 
     logger.debug(command.toString())
 
-    new ProcessBuilder(command:_*).start()
+    new ProcessBuilder(command: _*).start()
   }
 
-  override def parseReader[G](reader: Reader, baseOrigin: Origin = Origin(Nil)): ParseResult[G] = {
+  override def parseReader[G](
+      reader: Reader,
+      baseOrigin: Origin = Origin(Nil),
+  ): ParseResult[G] = {
     val interpreted = Files.createTempFile("vercors-interpreted-", ".ipp")
     try {
-      val process = interpret(
-        input = "-",
-        output = interpreted.toString
-      )
-      new Thread(() => {
-        val writer = new OutputStreamWriter(process.getOutputStream, StandardCharsets.UTF_8)
-        try {
-          val written = reader.transferTo(writer)
-          logger.debug(s"Wrote $written bytes to clang++")
-        } finally {
-          writer.close()
-        }
-      }, "[VerCors] clang stdout writer").start()
+      val process = interpret(input = "-", output = interpreted.toString)
+      new Thread(
+        () => {
+          val writer =
+            new OutputStreamWriter(
+              process.getOutputStream,
+              StandardCharsets.UTF_8,
+            )
+          try {
+            val written = reader.transferTo(writer)
+            logger.debug(s"Wrote $written bytes to clang++")
+          } finally { writer.close() }
+        },
+        "[VerCors] clang stdout writer",
+      ).start()
       process.waitFor()
 
       if (process.exitValue() != 0) {
@@ -69,14 +83,17 @@ case class ColCPPParser(debugOptions: DebugOptions,
         new InputStreamReader(process.getInputStream).transferTo(writer)
         new InputStreamReader(process.getErrorStream).transferTo(writer)
         writer.close()
-        throw PreprocessorError(baseOrigin.shortPositionText, process.exitValue(), writer.toString)
+        throw PreprocessorError(
+          baseOrigin.shortPositionText,
+          process.exitValue(),
+          writer.toString,
+        )
       }
 
       val ireadable = RWFile(interpreted, doWatch = false)
-      val result = ColIPPParser(debugOptions, blameProvider, Some(baseOrigin)).parse[G](ireadable)
+      val result = ColIPPParser(debugOptions, blameProvider, Some(baseOrigin))
+        .parse[G](ireadable)
       result
-    } finally {
-      Files.delete(interpreted)
-    }
+    } finally { Files.delete(interpreted) }
   }
 }
diff --git a/src/parsers/vct/parsers/parser/ColCParser.scala b/src/parsers/vct/parsers/parser/ColCParser.scala
index ca3aecfb82..3365186eff 100644
--- a/src/parsers/vct/parsers/parser/ColCParser.scala
+++ b/src/parsers/vct/parsers/parser/ColCParser.scala
@@ -11,24 +11,33 @@ import vct.parsers.transform.BlameProvider
 import vct.parsers.{ParseResult, Parser}
 import vct.result.VerificationError.{Unreachable, UserError}
 
-import java.io.{FileNotFoundException, InputStreamReader, OutputStreamWriter, Reader, StringWriter}
+import java.io.{
+  FileNotFoundException,
+  InputStreamReader,
+  OutputStreamWriter,
+  Reader,
+  StringWriter,
+}
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, NoSuchFileException, Path, Paths}
 
 case object CParser {
-  case class PreprocessorError(fileName: String, errorCode: Int, error: String) extends UserError {
+  case class PreprocessorError(fileName: String, errorCode: Int, error: String)
+      extends UserError {
     override def code: String = "preprocessorError"
     override def text: String =
       s"Preprocesing file $fileName failed with exit code $errorCode:\n$error"
   }
 }
 
-case class ColCParser(debugOptions: DebugOptions,
-                      blameProvider: BlameProvider,
-                      cc: Path,
-                      systemInclude: Path,
-                      otherIncludes: Seq[Path],
-                      defines: Map[String, String]) extends Parser with LazyLogging {
+case class ColCParser(
+    debugOptions: DebugOptions,
+    blameProvider: BlameProvider,
+    cc: Path,
+    systemInclude: Path,
+    otherIncludes: Seq[Path],
+    defines: Map[String, String],
+) extends Parser with LazyLogging {
   def interpret(input: String, output: String): Process = {
     var command = Seq(cc.toString, "-C", "-E")
 
@@ -42,26 +51,31 @@ case class ColCParser(debugOptions: DebugOptions,
 
     logger.debug(command.toString())
 
-    new ProcessBuilder(command:_*).start()
+    new ProcessBuilder(command: _*).start()
   }
 
-  override def parseReader[G](reader: Reader, baseOrigin: Origin = Origin(Nil)): ParseResult[G] = {
+  override def parseReader[G](
+      reader: Reader,
+      baseOrigin: Origin = Origin(Nil),
+  ): ParseResult[G] = {
     val interpreted = Files.createTempFile("vercors-interpreted-", ".i")
 
     try {
-      val process = interpret(
-        input = "-",
-        output = interpreted.toString
-      )
-      new Thread(() => {
-        val writer = new OutputStreamWriter(process.getOutputStream, StandardCharsets.UTF_8)
-        try {
-          val written = reader.transferTo(writer)
-          logger.debug(s"Wrote $written bytes to clang")
-        } finally {
-          writer.close()
-        }
-      }, "[VerCors] clang stdout writer").start()
+      val process = interpret(input = "-", output = interpreted.toString)
+      new Thread(
+        () => {
+          val writer =
+            new OutputStreamWriter(
+              process.getOutputStream,
+              StandardCharsets.UTF_8,
+            )
+          try {
+            val written = reader.transferTo(writer)
+            logger.debug(s"Wrote $written bytes to clang")
+          } finally { writer.close() }
+        },
+        "[VerCors] clang stdout writer",
+      ).start()
       process.waitFor()
 
       if (process.exitValue() != 0) {
@@ -69,14 +83,17 @@ case class ColCParser(debugOptions: DebugOptions,
         new InputStreamReader(process.getInputStream).transferTo(writer)
         new InputStreamReader(process.getErrorStream).transferTo(writer)
         writer.close()
-        throw PreprocessorError(baseOrigin.shortPositionText, process.exitValue(), writer.toString)
+        throw PreprocessorError(
+          baseOrigin.shortPositionText,
+          process.exitValue(),
+          writer.toString,
+        )
       }
 
       val ireadable = RWFile(interpreted, doWatch = false)
-      val result = ColIParser(debugOptions, blameProvider, Some(baseOrigin)).parse[G](ireadable)
+      val result = ColIParser(debugOptions, blameProvider, Some(baseOrigin))
+        .parse[G](ireadable)
       result
-    } finally {
-      Files.delete(interpreted)
-    }
+    } finally { Files.delete(interpreted) }
   }
 }
diff --git a/src/parsers/vct/parsers/parser/ColIPPParser.scala b/src/parsers/vct/parsers/parser/ColIPPParser.scala
index 83f9b68994..d3e1d76119 100644
--- a/src/parsers/vct/parsers/parser/ColIPPParser.scala
+++ b/src/parsers/vct/parsers/parser/ColIPPParser.scala
@@ -9,22 +9,40 @@ import vct.parsers.err.ParseMatchError
 import vct.parsers.transform.{BlameProvider, CPPToCol}
 import vct.parsers.{AntlrParser, ParseResult, Parser}
 
-case class ColIPPParser(debugOptions: DebugOptions, blameProvider: BlameProvider, cppOrigin: Option[Origin]) extends AntlrParser {
+case class ColIPPParser(
+    debugOptions: DebugOptions,
+    blameProvider: BlameProvider,
+    cppOrigin: Option[Origin],
+) extends AntlrParser {
   override type Parser = CPPParser
   override type Lexer = LangCPPLexer
   override type MainContext = CPPParser.TranslationUnitContext
   override type Converter[_] = CPPToCol[_]
 
-  override def newLexer(charStream: CharStream): Lexer = new LangCPPLexer(charStream)
+  override def newLexer(charStream: CharStream): Lexer =
+    new LangCPPLexer(charStream)
   override def expectedErrorChannel: Int = LangCPPLexer.EXPECTED_ERROR_CHANNEL
   override def expectedErrorStart: Int = LangCPPLexer.VAL_EXPECT_ERROR_OPEN
   override def expectedErrorEnd: Int = LangCPPLexer.VAL_EXPECT_ERROR_CLOSE
 
-  override def newParser(tokenStream: TokenStream): Parser = new CPPParser(tokenStream)
+  override def newParser(tokenStream: TokenStream): Parser =
+    new CPPParser(tokenStream)
   override def parseMain(parser: Parser): MainContext = parser.translationUnit()
 
-  override def newConverter[G](baseOrigin: Origin, expectedErrors: Seq[(Token, Token, ExpectedError)], tokenStream: TokenStream): Converter[G] =
-    CPPToCol[G](baseOrigin, blameProvider, expectedErrors, cppOrigin.map(o => (tokenStream, o)))
+  override def newConverter[G](
+      baseOrigin: Origin,
+      expectedErrors: Seq[(Token, Token, ExpectedError)],
+      tokenStream: TokenStream,
+  ): Converter[G] =
+    CPPToCol[G](
+      baseOrigin,
+      blameProvider,
+      expectedErrors,
+      cppOrigin.map(o => (tokenStream, o)),
+    )
 
-  override def mainToResult[G](converter: Converter[G], main: MainContext): Seq[GlobalDeclaration[_]] = converter.convert(main)
+  override def mainToResult[G](
+      converter: Converter[G],
+      main: MainContext,
+  ): Seq[GlobalDeclaration[_]] = converter.convert(main)
 }
diff --git a/src/parsers/vct/parsers/parser/ColIParser.scala b/src/parsers/vct/parsers/parser/ColIParser.scala
index 33f80fe2b7..9a49a220e6 100644
--- a/src/parsers/vct/parsers/parser/ColIParser.scala
+++ b/src/parsers/vct/parsers/parser/ColIParser.scala
@@ -9,23 +9,40 @@ import vct.parsers.err.ParseMatchError
 import vct.parsers.transform.{BlameProvider, CToCol}
 import vct.parsers.{AntlrParser, ParseResult, Parser}
 
-case class ColIParser(debugOptions: DebugOptions, blameProvider: BlameProvider, cOrigin: Option[Origin]) extends AntlrParser {
+case class ColIParser(
+    debugOptions: DebugOptions,
+    blameProvider: BlameProvider,
+    cOrigin: Option[Origin],
+) extends AntlrParser {
   override type Parser = CParser
   override type Lexer = LangCLexer
   override type MainContext = CParser.CompilationUnitContext
   override type Converter[_] = CToCol[_]
 
-  override def newLexer(charStream: CharStream): Lexer = new LangCLexer(charStream)
+  override def newLexer(charStream: CharStream): Lexer =
+    new LangCLexer(charStream)
   override def expectedErrorChannel: Int = LangCLexer.EXPECTED_ERROR_CHANNEL
   override def expectedErrorStart: Int = LangCLexer.VAL_EXPECT_ERROR_OPEN
   override def expectedErrorEnd: Int = LangCLexer.VAL_EXPECT_ERROR_CLOSE
 
-  override def newParser(tokenStream: TokenStream): Parser = new CParser(tokenStream)
+  override def newParser(tokenStream: TokenStream): Parser =
+    new CParser(tokenStream)
   override def parseMain(parser: Parser): MainContext = parser.compilationUnit()
 
-  override def newConverter[G](baseOrigin: Origin, expectedErrors: Seq[(Token, Token, ExpectedError)], tokenStream: TokenStream): Converter[G] =
-    CToCol(baseOrigin, blameProvider, expectedErrors, cOrigin.map(o => (tokenStream, o)))
+  override def newConverter[G](
+      baseOrigin: Origin,
+      expectedErrors: Seq[(Token, Token, ExpectedError)],
+      tokenStream: TokenStream,
+  ): Converter[G] =
+    CToCol(
+      baseOrigin,
+      blameProvider,
+      expectedErrors,
+      cOrigin.map(o => (tokenStream, o)),
+    )
 
-  override def mainToResult[G](converter: Converter[G], main: MainContext): Seq[GlobalDeclaration[_]] =
-    converter.convert(main)
+  override def mainToResult[G](
+      converter: Converter[G],
+      main: MainContext,
+  ): Seq[GlobalDeclaration[_]] = converter.convert(main)
 }
diff --git a/src/parsers/vct/parsers/parser/ColJavaParser.scala b/src/parsers/vct/parsers/parser/ColJavaParser.scala
index 31a7409fb7..c0cb9059ac 100644
--- a/src/parsers/vct/parsers/parser/ColJavaParser.scala
+++ b/src/parsers/vct/parsers/parser/ColJavaParser.scala
@@ -10,13 +10,18 @@ import vct.parsers.transform.{BlameProvider, JavaToCol}
 import vct.parsers.{AntlrParser, ParseResult, Parser}
 import hre.io.Readable
 
-case class ColJavaParser(debugOptions: DebugOptions, blameProvider: BlameProvider, specCommentsNeeded: Boolean = true) extends AntlrParser {
+case class ColJavaParser(
+    debugOptions: DebugOptions,
+    blameProvider: BlameProvider,
+    specCommentsNeeded: Boolean = true,
+) extends AntlrParser {
   override type Parser = JavaParser
   override type Lexer = LangJavaLexer
   override type MainContext = JavaParser.CompilationUnitContext
   override type Converter[_] = JavaToCol[_]
 
-  override def newLexer(charStream: CharStream): Lexer = new LangJavaLexer(charStream)
+  override def newLexer(charStream: CharStream): Lexer =
+    new LangJavaLexer(charStream)
   override def expectedErrorChannel: Int = LangJavaLexer.EXPECTED_ERROR_CHANNEL
   override def expectedErrorStart: Int = LangJavaLexer.VAL_EXPECT_ERROR_OPEN
   override def expectedErrorEnd: Int = LangJavaLexer.VAL_EXPECT_ERROR_CLOSE
@@ -24,19 +29,27 @@ case class ColJavaParser(debugOptions: DebugOptions, blameProvider: BlameProvide
   override def newParser(tokenStream: TokenStream): Parser = {
     val parser = new JavaParser(tokenStream)
 
-    if(!specCommentsNeeded)
+    if (!specCommentsNeeded)
       parser.specLevel = 1
 
     parser
   }
   override def parseMain(parser: Parser): MainContext = parser.compilationUnit()
 
-  override def newConverter[G](baseOrigin: Origin, expectedErrors: Seq[(Token, Token, ExpectedError)], tokenStream: TokenStream): Converter[G] =
-    JavaToCol[G](baseOrigin, blameProvider, expectedErrors)
+  override def newConverter[G](
+      baseOrigin: Origin,
+      expectedErrors: Seq[(Token, Token, ExpectedError)],
+      tokenStream: TokenStream,
+  ): Converter[G] = JavaToCol[G](baseOrigin, blameProvider, expectedErrors)
 
-  override def mainToResult[G](converter: Converter[G], main: JavaParser.CompilationUnitContext): Seq[GlobalDeclaration[_]] =
-    converter.convert(main)
+  override def mainToResult[G](
+      converter: Converter[G],
+      main: JavaParser.CompilationUnitContext,
+  ): Seq[GlobalDeclaration[_]] = converter.convert(main)
 
   def parseExpr[G](readable: Readable): (Expr[G], Seq[ExpectedError]) =
-    parseOrThrow[JavaParser.ExprContext, G, Expr[G]](readable)(p => p.expr(), (cv: Converter[G], e) => cv.convert(e).asInstanceOf[Expr[G]])
+    parseOrThrow[JavaParser.ExprContext, G, Expr[G]](readable)(
+      p => p.expr(),
+      (cv: Converter[G], e) => cv.convert(e).asInstanceOf[Expr[G]],
+    )
 }
diff --git a/src/parsers/vct/parsers/parser/ColLLVMContractParser.scala b/src/parsers/vct/parsers/parser/ColLLVMContractParser.scala
index 4229e0e476..dc41587e3d 100644
--- a/src/parsers/vct/parsers/parser/ColLLVMContractParser.scala
+++ b/src/parsers/vct/parsers/parser/ColLLVMContractParser.scala
@@ -11,26 +11,49 @@ import hre.io.Readable
 
 import java.io.Reader
 
-case class ColLLVMContractParser(debugOptions: DebugOptions, blameProvider: BlameProvider) extends AntlrParser {
+case class ColLLVMContractParser(
+    debugOptions: DebugOptions,
+    blameProvider: BlameProvider,
+) extends AntlrParser {
   override type Parser = LLVMSpecParser
   override type Lexer = LangLLVMSpecLexer
   override type MainContext = LLVMSpecParser.ValGlobalDeclarationContext
   override type Converter[_] = LLVMContractToCol[_]
 
-  override def newLexer(charStream: CharStream): Lexer = new LangLLVMSpecLexer(charStream)
-  override def expectedErrorChannel: Int = LangLLVMSpecLexer.EXPECTED_ERROR_CHANNEL
+  override def newLexer(charStream: CharStream): Lexer =
+    new LangLLVMSpecLexer(charStream)
+  override def expectedErrorChannel: Int =
+    LangLLVMSpecLexer.EXPECTED_ERROR_CHANNEL
   override def expectedErrorStart: Int = LangLLVMSpecLexer.VAL_EXPECT_ERROR_OPEN
   override def expectedErrorEnd: Int = LangLLVMSpecLexer.VAL_EXPECT_ERROR_CLOSE
 
-  override def newParser(tokenStream: TokenStream): Parser = new LLVMSpecParser(tokenStream)
-  override def parseMain(parser: Parser): MainContext = parser.valGlobalDeclaration()
+  override def newParser(tokenStream: TokenStream): Parser =
+    new LLVMSpecParser(tokenStream)
+  override def parseMain(parser: Parser): MainContext =
+    parser.valGlobalDeclaration()
 
-  override def newConverter[G](baseOrigin: Origin, expectedErrors: Seq[(Token, Token, ExpectedError)], tokenStream: TokenStream): Converter[G] =
+  override def newConverter[G](
+      baseOrigin: Origin,
+      expectedErrors: Seq[(Token, Token, ExpectedError)],
+      tokenStream: TokenStream,
+  ): Converter[G] =
     new LLVMContractToCol[G](baseOrigin, blameProvider, expectedErrors)
 
-  override def mainToResult[G](converter: Converter[G], main: MainContext): Seq[GlobalDeclaration[_]] =
-    Seq(converter.convert(main))
-
-  def parseFunctionContract[G](reader: Reader, baseOrigin: Origin = Origin(Nil)): (ApplicableContract[G], Seq[ExpectedError]) =
-    parseReaderOrThrow[LLVMSpecParser.ValEmbedContractContext, G, ApplicableContract[G]](reader, baseOrigin)(_.valEmbedContract(), _.convert(_).asInstanceOf[ApplicableContract[G]])
+  override def mainToResult[G](
+      converter: Converter[G],
+      main: MainContext,
+  ): Seq[GlobalDeclaration[_]] = Seq(converter.convert(main))
+
+  def parseFunctionContract[G](
+      reader: Reader,
+      baseOrigin: Origin = Origin(Nil),
+  ): (ApplicableContract[G], Seq[ExpectedError]) =
+    parseReaderOrThrow[
+      LLVMSpecParser.ValEmbedContractContext,
+      G,
+      ApplicableContract[G],
+    ](reader, baseOrigin)(
+      _.valEmbedContract(),
+      _.convert(_).asInstanceOf[ApplicableContract[G]],
+    )
 }
diff --git a/src/parsers/vct/parsers/parser/ColLLVMParser.scala b/src/parsers/vct/parsers/parser/ColLLVMParser.scala
index bd2e231b6a..98d65c25ef 100644
--- a/src/parsers/vct/parsers/parser/ColLLVMParser.scala
+++ b/src/parsers/vct/parsers/parser/ColLLVMParser.scala
@@ -17,33 +17,63 @@ import java.nio.charset.StandardCharsets
 import java.nio.file.Path
 import scala.util.{Failure, Using}
 
-case class ColLLVMParser(debugOptions: DebugOptions, blameProvider: BlameProvider, vcllvm: Path) extends Parser with LazyLogging {
-  case class LLVMParseError(fileName: String, errorCode: Int, error: String) extends UserError {
+case class ColLLVMParser(
+    debugOptions: DebugOptions,
+    blameProvider: BlameProvider,
+    vcllvm: Path,
+) extends Parser with LazyLogging {
+  case class LLVMParseError(fileName: String, errorCode: Int, error: String)
+      extends UserError {
     override def code: String = "LLVMParseError"
 
     override def text: String =
       s"[ERROR] Parsing file $fileName failed with exit code $errorCode:\n$error"
   }
 
-  override def parse[G](readable: Readable, baseOrigin: Origin = Origin(Nil)): ParseResult[G] = {
+  override def parse[G](
+      readable: Readable,
+      baseOrigin: Origin = Origin(Nil),
+  ): ParseResult[G] = {
     if (vcllvm == null) {
-      throw Unreachable("The COLLVMParser needs to be provided with the path to vcllvm to parse LLVM-IR files")
+      throw Unreachable(
+        "The COLLVMParser needs to be provided with the path to vcllvm to parse LLVM-IR files"
+      )
     }
     val command = Seq(vcllvm.toString, readable.fileName)
     val process = new ProcessBuilder(command: _*).start()
 
-    val protoProgram = Using(process.getInputStream) { is => Program.parseFrom(is) }.recoverWith {
-      case _: IOException => Failure(LLVMParseError(readable.fileName, process.exitValue(), new String(process.getErrorStream.readAllBytes(), StandardCharsets.UTF_8)))
-    }.get
+    val protoProgram =
+      Using(process.getInputStream) { is => Program.parseFrom(is) }
+        .recoverWith { case _: IOException =>
+          Failure(LLVMParseError(
+            readable.fileName,
+            process.exitValue(),
+            new String(
+              process.getErrorStream.readAllBytes(),
+              StandardCharsets.UTF_8,
+            ),
+          ))
+        }.get
 
     process.waitFor()
     if (process.exitValue() != 0) {
-      throw LLVMParseError(readable.fileName, process.exitValue(), new String(process.getErrorStream.readAllBytes(), StandardCharsets.UTF_8))
+      throw LLVMParseError(
+        readable.fileName,
+        process.exitValue(),
+        new String(
+          process.getErrorStream.readAllBytes(),
+          StandardCharsets.UTF_8,
+        ),
+      )
     }
 
-    val COLProgram = Deserialize.deserializeProgram[G](protoProgram, readable.fileName)
+    val COLProgram = Deserialize
+      .deserializeProgram[G](protoProgram, readable.fileName)
     ParseResult(COLProgram.declarations, Seq.empty)
   }
 
-  override def parseReader[G](reader: Reader, baseOrigin: Origin): ParseResult[G] = throw new UnsupportedOperationException()
+  override def parseReader[G](
+      reader: Reader,
+      baseOrigin: Origin,
+  ): ParseResult[G] = throw new UnsupportedOperationException()
 }
diff --git a/src/parsers/vct/parsers/parser/ColPVLParser.scala b/src/parsers/vct/parsers/parser/ColPVLParser.scala
index fa1d1569be..9519abeac7 100644
--- a/src/parsers/vct/parsers/parser/ColPVLParser.scala
+++ b/src/parsers/vct/parsers/parser/ColPVLParser.scala
@@ -9,23 +9,33 @@ import vct.parsers.err.ParseMatchError
 import vct.parsers.transform.{BlameProvider, PVLToCol}
 import vct.parsers.{AntlrParser, ParseResult, Parser}
 
-case class ColPVLParser(debugOptions: DebugOptions, blameProvider: BlameProvider) extends AntlrParser {
+case class ColPVLParser(
+    debugOptions: DebugOptions,
+    blameProvider: BlameProvider,
+) extends AntlrParser {
   override type Parser = PVLParser
   override type Lexer = LangPVLLexer
   override type MainContext = PVLParser.ProgramContext
   override type Converter[_] = PVLToCol[_]
 
-  override def newLexer(charStream: CharStream): Lexer = new LangPVLLexer(charStream)
+  override def newLexer(charStream: CharStream): Lexer =
+    new LangPVLLexer(charStream)
   override def expectedErrorChannel: Int = LangPVLLexer.EXPECTED_ERROR_CHANNEL
   override def expectedErrorStart: Int = LangPVLLexer.VAL_EXPECT_ERROR_OPEN
   override def expectedErrorEnd: Int = LangPVLLexer.VAL_EXPECT_ERROR_CLOSE
 
-  override def newParser(tokenStream: TokenStream): Parser = new PVLParser(tokenStream)
+  override def newParser(tokenStream: TokenStream): Parser =
+    new PVLParser(tokenStream)
   override def parseMain(parser: Parser): MainContext = parser.program()
 
-  override def newConverter[G](baseOrigin: Origin, expectedErrors: Seq[(Token, Token, ExpectedError)], tokenStream: TokenStream): Converter[G] =
-    new PVLToCol[G](baseOrigin, blameProvider, expectedErrors)
+  override def newConverter[G](
+      baseOrigin: Origin,
+      expectedErrors: Seq[(Token, Token, ExpectedError)],
+      tokenStream: TokenStream,
+  ): Converter[G] = new PVLToCol[G](baseOrigin, blameProvider, expectedErrors)
 
-  override def mainToResult[G](converter: Converter[G], main: MainContext): Seq[GlobalDeclaration[_]] =
-    converter.convert(main)
+  override def mainToResult[G](
+      converter: Converter[G],
+      main: MainContext,
+  ): Seq[GlobalDeclaration[_]] = converter.convert(main)
 }
diff --git a/src/parsers/vct/parsers/transform/BlameProvider.scala b/src/parsers/vct/parsers/transform/BlameProvider.scala
index 80910ac365..73d1316ae8 100644
--- a/src/parsers/vct/parsers/transform/BlameProvider.scala
+++ b/src/parsers/vct/parsers/transform/BlameProvider.scala
@@ -12,28 +12,42 @@ trait PositionContextProvider[T] {
     val startLineIdx = start.getLine - 1
     val startColIdx = start.getCharPositionInLine
     val endLineIdx = stop.getLine - 1
-    val endColIdx = stop.getCharPositionInLine + stop.getStopIndex - stop.getStartIndex + 1
+    val endColIdx =
+      stop.getCharPositionInLine + stop.getStopIndex - stop.getStartIndex + 1
     apply(startLineIdx, endLineIdx, Some((startColIdx, endColIdx)))
   }
 
-  def apply(startLineIdx: Int, endLineIdx: Int, cols: Option[(Int, Int)]): T = apply()
+  def apply(startLineIdx: Int, endLineIdx: Int, cols: Option[(Int, Int)]): T =
+    apply()
 
   def apply(): T
 }
 
 object OriginProvider {
-  def apply(startLineIdx: Int, endLineIdx: Int, cols: Option[(Int, Int)]): Origin =
-    Origin(Seq(PositionRange(startLineIdx, endLineIdx, cols)))
+  def apply(
+      startLineIdx: Int,
+      endLineIdx: Int,
+      cols: Option[(Int, Int)],
+  ): Origin = Origin(Seq(PositionRange(startLineIdx, endLineIdx, cols)))
 
-  def apply(origin: Origin, startLineIdx: Int, endLineIdx: Int, cols: Option[(Int, Int)]): Origin = {
-    Origin(apply(startLineIdx, endLineIdx, cols).originContents ++ origin.originContents)
+  def apply(
+      origin: Origin,
+      startLineIdx: Int,
+      endLineIdx: Int,
+      cols: Option[(Int, Int)],
+  ): Origin = {
+    Origin(
+      apply(startLineIdx, endLineIdx, cols).originContents ++
+        origin.originContents
+    )
   }
 
-  def apply(start: Token, stop: Token): Origin =  {
+  def apply(start: Token, stop: Token): Origin = {
     val startLineIdx = start.getLine - 1
     val startColIdx = start.getCharPositionInLine
     val endLineIdx = stop.getLine - 1
-    val endColIdx = stop.getCharPositionInLine + stop.getStopIndex - stop.getStartIndex + 1
+    val endColIdx =
+      stop.getCharPositionInLine + stop.getStopIndex - stop.getStartIndex + 1
     apply(startLineIdx, endLineIdx, Some((startColIdx, endColIdx)))
   }
 
@@ -46,9 +60,9 @@ object OriginProvider {
   def apply(): Origin = Origin(Seq())
 }
 
-
 trait BlameProvider extends PositionContextProvider[Blame[VerificationFailure]]
 
-case class ConstantBlameProvider(globalBlame: Blame[VerificationFailure]) extends BlameProvider {
+case class ConstantBlameProvider(globalBlame: Blame[VerificationFailure])
+    extends BlameProvider {
   override def apply(): Blame[VerificationFailure] = globalBlame
 }
diff --git a/src/parsers/vct/parsers/transform/CPPToCol.scala b/src/parsers/vct/parsers/transform/CPPToCol.scala
index 2fef4b5dce..01c9c4b054 100644
--- a/src/parsers/vct/parsers/transform/CPPToCol.scala
+++ b/src/parsers/vct/parsers/transform/CPPToCol.scala
@@ -19,12 +19,12 @@ import scala.jdk.CollectionConverters._
 import scala.util.Try
 
 @nowarn("msg=match may not be exhaustive&msg=Some\\(")
-case class CPPToCol[G](override val baseOrigin: Origin,
-                       override val blameProvider: BlameProvider,
-                       override val errors: Seq[(Token, Token, ExpectedError)],
-                       val cppOrigin: Option[(TokenStream, Origin)],
-                      )
-  extends ToCol(baseOrigin, blameProvider, errors) {
+case class CPPToCol[G](
+    override val baseOrigin: Origin,
+    override val blameProvider: BlameProvider,
+    override val errors: Seq[(Token, Token, ExpectedError)],
+    val cppOrigin: Option[(TokenStream, Origin)],
+) extends ToCol(baseOrigin, blameProvider, errors) {
 
   override implicit def origin(implicit node: ParserRuleContext): Origin =
     cppOrigin match {
@@ -34,28 +34,32 @@ case class CPPToCol[G](override val baseOrigin: Origin,
         val interpretedOrigin = baseOrigin.withContent(pos)
         val startOffset = getLineOffset(indicatorStream, pos.startLineIdx)
         val endOffset = getLineOffset(indicatorStream, pos.endLineIdx)
-        val posCOrigin = Try((startOffset.get, endOffset.get)).toOption.fold(cOrigin) {
-          case (startOffset, endOffset) =>
-            cOrigin.withContent(PositionRange(
-              pos.startLineIdx + startOffset,
-              pos.endLineIdx + endOffset,
-              startEndColIdx = None
-            ))
-        }
+        val posCOrigin =
+          Try((startOffset.get, endOffset.get)).toOption.fold(cOrigin) {
+            case (startOffset, endOffset) =>
+              cOrigin.withContent(PositionRange(
+                pos.startLineIdx + startOffset,
+                pos.endLineIdx + endOffset,
+                startEndColIdx = None,
+              ))
+          }
 
         Origin(interpretedOrigin.originContents ++ posCOrigin.originContents)
     }
 
-  private def getLineOffset(indicatorStream: TokenStream, lineIdx: Int): Option[Int] = {
-    val firstTokenAtOrPastLine =
-      (0 until indicatorStream.size())
-        .find(i => indicatorStream.get(i).getLine - 1 >= lineIdx)
-        .getOrElse(return None)
+  private def getLineOffset(
+      indicatorStream: TokenStream,
+      lineIdx: Int,
+  ): Option[Int] = {
+    val firstTokenAtOrPastLine = (0 until indicatorStream.size())
+      .find(i => indicatorStream.get(i).getLine - 1 >= lineIdx)
+      .getOrElse(return None)
 
     for (tokIdx <- firstTokenAtOrPastLine to 0 by -1) {
       val markerToken = indicatorStream.get(tokIdx)
       if (markerToken.getChannel == LangCPPLexer.LINE_DIRECTIVE_CHANNEL) {
-        val lineDirectiveLine = Integer.parseInt(markerToken.getText.split(' ')(1))
+        val lineDirectiveLine = Integer
+          .parseInt(markerToken.getText.split(' ')(1))
         val tokenLine = markerToken.getLine
         return Some(lineDirectiveLine - tokenLine - 1)
       }
@@ -67,494 +71,697 @@ case class CPPToCol[G](override val baseOrigin: Origin,
   private var prependNamespace: Boolean = true
   private val currentNamespacePath: mutable.Stack[String] = mutable.Stack()
 
-  private def getPrependedNameDeclarator(declarator: CPPDeclarator[G])(implicit o: Origin): CPPDeclarator[G] = {
+  private def getPrependedNameDeclarator(
+      declarator: CPPDeclarator[G]
+  )(implicit o: Origin): CPPDeclarator[G] = {
     if (prependNamespace) {
       declarator match {
-        case decl: CPPTypedFunctionDeclarator[G] => CPPTypedFunctionDeclarator[G](decl.params, decl.varargs, getPrependedNameDeclarator(decl.inner))
-        case CPPName(name) => CPPName[G]((currentNamespacePath.reverse :+ name).mkString("::"))
+        case decl: CPPTypedFunctionDeclarator[G] =>
+          CPPTypedFunctionDeclarator[G](
+            decl.params,
+            decl.varargs,
+            getPrependedNameDeclarator(decl.inner),
+          )
+        case CPPName(name) =>
+          CPPName[G]((currentNamespacePath.reverse :+ name).mkString("::"))
         case _ => declarator
       }
-    } else {
-      declarator
-    }
+    } else { declarator }
   }
 
-  def convert(implicit unit: TranslationUnitContext): Seq[GlobalDeclaration[G]] = unit match {
-    case TranslationUnit0(maybeDeclSeq, _) => Seq(new CPPTranslationUnit(maybeDeclSeq.toSeq.flatMap(convert(_))))
-  }
+  def convert(
+      implicit unit: TranslationUnitContext
+  ): Seq[GlobalDeclaration[G]] =
+    unit match {
+      case TranslationUnit0(maybeDeclSeq, _) =>
+        Seq(new CPPTranslationUnit(maybeDeclSeq.toSeq.flatMap(convert(_))))
+    }
 
-  def convert(implicit declSeq: DeclarationseqContext): Seq[GlobalDeclaration[G]] = declSeq match {
-    case Declarationseq0(decl, _) => convert(decl)
-    case Declarationseq1(declSeq, decl, _) => convert(declSeq) ++ convert(decl)
-  }
+  def convert(
+      implicit declSeq: DeclarationseqContext
+  ): Seq[GlobalDeclaration[G]] =
+    declSeq match {
+      case Declarationseq0(decl, _) => convert(decl)
+      case Declarationseq1(declSeq, decl, _) =>
+        convert(declSeq) ++ convert(decl)
+    }
 
   // Only support block declarations, function declarations, namespace declarations, empty declarations, and VerCors global declarations
-  def convert(implicit decl: DeclarationContext): Seq[GlobalDeclaration[G]] = decl match {
-    case Declaration0(funcDecl) => Seq(convert(funcDecl))
-    case Declaration1(blockDecl) => Seq(new CPPGlobalDeclaration(convert(blockDecl)))
-    case Declaration2(templateDecl) => ??(templateDecl)
-    case Declaration3(explicitInst) => ??(explicitInst)
-    case Declaration4(explicitSpec) => ??(explicitSpec)
-    case Declaration5(linkageSpec) => ??(linkageSpec)
-    case Declaration6(namespaceDecl) => convert(namespaceDecl)
-    case Declaration7(_) => Seq()
-    case Declaration8(attrDecl) => ??(attrDecl)
-    case Declaration9(globalSpecDecl) => convert(globalSpecDecl)
-  }
+  def convert(implicit decl: DeclarationContext): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case Declaration0(funcDecl) => Seq(convert(funcDecl))
+      case Declaration1(blockDecl) =>
+        Seq(new CPPGlobalDeclaration(convert(blockDecl)))
+      case Declaration2(templateDecl) => ??(templateDecl)
+      case Declaration3(explicitInst) => ??(explicitInst)
+      case Declaration4(explicitSpec) => ??(explicitSpec)
+      case Declaration5(linkageSpec) => ??(linkageSpec)
+      case Declaration6(namespaceDecl) => convert(namespaceDecl)
+      case Declaration7(_) => Seq()
+      case Declaration8(attrDecl) => ??(attrDecl)
+      case Declaration9(globalSpecDecl) => convert(globalSpecDecl)
+    }
 
   // Do not support inline and unnamed namespaces
-  def convert(implicit nsDef: NamespaceDefinitionContext): Seq[GlobalDeclaration[G]] = nsDef match {
-    case NamespaceDefinition0(None, _, Some(name), _, maybeBody, _) => {
-      val nameStr = convert(name)
-      currentNamespacePath.push(nameStr)
-      val result = maybeBody.toSeq.flatMap(convert(_))
-      currentNamespacePath.pop()
-      result
-    }
-    case NamespaceDefinition0(_, _, _, _, _, _) => ??(nsDef)
-  }
+  def convert(
+      implicit nsDef: NamespaceDefinitionContext
+  ): Seq[GlobalDeclaration[G]] =
+    nsDef match {
+      case NamespaceDefinition0(None, _, Some(name), _, maybeBody, _) => {
+        val nameStr = convert(name)
+        currentNamespacePath.push(nameStr)
+        val result = maybeBody.toSeq.flatMap(convert(_))
+        currentNamespacePath.pop()
+        result
+      }
+      case NamespaceDefinition0(_, _, _, _, _, _) => ??(nsDef)
+    }
 
   // Not supporting attribute specifiers and virtual specifiers
-  def convert(implicit funcDef: FunctionDefinitionContext): CPPFunctionDefinition[G] = funcDef match {
-    case FunctionDefinition0(maybeContract, None, maybeDeclSpecs, declarator, None, body) =>
-      val convertedDeclarator = getPrependedNameDeclarator(convert(declarator))
-      prependNamespace = false
-      val converted = withContract(maybeContract, contract =>
-        new CPPFunctionDefinition(contract.consumeApplicableContract(blame(funcDef)), maybeDeclSpecs.toSeq.flatMap(convert(_)), convertedDeclarator, convert(body))(blame(funcDef))
-      )
-      prependNamespace = true
-      converted
-    case FunctionDefinition0(_, _, _, _, _, _) => ??(funcDef)
-  }
+  def convert(
+      implicit funcDef: FunctionDefinitionContext
+  ): CPPFunctionDefinition[G] =
+    funcDef match {
+      case FunctionDefinition0(
+            maybeContract,
+            None,
+            maybeDeclSpecs,
+            declarator,
+            None,
+            body,
+          ) =>
+        val convertedDeclarator = getPrependedNameDeclarator(
+          convert(declarator)
+        )
+        prependNamespace = false
+        val converted = withContract(
+          maybeContract,
+          contract =>
+            new CPPFunctionDefinition(
+              contract.consumeApplicableContract(blame(funcDef)),
+              maybeDeclSpecs.toSeq.flatMap(convert(_)),
+              convertedDeclarator,
+              convert(body),
+            )(blame(funcDef)),
+        )
+        prependNamespace = true
+        converted
+      case FunctionDefinition0(_, _, _, _, _, _) => ??(funcDef)
+    }
 
   // Not supporting try blocks, '= default;', '= delete;', and constructor initializer ': name1, name2'
-  def convert(implicit funcBody: FunctionBodyContext): Statement[G] = funcBody match {
-    case FunctionBody0(None, compoundStmnt) => convert(compoundStmnt)
-    case FunctionBody0(_, _) => ??(funcBody)
-    case FunctionBody1(_) => ??(funcBody)
-    case FunctionBody2(_, _, _) => ??(funcBody)
-  }
+  def convert(implicit funcBody: FunctionBodyContext): Statement[G] =
+    funcBody match {
+      case FunctionBody0(None, compoundStmnt) => convert(compoundStmnt)
+      case FunctionBody0(_, _) => ??(funcBody)
+      case FunctionBody1(_) => ??(funcBody)
+      case FunctionBody2(_, _, _) => ??(funcBody)
+    }
 
-  def convert(implicit compoundStmnt: CompoundStatementContext): Statement[G] = compoundStmnt match {
-    case CompoundStatement0(_, None, _) => Scope(Nil, CPPLifetimeScope(Block(Seq())))
-    case CompoundStatement0(_, Some(stmntSeq), _) => Scope(Nil, CPPLifetimeScope(Block(convert(stmntSeq))))
-  }
+  def convert(implicit compoundStmnt: CompoundStatementContext): Statement[G] =
+    compoundStmnt match {
+      case CompoundStatement0(_, None, _) =>
+        Scope(Nil, CPPLifetimeScope(Block(Seq())))
+      case CompoundStatement0(_, Some(stmntSeq), _) =>
+        Scope(Nil, CPPLifetimeScope(Block(convert(stmntSeq))))
+    }
 
-  def convert(implicit stmntSeq: StatementSeqContext): Seq[Statement[G]] = stmntSeq match {
-    case StatementSeq0(stmnts) => stmnts.map(convert(_))
-  }
+  def convert(implicit stmntSeq: StatementSeqContext): Seq[Statement[G]] =
+    stmntSeq match { case StatementSeq0(stmnts) => stmnts.map(convert(_)) }
 
   // Do not support labeled statements and attribute specifiers before them
-  def convert(implicit stmnt: StatementContext): Statement[G] = stmnt match {
-    case Statement0(None, stmnt2) => convert(stmnt2)
-    case Statement1(blockDecl) => CPPDeclarationStatement(new CPPLocalDeclaration(convert(blockDecl)))
-    case Statement2(labeledStmnt) => ??(labeledStmnt)
-  }
+  def convert(implicit stmnt: StatementContext): Statement[G] =
+    stmnt match {
+      case Statement0(None, stmnt2) => convert(stmnt2)
+      case Statement1(blockDecl) =>
+        CPPDeclarationStatement(new CPPLocalDeclaration(convert(blockDecl)))
+      case Statement2(labeledStmnt) => ??(labeledStmnt)
+    }
 
   // Do not support try blocks
-  def convert(implicit stmnt: StatementTwoContext): Statement[G] = stmnt match {
-    case StatementTwo0(exprStmnt) => convert(exprStmnt)
-    case StatementTwo1(compoundStmnt) => convert(compoundStmnt)
-    case StatementTwo2(selectionStmnt) => convert(selectionStmnt)
-    case StatementTwo3(iterStmnt) => convert(iterStmnt)
-    case StatementTwo4(jumpStmnt) => convert(jumpStmnt)
-    case StatementTwo5(tryBlock) => ??(tryBlock)
-    case StatementTwo6(embedStat) => convert(embedStat)
-    case StatementTwo7(valStat) => convert(valStat)
-  }
+  def convert(implicit stmnt: StatementTwoContext): Statement[G] =
+    stmnt match {
+      case StatementTwo0(exprStmnt) => convert(exprStmnt)
+      case StatementTwo1(compoundStmnt) => convert(compoundStmnt)
+      case StatementTwo2(selectionStmnt) => convert(selectionStmnt)
+      case StatementTwo3(iterStmnt) => convert(iterStmnt)
+      case StatementTwo4(jumpStmnt) => convert(jumpStmnt)
+      case StatementTwo5(tryBlock) => ??(tryBlock)
+      case StatementTwo6(embedStat) => convert(embedStat)
+      case StatementTwo7(valStat) => convert(valStat)
+    }
 
   // Do not support asm definitions, namespace alias definitions, using declarations and directives,
   // static assert declarations, alias declarations, and opaque enum declarations
-  def convert(implicit blockDecl: BlockDeclarationContext): CPPDeclaration[G] = blockDecl match {
-    case BlockDeclaration0(simpleDecl) => convert(simpleDecl)
-    case BlockDeclaration1(decl) => ??(decl)
-    case BlockDeclaration2(decl) => ??(decl)
-    case BlockDeclaration3(decl) => ??(decl)
-    case BlockDeclaration4(decl) => ??(decl)
-    case BlockDeclaration5(decl) => ??(decl)
-    case BlockDeclaration6(decl) => ??(decl)
-    case BlockDeclaration7(decl) => ??(decl)
-  }
+  def convert(implicit blockDecl: BlockDeclarationContext): CPPDeclaration[G] =
+    blockDecl match {
+      case BlockDeclaration0(simpleDecl) => convert(simpleDecl)
+      case BlockDeclaration1(decl) => ??(decl)
+      case BlockDeclaration2(decl) => ??(decl)
+      case BlockDeclaration3(decl) => ??(decl)
+      case BlockDeclaration4(decl) => ??(decl)
+      case BlockDeclaration5(decl) => ??(decl)
+      case BlockDeclaration6(decl) => ??(decl)
+      case BlockDeclaration7(decl) => ??(decl)
+    }
 
   // Not supporting attribute specifiers
-  def convert(implicit simpleDecl: SimpleDeclarationContext): CPPDeclaration[G] = simpleDecl match {
-    case SimpleDeclaration0(maybeContract, declSpecs, maybeInits, _) =>
-      var convertedInits: Seq[CPPInit[G]] = Nil
-      if (maybeInits.isDefined) {
-        convert(maybeInits.get).foreach(init => {
-          if (currentNamespacePath.nonEmpty && prependNamespace && !init.decl.isInstanceOf[CPPTypedFunctionDeclarator[G]]) {
-            // Only allow method declarations inside a namespace
-            ??(simpleDecl)
-          }
-          convertedInits = convertedInits :+ CPPInit(getPrependedNameDeclarator(init.decl), init.init)
-        })
-      }
-      withContract(maybeContract, contract =>
-        new CPPDeclaration[G](contract.consumeApplicableContract(blame(simpleDecl)),
-          specs = convert(declSpecs), inits = convertedInits)
-      )
-    case SimpleDeclaration0(_, _, _, _) => ??(simpleDecl)
-    case SimpleDeclaration1(_, _, _, _, _) => ??(simpleDecl)
-  }
+  def convert(
+      implicit simpleDecl: SimpleDeclarationContext
+  ): CPPDeclaration[G] =
+    simpleDecl match {
+      case SimpleDeclaration0(maybeContract, declSpecs, maybeInits, _) =>
+        var convertedInits: Seq[CPPInit[G]] = Nil
+        if (maybeInits.isDefined) {
+          convert(maybeInits.get).foreach(init => {
+            if (
+              currentNamespacePath.nonEmpty && prependNamespace &&
+              !init.decl.isInstanceOf[CPPTypedFunctionDeclarator[G]]
+            ) {
+              // Only allow method declarations inside a namespace
+              ??(simpleDecl)
+            }
+            convertedInits =
+              convertedInits :+
+                CPPInit(getPrependedNameDeclarator(init.decl), init.init)
+          })
+        }
+        withContract(
+          maybeContract,
+          contract =>
+            new CPPDeclaration[G](
+              contract.consumeApplicableContract(blame(simpleDecl)),
+              specs = convert(declSpecs),
+              inits = convertedInits,
+            ),
+        )
+      case SimpleDeclaration0(_, _, _, _) => ??(simpleDecl)
+      case SimpleDeclaration1(_, _, _, _, _) => ??(simpleDecl)
+    }
 
-  def convert(implicit exprStmnt: ExpressionStatementContext): Statement[G] = exprStmnt match {
-    case ExpressionStatement0(None, _) => Block(Nil)
-    case ExpressionStatement0(Some(expr), _) => Block(convert(expr).map(Eval(_)))
-  }
+  def convert(implicit exprStmnt: ExpressionStatementContext): Statement[G] =
+    exprStmnt match {
+      case ExpressionStatement0(None, _) => Block(Nil)
+      case ExpressionStatement0(Some(expr), _) =>
+        Block(convert(expr).map(Eval(_)))
+    }
 
-  def convert(implicit exprs: OneOrMoreExpressionsContext): Seq[Expr[G]] = exprs match {
-    case OneOrMoreExpressions0(expr, _, moreExprs) => convert(expr) +: convert(moreExprs)
-    case OneOrMoreExpressions1(expr) => Seq(convert(expr))
-  }
+  def convert(implicit exprs: OneOrMoreExpressionsContext): Seq[Expr[G]] =
+    exprs match {
+      case OneOrMoreExpressions0(expr, _, moreExprs) =>
+        convert(expr) +: convert(moreExprs)
+      case OneOrMoreExpressions1(expr) => Seq(convert(expr))
+    }
 
-  def convert(implicit expr: ExpressionContext): Expr[G] = expr match {
-    case Expression0(pre, inner, post) => convertEmbedWith(pre, convertEmbedThen (post, convert(inner)))
-    case Expression1(assignmentExpr) => convert(assignmentExpr)
-    case Expression2(_) => ??(expr)
-  }
+  def convert(implicit expr: ExpressionContext): Expr[G] =
+    expr match {
+      case Expression0(pre, inner, post) =>
+        convertEmbedWith(pre, convertEmbedThen(post, convert(inner)))
+      case Expression1(assignmentExpr) => convert(assignmentExpr)
+      case Expression2(_) => ??(expr)
+    }
 
   // Do not support switch statement
-  def convert(implicit selectionStmnt: SelectionStatementContext): Statement[G] = selectionStmnt match {
-    case SelectionStatement0(ifStmnt) => convert(ifStmnt)
-    case SelectionStatement1(_) => ??(selectionStmnt)
-  }
+  def convert(
+      implicit selectionStmnt: SelectionStatementContext
+  ): Statement[G] =
+    selectionStmnt match {
+      case SelectionStatement0(ifStmnt) => convert(ifStmnt)
+      case SelectionStatement1(_) => ??(selectionStmnt)
+    }
 
-  def convert(implicit ifStmnt: IfStatementContext): Statement[G] = ifStmnt match {
-    case IfStatement0(_, _, cond, _, whenTrue, _, whenFalse) => Branch(Seq((convert(cond), convert(whenTrue)), (tt, convert(whenFalse))))
-    case IfStatement1(_, _, cond, _, whenTrue) => Branch(Seq((convert(cond), convert(whenTrue))))
-  }
+  def convert(implicit ifStmnt: IfStatementContext): Statement[G] =
+    ifStmnt match {
+      case IfStatement0(_, _, cond, _, whenTrue, _, whenFalse) =>
+        Branch(
+          Seq((convert(cond), convert(whenTrue)), (tt, convert(whenFalse)))
+        )
+      case IfStatement1(_, _, cond, _, whenTrue) =>
+        Branch(Seq((convert(cond), convert(whenTrue))))
+    }
 
   // Do not support do-while loops, 'for(item : list) {}' and expression instead of declaration in a for-loop
-  def convert(implicit iterStmnt: IterationStatementContext): Statement[G] = iterStmnt match {
-    case IterationStatement0(contract1, _, _, cond, _, contract2, body) => withContract(contract1, contract2, c => {
-      Scope(Nil, Loop[G](Block(Nil), convert(cond), Block(Nil), c.consumeLoopContract(iterStmnt), CPPLifetimeScope(convert(body))))
-    })
-    case IterationStatement1(_, _, _, _, _, _, _) => ??(iterStmnt)
-    case IterationStatement2(contract1, _, _, init, cond, _, update, _, contract2, body) =>
-      val loopInit = init match {
-        case ForInitStatement0(expr) => convert(expr)
-        case ForInitStatement1(simpleDecl) => CPPDeclarationStatement(new CPPLocalDeclaration(convert(simpleDecl)))
-      }
-      withContract(contract1, contract2, c => {
-        Scope(Nil, Loop[G](
-          loopInit,
-          cond.map(convert(_)).getOrElse(tt),
-          evalOrNop(update),
-          c.consumeLoopContract(iterStmnt),
-          CPPLifetimeScope(convert(body))
-        ))
-      })
-    case IterationStatement2(_, _, _, _, _, _, _, _, _, _) => ??(iterStmnt)
-    case IterationStatement3(_, _, _, _, _, _, _, _, _) => ??(iterStmnt)
-  }
+  def convert(implicit iterStmnt: IterationStatementContext): Statement[G] =
+    iterStmnt match {
+      case IterationStatement0(contract1, _, _, cond, _, contract2, body) =>
+        withContract(
+          contract1,
+          contract2,
+          c => {
+            Scope(
+              Nil,
+              Loop[G](
+                Block(Nil),
+                convert(cond),
+                Block(Nil),
+                c.consumeLoopContract(iterStmnt),
+                CPPLifetimeScope(convert(body)),
+              ),
+            )
+          },
+        )
+      case IterationStatement1(_, _, _, _, _, _, _) => ??(iterStmnt)
+      case IterationStatement2(
+            contract1,
+            _,
+            _,
+            init,
+            cond,
+            _,
+            update,
+            _,
+            contract2,
+            body,
+          ) =>
+        val loopInit =
+          init match {
+            case ForInitStatement0(expr) => convert(expr)
+            case ForInitStatement1(simpleDecl) =>
+              CPPDeclarationStatement(
+                new CPPLocalDeclaration(convert(simpleDecl))
+              )
+          }
+        withContract(
+          contract1,
+          contract2,
+          c => {
+            Scope(
+              Nil,
+              Loop[G](
+                loopInit,
+                cond.map(convert(_)).getOrElse(tt),
+                evalOrNop(update),
+                c.consumeLoopContract(iterStmnt),
+                CPPLifetimeScope(convert(body)),
+              ),
+            )
+          },
+        )
+      case IterationStatement2(_, _, _, _, _, _, _, _, _, _) => ??(iterStmnt)
+      case IterationStatement3(_, _, _, _, _, _, _, _, _) => ??(iterStmnt)
+    }
 
   // Do not support goto or return of a bracedInitList or multiple expressions
-  def convert(implicit jumpStmnt: JumpStatementContext): Statement[G] = jumpStmnt match {
-    case JumpStatement0(_, _) => col.Break(None)
-    case JumpStatement1(_, _) => col.Continue(None)
-    case JumpStatement2(_, expr, _) => convert(expr) match {
-      case Seq(e) => col.Return(e)
-      case _ => ??(jumpStmnt)
-    }
-    case JumpStatement3(_, _, _) => ??(jumpStmnt)
-    case JumpStatement4(_, _) => col.Return(col.Void())
-    case JumpStatement5(_, _, _) => ??(jumpStmnt)
-  }
+  def convert(implicit jumpStmnt: JumpStatementContext): Statement[G] =
+    jumpStmnt match {
+      case JumpStatement0(_, _) => col.Break(None)
+      case JumpStatement1(_, _) => col.Continue(None)
+      case JumpStatement2(_, expr, _) =>
+        convert(expr) match {
+          case Seq(e) => col.Return(e)
+          case _ => ??(jumpStmnt)
+        }
+      case JumpStatement3(_, _, _) => ??(jumpStmnt)
+      case JumpStatement4(_, _) => col.Return(col.Void())
+      case JumpStatement5(_, _, _) => ??(jumpStmnt)
+    }
 
   // Do not support assignments in condition or multiple expressions
-  def convert(implicit cond: ConditionContext): Expr[G] = cond match {
-    case Condition0(expr) => convert(expr) match {
-      case Seq(e) => e
-      case _ => ??(cond)
+  def convert(implicit cond: ConditionContext): Expr[G] =
+    cond match {
+      case Condition0(expr) =>
+        convert(expr) match {
+          case Seq(e) => e
+          case _ => ??(cond)
+        }
+      case _: Condition1Context => ??(cond)
     }
-    case _: Condition1Context => ??(cond)
-  }
 
   // Do not support throw expression
-  def convert(implicit expr: AssignmentExpressionContext): Expr[G] = expr match {
-    case AssignmentExpression0(pre, targetNode, op, valueNode, post) =>
-      val e = convert(op, targetNode, valueNode, expr)
-      convertEmbedWith(pre, convertEmbedThen(post, e))
-  }
+  def convert(implicit expr: AssignmentExpressionContext): Expr[G] =
+    expr match {
+      case AssignmentExpression0(pre, targetNode, op, valueNode, post) =>
+        val e = convert(op, targetNode, valueNode, expr)
+        convertEmbedWith(pre, convertEmbedThen(post, e))
+    }
 
   // Do not support bit operators
-  def convert(op: AssignmentOperatorContext, targetNode: PointerMemberExpressionContext, valueNode: InitializerClauseContext, expr: AssignmentExpressionContext)(implicit o: Origin): Expr[G] = {
+  def convert(
+      op: AssignmentOperatorContext,
+      targetNode: PointerMemberExpressionContext,
+      valueNode: InitializerClauseContext,
+      expr: AssignmentExpressionContext,
+  )(implicit o: Origin): Expr[G] = {
     val target = convert(targetNode)
     val value = convert(valueNode)
-    PreAssignExpression(target, op match {
-      case AssignmentOperator0(_) => value
-      case AssignmentOperator1(_) => AmbiguousMult(target, value)
-      case AssignmentOperator2(_) => AmbiguousTruncDiv(target, value)(blame(expr))
-      case AssignmentOperator3(_) => AmbiguousTruncMod(target, value)(blame(expr))
-      case AssignmentOperator4(_) => col.AmbiguousPlus(target, value)(blame(valueNode))
-      case AssignmentOperator5(_) => col.AmbiguousMinus(target, value)(blame(valueNode))
-      case _ => ??(op)
-    })(blame(expr))
+    PreAssignExpression(
+      target,
+      op match {
+        case AssignmentOperator0(_) => value
+        case AssignmentOperator1(_) => AmbiguousMult(target, value)
+        case AssignmentOperator2(_) =>
+          AmbiguousTruncDiv(target, value)(blame(expr))
+        case AssignmentOperator3(_) =>
+          AmbiguousTruncMod(target, value)(blame(expr))
+        case AssignmentOperator4(_) =>
+          col.AmbiguousPlus(target, value)(blame(valueNode))
+        case AssignmentOperator5(_) =>
+          col.AmbiguousMinus(target, value)(blame(valueNode))
+        case _ => ??(op)
+      },
+    )(blame(expr))
   }
 
   // Do not support multiple expressions
-  def convert(implicit expr: ConditionalExpressionContext): Expr[G] = expr match {
-    case ConditionalExpression0(inner) => convert(inner)
-    case ConditionalExpression1(cond, _, whenTrue, _, whenFalse) => convert(whenTrue) match {
-      case Seq(e) => Select(convert(cond), e, convert(whenFalse))
-      case _ => ??(expr)
+  def convert(implicit expr: ConditionalExpressionContext): Expr[G] =
+    expr match {
+      case ConditionalExpression0(inner) => convert(inner)
+      case ConditionalExpression1(cond, _, whenTrue, _, whenFalse) =>
+        convert(whenTrue) match {
+          case Seq(e) => Select(convert(cond), e, convert(whenFalse))
+          case _ => ??(expr)
+        }
     }
-  }
 
-  def convert(implicit expr: ImplicationExpressionContext): Expr[G] = expr match {
-    case ImplicationExpression0(inner) => convert(inner)
-    case ImplicationExpression1(left, op, right) => convert(op, convert(left), convert(right))
-  }
+  def convert(implicit expr: ImplicationExpressionContext): Expr[G] =
+    expr match {
+      case ImplicationExpression0(inner) => convert(inner)
+      case ImplicationExpression1(left, op, right) =>
+        convert(op, convert(left), convert(right))
+    }
 
-  def convert(op: ImplicationOpContext, left: Expr[G], right: Expr[G])(implicit o: Origin): Expr[G] = op match {
-    case ImplicationOp0(ValImpOp0(_)) => Wand(left, right)
-    case ImplicationOp0(ValImpOp1(_)) => Implies(left, right)
-  }
+  def convert(op: ImplicationOpContext, left: Expr[G], right: Expr[G])(
+      implicit o: Origin
+  ): Expr[G] =
+    op match {
+      case ImplicationOp0(ValImpOp0(_)) => Wand(left, right)
+      case ImplicationOp0(ValImpOp1(_)) => Implies(left, right)
+    }
 
-  def convert(implicit expr: LogicalOrExpressionContext): Expr[G] = expr match {
-    case LogicalOrExpression0(inner) => convert(inner)
-    case LogicalOrExpression1(left, _, right) => AmbiguousOr(convert(left), convert(right))
-  }
+  def convert(implicit expr: LogicalOrExpressionContext): Expr[G] =
+    expr match {
+      case LogicalOrExpression0(inner) => convert(inner)
+      case LogicalOrExpression1(left, _, right) =>
+        AmbiguousOr(convert(left), convert(right))
+    }
 
-  def convert(implicit expr: LogicalAndExpressionContext): Expr[G] = expr match {
-    case LogicalAndExpression0(inner) => convert(inner)
-    case LogicalAndExpression1(left, op, right) => op match {
-      case LogicalAndOp0(_) => col.And(convert(left), convert(right))
-      case LogicalAndOp1(valOp) => convert(expr, valOp, convert(left), convert(right))
+  def convert(implicit expr: LogicalAndExpressionContext): Expr[G] =
+    expr match {
+      case LogicalAndExpression0(inner) => convert(inner)
+      case LogicalAndExpression1(left, op, right) =>
+        op match {
+          case LogicalAndOp0(_) => col.And(convert(left), convert(right))
+          case LogicalAndOp1(valOp) =>
+            convert(expr, valOp, convert(left), convert(right))
+        }
     }
-  }
 
-  def convert(implicit expr: InclusiveOrExpressionContext): Expr[G] = expr match {
-    case InclusiveOrExpression0(inner) => convert(inner)
-    case InclusiveOrExpression1(left, _, right) => BitOr(convert(left), convert(right))
-  }
+  def convert(implicit expr: InclusiveOrExpressionContext): Expr[G] =
+    expr match {
+      case InclusiveOrExpression0(inner) => convert(inner)
+      case InclusiveOrExpression1(left, _, right) =>
+        BitOr(convert(left), convert(right))
+    }
 
-  def convert(implicit expr: ExclusiveOrExpressionContext): Expr[G] = expr match {
-    case ExclusiveOrExpression0(inner) => convert(inner)
-    case ExclusiveOrExpression1(left, _, right) => BitXor(convert(left), convert(right))
-  }
+  def convert(implicit expr: ExclusiveOrExpressionContext): Expr[G] =
+    expr match {
+      case ExclusiveOrExpression0(inner) => convert(inner)
+      case ExclusiveOrExpression1(left, _, right) =>
+        BitXor(convert(left), convert(right))
+    }
 
-  def convert(implicit expr: AndExpressionContext): Expr[G] = expr match {
-    case AndExpression0(inner) => convert(inner)
-    case AndExpression1(left, _, right) => BitAnd(convert(left), convert(right))
-  }
+  def convert(implicit expr: AndExpressionContext): Expr[G] =
+    expr match {
+      case AndExpression0(inner) => convert(inner)
+      case AndExpression1(left, _, right) =>
+        BitAnd(convert(left), convert(right))
+    }
 
-  def convert(implicit expr: EqualityExpressionContext): Expr[G] = expr match {
-    case EqualityExpression0(inner) => convert(inner)
-    case EqualityExpression1(left, _, right) => AmbiguousEq(convert(left), convert(right), TCInt())
-    case EqualityExpression2(left, _, right) => AmbiguousNeq(convert(left), convert(right), TCInt())
-  }
+  def convert(implicit expr: EqualityExpressionContext): Expr[G] =
+    expr match {
+      case EqualityExpression0(inner) => convert(inner)
+      case EqualityExpression1(left, _, right) =>
+        AmbiguousEq(convert(left), convert(right), TCInt())
+      case EqualityExpression2(left, _, right) =>
+        AmbiguousNeq(convert(left), convert(right), TCInt())
+    }
 
-  def convert(implicit expr: RelationalExpressionContext): Expr[G] = expr match {
-    case RelationalExpression0(inner) => convert(inner)
-    case RelationalExpression1(left, RelationalOp0(op), right) => op match {
-      case "<" => col.AmbiguousLess(convert(left), convert(right))
-      case ">" => col.AmbiguousGreater(convert(left), convert(right))
-      case "<=" => AmbiguousLessEq(convert(left), convert(right))
-      case ">=" => AmbiguousGreaterEq(convert(left), convert(right))
+  def convert(implicit expr: RelationalExpressionContext): Expr[G] =
+    expr match {
+      case RelationalExpression0(inner) => convert(inner)
+      case RelationalExpression1(left, RelationalOp0(op), right) =>
+        op match {
+          case "<" => col.AmbiguousLess(convert(left), convert(right))
+          case ">" => col.AmbiguousGreater(convert(left), convert(right))
+          case "<=" => AmbiguousLessEq(convert(left), convert(right))
+          case ">=" => AmbiguousGreaterEq(convert(left), convert(right))
+        }
+      case RelationalExpression1(left, RelationalOp1(specOp), right) =>
+        convert(expr, specOp, convert(left), convert(right))
     }
-    case RelationalExpression1(left, RelationalOp1(specOp), right) =>
-      convert(expr, specOp, convert(left), convert(right))
-  }
 
-  def convert(implicit expr: ShiftExpressionContext): Expr[G] = expr match {
-    case ShiftExpression0(inner) => convert(inner)
-    case ShiftExpression1(left, _, _, right) => BitShl(convert(left), convert(right))
-    case ShiftExpression2(left, _, _, right) => BitShr(convert(left), convert(right))
-  }
+  def convert(implicit expr: ShiftExpressionContext): Expr[G] =
+    expr match {
+      case ShiftExpression0(inner) => convert(inner)
+      case ShiftExpression1(left, _, _, right) =>
+        BitShl(convert(left), convert(right))
+      case ShiftExpression2(left, _, _, right) =>
+        BitShr(convert(left), convert(right))
+    }
 
-  def convert(implicit expr: AdditiveExpressionContext): Expr[G] = expr match {
-    case AdditiveExpression0(inner) => convert(inner)
-    case AdditiveExpression1(left, _, right) => AmbiguousPlus(convert(left), convert(right))(blame(expr))
-    case AdditiveExpression2(left, _, right) => col.AmbiguousMinus(convert(left), convert(right))(blame(expr))
-  }
+  def convert(implicit expr: AdditiveExpressionContext): Expr[G] =
+    expr match {
+      case AdditiveExpression0(inner) => convert(inner)
+      case AdditiveExpression1(left, _, right) =>
+        AmbiguousPlus(convert(left), convert(right))(blame(expr))
+      case AdditiveExpression2(left, _, right) =>
+        col.AmbiguousMinus(convert(left), convert(right))(blame(expr))
+    }
 
-  def convert(implicit expr: MultiplicativeExpressionContext): Expr[G] = expr match {
-    case MultiplicativeExpression0(inner) => convert(inner)
-    case MultiplicativeExpression1(left, op, right) => op match {
-      case MultiplicativeOp0(_) => AmbiguousMult(convert(left), convert(right))
-      case MultiplicativeOp1(_) => AmbiguousTruncDiv(convert(left), convert(right))(blame(expr))
-      case MultiplicativeOp2(_) => AmbiguousTruncMod(convert(left), convert(right))(blame(expr))
-      case MultiplicativeOp3(_) => col.RatDiv(convert(left), convert(right))(blame(expr))
+  def convert(implicit expr: MultiplicativeExpressionContext): Expr[G] =
+    expr match {
+      case MultiplicativeExpression0(inner) => convert(inner)
+      case MultiplicativeExpression1(left, op, right) =>
+        op match {
+          case MultiplicativeOp0(_) =>
+            AmbiguousMult(convert(left), convert(right))
+          case MultiplicativeOp1(_) =>
+            AmbiguousTruncDiv(convert(left), convert(right))(blame(expr))
+          case MultiplicativeOp2(_) =>
+            AmbiguousTruncMod(convert(left), convert(right))(blame(expr))
+          case MultiplicativeOp3(_) =>
+            col.RatDiv(convert(left), convert(right))(blame(expr))
+        }
     }
-  }
 
   // Do not support operators .* and ->*
-  def convert(implicit expr: PointerMemberExpressionContext): Expr[G] = expr match {
-    case PointerMemberExpression0(inner) => convert(inner)
-    case PointerMemberExpression1(_, _, _) => ??(expr)
-    case PointerMemberExpression2(_, _, _) => ??(expr)
-  }
+  def convert(implicit expr: PointerMemberExpressionContext): Expr[G] =
+    expr match {
+      case PointerMemberExpression0(inner) => convert(inner)
+      case PointerMemberExpression1(_, _, _) => ??(expr)
+      case PointerMemberExpression2(_, _, _) => ??(expr)
+    }
 
-  def convert(implicit expr: PrependExpressionContext): Expr[G] = expr match {
-    case PrependExpression0(inner) => convert(inner)
-    case PrependExpression1(left, PrependOp0(specOp), right) => convert(expr, specOp, convert(left), convert(right))
-  }
+  def convert(implicit expr: PrependExpressionContext): Expr[G] =
+    expr match {
+      case PrependExpression0(inner) => convert(inner)
+      case PrependExpression1(left, PrependOp0(specOp), right) =>
+        convert(expr, specOp, convert(left), convert(right))
+    }
 
   // Do not support cast expressions
-  def convert(expr: CastExpressionContext): Expr[G] = expr match {
-    case CastExpression0(inner) => convert(inner)
-    case CastExpression1(_, _, _, expr) => ??(expr)
-  }
+  def convert(expr: CastExpressionContext): Expr[G] =
+    expr match {
+      case CastExpression0(inner) => convert(inner)
+      case CastExpression1(_, _, _, expr) => ??(expr)
+    }
 
-  def convert(implicit initClause: InitializerClauseContext): Expr[G] = initClause match {
-    case InitializerClause0(expr) => convert(expr)
-    case InitializerClause1(expr) => convert(expr)
-  }
+  def convert(implicit initClause: InitializerClauseContext): Expr[G] =
+    initClause match {
+      case InitializerClause0(expr) => convert(expr)
+      case InitializerClause1(expr) => convert(expr)
+    }
 
-  def convert(implicit bracedInitList: BracedInitListContext): Expr[G] = bracedInitList match {
-    case BracedInitList0(_, _) => ??(bracedInitList)
-    case BracedInitList1(_, initList, _) => CPPLiteralArray(convert(initList))
-    case BracedInitList2(_, initList, _, _) => CPPLiteralArray(convert(initList))
-  }
+  def convert(implicit bracedInitList: BracedInitListContext): Expr[G] =
+    bracedInitList match {
+      case BracedInitList0(_, _) => ??(bracedInitList)
+      case BracedInitList1(_, initList, _) => CPPLiteralArray(convert(initList))
+      case BracedInitList2(_, initList, _, _) =>
+        CPPLiteralArray(convert(initList))
+    }
 
   // Do not support '...'
-  def convert(implicit expr: InitializerListContext): Seq[Expr[G]] = expr match {
-    case InitializerList0(initClause, None) => Seq(convert(initClause))
-    case InitializerList0(_, _) => ??(expr)
-    case InitializerList1(initList, _, initClause, None) => convert(initList) :+ convert(initClause)
-    case InitializerList1(_, _, _, _) => ??(expr)
-  }
+  def convert(implicit expr: InitializerListContext): Seq[Expr[G]] =
+    expr match {
+      case InitializerList0(initClause, None) => Seq(convert(initClause))
+      case InitializerList0(_, _) => ??(expr)
+      case InitializerList1(initList, _, initClause, None) =>
+        convert(initList) :+ convert(initClause)
+      case InitializerList1(_, _, _, _) => ??(expr)
+    }
 
   // Do not support sizeof, alignof, noexcept, and delete expressions
-  def convert(implicit expr: UnaryExpressionContext): Expr[G] = expr match {
-    case UnaryExpression0(inner) => convert(inner)
-    case UnaryExpression1(_, arg) =>
-      val target = convert(arg)
-      PreAssignExpression(target, col.AmbiguousPlus(target, c_const(1))(blame(expr)))(blame(expr))
-    case UnaryExpression2(_, arg) =>
-      val target = convert(arg)
-      PreAssignExpression(target, col.AmbiguousMinus(target, c_const(1))(blame(expr)))(blame(expr))
-    case UnaryExpression3(UnaryOperator0(_), arg) => AddrOf(convert(arg))
-    case UnaryExpression3(UnaryOperator1(_), arg) => DerefPointer(convert(arg))(blame(expr))
-    case UnaryExpression3(UnaryOperator2(_), arg) => convert(arg)
-    case UnaryExpression3(UnaryOperator3(_), arg) => UMinus(convert(arg))
-    case UnaryExpression3(UnaryOperator5(_), arg) => col.Not(convert(arg))
-    case UnaryExpression3(UnaryOperator6(_), arg) => col.Not(convert(arg))
-    case UnaryExpression4(_, _) => ??(expr)
-    case _: UnaryExpression5Context => ??(expr)
-    case UnaryExpression6(_, _, _, _) => ??(expr)
-    case UnaryExpression7(_) => ??(expr)
-    case UnaryExpression8(_) => ??(expr)
-    case UnaryExpression9(_) => ??(expr)
-    case UnaryExpression10(SpecPrefix0(op), inner) => convert(expr, op, convert(inner))
-  }
+  def convert(implicit expr: UnaryExpressionContext): Expr[G] =
+    expr match {
+      case UnaryExpression0(inner) => convert(inner)
+      case UnaryExpression1(_, arg) =>
+        val target = convert(arg)
+        PreAssignExpression(
+          target,
+          col.AmbiguousPlus(target, c_const(1))(blame(expr)),
+        )(blame(expr))
+      case UnaryExpression2(_, arg) =>
+        val target = convert(arg)
+        PreAssignExpression(
+          target,
+          col.AmbiguousMinus(target, c_const(1))(blame(expr)),
+        )(blame(expr))
+      case UnaryExpression3(UnaryOperator0(_), arg) => AddrOf(convert(arg))
+      case UnaryExpression3(UnaryOperator1(_), arg) =>
+        DerefPointer(convert(arg))(blame(expr))
+      case UnaryExpression3(UnaryOperator2(_), arg) => convert(arg)
+      case UnaryExpression3(UnaryOperator3(_), arg) => UMinus(convert(arg))
+      case UnaryExpression3(UnaryOperator5(_), arg) => col.Not(convert(arg))
+      case UnaryExpression3(UnaryOperator6(_), arg) => col.Not(convert(arg))
+      case UnaryExpression4(_, _) => ??(expr)
+      case _: UnaryExpression5Context => ??(expr)
+      case UnaryExpression6(_, _, _, _) => ??(expr)
+      case UnaryExpression7(_) => ??(expr)
+      case UnaryExpression8(_) => ??(expr)
+      case UnaryExpression9(_) => ??(expr)
+      case UnaryExpression10(SpecPrefix0(op), inner) =>
+        convert(expr, op, convert(inner))
+    }
 
-  def convert(implicit decls: InitDeclaratorListContext): Seq[CPPInit[G]] = decls match {
-    case InitDeclaratorList0(decl) => Seq(convert(decl))
-    case InitDeclaratorList1(init, _, last) => convert(init) :+ convert(last)
-  }
+  def convert(implicit decls: InitDeclaratorListContext): Seq[CPPInit[G]] =
+    decls match {
+      case InitDeclaratorList0(decl) => Seq(convert(decl))
+      case InitDeclaratorList1(init, _, last) => convert(init) :+ convert(last)
+    }
 
-  def convert(implicit decl: InitDeclaratorContext): CPPInit[G] = decl match {
-    case InitDeclarator0(inner, None) => CPPInit(convert(inner), None)
-    case InitDeclarator0(inner, Some(init)) => CPPInit(convert(inner), Some(convert(init)))
-  }
+  def convert(implicit decl: InitDeclaratorContext): CPPInit[G] =
+    decl match {
+      case InitDeclarator0(inner, None) => CPPInit(convert(inner), None)
+      case InitDeclarator0(inner, Some(init)) =>
+        CPPInit(convert(inner), Some(convert(init)))
+    }
 
-  def convert(implicit expr: InitializerContext): Expr[G] = expr match {
-    case Initializer0(expr) => convert(expr)
-    case Initializer1(_, _, _) => ??(expr)
-  }
+  def convert(implicit expr: InitializerContext): Expr[G] =
+    expr match {
+      case Initializer0(expr) => convert(expr)
+      case Initializer1(_, _, _) => ??(expr)
+    }
 
   // Do not support bracedInitList
-  def convert(implicit expr: BraceOrEqualInitializerContext): Expr[G] = expr match {
-    case BraceOrEqualInitializer0(_, expr) => convert(expr)
-    case BraceOrEqualInitializer1(expr) => ??(expr)
-  }
+  def convert(implicit expr: BraceOrEqualInitializerContext): Expr[G] =
+    expr match {
+      case BraceOrEqualInitializer0(_, expr) => convert(expr)
+      case BraceOrEqualInitializer1(expr) => ??(expr)
+    }
 
   // Do not support templates, typeNameSpecifiers, bracedInitLists, and multiple expressions
-  def convert(implicit expr: PostfixExpressionContext): Expr[G] = expr match {
-    case PostfixExpression0(inner) => convert(inner)
-    case PostfixExpression1(arr, _, idx, _) => convert(idx) match {
-      case Seq(i) => AmbiguousSubscript(convert(arr), i)(blame(expr))
-      case _ => ??(expr)
-    }
-    case PostfixExpression2(_, _, _, _) => ??(expr)
-    case PostfixExpression3(target, _, args, _, given, yields) =>
-      CPPInvocation(convert(target), args.map(convert(_)) getOrElse Nil,
-        convertEmbedGiven(given), convertEmbedYields(yields))(blame(expr))
-    case PostfixExpression4(classVar, _, None, idExpr) => convert(idExpr) match {
-      case CPPTypedefName(name, Seq()) => CPPClassMethodOrFieldAccess(convert(classVar), name)(blame(expr))
-      case _ => ??(expr)
-    }
-    case PostfixExpression4(_, _, _, _) => ??(expr)
-    case PostfixExpression5(_, _, _) => ??(expr)
-    case PostfixExpression6(_, _, _, _) => ??(expr)
-    case PostfixExpression7(_, _, _) => ??(expr)
-    case PostfixExpression8(targetNode, _) =>
-      val target = convert(targetNode)
-      PostAssignExpression(target, col.AmbiguousPlus(target, c_const(1))(blame(expr)))(blame(expr))
-    case PostfixExpression9(targetNode, _) =>
-      val target = convert(targetNode)
-      PostAssignExpression(target, col.AmbiguousMinus(target, c_const(1))(blame(expr)))(blame(expr))
-    case PostfixExpression10(e, SpecPostfix0(postfix)) => convert(expr, postfix, convert(e))
-    case PostfixExpression11(_, _, _, _, _, _) => ??(expr)
-    case PostfixExpression12(_, _) => ??(expr)
-    case PostfixExpression13(_, _, _, _, _, _) => ??(expr)
-    case PostfixExpression14(_, _) => ??(expr)
-    case PostfixExpression15(_, _, _, _, _, _, _) => ??(expr)
-    case _: PostfixExpression16Context => ??(expr)
-  }
+  def convert(implicit expr: PostfixExpressionContext): Expr[G] =
+    expr match {
+      case PostfixExpression0(inner) => convert(inner)
+      case PostfixExpression1(arr, _, idx, _) =>
+        convert(idx) match {
+          case Seq(i) => AmbiguousSubscript(convert(arr), i)(blame(expr))
+          case _ => ??(expr)
+        }
+      case PostfixExpression2(_, _, _, _) => ??(expr)
+      case PostfixExpression3(target, _, args, _, given, yields) =>
+        CPPInvocation(
+          convert(target),
+          args.map(convert(_)) getOrElse Nil,
+          convertEmbedGiven(given),
+          convertEmbedYields(yields),
+        )(blame(expr))
+      case PostfixExpression4(classVar, _, None, idExpr) =>
+        convert(idExpr) match {
+          case CPPTypedefName(name, Seq()) =>
+            CPPClassMethodOrFieldAccess(convert(classVar), name)(blame(expr))
+          case _ => ??(expr)
+        }
+      case PostfixExpression4(_, _, _, _) => ??(expr)
+      case PostfixExpression5(_, _, _) => ??(expr)
+      case PostfixExpression6(_, _, _, _) => ??(expr)
+      case PostfixExpression7(_, _, _) => ??(expr)
+      case PostfixExpression8(targetNode, _) =>
+        val target = convert(targetNode)
+        PostAssignExpression(
+          target,
+          col.AmbiguousPlus(target, c_const(1))(blame(expr)),
+        )(blame(expr))
+      case PostfixExpression9(targetNode, _) =>
+        val target = convert(targetNode)
+        PostAssignExpression(
+          target,
+          col.AmbiguousMinus(target, c_const(1))(blame(expr)),
+        )(blame(expr))
+      case PostfixExpression10(e, SpecPostfix0(postfix)) =>
+        convert(expr, postfix, convert(e))
+      case PostfixExpression11(_, _, _, _, _, _) => ??(expr)
+      case PostfixExpression12(_, _) => ??(expr)
+      case PostfixExpression13(_, _, _, _, _, _) => ??(expr)
+      case PostfixExpression14(_, _) => ??(expr)
+      case PostfixExpression15(_, _, _, _, _, _, _) => ??(expr)
+      case _: PostfixExpression16Context => ??(expr)
+    }
 
-  def convert(implicit exprList: ExpressionListContext): Seq[Expr[G]] = exprList match {
-    case ExpressionList0(initList) => convert(initList)
-  }
+  def convert(implicit exprList: ExpressionListContext): Seq[Expr[G]] =
+    exprList match { case ExpressionList0(initList) => convert(initList) }
 
-  def convert(implicit expr: AnnotatedPrimaryExpressionContext): Expr[G] = expr match {
-    case AnnotatedPrimaryExpression0(pre, inner, post) =>
-      convertEmbedWith(pre, convertEmbedThen(post, convert(inner)))
-  }
+  def convert(implicit expr: AnnotatedPrimaryExpressionContext): Expr[G] =
+    expr match {
+      case AnnotatedPrimaryExpression0(pre, inner, post) =>
+        convertEmbedWith(pre, convertEmbedThen(post, convert(inner)))
+    }
 
   // Do not support more than 1 literal or expression
-  def convert(implicit expr: PrimaryExpressionContext): Expr[G] = expr match {
-    case PrimaryExpression0(inner) => convert(inner)
-    case PrimaryExpression1(literal) => convert(literal)
-    case PrimaryExpression2(_) => AmbiguousThis()
-    case PrimaryExpression3(_, inner, _) => convert(inner) match {
-      case Seq(i) => i
-      case _ => ??(expr)
-    }
-    case PrimaryExpression4(inner) => convert(inner) match {
-      case CPPTypedefName(name, arg) => CPPLocal(name, arg)(blame(expr))(origin(expr))
-      case SYCLClassDefName(name, arg) => CPPLocal("sycl::" + name, arg)(blame(expr))(origin(expr))
-      case _ => ??(expr)
-    }
-    case PrimaryExpression5(lambda) => convert(lambda)
-  }
+  def convert(implicit expr: PrimaryExpressionContext): Expr[G] =
+    expr match {
+      case PrimaryExpression0(inner) => convert(inner)
+      case PrimaryExpression1(literal) => convert(literal)
+      case PrimaryExpression2(_) => AmbiguousThis()
+      case PrimaryExpression3(_, inner, _) =>
+        convert(inner) match {
+          case Seq(i) => i
+          case _ => ??(expr)
+        }
+      case PrimaryExpression4(inner) =>
+        convert(inner) match {
+          case CPPTypedefName(name, arg) =>
+            CPPLocal(name, arg)(blame(expr))(origin(expr))
+          case SYCLClassDefName(name, arg) =>
+            CPPLocal("sycl::" + name, arg)(blame(expr))(origin(expr))
+          case _ => ??(expr)
+        }
+      case PrimaryExpression5(lambda) => convert(lambda)
+    }
 
   // Do not support extended chars and strings and user-defined literals
-  def convert(implicit literal: LiteralContext): Expr[G] = literal match {
-    case Literal0(intLit) => parseInt(intLit).getOrElse(??(literal))
-    case Literal1(charLit) => parseChar(charLit).getOrElse(??(literal))
-    case Literal2(floatLit) => parseFloat(floatLit).getOrElse(??(literal))
-    case Literal3(strLit) => parseString(strLit).getOrElse(??(literal))
-    case Literal4(value) => BooleanValue(value == "true")
-    case Literal5(_) => Null()
-    case Literal6(_) => ??(literal)
-  }
+  def convert(implicit literal: LiteralContext): Expr[G] =
+    literal match {
+      case Literal0(intLit) => parseInt(intLit).getOrElse(??(literal))
+      case Literal1(charLit) => parseChar(charLit).getOrElse(??(literal))
+      case Literal2(floatLit) => parseFloat(floatLit).getOrElse(??(literal))
+      case Literal3(strLit) => parseString(strLit).getOrElse(??(literal))
+      case Literal4(value) => BooleanValue(value == "true")
+      case Literal5(_) => Null()
+      case Literal6(_) => ??(literal)
+    }
 
-  def convert(implicit idExpr: IdExpressionContext): CPPTypeSpecifier[G] = idExpr match {
-    case IdExpression0(id) => convert(id)
-    case IdExpression1(id) => convert(id)
-  }
+  def convert(implicit idExpr: IdExpressionContext): CPPTypeSpecifier[G] =
+    idExpr match {
+      case IdExpression0(id) => convert(id)
+      case IdExpression1(id) => convert(id)
+    }
 
   def parseFloat(numFlag: String)(implicit o: Origin): Option[Expr[G]] = {
     try {
       Some(numFlag.last match {
-        case 'f' | 'F' => FloatValue(BigDecimal(numFlag.init), TFloats.C_ieee754_32bit)
-        case 'l' | 'L' => FloatValue(BigDecimal(numFlag.init), TFloats.C_ieee754_64bit)
+        case 'f' | 'F' =>
+          FloatValue(BigDecimal(numFlag.init), TFloats.C_ieee754_32bit)
+        case 'l' | 'L' =>
+          FloatValue(BigDecimal(numFlag.init), TFloats.C_ieee754_64bit)
         case _ => FloatValue(BigDecimal(numFlag), TFloats.C_ieee754_32bit)
       })
-    } catch {
-      case _: NumberFormatException => None
-    }
+    } catch { case _: NumberFormatException => None }
   }
 
   def parseInt(i: String)(implicit o: Origin): Option[Expr[G]] =
-    try {
-      Some(CIntegerValue(BigInt(i)))
-    } catch {
-      case _: NumberFormatException => None
-    }
+    try { Some(CIntegerValue(BigInt(i))) }
+    catch { case _: NumberFormatException => None }
 
   private def parseChar(value: String)(implicit o: Origin): Option[Expr[G]] = {
     val fixedValue = fixEscapeAndUnicodeChars(value)
@@ -565,7 +772,9 @@ case class CPPToCol[G](override val baseOrigin: Origin,
     }
   }
 
-  private def parseString(value: String)(implicit o: Origin): Option[Expr[G]] = {
+  private def parseString(
+      value: String
+  )(implicit o: Origin): Option[Expr[G]] = {
     val fixedValue = fixEscapeAndUnicodeChars(value)
     val pattern = "^\"((.|\n|\r)*)\"$".r
     fixedValue match {
@@ -583,16 +792,30 @@ case class CPPToCol[G](override val baseOrigin: Origin,
     var patMatchOpt = unicodePattern.findFirstMatchIn(result)
     while (patMatchOpt.isDefined) {
       val patMatch = patMatchOpt.get
-      result = result.substring(0, patMatch.start) + new String(patMatch.group(1).sliding(2, 2).toArray.map(Integer.parseInt(_, 16).toByte), "UNICODE") + result.substring(patMatch.end)
+      result =
+        result.substring(0, patMatch.start) + new String(
+          patMatch.group(1).sliding(2, 2).toArray
+            .map(Integer.parseInt(_, 16).toByte),
+          "UNICODE",
+        ) + result.substring(patMatch.end)
       patMatchOpt = unicodePattern.findFirstMatchIn(result)
     }
 
     val escapePattern = "\\\\(['\"\\\\nrt])".r
-    val escapeMap: Map[String, String] = Map("'" -> "'", "\"" -> "\"", "\\" -> "\\", "n" -> "\n", "r" -> "\r", "t" -> "\t")
+    val escapeMap: Map[String, String] = Map(
+      "'" -> "'",
+      "\"" -> "\"",
+      "\\" -> "\\",
+      "n" -> "\n",
+      "r" -> "\r",
+      "t" -> "\t",
+    )
     patMatchOpt = escapePattern.findFirstMatchIn(result)
     while (patMatchOpt.isDefined) {
       val patMatch = patMatchOpt.get
-      result = result.substring(0, patMatch.start) + escapeMap(patMatch.group(1)) + result.substring(patMatch.end)
+      result =
+        result.substring(0, patMatch.start) + escapeMap(patMatch.group(1)) +
+          result.substring(patMatch.end)
       patMatchOpt = unicodePattern.findFirstMatchIn(result)
     }
 
@@ -600,980 +823,1531 @@ case class CPPToCol[G](override val baseOrigin: Origin,
   }
 
   // Not supporting attribute specifiers
-  def convert(implicit declSpecSeq: DeclSpecifierSeqContext): Seq[CPPDeclarationSpecifier[G]] = declSpecSeq match {
-    case DeclSpecifierSeq0(declSpec, None) => declSpec.flatMap(convert(_))
-    case DeclSpecifierSeq0(_, _) => ??(declSpecSeq)
-  }
+  def convert(
+      implicit declSpecSeq: DeclSpecifierSeqContext
+  ): Seq[CPPDeclarationSpecifier[G]] =
+    declSpecSeq match {
+      case DeclSpecifierSeq0(declSpec, None) => declSpec.flatMap(convert(_))
+      case DeclSpecifierSeq0(_, _) => ??(declSpecSeq)
+    }
 
   // Do not support storage specifiers, function specifiers, friends, typedefs, consts.
-  def convert(implicit declSpec: DeclSpecifierContext): Seq[CPPDeclarationSpecifier[G]] = declSpec match {
-    case DeclSpecifier0(_) => ??(declSpec)
-    case DeclSpecifier1(typeSpec) => convert(typeSpec)
-    case DeclSpecifier2(_) => ??(declSpec)
-    case DeclSpecifier3(_) => ??(declSpec)
-    case DeclSpecifier4(_) => ??(declSpec)
-    case DeclSpecifier5(_) => ??(declSpec)
-    case DeclSpecifier6(valEmbedModifier) => withModifiers(valEmbedModifier, m => {
-      if (m.consume(m.pure))
-        Seq(new CPPPure[G]())
-      else if (m.consume(m.inline))
-        Seq(new CPPInline[G]())
-      else
-        fail(m.nodes.head, "This modifier cannot be attached to a declaration in C++")
-    })
-  }
+  def convert(
+      implicit declSpec: DeclSpecifierContext
+  ): Seq[CPPDeclarationSpecifier[G]] =
+    declSpec match {
+      case DeclSpecifier0(_) => ??(declSpec)
+      case DeclSpecifier1(typeSpec) => convert(typeSpec)
+      case DeclSpecifier2(_) => ??(declSpec)
+      case DeclSpecifier3(_) => ??(declSpec)
+      case DeclSpecifier4(_) => ??(declSpec)
+      case DeclSpecifier5(_) => ??(declSpec)
+      case DeclSpecifier6(valEmbedModifier) =>
+        withModifiers(
+          valEmbedModifier,
+          m => {
+            if (m.consume(m.pure))
+              Seq(new CPPPure[G]())
+            else if (m.consume(m.inline))
+              Seq(new CPPInline[G]())
+            else
+              fail(
+                m.nodes.head,
+                "This modifier cannot be attached to a declaration in C++",
+              )
+          },
+        )
+    }
 
   // Do not support enum or class declarations, such as 'class className { members }' as type specifiers
-  def convert(implicit typeSpec: TypeSpecifierContext): Seq[CPPTypeSpecifier[G]] = typeSpec match {
-    case TypeSpecifier0(trailingTypeSpec) => convert(trailingTypeSpec)
-    case TypeSpecifier1(_) => ??(typeSpec)
-    case TypeSpecifier2(_) => ??(typeSpec)
-  }
+  def convert(
+      implicit typeSpec: TypeSpecifierContext
+  ): Seq[CPPTypeSpecifier[G]] =
+    typeSpec match {
+      case TypeSpecifier0(trailingTypeSpec) => convert(trailingTypeSpec)
+      case TypeSpecifier1(_) => ??(typeSpec)
+      case TypeSpecifier2(_) => ??(typeSpec)
+    }
 
   // Do not support elaboratedTypeSpec, typeNameSpec, and cvQualifier
-  def convert(implicit typeSpec: TrailingTypeSpecifierContext): Seq[CPPTypeSpecifier[G]] = typeSpec match {
-    case TrailingTypeSpecifier0(simpleTypeSpec) => convert(simpleTypeSpec)
-    case TrailingTypeSpecifier1(_) => ??(typeSpec)
-    case TrailingTypeSpecifier2(_) => ??(typeSpec)
-    case TrailingTypeSpecifier3(_) => ??(typeSpec)
-  }
+  def convert(
+      implicit typeSpec: TrailingTypeSpecifierContext
+  ): Seq[CPPTypeSpecifier[G]] =
+    typeSpec match {
+      case TrailingTypeSpecifier0(simpleTypeSpec) => convert(simpleTypeSpec)
+      case TrailingTypeSpecifier1(_) => ??(typeSpec)
+      case TrailingTypeSpecifier2(_) => ??(typeSpec)
+      case TrailingTypeSpecifier3(_) => ??(typeSpec)
+    }
 
   // Do not support types: template, char16_t, char32_t, wchar_t, auto, decltype(), and combination of namespace and typename
-  def convert(implicit typeSpec: SimpleTypeSpecifierContext): Seq[CPPTypeSpecifier[G]] = typeSpec match {
-    case SimpleTypeSpecifier0(None, typeName) => Seq(convert(typeName))
-    case SimpleTypeSpecifier0(Some(nestedNameSpec), typeName) =>
-      convert(typeName) match {
-        case CPPTypedefName(name, genericArgs) => convert(nestedNameSpec).nestedName match {
-          case s"sycl::$rest" => Seq(SYCLClassDefName(rest + name, genericArgs))
-          case other => Seq(CPPTypedefName(other + name, genericArgs))
+  def convert(
+      implicit typeSpec: SimpleTypeSpecifierContext
+  ): Seq[CPPTypeSpecifier[G]] =
+    typeSpec match {
+      case SimpleTypeSpecifier0(None, typeName) => Seq(convert(typeName))
+      case SimpleTypeSpecifier0(Some(nestedNameSpec), typeName) =>
+        convert(typeName) match {
+          case CPPTypedefName(name, genericArgs) =>
+            convert(nestedNameSpec).nestedName match {
+              case s"sycl::$rest" =>
+                Seq(SYCLClassDefName(rest + name, genericArgs))
+              case other => Seq(CPPTypedefName(other + name, genericArgs))
+            }
+          case _ => ??(typeSpec)
         }
-        case _ => ??(typeSpec)
-      }
-    case SimpleTypeSpecifier1(_, _, _) => ??(typeSpec)
-    case SimpleTypeSpecifier2(signedness) => Seq(convert(signedness))
-    case SimpleTypeSpecifier3(Some(signedness), typeLengthMods) => Seq(convert(signedness)) ++ typeLengthMods.map(convert(_))
-    case SimpleTypeSpecifier3(None, typeLengthMods) => typeLengthMods.map(convert(_))
-    case SimpleTypeSpecifier4(Some(signedness), _) => Seq(convert(signedness), new CPPChar[G]())
-    case SimpleTypeSpecifier4(None, _) => Seq(new CPPChar[G]())
-    case SimpleTypeSpecifier5(_, _) => ??(typeSpec)
-    case SimpleTypeSpecifier6(_, _) => ??(typeSpec)
-    case SimpleTypeSpecifier7(_, _) => ??(typeSpec)
-    case SimpleTypeSpecifier8(_) => Seq(new CPPBool[G]())
-    case SimpleTypeSpecifier9(Some(signedness), typeLengthMods, _) => Seq(convert(signedness)) ++ typeLengthMods.map(convert(_)) :+ new CPPInt[G]()
-    case SimpleTypeSpecifier9(None, typeLengthMods, _) => typeLengthMods.map(convert(_)) :+ new CPPInt[G]()
-    case SimpleTypeSpecifier10(_) => Seq(CPPSpecificationType(TFloats.C_ieee754_32bit))
-    case SimpleTypeSpecifier11(Some(typeLengthMod), _) => Seq(convert(typeLengthMod), CPPSpecificationType(TFloats.C_ieee754_64bit))
-    case SimpleTypeSpecifier11(None, _) => Seq(CPPSpecificationType(TFloats.C_ieee754_64bit))
-    case SimpleTypeSpecifier12(_) => Seq(new CPPVoid[G]())
-    case SimpleTypeSpecifier13(_) => ??(typeSpec)
-    case SimpleTypeSpecifier14(valType) => Seq(CPPSpecificationType(convert(valType)))
-    case SimpleTypeSpecifier15(_) => ??(typeSpec)
-  }
+      case SimpleTypeSpecifier1(_, _, _) => ??(typeSpec)
+      case SimpleTypeSpecifier2(signedness) => Seq(convert(signedness))
+      case SimpleTypeSpecifier3(Some(signedness), typeLengthMods) =>
+        Seq(convert(signedness)) ++ typeLengthMods.map(convert(_))
+      case SimpleTypeSpecifier3(None, typeLengthMods) =>
+        typeLengthMods.map(convert(_))
+      case SimpleTypeSpecifier4(Some(signedness), _) =>
+        Seq(convert(signedness), new CPPChar[G]())
+      case SimpleTypeSpecifier4(None, _) => Seq(new CPPChar[G]())
+      case SimpleTypeSpecifier5(_, _) => ??(typeSpec)
+      case SimpleTypeSpecifier6(_, _) => ??(typeSpec)
+      case SimpleTypeSpecifier7(_, _) => ??(typeSpec)
+      case SimpleTypeSpecifier8(_) => Seq(new CPPBool[G]())
+      case SimpleTypeSpecifier9(Some(signedness), typeLengthMods, _) =>
+        Seq(convert(signedness)) ++ typeLengthMods.map(convert(_)) :+
+          new CPPInt[G]()
+      case SimpleTypeSpecifier9(None, typeLengthMods, _) =>
+        typeLengthMods.map(convert(_)) :+ new CPPInt[G]()
+      case SimpleTypeSpecifier10(_) =>
+        Seq(CPPSpecificationType(TFloats.C_ieee754_32bit))
+      case SimpleTypeSpecifier11(Some(typeLengthMod), _) =>
+        Seq(
+          convert(typeLengthMod),
+          CPPSpecificationType(TFloats.C_ieee754_64bit),
+        )
+      case SimpleTypeSpecifier11(None, _) =>
+        Seq(CPPSpecificationType(TFloats.C_ieee754_64bit))
+      case SimpleTypeSpecifier12(_) => Seq(new CPPVoid[G]())
+      case SimpleTypeSpecifier13(_) => ??(typeSpec)
+      case SimpleTypeSpecifier14(valType) =>
+        Seq(CPPSpecificationType(convert(valType)))
+      case SimpleTypeSpecifier15(_) => ??(typeSpec)
+    }
 
-  def convert(implicit signedness: SimpleTypeSignednessModifierContext): CPPTypeSpecifier[G] = signedness match {
-    case SimpleTypeSignednessModifier0(_) => new CPPUnsigned[G]()
-    case SimpleTypeSignednessModifier1(_) => new CPPSigned[G]()
-  }
+  def convert(
+      implicit signedness: SimpleTypeSignednessModifierContext
+  ): CPPTypeSpecifier[G] =
+    signedness match {
+      case SimpleTypeSignednessModifier0(_) => new CPPUnsigned[G]()
+      case SimpleTypeSignednessModifier1(_) => new CPPSigned[G]()
+    }
 
-  def convert(implicit simpleTypeLengthMod: SimpleTypeLengthModifierContext): CPPTypeSpecifier[G] = simpleTypeLengthMod match {
-    case SimpleTypeLengthModifier0(_) => new CPPShort[G]()
-    case SimpleTypeLengthModifier1(_) => new CPPLong[G]()
-  }
+  def convert(
+      implicit simpleTypeLengthMod: SimpleTypeLengthModifierContext
+  ): CPPTypeSpecifier[G] =
+    simpleTypeLengthMod match {
+      case SimpleTypeLengthModifier0(_) => new CPPShort[G]()
+      case SimpleTypeLengthModifier1(_) => new CPPLong[G]()
+    }
 
   // Do not support template or decltypes, or a typename as identifier in the nestedname
-  def convert(implicit nestedNameSpec: NestedNameSpecifierContext): CPPTypedefName[G] = nestedNameSpec match {
-    case NestedNameSpecifier0(theTypeName, sep) =>
-      convert(theTypeName) match {
-        case name@CPPTypedefName(_, Seq()) => name.appendName(sep)
-        case _ => ??(theTypeName)
-      }
-    case NestedNameSpecifier1(namespaceName, sep) => convert(namespaceName).appendName(sep)
-    case NestedNameSpecifier2(_, _) => ??(nestedNameSpec)
-    case NestedNameSpecifier3(sep) => CPPTypedefName(sep, Seq())
-    case NestedNameSpecifier4(inner, id, sep) =>
-      convert(inner) match {
-        case name@CPPTypedefName(_, Seq()) => name.appendName(convert(id)).appendName(sep)
-        case _ => ??(inner)
-      }
-    case NestedNameSpecifier5(_, _, _, _) => ??(nestedNameSpec)
-  }
+  def convert(
+      implicit nestedNameSpec: NestedNameSpecifierContext
+  ): CPPTypedefName[G] =
+    nestedNameSpec match {
+      case NestedNameSpecifier0(theTypeName, sep) =>
+        convert(theTypeName) match {
+          case name @ CPPTypedefName(_, Seq()) => name.appendName(sep)
+          case _ => ??(theTypeName)
+        }
+      case NestedNameSpecifier1(namespaceName, sep) =>
+        convert(namespaceName).appendName(sep)
+      case NestedNameSpecifier2(_, _) => ??(nestedNameSpec)
+      case NestedNameSpecifier3(sep) => CPPTypedefName(sep, Seq())
+      case NestedNameSpecifier4(inner, id, sep) =>
+        convert(inner) match {
+          case name @ CPPTypedefName(_, Seq()) =>
+            name.appendName(convert(id)).appendName(sep)
+          case _ => ??(inner)
+        }
+      case NestedNameSpecifier5(_, _, _, _) => ??(nestedNameSpec)
+    }
 
-  def convert(implicit namespaceName: NamespaceNameContext): CPPTypedefName[G] = namespaceName match {
-    case NamespaceName0(OriginalNamespaceName0(id)) => CPPTypedefName(convert(id), Seq())
-    case NamespaceName1(NamespaceAlias0(id)) => CPPTypedefName(convert(id), Seq())
-  }
+  def convert(implicit namespaceName: NamespaceNameContext): CPPTypedefName[G] =
+    namespaceName match {
+      case NamespaceName0(OriginalNamespaceName0(id)) =>
+        CPPTypedefName(convert(id), Seq())
+      case NamespaceName1(NamespaceAlias0(id)) =>
+        CPPTypedefName(convert(id), Seq())
+    }
 
   // Do not support enum-names and typedef-names
-  def convert(implicit theTypeName: TheTypeNameContext): CPPTypeSpecifier[G] = theTypeName match {
-    case TheTypeName0(simpleTemplateId) => convert(simpleTemplateId)
-    case TheTypeName1(className) => convert(className)
-    case TheTypeName2(_) => ??(theTypeName)
-    case TheTypeName3(_) => ??(theTypeName)
-  }
+  def convert(implicit theTypeName: TheTypeNameContext): CPPTypeSpecifier[G] =
+    theTypeName match {
+      case TheTypeName0(simpleTemplateId) => convert(simpleTemplateId)
+      case TheTypeName1(className) => convert(className)
+      case TheTypeName2(_) => ??(theTypeName)
+      case TheTypeName3(_) => ??(theTypeName)
+    }
 
   // Do not support template-names
-  def convert(implicit className: ClassNameContext): CPPTypedefName[G] = className match {
-    case ClassName0(name) => CPPTypedefName(convert(name), Seq())
-    case ClassName1(_) => ??(className)
-  }
+  def convert(implicit className: ClassNameContext): CPPTypedefName[G] =
+    className match {
+      case ClassName0(name) => CPPTypedefName(convert(name), Seq())
+      case ClassName1(_) => ??(className)
+    }
 
-  def convert(implicit templateId: TemplateIdContext): CPPTypeSpecifier[G] = templateId match {
-    case TemplateId0(simpleTemplateId) => convert(simpleTemplateId)
-    case _: TemplateId1Context => ??(templateId)
-  }
+  def convert(implicit templateId: TemplateIdContext): CPPTypeSpecifier[G] =
+    templateId match {
+      case TemplateId0(simpleTemplateId) => convert(simpleTemplateId)
+      case _: TemplateId1Context => ??(templateId)
+    }
 
-  def convert(implicit simpleTemplateId: SimpleTemplateIdContext): CPPTypeSpecifier[G] = simpleTemplateId match {
-    case SimpleTemplateId0(name, _, arg, _) => CPPTypedefName(convert(name), Seq(convert(arg)))
-    case SimpleTemplateId1(name, _, Some(args), _) => CPPTypedefName(convert(name), convert(args))
-    case SimpleTemplateId1(name, _, None, _) => CPPTypedefName(convert(name), Seq())
-  }
+  def convert(
+      implicit simpleTemplateId: SimpleTemplateIdContext
+  ): CPPTypeSpecifier[G] =
+    simpleTemplateId match {
+      case SimpleTemplateId0(name, _, arg, _) =>
+        CPPTypedefName(convert(name), Seq(convert(arg)))
+      case SimpleTemplateId1(name, _, Some(args), _) =>
+        CPPTypedefName(convert(name), convert(args))
+      case SimpleTemplateId1(name, _, None, _) =>
+        CPPTypedefName(convert(name), Seq())
+    }
 
-  def convert(implicit templateArgumentList: TemplateArgumentListContext): Seq[CPPExprOrTypeSpecifier[G]] = templateArgumentList match {
-    case TemplateArgumentList0(arg, None, _, argList) => Seq(convert(arg)) ++ convert(argList)
-    case TemplateArgumentList0(_, _, _, _) => ??(templateArgumentList)
-    case TemplateArgumentList1(arg, None) => Seq(convert(arg))
-    case TemplateArgumentList1(_, _) => ??(templateArgumentList)
-  }
+  def convert(
+      implicit templateArgumentList: TemplateArgumentListContext
+  ): Seq[CPPExprOrTypeSpecifier[G]] =
+    templateArgumentList match {
+      case TemplateArgumentList0(arg, None, _, argList) =>
+        Seq(convert(arg)) ++ convert(argList)
+      case TemplateArgumentList0(_, _, _, _) => ??(templateArgumentList)
+      case TemplateArgumentList1(arg, None) => Seq(convert(arg))
+      case TemplateArgumentList1(_, _) => ??(templateArgumentList)
+    }
 
   // Only support constantExpression
-  def convert(implicit templateArgument: TemplateArgumentContext): CPPExprOrTypeSpecifier[G] = templateArgument match {
-    case TemplateArgument0(theTypeId) => convert(theTypeId) match {
-      // Only support one typeSpec
-      case Seq(typeSpec) => CPPExprOrTypeSpecifier(None, Some(typeSpec))
-      case _ => ??(templateArgument)
-    }
-    case TemplateArgument1(constantExpr) => CPPExprOrTypeSpecifier(Some(convert(constantExpr)), None)
-    case TemplateArgument2(_) => ??(templateArgument)
-  }
+  def convert(
+      implicit templateArgument: TemplateArgumentContext
+  ): CPPExprOrTypeSpecifier[G] =
+    templateArgument match {
+      case TemplateArgument0(theTypeId) =>
+        convert(theTypeId) match {
+          // Only support one typeSpec
+          case Seq(typeSpec) => CPPExprOrTypeSpecifier(None, Some(typeSpec))
+          case _ => ??(templateArgument)
+        }
+      case TemplateArgument1(constantExpr) =>
+        CPPExprOrTypeSpecifier(Some(convert(constantExpr)), None)
+      case TemplateArgument2(_) => ??(templateArgument)
+    }
 
-  def convert(implicit templateName: TemplateNameContext): String = templateName match {
-    case TemplateName0(identifier) => convert(identifier)
-  }
+  def convert(implicit templateName: TemplateNameContext): String =
+    templateName match { case TemplateName0(identifier) => convert(identifier) }
 
   // Do not support abstractDeclarator
-  def convert(implicit theTypeId: TheTypeIdContext): Seq[CPPTypeSpecifier[G]] = theTypeId match {
-    case TheTypeId0(typeSpecSeq, None) => convert(typeSpecSeq)
-    case TheTypeId0(_, _) => ??(theTypeId)
-  }
+  def convert(implicit theTypeId: TheTypeIdContext): Seq[CPPTypeSpecifier[G]] =
+    theTypeId match {
+      case TheTypeId0(typeSpecSeq, None) => convert(typeSpecSeq)
+      case TheTypeId0(_, _) => ??(theTypeId)
+    }
 
   // Do not support attributeSpecifierSeq
-  def convert(implicit typeSpecSeq: TypeSpecifierSeqContext): Seq[CPPTypeSpecifier[G]] = typeSpecSeq match {
-    case TypeSpecifierSeq0(typeSpecs, None) => typeSpecs.flatMap(convert(_))
-    case TypeSpecifierSeq0(_, _) => ??(typeSpecSeq)
-  }
+  def convert(
+      implicit typeSpecSeq: TypeSpecifierSeqContext
+  ): Seq[CPPTypeSpecifier[G]] =
+    typeSpecSeq match {
+      case TypeSpecifierSeq0(typeSpecs, None) => typeSpecs.flatMap(convert(_))
+      case TypeSpecifierSeq0(_, _) => ??(typeSpecSeq)
+    }
 
   // Do not support trailing return types
-  def convert(implicit declarator: DeclaratorContext): CPPDeclarator[G] = declarator match {
-    case Declarator0(pointerDeclarator) => convert(pointerDeclarator)
-    case Declarator1(_, _, _) => ??(declarator)
-  }
+  def convert(implicit declarator: DeclaratorContext): CPPDeclarator[G] =
+    declarator match {
+      case Declarator0(pointerDeclarator) => convert(pointerDeclarator)
+      case Declarator1(_, _, _) => ??(declarator)
+    }
 
-  def convert(implicit pointerDeclarator: PointerDeclaratorContext): CPPDeclarator[G] = pointerDeclarator match {
-    case PointerDeclarator0(pointerDeclaratorPrefix, noPointerDeclarator)
-      if pointerDeclaratorPrefix.isEmpty => convert(noPointerDeclarator)
-    case PointerDeclarator0(pointerDeclaratorPrefix, noPointerDeclarator)
-      if pointerDeclaratorPrefix.nonEmpty =>
+  def convert(
+      implicit pointerDeclarator: PointerDeclaratorContext
+  ): CPPDeclarator[G] =
+    pointerDeclarator match {
+      case PointerDeclarator0(pointerDeclaratorPrefix, noPointerDeclarator)
+          if pointerDeclaratorPrefix.isEmpty =>
+        convert(noPointerDeclarator)
+      case PointerDeclarator0(pointerDeclaratorPrefix, noPointerDeclarator)
+          if pointerDeclaratorPrefix.nonEmpty =>
         val pointers = pointerDeclaratorPrefix.flatMap(convert(_))
         CPPAddressingDeclarator(pointers, convert(noPointerDeclarator))
-  }
+    }
 
   // Do not support postfix 'const'
-  def convert(implicit pointer: PointerDeclaratorPrefixContext): Seq[CPPAddressing[G]] = pointer match {
-    case PointerDeclaratorPrefix0(pointerOp, None) => convert(pointerOp)
-    case PointerDeclaratorPrefix0(_, _) => ??(pointer)
-  }
+  def convert(
+      implicit pointer: PointerDeclaratorPrefixContext
+  ): Seq[CPPAddressing[G]] =
+    pointer match {
+      case PointerDeclaratorPrefix0(pointerOp, None) => convert(pointerOp)
+      case PointerDeclaratorPrefix0(_, _) => ??(pointer)
+    }
 
   // Do not support nestedNameSpecifier, attributeSpeciefierSeq, and cvQualifierSeq
-  def convert(implicit pointerOp: PointerOperatorWithDoubleStarContext): Seq[CPPAddressing[G]] = pointerOp match {
-    case PointerOperatorWithDoubleStar0(pointerOp) => convert(pointerOp)
-    case PointerOperatorWithDoubleStar1(None, _, None, None) => Seq(CPPPointer(), CPPPointer())
-    case PointerOperatorWithDoubleStar1(_, _, _, _) => ??(pointerOp)
-  }
+  def convert(
+      implicit pointerOp: PointerOperatorWithDoubleStarContext
+  ): Seq[CPPAddressing[G]] =
+    pointerOp match {
+      case PointerOperatorWithDoubleStar0(pointerOp) => convert(pointerOp)
+      case PointerOperatorWithDoubleStar1(None, _, None, None) =>
+        Seq(CPPPointer(), CPPPointer())
+      case PointerOperatorWithDoubleStar1(_, _, _, _) => ??(pointerOp)
+    }
 
   // Do not support '&' and '&&' and nestedNameSpecifier, attributeSpeciefierSeq, and cvQualifierSeq
-  def convert(implicit pointerOp: PointerOperatorContext): Seq[CPPAddressing[G]] = pointerOp match {
-    case PointerOperator0(_, None) => Seq(CPPReference())
-    case PointerOperator0(_, _) => ??(pointerOp)
-    case PointerOperator1(_, _) => ??(pointerOp)
-    case PointerOperator2(None, _, None, None) => Seq(CPPPointer())
-    case PointerOperator2(_, _, _, _) => ??(pointerOp)
-  }
+  def convert(
+      implicit pointerOp: PointerOperatorContext
+  ): Seq[CPPAddressing[G]] =
+    pointerOp match {
+      case PointerOperator0(_, None) => Seq(CPPReference())
+      case PointerOperator0(_, _) => ??(pointerOp)
+      case PointerOperator1(_, _) => ??(pointerOp)
+      case PointerOperator2(None, _, None, None) => Seq(CPPPointer())
+      case PointerOperator2(_, _, _, _) => ??(pointerOp)
+    }
 
   // Do not support attributeSpecifierSeq
-  def convert(noPointerDeclarator: NoPointerDeclaratorContext)(implicit o: Origin): CPPDeclarator[G] = noPointerDeclarator match {
-    case NoPointerDeclarator0(declaratorId, None) => convert(declaratorId)
-    case NoPointerDeclarator0(_, _) => ??(noPointerDeclarator)
-    case NoPointerDeclarator1(innerDeclarator, paramsAndQuals) =>
-      val (params, varargs) = convert(paramsAndQuals)
-      CPPTypedFunctionDeclarator[G](params, varargs, convert(innerDeclarator))
-    case NoPointerDeclarator2(innerDeclarator, _, None, _, None) =>
-      CPPArrayDeclarator(None, convert(innerDeclarator))(blame(noPointerDeclarator))
-    case NoPointerDeclarator2(innerDeclarator, _, Some(constExpr), _, None) =>
-      CPPArrayDeclarator(Some(convert(constExpr)), convert(innerDeclarator))(blame(noPointerDeclarator))
-    case NoPointerDeclarator2(_, _, _, _, _) => ??(noPointerDeclarator)
-    case NoPointerDeclarator3(_, _, _) => ??(noPointerDeclarator)
-  }
+  def convert(
+      noPointerDeclarator: NoPointerDeclaratorContext
+  )(implicit o: Origin): CPPDeclarator[G] =
+    noPointerDeclarator match {
+      case NoPointerDeclarator0(declaratorId, None) => convert(declaratorId)
+      case NoPointerDeclarator0(_, _) => ??(noPointerDeclarator)
+      case NoPointerDeclarator1(innerDeclarator, paramsAndQuals) =>
+        val (params, varargs) = convert(paramsAndQuals)
+        CPPTypedFunctionDeclarator[G](params, varargs, convert(innerDeclarator))
+      case NoPointerDeclarator2(innerDeclarator, _, None, _, None) =>
+        CPPArrayDeclarator(None, convert(innerDeclarator))(blame(
+          noPointerDeclarator
+        ))
+      case NoPointerDeclarator2(innerDeclarator, _, Some(constExpr), _, None) =>
+        CPPArrayDeclarator(Some(convert(constExpr)), convert(innerDeclarator))(
+          blame(noPointerDeclarator)
+        )
+      case NoPointerDeclarator2(_, _, _, _, _) => ??(noPointerDeclarator)
+      case NoPointerDeclarator3(_, _, _) => ??(noPointerDeclarator)
+    }
 
-  def convert(implicit constExpr: ConstantExpressionContext): Expr[G] = constExpr match {
-    case ConstantExpression0(condExpr) => convert(condExpr)
-  }
+  def convert(implicit constExpr: ConstantExpressionContext): Expr[G] =
+    constExpr match { case ConstantExpression0(condExpr) => convert(condExpr) }
 
   // Do not support cvQualifier, refqualifier, exceptionSpec and attributeSpec
-  def convert(implicit paramsAndQuals: ParametersAndQualifiersContext): (Seq[CPPParam[G]], Boolean) = paramsAndQuals match {
-    case ParametersAndQualifiers0(_, None, _, None, None, None, None) => (Seq(), false)
-    case ParametersAndQualifiers0(_, Some(paramDeclClause), _, None, None, None, None) => convert(paramDeclClause)
-    case ParametersAndQualifiers0(_, _, _, _, _, _, _) => ??(paramsAndQuals)
-  }
+  def convert(
+      implicit paramsAndQuals: ParametersAndQualifiersContext
+  ): (Seq[CPPParam[G]], Boolean) =
+    paramsAndQuals match {
+      case ParametersAndQualifiers0(_, None, _, None, None, None, None) =>
+        (Seq(), false)
+      case ParametersAndQualifiers0(
+            _,
+            Some(paramDeclClause),
+            _,
+            None,
+            None,
+            None,
+            None,
+          ) =>
+        convert(paramDeclClause)
+      case ParametersAndQualifiers0(_, _, _, _, _, _, _) => ??(paramsAndQuals)
+    }
 
-  def convert(implicit paramDeclClause: ParameterDeclarationClauseContext): (Seq[CPPParam[G]], Boolean) = paramDeclClause match {
-    case ParameterDeclarationClause0(paramDeclList, None) => (convert(paramDeclList), false)
-    case ParameterDeclarationClause0(paramDeclList, Some(_)) => (convert(paramDeclList), true)
-  }
+  def convert(
+      implicit paramDeclClause: ParameterDeclarationClauseContext
+  ): (Seq[CPPParam[G]], Boolean) =
+    paramDeclClause match {
+      case ParameterDeclarationClause0(paramDeclList, None) =>
+        (convert(paramDeclList), false)
+      case ParameterDeclarationClause0(paramDeclList, Some(_)) =>
+        (convert(paramDeclList), true)
+    }
 
-  def convert(implicit paramDeclList: ParameterDeclarationListContext): Seq[CPPParam[G]] = paramDeclList match {
-    case value: ParameterDeclarationList0Context => value.parameterDeclaration.asScala.toSeq.map(convert(_))
-  }
+  def convert(
+      implicit paramDeclList: ParameterDeclarationListContext
+  ): Seq[CPPParam[G]] =
+    paramDeclList match {
+      case value: ParameterDeclarationList0Context =>
+        value.parameterDeclaration.asScala.toSeq.map(convert(_))
+    }
 
   // only support params in form of 'declSpecifiers declarator'
-  def convert(implicit paramDecl: ParameterDeclarationContext): CPPParam[G] = paramDecl match {
-    case ParameterDeclaration0(declSpecs, declarator) => new CPPParam[G](convert(declSpecs), convert(declarator))
-    case _: ParameterDeclaration1Context => ??(paramDecl)
-  }
+  def convert(implicit paramDecl: ParameterDeclarationContext): CPPParam[G] =
+    paramDecl match {
+      case ParameterDeclaration0(declSpecs, declarator) =>
+        new CPPParam[G](convert(declSpecs), convert(declarator))
+      case _: ParameterDeclaration1Context => ??(paramDecl)
+    }
 
   // Do not support if spread operator '...' is used
-  def convert(implicit declaratorId: DeclaratoridContext): CPPDeclarator[G] = declaratorId match {
-    case Declaratorid0(None, idExpr) => convert(idExpr) match {
-      case CPPTypedefName(name, Nil) => CPPName(name)
-      case _ => ??(declaratorId)
+  def convert(implicit declaratorId: DeclaratoridContext): CPPDeclarator[G] =
+    declaratorId match {
+      case Declaratorid0(None, idExpr) =>
+        convert(idExpr) match {
+          case CPPTypedefName(name, Nil) => CPPName(name)
+          case _ => ??(declaratorId)
+        }
+      case Declaratorid0(_, _) => ??(declaratorId)
     }
-    case Declaratorid0(_, _) => ??(declaratorId)
-  }
 
   // Do not support operatorFunctionId, conversionFunctionId, literalOperatorId, and things starting with a tilde
-  def convert(implicit unqualifiedId: UnqualifiedIdContext): CPPTypeSpecifier[G] = unqualifiedId match {
-    case UnqualifiedId0(templateId) => convert(templateId)
-    case UnqualifiedId1(clangppId) => CPPTypedefName(convert(clangppId), Seq())
-    case UnqualifiedId2(_) => ??(unqualifiedId)
-    case UnqualifiedId3(_) => ??(unqualifiedId)
-    case UnqualifiedId4(_) => ??(unqualifiedId)
-  }
+  def convert(
+      implicit unqualifiedId: UnqualifiedIdContext
+  ): CPPTypeSpecifier[G] =
+    unqualifiedId match {
+      case UnqualifiedId0(templateId) => convert(templateId)
+      case UnqualifiedId1(clangppId) =>
+        CPPTypedefName(convert(clangppId), Seq())
+      case UnqualifiedId2(_) => ??(unqualifiedId)
+      case UnqualifiedId3(_) => ??(unqualifiedId)
+      case UnqualifiedId4(_) => ??(unqualifiedId)
+    }
 
   // Do not support template
-  def convert(implicit qualifiedId: QualifiedIdContext): CPPTypeSpecifier[G] = qualifiedId match {
-    case QualifiedId0(nestedNameSpec, None, id) => convert(id) match {
-      case CPPTypedefName(name, genericArgs) => convert(nestedNameSpec).nestedName match {
-        case s"sycl::$rest" => SYCLClassDefName(rest + name, genericArgs)
-        case other => CPPTypedefName(other + name, genericArgs)
-      }
-      case _ => ??(qualifiedId)
+  def convert(implicit qualifiedId: QualifiedIdContext): CPPTypeSpecifier[G] =
+    qualifiedId match {
+      case QualifiedId0(nestedNameSpec, None, id) =>
+        convert(id) match {
+          case CPPTypedefName(name, genericArgs) =>
+            convert(nestedNameSpec).nestedName match {
+              case s"sycl::$rest" => SYCLClassDefName(rest + name, genericArgs)
+              case other => CPPTypedefName(other + name, genericArgs)
+            }
+          case _ => ??(qualifiedId)
+        }
+      case QualifiedId0(_, _, _) => ??(qualifiedId)
     }
-    case QualifiedId0(_, _, _) => ??(qualifiedId)
-  }
 
-  def convert(implicit id: ClangppIdentifierContext): String = id match {
-    case ClangppIdentifier0(text) => text
-    case ClangppIdentifier1(inner) => convert(inner)
-  }
+  def convert(implicit id: ClangppIdentifierContext): String =
+    id match {
+      case ClangppIdentifier0(text) => text
+      case ClangppIdentifier1(inner) => convert(inner)
+    }
 
   // Do not support lambdas without a declarator and ignore captures like [=] and [&]
-  def convert(implicit lambda: LambdaExpressionContext): CPPLambdaDefinition[G] = lambda match {
-    case LambdaExpression0(maybeContract, _, Some(lambdaDecl), compoundStmnt) =>
-      withContract(maybeContract, contract =>
-        CPPLambdaDefinition(contract.consumeApplicableContract(blame(lambda)), convert(lambdaDecl), convert(compoundStmnt))(blame(lambda))
-      )
-    case LambdaExpression0(_, _, _, _) => ??(lambda)
-  }
+  def convert(
+      implicit lambda: LambdaExpressionContext
+  ): CPPLambdaDefinition[G] =
+    lambda match {
+      case LambdaExpression0(
+            maybeContract,
+            _,
+            Some(lambdaDecl),
+            compoundStmnt,
+          ) =>
+        withContract(
+          maybeContract,
+          contract =>
+            CPPLambdaDefinition(
+              contract.consumeApplicableContract(blame(lambda)),
+              convert(lambdaDecl),
+              convert(compoundStmnt),
+            )(blame(lambda)),
+        )
+      case LambdaExpression0(_, _, _, _) => ??(lambda)
+    }
 
   // Do not support Mutable, exceptionSpecification, attributeSpecifierSeq, and trailingReturnType
   // Also do not support declarator with '...'
-  def convert(implicit decl: LambdaDeclaratorContext): CPPDeclarator[G] = decl match {
-    case LambdaDeclarator0(_, Some(parameterClause), _, None, None, None, None) => convert(parameterClause) match {
-      case (x, false) => CPPLambdaDeclarator(x)
-      case _ => ??(decl)
+  def convert(implicit decl: LambdaDeclaratorContext): CPPDeclarator[G] =
+    decl match {
+      case LambdaDeclarator0(
+            _,
+            Some(parameterClause),
+            _,
+            None,
+            None,
+            None,
+            None,
+          ) =>
+        convert(parameterClause) match {
+          case (x, false) => CPPLambdaDeclarator(x)
+          case _ => ??(decl)
+        }
+      case LambdaDeclarator0(_, None, _, None, None, None, None) =>
+        CPPLambdaDeclarator(Seq())
+      case LambdaDeclarator0(_, _, _, _, _, _, _) => ??(decl)
     }
-    case LambdaDeclarator0(_, None, _, None, None, None, None) => CPPLambdaDeclarator(Seq())
-    case LambdaDeclarator0(_, _, _, _, _, _, _) => ??(decl)
-  }
 
-  def convert(expr: LangExprContext): Expr[G] = expr match {
-    case LangExpr0(expr) => convert(expr)
-  }
+  def convert(expr: LangExprContext): Expr[G] =
+    expr match { case LangExpr0(expr) => convert(expr) }
 
-  def convert(stat: LangStatementContext): Statement[G] = stat match {
-    case LangStatement0(stat) => convert(stat)
-  }
+  def convert(stat: LangStatementContext): Statement[G] =
+    stat match { case LangStatement0(stat) => convert(stat) }
 
-  def convert(implicit t: LangTypeContext): Type[G] = t match {
-    case LangType0(typeSpec) => CPPPrimitiveType(convert(typeSpec))
-  }
+  def convert(implicit t: LangTypeContext): Type[G] =
+    t match { case LangType0(typeSpec) => CPPPrimitiveType(convert(typeSpec)) }
 
-  def convert(id: LangIdContext): String = id match {
-    case LangId0(id) => convert(id)
-  }
+  def convert(id: LangIdContext): String =
+    id match { case LangId0(id) => convert(id) }
 
-  def convert(implicit n: LangConstIntContext): BigInt = n match {
-    case LangConstInt0(Literal0(string)) => BigInt(string)
-    case LangConstInt0(Literal1(string)) => BigInt(string)
-    case LangConstInt0(Literal2(string)) => BigInt(string)
-    case x => ??(x)
-  }
+  def convert(implicit n: LangConstIntContext): BigInt =
+    n match {
+      case LangConstInt0(Literal0(string)) => BigInt(string)
+      case LangConstInt0(Literal1(string)) => BigInt(string)
+      case LangConstInt0(Literal2(string)) => BigInt(string)
+      case x => ??(x)
+    }
 
   def local(ctx: ParserRuleContext, name: String): Expr[G] =
     CPPLocal(name, Seq())(blame(ctx))(origin(ctx))
 
-  def convert(decl: LangGlobalDeclContext): Seq[GlobalDeclaration[G]] = decl match {
-    case LangGlobalDecl0(decl) => convert(decl)
-  }
+  def convert(decl: LangGlobalDeclContext): Seq[GlobalDeclaration[G]] =
+    decl match { case LangGlobalDecl0(decl) => convert(decl) }
 
   def convert(decl: LangClassDeclContext): Seq[ClassDeclaration[G]] = Nil
 
-  def withCollector[T](collector: ContractCollector[G], f: ContractCollector[G] => T): T = {
+  def withCollector[T](
+      collector: ContractCollector[G],
+      f: ContractCollector[G] => T,
+  ): T = {
     val result = f(collector)
     collector.nodes.headOption match {
-      case Some(node) => fail(node, "This specification clause may not occur here")
+      case Some(node) =>
+        fail(node, "This specification clause may not occur here")
       case None => result
     }
   }
 
-  def withContract[T](node: Option[ValEmbedContractContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node: Option[ValEmbedContractContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withContract[T](node1: Option[ValEmbedContractContext], node2: Option[ValEmbedContractContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node1: Option[ValEmbedContractContext],
+      node2: Option[ValEmbedContractContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node1.foreach(convert(_, collector))
     node2.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withContract[T](node: Seq[ValContractClauseContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node: Seq[ValContractClauseContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withCollector[T](collector: ModifierCollector, f: ModifierCollector => T): T = {
+  def withCollector[T](
+      collector: ModifierCollector,
+      f: ModifierCollector => T,
+  ): T = {
     val result = f(collector)
     collector.nodes.headOption match {
-      case Some(node) => fail(node, "This modifier cannot be attached to this declaration")
+      case Some(node) =>
+        fail(node, "This modifier cannot be attached to this declaration")
       case None => result
     }
   }
 
-  def withModifiers[T](node: Seq[ValModifierContext], f: ModifierCollector => T): T = {
+  def withModifiers[T](
+      node: Seq[ValModifierContext],
+      f: ModifierCollector => T,
+  ): T = {
     val collector = new ModifierCollector()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withModifiers[T](node: ValEmbedModifierContext, f: ModifierCollector => T): T = {
+  def withModifiers[T](
+      node: ValEmbedModifierContext,
+      f: ModifierCollector => T,
+  ): T = {
     val collector = new ModifierCollector()
     convert(node, collector)
     withCollector(collector, f)
   }
 
-  def convert(contract: ValEmbedContractContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValEmbedContract0(blocks) => blocks.foreach(convert(_, collector))
-  }
-
-  def convert(contract: ValEmbedContractBlockContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValEmbedContractBlock0(_, clauses, _) => clauses.foreach(convert(_, collector))
-    case ValEmbedContractBlock1(clauses) => clauses.foreach(convert(_, collector))
-  }
-
-  def convert(implicit contract: ValContractClauseContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValContractClause0(_, ids, _) => collector.modifies ++= convert(ids).map((contract, _))
-    case ValContractClause1(_, ids, _) => collector.accessible ++= convert(ids).map((contract, _))
-    case ValContractClause2(_, exp, _) => collector.requires += ((contract, convert(exp)))
-    case ValContractClause3(_, exp, _) => collector.ensures += ((contract, convert(exp)))
-    case ValContractClause4(_, t, id, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName((convert(id))))
-      collector.given += ((contract, variable))
-    case ValContractClause5(_, t, id, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName((convert(id))))
-      collector.yields += ((contract, variable))
-    case ValContractClause6(_, exp, _) => collector.context_everywhere += ((contract, convert(exp)))
-    case ValContractClause7(_, exp, _) =>
-      collector.requires += ((contract, convert(exp)))
-      collector.ensures += ((contract, convert(exp)))
-    case ValContractClause8(_, exp, _) => collector.loop_invariant += ((contract, convert(exp)))
-    case ValContractClause9(_, exp, _) => collector.kernel_invariant += ((contract, convert(exp)))
-    case ValContractClause10(_, _, t, id, _, exp, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName((convert(id))))
-      collector.signals += ((contract, SignalsClause(variable, convert(exp))(OriginProvider(contract))))
-    case ValContractClause11(_, invariant, _) => collector.lock_invariant += ((contract, convert(invariant)))
-    case ValContractClause12(_, None, _) => collector.decreases += ((contract, DecreasesClauseNoRecursion()))
-    case ValContractClause12(_, Some(clause), _) => collector.decreases += ((contract, convert(clause)))
-  }
-
-  def convert(implicit clause: ValDecreasesMeasureContext): DecreasesClause[G] = clause match {
-    case ValDecreasesMeasure0(_) => DecreasesClauseAssume()
-    case ValDecreasesMeasure1(exps) => DecreasesClauseTuple(convert(exps))
-  }
-
-  def convert(mod: ValEmbedModifierContext, collector: ModifierCollector): Unit = mod match {
-    case ValEmbedModifier0(_, mod, _) => convert(mod, collector)
-    case ValEmbedModifier1(mod) => convert(mod, collector)
-  }
+  def convert(
+      contract: ValEmbedContractContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValEmbedContract0(blocks) => blocks.foreach(convert(_, collector))
+    }
 
-  def convert(mod: ValModifierContext, collector: ModifierCollector): Unit = mod match {
-    case ValModifier0(name) => name match {
-      case "pure" => collector.pure += mod
-      case "inline" => collector.inline += mod
-      case "thread_local" => collector.threadLocal += mod
+  def convert(
+      contract: ValEmbedContractBlockContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValEmbedContractBlock0(_, clauses, _) =>
+        clauses.foreach(convert(_, collector))
+      case ValEmbedContractBlock1(clauses) =>
+        clauses.foreach(convert(_, collector))
     }
-    case ValStatic(_) => collector.static += mod
-  }
 
-  def convertEmbedWith(implicit whiff: Option[ValEmbedWithContext], inner: Expr[G]): Expr[G] = whiff match {
-    case None => inner
-    case Some(ValEmbedWith0(_, whiff, _)) => convertWith(whiff, inner)
-    case Some(ValEmbedWith1(whiff)) => convertWith(Some(whiff), inner)
-  }
+  def convert(
+      implicit contract: ValContractClauseContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValContractClause0(_, ids, _) =>
+        collector.modifies ++= convert(ids).map((contract, _))
+      case ValContractClause1(_, ids, _) =>
+        collector.accessible ++= convert(ids).map((contract, _))
+      case ValContractClause2(_, exp, _) =>
+        collector.requires += ((contract, convert(exp)))
+      case ValContractClause3(_, exp, _) =>
+        collector.ensures += ((contract, convert(exp)))
+      case ValContractClause4(_, t, id, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName((convert(id))))
+        collector.given += ((contract, variable))
+      case ValContractClause5(_, t, id, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName((convert(id))))
+        collector.yields += ((contract, variable))
+      case ValContractClause6(_, exp, _) =>
+        collector.context_everywhere += ((contract, convert(exp)))
+      case ValContractClause7(_, exp, _) =>
+        collector.requires += ((contract, convert(exp)))
+        collector.ensures += ((contract, convert(exp)))
+      case ValContractClause8(_, exp, _) =>
+        collector.loop_invariant += ((contract, convert(exp)))
+      case ValContractClause9(_, exp, _) =>
+        collector.kernel_invariant += ((contract, convert(exp)))
+      case ValContractClause10(_, _, t, id, _, exp, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName((convert(id))))
+        collector.signals +=
+          ((
+            contract,
+            SignalsClause(variable, convert(exp))(OriginProvider(contract)),
+          ))
+      case ValContractClause11(_, invariant, _) =>
+        collector.lock_invariant += ((contract, convert(invariant)))
+      case ValContractClause12(_, None, _) =>
+        collector.decreases += ((contract, DecreasesClauseNoRecursion()))
+      case ValContractClause12(_, Some(clause), _) =>
+        collector.decreases += ((contract, convert(clause)))
+    }
 
-  def convertWith(implicit whiff: Option[ValWithContext], inner: Expr[G]): Expr[G] = whiff match {
-    case None => inner
-    case Some(whiff@ValWith0(_, stat)) => With(convert(stat), inner)(origin(whiff))
-  }
+  def convert(implicit clause: ValDecreasesMeasureContext): DecreasesClause[G] =
+    clause match {
+      case ValDecreasesMeasure0(_) => DecreasesClauseAssume()
+      case ValDecreasesMeasure1(exps) => DecreasesClauseTuple(convert(exps))
+    }
 
-  def convertEmbedThen(implicit den: Option[ValEmbedThenContext], inner: Expr[G]): Expr[G] = den match {
-    case None => inner
-    case Some(ValEmbedThen0(_, den, _)) => convertThen(den, inner)
-    case Some(ValEmbedThen1(den)) => convertThen(Some(den), inner)
-  }
+  def convert(
+      mod: ValEmbedModifierContext,
+      collector: ModifierCollector,
+  ): Unit =
+    mod match {
+      case ValEmbedModifier0(_, mod, _) => convert(mod, collector)
+      case ValEmbedModifier1(mod) => convert(mod, collector)
+    }
 
-  def convertThen(implicit den: Option[ValThenContext], inner: Expr[G]): Expr[G] = den match {
-    case None => inner
-    case Some(den@ValThen0(_, stat)) => Then(inner, convert(stat))(origin(den))
-  }
+  def convert(mod: ValModifierContext, collector: ModifierCollector): Unit =
+    mod match {
+      case ValModifier0(name) =>
+        name match {
+          case "pure" => collector.pure += mod
+          case "inline" => collector.inline += mod
+          case "thread_local" => collector.threadLocal += mod
+        }
+      case ValStatic(_) => collector.static += mod
+    }
 
-  def convert(implicit whiff: ValEmbedWithContext): Statement[G] = whiff match {
-    case ValEmbedWith0(_, Some(whiff), _) => convert(whiff)
-    case ValEmbedWith0(_, None, _) => Block(Nil)
-    case ValEmbedWith1(whiff) => convert(whiff)
-  }
+  def convertEmbedWith(
+      implicit whiff: Option[ValEmbedWithContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    whiff match {
+      case None => inner
+      case Some(ValEmbedWith0(_, whiff, _)) => convertWith(whiff, inner)
+      case Some(ValEmbedWith1(whiff)) => convertWith(Some(whiff), inner)
+    }
 
-  def convert(implicit whiff: ValWithContext): Statement[G] = whiff match {
-    case ValWith0(_, stat) => convert(stat)
-  }
+  def convertWith(
+      implicit whiff: Option[ValWithContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    whiff match {
+      case None => inner
+      case Some(whiff @ ValWith0(_, stat)) =>
+        With(convert(stat), inner)(origin(whiff))
+    }
 
-  def convert(implicit whiff: ValEmbedThenContext): Statement[G] = whiff match {
-    case ValEmbedThen0(_, Some(whiff), _) => convert(whiff)
-    case ValEmbedThen0(_, None, _) => Block(Nil)
-    case ValEmbedThen1(whiff) => convert(whiff)
-  }
+  def convertEmbedThen(
+      implicit den: Option[ValEmbedThenContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    den match {
+      case None => inner
+      case Some(ValEmbedThen0(_, den, _)) => convertThen(den, inner)
+      case Some(ValEmbedThen1(den)) => convertThen(Some(den), inner)
+    }
 
-  def convert(implicit whiff: ValThenContext): Statement[G] = whiff match {
-    case ValThen0(_, stat) => convert(stat)
-  }
+  def convertThen(
+      implicit den: Option[ValThenContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    den match {
+      case None => inner
+      case Some(den @ ValThen0(_, stat)) =>
+        Then(inner, convert(stat))(origin(den))
+    }
 
-  def convertEmbedGiven(implicit given: Option[ValEmbedGivenContext]): Seq[(Ref[G, Variable[G]], Expr[G])] = given match {
-    case None => Nil
-    case Some(ValEmbedGiven0(_, inner, _)) => convertGiven(inner)
-    case Some(ValEmbedGiven1(inner)) => convertGiven(Some(inner))
-  }
+  def convert(implicit whiff: ValEmbedWithContext): Statement[G] =
+    whiff match {
+      case ValEmbedWith0(_, Some(whiff), _) => convert(whiff)
+      case ValEmbedWith0(_, None, _) => Block(Nil)
+      case ValEmbedWith1(whiff) => convert(whiff)
+    }
 
-  def convertGiven(implicit given: Option[ValGivenContext]): Seq[(Ref[G, Variable[G]], Expr[G])] = given match {
-    case None => Nil
-    case Some(ValGiven0(_, _, mappings, _)) => convert(mappings)
-  }
+  def convert(implicit whiff: ValWithContext): Statement[G] =
+    whiff match { case ValWith0(_, stat) => convert(stat) }
 
-  def convert(implicit mappings: ValGivenMappingsContext): Seq[(Ref[G, Variable[G]], Expr[G])] = mappings match {
-    case ValGivenMappings0(arg, _, v) => Seq((new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)))
-    case ValGivenMappings1(arg, _, v, _, more) => (new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)) +: convert(more)
-  }
+  def convert(implicit whiff: ValEmbedThenContext): Statement[G] =
+    whiff match {
+      case ValEmbedThen0(_, Some(whiff), _) => convert(whiff)
+      case ValEmbedThen0(_, None, _) => Block(Nil)
+      case ValEmbedThen1(whiff) => convert(whiff)
+    }
 
-  def convertEmbedYields(implicit given: Option[ValEmbedYieldsContext]): Seq[(Expr[G], Ref[G, Variable[G]])] = given match {
-    case None => Nil
-    case Some(ValEmbedYields0(_, inner, _)) => convertYields(inner)
-    case Some(ValEmbedYields1(inner)) => convertYields(Some(inner))
-  }
+  def convert(implicit whiff: ValThenContext): Statement[G] =
+    whiff match { case ValThen0(_, stat) => convert(stat) }
 
-  def convertYields(implicit given: Option[ValYieldsContext]): Seq[(Expr[G], Ref[G, Variable[G]])] = given match {
-    case None => Nil
-    case Some(ValYields0(_, _, mappings, _)) => convert(mappings)
-  }
+  def convertEmbedGiven(
+      implicit given: Option[ValEmbedGivenContext]
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    given match {
+      case None => Nil
+      case Some(ValEmbedGiven0(_, inner, _)) => convertGiven(inner)
+      case Some(ValEmbedGiven1(inner)) => convertGiven(Some(inner))
+    }
 
-  def convert(implicit mappings: ValYieldsMappingsContext): Seq[(Expr[G], Ref[G, Variable[G]])] = mappings match {
-    case ValYieldsMappings0(target, _, res) => Seq((local(target, convert(target)), new UnresolvedRef[G, Variable[G]](convert(res))))
-    case ValYieldsMappings1(target, _, res, _, more) => (local(target, convert(target)), new UnresolvedRef[G, Variable[G]](convert(res))) +: convert(more)
-  }
+  def convertGiven(
+      implicit given: Option[ValGivenContext]
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    given match {
+      case None => Nil
+      case Some(ValGiven0(_, _, mappings, _)) => convert(mappings)
+    }
 
-  def convert(implicit exprs: ValExpressionListContext): Seq[Expr[G]] = exprs match {
-    case ValExpressionList0(expr) => Seq(convert(expr))
-    case ValExpressionList1(head, _, tail) => convert(head) +: convert(tail)
-  }
+  def convert(
+      implicit mappings: ValGivenMappingsContext
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    mappings match {
+      case ValGivenMappings0(arg, _, v) =>
+        Seq((new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)))
+      case ValGivenMappings1(arg, _, v, _, more) =>
+        (new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)) +:
+          convert(more)
+    }
 
-  def convert(implicit ids: ValIdListContext): Seq[String] = ids match {
-    case ValIdList0(id) => Seq(convert(id))
-    case ValIdList1(id, _, ids) => convert(id) +: convert(ids)
-  }
+  def convertEmbedYields(
+      implicit given: Option[ValEmbedYieldsContext]
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    given match {
+      case None => Nil
+      case Some(ValEmbedYields0(_, inner, _)) => convertYields(inner)
+      case Some(ValEmbedYields1(inner)) => convertYields(Some(inner))
+    }
 
-  def convert(implicit ts: ValTypeListContext): Seq[Type[G]] = ts match {
-    case ValTypeList0(t) => Seq(convert(t))
-    case ValTypeList1(t, _, ts) => convert(t) +: convert(ts)
-  }
+  def convertYields(
+      implicit given: Option[ValYieldsContext]
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    given match {
+      case None => Nil
+      case Some(ValYields0(_, _, mappings, _)) => convert(mappings)
+    }
 
-  def convert(implicit root: ParserRuleContext, impOp: ValImpOpContext, left: Expr[G], right: Expr[G]): Expr[G] = impOp match {
-    case ValImpOp0(_) => Wand(left, right)(origin(impOp))
-    case ValImpOp1(_) => Implies(left, right)(origin(impOp))
-  }
+  def convert(
+      implicit mappings: ValYieldsMappingsContext
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    mappings match {
+      case ValYieldsMappings0(target, _, res) =>
+        Seq((
+          local(target, convert(target)),
+          new UnresolvedRef[G, Variable[G]](convert(res)),
+        ))
+      case ValYieldsMappings1(target, _, res, _, more) =>
+        (
+          local(target, convert(target)),
+          new UnresolvedRef[G, Variable[G]](convert(res)),
+        ) +: convert(more)
+    }
 
-  def convert(implicit root: ParserRuleContext, andOp: ValAndOpContext, left: Expr[G], right: Expr[G]): Expr[G] = andOp match {
-    case ValAndOp0(_) => col.Star(left, right)(origin(andOp))
-  }
+  def convert(implicit exprs: ValExpressionListContext): Seq[Expr[G]] =
+    exprs match {
+      case ValExpressionList0(expr) => Seq(convert(expr))
+      case ValExpressionList1(head, _, tail) => convert(head) +: convert(tail)
+    }
 
-  def convert(implicit root: ParserRuleContext, inOp: ValInOpContext, left: Expr[G], right: Expr[G]): Expr[G] = inOp match {
-    case ValInOp0(_) => AmbiguousMember(left, right)
-  }
+  def convert(implicit ids: ValIdListContext): Seq[String] =
+    ids match {
+      case ValIdList0(id) => Seq(convert(id))
+      case ValIdList1(id, _, ids) => convert(id) +: convert(ids)
+    }
 
-  def convert(implicit root: ParserRuleContext, mulOp: ValMulOpContext, left: Expr[G], right: Expr[G]): Expr[G] = mulOp match {
-    case ValMulOp0(_) => col.RatDiv(left, right)(blame(mulOp))
-  }
+  def convert(implicit ts: ValTypeListContext): Seq[Type[G]] =
+    ts match {
+      case ValTypeList0(t) => Seq(convert(t))
+      case ValTypeList1(t, _, ts) => convert(t) +: convert(ts)
+    }
 
-  def convert(implicit root: ParserRuleContext, prependOp: ValPrependOpContext, left: Expr[G], right: Expr[G]): Expr[G] = prependOp match {
-    case ValPrependOp0(_) => Cons(left, right)
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      impOp: ValImpOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    impOp match {
+      case ValImpOp0(_) => Wand(left, right)(origin(impOp))
+      case ValImpOp1(_) => Implies(left, right)(origin(impOp))
+    }
 
-  def convert(implicit root: ParserRuleContext, postfixOp: ValPostfixContext, xs: Expr[G]): Expr[G] = postfixOp match {
-    case ValPostfix0(_, _, to, _) => Take(xs, convert(to))
-    case ValPostfix1(_, from, _, None, _) => Drop(xs, convert(from))
-    case ValPostfix1(_, from, _, Some(to), _) => Slice(xs, convert(from), convert(to))
-    case ValPostfix2(_, idx, _, v, _) => SeqUpdate(xs, convert(idx), convert(v))
-    case ValPostfix3(_, name, _, args, _) => CoalesceInstancePredicateApply(xs, new UnresolvedRef[G, InstancePredicate[G]](convert(name)), args.map(convert(_)).getOrElse(Nil), WritePerm())
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      andOp: ValAndOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    andOp match { case ValAndOp0(_) => col.Star(left, right)(origin(andOp)) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      inOp: ValInOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] = inOp match { case ValInOp0(_) => AmbiguousMember(left, right) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      mulOp: ValMulOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    mulOp match { case ValMulOp0(_) => col.RatDiv(left, right)(blame(mulOp)) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      prependOp: ValPrependOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] = prependOp match { case ValPrependOp0(_) => Cons(left, right) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      postfixOp: ValPostfixContext,
+      xs: Expr[G],
+  ): Expr[G] =
+    postfixOp match {
+      case ValPostfix0(_, _, to, _) => Take(xs, convert(to))
+      case ValPostfix1(_, from, _, None, _) => Drop(xs, convert(from))
+      case ValPostfix1(_, from, _, Some(to), _) =>
+        Slice(xs, convert(from), convert(to))
+      case ValPostfix2(_, idx, _, v, _) =>
+        SeqUpdate(xs, convert(idx), convert(v))
+      case ValPostfix3(_, name, _, args, _) =>
+        CoalesceInstancePredicateApply(
+          xs,
+          new UnresolvedRef[G, InstancePredicate[G]](convert(name)),
+          args.map(convert(_)).getOrElse(Nil),
+          WritePerm(),
+        )
+    }
 
-  def convert(implicit root: ParserRuleContext, prefixOp: ValPrefixContext, xs: Expr[G]): Expr[G] = prefixOp match {
-    case ValScale(_, scale, _) => Scale(convert(scale), xs)(blame(prefixOp))
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      prefixOp: ValPrefixContext,
+      xs: Expr[G],
+  ): Expr[G] =
+    prefixOp match {
+      case ValScale(_, scale, _) => Scale(convert(scale), xs)(blame(prefixOp))
+    }
 
-  def convert(implicit block: ValEmbedStatementBlockContext): Statement[G] = block match {
-    case ValEmbedStatementBlock0(_, stats, _) => Block(stats.map(convert(_)))
-    case ValEmbedStatementBlock1(stats) => Block(stats.map(convert(_)))
-    case ValEmbedStatementBlock2(_, _, _, stat) => Extract(convert(stat))
-    case ValEmbedStatementBlock3(_, _, clauses, _, _, body, _, _, _) =>
-      withContract(clauses, contract => {
-        FramedProof(
-          AstBuildHelpers.foldStar(contract.consume(contract.requires)),
-          Block(body.map(convert(_))),
-          AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
-        )(blame(block))
-      })
-  }
+  def convert(implicit block: ValEmbedStatementBlockContext): Statement[G] =
+    block match {
+      case ValEmbedStatementBlock0(_, stats, _) => Block(stats.map(convert(_)))
+      case ValEmbedStatementBlock1(stats) => Block(stats.map(convert(_)))
+      case ValEmbedStatementBlock2(_, _, _, stat) => Extract(convert(stat))
+      case ValEmbedStatementBlock3(_, _, clauses, _, _, body, _, _, _) =>
+        withContract(
+          clauses,
+          contract => {
+            FramedProof(
+              AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+              Block(body.map(convert(_))),
+              AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
+            )(blame(block))
+          },
+        )
+    }
 
-  def convert(implicit stat: ValStatementContext): Statement[G] = stat match {
-    case ValPackage(_, expr, innerStat) => WandPackage(convert(expr), convert(innerStat))(blame(stat))
-    case ValApplyWand(_, wand, _) => WandApply(convert(wand))(blame(stat))
-    case ValFold(_, predicate, _) =>
-      Fold(convert(predicate))(blame(stat))
-    case ValUnfold(_, predicate, _) =>
-      Unfold(convert(predicate))(blame(stat))
-    case ValOpen(_, _, _) => ??(stat)
-    case ValClose(_, _, _) => ??(stat)
-    case ValAssert(_, assn, _) => Assert(convert(assn))(blame(stat))
-    case ValAssume(_, assn, _) => Assume(convert(assn))
-    case ValInhale(_, resource, _) => Inhale(convert(resource))
-    case ValExhale(_, resource, _) => Exhale(convert(resource))(blame(stat))
-    case ValLabel(_, label, _) =>
-      Label(new LabelDecl()(origin(stat).sourceName(convert(label))), Block(Nil))
-    case ValRefute(_, assn, _) => Refute(convert(assn))(blame(stat))
-    case ValWitness(_, _, _) => ??(stat)
-    case ValGhost(_, stat) => convert(stat)
-    case ValSend(_, name, _, delta, _, resource, _) =>
-      Send(new SendDecl()(origin(stat).sourceName(convert(name))), convert(delta), convert(resource))(blame(stat))
-    case ValRecv(_, name, _) =>
-      Recv(new UnresolvedRef[G, SendDecl[G]](convert(name)))
-    case ValTransfer(_, _, _) => ??(stat)
-    case ValCslSubject(_, _, _) => ??(stat) // FIXME PB: csl_subject seems to be used
-    case ValSpecIgnoreStart(_, _) => SpecIgnoreEnd()
-    case ValSpecIgnoreEnd(_, _) => SpecIgnoreStart()
-    case ValActionModel(_, _, model, _, perm, _, after, _, action, _, impl) =>
-      ModelDo(convert(model), convert(perm), convert(after), convert(action), impl match {
-        case ValActionImpl0(_) => Block(Nil)
-        case ValActionImpl1(inner) => convert(inner)
-      })
-    case ValAtomic(_, _, invariant, _, body) =>
-      ParAtomic(Seq(new UnresolvedRef[G, ParInvariantDecl[G]](convert(invariant))), convert(body))(blame(stat))
-    case ValCommit(_, obj, _) =>
-      Commit(convert(obj))(blame(stat))
-    case ValExtract(_, body) =>
-      Extract(convert(body))
-    case ValFrame(_, clauses, body) =>
-      withContract(clauses, contract => {
-        FramedProof(
-          AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+  def convert(implicit stat: ValStatementContext): Statement[G] =
+    stat match {
+      case ValPackage(_, expr, innerStat) =>
+        WandPackage(convert(expr), convert(innerStat))(blame(stat))
+      case ValApplyWand(_, wand, _) => WandApply(convert(wand))(blame(stat))
+      case ValFold(_, predicate, _) => Fold(convert(predicate))(blame(stat))
+      case ValUnfold(_, predicate, _) => Unfold(convert(predicate))(blame(stat))
+      case ValOpen(_, _, _) => ??(stat)
+      case ValClose(_, _, _) => ??(stat)
+      case ValAssert(_, assn, _) => Assert(convert(assn))(blame(stat))
+      case ValAssume(_, assn, _) => Assume(convert(assn))
+      case ValInhale(_, resource, _) => Inhale(convert(resource))
+      case ValExhale(_, resource, _) => Exhale(convert(resource))(blame(stat))
+      case ValLabel(_, label, _) =>
+        Label(
+          new LabelDecl()(origin(stat).sourceName(convert(label))),
+          Block(Nil),
+        )
+      case ValRefute(_, assn, _) => Refute(convert(assn))(blame(stat))
+      case ValWitness(_, _, _) => ??(stat)
+      case ValGhost(_, stat) => convert(stat)
+      case ValSend(_, name, _, delta, _, resource, _) =>
+        Send(
+          new SendDecl()(origin(stat).sourceName(convert(name))),
+          convert(delta),
+          convert(resource),
+        )(blame(stat))
+      case ValRecv(_, name, _) =>
+        Recv(new UnresolvedRef[G, SendDecl[G]](convert(name)))
+      case ValTransfer(_, _, _) => ??(stat)
+      case ValCslSubject(_, _, _) =>
+        ??(stat) // FIXME PB: csl_subject seems to be used
+      case ValSpecIgnoreStart(_, _) => SpecIgnoreEnd()
+      case ValSpecIgnoreEnd(_, _) => SpecIgnoreStart()
+      case ValActionModel(_, _, model, _, perm, _, after, _, action, _, impl) =>
+        ModelDo(
+          convert(model),
+          convert(perm),
+          convert(after),
+          convert(action),
+          impl match {
+            case ValActionImpl0(_) => Block(Nil)
+            case ValActionImpl1(inner) => convert(inner)
+          },
+        )
+      case ValAtomic(_, _, invariant, _, body) =>
+        ParAtomic(
+          Seq(new UnresolvedRef[G, ParInvariantDecl[G]](convert(invariant))),
           convert(body),
-          AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
         )(blame(stat))
-      })
-  }
+      case ValCommit(_, obj, _) => Commit(convert(obj))(blame(stat))
+      case ValExtract(_, body) => Extract(convert(body))
+      case ValFrame(_, clauses, body) =>
+        withContract(
+          clauses,
+          contract => {
+            FramedProof(
+              AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+              convert(body),
+              AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
+            )(blame(stat))
+          },
+        )
+    }
 
-  def convert(implicit block: ValBlockContext): Seq[Statement[G]] = block match {
-    case ValBlock0(_, stats, _) => stats.map(convert(_))
-  }
+  def convert(implicit block: ValBlockContext): Seq[Statement[G]] =
+    block match { case ValBlock0(_, stats, _) => stats.map(convert(_)) }
 
-  def convert(implicit arg: ValArgContext): Variable[G] = arg match {
-    case ValArg0(paramDecl) => {
-      val param = convert(paramDecl)
-      new Variable(CPP.typeOrReturnTypeFromDeclarator(param.specifiers, param.declarator))(origin(arg).sourceName(CPP.nameFromDeclarator(param.declarator)))
+  def convert(implicit arg: ValArgContext): Variable[G] =
+    arg match {
+      case ValArg0(paramDecl) => {
+        val param = convert(paramDecl)
+        new Variable(
+          CPP.typeOrReturnTypeFromDeclarator(param.specifiers, param.declarator)
+        )(origin(arg).sourceName(CPP.nameFromDeclarator(param.declarator)))
+      }
     }
-  }
 
-  def convert(implicit args: ValArgListContext): Seq[Variable[G]] = args match {
-    case ValArgList0(arg) => Seq(convert(arg))
-    case ValArgList1(arg, _, args) => convert(arg) +: convert(args)
-  }
+  def convert(implicit args: ValArgListContext): Seq[Variable[G]] =
+    args match {
+      case ValArgList0(arg) => Seq(convert(arg))
+      case ValArgList1(arg, _, args) => convert(arg) +: convert(args)
+    }
 
-  def convert(implicit decl: ValEmbedGlobalDeclarationBlockContext): Seq[GlobalDeclaration[G]] = decl match {
-    case ValEmbedGlobalDeclarationBlock0(_, globals, _) => globals.flatMap(convert(_))
-    case ValEmbedGlobalDeclarationBlock1(globals) => globals.flatMap(convert(_))
-  }
+  def convert(
+      implicit decl: ValEmbedGlobalDeclarationBlockContext
+  ): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case ValEmbedGlobalDeclarationBlock0(_, globals, _) =>
+        globals.flatMap(convert(_))
+      case ValEmbedGlobalDeclarationBlock1(globals) =>
+        globals.flatMap(convert(_))
+    }
 
-  def convert(implicit decl: ValGlobalDeclarationContext): Seq[GlobalDeclaration[G]] = decl match {
-    case ValAxiom(_, name, _, axiom, _) =>
-      Seq(new SimplificationRule(convert(axiom))(origin(decl).sourceName(convert(name))))
-    case ValPredicate(modifiers, _, name, _, args, _, definition) =>
-      withModifiers(modifiers, mods =>
-        Seq(new Predicate(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          mods.consume(mods.threadLocal), mods.consume(mods.inline))
-          (origin(decl).sourceName((currentNamespacePath.reverse :+ convert(name)).mkString("::")))))
-    case ValFunction(contract, modifiers, _, t, name, typeArgs, _, args, _, definition) =>
-      Seq(withContract(contract, c =>
-        withModifiers(modifiers, m => {
-          val namedOrigin = origin(decl).sourceName((currentNamespacePath.reverse :+ convert(name)).mkString("::"))
-          new Function(
-            convert(t),
-            args.map(convert(_)).getOrElse(Nil),
+  def convert(
+      implicit decl: ValGlobalDeclarationContext
+  ): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case ValAxiom(_, name, _, axiom, _) =>
+        Seq(new SimplificationRule(convert(axiom))(
+          origin(decl).sourceName(convert(name))
+        ))
+      case ValPredicate(modifiers, _, name, _, args, _, definition) =>
+        withModifiers(
+          modifiers,
+          mods =>
+            Seq(
+              new Predicate(
+                args.map(convert(_)).getOrElse(Nil),
+                convert(definition),
+                mods.consume(mods.threadLocal),
+                mods.consume(mods.inline),
+              )(origin(decl).sourceName(
+                (currentNamespacePath.reverse :+ convert(name)).mkString("::")
+              ))
+            ),
+        )
+      case ValFunction(
+            contract,
+            modifiers,
+            _,
+            t,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c =>
+            withModifiers(
+              modifiers,
+              m => {
+                val namedOrigin = origin(decl).sourceName(
+                  (currentNamespacePath.reverse :+ convert(name)).mkString("::")
+                )
+                new Function(
+                  convert(t),
+                  args.map(convert(_)).getOrElse(Nil),
+                  typeArgs.map(convert(_)).getOrElse(Nil),
+                  convert(definition),
+                  c.consumeApplicableContract(blame(decl)),
+                  m.consume(m.inline),
+                )(blame(decl))(namedOrigin)
+              },
+            ),
+        ))
+      case ValModel(_, name, _, decls, _) =>
+        Seq(new Model(decls.flatMap(convert(_)))(
+          origin(decl).sourceName(convert(name))
+        ))
+      case ValGhostDecl(_, inner) => convert(inner)
+      case ValAdtDecl(_, name, typeArgs, _, decls, _) =>
+        Seq(
+          new AxiomaticDataType(
+            decls.map(convert(_)),
             typeArgs.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)),
-            m.consume(m.inline))(blame(decl))(namedOrigin)
-        })
-      ))
-    case ValModel(_, name, _, decls, _) =>
-      Seq(new Model(decls.flatMap(convert(_)))(origin(decl).sourceName(convert(name))))
-    case ValGhostDecl(_, inner) =>
-      convert(inner)
-    case ValAdtDecl(_, name, typeArgs, _, decls, _) =>
-      Seq(new AxiomaticDataType(decls.map(convert(_)), typeArgs.map(convert(_)).getOrElse(Nil))(
-        origin(decl).sourceName((currentNamespacePath.reverse :+ convert(name)).mkString("::"))
-      ))
-  }
+          )(origin(decl).sourceName(
+            (currentNamespacePath.reverse :+ convert(name)).mkString("::")
+          ))
+        )
+    }
 
-  def convert(implicit decl: ValEmbedClassDeclarationBlockContext): Seq[ClassDeclaration[G]] = decl match {
-    case ValEmbedClassDeclarationBlock0(_, decls, _) => decls.flatMap(convert(_, x => x))
-    case ValEmbedClassDeclarationBlock1(decls) => decls.flatMap(convert(_, x => x))
-  }
+  def convert(
+      implicit decl: ValEmbedClassDeclarationBlockContext
+  ): Seq[ClassDeclaration[G]] =
+    decl match {
+      case ValEmbedClassDeclarationBlock0(_, decls, _) =>
+        decls.flatMap(convert(_, x => x))
+      case ValEmbedClassDeclarationBlock1(decls) =>
+        decls.flatMap(convert(_, x => x))
+    }
 
-  def convert[T](implicit decl: ValClassDeclarationContext, transform: ClassDeclaration[G] => T): Seq[T] = decl match {
-    case ValInstancePredicate(modifiers, _, name, _, args, _, definition) =>
-      Seq(withModifiers(modifiers, mods => {
-        transform(new InstancePredicate(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          mods.consume(mods.threadLocal), mods.consume(mods.inline))(
-          origin(decl).sourceName(convert(name))))
-      }))
-    case ValInstanceFunction(contract, modifiers, _, t, name, typeArgs, _, args, _, definition) =>
-      Seq(withContract(contract, c => {
-        withModifiers(modifiers, m => {
-          transform(new InstanceFunction(
-            convert(t),
-            args.map(convert(_)).getOrElse(Nil),
-            typeArgs.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)), m.consume(m.inline))(
-            blame(decl))(
-            origin(decl).sourceName(convert(name))))
-        })
-      }))
-    case ValInstanceGhostDecl(_, decl) => convert(decl).map(transform)
-  }
+  def convert[T](
+      implicit decl: ValClassDeclarationContext,
+      transform: ClassDeclaration[G] => T,
+  ): Seq[T] =
+    decl match {
+      case ValInstancePredicate(modifiers, _, name, _, args, _, definition) =>
+        Seq(withModifiers(
+          modifiers,
+          mods => {
+            transform(
+              new InstancePredicate(
+                args.map(convert(_)).getOrElse(Nil),
+                convert(definition),
+                mods.consume(mods.threadLocal),
+                mods.consume(mods.inline),
+              )(origin(decl).sourceName(convert(name)))
+            )
+          },
+        ))
+      case ValInstanceFunction(
+            contract,
+            modifiers,
+            _,
+            t,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c => {
+            withModifiers(
+              modifiers,
+              m => {
+                transform(
+                  new InstanceFunction(
+                    convert(t),
+                    args.map(convert(_)).getOrElse(Nil),
+                    typeArgs.map(convert(_)).getOrElse(Nil),
+                    convert(definition),
+                    c.consumeApplicableContract(blame(decl)),
+                    m.consume(m.inline),
+                  )(blame(decl))(origin(decl).sourceName(convert(name)))
+                )
+              },
+            )
+          },
+        ))
+      case ValInstanceGhostDecl(_, decl) => convert(decl).map(transform)
+    }
 
-  def convert(implicit decl: ValModelDeclarationContext): Seq[ModelDeclaration[G]] = decl match {
-    case ValModelField(t, name, _) =>
-      convert(name).map(name => {
-        new ModelField(convert(t))(origin(decl).sourceName(name))
-      })
-    case ValModelProcess(contract, _, name, _, args, _, _, definition, _) =>
-      Seq(withContract(contract, c => {
-        new ModelProcess(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          AstBuildHelpers.foldAnd(c.consume(c.requires)), AstBuildHelpers.foldAnd(c.consume(c.ensures)),
-          c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)), c.consume(c.accessible).map(new UnresolvedRef[G, ModelField[G]](_)))(
-          blame(decl))(origin(decl).sourceName(convert(name)))
-      }))
-    case ValModelAction(contract, _, name, _, args, _, _) =>
-      Seq(withContract(contract, c => {
-        new ModelAction(args.map(convert(_)).getOrElse(Nil),
-          AstBuildHelpers.foldAnd(c.consume(c.requires)), AstBuildHelpers.foldAnd(c.consume(c.ensures)),
-          c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)), c.consume(c.accessible).map(new UnresolvedRef[G, ModelField[G]](_)))(
-          origin(decl).sourceName(convert(name)))
-      }))
-  }
+  def convert(
+      implicit decl: ValModelDeclarationContext
+  ): Seq[ModelDeclaration[G]] =
+    decl match {
+      case ValModelField(t, name, _) =>
+        convert(name).map(name => {
+          new ModelField(convert(t))(origin(decl).sourceName(name))
+        })
+      case ValModelProcess(contract, _, name, _, args, _, _, definition, _) =>
+        Seq(withContract(
+          contract,
+          c => {
+            new ModelProcess(
+              args.map(convert(_)).getOrElse(Nil),
+              convert(definition),
+              AstBuildHelpers.foldAnd(c.consume(c.requires)),
+              AstBuildHelpers.foldAnd(c.consume(c.ensures)),
+              c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)),
+              c.consume(c.accessible)
+                .map(new UnresolvedRef[G, ModelField[G]](_)),
+            )(blame(decl))(origin(decl).sourceName(convert(name)))
+          },
+        ))
+      case ValModelAction(contract, _, name, _, args, _, _) =>
+        Seq(withContract(
+          contract,
+          c => {
+            new ModelAction(
+              args.map(convert(_)).getOrElse(Nil),
+              AstBuildHelpers.foldAnd(c.consume(c.requires)),
+              AstBuildHelpers.foldAnd(c.consume(c.ensures)),
+              c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)),
+              c.consume(c.accessible)
+                .map(new UnresolvedRef[G, ModelField[G]](_)),
+            )(origin(decl).sourceName(convert(name)))
+          },
+        ))
+    }
 
-  def convert(implicit ts: ValTypeVarsContext): Seq[Variable[G]] = ts match {
-    case ValTypeVars0(_, names, _) =>
-      convert(names).map(name => new Variable(TType(TAnyValue()))(origin(ts).sourceName(name)))
-  }
+  def convert(implicit ts: ValTypeVarsContext): Seq[Variable[G]] =
+    ts match {
+      case ValTypeVars0(_, names, _) =>
+        convert(names).map(name =>
+          new Variable(TType(TAnyValue()))(origin(ts).sourceName(name))
+        )
+    }
 
-  def convert(implicit decl: ValAdtDeclarationContext): ADTDeclaration[G] = decl match {
-    case ValAdtAxiom(_, ax, _) => new ADTAxiom(convert(ax))
-    case ValAdtFunction(_, returnType, name, _, args, _, _) =>
-      new ADTFunction(args.map(convert(_)).getOrElse(Nil), convert(returnType))(
-        origin(decl).sourceName(convert(name)))
-  }
+  def convert(implicit decl: ValAdtDeclarationContext): ADTDeclaration[G] =
+    decl match {
+      case ValAdtAxiom(_, ax, _) => new ADTAxiom(convert(ax))
+      case ValAdtFunction(_, returnType, name, _, args, _, _) =>
+        new ADTFunction(
+          args.map(convert(_)).getOrElse(Nil),
+          convert(returnType),
+        )(origin(decl).sourceName(convert(name)))
+    }
 
-  def convert(implicit definition: ValPureDefContext): Option[Expr[G]] = definition match {
-    case ValPureAbstractBody(_) => None
-    case ValPureBody(_, expr, _) =>
-      prependNamespace = false
-      val result = Some(convert(expr))
-      prependNamespace = true
-      result
-  }
+  def convert(implicit definition: ValPureDefContext): Option[Expr[G]] =
+    definition match {
+      case ValPureAbstractBody(_) => None
+      case ValPureBody(_, expr, _) =>
+        prependNamespace = false
+        val result = Some(convert(expr))
+        prependNamespace = true
+        result
+    }
 
-  def convert(implicit definition: ValImpureDefContext): Option[Statement[G]] = definition match {
-    case ValImpureAbstractBody(_) => None
-    case ValImpureBody(statement) => Some(convert(statement))
-  }
+  def convert(implicit definition: ValImpureDefContext): Option[Statement[G]] =
+    definition match {
+      case ValImpureAbstractBody(_) => None
+      case ValImpureBody(statement) => Some(convert(statement))
+    }
 
-  def convert(implicit t: ValTypeContext): Type[G] = t match {
-    case ValPrimaryType(name) => name match {
-      case "resource" => TResourceVal()
-      case "process" => TProcess()
-      case "frac" => TFraction()
-      case "zfrac" => TZFraction()
-      case "rational" => TRational()
-      case "bool" => TBool()
-      case "ref" => TRef()
-      case "any" => TAnyValue()
-      case "nothing" => TNothing()
-    }
-    case ValSeqType(_, _, element, _) => TSeq(convert(element))
-    case ValSetType(_, _, element, _) => TSet(convert(element))
-    case ValVectorType(_, _, element, _, size, _) => TVector(convert(size), convert(element))()
-    case ValBagType(_, _, element, _) => TBag(convert(element))
-    case ValOptionType(_, _, element, _) => TOption(convert(element))
-    case ValMapType(_, _, key, _, value, _) => TMap(convert(key), convert(value))
-    case ValTupleType(_, _, t1, _, t2, _) => TTuple(Seq(convert(t1), convert(t2)))
-    case ValPointerType(_, _, element, _) => TPointer(convert(element))
-    case ValTypeType(_, _, element, _) => TType(convert(element))
-    case ValEitherType(_, _, left, _, right, _) => TEither(convert(left), convert(right))
-  }
+  def convert(implicit t: ValTypeContext): Type[G] =
+    t match {
+      case ValPrimaryType(name) =>
+        name match {
+          case "resource" => TResourceVal()
+          case "process" => TProcess()
+          case "frac" => TFraction()
+          case "zfrac" => TZFraction()
+          case "rational" => TRational()
+          case "bool" => TBool()
+          case "ref" => TRef()
+          case "any" => TAnyValue()
+          case "nothing" => TNothing()
+        }
+      case ValSeqType(_, _, element, _) => TSeq(convert(element))
+      case ValSetType(_, _, element, _) => TSet(convert(element))
+      case ValVectorType(_, _, element, _, size, _) =>
+        TVector(convert(size), convert(element))()
+      case ValBagType(_, _, element, _) => TBag(convert(element))
+      case ValOptionType(_, _, element, _) => TOption(convert(element))
+      case ValMapType(_, _, key, _, value, _) =>
+        TMap(convert(key), convert(value))
+      case ValTupleType(_, _, t1, _, t2, _) =>
+        TTuple(Seq(convert(t1), convert(t2)))
+      case ValPointerType(_, _, element, _) => TPointer(convert(element))
+      case ValTypeType(_, _, element, _) => TType(convert(element))
+      case ValEitherType(_, _, left, _, right, _) =>
+        TEither(convert(left), convert(right))
+    }
 
-  def convert(implicit e: ValPrimarySeqContext): Expr[G] = e match {
-    case ValCardinality(_, xs, _) => Size(convert(xs))
-    case ValArrayValues(_, _, a, _, from, _, to, _) => Values(convert(a), convert(from), convert(to))(blame(e))
-  }
+  def convert(implicit e: ValPrimarySeqContext): Expr[G] =
+    e match {
+      case ValCardinality(_, xs, _) => Size(convert(xs))
+      case ValArrayValues(_, _, a, _, from, _, to, _) =>
+        Values(convert(a), convert(from), convert(to))(blame(e))
+    }
 
-  def convert(implicit e: ValPrimaryOptionContext): Expr[G] = e match {
-    case ValSome(_, _, v, _) => OptSome(convert(v))
-  }
+  def convert(implicit e: ValPrimaryOptionContext): Expr[G] =
+    e match { case ValSome(_, _, v, _) => OptSome(convert(v)) }
 
-  def convert(implicit e: ValPrimaryEitherContext): Expr[G] = e match {
-    case ValLeft(_, _, inner, _) => EitherLeft(convert(inner))
-    case ValRight(_, _, inner, _) => EitherRight(convert(inner))
-  }
+  def convert(implicit e: ValPrimaryEitherContext): Expr[G] =
+    e match {
+      case ValLeft(_, _, inner, _) => EitherLeft(convert(inner))
+      case ValRight(_, _, inner, _) => EitherRight(convert(inner))
+    }
 
   // valsetcompselectors
-  def convert(implicit exprs: ValMapPairsContext): Seq[(Expr[G], Expr[G])] = exprs match {
-    case ValMapPairs0(k, _, v) => Seq((convert(k), convert(v)))
-    case ValMapPairs1(k, _, v, _, tail) => (convert(k), convert(v)) +: convert(tail)
-  }
+  def convert(implicit exprs: ValMapPairsContext): Seq[(Expr[G], Expr[G])] =
+    exprs match {
+      case ValMapPairs0(k, _, v) => Seq((convert(k), convert(v)))
+      case ValMapPairs1(k, _, v, _, tail) =>
+        (convert(k), convert(v)) +: convert(tail)
+    }
 
-  def convert(implicit e: ValPrimaryCollectionConstructorContext): Expr[G] = e match {
-    case ValTypedLiteralSeq(_, _, t, _, _, exprs, _) => LiteralSeq(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralSet(_, _, t, _, _, exprs, _) => LiteralSet(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralVector(_, _, t, _, _, exprs, _) => LiteralVector(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValSetComprehension(_, _, t, _, _, value, _, selectors, _, something, _) => ??(e)
-    case ValTypedLiteralBag(_, _, t, _, _, exprs, _) => LiteralBag(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralMap(_, _, key, _, value, _, _, pairs, _) => LiteralMap(convert(key), convert(value), pairs.map(convert(_)).getOrElse(Nil))
-    case ValTypedTuple(_, _, t1, _, t2, _, _, v1, _, v2, _) =>
-      LiteralTuple(Seq(convert(t1), convert(t2)), Seq(convert(v1), convert(v2)))
-    case ValLiteralSeq(_, exprs, _) => UntypedLiteralSeq(convert(exprs))
-    case ValLiteralSet(_, exprs, _) => UntypedLiteralSet(convert(exprs))
-    case ValLiteralBag(_, exprs, _) => UntypedLiteralBag(convert(exprs))
-    case ValEmptySeq(_, t, _) => LiteralSeq(convert(t), Nil)
-    case ValEmptySet(_, t, _) => LiteralSet(convert(t), Nil)
-    case ValEmptyBag(_, t, _) => LiteralBag(convert(t), Nil)
-    case ValRange(_, from, _, to, _) => Range(convert(from), convert(to))
-    case ValRangeSet(_, from, _, to, _) => RangeSet(convert(from), convert(to))
-  }
+  def convert(implicit e: ValPrimaryCollectionConstructorContext): Expr[G] =
+    e match {
+      case ValTypedLiteralSeq(_, _, t, _, _, exprs, _) =>
+        LiteralSeq(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralSet(_, _, t, _, _, exprs, _) =>
+        LiteralSet(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralVector(_, _, t, _, _, exprs, _) =>
+        LiteralVector(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValSetComprehension(
+            _,
+            _,
+            t,
+            _,
+            _,
+            value,
+            _,
+            selectors,
+            _,
+            something,
+            _,
+          ) =>
+        ??(e)
+      case ValTypedLiteralBag(_, _, t, _, _, exprs, _) =>
+        LiteralBag(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralMap(_, _, key, _, value, _, _, pairs, _) =>
+        LiteralMap(
+          convert(key),
+          convert(value),
+          pairs.map(convert(_)).getOrElse(Nil),
+        )
+      case ValTypedTuple(_, _, t1, _, t2, _, _, v1, _, v2, _) =>
+        LiteralTuple(
+          Seq(convert(t1), convert(t2)),
+          Seq(convert(v1), convert(v2)),
+        )
+      case ValLiteralSeq(_, exprs, _) => UntypedLiteralSeq(convert(exprs))
+      case ValLiteralSet(_, exprs, _) => UntypedLiteralSet(convert(exprs))
+      case ValLiteralBag(_, exprs, _) => UntypedLiteralBag(convert(exprs))
+      case ValEmptySeq(_, t, _) => LiteralSeq(convert(t), Nil)
+      case ValEmptySet(_, t, _) => LiteralSet(convert(t), Nil)
+      case ValEmptyBag(_, t, _) => LiteralBag(convert(t), Nil)
+      case ValRange(_, from, _, to, _) => Range(convert(from), convert(to))
+      case ValRangeSet(_, from, _, to, _) =>
+        RangeSet(convert(from), convert(to))
+    }
 
-  def convert(implicit e: ValPrimaryPermissionContext): Expr[G] = e match {
-    case ValCurPerm(_, _, loc, _) => CurPerm(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValPerm(_, _, loc, _, perm, _) => Perm(AmbiguousLocation(convert(loc))(blame(e)), convert(perm))
-    case ValValue(_, _, loc, _) => Value(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValAutoValue(_, _, loc, _) => AutoValue(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValPointsTo(_, _, loc, _, perm, _, v, _) => PointsTo(AmbiguousLocation(convert(loc))(blame(e)), convert(perm), convert(v))
-    case ValHPerm(_, _, loc, _, perm, _) => ModelPerm(convert(loc), convert(perm))
-    case ValAPerm(_, _, loc, _, perm, _) => ActionPerm(convert(loc), convert(perm))
-    case ValArrayPerm(_, _, arr, _, i, _, step, _, count, _, perm, _) => ??(e)
-    case ValMatrix(_, _, m, _, dim1, _, dim2, _) => ValidMatrix(convert(m), convert(dim1), convert(dim2))
-    case ValArray(_, _, arr, _, dim, _) => ValidArray(convert(arr), convert(dim))
-    case ValPointer(_, _, ptr, _, n, _, perm, _) => PermPointer(convert(ptr), convert(n), convert(perm))
-    case ValPointerIndex(_, _, ptr, _, idx, _, perm, _) => PermPointerIndex(convert(ptr), convert(idx), convert(perm))
-    case ValPointerBlockLength(_, _, ptr, _) => PointerBlockLength(convert(ptr))(blame(e))
-    case ValPointerBlockOffset(_, _, ptr, _) => PointerBlockOffset(convert(ptr))(blame(e))
-    case ValPointerLength(_, _, ptr, _) => PointerLength(convert(ptr))(blame(e))
-    case ValPolarityDependent(_, _, onInhale, _, onExhale, _) => PolarityDependent(convert(onInhale), convert(onExhale))
-  }
+  def convert(implicit e: ValPrimaryPermissionContext): Expr[G] =
+    e match {
+      case ValCurPerm(_, _, loc, _) =>
+        CurPerm(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValPerm(_, _, loc, _, perm, _) =>
+        Perm(AmbiguousLocation(convert(loc))(blame(e)), convert(perm))
+      case ValValue(_, _, loc, _) =>
+        Value(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValAutoValue(_, _, loc, _) =>
+        AutoValue(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValPointsTo(_, _, loc, _, perm, _, v, _) =>
+        PointsTo(
+          AmbiguousLocation(convert(loc))(blame(e)),
+          convert(perm),
+          convert(v),
+        )
+      case ValHPerm(_, _, loc, _, perm, _) =>
+        ModelPerm(convert(loc), convert(perm))
+      case ValAPerm(_, _, loc, _, perm, _) =>
+        ActionPerm(convert(loc), convert(perm))
+      case ValArrayPerm(_, _, arr, _, i, _, step, _, count, _, perm, _) => ??(e)
+      case ValMatrix(_, _, m, _, dim1, _, dim2, _) =>
+        ValidMatrix(convert(m), convert(dim1), convert(dim2))
+      case ValArray(_, _, arr, _, dim, _) =>
+        ValidArray(convert(arr), convert(dim))
+      case ValPointer(_, _, ptr, _, n, _, perm, _) =>
+        PermPointer(convert(ptr), convert(n), convert(perm))
+      case ValPointerIndex(_, _, ptr, _, idx, _, perm, _) =>
+        PermPointerIndex(convert(ptr), convert(idx), convert(perm))
+      case ValPointerBlockLength(_, _, ptr, _) =>
+        PointerBlockLength(convert(ptr))(blame(e))
+      case ValPointerBlockOffset(_, _, ptr, _) =>
+        PointerBlockOffset(convert(ptr))(blame(e))
+      case ValPointerLength(_, _, ptr, _) =>
+        PointerLength(convert(ptr))(blame(e))
+      case ValPolarityDependent(_, _, onInhale, _, onExhale, _) =>
+        PolarityDependent(convert(onInhale), convert(onExhale))
+    }
 
-  def convert(implicit v: ValBindingContext): (Variable[G], Seq[Expr[G]]) = v match {
-    case ValRangeBinding(t, id, _, from, _, to) =>
-      val variable = new Variable[G](convert(t))(origin(id).sourceName(convert(id)))
-      val cond = SeqMember[G](Local(variable.ref), Range(convert(from), convert(to)))
-      (variable, Seq(cond))
-    case ValNormalBinding(arg) =>
-      (convert(arg), Nil)
-  }
+  def convert(implicit v: ValBindingContext): (Variable[G], Seq[Expr[G]]) =
+    v match {
+      case ValRangeBinding(t, id, _, from, _, to) =>
+        val variable =
+          new Variable[G](convert(t))(origin(id).sourceName(convert(id)))
+        val cond = SeqMember[G](
+          Local(variable.ref),
+          Range(convert(from), convert(to)),
+        )
+        (variable, Seq(cond))
+      case ValNormalBinding(arg) => (convert(arg), Nil)
+    }
 
-  def convert(implicit vs: ValBindingsContext): (Seq[Variable[G]], Seq[Expr[G]]) = vs match {
-    case ValBindings0(binding) =>
-      val (v, cs) = convert(binding)
-      (Seq(v), cs)
-    case ValBindings1(binding, _, bindings) =>
-      val (v, cs) = convert(binding)
-      val (vs, ds) = convert(bindings)
-      (v +: vs, cs ++ ds)
-  }
+  def convert(
+      implicit vs: ValBindingsContext
+  ): (Seq[Variable[G]], Seq[Expr[G]]) =
+    vs match {
+      case ValBindings0(binding) =>
+        val (v, cs) = convert(binding)
+        (Seq(v), cs)
+      case ValBindings1(binding, _, bindings) =>
+        val (v, cs) = convert(binding)
+        val (vs, ds) = convert(bindings)
+        (v +: vs, cs ++ ds)
+    }
 
-  def convert(implicit e: ValPrimaryBinderContext): Expr[G] = e match {
-    case ValQuantifier(_, symbol, bindings, _, bodyOrCond, maybeBody, _) =>
-      val (variables, bindingConds) = convert(bindings)
-      val (bodyConds, body) = maybeBody match {
-        case Some(ValBinderCont0(_, body)) => (Seq(convert(bodyOrCond)), convert(body))
-        case None => (Nil, convert(bodyOrCond))
-      }
-      val conds = bindingConds ++ bodyConds
-      symbol match {
-        case ValForallSymb(_) => Forall(variables, Nil, implies(conds, body))
-        case ValStarallSymb(_) => Starall(variables, Nil, implies(conds, body))(blame(e))
-        case ValExistsSymb(_) => Exists(variables, Nil, foldAnd(conds :+ body))
-      }
-    case ValLet(_, _, t, id, _, v, _, body, _) =>
-      Let(new Variable(convert(t))(origin(id).sourceName(convert(id))), convert(v), convert(body))
-    case ValForPerm(_, _, bindings, _, loc, _, body, _) =>
-      ForPerm(convert(bindings), AmbiguousLocation(convert(loc))(blame(loc))(origin(loc)), convert(body))
-    case ValForPermWithValue(_, _, _, id, _, body, _) =>
-      ForPermWithValue(new Variable(TAny())(origin(id).sourceName(convert(id))), convert(body))
-  }
+  def convert(implicit e: ValPrimaryBinderContext): Expr[G] =
+    e match {
+      case ValQuantifier(_, symbol, bindings, _, bodyOrCond, maybeBody, _) =>
+        val (variables, bindingConds) = convert(bindings)
+        val (bodyConds, body) =
+          maybeBody match {
+            case Some(ValBinderCont0(_, body)) =>
+              (Seq(convert(bodyOrCond)), convert(body))
+            case None => (Nil, convert(bodyOrCond))
+          }
+        val conds = bindingConds ++ bodyConds
+        symbol match {
+          case ValForallSymb(_) => Forall(variables, Nil, implies(conds, body))
+          case ValStarallSymb(_) =>
+            Starall(variables, Nil, implies(conds, body))(blame(e))
+          case ValExistsSymb(_) =>
+            Exists(variables, Nil, foldAnd(conds :+ body))
+        }
+      case ValLet(_, _, t, id, _, v, _, body, _) =>
+        Let(
+          new Variable(convert(t))(origin(id).sourceName(convert(id))),
+          convert(v),
+          convert(body),
+        )
+      case ValForPerm(_, _, bindings, _, loc, _, body, _) =>
+        ForPerm(
+          convert(bindings),
+          AmbiguousLocation(convert(loc))(blame(loc))(origin(loc)),
+          convert(body),
+        )
+      case ValForPermWithValue(_, _, _, id, _, body, _) =>
+        ForPermWithValue(
+          new Variable(TAny())(origin(id).sourceName(convert(id))),
+          convert(body),
+        )
+    }
 
-  def convert(implicit e: ValPrimaryVectorContext): Expr[G] = e match {
-    case ValSum(_, _, t, id, _, cond, _, body, _) =>
-      val binding = new Variable(convert(t))(origin(id).sourceName(convert(id)))
-      Sum(Seq(binding), convert(cond), convert(body))
-    case ValVectorSum(_, _, rng, _, vec, _) => VectorSum(convert(rng), convert(vec))
-    case ValVectorCmp(_, _, left, _, right, _) => VectorCompare(convert(left), convert(right))
-    case ValVectorRep(_, _, inner, _) => VectorRepeat(convert(inner))
-    case ValMatrixSum(_, _, rng, _, mat, _) => MatrixSum(convert(rng), convert(mat))
-    case ValMatrixCmp(_, _, left, _, right, _) => MatrixCompare(convert(left), convert(right))
-    case ValMatrixRep(_, _, inner, _) => MatrixRepeat(convert(inner))
-  }
+  def convert(implicit e: ValPrimaryVectorContext): Expr[G] =
+    e match {
+      case ValSum(_, _, t, id, _, cond, _, body, _) =>
+        val binding =
+          new Variable(convert(t))(origin(id).sourceName(convert(id)))
+        Sum(Seq(binding), convert(cond), convert(body))
+      case ValVectorSum(_, _, rng, _, vec, _) =>
+        VectorSum(convert(rng), convert(vec))
+      case ValVectorCmp(_, _, left, _, right, _) =>
+        VectorCompare(convert(left), convert(right))
+      case ValVectorRep(_, _, inner, _) => VectorRepeat(convert(inner))
+      case ValMatrixSum(_, _, rng, _, mat, _) =>
+        MatrixSum(convert(rng), convert(mat))
+      case ValMatrixCmp(_, _, left, _, right, _) =>
+        MatrixCompare(convert(left), convert(right))
+      case ValMatrixRep(_, _, inner, _) => MatrixRepeat(convert(inner))
+    }
 
   def convert(implicit e: ValPrimaryReducibleContext): Expr[G] = ??(e)
 
-  def convert(implicit e: ValPrimaryThreadContext): Expr[G] = e match {
-    case ValIdle(_, _, thread, _) => IdleToken(convert(thread))
-    case ValRunning(_, _, thread, _) => JoinToken(convert(thread))
-  }
-
-  def convert(implicit e: ValPrimaryContextContext): Expr[G] = e match {
-    case ValPrimaryContext0("\\result") => AmbiguousResult()
-    case ValPrimaryContext1("\\current_thread") => CurrentThreadId()
-    case ValPrimaryContext2("\\ltid") => LocalThreadId()
-    case ValPrimaryContext3("\\gtid") => GlobalThreadId()
-  }
+  def convert(implicit e: ValPrimaryThreadContext): Expr[G] =
+    e match {
+      case ValIdle(_, _, thread, _) => IdleToken(convert(thread))
+      case ValRunning(_, _, thread, _) => JoinToken(convert(thread))
+    }
 
-  def convert(implicit e: ValPrimaryContext): Expr[G] = e match {
-    case ValPrimary0(inner) => convert(inner)
-    case ValPrimary1(inner) => convert(inner)
-    case ValPrimary2(inner) => convert(inner)
-    case ValPrimary3(inner) => convert(inner)
-    case ValPrimary4(inner) => convert(inner)
-    case ValPrimary5(inner) => convert(inner)
-    case ValPrimary6(inner) => convert(inner)
-    case ValPrimary7(inner) => convert(inner)
-    case ValPrimary8(inner) => convert(inner)
-    case ValPrimary9(inner) => convert(inner)
-    case ValAny(_) => Any()(blame(e))
-    case ValFunctionOf(_, inner, _, names, _) => FunctionOf(new UnresolvedRef[G, Variable[G]](convert(inner)), convert(names).map(new UnresolvedRef[G, Variable[G]](_)))
-    case ValInlinePattern(open, pattern, _) =>
-      val groupText = open.filter(_.isDigit)
-      InlinePattern(convert(pattern), open.count(_ == '<'), if (groupText.isEmpty) 0 else groupText.toInt)
-    case ValUnfolding(_, predExpr, _, body) => Unfolding(convert(predExpr), convert(body))(blame(e))
-    case ValOld(_, _, expr, _) => Old(convert(expr), at = None)(blame(e))
-    case ValOldLabeled(_, _, label, _, _, expr, _) => Old(convert(expr), at = Some(new UnresolvedRef[G, LabelDecl[G]](convert(label))))(blame(e))
-    case ValTypeof(_, _, expr, _) => TypeOf(convert(expr))
-    case ValTypeValue(_, _, t, _) => TypeValue(convert(t))
-    case ValHeld(_, _, obj, _) => Held(convert(obj))
-    case ValCommitted(_, _, obj, _) => Committed(convert(obj))(blame(e))
-    case ValIdEscape(text) => local(e, text.substring(1, text.length - 1))
-    case ValSharedMemSize(_, _, ptr, _) => SharedMemSize(convert(ptr))
-    case ValNdIndex(_, _, firstIndex, _, firstDim, parsePairs, _) =>
-      val pairs = parsePairs.map(convert(_))
-      val indices = convert(firstIndex) +: pairs.map(_._1)
-      val dims = convert(firstDim) +: pairs.map(_._2)
-      NdIndex(indices, dims)
-    case ValNdLIndex(_, _, indices, _, dims, _) =>
-      val allIndices = convert(indices)
-      NdPartialIndex(allIndices.init, allIndices.last, convert(dims))
-    case ValNdLength(_, _, dims, _) => NdLength(convert(dims))
-    case ValEuclideanDiv(_, _, left, _, right, _) => FloorDiv(convert(left), convert(right))(blame(e))
-    case ValEuclideanMod(_, _, left, _, right, _) => col.Mod(convert(left), convert(right))(blame(e))
-    case ValPow(_, _, left, _, right, _) => SmtlibPow(convert(left), convert(right))
-    case ValIsInt(_, _, arg, _) => SmtlibIsInt(convert(arg))
-    case ValChoose(_, _, xs, _) => Choose(convert(xs))(blame(e))
-    case ValChooseFresh(_, _, xs, _) => ChooseFresh(convert(xs))(blame(e))
-  }
+  def convert(implicit e: ValPrimaryContextContext): Expr[G] =
+    e match {
+      case ValPrimaryContext0("\\result") => AmbiguousResult()
+      case ValPrimaryContext1("\\current_thread") => CurrentThreadId()
+      case ValPrimaryContext2("\\ltid") => LocalThreadId()
+      case ValPrimaryContext3("\\gtid") => GlobalThreadId()
+    }
 
-  def convert(implicit e: ValExprPairContext): (Expr[G], Expr[G]) = e match {
-    case ValExprPair0(_, e1, _, e2) => (convert(e1), convert(e2))
-  }
+  def convert(implicit e: ValPrimaryContext): Expr[G] =
+    e match {
+      case ValPrimary0(inner) => convert(inner)
+      case ValPrimary1(inner) => convert(inner)
+      case ValPrimary2(inner) => convert(inner)
+      case ValPrimary3(inner) => convert(inner)
+      case ValPrimary4(inner) => convert(inner)
+      case ValPrimary5(inner) => convert(inner)
+      case ValPrimary6(inner) => convert(inner)
+      case ValPrimary7(inner) => convert(inner)
+      case ValPrimary8(inner) => convert(inner)
+      case ValPrimary9(inner) => convert(inner)
+      case ValAny(_) => Any()(blame(e))
+      case ValFunctionOf(_, inner, _, names, _) =>
+        FunctionOf(
+          new UnresolvedRef[G, Variable[G]](convert(inner)),
+          convert(names).map(new UnresolvedRef[G, Variable[G]](_)),
+        )
+      case ValInlinePattern(open, pattern, _) =>
+        val groupText = open.filter(_.isDigit)
+        InlinePattern(
+          convert(pattern),
+          open.count(_ == '<'),
+          if (groupText.isEmpty)
+            0
+          else
+            groupText.toInt,
+        )
+      case ValUnfolding(_, predExpr, _, body) =>
+        Unfolding(convert(predExpr), convert(body))(blame(e))
+      case ValOld(_, _, expr, _) => Old(convert(expr), at = None)(blame(e))
+      case ValOldLabeled(_, _, label, _, _, expr, _) =>
+        Old(
+          convert(expr),
+          at = Some(new UnresolvedRef[G, LabelDecl[G]](convert(label))),
+        )(blame(e))
+      case ValTypeof(_, _, expr, _) => TypeOf(convert(expr))
+      case ValTypeValue(_, _, t, _) => TypeValue(convert(t))
+      case ValHeld(_, _, obj, _) => Held(convert(obj))
+      case ValCommitted(_, _, obj, _) => Committed(convert(obj))(blame(e))
+      case ValIdEscape(text) => local(e, text.substring(1, text.length - 1))
+      case ValSharedMemSize(_, _, ptr, _) => SharedMemSize(convert(ptr))
+      case ValNdIndex(_, _, firstIndex, _, firstDim, parsePairs, _) =>
+        val pairs = parsePairs.map(convert(_))
+        val indices = convert(firstIndex) +: pairs.map(_._1)
+        val dims = convert(firstDim) +: pairs.map(_._2)
+        NdIndex(indices, dims)
+      case ValNdLIndex(_, _, indices, _, dims, _) =>
+        val allIndices = convert(indices)
+        NdPartialIndex(allIndices.init, allIndices.last, convert(dims))
+      case ValNdLength(_, _, dims, _) => NdLength(convert(dims))
+      case ValEuclideanDiv(_, _, left, _, right, _) =>
+        FloorDiv(convert(left), convert(right))(blame(e))
+      case ValEuclideanMod(_, _, left, _, right, _) =>
+        col.Mod(convert(left), convert(right))(blame(e))
+      case ValPow(_, _, left, _, right, _) =>
+        SmtlibPow(convert(left), convert(right))
+      case ValIsInt(_, _, arg, _) => SmtlibIsInt(convert(arg))
+      case ValChoose(_, _, xs, _) => Choose(convert(xs))(blame(e))
+      case ValChooseFresh(_, _, xs, _) => ChooseFresh(convert(xs))(blame(e))
+    }
 
-  def convert(implicit e: ValExprContext): Expr[G] = e match {
-    case ValExpr0(inner) => convert(inner)
-    case ValExpr1(inner) => convert(inner)
-  }
+  def convert(implicit e: ValExprPairContext): (Expr[G], Expr[G]) =
+    e match { case ValExprPair0(_, e1, _, e2) => (convert(e1), convert(e2)) }
 
-  def convert(implicit id: ValIdentifierContext): String = id match {
-    case ValIdentifier0(inner) => convertText(inner)
-    case ValIdentifier1(ValKeywordNonExpr0(text)) => text
-    case ValIdentifier2(text) => text.substring(1, text.length - 1)
-  }
+  def convert(implicit e: ValExprContext): Expr[G] =
+    e match {
+      case ValExpr0(inner) => convert(inner)
+      case ValExpr1(inner) => convert(inner)
+    }
 
-  def convertText(implicit res: ValKeywordExprContext): String = res match {
-    case ValNonePerm(_) => "none"
-    case ValWrite(_) => "write"
-    case ValRead(_) => "read"
-    case ValNoneOption(_) => "None"
-    case ValEmpty(_) => "empty"
-    case ValTrue(_) => "true"
-    case ValFalse(_) => "false"
-  }
+  def convert(implicit id: ValIdentifierContext): String =
+    id match {
+      case ValIdentifier0(inner) => convertText(inner)
+      case ValIdentifier1(ValKeywordNonExpr0(text)) => text
+      case ValIdentifier2(text) => text.substring(1, text.length - 1)
+    }
 
-  def convert(implicit res: ValKeywordExprContext): Expr[G] = res match {
-    case ValNonePerm(_) => NoPerm()
-    case ValWrite(_) => WritePerm()
-    case ValRead(_) => ReadPerm()
-    case ValNoneOption(_) => OptNone()
-    case ValEmpty(_) => EmptyProcess()
-    case ValTrue(_) => tt
-    case ValFalse(_) => ff
-  }
+  def convertText(implicit res: ValKeywordExprContext): String =
+    res match {
+      case ValNonePerm(_) => "none"
+      case ValWrite(_) => "write"
+      case ValRead(_) => "read"
+      case ValNoneOption(_) => "None"
+      case ValEmpty(_) => "empty"
+      case ValTrue(_) => "true"
+      case ValFalse(_) => "false"
+    }
 
-  def convert(implicit inv: ValGenericAdtInvocationContext): Expr[G] = inv match {
-    case ValGenericAdtInvocation0(adt, _, typeArgs, _, _, func, _, args, _) =>
-      ADTFunctionInvocation(Some((new UnresolvedRef[G, AxiomaticDataType[G]](convert(adt)), convert(typeArgs))),
-        new UnresolvedRef[G, ADTFunction[G]](convert(func)), args.map(convert(_)).getOrElse(Nil))
-  }
+  def convert(implicit res: ValKeywordExprContext): Expr[G] =
+    res match {
+      case ValNonePerm(_) => NoPerm()
+      case ValWrite(_) => WritePerm()
+      case ValRead(_) => ReadPerm()
+      case ValNoneOption(_) => OptNone()
+      case ValEmpty(_) => EmptyProcess()
+      case ValTrue(_) => tt
+      case ValFalse(_) => ff
+    }
 
+  def convert(implicit inv: ValGenericAdtInvocationContext): Expr[G] =
+    inv match {
+      case ValGenericAdtInvocation0(adt, _, typeArgs, _, _, func, _, args, _) =>
+        ADTFunctionInvocation(
+          Some((
+            new UnresolvedRef[G, AxiomaticDataType[G]](convert(adt)),
+            convert(typeArgs),
+          )),
+          new UnresolvedRef[G, ADTFunction[G]](convert(func)),
+          args.map(convert(_)).getOrElse(Nil),
+        )
+    }
 
-  def evalOrNop(implicit expr: Option[OneOrMoreExpressionsContext]): Statement[G] = expr match {
-    case Some(exprs) => Block(convert(exprs).map(e => Eval(e)(e.o)))(origin(exprs))
-    case None =>
-      // PB: strictly speaking it would be nice if we can point to the empty range that indicates the absence of a statement here.
-      Block(Nil)(DiagnosticOrigin)
-  }
+  def evalOrNop(
+      implicit expr: Option[OneOrMoreExpressionsContext]
+  ): Statement[G] =
+    expr match {
+      case Some(exprs) =>
+        Block(convert(exprs).map(e => Eval(e)(e.o)))(origin(exprs))
+      case None =>
+        // PB: strictly speaking it would be nice if we can point to the empty range that indicates the absence of a statement here.
+        Block(Nil)(DiagnosticOrigin)
+    }
 
-}
\ No newline at end of file
+}
diff --git a/src/parsers/vct/parsers/transform/CToCol.scala b/src/parsers/vct/parsers/transform/CToCol.scala
index 8d10e0fe98..9e1a47ab97 100644
--- a/src/parsers/vct/parsers/transform/CToCol.scala
+++ b/src/parsers/vct/parsers/transform/CToCol.scala
@@ -18,12 +18,12 @@ import scala.collection.mutable
 import scala.util.Try
 
 @nowarn("msg=match may not be exhaustive&msg=Some\\(")
-case class CToCol[G](override val baseOrigin: Origin,
-                     override val blameProvider: BlameProvider,
-                     override val errors: Seq[(Token, Token, ExpectedError)],
-                     val cOrigin: Option[(TokenStream, Origin)],
-                    )
-  extends ToCol(baseOrigin, blameProvider, errors) {
+case class CToCol[G](
+    override val baseOrigin: Origin,
+    override val blameProvider: BlameProvider,
+    override val errors: Seq[(Token, Token, ExpectedError)],
+    val cOrigin: Option[(TokenStream, Origin)],
+) extends ToCol(baseOrigin, blameProvider, errors) {
 
   override implicit def origin(implicit node: ParserRuleContext): Origin =
     cOrigin match {
@@ -33,28 +33,32 @@ case class CToCol[G](override val baseOrigin: Origin,
         val interpretedOrigin = baseOrigin.withContent(pos)
         val startOffset = getLineOffset(indicatorStream, pos.startLineIdx)
         val endOffset = getLineOffset(indicatorStream, pos.endLineIdx)
-        val posCOrigin = Try((startOffset.get, endOffset.get)).toOption.fold(cOrigin) {
-          case (startOffset, endOffset) =>
-            cOrigin.withContent(PositionRange(
-              pos.startLineIdx + startOffset,
-              pos.endLineIdx + endOffset,
-              startEndColIdx = None
-            ))
-        }
+        val posCOrigin =
+          Try((startOffset.get, endOffset.get)).toOption.fold(cOrigin) {
+            case (startOffset, endOffset) =>
+              cOrigin.withContent(PositionRange(
+                pos.startLineIdx + startOffset,
+                pos.endLineIdx + endOffset,
+                startEndColIdx = None,
+              ))
+          }
 
         Origin(interpretedOrigin.originContents ++ posCOrigin.originContents)
     }
 
-  private def getLineOffset(indicatorStream: TokenStream, lineIdx: Int): Option[Int] = {
-    val firstTokenAtOrPastLine =
-      (0 until indicatorStream.size())
-        .find(i => indicatorStream.get(i).getLine - 1 >= lineIdx)
-        .getOrElse(return None)
+  private def getLineOffset(
+      indicatorStream: TokenStream,
+      lineIdx: Int,
+  ): Option[Int] = {
+    val firstTokenAtOrPastLine = (0 until indicatorStream.size())
+      .find(i => indicatorStream.get(i).getLine - 1 >= lineIdx)
+      .getOrElse(return None)
 
     for (tokIdx <- firstTokenAtOrPastLine to 0 by -1) {
       val markerToken = indicatorStream.get(tokIdx)
       if (markerToken.getChannel == LangCLexer.LINE_DIRECTIVE_CHANNEL) {
-        val lineDirectiveLine = Integer.parseInt(markerToken.getText.split(' ')(1))
+        val lineDirectiveLine = Integer
+          .parseInt(markerToken.getText.split(' ')(1))
         val tokenLine = markerToken.getLine
         return Some(lineDirectiveLine - tokenLine - 1)
       }
@@ -63,1268 +67,1986 @@ case class CToCol[G](override val baseOrigin: Origin,
     None
   }
 
-  def convert(unit: CompilationUnitContext): Seq[GlobalDeclaration[G]] = unit match {
-    case CompilationUnit0(translationUnit, _) =>
-      translationUnit.toSeq.map(convert(_))
-  }
+  def convert(unit: CompilationUnitContext): Seq[GlobalDeclaration[G]] =
+    unit match {
+      case CompilationUnit0(translationUnit, _) =>
+        translationUnit.toSeq.map(convert(_))
+    }
 
   def convert(implicit unit: TranslationUnitContext): CTranslationUnit[G] =
-    new CTranslationUnit(convertList(TranslationUnit0.unapply, TranslationUnit1.unapply)(unit).flatMap(convert(_)))
-
-  def convert(implicit externalDecl: ExternalDeclarationContext): Seq[GlobalDeclaration[G]] = externalDecl match {
-    case ExternalDeclaration0(funcDef) => Seq(convert(funcDef))
-    case ExternalDeclaration1(decl) => Seq(new CGlobalDeclaration(convert(decl)))
-    case ExternalDeclaration2(valDecls) => convert(valDecls)
-    case ExternalDeclaration3(";") => Nil
-  }
+    new CTranslationUnit(
+      convertList(TranslationUnit0.unapply, TranslationUnit1.unapply)(unit)
+        .flatMap(convert(_))
+    )
+
+  def convert(
+      implicit externalDecl: ExternalDeclarationContext
+  ): Seq[GlobalDeclaration[G]] =
+    externalDecl match {
+      case ExternalDeclaration0(funcDef) => Seq(convert(funcDef))
+      case ExternalDeclaration1(decl) =>
+        Seq(new CGlobalDeclaration(convert(decl)))
+      case ExternalDeclaration2(valDecls) => convert(valDecls)
+      case ExternalDeclaration3(";") => Nil
+    }
 
-  def convert(implicit funcDef: FunctionDefinitionContext): CFunctionDefinition[G] = {
+  def convert(
+      implicit funcDef: FunctionDefinitionContext
+  ): CFunctionDefinition[G] = {
     funcDef match {
       case FunctionDefinition0(_, _, _, Some(declarationList), _) =>
         ??(declarationList)
-      case FunctionDefinition0(maybeContract, declSpecs, declarator, None, body) =>
-        withContract(maybeContract, contract =>
-          new CFunctionDefinition(contract.consumeApplicableContract(blame(funcDef)), convert(declSpecs), convert(declarator), convert(body))(blame(funcDef)))
+      case FunctionDefinition0(
+            maybeContract,
+            declSpecs,
+            declarator,
+            None,
+            body,
+          ) =>
+        withContract(
+          maybeContract,
+          contract =>
+            new CFunctionDefinition(
+              contract.consumeApplicableContract(blame(funcDef)),
+              convert(declSpecs),
+              convert(declarator),
+              convert(body),
+            )(blame(funcDef)),
+        )
     }
   }
 
-  def convert(implicit decl: DeclarationContext): CDeclaration[G] = decl match {
-    case Declaration0(maybeContract, declSpecs, maybeInits, _) =>
-      withContract(maybeContract, contract =>
-        new CDeclaration[G](contract.consumeApplicableContract(blame(decl)), AstBuildHelpers.foldStar[G](contract.consume(contract.kernel_invariant)),
-          specs=convert(declSpecs), inits=maybeInits.map(convert(_)) getOrElse Nil))
-    case Declaration1(staticAssert) =>
-      ??(staticAssert)
-  }
-
-  def convert(declSpecs: DeclarationSpecifiersContext): Seq[CDeclarationSpecifier[G]] = declSpecs match {
-    case DeclarationSpecifiers0(specs) => specs.map(convert(_))
-  }
+  def convert(implicit decl: DeclarationContext): CDeclaration[G] =
+    decl match {
+      case Declaration0(maybeContract, declSpecs, maybeInits, _) =>
+        withContract(
+          maybeContract,
+          contract =>
+            new CDeclaration[G](
+              contract.consumeApplicableContract(blame(decl)),
+              AstBuildHelpers
+                .foldStar[G](contract.consume(contract.kernel_invariant)),
+              specs = convert(declSpecs),
+              inits = maybeInits.map(convert(_)) getOrElse Nil,
+            ),
+        )
+      case Declaration1(staticAssert) => ??(staticAssert)
+    }
 
-  def convert(declSpecs: DeclarationSpecifiers2Context): Seq[CDeclarationSpecifier[G]] = declSpecs match {
-    case DeclarationSpecifiers20(specs) => specs.map(convert(_))
-  }
+  def convert(
+      declSpecs: DeclarationSpecifiersContext
+  ): Seq[CDeclarationSpecifier[G]] =
+    declSpecs match {
+      case DeclarationSpecifiers0(specs) => specs.map(convert(_))
+    }
 
-  def convert(implicit declSpec: DeclarationSpecifierContext): CDeclarationSpecifier[G] = declSpec match {
-    case DeclarationSpecifier0(storageClass) => convert(storageClass)
-    case DeclarationSpecifier1(typeSpec) => convert(typeSpec)
-    case DeclarationSpecifier2(typeQual) => CTypeQualifierDeclarationSpecifier(convert(typeQual))
-    case DeclarationSpecifier3(functionSpecifier) => convert(functionSpecifier)
-    case DeclarationSpecifier4(alignmentSpecifier) => ??(alignmentSpecifier)
-    case DeclarationSpecifier5(kernelSpecifier) => convert(kernelSpecifier)
-    case DeclarationSpecifier6(valEmbedModifier) => withModifiers(valEmbedModifier, m => {
-      if(m.consume(m.pure))
-        CPure[G]()
-      else if(m.consume(m.inline))
-        CInline[G]()
-      else
-        fail(m.nodes.head, "This modifier cannot be attached to a declaration in C")
-    })
-  }
+  def convert(
+      declSpecs: DeclarationSpecifiers2Context
+  ): Seq[CDeclarationSpecifier[G]] =
+    declSpecs match {
+      case DeclarationSpecifiers20(specs) => specs.map(convert(_))
+    }
 
-  def convert(implicit functionSpec: FunctionSpecifierContext): CDeclarationSpecifier[G] = functionSpec match {
-    case FunctionSpecifier0("inline") => CInline[G]()
-    case FunctionSpecifier0(_) => ??(functionSpec)
-    case FunctionSpecifier1(attribute) => CFunctionTypeExtensionModifier(convert(attribute))
-    case FunctionSpecifier2(_) => ??(functionSpec)
-  }
+  def convert(
+      implicit declSpec: DeclarationSpecifierContext
+  ): CDeclarationSpecifier[G] =
+    declSpec match {
+      case DeclarationSpecifier0(storageClass) => convert(storageClass)
+      case DeclarationSpecifier1(typeSpec) => convert(typeSpec)
+      case DeclarationSpecifier2(typeQual) =>
+        CTypeQualifierDeclarationSpecifier(convert(typeQual))
+      case DeclarationSpecifier3(functionSpecifier) =>
+        convert(functionSpecifier)
+      case DeclarationSpecifier4(alignmentSpecifier) => ??(alignmentSpecifier)
+      case DeclarationSpecifier5(kernelSpecifier) => convert(kernelSpecifier)
+      case DeclarationSpecifier6(valEmbedModifier) =>
+        withModifiers(
+          valEmbedModifier,
+          m => {
+            if (m.consume(m.pure))
+              CPure[G]()
+            else if (m.consume(m.inline))
+              CInline[G]()
+            else
+              fail(
+                m.nodes.head,
+                "This modifier cannot be attached to a declaration in C",
+              )
+          },
+        )
+    }
 
-  def convert(implicit storageClass: StorageClassSpecifierContext): CStorageClassSpecifier[G] = storageClass match {
-    case StorageClassSpecifier0(_) => CTypedef()
-    case StorageClassSpecifier1(_) => CExtern()
-    case StorageClassSpecifier2(_) => CStatic()
-    case StorageClassSpecifier3(_) => ??(storageClass)
-    case StorageClassSpecifier4(_) => ??(storageClass)
-    case StorageClassSpecifier5(_) => ??(storageClass)
-    case StorageClassSpecifier6(_) => GPULocal()
-    case StorageClassSpecifier7(_) => GPUGlobal()
-  }
+  def convert(
+      implicit functionSpec: FunctionSpecifierContext
+  ): CDeclarationSpecifier[G] =
+    functionSpec match {
+      case FunctionSpecifier0("inline") => CInline[G]()
+      case FunctionSpecifier0(_) => ??(functionSpec)
+      case FunctionSpecifier1(attribute) =>
+        CFunctionTypeExtensionModifier(convert(attribute))
+      case FunctionSpecifier2(_) => ??(functionSpec)
+    }
 
-  def convert(implicit typeSpec: TypeSpecifierContext): CTypeSpecifier[G] = typeSpec match {
-    case TypeSpecifier0(name) => name match {
-      case "void" => CVoid()
-      case "char" => CChar()
-      case "short" => CShort()
-      case "int" => CInt()
-      case "long" => CLong()
-      case "float" => CFloat()
-      case "double" => CDouble()
-      case "signed" => CSigned()
-      case "unsigned" => CUnsigned()
-      case "_Bool" => CBool()
-      case _ => ??(typeSpec)
+  def convert(
+      implicit storageClass: StorageClassSpecifierContext
+  ): CStorageClassSpecifier[G] =
+    storageClass match {
+      case StorageClassSpecifier0(_) => CTypedef()
+      case StorageClassSpecifier1(_) => CExtern()
+      case StorageClassSpecifier2(_) => CStatic()
+      case StorageClassSpecifier3(_) => ??(storageClass)
+      case StorageClassSpecifier4(_) => ??(storageClass)
+      case StorageClassSpecifier5(_) => ??(storageClass)
+      case StorageClassSpecifier6(_) => GPULocal()
+      case StorageClassSpecifier7(_) => GPUGlobal()
     }
-//    case TypeSpecifier1(_, _, _, _) => ??(typeSpec)
-    case TypeSpecifier1(valType) => CSpecificationType(convert(valType))
-    case TypeSpecifier2(_) => ??(typeSpec)
-    case TypeSpecifier3(struct) => convert(struct)
-    case TypeSpecifier4(_) => ??(typeSpec)
-    case TypeSpecifier5(name) => name match {
-      case TypedefName0(name) => CTypedefName(convert(name))
-    }
-    case TypeSpecifier6(_, _, _, _) => ??(typeSpec)
-    case TypeSpecifier7(_, _, t, _, size, _) => CSpecificationType(TOpenCLVector(BigInt(size), convert(t)))
-  }
 
-  def convert(implicit struct: StructOrUnionSpecifierContext): CTypeSpecifier[G] = struct match {
-    case StructOrUnionSpecifier0(StructOrUnion0(_), name, _, declarations, _) => CStructDeclaration(name.map(convert), convert(declarations))
-    case StructOrUnionSpecifier1(StructOrUnion0(_), name) => CStructSpecifier(convert(name))
-  }
+  def convert(implicit typeSpec: TypeSpecifierContext): CTypeSpecifier[G] =
+    typeSpec match {
+      case TypeSpecifier0(name) =>
+        name match {
+          case "void" => CVoid()
+          case "char" => CChar()
+          case "short" => CShort()
+          case "int" => CInt()
+          case "long" => CLong()
+          case "float" => CFloat()
+          case "double" => CDouble()
+          case "signed" => CSigned()
+          case "unsigned" => CUnsigned()
+          case "_Bool" => CBool()
+          case _ => ??(typeSpec)
+        }
+//    case TypeSpecifier1(_, _, _, _) => ??(typeSpec)
+      case TypeSpecifier1(valType) => CSpecificationType(convert(valType))
+      case TypeSpecifier2(_) => ??(typeSpec)
+      case TypeSpecifier3(struct) => convert(struct)
+      case TypeSpecifier4(_) => ??(typeSpec)
+      case TypeSpecifier5(name) =>
+        name match { case TypedefName0(name) => CTypedefName(convert(name)) }
+      case TypeSpecifier6(_, _, _, _) => ??(typeSpec)
+      case TypeSpecifier7(_, _, t, _, size, _) =>
+        CSpecificationType(TOpenCLVector(BigInt(size), convert(t)))
+    }
 
-  def convert(implicit specifiers: StructDeclarationListContext): Seq[CStructMemberDeclarator[G]] = specifiers match {
-    case StructDeclarationList0(decl) => Seq(convert(decl))
-    case StructDeclarationList1(decls, decl) => convert(decls) :+ convert(decl)
-  }
+  def convert(
+      implicit struct: StructOrUnionSpecifierContext
+  ): CTypeSpecifier[G] =
+    struct match {
+      case StructOrUnionSpecifier0(
+            StructOrUnion0(_),
+            name,
+            _,
+            declarations,
+            _,
+          ) =>
+        CStructDeclaration(name.map(convert), convert(declarations))
+      case StructOrUnionSpecifier1(StructOrUnion0(_), name) =>
+        CStructSpecifier(convert(name))
+    }
 
-  def convert(implicit decl: StructDeclarationContext): CStructMemberDeclarator[G] = decl match {
-    case StructDeclaration0(specs, decls, _) => CStructMemberDeclarator(convert(specs), convert(decls))
-    case StructDeclaration1(specs, _) => ??(decl) // Quite complicated use case, lets not allow it for now
-    case StructDeclaration2(_) => ??(decl)
-  }
+  def convert(
+      implicit specifiers: StructDeclarationListContext
+  ): Seq[CStructMemberDeclarator[G]] =
+    specifiers match {
+      case StructDeclarationList0(decl) => Seq(convert(decl))
+      case StructDeclarationList1(decls, decl) =>
+        convert(decls) :+ convert(decl)
+    }
 
-  def convert(implicit decl: StructDeclaratorListContext): Seq[CDeclarator[G]] = decl match {
-    case StructDeclaratorList0(decl) => Seq(convert(decl))
-    case StructDeclaratorList1(decls, _, decl) => convert(decls) :+ convert(decl)
-  }
+  def convert(
+      implicit decl: StructDeclarationContext
+  ): CStructMemberDeclarator[G] =
+    decl match {
+      case StructDeclaration0(specs, decls, _) =>
+        CStructMemberDeclarator(convert(specs), convert(decls))
+      case StructDeclaration1(specs, _) =>
+        ??(decl) // Quite complicated use case, lets not allow it for now
+      case StructDeclaration2(_) => ??(decl)
+    }
 
-  def convert(implicit decl:  StructDeclaratorContext): CDeclarator[G] = decl match {
-    case StructDeclarator0(decl) => convert(decl)
-    case StructDeclarator1(_, _, _) => ??(decl)
-  }
+  def convert(implicit decl: StructDeclaratorListContext): Seq[CDeclarator[G]] =
+    decl match {
+      case StructDeclaratorList0(decl) => Seq(convert(decl))
+      case StructDeclaratorList1(decls, _, decl) =>
+        convert(decls) :+ convert(decl)
+    }
 
-  def convert(implicit quals: TypeQualifierListContext): Seq[CTypeQualifier[G]] =
-    convertList(TypeQualifierList0.unapply, TypeQualifierList1.unapply)(quals).map(convert(_))
+  def convert(implicit decl: StructDeclaratorContext): CDeclarator[G] =
+    decl match {
+      case StructDeclarator0(decl) => convert(decl)
+      case StructDeclarator1(_, _, _) => ??(decl)
+    }
 
-  def convert(implicit qual: TypeQualifierContext): CTypeQualifier[G] = qual match {
-    case TypeQualifier0(_) => CConst()
-    case TypeQualifier1(_) => CRestrict()
-    case TypeQualifier2(_) => CVolatile()
-    case TypeQualifier3(_) => CAtomic()
-  }
+  def convert(
+      implicit quals: TypeQualifierListContext
+  ): Seq[CTypeQualifier[G]] =
+    convertList(TypeQualifierList0.unapply, TypeQualifierList1.unapply)(quals)
+      .map(convert(_))
+
+  def convert(implicit qual: TypeQualifierContext): CTypeQualifier[G] =
+    qual match {
+      case TypeQualifier0(_) => CConst()
+      case TypeQualifier1(_) => CRestrict()
+      case TypeQualifier2(_) => CVolatile()
+      case TypeQualifier3(_) => CAtomic()
+    }
 
-  def convert(implicit kernel: GpgpuKernelSpecifierContext): CGpgpuKernelSpecifier[G] = kernel match {
-    case GpgpuKernelSpecifier0(_) => CUDAKernel()(blame(kernel))
-    case GpgpuKernelSpecifier1(_) => OpenCLKernel()(blame(kernel))
-  }
+  def convert(
+      implicit kernel: GpgpuKernelSpecifierContext
+  ): CGpgpuKernelSpecifier[G] =
+    kernel match {
+      case GpgpuKernelSpecifier0(_) => CUDAKernel()(blame(kernel))
+      case GpgpuKernelSpecifier1(_) => OpenCLKernel()(blame(kernel))
+    }
 
-  def convert(implicit decls: InitDeclaratorListContext): Seq[CInit[G]] = decls match {
-    case InitDeclaratorList0(decl) => Seq(convert(decl))
-    case InitDeclaratorList1(init, _, last) => convert(init) :+ convert(last)
-  }
+  def convert(implicit decls: InitDeclaratorListContext): Seq[CInit[G]] =
+    decls match {
+      case InitDeclaratorList0(decl) => Seq(convert(decl))
+      case InitDeclaratorList1(init, _, last) => convert(init) :+ convert(last)
+    }
 
-  def convert(implicit decl: InitDeclaratorContext): CInit[G] = decl match {
-    case InitDeclarator0(inner) => CInit(convert(inner), None)
-    case InitDeclarator1(inner, _, init) => CInit(convert(inner), Some(convert(init)))
-  }
+  def convert(implicit decl: InitDeclaratorContext): CInit[G] =
+    decl match {
+      case InitDeclarator0(inner) => CInit(convert(inner), None)
+      case InitDeclarator1(inner, _, init) =>
+        CInit(convert(inner), Some(convert(init)))
+    }
 
-  def convert(implicit decl: DeclaratorContext): CDeclarator[G] = decl match {
-    case Declarator0(Some(ptr), inner, Nil) =>
-      val pointers = convert(ptr)
-      CPointerDeclarator(pointers, convert(inner))
-    case Declarator0(None, inner, Nil) => convert(inner)
-    case Declarator0(Some(ptr), inner, extensions) =>
-      val pointers = convert(ptr)
-      val innerWithExtensions = CTypeExtensionDeclarator(extensions.flatMap(convert(_)), convert(inner))
-      CPointerDeclarator(pointers, innerWithExtensions)
-    case Declarator0(None, inner, extensions) => CTypeExtensionDeclarator(extensions.flatMap(convert(_)), convert(inner))
-  }
+  def convert(implicit decl: DeclaratorContext): CDeclarator[G] =
+    decl match {
+      case Declarator0(Some(ptr), inner, Nil) =>
+        val pointers = convert(ptr)
+        CPointerDeclarator(pointers, convert(inner))
+      case Declarator0(None, inner, Nil) => convert(inner)
+      case Declarator0(Some(ptr), inner, extensions) =>
+        val pointers = convert(ptr)
+        val innerWithExtensions = CTypeExtensionDeclarator(
+          extensions.flatMap(convert(_)),
+          convert(inner),
+        )
+        CPointerDeclarator(pointers, innerWithExtensions)
+      case Declarator0(None, inner, extensions) =>
+        CTypeExtensionDeclarator(extensions.flatMap(convert(_)), convert(inner))
+    }
 
-  def convert(implicit decl: GccDeclaratorExtensionContext): Seq[CTypeExtensions[G]] = decl match {
-    case GccDeclaratorExtension0(_, _, _, _) => ??(decl)
-    case GccDeclaratorExtension1(attr) => convert(attr)
-  }
+  def convert(
+      implicit decl: GccDeclaratorExtensionContext
+  ): Seq[CTypeExtensions[G]] =
+    decl match {
+      case GccDeclaratorExtension0(_, _, _, _) => ??(decl)
+      case GccDeclaratorExtension1(attr) => convert(attr)
+    }
 
-  def convert(implicit decl: GccAttributeSpecifierContext): Seq[CTypeExtensions[G]] = decl match {
-    case GccAttributeSpecifier0(_, _, _, attributeList, _ , _) => convert(attributeList)
-  }
+  def convert(
+      implicit decl: GccAttributeSpecifierContext
+  ): Seq[CTypeExtensions[G]] =
+    decl match {
+      case GccAttributeSpecifier0(_, _, _, attributeList, _, _) =>
+        convert(attributeList)
+    }
 
-  def convert(implicit list: GccAttributeListContext): Seq[CTypeExtensions[G]] = list match {
-    case GccAttributeList0(nonEmpty) => convert(nonEmpty)
-    case GccAttributeList1(_) => Seq()
-  }
+  def convert(implicit list: GccAttributeListContext): Seq[CTypeExtensions[G]] =
+    list match {
+      case GccAttributeList0(nonEmpty) => convert(nonEmpty)
+      case GccAttributeList1(_) => Seq()
+    }
 
-  def convert(implicit list: GccAttributeListNonEmptyContext): Seq[CTypeExtensions[G]] = list match {
-    case GccAttributeListNonEmpty0(remainder, _, attr) =>
-      val last = convert(attr).map(Seq(_)).getOrElse(Nil)
-      convert(remainder) ++ last
-    case GccAttributeListNonEmpty1(attr) => convert(attr).map(Seq(_)).getOrElse(Nil)
-  }
+  def convert(
+      implicit list: GccAttributeListNonEmptyContext
+  ): Seq[CTypeExtensions[G]] =
+    list match {
+      case GccAttributeListNonEmpty0(remainder, _, attr) =>
+        val last = convert(attr).map(Seq(_)).getOrElse(Nil)
+        convert(remainder) ++ last
+      case GccAttributeListNonEmpty1(attr) =>
+        convert(attr).map(Seq(_)).getOrElse(Nil)
+    }
 
-  def convert(implicit list: GccAttributeContext): Option[CTypeExtensions[G]] = list match {
-    case GccAttribute0(name, args) =>
+  def convert(implicit list: GccAttributeContext): Option[CTypeExtensions[G]] =
+    list match {
+      case GccAttribute0(name, args) =>
 //      Some(CTypeAttribute(name, args.map(convert(_)).getOrElse(Seq())))
-      Some(CTypeAttribute(convert(name), args.map(convert(_)).getOrElse(Seq())))
-    case GccAttribute1(_) => None
-
-  }
+        Some(
+          CTypeAttribute(convert(name), args.map(convert(_)).getOrElse(Seq()))
+        )
+      case GccAttribute1(_) => None
 
-  def convert(implicit list: ParenthesizedArgumentExpressionListContext): Seq[Expr[G]] = list match {
-    case ParenthesizedArgumentExpressionList0(_, inner, _) => inner.map(convert(_)).getOrElse(Seq())
-  }
+    }
 
+  def convert(
+      implicit list: ParenthesizedArgumentExpressionListContext
+  ): Seq[Expr[G]] =
+    list match {
+      case ParenthesizedArgumentExpressionList0(_, inner, _) =>
+        inner.map(convert(_)).getOrElse(Seq())
+    }
 
-  def convert(implicit ptr: PointerContext): Seq[CPointer[G]] = ptr match {
-    case Pointer0(_, quals) =>
-      Seq(CPointer(quals.map(convert(_)) getOrElse Nil))
-    case Pointer1(_, quals, tail) =>
-      CPointer(quals.map(convert(_)) getOrElse Nil) +: convert(tail)
-    case Pointer2(_, quals) =>
-      Seq(CPointer(Nil), CPointer(quals.map(convert(_)) getOrElse Nil))
-    case Pointer3(_, quals, tail) =>
-      Seq(CPointer[G](Nil), CPointer[G](quals.map(convert(_)) getOrElse Nil)) ++ convert(tail)
-    case Pointer4(_, _) => ??(ptr)
-    case Pointer5(_, _, _) => ??(ptr)
-  }
+  def convert(implicit ptr: PointerContext): Seq[CPointer[G]] =
+    ptr match {
+      case Pointer0(_, quals) =>
+        Seq(CPointer(quals.map(convert(_)) getOrElse Nil))
+      case Pointer1(_, quals, tail) =>
+        CPointer(quals.map(convert(_)) getOrElse Nil) +: convert(tail)
+      case Pointer2(_, quals) =>
+        Seq(CPointer(Nil), CPointer(quals.map(convert(_)) getOrElse Nil))
+      case Pointer3(_, quals, tail) =>
+        Seq(
+          CPointer[G](Nil),
+          CPointer[G](quals.map(convert(_)) getOrElse Nil),
+        ) ++ convert(tail)
+      case Pointer4(_, _) => ??(ptr)
+      case Pointer5(_, _, _) => ??(ptr)
+    }
 
-  def convert(implicit decl: DirectDeclaratorContext): CDeclarator[G] = decl match {
-    case DirectDeclarator0(name) => CName(convert(name))
-    case DirectDeclarator1(inner, _, quals, dim, _) =>
-      CArrayDeclarator(quals.map(convert(_)) getOrElse Nil, dim.map(convert(_)), convert(inner))(blame(decl))
-    case DirectDeclarator2(_, _, _, _, _, _) => ??(decl)
-    case DirectDeclarator3(_, _, _, _, _, _) => ??(decl)
-    case DirectDeclarator4(_, _, _, _, _) => ??(decl)
-    case DirectDeclarator5(inner, _, paramList, _) =>
-      val (params, varargs) = paramList match {
-        case ParameterTypeList0(params) => (convert(params), false)
-        case ParameterTypeList1(params, _, _) => (convert(params), true)
-      }
-      CTypedFunctionDeclarator(params, varargs, convert(inner))
-    case DirectDeclarator6(inner, _, names, _) =>
-      CAnonymousFunctionDeclarator(names.map(convert(_)) getOrElse Nil, convert(inner))
-  }
+  def convert(implicit decl: DirectDeclaratorContext): CDeclarator[G] =
+    decl match {
+      case DirectDeclarator0(name) => CName(convert(name))
+      case DirectDeclarator1(inner, _, quals, dim, _) =>
+        CArrayDeclarator(
+          quals.map(convert(_)) getOrElse Nil,
+          dim.map(convert(_)),
+          convert(inner),
+        )(blame(decl))
+      case DirectDeclarator2(_, _, _, _, _, _) => ??(decl)
+      case DirectDeclarator3(_, _, _, _, _, _) => ??(decl)
+      case DirectDeclarator4(_, _, _, _, _) => ??(decl)
+      case DirectDeclarator5(inner, _, paramList, _) =>
+        val (params, varargs) =
+          paramList match {
+            case ParameterTypeList0(params) => (convert(params), false)
+            case ParameterTypeList1(params, _, _) => (convert(params), true)
+          }
+        CTypedFunctionDeclarator(params, varargs, convert(inner))
+      case DirectDeclarator6(inner, _, names, _) =>
+        CAnonymousFunctionDeclarator(
+          names.map(convert(_)) getOrElse Nil,
+          convert(inner),
+        )
+    }
 
-  def convert(implicit params: ParameterListContext): Seq[CParam[G]] = params match {
-    case ParameterList0(decl) => Seq(convert(decl))
-    case ParameterList1(init, _, last) => convert(init) :+ convert(last)
-  }
+  def convert(implicit params: ParameterListContext): Seq[CParam[G]] =
+    params match {
+      case ParameterList0(decl) => Seq(convert(decl))
+      case ParameterList1(init, _, last) => convert(init) :+ convert(last)
+    }
 
-  def convert(implicit param: ParameterDeclarationContext): CParam[G] = param match {
-    case ParameterDeclaration0(declSpecs, declarator) =>
-      new CParam(convert(declSpecs), convert(declarator))
-    case ParameterDeclaration1(_, _) =>
-      ??(param)
-  }
+  def convert(implicit param: ParameterDeclarationContext): CParam[G] =
+    param match {
+      case ParameterDeclaration0(declSpecs, declarator) =>
+        new CParam(convert(declSpecs), convert(declarator))
+      case ParameterDeclaration1(_, _) => ??(param)
+    }
 
-  def convert(implicit stat: StatementContext): Statement[G] = stat match {
-    case Statement0(stat) => convert(stat)
-    case Statement1(stat) => convert(stat)
-    case Statement2(stat) => convert(stat)
-    case Statement3(stat) => convert(stat)
-    case Statement4(stat) => convert(stat)
-    case Statement5(stat) => convert(stat)
-    case _: Statement6Context => ??(stat)
-    case Statement7(embedStats) => convert(embedStats)
-    case Statement8(embedStat) => convert(embedStat)
-    case Statement9(GpgpuBarrier0(contract, _, _, specifier, _)) => withContract(contract, c => {
-      GpgpuBarrier(AstBuildHelpers.foldStar[G](c.consume(c.requires)), AstBuildHelpers.foldStar[G](c.consume(c.ensures))
-        , convert(specifier))(blame(stat))
-    })
-    case Statement10(GpgpuAtomicBlock0(whiff, _, impl, den)) =>
-      GpgpuAtomic(convert(impl), whiff.map(convert(_)).getOrElse(Block(Nil)), den.map(convert(_)).getOrElse(Block(Nil)))
-  }
+  def convert(implicit stat: StatementContext): Statement[G] =
+    stat match {
+      case Statement0(stat) => convert(stat)
+      case Statement1(stat) => convert(stat)
+      case Statement2(stat) => convert(stat)
+      case Statement3(stat) => convert(stat)
+      case Statement4(stat) => convert(stat)
+      case Statement5(stat) => convert(stat)
+      case _: Statement6Context => ??(stat)
+      case Statement7(embedStats) => convert(embedStats)
+      case Statement8(embedStat) => convert(embedStat)
+      case Statement9(GpgpuBarrier0(contract, _, _, specifier, _)) =>
+        withContract(
+          contract,
+          c => {
+            GpgpuBarrier(
+              AstBuildHelpers.foldStar[G](c.consume(c.requires)),
+              AstBuildHelpers.foldStar[G](c.consume(c.ensures)),
+              convert(specifier),
+            )(blame(stat))
+          },
+        )
+      case Statement10(GpgpuAtomicBlock0(whiff, _, impl, den)) =>
+        GpgpuAtomic(
+          convert(impl),
+          whiff.map(convert(_)).getOrElse(Block(Nil)),
+          den.map(convert(_)).getOrElse(Block(Nil)),
+        )
+    }
 
-  def convert(implicit block: CompoundStatementContext): Statement[G] = block match {
-    case CompoundStatement0(_, stats, _) =>
-      Scope(Nil, Block(stats.map(convert(_)) getOrElse Nil))
-    case CompoundStatement1(ompPragma, _, contract, stats, _) =>
-      ??(block)
-  }
+  def convert(implicit block: CompoundStatementContext): Statement[G] =
+    block match {
+      case CompoundStatement0(_, stats, _) =>
+        Scope(Nil, Block(stats.map(convert(_)) getOrElse Nil))
+      case CompoundStatement1(ompPragma, _, contract, stats, _) => ??(block)
+    }
 
   def convert(implicit stats: BlockItemListContext): Seq[Statement[G]] =
-    convertList(BlockItemList0.unapply, BlockItemList1.unapply)(stats).map(convert(_))
-
-  def convert(implicit stat: BlockItemContext): Statement[G] = stat match {
-    case BlockItem0(decl) =>
-      CDeclarationStatement(new CLocalDeclaration(convert(decl)))
-    case BlockItem1(stat) => convert(stat)
-  }
+    convertList(BlockItemList0.unapply, BlockItemList1.unapply)(stats)
+      .map(convert(_))
+
+  def convert(implicit stat: BlockItemContext): Statement[G] =
+    stat match {
+      case BlockItem0(decl) =>
+        CDeclarationStatement(new CLocalDeclaration(convert(decl)))
+      case BlockItem1(stat) => convert(stat)
+    }
 
-  def convert(implicit spec: GpgpuMemFenceListContext): Seq[GpuMemoryFence[G]] = spec match {
-    case GpgpuMemFenceList0(argument) => Seq(convert(argument))
-    case GpgpuMemFenceList1(init, _, last) => convert(init) :+ convert(last)
-  }
+  def convert(implicit spec: GpgpuMemFenceListContext): Seq[GpuMemoryFence[G]] =
+    spec match {
+      case GpgpuMemFenceList0(argument) => Seq(convert(argument))
+      case GpgpuMemFenceList1(init, _, last) => convert(init) :+ convert(last)
+    }
 
-  def convert(implicit spec: GpgpuMemFenceContext): GpuMemoryFence[G] = spec match {
-    case GpgpuMemFence0(_) => GpuLocalMemoryFence()
-    case GpgpuMemFence1(_) => GpuGlobalMemoryFence()
-    case GpgpuMemFence2(i) => GpuZeroMemoryFence(BigInt(i))
-  }
+  def convert(implicit spec: GpgpuMemFenceContext): GpuMemoryFence[G] =
+    spec match {
+      case GpgpuMemFence0(_) => GpuLocalMemoryFence()
+      case GpgpuMemFence1(_) => GpuGlobalMemoryFence()
+      case GpgpuMemFence2(i) => GpuZeroMemoryFence(BigInt(i))
+    }
 
-  def convert(implicit stat: LabeledStatementContext): Statement[G] = stat match {
-    case LabeledStatement0(label, _, inner) =>
-      Label(new LabelDecl()(OriginProvider(stat).sourceName(convert(label))), convert(inner))
-    case LabeledStatement1(_, _, _, _) => ??(stat)
-    case LabeledStatement2(_, _, _) => ??(stat)
-  }
+  def convert(implicit stat: LabeledStatementContext): Statement[G] =
+    stat match {
+      case LabeledStatement0(label, _, inner) =>
+        Label(
+          new LabelDecl()(OriginProvider(stat).sourceName(convert(label))),
+          convert(inner),
+        )
+      case LabeledStatement1(_, _, _, _) => ??(stat)
+      case LabeledStatement2(_, _, _) => ??(stat)
+    }
 
-  def convert(implicit stat: ExpressionStatementContext): Statement[G] = stat match {
-    case ExpressionStatement0(None, _) => Block(Nil)
-    case ExpressionStatement0(Some(expr), _) => Eval(convert(expr))
-  }
+  def convert(implicit stat: ExpressionStatementContext): Statement[G] =
+    stat match {
+      case ExpressionStatement0(None, _) => Block(Nil)
+      case ExpressionStatement0(Some(expr), _) => Eval(convert(expr))
+    }
 
-  def convert(implicit stat: SelectionStatementContext): Statement[G] = stat match {
-    case SelectionStatement0(_, _, cond, _, whenTrue, None) =>
-      Branch(Seq((convert(cond), convert(whenTrue))))
-    case SelectionStatement0(_, _, cond, _, whenTrue, Some(whenFalse)) =>
-      Branch(Seq((convert(cond), convert(whenTrue)), (tt, convert(whenFalse))))
-    case SelectionStatement1(_, _, _, _, _) => ??(stat)
-  }
+  def convert(implicit stat: SelectionStatementContext): Statement[G] =
+    stat match {
+      case SelectionStatement0(_, _, cond, _, whenTrue, None) =>
+        Branch(Seq((convert(cond), convert(whenTrue))))
+      case SelectionStatement0(_, _, cond, _, whenTrue, Some(whenFalse)) =>
+        Branch(
+          Seq((convert(cond), convert(whenTrue)), (tt, convert(whenFalse)))
+        )
+      case SelectionStatement1(_, _, _, _, _) => ??(stat)
+    }
 
-  def convert(implicit stat: ElseBranchContext): Statement[G] = stat match {
-    case ElseBranch0(_, stat) => convert(stat)
-  }
+  def convert(implicit stat: ElseBranchContext): Statement[G] =
+    stat match { case ElseBranch0(_, stat) => convert(stat) }
 
-  def evalOrNop(implicit expr: Option[ExpressionContext]): Statement[G] = expr match {
-    case Some(expr) => Eval(convert(expr))(origin(expr))
-    case None =>
-      // PB: strictly speaking it would be nice if we can point to the empty range that indicates the absence of a statement here.
-      Block(Nil)(DiagnosticOrigin)
-  }
+  def evalOrNop(implicit expr: Option[ExpressionContext]): Statement[G] =
+    expr match {
+      case Some(expr) => Eval(convert(expr))(origin(expr))
+      case None =>
+        // PB: strictly speaking it would be nice if we can point to the empty range that indicates the absence of a statement here.
+        Block(Nil)(DiagnosticOrigin)
+    }
 
-  def convert(implicit stat: IterationStatementContext): Statement[G] = stat match {
-    case IterationStatement0(contract1, _, _, cond, _, contract2, body) => withContract(contract1, contract2, c => {
-      Scope(Nil, Loop[G](Block(Nil), convert(cond), Block(Nil), c.consumeLoopContract(stat), convert(body)))
-    })
-    case IterationStatement1(_, _, _, _, _, _, _) => ??(stat)
-    case IterationStatement2(contract1, maybePragma, _, _, init, _, cond, _, update, _, contract2, body) =>
-      withContract(contract1, contract2, c => {
-        Scope(Nil, Loop[G](evalOrNop(init), cond.map(convert(_)) getOrElse tt, evalOrNop(update), c.consumeLoopContract(stat), convert(body)))
-      })
-    case IterationStatement3(contract1, maybePragma, _, _, init, cond, _, update, _, contract2, body) =>
-      withContract(contract1, contract2, c => {
-        Scope(Nil, Loop[G](CDeclarationStatement(new CLocalDeclaration(convert(init))), cond.map(convert(_)) getOrElse tt, evalOrNop(update), c.consumeLoopContract(stat), convert(body)))
-      })
-  }
+  def convert(implicit stat: IterationStatementContext): Statement[G] =
+    stat match {
+      case IterationStatement0(contract1, _, _, cond, _, contract2, body) =>
+        withContract(
+          contract1,
+          contract2,
+          c => {
+            Scope(
+              Nil,
+              Loop[G](
+                Block(Nil),
+                convert(cond),
+                Block(Nil),
+                c.consumeLoopContract(stat),
+                convert(body),
+              ),
+            )
+          },
+        )
+      case IterationStatement1(_, _, _, _, _, _, _) => ??(stat)
+      case IterationStatement2(
+            contract1,
+            maybePragma,
+            _,
+            _,
+            init,
+            _,
+            cond,
+            _,
+            update,
+            _,
+            contract2,
+            body,
+          ) =>
+        withContract(
+          contract1,
+          contract2,
+          c => {
+            Scope(
+              Nil,
+              Loop[G](
+                evalOrNop(init),
+                cond.map(convert(_)) getOrElse tt,
+                evalOrNop(update),
+                c.consumeLoopContract(stat),
+                convert(body),
+              ),
+            )
+          },
+        )
+      case IterationStatement3(
+            contract1,
+            maybePragma,
+            _,
+            _,
+            init,
+            cond,
+            _,
+            update,
+            _,
+            contract2,
+            body,
+          ) =>
+        withContract(
+          contract1,
+          contract2,
+          c => {
+            Scope(
+              Nil,
+              Loop[G](
+                CDeclarationStatement(new CLocalDeclaration(convert(init))),
+                cond.map(convert(_)) getOrElse tt,
+                evalOrNop(update),
+                c.consumeLoopContract(stat),
+                convert(body),
+              ),
+            )
+          },
+        )
+    }
 
-  def convert(implicit stat: JumpStatementContext): Statement[G] = stat match {
-    case JumpStatement0(_, label, _) =>
-      CGoto(convert(label))
-    case JumpStatement1(_, _) => col.Continue(None)
-    case JumpStatement2(_, _) => col.Break(None)
-    case JumpStatement3(_, None, _) => col.Return(col.Void())
-    case JumpStatement3(_, Some(value), _) => col.Return(convert(value))
-    case JumpStatement4(_, _, _) => ??(stat)
-  }
+  def convert(implicit stat: JumpStatementContext): Statement[G] =
+    stat match {
+      case JumpStatement0(_, label, _) => CGoto(convert(label))
+      case JumpStatement1(_, _) => col.Continue(None)
+      case JumpStatement2(_, _) => col.Break(None)
+      case JumpStatement3(_, None, _) => col.Return(col.Void())
+      case JumpStatement3(_, Some(value), _) => col.Return(convert(value))
+      case JumpStatement4(_, _, _) => ??(stat)
+    }
 
-  def convert(implicit exprs: ArgumentExpressionListContext): Seq[Expr[G]] = exprs match {
-    case ArgumentExpressionList0(argument) => Seq(convert(argument))
-    case ArgumentExpressionList1(init, _, last) => convert(init) :+ convert(last)
-  }
+  def convert(implicit exprs: ArgumentExpressionListContext): Seq[Expr[G]] =
+    exprs match {
+      case ArgumentExpressionList0(argument) => Seq(convert(argument))
+      case ArgumentExpressionList1(init, _, last) =>
+        convert(init) :+ convert(last)
+    }
 
-  def convert(implicit expr: ExpressionContext): Expr[G] = expr match {
-    case Expression0(inner) => convert(inner)
-    case Expression1(first, _, result) =>
-      With(Eval(convert(first)), convert(result))
-  }
+  def convert(implicit expr: ExpressionContext): Expr[G] =
+    expr match {
+      case Expression0(inner) => convert(inner)
+      case Expression1(first, _, result) =>
+        With(Eval(convert(first)), convert(result))
+    }
 
-  def convert(implicit expr: InitializerContext): Expr[G] = expr match {
-    case Initializer0(_, list, _) => CLiteralArray(convert(list))
-    case Initializer1(_, list, _, _) => CLiteralArray(convert(list))
-    case Initializer2(inner) => convert(inner)
-  }
+  def convert(implicit expr: InitializerContext): Expr[G] =
+    expr match {
+      case Initializer0(_, list, _) => CLiteralArray(convert(list))
+      case Initializer1(_, list, _, _) => CLiteralArray(convert(list))
+      case Initializer2(inner) => convert(inner)
+    }
 
-  def convert(implicit list: InitializerListContext): Seq[Expr[G]] = list match {
-    case InitializerList0(None, init) => Seq(convert(init))
-    case InitializerList0(Some(_), init) => ??(list)
-    case InitializerList1(inits, _, None, last) => convert(inits) :+ convert(last)
-    case InitializerList1(inits, _, Some(_), last) => ??(list)
-  }
+  def convert(implicit list: InitializerListContext): Seq[Expr[G]] =
+    list match {
+      case InitializerList0(None, init) => Seq(convert(init))
+      case InitializerList0(Some(_), init) => ??(list)
+      case InitializerList1(inits, _, None, last) =>
+        convert(inits) :+ convert(last)
+      case InitializerList1(inits, _, Some(_), last) => ??(list)
+    }
 
-  def convert(implicit expr: AssignmentExpressionContext): Expr[G] = expr match {
-    case AssignmentExpression0(pre, inner, post) =>
-      convertEmbedWith(pre, convertEmbedThen(post, convert(inner)))
-    case AssignmentExpression1(pre, targetNode, AssignmentOperator0(op), valueNode, post) =>
-      val target = convert(targetNode)
-      val value = convert(valueNode)
-
-      val e = PreAssignExpression(target, op match {
-        case "=" => value
-        case "*=" => AmbiguousMult(target, value)
-        case "/=" => AmbiguousTruncDiv(target, value)(blame(expr))
-        case "%=" => AmbiguousTruncMod(target, value)(blame(expr))
-        case "+=" => col.AmbiguousPlus(target, value)(blame(valueNode))
-        case "-=" => col.AmbiguousMinus(target, value)((blame(valueNode)))
-        case "<<=" => BitShl(target, value)
-        case ">>=" => BitShr(target, value)
-        case "&=" => BitAnd(target, value)
-        case "^=" => BitXor(target, value)
-        case "|=" => BitOr(target, value)
-      })(blame(expr))
-
-      convertEmbedWith(pre, convertEmbedThen(post, e))
-  }
+  def convert(implicit expr: AssignmentExpressionContext): Expr[G] =
+    expr match {
+      case AssignmentExpression0(pre, inner, post) =>
+        convertEmbedWith(pre, convertEmbedThen(post, convert(inner)))
+      case AssignmentExpression1(
+            pre,
+            targetNode,
+            AssignmentOperator0(op),
+            valueNode,
+            post,
+          ) =>
+        val target = convert(targetNode)
+        val value = convert(valueNode)
+
+        val e =
+          PreAssignExpression(
+            target,
+            op match {
+              case "=" => value
+              case "*=" => AmbiguousMult(target, value)
+              case "/=" => AmbiguousTruncDiv(target, value)(blame(expr))
+              case "%=" => AmbiguousTruncMod(target, value)(blame(expr))
+              case "+=" => col.AmbiguousPlus(target, value)(blame(valueNode))
+              case "-=" => col.AmbiguousMinus(target, value)((blame(valueNode)))
+              case "<<=" => BitShl(target, value)
+              case ">>=" => BitShr(target, value)
+              case "&=" => BitAnd(target, value)
+              case "^=" => BitXor(target, value)
+              case "|=" => BitOr(target, value)
+            },
+          )(blame(expr))
+
+        convertEmbedWith(pre, convertEmbedThen(post, e))
+    }
 
-  def convert(implicit expr: ConditionalExpressionContext): Expr[G] = expr match {
-    case ConditionalExpression0(inner) => convert(inner)
-    case ConditionalExpression1(cond, _, whenTrue, _, whenFalse) =>
-      Select(convert(cond), convert(whenTrue), convert(whenFalse))
-  }
+  def convert(implicit expr: ConditionalExpressionContext): Expr[G] =
+    expr match {
+      case ConditionalExpression0(inner) => convert(inner)
+      case ConditionalExpression1(cond, _, whenTrue, _, whenFalse) =>
+        Select(convert(cond), convert(whenTrue), convert(whenFalse))
+    }
 
-  def convert(implicit expr: ImplicationExpressionContext): Expr[G] = expr match {
-    case ImplicationExpression0(left, ImplicationOp0(specOp), right) =>
-      convert(expr, specOp, convert(left), convert(right))
-    case ImplicationExpression1(inner) => convert(inner)
-  }
+  def convert(implicit expr: ImplicationExpressionContext): Expr[G] =
+    expr match {
+      case ImplicationExpression0(left, ImplicationOp0(specOp), right) =>
+        convert(expr, specOp, convert(left), convert(right))
+      case ImplicationExpression1(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: LogicalOrExpressionContext): Expr[G] = expr match {
-    case LogicalOrExpression0(inner) => convert(inner)
-    case LogicalOrExpression1(left, _, right) => AmbiguousOr(convert(left), convert(right))
-  }
+  def convert(implicit expr: LogicalOrExpressionContext): Expr[G] =
+    expr match {
+      case LogicalOrExpression0(inner) => convert(inner)
+      case LogicalOrExpression1(left, _, right) =>
+        AmbiguousOr(convert(left), convert(right))
+    }
 
-  def convert(implicit expr: LogicalAndExpressionContext): Expr[G] = expr match {
-    case LogicalAndExpression0(inner) => convert(inner)
-    case LogicalAndExpression1(left, op, right) => op match {
-      case LogicalAndOp0(_) => col.And(convert(left), convert(right))
-      case LogicalAndOp1(valOp) => convert(expr, valOp, convert(left), convert(right))
+  def convert(implicit expr: LogicalAndExpressionContext): Expr[G] =
+    expr match {
+      case LogicalAndExpression0(inner) => convert(inner)
+      case LogicalAndExpression1(left, op, right) =>
+        op match {
+          case LogicalAndOp0(_) => col.And(convert(left), convert(right))
+          case LogicalAndOp1(valOp) =>
+            convert(expr, valOp, convert(left), convert(right))
+        }
     }
-  }
 
-  def convert(implicit expr: InclusiveOrExpressionContext): Expr[G] = expr match {
-    case InclusiveOrExpression0(inner) => convert(inner)
-    case InclusiveOrExpression1(left, _, right) => BitOr(convert(left), convert(right))
-  }
+  def convert(implicit expr: InclusiveOrExpressionContext): Expr[G] =
+    expr match {
+      case InclusiveOrExpression0(inner) => convert(inner)
+      case InclusiveOrExpression1(left, _, right) =>
+        BitOr(convert(left), convert(right))
+    }
 
-  def convert(implicit expr: ExclusiveOrExpressionContext): Expr[G] = expr match {
-    case ExclusiveOrExpression0(inner) => convert(inner)
-    case ExclusiveOrExpression1(left, _, right) => BitXor(convert(left), convert(right))
-  }
+  def convert(implicit expr: ExclusiveOrExpressionContext): Expr[G] =
+    expr match {
+      case ExclusiveOrExpression0(inner) => convert(inner)
+      case ExclusiveOrExpression1(left, _, right) =>
+        BitXor(convert(left), convert(right))
+    }
 
-  def convert(implicit expr: AndExpressionContext): Expr[G] = expr match {
-    case AndExpression0(inner) => convert(inner)
-    case AndExpression1(left, _, right) => BitAnd(convert(left), convert(right))
-  }
+  def convert(implicit expr: AndExpressionContext): Expr[G] =
+    expr match {
+      case AndExpression0(inner) => convert(inner)
+      case AndExpression1(left, _, right) =>
+        BitAnd(convert(left), convert(right))
+    }
 
-  def convert(implicit expr: EqualityExpressionContext): Expr[G] = expr match {
-    case EqualityExpression0(inner) => convert(inner)
-    case EqualityExpression1(left, _, right) => AmbiguousEq(convert(left), convert(right), TCInt())
-    case EqualityExpression2(left, _, right) => AmbiguousNeq(convert(left), convert(right), TCInt())
-  }
+  def convert(implicit expr: EqualityExpressionContext): Expr[G] =
+    expr match {
+      case EqualityExpression0(inner) => convert(inner)
+      case EqualityExpression1(left, _, right) =>
+        AmbiguousEq(convert(left), convert(right), TCInt())
+      case EqualityExpression2(left, _, right) =>
+        AmbiguousNeq(convert(left), convert(right), TCInt())
+    }
 
-  def convert(implicit expr: RelationalExpressionContext): Expr[G] = expr match {
-    case RelationalExpression0(inner) => convert(inner)
-    case RelationalExpression1(left, RelationalOp0(op), right) => op match {
-      case "<" => col.AmbiguousLess(convert(left), convert(right))
-      case ">" => col.AmbiguousGreater(convert(left), convert(right))
-      case "<=" => AmbiguousLessEq(convert(left), convert(right))
-      case ">=" => AmbiguousGreaterEq(convert(left), convert(right))
+  def convert(implicit expr: RelationalExpressionContext): Expr[G] =
+    expr match {
+      case RelationalExpression0(inner) => convert(inner)
+      case RelationalExpression1(left, RelationalOp0(op), right) =>
+        op match {
+          case "<" => col.AmbiguousLess(convert(left), convert(right))
+          case ">" => col.AmbiguousGreater(convert(left), convert(right))
+          case "<=" => AmbiguousLessEq(convert(left), convert(right))
+          case ">=" => AmbiguousGreaterEq(convert(left), convert(right))
+        }
+      case RelationalExpression1(left, RelationalOp1(specOp), right) =>
+        convert(expr, specOp, convert(left), convert(right))
     }
-    case RelationalExpression1(left, RelationalOp1(specOp), right) =>
-      convert(expr, specOp, convert(left), convert(right))
-  }
 
-  def convert(implicit expr: ShiftExpressionContext): Expr[G] = expr match {
-    case ShiftExpression0(inner) => convert(inner)
-    case ShiftExpression1(left, _, right) => BitShl(convert(left), convert(right))
-    case ShiftExpression2(left, _, right) => BitShr(convert(left), convert(right))
-  }
+  def convert(implicit expr: ShiftExpressionContext): Expr[G] =
+    expr match {
+      case ShiftExpression0(inner) => convert(inner)
+      case ShiftExpression1(left, _, right) =>
+        BitShl(convert(left), convert(right))
+      case ShiftExpression2(left, _, right) =>
+        BitShr(convert(left), convert(right))
+    }
 
-  def convert(implicit expr: AdditiveExpressionContext): Expr[G] = expr match {
-    case AdditiveExpression0(inner) => convert(inner)
-    case AdditiveExpression1(left, _, right) => AmbiguousPlus(convert(left), convert(right))(blame(expr))
-    case AdditiveExpression2(left, _, right) => col.AmbiguousMinus(convert(left), convert(right))(blame(expr))
-  }
+  def convert(implicit expr: AdditiveExpressionContext): Expr[G] =
+    expr match {
+      case AdditiveExpression0(inner) => convert(inner)
+      case AdditiveExpression1(left, _, right) =>
+        AmbiguousPlus(convert(left), convert(right))(blame(expr))
+      case AdditiveExpression2(left, _, right) =>
+        col.AmbiguousMinus(convert(left), convert(right))(blame(expr))
+    }
 
-  def convert(implicit expr: MultiplicativeExpressionContext): Expr[G] = expr match {
-    case MultiplicativeExpression0(inner) => convert(inner)
-    case MultiplicativeExpression1(left, op, right) => op match {
-      case MultiplicativeOp0(_) => AmbiguousMult(convert(left), convert(right))
-      case MultiplicativeOp1(_) => AmbiguousTruncDiv(convert(left), convert(right))(blame(expr))
-      case MultiplicativeOp2(_) => AmbiguousTruncMod(convert(left), convert(right))(blame(expr))
-      case MultiplicativeOp3(_) => col.RatDiv(convert(left), convert(right))(blame(expr))
+  def convert(implicit expr: MultiplicativeExpressionContext): Expr[G] =
+    expr match {
+      case MultiplicativeExpression0(inner) => convert(inner)
+      case MultiplicativeExpression1(left, op, right) =>
+        op match {
+          case MultiplicativeOp0(_) =>
+            AmbiguousMult(convert(left), convert(right))
+          case MultiplicativeOp1(_) =>
+            AmbiguousTruncDiv(convert(left), convert(right))(blame(expr))
+          case MultiplicativeOp2(_) =>
+            AmbiguousTruncMod(convert(left), convert(right))(blame(expr))
+          case MultiplicativeOp3(_) =>
+            col.RatDiv(convert(left), convert(right))(blame(expr))
+        }
     }
-  }
 
-  def convert(implicit expr: PrependExpressionContext): Expr[G] = expr match {
-    case PrependExpression0(left, PrependOp0(specOp), right) => convert(expr, specOp, convert(left), convert(right))
-    case PrependExpression1(inner) => convert(inner)
-  }
+  def convert(implicit expr: PrependExpressionContext): Expr[G] =
+    expr match {
+      case PrependExpression0(left, PrependOp0(specOp), right) =>
+        convert(expr, specOp, convert(left), convert(right))
+      case PrependExpression1(inner) => convert(inner)
+    }
 
-  def convert(implicit typeName: TypeNameContext): Type[G] = typeName match {
-    case TypeName0(specifiers, None) => CPrimitiveType(convert(specifiers))
-    case TypeName0(specifiers, Some(AbstractDeclarator0(pointer))) => convert(pointer, convert(specifiers))
-    case TypeName0(_, _) => ??(typeName)
-  }
+  def convert(implicit typeName: TypeNameContext): Type[G] =
+    typeName match {
+      case TypeName0(specifiers, None) => CPrimitiveType(convert(specifiers))
+      case TypeName0(specifiers, Some(AbstractDeclarator0(pointer))) =>
+        convert(pointer, convert(specifiers))
+      case TypeName0(_, _) => ??(typeName)
+    }
 
-  def convert(implicit pointer: PointerContext, specifiers: Seq[CDeclarationSpecifier[G]]): Type[G] = pointer match {
-    case Pointer0(_, None) => CTPointer(CPrimitiveType(specifiers))
-    case Pointer1(_, None, p) => CTPointer(convert(p, specifiers))
-    case Pointer2(_, None) => CTPointer(CTPointer(CPrimitiveType(specifiers)))
-    case Pointer3(_, None, p) => CTPointer(CTPointer(convert(p, specifiers)))
-    case _ =>  ??(pointer)
-  }
+  def convert(
+      implicit pointer: PointerContext,
+      specifiers: Seq[CDeclarationSpecifier[G]],
+  ): Type[G] =
+    pointer match {
+      case Pointer0(_, None) => CTPointer(CPrimitiveType(specifiers))
+      case Pointer1(_, None, p) => CTPointer(convert(p, specifiers))
+      case Pointer2(_, None) => CTPointer(CTPointer(CPrimitiveType(specifiers)))
+      case Pointer3(_, None, p) => CTPointer(CTPointer(convert(p, specifiers)))
+      case _ => ??(pointer)
+    }
 
-  def convert(implicit specifiers: SpecifierQualifierListContext): Seq[CDeclarationSpecifier[G]] = specifiers match {
-    case SpecifierQualifierList0(t, tail) => convert(t) +: tail.map((e: SpecifierQualifierListContext) => convert(e)).getOrElse(Nil)
-    case SpecifierQualifierList1(_, _) => ??(specifiers)
-  }
+  def convert(
+      implicit specifiers: SpecifierQualifierListContext
+  ): Seq[CDeclarationSpecifier[G]] =
+    specifiers match {
+      case SpecifierQualifierList0(t, tail) =>
+        convert(t) +: tail.map((e: SpecifierQualifierListContext) => convert(e))
+          .getOrElse(Nil)
+      case SpecifierQualifierList1(_, _) => ??(specifiers)
+    }
 
-  def convert(implicit expr: CastExpressionContext): Expr[G] = expr match {
-    case CastExpression0(inner) => convert(inner)
-    case CastExpression1(_, typeName, _, e) => CCast(convert(e), convert(typeName))
-    case CastExpression1(_, _, _, _) => ??(expr)
-    case CastExpression2(_, _, _, _, _) => ??(expr)
-  }
+  def convert(implicit expr: CastExpressionContext): Expr[G] =
+    expr match {
+      case CastExpression0(inner) => convert(inner)
+      case CastExpression1(_, typeName, _, e) =>
+        CCast(convert(e), convert(typeName))
+      case CastExpression1(_, _, _, _) => ??(expr)
+      case CastExpression2(_, _, _, _, _) => ??(expr)
+    }
 
-  def convert(implicit expr: UnaryExpressionContext): Expr[G] = expr match {
-    case UnaryExpression0(inner) => convert(inner)
-    case UnaryExpression1(_, arg) =>
-      val target = convert(arg)
-      PreAssignExpression(target, col.AmbiguousPlus(target, c_const(1))(blame(expr)))(blame(expr))
-    case UnaryExpression2(_, arg) =>
-      val target = convert(arg)
-      PreAssignExpression(target, col.AmbiguousMinus(target, c_const(1))(blame(expr)))(blame(expr))
-    case UnaryExpression3(UnaryOperator0(op), arg) => op match {
-      case "&" => AddrOf(convert(arg))
-      case "*" => DerefPointer(convert(arg))(blame(expr))
-      case "+" => convert(arg)
-      case "-" => UMinus(convert(arg))
-      case "~" => BitNot(convert(arg))
-      case "!" => col.Not(convert(arg))
-    }
-    case UnaryExpression4(_, _) => ??(expr)
-    case UnaryExpression5(_, _, tname, _) => SizeOf(convert(tname))
-    case UnaryExpression6(_, _, _, _) => ??(expr)
-    case UnaryExpression7(_, _) => ??(expr)
-    case UnaryExpression8(SpecPrefix0(op), inner) => convert(expr, op, convert(inner))
-  }
+  def convert(implicit expr: UnaryExpressionContext): Expr[G] =
+    expr match {
+      case UnaryExpression0(inner) => convert(inner)
+      case UnaryExpression1(_, arg) =>
+        val target = convert(arg)
+        PreAssignExpression(
+          target,
+          col.AmbiguousPlus(target, c_const(1))(blame(expr)),
+        )(blame(expr))
+      case UnaryExpression2(_, arg) =>
+        val target = convert(arg)
+        PreAssignExpression(
+          target,
+          col.AmbiguousMinus(target, c_const(1))(blame(expr)),
+        )(blame(expr))
+      case UnaryExpression3(UnaryOperator0(op), arg) =>
+        op match {
+          case "&" => AddrOf(convert(arg))
+          case "*" => DerefPointer(convert(arg))(blame(expr))
+          case "+" => convert(arg)
+          case "-" => UMinus(convert(arg))
+          case "~" => BitNot(convert(arg))
+          case "!" => col.Not(convert(arg))
+        }
+      case UnaryExpression4(_, _) => ??(expr)
+      case UnaryExpression5(_, _, tname, _) => SizeOf(convert(tname))
+      case UnaryExpression6(_, _, _, _) => ??(expr)
+      case UnaryExpression7(_, _) => ??(expr)
+      case UnaryExpression8(SpecPrefix0(op), inner) =>
+        convert(expr, op, convert(inner))
+    }
 
-  def convert(implicit expr: PostfixExpressionContext): Expr[G] = expr match {
-    case PostfixExpression0(inner) => convert(inner)
-    case PostfixExpression1(arr, _, idx, _) => AmbiguousSubscript(convert(arr), convert(idx))(blame(expr))
-    case PostfixExpression2(f, _, args, _, given, yields) =>
-      CInvocation(convert(f), args.map(convert(_)) getOrElse Nil,
-        convertEmbedGiven(given), convertEmbedYields(yields))(blame(expr))
-    case PostfixExpression3(struct, _, field) => CFieldAccess(convert(struct), convert(field))(blame(expr))
-    case PostfixExpression4(struct, _, field) => CStructDeref(convert(struct), convert(field))(blame(expr))
-    case PostfixExpression5(targetNode, _) =>
-      val target = convert(targetNode)
-      PostAssignExpression(target, col.AmbiguousPlus(target, c_const(1))(blame(expr)))(blame(expr))
-    case PostfixExpression6(targetNode, _) =>
-      val target = convert(targetNode)
-      PostAssignExpression(target, col.AmbiguousMinus(target, c_const(1))(blame(expr)))(blame(expr))
-    case PostfixExpression7(e, SpecPostfix0(postfix)) => convert(expr, postfix, convert(e))
-    case PostfixExpression8(_, _, _, _, _, _) => ??(expr)
-    case PostfixExpression9(_, _, _, _, _, _, _) => ??(expr)
-    case PostfixExpression10(_, _, _, _, _, _, _) => ??(expr)
-    case PostfixExpression11(_, _, _, _, _, _, _, _) => ??(expr)
-    case PostfixExpression12(GpgpuCudaKernelInvocation0(name, _, blocks, _, threads, _, _, args, _, given, yields)) =>
-      GpgpuCudaKernelInvocation(convert(name), convert(blocks), convert(threads), convert(args),
-        convertEmbedGiven(given), convertEmbedYields(yields))(blame(expr))
-  }
+  def convert(implicit expr: PostfixExpressionContext): Expr[G] =
+    expr match {
+      case PostfixExpression0(inner) => convert(inner)
+      case PostfixExpression1(arr, _, idx, _) =>
+        AmbiguousSubscript(convert(arr), convert(idx))(blame(expr))
+      case PostfixExpression2(f, _, args, _, given, yields) =>
+        CInvocation(
+          convert(f),
+          args.map(convert(_)) getOrElse Nil,
+          convertEmbedGiven(given),
+          convertEmbedYields(yields),
+        )(blame(expr))
+      case PostfixExpression3(struct, _, field) =>
+        CFieldAccess(convert(struct), convert(field))(blame(expr))
+      case PostfixExpression4(struct, _, field) =>
+        CStructDeref(convert(struct), convert(field))(blame(expr))
+      case PostfixExpression5(targetNode, _) =>
+        val target = convert(targetNode)
+        PostAssignExpression(
+          target,
+          col.AmbiguousPlus(target, c_const(1))(blame(expr)),
+        )(blame(expr))
+      case PostfixExpression6(targetNode, _) =>
+        val target = convert(targetNode)
+        PostAssignExpression(
+          target,
+          col.AmbiguousMinus(target, c_const(1))(blame(expr)),
+        )(blame(expr))
+      case PostfixExpression7(e, SpecPostfix0(postfix)) =>
+        convert(expr, postfix, convert(e))
+      case PostfixExpression8(_, _, _, _, _, _) => ??(expr)
+      case PostfixExpression9(_, _, _, _, _, _, _) => ??(expr)
+      case PostfixExpression10(_, _, _, _, _, _, _) => ??(expr)
+      case PostfixExpression11(_, _, _, _, _, _, _, _) => ??(expr)
+      case PostfixExpression12(
+            GpgpuCudaKernelInvocation0(
+              name,
+              _,
+              blocks,
+              _,
+              threads,
+              _,
+              _,
+              args,
+              _,
+              given,
+              yields,
+            )
+          ) =>
+        GpgpuCudaKernelInvocation(
+          convert(name),
+          convert(blocks),
+          convert(threads),
+          convert(args),
+          convertEmbedGiven(given),
+          convertEmbedYields(yields),
+        )(blame(expr))
+    }
 
-  def convert(implicit expr: AnnotatedPrimaryExpressionContext): Expr[G] = expr match {
-    case AnnotatedPrimaryExpression0(pre, inner, post) =>
-      convertEmbedWith(pre, convertEmbedThen(post, convert(inner)))
-  }
+  def convert(implicit expr: AnnotatedPrimaryExpressionContext): Expr[G] =
+    expr match {
+      case AnnotatedPrimaryExpression0(pre, inner, post) =>
+        convertEmbedWith(pre, convertEmbedThen(post, convert(inner)))
+    }
 
   def parseFloat(numFlag: String)(implicit o: Origin): Option[Expr[G]] = {
     try {
       Some(numFlag.last match {
-        case 'f' | 'F' => FloatValue(BigDecimal(numFlag.init), TFloats.C_ieee754_32bit)
-        case 'l' | 'L' => FloatValue(BigDecimal(numFlag.init), TFloats.C_ieee754_64bit)
+        case 'f' | 'F' =>
+          FloatValue(BigDecimal(numFlag.init), TFloats.C_ieee754_32bit)
+        case 'l' | 'L' =>
+          FloatValue(BigDecimal(numFlag.init), TFloats.C_ieee754_64bit)
         case _ => FloatValue(BigDecimal(numFlag), TFloats.C_ieee754_32bit)
       })
-    } catch {
-        case _: NumberFormatException => None
-    }
+    } catch { case _: NumberFormatException => None }
   }
 
   def parseInt(i: String)(implicit o: Origin): Option[Expr[G]] =
-    try {
-      Some(CIntegerValue(BigInt(i)))
-    } catch {
-      case e: NumberFormatException => None
-    }
-
-  def convert(implicit expr: PrimaryExpressionContext): Expr[G] = expr match {
-    case PrimaryExpression0(inner) => convert(inner)
-    case PrimaryExpression1(inner) => local(expr, convert(inner))
-    case PrimaryExpression2(const) =>
-      parseInt(const).orElse(parseFloat(const)).getOrElse(??(expr))
-    case PrimaryExpression3(_) => ??(expr)
-    case PrimaryExpression4(_, inner, _) => convert(inner)
-    case PrimaryExpression5(_) => ??(expr)
-    case PrimaryExpression6(_, _, _, _) => ??(expr)
-    case PrimaryExpression7(_, _, _, _, _, _) => ??(expr)
-    case PrimaryExpression8(_, _, _, _, _, _) => ??(expr)
-    case PrimaryExpression9(_) => col.Null()
-  }
+    try { Some(CIntegerValue(BigInt(i))) }
+    catch { case e: NumberFormatException => None }
+
+  def convert(implicit expr: PrimaryExpressionContext): Expr[G] =
+    expr match {
+      case PrimaryExpression0(inner) => convert(inner)
+      case PrimaryExpression1(inner) => local(expr, convert(inner))
+      case PrimaryExpression2(const) =>
+        parseInt(const).orElse(parseFloat(const)).getOrElse(??(expr))
+      case PrimaryExpression3(_) => ??(expr)
+      case PrimaryExpression4(_, inner, _) => convert(inner)
+      case PrimaryExpression5(_) => ??(expr)
+      case PrimaryExpression6(_, _, _, _) => ??(expr)
+      case PrimaryExpression7(_, _, _, _, _, _) => ??(expr)
+      case PrimaryExpression8(_, _, _, _, _, _) => ??(expr)
+      case PrimaryExpression9(_) => col.Null()
+    }
 
-  def convert(implicit ids: IdentifierListContext): Seq[String] = ids match {
-    case IdentifierList0(id) => Seq(convert(id))
-    case IdentifierList1(init, _, last) => convert(init) :+ convert(last)
-  }
+  def convert(implicit ids: IdentifierListContext): Seq[String] =
+    ids match {
+      case IdentifierList0(id) => Seq(convert(id))
+      case IdentifierList1(init, _, last) => convert(init) :+ convert(last)
+    }
 
-  def convert(id: ClangIdentifierContext): String = id match {
-    case ClangIdentifier0(text) => text
-    case ClangIdentifier1(inner) => convert(inner)
-  }
+  def convert(id: ClangIdentifierContext): String =
+    id match {
+      case ClangIdentifier0(text) => text
+      case ClangIdentifier1(inner) => convert(inner)
+    }
 
-  def convert(expr: LangExprContext): Expr[G] = expr match {
-    case LangExpr0(expr) => convert(expr)
-  }
+  def convert(expr: LangExprContext): Expr[G] =
+    expr match { case LangExpr0(expr) => convert(expr) }
 
-  def convert(stat: LangStatementContext): Statement[G] = stat match {
-    case LangStatement0(stat) => convert(stat)
-  }
+  def convert(stat: LangStatementContext): Statement[G] =
+    stat match { case LangStatement0(stat) => convert(stat) }
 
-  def convert(implicit t: LangTypeContext): Type[G] = t match {
-    case LangType0(typeSpec) => convert(typeSpec)
-  }
+  def convert(implicit t: LangTypeContext): Type[G] =
+    t match { case LangType0(typeSpec) => convert(typeSpec) }
 
-  def convert(t: TypeSpecifierWithPointerOrArrayContext): Type[G] = t match {
-    case TypeSpecifierWithPointerOrArray0(typeSpec) => CPrimitiveType(Seq(convert(typeSpec)))
-    case TypeSpecifierWithPointerOrArray1(typeSpec, _, _) => CTArray(None, CPrimitiveType(Seq(convert(typeSpec))))(blame(t))
-    case TypeSpecifierWithPointerOrArray2(typeSpec, _) => CTPointer(CPrimitiveType(Seq(convert(typeSpec))))
-  }
+  def convert(t: TypeSpecifierWithPointerOrArrayContext): Type[G] =
+    t match {
+      case TypeSpecifierWithPointerOrArray0(typeSpec) =>
+        CPrimitiveType(Seq(convert(typeSpec)))
+      case TypeSpecifierWithPointerOrArray1(typeSpec, _, _) =>
+        CTArray(None, CPrimitiveType(Seq(convert(typeSpec))))(blame(t))
+      case TypeSpecifierWithPointerOrArray2(typeSpec, _) =>
+        CTPointer(CPrimitiveType(Seq(convert(typeSpec))))
+    }
 
-  def convert(id: LangIdContext): String = id match {
-    case LangId0(id) => convert(id)
-  }
+  def convert(id: LangIdContext): String =
+    id match { case LangId0(id) => convert(id) }
 
-  def convert(implicit n: LangConstIntContext): BigInt = n match {
-    case LangConstInt0(string) => BigInt(string)
-  }
+  def convert(implicit n: LangConstIntContext): BigInt =
+    n match { case LangConstInt0(string) => BigInt(string) }
 
   def local(ctx: ParserRuleContext, name: String): Expr[G] =
     CLocal(name)(blame(ctx))(origin(ctx))
 
-  def convert(decl: LangGlobalDeclContext): Seq[GlobalDeclaration[G]] = decl match {
-    case LangGlobalDecl0(decl) => convert(decl)
-  }
+  def convert(decl: LangGlobalDeclContext): Seq[GlobalDeclaration[G]] =
+    decl match { case LangGlobalDecl0(decl) => convert(decl) }
 
   def convert(decl: LangClassDeclContext): Seq[ClassDeclaration[G]] = Nil
 
-  def withCollector[T](collector: ContractCollector[G], f: ContractCollector[G] => T): T = {
+  def withCollector[T](
+      collector: ContractCollector[G],
+      f: ContractCollector[G] => T,
+  ): T = {
     val result = f(collector)
     collector.nodes.headOption match {
-      case Some(node) => fail(node, "This specification clause may not occur here")
+      case Some(node) =>
+        fail(node, "This specification clause may not occur here")
       case None => result
     }
   }
 
-  def withContract[T](node: Option[ValEmbedContractContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node: Option[ValEmbedContractContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withContract[T](node1: Option[ValEmbedContractContext], node2: Option[ValEmbedContractContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node1: Option[ValEmbedContractContext],
+      node2: Option[ValEmbedContractContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node1.foreach(convert(_, collector))
     node2.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withContract[T](node: Seq[ValContractClauseContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node: Seq[ValContractClauseContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withCollector[T](collector: ModifierCollector, f: ModifierCollector => T): T = {
+  def withCollector[T](
+      collector: ModifierCollector,
+      f: ModifierCollector => T,
+  ): T = {
     val result = f(collector)
     collector.nodes.headOption match {
-      case Some(node) => fail(node, "This modifier cannot be attached to this declaration")
+      case Some(node) =>
+        fail(node, "This modifier cannot be attached to this declaration")
       case None => result
     }
   }
 
-  def withModifiers[T](node: Seq[ValModifierContext], f: ModifierCollector => T): T = {
+  def withModifiers[T](
+      node: Seq[ValModifierContext],
+      f: ModifierCollector => T,
+  ): T = {
     val collector = new ModifierCollector()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withModifiers[T](node: ValEmbedModifierContext, f: ModifierCollector => T): T = {
+  def withModifiers[T](
+      node: ValEmbedModifierContext,
+      f: ModifierCollector => T,
+  ): T = {
     val collector = new ModifierCollector()
     convert(node, collector)
     withCollector(collector, f)
   }
 
-  def convert(contract: ValEmbedContractContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValEmbedContract0(blocks) => blocks.foreach(convert(_, collector))
-  }
-
-  def convert(contract: ValEmbedContractBlockContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValEmbedContractBlock0(_, clauses, _) => clauses.foreach(convert(_, collector))
-    case ValEmbedContractBlock1(clauses) => clauses.foreach(convert(_, collector))
-  }
-
-  def convert(implicit contract: ValContractClauseContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValContractClause0(_, ids, _) => collector.modifies ++= convert(ids).map((contract, _))
-    case ValContractClause1(_, ids, _) => collector.accessible ++= convert(ids).map((contract, _))
-    case ValContractClause2(_, exp, _) => collector.requires += ((contract, convert(exp)))
-    case ValContractClause3(_, exp, _) => collector.ensures += ((contract, convert(exp)))
-    case ValContractClause4(_, t, id, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName(convert(id)))
-      collector.given += ((contract, variable))
-    case ValContractClause5(_, t, id, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName(convert(id)))
-      collector.yields += ((contract, variable))
-    case ValContractClause6(_, exp, _) => collector.context_everywhere += ((contract, convert(exp)))
-    case ValContractClause7(_, exp, _) =>
-      collector.requires += ((contract, convert(exp)))
-      collector.ensures += ((contract, convert(exp)))
-    case ValContractClause8(_, exp, _) => collector.loop_invariant += ((contract, convert(exp)))
-    case ValContractClause9(_, exp, _) => collector.kernel_invariant += ((contract, convert(exp)))
-    case ValContractClause10(_, _, t, id, _, exp, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName(convert(id)))
-      collector.signals += ((contract, SignalsClause(variable, convert(exp))(OriginProvider(contract))))
-    case ValContractClause11(_, invariant, _) => collector.lock_invariant += ((contract, convert(invariant)))
-    case ValContractClause12(_, None, _) => collector.decreases += ((contract, DecreasesClauseNoRecursion()))
-    case ValContractClause12(_, Some(clause), _) => collector.decreases += ((contract, convert(clause)))
-  }
-
-  def convert(implicit clause: ValDecreasesMeasureContext): DecreasesClause[G] = clause match {
-    case ValDecreasesMeasure0(_) => DecreasesClauseAssume()
-    case ValDecreasesMeasure1(exps) => DecreasesClauseTuple(convert(exps))
-  }
-
-  def convert(mod: ValEmbedModifierContext, collector: ModifierCollector): Unit = mod match {
-    case ValEmbedModifier0(_, mod, _) => convert(mod, collector)
-    case ValEmbedModifier1(mod) => convert(mod, collector)
-  }
+  def convert(
+      contract: ValEmbedContractContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValEmbedContract0(blocks) => blocks.foreach(convert(_, collector))
+    }
 
-  def convert(mod: ValModifierContext, collector: ModifierCollector): Unit = mod match {
-    case ValModifier0(name) => name match {
-      case "pure" => collector.pure += mod
-      case "inline" => collector.inline += mod
-      case "thread_local" => collector.threadLocal += mod
+  def convert(
+      contract: ValEmbedContractBlockContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValEmbedContractBlock0(_, clauses, _) =>
+        clauses.foreach(convert(_, collector))
+      case ValEmbedContractBlock1(clauses) =>
+        clauses.foreach(convert(_, collector))
     }
-    case ValStatic(_) => collector.static += mod
-  }
 
-  def convertEmbedWith(implicit whiff: Option[ValEmbedWithContext], inner: Expr[G]): Expr[G] = whiff match {
-    case None => inner
-    case Some(ValEmbedWith0(_, whiff, _)) => convertWith(whiff, inner)
-    case Some(ValEmbedWith1(whiff)) => convertWith(Some(whiff), inner)
-  }
+  def convert(
+      implicit contract: ValContractClauseContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValContractClause0(_, ids, _) =>
+        collector.modifies ++= convert(ids).map((contract, _))
+      case ValContractClause1(_, ids, _) =>
+        collector.accessible ++= convert(ids).map((contract, _))
+      case ValContractClause2(_, exp, _) =>
+        collector.requires += ((contract, convert(exp)))
+      case ValContractClause3(_, exp, _) =>
+        collector.ensures += ((contract, convert(exp)))
+      case ValContractClause4(_, t, id, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName(convert(id)))
+        collector.given += ((contract, variable))
+      case ValContractClause5(_, t, id, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName(convert(id)))
+        collector.yields += ((contract, variable))
+      case ValContractClause6(_, exp, _) =>
+        collector.context_everywhere += ((contract, convert(exp)))
+      case ValContractClause7(_, exp, _) =>
+        collector.requires += ((contract, convert(exp)))
+        collector.ensures += ((contract, convert(exp)))
+      case ValContractClause8(_, exp, _) =>
+        collector.loop_invariant += ((contract, convert(exp)))
+      case ValContractClause9(_, exp, _) =>
+        collector.kernel_invariant += ((contract, convert(exp)))
+      case ValContractClause10(_, _, t, id, _, exp, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName(convert(id)))
+        collector.signals +=
+          ((
+            contract,
+            SignalsClause(variable, convert(exp))(OriginProvider(contract)),
+          ))
+      case ValContractClause11(_, invariant, _) =>
+        collector.lock_invariant += ((contract, convert(invariant)))
+      case ValContractClause12(_, None, _) =>
+        collector.decreases += ((contract, DecreasesClauseNoRecursion()))
+      case ValContractClause12(_, Some(clause), _) =>
+        collector.decreases += ((contract, convert(clause)))
+    }
 
-  def convertWith(implicit whiff: Option[ValWithContext], inner: Expr[G]): Expr[G] = whiff match {
-    case None => inner
-    case Some(whiff@ValWith0(_, stat)) => With(convert(stat), inner)(origin(whiff))
-  }
+  def convert(implicit clause: ValDecreasesMeasureContext): DecreasesClause[G] =
+    clause match {
+      case ValDecreasesMeasure0(_) => DecreasesClauseAssume()
+      case ValDecreasesMeasure1(exps) => DecreasesClauseTuple(convert(exps))
+    }
 
-  def convertEmbedThen(implicit den: Option[ValEmbedThenContext], inner: Expr[G]): Expr[G] = den match {
-    case None => inner
-    case Some(ValEmbedThen0(_, den, _)) => convertThen(den, inner)
-    case Some(ValEmbedThen1(den)) => convertThen(Some(den), inner)
-  }
+  def convert(
+      mod: ValEmbedModifierContext,
+      collector: ModifierCollector,
+  ): Unit =
+    mod match {
+      case ValEmbedModifier0(_, mod, _) => convert(mod, collector)
+      case ValEmbedModifier1(mod) => convert(mod, collector)
+    }
 
-  def convertThen(implicit den: Option[ValThenContext], inner: Expr[G]): Expr[G] = den match {
-    case None => inner
-    case Some(den@ValThen0(_, stat)) => Then(inner, convert(stat))(origin(den))
-  }
+  def convert(mod: ValModifierContext, collector: ModifierCollector): Unit =
+    mod match {
+      case ValModifier0(name) =>
+        name match {
+          case "pure" => collector.pure += mod
+          case "inline" => collector.inline += mod
+          case "thread_local" => collector.threadLocal += mod
+        }
+      case ValStatic(_) => collector.static += mod
+    }
 
-  def convert(implicit whiff: ValEmbedWithContext): Statement[G] = whiff match {
-    case ValEmbedWith0(_, Some(whiff), _) => convert(whiff)
-    case ValEmbedWith0(_, None, _) => Block(Nil)
-    case ValEmbedWith1(whiff) => convert(whiff)
-  }
+  def convertEmbedWith(
+      implicit whiff: Option[ValEmbedWithContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    whiff match {
+      case None => inner
+      case Some(ValEmbedWith0(_, whiff, _)) => convertWith(whiff, inner)
+      case Some(ValEmbedWith1(whiff)) => convertWith(Some(whiff), inner)
+    }
 
-  def convert(implicit whiff: ValWithContext): Statement[G] = whiff match {
-    case ValWith0(_, stat) => convert(stat)
-  }
+  def convertWith(
+      implicit whiff: Option[ValWithContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    whiff match {
+      case None => inner
+      case Some(whiff @ ValWith0(_, stat)) =>
+        With(convert(stat), inner)(origin(whiff))
+    }
 
-  def convert(implicit whiff: ValEmbedThenContext): Statement[G] = whiff match {
-    case ValEmbedThen0(_, Some(whiff), _) => convert(whiff)
-    case ValEmbedThen0(_, None, _) => Block(Nil)
-    case ValEmbedThen1(whiff) => convert(whiff)
-  }
+  def convertEmbedThen(
+      implicit den: Option[ValEmbedThenContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    den match {
+      case None => inner
+      case Some(ValEmbedThen0(_, den, _)) => convertThen(den, inner)
+      case Some(ValEmbedThen1(den)) => convertThen(Some(den), inner)
+    }
 
-  def convert(implicit whiff: ValThenContext): Statement[G] = whiff match {
-    case ValThen0(_, stat) => convert(stat)
-  }
+  def convertThen(
+      implicit den: Option[ValThenContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    den match {
+      case None => inner
+      case Some(den @ ValThen0(_, stat)) =>
+        Then(inner, convert(stat))(origin(den))
+    }
 
-  def convertEmbedGiven(implicit given: Option[ValEmbedGivenContext]): Seq[(Ref[G, Variable[G]], Expr[G])] = given match {
-    case None => Nil
-    case Some(ValEmbedGiven0(_, inner, _)) => convertGiven(inner)
-    case Some(ValEmbedGiven1(inner)) => convertGiven(Some(inner))
-  }
+  def convert(implicit whiff: ValEmbedWithContext): Statement[G] =
+    whiff match {
+      case ValEmbedWith0(_, Some(whiff), _) => convert(whiff)
+      case ValEmbedWith0(_, None, _) => Block(Nil)
+      case ValEmbedWith1(whiff) => convert(whiff)
+    }
 
-  def convertGiven(implicit given: Option[ValGivenContext]): Seq[(Ref[G, Variable[G]], Expr[G])] = given match {
-    case None => Nil
-    case Some(ValGiven0(_, _, mappings, _)) => convert(mappings)
-  }
+  def convert(implicit whiff: ValWithContext): Statement[G] =
+    whiff match { case ValWith0(_, stat) => convert(stat) }
 
-  def convert(implicit mappings: ValGivenMappingsContext): Seq[(Ref[G, Variable[G]], Expr[G])] = mappings match {
-    case ValGivenMappings0(arg, _, v) => Seq((new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)))
-    case ValGivenMappings1(arg, _, v, _, more) => (new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)) +: convert(more)
-  }
+  def convert(implicit whiff: ValEmbedThenContext): Statement[G] =
+    whiff match {
+      case ValEmbedThen0(_, Some(whiff), _) => convert(whiff)
+      case ValEmbedThen0(_, None, _) => Block(Nil)
+      case ValEmbedThen1(whiff) => convert(whiff)
+    }
 
-  def convertEmbedYields(implicit given: Option[ValEmbedYieldsContext]): Seq[(Expr[G], Ref[G, Variable[G]])] = given match {
-    case None => Nil
-    case Some(ValEmbedYields0(_, inner, _)) => convertYields(inner)
-    case Some(ValEmbedYields1(inner)) => convertYields(Some(inner))
-  }
+  def convert(implicit whiff: ValThenContext): Statement[G] =
+    whiff match { case ValThen0(_, stat) => convert(stat) }
 
-  def convertYields(implicit given: Option[ValYieldsContext]): Seq[(Expr[G], Ref[G, Variable[G]])] = given match {
-    case None => Nil
-    case Some(ValYields0(_, _, mappings, _)) => convert(mappings)
-  }
+  def convertEmbedGiven(
+      implicit given: Option[ValEmbedGivenContext]
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    given match {
+      case None => Nil
+      case Some(ValEmbedGiven0(_, inner, _)) => convertGiven(inner)
+      case Some(ValEmbedGiven1(inner)) => convertGiven(Some(inner))
+    }
 
-  def convert(implicit mappings: ValYieldsMappingsContext): Seq[(Expr[G], Ref[G, Variable[G]])] = mappings match {
-    case ValYieldsMappings0(target, _, res) => Seq((local(target, convert(target)), new UnresolvedRef[G, Variable[G]](convert(res))))
-    case ValYieldsMappings1(target, _, res, _, more) => (local(target, convert(target)), new UnresolvedRef[G, Variable[G]](convert(res))) +: convert(more)
-  }
+  def convertGiven(
+      implicit given: Option[ValGivenContext]
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    given match {
+      case None => Nil
+      case Some(ValGiven0(_, _, mappings, _)) => convert(mappings)
+    }
 
-  def convert(implicit exprs: ValExpressionListContext): Seq[Expr[G]] = exprs match {
-    case ValExpressionList0(expr) => Seq(convert(expr))
-    case ValExpressionList1(head, _, tail) => convert(head) +: convert(tail)
-  }
+  def convert(
+      implicit mappings: ValGivenMappingsContext
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    mappings match {
+      case ValGivenMappings0(arg, _, v) =>
+        Seq((new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)))
+      case ValGivenMappings1(arg, _, v, _, more) =>
+        (new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)) +:
+          convert(more)
+    }
 
-  def convert(implicit ids: ValIdListContext): Seq[String] = ids match {
-    case ValIdList0(id) => Seq(convert(id))
-    case ValIdList1(id, _, ids) => convert(id) +: convert(ids)
-  }
+  def convertEmbedYields(
+      implicit given: Option[ValEmbedYieldsContext]
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    given match {
+      case None => Nil
+      case Some(ValEmbedYields0(_, inner, _)) => convertYields(inner)
+      case Some(ValEmbedYields1(inner)) => convertYields(Some(inner))
+    }
 
-  def convert(implicit ts: ValTypeListContext): Seq[Type[G]] = ts match {
-    case ValTypeList0(t) => Seq(convert(t))
-    case ValTypeList1(t, _, ts) => convert(t) +: convert(ts)
-  }
+  def convertYields(
+      implicit given: Option[ValYieldsContext]
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    given match {
+      case None => Nil
+      case Some(ValYields0(_, _, mappings, _)) => convert(mappings)
+    }
 
-  def convert(implicit root: ParserRuleContext, impOp: ValImpOpContext, left: Expr[G], right: Expr[G]): Expr[G] = impOp match {
-    case ValImpOp0(_) => Wand(left, right)(origin(impOp))
-    case ValImpOp1(_) => Implies(left, right)(origin(impOp))
-  }
+  def convert(
+      implicit mappings: ValYieldsMappingsContext
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    mappings match {
+      case ValYieldsMappings0(target, _, res) =>
+        Seq((
+          local(target, convert(target)),
+          new UnresolvedRef[G, Variable[G]](convert(res)),
+        ))
+      case ValYieldsMappings1(target, _, res, _, more) =>
+        (
+          local(target, convert(target)),
+          new UnresolvedRef[G, Variable[G]](convert(res)),
+        ) +: convert(more)
+    }
 
-  def convert(implicit root: ParserRuleContext, andOp: ValAndOpContext, left: Expr[G], right: Expr[G]): Expr[G] = andOp match {
-    case ValAndOp0(_) => col.Star(left, right)(origin(andOp))
-  }
+  def convert(implicit exprs: ValExpressionListContext): Seq[Expr[G]] =
+    exprs match {
+      case ValExpressionList0(expr) => Seq(convert(expr))
+      case ValExpressionList1(head, _, tail) => convert(head) +: convert(tail)
+    }
 
-  def convert(implicit root: ParserRuleContext, inOp: ValInOpContext, left: Expr[G], right: Expr[G]): Expr[G] = inOp match {
-    case ValInOp0(_) => AmbiguousMember(left, right)
-  }
+  def convert(implicit ids: ValIdListContext): Seq[String] =
+    ids match {
+      case ValIdList0(id) => Seq(convert(id))
+      case ValIdList1(id, _, ids) => convert(id) +: convert(ids)
+    }
 
-  def convert(implicit root: ParserRuleContext, mulOp: ValMulOpContext, left: Expr[G], right: Expr[G]): Expr[G] = mulOp match {
-    case ValMulOp0(_) => col.RatDiv(left, right)(blame(mulOp))
-  }
+  def convert(implicit ts: ValTypeListContext): Seq[Type[G]] =
+    ts match {
+      case ValTypeList0(t) => Seq(convert(t))
+      case ValTypeList1(t, _, ts) => convert(t) +: convert(ts)
+    }
 
-  def convert(implicit root: ParserRuleContext, prependOp: ValPrependOpContext, left: Expr[G], right: Expr[G]): Expr[G] = prependOp match {
-    case ValPrependOp0(_) => Cons(left, right)
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      impOp: ValImpOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    impOp match {
+      case ValImpOp0(_) => Wand(left, right)(origin(impOp))
+      case ValImpOp1(_) => Implies(left, right)(origin(impOp))
+    }
 
-  def convert(implicit root: ParserRuleContext, postfixOp: ValPostfixContext, xs: Expr[G]): Expr[G] = postfixOp match {
-    case ValPostfix0(_, _, to, _) => Take(xs, convert(to))
-    case ValPostfix1(_, from, _, None, _) => Drop(xs, convert(from))
-    case ValPostfix1(_, from, _, Some(to), _) => Slice(xs, convert(from), convert(to))
-    case ValPostfix2(_, idx, _, v, _) => SeqUpdate(xs, convert(idx), convert(v))
-    case ValPostfix3(_, name, _, args, _) => CoalesceInstancePredicateApply(xs, new UnresolvedRef[G, InstancePredicate[G]](convert(name)), args.map(convert(_)).getOrElse(Nil), WritePerm())
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      andOp: ValAndOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    andOp match { case ValAndOp0(_) => col.Star(left, right)(origin(andOp)) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      inOp: ValInOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] = inOp match { case ValInOp0(_) => AmbiguousMember(left, right) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      mulOp: ValMulOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    mulOp match { case ValMulOp0(_) => col.RatDiv(left, right)(blame(mulOp)) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      prependOp: ValPrependOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] = prependOp match { case ValPrependOp0(_) => Cons(left, right) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      postfixOp: ValPostfixContext,
+      xs: Expr[G],
+  ): Expr[G] =
+    postfixOp match {
+      case ValPostfix0(_, _, to, _) => Take(xs, convert(to))
+      case ValPostfix1(_, from, _, None, _) => Drop(xs, convert(from))
+      case ValPostfix1(_, from, _, Some(to), _) =>
+        Slice(xs, convert(from), convert(to))
+      case ValPostfix2(_, idx, _, v, _) =>
+        SeqUpdate(xs, convert(idx), convert(v))
+      case ValPostfix3(_, name, _, args, _) =>
+        CoalesceInstancePredicateApply(
+          xs,
+          new UnresolvedRef[G, InstancePredicate[G]](convert(name)),
+          args.map(convert(_)).getOrElse(Nil),
+          WritePerm(),
+        )
+    }
 
-  def convert(implicit root: ParserRuleContext, prefixOp: ValPrefixContext, xs: Expr[G]): Expr[G] = prefixOp match {
-    case ValScale(_, scale, _) => Scale(convert(scale), xs)(blame(prefixOp))
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      prefixOp: ValPrefixContext,
+      xs: Expr[G],
+  ): Expr[G] =
+    prefixOp match {
+      case ValScale(_, scale, _) => Scale(convert(scale), xs)(blame(prefixOp))
+    }
 
-  def convert(implicit block: ValEmbedStatementBlockContext): Statement[G] = block match {
-    case ValEmbedStatementBlock0(_, stats, _) => Block(stats.map(convert(_)))
-    case ValEmbedStatementBlock1(stats) => Block(stats.map(convert(_)))
-    case ValEmbedStatementBlock2(_, _, _, stat) => Extract(convert(stat))
-    case ValEmbedStatementBlock3(_, _, clauses, _, _, body, _, _, _) =>
-      withContract(clauses, contract => {
-        FramedProof(
-          AstBuildHelpers.foldStar(contract.consume(contract.requires)),
-          Block(body.map(convert(_))),
-          AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
-        )(blame(block))
-      })
-  }
+  def convert(implicit block: ValEmbedStatementBlockContext): Statement[G] =
+    block match {
+      case ValEmbedStatementBlock0(_, stats, _) => Block(stats.map(convert(_)))
+      case ValEmbedStatementBlock1(stats) => Block(stats.map(convert(_)))
+      case ValEmbedStatementBlock2(_, _, _, stat) => Extract(convert(stat))
+      case ValEmbedStatementBlock3(_, _, clauses, _, _, body, _, _, _) =>
+        withContract(
+          clauses,
+          contract => {
+            FramedProof(
+              AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+              Block(body.map(convert(_))),
+              AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
+            )(blame(block))
+          },
+        )
+    }
 
-  def convert(implicit stat: ValStatementContext): Statement[G] = stat match {
-    case ValPackage(_, expr, innerStat) => WandPackage(convert(expr), convert(innerStat))(blame(stat))
-    case ValApplyWand(_, wand, _) => WandApply(convert(wand))(blame(stat))
-    case ValFold(_, predicate, _) =>
-      Fold(convert(predicate))(blame(stat))
-    case ValUnfold(_, predicate, _) =>
-      Unfold(convert(predicate))(blame(stat))
-    case ValOpen(_, _, _) => ??(stat)
-    case ValClose(_, _, _) => ??(stat)
-    case ValAssert(_, assn, _) => Assert(convert(assn))(blame(stat))
-    case ValAssume(_, assn, _) => Assume(convert(assn))
-    case ValInhale(_, resource, _) => Inhale(convert(resource))
-    case ValExhale(_, resource, _) => Exhale(convert(resource))(blame(stat))
-    case ValLabel(_, label, _) =>
-      Label(new LabelDecl()(origin(stat).sourceName(convert(label))), Block(Nil))
-    case ValRefute(_, assn, _) => Refute(convert(assn))(blame(stat))
-    case ValWitness(_, _, _) => ??(stat)
-    case ValGhost(_, stat) => convert(stat)
-    case ValSend(_, name, _, delta, _, resource, _) =>
-      Send(new SendDecl()(origin(stat).sourceName(convert(name))), convert(delta), convert(resource))(blame(stat))
-    case ValRecv(_, name, _) =>
-      Recv(new UnresolvedRef[G, SendDecl[G]](convert(name)))
-    case ValTransfer(_, _, _) => ??(stat)
-    case ValCslSubject(_, _, _) => ??(stat) // FIXME PB: csl_subject seems to be used
-    case ValSpecIgnoreStart(_, _) => SpecIgnoreEnd()
-    case ValSpecIgnoreEnd(_, _) => SpecIgnoreStart()
-    case ValActionModel(_, _, model, _, perm, _, after, _, action, _, impl) =>
-      ModelDo(convert(model), convert(perm), convert(after), convert(action), impl match {
-        case ValActionImpl0(_) => Block(Nil)
-        case ValActionImpl1(inner) => convert(inner)
-      })
-    case ValAtomic(_, _, invariant, _, body) =>
-      ParAtomic(Seq(new UnresolvedRef[G, ParInvariantDecl[G]](convert(invariant))), convert(body))(blame(stat))
-    case ValCommit(_, obj, _) =>
-      Commit(convert(obj))(blame(stat))
-    case ValExtract(_, body) =>
-      Extract(convert(body))
-    case ValFrame(_, clauses, body) =>
-      withContract(clauses, contract => {
-        FramedProof(
-          AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+  def convert(implicit stat: ValStatementContext): Statement[G] =
+    stat match {
+      case ValPackage(_, expr, innerStat) =>
+        WandPackage(convert(expr), convert(innerStat))(blame(stat))
+      case ValApplyWand(_, wand, _) => WandApply(convert(wand))(blame(stat))
+      case ValFold(_, predicate, _) => Fold(convert(predicate))(blame(stat))
+      case ValUnfold(_, predicate, _) => Unfold(convert(predicate))(blame(stat))
+      case ValOpen(_, _, _) => ??(stat)
+      case ValClose(_, _, _) => ??(stat)
+      case ValAssert(_, assn, _) => Assert(convert(assn))(blame(stat))
+      case ValAssume(_, assn, _) => Assume(convert(assn))
+      case ValInhale(_, resource, _) => Inhale(convert(resource))
+      case ValExhale(_, resource, _) => Exhale(convert(resource))(blame(stat))
+      case ValLabel(_, label, _) =>
+        Label(
+          new LabelDecl()(origin(stat).sourceName(convert(label))),
+          Block(Nil),
+        )
+      case ValRefute(_, assn, _) => Refute(convert(assn))(blame(stat))
+      case ValWitness(_, _, _) => ??(stat)
+      case ValGhost(_, stat) => convert(stat)
+      case ValSend(_, name, _, delta, _, resource, _) =>
+        Send(
+          new SendDecl()(origin(stat).sourceName(convert(name))),
+          convert(delta),
+          convert(resource),
+        )(blame(stat))
+      case ValRecv(_, name, _) =>
+        Recv(new UnresolvedRef[G, SendDecl[G]](convert(name)))
+      case ValTransfer(_, _, _) => ??(stat)
+      case ValCslSubject(_, _, _) =>
+        ??(stat) // FIXME PB: csl_subject seems to be used
+      case ValSpecIgnoreStart(_, _) => SpecIgnoreEnd()
+      case ValSpecIgnoreEnd(_, _) => SpecIgnoreStart()
+      case ValActionModel(_, _, model, _, perm, _, after, _, action, _, impl) =>
+        ModelDo(
+          convert(model),
+          convert(perm),
+          convert(after),
+          convert(action),
+          impl match {
+            case ValActionImpl0(_) => Block(Nil)
+            case ValActionImpl1(inner) => convert(inner)
+          },
+        )
+      case ValAtomic(_, _, invariant, _, body) =>
+        ParAtomic(
+          Seq(new UnresolvedRef[G, ParInvariantDecl[G]](convert(invariant))),
           convert(body),
-          AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
         )(blame(stat))
-      })
-  }
+      case ValCommit(_, obj, _) => Commit(convert(obj))(blame(stat))
+      case ValExtract(_, body) => Extract(convert(body))
+      case ValFrame(_, clauses, body) =>
+        withContract(
+          clauses,
+          contract => {
+            FramedProof(
+              AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+              convert(body),
+              AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
+            )(blame(stat))
+          },
+        )
+    }
 
-  def convert(implicit block: ValBlockContext): Seq[Statement[G]] = block match {
-    case ValBlock0(_, stats, _) => stats.map(convert(_))
-  }
+  def convert(implicit block: ValBlockContext): Seq[Statement[G]] =
+    block match { case ValBlock0(_, stats, _) => stats.map(convert(_)) }
 
-  def convert(implicit arg: ValArgContext): Variable[G] = arg match {
-    case ValArg0(t, id) => new Variable(convert(t))(origin(arg).sourceName(convert(id)))
-  }
+  def convert(implicit arg: ValArgContext): Variable[G] =
+    arg match {
+      case ValArg0(t, id) =>
+        new Variable(convert(t))(origin(arg).sourceName(convert(id)))
+    }
 
-  def convert(implicit args: ValArgListContext): Seq[Variable[G]] = args match {
-    case ValArgList0(arg) => Seq(convert(arg))
-    case ValArgList1(arg, _, args) => convert(arg) +: convert(args)
-  }
+  def convert(implicit args: ValArgListContext): Seq[Variable[G]] =
+    args match {
+      case ValArgList0(arg) => Seq(convert(arg))
+      case ValArgList1(arg, _, args) => convert(arg) +: convert(args)
+    }
 
-  def convert(implicit decl: ValEmbedGlobalDeclarationBlockContext): Seq[GlobalDeclaration[G]] = decl match {
-    case ValEmbedGlobalDeclarationBlock0(_, globals, _) => globals.flatMap(convert(_))
-    case ValEmbedGlobalDeclarationBlock1(globals) => globals.flatMap(convert(_))
-  }
+  def convert(
+      implicit decl: ValEmbedGlobalDeclarationBlockContext
+  ): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case ValEmbedGlobalDeclarationBlock0(_, globals, _) =>
+        globals.flatMap(convert(_))
+      case ValEmbedGlobalDeclarationBlock1(globals) =>
+        globals.flatMap(convert(_))
+    }
 
-  def convert(implicit decl: ValGlobalDeclarationContext): Seq[GlobalDeclaration[G]] = decl match {
-    case ValAxiom(_, name, _, axiom, _) =>
-      Seq(new SimplificationRule(convert(axiom))(origin(decl).sourceName(convert(name))))
-    case ValPredicate(modifiers, _, name, _, args, _, definition) =>
-      withModifiers(modifiers, mods =>
-        Seq(new Predicate(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          mods.consume(mods.threadLocal), mods.consume(mods.inline))
-        (origin(decl).sourceName(convert(name)))))
-    case ValFunction(contract, modifiers, _, t, name, typeArgs, _, args, _, definition) =>
-      Seq(withContract(contract, c =>
-        withModifiers(modifiers, m => {
-          val namedOrigin = origin(decl).sourceName(convert(name))
-          new Function(
-            convert(t),
-            args.map(convert(_)).getOrElse(Nil),
+  def convert(
+      implicit decl: ValGlobalDeclarationContext
+  ): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case ValAxiom(_, name, _, axiom, _) =>
+        Seq(new SimplificationRule(convert(axiom))(
+          origin(decl).sourceName(convert(name))
+        ))
+      case ValPredicate(modifiers, _, name, _, args, _, definition) =>
+        withModifiers(
+          modifiers,
+          mods =>
+            Seq(
+              new Predicate(
+                args.map(convert(_)).getOrElse(Nil),
+                convert(definition),
+                mods.consume(mods.threadLocal),
+                mods.consume(mods.inline),
+              )(origin(decl).sourceName(convert(name)))
+            ),
+        )
+      case ValFunction(
+            contract,
+            modifiers,
+            _,
+            t,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c =>
+            withModifiers(
+              modifiers,
+              m => {
+                val namedOrigin = origin(decl).sourceName(convert(name))
+                new Function(
+                  convert(t),
+                  args.map(convert(_)).getOrElse(Nil),
+                  typeArgs.map(convert(_)).getOrElse(Nil),
+                  convert(definition),
+                  c.consumeApplicableContract(blame(decl)),
+                  m.consume(m.inline),
+                )(blame(decl))(namedOrigin)
+              },
+            ),
+        ))
+      case ValModel(_, name, _, decls, _) =>
+        Seq(new Model(decls.flatMap(convert(_)))(
+          origin(decl).sourceName(convert(name))
+        ))
+      case ValGhostDecl(_, inner) => convert(inner)
+      case ValAdtDecl(_, name, typeArgs, _, decls, _) =>
+        Seq(
+          new AxiomaticDataType(
+            decls.map(convert(_)),
             typeArgs.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)),
-            m.consume(m.inline))(blame(decl))(namedOrigin)
-        })
-      ))
-    case ValModel(_, name, _, decls, _) =>
-      Seq(new Model(decls.flatMap(convert(_)))(origin(decl).sourceName(convert(name))))
-    case ValGhostDecl(_, inner) =>
-      convert(inner)
-    case ValAdtDecl(_, name, typeArgs, _, decls, _) =>
-      Seq(new AxiomaticDataType(decls.map(convert(_)), typeArgs.map(convert(_)).getOrElse(Nil))(
-        origin(decl).sourceName(convert(name))))
-  }
+          )(origin(decl).sourceName(convert(name)))
+        )
+    }
 
-  def convert(implicit decl: ValEmbedClassDeclarationBlockContext): Seq[ClassDeclaration[G]] = decl match {
-    case ValEmbedClassDeclarationBlock0(_, decls, _) => decls.flatMap(convert(_, x => x))
-    case ValEmbedClassDeclarationBlock1(decls) => decls.flatMap(convert(_, x => x))
-  }
+  def convert(
+      implicit decl: ValEmbedClassDeclarationBlockContext
+  ): Seq[ClassDeclaration[G]] =
+    decl match {
+      case ValEmbedClassDeclarationBlock0(_, decls, _) =>
+        decls.flatMap(convert(_, x => x))
+      case ValEmbedClassDeclarationBlock1(decls) =>
+        decls.flatMap(convert(_, x => x))
+    }
 
-  def convert[T](implicit decl: ValClassDeclarationContext, transform: ClassDeclaration[G] => T): Seq[T] = decl match {
-    case ValInstancePredicate(modifiers, _, name, _, args, _, definition) =>
-      Seq(withModifiers(modifiers, mods => {
-        transform(new InstancePredicate(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          mods.consume(mods.threadLocal), mods.consume(mods.inline))(
-          origin(decl).sourceName(convert(name))))
-      }))
-    case ValInstanceFunction(contract, modifiers, _, t, name, typeArgs, _, args, _, definition) =>
-      Seq(withContract(contract, c => {
-        withModifiers(modifiers, m => {
-          transform(new InstanceFunction(
-            convert(t),
-            args.map(convert(_)).getOrElse(Nil),
-            typeArgs.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)), m.consume(m.inline))(
-            blame(decl))(
-            origin(decl).sourceName(convert(name))))
-        })
-      }))
-    case ValInstanceGhostDecl(_, decl) => convert(decl).map(transform)
-  }
+  def convert[T](
+      implicit decl: ValClassDeclarationContext,
+      transform: ClassDeclaration[G] => T,
+  ): Seq[T] =
+    decl match {
+      case ValInstancePredicate(modifiers, _, name, _, args, _, definition) =>
+        Seq(withModifiers(
+          modifiers,
+          mods => {
+            transform(
+              new InstancePredicate(
+                args.map(convert(_)).getOrElse(Nil),
+                convert(definition),
+                mods.consume(mods.threadLocal),
+                mods.consume(mods.inline),
+              )(origin(decl).sourceName(convert(name)))
+            )
+          },
+        ))
+      case ValInstanceFunction(
+            contract,
+            modifiers,
+            _,
+            t,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c => {
+            withModifiers(
+              modifiers,
+              m => {
+                transform(
+                  new InstanceFunction(
+                    convert(t),
+                    args.map(convert(_)).getOrElse(Nil),
+                    typeArgs.map(convert(_)).getOrElse(Nil),
+                    convert(definition),
+                    c.consumeApplicableContract(blame(decl)),
+                    m.consume(m.inline),
+                  )(blame(decl))(origin(decl).sourceName(convert(name)))
+                )
+              },
+            )
+          },
+        ))
+      case ValInstanceGhostDecl(_, decl) => convert(decl).map(transform)
+    }
 
-  def convert(implicit decl: ValModelDeclarationContext): Seq[ModelDeclaration[G]] = decl match {
-    case ValModelField(t, name, _) =>
-      convert(name).map(name => {
-        new ModelField(convert(t))(origin(decl).sourceName(name))
-      })
-    case ValModelProcess(contract, _, name, _, args, _, _, definition, _) =>
-      Seq(withContract(contract, c => {
-        new ModelProcess(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          AstBuildHelpers.foldAnd(c.consume(c.requires)), AstBuildHelpers.foldAnd(c.consume(c.ensures)),
-          c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)), c.consume(c.accessible).map(new UnresolvedRef[G, ModelField[G]](_)))(
-          blame(decl))(origin(decl).sourceName(convert(name)))
-      }))
-    case ValModelAction(contract, _, name, _, args, _, _) =>
-      Seq(withContract(contract, c => {
-        new ModelAction(args.map(convert(_)).getOrElse(Nil),
-          AstBuildHelpers.foldAnd(c.consume(c.requires)), AstBuildHelpers.foldAnd(c.consume(c.ensures)),
-          c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)), c.consume(c.accessible).map(new UnresolvedRef[G, ModelField[G]](_)))(
-          origin(decl).sourceName(convert(name)))
-      }))
-  }
+  def convert(
+      implicit decl: ValModelDeclarationContext
+  ): Seq[ModelDeclaration[G]] =
+    decl match {
+      case ValModelField(t, name, _) =>
+        convert(name).map(name => {
+          new ModelField(convert(t))(origin(decl).sourceName(name))
+        })
+      case ValModelProcess(contract, _, name, _, args, _, _, definition, _) =>
+        Seq(withContract(
+          contract,
+          c => {
+            new ModelProcess(
+              args.map(convert(_)).getOrElse(Nil),
+              convert(definition),
+              AstBuildHelpers.foldAnd(c.consume(c.requires)),
+              AstBuildHelpers.foldAnd(c.consume(c.ensures)),
+              c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)),
+              c.consume(c.accessible)
+                .map(new UnresolvedRef[G, ModelField[G]](_)),
+            )(blame(decl))(origin(decl).sourceName(convert(name)))
+          },
+        ))
+      case ValModelAction(contract, _, name, _, args, _, _) =>
+        Seq(withContract(
+          contract,
+          c => {
+            new ModelAction(
+              args.map(convert(_)).getOrElse(Nil),
+              AstBuildHelpers.foldAnd(c.consume(c.requires)),
+              AstBuildHelpers.foldAnd(c.consume(c.ensures)),
+              c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)),
+              c.consume(c.accessible)
+                .map(new UnresolvedRef[G, ModelField[G]](_)),
+            )(origin(decl).sourceName(convert(name)))
+          },
+        ))
+    }
 
-  def convert(implicit ts: ValTypeVarsContext): Seq[Variable[G]] = ts match {
-    case ValTypeVars0(_, names, _) =>
-      convert(names).map(name => new Variable(TType(TAnyValue()))(origin(ts).sourceName(name)))
-  }
+  def convert(implicit ts: ValTypeVarsContext): Seq[Variable[G]] =
+    ts match {
+      case ValTypeVars0(_, names, _) =>
+        convert(names).map(name =>
+          new Variable(TType(TAnyValue()))(origin(ts).sourceName(name))
+        )
+    }
 
-  def convert(implicit decl: ValAdtDeclarationContext): ADTDeclaration[G] = decl match {
-    case ValAdtAxiom(_, ax, _) => new ADTAxiom(convert(ax))
-    case ValAdtFunction(_, returnType, name, _, args, _, _) =>
-      new ADTFunction(args.map(convert(_)).getOrElse(Nil), convert(returnType))(
-        origin(decl).sourceName(convert(name)))
-  }
+  def convert(implicit decl: ValAdtDeclarationContext): ADTDeclaration[G] =
+    decl match {
+      case ValAdtAxiom(_, ax, _) => new ADTAxiom(convert(ax))
+      case ValAdtFunction(_, returnType, name, _, args, _, _) =>
+        new ADTFunction(
+          args.map(convert(_)).getOrElse(Nil),
+          convert(returnType),
+        )(origin(decl).sourceName(convert(name)))
+    }
 
-  def convert(implicit definition: ValPureDefContext): Option[Expr[G]] = definition match {
-    case ValPureAbstractBody(_) => None
-    case ValPureBody(_, expr, _) => Some(convert(expr))
-  }
+  def convert(implicit definition: ValPureDefContext): Option[Expr[G]] =
+    definition match {
+      case ValPureAbstractBody(_) => None
+      case ValPureBody(_, expr, _) => Some(convert(expr))
+    }
 
-  def convert(implicit definition: ValImpureDefContext): Option[Statement[G]] = definition match {
-    case ValImpureAbstractBody(_) => None
-    case ValImpureBody(statement) => Some(convert(statement))
-  }
+  def convert(implicit definition: ValImpureDefContext): Option[Statement[G]] =
+    definition match {
+      case ValImpureAbstractBody(_) => None
+      case ValImpureBody(statement) => Some(convert(statement))
+    }
 
-  def convert(implicit t: ValTypeContext): Type[G] = t match {
-    case ValPrimaryType(name) => name match {
-      case "resource" => TResourceVal()
-      case "process" => TProcess()
-      case "frac" => TFraction()
-      case "zfrac" => TZFraction()
-      case "rational" => TRational()
-      case "bool" => TBool()
-      case "ref" => TRef()
-      case "any" => TAnyValue()
-      case "nothing" => TNothing()
-    }
-    case ValSeqType(_, _, element, _) => TSeq(convert(element))
-    case ValSetType(_, _, element, _) => TSet(convert(element))
-    case ValVectorType(_, _, element, _, size, _) => TVector(convert(size), convert(element))()
-    case ValBagType(_, _, element, _) => TBag(convert(element))
-    case ValOptionType(_, _, element, _) => TOption(convert(element))
-    case ValMapType(_, _, key, _, value, _) => TMap(convert(key), convert(value))
-    case ValTupleType(_, _, t1, _, t2, _) => TTuple(Seq(convert(t1), convert(t2)))
-    case ValPointerType(_, _, element, _) => TPointer(convert(element))
-    case ValTypeType(_, _, element, _) => TType(convert(element))
-    case ValEitherType(_, _, left, _, right, _) => TEither(convert(left), convert(right))
-  }
+  def convert(implicit t: ValTypeContext): Type[G] =
+    t match {
+      case ValPrimaryType(name) =>
+        name match {
+          case "resource" => TResourceVal()
+          case "process" => TProcess()
+          case "frac" => TFraction()
+          case "zfrac" => TZFraction()
+          case "rational" => TRational()
+          case "bool" => TBool()
+          case "ref" => TRef()
+          case "any" => TAnyValue()
+          case "nothing" => TNothing()
+        }
+      case ValSeqType(_, _, element, _) => TSeq(convert(element))
+      case ValSetType(_, _, element, _) => TSet(convert(element))
+      case ValVectorType(_, _, element, _, size, _) =>
+        TVector(convert(size), convert(element))()
+      case ValBagType(_, _, element, _) => TBag(convert(element))
+      case ValOptionType(_, _, element, _) => TOption(convert(element))
+      case ValMapType(_, _, key, _, value, _) =>
+        TMap(convert(key), convert(value))
+      case ValTupleType(_, _, t1, _, t2, _) =>
+        TTuple(Seq(convert(t1), convert(t2)))
+      case ValPointerType(_, _, element, _) => TPointer(convert(element))
+      case ValTypeType(_, _, element, _) => TType(convert(element))
+      case ValEitherType(_, _, left, _, right, _) =>
+        TEither(convert(left), convert(right))
+    }
 
-  def convert(implicit e: ValPrimarySeqContext): Expr[G] = e match {
-    case ValCardinality(_, xs, _) => Size(convert(xs))
-    case ValArrayValues(_, _, a, _, from, _, to, _) => Values(convert(a), convert(from), convert(to))(blame(e))
-  }
+  def convert(implicit e: ValPrimarySeqContext): Expr[G] =
+    e match {
+      case ValCardinality(_, xs, _) => Size(convert(xs))
+      case ValArrayValues(_, _, a, _, from, _, to, _) =>
+        Values(convert(a), convert(from), convert(to))(blame(e))
+    }
 
-  def convert(implicit e: ValPrimaryOptionContext): Expr[G] = e match {
-    case ValSome(_, _, v, _) => OptSome(convert(v))
-  }
+  def convert(implicit e: ValPrimaryOptionContext): Expr[G] =
+    e match { case ValSome(_, _, v, _) => OptSome(convert(v)) }
 
-  def convert(implicit e: ValPrimaryEitherContext): Expr[G] = e match {
-    case ValLeft(_, _, inner, _) => EitherLeft(convert(inner))
-    case ValRight(_, _, inner, _) => EitherRight(convert(inner))
-  }
+  def convert(implicit e: ValPrimaryEitherContext): Expr[G] =
+    e match {
+      case ValLeft(_, _, inner, _) => EitherLeft(convert(inner))
+      case ValRight(_, _, inner, _) => EitherRight(convert(inner))
+    }
 
   // valsetcompselectors
-  def convert(implicit exprs: ValMapPairsContext): Seq[(Expr[G], Expr[G])] = exprs match {
-    case ValMapPairs0(k, _, v) => Seq((convert(k), convert(v)))
-    case ValMapPairs1(k, _, v, _, tail) => (convert(k), convert(v)) +: convert(tail)
-  }
+  def convert(implicit exprs: ValMapPairsContext): Seq[(Expr[G], Expr[G])] =
+    exprs match {
+      case ValMapPairs0(k, _, v) => Seq((convert(k), convert(v)))
+      case ValMapPairs1(k, _, v, _, tail) =>
+        (convert(k), convert(v)) +: convert(tail)
+    }
 
-  def convert(implicit e: ValPrimaryCollectionConstructorContext): Expr[G] = e match {
-    case ValTypedLiteralSeq(_, _, t, _, _, exprs, _) => LiteralSeq(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralSet(_, _, t, _, _, exprs, _) => LiteralSet(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralVector(_, _, t, _, _, exprs, _) => LiteralVector(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValSetComprehension(_, _, t, _, _, value, _, selectors, _, something, _) => ??(e)
-    case ValTypedLiteralBag(_, _, t, _, _, exprs, _) => LiteralBag(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralMap(_, _, key, _, value, _, _, pairs, _) => LiteralMap(convert(key), convert(value), pairs.map(convert(_)).getOrElse(Nil))
-    case ValTypedTuple(_, _, t1, _, t2, _, _, v1, _, v2, _) =>
-      LiteralTuple(Seq(convert(t1), convert(t2)), Seq(convert(v1), convert(v2)))
-    case ValLiteralSeq(_, exprs, _) => UntypedLiteralSeq(convert(exprs))
-    case ValLiteralSet(_, exprs, _) => UntypedLiteralSet(convert(exprs))
-    case ValLiteralBag(_, exprs, _) => UntypedLiteralBag(convert(exprs))
-    case ValEmptySeq(_, t, _) => LiteralSeq(convert(t), Nil)
-    case ValEmptySet(_, t, _) => LiteralSet(convert(t), Nil)
-    case ValEmptyBag(_, t, _) => LiteralBag(convert(t), Nil)
-    case ValRange(_, from, _, to, _) => Range(convert(from), convert(to))
-    case ValRangeSet(_, from, _, to, _) => RangeSet(convert(from), convert(to))
-  }
+  def convert(implicit e: ValPrimaryCollectionConstructorContext): Expr[G] =
+    e match {
+      case ValTypedLiteralSeq(_, _, t, _, _, exprs, _) =>
+        LiteralSeq(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralSet(_, _, t, _, _, exprs, _) =>
+        LiteralSet(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralVector(_, _, t, _, _, exprs, _) =>
+        LiteralVector(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValSetComprehension(
+            _,
+            _,
+            t,
+            _,
+            _,
+            value,
+            _,
+            selectors,
+            _,
+            something,
+            _,
+          ) =>
+        ??(e)
+      case ValTypedLiteralBag(_, _, t, _, _, exprs, _) =>
+        LiteralBag(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralMap(_, _, key, _, value, _, _, pairs, _) =>
+        LiteralMap(
+          convert(key),
+          convert(value),
+          pairs.map(convert(_)).getOrElse(Nil),
+        )
+      case ValTypedTuple(_, _, t1, _, t2, _, _, v1, _, v2, _) =>
+        LiteralTuple(
+          Seq(convert(t1), convert(t2)),
+          Seq(convert(v1), convert(v2)),
+        )
+      case ValLiteralSeq(_, exprs, _) => UntypedLiteralSeq(convert(exprs))
+      case ValLiteralSet(_, exprs, _) => UntypedLiteralSet(convert(exprs))
+      case ValLiteralBag(_, exprs, _) => UntypedLiteralBag(convert(exprs))
+      case ValEmptySeq(_, t, _) => LiteralSeq(convert(t), Nil)
+      case ValEmptySet(_, t, _) => LiteralSet(convert(t), Nil)
+      case ValEmptyBag(_, t, _) => LiteralBag(convert(t), Nil)
+      case ValRange(_, from, _, to, _) => Range(convert(from), convert(to))
+      case ValRangeSet(_, from, _, to, _) =>
+        RangeSet(convert(from), convert(to))
+    }
 
-  def convert(implicit e: ValPrimaryPermissionContext): Expr[G] = e match {
-    case ValCurPerm(_, _, loc, _) => CurPerm(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValPerm(_, _, loc, _, perm, _) => Perm(AmbiguousLocation(convert(loc))(blame(e)), convert(perm))
-    case ValValue(_, _, loc, _) => Value(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValAutoValue(_, _, loc, _) => AutoValue(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValPointsTo(_, _, loc, _, perm, _, v, _) => PointsTo(AmbiguousLocation(convert(loc))(blame(e)), convert(perm), convert(v))
-    case ValHPerm(_, _, loc, _, perm, _) => ModelPerm(convert(loc), convert(perm))
-    case ValAPerm(_, _, loc, _, perm, _) => ActionPerm(convert(loc), convert(perm))
-    case ValArrayPerm(_, _, arr, _, i, _, step, _, count, _, perm, _) => ??(e)
-    case ValMatrix(_, _, m, _, dim1, _, dim2, _) => ValidMatrix(convert(m), convert(dim1), convert(dim2))
-    case ValArray(_, _, arr, _, dim, _) => ValidArray(convert(arr), convert(dim))
-    case ValPointer(_, _, ptr, _, n, _, perm, _) => PermPointer(convert(ptr), convert(n), convert(perm))
-    case ValPointerIndex(_, _, ptr, _, idx, _, perm, _) => PermPointerIndex(convert(ptr), convert(idx), convert(perm))
-    case ValPointerBlockLength(_, _, ptr, _) => PointerBlockLength(convert(ptr))(blame(e))
-    case ValPointerBlockOffset(_, _, ptr, _) => PointerBlockOffset(convert(ptr))(blame(e))
-    case ValPointerLength(_, _, ptr, _) => PointerLength(convert(ptr))(blame(e))
-    case ValPolarityDependent(_, _, onInhale, _, onExhale, _) => PolarityDependent(convert(onInhale), convert(onExhale))
-  }
+  def convert(implicit e: ValPrimaryPermissionContext): Expr[G] =
+    e match {
+      case ValCurPerm(_, _, loc, _) =>
+        CurPerm(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValPerm(_, _, loc, _, perm, _) =>
+        Perm(AmbiguousLocation(convert(loc))(blame(e)), convert(perm))
+      case ValValue(_, _, loc, _) =>
+        Value(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValAutoValue(_, _, loc, _) =>
+        AutoValue(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValPointsTo(_, _, loc, _, perm, _, v, _) =>
+        PointsTo(
+          AmbiguousLocation(convert(loc))(blame(e)),
+          convert(perm),
+          convert(v),
+        )
+      case ValHPerm(_, _, loc, _, perm, _) =>
+        ModelPerm(convert(loc), convert(perm))
+      case ValAPerm(_, _, loc, _, perm, _) =>
+        ActionPerm(convert(loc), convert(perm))
+      case ValArrayPerm(_, _, arr, _, i, _, step, _, count, _, perm, _) => ??(e)
+      case ValMatrix(_, _, m, _, dim1, _, dim2, _) =>
+        ValidMatrix(convert(m), convert(dim1), convert(dim2))
+      case ValArray(_, _, arr, _, dim, _) =>
+        ValidArray(convert(arr), convert(dim))
+      case ValPointer(_, _, ptr, _, n, _, perm, _) =>
+        PermPointer(convert(ptr), convert(n), convert(perm))
+      case ValPointerIndex(_, _, ptr, _, idx, _, perm, _) =>
+        PermPointerIndex(convert(ptr), convert(idx), convert(perm))
+      case ValPointerBlockLength(_, _, ptr, _) =>
+        PointerBlockLength(convert(ptr))(blame(e))
+      case ValPointerBlockOffset(_, _, ptr, _) =>
+        PointerBlockOffset(convert(ptr))(blame(e))
+      case ValPointerLength(_, _, ptr, _) =>
+        PointerLength(convert(ptr))(blame(e))
+      case ValPolarityDependent(_, _, onInhale, _, onExhale, _) =>
+        PolarityDependent(convert(onInhale), convert(onExhale))
+    }
 
-  def convert(implicit v: ValBindingContext): (Variable[G], Seq[Expr[G]]) = v match {
-    case ValRangeBinding(t, id, _, from, _, to) =>
-      val variable = new Variable[G](convert(t))(origin(id).sourceName(convert(id)))
-      val cond = SeqMember[G](Local(variable.ref), Range(convert(from), convert(to)))
-      (variable, Seq(cond))
-    case ValNormalBinding(arg) =>
-      (convert(arg), Nil)
-  }
+  def convert(implicit v: ValBindingContext): (Variable[G], Seq[Expr[G]]) =
+    v match {
+      case ValRangeBinding(t, id, _, from, _, to) =>
+        val variable =
+          new Variable[G](convert(t))(origin(id).sourceName(convert(id)))
+        val cond = SeqMember[G](
+          Local(variable.ref),
+          Range(convert(from), convert(to)),
+        )
+        (variable, Seq(cond))
+      case ValNormalBinding(arg) => (convert(arg), Nil)
+    }
 
-  def convert(implicit vs: ValBindingsContext): (Seq[Variable[G]], Seq[Expr[G]]) = vs match {
-    case ValBindings0(binding) =>
-      val (v, cs) = convert(binding)
-      (Seq(v), cs)
-    case ValBindings1(binding, _, bindings) =>
-      val (v, cs) = convert(binding)
-      val (vs, ds) = convert(bindings)
-      (v +: vs, cs ++ ds)
-  }
+  def convert(
+      implicit vs: ValBindingsContext
+  ): (Seq[Variable[G]], Seq[Expr[G]]) =
+    vs match {
+      case ValBindings0(binding) =>
+        val (v, cs) = convert(binding)
+        (Seq(v), cs)
+      case ValBindings1(binding, _, bindings) =>
+        val (v, cs) = convert(binding)
+        val (vs, ds) = convert(bindings)
+        (v +: vs, cs ++ ds)
+    }
 
-  def convert(implicit e: ValPrimaryBinderContext): Expr[G] = e match {
-    case ValQuantifier(_, symbol, bindings, _, bodyOrCond, maybeBody, _) =>
-      val (variables, bindingConds) = convert(bindings)
-      val (bodyConds, body) = maybeBody match {
-        case Some(ValBinderCont0(_, body)) => (Seq(convert(bodyOrCond)), convert(body))
-        case None => (Nil, convert(bodyOrCond))
-      }
-      val conds = bindingConds ++ bodyConds
-      symbol match {
-        case ValForallSymb(_) => Forall(variables, Nil, implies(conds, body))
-        case ValStarallSymb(_) => Starall(variables, Nil, implies(conds, body))(blame(e))
-        case ValExistsSymb(_) => Exists(variables, Nil, foldAnd(conds :+ body))
-      }
-    case ValLet(_, _, t, id, _, v, _, body, _) =>
-      Let(new Variable(convert(t))(origin(id).sourceName(convert(id))), convert(v), convert(body))
-    case ValForPerm(_, _, bindings, _, loc, _, body, _) =>
-      ForPerm(convert(bindings), AmbiguousLocation(convert(loc))(blame(loc))(origin(loc)), convert(body))
-    case ValForPermWithValue(_, _, _, id, _, body, _) =>
-      ForPermWithValue(new Variable(TAny())(origin(id).sourceName(convert(id))), convert(body))
-  }
+  def convert(implicit e: ValPrimaryBinderContext): Expr[G] =
+    e match {
+      case ValQuantifier(_, symbol, bindings, _, bodyOrCond, maybeBody, _) =>
+        val (variables, bindingConds) = convert(bindings)
+        val (bodyConds, body) =
+          maybeBody match {
+            case Some(ValBinderCont0(_, body)) =>
+              (Seq(convert(bodyOrCond)), convert(body))
+            case None => (Nil, convert(bodyOrCond))
+          }
+        val conds = bindingConds ++ bodyConds
+        symbol match {
+          case ValForallSymb(_) => Forall(variables, Nil, implies(conds, body))
+          case ValStarallSymb(_) =>
+            Starall(variables, Nil, implies(conds, body))(blame(e))
+          case ValExistsSymb(_) =>
+            Exists(variables, Nil, foldAnd(conds :+ body))
+        }
+      case ValLet(_, _, t, id, _, v, _, body, _) =>
+        Let(
+          new Variable(convert(t))(origin(id).sourceName(convert(id))),
+          convert(v),
+          convert(body),
+        )
+      case ValForPerm(_, _, bindings, _, loc, _, body, _) =>
+        ForPerm(
+          convert(bindings),
+          AmbiguousLocation(convert(loc))(blame(loc))(origin(loc)),
+          convert(body),
+        )
+      case ValForPermWithValue(_, _, _, id, _, body, _) =>
+        ForPermWithValue(
+          new Variable(TAny())(origin(id).sourceName(convert(id))),
+          convert(body),
+        )
+    }
 
-  def convert(implicit e: ValPrimaryVectorContext): Expr[G] = e match {
-    case ValSum(_, _, t, id, _, cond, _, body, _) =>
-      val binding = new Variable(convert(t))(origin(id).sourceName(convert(id)))
-      Sum(Seq(binding), convert(cond), convert(body))
-    case ValVectorSum(_, _, rng, _, vec, _) => VectorSum(convert(rng), convert(vec))
-    case ValVectorCmp(_, _, left, _, right, _) => VectorCompare(convert(left), convert(right))
-    case ValVectorRep(_, _, inner, _) => VectorRepeat(convert(inner))
-    case ValMatrixSum(_, _, rng, _, mat, _) => MatrixSum(convert(rng), convert(mat))
-    case ValMatrixCmp(_, _, left, _, right, _) => MatrixCompare(convert(left), convert(right))
-    case ValMatrixRep(_, _, inner, _) => MatrixRepeat(convert(inner))
-  }
+  def convert(implicit e: ValPrimaryVectorContext): Expr[G] =
+    e match {
+      case ValSum(_, _, t, id, _, cond, _, body, _) =>
+        val binding =
+          new Variable(convert(t))(origin(id).sourceName(convert(id)))
+        Sum(Seq(binding), convert(cond), convert(body))
+      case ValVectorSum(_, _, rng, _, vec, _) =>
+        VectorSum(convert(rng), convert(vec))
+      case ValVectorCmp(_, _, left, _, right, _) =>
+        VectorCompare(convert(left), convert(right))
+      case ValVectorRep(_, _, inner, _) => VectorRepeat(convert(inner))
+      case ValMatrixSum(_, _, rng, _, mat, _) =>
+        MatrixSum(convert(rng), convert(mat))
+      case ValMatrixCmp(_, _, left, _, right, _) =>
+        MatrixCompare(convert(left), convert(right))
+      case ValMatrixRep(_, _, inner, _) => MatrixRepeat(convert(inner))
+    }
 
   def convert(implicit e: ValPrimaryReducibleContext): Expr[G] = ??(e)
 
-  def convert(implicit e: ValPrimaryThreadContext): Expr[G] = e match {
-    case ValIdle(_, _, thread, _) => IdleToken(convert(thread))
-    case ValRunning(_, _, thread, _) => JoinToken(convert(thread))
-  }
+  def convert(implicit e: ValPrimaryThreadContext): Expr[G] =
+    e match {
+      case ValIdle(_, _, thread, _) => IdleToken(convert(thread))
+      case ValRunning(_, _, thread, _) => JoinToken(convert(thread))
+    }
 
-  def convert(implicit e: ValPrimaryContextContext): Expr[G] = e match {
-    case ValPrimaryContext0("\\result") => AmbiguousResult()
-    case ValPrimaryContext1("\\current_thread") => CurrentThreadId()
-    case ValPrimaryContext2("\\ltid") => LocalThreadId()
-    case ValPrimaryContext3("\\gtid") => GlobalThreadId()
-  }
+  def convert(implicit e: ValPrimaryContextContext): Expr[G] =
+    e match {
+      case ValPrimaryContext0("\\result") => AmbiguousResult()
+      case ValPrimaryContext1("\\current_thread") => CurrentThreadId()
+      case ValPrimaryContext2("\\ltid") => LocalThreadId()
+      case ValPrimaryContext3("\\gtid") => GlobalThreadId()
+    }
 
-  def convert(implicit e: ValPrimaryContext): Expr[G] = e match {
-    case ValPrimary0(inner) => convert(inner)
-    case ValPrimary1(inner) => convert(inner)
-    case ValPrimary2(inner) => convert(inner)
-    case ValPrimary3(inner) => convert(inner)
-    case ValPrimary4(inner) => convert(inner)
-    case ValPrimary5(inner) => convert(inner)
-    case ValPrimary6(inner) => convert(inner)
-    case ValPrimary7(inner) => convert(inner)
-    case ValPrimary8(inner) => convert(inner)
-    case ValPrimary9(inner) => convert(inner)
-    case ValAny(_) => Any()(blame(e))
-    case ValFunctionOf(_, inner, _, names, _) => FunctionOf(new UnresolvedRef[G, Variable[G]](convert(inner)), convert(names).map(new UnresolvedRef[G, Variable[G]](_)))
-    case ValInlinePattern(open, pattern, _) =>
-      val groupText = open.filter(_.isDigit)
-      InlinePattern(convert(pattern), open.count(_ == '<'), if (groupText.isEmpty) 0 else groupText.toInt)
-    case ValUnfolding(_, predExpr, _, body) => Unfolding(convert(predExpr), convert(body))(blame(e))
-    case ValOld(_, _, expr, _) => Old(convert(expr), at = None)(blame(e))
-    case ValOldLabeled(_, _, label, _, _, expr, _) => Old(convert(expr), at = Some(new UnresolvedRef[G, LabelDecl[G]](convert(label))))(blame(e))
-    case ValTypeof(_, _, expr, _) => TypeOf(convert(expr))
-    case ValTypeValue(_, _, t, _) => TypeValue(convert(t))
-    case ValHeld(_, _, obj, _) => Held(convert(obj))
-    case ValCommitted(_, _, obj, _) => Committed(convert(obj))(blame(e))
-    case ValIdEscape(text) => local(e, text.substring(1, text.length - 1))
-    case ValSharedMemSize(_, _, ptr, _) => SharedMemSize(convert(ptr))
-    case ValNdIndex(_, _, firstIndex, _, firstDim, parsePairs, _) =>
-      val pairs = parsePairs.map(convert(_))
-      val indices = convert(firstIndex) +: pairs.map(_._1)
-      val dims = convert(firstDim) +: pairs.map(_._2)
-      NdIndex(indices, dims)
-    case ValNdLIndex(_, _, indices, _, dims, _) =>
-      val allIndices = convert(indices)
-      NdPartialIndex(allIndices.init, allIndices.last, convert(dims))
-    case ValNdLength(_, _, dims, _) => NdLength(convert(dims))
-    case ValEuclideanDiv(_, _, left, _, right, _) => AmbiguousDiv(convert(left), convert(right))(blame(e))
-    case ValEuclideanMod(_, _, left, _, right, _) => AmbiguousMod(convert(left), convert(right))(blame(e))
-    case ValPow(_, _, left, _, right, _) => SmtlibPow(convert(left), convert(right))
-    case ValIsInt(_, _, arg, _) => SmtlibIsInt(convert(arg))
-    case ValChoose(_, _, xs, _) => Choose(convert(xs))(blame(e))
-    case ValChooseFresh(_, _, xs, _) => ChooseFresh(convert(xs))(blame(e))
-  }
+  def convert(implicit e: ValPrimaryContext): Expr[G] =
+    e match {
+      case ValPrimary0(inner) => convert(inner)
+      case ValPrimary1(inner) => convert(inner)
+      case ValPrimary2(inner) => convert(inner)
+      case ValPrimary3(inner) => convert(inner)
+      case ValPrimary4(inner) => convert(inner)
+      case ValPrimary5(inner) => convert(inner)
+      case ValPrimary6(inner) => convert(inner)
+      case ValPrimary7(inner) => convert(inner)
+      case ValPrimary8(inner) => convert(inner)
+      case ValPrimary9(inner) => convert(inner)
+      case ValAny(_) => Any()(blame(e))
+      case ValFunctionOf(_, inner, _, names, _) =>
+        FunctionOf(
+          new UnresolvedRef[G, Variable[G]](convert(inner)),
+          convert(names).map(new UnresolvedRef[G, Variable[G]](_)),
+        )
+      case ValInlinePattern(open, pattern, _) =>
+        val groupText = open.filter(_.isDigit)
+        InlinePattern(
+          convert(pattern),
+          open.count(_ == '<'),
+          if (groupText.isEmpty)
+            0
+          else
+            groupText.toInt,
+        )
+      case ValUnfolding(_, predExpr, _, body) =>
+        Unfolding(convert(predExpr), convert(body))(blame(e))
+      case ValOld(_, _, expr, _) => Old(convert(expr), at = None)(blame(e))
+      case ValOldLabeled(_, _, label, _, _, expr, _) =>
+        Old(
+          convert(expr),
+          at = Some(new UnresolvedRef[G, LabelDecl[G]](convert(label))),
+        )(blame(e))
+      case ValTypeof(_, _, expr, _) => TypeOf(convert(expr))
+      case ValTypeValue(_, _, t, _) => TypeValue(convert(t))
+      case ValHeld(_, _, obj, _) => Held(convert(obj))
+      case ValCommitted(_, _, obj, _) => Committed(convert(obj))(blame(e))
+      case ValIdEscape(text) => local(e, text.substring(1, text.length - 1))
+      case ValSharedMemSize(_, _, ptr, _) => SharedMemSize(convert(ptr))
+      case ValNdIndex(_, _, firstIndex, _, firstDim, parsePairs, _) =>
+        val pairs = parsePairs.map(convert(_))
+        val indices = convert(firstIndex) +: pairs.map(_._1)
+        val dims = convert(firstDim) +: pairs.map(_._2)
+        NdIndex(indices, dims)
+      case ValNdLIndex(_, _, indices, _, dims, _) =>
+        val allIndices = convert(indices)
+        NdPartialIndex(allIndices.init, allIndices.last, convert(dims))
+      case ValNdLength(_, _, dims, _) => NdLength(convert(dims))
+      case ValEuclideanDiv(_, _, left, _, right, _) =>
+        AmbiguousDiv(convert(left), convert(right))(blame(e))
+      case ValEuclideanMod(_, _, left, _, right, _) =>
+        AmbiguousMod(convert(left), convert(right))(blame(e))
+      case ValPow(_, _, left, _, right, _) =>
+        SmtlibPow(convert(left), convert(right))
+      case ValIsInt(_, _, arg, _) => SmtlibIsInt(convert(arg))
+      case ValChoose(_, _, xs, _) => Choose(convert(xs))(blame(e))
+      case ValChooseFresh(_, _, xs, _) => ChooseFresh(convert(xs))(blame(e))
+    }
 
-  def convert(implicit e: ValExprPairContext): (Expr[G], Expr[G]) = e match {
-    case ValExprPair0(_, e1, _, e2) => (convert(e1), convert(e2))
-  }
+  def convert(implicit e: ValExprPairContext): (Expr[G], Expr[G]) =
+    e match { case ValExprPair0(_, e1, _, e2) => (convert(e1), convert(e2)) }
 
-  def convert(implicit e: ValExprContext): Expr[G] = e match {
-    case ValExpr0(inner) => convert(inner)
-    case ValExpr1(inner) => convert(inner)
-  }
+  def convert(implicit e: ValExprContext): Expr[G] =
+    e match {
+      case ValExpr0(inner) => convert(inner)
+      case ValExpr1(inner) => convert(inner)
+    }
 
-  def convert(implicit id: ValIdentifierContext): String = id match {
-    case ValIdentifier0(inner) => convertText(inner)
-    case ValIdentifier1(ValKeywordNonExpr0(text)) => text
-    case ValIdentifier2(text) => text.substring(1, text.length - 1)
-  }
+  def convert(implicit id: ValIdentifierContext): String =
+    id match {
+      case ValIdentifier0(inner) => convertText(inner)
+      case ValIdentifier1(ValKeywordNonExpr0(text)) => text
+      case ValIdentifier2(text) => text.substring(1, text.length - 1)
+    }
 
-  def convertText(implicit res: ValKeywordExprContext): String = res match {
-    case ValNonePerm(_) => "none"
-    case ValWrite(_) => "write"
-    case ValRead(_) => "read"
-    case ValNoneOption(_) => "None"
-    case ValEmpty(_) => "empty"
-    case ValTrue(_) => "true"
-    case ValFalse(_) => "false"
-  }
+  def convertText(implicit res: ValKeywordExprContext): String =
+    res match {
+      case ValNonePerm(_) => "none"
+      case ValWrite(_) => "write"
+      case ValRead(_) => "read"
+      case ValNoneOption(_) => "None"
+      case ValEmpty(_) => "empty"
+      case ValTrue(_) => "true"
+      case ValFalse(_) => "false"
+    }
 
-  def convert(implicit res: ValKeywordExprContext): Expr[G] = res match {
-    case ValNonePerm(_) => NoPerm()
-    case ValWrite(_) => WritePerm()
-    case ValRead(_) => ReadPerm()
-    case ValNoneOption(_) => OptNone()
-    case ValEmpty(_) => EmptyProcess()
-    case ValTrue(_) => tt
-    case ValFalse(_) => ff
-  }
+  def convert(implicit res: ValKeywordExprContext): Expr[G] =
+    res match {
+      case ValNonePerm(_) => NoPerm()
+      case ValWrite(_) => WritePerm()
+      case ValRead(_) => ReadPerm()
+      case ValNoneOption(_) => OptNone()
+      case ValEmpty(_) => EmptyProcess()
+      case ValTrue(_) => tt
+      case ValFalse(_) => ff
+    }
 
-  def convert(implicit inv: ValGenericAdtInvocationContext): Expr[G] = inv match {
-    case ValGenericAdtInvocation0(adt, _, typeArgs, _, _, func, _, args, _) =>
-      ADTFunctionInvocation(Some((new UnresolvedRef[G, AxiomaticDataType[G]](convert(adt)), convert(typeArgs))),
-        new UnresolvedRef[G, ADTFunction[G]](convert(func)), args.map(convert(_)).getOrElse(Nil))
-  }
-}
\ No newline at end of file
+  def convert(implicit inv: ValGenericAdtInvocationContext): Expr[G] =
+    inv match {
+      case ValGenericAdtInvocation0(adt, _, typeArgs, _, _, func, _, args, _) =>
+        ADTFunctionInvocation(
+          Some((
+            new UnresolvedRef[G, AxiomaticDataType[G]](convert(adt)),
+            convert(typeArgs),
+          )),
+          new UnresolvedRef[G, ADTFunction[G]](convert(func)),
+          args.map(convert(_)).getOrElse(Nil),
+        )
+    }
+}
diff --git a/src/parsers/vct/parsers/transform/JavaToCol.scala b/src/parsers/vct/parsers/transform/JavaToCol.scala
index 3035b8bcb2..99e8b38589 100644
--- a/src/parsers/vct/parsers/transform/JavaToCol.scala
+++ b/src/parsers/vct/parsers/transform/JavaToCol.scala
@@ -18,1535 +18,2570 @@ import scala.annotation.nowarn
 import scala.collection.mutable
 
 @nowarn("msg=match may not be exhaustive&msg=Some\\(")
-case class JavaToCol[G](override val baseOrigin: Origin,
-                        override val blameProvider: BlameProvider,
-                        override val errors: Seq[(Token, Token, ExpectedError)])
-  extends ToCol[G](baseOrigin, blameProvider, errors) with LazyLogging {
-  def convert(implicit unit: CompilationUnitContext): Seq[GlobalDeclaration[G]] = unit match {
-    case CompilationUnit0(pkg, imports, decls, _) =>
-      Seq(new JavaNamespace(pkg.map(convert(_)), imports.map(convert(_)), decls.flatMap(convert(_))))
-  }
-
-  def convert(implicit pkg: PackageDeclarationContext): JavaName[G] = pkg match {
-    case PackageDeclaration0(_, _, name, _) => convert(name)
-  }
+case class JavaToCol[G](
+    override val baseOrigin: Origin,
+    override val blameProvider: BlameProvider,
+    override val errors: Seq[(Token, Token, ExpectedError)],
+) extends ToCol[G](baseOrigin, blameProvider, errors) with LazyLogging {
+  def convert(
+      implicit unit: CompilationUnitContext
+  ): Seq[GlobalDeclaration[G]] =
+    unit match {
+      case CompilationUnit0(pkg, imports, decls, _) =>
+        Seq(new JavaNamespace(
+          pkg.map(convert(_)),
+          imports.map(convert(_)),
+          decls.flatMap(convert(_)),
+        ))
+    }
 
-  def convert(implicit imp: ImportDeclarationContext): JavaImport[G] = imp match {
-    case ImportDeclaration0(_, isStatic, name, star, _) => JavaImport(isStatic.nonEmpty, convert(name), star.nonEmpty)
-  }
+  def convert(implicit pkg: PackageDeclarationContext): JavaName[G] =
+    pkg match { case PackageDeclaration0(_, _, name, _) => convert(name) }
 
-  def convert(implicit decl: TypeDeclarationContext): Seq[GlobalDeclaration[G]] = decl match {
-    case TypeDeclaration0(mods, ClassDeclaration0(contract, _, name, args, ext, imp, ClassBody0(_, decls, _))) =>
-      withContract(contract, contract => {
-        Seq(new JavaClass(convert(name), mods.map(convert(_)), args.map(convert(_)).getOrElse(Nil),
-          AstBuildHelpers.foldStar(contract.consume(contract.lock_invariant)),
-          ext.map(convert(_)).getOrElse(Java.JAVA_LANG_OBJECT),
-          imp.map(convert(_)).getOrElse(Nil), decls.flatMap(convert(_)))(blame(decl)))
-      })
-    case TypeDeclaration1(mods, EnumDeclaration0(_, name, None, _, Some(constants), _, None | Some(EnumBodyDeclarations0(_, Seq())), _)) =>
-      mods.map(convert(_)).foreach {
-        case JavaPublic() =>
-        case _ => fail(decl, "only public modifier allowed")
-      }
-      Seq(new Enum(convert(constants))(origin(decl).sourceName(convert(name))))
-    case TypeDeclaration1(mods, enum @ EnumDeclaration0(a, b, c, d, e, f, g, h)) =>
-      fail(enum, "Enums with implements or class declarations, or without constants, are not supported")
-    case TypeDeclaration2(mods, InterfaceDeclaration0(_, name, args, ext, InterfaceBody0(_, decls, _))) =>
-      Seq(new JavaInterface(convert(name), mods.map(convert(_)), args.map(convert(_)).getOrElse(Nil),
-        ext.map(convert(_)).getOrElse(Nil), decls.flatMap(convert(_))))
-    case TypeDeclaration3(mods, AnnotationTypeDeclaration0(_, _, name, AnnotationTypeBody0(_, decls, _))) =>
-      Seq(new JavaAnnotationInterface(convert(name), mods.map(convert(_)), Java.JAVA_LANG_ANNOTATION_ANNOTATION, decls.flatMap(convert(_))))
-    case TypeDeclaration4(inner) => convert(inner)
-    case TypeDeclaration5(_) => Nil
-  }
+  def convert(implicit imp: ImportDeclarationContext): JavaImport[G] =
+    imp match {
+      case ImportDeclaration0(_, isStatic, name, star, _) =>
+        JavaImport(isStatic.nonEmpty, convert(name), star.nonEmpty)
+    }
 
-  def convert(implicit constants: EnumConstantsContext): Seq[EnumConstant[G]] = constants match {
-    case EnumConstants0(constant) => Seq(convert(constant))
-    case EnumConstants1(constants, _, constant) => convert(constants) :+ convert(constant)
-  }
+  def convert(
+      implicit decl: TypeDeclarationContext
+  ): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case TypeDeclaration0(
+            mods,
+            ClassDeclaration0(
+              contract,
+              _,
+              name,
+              args,
+              ext,
+              imp,
+              ClassBody0(_, decls, _),
+            ),
+          ) =>
+        withContract(
+          contract,
+          contract => {
+            Seq(
+              new JavaClass(
+                convert(name),
+                mods.map(convert(_)),
+                args.map(convert(_)).getOrElse(Nil),
+                AstBuildHelpers
+                  .foldStar(contract.consume(contract.lock_invariant)),
+                ext.map(convert(_)).getOrElse(Java.JAVA_LANG_OBJECT),
+                imp.map(convert(_)).getOrElse(Nil),
+                decls.flatMap(convert(_)),
+              )(blame(decl))
+            )
+          },
+        )
+      case TypeDeclaration1(
+            mods,
+            EnumDeclaration0(
+              _,
+              name,
+              None,
+              _,
+              Some(constants),
+              _,
+              None | Some(EnumBodyDeclarations0(_, Seq())),
+              _,
+            ),
+          ) =>
+        mods.map(convert(_)).foreach {
+          case JavaPublic() =>
+          case _ => fail(decl, "only public modifier allowed")
+        }
+        Seq(
+          new Enum(convert(constants))(origin(decl).sourceName(convert(name)))
+        )
+      case TypeDeclaration1(
+            mods,
+            enum @ EnumDeclaration0(a, b, c, d, e, f, g, h),
+          ) =>
+        fail(
+          enum,
+          "Enums with implements or class declarations, or without constants, are not supported",
+        )
+      case TypeDeclaration2(
+            mods,
+            InterfaceDeclaration0(
+              _,
+              name,
+              args,
+              ext,
+              InterfaceBody0(_, decls, _),
+            ),
+          ) =>
+        Seq(new JavaInterface(
+          convert(name),
+          mods.map(convert(_)),
+          args.map(convert(_)).getOrElse(Nil),
+          ext.map(convert(_)).getOrElse(Nil),
+          decls.flatMap(convert(_)),
+        ))
+      case TypeDeclaration3(
+            mods,
+            AnnotationTypeDeclaration0(
+              _,
+              _,
+              name,
+              AnnotationTypeBody0(_, decls, _),
+            ),
+          ) =>
+        Seq(new JavaAnnotationInterface(
+          convert(name),
+          mods.map(convert(_)),
+          Java.JAVA_LANG_ANNOTATION_ANNOTATION,
+          decls.flatMap(convert(_)),
+        ))
+      case TypeDeclaration4(inner) => convert(inner)
+      case TypeDeclaration5(_) => Nil
+    }
 
-  def convert(implicit constant: EnumConstantContext): EnumConstant[G] = constant match {
-    case EnumConstant0(Nil, name, None, None) => new EnumConstant()(origin(constant).sourceName(convert(name)))
-    case constant => fail(constant, "Arguments, annotations, or class body on enum alternatives not supported")
-  }
+  def convert(implicit constants: EnumConstantsContext): Seq[EnumConstant[G]] =
+    constants match {
+      case EnumConstants0(constant) => Seq(convert(constant))
+      case EnumConstants1(constants, _, constant) =>
+        convert(constants) :+ convert(constant)
+    }
 
-  def convert(implicit decl: AnnotationTypeElementDeclarationContext): Option[JavaAnnotationMethod[G]] = decl match {
-    case AnnotationTypeElementDeclaration0(mods, AnnotationTypeElementRest0(returnType, AnnotationMethodOrConstantRest0(AnnotationMethodRest0(name, _, _, default)), _)) =>
-      val modifiers: Set[JavaModifier[G]] = mods.map(convert(_)).toSet
-      if (!modifiers.subsetOf(Set(JavaPublic()(DiagnosticOrigin), JavaAbstract()(DiagnosticOrigin)))) {
-        fail(decl, "Only modifiers allowed on @interface members are public, abstract")
-      }
-      Some(new JavaAnnotationMethod(convert(returnType), convert(name), default.map(convert(_))))
-    case AnnotationTypeElementDeclaration1(_) => None
-  }
+  def convert(implicit constant: EnumConstantContext): EnumConstant[G] =
+    constant match {
+      case EnumConstant0(Nil, name, None, None) =>
+        new EnumConstant()(origin(constant).sourceName(convert(name)))
+      case constant =>
+        fail(
+          constant,
+          "Arguments, annotations, or class body on enum alternatives not supported",
+        )
+    }
 
-  def convert(implicit default: DefaultValueContext): Expr[G] = default match {
-    case DefaultValue0(_, ElementValue1(expr)) => convert(expr)
-    case DefaultValue0(_, elementValue) => ??(elementValue)
-  }
+  def convert(
+      implicit decl: AnnotationTypeElementDeclarationContext
+  ): Option[JavaAnnotationMethod[G]] =
+    decl match {
+      case AnnotationTypeElementDeclaration0(
+            mods,
+            AnnotationTypeElementRest0(
+              returnType,
+              AnnotationMethodOrConstantRest0(
+                AnnotationMethodRest0(name, _, _, default)
+              ),
+              _,
+            ),
+          ) =>
+        val modifiers: Set[JavaModifier[G]] = mods.map(convert(_)).toSet
+        if (
+          !modifiers.subsetOf(Set(
+            JavaPublic()(DiagnosticOrigin),
+            JavaAbstract()(DiagnosticOrigin),
+          ))
+        ) {
+          fail(
+            decl,
+            "Only modifiers allowed on @interface members are public, abstract",
+          )
+        }
+        Some(new JavaAnnotationMethod(
+          convert(returnType),
+          convert(name),
+          default.map(convert(_)),
+        ))
+      case AnnotationTypeElementDeclaration1(_) => None
+    }
 
-  def convert(implicit modifier: ModifierContext): JavaModifier[G] = modifier match {
-    case Modifier0(modifier) => convert(modifier)
-    case Modifier1(name) => name match {
-      case "native" => JavaNative()
-      case "synchronized" => JavaSynchronized()(blame(modifier))
-      case "transient" => JavaTransient()
-      case "volatile" => JavaVolatile()
+  def convert(implicit default: DefaultValueContext): Expr[G] =
+    default match {
+      case DefaultValue0(_, ElementValue1(expr)) => convert(expr)
+      case DefaultValue0(_, elementValue) => ??(elementValue)
     }
-  }
 
-  def convert(implicit modifier: ClassOrInterfaceModifierContext): JavaModifier[G] = modifier match {
-    case ClassOrInterfaceModifier0(annotation) => convert(annotation)
-    case ClassOrInterfaceModifier1(name) => name match {
-      case "public" => JavaPublic()
-      case "protected" => JavaProtected()
-      case "private" => JavaPrivate()
-      case "static" => JavaStatic()
-      case "abstract" => JavaAbstract()
-      case "final" => JavaFinal()
-      case "strictfp" => JavaStrictFP()
-    }
-    case ClassOrInterfaceModifier2(mods) => withModifiers(mods, m => {
-      if (m.consume(m.pure)) JavaPure[G]()
-      else if (m.consume(m.inline)) JavaInline[G]()
-      else if (m.consume(m.bipAnnotation)) JavaBipAnnotation[G]()
-      else fail(m.nodes.head, "This modifier cannot be attached to a declaration in Java")
-    })
-  }
+  def convert(implicit modifier: ModifierContext): JavaModifier[G] =
+    modifier match {
+      case Modifier0(modifier) => convert(modifier)
+      case Modifier1(name) =>
+        name match {
+          case "native" => JavaNative()
+          case "synchronized" => JavaSynchronized()(blame(modifier))
+          case "transient" => JavaTransient()
+          case "volatile" => JavaVolatile()
+        }
+    }
 
-  def convert(implicit annotation: AnnotationContext): JavaAnnotation[G] = annotation match {
-    case Annotation0(_, name, annotationArgs) =>
-      JavaAnnotation(convert(name), annotationArgs.map(convert(_)).getOrElse(Seq()))(blame(annotation))
-  }
+  def convert(
+      implicit modifier: ClassOrInterfaceModifierContext
+  ): JavaModifier[G] =
+    modifier match {
+      case ClassOrInterfaceModifier0(annotation) => convert(annotation)
+      case ClassOrInterfaceModifier1(name) =>
+        name match {
+          case "public" => JavaPublic()
+          case "protected" => JavaProtected()
+          case "private" => JavaPrivate()
+          case "static" => JavaStatic()
+          case "abstract" => JavaAbstract()
+          case "final" => JavaFinal()
+          case "strictfp" => JavaStrictFP()
+        }
+      case ClassOrInterfaceModifier2(mods) =>
+        withModifiers(
+          mods,
+          m => {
+            if (m.consume(m.pure))
+              JavaPure[G]()
+            else if (m.consume(m.inline))
+              JavaInline[G]()
+            else if (m.consume(m.bipAnnotation))
+              JavaBipAnnotation[G]()
+            else
+              fail(
+                m.nodes.head,
+                "This modifier cannot be attached to a declaration in Java",
+              )
+          },
+        )
+    }
 
-  def convert(implicit annotationName: AnnotationNameContext): JavaNamedType[G] = annotationName match {
-    case AnnotationName0(qualifiedName) => JavaNamedType(convert(qualifiedName).names.map(part => (part, None)))
-  }
+  def convert(implicit annotation: AnnotationContext): JavaAnnotation[G] =
+    annotation match {
+      case Annotation0(_, name, annotationArgs) =>
+        JavaAnnotation(
+          convert(name),
+          annotationArgs.map(convert(_)).getOrElse(Seq()),
+        )(blame(annotation))
+    }
 
-  def convert(implicit annotationArgs: AnnotationArgsContext): Seq[(String, Expr[G])] = annotationArgs match {
-    case AnnotationArgs0(_, None, _ ) => Seq()
-    case AnnotationArgs0(_, Some(AnnotationArgsElems0(pairs)), _ ) => convert(pairs)
-    case AnnotationArgs0(_, Some(AnnotationArgsElems1(ElementValue1(expr))), _) => Seq(("value", convert(expr)))
-    case _ => ??(annotationArgs)
-  }
+  def convert(
+      implicit annotationName: AnnotationNameContext
+  ): JavaNamedType[G] =
+    annotationName match {
+      case AnnotationName0(qualifiedName) =>
+        JavaNamedType(convert(qualifiedName).names.map(part => (part, None)))
+    }
 
-  def convert(implicit pairs: ElementValuePairsContext): Seq[(String, Expr[G])] = pairs match {
-    case ElementValuePairs0(pair) => convert(pair).toSeq
-    case ElementValuePairs1(more, _, pair) => convert(more) ++ convert(pair).toSeq
-    case _ => ???
-  }
+  def convert(
+      implicit annotationArgs: AnnotationArgsContext
+  ): Seq[(String, Expr[G])] =
+    annotationArgs match {
+      case AnnotationArgs0(_, None, _) => Seq()
+      case AnnotationArgs0(_, Some(AnnotationArgsElems0(pairs)), _) =>
+        convert(pairs)
+      case AnnotationArgs0(
+            _,
+            Some(AnnotationArgsElems1(ElementValue1(expr))),
+            _,
+          ) =>
+        Seq(("value", convert(expr)))
+      case _ => ??(annotationArgs)
+    }
 
-  def convert(implicit pair: ElementValuePairContext): Option[(String, Expr[G])] = pair match {
-    case ElementValuePair0(name, _, ElementValue0(expr)) =>
-      logger.warn(s"Annotation array initializer at ${OriginProvider(pair).shortPositionText} is discarded")
-      None
-    case ElementValuePair0(name, _, ElementValue1(expr)) => Some((convert(name), convert(expr)))
-    case x => ??(x)
-  }
+  def convert(
+      implicit pairs: ElementValuePairsContext
+  ): Seq[(String, Expr[G])] =
+    pairs match {
+      case ElementValuePairs0(pair) => convert(pair).toSeq
+      case ElementValuePairs1(more, _, pair) =>
+        convert(more) ++ convert(pair).toSeq
+      case _ => ???
+    }
 
-  def convert(implicit modifier: VariableModifierContext): JavaModifier[G] = modifier match {
-    case VariableModifier0(_) => JavaFinal()
-    case VariableModifier1(annotation) => convert(annotation)
-  }
+  def convert(
+      implicit pair: ElementValuePairContext
+  ): Option[(String, Expr[G])] =
+    pair match {
+      case ElementValuePair0(name, _, ElementValue0(expr)) =>
+        logger.warn(
+          s"Annotation array initializer at ${OriginProvider(pair).shortPositionText} is discarded"
+        )
+        None
+      case ElementValuePair0(name, _, ElementValue1(expr)) =>
+        Some((convert(name), convert(expr)))
+      case x => ??(x)
+    }
 
-  def convert(implicit args: TypeParametersContext): Seq[Variable[G]] = args match {
-    case TypeParameters0(_, args, _) => convert(args)
-  }
+  def convert(implicit modifier: VariableModifierContext): JavaModifier[G] =
+    modifier match {
+      case VariableModifier0(_) => JavaFinal()
+      case VariableModifier1(annotation) => convert(annotation)
+    }
 
-  def convert(implicit args: TypeParameterListContext): Seq[Variable[G]] = args match {
-    case TypeParameterList0(arg) => Seq(convert(arg))
-    case TypeParameterList1(arg, _, args) => convert(arg) +: convert(args)
-  }
+  def convert(implicit args: TypeParametersContext): Seq[Variable[G]] =
+    args match { case TypeParameters0(_, args, _) => convert(args) }
 
-  def convert(implicit arg: TypeParameterContext): Variable[G] = arg match {
-    case TypeParameter0(id, bound) => bound match {
-      case None =>
-        new Variable(TType(Java.JAVA_LANG_OBJECT))(origin(arg).sourceName(convert(id)))
-      case Some(TypeParameterBound0(_, TypeBound0(ext))) =>
-        new Variable(TType(convert(ext)))(origin(arg).sourceName(convert(id)))
-      case Some(TypeParameterBound0(_, TypeBound1(_, _, moreBounds))) =>
-        fail(moreBounds, "Multiple upper type bounds are not supported")
+  def convert(implicit args: TypeParameterListContext): Seq[Variable[G]] =
+    args match {
+      case TypeParameterList0(arg) => Seq(convert(arg))
+      case TypeParameterList1(arg, _, args) => convert(arg) +: convert(args)
     }
-  }
-
-  def convert(implicit decl: ClassBodyDeclarationContext): Seq[ClassDeclaration[G]] = decl match {
-    case ClassBodyDeclaration0(_) => Nil
-    case ClassBodyDeclaration1(isStatic, body) => Seq(new JavaSharedInitialization(isStatic.nonEmpty, convert(body)))
-    case ClassBodyDeclaration2(contract, mods, decl) =>
-      withContract(contract, c => {
-        convert(decl, mods.map(convert(_)), c)
-      })
-    case ClassBodyDeclaration3(inner) => convert(inner)
-  }
 
-  def convert(implicit decl: InterfaceBodyDeclarationContext): Seq[ClassDeclaration[G]] = decl match {
-    case InterfaceBodyDeclaration0(contract, mods, decl) =>
-      withContract(contract, c => {
-        convert(decl, mods.map(convert(_)), c)
-      })
-    case InterfaceBodyDeclaration1(inner) => convert(inner)
-    case InterfaceBodyDeclaration2(_) => Nil
-  }
+  def convert(implicit arg: TypeParameterContext): Variable[G] =
+    arg match {
+      case TypeParameter0(id, bound) =>
+        bound match {
+          case None =>
+            new Variable(TType(Java.JAVA_LANG_OBJECT))(
+              origin(arg).sourceName(convert(id))
+            )
+          case Some(TypeParameterBound0(_, TypeBound0(ext))) =>
+            new Variable(TType(convert(ext)))(
+              origin(arg).sourceName(convert(id))
+            )
+          case Some(TypeParameterBound0(_, TypeBound1(_, _, moreBounds))) =>
+            fail(moreBounds, "Multiple upper type bounds are not supported")
+        }
+    }
 
-  def convert(implicit decl: MemberDeclarationContext, mods: Seq[JavaModifier[G]], c: ContractCollector[G]): Seq[ClassDeclaration[G]] = decl match {
-    case MemberDeclaration0(MethodDeclaration0(returnType, name, params, dims, signals, body)) =>
-      Seq(new JavaMethod(mods, convert(returnType), dims.map(convert(_)).getOrElse(0),
-        convert(name), convert(params), Nil, signals.map(convert(_)).getOrElse(Nil),
-        convert(body), c.consumeApplicableContract(blame(decl)))(blame(decl)))
-    case MemberDeclaration1(GenericMethodDeclaration0(typeParams, MethodDeclaration0(
-      returnType, name, params, dims, signals, body))) =>
-      Seq(new JavaMethod(mods, convert(returnType), dims.map(convert(_)).getOrElse(0),
-        convert(name), convert(params), convert(typeParams), signals.map(convert(_)).getOrElse(Nil),
-        convert(body), c.consumeApplicableContract(blame(decl)))(blame(decl)))
-    case MemberDeclaration2(FieldDeclaration0(t, decls, _)) =>
-      // Ignore the contract collector, so that complains about being non-empty
-      Seq(new JavaFields(mods, convert(t), convert(decls)))
-    case MemberDeclaration3(ConstructorDeclaration0(name, params, signals, ConstructorBody0(body))) =>
-      Seq(new JavaConstructor(mods, convert(name), convert(params), Nil,
-        signals.map(convert(_)).getOrElse(Nil), convert(body), c.consumeApplicableContract(blame(decl)))(blame(decl)))
-    case MemberDeclaration4(GenericConstructorDeclaration0(typeParams,
-      ConstructorDeclaration0(name, params, signals, ConstructorBody0(body)))) =>
-      Seq(new JavaConstructor(mods, convert(name), convert(params), convert(typeParams),
-        signals.map(convert(_)).getOrElse(Nil), convert(body), c.consumeApplicableContract(blame(decl)))(blame(decl)))
-    case MemberDeclaration5(interface) => fail(interface, "Inner interfaces are not supported.")
-    case MemberDeclaration6(annotation) => fail(annotation, "Annotations are not supported.")
-    case MemberDeclaration7(cls) => fail(cls, "Inner classes are not supported.")
-    case MemberDeclaration8(enum) => fail(enum, "Inner enums are not supported.")
-  }
+  def convert(
+      implicit decl: ClassBodyDeclarationContext
+  ): Seq[ClassDeclaration[G]] =
+    decl match {
+      case ClassBodyDeclaration0(_) => Nil
+      case ClassBodyDeclaration1(isStatic, body) =>
+        Seq(new JavaSharedInitialization(isStatic.nonEmpty, convert(body)))
+      case ClassBodyDeclaration2(contract, mods, decl) =>
+        withContract(contract, c => { convert(decl, mods.map(convert(_)), c) })
+      case ClassBodyDeclaration3(inner) => convert(inner)
+    }
 
-  def convert(implicit decl: InterfaceMemberDeclarationContext, mods: Seq[JavaModifier[G]], c: ContractCollector[G]): Seq[ClassDeclaration[G]] = decl match {
-    case InterfaceMemberDeclaration0(ConstDeclaration0(t, decls, _)) =>
-      // JLS SE 7 - 9.3
-      Seq(new JavaFields(Seq(JavaPublic[G](), JavaStatic[G](), JavaFinal[G]()) ++ mods, convert(t), convert(decls)))
-    case InterfaceMemberDeclaration1(InterfaceMethodDeclaration0(t, name, params, dims, signals, _)) =>
-      // JLS SE 7 - 9.4
-      Seq(new JavaMethod(Seq(JavaPublic[G](), JavaAbstract[G]()) ++ mods, convert(t), dims.map(convert(_)).getOrElse(0),
-        convert(name), convert(params), Nil, signals.map(convert(_)).getOrElse(Nil), None, c.consumeApplicableContract(blame(decl)))(blame(decl)))
-    case InterfaceMemberDeclaration2(GenericInterfaceMethodDeclaration0(typeParams, InterfaceMethodDeclaration0(
-      t, name, params, dims, signals, _))) =>
-      Seq(new JavaMethod(Seq(JavaPublic[G](), JavaAbstract[G]()) ++ mods, convert(t), dims.map(convert(_)).getOrElse(0),
-        convert(name), convert(params), convert(typeParams), signals.map(convert(_)).getOrElse(Nil),
-        None, c.consumeApplicableContract(blame(decl)))(blame(decl)))
-    case InterfaceMemberDeclaration3(interface) => fail(interface, "Inner interfaces are not supported.")
-    case InterfaceMemberDeclaration4(annotation) => fail(annotation, "Annotations are not supported.")
-    case InterfaceMemberDeclaration5(cls) => fail(cls, "Inner classes are not supported.")
-    case InterfaceMemberDeclaration6(enum) => fail(enum, "Enums are not supported.")
-  }
+  def convert(
+      implicit decl: InterfaceBodyDeclarationContext
+  ): Seq[ClassDeclaration[G]] =
+    decl match {
+      case InterfaceBodyDeclaration0(contract, mods, decl) =>
+        withContract(contract, c => { convert(decl, mods.map(convert(_)), c) })
+      case InterfaceBodyDeclaration1(inner) => convert(inner)
+      case InterfaceBodyDeclaration2(_) => Nil
+    }
 
-  def convert(implicit decls: VariableDeclaratorsContext): Seq[JavaVariableDeclaration[G]] = decls match {
-    case VariableDeclarators0(decl) => Seq(convert(decl))
-    case VariableDeclarators1(decl, _, decls) => convert(decl) +: convert(decls)
-  }
+  def convert(
+      implicit decl: MemberDeclarationContext,
+      mods: Seq[JavaModifier[G]],
+      c: ContractCollector[G],
+  ): Seq[ClassDeclaration[G]] =
+    decl match {
+      case MemberDeclaration0(
+            MethodDeclaration0(returnType, name, params, dims, signals, body)
+          ) =>
+        Seq(
+          new JavaMethod(
+            mods,
+            convert(returnType),
+            dims.map(convert(_)).getOrElse(0),
+            convert(name),
+            convert(params),
+            Nil,
+            signals.map(convert(_)).getOrElse(Nil),
+            convert(body),
+            c.consumeApplicableContract(blame(decl)),
+          )(blame(decl))
+        )
+      case MemberDeclaration1(
+            GenericMethodDeclaration0(
+              typeParams,
+              MethodDeclaration0(returnType, name, params, dims, signals, body),
+            )
+          ) =>
+        Seq(
+          new JavaMethod(
+            mods,
+            convert(returnType),
+            dims.map(convert(_)).getOrElse(0),
+            convert(name),
+            convert(params),
+            convert(typeParams),
+            signals.map(convert(_)).getOrElse(Nil),
+            convert(body),
+            c.consumeApplicableContract(blame(decl)),
+          )(blame(decl))
+        )
+      case MemberDeclaration2(FieldDeclaration0(t, decls, _)) =>
+        // Ignore the contract collector, so that complains about being non-empty
+        Seq(new JavaFields(mods, convert(t), convert(decls)))
+      case MemberDeclaration3(
+            ConstructorDeclaration0(
+              name,
+              params,
+              signals,
+              ConstructorBody0(body),
+            )
+          ) =>
+        Seq(
+          new JavaConstructor(
+            mods,
+            convert(name),
+            convert(params),
+            Nil,
+            signals.map(convert(_)).getOrElse(Nil),
+            convert(body),
+            c.consumeApplicableContract(blame(decl)),
+          )(blame(decl))
+        )
+      case MemberDeclaration4(
+            GenericConstructorDeclaration0(
+              typeParams,
+              ConstructorDeclaration0(
+                name,
+                params,
+                signals,
+                ConstructorBody0(body),
+              ),
+            )
+          ) =>
+        Seq(
+          new JavaConstructor(
+            mods,
+            convert(name),
+            convert(params),
+            convert(typeParams),
+            signals.map(convert(_)).getOrElse(Nil),
+            convert(body),
+            c.consumeApplicableContract(blame(decl)),
+          )(blame(decl))
+        )
+      case MemberDeclaration5(interface) =>
+        fail(interface, "Inner interfaces are not supported.")
+      case MemberDeclaration6(annotation) =>
+        fail(annotation, "Annotations are not supported.")
+      case MemberDeclaration7(cls) =>
+        fail(cls, "Inner classes are not supported.")
+      case MemberDeclaration8(enum) =>
+        fail(enum, "Inner enums are not supported.")
+    }
 
-  def convert(implicit decl: VariableDeclaratorContext): JavaVariableDeclaration[G] = decl match {
-    case VariableDeclarator0(VariableDeclaratorId0(name, dims), init) =>
-      JavaVariableDeclaration(convert(name), dims.map(convert(_)).getOrElse(0), init.map(convert(_)))
-  }
+  def convert(
+      implicit decl: InterfaceMemberDeclarationContext,
+      mods: Seq[JavaModifier[G]],
+      c: ContractCollector[G],
+  ): Seq[ClassDeclaration[G]] =
+    decl match {
+      case InterfaceMemberDeclaration0(ConstDeclaration0(t, decls, _)) =>
+        // JLS SE 7 - 9.3
+        Seq(new JavaFields(
+          Seq(JavaPublic[G](), JavaStatic[G](), JavaFinal[G]()) ++ mods,
+          convert(t),
+          convert(decls),
+        ))
+      case InterfaceMemberDeclaration1(
+            InterfaceMethodDeclaration0(t, name, params, dims, signals, _)
+          ) =>
+        // JLS SE 7 - 9.4
+        Seq(
+          new JavaMethod(
+            Seq(JavaPublic[G](), JavaAbstract[G]()) ++ mods,
+            convert(t),
+            dims.map(convert(_)).getOrElse(0),
+            convert(name),
+            convert(params),
+            Nil,
+            signals.map(convert(_)).getOrElse(Nil),
+            None,
+            c.consumeApplicableContract(blame(decl)),
+          )(blame(decl))
+        )
+      case InterfaceMemberDeclaration2(
+            GenericInterfaceMethodDeclaration0(
+              typeParams,
+              InterfaceMethodDeclaration0(t, name, params, dims, signals, _),
+            )
+          ) =>
+        Seq(
+          new JavaMethod(
+            Seq(JavaPublic[G](), JavaAbstract[G]()) ++ mods,
+            convert(t),
+            dims.map(convert(_)).getOrElse(0),
+            convert(name),
+            convert(params),
+            convert(typeParams),
+            signals.map(convert(_)).getOrElse(Nil),
+            None,
+            c.consumeApplicableContract(blame(decl)),
+          )(blame(decl))
+        )
+      case InterfaceMemberDeclaration3(interface) =>
+        fail(interface, "Inner interfaces are not supported.")
+      case InterfaceMemberDeclaration4(annotation) =>
+        fail(annotation, "Annotations are not supported.")
+      case InterfaceMemberDeclaration5(cls) =>
+        fail(cls, "Inner classes are not supported.")
+      case InterfaceMemberDeclaration6(enum) =>
+        fail(enum, "Enums are not supported.")
+    }
 
-  def convert(implicit decls: ConstantDeclaratorListContext): Seq[JavaVariableDeclaration[G]] = decls match {
-    case ConstantDeclaratorList0(decl) => Seq(convert(decl))
-    case ConstantDeclaratorList1(decl, _, decls) => convert(decl) +: convert(decls)
-  }
+  def convert(
+      implicit decls: VariableDeclaratorsContext
+  ): Seq[JavaVariableDeclaration[G]] =
+    decls match {
+      case VariableDeclarators0(decl) => Seq(convert(decl))
+      case VariableDeclarators1(decl, _, decls) =>
+        convert(decl) +: convert(decls)
+    }
 
-  def convert(implicit decl: ConstantDeclaratorContext): JavaVariableDeclaration[G] = decl match {
-    case ConstantDeclarator0(name, dims, _, init) =>
-      JavaVariableDeclaration(convert(name), dims.map(convert(_)).getOrElse(0), Some(convert(init)))
-  }
+  def convert(
+      implicit decl: VariableDeclaratorContext
+  ): JavaVariableDeclaration[G] =
+    decl match {
+      case VariableDeclarator0(VariableDeclaratorId0(name, dims), init) =>
+        JavaVariableDeclaration(
+          convert(name),
+          dims.map(convert(_)).getOrElse(0),
+          init.map(convert(_)),
+        )
+    }
 
-  def convert(implicit params: FormalParametersContext): Seq[JavaParam[G]] = params match {
-    case FormalParameters0(_, params, _) => params.map(convert(_)).getOrElse(Nil)
-  }
+  def convert(
+      implicit decls: ConstantDeclaratorListContext
+  ): Seq[JavaVariableDeclaration[G]] =
+    decls match {
+      case ConstantDeclaratorList0(decl) => Seq(convert(decl))
+      case ConstantDeclaratorList1(decl, _, decls) =>
+        convert(decl) +: convert(decls)
+    }
 
-  def convert(implicit params: FormalParameterListContext): Seq[JavaParam[G]] = params match {
-    case FormalParameterList0(varargs) => ??(varargs)
-    case FormalParameterList1(params) => convert(params)
-    case FormalParameterList2(_, _, varargs) => ??(varargs)
-  }
+  def convert(
+      implicit decl: ConstantDeclaratorContext
+  ): JavaVariableDeclaration[G] =
+    decl match {
+      case ConstantDeclarator0(name, dims, _, init) =>
+        JavaVariableDeclaration(
+          convert(name),
+          dims.map(convert(_)).getOrElse(0),
+          Some(convert(init)),
+        )
+    }
 
-  def convert(implicit params: InitFormalParameterListContext): Seq[JavaParam[G]] = params match {
-    case InitFormalParameterList0(param) => Seq(convert(param))
-    case InitFormalParameterList1(param, _, params) => convert(param) +: convert(params)
-  }
+  def convert(implicit params: FormalParametersContext): Seq[JavaParam[G]] =
+    params match {
+      case FormalParameters0(_, params, _) =>
+        params.map(convert(_)).getOrElse(Nil)
+    }
 
-  def convert(implicit param: FormalParameterContext): JavaParam[G] = param match {
-    case FormalParameter0(modifiers, tNode, nameDims) =>
-      val (name, dims) = convert(nameDims)
-      val t = FuncTools.repeat(TArray[G](_), dims, convert(tNode))
-      new JavaParam(modifiers.map(convert(_)), name, t)(origin(param).sourceName(name))
-  }
+  def convert(implicit params: FormalParameterListContext): Seq[JavaParam[G]] =
+    params match {
+      case FormalParameterList0(varargs) => ??(varargs)
+      case FormalParameterList1(params) => convert(params)
+      case FormalParameterList2(_, _, varargs) => ??(varargs)
+    }
 
-  def convert(implicit dims: DimsContext): Int = dims match {
-    case Dims0(dims) => dims.size
-  }
+  def convert(
+      implicit params: InitFormalParameterListContext
+  ): Seq[JavaParam[G]] =
+    params match {
+      case InitFormalParameterList0(param) => Seq(convert(param))
+      case InitFormalParameterList1(param, _, params) =>
+        convert(param) +: convert(params)
+    }
 
-  def convert(implicit names: QualifiedNameListContext): Seq[JavaName[G]] = names match {
-    case QualifiedNameList0(name) => Seq(convert(name))
-    case QualifiedNameList1(name, _, names) => convert(name) +: convert(names)
-  }
+  def convert(implicit param: FormalParameterContext): JavaParam[G] =
+    param match {
+      case FormalParameter0(modifiers, tNode, nameDims) =>
+        val (name, dims) = convert(nameDims)
+        val t = FuncTools.repeat(TArray[G](_), dims, convert(tNode))
+        new JavaParam(modifiers.map(convert(_)), name, t)(
+          origin(param).sourceName(name)
+        )
+    }
 
-  def convert(implicit name: QualifiedNameContext): JavaName[G] = name match {
-    case QualifiedName0(id) => JavaName(Seq(convert(id)))
-    case QualifiedName1(id, _, names) => JavaName(convert(id) +: convert(names).names)
-  }
+  def convert(implicit dims: DimsContext): Int =
+    dims match { case Dims0(dims) => dims.size }
 
-  def convert(implicit ts: IntExtContext): Seq[Type[G]] = ts match {
-    case IntExt0(_, ts) => convert(ts)
-  }
+  def convert(implicit names: QualifiedNameListContext): Seq[JavaName[G]] =
+    names match {
+      case QualifiedNameList0(name) => Seq(convert(name))
+      case QualifiedNameList1(name, _, names) => convert(name) +: convert(names)
+    }
 
-  def convert(implicit t: ExtContext): Type[G] = t match {
-    case Ext0(_, t) => convert(t)
-  }
+  def convert(implicit name: QualifiedNameContext): JavaName[G] =
+    name match {
+      case QualifiedName0(id) => JavaName(Seq(convert(id)))
+      case QualifiedName1(id, _, names) =>
+        JavaName(convert(id) +: convert(names).names)
+    }
 
-  def convert(implicit ts: ImpContext): Seq[Type[G]] = ts match {
-    case Imp0(_, ts) => convert(ts)
-  }
+  def convert(implicit ts: IntExtContext): Seq[Type[G]] =
+    ts match { case IntExt0(_, ts) => convert(ts) }
 
-  def convert(implicit ts: TypeListContext): Seq[Type[G]] = ts match {
-    case TypeList0(t) => Seq(convert(t))
-    case TypeList1(t, _, ts) => convert(t) +: convert(ts)
-  }
+  def convert(implicit t: ExtContext): Type[G] =
+    t match { case Ext0(_, t) => convert(t) }
 
-  def convert(implicit signals: ThrowyContext): Seq[JavaNamedType[G]] = signals match {
-    case Throwy0(_, ts) =>
-      convert(ts).map(name => JavaNamedType(name.names.map(part => (part, None))))
-  }
+  def convert(implicit ts: ImpContext): Seq[Type[G]] =
+    ts match { case Imp0(_, ts) => convert(ts) }
 
-  def convert(implicit stat: MethodBodyOrEmptyContext): Option[Statement[G]] = stat match {
-    case MethodBodyOrEmpty0(_) => None
-    case MethodBodyOrEmpty1(MethodBody0(body)) => Some(convert(body))
-  }
+  def convert(implicit ts: TypeListContext): Seq[Type[G]] =
+    ts match {
+      case TypeList0(t) => Seq(convert(t))
+      case TypeList1(t, _, ts) => convert(t) +: convert(ts)
+    }
 
-  def convert(implicit stat: BlockContext): Statement[G] = stat match {
-    case Block0(_, stats, _) => Scope(Nil, Block(stats.map(convert(_))))
-  }
+  def convert(implicit signals: ThrowyContext): Seq[JavaNamedType[G]] =
+    signals match {
+      case Throwy0(_, ts) =>
+        convert(ts)
+          .map(name => JavaNamedType(name.names.map(part => (part, None))))
+    }
 
-  def convert(implicit stat: BlockStatementContext): Statement[G] = stat match {
-    case BlockStatement0(decl) => convert(decl)
-    case BlockStatement1(statement) => convert(statement)
-    case BlockStatement2(decl) => ??(decl)
-    case BlockStatement3(inner) => convert(inner)
-  }
+  def convert(implicit stat: MethodBodyOrEmptyContext): Option[Statement[G]] =
+    stat match {
+      case MethodBodyOrEmpty0(_) => None
+      case MethodBodyOrEmpty1(MethodBody0(body)) => Some(convert(body))
+    }
 
-  def convert(implicit decl: LocalVariableDeclarationStatementContext): Statement[G] = decl match {
-    case LocalVariableDeclarationStatement0(decl, _) => convert(decl)
-  }
+  def convert(implicit stat: BlockContext): Statement[G] =
+    stat match {
+      case Block0(_, stats, _) => Scope(Nil, Block(stats.map(convert(_))))
+    }
 
-  def convert(implicit decl: LocalVariableDeclarationContext): Statement[G] = decl match {
-    case LocalVariableDeclaration0(mods, t, decls) =>
-      JavaLocalDeclarationStatement(new JavaLocalDeclaration(mods.map(convert(_)), convert(t), convert(decls)))
-  }
+  def convert(implicit stat: BlockStatementContext): Statement[G] =
+    stat match {
+      case BlockStatement0(decl) => convert(decl)
+      case BlockStatement1(statement) => convert(statement)
+      case BlockStatement2(decl) => ??(decl)
+      case BlockStatement3(inner) => convert(inner)
+    }
 
-  def convert(implicit stat: ElseBlockContext): Statement[G] = stat match {
-    case ElseBlock0(_, stat) => convert(stat)
-  }
+  def convert(
+      implicit decl: LocalVariableDeclarationStatementContext
+  ): Statement[G] =
+    decl match {
+      case LocalVariableDeclarationStatement0(decl, _) => convert(decl)
+    }
 
-  def convert(prefix: LoopAmalgamationContext, f: ContractCollector[G] => Statement[G], labels: Seq[LabelDecl[G]], collector: ContractCollector[G]): Statement[G] = prefix match {
-    case LoopAmalgamation0(contract, tail) =>
-      convert(contract, collector)
-      convert(tail, f, labels, collector)
-    case LoopAmalgamation1(label, tail) =>
-      convert(tail, f, labels :+ convert(label), collector)
-    case LoopAmalgamation2(_) =>
-      labels.foldRight[Statement[G]](f(collector)) {
-        case (label, stat) => Label(label, stat)(label.o)
-      }
-  }
+  def convert(implicit decl: LocalVariableDeclarationContext): Statement[G] =
+    decl match {
+      case LocalVariableDeclaration0(mods, t, decls) =>
+        JavaLocalDeclarationStatement(new JavaLocalDeclaration(
+          mods.map(convert(_)),
+          convert(t),
+          convert(decls),
+        ))
+    }
 
-  def convert(prefix: LoopAmalgamationContext, f: ContractCollector[G] => Statement[G]): Statement[G] =
-    convert(prefix, f, Nil, new ContractCollector())
-
-
-  def convert(implicit stat: StatementContext): Statement[G] = stat match {
-    case Statement0(block) => convert(block)
-    case Statement1(_, assn, _, _) => Assert(convert(assn))(blame(stat))
-    case Statement2(_, cond, body, otherwise) =>
-      Branch(Seq((convert(cond), convert(body))) ++ (otherwise match {
-        case None => Nil
-        case Some(otherwise) => Seq((BooleanValue(true), convert(otherwise)))
-      }))
-    case Statement3(prefix, _, _, control, _, contract2, body) =>
-      convert(prefix, c => {
-        contract2.foreach(contract => convert(contract, c))
-        control match {
-          case ForControl0(foreach) => ??(foreach)
-          case ForControl1(init, _, cond, _, update) =>
-            Scope(Nil, Loop(
-              init.map(convert(_)).getOrElse(Block(Nil)),
-              cond.map(convert(_)).getOrElse(tt),
-              update.map(convert(_)).getOrElse(Block(Nil)),
-              c.consumeLoopContract(stat),
-              convert(body)
-            ))
+  def convert(implicit stat: ElseBlockContext): Statement[G] =
+    stat match { case ElseBlock0(_, stat) => convert(stat) }
+
+  def convert(
+      prefix: LoopAmalgamationContext,
+      f: ContractCollector[G] => Statement[G],
+      labels: Seq[LabelDecl[G]],
+      collector: ContractCollector[G],
+  ): Statement[G] =
+    prefix match {
+      case LoopAmalgamation0(contract, tail) =>
+        convert(contract, collector)
+        convert(tail, f, labels, collector)
+      case LoopAmalgamation1(label, tail) =>
+        convert(tail, f, labels :+ convert(label), collector)
+      case LoopAmalgamation2(_) =>
+        labels.foldRight[Statement[G]](f(collector)) { case (label, stat) =>
+          Label(label, stat)(label.o)
         }
-      })
-    case Statement4(prefix, _, cond, contract2, body) =>
-      convert(prefix, c => {
-        contract2.foreach(contract => convert(contract, c))
-        Scope(Nil, Loop(Block(Nil), convert(cond), Block(Nil), c.consumeLoopContract(stat), convert(body)))
-      })
-    case Statement5(_, _, _, _, _) => ??(stat)
-    case Statement6(_, attempt, grab, eventually) =>
-      TryCatchFinally(convert(attempt), eventually.map(convert(_)).getOrElse(Block(Nil)), grab.map(convert(_)))
-    case Statement7(_, attempt, eventually) =>
-      TryCatchFinally(convert(attempt), convert(eventually), Nil)
-    case Statement8(_, _, _, _, _) => ??(stat)
-    case Statement9(_, expr, _, casedStatements, trailingCases, _) =>
-      Switch(convert(expr), Block(casedStatements.flatMap(convert(_)) ++ trailingCases.map(convert(_))))
-    case Statement10(_, obj, inner) => Synchronized(convert(obj), convert(inner))(blame(stat))
-    case Statement11(_, expr, _) => Return(expr.map(convert(_)).getOrElse(Void()))
-    case Statement12(_, exc, _) => Throw(convert(exc))(blame(stat))
-    case Statement13(_, label, _) => Break(label.map(convert(_)).map(new UnresolvedRef[G, LabelDecl[G]](_)))
-    case Statement14(_, label, _) => Continue(label.map(convert(_)).map(new UnresolvedRef[G, LabelDecl[G]](_)))
-    case Statement15(_) => Block(Nil)
-    case Statement16(expr, _) => Eval(convert(expr))
-    case Statement17(label, _, statement) =>
-      Label(
-        new LabelDecl()(origin(stat).sourceName(convert(label))),
-        convert(statement),
-      )
-    case Statement18(inner) => convert(inner)
-  }
+    }
 
-  def convert(implicit label: LoopLabelContext): LabelDecl[G] = label match {
-    case LoopLabel0(name, _) => new LabelDecl()(origin(label).sourceName(convert(name)))
-  }
+  def convert(
+      prefix: LoopAmalgamationContext,
+      f: ContractCollector[G] => Statement[G],
+  ): Statement[G] = convert(prefix, f, Nil, new ContractCollector())
+
+  def convert(implicit stat: StatementContext): Statement[G] =
+    stat match {
+      case Statement0(block) => convert(block)
+      case Statement1(_, assn, _, _) => Assert(convert(assn))(blame(stat))
+      case Statement2(_, cond, body, otherwise) =>
+        Branch(
+          Seq((convert(cond), convert(body))) ++
+            (otherwise match {
+              case None => Nil
+              case Some(otherwise) =>
+                Seq((BooleanValue(true), convert(otherwise)))
+            })
+        )
+      case Statement3(prefix, _, _, control, _, contract2, body) =>
+        convert(
+          prefix,
+          c => {
+            contract2.foreach(contract => convert(contract, c))
+            control match {
+              case ForControl0(foreach) => ??(foreach)
+              case ForControl1(init, _, cond, _, update) =>
+                Scope(
+                  Nil,
+                  Loop(
+                    init.map(convert(_)).getOrElse(Block(Nil)),
+                    cond.map(convert(_)).getOrElse(tt),
+                    update.map(convert(_)).getOrElse(Block(Nil)),
+                    c.consumeLoopContract(stat),
+                    convert(body),
+                  ),
+                )
+            }
+          },
+        )
+      case Statement4(prefix, _, cond, contract2, body) =>
+        convert(
+          prefix,
+          c => {
+            contract2.foreach(contract => convert(contract, c))
+            Scope(
+              Nil,
+              Loop(
+                Block(Nil),
+                convert(cond),
+                Block(Nil),
+                c.consumeLoopContract(stat),
+                convert(body),
+              ),
+            )
+          },
+        )
+      case Statement5(_, _, _, _, _) => ??(stat)
+      case Statement6(_, attempt, grab, eventually) =>
+        TryCatchFinally(
+          convert(attempt),
+          eventually.map(convert(_)).getOrElse(Block(Nil)),
+          grab.map(convert(_)),
+        )
+      case Statement7(_, attempt, eventually) =>
+        TryCatchFinally(convert(attempt), convert(eventually), Nil)
+      case Statement8(_, _, _, _, _) => ??(stat)
+      case Statement9(_, expr, _, casedStatements, trailingCases, _) =>
+        Switch(
+          convert(expr),
+          Block(
+            casedStatements.flatMap(convert(_)) ++ trailingCases.map(convert(_))
+          ),
+        )
+      case Statement10(_, obj, inner) =>
+        Synchronized(convert(obj), convert(inner))(blame(stat))
+      case Statement11(_, expr, _) =>
+        Return(expr.map(convert(_)).getOrElse(Void()))
+      case Statement12(_, exc, _) => Throw(convert(exc))(blame(stat))
+      case Statement13(_, label, _) =>
+        Break(label.map(convert(_)).map(new UnresolvedRef[G, LabelDecl[G]](_)))
+      case Statement14(_, label, _) =>
+        Continue(
+          label.map(convert(_)).map(new UnresolvedRef[G, LabelDecl[G]](_))
+        )
+      case Statement15(_) => Block(Nil)
+      case Statement16(expr, _) => Eval(convert(expr))
+      case Statement17(label, _, statement) =>
+        Label(
+          new LabelDecl()(origin(stat).sourceName(convert(label))),
+          convert(statement),
+        )
+      case Statement18(inner) => convert(inner)
+    }
 
-  def convert(implicit switchBlock: SwitchBlockStatementGroupContext): Seq[Statement[G]] = switchBlock match {
-    case SwitchBlockStatementGroup0(labels, statements) =>
-      labels.map(convert(_)) ++ statements.map(convert(_))
-  }
+  def convert(implicit label: LoopLabelContext): LabelDecl[G] =
+    label match {
+      case LoopLabel0(name, _) =>
+        new LabelDecl()(origin(label).sourceName(convert(name)))
+    }
 
-  def convert(implicit switchLabel: SwitchLabelContext): Statement[G] = switchLabel match {
-    case SwitchLabel0(_, expr, _) => Case(convert(expr))
-    case SwitchLabel1(_, enum, _) => ??(enum)
-    case SwitchLabel2(_, _) => DefaultCase()
-  }
+  def convert(
+      implicit switchBlock: SwitchBlockStatementGroupContext
+  ): Seq[Statement[G]] =
+    switchBlock match {
+      case SwitchBlockStatementGroup0(labels, statements) =>
+        labels.map(convert(_)) ++ statements.map(convert(_))
+    }
 
-  def convert(implicit stat: ForInitContext): Statement[G] = stat match {
-    case ForInit0(locals) => convert(locals)
-    case ForInit1(exprs) => Block(convert(exprs).map(Eval(_)))
-  }
+  def convert(implicit switchLabel: SwitchLabelContext): Statement[G] =
+    switchLabel match {
+      case SwitchLabel0(_, expr, _) => Case(convert(expr))
+      case SwitchLabel1(_, enum, _) => ??(enum)
+      case SwitchLabel2(_, _) => DefaultCase()
+    }
 
-  def convert(implicit stat: ForUpdateContext): Statement[G] = stat match {
-    case ForUpdate0(exprs) => Block(convert(exprs).map(Eval(_)))
-  }
+  def convert(implicit stat: ForInitContext): Statement[G] =
+    stat match {
+      case ForInit0(locals) => convert(locals)
+      case ForInit1(exprs) => Block(convert(exprs).map(Eval(_)))
+    }
 
-  def convert(implicit stat: FinallyBlockContext): Statement[G] = stat match {
-    case FinallyBlock0(_, block) => convert(block)
-  }
+  def convert(implicit stat: ForUpdateContext): Statement[G] =
+    stat match { case ForUpdate0(exprs) => Block(convert(exprs).map(Eval(_))) }
 
-  def convert(implicit grab: CatchClauseContext): CatchClause[G] = grab match {
-    case CatchClause0(_, _, _mods, ts, id, _, body) =>
-      CatchClause(new Variable(convert(ts))(origin(grab).sourceName(convert(id))), convert(body))
-  }
+  def convert(implicit stat: FinallyBlockContext): Statement[G] =
+    stat match { case FinallyBlock0(_, block) => convert(block) }
 
-  def convert(implicit ts: CatchTypeContext): TUnion[G] = ts match {
-    case CatchType0(name) => TUnion(Seq(convert(name)))
-    case CatchType1(name, _, names) => TUnion(convert(name) +: convert(names).types)
-  }
+  def convert(implicit grab: CatchClauseContext): CatchClause[G] =
+    grab match {
+      case CatchClause0(_, _, _mods, ts, id, _, body) =>
+        CatchClause(
+          new Variable(convert(ts))(origin(grab).sourceName(convert(id))),
+          convert(body),
+        )
+    }
 
-  def convert(implicit ts: NonWildcardTypeArgumentsContext): Seq[Type[G]] = ts match {
-    case NonWildcardTypeArguments0(_, ts, _) => convert(ts)
-  }
+  def convert(implicit ts: CatchTypeContext): TUnion[G] =
+    ts match {
+      case CatchType0(name) => TUnion(Seq(convert(name)))
+      case CatchType1(name, _, names) =>
+        TUnion(convert(name) +: convert(names).types)
+    }
 
-  def convert(implicit t: TypeOrVoidContext): Type[G] = t match {
-    case TypeOrVoid0(_) => TVoid()
-    case TypeOrVoid1(t) => convert(t)
-  }
+  def convert(implicit ts: NonWildcardTypeArgumentsContext): Seq[Type[G]] =
+    ts match { case NonWildcardTypeArguments0(_, ts, _) => convert(ts) }
 
-  def convert(implicit t: TypeContext): Type[G] = t match {
-    case Type0(inner) => convert(inner)
-    case Type1(element, dims) => FuncTools.repeat(TArray[G](_), dims.map(convert(_)).getOrElse(0), convert(element))
-    case Type2(element, dims) => FuncTools.repeat(TArray[G](_), dims.map(convert(_)).getOrElse(0), convert(element))
-  }
+  def convert(implicit t: TypeOrVoidContext): Type[G] =
+    t match {
+      case TypeOrVoid0(_) => TVoid()
+      case TypeOrVoid1(t) => convert(t)
+    }
 
-  def convert(implicit t: ClassOrInterfaceTypeContext): JavaNamedType[G] = t match {
-    case ClassOrInterfaceType0(name, args) =>
-      JavaNamedType(Seq((convert(name), args.map(convert(_)))))
-    case ClassOrInterfaceType1(names, _, name, args) =>
-      JavaNamedType(convert(names).names :+ (convert(name), args.map(convert(_))))
-  }
+  def convert(implicit t: TypeContext): Type[G] =
+    t match {
+      case Type0(inner) => convert(inner)
+      case Type1(element, dims) =>
+        FuncTools.repeat(
+          TArray[G](_),
+          dims.map(convert(_)).getOrElse(0),
+          convert(element),
+        )
+      case Type2(element, dims) =>
+        FuncTools.repeat(
+          TArray[G](_),
+          dims.map(convert(_)).getOrElse(0),
+          convert(element),
+        )
+    }
 
-  def convert(implicit t: CreatedNameContext): Type[G] = t match {
-    case CreatedName0(t) => convert(t)
-    case CreatedName1(t) => convert(t)
-  }
+  def convert(implicit t: ClassOrInterfaceTypeContext): JavaNamedType[G] =
+    t match {
+      case ClassOrInterfaceType0(name, args) =>
+        JavaNamedType(Seq((convert(name), args.map(convert(_)))))
+      case ClassOrInterfaceType1(names, _, name, args) =>
+        JavaNamedType(
+          convert(names).names :+ (convert(name), args.map(convert(_)))
+        )
+    }
 
-  def convert(implicit t: ClassTypeDiamondListContext): JavaNamedType[G] = t match {
-    case ClassTypeDiamondList0(name, typeArgs) =>
-      JavaNamedType(Seq((convert(name), typeArgs.map(convert(_)))))
-    case ClassTypeDiamondList1(name, typeArgs, _, more) =>
-      JavaNamedType((convert(name), typeArgs.map(convert(_))) +: convert(more).names)
-  }
+  def convert(implicit t: CreatedNameContext): Type[G] =
+    t match {
+      case CreatedName0(t) => convert(t)
+      case CreatedName1(t) => convert(t)
+    }
 
-  def convert(implicit ts: TypeArgumentsOrDiamondContext): Seq[Type[G]] = ts match {
-    case TypeArgumentsOrDiamond0(_, _) => Nil
-    case TypeArgumentsOrDiamond1(ts) => convert(ts)
-  }
+  def convert(implicit t: ClassTypeDiamondListContext): JavaNamedType[G] =
+    t match {
+      case ClassTypeDiamondList0(name, typeArgs) =>
+        JavaNamedType(Seq((convert(name), typeArgs.map(convert(_)))))
+      case ClassTypeDiamondList1(name, typeArgs, _, more) =>
+        JavaNamedType(
+          (convert(name), typeArgs.map(convert(_))) +: convert(more).names
+        )
+    }
 
-  def convert(implicit t: PrimitiveTypeContext): Type[G] = t match {
-    case PrimitiveType0(name) => name match {
-      case "boolean" => TBool()
-      case "char" => ??(t)
-      case "byte" => TInt()
-      case "short" => TInt()
-      case "int" => TInt()
-      case "long" => TInt()
-      case "float" => Java.float
-      case "double" => Java.double
+  def convert(implicit ts: TypeArgumentsOrDiamondContext): Seq[Type[G]] =
+    ts match {
+      case TypeArgumentsOrDiamond0(_, _) => Nil
+      case TypeArgumentsOrDiamond1(ts) => convert(ts)
     }
-  }
 
-  def convert(implicit ts: TypeArgumentsContext): Seq[Type[G]] = ts match {
-    case TypeArguments0(_, ts, _) => convert(ts)
-  }
+  def convert(implicit t: PrimitiveTypeContext): Type[G] =
+    t match {
+      case PrimitiveType0(name) =>
+        name match {
+          case "boolean" => TBool()
+          case "char" => ??(t)
+          case "byte" => TInt()
+          case "short" => TInt()
+          case "int" => TInt()
+          case "long" => TInt()
+          case "float" => Java.float
+          case "double" => Java.double
+        }
+    }
 
-  def convert(implicit ts: TypeArgumentListContext): Seq[Type[G]] = ts match {
-    case TypeArgumentList0(arg) => Seq(convert(arg))
-    case TypeArgumentList1(arg, _, args) => convert(arg) +: convert(args)
-  }
+  def convert(implicit ts: TypeArgumentsContext): Seq[Type[G]] =
+    ts match { case TypeArguments0(_, ts, _) => convert(ts) }
 
-  def convert(implicit t: TypeArgumentContext): Type[G] = t match {
-    case TypeArgument0(t) => convert(t)
-    case TypeArgument1("?", None) => JavaWildcard()
-    case other: TypeArgument1Context => ??(other)
-  }
+  def convert(implicit ts: TypeArgumentListContext): Seq[Type[G]] =
+    ts match {
+      case TypeArgumentList0(arg) => Seq(convert(arg))
+      case TypeArgumentList1(arg, _, args) => convert(arg) +: convert(args)
+    }
 
-  def convert(implicit expr: VariableDeclaratorInitContext): Expr[G] = expr match {
-    case VariableDeclaratorInit0(_, init) => convert(init)
-  }
+  def convert(implicit t: TypeArgumentContext): Type[G] =
+    t match {
+      case TypeArgument0(t) => convert(t)
+      case TypeArgument1("?", None) => JavaWildcard()
+      case other: TypeArgument1Context => ??(other)
+    }
 
-  def convert(implicit expr: VariableInitializerContext): Expr[G] = expr match {
-    case VariableInitializer0(arrayInit) => convert(arrayInit)
-    case VariableInitializer1(expr) => convert(expr)
-  }
+  def convert(implicit expr: VariableDeclaratorInitContext): Expr[G] =
+    expr match { case VariableDeclaratorInit0(_, init) => convert(init) }
 
-  def convert(implicit expr: ArrayInitializerContext): Expr[G] = expr match {
-    case ArrayInitializer0(_, _) => JavaLiteralArray(Nil)
-    case ArrayInitializer1(_, exprs, _, _) => JavaLiteralArray(convert(exprs))
-  }
+  def convert(implicit expr: VariableInitializerContext): Expr[G] =
+    expr match {
+      case VariableInitializer0(arrayInit) => convert(arrayInit)
+      case VariableInitializer1(expr) => convert(expr)
+    }
 
-  def convert(implicit expr: ParExpressionContext): Expr[G] = expr match {
-    case ParExpression0(_, expr, _) => convert(expr)
-  }
+  def convert(implicit expr: ArrayInitializerContext): Expr[G] =
+    expr match {
+      case ArrayInitializer0(_, _) => JavaLiteralArray(Nil)
+      case ArrayInitializer1(_, exprs, _, _) => JavaLiteralArray(convert(exprs))
+    }
 
-  def convert(implicit exprs: ExpressionListContext): Seq[Expr[G]] = exprs match {
-    case ExpressionList0(expr) => Seq(convert(expr))
-    case ExpressionList1(expr, _, exprs) => convert(expr) +: convert(exprs)
-  }
+  def convert(implicit expr: ParExpressionContext): Expr[G] =
+    expr match { case ParExpression0(_, expr, _) => convert(expr) }
 
-  def convert(implicit exprs: VariableInitializerListContext): Seq[Expr[G]] = exprs match {
-    case VariableInitializerList0(expr) => Seq(convert(expr))
-    case VariableInitializerList1(expr, _, exprs) => convert(expr) +: convert(exprs)
-  }
+  def convert(implicit exprs: ExpressionListContext): Seq[Expr[G]] =
+    exprs match {
+      case ExpressionList0(expr) => Seq(convert(expr))
+      case ExpressionList1(expr, _, exprs) => convert(expr) +: convert(exprs)
+    }
 
-  def convert(implicit exprs: SpecifiedDimsContext): Seq[Expr[G]] = exprs match {
-    case SpecifiedDims0(dim) => Seq(convert(dim))
-    case SpecifiedDims1(dim, dims) => convert(dim) +: convert(dims)
-  }
+  def convert(implicit exprs: VariableInitializerListContext): Seq[Expr[G]] =
+    exprs match {
+      case VariableInitializerList0(expr) => Seq(convert(expr))
+      case VariableInitializerList1(expr, _, exprs) =>
+        convert(expr) +: convert(exprs)
+    }
 
-  def convert(implicit exprs: ArgumentsContext): Seq[Expr[G]] = exprs match {
-    case Arguments0(_, exprs, _) => exprs.map(convert(_)).getOrElse(Nil)
-  }
+  def convert(implicit exprs: SpecifiedDimsContext): Seq[Expr[G]] =
+    exprs match {
+      case SpecifiedDims0(dim) => Seq(convert(dim))
+      case SpecifiedDims1(dim, dims) => convert(dim) +: convert(dims)
+    }
 
-  def convert(implicit expr: ConstantExpressionContext): Expr[G] = expr match {
-    case ConstantExpression0(expr) => convert(expr)
-  }
+  def convert(implicit exprs: ArgumentsContext): Seq[Expr[G]] =
+    exprs match {
+      case Arguments0(_, exprs, _) => exprs.map(convert(_)).getOrElse(Nil)
+    }
 
-  def convert(implicit expr: StatementExpressionContext): Expr[G] = expr match {
-    case StatementExpression0(expr) => convert(expr)
-  }
+  def convert(implicit expr: ConstantExpressionContext): Expr[G] =
+    expr match { case ConstantExpression0(expr) => convert(expr) }
 
-  def convert(implicit expr: SpecifiedDimContext): Expr[G] = expr match {
-    case SpecifiedDim0(_, expr, _) => convert(expr)
-  }
+  def convert(implicit expr: StatementExpressionContext): Expr[G] =
+    expr match { case StatementExpression0(expr) => convert(expr) }
 
-  def convert(implicit expr: ExpressionContext): Expr[G] = expr match {
-    case Expression0(whiff, inner, den) =>
-      convertEmbedWith(whiff, convertEmbedThen(den, convert(inner)))
-  }
+  def convert(implicit expr: SpecifiedDimContext): Expr[G] =
+    expr match { case SpecifiedDim0(_, expr, _) => convert(expr) }
 
-  def convert(implicit expr: ExprContext): Expr[G] = expr match {
-    case JavaPrimary(inner) => convert(inner)
-    case parse.JavaDeref(obj, _, field) => col.JavaDeref(convert(obj), convert(field))(blame(expr))
-    case JavaPinnedThis(innerOrOuterClass, _, _) => ??(expr)
-    case JavaPinnedOuterClassNew(pinnedOuterClassObj, _, _, _, _) => ??(expr)
-    case JavaSuper(_, _, _, _) => ??(expr)
-    case JavaGenericInvocation(obj, _, ExplicitGenericInvocation0(typeArgs, invocation)) =>
-      convert(invocation, Some(convert(obj)), convert(typeArgs))
-    case JavaSubscript(ar, _, idx, _) => AmbiguousSubscript(convert(ar), convert(idx))(blame(expr))
-    case JavaNonNullInvocation(obj, _, name, args) =>
-      Implies(
-        Neq(convert(obj), Null()),
-        col.JavaInvocation(Some(convert(obj)), Nil, convert(name), convert(args), Nil, Nil)(blame(expr)),
-      )
-    case parse.JavaInvocation(obj, _, name, familyType, args, given, yields) =>
-      failIfDefined(familyType, "Predicate families not supported (for now)")
-      col.JavaInvocation(
-        Some(convert(obj)), Nil, convert(name), convert(args),
-        convertEmbedGiven(given), convertEmbedYields(yields))(
-        blame(expr))
-    case JavaValPostfix(expr, PostfixOp0(valPostfix)) => convert(expr, valPostfix, convert(expr))
-    case JavaNew(_, Some(_), Creator1(createdName, creatorRest), None, None) =>
-      convertBipGlue(creatorRest)
-    case JavaNew(_, None, creator, given, yields) =>
-      convert(creator, convertEmbedGiven(given), convertEmbedYields(yields))
-    case JavaCast(_, t, _, inner) => Cast(convert(inner), TypeValue(convert(t)))
-    case JavaPostfixIncDec(inner, postOp) =>
-      val target = convert(inner)
-      postOp match {
-        case "++" => PostAssignExpression(target, Plus(target, const(1)))(blame(expr))
-        case "--" => PostAssignExpression(target, Minus(target, const(1)))(blame(expr))
-      }
-    case JavaPrefixOp(preOp, inner) =>
-      val target = convert(inner)
-      preOp match {
-        case "+" => target // TODO PB: not sure if this is true for IEEE floats
-        case "-" => UMinus(target)
-        case "++" => PreAssignExpression(target, Plus(target, const(1)))(blame(expr))
-        case "--" => PreAssignExpression(target, Minus(target, const(1)))(blame(expr))
-      }
-    case JavaPrefixOp2(preOp, inner) => preOp match {
-      case "~" => BitNot(convert(inner))
-      case "!" => Not(convert(inner))
-    }
-    case JavaValPrefix(PrefixOp0(op), inner) =>
-      convert(expr, op, convert(inner))
-    case JavaValPrepend(left, PrependOp0(op), right) =>
-      convert(expr, op, convert(left), convert(right))
-    case JavaMul(leftNode, mul, rightNode) =>
-      val (left, right) = (convert(leftNode), convert(rightNode))
-      mul match {
-        case MulOp0(op) => op match {
-          case "*" => AmbiguousMult(left, right)
-          case "/" => AmbiguousTruncDiv(left, right)(blame(expr))
-          case "%" => AmbiguousTruncMod(left, right)(blame(expr))
+  def convert(implicit expr: ExpressionContext): Expr[G] =
+    expr match {
+      case Expression0(whiff, inner, den) =>
+        convertEmbedWith(whiff, convertEmbedThen(den, convert(inner)))
+    }
+
+  def convert(implicit expr: ExprContext): Expr[G] =
+    expr match {
+      case JavaPrimary(inner) => convert(inner)
+      case parse.JavaDeref(obj, _, field) =>
+        col.JavaDeref(convert(obj), convert(field))(blame(expr))
+      case JavaPinnedThis(innerOrOuterClass, _, _) => ??(expr)
+      case JavaPinnedOuterClassNew(pinnedOuterClassObj, _, _, _, _) => ??(expr)
+      case JavaSuper(_, _, _, _) => ??(expr)
+      case JavaGenericInvocation(
+            obj,
+            _,
+            ExplicitGenericInvocation0(typeArgs, invocation),
+          ) =>
+        convert(invocation, Some(convert(obj)), convert(typeArgs))
+      case JavaSubscript(ar, _, idx, _) =>
+        AmbiguousSubscript(convert(ar), convert(idx))(blame(expr))
+      case JavaNonNullInvocation(obj, _, name, args) =>
+        Implies(
+          Neq(convert(obj), Null()),
+          col.JavaInvocation(
+            Some(convert(obj)),
+            Nil,
+            convert(name),
+            convert(args),
+            Nil,
+            Nil,
+          )(blame(expr)),
+        )
+      case parse
+            .JavaInvocation(obj, _, name, familyType, args, given, yields) =>
+        failIfDefined(familyType, "Predicate families not supported (for now)")
+        col.JavaInvocation(
+          Some(convert(obj)),
+          Nil,
+          convert(name),
+          convert(args),
+          convertEmbedGiven(given),
+          convertEmbedYields(yields),
+        )(blame(expr))
+      case JavaValPostfix(expr, PostfixOp0(valPostfix)) =>
+        convert(expr, valPostfix, convert(expr))
+      case JavaNew(
+            _,
+            Some(_),
+            Creator1(createdName, creatorRest),
+            None,
+            None,
+          ) =>
+        convertBipGlue(creatorRest)
+      case JavaNew(_, None, creator, given, yields) =>
+        convert(creator, convertEmbedGiven(given), convertEmbedYields(yields))
+      case JavaCast(_, t, _, inner) =>
+        Cast(convert(inner), TypeValue(convert(t)))
+      case JavaPostfixIncDec(inner, postOp) =>
+        val target = convert(inner)
+        postOp match {
+          case "++" =>
+            PostAssignExpression(target, Plus(target, const(1)))(blame(expr))
+          case "--" =>
+            PostAssignExpression(target, Minus(target, const(1)))(blame(expr))
         }
-        case MulOp1(specOp) => convert(expr, specOp, left, right)
-      }
-    case JavaAdd(left, op, right) => op match {
-      case "+" => AmbiguousPlus(convert(left), convert(right))(blame(expr))
-      case "-" => AmbiguousMinus(convert(left), convert(right))(blame(expr))
-    }
-    case JavaShift(left, shift, right) => shift match {
-      case ShiftOp0(_, _) => BitShl(convert(left), convert(right))
-      case ShiftOp1(_, _, _) => BitUShr(convert(left), convert(right))
-      case ShiftOp2(_, _) => BitShr(convert(left), convert(right))
-    }
-    case JavaRel(left, comp, right) => comp match {
-      case RelOp0("<=") => AmbiguousLessEq(convert(left), convert(right))
-      case RelOp0(">=") => AmbiguousGreaterEq(convert(left), convert(right))
-      case RelOp0(">") => AmbiguousGreater(convert(left), convert(right))
-      case RelOp0("<") => AmbiguousLess(convert(left), convert(right))
-      case RelOp1(valOp) => convert(expr, valOp, convert(left), convert(right))
-    }
-    case JavaInstanceOf(obj, _, t) => InstanceOf(convert(obj), TypeValue(convert(t)))
-    case JavaEquals(left, eq, right) => eq match {
-      case "==" => AmbiguousEq(convert(left), convert(right), TInt())
-      case "!=" => AmbiguousNeq(convert(left), convert(right), TInt())
-    }
-    case JavaBitAnd(left, _, right) => AmbiguousComputationalAnd(convert(left), convert(right))
-    case JavaBitXor(left, _, right) => AmbiguousComputationalXor(convert(left), convert(right))
-    case JavaBitOr(left, _, right) => AmbiguousComputationalOr(convert(left), convert(right))
-    case JavaAnd(left, and, right) => and match {
-      case AndOp0(_) => And(convert(left), convert(right))
-      case AndOp1(specOp) => convert(expr, specOp, convert(left), convert(right))
-    }
-    case JavaOr(left, _, right) => AmbiguousOr(convert(left), convert(right))
-    case JavaValImp(left, imp, right) => imp match {
-      case ImpOp0(specOp) => convert(expr, specOp, convert(left), convert(right))
-    }
-    case JavaSelect(cond, _, whenTrue, _, whenFalse) =>
-      Select(convert(cond), convert(whenTrue), convert(whenFalse))
-    case JavaAssign(left, AssignOp0(op), right) =>
-      val target = convert(left)
-      val value = convert(right)
-      PreAssignExpression(target, op match {
-        case "=" => value
-        case "+=" => AmbiguousPlus(target, value)(blame(right))
-        case "-=" => AmbiguousMinus(target, value)(blame(right))
-        case "*=" => AmbiguousMult(target,  value)
-        case "/=" => AmbiguousTruncDiv(target,  value)(blame(expr))
-        case "&=" => AmbiguousComputationalAnd(target, value)
-        case "|=" => BitOr(target, value)
-        case "^=" => BitXor(target, value)
-        case ">>=" => BitShr(target, value)
-        case ">>>=" => BitUShr(target, value)
-        case "<<=" => BitShl(target, value)
-        case "%=" => AmbiguousTruncMod(target, value)(blame(expr))
-      })(blame(expr))
-  }
+      case JavaPrefixOp(preOp, inner) =>
+        val target = convert(inner)
+        preOp match {
+          case "+" =>
+            target // TODO PB: not sure if this is true for IEEE floats
+          case "-" => UMinus(target)
+          case "++" =>
+            PreAssignExpression(target, Plus(target, const(1)))(blame(expr))
+          case "--" =>
+            PreAssignExpression(target, Minus(target, const(1)))(blame(expr))
+        }
+      case JavaPrefixOp2(preOp, inner) =>
+        preOp match {
+          case "~" => BitNot(convert(inner))
+          case "!" => Not(convert(inner))
+        }
+      case JavaValPrefix(PrefixOp0(op), inner) =>
+        convert(expr, op, convert(inner))
+      case JavaValPrepend(left, PrependOp0(op), right) =>
+        convert(expr, op, convert(left), convert(right))
+      case JavaMul(leftNode, mul, rightNode) =>
+        val (left, right) = (convert(leftNode), convert(rightNode))
+        mul match {
+          case MulOp0(op) =>
+            op match {
+              case "*" => AmbiguousMult(left, right)
+              case "/" => AmbiguousTruncDiv(left, right)(blame(expr))
+              case "%" => AmbiguousTruncMod(left, right)(blame(expr))
+            }
+          case MulOp1(specOp) => convert(expr, specOp, left, right)
+        }
+      case JavaAdd(left, op, right) =>
+        op match {
+          case "+" => AmbiguousPlus(convert(left), convert(right))(blame(expr))
+          case "-" => AmbiguousMinus(convert(left), convert(right))(blame(expr))
+        }
+      case JavaShift(left, shift, right) =>
+        shift match {
+          case ShiftOp0(_, _) => BitShl(convert(left), convert(right))
+          case ShiftOp1(_, _, _) => BitUShr(convert(left), convert(right))
+          case ShiftOp2(_, _) => BitShr(convert(left), convert(right))
+        }
+      case JavaRel(left, comp, right) =>
+        comp match {
+          case RelOp0("<=") => AmbiguousLessEq(convert(left), convert(right))
+          case RelOp0(">=") => AmbiguousGreaterEq(convert(left), convert(right))
+          case RelOp0(">") => AmbiguousGreater(convert(left), convert(right))
+          case RelOp0("<") => AmbiguousLess(convert(left), convert(right))
+          case RelOp1(valOp) =>
+            convert(expr, valOp, convert(left), convert(right))
+        }
+      case JavaInstanceOf(obj, _, t) =>
+        InstanceOf(convert(obj), TypeValue(convert(t)))
+      case JavaEquals(left, eq, right) =>
+        eq match {
+          case "==" => AmbiguousEq(convert(left), convert(right), TInt())
+          case "!=" => AmbiguousNeq(convert(left), convert(right), TInt())
+        }
+      case JavaBitAnd(left, _, right) =>
+        AmbiguousComputationalAnd(convert(left), convert(right))
+      case JavaBitXor(left, _, right) =>
+        AmbiguousComputationalXor(convert(left), convert(right))
+      case JavaBitOr(left, _, right) =>
+        AmbiguousComputationalOr(convert(left), convert(right))
+      case JavaAnd(left, and, right) =>
+        and match {
+          case AndOp0(_) => And(convert(left), convert(right))
+          case AndOp1(specOp) =>
+            convert(expr, specOp, convert(left), convert(right))
+        }
+      case JavaOr(left, _, right) => AmbiguousOr(convert(left), convert(right))
+      case JavaValImp(left, imp, right) =>
+        imp match {
+          case ImpOp0(specOp) =>
+            convert(expr, specOp, convert(left), convert(right))
+        }
+      case JavaSelect(cond, _, whenTrue, _, whenFalse) =>
+        Select(convert(cond), convert(whenTrue), convert(whenFalse))
+      case JavaAssign(left, AssignOp0(op), right) =>
+        val target = convert(left)
+        val value = convert(right)
+        PreAssignExpression(
+          target,
+          op match {
+            case "=" => value
+            case "+=" => AmbiguousPlus(target, value)(blame(right))
+            case "-=" => AmbiguousMinus(target, value)(blame(right))
+            case "*=" => AmbiguousMult(target, value)
+            case "/=" => AmbiguousTruncDiv(target, value)(blame(expr))
+            case "&=" => AmbiguousComputationalAnd(target, value)
+            case "|=" => BitOr(target, value)
+            case "^=" => BitXor(target, value)
+            case ">>=" => BitShr(target, value)
+            case ">>>=" => BitUShr(target, value)
+            case "<<=" => BitShl(target, value)
+            case "%=" => AmbiguousTruncMod(target, value)(blame(expr))
+          },
+        )(blame(expr))
+    }
 
-  def convertBipGlue(implicit p: ParserRuleContext): JavaBipGlue[G] = p match {
-    /* TODO: This block of code, and related functions, can be removed once we add typechecking for all features
+  def convertBipGlue(implicit p: ParserRuleContext): JavaBipGlue[G] =
+    p match {
+      /* TODO: This block of code, and related functions, can be removed once we add typechecking for all features
          required by examples/concepts/javabip/casinoBroken/Main.java; then it's possible to pick this structure out in
          LangBipToCol.
-     */
-    case CreatorRest1(ClassCreatorRest0(Arguments0(_, None, _), Some(classBody))) => convertBipGlue(classBody)
-    case ClassBody0(_, Seq(decl), _) => convertBipGlue(decl)
-    case ClassBodyDeclaration2(None, _, MemberDeclaration0(method)) => convertBipGlue(method)
-    case MethodDeclaration0(
-    TypeOrVoid0(_),
-    JavaIdentifier0("configure"),
-    FormalParameters0(_, None, _),
-    None, None, MethodBodyOrEmpty1(m@MethodBody0(Block0(_, statements, _)))
-    ) => JavaBipGlue(statements.map(convertBipGlueElement(_)))(blame(m))
-    case _ => ??(p)
-  }
+       */
+      case CreatorRest1(
+            ClassCreatorRest0(Arguments0(_, None, _), Some(classBody))
+          ) =>
+        convertBipGlue(classBody)
+      case ClassBody0(_, Seq(decl), _) => convertBipGlue(decl)
+      case ClassBodyDeclaration2(None, _, MemberDeclaration0(method)) =>
+        convertBipGlue(method)
+      case MethodDeclaration0(
+            TypeOrVoid0(_),
+            JavaIdentifier0("configure"),
+            FormalParameters0(_, None, _),
+            None,
+            None,
+            MethodBodyOrEmpty1(m @ MethodBody0(Block0(_, statements, _))),
+          ) =>
+        JavaBipGlue(statements.map(convertBipGlueElement(_)))(blame(m))
+      case _ => ??(p)
+    }
 
   object JavaId {
-    def unapply(javaIdentifier: JavaIdentifierContext): Option[String] = Some(javaIdentifier.start.getText)
+    def unapply(javaIdentifier: JavaIdentifierContext): Option[String] =
+      Some(javaIdentifier.start.getText)
   }
 
   object Arguments {
-    def unapply(arguments: ArgumentsContext): Option[Seq[ExpressionContext]] = arguments match {
-      case Arguments0("(", None, ")") => Some(Nil)
-      case Arguments0("(", Some(exprList), ")") => Some(getExprs(exprList))
-    }
+    def unapply(arguments: ArgumentsContext): Option[Seq[ExpressionContext]] =
+      arguments match {
+        case Arguments0("(", None, ")") => Some(Nil)
+        case Arguments0("(", Some(exprList), ")") => Some(getExprs(exprList))
+      }
 
-    def getExprs(exprList: ExpressionListContext): Seq[ExpressionContext] = exprList match {
-      case ExpressionList0(expression) => Seq(expression)
-      case ExpressionList1(expression, _, exprList) => expression +: getExprs(exprList)
-    }
+    def getExprs(exprList: ExpressionListContext): Seq[ExpressionContext] =
+      exprList match {
+        case ExpressionList0(expression) => Seq(expression)
+        case ExpressionList1(expression, _, exprList) =>
+          expression +: getExprs(exprList)
+      }
   }
 
   object CleanPrimary {
-    def unapply(ann: ParserRuleContext): Option[PrimaryContext] = ann match {
-      case Expression0(None, parse.JavaPrimary(AnnotatedPrimary0(None, primary, None)), None) => Some(primary)
-      case parse.JavaPrimary(AnnotatedPrimary0(None, primary, None)) => Some(primary)
-      case AnnotatedPrimary0(None, primary, None) => Some(primary)
-      case _ => None
-    }
+    def unapply(ann: ParserRuleContext): Option[PrimaryContext] =
+      ann match {
+        case Expression0(
+              None,
+              parse.JavaPrimary(AnnotatedPrimary0(None, primary, None)),
+              None,
+            ) =>
+          Some(primary)
+        case parse.JavaPrimary(AnnotatedPrimary0(None, primary, None)) =>
+          Some(primary)
+        case AnnotatedPrimary0(None, primary, None) => Some(primary)
+        case _ => None
+      }
   }
 
-  def convertDotClassToType(implicit e: ExpressionContext): Type[G] = e match {
-    case CleanPrimary(Primary6(t, _, _)) => convert(t)
-  }
+  def convertDotClassToType(implicit e: ExpressionContext): Type[G] =
+    e match { case CleanPrimary(Primary6(t, _, _)) => convert(t) }
 
   def convertPorts(args: Seq[ExpressionContext]): Seq[JavaBipGlueName[G]] = {
     assert((args.length % 2) == 0)
     args.grouped(2).map { case Seq(portType, portName) =>
-      JavaBipGlueName(convertDotClassToType(portType), convert(portName))(origin(portType))
+      JavaBipGlueName(convertDotClassToType(portType), convert(portName))(
+        origin(portType)
+      )
     }.toSeq
   }
 
-  def convertPort(implicit e: ExprContext): Option[JavaBipGlueName[G]] = e match {
-    case CleanPrimary(
-    Primary5(JavaIdentifier0("port"), None, Arguments(Seq(portType, portName)), None, None)
-    ) => Some(JavaBipGlueName(convertDotClassToType(portType), convert(portName)))
-    case _ => None
-  }
+  def convertPort(implicit e: ExprContext): Option[JavaBipGlueName[G]] =
+    e match {
+      case CleanPrimary(
+            Primary5(
+              JavaIdentifier0("port"),
+              None,
+              Arguments(Seq(portType, portName)),
+              None,
+              None,
+            )
+          ) =>
+        Some(
+          JavaBipGlueName(convertDotClassToType(portType), convert(portName))
+        )
+      case _ => None
+    }
 
-  def convertSynchron(implicit e: ExprContext): Option[JavaBipGlueName[G]] = e match {
-    case CleanPrimary(
-    Primary5(JavaIdentifier0("synchron"), None, Arguments(Seq(portType, portName)), None, None)
-    ) => Some(JavaBipGlueName(convertDotClassToType(portType), convert(portName)))
-    case _ => None
-  }
+  def convertSynchron(implicit e: ExprContext): Option[JavaBipGlueName[G]] =
+    e match {
+      case CleanPrimary(
+            Primary5(
+              JavaIdentifier0("synchron"),
+              None,
+              Arguments(Seq(portType, portName)),
+              None,
+              None,
+            )
+          ) =>
+        Some(
+          JavaBipGlueName(convertDotClassToType(portType), convert(portName))
+        )
+      case _ => None
+    }
 
-  def convertData(implicit e: ExprContext): Option[JavaBipGlueName[G]] = e match {
-    case CleanPrimary(
-    Primary5(JavaIdentifier0("data"), None, Arguments(Seq(portType, portName)), None, None)
-    ) => Some(JavaBipGlueName(convertDotClassToType(portType), convert(portName)))
-    case _ => None
-  }
+  def convertData(implicit e: ExprContext): Option[JavaBipGlueName[G]] =
+    e match {
+      case CleanPrimary(
+            Primary5(
+              JavaIdentifier0("data"),
+              None,
+              Arguments(Seq(portType, portName)),
+              None,
+              None,
+            )
+          ) =>
+        Some(
+          JavaBipGlueName(convertDotClassToType(portType), convert(portName))
+        )
+      case _ => None
+    }
 
-  def convertBipGlueElement(implicit s: ParserRuleContext): JavaBipGlueElement[G] = s match {
-    case BlockStatement1(statement) => convertBipGlueElement(statement)
-    case Statement16(StatementExpression0(expr), _) => convertBipGlueElement(expr)
-    case Expression0(None, expr, None) => convertBipGlueElement(expr)
-    case parse.JavaInvocation(obj, _, JavaIdentifier0("requiresNothing"), None, Arguments(Seq()), None, None) =>
-      JavaBipGlueRequires(convertPort(obj).get, Seq())
-    case parse.JavaInvocation(obj, _, JavaIdentifier0("acceptsNothing"), None, Arguments(Seq()), None, None) =>
-      JavaBipGlueAccepts(convertPort(obj).get, Seq())
-    case parse.JavaInvocation(obj, _, JavaId("accepts"), None, Arguments(args), None, None) =>
-      JavaBipGlueAccepts(convertPort(obj).get, convertPorts(args))
-    case parse.JavaInvocation(obj, _, JavaId("requires"), None, Arguments(args), None, None) =>
-      JavaBipGlueRequires(convertPort(obj).get, convertPorts(args))
-    case parse.JavaInvocation(obj, _, JavaId("to"), None, args@Arguments(Seq(portType, portName)), None, None) =>
-      (convertSynchron(obj), convertData(obj)) match {
-        case (Some(synchronPortName), _) =>
-          JavaBipGlueSynchron(synchronPortName, JavaBipGlueName(convertDotClassToType(portType), convert(portName))(origin(args)))
-        case (_, Some(dataName)) =>
-          JavaBipGlueDataWire(dataName, JavaBipGlueName(convertDotClassToType(portType), convert(portName))(origin(args)))
-        case _ => ??(s)
-      }
-    case _ => ??(s)
-  }
+  def convertBipGlueElement(
+      implicit s: ParserRuleContext
+  ): JavaBipGlueElement[G] =
+    s match {
+      case BlockStatement1(statement) => convertBipGlueElement(statement)
+      case Statement16(StatementExpression0(expr), _) =>
+        convertBipGlueElement(expr)
+      case Expression0(None, expr, None) => convertBipGlueElement(expr)
+      case parse.JavaInvocation(
+            obj,
+            _,
+            JavaIdentifier0("requiresNothing"),
+            None,
+            Arguments(Seq()),
+            None,
+            None,
+          ) =>
+        JavaBipGlueRequires(convertPort(obj).get, Seq())
+      case parse.JavaInvocation(
+            obj,
+            _,
+            JavaIdentifier0("acceptsNothing"),
+            None,
+            Arguments(Seq()),
+            None,
+            None,
+          ) =>
+        JavaBipGlueAccepts(convertPort(obj).get, Seq())
+      case parse.JavaInvocation(
+            obj,
+            _,
+            JavaId("accepts"),
+            None,
+            Arguments(args),
+            None,
+            None,
+          ) =>
+        JavaBipGlueAccepts(convertPort(obj).get, convertPorts(args))
+      case parse.JavaInvocation(
+            obj,
+            _,
+            JavaId("requires"),
+            None,
+            Arguments(args),
+            None,
+            None,
+          ) =>
+        JavaBipGlueRequires(convertPort(obj).get, convertPorts(args))
+      case parse.JavaInvocation(
+            obj,
+            _,
+            JavaId("to"),
+            None,
+            args @ Arguments(Seq(portType, portName)),
+            None,
+            None,
+          ) =>
+        (convertSynchron(obj), convertData(obj)) match {
+          case (Some(synchronPortName), _) =>
+            JavaBipGlueSynchron(
+              synchronPortName,
+              JavaBipGlueName(
+                convertDotClassToType(portType),
+                convert(portName),
+              )(origin(args)),
+            )
+          case (_, Some(dataName)) =>
+            JavaBipGlueDataWire(
+              dataName,
+              JavaBipGlueName(
+                convertDotClassToType(portType),
+                convert(portName),
+              )(origin(args)),
+            )
+          case _ => ??(s)
+        }
+      case _ => ??(s)
+    }
 
-  def convert(implicit invocation: ExplicitGenericInvocationSuffixContext,
-              obj: Option[Expr[G]], typeArgs: Seq[Type[G]]): Expr[G] = invocation match {
-    case ExplicitGenericInvocationSuffix0(_, _) => ??(invocation)
-    case ExplicitGenericInvocationSuffix1(name, familyType, arguments) =>
-      // FIXME PB: should support this again somehow, maybe reuse open/close with type syntax instead of fold/unfold?
-      failIfDefined(familyType, "Predicate families not supported (for now)")
-      col.JavaInvocation(obj, typeArgs, convert(name), convert(arguments), Nil, Nil)(blame(invocation))
-  }
+  def convert(
+      implicit invocation: ExplicitGenericInvocationSuffixContext,
+      obj: Option[Expr[G]],
+      typeArgs: Seq[Type[G]],
+  ): Expr[G] =
+    invocation match {
+      case ExplicitGenericInvocationSuffix0(_, _) => ??(invocation)
+      case ExplicitGenericInvocationSuffix1(name, familyType, arguments) =>
+        // FIXME PB: should support this again somehow, maybe reuse open/close with type syntax instead of fold/unfold?
+        failIfDefined(familyType, "Predicate families not supported (for now)")
+        col.JavaInvocation(
+          obj,
+          typeArgs,
+          convert(name),
+          convert(arguments),
+          Nil,
+          Nil,
+        )(blame(invocation))
+    }
 
-  def convert(implicit expr: CreatorContext, givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])]): Expr[G] = expr match {
-    case Creator0(typeArgs, name, creator) =>
-      convert(creator, convert(typeArgs), convert(name), givenArgs, yields)
-    case Creator1(name, creator) => creator match {
-      case CreatorRest0(array) => convert(array, convert(name))
-      case CreatorRest1(cls) => convert(cls, Nil, convert(name), givenArgs, yields)
+  def convert(
+      implicit expr: CreatorContext,
+      givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])],
+      yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+  ): Expr[G] =
+    expr match {
+      case Creator0(typeArgs, name, creator) =>
+        convert(creator, convert(typeArgs), convert(name), givenArgs, yields)
+      case Creator1(name, creator) =>
+        creator match {
+          case CreatorRest0(array) => convert(array, convert(name))
+          case CreatorRest1(cls) =>
+            convert(cls, Nil, convert(name), givenArgs, yields)
+        }
     }
-  }
 
-  def convert(implicit creator: ClassCreatorRestContext, ts: Seq[Type[G]], name: Type[G], givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])], yields: Seq[(Expr[G], Ref[G, Variable[G]])]): Expr[G] = creator match {
-    case ClassCreatorRest0(args, impl) =>
-      failIfDefined(impl, "Anonymous classes are not supported")
-      JavaNewClass(convert(args), ts, name, givenArgs, yields)(blame(creator))
-  }
+  def convert(
+      implicit creator: ClassCreatorRestContext,
+      ts: Seq[Type[G]],
+      name: Type[G],
+      givenArgs: Seq[(Ref[G, Variable[G]], Expr[G])],
+      yields: Seq[(Expr[G], Ref[G, Variable[G]])],
+  ): Expr[G] =
+    creator match {
+      case ClassCreatorRest0(args, impl) =>
+        failIfDefined(impl, "Anonymous classes are not supported")
+        JavaNewClass(convert(args), ts, name, givenArgs, yields)(blame(creator))
+    }
 
-  def convert(implicit creator: ArrayCreatorRestContext, name: Type[G]): Expr[G] = creator match {
-    case ArrayCreatorRest0(dims, init) => JavaNewLiteralArray(name, convert(dims), convert(init))(blame(creator))
-    case ArrayCreatorRest1(specDims, extraDims) => JavaNewDefaultArray(name, convert(specDims), extraDims.map(convert(_)).getOrElse(0))(blame(creator))
-  }
+  def convert(
+      implicit creator: ArrayCreatorRestContext,
+      name: Type[G],
+  ): Expr[G] =
+    creator match {
+      case ArrayCreatorRest0(dims, init) =>
+        JavaNewLiteralArray(name, convert(dims), convert(init))(blame(creator))
+      case ArrayCreatorRest1(specDims, extraDims) =>
+        JavaNewDefaultArray(
+          name,
+          convert(specDims),
+          extraDims.map(convert(_)).getOrElse(0),
+        )(blame(creator))
+    }
 
-  def convert(implicit expr: AnnotatedPrimaryContext): Expr[G] = expr match {
-    case AnnotatedPrimary0(pre, inner, post) =>
-      convertEmbedWith(pre, convertEmbedThen(post, convert(inner)))
-  }
+  def convert(implicit expr: AnnotatedPrimaryContext): Expr[G] =
+    expr match {
+      case AnnotatedPrimary0(pre, inner, post) =>
+        convertEmbedWith(pre, convertEmbedThen(post, convert(inner)))
+    }
 
-  def convert(implicit expr: PrimaryContext): Expr[G] = expr match {
-    case Primary0(_, expr, _) => convert(expr)
-    case Primary1(_) => AmbiguousThis()
-    case Primary2(_) => ??(expr)
-    case Primary3(literal) => convert(literal)
-    case Primary4(name) => local(expr, convert(name))
-    case Primary5(name, familyType, args, given, yields) =>
-      failIfDefined(familyType, "Predicate families are unsupported (for now)")
-      col.JavaInvocation(None, Nil, convert(name), convert(args),
-        convertEmbedGiven(given), convertEmbedYields(yields))(
-        blame(expr))
-    case Primary6(_, _, _) => ??(expr)
-    case Primary7(_, _, _) => ??(expr)
-    case _: Primary8Context => ??(expr)
-    case Primary9(inner) => convert(inner)
-  }
+  def convert(implicit expr: PrimaryContext): Expr[G] =
+    expr match {
+      case Primary0(_, expr, _) => convert(expr)
+      case Primary1(_) => AmbiguousThis()
+      case Primary2(_) => ??(expr)
+      case Primary3(literal) => convert(literal)
+      case Primary4(name) => local(expr, convert(name))
+      case Primary5(name, familyType, args, given, yields) =>
+        failIfDefined(
+          familyType,
+          "Predicate families are unsupported (for now)",
+        )
+        col.JavaInvocation(
+          None,
+          Nil,
+          convert(name),
+          convert(args),
+          convertEmbedGiven(given),
+          convertEmbedYields(yields),
+        )(blame(expr))
+      case Primary6(_, _, _) => ??(expr)
+      case Primary7(_, _, _) => ??(expr)
+      case _: Primary8Context => ??(expr)
+      case Primary9(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: LiteralContext): Expr[G] = expr match {
-    case Literal0(i) => const(BigInt(i))
-    case Literal1(n) if n.length > 1 =>
-      val (num, t) = n.last match {
-        case 'f' | 'F' => (n.init, Java.float[G])
-        case 'd' | 'D' => (n.init, Java.double[G])
-        case _ => (n, Java.double[G])
-      }
-      FloatValue(BigDecimal(num), t)
-    case Literal2(_) => ??(expr)
-    case Literal3(data) => JavaStringValue(data.substring(1, data.length - 1), Java.JAVA_LANG_STRING_TYPE)
-    case Literal4(value) => value match {
-      case "true" => tt
-      case "false" => ff
-    }
-    case Literal5(_) => Null()
-  }
+  def convert(implicit expr: LiteralContext): Expr[G] =
+    expr match {
+      case Literal0(i) => const(BigInt(i))
+      case Literal1(n) if n.length > 1 =>
+        val (num, t) =
+          n.last match {
+            case 'f' | 'F' => (n.init, Java.float[G])
+            case 'd' | 'D' => (n.init, Java.double[G])
+            case _ => (n, Java.double[G])
+          }
+        FloatValue(BigDecimal(num), t)
+      case Literal2(_) => ??(expr)
+      case Literal3(data) =>
+        JavaStringValue(
+          data.substring(1, data.length - 1),
+          Java.JAVA_LANG_STRING_TYPE,
+        )
+      case Literal4(value) =>
+        value match {
+          case "true" => tt
+          case "false" => ff
+        }
+      case Literal5(_) => Null()
+    }
 
-  def convert(implicit id: VariableDeclaratorIdContext): (String, Int) = id match {
-    case VariableDeclaratorId0(name, Some(dims)) => (convert(name), convert(dims))
-    case VariableDeclaratorId0(name, None) => (convert(name), 0)
-  }
+  def convert(implicit id: VariableDeclaratorIdContext): (String, Int) =
+    id match {
+      case VariableDeclaratorId0(name, Some(dims)) =>
+        (convert(name), convert(dims))
+      case VariableDeclaratorId0(name, None) => (convert(name), 0)
+    }
 
-  def convert(implicit id: JavaIdentifierContext): String = id match {
-    case JavaIdentifier0(text) => text
-    case JavaIdentifier1(inner) => convert(inner)
-  }
+  def convert(implicit id: JavaIdentifierContext): String =
+    id match {
+      case JavaIdentifier0(text) => text
+      case JavaIdentifier1(inner) => convert(inner)
+    }
 
-  def convert(implicit decl: LangGlobalDeclContext): Seq[GlobalDeclaration[G]] = decl match {
-    case LangGlobalDecl0(typeDecl) => convert(typeDecl)
-  }
+  def convert(implicit decl: LangGlobalDeclContext): Seq[GlobalDeclaration[G]] =
+    decl match { case LangGlobalDecl0(typeDecl) => convert(typeDecl) }
 
-  def convert(implicit decl: LangClassDeclContext): Seq[ClassDeclaration[G]] = decl match {
-    case LangClassDecl0(classDecl) => convert(classDecl)
-  }
+  def convert(implicit decl: LangClassDeclContext): Seq[ClassDeclaration[G]] =
+    decl match { case LangClassDecl0(classDecl) => convert(classDecl) }
 
-  def convert(implicit stat: LangStatementContext): Statement[G] = stat match {
-    case LangStatement0(block) => convert(block)
-  }
+  def convert(implicit stat: LangStatementContext): Statement[G] =
+    stat match { case LangStatement0(block) => convert(block) }
 
-  def convert(implicit t: LangTypeContext): Type[G] = t match {
-    case LangType0(t) => convert(t)
-  }
+  def convert(implicit t: LangTypeContext): Type[G] =
+    t match { case LangType0(t) => convert(t) }
 
-  def convert(implicit e: LangExprContext): Expr[G] = e match {
-    case LangExpr0(e) => convert(e)
-  }
+  def convert(implicit e: LangExprContext): Expr[G] =
+    e match { case LangExpr0(e) => convert(e) }
 
-  def convert(implicit id: LangIdContext): String = id match {
-    case LangId0(id) => convert(id)
-  }
+  def convert(implicit id: LangIdContext): String =
+    id match { case LangId0(id) => convert(id) }
 
-  def convert(implicit n: LangConstIntContext): BigInt = n match {
-    case LangConstInt0(string) => BigInt(string)
-  }
+  def convert(implicit n: LangConstIntContext): BigInt =
+    n match { case LangConstInt0(string) => BigInt(string) }
 
   def local(ctx: ParserRuleContext, name: String): Expr[G] =
     JavaLocal(name)(blame(ctx))(origin(ctx))
 
-  def withCollector[T](collector: ContractCollector[G], f: ContractCollector[G] => T): T = {
+  def withCollector[T](
+      collector: ContractCollector[G],
+      f: ContractCollector[G] => T,
+  ): T = {
     val result = f(collector)
     collector.nodes.headOption match {
-      case Some(node) => fail(node, "This specification clause may not occur here")
+      case Some(node) =>
+        fail(node, "This specification clause may not occur here")
       case None => result
     }
   }
 
-  def withContract[T](node: Option[ValEmbedContractContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node: Option[ValEmbedContractContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withContract[T](node1: Option[ValEmbedContractContext], node2: Option[ValEmbedContractContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node1: Option[ValEmbedContractContext],
+      node2: Option[ValEmbedContractContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node1.foreach(convert(_, collector))
     node2.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withContract[T](node: Seq[ValContractClauseContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node: Seq[ValContractClauseContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withCollector[T](collector: ModifierCollector, f: ModifierCollector => T): T = {
+  def withCollector[T](
+      collector: ModifierCollector,
+      f: ModifierCollector => T,
+  ): T = {
     val result = f(collector)
     collector.nodes.headOption match {
-      case Some(node) => fail(node, "This modifier cannot be attached to this declaration")
+      case Some(node) =>
+        fail(node, "This modifier cannot be attached to this declaration")
       case None => result
     }
   }
 
-  def withModifiers[T](node: Seq[ValModifierContext], f: ModifierCollector => T): T = {
+  def withModifiers[T](
+      node: Seq[ValModifierContext],
+      f: ModifierCollector => T,
+  ): T = {
     val collector = new ModifierCollector()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withModifiers[T](node: ValEmbedModifierContext, f: ModifierCollector => T): T = {
+  def withModifiers[T](
+      node: ValEmbedModifierContext,
+      f: ModifierCollector => T,
+  ): T = {
     val collector = new ModifierCollector()
     convert(node, collector)
     withCollector(collector, f)
   }
 
-  def convert(contract: ValEmbedContractContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValEmbedContract0(blocks) => blocks.foreach(convert(_, collector))
-  }
-
-  def convert(contract: ValEmbedContractBlockContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValEmbedContractBlock0(_, clauses, _) => clauses.foreach(convert(_, collector))
-    case ValEmbedContractBlock1(clauses) => clauses.foreach(convert(_, collector))
-  }
-
-  def convert(implicit contract: ValContractClauseContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValContractClause0(_, ids, _) => collector.modifies ++= convert(ids).map((contract, _))
-    case ValContractClause1(_, ids, _) => collector.accessible ++= convert(ids).map((contract, _))
-    case ValContractClause2(_, exp, _) => collector.requires += ((contract, convert(exp)))
-    case ValContractClause3(_, exp, _) => collector.ensures += ((contract, convert(exp)))
-    case ValContractClause4(_, t, id, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName(convert(id)))
-      collector.given += ((contract, variable))
-    case ValContractClause5(_, t, id, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName(convert(id)))
-      collector.yields += ((contract, variable))
-    case ValContractClause6(_, exp, _) => collector.context_everywhere += ((contract, convert(exp)))
-    case ValContractClause7(_, exp, _) =>
-      collector.requires += ((contract, convert(exp)))
-      collector.ensures += ((contract, convert(exp)))
-    case ValContractClause8(_, exp, _) => collector.loop_invariant += ((contract, convert(exp)))
-    case ValContractClause9(_, exp, _) => collector.kernel_invariant += ((contract, convert(exp)))
-    case ValContractClause10(_, _, t, id, _, exp, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName(convert(id)))
-      collector.signals += ((contract, SignalsClause(variable, convert(exp))(OriginProvider(contract))))
-    case ValContractClause11(_, invariant, _) => collector.lock_invariant += ((contract, convert(invariant)))
-    case ValContractClause12(_, None, _) => collector.decreases += ((contract, DecreasesClauseNoRecursion()))
-    case ValContractClause12(_, Some(clause), _) => collector.decreases += ((contract, convert(clause)))
-  }
-
-  def convert(implicit clause: ValDecreasesMeasureContext): DecreasesClause[G] = clause match {
-    case ValDecreasesMeasure0(_) => DecreasesClauseAssume()
-    case ValDecreasesMeasure1(exps) => DecreasesClauseTuple(convert(exps))
-  }
+  def convert(
+      contract: ValEmbedContractContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValEmbedContract0(blocks) => blocks.foreach(convert(_, collector))
+    }
 
-  def convert(mod: ValEmbedModifierContext, collector: ModifierCollector): Unit = mod match {
-    case ValEmbedModifier0(_, mod, _) => convert(mod, collector)
-    case ValEmbedModifier1(mod) => convert(mod, collector)
-  }
+  def convert(
+      contract: ValEmbedContractBlockContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValEmbedContractBlock0(_, clauses, _) =>
+        clauses.foreach(convert(_, collector))
+      case ValEmbedContractBlock1(clauses) =>
+        clauses.foreach(convert(_, collector))
+    }
 
-  def convert(mod: ValModifierContext, collector: ModifierCollector): Unit = mod match {
-    case ValModifier0(name) => name match {
-      case "pure" => collector.pure += mod
-      case "inline" => collector.inline += mod
-      case "thread_local" => collector.threadLocal += mod
-      case "bip_annotation" => collector.bipAnnotation += mod
+  def convert(
+      implicit contract: ValContractClauseContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValContractClause0(_, ids, _) =>
+        collector.modifies ++= convert(ids).map((contract, _))
+      case ValContractClause1(_, ids, _) =>
+        collector.accessible ++= convert(ids).map((contract, _))
+      case ValContractClause2(_, exp, _) =>
+        collector.requires += ((contract, convert(exp)))
+      case ValContractClause3(_, exp, _) =>
+        collector.ensures += ((contract, convert(exp)))
+      case ValContractClause4(_, t, id, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName(convert(id)))
+        collector.given += ((contract, variable))
+      case ValContractClause5(_, t, id, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName(convert(id)))
+        collector.yields += ((contract, variable))
+      case ValContractClause6(_, exp, _) =>
+        collector.context_everywhere += ((contract, convert(exp)))
+      case ValContractClause7(_, exp, _) =>
+        collector.requires += ((contract, convert(exp)))
+        collector.ensures += ((contract, convert(exp)))
+      case ValContractClause8(_, exp, _) =>
+        collector.loop_invariant += ((contract, convert(exp)))
+      case ValContractClause9(_, exp, _) =>
+        collector.kernel_invariant += ((contract, convert(exp)))
+      case ValContractClause10(_, _, t, id, _, exp, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName(convert(id)))
+        collector.signals +=
+          ((
+            contract,
+            SignalsClause(variable, convert(exp))(OriginProvider(contract)),
+          ))
+      case ValContractClause11(_, invariant, _) =>
+        collector.lock_invariant += ((contract, convert(invariant)))
+      case ValContractClause12(_, None, _) =>
+        collector.decreases += ((contract, DecreasesClauseNoRecursion()))
+      case ValContractClause12(_, Some(clause), _) =>
+        collector.decreases += ((contract, convert(clause)))
     }
-    case ValStatic(_) => collector.static += mod
-  }
 
-  def convertEmbedWith(implicit whiff: Option[ValEmbedWithContext], inner: Expr[G]): Expr[G] = whiff match {
-    case None => inner
-    case Some(ValEmbedWith0(_, whiff, _)) => convertWith(whiff, inner)
-    case Some(ValEmbedWith1(whiff)) => convertWith(Some(whiff), inner)
-  }
+  def convert(implicit clause: ValDecreasesMeasureContext): DecreasesClause[G] =
+    clause match {
+      case ValDecreasesMeasure0(_) => DecreasesClauseAssume()
+      case ValDecreasesMeasure1(exps) => DecreasesClauseTuple(convert(exps))
+    }
 
-  def convertWith(implicit whiff: Option[ValWithContext], inner: Expr[G]): Expr[G] = whiff match {
-    case None => inner
-    case Some(whiff@ValWith0(_, stat)) => With(convert(stat), inner)(origin(whiff))
-  }
+  def convert(
+      mod: ValEmbedModifierContext,
+      collector: ModifierCollector,
+  ): Unit =
+    mod match {
+      case ValEmbedModifier0(_, mod, _) => convert(mod, collector)
+      case ValEmbedModifier1(mod) => convert(mod, collector)
+    }
 
-  def convertEmbedThen(implicit den: Option[ValEmbedThenContext], inner: Expr[G]): Expr[G] = den match {
-    case None => inner
-    case Some(ValEmbedThen0(_, den, _)) => convertThen(den, inner)
-    case Some(ValEmbedThen1(den)) => convertThen(Some(den), inner)
-  }
+  def convert(mod: ValModifierContext, collector: ModifierCollector): Unit =
+    mod match {
+      case ValModifier0(name) =>
+        name match {
+          case "pure" => collector.pure += mod
+          case "inline" => collector.inline += mod
+          case "thread_local" => collector.threadLocal += mod
+          case "bip_annotation" => collector.bipAnnotation += mod
+        }
+      case ValStatic(_) => collector.static += mod
+    }
 
-  def convertThen(implicit den: Option[ValThenContext], inner: Expr[G]): Expr[G] = den match {
-    case None => inner
-    case Some(den@ValThen0(_, stat)) => Then(inner, convert(stat))(origin(den))
-  }
+  def convertEmbedWith(
+      implicit whiff: Option[ValEmbedWithContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    whiff match {
+      case None => inner
+      case Some(ValEmbedWith0(_, whiff, _)) => convertWith(whiff, inner)
+      case Some(ValEmbedWith1(whiff)) => convertWith(Some(whiff), inner)
+    }
 
-  def convert(implicit whiff: ValEmbedWithContext): Statement[G] = whiff match {
-    case ValEmbedWith0(_, Some(whiff), _) => convert(whiff)
-    case ValEmbedWith0(_, None, _) => Block(Nil)
-    case ValEmbedWith1(whiff) => convert(whiff)
-  }
+  def convertWith(
+      implicit whiff: Option[ValWithContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    whiff match {
+      case None => inner
+      case Some(whiff @ ValWith0(_, stat)) =>
+        With(convert(stat), inner)(origin(whiff))
+    }
 
-  def convert(implicit whiff: ValWithContext): Statement[G] = whiff match {
-    case ValWith0(_, stat) => convert(stat)
-  }
+  def convertEmbedThen(
+      implicit den: Option[ValEmbedThenContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    den match {
+      case None => inner
+      case Some(ValEmbedThen0(_, den, _)) => convertThen(den, inner)
+      case Some(ValEmbedThen1(den)) => convertThen(Some(den), inner)
+    }
 
-  def convert(implicit whiff: ValEmbedThenContext): Statement[G] = whiff match {
-    case ValEmbedThen0(_, Some(whiff), _) => convert(whiff)
-    case ValEmbedThen0(_, None, _) => Block(Nil)
-    case ValEmbedThen1(whiff) => convert(whiff)
-  }
+  def convertThen(
+      implicit den: Option[ValThenContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    den match {
+      case None => inner
+      case Some(den @ ValThen0(_, stat)) =>
+        Then(inner, convert(stat))(origin(den))
+    }
 
-  def convert(implicit whiff: ValThenContext): Statement[G] = whiff match {
-    case ValThen0(_, stat) => convert(stat)
-  }
+  def convert(implicit whiff: ValEmbedWithContext): Statement[G] =
+    whiff match {
+      case ValEmbedWith0(_, Some(whiff), _) => convert(whiff)
+      case ValEmbedWith0(_, None, _) => Block(Nil)
+      case ValEmbedWith1(whiff) => convert(whiff)
+    }
 
-  def convertEmbedGiven(implicit given: Option[ValEmbedGivenContext]): Seq[(Ref[G, Variable[G]], Expr[G])] = given match {
-    case None => Nil
-    case Some(ValEmbedGiven0(_, inner, _)) => convertGiven(inner)
-    case Some(ValEmbedGiven1(inner)) => convertGiven(Some(inner))
-  }
+  def convert(implicit whiff: ValWithContext): Statement[G] =
+    whiff match { case ValWith0(_, stat) => convert(stat) }
 
-  def convertGiven(implicit given: Option[ValGivenContext]): Seq[(Ref[G, Variable[G]], Expr[G])] = given match {
-    case None => Nil
-    case Some(ValGiven0(_, _, mappings, _)) => convert(mappings)
-  }
-
-  def convert(implicit mappings: ValGivenMappingsContext): Seq[(Ref[G, Variable[G]], Expr[G])] = mappings match {
-    case ValGivenMappings0(arg, _, v) => Seq((new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)))
-    case ValGivenMappings1(arg, _, v, _, more) => (new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)) +: convert(more)
-  }
+  def convert(implicit whiff: ValEmbedThenContext): Statement[G] =
+    whiff match {
+      case ValEmbedThen0(_, Some(whiff), _) => convert(whiff)
+      case ValEmbedThen0(_, None, _) => Block(Nil)
+      case ValEmbedThen1(whiff) => convert(whiff)
+    }
 
-  def convertEmbedYields(implicit given: Option[ValEmbedYieldsContext]): Seq[(Expr[G], Ref[G, Variable[G]])] = given match {
-    case None => Nil
-    case Some(ValEmbedYields0(_, inner, _)) => convertYields(inner)
-    case Some(ValEmbedYields1(inner)) => convertYields(Some(inner))
-  }
+  def convert(implicit whiff: ValThenContext): Statement[G] =
+    whiff match { case ValThen0(_, stat) => convert(stat) }
 
-  def convertYields(implicit given: Option[ValYieldsContext]): Seq[(Expr[G], Ref[G, Variable[G]])] = given match {
-    case None => Nil
-    case Some(ValYields0(_, _, mappings, _)) => convert(mappings)
-  }
+  def convertEmbedGiven(
+      implicit given: Option[ValEmbedGivenContext]
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    given match {
+      case None => Nil
+      case Some(ValEmbedGiven0(_, inner, _)) => convertGiven(inner)
+      case Some(ValEmbedGiven1(inner)) => convertGiven(Some(inner))
+    }
 
-  def convert(implicit mappings: ValYieldsMappingsContext): Seq[(Expr[G], Ref[G, Variable[G]])] = mappings match {
-    case ValYieldsMappings0(target, _, res) => Seq((local(target, convert(target)), new UnresolvedRef[G, Variable[G]](convert(res))))
-    case ValYieldsMappings1(target, _, res, _, more) => (local(target, convert(target)), new UnresolvedRef[G, Variable[G]](convert(res))) +: convert(more)
-  }
+  def convertGiven(
+      implicit given: Option[ValGivenContext]
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    given match {
+      case None => Nil
+      case Some(ValGiven0(_, _, mappings, _)) => convert(mappings)
+    }
 
-  def convert(implicit exprs: ValExpressionListContext): Seq[Expr[G]] = exprs match {
-    case ValExpressionList0(expr) => Seq(convert(expr))
-    case ValExpressionList1(head, _, tail) => convert(head) +: convert(tail)
-  }
+  def convert(
+      implicit mappings: ValGivenMappingsContext
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    mappings match {
+      case ValGivenMappings0(arg, _, v) =>
+        Seq((new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)))
+      case ValGivenMappings1(arg, _, v, _, more) =>
+        (new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)) +:
+          convert(more)
+    }
 
-  def convert(implicit ids: ValIdListContext): Seq[String] = ids match {
-    case ValIdList0(id) => Seq(convert(id))
-    case ValIdList1(id, _, ids) => convert(id) +: convert(ids)
-  }
+  def convertEmbedYields(
+      implicit given: Option[ValEmbedYieldsContext]
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    given match {
+      case None => Nil
+      case Some(ValEmbedYields0(_, inner, _)) => convertYields(inner)
+      case Some(ValEmbedYields1(inner)) => convertYields(Some(inner))
+    }
 
-  def convert(implicit ts: ValTypeListContext): Seq[Type[G]] = ts match {
-    case ValTypeList0(t) => Seq(convert(t))
-    case ValTypeList1(t, _, ts) => convert(t) +: convert(ts)
-  }
+  def convertYields(
+      implicit given: Option[ValYieldsContext]
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    given match {
+      case None => Nil
+      case Some(ValYields0(_, _, mappings, _)) => convert(mappings)
+    }
 
-  def convert(implicit root: ParserRuleContext, impOp: ValImpOpContext, left: Expr[G], right: Expr[G]): Expr[G] = impOp match {
-    case ValImpOp0(_) => Wand(left, right)(origin(impOp))
-    case ValImpOp1(_) => Implies(left, right)(origin(impOp))
-  }
+  def convert(
+      implicit mappings: ValYieldsMappingsContext
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    mappings match {
+      case ValYieldsMappings0(target, _, res) =>
+        Seq((
+          local(target, convert(target)),
+          new UnresolvedRef[G, Variable[G]](convert(res)),
+        ))
+      case ValYieldsMappings1(target, _, res, _, more) =>
+        (
+          local(target, convert(target)),
+          new UnresolvedRef[G, Variable[G]](convert(res)),
+        ) +: convert(more)
+    }
 
-  def convert(implicit root: ParserRuleContext, andOp: ValAndOpContext, left: Expr[G], right: Expr[G]): Expr[G] = andOp match {
-    case ValAndOp0(_) => col.Star(left, right)(origin(andOp))
-  }
+  def convert(implicit exprs: ValExpressionListContext): Seq[Expr[G]] =
+    exprs match {
+      case ValExpressionList0(expr) => Seq(convert(expr))
+      case ValExpressionList1(head, _, tail) => convert(head) +: convert(tail)
+    }
 
-  def convert(implicit root: ParserRuleContext, inOp: ValInOpContext, left: Expr[G], right: Expr[G]): Expr[G] = inOp match {
-    case ValInOp0(_) => AmbiguousMember(left, right)
-  }
+  def convert(implicit ids: ValIdListContext): Seq[String] =
+    ids match {
+      case ValIdList0(id) => Seq(convert(id))
+      case ValIdList1(id, _, ids) => convert(id) +: convert(ids)
+    }
 
-  def convert(implicit root: ParserRuleContext, mulOp: ValMulOpContext, left: Expr[G], right: Expr[G]): Expr[G] = mulOp match {
-    case ValMulOp0(_) => col.RatDiv(left, right)(blame(mulOp))
-  }
+  def convert(implicit ts: ValTypeListContext): Seq[Type[G]] =
+    ts match {
+      case ValTypeList0(t) => Seq(convert(t))
+      case ValTypeList1(t, _, ts) => convert(t) +: convert(ts)
+    }
 
-  def convert(implicit root: ParserRuleContext, prependOp: ValPrependOpContext, left: Expr[G], right: Expr[G]): Expr[G] = prependOp match {
-    case ValPrependOp0(_) => Cons(left, right)
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      impOp: ValImpOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    impOp match {
+      case ValImpOp0(_) => Wand(left, right)(origin(impOp))
+      case ValImpOp1(_) => Implies(left, right)(origin(impOp))
+    }
 
-  def convert(implicit root: ParserRuleContext, postfixOp: ValPostfixContext, xs: Expr[G]): Expr[G] = postfixOp match {
-    case ValPostfix0(_, _, to, _) => Take(xs, convert(to))
-    case ValPostfix1(_, from, _, None, _) => Drop(xs, convert(from))
-    case ValPostfix1(_, from, _, Some(to), _) => Slice(xs, convert(from), convert(to))
-    case ValPostfix2(_, idx, _, v, _) => SeqUpdate(xs, convert(idx), convert(v))
-    case ValPostfix3(_, name, _, args, _) => CoalesceInstancePredicateApply(xs, new UnresolvedRef[G, InstancePredicate[G]](convert(name)), args.map(convert(_)).getOrElse(Nil), WritePerm())
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      andOp: ValAndOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    andOp match { case ValAndOp0(_) => col.Star(left, right)(origin(andOp)) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      inOp: ValInOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] = inOp match { case ValInOp0(_) => AmbiguousMember(left, right) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      mulOp: ValMulOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    mulOp match { case ValMulOp0(_) => col.RatDiv(left, right)(blame(mulOp)) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      prependOp: ValPrependOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] = prependOp match { case ValPrependOp0(_) => Cons(left, right) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      postfixOp: ValPostfixContext,
+      xs: Expr[G],
+  ): Expr[G] =
+    postfixOp match {
+      case ValPostfix0(_, _, to, _) => Take(xs, convert(to))
+      case ValPostfix1(_, from, _, None, _) => Drop(xs, convert(from))
+      case ValPostfix1(_, from, _, Some(to), _) =>
+        Slice(xs, convert(from), convert(to))
+      case ValPostfix2(_, idx, _, v, _) =>
+        SeqUpdate(xs, convert(idx), convert(v))
+      case ValPostfix3(_, name, _, args, _) =>
+        CoalesceInstancePredicateApply(
+          xs,
+          new UnresolvedRef[G, InstancePredicate[G]](convert(name)),
+          args.map(convert(_)).getOrElse(Nil),
+          WritePerm(),
+        )
+    }
 
-  def convert(implicit root: ParserRuleContext, prefixOp: ValPrefixContext, xs: Expr[G]): Expr[G] = prefixOp match {
-    case ValScale(_, scale, _) => Scale(convert(scale), xs)(blame(prefixOp))
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      prefixOp: ValPrefixContext,
+      xs: Expr[G],
+  ): Expr[G] =
+    prefixOp match {
+      case ValScale(_, scale, _) => Scale(convert(scale), xs)(blame(prefixOp))
+    }
 
-  def convert(implicit block: ValEmbedStatementBlockContext): Statement[G] = block match {
-    case ValEmbedStatementBlock0(_, stats, _) => Block(stats.map(convert(_)))
-    case ValEmbedStatementBlock1(stats) => Block(stats.map(convert(_)))
-    case ValEmbedStatementBlock2(_, _, _, stat) => Extract(convert(stat))
-    case ValEmbedStatementBlock3(_, _, clauses, _, _, body, _, _, _) =>
-      withContract(clauses, contract => {
-        FramedProof(
-          AstBuildHelpers.foldStar(contract.consume(contract.requires)),
-          Block(body.map(convert(_))),
-          AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
-        )(blame(block))
-      })
-  }
+  def convert(implicit block: ValEmbedStatementBlockContext): Statement[G] =
+    block match {
+      case ValEmbedStatementBlock0(_, stats, _) => Block(stats.map(convert(_)))
+      case ValEmbedStatementBlock1(stats) => Block(stats.map(convert(_)))
+      case ValEmbedStatementBlock2(_, _, _, stat) => Extract(convert(stat))
+      case ValEmbedStatementBlock3(_, _, clauses, _, _, body, _, _, _) =>
+        withContract(
+          clauses,
+          contract => {
+            FramedProof(
+              AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+              Block(body.map(convert(_))),
+              AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
+            )(blame(block))
+          },
+        )
+    }
 
-  def convert(implicit stat: ValStatementContext): Statement[G] = stat match {
-    case ValPackage(_, expr, innerStat) => WandPackage(convert(expr), convert(innerStat))(blame(stat))
-    case ValApplyWand(_, wand, _) => WandApply(convert(wand))(blame(stat))
-    case ValFold(_, predicate, _) =>
-      Fold(convert(predicate))(blame(stat))
-    case ValUnfold(_, predicate, _) =>
-      Unfold(convert(predicate))(blame(stat))
-    case ValOpen(_, _, _) => ??(stat)
-    case ValClose(_, _, _) => ??(stat)
-    case ValAssert(_, assn, _) => Assert(convert(assn))(blame(stat))
-    case ValAssume(_, assn, _) => Assume(convert(assn))
-    case ValInhale(_, resource, _) => Inhale(convert(resource))
-    case ValExhale(_, resource, _) => Exhale(convert(resource))(blame(stat))
-    case ValLabel(_, label, _) =>
-      Label(new LabelDecl()(origin(stat).sourceName(convert(label))), Block(Nil))
-    case ValRefute(_, assn, _) => Refute(convert(assn))(blame(stat))
-    case ValWitness(_, _, _) => ??(stat)
-    case ValGhost(_, stat) => convert(stat)
-    case ValSend(_, name, _, delta, _, resource, _) =>
-      Send(new SendDecl()(origin(stat).sourceName(convert(name))), convert(delta), convert(resource))(blame(stat))
-    case ValRecv(_, name, _) =>
-      Recv(new UnresolvedRef[G, SendDecl[G]](convert(name)))
-    case ValTransfer(_, _, _) => ??(stat)
-    case ValCslSubject(_, _, _) => ??(stat) // FIXME PB: csl_subject seems to be used
-    case ValSpecIgnoreStart(_, _) => SpecIgnoreEnd()
-    case ValSpecIgnoreEnd(_, _) => SpecIgnoreStart()
-    case ValActionModel(_, _, model, _, perm, _, after, _, action, _, impl) =>
-      ModelDo(convert(model), convert(perm), convert(after), convert(action), impl match {
-        case ValActionImpl0(_) => Block(Nil)
-        case ValActionImpl1(inner) => convert(inner)
-      })
-    case ValAtomic(_, _, invariant, _, body) =>
-      ParAtomic(Seq(new UnresolvedRef[G, ParInvariantDecl[G]](convert(invariant))), convert(body))(blame(stat))
-    case ValCommit(_, obj, _) =>
-      Commit(convert(obj))(blame(stat))
-    case ValExtract(_, body) =>
-      Extract(convert(body))
-    case ValFrame(_, clauses, body) =>
-      withContract(clauses, contract => {
-        FramedProof(
-          AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+  def convert(implicit stat: ValStatementContext): Statement[G] =
+    stat match {
+      case ValPackage(_, expr, innerStat) =>
+        WandPackage(convert(expr), convert(innerStat))(blame(stat))
+      case ValApplyWand(_, wand, _) => WandApply(convert(wand))(blame(stat))
+      case ValFold(_, predicate, _) => Fold(convert(predicate))(blame(stat))
+      case ValUnfold(_, predicate, _) => Unfold(convert(predicate))(blame(stat))
+      case ValOpen(_, _, _) => ??(stat)
+      case ValClose(_, _, _) => ??(stat)
+      case ValAssert(_, assn, _) => Assert(convert(assn))(blame(stat))
+      case ValAssume(_, assn, _) => Assume(convert(assn))
+      case ValInhale(_, resource, _) => Inhale(convert(resource))
+      case ValExhale(_, resource, _) => Exhale(convert(resource))(blame(stat))
+      case ValLabel(_, label, _) =>
+        Label(
+          new LabelDecl()(origin(stat).sourceName(convert(label))),
+          Block(Nil),
+        )
+      case ValRefute(_, assn, _) => Refute(convert(assn))(blame(stat))
+      case ValWitness(_, _, _) => ??(stat)
+      case ValGhost(_, stat) => convert(stat)
+      case ValSend(_, name, _, delta, _, resource, _) =>
+        Send(
+          new SendDecl()(origin(stat).sourceName(convert(name))),
+          convert(delta),
+          convert(resource),
+        )(blame(stat))
+      case ValRecv(_, name, _) =>
+        Recv(new UnresolvedRef[G, SendDecl[G]](convert(name)))
+      case ValTransfer(_, _, _) => ??(stat)
+      case ValCslSubject(_, _, _) =>
+        ??(stat) // FIXME PB: csl_subject seems to be used
+      case ValSpecIgnoreStart(_, _) => SpecIgnoreEnd()
+      case ValSpecIgnoreEnd(_, _) => SpecIgnoreStart()
+      case ValActionModel(_, _, model, _, perm, _, after, _, action, _, impl) =>
+        ModelDo(
+          convert(model),
+          convert(perm),
+          convert(after),
+          convert(action),
+          impl match {
+            case ValActionImpl0(_) => Block(Nil)
+            case ValActionImpl1(inner) => convert(inner)
+          },
+        )
+      case ValAtomic(_, _, invariant, _, body) =>
+        ParAtomic(
+          Seq(new UnresolvedRef[G, ParInvariantDecl[G]](convert(invariant))),
           convert(body),
-          AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
         )(blame(stat))
-      })
-  }
+      case ValCommit(_, obj, _) => Commit(convert(obj))(blame(stat))
+      case ValExtract(_, body) => Extract(convert(body))
+      case ValFrame(_, clauses, body) =>
+        withContract(
+          clauses,
+          contract => {
+            FramedProof(
+              AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+              convert(body),
+              AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
+            )(blame(stat))
+          },
+        )
+    }
 
-  def convert(implicit block: ValBlockContext): Seq[Statement[G]] = block match {
-    case ValBlock0(_, stats, _) => stats.map(convert(_))
-  }
+  def convert(implicit block: ValBlockContext): Seq[Statement[G]] =
+    block match { case ValBlock0(_, stats, _) => stats.map(convert(_)) }
 
-  def convert(implicit arg: ValArgContext): Variable[G] = arg match {
-    case ValArg0(t, id) => new Variable(convert(t))(origin(arg).sourceName(convert(id)))
-  }
+  def convert(implicit arg: ValArgContext): Variable[G] =
+    arg match {
+      case ValArg0(t, id) =>
+        new Variable(convert(t))(origin(arg).sourceName(convert(id)))
+    }
 
-  def convert(implicit args: ValArgListContext): Seq[Variable[G]] = args match {
-    case ValArgList0(arg) => Seq(convert(arg))
-    case ValArgList1(arg, _, args) => convert(arg) +: convert(args)
-  }
+  def convert(implicit args: ValArgListContext): Seq[Variable[G]] =
+    args match {
+      case ValArgList0(arg) => Seq(convert(arg))
+      case ValArgList1(arg, _, args) => convert(arg) +: convert(args)
+    }
 
-  def convert(implicit decl: ValEmbedGlobalDeclarationBlockContext): Seq[GlobalDeclaration[G]] = decl match {
-    case ValEmbedGlobalDeclarationBlock0(_, globals, _) => globals.flatMap(convert(_))
-    case ValEmbedGlobalDeclarationBlock1(globals) => globals.flatMap(convert(_))
-  }
+  def convert(
+      implicit decl: ValEmbedGlobalDeclarationBlockContext
+  ): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case ValEmbedGlobalDeclarationBlock0(_, globals, _) =>
+        globals.flatMap(convert(_))
+      case ValEmbedGlobalDeclarationBlock1(globals) =>
+        globals.flatMap(convert(_))
+    }
 
-  def convert(implicit decl: ValGlobalDeclarationContext): Seq[GlobalDeclaration[G]] = decl match {
-    case ValAxiom(_, name, _, axiom, _) =>
-      Seq(new SimplificationRule(convert(axiom))(origin(decl).sourceName(convert(name))))
-    case ValPredicate(modifiers, _, name, _, args, _, definition) =>
-      withModifiers(modifiers, mods =>
-        Seq(new Predicate(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          mods.consume(mods.threadLocal), mods.consume(mods.inline))
-        (origin(decl).sourceName(convert(name)))))
-    case ValFunction(contract, modifiers, _, t, name, typeArgs, _, args, _, definition) =>
-      Seq(withContract(contract, c =>
-        withModifiers(modifiers, m => {
-          val namedOrigin = origin(decl).sourceName(convert(name))
-          new Function(
-            convert(t),
-            args.map(convert(_)).getOrElse(Nil),
+  def convert(
+      implicit decl: ValGlobalDeclarationContext
+  ): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case ValAxiom(_, name, _, axiom, _) =>
+        Seq(new SimplificationRule(convert(axiom))(
+          origin(decl).sourceName(convert(name))
+        ))
+      case ValPredicate(modifiers, _, name, _, args, _, definition) =>
+        withModifiers(
+          modifiers,
+          mods =>
+            Seq(
+              new Predicate(
+                args.map(convert(_)).getOrElse(Nil),
+                convert(definition),
+                mods.consume(mods.threadLocal),
+                mods.consume(mods.inline),
+              )(origin(decl).sourceName(convert(name)))
+            ),
+        )
+      case ValFunction(
+            contract,
+            modifiers,
+            _,
+            t,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c =>
+            withModifiers(
+              modifiers,
+              m => {
+                val namedOrigin = origin(decl).sourceName(convert(name))
+                new Function(
+                  convert(t),
+                  args.map(convert(_)).getOrElse(Nil),
+                  typeArgs.map(convert(_)).getOrElse(Nil),
+                  convert(definition),
+                  c.consumeApplicableContract(blame(decl)),
+                  m.consume(m.inline),
+                )(blame(decl))(namedOrigin)
+              },
+            ),
+        ))
+      case ValModel(_, name, _, decls, _) =>
+        Seq(new Model(decls.flatMap(convert(_)))(
+          origin(decl).sourceName(convert(name))
+        ))
+      case ValGhostDecl(_, inner) => convert(inner)
+      case ValAdtDecl(_, name, typeArgs, _, decls, _) =>
+        Seq(
+          new AxiomaticDataType(
+            decls.map(convert(_)),
             typeArgs.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)),
-            m.consume(m.inline))(blame(decl))(namedOrigin)
-        })
-      ))
-    case ValModel(_, name, _, decls, _) =>
-      Seq(new Model(decls.flatMap(convert(_)))(origin(decl).sourceName(convert(name))))
-    case ValGhostDecl(_, inner) =>
-      convert(inner)
-    case ValAdtDecl(_, name, typeArgs, _, decls, _) =>
-      Seq(new AxiomaticDataType(decls.map(convert(_)), typeArgs.map(convert(_)).getOrElse(Nil))(
-        origin(decl).sourceName(convert(name))))
-  }
+          )(origin(decl).sourceName(convert(name)))
+        )
+    }
 
-  def convert(implicit decl: ValEmbedClassDeclarationBlockContext): Seq[ClassDeclaration[G]] = decl match {
-    case ValEmbedClassDeclarationBlock0(_, decls, _) => decls.flatMap(convert(_, x => x))
-    case ValEmbedClassDeclarationBlock1(decls) => decls.flatMap(convert(_, x => x))
-  }
+  def convert(
+      implicit decl: ValEmbedClassDeclarationBlockContext
+  ): Seq[ClassDeclaration[G]] =
+    decl match {
+      case ValEmbedClassDeclarationBlock0(_, decls, _) =>
+        decls.flatMap(convert(_, x => x))
+      case ValEmbedClassDeclarationBlock1(decls) =>
+        decls.flatMap(convert(_, x => x))
+    }
 
-  def convert[T](implicit decl: ValClassDeclarationContext, transform: ClassDeclaration[G] => T): Seq[T] = decl match {
-    case ValInstancePredicate(modifiers, _, name, _, args, _, definition) =>
-      Seq(withModifiers(modifiers, mods => {
-        transform(new InstancePredicate(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          mods.consume(mods.threadLocal), mods.consume(mods.inline))(
-          origin(decl).sourceName(convert(name))))
-      }))
-    case ValInstanceFunction(contract, modifiers, _, t, name, typeArgs, _, args, _, definition) =>
-      Seq(withContract(contract, c => {
-        withModifiers(modifiers, m => {
-          transform(new InstanceFunction(
-            convert(t),
-            args.map(convert(_)).getOrElse(Nil),
-            typeArgs.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)), m.consume(m.inline))(
-            blame(decl))(
-            origin(decl).sourceName(convert(name))))
-        })
-      }))
-    case ValInstanceGhostDecl(_, decl) => convert(decl).map(transform)
-    case ValInstanceOperatorFunction(contract, modifiers, "pure", t, name, "(", args, ")", definition) =>
-      Seq(withContract(contract, c => {
-        withModifiers(modifiers, m => {
-          transform(new InstanceOperatorFunction(
-            convert(t),
-            convert(name),
-            args.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)),
-            m.consume(m.inline),
-            m.consume(m.threadLocal)
-          )(blame(decl)))
-        })
-      }))
-    case ValInstanceOperatorMethod(contract, modifiers, t, name, "(", args, ")", definition) =>
-      Seq(withContract(contract, c => {
-        withModifiers(modifiers, m => {
-          transform(new InstanceOperatorMethod(
-            convert(t),
-            convert(name),
-            args.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)),
-            m.consume(m.inline),
-            m.consume(m.pure)
-          )(blame(decl)))
-        })
-      }))
-  }
+  def convert[T](
+      implicit decl: ValClassDeclarationContext,
+      transform: ClassDeclaration[G] => T,
+  ): Seq[T] =
+    decl match {
+      case ValInstancePredicate(modifiers, _, name, _, args, _, definition) =>
+        Seq(withModifiers(
+          modifiers,
+          mods => {
+            transform(
+              new InstancePredicate(
+                args.map(convert(_)).getOrElse(Nil),
+                convert(definition),
+                mods.consume(mods.threadLocal),
+                mods.consume(mods.inline),
+              )(origin(decl).sourceName(convert(name)))
+            )
+          },
+        ))
+      case ValInstanceFunction(
+            contract,
+            modifiers,
+            _,
+            t,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c => {
+            withModifiers(
+              modifiers,
+              m => {
+                transform(
+                  new InstanceFunction(
+                    convert(t),
+                    args.map(convert(_)).getOrElse(Nil),
+                    typeArgs.map(convert(_)).getOrElse(Nil),
+                    convert(definition),
+                    c.consumeApplicableContract(blame(decl)),
+                    m.consume(m.inline),
+                  )(blame(decl))(origin(decl).sourceName(convert(name)))
+                )
+              },
+            )
+          },
+        ))
+      case ValInstanceGhostDecl(_, decl) => convert(decl).map(transform)
+      case ValInstanceOperatorFunction(
+            contract,
+            modifiers,
+            "pure",
+            t,
+            name,
+            "(",
+            args,
+            ")",
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c => {
+            withModifiers(
+              modifiers,
+              m => {
+                transform(
+                  new InstanceOperatorFunction(
+                    convert(t),
+                    convert(name),
+                    args.map(convert(_)).getOrElse(Nil),
+                    convert(definition),
+                    c.consumeApplicableContract(blame(decl)),
+                    m.consume(m.inline),
+                    m.consume(m.threadLocal),
+                  )(blame(decl))
+                )
+              },
+            )
+          },
+        ))
+      case ValInstanceOperatorMethod(
+            contract,
+            modifiers,
+            t,
+            name,
+            "(",
+            args,
+            ")",
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c => {
+            withModifiers(
+              modifiers,
+              m => {
+                transform(
+                  new InstanceOperatorMethod(
+                    convert(t),
+                    convert(name),
+                    args.map(convert(_)).getOrElse(Nil),
+                    convert(definition),
+                    c.consumeApplicableContract(blame(decl)),
+                    m.consume(m.inline),
+                    m.consume(m.pure),
+                  )(blame(decl))
+                )
+              },
+            )
+          },
+        ))
+    }
 
-  def convert(implicit operator: ValOperatorNameContext): Operator[G] = operator match {
-    case ValOperatorName0("+") => OperatorLeftPlus()
-    case ValOperatorName1(id, "+") if convert(id) == "right" => OperatorRightPlus()
-  }
+  def convert(implicit operator: ValOperatorNameContext): Operator[G] =
+    operator match {
+      case ValOperatorName0("+") => OperatorLeftPlus()
+      case ValOperatorName1(id, "+") if convert(id) == "right" =>
+        OperatorRightPlus()
+    }
 
-  def convert(implicit decl: ValModelDeclarationContext): Seq[ModelDeclaration[G]] = decl match {
-    case ValModelField(t, name, _) =>
-      convert(name).map(name => {
-        new ModelField(convert(t))(origin(decl).sourceName(name))
-      })
-    case ValModelProcess(contract, _, name, _, args, _, _, definition, _) =>
-      Seq(withContract(contract, c => {
-        new ModelProcess(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          AstBuildHelpers.foldAnd(c.consume(c.requires)), AstBuildHelpers.foldAnd(c.consume(c.ensures)),
-          c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)), c.consume(c.accessible).map(new UnresolvedRef[G, ModelField[G]](_)))(
-          blame(decl))(origin(decl).sourceName(convert(name)))
-      }))
-    case ValModelAction(contract, _, name, _, args, _, _) =>
-      Seq(withContract(contract, c => {
-        new ModelAction(args.map(convert(_)).getOrElse(Nil),
-          AstBuildHelpers.foldAnd(c.consume(c.requires)), AstBuildHelpers.foldAnd(c.consume(c.ensures)),
-          c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)), c.consume(c.accessible).map(new UnresolvedRef[G, ModelField[G]](_)))(
-          origin(decl).sourceName(convert(name)))
-      }))
-  }
+  def convert(
+      implicit decl: ValModelDeclarationContext
+  ): Seq[ModelDeclaration[G]] =
+    decl match {
+      case ValModelField(t, name, _) =>
+        convert(name).map(name => {
+          new ModelField(convert(t))(origin(decl).sourceName(name))
+        })
+      case ValModelProcess(contract, _, name, _, args, _, _, definition, _) =>
+        Seq(withContract(
+          contract,
+          c => {
+            new ModelProcess(
+              args.map(convert(_)).getOrElse(Nil),
+              convert(definition),
+              AstBuildHelpers.foldAnd(c.consume(c.requires)),
+              AstBuildHelpers.foldAnd(c.consume(c.ensures)),
+              c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)),
+              c.consume(c.accessible)
+                .map(new UnresolvedRef[G, ModelField[G]](_)),
+            )(blame(decl))(origin(decl).sourceName(convert(name)))
+          },
+        ))
+      case ValModelAction(contract, _, name, _, args, _, _) =>
+        Seq(withContract(
+          contract,
+          c => {
+            new ModelAction(
+              args.map(convert(_)).getOrElse(Nil),
+              AstBuildHelpers.foldAnd(c.consume(c.requires)),
+              AstBuildHelpers.foldAnd(c.consume(c.ensures)),
+              c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)),
+              c.consume(c.accessible)
+                .map(new UnresolvedRef[G, ModelField[G]](_)),
+            )(origin(decl).sourceName(convert(name)))
+          },
+        ))
+    }
 
-  def convert(implicit ts: ValTypeVarsContext): Seq[Variable[G]] = ts match {
-    case ValTypeVars0(_, names, _) =>
-      convert(names).map(name => new Variable(TType(TAnyValue()))(origin(ts).sourceName(name)))
-  }
+  def convert(implicit ts: ValTypeVarsContext): Seq[Variable[G]] =
+    ts match {
+      case ValTypeVars0(_, names, _) =>
+        convert(names).map(name =>
+          new Variable(TType(TAnyValue()))(origin(ts).sourceName(name))
+        )
+    }
 
-  def convert(implicit decl: ValAdtDeclarationContext): ADTDeclaration[G] = decl match {
-    case ValAdtAxiom(_, ax, _) => new ADTAxiom(convert(ax))
-    case ValAdtFunction(_, returnType, name, _, args, _, _) =>
-      new ADTFunction(args.map(convert(_)).getOrElse(Nil), convert(returnType))(
-        origin(decl).sourceName(convert(name)))
-  }
+  def convert(implicit decl: ValAdtDeclarationContext): ADTDeclaration[G] =
+    decl match {
+      case ValAdtAxiom(_, ax, _) => new ADTAxiom(convert(ax))
+      case ValAdtFunction(_, returnType, name, _, args, _, _) =>
+        new ADTFunction(
+          args.map(convert(_)).getOrElse(Nil),
+          convert(returnType),
+        )(origin(decl).sourceName(convert(name)))
+    }
 
-  def convert(implicit definition: ValPureDefContext): Option[Expr[G]] = definition match {
-    case ValPureAbstractBody(_) => None
-    case ValPureBody(_, expr, _) => Some(convert(expr))
-  }
+  def convert(implicit definition: ValPureDefContext): Option[Expr[G]] =
+    definition match {
+      case ValPureAbstractBody(_) => None
+      case ValPureBody(_, expr, _) => Some(convert(expr))
+    }
 
-  def convert(implicit definition: ValImpureDefContext): Option[Statement[G]] = definition match {
-    case ValImpureAbstractBody(_) => None
-    case ValImpureBody(statement) => Some(convert(statement))
-  }
+  def convert(implicit definition: ValImpureDefContext): Option[Statement[G]] =
+    definition match {
+      case ValImpureAbstractBody(_) => None
+      case ValImpureBody(statement) => Some(convert(statement))
+    }
 
-  def convert(implicit t: ValTypeContext): Type[G] = t match {
-    case ValPrimaryType(name) => name match {
-      case "resource" => TResourceVal()
-      case "process" => TProcess()
-      case "frac" => TFraction()
-      case "zfrac" => TZFraction()
-      case "rational" => TRational()
-      case "bool" => TBool()
-      case "ref" => TRef()
-      case "any" => TAnyValue()
-      case "nothing" => TNothing()
-      case "string" => TString()
-    }
-    case ValSeqType(_, _, element, _) => TSeq(convert(element))
-    case ValSetType(_, _, element, _) => TSet(convert(element))
-    case ValVectorType(_, _, element, _, size, _) => TVector(convert(size), convert(element))()
-    case ValBagType(_, _, element, _) => TBag(convert(element))
-    case ValOptionType(_, _, element, _) => TOption(convert(element))
-    case ValMapType(_, _, key, _, value, _) => TMap(convert(key), convert(value))
-    case ValTupleType(_, _, t1, _, t2, _) => TTuple(Seq(convert(t1), convert(t2)))
-    case ValPointerType(_, _, element, _) => TPointer(convert(element))
-    case ValTypeType(_, _, element, _) => TType(convert(element))
-    case ValEitherType(_, _, left, _, right, _) => TEither(convert(left), convert(right))
-  }
+  def convert(implicit t: ValTypeContext): Type[G] =
+    t match {
+      case ValPrimaryType(name) =>
+        name match {
+          case "resource" => TResourceVal()
+          case "process" => TProcess()
+          case "frac" => TFraction()
+          case "zfrac" => TZFraction()
+          case "rational" => TRational()
+          case "bool" => TBool()
+          case "ref" => TRef()
+          case "any" => TAnyValue()
+          case "nothing" => TNothing()
+          case "string" => TString()
+        }
+      case ValSeqType(_, _, element, _) => TSeq(convert(element))
+      case ValSetType(_, _, element, _) => TSet(convert(element))
+      case ValVectorType(_, _, element, _, size, _) =>
+        TVector(convert(size), convert(element))()
+      case ValBagType(_, _, element, _) => TBag(convert(element))
+      case ValOptionType(_, _, element, _) => TOption(convert(element))
+      case ValMapType(_, _, key, _, value, _) =>
+        TMap(convert(key), convert(value))
+      case ValTupleType(_, _, t1, _, t2, _) =>
+        TTuple(Seq(convert(t1), convert(t2)))
+      case ValPointerType(_, _, element, _) => TPointer(convert(element))
+      case ValTypeType(_, _, element, _) => TType(convert(element))
+      case ValEitherType(_, _, left, _, right, _) =>
+        TEither(convert(left), convert(right))
+    }
 
-  def convert(implicit e: ValPrimarySeqContext): Expr[G] = e match {
-    case ValCardinality(_, xs, _) => Size(convert(xs))
-    case ValArrayValues(_, _, a, _, from, _, to, _) => Values(convert(a), convert(from), convert(to))(blame(e))
-  }
+  def convert(implicit e: ValPrimarySeqContext): Expr[G] =
+    e match {
+      case ValCardinality(_, xs, _) => Size(convert(xs))
+      case ValArrayValues(_, _, a, _, from, _, to, _) =>
+        Values(convert(a), convert(from), convert(to))(blame(e))
+    }
 
-  def convert(implicit e: ValPrimaryOptionContext): Expr[G] = e match {
-    case ValSome(_, _, v, _) => OptSome(convert(v))
-  }
+  def convert(implicit e: ValPrimaryOptionContext): Expr[G] =
+    e match { case ValSome(_, _, v, _) => OptSome(convert(v)) }
 
-  def convert(implicit e: ValPrimaryEitherContext): Expr[G] = e match {
-    case ValLeft(_, _, inner, _) => EitherLeft(convert(inner))
-    case ValRight(_, _, inner, _) => EitherRight(convert(inner))
-  }
+  def convert(implicit e: ValPrimaryEitherContext): Expr[G] =
+    e match {
+      case ValLeft(_, _, inner, _) => EitherLeft(convert(inner))
+      case ValRight(_, _, inner, _) => EitherRight(convert(inner))
+    }
 
   // valsetcompselectors
-  def convert(implicit exprs: ValMapPairsContext): Seq[(Expr[G], Expr[G])] = exprs match {
-    case ValMapPairs0(k, _, v) => Seq((convert(k), convert(v)))
-    case ValMapPairs1(k, _, v, _, tail) => (convert(k), convert(v)) +: convert(tail)
-  }
+  def convert(implicit exprs: ValMapPairsContext): Seq[(Expr[G], Expr[G])] =
+    exprs match {
+      case ValMapPairs0(k, _, v) => Seq((convert(k), convert(v)))
+      case ValMapPairs1(k, _, v, _, tail) =>
+        (convert(k), convert(v)) +: convert(tail)
+    }
 
-  def convert(implicit e: ValPrimaryCollectionConstructorContext): Expr[G] = e match {
-    case ValTypedLiteralSeq(_, _, t, _, _, exprs, _) => LiteralSeq(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralSet(_, _, t, _, _, exprs, _) => LiteralSet(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralVector(_, _, t, _, _, exprs, _) => LiteralVector(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValSetComprehension(_, _, t, _, _, value, _, selectors, _, something, _) => ??(e)
-    case ValTypedLiteralBag(_, _, t, _, _, exprs, _) => LiteralBag(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralMap(_, _, key, _, value, _, _, pairs, _) => LiteralMap(convert(key), convert(value), pairs.map(convert(_)).getOrElse(Nil))
-    case ValTypedTuple(_, _, t1, _, t2, _, _, v1, _, v2, _) =>
-      LiteralTuple(Seq(convert(t1), convert(t2)), Seq(convert(v1), convert(v2)))
-    case ValLiteralSeq(_, exprs, _) => UntypedLiteralSeq(convert(exprs))
-    case ValLiteralSet(_, exprs, _) => UntypedLiteralSet(convert(exprs))
-    case ValLiteralBag(_, exprs, _) => UntypedLiteralBag(convert(exprs))
-    case ValEmptySeq(_, t, _) => LiteralSeq(convert(t), Nil)
-    case ValEmptySet(_, t, _) => LiteralSet(convert(t), Nil)
-    case ValEmptyBag(_, t, _) => LiteralBag(convert(t), Nil)
-    case ValRange(_, from, _, to, _) => Range(convert(from), convert(to))
-    case ValRangeSet(_, from, _, to, _) => RangeSet(convert(from), convert(to))
-  }
+  def convert(implicit e: ValPrimaryCollectionConstructorContext): Expr[G] =
+    e match {
+      case ValTypedLiteralSeq(_, _, t, _, _, exprs, _) =>
+        LiteralSeq(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralSet(_, _, t, _, _, exprs, _) =>
+        LiteralSet(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralVector(_, _, t, _, _, exprs, _) =>
+        LiteralVector(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValSetComprehension(
+            _,
+            _,
+            t,
+            _,
+            _,
+            value,
+            _,
+            selectors,
+            _,
+            something,
+            _,
+          ) =>
+        ??(e)
+      case ValTypedLiteralBag(_, _, t, _, _, exprs, _) =>
+        LiteralBag(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralMap(_, _, key, _, value, _, _, pairs, _) =>
+        LiteralMap(
+          convert(key),
+          convert(value),
+          pairs.map(convert(_)).getOrElse(Nil),
+        )
+      case ValTypedTuple(_, _, t1, _, t2, _, _, v1, _, v2, _) =>
+        LiteralTuple(
+          Seq(convert(t1), convert(t2)),
+          Seq(convert(v1), convert(v2)),
+        )
+      case ValLiteralSeq(_, exprs, _) => UntypedLiteralSeq(convert(exprs))
+      case ValLiteralSet(_, exprs, _) => UntypedLiteralSet(convert(exprs))
+      case ValLiteralBag(_, exprs, _) => UntypedLiteralBag(convert(exprs))
+      case ValEmptySeq(_, t, _) => LiteralSeq(convert(t), Nil)
+      case ValEmptySet(_, t, _) => LiteralSet(convert(t), Nil)
+      case ValEmptyBag(_, t, _) => LiteralBag(convert(t), Nil)
+      case ValRange(_, from, _, to, _) => Range(convert(from), convert(to))
+      case ValRangeSet(_, from, _, to, _) =>
+        RangeSet(convert(from), convert(to))
+    }
 
-  def convert(implicit e: ValPrimaryPermissionContext): Expr[G] = e match {
-    case ValCurPerm(_, _, loc, _) => CurPerm(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValPerm(_, _, loc, _, perm, _) => Perm(AmbiguousLocation(convert(loc))(blame(e)), convert(perm))
-    case ValValue(_, _, loc, _) => Value(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValAutoValue(_, _, loc, _) => AutoValue(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValPointsTo(_, _, loc, _, perm, _, v, _) => PointsTo(AmbiguousLocation(convert(loc))(blame(e)), convert(perm), convert(v))
-    case ValHPerm(_, _, loc, _, perm, _) => ModelPerm(convert(loc), convert(perm))
-    case ValAPerm(_, _, loc, _, perm, _) => ActionPerm(convert(loc), convert(perm))
-    case ValArrayPerm(_, _, arr, _, i, _, step, _, count, _, perm, _) => ??(e)
-    case ValMatrix(_, _, m, _, dim1, _, dim2, _) => ValidMatrix(convert(m), convert(dim1), convert(dim2))
-    case ValArray(_, _, arr, _, dim, _) => ValidArray(convert(arr), convert(dim))
-    case ValPointer(_, _, ptr, _, n, _, perm, _) => PermPointer(convert(ptr), convert(n), convert(perm))
-    case ValPointerIndex(_, _, ptr, _, idx, _, perm, _) => PermPointerIndex(convert(ptr), convert(idx), convert(perm))
-    case ValPointerBlockLength(_, _, ptr, _) => PointerBlockLength(convert(ptr))(blame(e))
-    case ValPointerBlockOffset(_, _, ptr, _) => PointerBlockOffset(convert(ptr))(blame(e))
-    case ValPointerLength(_, _, ptr, _) => PointerLength(convert(ptr))(blame(e))
-    case ValPolarityDependent(_, _, onInhale, _, onExhale, _) => PolarityDependent(convert(onInhale), convert(onExhale))
-  }
+  def convert(implicit e: ValPrimaryPermissionContext): Expr[G] =
+    e match {
+      case ValCurPerm(_, _, loc, _) =>
+        CurPerm(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValPerm(_, _, loc, _, perm, _) =>
+        Perm(AmbiguousLocation(convert(loc))(blame(e)), convert(perm))
+      case ValValue(_, _, loc, _) =>
+        Value(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValAutoValue(_, _, loc, _) =>
+        AutoValue(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValPointsTo(_, _, loc, _, perm, _, v, _) =>
+        PointsTo(
+          AmbiguousLocation(convert(loc))(blame(e)),
+          convert(perm),
+          convert(v),
+        )
+      case ValHPerm(_, _, loc, _, perm, _) =>
+        ModelPerm(convert(loc), convert(perm))
+      case ValAPerm(_, _, loc, _, perm, _) =>
+        ActionPerm(convert(loc), convert(perm))
+      case ValArrayPerm(_, _, arr, _, i, _, step, _, count, _, perm, _) => ??(e)
+      case ValMatrix(_, _, m, _, dim1, _, dim2, _) =>
+        ValidMatrix(convert(m), convert(dim1), convert(dim2))
+      case ValArray(_, _, arr, _, dim, _) =>
+        ValidArray(convert(arr), convert(dim))
+      case ValPointer(_, _, ptr, _, n, _, perm, _) =>
+        PermPointer(convert(ptr), convert(n), convert(perm))
+      case ValPointerIndex(_, _, ptr, _, idx, _, perm, _) =>
+        PermPointerIndex(convert(ptr), convert(idx), convert(perm))
+      case ValPointerBlockLength(_, _, ptr, _) =>
+        PointerBlockLength(convert(ptr))(blame(e))
+      case ValPointerBlockOffset(_, _, ptr, _) =>
+        PointerBlockOffset(convert(ptr))(blame(e))
+      case ValPointerLength(_, _, ptr, _) =>
+        PointerLength(convert(ptr))(blame(e))
+      case ValPolarityDependent(_, _, onInhale, _, onExhale, _) =>
+        PolarityDependent(convert(onInhale), convert(onExhale))
+    }
 
-  def convert(implicit v: ValBindingContext): (Variable[G], Seq[Expr[G]]) = v match {
-    case ValRangeBinding(t, id, _, from, _, to) =>
-      val variable = new Variable[G](convert(t))(origin(id).sourceName(convert(id)))
-      val cond = SeqMember[G](Local(variable.ref), Range(convert(from), convert(to)))
-      (variable, Seq(cond))
-    case ValNormalBinding(arg) =>
-      (convert(arg), Nil)
-  }
+  def convert(implicit v: ValBindingContext): (Variable[G], Seq[Expr[G]]) =
+    v match {
+      case ValRangeBinding(t, id, _, from, _, to) =>
+        val variable =
+          new Variable[G](convert(t))(origin(id).sourceName(convert(id)))
+        val cond = SeqMember[G](
+          Local(variable.ref),
+          Range(convert(from), convert(to)),
+        )
+        (variable, Seq(cond))
+      case ValNormalBinding(arg) => (convert(arg), Nil)
+    }
 
-  def convert(implicit vs: ValBindingsContext): (Seq[Variable[G]], Seq[Expr[G]]) = vs match {
-    case ValBindings0(binding) =>
-      val (v, cs) = convert(binding)
-      (Seq(v), cs)
-    case ValBindings1(binding, _, bindings) =>
-      val (v, cs) = convert(binding)
-      val (vs, ds) = convert(bindings)
-      (v +: vs, cs ++ ds)
-  }
+  def convert(
+      implicit vs: ValBindingsContext
+  ): (Seq[Variable[G]], Seq[Expr[G]]) =
+    vs match {
+      case ValBindings0(binding) =>
+        val (v, cs) = convert(binding)
+        (Seq(v), cs)
+      case ValBindings1(binding, _, bindings) =>
+        val (v, cs) = convert(binding)
+        val (vs, ds) = convert(bindings)
+        (v +: vs, cs ++ ds)
+    }
 
-  def convert(implicit e: ValPrimaryBinderContext): Expr[G] = e match {
-    case ValQuantifier(_, symbol, bindings, _, bodyOrCond, maybeBody, _) =>
-      val (variables, bindingConds) = convert(bindings)
-      val (bodyConds, body) = maybeBody match {
-        case Some(ValBinderCont0(_, body)) => (Seq(convert(bodyOrCond)), convert(body))
-        case None => (Nil, convert(bodyOrCond))
-      }
-      val conds = bindingConds ++ bodyConds
-      symbol match {
-        case ValForallSymb(_) => Forall(variables, Nil, implies(conds, body))
-        case ValStarallSymb(_) => Starall(variables, Nil, implies(conds, body))(blame(e))
-        case ValExistsSymb(_) => Exists(variables, Nil, foldAnd(conds :+ body))
-      }
-    case ValLet(_, _, t, id, _, v, _, body, _) =>
-      Let(new Variable(convert(t))(origin(id).sourceName(convert(id))), convert(v), convert(body))
-    case ValForPerm(_, _, bindings, _, loc, _, body, _) =>
-      ForPerm(convert(bindings), AmbiguousLocation(convert(loc))(blame(loc))(origin(loc)), convert(body))
-    case ValForPermWithValue(_, _, _, id, _, body, _) =>
-      ForPermWithValue(new Variable(TAny())(origin(id).sourceName(convert(id))), convert(body))
-  }
+  def convert(implicit e: ValPrimaryBinderContext): Expr[G] =
+    e match {
+      case ValQuantifier(_, symbol, bindings, _, bodyOrCond, maybeBody, _) =>
+        val (variables, bindingConds) = convert(bindings)
+        val (bodyConds, body) =
+          maybeBody match {
+            case Some(ValBinderCont0(_, body)) =>
+              (Seq(convert(bodyOrCond)), convert(body))
+            case None => (Nil, convert(bodyOrCond))
+          }
+        val conds = bindingConds ++ bodyConds
+        symbol match {
+          case ValForallSymb(_) => Forall(variables, Nil, implies(conds, body))
+          case ValStarallSymb(_) =>
+            Starall(variables, Nil, implies(conds, body))(blame(e))
+          case ValExistsSymb(_) =>
+            Exists(variables, Nil, foldAnd(conds :+ body))
+        }
+      case ValLet(_, _, t, id, _, v, _, body, _) =>
+        Let(
+          new Variable(convert(t))(origin(id).sourceName(convert(id))),
+          convert(v),
+          convert(body),
+        )
+      case ValForPerm(_, _, bindings, _, loc, _, body, _) =>
+        ForPerm(
+          convert(bindings),
+          AmbiguousLocation(convert(loc))(blame(loc))(origin(loc)),
+          convert(body),
+        )
+      case ValForPermWithValue(_, _, _, id, _, body, _) =>
+        ForPermWithValue(
+          new Variable(TAny())(origin(id).sourceName(convert(id))),
+          convert(body),
+        )
+    }
 
-  def convert(implicit e: ValPrimaryVectorContext): Expr[G] = e match {
-    case ValSum(_, _, t, id, _, cond, _, body, _) =>
-      val binding = new Variable(convert(t))(origin(id).sourceName(convert(id)))
-      Sum(Seq(binding), convert(cond), convert(body))
-    case ValVectorSum(_, _, rng, _, vec, _) => VectorSum(convert(rng), convert(vec))
-    case ValVectorCmp(_, _, left, _, right, _) => VectorCompare(convert(left), convert(right))
-    case ValVectorRep(_, _, inner, _) => VectorRepeat(convert(inner))
-    case ValMatrixSum(_, _, rng, _, mat, _) => MatrixSum(convert(rng), convert(mat))
-    case ValMatrixCmp(_, _, left, _, right, _) => MatrixCompare(convert(left), convert(right))
-    case ValMatrixRep(_, _, inner, _) => MatrixRepeat(convert(inner))
-  }
+  def convert(implicit e: ValPrimaryVectorContext): Expr[G] =
+    e match {
+      case ValSum(_, _, t, id, _, cond, _, body, _) =>
+        val binding =
+          new Variable(convert(t))(origin(id).sourceName(convert(id)))
+        Sum(Seq(binding), convert(cond), convert(body))
+      case ValVectorSum(_, _, rng, _, vec, _) =>
+        VectorSum(convert(rng), convert(vec))
+      case ValVectorCmp(_, _, left, _, right, _) =>
+        VectorCompare(convert(left), convert(right))
+      case ValVectorRep(_, _, inner, _) => VectorRepeat(convert(inner))
+      case ValMatrixSum(_, _, rng, _, mat, _) =>
+        MatrixSum(convert(rng), convert(mat))
+      case ValMatrixCmp(_, _, left, _, right, _) =>
+        MatrixCompare(convert(left), convert(right))
+      case ValMatrixRep(_, _, inner, _) => MatrixRepeat(convert(inner))
+    }
 
   def convert(implicit e: ValPrimaryReducibleContext): Expr[G] = ??(e)
 
-  def convert(implicit e: ValPrimaryThreadContext): Expr[G] = e match {
-    case ValIdle(_, _, thread, _) => IdleToken(convert(thread))
-    case ValRunning(_, _, thread, _) => JoinToken(convert(thread))
-  }
+  def convert(implicit e: ValPrimaryThreadContext): Expr[G] =
+    e match {
+      case ValIdle(_, _, thread, _) => IdleToken(convert(thread))
+      case ValRunning(_, _, thread, _) => JoinToken(convert(thread))
+    }
 
-  def convert(implicit e: ValPrimaryContextContext): Expr[G] = e match {
-    case ValPrimaryContext0("\\result") => AmbiguousResult()
-    case ValPrimaryContext1("\\current_thread") => CurrentThreadId()
-    case ValPrimaryContext2("\\ltid") => LocalThreadId()
-    case ValPrimaryContext3("\\gtid") => GlobalThreadId()
-  }
+  def convert(implicit e: ValPrimaryContextContext): Expr[G] =
+    e match {
+      case ValPrimaryContext0("\\result") => AmbiguousResult()
+      case ValPrimaryContext1("\\current_thread") => CurrentThreadId()
+      case ValPrimaryContext2("\\ltid") => LocalThreadId()
+      case ValPrimaryContext3("\\gtid") => GlobalThreadId()
+    }
 
-  def convert(implicit e: ValPrimaryContext): Expr[G] = e match {
-    case ValPrimary0(inner) => convert(inner)
-    case ValPrimary1(inner) => convert(inner)
-    case ValPrimary2(inner) => convert(inner)
-    case ValPrimary3(inner) => convert(inner)
-    case ValPrimary4(inner) => convert(inner)
-    case ValPrimary5(inner) => convert(inner)
-    case ValPrimary6(inner) => convert(inner)
-    case ValPrimary7(inner) => convert(inner)
-    case ValPrimary8(inner) => convert(inner)
-    case ValPrimary9(inner) => convert(inner)
-    case ValAny(_) => Any()(blame(e))
-    case ValFunctionOf(_, inner, _, names, _) => FunctionOf(new UnresolvedRef[G, Variable[G]](convert(inner)), convert(names).map(new UnresolvedRef[G, Variable[G]](_)))
-    case ValInlinePattern(open, pattern, _) =>
-      val groupText = open.filter(_.isDigit)
-      InlinePattern(convert(pattern), open.count(_ == '<'), if (groupText.isEmpty) 0 else groupText.toInt)
-    case ValUnfolding(_, predExpr, _, body) => Unfolding(convert(predExpr), convert(body))(blame(e))
-    case ValOld(_, _, expr, _) => Old(convert(expr), at = None)(blame(e))
-    case ValOldLabeled(_, _, label, _, _, expr, _) => Old(convert(expr), at = Some(new UnresolvedRef[G, LabelDecl[G]](convert(label))))(blame(e))
-    case ValTypeof(_, _, expr, _) => TypeOf(convert(expr))
-    case ValTypeValue(_, _, t, _) => TypeValue(convert(t))
-    case ValHeld(_, _, obj, _) => Held(convert(obj))
-    case ValCommitted(_, _, obj, _) => Committed(convert(obj))(blame(e))
-    case ValIdEscape(text) => local(e, text.substring(1, text.length - 1))
-    case ValSharedMemSize(_, _, ptr, _) => SharedMemSize(convert(ptr))
-    case ValNdIndex(_, _, firstIndex, _, firstDim, parsePairs, _) =>
-      val pairs = parsePairs.map(convert(_))
-      val indices = convert(firstIndex) +: pairs.map(_._1)
-      val dims = convert(firstDim) +: pairs.map(_._2)
-      NdIndex(indices, dims)
-    case ValNdLIndex(_, _, indices, _, dims, _) =>
-      val allIndices = convert(indices)
-      NdPartialIndex(allIndices.init, allIndices.last, convert(dims))
-    case ValNdLength(_, _, dims, _) => NdLength(convert(dims))
-    case ValChoose(_, _, xs, _) => Choose(convert(xs))(blame(e))
-    case ValChooseFresh(_, _, xs, _) => ChooseFresh(convert(xs))(blame(e))
-  }
+  def convert(implicit e: ValPrimaryContext): Expr[G] =
+    e match {
+      case ValPrimary0(inner) => convert(inner)
+      case ValPrimary1(inner) => convert(inner)
+      case ValPrimary2(inner) => convert(inner)
+      case ValPrimary3(inner) => convert(inner)
+      case ValPrimary4(inner) => convert(inner)
+      case ValPrimary5(inner) => convert(inner)
+      case ValPrimary6(inner) => convert(inner)
+      case ValPrimary7(inner) => convert(inner)
+      case ValPrimary8(inner) => convert(inner)
+      case ValPrimary9(inner) => convert(inner)
+      case ValAny(_) => Any()(blame(e))
+      case ValFunctionOf(_, inner, _, names, _) =>
+        FunctionOf(
+          new UnresolvedRef[G, Variable[G]](convert(inner)),
+          convert(names).map(new UnresolvedRef[G, Variable[G]](_)),
+        )
+      case ValInlinePattern(open, pattern, _) =>
+        val groupText = open.filter(_.isDigit)
+        InlinePattern(
+          convert(pattern),
+          open.count(_ == '<'),
+          if (groupText.isEmpty)
+            0
+          else
+            groupText.toInt,
+        )
+      case ValUnfolding(_, predExpr, _, body) =>
+        Unfolding(convert(predExpr), convert(body))(blame(e))
+      case ValOld(_, _, expr, _) => Old(convert(expr), at = None)(blame(e))
+      case ValOldLabeled(_, _, label, _, _, expr, _) =>
+        Old(
+          convert(expr),
+          at = Some(new UnresolvedRef[G, LabelDecl[G]](convert(label))),
+        )(blame(e))
+      case ValTypeof(_, _, expr, _) => TypeOf(convert(expr))
+      case ValTypeValue(_, _, t, _) => TypeValue(convert(t))
+      case ValHeld(_, _, obj, _) => Held(convert(obj))
+      case ValCommitted(_, _, obj, _) => Committed(convert(obj))(blame(e))
+      case ValIdEscape(text) => local(e, text.substring(1, text.length - 1))
+      case ValSharedMemSize(_, _, ptr, _) => SharedMemSize(convert(ptr))
+      case ValNdIndex(_, _, firstIndex, _, firstDim, parsePairs, _) =>
+        val pairs = parsePairs.map(convert(_))
+        val indices = convert(firstIndex) +: pairs.map(_._1)
+        val dims = convert(firstDim) +: pairs.map(_._2)
+        NdIndex(indices, dims)
+      case ValNdLIndex(_, _, indices, _, dims, _) =>
+        val allIndices = convert(indices)
+        NdPartialIndex(allIndices.init, allIndices.last, convert(dims))
+      case ValNdLength(_, _, dims, _) => NdLength(convert(dims))
+      case ValChoose(_, _, xs, _) => Choose(convert(xs))(blame(e))
+      case ValChooseFresh(_, _, xs, _) => ChooseFresh(convert(xs))(blame(e))
+    }
 
-  def convert(implicit e: ValExprPairContext): (Expr[G], Expr[G]) = e match {
-    case ValExprPair0(_, e1, _, e2) => (convert(e1), convert(e2))
-  }
+  def convert(implicit e: ValExprPairContext): (Expr[G], Expr[G]) =
+    e match { case ValExprPair0(_, e1, _, e2) => (convert(e1), convert(e2)) }
 
-  def convert(implicit e: ValExprContext): Expr[G] = e match {
-    case ValExpr0(inner) => convert(inner)
-    case ValExpr1(inner) => convert(inner)
-    // TODO: Remove this when we support nested enums (for the JavaBIP casino example)
-    case ValExpr2(_, _, _, replacer, _, _, inner , _, _, _) => convert(replacer)
-  }
+  def convert(implicit e: ValExprContext): Expr[G] =
+    e match {
+      case ValExpr0(inner) => convert(inner)
+      case ValExpr1(inner) => convert(inner)
+      // TODO: Remove this when we support nested enums (for the JavaBIP casino example)
+      case ValExpr2(_, _, _, replacer, _, _, inner, _, _, _) =>
+        convert(replacer)
+    }
 
-  def convert(implicit id: ValIdentifierContext): String = id match {
-    case ValIdentifier0(inner) => convertText(inner)
-    case ValIdentifier1(ValKeywordNonExpr0(text)) => text
-    case ValIdentifier2(text) => text.substring(1, text.length - 1)
-  }
+  def convert(implicit id: ValIdentifierContext): String =
+    id match {
+      case ValIdentifier0(inner) => convertText(inner)
+      case ValIdentifier1(ValKeywordNonExpr0(text)) => text
+      case ValIdentifier2(text) => text.substring(1, text.length - 1)
+    }
 
-  def convertText(implicit res: ValKeywordExprContext): String = res match {
-    case ValNonePerm(_) => "none"
-    case ValWrite(_) => "write"
-    case ValRead(_) => "read"
-    case ValNoneOption(_) => "None"
-    case ValEmpty(_) => "empty"
-    case ValTrue(_) => "true"
-    case ValFalse(_) => "false"
-  }
+  def convertText(implicit res: ValKeywordExprContext): String =
+    res match {
+      case ValNonePerm(_) => "none"
+      case ValWrite(_) => "write"
+      case ValRead(_) => "read"
+      case ValNoneOption(_) => "None"
+      case ValEmpty(_) => "empty"
+      case ValTrue(_) => "true"
+      case ValFalse(_) => "false"
+    }
 
-  def convert(implicit res: ValKeywordExprContext): Expr[G] = res match {
-    case ValNonePerm(_) => NoPerm()
-    case ValWrite(_) => WritePerm()
-    case ValRead(_) => ReadPerm()
-    case ValNoneOption(_) => OptNone()
-    case ValEmpty(_) => EmptyProcess()
-    case ValTrue(_) => tt
-    case ValFalse(_) => ff
-  }
+  def convert(implicit res: ValKeywordExprContext): Expr[G] =
+    res match {
+      case ValNonePerm(_) => NoPerm()
+      case ValWrite(_) => WritePerm()
+      case ValRead(_) => ReadPerm()
+      case ValNoneOption(_) => OptNone()
+      case ValEmpty(_) => EmptyProcess()
+      case ValTrue(_) => tt
+      case ValFalse(_) => ff
+    }
 
-  def convert(implicit inv: ValGenericAdtInvocationContext): Expr[G] = inv match {
-    case ValGenericAdtInvocation0(adt, _, typeArgs, _, _, func, _, args, _) =>
-      ADTFunctionInvocation(Some((new UnresolvedRef[G, AxiomaticDataType[G]](convert(adt)), convert(typeArgs))),
-        new UnresolvedRef[G, ADTFunction[G]](convert(func)), args.map(convert(_)).getOrElse(Nil))
-  }
+  def convert(implicit inv: ValGenericAdtInvocationContext): Expr[G] =
+    inv match {
+      case ValGenericAdtInvocation0(adt, _, typeArgs, _, _, func, _, args, _) =>
+        ADTFunctionInvocation(
+          Some((
+            new UnresolvedRef[G, AxiomaticDataType[G]](convert(adt)),
+            convert(typeArgs),
+          )),
+          new UnresolvedRef[G, ADTFunction[G]](convert(func)),
+          args.map(convert(_)).getOrElse(Nil),
+        )
+    }
 }
diff --git a/src/parsers/vct/parsers/transform/LLVMContractToCol.scala b/src/parsers/vct/parsers/transform/LLVMContractToCol.scala
index cfa7079aa9..dfd50a7640 100644
--- a/src/parsers/vct/parsers/transform/LLVMContractToCol.scala
+++ b/src/parsers/vct/parsers/transform/LLVMContractToCol.scala
@@ -16,21 +16,28 @@ import scala.collection.immutable.{AbstractSeq, LinearSeq}
 import scala.collection.mutable
 
 @nowarn("msg=match may not be exhaustive&msg=Some\\(")
-case class LLVMContractToCol[G](override val baseOrigin: Origin,
-                                override val blameProvider: BlameProvider,
-                                override val errors: Seq[(Token, Token, ExpectedError)])
-  extends ToCol(baseOrigin, blameProvider, errors) {
+case class LLVMContractToCol[G](
+    override val baseOrigin: Origin,
+    override val blameProvider: BlameProvider,
+    override val errors: Seq[(Token, Token, ExpectedError)],
+) extends ToCol(baseOrigin, blameProvider, errors) {
 
   def local(ctx: ParserRuleContext, name: String): Expr[G] =
     LlvmLocal(name)(blame(ctx))(origin(ctx))
 
-  def createVariable(ctx: ParserRuleContext, id: LangIdContext, t: LangTypeContext): Variable[G] = {
+  def createVariable(
+      ctx: ParserRuleContext,
+      id: LangIdContext,
+      t: LangTypeContext,
+  ): Variable[G] = {
     val varId = convert(id)
     val variable = new Variable(convert(t))(origin(ctx).sourceName(varId))
     variable
   }
 
-  def convert(implicit contract: ValEmbedContractContext): ApplicableContract[G] = {
+  def convert(
+      implicit contract: ValEmbedContractContext
+  ): ApplicableContract[G] = {
     val collector = new ContractCollector[G]()
     contract match {
       case ValEmbedContract0(blocks) => blocks.foreach(convert(_, collector))
@@ -39,92 +46,118 @@ case class LLVMContractToCol[G](override val baseOrigin: Origin,
   }
 
   // assume specLevel == 1 (so only cover the 2nd parse rule)
-  def convert(contract: ValEmbedContractBlockContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValEmbedContractBlock1(clauses) => clauses.foreach(convert(_, collector))
-  }
-
-  def convert(implicit contract: ValContractClauseContext, collector: ContractCollector[G]): Unit = contract match {
-    //case ValContractClause0(_, ids, _) => collector.modifies ++= convert(ids).map((contract, _))
-    //case ValContractClause1(_, ids, _) => collector.accessible ++= convert(ids).map((contract, _))
-    case ValContractClause2(_, exp, _) => collector.requires += ((contract, convert(exp)))
-    case ValContractClause3(_, exp, _) => collector.ensures += ((contract, convert(exp)))
-    case ValContractClause4(_, t, id, _) =>
-      val variable = createVariable(contract, id, t)
-      collector.given += ((contract, variable))
-    case ValContractClause5(_, t, id, _) =>
-      val variable = createVariable(contract, id, t)
-      collector.yields += ((contract, variable))
-    case ValContractClause6(_, exp, _) => collector.context_everywhere += ((contract, convert(exp)))
-    case ValContractClause7(_, exp, _) =>
-      collector.requires += ((contract, convert(exp)))
-      collector.ensures += ((contract, convert(exp)))
-    //case ValContractClause8(_, exp, _) => collector.loop_invariant += ((contract, convert(exp)))
-    //case ValContractClause9(_, exp, _) => collector.kernel_invariant += ((contract, convert(exp)))
-    case ValContractClause10(_, _, t, id, _, exp, _) =>
-      val variable = createVariable(contract, id, t)
-      collector.signals += ((contract, SignalsClause(variable, convert(exp))(OriginProvider(contract))))
-    //case ValContractClause11(_, invariant, _) => collector.lock_invariant += ((contract, convert(invariant)))
-    case ValContractClause12(_, None, _) => collector.decreases += ((contract, DecreasesClauseNoRecursion()))
-    case ValContractClause12(_, Some(clause), _) => collector.decreases += ((contract, convert(clause)))
-  }
+  def convert(
+      contract: ValEmbedContractBlockContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValEmbedContractBlock1(clauses) =>
+        clauses.foreach(convert(_, collector))
+    }
 
-  def convert(implicit t: LangTypeContext): Type[G] = t match {
-    case LangType0(t) => convert(t)
-  }
+  def convert(
+      implicit contract: ValContractClauseContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      // case ValContractClause0(_, ids, _) => collector.modifies ++= convert(ids).map((contract, _))
+      // case ValContractClause1(_, ids, _) => collector.accessible ++= convert(ids).map((contract, _))
+      case ValContractClause2(_, exp, _) =>
+        collector.requires += ((contract, convert(exp)))
+      case ValContractClause3(_, exp, _) =>
+        collector.ensures += ((contract, convert(exp)))
+      case ValContractClause4(_, t, id, _) =>
+        val variable = createVariable(contract, id, t)
+        collector.given += ((contract, variable))
+      case ValContractClause5(_, t, id, _) =>
+        val variable = createVariable(contract, id, t)
+        collector.yields += ((contract, variable))
+      case ValContractClause6(_, exp, _) =>
+        collector.context_everywhere += ((contract, convert(exp)))
+      case ValContractClause7(_, exp, _) =>
+        collector.requires += ((contract, convert(exp)))
+        collector.ensures += ((contract, convert(exp)))
+      // case ValContractClause8(_, exp, _) => collector.loop_invariant += ((contract, convert(exp)))
+      // case ValContractClause9(_, exp, _) => collector.kernel_invariant += ((contract, convert(exp)))
+      case ValContractClause10(_, _, t, id, _, exp, _) =>
+        val variable = createVariable(contract, id, t)
+        collector.signals +=
+          ((
+            contract,
+            SignalsClause(variable, convert(exp))(OriginProvider(contract)),
+          ))
+      // case ValContractClause11(_, invariant, _) => collector.lock_invariant += ((contract, convert(invariant)))
+      case ValContractClause12(_, None, _) =>
+        collector.decreases += ((contract, DecreasesClauseNoRecursion()))
+      case ValContractClause12(_, Some(clause), _) =>
+        collector.decreases += ((contract, convert(clause)))
+    }
 
-  def convert(implicit t: TypeContext): Type[G] = t match {
-    case T_intRule(_) => TInt()
-    case T_boolRule(_) => TBool()
-  }
+  def convert(implicit t: LangTypeContext): Type[G] =
+    t match { case LangType0(t) => convert(t) }
 
-  def convert(implicit id: LangIdContext): String = id match {
-    case LangId0(text) => text
-  }
-
-  def convert(implicit exprs: ExpressionListContext): Seq[Expr[G]] = exprs match {
-    case ExpressionList0(expr) => Seq(convert(expr))
-    case ExpressionList1(expr, _, exprs) => convert(expr) +: convert(exprs)
-  }
+  def convert(implicit t: TypeContext): Type[G] =
+    t match {
+      case T_intRule(_) => TInt()
+      case T_boolRule(_) => TBool()
+    }
 
+  def convert(implicit id: LangIdContext): String =
+    id match { case LangId0(text) => text }
 
-  def convert(implicit expr: LangExprContext): Expr[G] = expr match {
-    case LangExpr0(expr) => convert(expr)
-  }
+  def convert(implicit exprs: ExpressionListContext): Seq[Expr[G]] =
+    exprs match {
+      case ExpressionList0(expr) => Seq(convert(expr))
+      case ExpressionList1(expr, _, exprs) => convert(expr) +: convert(exprs)
+    }
 
-  def convert(implicit expr: ExpressionContext): Expr[G] = expr match {
-    case Expression0(instruction) => convert(instruction)
-    case Expression1(constant) => convert(constant)
-    case Expression2(identifier) => convert(identifier)
-    case Expression3(valExpr) => convert(valExpr)
-    case Expression4(e1, impOp, e2) => impOp match {
-      case ValImpOp0(_) => ???
-      case ValImpOp1(_) => Implies(convert(e1), convert(e2))
+  def convert(implicit expr: LangExprContext): Expr[G] =
+    expr match { case LangExpr0(expr) => convert(expr) }
+
+  def convert(implicit expr: ExpressionContext): Expr[G] =
+    expr match {
+      case Expression0(instruction) => convert(instruction)
+      case Expression1(constant) => convert(constant)
+      case Expression2(identifier) => convert(identifier)
+      case Expression3(valExpr) => convert(valExpr)
+      case Expression4(e1, impOp, e2) =>
+        impOp match {
+          case ValImpOp0(_) => ???
+          case ValImpOp1(_) => Implies(convert(e1), convert(e2))
+        }
     }
-  }
 
-  def convert(implicit inst: InstructionContext): Expr[G] = inst match {
-    case BinOpRule(binOp) => convert(binOp)
-    case CmpOpRule(cmpOp) => convert(cmpOp)
-    case CallOpRule(callOp) => convert(callOp)
-    case BrOpRule(brOp) => convert(brOp)
-  }
+  def convert(implicit inst: InstructionContext): Expr[G] =
+    inst match {
+      case BinOpRule(binOp) => convert(binOp)
+      case CmpOpRule(cmpOp) => convert(cmpOp)
+      case CallOpRule(callOp) => convert(callOp)
+      case BrOpRule(brOp) => convert(brOp)
+    }
 
-  def convert(implicit brOp:BranchInstructionContext): Expr[G] = brOp match {
-    case BranchInstruction0(_, _, testExpr, _, trueExpr, _, falseExpr, _) =>
-      Select(convert(testExpr), convert(trueExpr), convert(falseExpr))
-  }
+  def convert(implicit brOp: BranchInstructionContext): Expr[G] =
+    brOp match {
+      case BranchInstruction0(_, _, testExpr, _, trueExpr, _, falseExpr, _) =>
+        Select(convert(testExpr), convert(trueExpr), convert(falseExpr))
+    }
 
-  def convert(implicit callOp: CallInstructionContext): Expr[G] = callOp match {
-    case CallInstruction0(_, id, _, exprList, _) =>
-      val args: Seq[Expr[G]] = convert(exprList)
-      LlvmAmbiguousFunctionInvocation(id, args, Nil, Nil)(blame(callOp))
-  }
+  def convert(implicit callOp: CallInstructionContext): Expr[G] =
+    callOp match {
+      case CallInstruction0(_, id, _, exprList, _) =>
+        val args: Seq[Expr[G]] = convert(exprList)
+        LlvmAmbiguousFunctionInvocation(id, args, Nil, Nil)(blame(callOp))
+    }
 
-  def convert(implicit binOp: BinOpInstructionContext): Expr[G] = binOp match {
-    case BinOpInstruction0(op, _, lhs, _, rhs, _) => convert(op, lhs, rhs)
-  }
+  def convert(implicit binOp: BinOpInstructionContext): Expr[G] =
+    binOp match {
+      case BinOpInstruction0(op, _, lhs, _, rhs, _) => convert(op, lhs, rhs)
+    }
 
-  def convert(implicit op: BinOpContext, lhs: ExpressionContext, rhs: ExpressionContext): Expr[G] = {
+  def convert(
+      implicit op: BinOpContext,
+      lhs: ExpressionContext,
+      rhs: ExpressionContext,
+  ): Expr[G] = {
     implicit val o: Origin = origin(op.getParent)
     val left: Expr[G] = convert(lhs)
     val right: Expr[G] = convert(rhs)
@@ -134,28 +167,40 @@ case class LLVMContractToCol[G](override val baseOrigin: Origin,
       case Mul(_) => Mult(left, right)
       case Udiv(_) | Sdiv(_) => FloorDiv(left, right)(blame(op))
       // bitwise/boolean
-      case bitOp => left.t match {
-        case TBool() => bitOp match {
-          case LLVMSpecParserPatterns.And(_) => vct.col.ast.And(left, right)
-          case LLVMSpecParserPatterns.Or(_) => vct.col.ast.Or(left, right)
-          case Xor(_) => Neq(left, right)
-        }
-        case TInt() => bitOp match {
-          case LLVMSpecParserPatterns.And(_) => BitAnd(left, right)
-          case LLVMSpecParserPatterns.Or(_) => BitOr(left, right)
-          case Xor(_) => BitXor(left, right)
+      case bitOp =>
+        left.t match {
+          case TBool() =>
+            bitOp match {
+              case LLVMSpecParserPatterns.And(_) => vct.col.ast.And(left, right)
+              case LLVMSpecParserPatterns.Or(_) => vct.col.ast.Or(left, right)
+              case Xor(_) => Neq(left, right)
+            }
+          case TInt() =>
+            bitOp match {
+              case LLVMSpecParserPatterns.And(_) => BitAnd(left, right)
+              case LLVMSpecParserPatterns.Or(_) => BitOr(left, right)
+              case Xor(_) => BitXor(left, right)
+            }
+          case other =>
+            throw ParseError(
+              left.o,
+              s"Expected an integer or boolean expression here, but got `$other`",
+            )
         }
-        case other => throw ParseError(left.o, s"Expected an integer or boolean expression here, but got `$other`")
-      }
     }
   }
 
   def convert(implicit cmpOp: CompareInstructionContext): Expr[G] =
     cmpOp match {
-      case CompareInstruction0(_, _, pred, _, lhs, _, rhs, _) => convert(pred, lhs, rhs)
+      case CompareInstruction0(_, _, pred, _, lhs, _, rhs, _) =>
+        convert(pred, lhs, rhs)
     }
 
-  def convert(implicit pred: CompPredContext, lhs: ExpressionContext, rhs: ExpressionContext): Expr[G] = {
+  def convert(
+      implicit pred: CompPredContext,
+      lhs: ExpressionContext,
+      rhs: ExpressionContext,
+  ): Expr[G] = {
     implicit val o: Origin = origin(pred.getParent)
     val left: Expr[G] = convert(lhs)
     val right: Expr[G] = convert(rhs)
@@ -172,254 +217,363 @@ case class LLVMContractToCol[G](override val baseOrigin: Origin,
 
   def convert(implicit const: ConstantContext): Expr[G] = {
     const match {
-      case BoolConstRule(const) => BooleanValue(const match {
-        case ConstTrue(_) => true
-        case ConstFalse(_) => false
-      })(origin(const))
-      case IntConstRule(IntegerConstant0(constInt)) => IntegerValue(BigInt(constInt))(origin(const))
+      case BoolConstRule(const) =>
+        BooleanValue(const match {
+          case ConstTrue(_) => true
+          case ConstFalse(_) => false
+        })(origin(const))
+      case IntConstRule(IntegerConstant0(constInt)) =>
+        IntegerValue(BigInt(constInt))(origin(const))
     }
   }
 
-  def convert(implicit id: IdentifierContext): Expr[G] = id match {
-    case Identifier0(text) => local(id, text)
-  }
+  def convert(implicit id: IdentifierContext): Expr[G] =
+    id match { case Identifier0(text) => local(id, text) }
 
+  def convert(implicit e: ValExprContext): Expr[G] =
+    e match {
+      case ValExpr0(inner) => convert(inner)
+      case ValExpr1(inner) => convert(inner)
+    }
 
-  def convert(implicit e: ValExprContext): Expr[G] = e match {
-    case ValExpr0(inner) => convert(inner)
-    case ValExpr1(inner) => convert(inner)
-  }
-
-  def convert(implicit e: ValPrimaryContext): Expr[G] = e match {
-    case ValPrimary0(inner) => convert(inner)
-    case ValPrimary1(inner) => convert(inner)
-    case ValPrimary2(inner) => convert(inner)
-    case ValPrimary3(inner) => convert(inner)
-    case ValPrimary4(inner) => convert(inner)
-    case ValPrimary5(inner) => convert(inner)
-    case ValPrimary6(inner) => convert(inner)
-    case ValPrimary7(inner) => convert(inner)
-    case ValPrimary8(inner) => convert(inner)
-    case ValPrimary9(inner) => convert(inner)
-    case ValAny(_) => Any()(blame(e))
-    case ValFunctionOf(_, inner, _, names, _) => FunctionOf(new UnresolvedRef[G, Variable[G]](convert(inner)), convert(names).map(new UnresolvedRef[G, Variable[G]](_)))
-    case ValInlinePattern(open, pattern, _) =>
-      val groupText = open.filter(_.isDigit)
-      InlinePattern(convert(pattern), open.count(_ == '<'), if (groupText.isEmpty) 0 else groupText.toInt)
-    case ValUnfolding(_, predExpr, _, body) => Unfolding(convert(predExpr), convert(body))(blame(e))
-    case ValOld(_, _, expr, _) => Old(convert(expr), at = None)(blame(e))
-    case ValOldLabeled(_, _, label, _, _, expr, _) => Old(convert(expr), at = Some(new UnresolvedRef[G, LabelDecl[G]](convert(label))))(blame(e))
-    case ValTypeof(_, _, expr, _) => TypeOf(convert(expr))
-    case ValTypeValue(_, _, t, _) => TypeValue(convert(t))
-    case ValHeld(_, _, obj, _) => Held(convert(obj))
-    case ValCommitted(_, _, obj, _) => Committed(convert(obj))(blame(e))
-    case ValIdEscape(text) => local(e, text.substring(1, text.length - 1))
-    case ValSharedMemSize(_, _, ptr, _) => SharedMemSize(convert(ptr))
-    case ValNdIndex(_, _, firstIndex, _, firstDim, parsePairs, _) =>
-      val pairs = parsePairs.map(convert(_))
-      val indices = convert(firstIndex) +: pairs.map(_._1)
-      val dims = convert(firstDim) +: pairs.map(_._2)
-      NdIndex(indices, dims)
-    case ValNdLIndex(_, _, indices, _, dims, _) =>
-      val allIndices = convert(indices)
-      NdPartialIndex(allIndices.init, allIndices.last, convert(dims))
-    case ValNdLength(_, _, dims, _) => NdLength(convert(dims))
-  }
+  def convert(implicit e: ValPrimaryContext): Expr[G] =
+    e match {
+      case ValPrimary0(inner) => convert(inner)
+      case ValPrimary1(inner) => convert(inner)
+      case ValPrimary2(inner) => convert(inner)
+      case ValPrimary3(inner) => convert(inner)
+      case ValPrimary4(inner) => convert(inner)
+      case ValPrimary5(inner) => convert(inner)
+      case ValPrimary6(inner) => convert(inner)
+      case ValPrimary7(inner) => convert(inner)
+      case ValPrimary8(inner) => convert(inner)
+      case ValPrimary9(inner) => convert(inner)
+      case ValAny(_) => Any()(blame(e))
+      case ValFunctionOf(_, inner, _, names, _) =>
+        FunctionOf(
+          new UnresolvedRef[G, Variable[G]](convert(inner)),
+          convert(names).map(new UnresolvedRef[G, Variable[G]](_)),
+        )
+      case ValInlinePattern(open, pattern, _) =>
+        val groupText = open.filter(_.isDigit)
+        InlinePattern(
+          convert(pattern),
+          open.count(_ == '<'),
+          if (groupText.isEmpty)
+            0
+          else
+            groupText.toInt,
+        )
+      case ValUnfolding(_, predExpr, _, body) =>
+        Unfolding(convert(predExpr), convert(body))(blame(e))
+      case ValOld(_, _, expr, _) => Old(convert(expr), at = None)(blame(e))
+      case ValOldLabeled(_, _, label, _, _, expr, _) =>
+        Old(
+          convert(expr),
+          at = Some(new UnresolvedRef[G, LabelDecl[G]](convert(label))),
+        )(blame(e))
+      case ValTypeof(_, _, expr, _) => TypeOf(convert(expr))
+      case ValTypeValue(_, _, t, _) => TypeValue(convert(t))
+      case ValHeld(_, _, obj, _) => Held(convert(obj))
+      case ValCommitted(_, _, obj, _) => Committed(convert(obj))(blame(e))
+      case ValIdEscape(text) => local(e, text.substring(1, text.length - 1))
+      case ValSharedMemSize(_, _, ptr, _) => SharedMemSize(convert(ptr))
+      case ValNdIndex(_, _, firstIndex, _, firstDim, parsePairs, _) =>
+        val pairs = parsePairs.map(convert(_))
+        val indices = convert(firstIndex) +: pairs.map(_._1)
+        val dims = convert(firstDim) +: pairs.map(_._2)
+        NdIndex(indices, dims)
+      case ValNdLIndex(_, _, indices, _, dims, _) =>
+        val allIndices = convert(indices)
+        NdPartialIndex(allIndices.init, allIndices.last, convert(dims))
+      case ValNdLength(_, _, dims, _) => NdLength(convert(dims))
+    }
 
-  def convert(implicit e: ValPrimarySeqContext): Expr[G] = e match {
-    case ValCardinality(_, xs, _) => Size(convert(xs))
-    case ValArrayValues(_, _, a, _, from, _, to, _) => Values(convert(a), convert(from), convert(to))(blame(e))
-  }
+  def convert(implicit e: ValPrimarySeqContext): Expr[G] =
+    e match {
+      case ValCardinality(_, xs, _) => Size(convert(xs))
+      case ValArrayValues(_, _, a, _, from, _, to, _) =>
+        Values(convert(a), convert(from), convert(to))(blame(e))
+    }
 
-  def convert(implicit e: ValPrimaryOptionContext): Expr[G] = e match {
-    case ValSome(_, _, v, _) => OptSome(convert(v))
-  }
+  def convert(implicit e: ValPrimaryOptionContext): Expr[G] =
+    e match { case ValSome(_, _, v, _) => OptSome(convert(v)) }
 
-  def convert(implicit e: ValPrimaryEitherContext): Expr[G] = e match {
-    case ValLeft(_, _, inner, _) => EitherLeft(convert(inner))
-    case ValRight(_, _, inner, _) => EitherRight(convert(inner))
-  }
+  def convert(implicit e: ValPrimaryEitherContext): Expr[G] =
+    e match {
+      case ValLeft(_, _, inner, _) => EitherLeft(convert(inner))
+      case ValRight(_, _, inner, _) => EitherRight(convert(inner))
+    }
 
-  def convert(implicit e: ValPrimaryCollectionConstructorContext): Expr[G] = e match {
-    case ValTypedLiteralSeq(_, _, t, _, _, exprs, _) => LiteralSeq(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralSet(_, _, t, _, _, exprs, _) => LiteralSet(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralVector(_, _, t, _, _, exprs, _) => LiteralVector(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValSetComprehension(_, _, t, _, _, value, _, selectors, _, something, _) => ??(e)
-    case ValTypedLiteralBag(_, _, t, _, _, exprs, _) => LiteralBag(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralMap(_, _, key, _, value, _, _, pairs, _) => LiteralMap(convert(key), convert(value), pairs.map(convert(_)).getOrElse(Nil))
-    case ValTypedTuple(_, _, t1, _, t2, _, _, v1, _, v2, _) =>
-      LiteralTuple(Seq(convert(t1), convert(t2)), Seq(convert(v1), convert(v2)))
-    case ValLiteralSeq(_, exprs, _) => UntypedLiteralSeq(convert(exprs))
-    case ValLiteralSet(_, exprs, _) => UntypedLiteralSet(convert(exprs))
-    case ValLiteralBag(_, exprs, _) => UntypedLiteralBag(convert(exprs))
-    case ValEmptySeq(_, t, _) => LiteralSeq(convert(t), Nil)
-    case ValEmptySet(_, t, _) => LiteralSet(convert(t), Nil)
-    case ValEmptyBag(_, t, _) => LiteralBag(convert(t), Nil)
-    case ValRange(_, from, _, to, _) => Range(convert(from), convert(to))
-  }
+  def convert(implicit e: ValPrimaryCollectionConstructorContext): Expr[G] =
+    e match {
+      case ValTypedLiteralSeq(_, _, t, _, _, exprs, _) =>
+        LiteralSeq(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralSet(_, _, t, _, _, exprs, _) =>
+        LiteralSet(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralVector(_, _, t, _, _, exprs, _) =>
+        LiteralVector(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValSetComprehension(
+            _,
+            _,
+            t,
+            _,
+            _,
+            value,
+            _,
+            selectors,
+            _,
+            something,
+            _,
+          ) =>
+        ??(e)
+      case ValTypedLiteralBag(_, _, t, _, _, exprs, _) =>
+        LiteralBag(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralMap(_, _, key, _, value, _, _, pairs, _) =>
+        LiteralMap(
+          convert(key),
+          convert(value),
+          pairs.map(convert(_)).getOrElse(Nil),
+        )
+      case ValTypedTuple(_, _, t1, _, t2, _, _, v1, _, v2, _) =>
+        LiteralTuple(
+          Seq(convert(t1), convert(t2)),
+          Seq(convert(v1), convert(v2)),
+        )
+      case ValLiteralSeq(_, exprs, _) => UntypedLiteralSeq(convert(exprs))
+      case ValLiteralSet(_, exprs, _) => UntypedLiteralSet(convert(exprs))
+      case ValLiteralBag(_, exprs, _) => UntypedLiteralBag(convert(exprs))
+      case ValEmptySeq(_, t, _) => LiteralSeq(convert(t), Nil)
+      case ValEmptySet(_, t, _) => LiteralSet(convert(t), Nil)
+      case ValEmptyBag(_, t, _) => LiteralBag(convert(t), Nil)
+      case ValRange(_, from, _, to, _) => Range(convert(from), convert(to))
+    }
 
   // valsetcompselectors
-  def convert(implicit exprs: ValMapPairsContext): Seq[(Expr[G], Expr[G])] = exprs match {
-    case ValMapPairs0(k, _, v) => Seq((convert(k), convert(v)))
-    case ValMapPairs1(k, _, v, _, tail) => (convert(k), convert(v)) +: convert(tail)
-  }
+  def convert(implicit exprs: ValMapPairsContext): Seq[(Expr[G], Expr[G])] =
+    exprs match {
+      case ValMapPairs0(k, _, v) => Seq((convert(k), convert(v)))
+      case ValMapPairs1(k, _, v, _, tail) =>
+        (convert(k), convert(v)) +: convert(tail)
+    }
 
-  def convert(implicit e: ValPrimaryPermissionContext): Expr[G] = e match {
-    case ValCurPerm(_, _, loc, _) => CurPerm(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValPerm(_, _, loc, _, perm, _) => Perm(AmbiguousLocation(convert(loc))(blame(e)), convert(perm))
-    case ValValue(_, _, loc, _) => Value(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValAutoValue(_, _, loc, _) => AutoValue(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValPointsTo(_, _, loc, _, perm, _, v, _) => PointsTo(AmbiguousLocation(convert(loc))(blame(e)), convert(perm), convert(v))
-    case ValHPerm(_, _, loc, _, perm, _) => ModelPerm(convert(loc), convert(perm))
-    case ValAPerm(_, _, loc, _, perm, _) => ActionPerm(convert(loc), convert(perm))
-    case ValArrayPerm(_, _, arr, _, i, _, step, _, count, _, perm, _) => ??(e)
-    case ValMatrix(_, _, m, _, dim1, _, dim2, _) => ValidMatrix(convert(m), convert(dim1), convert(dim2))
-    case ValArray(_, _, arr, _, dim, _) => ValidArray(convert(arr), convert(dim))
-    case ValPointer(_, _, ptr, _, n, _, perm, _) => PermPointer(convert(ptr), convert(n), convert(perm))
-    case ValPointerIndex(_, _, ptr, _, idx, _, perm, _) => PermPointerIndex(convert(ptr), convert(idx), convert(perm))
-    case ValPointerBlockLength(_, _, ptr, _) => PointerBlockLength(convert(ptr))(blame(e))
-    case ValPointerBlockOffset(_, _, ptr, _) => PointerBlockOffset(convert(ptr))(blame(e))
-    case ValPointerLength(_, _, ptr, _) => PointerLength(convert(ptr))(blame(e))
-    case ValPolarityDependent(_, _, onInhale, _, onExhale, _) => PolarityDependent(convert(onInhale), convert(onExhale))
-  }
+  def convert(implicit e: ValPrimaryPermissionContext): Expr[G] =
+    e match {
+      case ValCurPerm(_, _, loc, _) =>
+        CurPerm(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValPerm(_, _, loc, _, perm, _) =>
+        Perm(AmbiguousLocation(convert(loc))(blame(e)), convert(perm))
+      case ValValue(_, _, loc, _) =>
+        Value(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValAutoValue(_, _, loc, _) =>
+        AutoValue(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValPointsTo(_, _, loc, _, perm, _, v, _) =>
+        PointsTo(
+          AmbiguousLocation(convert(loc))(blame(e)),
+          convert(perm),
+          convert(v),
+        )
+      case ValHPerm(_, _, loc, _, perm, _) =>
+        ModelPerm(convert(loc), convert(perm))
+      case ValAPerm(_, _, loc, _, perm, _) =>
+        ActionPerm(convert(loc), convert(perm))
+      case ValArrayPerm(_, _, arr, _, i, _, step, _, count, _, perm, _) => ??(e)
+      case ValMatrix(_, _, m, _, dim1, _, dim2, _) =>
+        ValidMatrix(convert(m), convert(dim1), convert(dim2))
+      case ValArray(_, _, arr, _, dim, _) =>
+        ValidArray(convert(arr), convert(dim))
+      case ValPointer(_, _, ptr, _, n, _, perm, _) =>
+        PermPointer(convert(ptr), convert(n), convert(perm))
+      case ValPointerIndex(_, _, ptr, _, idx, _, perm, _) =>
+        PermPointerIndex(convert(ptr), convert(idx), convert(perm))
+      case ValPointerBlockLength(_, _, ptr, _) =>
+        PointerBlockLength(convert(ptr))(blame(e))
+      case ValPointerBlockOffset(_, _, ptr, _) =>
+        PointerBlockOffset(convert(ptr))(blame(e))
+      case ValPointerLength(_, _, ptr, _) =>
+        PointerLength(convert(ptr))(blame(e))
+      case ValPolarityDependent(_, _, onInhale, _, onExhale, _) =>
+        PolarityDependent(convert(onInhale), convert(onExhale))
+    }
 
-  def convert(implicit e: ValPrimaryBinderContext): Expr[G] = e match {
-    case ValQuantifier(_, symbol, bindings, _, bodyOrCond, maybeBody, _) =>
-      val (variables, bindingConds) = convert(bindings)
-      val (bodyConds, body) = maybeBody match {
-        case Some(ValBinderCont0(_, body)) => (Seq(convert(bodyOrCond)), convert(body))
-        case None => (Nil, convert(bodyOrCond))
-      }
-      val conds = bindingConds ++ bodyConds
-      symbol match {
-        case ValForallSymb(_) => Forall(variables, Nil, implies(conds, body))
-        case ValStarallSymb(_) => Starall(variables, Nil, implies(conds, body))(blame(e))
-        case ValExistsSymb(_) => Exists(variables, Nil, foldAnd(conds :+ body))
-      }
-    case ValLet(_, _, t, id, _, v, _, body, _) =>
-      val variable = createVariable(e, id, t)
-      Let(variable, convert(v), convert(body))
-    case ValForPerm(_, _, bindings, _, loc, _, body, _) =>
-      ForPerm(convert(bindings), AmbiguousLocation(convert(loc))(blame(loc))(origin(loc)), convert(body))
-  }
+  def convert(implicit e: ValPrimaryBinderContext): Expr[G] =
+    e match {
+      case ValQuantifier(_, symbol, bindings, _, bodyOrCond, maybeBody, _) =>
+        val (variables, bindingConds) = convert(bindings)
+        val (bodyConds, body) =
+          maybeBody match {
+            case Some(ValBinderCont0(_, body)) =>
+              (Seq(convert(bodyOrCond)), convert(body))
+            case None => (Nil, convert(bodyOrCond))
+          }
+        val conds = bindingConds ++ bodyConds
+        symbol match {
+          case ValForallSymb(_) => Forall(variables, Nil, implies(conds, body))
+          case ValStarallSymb(_) =>
+            Starall(variables, Nil, implies(conds, body))(blame(e))
+          case ValExistsSymb(_) =>
+            Exists(variables, Nil, foldAnd(conds :+ body))
+        }
+      case ValLet(_, _, t, id, _, v, _, body, _) =>
+        val variable = createVariable(e, id, t)
+        Let(variable, convert(v), convert(body))
+      case ValForPerm(_, _, bindings, _, loc, _, body, _) =>
+        ForPerm(
+          convert(bindings),
+          AmbiguousLocation(convert(loc))(blame(loc))(origin(loc)),
+          convert(body),
+        )
+    }
 
-  def convert(implicit vs: ValBindingsContext): (Seq[Variable[G]], Seq[Expr[G]]) = vs match {
-    case ValBindings0(binding) =>
-      val (v, cs) = convert(binding)
-      (Seq(v), cs)
-    case ValBindings1(binding, _, bindings) =>
-      val (v, cs) = convert(binding)
-      val (vs, ds) = convert(bindings)
-      (v +: vs, cs ++ ds)
-  }
+  def convert(
+      implicit vs: ValBindingsContext
+  ): (Seq[Variable[G]], Seq[Expr[G]]) =
+    vs match {
+      case ValBindings0(binding) =>
+        val (v, cs) = convert(binding)
+        (Seq(v), cs)
+      case ValBindings1(binding, _, bindings) =>
+        val (v, cs) = convert(binding)
+        val (vs, ds) = convert(bindings)
+        (v +: vs, cs ++ ds)
+    }
 
-  def convert(implicit v: ValBindingContext): (Variable[G], Seq[Expr[G]]) = v match {
-    case ValRangeBinding(t, id, _, from, _, to) =>
-      val variable = createVariable(v, id, t)
-      val cond = SeqMember[G](Local(variable.ref), Range(convert(from), convert(to)))
-      (variable, Seq(cond))
-    case ValNormalBinding(arg) =>
-      (convert(arg), Nil)
-  }
+  def convert(implicit v: ValBindingContext): (Variable[G], Seq[Expr[G]]) =
+    v match {
+      case ValRangeBinding(t, id, _, from, _, to) =>
+        val variable = createVariable(v, id, t)
+        val cond = SeqMember[G](
+          Local(variable.ref),
+          Range(convert(from), convert(to)),
+        )
+        (variable, Seq(cond))
+      case ValNormalBinding(arg) => (convert(arg), Nil)
+    }
 
-  def convert(implicit arg: ValArgContext): Variable[G] = arg match {
-    case ValArg0(t, id) => createVariable(arg, id, t)
-  }
+  def convert(implicit arg: ValArgContext): Variable[G] =
+    arg match { case ValArg0(t, id) => createVariable(arg, id, t) }
 
-  def convert(implicit args: ValArgListContext): Seq[Variable[G]] = args match {
-    case ValArgList0(arg) => Seq(convert(arg))
-    case ValArgList1(arg, _, args) => convert(arg) +: convert(args)
-  }
+  def convert(implicit args: ValArgListContext): Seq[Variable[G]] =
+    args match {
+      case ValArgList0(arg) => Seq(convert(arg))
+      case ValArgList1(arg, _, args) => convert(arg) +: convert(args)
+    }
 
-  def convert(implicit e: ValPrimaryVectorContext): Expr[G] = e match {
-    case ValSum(_, _, t, id, _, cond, _, body, _) =>
-      val binding = createVariable(e, id, t)
-      Sum(Seq(binding), convert(cond), convert(body))
-    case ValVectorSum(_, _, rng, _, vec, _) => VectorSum(convert(rng), convert(vec))
-    case ValVectorCmp(_, _, left, _, right, _) => VectorCompare(convert(left), convert(right))
-    case ValVectorRep(_, _, inner, _) => VectorRepeat(convert(inner))
-    case ValMatrixSum(_, _, rng, _, mat, _) => MatrixSum(convert(rng), convert(mat))
-    case ValMatrixCmp(_, _, left, _, right, _) => MatrixCompare(convert(left), convert(right))
-    case ValMatrixRep(_, _, inner, _) => MatrixRepeat(convert(inner))
-  }
+  def convert(implicit e: ValPrimaryVectorContext): Expr[G] =
+    e match {
+      case ValSum(_, _, t, id, _, cond, _, body, _) =>
+        val binding = createVariable(e, id, t)
+        Sum(Seq(binding), convert(cond), convert(body))
+      case ValVectorSum(_, _, rng, _, vec, _) =>
+        VectorSum(convert(rng), convert(vec))
+      case ValVectorCmp(_, _, left, _, right, _) =>
+        VectorCompare(convert(left), convert(right))
+      case ValVectorRep(_, _, inner, _) => VectorRepeat(convert(inner))
+      case ValMatrixSum(_, _, rng, _, mat, _) =>
+        MatrixSum(convert(rng), convert(mat))
+      case ValMatrixCmp(_, _, left, _, right, _) =>
+        MatrixCompare(convert(left), convert(right))
+      case ValMatrixRep(_, _, inner, _) => MatrixRepeat(convert(inner))
+    }
 
-  def convert(implicit clause: ValDecreasesMeasureContext): DecreasesClause[G] = clause match {
-    case ValDecreasesMeasure0(_) => DecreasesClauseAssume()
-    case ValDecreasesMeasure1(exps) => DecreasesClauseTuple(convert(exps))
-  }
+  def convert(implicit clause: ValDecreasesMeasureContext): DecreasesClause[G] =
+    clause match {
+      case ValDecreasesMeasure0(_) => DecreasesClauseAssume()
+      case ValDecreasesMeasure1(exps) => DecreasesClauseTuple(convert(exps))
+    }
 
-  def convert(implicit e: ValPrimaryThreadContext): Expr[G] = e match {
-    case ValIdle(_, _, thread, _) => IdleToken(convert(thread))
-    case ValRunning(_, _, thread, _) => JoinToken(convert(thread))
-  }
+  def convert(implicit e: ValPrimaryThreadContext): Expr[G] =
+    e match {
+      case ValIdle(_, _, thread, _) => IdleToken(convert(thread))
+      case ValRunning(_, _, thread, _) => JoinToken(convert(thread))
+    }
 
   def convert(implicit e: ValPrimaryReducibleContext): Expr[G] = ??(e)
 
-  def convert(implicit e: ValPrimaryContextContext): Expr[G] = e match {
-    case ValPrimaryContext0("\\result") => AmbiguousResult()
-    case ValPrimaryContext1("\\current_thread") => CurrentThreadId()
-    case ValPrimaryContext2("\\ltid") => LocalThreadId()
-    case ValPrimaryContext3("\\gtid") => GlobalThreadId()
-  }
-
-  def convert(implicit e: ValExprPairContext): (Expr[G], Expr[G]) = e match {
-    case ValExprPair0(_, e1, _, e2) => (convert(e1), convert(e2))
-  }
-
-  def convert(implicit res: ValKeywordExprContext): Expr[G] = res match {
-    case ValNonePerm(_) => NoPerm()
-    case ValWrite(_) => WritePerm()
-    case ValRead(_) => ReadPerm()
-    case ValNoneOption(_) => OptNone()
-    case ValEmpty(_) => EmptyProcess()
-    case ValTrue(_) => tt
-    case ValFalse(_) => ff
-  }
+  def convert(implicit e: ValPrimaryContextContext): Expr[G] =
+    e match {
+      case ValPrimaryContext0("\\result") => AmbiguousResult()
+      case ValPrimaryContext1("\\current_thread") => CurrentThreadId()
+      case ValPrimaryContext2("\\ltid") => LocalThreadId()
+      case ValPrimaryContext3("\\gtid") => GlobalThreadId()
+    }
 
-  def convert(implicit ids: ValIdListContext): Seq[String] = ids match {
-    case ValIdList0(id) => Seq(convert(id))
-    case ValIdList1(id, _, ids) => convert(id) +: convert(ids)
-  }
+  def convert(implicit e: ValExprPairContext): (Expr[G], Expr[G]) =
+    e match { case ValExprPair0(_, e1, _, e2) => (convert(e1), convert(e2)) }
+
+  def convert(implicit res: ValKeywordExprContext): Expr[G] =
+    res match {
+      case ValNonePerm(_) => NoPerm()
+      case ValWrite(_) => WritePerm()
+      case ValRead(_) => ReadPerm()
+      case ValNoneOption(_) => OptNone()
+      case ValEmpty(_) => EmptyProcess()
+      case ValTrue(_) => tt
+      case ValFalse(_) => ff
+    }
 
-  def convert(implicit exps: ValExpressionListContext): Seq[Expr[G]] = exps match {
-    case ValExpressionList0(expr) => Seq(convert(expr))
-    case ValExpressionList1(head, _, tail) => convert(head) +: convert(tail)
-  }
+  def convert(implicit ids: ValIdListContext): Seq[String] =
+    ids match {
+      case ValIdList0(id) => Seq(convert(id))
+      case ValIdList1(id, _, ids) => convert(id) +: convert(ids)
+    }
 
-  def convert(implicit decl: ValGlobalDeclarationContext): GlobalDeclaration[G] = decl match {
-    case ValFunction(contract, modifiers, _, t, name, typeArgs, _, args, _, definition) =>
-      val contractCollector = new ContractCollector[G]()
-      contract.foreach(convert(_, contractCollector))
-
-      val modifierCollector = new ModifierCollector()
-      modifiers.foreach(convert(_, modifierCollector))
-
-      val namedOrigin = origin(decl).sourceName(convert(name))
-      new LlvmSpecFunction(
-        convert(name),
-        convert(t),
-        args.map(convert(_)).getOrElse(Nil),
-        Nil, // TODO implement
-        convert(definition),
-        contractCollector.consumeApplicableContract(blame(decl)),
-        modifierCollector.consume(modifierCollector.inline))(blame(decl)
-      )(namedOrigin)
-  }
+  def convert(implicit exps: ValExpressionListContext): Seq[Expr[G]] =
+    exps match {
+      case ValExpressionList0(expr) => Seq(convert(expr))
+      case ValExpressionList1(head, _, tail) => convert(head) +: convert(tail)
+    }
 
-  def convert(implicit definition: ValPureDefContext): Option[Expr[G]] = definition match {
-    case ValPureAbstractBody(_) => None
-    case ValPureBody(_, expr, _) => Some(convert(expr))
-  }
+  def convert(
+      implicit decl: ValGlobalDeclarationContext
+  ): GlobalDeclaration[G] =
+    decl match {
+      case ValFunction(
+            contract,
+            modifiers,
+            _,
+            t,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            definition,
+          ) =>
+        val contractCollector = new ContractCollector[G]()
+        contract.foreach(convert(_, contractCollector))
+
+        val modifierCollector = new ModifierCollector()
+        modifiers.foreach(convert(_, modifierCollector))
+
+        val namedOrigin = origin(decl).sourceName(convert(name))
+        new LlvmSpecFunction(
+          convert(name),
+          convert(t),
+          args.map(convert(_)).getOrElse(Nil),
+          Nil, // TODO implement
+          convert(definition),
+          contractCollector.consumeApplicableContract(blame(decl)),
+          modifierCollector.consume(modifierCollector.inline),
+        )(blame(decl))(namedOrigin)
+    }
 
-  def convert(mod: ValModifierContext, collector: ModifierCollector): Unit = mod match {
-    case ValModifier0(name) => name match {
-      case "pure" => collector.pure += mod
-      case "inline" => collector.inline += mod
-      case "thread_local" => collector.threadLocal += mod
-      case "bip_annotation" => collector.bipAnnotation += mod
+  def convert(implicit definition: ValPureDefContext): Option[Expr[G]] =
+    definition match {
+      case ValPureAbstractBody(_) => None
+      case ValPureBody(_, expr, _) => Some(convert(expr))
     }
-    case ValStatic(_) => collector.static += mod
-  }
 
+  def convert(mod: ValModifierContext, collector: ModifierCollector): Unit =
+    mod match {
+      case ValModifier0(name) =>
+        name match {
+          case "pure" => collector.pure += mod
+          case "inline" => collector.inline += mod
+          case "thread_local" => collector.threadLocal += mod
+          case "bip_annotation" => collector.bipAnnotation += mod
+        }
+      case ValStatic(_) => collector.static += mod
+    }
 
-}
\ No newline at end of file
+}
diff --git a/src/parsers/vct/parsers/transform/PVLToCol.scala b/src/parsers/vct/parsers/transform/PVLToCol.scala
index 0a481bd9e0..5e9d424fa6 100644
--- a/src/parsers/vct/parsers/transform/PVLToCol.scala
+++ b/src/parsers/vct/parsers/transform/PVLToCol.scala
@@ -17,1250 +17,1958 @@ import scala.annotation.nowarn
 import scala.collection.mutable
 
 @nowarn("msg=match may not be exhaustive&msg=Some\\(")
-case class PVLToCol[G](override val baseOrigin: Origin,
-                       override val blameProvider: BlameProvider,
-                       override val errors: Seq[(Token, Token, ExpectedError)])
-  extends ToCol[G](baseOrigin, blameProvider, errors) {
-  def convert(implicit program: ProgramContext): Seq[GlobalDeclaration[G]] = program match {
-    case Program0(decls, _, _) => decls.flatMap(convert(_))
-  }
-
-  def convert(implicit decl: ProgramDeclContext): Seq[GlobalDeclaration[G]] = decl match {
-    case ProgramDecl0(valDecl) => convert(valDecl)
-    case ProgramDecl1(cls) => Seq(convert(cls))
-    case ProgramDecl2(enum) => Seq(convert(enum))
-    case ProgramDecl3(method) => Seq(convertProcedure(method))
-    case ProgramDecl4(choreography) => Seq(convertChoreography(choreography))
-    case ProgramDecl5(vesuv_entry) => convert(vesuv_entry)
-  }
-
-  def convert(implicit enum: EnumDeclContext): Enum[G] = enum match {
-    case EnumDecl0(_, name, _, constants, _, _) =>
-      new vct.col.ast.Enum[G](constants.map(convertConstants(_)).getOrElse(Nil))(origin(enum).sourceName(convert(name)))
-  }
+case class PVLToCol[G](
+    override val baseOrigin: Origin,
+    override val blameProvider: BlameProvider,
+    override val errors: Seq[(Token, Token, ExpectedError)],
+) extends ToCol[G](baseOrigin, blameProvider, errors) {
+  def convert(implicit program: ProgramContext): Seq[GlobalDeclaration[G]] =
+    program match { case Program0(decls, _, _) => decls.flatMap(convert(_)) }
+
+  def convert(implicit decl: ProgramDeclContext): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case ProgramDecl0(valDecl) => convert(valDecl)
+      case ProgramDecl1(cls) => Seq(convert(cls))
+      case ProgramDecl2(enum) => Seq(convert(enum))
+      case ProgramDecl3(method) => Seq(convertProcedure(method))
+      case ProgramDecl4(choreography) => Seq(convertChoreography(choreography))
+      case ProgramDecl5(vesuv_entry) => convert(vesuv_entry)
+    }
 
-  def convertConstants(implicit identifierList: IdentifierListContext): Seq[EnumConstant[G]] = identifierList match {
-    case IdentifierList0(id) => Seq(new vct.col.ast.EnumConstant[G]()(origin(identifierList).sourceName(convert(id))))
-    case IdentifierList1(id, _, tail) => new vct.col.ast.EnumConstant[G]()(origin(identifierList).sourceName(convert(id))) +: convertConstants(tail)
-  }
+  def convert(implicit enum: EnumDeclContext): Enum[G] =
+    enum match {
+      case EnumDecl0(_, name, _, constants, _, _) =>
+        new vct.col.ast.Enum[G](constants.map(convertConstants(_)).getOrElse(
+          Nil
+        ))(origin(enum).sourceName(convert(name)))
+    }
 
-  def convert(implicit decl: SeqProgDeclContext): ClassDeclaration[G] = decl match {
-    case SeqProgMethod(method) => convert(method)
-    case PvlSeqRun(contract, _, body) =>
-      withContract(contract, contract =>
-        PVLChorRun(
-          convert(body),
-          contract.consumeApplicableContract(blame(decl))
-        )(blame(decl))(origin(decl).where(name = "run")))
-    case PvlEndpoint(_, name, _, ClassType0(endpointType, typeArgs), _, args, _, _) =>
-      new PVLEndpoint(
-        convert(name),
-        new UnresolvedRef[G, Class[G]](convert(endpointType)),
-        typeArgs.map(convert(_)).getOrElse(Seq()),
-        args.map(convert(_)).getOrElse(Nil))(blame(decl))(origin(decl).sourceName(convert(name))
-      )
-    case PvlEndpoint(_, name, _, t@ClassType0(_, Some(_)), _, args, _, _) => ??(t)
-  }
+  def convertConstants(
+      implicit identifierList: IdentifierListContext
+  ): Seq[EnumConstant[G]] =
+    identifierList match {
+      case IdentifierList0(id) =>
+        Seq(new vct.col.ast.EnumConstant[G]()(origin(identifierList).sourceName(
+          convert(id)
+        )))
+      case IdentifierList1(id, _, tail) =>
+        new vct.col.ast.EnumConstant[G]()(origin(identifierList).sourceName(
+          convert(id)
+        )) +: convertConstants(tail)
+    }
 
-  def convertChoreography(implicit decl: DeclVeyMontSeqProgContext): PVLChoreography[G] = decl match {
-    case DeclVeyMontSeqProg0(contract, _, name, _, args, _, _, decls, _) =>
-      withContract(contract, contract => {
-        new PVLChoreography(
+  def convert(implicit decl: SeqProgDeclContext): ClassDeclaration[G] =
+    decl match {
+      case SeqProgMethod(method) => convert(method)
+      case PvlSeqRun(contract, _, body) =>
+        withContract(
+          contract,
+          contract =>
+            PVLChorRun(
+              convert(body),
+              contract.consumeApplicableContract(blame(decl)),
+            )(blame(decl))(origin(decl).where(name = "run")),
+        )
+      case PvlEndpoint(
+            _,
+            name,
+            _,
+            ClassType0(endpointType, typeArgs),
+            _,
+            args,
+            _,
+            _,
+          ) =>
+        new PVLEndpoint(
           convert(name),
-          decls.map(convert(_)),
-          contract.consumeApplicableContract(blame(decl)),
-          args.map(convert(_)).getOrElse(Seq())
-        )(blame(decl))(origin(decl).sourceName(convert(name)))
-      })
-  }
-
-  def convertProcedure(implicit method: MethodContext): Procedure[G] = method match {
-    case Method0(contract, modifiers, returnType, name, typeArgs, _, args, _, body) =>
-      withModifiers(modifiers, mods => withContract(contract, contract => {
-        new Procedure(
-          convert(returnType),
+          new UnresolvedRef[G, Class[G]](convert(endpointType)),
+          typeArgs.map(convert(_)).getOrElse(Seq()),
           args.map(convert(_)).getOrElse(Nil),
-          outArgs = Nil,
-          typeArgs = typeArgs.map(convert(_)).getOrElse(Nil),
-          convert(body),
-          contract.consumeApplicableContract(blame(method)),
-          inline = mods.consume(mods.inline),
-          pure = mods.consume(mods.pure),
-        )(blame(method))(origin(method).sourceName(convert(name)))
-      }))
-  }
+        )(blame(decl))(origin(decl).sourceName(convert(name)))
+      case PvlEndpoint(_, name, _, t @ ClassType0(_, Some(_)), _, args, _, _) =>
+        ??(t)
+    }
 
-  def typeVar(identifier: IdentifierContext): Variable[G] =
-    new Variable(TType(TAnyValue()))(origin(identifier).sourceName(convert(identifier)))
+  def convertChoreography(
+      implicit decl: DeclVeyMontSeqProgContext
+  ): PVLChoreography[G] =
+    decl match {
+      case DeclVeyMontSeqProg0(contract, _, name, _, args, _, _, decls, _) =>
+        withContract(
+          contract,
+          contract => {
+            new PVLChoreography(
+              convert(name),
+              decls.map(convert(_)),
+              contract.consumeApplicableContract(blame(decl)),
+              args.map(convert(_)).getOrElse(Seq()),
+            )(blame(decl))(origin(decl).sourceName(convert(name)))
+          },
+        )
+    }
 
-  def convertVars(implicit ids: IdentifierListContext): Seq[Variable[G]] = ids match {
-    case IdentifierList0(identifier) => Seq(typeVar(identifier))
-    case IdentifierList1(identifier, _, identifiers) => typeVar(identifier) +: convertVars(identifiers)
-  }
+  def convertProcedure(implicit method: MethodContext): Procedure[G] =
+    method match {
+      case Method0(
+            contract,
+            modifiers,
+            returnType,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            body,
+          ) =>
+        withModifiers(
+          modifiers,
+          mods =>
+            withContract(
+              contract,
+              contract => {
+                new Procedure(
+                  convert(returnType),
+                  args.map(convert(_)).getOrElse(Nil),
+                  outArgs = Nil,
+                  typeArgs = typeArgs.map(convert(_)).getOrElse(Nil),
+                  convert(body),
+                  contract.consumeApplicableContract(blame(method)),
+                  inline = mods.consume(mods.inline),
+                  pure = mods.consume(mods.pure),
+                )(blame(method))(origin(method).sourceName(convert(name)))
+              },
+            ),
+        )
+    }
 
-  def convert(implicit cls: DeclClassContext): GlobalDeclaration[G] = cls match {
-    case DeclClass0(contract, _, name, typeArgs, _, decls, _) =>
-      withContract(contract, contract => {
-        new Class(
-          decls = decls.flatMap(convert(_)),
-          supports = Nil,
-          intrinsicLockInvariant = AstBuildHelpers.foldStar(contract.consume(contract.lock_invariant)),
-          typeArgs = typeArgs.map(convert(_)).getOrElse(Nil)
-        )(origin(cls).sourceName(convert(name)))
-      })
-  }
+  def typeVar(identifier: IdentifierContext): Variable[G] =
+    new Variable(TType(TAnyValue()))(
+      origin(identifier).sourceName(convert(identifier))
+    )
+
+  def convertVars(implicit ids: IdentifierListContext): Seq[Variable[G]] =
+    ids match {
+      case IdentifierList0(identifier) => Seq(typeVar(identifier))
+      case IdentifierList1(identifier, _, identifiers) =>
+        typeVar(identifier) +: convertVars(identifiers)
+    }
 
-  def convert(implicit decl: ClassDeclContext): Seq[ClassDeclaration[G]] = decl match {
-    case ClassDecl0(inner) => convert(inner, x => x)
-    case ClassDecl1(inner) => convert(inner)
-    case ClassDecl2(inner) => Seq(convert(inner))
-    case ClassDecl3(inner) => convert(inner)
-    case ClassDecl4(inner) => convert(inner)
-  }
+  def convert(implicit cls: DeclClassContext): GlobalDeclaration[G] =
+    cls match {
+      case DeclClass0(contract, _, name, typeArgs, _, decls, _) =>
+        withContract(
+          contract,
+          contract => {
+            new Class(
+              decls = decls.flatMap(convert(_)),
+              supports = Nil,
+              intrinsicLockInvariant = AstBuildHelpers
+                .foldStar(contract.consume(contract.lock_invariant)),
+              typeArgs = typeArgs.map(convert(_)).getOrElse(Nil),
+            )(origin(cls).sourceName(convert(name)))
+          },
+        )
+    }
 
-  def convert(implicit method: MethodContext): InstanceMethod[G] = method match {
-    case Method0(contract, modifiers, returnType, name, typeArgs, _, args, _, body) =>
-      withModifiers(modifiers, mods => withContract(contract, contract => {
-        new InstanceMethod(
-          convert(returnType),
-          args.map(convert(_)).getOrElse(Nil),
-          outArgs = Nil,
-          typeArgs = typeArgs.map(convert(_)).getOrElse(Nil),
-          convert(body),
-          contract.consumeApplicableContract(blame(method)),
-          inline = mods.consume(mods.inline),
-          pure = mods.consume(mods.pure),
-        )(blame(method))(origin(method).sourceName(convert(name)))
-      }))
-  }
+  def convert(implicit decl: ClassDeclContext): Seq[ClassDeclaration[G]] =
+    decl match {
+      case ClassDecl0(inner) => convert(inner, x => x)
+      case ClassDecl1(inner) => convert(inner)
+      case ClassDecl2(inner) => Seq(convert(inner))
+      case ClassDecl3(inner) => convert(inner)
+      case ClassDecl4(inner) => convert(inner)
+    }
 
-  def convert(implicit body: MethodBodyContext): Option[Statement[G]] = body match {
-    case MethodBody0(_) => None
-    case MethodBody1(stat) => Some(convert(stat))
-  }
+  def convert(implicit method: MethodContext): InstanceMethod[G] =
+    method match {
+      case Method0(
+            contract,
+            modifiers,
+            returnType,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            body,
+          ) =>
+        withModifiers(
+          modifiers,
+          mods =>
+            withContract(
+              contract,
+              contract => {
+                new InstanceMethod(
+                  convert(returnType),
+                  args.map(convert(_)).getOrElse(Nil),
+                  outArgs = Nil,
+                  typeArgs = typeArgs.map(convert(_)).getOrElse(Nil),
+                  convert(body),
+                  contract.consumeApplicableContract(blame(method)),
+                  inline = mods.consume(mods.inline),
+                  pure = mods.consume(mods.pure),
+                )(blame(method))(origin(method).sourceName(convert(name)))
+              },
+            ),
+        )
+    }
 
-  def convert(implicit constructor: ConstructorContext): Seq[ClassDeclaration[G]] = constructor match {
-    case Constructor0(contract, _, typeVars, _, args, _, body) =>
-      Seq(withContract(contract, contract =>
-        new PVLConstructor(contract.consumeApplicableContract(blame(constructor)), typeVars.map(convert(_)).getOrElse(Seq()),
-          args.map(convert(_)).getOrElse(Nil), convert(body)
-        )(blame(constructor))))
-  }
+  def convert(implicit body: MethodBodyContext): Option[Statement[G]] =
+    body match {
+      case MethodBody0(_) => None
+      case MethodBody1(stat) => Some(convert(stat))
+    }
 
-  def convert(implicit finalFlag: FinalFlagContext): FieldFlag[G] = finalFlag match {
-    case FinalFlag0(_) => Final()
-  }
+  def convert(
+      implicit constructor: ConstructorContext
+  ): Seq[ClassDeclaration[G]] =
+    constructor match {
+      case Constructor0(contract, _, typeVars, _, args, _, body) =>
+        Seq(withContract(
+          contract,
+          contract =>
+            new PVLConstructor(
+              contract.consumeApplicableContract(blame(constructor)),
+              typeVars.map(convert(_)).getOrElse(Seq()),
+              args.map(convert(_)).getOrElse(Nil),
+              convert(body),
+            )(blame(constructor)),
+        ))
+    }
 
-  def convert(implicit field: FieldContext): Seq[InstanceField[G]] = field match {
-    case Field0(finalFlag, t, ids, _) =>
-      convert(ids).map(name => new InstanceField[G](convert(t), finalFlag.map(convert(_)).toSeq)(origin(field).sourceName(name)))
-  }
+  def convert(implicit finalFlag: FinalFlagContext): FieldFlag[G] =
+    finalFlag match { case FinalFlag0(_) => Final() }
+
+  def convert(implicit field: FieldContext): Seq[InstanceField[G]] =
+    field match {
+      case Field0(finalFlag, t, ids, _) =>
+        convert(ids).map(name =>
+          new InstanceField[G](convert(t), finalFlag.map(convert(_)).toSeq)(
+            origin(field).sourceName(name)
+          )
+        )
+    }
 
-  def convert(implicit method: RunMethodContext): Seq[RunMethod[G]] = method match {
-    case RunMethod0(contract, _, maybeBody) =>
-      withContract(contract, contract =>
-        Seq(new RunMethod(convert(maybeBody), contract.consumeApplicableContract(blame(method)))(blame(method)))
-      )
-  }
+  def convert(implicit method: RunMethodContext): Seq[RunMethod[G]] =
+    method match {
+      case RunMethod0(contract, _, maybeBody) =>
+        withContract(
+          contract,
+          contract =>
+            Seq(
+              new RunMethod(
+                convert(maybeBody),
+                contract.consumeApplicableContract(blame(method)),
+              )(blame(method))
+            ),
+        )
+    }
 
-  def convert(implicit method: VesuvEntryContext): Seq[VeSUVMainMethod[G]] = method match {
-    case VesuvEntry0(_, maybeBody) =>
-      Seq(new VeSUVMainMethod(convert(maybeBody))(blame(method)))
-  }
+  def convert(implicit method: VesuvEntryContext): Seq[VeSUVMainMethod[G]] =
+    method match {
+      case VesuvEntry0(_, maybeBody) =>
+        Seq(new VeSUVMainMethod(convert(maybeBody))(blame(method)))
+    }
 
-  def convert(implicit args: ArgsContext): Seq[Variable[G]] = args match {
-    case Args0(t, name) => Seq(new Variable(convert(t))(origin(name).sourceName(convert(name))))
-    case Args1(t, name, _, args) =>
-      new Variable(convert(t))(origin(name).sourceName(convert(name))) +: convert(args)
-  }
+  def convert(implicit args: ArgsContext): Seq[Variable[G]] =
+    args match {
+      case Args0(t, name) =>
+        Seq(new Variable(convert(t))(origin(name).sourceName(convert(name))))
+      case Args1(t, name, _, args) =>
+        new Variable(convert(t))(origin(name).sourceName(convert(name))) +:
+          convert(args)
+    }
 
-  def convert(implicit exprs: ExprListContext): Seq[Expr[G]] = exprs match {
-    case ExprList0(e) => Seq(convert(e))
-    case ExprList1(e, _, es) => convert(e) +: convert(es)
-  }
+  def convert(implicit exprs: ExprListContext): Seq[Expr[G]] =
+    exprs match {
+      case ExprList0(e) => Seq(convert(e))
+      case ExprList1(e, _, es) => convert(e) +: convert(es)
+    }
 
-  def convert(implicit tuple: TupleContext): Seq[Expr[G]] = tuple match {
-    case Tuple0(_, exprs, _) => exprs.map(convert(_)).getOrElse(Nil)
-  }
+  def convert(implicit tuple: TupleContext): Seq[Expr[G]] =
+    tuple match {
+      case Tuple0(_, exprs, _) => exprs.map(convert(_)).getOrElse(Nil)
+    }
 
-  def convert(implicit exprs: NewDimsContext): Seq[Expr[G]] = exprs match {
-    case NewDims0(dims) => dims.map(convert(_))
-  }
+  def convert(implicit exprs: NewDimsContext): Seq[Expr[G]] =
+    exprs match { case NewDims0(dims) => dims.map(convert(_)) }
 
-  def convert(implicit dim: QuantifiedDimContext): Expr[G] = dim match {
-    case QuantifiedDim0(_, inner, _) => convert(inner)
-  }
+  def convert(implicit dim: QuantifiedDimContext): Expr[G] =
+    dim match { case QuantifiedDim0(_, inner, _) => convert(inner) }
 
-  def convert(implicit expr: ExprContext): Expr[G] = expr match {
-    case Expr0(pre, inner, post) =>
-      convertWith(pre, convertThen(post, convert(inner)))
-  }
+  def convert(implicit expr: ExprContext): Expr[G] =
+    expr match {
+      case Expr0(pre, inner, post) =>
+        convertWith(pre, convertThen(post, convert(inner)))
+    }
 
-  def convert(implicit expr: UnfoldingExprContext): Expr[G] = expr match {
-    case UnfoldingExpr0(_, pred, _, body) => Unfolding(convert(pred), convert(body))(blame(expr))
-    case UnfoldingExpr1(inner) => convert(inner)
-  }
+  def convert(implicit expr: UnfoldingExprContext): Expr[G] =
+    expr match {
+      case UnfoldingExpr0(_, pred, _, body) =>
+        Unfolding(convert(pred), convert(body))(blame(expr))
+      case UnfoldingExpr1(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: IteExprContext): Expr[G] = expr match {
-    case IteExpr0(cond, _, whenTrue, _, whenFalse) => Select(convert(cond), convert(whenTrue), convert(whenFalse))
-    case IteExpr1(inner) => convert(inner)
-  }
+  def convert(implicit expr: IteExprContext): Expr[G] =
+    expr match {
+      case IteExpr0(cond, _, whenTrue, _, whenFalse) =>
+        Select(convert(cond), convert(whenTrue), convert(whenFalse))
+      case IteExpr1(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: ImplicationExprContext): Expr[G] = expr match {
-    case ImplicationExpr0(left, specOp, right) => convert(expr, specOp, convert(left), convert(right))
-    case ImplicationExpr1(inner) => convert(inner)
-  }
+  def convert(implicit expr: ImplicationExprContext): Expr[G] =
+    expr match {
+      case ImplicationExpr0(left, specOp, right) =>
+        convert(expr, specOp, convert(left), convert(right))
+      case ImplicationExpr1(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: OrExprContext): Expr[G] = expr match {
-    case OrExpr0(left, _, right) => AmbiguousOr(convert(left), convert(right))
-    case OrExpr1(inner) => convert(inner)
-  }
+  def convert(implicit expr: OrExprContext): Expr[G] =
+    expr match {
+      case OrExpr0(left, _, right) => AmbiguousOr(convert(left), convert(right))
+      case OrExpr1(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: AndExprContext): Expr[G] = expr match {
-    case AndExpr0(left, _, right) => And(convert(left), convert(right))
-    case AndExpr1(left, specOp, right) => convert(expr, specOp, convert(left), convert(right))
-    case AndExpr2(inner) => convert(inner)
-  }
+  def convert(implicit expr: AndExprContext): Expr[G] =
+    expr match {
+      case AndExpr0(left, _, right) => And(convert(left), convert(right))
+      case AndExpr1(left, specOp, right) =>
+        convert(expr, specOp, convert(left), convert(right))
+      case AndExpr2(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: EqExprContext): Expr[G] = expr match {
-    case EqExpr0(left, _, right) => AmbiguousEq(convert(left), convert(right), TInt())
-    case EqExpr1(left, _, right) => AmbiguousNeq(convert(left), convert(right), TInt())
-    case EqExpr2(inner) => convert(inner)
-  }
+  def convert(implicit expr: EqExprContext): Expr[G] =
+    expr match {
+      case EqExpr0(left, _, right) =>
+        AmbiguousEq(convert(left), convert(right), TInt())
+      case EqExpr1(left, _, right) =>
+        AmbiguousNeq(convert(left), convert(right), TInt())
+      case EqExpr2(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: RelExprContext): Expr[G] = expr match {
-    case RelExpr0(left, _, right) => AmbiguousLess(convert(left), convert(right))
-    case RelExpr1(left, _, right) => AmbiguousLessEq(convert(left), convert(right))
-    case RelExpr2(left, _, right) => AmbiguousGreaterEq(convert(left), convert(right))
-    case RelExpr3(left, _, right) => AmbiguousGreater(convert(left), convert(right))
-    case RelExpr4(left, specOp, right) => convert(expr, specOp, convert(left), convert(right))
-    case RelExpr5(inner) => convert(inner)
-  }
+  def convert(implicit expr: RelExprContext): Expr[G] =
+    expr match {
+      case RelExpr0(left, _, right) =>
+        AmbiguousLess(convert(left), convert(right))
+      case RelExpr1(left, _, right) =>
+        AmbiguousLessEq(convert(left), convert(right))
+      case RelExpr2(left, _, right) =>
+        AmbiguousGreaterEq(convert(left), convert(right))
+      case RelExpr3(left, _, right) =>
+        AmbiguousGreater(convert(left), convert(right))
+      case RelExpr4(left, specOp, right) =>
+        convert(expr, specOp, convert(left), convert(right))
+      case RelExpr5(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: SetExprContext): Expr[G] = expr match {
-    case SetExpr0(x, _, xs) => AmbiguousMember(convert(x), convert(xs))
-    case SetExpr1(inner) => convert(inner)
-  }
+  def convert(implicit expr: SetExprContext): Expr[G] =
+    expr match {
+      case SetExpr0(x, _, xs) => AmbiguousMember(convert(x), convert(xs))
+      case SetExpr1(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: AddExprContext): Expr[G] = expr match {
-    case AddExpr0(left, _, right) => AmbiguousPlus(convert(left), convert(right))(blame(expr))
-    case AddExpr1(left, _, right) => AmbiguousMinus(convert(left), convert(right))(blame(expr))
-    case AddExpr2(inner) => convert(inner)
-  }
+  def convert(implicit expr: AddExprContext): Expr[G] =
+    expr match {
+      case AddExpr0(left, _, right) =>
+        AmbiguousPlus(convert(left), convert(right))(blame(expr))
+      case AddExpr1(left, _, right) =>
+        AmbiguousMinus(convert(left), convert(right))(blame(expr))
+      case AddExpr2(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: MultExprContext): Expr[G] = expr match {
-    case MultExpr0(left, _, right) => AmbiguousMult(convert(left), convert(right))
-    case MultExpr1(left, _, right) => AmbiguousDiv(convert(left), convert(right))(blame(expr))
-    case MultExpr2(left, _, right) => AmbiguousMod(convert(left), convert(right))(blame(expr))
-    case MultExpr3(left, specOp, right) => convert(expr, specOp, convert(left), convert(right))
-    case MultExpr4(inner) => convert(inner)
-  }
+  def convert(implicit expr: MultExprContext): Expr[G] =
+    expr match {
+      case MultExpr0(left, _, right) =>
+        AmbiguousMult(convert(left), convert(right))
+      case MultExpr1(left, _, right) =>
+        AmbiguousDiv(convert(left), convert(right))(blame(expr))
+      case MultExpr2(left, _, right) =>
+        AmbiguousMod(convert(left), convert(right))(blame(expr))
+      case MultExpr3(left, specOp, right) =>
+        convert(expr, specOp, convert(left), convert(right))
+      case MultExpr4(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: PowExprContext): Expr[G] = expr match {
-    case PowExpr0(left, _, right) => Exp(convert(left), convert(right))
-    case PowExpr1(inner) => convert(inner)
-  }
+  def convert(implicit expr: PowExprContext): Expr[G] =
+    expr match {
+      case PowExpr0(left, _, right) => Exp(convert(left), convert(right))
+      case PowExpr1(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: SeqAddExprContext): Expr[G] = expr match {
-    case SeqAddExpr0(left, _, right) => Cons(convert(left), convert(right))
-    case SeqAddExpr1(left, _, right) => ??(expr)
-    case SeqAddExpr2(m, _, _, k, _, v, _) => MapCons(convert(m), convert(k), convert(v))
-    case SeqAddExpr3(inner) => convert(inner)
-  }
+  def convert(implicit expr: SeqAddExprContext): Expr[G] =
+    expr match {
+      case SeqAddExpr0(left, _, right) => Cons(convert(left), convert(right))
+      case SeqAddExpr1(left, _, right) => ??(expr)
+      case SeqAddExpr2(m, _, _, k, _, v, _) =>
+        MapCons(convert(m), convert(k), convert(v))
+      case SeqAddExpr3(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: UnaryExprContext): Expr[G] = expr match {
-    case UnaryExpr0(_, inner) => Not(convert(inner))
-    case UnaryExpr1(_, inner) => UMinus(convert(inner))
-    case UnaryExpr2(op, inner) => convert(expr, op, convert(inner))
-    case UnaryExpr3(inner) => convert(inner)
-  }
+  def convert(implicit expr: UnaryExprContext): Expr[G] =
+    expr match {
+      case UnaryExpr0(_, inner) => Not(convert(inner))
+      case UnaryExpr1(_, inner) => UMinus(convert(inner))
+      case UnaryExpr2(op, inner) => convert(expr, op, convert(inner))
+      case UnaryExpr3(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: NewExprContext): Expr[G] = expr match {
-    case NewExpr0(_, name, Call0(typeArgs, args, given, yields)) =>
-      PVLNew(convert(name), typeArgs.map(convert(_)).getOrElse(Seq()), convert(args), convertGiven(given), convertYields(yields))(blame(expr))
-    case NewExpr1(_, t, dims) => NewArray(convert(t), convert(dims), moreDims = 0, true)(blame(expr))
-    case NewExpr2(inner) => convert(inner)
-  }
+  def convert(implicit expr: NewExprContext): Expr[G] =
+    expr match {
+      case NewExpr0(_, name, Call0(typeArgs, args, given, yields)) =>
+        PVLNew(
+          convert(name),
+          typeArgs.map(convert(_)).getOrElse(Seq()),
+          convert(args),
+          convertGiven(given),
+          convertYields(yields),
+        )(blame(expr))
+      case NewExpr1(_, t, dims) =>
+        NewArray(convert(t), convert(dims), moreDims = 0, true)(blame(expr))
+      case NewExpr2(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: PostfixExprContext): Expr[G] = expr match {
-    case PostfixExpr0(obj, _, field, None) => PVLDeref(convert(obj), convert(field))(blame(expr))
-    case PostfixExpr0(obj, _, field, Some(Call0(typeArgs, args, given, yields))) =>
-      PVLInvocation(Some(convert(obj)), convert(field), convert(args), typeArgs.map(convert(_)).getOrElse(Nil),
-        convertGiven(given), convertYields(yields))(blame(expr))
-    case PostfixExpr1(xs, _, i, _) => AmbiguousSubscript(convert(xs), convert(i))(blame(expr))
-    case PostfixExpr2(obj, specOp) => convert(expr, specOp, convert(obj))
-    case PostfixExpr3(inner) => convert(inner)
-  }
+  def convert(implicit expr: PostfixExprContext): Expr[G] =
+    expr match {
+      case PostfixExpr0(obj, _, field, None) =>
+        PVLDeref(convert(obj), convert(field))(blame(expr))
+      case PostfixExpr0(
+            obj,
+            _,
+            field,
+            Some(Call0(typeArgs, args, given, yields)),
+          ) =>
+        PVLInvocation(
+          Some(convert(obj)),
+          convert(field),
+          convert(args),
+          typeArgs.map(convert(_)).getOrElse(Nil),
+          convertGiven(given),
+          convertYields(yields),
+        )(blame(expr))
+      case PostfixExpr1(xs, _, i, _) =>
+        AmbiguousSubscript(convert(xs), convert(i))(blame(expr))
+      case PostfixExpr2(obj, specOp) => convert(expr, specOp, convert(obj))
+      case PostfixExpr3(inner) => convert(inner)
+    }
 
-  def convert(implicit expr: UnitContext): Expr[G] = expr match {
-    case PvlValExpr(inner) => convert(inner)
-    case PvlChorPerm(_, _, endpoint, _, _, loc, _, perm, _) =>
-      PVLChorPerm(
-        PVLEndpointName(convert(endpoint))(origin(endpoint)),
-        AmbiguousLocation(convert(loc))(blame(expr)),
-        convert(perm)
-      )
-    case PvlSender(_) => PVLSender()
-    case PvlReceiver(_) => PVLReceiver()
-    case PvlMessage(_) => PVLMessage()
-    case PvlThis(_) => AmbiguousThis()
-    case PvlNull(_) => Null()
-    case PvlNumber(n) => const(BigInt(n))
-    case PvlDecimal(n) => FloatValue(BigDecimal(n), PVL.float64)
-    case PvlDecimalF(s"${n}f") /* take off final "f" */ => FloatValue(BigDecimal(n), PVL.float32)
-    case PvlString(data) => StringValue(data.substring(1, data.length - 1))
-    case PvlChar(s"'$data'") => CharValue(data.codePointAt(0))
-    case PvlParens(_, inner, _) => convert(inner)
-    case PvlInvocation(id, None) => local(id, convert(id))
-    case PvlInvocation(id, Some(Call0(typeArgs, args, given, yields))) =>
-      PVLInvocation(None, convert(id), convert(args), typeArgs.map(convert(_)).getOrElse(Nil),
-        convertGiven(given), convertYields(yields))(blame(expr))
-    case PvlValAdtInvocation(inner) => convert(inner)
-  }
+  def convert(implicit expr: UnitContext): Expr[G] =
+    expr match {
+      case PvlValExpr(inner) => convert(inner)
+      case PvlChorPerm(_, _, endpoint, _, _, loc, _, perm, _) =>
+        PVLChorPerm(
+          PVLEndpointName(convert(endpoint))(origin(endpoint)),
+          AmbiguousLocation(convert(loc))(blame(expr)),
+          convert(perm),
+        )
+      case PvlSender(_) => PVLSender()
+      case PvlReceiver(_) => PVLReceiver()
+      case PvlMessage(_) => PVLMessage()
+      case PvlThis(_) => AmbiguousThis()
+      case PvlNull(_) => Null()
+      case PvlNumber(n) => const(BigInt(n))
+      case PvlDecimal(n) => FloatValue(BigDecimal(n), PVL.float64)
+      case PvlDecimalF(s"${n}f") /* take off final "f" */ =>
+        FloatValue(BigDecimal(n), PVL.float32)
+      case PvlString(data) => StringValue(data.substring(1, data.length - 1))
+      case PvlChar(s"'$data'") => CharValue(data.codePointAt(0))
+      case PvlParens(_, inner, _) => convert(inner)
+      case PvlInvocation(id, None) => local(id, convert(id))
+      case PvlInvocation(id, Some(Call0(typeArgs, args, given, yields))) =>
+        PVLInvocation(
+          None,
+          convert(id),
+          convert(args),
+          typeArgs.map(convert(_)).getOrElse(Nil),
+          convertGiven(given),
+          convertYields(yields),
+        )(blame(expr))
+      case PvlValAdtInvocation(inner) => convert(inner)
+    }
 
-  def convert(implicit stat: StatementContext): Statement[G] = stat match {
-    case PvlReturn(_, value, _) => Return(value.map(convert(_)).getOrElse(Void()))
-    case PvlLock(_, obj, _) => Lock(convert(obj))(blame(stat))
-    case PvlUnlock(_, obj, _) => Unlock(convert(obj))(blame(stat))
-    case PvlWait(_, obj, _) => Wait(convert(obj))(blame(stat))
-    case PvlNotify(_, obj, _) => Notify(convert(obj))(blame(stat))
-    case PvlFork(_, obj, _) => Fork(convert(obj))(blame(stat))
-    case PvlJoin(_, obj, _) => Join(convert(obj))(blame(stat))
-    case PvlValStatement(inner) => convert(inner)
-    case PvlIndetBranch(_, _, _, _, body, None) =>
-      IndetBranch(Seq(convert(body), Block(Nil)))
-    case PvlIndetBranch(_, _, _, _, body, Some(ElseBlock0(_, otherwise))) =>
-      IndetBranch(Seq(convert(body), convert(otherwise)))
-    case PvlIf(_, _, cond, _, body, None) =>
-      PVLBranch(Seq((convert(cond), convert(body))))(blame(stat))
-    case PvlIf(_, _, cond, _, body, Some(ElseBlock0(_, otherwise))) =>
-      PVLBranch(Seq(
-        (convert(cond), convert(body)),
-        (tt[G], convert(otherwise)),
-      ))(blame(stat))
-    case PvlBarrier(_, _, block, tags, _, body) =>
-      val (contract, content: Statement[G]) = body match {
-        case BarrierBody0(_, contract, _) => (contract, Block[G](Nil))
-        case BarrierBody1(contract, content) => (contract, convert(content))
-      }
-
-      withContract(contract, contract => {
-        ParBarrier(
-        block = new UnresolvedRef[G, ParBlockDecl[G]](convert(block)),
-          invs = tags.map(convert(_)).getOrElse(Nil),
-          AstBuildHelpers.foldStar(contract.consume(contract.requires)),
-          AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
-          content,
+  def convert(implicit stat: StatementContext): Statement[G] =
+    stat match {
+      case PvlReturn(_, value, _) =>
+        Return(value.map(convert(_)).getOrElse(Void()))
+      case PvlLock(_, obj, _) => Lock(convert(obj))(blame(stat))
+      case PvlUnlock(_, obj, _) => Unlock(convert(obj))(blame(stat))
+      case PvlWait(_, obj, _) => Wait(convert(obj))(blame(stat))
+      case PvlNotify(_, obj, _) => Notify(convert(obj))(blame(stat))
+      case PvlFork(_, obj, _) => Fork(convert(obj))(blame(stat))
+      case PvlJoin(_, obj, _) => Join(convert(obj))(blame(stat))
+      case PvlValStatement(inner) => convert(inner)
+      case PvlIndetBranch(_, _, _, _, body, None) =>
+        IndetBranch(Seq(convert(body), Block(Nil)))
+      case PvlIndetBranch(_, _, _, _, body, Some(ElseBlock0(_, otherwise))) =>
+        IndetBranch(Seq(convert(body), convert(otherwise)))
+      case PvlIf(_, _, cond, _, body, None) =>
+        PVLBranch(Seq((convert(cond), convert(body))))(blame(stat))
+      case PvlIf(_, _, cond, _, body, Some(ElseBlock0(_, otherwise))) =>
+        PVLBranch(
+          Seq((convert(cond), convert(body)), (tt[G], convert(otherwise)))
         )(blame(stat))
-      })
-    case PvlPar(impl) =>
-      ParStatement(convert(impl))
-    case PvlVec(_, _, iter, _, body) =>
-      ??(stat)
-    case PvlInvariant(_, name, _, res, _, body) =>
-      ParInvariant(
-        new ParInvariantDecl()(origin(stat).sourceName(convert(name))),
-        convert(res), convert(body)
-      )(blame(stat))
-    case PvlAtomic(_, _, invs, _, body) =>
-      ParAtomic(convert(invs).map(new UnresolvedRef[G, ParInvariantDecl[G]](_)), convert(body))(blame(stat))
-    case PvlWhile(contract, _, _, cond, _, body) =>
-      withContract(contract, contract =>
-        Scope(Nil, PVLLoop(Block(Nil), convert(cond), Block(Nil), contract.consumeLoopContract(stat), convert(body))(blame(stat)))
-      )
-    case PvlFor(contract, _, _, init, _, cond, _, update, _, body) =>
-      withContract(contract, contract =>
-        Scope(Nil, Loop(
-          init.map(convert(_)).getOrElse(Block(Nil)),
-          cond.map(convert(_)).getOrElse(tt),
-          update.map(convert(_)).getOrElse(Block(Nil)),
-          contract.consumeLoopContract(stat),
-          convert(body)
-        ))
-      )
-    case PvlRangedFor(contract, _, _, iter, _, body) =>
-      withContract(contract, contract =>
-        Scope(Nil, RangedFor(convert(iter),
-          contract.consumeLoopContract(stat),
-          convert(body))))
-    case PvlBlock(inner) => convert(inner)
-    case PvlGoto(_, label, _) => Goto(new UnresolvedRef[G, LabelDecl[G]](convert(label)))
-    case PvlLabel(_, label, _) => Label(new LabelDecl()(origin(stat).sourceName(convert(label))), Block(Nil))
-    case PvlForStatement(inner, _) => convert(inner)
-    case comm @ PvlCommunicateStatement(inv, _, to, Direction0("<-"), from, _) =>
-      convertCommunicate(inv, to, from)(comm)
-    case comm @ PvlCommunicateStatement(inv, _, from, Direction1("->"), to, _) =>
-      convertCommunicate(inv, to, from)(comm)
-  }
+      case PvlBarrier(_, _, block, tags, _, body) =>
+        val (contract, content: Statement[G]) =
+          body match {
+            case BarrierBody0(_, contract, _) => (contract, Block[G](Nil))
+            case BarrierBody1(contract, content) => (contract, convert(content))
+          }
+
+        withContract(
+          contract,
+          contract => {
+            ParBarrier(
+              block = new UnresolvedRef[G, ParBlockDecl[G]](convert(block)),
+              invs = tags.map(convert(_)).getOrElse(Nil),
+              AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+              AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
+              content,
+            )(blame(stat))
+          },
+        )
+      case PvlPar(impl) => ParStatement(convert(impl))
+      case PvlVec(_, _, iter, _, body) => ??(stat)
+      case PvlInvariant(_, name, _, res, _, body) =>
+        ParInvariant(
+          new ParInvariantDecl()(origin(stat).sourceName(convert(name))),
+          convert(res),
+          convert(body),
+        )(blame(stat))
+      case PvlAtomic(_, _, invs, _, body) =>
+        ParAtomic(
+          convert(invs).map(new UnresolvedRef[G, ParInvariantDecl[G]](_)),
+          convert(body),
+        )(blame(stat))
+      case PvlWhile(contract, _, _, cond, _, body) =>
+        withContract(
+          contract,
+          contract =>
+            Scope(
+              Nil,
+              PVLLoop(
+                Block(Nil),
+                convert(cond),
+                Block(Nil),
+                contract.consumeLoopContract(stat),
+                convert(body),
+              )(blame(stat)),
+            ),
+        )
+      case PvlFor(contract, _, _, init, _, cond, _, update, _, body) =>
+        withContract(
+          contract,
+          contract =>
+            Scope(
+              Nil,
+              Loop(
+                init.map(convert(_)).getOrElse(Block(Nil)),
+                cond.map(convert(_)).getOrElse(tt),
+                update.map(convert(_)).getOrElse(Block(Nil)),
+                contract.consumeLoopContract(stat),
+                convert(body),
+              ),
+            ),
+        )
+      case PvlRangedFor(contract, _, _, iter, _, body) =>
+        withContract(
+          contract,
+          contract =>
+            Scope(
+              Nil,
+              RangedFor(
+                convert(iter),
+                contract.consumeLoopContract(stat),
+                convert(body),
+              ),
+            ),
+        )
+      case PvlBlock(inner) => convert(inner)
+      case PvlGoto(_, label, _) =>
+        Goto(new UnresolvedRef[G, LabelDecl[G]](convert(label)))
+      case PvlLabel(_, label, _) =>
+        Label(
+          new LabelDecl()(origin(stat).sourceName(convert(label))),
+          Block(Nil),
+        )
+      case PvlForStatement(inner, _) => convert(inner)
+      case comm @ PvlCommunicateStatement(
+            inv,
+            _,
+            to,
+            Direction0("<-"),
+            from,
+            _,
+          ) =>
+        convertCommunicate(inv, to, from)(comm)
+      case comm @ PvlCommunicateStatement(
+            inv,
+            _,
+            from,
+            Direction1("->"),
+            to,
+            _,
+          ) =>
+        convertCommunicate(inv, to, from)(comm)
+    }
 
-  def convertCommunicate(inv: Option[ChannelInvariantContext], to: AccessContext, from: AccessContext)(implicit node: ParserRuleContext): Statement[G] = {
+  def convertCommunicate(
+      inv: Option[ChannelInvariantContext],
+      to: AccessContext,
+      from: AccessContext,
+  )(implicit node: ParserRuleContext): Statement[G] = {
     val Access0(receiver, target) = to
     val Access0(sender, msg) = from
-    val comm = PVLCommunicate[G](
-      receiver.map(convertParticipant(_)),
-      convert(target),
-      sender.map(convertParticipant(_)),
-      convert(msg)
-    )(blame(node))
+    val comm =
+      PVLCommunicate[G](
+        receiver.map(convertParticipant(_)),
+        convert(target),
+        sender.map(convertParticipant(_)),
+        convert(msg),
+      )(blame(node))
     inv match {
-      case Some(node @ ChannelInvariant0(_, inv, _)) => PVLChannelInvariant[G](comm, convert(inv))(origin(node))
+      case Some(node @ ChannelInvariant0(_, inv, _)) =>
+        PVLChannelInvariant[G](comm, convert(inv))(origin(node))
       case None => comm
     }
   }
 
-  def convertParticipant(implicit participant: ParticipantContext): PVLEndpointName[G] = participant match {
-    case Participant0(name, _) => PVLEndpointName(convert(name))
-  }
+  def convertParticipant(
+      implicit participant: ParticipantContext
+  ): PVLEndpointName[G] =
+    participant match {
+      case Participant0(name, _) => PVLEndpointName(convert(name))
+    }
 
   def convert(implicit stat: ForStatementListContext): Statement[G] =
     Block(convertList(stat))
 
-  def convertList(implicit stat: ForStatementListContext): Seq[Statement[G]] = stat match {
-    case ForStatementList0(stat) => Seq(convert(stat))
-    case ForStatementList1(stat, _, stats) => convert(stat) +: convertList(stats)
-  }
-
-  def convert(implicit stat: AllowedForStatementContext): Statement[G] = stat match {
-    case PvlLocal(t, decls) =>
-      Block(convert(decls, convert(t)))
-    case PvlEval(e) => Eval(convert(e))
-    case PvlIncDec(name, op) =>
-      val target = PVLLocal[G](convert(name))(blame(stat))
-      Eval(op match {
-        case "++" => PostAssignExpression[G](target, target + const(1))(blame(stat))
-        case "--" => PostAssignExpression[G](target, target - const(1))(blame(stat))
-      })
-    case PvlAssign(target, _, value) => Assign(convert(target), convert(value))(blame(stat))
-    case PvlSeqAssign(participant, receiver, _, _, value) =>
-      PVLChorStatement(participant.map(convertParticipant(_)), Assign(convert(receiver), convert(value))(blame(stat)))(blame(stat))
-  }
-
-  def convert(implicit region: ParRegionContext): ParRegion[G] = region match {
-    case PvlParallel(_, _, regions, _) => ParParallel(regions.map(convert(_)))(blame(region))
-    case PvlSequential(_, _, regions, _) => ParSequential(regions.map(convert(_)))(blame(region))
-    case PvlParBlock(_, name, iter, contract, impl) =>
-      withContract(contract, contract => {
-        val decl = name match {
-          case None => new ParBlockDecl[G]()
-          case Some(name) => new ParBlockDecl[G]()(origin(region).sourceName(convert(name)))
-        }
-        ParBlock(
-          decl,
-          iter.map(convert(_)).getOrElse(Nil),
-          AstBuildHelpers.foldStar(contract.consume(contract.context_everywhere)),
-          AstBuildHelpers.foldStar(contract.consume(contract.requires)),
-          AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
-          convert(impl),
-        )(blame(region))
-      })
-  }
+  def convertList(implicit stat: ForStatementListContext): Seq[Statement[G]] =
+    stat match {
+      case ForStatementList0(stat) => Seq(convert(stat))
+      case ForStatementList1(stat, _, stats) =>
+        convert(stat) +: convertList(stats)
+    }
 
-  def convert(implicit iters: ParBlockIterContext): Seq[IterVariable[G]] = iters match {
-    case ParBlockIter0(_, iters, _) => convert(iters)
-  }
+  def convert(implicit stat: AllowedForStatementContext): Statement[G] =
+    stat match {
+      case PvlLocal(t, decls) => Block(convert(decls, convert(t)))
+      case PvlEval(e) => Eval(convert(e))
+      case PvlIncDec(name, op) =>
+        val target = PVLLocal[G](convert(name))(blame(stat))
+        Eval(op match {
+          case "++" =>
+            PostAssignExpression[G](target, target + const(1))(blame(stat))
+          case "--" =>
+            PostAssignExpression[G](target, target - const(1))(blame(stat))
+        })
+      case PvlAssign(target, _, value) =>
+        Assign(convert(target), convert(value))(blame(stat))
+      case PvlSeqAssign(participant, receiver, _, _, value) =>
+        PVLChorStatement(
+          participant.map(convertParticipant(_)),
+          Assign(convert(receiver), convert(value))(blame(stat)),
+        )(blame(stat))
+    }
 
-  def convert(implicit decls: DeclListContext, t: Type[G]): Seq[Statement[G]] = decls match {
-    case DeclList0(name, None) =>
-      Seq(LocalDecl(new Variable(t)(origin(name).sourceName(convert(name)))))
-    case DeclList0(name, Some(DeclInit0(_, init))) =>
-      val v = new Variable(t)(origin(name).sourceName(convert(name)))
-      Seq(
-        LocalDecl(v),
-        Assign(Local(v.ref[Variable[G]]), convert(init))(AssignLocalOk)
-      )
-    case DeclList1(name, None, _, more) =>
-      LocalDecl(new Variable(t)(origin(name).sourceName(convert(name)))) +:
-        convert(more, t)
-    case DeclList1(name, Some(DeclInit0(_, init)), _, more) =>
-      val v = new Variable[G](t)(origin(name).sourceName(convert(name)))
-      Seq(
-        LocalDecl[G](v),
-        Assign[G](Local(v.ref), convert(init))(AssignLocalOk)
-      ) ++ convert(more, t)
-  }
+  def convert(implicit region: ParRegionContext): ParRegion[G] =
+    region match {
+      case PvlParallel(_, _, regions, _) =>
+        ParParallel(regions.map(convert(_)))(blame(region))
+      case PvlSequential(_, _, regions, _) =>
+        ParSequential(regions.map(convert(_)))(blame(region))
+      case PvlParBlock(_, name, iter, contract, impl) =>
+        withContract(
+          contract,
+          contract => {
+            val decl =
+              name match {
+                case None => new ParBlockDecl[G]()
+                case Some(name) =>
+                  new ParBlockDecl[G]()(origin(region).sourceName(convert(
+                    name
+                  )))
+              }
+            ParBlock(
+              decl,
+              iter.map(convert(_)).getOrElse(Nil),
+              AstBuildHelpers
+                .foldStar(contract.consume(contract.context_everywhere)),
+              AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+              AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
+              convert(impl),
+            )(blame(region))
+          },
+        )
+    }
 
-  def convert(implicit block: BlockContext): Statement[G] = block match {
-    case Block0(_, stats, _) => Scope(Nil, Block(stats.map(convert(_))))
-  }
+  def convert(implicit iters: ParBlockIterContext): Seq[IterVariable[G]] =
+    iters match { case ParBlockIter0(_, iters, _) => convert(iters) }
+
+  def convert(implicit decls: DeclListContext, t: Type[G]): Seq[Statement[G]] =
+    decls match {
+      case DeclList0(name, None) =>
+        Seq(LocalDecl(new Variable(t)(origin(name).sourceName(convert(name)))))
+      case DeclList0(name, Some(DeclInit0(_, init))) =>
+        val v = new Variable(t)(origin(name).sourceName(convert(name)))
+        Seq(
+          LocalDecl(v),
+          Assign(Local(v.ref[Variable[G]]), convert(init))(AssignLocalOk),
+        )
+      case DeclList1(name, None, _, more) =>
+        LocalDecl(new Variable(t)(origin(name).sourceName(convert(name)))) +:
+          convert(more, t)
+      case DeclList1(name, Some(DeclInit0(_, init)), _, more) =>
+        val v = new Variable[G](t)(origin(name).sourceName(convert(name)))
+        Seq(
+          LocalDecl[G](v),
+          Assign[G](Local(v.ref), convert(init))(AssignLocalOk),
+        ) ++ convert(more, t)
+    }
 
-  def convert(implicit tags: BarrierTagsContext): Seq[Ref[G, ParInvariantDecl[G]]] = tags match {
-    case BarrierTags0(_, ids) =>
-      convert(ids).map(new UnresolvedRef[G, ParInvariantDecl[G]](_))
-  }
+  def convert(implicit block: BlockContext): Statement[G] =
+    block match {
+      case Block0(_, stats, _) => Scope(Nil, Block(stats.map(convert(_))))
+    }
 
-  def convert(implicit iters: ItersContext): Seq[IterVariable[G]] = iters match {
-    case Iters0(iter) => Seq(convert(iter))
-    case Iters1(iter, _, iters) => convert(iter) +: convert(iters)
-  }
+  def convert(
+      implicit tags: BarrierTagsContext
+  ): Seq[Ref[G, ParInvariantDecl[G]]] =
+    tags match {
+      case BarrierTags0(_, ids) =>
+        convert(ids).map(new UnresolvedRef[G, ParInvariantDecl[G]](_))
+    }
 
-  def convert(implicit iter: IterContext): IterVariable[G] = iter match {
-    case Iter0(t, name, _, from, _, to) =>
-      IterVariable(
-        new Variable(convert(t))(origin(name).sourceName(convert(name))),
-        convert(from), convert(to)
-      )
-  }
+  def convert(implicit iters: ItersContext): Seq[IterVariable[G]] =
+    iters match {
+      case Iters0(iter) => Seq(convert(iter))
+      case Iters1(iter, _, iters) => convert(iter) +: convert(iters)
+    }
 
-  def convert(implicit wait: ParWaitListContext): Seq[Ref[G, ParBlockDecl[G]]] = ??(wait)
+  def convert(implicit iter: IterContext): IterVariable[G] =
+    iter match {
+      case Iter0(t, name, _, from, _, to) =>
+        IterVariable(
+          new Variable(convert(t))(origin(name).sourceName(convert(name))),
+          convert(from),
+          convert(to),
+        )
+    }
 
-  def convert(implicit t: TypeContext): Type[G] = t match {
-    case Type0(inner, dims) =>
-      FuncTools.repeat(TArray[G](_), dims.map(convert(_)).getOrElse(0), convert(inner))
-  }
+  def convert(implicit wait: ParWaitListContext): Seq[Ref[G, ParBlockDecl[G]]] =
+    ??(wait)
+
+  def convert(implicit t: TypeContext): Type[G] =
+    t match {
+      case Type0(inner, dims) =>
+        FuncTools.repeat(
+          TArray[G](_),
+          dims.map(convert(_)).getOrElse(0),
+          convert(inner),
+        )
+    }
 
-  def convert(implicit ts: TypeListContext): Seq[Type[G]] = ts match {
-    case TypeList0(t) => Seq(convert(t))
-    case TypeList1(t, _, ts) => convert(t) +: convert(ts)
-  }
+  def convert(implicit ts: TypeListContext): Seq[Type[G]] =
+    ts match {
+      case TypeList0(t) => Seq(convert(t))
+      case TypeList1(t, _, ts) => convert(t) +: convert(ts)
+    }
 
-  def convert(implicit dims: TypeDimsContext): Int = dims match {
-    case TypeDims0(dims) => dims.size
-    case TypeDims1(dims) => dims.size
-  }
+  def convert(implicit dims: TypeDimsContext): Int =
+    dims match {
+      case TypeDims0(dims) => dims.size
+      case TypeDims1(dims) => dims.size
+    }
 
-  def convert(implicit t: NonArrayTypeContext): Type[G] = t match {
-    case NonArrayType0(inner) => convert(inner)
-    case NonArrayType1(name) => name match {
-      case "int" => TInt()
-      case "boolean" => TBool()
-      case "void" => TVoid()
-      case "float32" => PVL.float32
-      case "float64" => PVL.float64
-      case "char" => TChar()
-    }
-    case NonArrayType2(inner) => convert(inner)
-  }
+  def convert(implicit t: NonArrayTypeContext): Type[G] =
+    t match {
+      case NonArrayType0(inner) => convert(inner)
+      case NonArrayType1(name) =>
+        name match {
+          case "int" => TInt()
+          case "boolean" => TBool()
+          case "void" => TVoid()
+          case "float32" => PVL.float32
+          case "float64" => PVL.float64
+          case "char" => TChar()
+        }
+      case NonArrayType2(inner) => convert(inner)
+    }
 
-  def convert(implicit t: ClassTypeContext): Type[G] = t match {
-    case ClassType0(name, typeArgs) => PVLNamedType(convert(name), typeArgs.map(convert(_)).getOrElse(Nil))
-  }
+  def convert(implicit t: ClassTypeContext): Type[G] =
+    t match {
+      case ClassType0(name, typeArgs) =>
+        PVLNamedType(convert(name), typeArgs.map(convert(_)).getOrElse(Nil))
+    }
 
-  def convert(implicit ts: TypeArgsContext): Seq[Type[G]] = ts match {
-    case TypeArgs0(_, ts, _) => convert(ts)
-  }
+  def convert(implicit ts: TypeArgsContext): Seq[Type[G]] =
+    ts match { case TypeArgs0(_, ts, _) => convert(ts) }
 
-  def convert(implicit ts: DeclaredTypeArgsContext): Seq[Variable[G]] = ts match {
-    case DeclaredTypeArgs0(_, names, _) =>
-      convert(names).map(name => new Variable(TType(TAnyValue()))(origin(ts).sourceName(name)))
-  }
+  def convert(implicit ts: DeclaredTypeArgsContext): Seq[Variable[G]] =
+    ts match {
+      case DeclaredTypeArgs0(_, names, _) =>
+        convert(names).map(name =>
+          new Variable(TType(TAnyValue()))(origin(ts).sourceName(name))
+        )
+    }
 
-  def convert(implicit ids: IdentifierListContext): Seq[String] = ids match {
-    case IdentifierList0(id) => Seq(convert(id))
-    case IdentifierList1(id, _, ids) => convert(id) +: convert(ids)
-  }
+  def convert(implicit ids: IdentifierListContext): Seq[String] =
+    ids match {
+      case IdentifierList0(id) => Seq(convert(id))
+      case IdentifierList1(id, _, ids) => convert(id) +: convert(ids)
+    }
 
-  def convert(implicit id: IdentifierContext): String = id match {
-    case Identifier0(id) => id
-    case Identifier1(id) => id.substring(1, id.length - 1)
-  }
+  def convert(implicit id: IdentifierContext): String =
+    id match {
+      case Identifier0(id) => id
+      case Identifier1(id) => id.substring(1, id.length - 1)
+    }
 
-  def withContract[T](node: ContractContext, f: ContractCollector[G] => T): T = node match {
-    case Contract0(clauses) =>
-      val collector = new ContractCollector[G]()
-      clauses.foreach(convert(_, collector))
-      withCollector(collector, f)
-  }
+  def withContract[T](node: ContractContext, f: ContractCollector[G] => T): T =
+    node match {
+      case Contract0(clauses) =>
+        val collector = new ContractCollector[G]()
+        clauses.foreach(convert(_, collector))
+        withCollector(collector, f)
+    }
 
-  def convert(implicit decl: LangGlobalDeclContext): Seq[GlobalDeclaration[G]] = Nil
-  def convert(implicit decl: LangClassDeclContext): Seq[ClassDeclaration[G]] = Nil
+  def convert(implicit decl: LangGlobalDeclContext): Seq[GlobalDeclaration[G]] =
+    Nil
+  def convert(implicit decl: LangClassDeclContext): Seq[ClassDeclaration[G]] =
+    Nil
 
-  def convert(implicit stat: LangStatementContext): Statement[G] = stat match {
-    case LangStatement0(block) => convert(block)
-  }
+  def convert(implicit stat: LangStatementContext): Statement[G] =
+    stat match { case LangStatement0(block) => convert(block) }
 
-  def convert(implicit t: LangTypeContext): Type[G] = t match {
-    case LangType0(t) => convert(t)
-  }
+  def convert(implicit t: LangTypeContext): Type[G] =
+    t match { case LangType0(t) => convert(t) }
 
-  def convert(implicit e: LangExprContext): Expr[G] = e match {
-    case LangExpr0(e) => convert(e)
-  }
+  def convert(implicit e: LangExprContext): Expr[G] =
+    e match { case LangExpr0(e) => convert(e) }
 
-  def convert(implicit id: LangIdContext): String = id match {
-    case LangId0(id) => convert(id)
-  }
+  def convert(implicit id: LangIdContext): String =
+    id match { case LangId0(id) => convert(id) }
 
-  def convert(implicit n: LangConstIntContext): BigInt = n match {
-    case LangConstInt0(string) => BigInt(string)
-  }
+  def convert(implicit n: LangConstIntContext): BigInt =
+    n match { case LangConstInt0(string) => BigInt(string) }
 
   def local(ctx: ParserRuleContext, name: String): Expr[G] =
     PVLLocal(name)(blame(ctx))(origin(ctx))
 
-  def withCollector[T](collector: ContractCollector[G], f: ContractCollector[G] => T): T = {
+  def withCollector[T](
+      collector: ContractCollector[G],
+      f: ContractCollector[G] => T,
+  ): T = {
     val result = f(collector)
     collector.nodes.headOption match {
-      case Some(node) => fail(node, "This specification clause may not occur here")
+      case Some(node) =>
+        fail(node, "This specification clause may not occur here")
       case None => result
     }
   }
 
-  def withContract[T](node: Option[ValEmbedContractContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node: Option[ValEmbedContractContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withContract[T](node1: Option[ValEmbedContractContext], node2: Option[ValEmbedContractContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node1: Option[ValEmbedContractContext],
+      node2: Option[ValEmbedContractContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node1.foreach(convert(_, collector))
     node2.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withContract[T](node: Seq[ValContractClauseContext], f: ContractCollector[G] => T): T = {
+  def withContract[T](
+      node: Seq[ValContractClauseContext],
+      f: ContractCollector[G] => T,
+  ): T = {
     val collector = new ContractCollector[G]()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withCollector[T](collector: ModifierCollector, f: ModifierCollector => T): T = {
+  def withCollector[T](
+      collector: ModifierCollector,
+      f: ModifierCollector => T,
+  ): T = {
     val result = f(collector)
     collector.nodes.headOption match {
-      case Some(node) => fail(node, "This modifier cannot be attached to this declaration")
+      case Some(node) =>
+        fail(node, "This modifier cannot be attached to this declaration")
       case None => result
     }
   }
 
-  def withModifiers[T](node: Seq[ValModifierContext], f: ModifierCollector => T): T = {
+  def withModifiers[T](
+      node: Seq[ValModifierContext],
+      f: ModifierCollector => T,
+  ): T = {
     val collector = new ModifierCollector()
     node.foreach(convert(_, collector))
     withCollector(collector, f)
   }
 
-  def withModifiers[T](node: ValEmbedModifierContext, f: ModifierCollector => T): T = {
+  def withModifiers[T](
+      node: ValEmbedModifierContext,
+      f: ModifierCollector => T,
+  ): T = {
     val collector = new ModifierCollector()
     convert(node, collector)
     withCollector(collector, f)
   }
 
-  def convert(contract: ValEmbedContractContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValEmbedContract0(blocks) => blocks.foreach(convert(_, collector))
-  }
-
-  def convert(contract: ValEmbedContractBlockContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValEmbedContractBlock0(_, clauses, _) => clauses.foreach(convert(_, collector))
-    case ValEmbedContractBlock1(clauses) => clauses.foreach(convert(_, collector))
-  }
-
-  def convert(implicit contract: ValContractClauseContext, collector: ContractCollector[G]): Unit = contract match {
-    case ValContractClause0(_, ids, _) => collector.modifies ++= convert(ids).map((contract, _))
-    case ValContractClause1(_, ids, _) => collector.accessible ++= convert(ids).map((contract, _))
-    case ValContractClause2(_, exp, _) => collector.requires += ((contract, convert(exp)))
-    case ValContractClause3(_, exp, _) => collector.ensures += ((contract, convert(exp)))
-    case ValContractClause4(_, t, id, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName(convert(id)))
-      collector.given += ((contract, variable))
-    case ValContractClause5(_, t, id, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName(convert(id)))
-      collector.yields += ((contract, variable))
-    case ValContractClause6(_, exp, _) => collector.context_everywhere += ((contract, convert(exp)))
-    case ValContractClause7(_, exp, _) =>
-      collector.requires += ((contract, convert(exp)))
-      collector.ensures += ((contract, convert(exp)))
-    case ValContractClause8(_, exp, _) => collector.loop_invariant += ((contract, convert(exp)))
-    case ValContractClause9(_, exp, _) => collector.kernel_invariant += ((contract, convert(exp)))
-    case ValContractClause10(_, _, t, id, _, exp, _) =>
-      val variable = new Variable(convert(t))(origin(contract).sourceName(convert(id)))
-      collector.signals += ((contract, SignalsClause(variable, convert(exp))(OriginProvider(contract))))
-    case ValContractClause11(_, invariant, _) => collector.lock_invariant += ((contract, convert(invariant)))
-    case ValContractClause12(_, None, _) => collector.decreases += ((contract, DecreasesClauseNoRecursion()))
-    case ValContractClause12(_, Some(clause), _) => collector.decreases += ((contract, convert(clause)))
-  }
-
-  def convert(implicit clause: ValDecreasesMeasureContext): DecreasesClause[G] = clause match {
-    case ValDecreasesMeasure0(_) => DecreasesClauseAssume()
-    case ValDecreasesMeasure1(exps) => DecreasesClauseTuple(convert(exps))
-  }
-
-  def convert(mod: ValEmbedModifierContext, collector: ModifierCollector): Unit = mod match {
-    case ValEmbedModifier0(_, mod, _) => convert(mod, collector)
-    case ValEmbedModifier1(mod) => convert(mod, collector)
-  }
+  def convert(
+      contract: ValEmbedContractContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValEmbedContract0(blocks) => blocks.foreach(convert(_, collector))
+    }
 
-  def convert(mod: ValModifierContext, collector: ModifierCollector): Unit = mod match {
-    case ValModifier0(name) => name match {
-      case "pure" => collector.pure += mod
-      case "inline" => collector.inline += mod
-      case "thread_local" => collector.threadLocal += mod
+  def convert(
+      contract: ValEmbedContractBlockContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValEmbedContractBlock0(_, clauses, _) =>
+        clauses.foreach(convert(_, collector))
+      case ValEmbedContractBlock1(clauses) =>
+        clauses.foreach(convert(_, collector))
     }
-    case ValStatic(_) => collector.static += mod
-  }
 
-  def convertEmbedWith(implicit whiff: Option[ValEmbedWithContext], inner: Expr[G]): Expr[G] = whiff match {
-    case None => inner
-    case Some(ValEmbedWith0(_, whiff, _)) => convertWith(whiff, inner)
-    case Some(ValEmbedWith1(whiff)) => convertWith(Some(whiff), inner)
-  }
+  def convert(
+      implicit contract: ValContractClauseContext,
+      collector: ContractCollector[G],
+  ): Unit =
+    contract match {
+      case ValContractClause0(_, ids, _) =>
+        collector.modifies ++= convert(ids).map((contract, _))
+      case ValContractClause1(_, ids, _) =>
+        collector.accessible ++= convert(ids).map((contract, _))
+      case ValContractClause2(_, exp, _) =>
+        collector.requires += ((contract, convert(exp)))
+      case ValContractClause3(_, exp, _) =>
+        collector.ensures += ((contract, convert(exp)))
+      case ValContractClause4(_, t, id, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName(convert(id)))
+        collector.given += ((contract, variable))
+      case ValContractClause5(_, t, id, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName(convert(id)))
+        collector.yields += ((contract, variable))
+      case ValContractClause6(_, exp, _) =>
+        collector.context_everywhere += ((contract, convert(exp)))
+      case ValContractClause7(_, exp, _) =>
+        collector.requires += ((contract, convert(exp)))
+        collector.ensures += ((contract, convert(exp)))
+      case ValContractClause8(_, exp, _) =>
+        collector.loop_invariant += ((contract, convert(exp)))
+      case ValContractClause9(_, exp, _) =>
+        collector.kernel_invariant += ((contract, convert(exp)))
+      case ValContractClause10(_, _, t, id, _, exp, _) =>
+        val variable =
+          new Variable(convert(t))(origin(contract).sourceName(convert(id)))
+        collector.signals +=
+          ((
+            contract,
+            SignalsClause(variable, convert(exp))(OriginProvider(contract)),
+          ))
+      case ValContractClause11(_, invariant, _) =>
+        collector.lock_invariant += ((contract, convert(invariant)))
+      case ValContractClause12(_, None, _) =>
+        collector.decreases += ((contract, DecreasesClauseNoRecursion()))
+      case ValContractClause12(_, Some(clause), _) =>
+        collector.decreases += ((contract, convert(clause)))
+    }
 
-  def convertWith(implicit whiff: Option[ValWithContext], inner: Expr[G]): Expr[G] = whiff match {
-    case None => inner
-    case Some(whiff @ ValWith0(_, stat)) => With(convert(stat), inner)(origin(whiff))
-  }
+  def convert(implicit clause: ValDecreasesMeasureContext): DecreasesClause[G] =
+    clause match {
+      case ValDecreasesMeasure0(_) => DecreasesClauseAssume()
+      case ValDecreasesMeasure1(exps) => DecreasesClauseTuple(convert(exps))
+    }
 
-  def convertEmbedThen(implicit den: Option[ValEmbedThenContext], inner: Expr[G]): Expr[G] = den match {
-    case None => inner
-    case Some(ValEmbedThen0(_, den, _)) => convertThen(den, inner)
-    case Some(ValEmbedThen1(den)) => convertThen(Some(den), inner)
-  }
+  def convert(
+      mod: ValEmbedModifierContext,
+      collector: ModifierCollector,
+  ): Unit =
+    mod match {
+      case ValEmbedModifier0(_, mod, _) => convert(mod, collector)
+      case ValEmbedModifier1(mod) => convert(mod, collector)
+    }
 
-  def convertThen(implicit den: Option[ValThenContext], inner: Expr[G]): Expr[G] = den match {
-    case None => inner
-    case Some(den @ ValThen0(_, stat)) => Then(inner, convert(stat))(origin(den))
-  }
+  def convert(mod: ValModifierContext, collector: ModifierCollector): Unit =
+    mod match {
+      case ValModifier0(name) =>
+        name match {
+          case "pure" => collector.pure += mod
+          case "inline" => collector.inline += mod
+          case "thread_local" => collector.threadLocal += mod
+        }
+      case ValStatic(_) => collector.static += mod
+    }
 
-  def convert(implicit whiff: ValEmbedWithContext): Statement[G] = whiff match {
-    case ValEmbedWith0(_, Some(whiff), _) => convert(whiff)
-    case ValEmbedWith0(_, None, _) => Block(Nil)
-    case ValEmbedWith1(whiff) => convert(whiff)
-  }
+  def convertEmbedWith(
+      implicit whiff: Option[ValEmbedWithContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    whiff match {
+      case None => inner
+      case Some(ValEmbedWith0(_, whiff, _)) => convertWith(whiff, inner)
+      case Some(ValEmbedWith1(whiff)) => convertWith(Some(whiff), inner)
+    }
 
-  def convert(implicit whiff: ValWithContext): Statement[G] = whiff match {
-    case ValWith0(_, stat) => convert(stat)
-  }
+  def convertWith(
+      implicit whiff: Option[ValWithContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    whiff match {
+      case None => inner
+      case Some(whiff @ ValWith0(_, stat)) =>
+        With(convert(stat), inner)(origin(whiff))
+    }
 
-  def convert(implicit whiff: ValEmbedThenContext): Statement[G] = whiff match {
-    case ValEmbedThen0(_, Some(whiff), _) => convert(whiff)
-    case ValEmbedThen0(_, None, _) => Block(Nil)
-    case ValEmbedThen1(whiff) => convert(whiff)
-  }
+  def convertEmbedThen(
+      implicit den: Option[ValEmbedThenContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    den match {
+      case None => inner
+      case Some(ValEmbedThen0(_, den, _)) => convertThen(den, inner)
+      case Some(ValEmbedThen1(den)) => convertThen(Some(den), inner)
+    }
 
-  def convert(implicit whiff: ValThenContext): Statement[G] = whiff match {
-    case ValThen0(_, stat) => convert(stat)
-  }
+  def convertThen(
+      implicit den: Option[ValThenContext],
+      inner: Expr[G],
+  ): Expr[G] =
+    den match {
+      case None => inner
+      case Some(den @ ValThen0(_, stat)) =>
+        Then(inner, convert(stat))(origin(den))
+    }
 
-  def convertEmbedGiven(implicit given: Option[ValEmbedGivenContext]): Seq[(Ref[G, Variable[G]], Expr[G])] = given match {
-    case None => Nil
-    case Some(ValEmbedGiven0(_, inner, _)) => convertGiven(inner)
-    case Some(ValEmbedGiven1(inner)) => convertGiven(Some(inner))
-  }
+  def convert(implicit whiff: ValEmbedWithContext): Statement[G] =
+    whiff match {
+      case ValEmbedWith0(_, Some(whiff), _) => convert(whiff)
+      case ValEmbedWith0(_, None, _) => Block(Nil)
+      case ValEmbedWith1(whiff) => convert(whiff)
+    }
 
-  def convertGiven(implicit given: Option[ValGivenContext]): Seq[(Ref[G, Variable[G]], Expr[G])] = given match {
-    case None => Nil
-    case Some(ValGiven0(_, _, mappings, _)) => convert(mappings)
-  }
+  def convert(implicit whiff: ValWithContext): Statement[G] =
+    whiff match { case ValWith0(_, stat) => convert(stat) }
 
-  def convert(implicit mappings: ValGivenMappingsContext): Seq[(Ref[G, Variable[G]], Expr[G])] = mappings match {
-    case ValGivenMappings0(arg, _, v) => Seq((new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)))
-    case ValGivenMappings1(arg, _, v, _, more) => (new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)) +: convert(more)
-  }
+  def convert(implicit whiff: ValEmbedThenContext): Statement[G] =
+    whiff match {
+      case ValEmbedThen0(_, Some(whiff), _) => convert(whiff)
+      case ValEmbedThen0(_, None, _) => Block(Nil)
+      case ValEmbedThen1(whiff) => convert(whiff)
+    }
 
-  def convertEmbedYields(implicit given: Option[ValEmbedYieldsContext]): Seq[(Expr[G], Ref[G, Variable[G]])] = given match {
-    case None => Nil
-    case Some(ValEmbedYields0(_, inner, _)) => convertYields(inner)
-    case Some(ValEmbedYields1(inner)) => convertYields(Some(inner))
-  }
+  def convert(implicit whiff: ValThenContext): Statement[G] =
+    whiff match { case ValThen0(_, stat) => convert(stat) }
 
-  def convertYields(implicit given: Option[ValYieldsContext]): Seq[(Expr[G], Ref[G, Variable[G]])] = given match {
-    case None => Nil
-    case Some(ValYields0(_, _, mappings, _)) => convert(mappings)
-  }
+  def convertEmbedGiven(
+      implicit given: Option[ValEmbedGivenContext]
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    given match {
+      case None => Nil
+      case Some(ValEmbedGiven0(_, inner, _)) => convertGiven(inner)
+      case Some(ValEmbedGiven1(inner)) => convertGiven(Some(inner))
+    }
 
-  def convert(implicit mappings: ValYieldsMappingsContext): Seq[(Expr[G], Ref[G, Variable[G]])] = mappings match {
-    case ValYieldsMappings0(target, _, res) => Seq((local(target, convert(target)), new UnresolvedRef[G, Variable[G]](convert(res))))
-    case ValYieldsMappings1(target, _, res, _, more) => (local(target, convert(target)), new UnresolvedRef[G, Variable[G]](convert(res))) +: convert(more)
-  }
+  def convertGiven(
+      implicit given: Option[ValGivenContext]
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    given match {
+      case None => Nil
+      case Some(ValGiven0(_, _, mappings, _)) => convert(mappings)
+    }
 
-  def convert(implicit exprs: ValExpressionListContext): Seq[Expr[G]] = exprs match {
-    case ValExpressionList0(expr) => Seq(convert(expr))
-    case ValExpressionList1(head, _, tail) => convert(head) +: convert(tail)
-  }
+  def convert(
+      implicit mappings: ValGivenMappingsContext
+  ): Seq[(Ref[G, Variable[G]], Expr[G])] =
+    mappings match {
+      case ValGivenMappings0(arg, _, v) =>
+        Seq((new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)))
+      case ValGivenMappings1(arg, _, v, _, more) =>
+        (new UnresolvedRef[G, Variable[G]](convert(arg)), convert(v)) +:
+          convert(more)
+    }
 
-  def convert(implicit ids: ValIdListContext): Seq[String] = ids match {
-    case ValIdList0(id) => Seq(convert(id))
-    case ValIdList1(id, _, ids) => convert(id) +: convert(ids)
-  }
+  def convertEmbedYields(
+      implicit given: Option[ValEmbedYieldsContext]
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    given match {
+      case None => Nil
+      case Some(ValEmbedYields0(_, inner, _)) => convertYields(inner)
+      case Some(ValEmbedYields1(inner)) => convertYields(Some(inner))
+    }
 
-  def convert(implicit ts: ValTypeListContext): Seq[Type[G]] = ts match {
-    case ValTypeList0(t) => Seq(convert(t))
-    case ValTypeList1(t, _, ts) => convert(t) +: convert(ts)
-  }
+  def convertYields(
+      implicit given: Option[ValYieldsContext]
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    given match {
+      case None => Nil
+      case Some(ValYields0(_, _, mappings, _)) => convert(mappings)
+    }
 
-  def convert(implicit root: ParserRuleContext, impOp: ValImpOpContext, left: Expr[G], right: Expr[G]): Expr[G] = impOp match {
-    case ValImpOp0(_) => Wand(left, right)(origin(impOp))
-    case ValImpOp1(_) => Implies(left, right)(origin(impOp))
-  }
+  def convert(
+      implicit mappings: ValYieldsMappingsContext
+  ): Seq[(Expr[G], Ref[G, Variable[G]])] =
+    mappings match {
+      case ValYieldsMappings0(target, _, res) =>
+        Seq((
+          local(target, convert(target)),
+          new UnresolvedRef[G, Variable[G]](convert(res)),
+        ))
+      case ValYieldsMappings1(target, _, res, _, more) =>
+        (
+          local(target, convert(target)),
+          new UnresolvedRef[G, Variable[G]](convert(res)),
+        ) +: convert(more)
+    }
 
-  def convert(implicit root: ParserRuleContext, andOp: ValAndOpContext, left: Expr[G], right: Expr[G]): Expr[G] = andOp match {
-    case ValAndOp0(_) => col.Star(left, right)(origin(andOp))
-  }
+  def convert(implicit exprs: ValExpressionListContext): Seq[Expr[G]] =
+    exprs match {
+      case ValExpressionList0(expr) => Seq(convert(expr))
+      case ValExpressionList1(head, _, tail) => convert(head) +: convert(tail)
+    }
 
-  def convert(implicit root: ParserRuleContext, inOp: ValInOpContext, left: Expr[G], right: Expr[G]): Expr[G] = inOp match {
-    case ValInOp0(_) => AmbiguousMember(left, right)
-  }
+  def convert(implicit ids: ValIdListContext): Seq[String] =
+    ids match {
+      case ValIdList0(id) => Seq(convert(id))
+      case ValIdList1(id, _, ids) => convert(id) +: convert(ids)
+    }
 
-  def convert(implicit root: ParserRuleContext, mulOp: ValMulOpContext, left: Expr[G], right: Expr[G]): Expr[G] = mulOp match {
-    case ValMulOp0(_) => col.RatDiv(left, right)(blame(mulOp))
-  }
+  def convert(implicit ts: ValTypeListContext): Seq[Type[G]] =
+    ts match {
+      case ValTypeList0(t) => Seq(convert(t))
+      case ValTypeList1(t, _, ts) => convert(t) +: convert(ts)
+    }
 
-  def convert(implicit root: ParserRuleContext, prependOp: ValPrependOpContext, left: Expr[G], right: Expr[G]): Expr[G] = prependOp match {
-    case ValPrependOp0(_) => Cons(left, right)
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      impOp: ValImpOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    impOp match {
+      case ValImpOp0(_) => Wand(left, right)(origin(impOp))
+      case ValImpOp1(_) => Implies(left, right)(origin(impOp))
+    }
 
-  def convert(implicit root: ParserRuleContext, postfixOp: ValPostfixContext, xs: Expr[G]): Expr[G] = postfixOp match {
-    case ValPostfix0(_, _, to, _) => Take(xs, convert(to))
-    case ValPostfix1(_, from, _, None, _) => Drop(xs, convert(from))
-    case ValPostfix1(_, from, _, Some(to), _) => Slice(xs, convert(from), convert(to))
-    case ValPostfix2(_, idx, _, v, _) => SeqUpdate(xs, convert(idx), convert(v))
-    case ValPostfix3(_, name, _, args, _) => CoalesceInstancePredicateApply(xs, new UnresolvedRef[G, InstancePredicate[G]](convert(name)), args.map(convert(_)).getOrElse(Nil), WritePerm())
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      andOp: ValAndOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    andOp match { case ValAndOp0(_) => col.Star(left, right)(origin(andOp)) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      inOp: ValInOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] = inOp match { case ValInOp0(_) => AmbiguousMember(left, right) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      mulOp: ValMulOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] =
+    mulOp match { case ValMulOp0(_) => col.RatDiv(left, right)(blame(mulOp)) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      prependOp: ValPrependOpContext,
+      left: Expr[G],
+      right: Expr[G],
+  ): Expr[G] = prependOp match { case ValPrependOp0(_) => Cons(left, right) }
+
+  def convert(
+      implicit root: ParserRuleContext,
+      postfixOp: ValPostfixContext,
+      xs: Expr[G],
+  ): Expr[G] =
+    postfixOp match {
+      case ValPostfix0(_, _, to, _) => Take(xs, convert(to))
+      case ValPostfix1(_, from, _, None, _) => Drop(xs, convert(from))
+      case ValPostfix1(_, from, _, Some(to), _) =>
+        Slice(xs, convert(from), convert(to))
+      case ValPostfix2(_, idx, _, v, _) =>
+        SeqUpdate(xs, convert(idx), convert(v))
+      case ValPostfix3(_, name, _, args, _) =>
+        CoalesceInstancePredicateApply(
+          xs,
+          new UnresolvedRef[G, InstancePredicate[G]](convert(name)),
+          args.map(convert(_)).getOrElse(Nil),
+          WritePerm(),
+        )
+    }
 
-  def convert(implicit root: ParserRuleContext, prefixOp: ValPrefixContext, xs: Expr[G]): Expr[G] = prefixOp match {
-    case ValScale(_, scale, _) => Scale(convert(scale), xs)(blame(prefixOp))
-  }
+  def convert(
+      implicit root: ParserRuleContext,
+      prefixOp: ValPrefixContext,
+      xs: Expr[G],
+  ): Expr[G] =
+    prefixOp match {
+      case ValScale(_, scale, _) => Scale(convert(scale), xs)(blame(prefixOp))
+    }
 
-  def convert(implicit block: ValEmbedStatementBlockContext): Statement[G] = block match {
-    case ValEmbedStatementBlock0(_, stats, _) => Block(stats.map(convert(_)))
-    case ValEmbedStatementBlock1(stats) => Block(stats.map(convert(_)))
-    case ValEmbedStatementBlock2(_, _, _, stat) => Extract(convert(stat))
-    case ValEmbedStatementBlock3(_, _, clauses, _, _, body, _, _, _) =>
-      withContract(clauses, contract => {
-        FramedProof(
-          AstBuildHelpers.foldStar(contract.consume(contract.requires)),
-          Block(body.map(convert(_))),
-          AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
-        )(blame(block))
-      })
-  }
+  def convert(implicit block: ValEmbedStatementBlockContext): Statement[G] =
+    block match {
+      case ValEmbedStatementBlock0(_, stats, _) => Block(stats.map(convert(_)))
+      case ValEmbedStatementBlock1(stats) => Block(stats.map(convert(_)))
+      case ValEmbedStatementBlock2(_, _, _, stat) => Extract(convert(stat))
+      case ValEmbedStatementBlock3(_, _, clauses, _, _, body, _, _, _) =>
+        withContract(
+          clauses,
+          contract => {
+            FramedProof(
+              AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+              Block(body.map(convert(_))),
+              AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
+            )(blame(block))
+          },
+        )
+    }
 
-  def convert(implicit stat: ValStatementContext): Statement[G] = stat match {
-    case ValPackage(_, expr, innerStat) => WandPackage(convert(expr), convert(innerStat))(blame(stat))
-    case ValApplyWand(_, wand, _) => WandApply(convert(wand))(blame(stat))
-    case ValFold(_, predicate, _) =>
-      Fold(convert(predicate))(blame(stat))
-    case ValUnfold(_, predicate, _) =>
-      Unfold(convert(predicate))(blame(stat))
-    case ValOpen(_, _, _) => ??(stat)
-    case ValClose(_, _, _) => ??(stat)
-    case ValAssert(_, assn, _) => Assert(convert(assn))(blame(stat))
-    case ValAssume(_, assn, _) => Assume(convert(assn))
-    case ValInhale(_, resource, _) => Inhale(convert(resource))
-    case ValExhale(_, resource, _) => Exhale(convert(resource))(blame(stat))
-    case ValLabel(_, label, _) =>
-      Label(new LabelDecl()(origin(stat).sourceName(convert(label))), Block(Nil))
-    case ValRefute(_, assn, _) => Refute(convert(assn))(blame(stat))
-    case ValWitness(_, _, _) => ??(stat)
-    case ValGhost(_, stat) => convert(stat)
-    case ValSend(_, name, _, delta, _, resource, _) =>
-      Send(new SendDecl()(origin(stat).sourceName(convert(name))), convert(delta), convert(resource))(blame(stat))
-    case ValRecv(_, name, _) =>
-      Recv(new UnresolvedRef[G, SendDecl[G]](convert(name)))
-    case ValTransfer(_, _, _) => ??(stat)
-    case ValCslSubject(_, _, _) => ??(stat) // FIXME PB: csl_subject seems to be used
-    case ValSpecIgnoreStart(_, _) => SpecIgnoreEnd()
-    case ValSpecIgnoreEnd(_, _) => SpecIgnoreStart()
-    case ValActionModel(_, _, model, _, perm, _, after, _, action, _, impl) =>
-      ModelDo(convert(model), convert(perm), convert(after), convert(action), impl match {
-        case ValActionImpl0(_) => Block(Nil)
-        case ValActionImpl1(inner) => convert(inner)
-      })
-    case ValAtomic(_, _, invariant, _, body) =>
-      ParAtomic(Seq(new UnresolvedRef[G, ParInvariantDecl[G]](convert(invariant))), convert(body))(blame(stat))
-    case ValCommit(_, obj, _) =>
-      Commit(convert(obj))(blame(stat))
-    case ValExtract(_, body) =>
-      Extract(convert(body))
-    case ValFrame(_, clauses, body) =>
-      withContract(clauses, contract => {
-        FramedProof(
-          AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+  def convert(implicit stat: ValStatementContext): Statement[G] =
+    stat match {
+      case ValPackage(_, expr, innerStat) =>
+        WandPackage(convert(expr), convert(innerStat))(blame(stat))
+      case ValApplyWand(_, wand, _) => WandApply(convert(wand))(blame(stat))
+      case ValFold(_, predicate, _) => Fold(convert(predicate))(blame(stat))
+      case ValUnfold(_, predicate, _) => Unfold(convert(predicate))(blame(stat))
+      case ValOpen(_, _, _) => ??(stat)
+      case ValClose(_, _, _) => ??(stat)
+      case ValAssert(_, assn, _) => Assert(convert(assn))(blame(stat))
+      case ValAssume(_, assn, _) => Assume(convert(assn))
+      case ValInhale(_, resource, _) => Inhale(convert(resource))
+      case ValExhale(_, resource, _) => Exhale(convert(resource))(blame(stat))
+      case ValLabel(_, label, _) =>
+        Label(
+          new LabelDecl()(origin(stat).sourceName(convert(label))),
+          Block(Nil),
+        )
+      case ValRefute(_, assn, _) => Refute(convert(assn))(blame(stat))
+      case ValWitness(_, _, _) => ??(stat)
+      case ValGhost(_, stat) => convert(stat)
+      case ValSend(_, name, _, delta, _, resource, _) =>
+        Send(
+          new SendDecl()(origin(stat).sourceName(convert(name))),
+          convert(delta),
+          convert(resource),
+        )(blame(stat))
+      case ValRecv(_, name, _) =>
+        Recv(new UnresolvedRef[G, SendDecl[G]](convert(name)))
+      case ValTransfer(_, _, _) => ??(stat)
+      case ValCslSubject(_, _, _) =>
+        ??(stat) // FIXME PB: csl_subject seems to be used
+      case ValSpecIgnoreStart(_, _) => SpecIgnoreEnd()
+      case ValSpecIgnoreEnd(_, _) => SpecIgnoreStart()
+      case ValActionModel(_, _, model, _, perm, _, after, _, action, _, impl) =>
+        ModelDo(
+          convert(model),
+          convert(perm),
+          convert(after),
+          convert(action),
+          impl match {
+            case ValActionImpl0(_) => Block(Nil)
+            case ValActionImpl1(inner) => convert(inner)
+          },
+        )
+      case ValAtomic(_, _, invariant, _, body) =>
+        ParAtomic(
+          Seq(new UnresolvedRef[G, ParInvariantDecl[G]](convert(invariant))),
           convert(body),
-          AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
         )(blame(stat))
-      })
-  }
+      case ValCommit(_, obj, _) => Commit(convert(obj))(blame(stat))
+      case ValExtract(_, body) => Extract(convert(body))
+      case ValFrame(_, clauses, body) =>
+        withContract(
+          clauses,
+          contract => {
+            FramedProof(
+              AstBuildHelpers.foldStar(contract.consume(contract.requires)),
+              convert(body),
+              AstBuildHelpers.foldStar(contract.consume(contract.ensures)),
+            )(blame(stat))
+          },
+        )
+    }
 
-  def convert(implicit block: ValBlockContext): Seq[Statement[G]] = block match {
-    case ValBlock0(_, stats, _) => stats.map(convert(_))
-  }
+  def convert(implicit block: ValBlockContext): Seq[Statement[G]] =
+    block match { case ValBlock0(_, stats, _) => stats.map(convert(_)) }
 
-  def convert(implicit arg: ValArgContext): Variable[G] = arg match {
-    case ValArg0(t, id) => new Variable(convert(t))(origin(arg).sourceName(convert(id)))
-  }
+  def convert(implicit arg: ValArgContext): Variable[G] =
+    arg match {
+      case ValArg0(t, id) =>
+        new Variable(convert(t))(origin(arg).sourceName(convert(id)))
+    }
 
-  def convert(implicit args: ValArgListContext): Seq[Variable[G]] = args match {
-    case ValArgList0(arg) => Seq(convert(arg))
-    case ValArgList1(arg, _, args) => convert(arg) +: convert(args)
-  }
+  def convert(implicit args: ValArgListContext): Seq[Variable[G]] =
+    args match {
+      case ValArgList0(arg) => Seq(convert(arg))
+      case ValArgList1(arg, _, args) => convert(arg) +: convert(args)
+    }
 
-  def convert(implicit decl: ValEmbedGlobalDeclarationBlockContext): Seq[GlobalDeclaration[G]] = decl match {
-    case ValEmbedGlobalDeclarationBlock0(_, globals, _) => globals.flatMap(convert(_))
-    case ValEmbedGlobalDeclarationBlock1(globals) => globals.flatMap(convert(_))
-  }
+  def convert(
+      implicit decl: ValEmbedGlobalDeclarationBlockContext
+  ): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case ValEmbedGlobalDeclarationBlock0(_, globals, _) =>
+        globals.flatMap(convert(_))
+      case ValEmbedGlobalDeclarationBlock1(globals) =>
+        globals.flatMap(convert(_))
+    }
 
-  def convert(implicit decl: ValGlobalDeclarationContext): Seq[GlobalDeclaration[G]] = decl match {
-    case ValAxiom(_, name, _, axiom, _) =>
-      Seq(new SimplificationRule(convert(axiom))(origin(decl).sourceName(convert(name))))
-    case ValPredicate(modifiers, _, name, _, args, _, definition) =>
-      withModifiers(modifiers, mods =>
-        Seq(new Predicate(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          mods.consume(mods.threadLocal), mods.consume(mods.inline))
-        (origin(decl).sourceName(convert(name)))))
-    case ValFunction(contract, modifiers, _, t, name, typeArgs, _, args, _, definition) =>
-      Seq(withContract(contract, c =>
-        withModifiers(modifiers, m => {
-          val namedOrigin = origin(decl).sourceName(convert(name))
-          new Function(
-            convert(t),
-            args.map(convert(_)).getOrElse(Nil),
+  def convert(
+      implicit decl: ValGlobalDeclarationContext
+  ): Seq[GlobalDeclaration[G]] =
+    decl match {
+      case ValAxiom(_, name, _, axiom, _) =>
+        Seq(new SimplificationRule(convert(axiom))(
+          origin(decl).sourceName(convert(name))
+        ))
+      case ValPredicate(modifiers, _, name, _, args, _, definition) =>
+        withModifiers(
+          modifiers,
+          mods =>
+            Seq(
+              new Predicate(
+                args.map(convert(_)).getOrElse(Nil),
+                convert(definition),
+                mods.consume(mods.threadLocal),
+                mods.consume(mods.inline),
+              )(origin(decl).sourceName(convert(name)))
+            ),
+        )
+      case ValFunction(
+            contract,
+            modifiers,
+            _,
+            t,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c =>
+            withModifiers(
+              modifiers,
+              m => {
+                val namedOrigin = origin(decl).sourceName(convert(name))
+                new Function(
+                  convert(t),
+                  args.map(convert(_)).getOrElse(Nil),
+                  typeArgs.map(convert(_)).getOrElse(Nil),
+                  convert(definition),
+                  c.consumeApplicableContract(blame(decl)),
+                  m.consume(m.inline),
+                )(blame(decl))(namedOrigin)
+              },
+            ),
+        ))
+      case ValModel(_, name, _, decls, _) =>
+        Seq(new Model(decls.flatMap(convert(_)))(
+          origin(decl).sourceName(convert(name))
+        ))
+      case ValGhostDecl(_, inner) => convert(inner)
+      case ValAdtDecl(_, name, typeArgs, _, decls, _) =>
+        Seq(
+          new AxiomaticDataType(
+            decls.map(convert(_)),
             typeArgs.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)),
-            m.consume(m.inline))(blame(decl))(namedOrigin)
-        })
-      ))
-    case ValModel(_, name, _, decls, _) =>
-      Seq(new Model(decls.flatMap(convert(_)))(origin(decl).sourceName(convert(name))))
-    case ValGhostDecl(_, inner) =>
-      convert(inner)
-    case ValAdtDecl(_, name, typeArgs, _, decls, _) =>
-      Seq(new AxiomaticDataType(decls.map(convert(_)), typeArgs.map(convert(_)).getOrElse(Nil))(
-        origin(decl).sourceName(convert(name))))
-    case ValProverType(_, name, ints, _) =>
-      Seq(new ProverType(convert(ints))(origin(decl).sourceName(convert(name))))
-    case ValProverFunction(_, t, name, _, args, _, ints, _) =>
-      Seq(new ProverFunction(convert(ints), args.map(convert(_)).getOrElse(Nil), convert(t))(origin(decl).sourceName(convert(name))))
-  }
+          )(origin(decl).sourceName(convert(name)))
+        )
+      case ValProverType(_, name, ints, _) =>
+        Seq(
+          new ProverType(convert(ints))(origin(decl).sourceName(convert(name)))
+        )
+      case ValProverFunction(_, t, name, _, args, _, ints, _) =>
+        Seq(
+          new ProverFunction(
+            convert(ints),
+            args.map(convert(_)).getOrElse(Nil),
+            convert(t),
+          )(origin(decl).sourceName(convert(name)))
+        )
+    }
 
-  def convert(implicit int: ValProverInterpretationsContext): Seq[(ProverLanguage[G], String)] = int match {
-    case ValProverInterpretations0(int) => Seq(convert(int))
-    case ValProverInterpretations1(int, ints) => convert(int) +: convert(ints)
-  }
+  def convert(
+      implicit int: ValProverInterpretationsContext
+  ): Seq[(ProverLanguage[G], String)] =
+    int match {
+      case ValProverInterpretations0(int) => Seq(convert(int))
+      case ValProverInterpretations1(int, ints) => convert(int) +: convert(ints)
+    }
 
-  def convert(implicit int: ValProverInterpretationContext): (ProverLanguage[G], String) = int match {
-    case ValInterpSmtlib(_, int) => SmtLib()(origin(int)) -> convert(int)
-    case ValInterpBoogie(_, int) => Boogie()(origin(int)) -> convert(int)
-  }
+  def convert(
+      implicit int: ValProverInterpretationContext
+  ): (ProverLanguage[G], String) =
+    int match {
+      case ValInterpSmtlib(_, int) => SmtLib()(origin(int)) -> convert(int)
+      case ValInterpBoogie(_, int) => Boogie()(origin(int)) -> convert(int)
+    }
 
-  def convert(implicit decl: ValEmbedClassDeclarationBlockContext): Seq[ClassDeclaration[G]] = decl match {
-    case ValEmbedClassDeclarationBlock0(_, decls, _) => decls.flatMap(convert(_, x => x))
-    case ValEmbedClassDeclarationBlock1(decls) => decls.flatMap(convert(_, x => x))
-  }
+  def convert(
+      implicit decl: ValEmbedClassDeclarationBlockContext
+  ): Seq[ClassDeclaration[G]] =
+    decl match {
+      case ValEmbedClassDeclarationBlock0(_, decls, _) =>
+        decls.flatMap(convert(_, x => x))
+      case ValEmbedClassDeclarationBlock1(decls) =>
+        decls.flatMap(convert(_, x => x))
+    }
 
-  def convert[T](implicit decl: ValClassDeclarationContext, transform: ClassDeclaration[G] => T): Seq[T] = decl match {
-    case ValInstancePredicate(modifiers, _, name, _, args, _, definition) =>
-      Seq(withModifiers(modifiers, mods => {
-        transform(new InstancePredicate(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          mods.consume(mods.threadLocal), mods.consume(mods.inline))(
-          origin(decl).sourceName(convert(name))))
-      }))
-    case ValInstanceFunction(contract, modifiers, _, t, name, typeArgs, _, args, _, definition) =>
-      Seq(withContract(contract, c => {
-        withModifiers(modifiers, m => {
-          transform(new InstanceFunction(
-            convert(t),
-            args.map(convert(_)).getOrElse(Nil),
-            typeArgs.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)), m.consume(m.inline))(
-            blame(decl))(
-            origin(decl).sourceName(convert(name))))
-        })
-      }))
-    case ValInstanceGhostDecl(_, decl) => convert(decl).map(transform)
-    case ValInstanceOperatorFunction(contract, modifiers, "pure", t, name, "(", args, ")", definition) =>
-      Seq(withContract(contract, c => {
-        withModifiers(modifiers, m => {
-          transform(new InstanceOperatorFunction(
-            convert(t),
-            convert(name),
-            args.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)),
-            m.consume(m.inline),
-            m.consume(m.threadLocal)
-          )(blame(decl)))
-        })
-      }))
-    case ValInstanceOperatorMethod(contract, modifiers, t, name, "(", args, ")", definition) =>
-      Seq(withContract(contract, c => {
-        withModifiers(modifiers, m => {
-          transform(new InstanceOperatorMethod(
-            convert(t),
-            convert(name),
-            args.map(convert(_)).getOrElse(Nil),
-            convert(definition),
-            c.consumeApplicableContract(blame(decl)),
-            m.consume(m.inline),
-            m.consume(m.pure)
-          )(blame(decl)))
-        })
-      }))
-  }
+  def convert[T](
+      implicit decl: ValClassDeclarationContext,
+      transform: ClassDeclaration[G] => T,
+  ): Seq[T] =
+    decl match {
+      case ValInstancePredicate(modifiers, _, name, _, args, _, definition) =>
+        Seq(withModifiers(
+          modifiers,
+          mods => {
+            transform(
+              new InstancePredicate(
+                args.map(convert(_)).getOrElse(Nil),
+                convert(definition),
+                mods.consume(mods.threadLocal),
+                mods.consume(mods.inline),
+              )(origin(decl).sourceName(convert(name)))
+            )
+          },
+        ))
+      case ValInstanceFunction(
+            contract,
+            modifiers,
+            _,
+            t,
+            name,
+            typeArgs,
+            _,
+            args,
+            _,
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c => {
+            withModifiers(
+              modifiers,
+              m => {
+                transform(
+                  new InstanceFunction(
+                    convert(t),
+                    args.map(convert(_)).getOrElse(Nil),
+                    typeArgs.map(convert(_)).getOrElse(Nil),
+                    convert(definition),
+                    c.consumeApplicableContract(blame(decl)),
+                    m.consume(m.inline),
+                  )(blame(decl))(origin(decl).sourceName(convert(name)))
+                )
+              },
+            )
+          },
+        ))
+      case ValInstanceGhostDecl(_, decl) => convert(decl).map(transform)
+      case ValInstanceOperatorFunction(
+            contract,
+            modifiers,
+            "pure",
+            t,
+            name,
+            "(",
+            args,
+            ")",
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c => {
+            withModifiers(
+              modifiers,
+              m => {
+                transform(
+                  new InstanceOperatorFunction(
+                    convert(t),
+                    convert(name),
+                    args.map(convert(_)).getOrElse(Nil),
+                    convert(definition),
+                    c.consumeApplicableContract(blame(decl)),
+                    m.consume(m.inline),
+                    m.consume(m.threadLocal),
+                  )(blame(decl))
+                )
+              },
+            )
+          },
+        ))
+      case ValInstanceOperatorMethod(
+            contract,
+            modifiers,
+            t,
+            name,
+            "(",
+            args,
+            ")",
+            definition,
+          ) =>
+        Seq(withContract(
+          contract,
+          c => {
+            withModifiers(
+              modifiers,
+              m => {
+                transform(
+                  new InstanceOperatorMethod(
+                    convert(t),
+                    convert(name),
+                    args.map(convert(_)).getOrElse(Nil),
+                    convert(definition),
+                    c.consumeApplicableContract(blame(decl)),
+                    m.consume(m.inline),
+                    m.consume(m.pure),
+                  )(blame(decl))
+                )
+              },
+            )
+          },
+        ))
+    }
 
-  def convert(implicit operator: ValOperatorNameContext): Operator[G] = operator match {
-    case ValOperatorName0("+") => OperatorLeftPlus()
-    case ValOperatorName1(id, "+") if convert(id) == "right" => OperatorRightPlus()
-  }
+  def convert(implicit operator: ValOperatorNameContext): Operator[G] =
+    operator match {
+      case ValOperatorName0("+") => OperatorLeftPlus()
+      case ValOperatorName1(id, "+") if convert(id) == "right" =>
+        OperatorRightPlus()
+    }
 
-  def convert(implicit decl: ValModelDeclarationContext): Seq[ModelDeclaration[G]] = decl match {
-    case ValModelField(t, name, _) =>
-      convert(name).map(name => {
-        new ModelField(convert(t))(origin(decl).sourceName(name))
-      })
-    case ValModelProcess(contract, _, name, _, args, _, _, definition, _) =>
-      Seq(withContract(contract, c => {
-        new ModelProcess(args.map(convert(_)).getOrElse(Nil), convert(definition),
-          AstBuildHelpers.foldAnd(c.consume(c.requires)), AstBuildHelpers.foldAnd(c.consume(c.ensures)),
-          c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)), c.consume(c.accessible).map(new UnresolvedRef[G, ModelField[G]](_)))(
-          blame(decl))(origin(decl).sourceName(convert(name)))
-      }))
-    case ValModelAction(contract, _, name, _, args, _, _) =>
-      Seq(withContract(contract, c => {
-        new ModelAction(args.map(convert(_)).getOrElse(Nil),
-          AstBuildHelpers.foldAnd(c.consume(c.requires)), AstBuildHelpers.foldAnd(c.consume(c.ensures)),
-          c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)), c.consume(c.accessible).map(new UnresolvedRef[G, ModelField[G]](_)))(
-          origin(decl).sourceName(convert(name)))
-      }))
-  }
+  def convert(
+      implicit decl: ValModelDeclarationContext
+  ): Seq[ModelDeclaration[G]] =
+    decl match {
+      case ValModelField(t, name, _) =>
+        convert(name).map(name => {
+          new ModelField(convert(t))(origin(decl).sourceName(name))
+        })
+      case ValModelProcess(contract, _, name, _, args, _, _, definition, _) =>
+        Seq(withContract(
+          contract,
+          c => {
+            new ModelProcess(
+              args.map(convert(_)).getOrElse(Nil),
+              convert(definition),
+              AstBuildHelpers.foldAnd(c.consume(c.requires)),
+              AstBuildHelpers.foldAnd(c.consume(c.ensures)),
+              c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)),
+              c.consume(c.accessible)
+                .map(new UnresolvedRef[G, ModelField[G]](_)),
+            )(blame(decl))(origin(decl).sourceName(convert(name)))
+          },
+        ))
+      case ValModelAction(contract, _, name, _, args, _, _) =>
+        Seq(withContract(
+          contract,
+          c => {
+            new ModelAction(
+              args.map(convert(_)).getOrElse(Nil),
+              AstBuildHelpers.foldAnd(c.consume(c.requires)),
+              AstBuildHelpers.foldAnd(c.consume(c.ensures)),
+              c.consume(c.modifies).map(new UnresolvedRef[G, ModelField[G]](_)),
+              c.consume(c.accessible)
+                .map(new UnresolvedRef[G, ModelField[G]](_)),
+            )(origin(decl).sourceName(convert(name)))
+          },
+        ))
+    }
 
-  def convert(implicit ts: ValTypeVarsContext): Seq[Variable[G]] = ts match {
-    case ValTypeVars0(_, names, _) =>
-      convert(names).map(name => new Variable(TType(TAnyValue()))(origin(ts).sourceName(name)))
-  }
+  def convert(implicit ts: ValTypeVarsContext): Seq[Variable[G]] =
+    ts match {
+      case ValTypeVars0(_, names, _) =>
+        convert(names).map(name =>
+          new Variable(TType(TAnyValue()))(origin(ts).sourceName(name))
+        )
+    }
 
-  def convert(implicit decl: ValAdtDeclarationContext): ADTDeclaration[G] = decl match {
-    case ValAdtAxiom(_, ax, _) => new ADTAxiom(convert(ax))
-    case ValAdtFunction(_, returnType, name, _, args, _, _) =>
-      new ADTFunction(args.map(convert(_)).getOrElse(Nil), convert(returnType))(
-        origin(decl).sourceName(convert(name)))
-  }
+  def convert(implicit decl: ValAdtDeclarationContext): ADTDeclaration[G] =
+    decl match {
+      case ValAdtAxiom(_, ax, _) => new ADTAxiom(convert(ax))
+      case ValAdtFunction(_, returnType, name, _, args, _, _) =>
+        new ADTFunction(
+          args.map(convert(_)).getOrElse(Nil),
+          convert(returnType),
+        )(origin(decl).sourceName(convert(name)))
+    }
 
-  def convert(implicit definition: ValPureDefContext): Option[Expr[G]] = definition match {
-    case ValPureAbstractBody(_) => None
-    case ValPureBody(_, expr, _) => Some(convert(expr))
-  }
+  def convert(implicit definition: ValPureDefContext): Option[Expr[G]] =
+    definition match {
+      case ValPureAbstractBody(_) => None
+      case ValPureBody(_, expr, _) => Some(convert(expr))
+    }
 
-  def convert(implicit definition: ValImpureDefContext): Option[Statement[G]] = definition match {
-    case ValImpureAbstractBody(_) => None
-    case ValImpureBody(statement) => Some(convert(statement))
-  }
+  def convert(implicit definition: ValImpureDefContext): Option[Statement[G]] =
+    definition match {
+      case ValImpureAbstractBody(_) => None
+      case ValImpureBody(statement) => Some(convert(statement))
+    }
 
-  def convert(implicit t: ValTypeContext): Type[G] = t match {
-    case ValPrimaryType(name) => name match {
-      case "resource" => TResourceVal()
-      case "process" => TProcess()
-      case "frac" => TFraction()
-      case "zfrac" => TZFraction()
-      case "rational" => TRational()
-      case "bool" => TBool()
-      case "ref" => TRef()
-      case "any" => TAnyValue()
-      case "nothing" => TNothing()
-      case "string" => TString()
-    }
-    case ValSeqType(_, _, element, _) => TSeq(convert(element))
-    case ValSetType(_, _, element, _) => TSet(convert(element))
-    case ValVectorType(_, _, element, _, size, _) => TVector(convert(size), convert(element))()
-    case ValBagType(_, _, element, _) => TBag(convert(element))
-    case ValOptionType(_, _, element, _) => TOption(convert(element))
-    case ValMapType(_, _, key, _, value, _) => TMap(convert(key), convert(value))
-    case ValTupleType(_, _, t1, _, t2, _) => TTuple(Seq(convert(t1), convert(t2)))
-    case ValPointerType(_, _, element, _) => TPointer(convert(element))
-    case ValTypeType(_, _, element, _) => TType(convert(element))
-    case ValEitherType(_, _, left, _, right, _) => TEither(convert(left), convert(right))
-  }
+  def convert(implicit t: ValTypeContext): Type[G] =
+    t match {
+      case ValPrimaryType(name) =>
+        name match {
+          case "resource" => TResourceVal()
+          case "process" => TProcess()
+          case "frac" => TFraction()
+          case "zfrac" => TZFraction()
+          case "rational" => TRational()
+          case "bool" => TBool()
+          case "ref" => TRef()
+          case "any" => TAnyValue()
+          case "nothing" => TNothing()
+          case "string" => TString()
+        }
+      case ValSeqType(_, _, element, _) => TSeq(convert(element))
+      case ValSetType(_, _, element, _) => TSet(convert(element))
+      case ValVectorType(_, _, element, _, size, _) =>
+        TVector(convert(size), convert(element))()
+      case ValBagType(_, _, element, _) => TBag(convert(element))
+      case ValOptionType(_, _, element, _) => TOption(convert(element))
+      case ValMapType(_, _, key, _, value, _) =>
+        TMap(convert(key), convert(value))
+      case ValTupleType(_, _, t1, _, t2, _) =>
+        TTuple(Seq(convert(t1), convert(t2)))
+      case ValPointerType(_, _, element, _) => TPointer(convert(element))
+      case ValTypeType(_, _, element, _) => TType(convert(element))
+      case ValEitherType(_, _, left, _, right, _) =>
+        TEither(convert(left), convert(right))
+    }
 
-  def convert(implicit e: ValPrimarySeqContext): Expr[G] = e match {
-    case ValCardinality(_, xs, _) => Size(convert(xs))
-    case ValArrayValues(_, _, a, _, from, _, to, _) => Values(convert(a), convert(from), convert(to))(blame(e))
-  }
+  def convert(implicit e: ValPrimarySeqContext): Expr[G] =
+    e match {
+      case ValCardinality(_, xs, _) => Size(convert(xs))
+      case ValArrayValues(_, _, a, _, from, _, to, _) =>
+        Values(convert(a), convert(from), convert(to))(blame(e))
+    }
 
-  def convert(implicit e: ValPrimaryOptionContext): Expr[G] = e match {
-    case ValSome(_, _, v, _) => OptSome(convert(v))
-  }
+  def convert(implicit e: ValPrimaryOptionContext): Expr[G] =
+    e match { case ValSome(_, _, v, _) => OptSome(convert(v)) }
 
-  def convert(implicit e: ValPrimaryEitherContext): Expr[G] = e match {
-    case ValLeft(_, _, inner, _) => EitherLeft(convert(inner))
-    case ValRight(_, _, inner, _) => EitherRight(convert(inner))
-  }
+  def convert(implicit e: ValPrimaryEitherContext): Expr[G] =
+    e match {
+      case ValLeft(_, _, inner, _) => EitherLeft(convert(inner))
+      case ValRight(_, _, inner, _) => EitherRight(convert(inner))
+    }
 
   // valsetcompselectors
-  def convert(implicit exprs: ValMapPairsContext): Seq[(Expr[G], Expr[G])] = exprs match {
-    case ValMapPairs0(k, _, v) => Seq((convert(k), convert(v)))
-    case ValMapPairs1(k, _, v, _, tail) => (convert(k), convert(v)) +: convert(tail)
-  }
+  def convert(implicit exprs: ValMapPairsContext): Seq[(Expr[G], Expr[G])] =
+    exprs match {
+      case ValMapPairs0(k, _, v) => Seq((convert(k), convert(v)))
+      case ValMapPairs1(k, _, v, _, tail) =>
+        (convert(k), convert(v)) +: convert(tail)
+    }
 
-  def convert(implicit e: ValPrimaryCollectionConstructorContext): Expr[G] = e match {
-    case ValTypedLiteralSeq(_, _, t, _, _, exprs, _) => LiteralSeq(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralSet(_, _, t, _, _, exprs, _) => LiteralSet(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralVector(_, _, t, _, _, exprs, _) => LiteralVector(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValSetComprehension(_, _, t, _, _, value, _, selectors, _, something, _) => ??(e)
-    case ValTypedLiteralBag(_, _, t, _, _, exprs, _) => LiteralBag(convert(t), exprs.map(convert(_)).getOrElse(Nil))
-    case ValTypedLiteralMap(_, _, key, _, value, _, _, pairs, _) => LiteralMap(convert(key), convert(value), pairs.map(convert(_)).getOrElse(Nil))
-    case ValTypedTuple(_, _, t1, _, t2, _, _, v1, _, v2, _) =>
-      LiteralTuple(Seq(convert(t1), convert(t2)), Seq(convert(v1), convert(v2)))
-    case ValLiteralSeq(_, exprs, _) => UntypedLiteralSeq(convert(exprs))
-    case ValLiteralSet(_, exprs, _) => UntypedLiteralSet(convert(exprs))
-    case ValLiteralBag(_, exprs, _) => UntypedLiteralBag(convert(exprs))
-    case ValEmptySeq(_, t, _) => LiteralSeq(convert(t), Nil)
-    case ValEmptySet(_, t, _) => LiteralSet(convert(t), Nil)
-    case ValEmptyBag(_, t, _) => LiteralBag(convert(t), Nil)
-    case ValRange(_, from, _, to, _) => Range(convert(from), convert(to))
-    case ValRangeSet(_, from, _, to, _) => RangeSet(convert(from), convert(to))
-  }
+  def convert(implicit e: ValPrimaryCollectionConstructorContext): Expr[G] =
+    e match {
+      case ValTypedLiteralSeq(_, _, t, _, _, exprs, _) =>
+        LiteralSeq(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralSet(_, _, t, _, _, exprs, _) =>
+        LiteralSet(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralVector(_, _, t, _, _, exprs, _) =>
+        LiteralVector(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValSetComprehension(
+            _,
+            _,
+            t,
+            _,
+            _,
+            value,
+            _,
+            selectors,
+            _,
+            something,
+            _,
+          ) =>
+        ??(e)
+      case ValTypedLiteralBag(_, _, t, _, _, exprs, _) =>
+        LiteralBag(convert(t), exprs.map(convert(_)).getOrElse(Nil))
+      case ValTypedLiteralMap(_, _, key, _, value, _, _, pairs, _) =>
+        LiteralMap(
+          convert(key),
+          convert(value),
+          pairs.map(convert(_)).getOrElse(Nil),
+        )
+      case ValTypedTuple(_, _, t1, _, t2, _, _, v1, _, v2, _) =>
+        LiteralTuple(
+          Seq(convert(t1), convert(t2)),
+          Seq(convert(v1), convert(v2)),
+        )
+      case ValLiteralSeq(_, exprs, _) => UntypedLiteralSeq(convert(exprs))
+      case ValLiteralSet(_, exprs, _) => UntypedLiteralSet(convert(exprs))
+      case ValLiteralBag(_, exprs, _) => UntypedLiteralBag(convert(exprs))
+      case ValEmptySeq(_, t, _) => LiteralSeq(convert(t), Nil)
+      case ValEmptySet(_, t, _) => LiteralSet(convert(t), Nil)
+      case ValEmptyBag(_, t, _) => LiteralBag(convert(t), Nil)
+      case ValRange(_, from, _, to, _) => Range(convert(from), convert(to))
+      case ValRangeSet(_, from, _, to, _) =>
+        RangeSet(convert(from), convert(to))
+    }
 
-  def convert(implicit e: ValPrimaryPermissionContext): Expr[G] = e match {
-    case ValCurPerm(_, _, loc, _) => CurPerm(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValPerm(_, _, loc, _, perm, _) => Perm(AmbiguousLocation(convert(loc))(blame(e)), convert(perm))
-    case ValValue(_, _, loc, _) => Value(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValAutoValue(_, _, loc, _) => AutoValue(AmbiguousLocation(convert(loc))(blame(e)))
-    case ValPointsTo(_, _, loc, _, perm, _, v, _) => PointsTo(AmbiguousLocation(convert(loc))(blame(e)), convert(perm), convert(v))
-    case ValHPerm(_, _, loc, _, perm, _) => ModelPerm(convert(loc), convert(perm))
-    case ValAPerm(_, _, loc, _, perm, _) => ActionPerm(convert(loc), convert(perm))
-    case ValArrayPerm(_, _, arr, _, i, _, step, _, count, _, perm, _) => ??(e)
-    case ValMatrix(_, _, m, _, dim1, _, dim2, _) => ValidMatrix(convert(m), convert(dim1), convert(dim2))
-    case ValArray(_, _, arr, _, dim, _) => ValidArray(convert(arr), convert(dim))
-    case ValPointer(_, _, ptr, _, n, _, perm, _) => PermPointer(convert(ptr), convert(n), convert(perm))
-    case ValPointerIndex(_, _, ptr, _, idx, _, perm, _) => PermPointerIndex(convert(ptr), convert(idx), convert(perm))
-    case ValPointerBlockLength(_, _, ptr, _) => PointerBlockLength(convert(ptr))(blame(e))
-    case ValPointerBlockOffset(_, _, ptr, _) => PointerBlockOffset(convert(ptr))(blame(e))
-    case ValPointerLength(_, _, ptr, _) => PointerLength(convert(ptr))(blame(e))
-    case ValPolarityDependent(_, _, onInhale, _, onExhale, _) => PolarityDependent(convert(onInhale), convert(onExhale))
-  }
+  def convert(implicit e: ValPrimaryPermissionContext): Expr[G] =
+    e match {
+      case ValCurPerm(_, _, loc, _) =>
+        CurPerm(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValPerm(_, _, loc, _, perm, _) =>
+        Perm(AmbiguousLocation(convert(loc))(blame(e)), convert(perm))
+      case ValValue(_, _, loc, _) =>
+        Value(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValAutoValue(_, _, loc, _) =>
+        AutoValue(AmbiguousLocation(convert(loc))(blame(e)))
+      case ValPointsTo(_, _, loc, _, perm, _, v, _) =>
+        PointsTo(
+          AmbiguousLocation(convert(loc))(blame(e)),
+          convert(perm),
+          convert(v),
+        )
+      case ValHPerm(_, _, loc, _, perm, _) =>
+        ModelPerm(convert(loc), convert(perm))
+      case ValAPerm(_, _, loc, _, perm, _) =>
+        ActionPerm(convert(loc), convert(perm))
+      case ValArrayPerm(_, _, arr, _, i, _, step, _, count, _, perm, _) => ??(e)
+      case ValMatrix(_, _, m, _, dim1, _, dim2, _) =>
+        ValidMatrix(convert(m), convert(dim1), convert(dim2))
+      case ValArray(_, _, arr, _, dim, _) =>
+        ValidArray(convert(arr), convert(dim))
+      case ValPointer(_, _, ptr, _, n, _, perm, _) =>
+        PermPointer(convert(ptr), convert(n), convert(perm))
+      case ValPointerIndex(_, _, ptr, _, idx, _, perm, _) =>
+        PermPointerIndex(convert(ptr), convert(idx), convert(perm))
+      case ValPointerBlockLength(_, _, ptr, _) =>
+        PointerBlockLength(convert(ptr))(blame(e))
+      case ValPointerBlockOffset(_, _, ptr, _) =>
+        PointerBlockOffset(convert(ptr))(blame(e))
+      case ValPointerLength(_, _, ptr, _) =>
+        PointerLength(convert(ptr))(blame(e))
+      case ValPolarityDependent(_, _, onInhale, _, onExhale, _) =>
+        PolarityDependent(convert(onInhale), convert(onExhale))
+    }
 
-  def convert(implicit v: ValBindingContext): (Variable[G], Seq[Expr[G]]) = v match {
-    case ValRangeBinding(t, id, _, from, _, to) =>
-      val variable = new Variable[G](convert(t))(origin(id).sourceName(convert(id)))
-      val cond = SeqMember[G](Local(variable.ref), Range(convert(from), convert(to)))
-      (variable, Seq(cond))
-    case ValNormalBinding(arg) =>
-      (convert(arg), Nil)
-  }
+  def convert(implicit v: ValBindingContext): (Variable[G], Seq[Expr[G]]) =
+    v match {
+      case ValRangeBinding(t, id, _, from, _, to) =>
+        val variable =
+          new Variable[G](convert(t))(origin(id).sourceName(convert(id)))
+        val cond = SeqMember[G](
+          Local(variable.ref),
+          Range(convert(from), convert(to)),
+        )
+        (variable, Seq(cond))
+      case ValNormalBinding(arg) => (convert(arg), Nil)
+    }
 
-  def convert(implicit vs: ValBindingsContext): (Seq[Variable[G]], Seq[Expr[G]]) = vs match {
-    case ValBindings0(binding) =>
-      val (v, cs) = convert(binding)
-      (Seq(v), cs)
-    case ValBindings1(binding, _, bindings) =>
-      val (v, cs) = convert(binding)
-      val (vs, ds) = convert(bindings)
-      (v +: vs, cs ++ ds)
-  }
+  def convert(
+      implicit vs: ValBindingsContext
+  ): (Seq[Variable[G]], Seq[Expr[G]]) =
+    vs match {
+      case ValBindings0(binding) =>
+        val (v, cs) = convert(binding)
+        (Seq(v), cs)
+      case ValBindings1(binding, _, bindings) =>
+        val (v, cs) = convert(binding)
+        val (vs, ds) = convert(bindings)
+        (v +: vs, cs ++ ds)
+    }
 
-  def convert(implicit e: ValPrimaryBinderContext): Expr[G] = e match {
-    case ValQuantifier(_, symbol, bindings, _, bodyOrCond, maybeBody, _) =>
-      val (variables, bindingConds) = convert(bindings)
-      val (bodyConds, body) = maybeBody match {
-        case Some(ValBinderCont0(_, body)) => (Seq(convert(bodyOrCond)), convert(body))
-        case None => (Nil, convert(bodyOrCond))
-      }
-      val conds = bindingConds ++ bodyConds
-      symbol match {
-        case ValForallSymb(_) => Forall(variables, Nil, implies(conds, body))
-        case ValStarallSymb(_) => Starall(variables, Nil, implies(conds, body))(blame(e))
-        case ValExistsSymb(_) => Exists(variables, Nil, foldAnd(conds :+ body))
-      }
-    case ValLet(_, _, t, id, _, v, _, body, _) =>
-      Let(new Variable(convert(t))(origin(id).sourceName(convert(id))), convert(v), convert(body))
-    case ValForPerm(_, _, bindings, _, loc, _, body, _) =>
-      ForPerm(convert(bindings), AmbiguousLocation(convert(loc))(blame(loc))(origin(loc)), convert(body))
-    case ValForPermWithValue(_, _, _, id, _, body, _) =>
-      ForPermWithValue(new Variable(TAny())(origin(id).sourceName(convert(id))), convert(body))
-  }
+  def convert(implicit e: ValPrimaryBinderContext): Expr[G] =
+    e match {
+      case ValQuantifier(_, symbol, bindings, _, bodyOrCond, maybeBody, _) =>
+        val (variables, bindingConds) = convert(bindings)
+        val (bodyConds, body) =
+          maybeBody match {
+            case Some(ValBinderCont0(_, body)) =>
+              (Seq(convert(bodyOrCond)), convert(body))
+            case None => (Nil, convert(bodyOrCond))
+          }
+        val conds = bindingConds ++ bodyConds
+        symbol match {
+          case ValForallSymb(_) => Forall(variables, Nil, implies(conds, body))
+          case ValStarallSymb(_) =>
+            Starall(variables, Nil, implies(conds, body))(blame(e))
+          case ValExistsSymb(_) =>
+            Exists(variables, Nil, foldAnd(conds :+ body))
+        }
+      case ValLet(_, _, t, id, _, v, _, body, _) =>
+        Let(
+          new Variable(convert(t))(origin(id).sourceName(convert(id))),
+          convert(v),
+          convert(body),
+        )
+      case ValForPerm(_, _, bindings, _, loc, _, body, _) =>
+        ForPerm(
+          convert(bindings),
+          AmbiguousLocation(convert(loc))(blame(loc))(origin(loc)),
+          convert(body),
+        )
+      case ValForPermWithValue(_, _, _, id, _, body, _) =>
+        ForPermWithValue(
+          new Variable(TAny())(origin(id).sourceName(convert(id))),
+          convert(body),
+        )
+    }
 
-  def convert(implicit e: ValPrimaryVectorContext): Expr[G] = e match {
-    case ValSum(_, _, t, id, _, cond, _, body, _) =>
-      val binding = new Variable(convert(t))(origin(id).sourceName(convert(id)))
-      Sum(Seq(binding), convert(cond), convert(body))
-    case ValVectorSum(_, _, rng, _, vec, _) => VectorSum(convert(rng), convert(vec))
-    case ValVectorCmp(_, _, left, _, right, _) => VectorCompare(convert(left), convert(right))
-    case ValVectorRep(_, _, inner, _) => VectorRepeat(convert(inner))
-    case ValMatrixSum(_, _, rng, _, mat, _) => MatrixSum(convert(rng), convert(mat))
-    case ValMatrixCmp(_, _, left, _, right, _) => MatrixCompare(convert(left), convert(right))
-    case ValMatrixRep(_, _, inner, _) => MatrixRepeat(convert(inner))
-  }
+  def convert(implicit e: ValPrimaryVectorContext): Expr[G] =
+    e match {
+      case ValSum(_, _, t, id, _, cond, _, body, _) =>
+        val binding =
+          new Variable(convert(t))(origin(id).sourceName(convert(id)))
+        Sum(Seq(binding), convert(cond), convert(body))
+      case ValVectorSum(_, _, rng, _, vec, _) =>
+        VectorSum(convert(rng), convert(vec))
+      case ValVectorCmp(_, _, left, _, right, _) =>
+        VectorCompare(convert(left), convert(right))
+      case ValVectorRep(_, _, inner, _) => VectorRepeat(convert(inner))
+      case ValMatrixSum(_, _, rng, _, mat, _) =>
+        MatrixSum(convert(rng), convert(mat))
+      case ValMatrixCmp(_, _, left, _, right, _) =>
+        MatrixCompare(convert(left), convert(right))
+      case ValMatrixRep(_, _, inner, _) => MatrixRepeat(convert(inner))
+    }
 
   def convert(implicit e: ValPrimaryReducibleContext): Expr[G] = ??(e)
 
-  def convert(implicit e: ValPrimaryThreadContext): Expr[G] = e match {
-    case ValIdle(_, _, thread, _) => IdleToken(convert(thread))
-    case ValRunning(_, _, thread, _) => JoinToken(convert(thread))
-  }
+  def convert(implicit e: ValPrimaryThreadContext): Expr[G] =
+    e match {
+      case ValIdle(_, _, thread, _) => IdleToken(convert(thread))
+      case ValRunning(_, _, thread, _) => JoinToken(convert(thread))
+    }
 
-  def convert(implicit e: ValPrimaryContextContext): Expr[G] = e match {
-    case ValPrimaryContext0("\\result") => AmbiguousResult()
-    case ValPrimaryContext1("\\current_thread") => CurrentThreadId()
-    case ValPrimaryContext2("\\ltid") => LocalThreadId()
-    case ValPrimaryContext3("\\gtid") => GlobalThreadId()
-  }
+  def convert(implicit e: ValPrimaryContextContext): Expr[G] =
+    e match {
+      case ValPrimaryContext0("\\result") => AmbiguousResult()
+      case ValPrimaryContext1("\\current_thread") => CurrentThreadId()
+      case ValPrimaryContext2("\\ltid") => LocalThreadId()
+      case ValPrimaryContext3("\\gtid") => GlobalThreadId()
+    }
 
-  def convert(implicit e: ValPrimaryContext): Expr[G] = e match {
-    case ValPrimary0(inner) => convert(inner)
-    case ValPrimary1(inner) => convert(inner)
-    case ValPrimary2(inner) => convert(inner)
-    case ValPrimary3(inner) => convert(inner)
-    case ValPrimary4(inner) => convert(inner)
-    case ValPrimary5(inner) => convert(inner)
-    case ValPrimary6(inner) => convert(inner)
-    case ValPrimary7(inner) => convert(inner)
-    case ValPrimary8(inner) => convert(inner)
-    case ValPrimary9(inner) => convert(inner)
-    case ValAny(_) => Any()(blame(e))
-    case ValFunctionOf(_, inner, _, names, _) => FunctionOf(new UnresolvedRef[G, Variable[G]](convert(inner)), convert(names).map(new UnresolvedRef[G, Variable[G]](_)))
-    case ValInlinePattern(open, pattern, _) =>
-      val groupText = open.filter(_.isDigit)
-      InlinePattern(convert(pattern), open.count(_ == '<'), if (groupText.isEmpty) 0 else groupText.toInt)
-    case ValUnfolding(_, predExpr, _, body) => Unfolding(convert(predExpr), convert(body))(blame(e))
-    case ValOld(_, _, expr, _) => Old(convert(expr), at = None)(blame(e))
-    case ValOldLabeled(_, _, label, _, _, expr, _) => Old(convert(expr), at = Some(new UnresolvedRef[G, LabelDecl[G]](convert(label))))(blame(e))
-    case ValTypeof(_, _, expr, _) => TypeOf(convert(expr))
-    case ValTypeValue(_, _, t, _) => TypeValue(convert(t))
-    case ValHeld(_, _, obj, _) => Held(convert(obj))
-    case ValCommitted(_, _, obj, _) => Committed(convert(obj))(blame(e))
-    case ValIdEscape(text) => local(e, text.substring(1, text.length - 1))
-    case ValSharedMemSize(_, _, ptr, _) => SharedMemSize(convert(ptr))
-    case ValNdIndex(_, _, firstIndex, _, firstDim, parsePairs, _) =>
-      val pairs = parsePairs.map(convert(_))
-      val indices = convert(firstIndex) +: pairs.map(_._1)
-      val dims = convert(firstDim) +: pairs.map(_._2)
-      NdIndex(indices, dims)
-    case ValNdLIndex(_, _, indices, _, dims, _) =>
-      val allIndices = convert(indices)
-      NdPartialIndex(allIndices.init, allIndices.last, convert(dims))
-    case ValNdLength(_, _, dims, _) => NdLength(convert(dims))
-    case ValChoose(_, _, xs, _) => Choose(convert(xs))(blame(e))
-    case ValChooseFresh(_, _, xs, _) => ChooseFresh(convert(xs))(blame(e))
-  }
+  def convert(implicit e: ValPrimaryContext): Expr[G] =
+    e match {
+      case ValPrimary0(inner) => convert(inner)
+      case ValPrimary1(inner) => convert(inner)
+      case ValPrimary2(inner) => convert(inner)
+      case ValPrimary3(inner) => convert(inner)
+      case ValPrimary4(inner) => convert(inner)
+      case ValPrimary5(inner) => convert(inner)
+      case ValPrimary6(inner) => convert(inner)
+      case ValPrimary7(inner) => convert(inner)
+      case ValPrimary8(inner) => convert(inner)
+      case ValPrimary9(inner) => convert(inner)
+      case ValAny(_) => Any()(blame(e))
+      case ValFunctionOf(_, inner, _, names, _) =>
+        FunctionOf(
+          new UnresolvedRef[G, Variable[G]](convert(inner)),
+          convert(names).map(new UnresolvedRef[G, Variable[G]](_)),
+        )
+      case ValInlinePattern(open, pattern, _) =>
+        val groupText = open.filter(_.isDigit)
+        InlinePattern(
+          convert(pattern),
+          open.count(_ == '<'),
+          if (groupText.isEmpty)
+            0
+          else
+            groupText.toInt,
+        )
+      case ValUnfolding(_, predExpr, _, body) =>
+        Unfolding(convert(predExpr), convert(body))(blame(e))
+      case ValOld(_, _, expr, _) => Old(convert(expr), at = None)(blame(e))
+      case ValOldLabeled(_, _, label, _, _, expr, _) =>
+        Old(
+          convert(expr),
+          at = Some(new UnresolvedRef[G, LabelDecl[G]](convert(label))),
+        )(blame(e))
+      case ValTypeof(_, _, expr, _) => TypeOf(convert(expr))
+      case ValTypeValue(_, _, t, _) => TypeValue(convert(t))
+      case ValHeld(_, _, obj, _) => Held(convert(obj))
+      case ValCommitted(_, _, obj, _) => Committed(convert(obj))(blame(e))
+      case ValIdEscape(text) => local(e, text.substring(1, text.length - 1))
+      case ValSharedMemSize(_, _, ptr, _) => SharedMemSize(convert(ptr))
+      case ValNdIndex(_, _, firstIndex, _, firstDim, parsePairs, _) =>
+        val pairs = parsePairs.map(convert(_))
+        val indices = convert(firstIndex) +: pairs.map(_._1)
+        val dims = convert(firstDim) +: pairs.map(_._2)
+        NdIndex(indices, dims)
+      case ValNdLIndex(_, _, indices, _, dims, _) =>
+        val allIndices = convert(indices)
+        NdPartialIndex(allIndices.init, allIndices.last, convert(dims))
+      case ValNdLength(_, _, dims, _) => NdLength(convert(dims))
+      case ValChoose(_, _, xs, _) => Choose(convert(xs))(blame(e))
+      case ValChooseFresh(_, _, xs, _) => ChooseFresh(convert(xs))(blame(e))
+    }
 
-  def convert(implicit e: ValExprPairContext): (Expr[G], Expr[G]) = e match {
-    case ValExprPair0(_, e1, _, e2) => (convert(e1), convert(e2))
-  }
+  def convert(implicit e: ValExprPairContext): (Expr[G], Expr[G]) =
+    e match { case ValExprPair0(_, e1, _, e2) => (convert(e1), convert(e2)) }
 
-  def convert(implicit e: ValExprContext): Expr[G] = e match {
-    case ValExpr0(inner) => convert(inner)
-    case ValExpr1(inner) => convert(inner)
-  }
+  def convert(implicit e: ValExprContext): Expr[G] =
+    e match {
+      case ValExpr0(inner) => convert(inner)
+      case ValExpr1(inner) => convert(inner)
+    }
 
-  def convert(implicit id: ValIdentifierContext): String = id match {
-    case ValIdentifier0(inner) => convertText(inner)
-    case ValIdentifier1(ValKeywordNonExpr0(text)) => text
-    case ValIdentifier2(text) => text.substring(1, text.length-1)
-  }
+  def convert(implicit id: ValIdentifierContext): String =
+    id match {
+      case ValIdentifier0(inner) => convertText(inner)
+      case ValIdentifier1(ValKeywordNonExpr0(text)) => text
+      case ValIdentifier2(text) => text.substring(1, text.length - 1)
+    }
 
-  def convertText(implicit res: ValKeywordExprContext): String = res match {
-    case ValNonePerm(_) => "none"
-    case ValWrite(_) => "write"
-    case ValRead(_) => "read"
-    case ValNoneOption(_) => "None"
-    case ValEmpty(_) => "empty"
-    case ValTrue(_) => "true"
-    case ValFalse(_) => "false"
-  }
+  def convertText(implicit res: ValKeywordExprContext): String =
+    res match {
+      case ValNonePerm(_) => "none"
+      case ValWrite(_) => "write"
+      case ValRead(_) => "read"
+      case ValNoneOption(_) => "None"
+      case ValEmpty(_) => "empty"
+      case ValTrue(_) => "true"
+      case ValFalse(_) => "false"
+    }
 
-  def convert(implicit res: ValKeywordExprContext): Expr[G] = res match {
-    case ValNonePerm(_) => NoPerm()
-    case ValWrite(_) => WritePerm()
-    case ValRead(_) => ReadPerm()
-    case ValNoneOption(_) => OptNone()
-    case ValEmpty(_) => EmptyProcess()
-    case ValTrue(_) => tt
-    case ValFalse(_) => ff
-  }
+  def convert(implicit res: ValKeywordExprContext): Expr[G] =
+    res match {
+      case ValNonePerm(_) => NoPerm()
+      case ValWrite(_) => WritePerm()
+      case ValRead(_) => ReadPerm()
+      case ValNoneOption(_) => OptNone()
+      case ValEmpty(_) => EmptyProcess()
+      case ValTrue(_) => tt
+      case ValFalse(_) => ff
+    }
 
-  def convert(implicit inv: ValGenericAdtInvocationContext): Expr[G] = inv match {
-    case ValGenericAdtInvocation0(adt, _, typeArgs, _, _, func, _, args, _) =>
-      ADTFunctionInvocation(Some((new UnresolvedRef[G, AxiomaticDataType[G]](convert(adt)), convert(typeArgs))),
-        new UnresolvedRef[G, ADTFunction[G]](convert(func)), args.map(convert(_)).getOrElse(Nil))
-  }
-}
\ No newline at end of file
+  def convert(implicit inv: ValGenericAdtInvocationContext): Expr[G] =
+    inv match {
+      case ValGenericAdtInvocation0(adt, _, typeArgs, _, _, func, _, args, _) =>
+        ADTFunctionInvocation(
+          Some((
+            new UnresolvedRef[G, AxiomaticDataType[G]](convert(adt)),
+            convert(typeArgs),
+          )),
+          new UnresolvedRef[G, ADTFunction[G]](convert(func)),
+          args.map(convert(_)).getOrElse(Nil),
+        )
+    }
+}
diff --git a/src/parsers/vct/parsers/transform/ToCol.scala b/src/parsers/vct/parsers/transform/ToCol.scala
index 3d25dbe77e..e2861443a7 100644
--- a/src/parsers/vct/parsers/transform/ToCol.scala
+++ b/src/parsers/vct/parsers/transform/ToCol.scala
@@ -13,75 +13,123 @@ import scala.collection.mutable.ArrayBuffer
 import scala.reflect.ClassTag
 
 @nowarn("msg=match may not be exhaustive&msg=Some\\(")
-abstract class ToCol[G](val baseOrigin: Origin, val blameProvider: BlameProvider, val errors: Seq[(Token, Token, ExpectedError)]) {
+abstract class ToCol[G](
+    val baseOrigin: Origin,
+    val blameProvider: BlameProvider,
+    val errors: Seq[(Token, Token, ExpectedError)],
+) {
   class ContractCollector[G1]() {
-    val modifies: mutable.ArrayBuffer[(ParserRuleContext, String)] = mutable.ArrayBuffer()
-    val accessible: mutable.ArrayBuffer[(ParserRuleContext, String)] = mutable.ArrayBuffer()
-    val signals: mutable.ArrayBuffer[(ParserRuleContext, SignalsClause[G1])] = mutable.ArrayBuffer()
-    val decreases: mutable.ArrayBuffer[(ParserRuleContext, DecreasesClause[G1])] = mutable.ArrayBuffer()
-
-    val requires: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] = mutable.ArrayBuffer()
-    val ensures: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] = mutable.ArrayBuffer()
-    val context_everywhere: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] = mutable.ArrayBuffer()
-    val kernel_invariant: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] = mutable.ArrayBuffer()
-    val lock_invariant: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] = mutable.ArrayBuffer()
-
-    val given: mutable.ArrayBuffer[(ParserRuleContext, Variable[G1])] = mutable.ArrayBuffer()
-    val yields: mutable.ArrayBuffer[(ParserRuleContext, Variable[G1])] = mutable.ArrayBuffer()
-
-    val loop_invariant: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] = mutable.ArrayBuffer()
-
-    def consume[T](buffer: mutable.ArrayBuffer[(ParserRuleContext, T)]): Seq[T] = {
+    val modifies: mutable.ArrayBuffer[(ParserRuleContext, String)] = mutable
+      .ArrayBuffer()
+    val accessible: mutable.ArrayBuffer[(ParserRuleContext, String)] = mutable
+      .ArrayBuffer()
+    val signals: mutable.ArrayBuffer[(ParserRuleContext, SignalsClause[G1])] =
+      mutable.ArrayBuffer()
+    val decreases
+        : mutable.ArrayBuffer[(ParserRuleContext, DecreasesClause[G1])] =
+      mutable.ArrayBuffer()
+
+    val requires: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] = mutable
+      .ArrayBuffer()
+    val ensures: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] = mutable
+      .ArrayBuffer()
+    val context_everywhere: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] =
+      mutable.ArrayBuffer()
+    val kernel_invariant: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] =
+      mutable.ArrayBuffer()
+    val lock_invariant: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] =
+      mutable.ArrayBuffer()
+
+    val given: mutable.ArrayBuffer[(ParserRuleContext, Variable[G1])] = mutable
+      .ArrayBuffer()
+    val yields: mutable.ArrayBuffer[(ParserRuleContext, Variable[G1])] = mutable
+      .ArrayBuffer()
+
+    val loop_invariant: mutable.ArrayBuffer[(ParserRuleContext, Expr[G1])] =
+      mutable.ArrayBuffer()
+
+    def consume[T](
+        buffer: mutable.ArrayBuffer[(ParserRuleContext, T)]
+    ): Seq[T] = {
       val result = buffer.map(_._2)
       buffer.clear()
       result.toSeq
     }
 
-    def consumeOpt[T](buffer: mutable.ArrayBuffer[(ParserRuleContext, T)]): Option[T] = {
+    def consumeOpt[T](
+        buffer: mutable.ArrayBuffer[(ParserRuleContext, T)]
+    ): Option[T] = {
       val result = buffer.toSeq
       buffer.clear()
 
       result match {
         case Nil => None
         case (_, x) +: Nil => Some(x)
-        case _ +: (rule, _) +: _ => fail(rule, "Only one clause of this type may occur in a contract")
+        case _ +: (rule, _) +: _ =>
+          fail(rule, "Only one clause of this type may occur in a contract")
       }
     }
 
-    def consumeApplicableContract(blame: Blame[NontrivialUnsatisfiable])(implicit o: Origin): ApplicableContract[G1] = {
-      ApplicableContract(UnitAccountedPredicate(AstBuildHelpers.foldStar(consume(requires))),
-                         UnitAccountedPredicate(AstBuildHelpers.foldStar(consume(ensures))),
-                         AstBuildHelpers.foldStar(consume(context_everywhere)),
-                         consume(signals), consume(given), consume(yields), consumeOpt(decreases))(blame)
+    def consumeApplicableContract(
+        blame: Blame[NontrivialUnsatisfiable]
+    )(implicit o: Origin): ApplicableContract[G1] = {
+      ApplicableContract(
+        UnitAccountedPredicate(AstBuildHelpers.foldStar(consume(requires))),
+        UnitAccountedPredicate(AstBuildHelpers.foldStar(consume(ensures))),
+        AstBuildHelpers.foldStar(consume(context_everywhere)),
+        consume(signals),
+        consume(given),
+        consume(yields),
+        consumeOpt(decreases),
+      )(blame)
     }
 
-    def consumeLoopContract(blameNode: ParserRuleContext)(implicit o: Origin): LoopContract[G1] = {
+    def consumeLoopContract(
+        blameNode: ParserRuleContext
+    )(implicit o: Origin): LoopContract[G1] = {
       val likelyMeantInvariant = loop_invariant.nonEmpty
-      val likelyMeantIteration = requires.nonEmpty || ensures.nonEmpty || context_everywhere.nonEmpty
-
-      if(likelyMeantInvariant || (!likelyMeantIteration && decreases.nonEmpty))
-        LoopInvariant(AstBuildHelpers.foldStar(consume(loop_invariant)), consumeOpt(decreases))(blame(blameNode))
-      else if(likelyMeantIteration)
+      val likelyMeantIteration =
+        requires.nonEmpty || ensures.nonEmpty || context_everywhere.nonEmpty
+
+      if (likelyMeantInvariant || (!likelyMeantIteration && decreases.nonEmpty))
+        LoopInvariant(
+          AstBuildHelpers.foldStar(consume(loop_invariant)),
+          consumeOpt(decreases),
+        )(blame(blameNode))
+      else if (likelyMeantIteration)
         IterationContract(
           AstBuildHelpers.foldStar(consume(requires)),
           AstBuildHelpers.foldStar(consume(ensures)),
-          AstBuildHelpers.foldAnd(consume(context_everywhere)))(blame(blameNode))
-      else LoopInvariant(tt[G1], None)(blame(blameNode))
+          AstBuildHelpers.foldAnd(consume(context_everywhere)),
+        )(blame(blameNode))
+      else
+        LoopInvariant(tt[G1], None)(blame(blameNode))
     }
 
-    def nodes: Seq[ParserRuleContext] = Seq(
-      modifies, accessible, signals, decreases,
-      requires, ensures, context_everywhere, kernel_invariant,
-      given, yields, loop_invariant,
-    ).flatMap(_.map(_._1))
+    def nodes: Seq[ParserRuleContext] =
+      Seq(
+        modifies,
+        accessible,
+        signals,
+        decreases,
+        requires,
+        ensures,
+        context_everywhere,
+        kernel_invariant,
+        given,
+        yields,
+        loop_invariant,
+      ).flatMap(_.map(_._1))
   }
 
   class ModifierCollector() {
     val pure: mutable.ArrayBuffer[ParserRuleContext] = mutable.ArrayBuffer()
     val inline: mutable.ArrayBuffer[ParserRuleContext] = mutable.ArrayBuffer()
-    val threadLocal: mutable.ArrayBuffer[ParserRuleContext] = mutable.ArrayBuffer()
+    val threadLocal: mutable.ArrayBuffer[ParserRuleContext] = mutable
+      .ArrayBuffer()
     val static: mutable.ArrayBuffer[ParserRuleContext] = mutable.ArrayBuffer()
-    val bipAnnotation: mutable.ArrayBuffer[ParserRuleContext] = mutable.ArrayBuffer()
+    val bipAnnotation: mutable.ArrayBuffer[ParserRuleContext] = mutable
+      .ArrayBuffer()
 
     def consume(buffer: mutable.ArrayBuffer[ParserRuleContext]): Boolean = {
       val result = buffer.nonEmpty
@@ -89,79 +137,101 @@ abstract class ToCol[G](val baseOrigin: Origin, val blameProvider: BlameProvider
       result
     }
 
-    def nodes: Seq[ParserRuleContext] = Seq(pure, inline, threadLocal, static, bipAnnotation).flatten
+    def nodes: Seq[ParserRuleContext] =
+      Seq(pure, inline, threadLocal, static, bipAnnotation).flatten
   }
 
-  /**
-   * Used to convert ParserRuleContext nodes into origin implicitly
-   * @param node the node we want the origin of
-   * @return a constructed Origin based on the (implicitly) given node
-   */
+  /** Used to convert ParserRuleContext nodes into origin implicitly
+    * @param node
+    *   the node we want the origin of
+    * @return
+    *   a constructed Origin based on the (implicitly) given node
+    */
   implicit def origin(implicit node: ParserRuleContext): Origin = {
     baseOrigin.withContent(ctxToOrigin(node.start, node.stop))
   }
 
-  /**
-   * Helper function used to deduce a node's position in the origin, used by the implicit origin method
-   */
+  /** Helper function used to deduce a node's position in the origin, used by
+    * the implicit origin method
+    */
   def ctxToOrigin(start: Token, stop: Token): PositionRange = {
     val startLineIdx = start.getLine - 1
     val startColIdx = start.getCharPositionInLine
     val endLineIdx = stop.getLine - 1
-    val endColIdx = stop.getCharPositionInLine + stop.getStopIndex - stop.getStartIndex + 1
+    val endColIdx =
+      stop.getCharPositionInLine + stop.getStopIndex - stop.getStartIndex + 1
     positionToOrigin(startLineIdx, endLineIdx, Some((startColIdx, endColIdx)))
   }
 
-  def positionToOrigin(startLineIdx: Int, endLineIdx: Int, cols: Some[(Int, Int)]): PositionRange =
-    PositionRange(startLineIdx, endLineIdx, cols)
+  def positionToOrigin(
+      startLineIdx: Int,
+      endLineIdx: Int,
+      cols: Some[(Int, Int)],
+  ): PositionRange = PositionRange(startLineIdx, endLineIdx, cols)
 
   def blame(implicit node: ParserRuleContext): Blame[VerificationFailure] =
     errors.foldLeft(blameProvider(node)) {
       case (currentBlame, (from, to, expectedError)) =>
-        if(node.start.getTokenIndex >= from.getTokenIndex && node.stop.getTokenIndex <= to.getTokenIndex) {
-          FilterExpectedErrorBlame(currentBlame, expectedError)
-        } else {
-          currentBlame
-        }
+        if (
+          node.start.getTokenIndex >= from.getTokenIndex &&
+          node.stop.getTokenIndex <= to.getTokenIndex
+        ) { FilterExpectedErrorBlame(currentBlame, expectedError) }
+        else { currentBlame }
     }
 
-  def convertList[Input, Append <: Input, Singleton <: Input, Element]
-                 (extractSingle: Singleton => Option[Element], extractAppend: Append => Option[(Input, Element)])
-                 (input: Input)
-                 (implicit singleTag: ClassTag[Singleton], appendTag: ClassTag[Append]): Seq[Element] =
+  def convertList[Input, Append <: Input, Singleton <: Input, Element](
+      extractSingle: Singleton => Option[Element],
+      extractAppend: Append => Option[(Input, Element)],
+  )(input: Input)(
+      implicit singleTag: ClassTag[Singleton],
+      appendTag: ClassTag[Append],
+  ): Seq[Element] =
     input match {
       case single: Singleton => Seq(extractSingle(single).get)
-      case append: Append => extractAppend(append).get match {
-        case (input, element) => convertList(extractSingle, extractAppend)(input) :+ element
-      }
+      case append: Append =>
+        extractAppend(append).get match {
+          case (input, element) =>
+            convertList(extractSingle, extractAppend)(input) :+ element
+        }
     }
 
-  def getOrFail[B](node: ParserRuleContext, thing: Either[String, B]): B = thing match {
-    case Left(err) => fail(node, err)
-    case Right(good) => good
-  }
+  def getOrFail[B](node: ParserRuleContext, thing: Either[String, B]): B =
+    thing match {
+      case Left(err) => fail(node, err)
+      case Right(good) => good
+    }
 
-  def getOrFail[B](node: ParserRuleContext, thing: Option[B], message: String): B = thing match {
-    case None => fail(node, message)
-    case Some(b) => b
-  }
+  def getOrFail[B](
+      node: ParserRuleContext,
+      thing: Option[B],
+      message: String,
+  ): B =
+    thing match {
+      case None => fail(node, message)
+      case Some(b) => b
+    }
 
-  def failIfDefined[T <: ParserRuleContext](node: Option[T], format: String): Unit = node match {
-    case Some(node) => fail(node, format)
-    case None => // do nothing
-  }
+  def failIfDefined[T <: ParserRuleContext](
+      node: Option[T],
+      format: String,
+  ): Unit =
+    node match {
+      case Some(node) => fail(node, format)
+      case None => // do nothing
+    }
 
   def fail(tree: ParserRuleContext, message: String): Nothing = {
     throw ParseError(OriginProvider(tree), message)
   }
 
-  /**
-   * Print notice and exit, because a rule is unimplemented in the conversion to COL. Named after the scala
-   * "unimplemented" method, [[???]]
-   */
+  /** Print notice and exit, because a rule is unimplemented in the conversion
+    * to COL. Named after the scala "unimplemented" method, [[???]]
+    */
   def ??(tree: ParserRuleContext): Nothing = {
-    fail(tree, f"This construct (${tree.getClass.getSimpleName}) is syntactically valid, but not supported by VerCors.")
+    fail(
+      tree,
+      f"This construct (${tree.getClass.getSimpleName}) is syntactically valid, but not supported by VerCors.",
+    )
   }
 
-
 }
diff --git a/src/parsers/vct/parsers/transform/systemctocol/util/Seqs.scala b/src/parsers/vct/parsers/transform/systemctocol/util/Seqs.scala
index 9ccf5c037e..b9e9dffabb 100644
--- a/src/parsers/vct/parsers/transform/systemctocol/util/Seqs.scala
+++ b/src/parsers/vct/parsers/transform/systemctocol/util/Seqs.scala
@@ -7,5 +7,6 @@ object Seqs {
 
   def singleton[T](t: T): Seq[T] = Seq(t)
 
-  @varargs def make[T](ts: T*): Seq[T] = Seq(ts: _*)
+  @varargs
+  def make[T](ts: T*): Seq[T] = Seq(ts: _*)
 }
diff --git a/src/rewrite/vct/rewrite/ApplyTermRewriter.scala b/src/rewrite/vct/rewrite/ApplyTermRewriter.scala
index 5f8e1d2aed..67434a5b3a 100644
--- a/src/rewrite/vct/rewrite/ApplyTermRewriter.scala
+++ b/src/rewrite/vct/rewrite/ApplyTermRewriter.scala
@@ -16,8 +16,32 @@ import scala.collection.mutable
 import scala.reflect.ClassTag
 
 case object ApplyTermRewriter {
-  case class BuilderFor[Rule]
-  (
+  case class BuilderFor[Rule](
+      ruleNodes: Seq[SimplificationRule[Rule]],
+      debugIn: Seq[String],
+      debugMatch: Boolean,
+      debugMatchShort: Boolean,
+      debugNoMatch: Boolean,
+      debugFilterInputKind: Option[String],
+      debugFilterRule: Option[String],
+  ) extends RewriterBuilder {
+    override def apply[Pre <: Generation](): Rewriter[Pre] =
+      ApplyTermRewriter(
+        ruleNodes,
+        debugIn,
+        debugMatch,
+        debugMatchShort,
+        debugNoMatch,
+        debugFilterInputKind,
+        debugFilterRule,
+      )
+    override def key: String = "simplify"
+    override def desc: String =
+      "Apply axiomatic simplification lemmas to expressions."
+  }
+}
+
+case class ApplyTermRewriter[Rule, Pre <: Generation](
     ruleNodes: Seq[SimplificationRule[Rule]],
     debugIn: Seq[String],
     debugMatch: Boolean,
@@ -25,100 +49,101 @@ case object ApplyTermRewriter {
     debugNoMatch: Boolean,
     debugFilterInputKind: Option[String],
     debugFilterRule: Option[String],
-  ) extends RewriterBuilder {
-    override def apply[Pre <: Generation](): Rewriter[Pre] =
-      ApplyTermRewriter(ruleNodes, debugIn, debugMatch, debugMatchShort, debugNoMatch, debugFilterInputKind, debugFilterRule)
-    override def key: String = "simplify"
-    override def desc: String = "Apply axiomatic simplification lemmas to expressions."
-  }
-}
-
-case class ApplyTermRewriter[Rule, Pre <: Generation]
-(
-  ruleNodes: Seq[SimplificationRule[Rule]],
-  debugIn: Seq[String],
-  debugMatch: Boolean,
-  debugMatchShort: Boolean,
-  debugNoMatch: Boolean,
-  debugFilterInputKind: Option[String],
-  debugFilterRule: Option[String],
 ) extends Rewriter[Pre] with LazyLogging {
   case class MalformedSimplificationRule(body: Expr[_]) extends UserError {
     override def code: String = "malformedSimpRule"
     override def text: String =
       body.o.messageInContext(
         "The body of a simplification rule must be any number of nested \\forall predicates, " +
-          "of which the body is an equality.")
+          "of which the body is an equality."
+      )
   }
 
-  case class MalformedSimplificationRuleBinders(body: Expr[_]) extends UserError {
+  case class MalformedSimplificationRuleBinders(body: Expr[_])
+      extends UserError {
     override def code: String = "malformedSimpRuleBinders"
     override def text: String =
       body.o.messageInContext(
         "The body of a simplification rule with nested \\forall predicates, " +
-          "must have consistent order of forall binders indicators (e.g. not (r1!t1,t2) and (r2!t2,t1)")
+          "must have consistent order of forall binders indicators (e.g. not (r1!t1,t2) and (r2!t2,t1)"
+      )
   }
 
-  val rules: Seq[(Seq[Variable[Rule]], Expr[Rule], Expr[Rule], Origin)] = ruleNodes.map(node => (node.o, consumeForalls(node.axiom))).map {
-    case (o, (free, body)) => body match {
-      case Eq(left, right) => (free, left, right, o)
-      case other => throw MalformedSimplificationRule(other)
+  val rules: Seq[(Seq[Variable[Rule]], Expr[Rule], Expr[Rule], Origin)] =
+    ruleNodes.map(node => (node.o, consumeForalls(node.axiom))).map {
+      case (o, (free, body)) =>
+        body match {
+          case Eq(left, right) => (free, left, right, o)
+          case other => throw MalformedSimplificationRule(other)
+        }
     }
-  }
 
-  val ruleMap: Map[java.lang.Class[_], Seq[(Seq[Variable[Rule]], Expr[Rule], Expr[Rule], Origin)]] =
-    rules.groupBy {
-      case (_, pattern, _, _) => pattern.getClass
-    }
+  val ruleMap: Map[java.lang.Class[_], Seq[
+    (Seq[Variable[Rule]], Expr[Rule], Expr[Rule], Origin)
+  ]] = rules.groupBy { case (_, pattern, _, _) => pattern.getClass }
 
   val debugNameStack: ScopedStack[String] = ScopedStack()
 
   val updateProgress: ScopedStack[String => Unit] = ScopedStack()
 
-  def consumeForalls(node: Expr[Rule]): (Seq[Variable[Rule]], Expr[Rule]) = node match {
-    case Forall(bindings, _, body) =>
-      val (innerBindings, innerBody) = consumeForalls(body)
-      (bindings ++ innerBindings, innerBody)
-    case other => (Nil, other)
-  }
+  def consumeForalls(node: Expr[Rule]): (Seq[Variable[Rule]], Expr[Rule]) =
+    node match {
+      case Forall(bindings, _, body) =>
+        val (innerBindings, innerBody) = consumeForalls(body)
+        (bindings ++ innerBindings, innerBody)
+      case other => (Nil, other)
+    }
 
-  case class ApplyParametricBindings(bindings: Map[Variable[Pre], Ref[Pre, Variable[Pre]]]) extends NonLatchingRewriter[Pre, Pre] {
+  case class ApplyParametricBindings(
+      bindings: Map[Variable[Pre], Ref[Pre, Variable[Pre]]]
+  ) extends NonLatchingRewriter[Pre, Pre] {
     override def succProvider: SuccessorsProvider[Pre, Pre] =
       new SuccessorsProviderTrafo(allScopes.freeze) {
-        override def postTransform[T <: Declaration[Pre]](pre: Declaration[Pre], post: Option[T]): Option[T] =
-          Some(pre.asInstanceOf[T])
-
-        override def succ[RefDecl <: Declaration[Pre]](decl: Variable[Pre])(implicit tag: ClassTag[RefDecl]): Ref[Pre, RefDecl] =
-          bindings.getOrElse(decl, decl.asInstanceOf[RefDecl].ref).asInstanceOf[Ref[Pre, RefDecl]]
+        override def postTransform[T <: Declaration[Pre]](
+            pre: Declaration[Pre],
+            post: Option[T],
+        ): Option[T] = Some(pre.asInstanceOf[T])
+
+        override def succ[RefDecl <: Declaration[Pre]](
+            decl: Variable[Pre]
+        )(implicit tag: ClassTag[RefDecl]): Ref[Pre, RefDecl] =
+          bindings.getOrElse(decl, decl.asInstanceOf[RefDecl].ref)
+            .asInstanceOf[Ref[Pre, RefDecl]]
       }
 
     override def dispatch(decl: Declaration[Pre]): Unit =
       allScopes.anyDeclare(decl)
   }
 
-  case class ApplyRule(inst: Map[Variable[Rule], (Expr[Pre], Seq[Variable[Pre]])], typeInst: Map[Variable[Rule], Type[Pre]],
-                       defaultOrigin: Origin, rule: Expr[Rule]) extends NonLatchingRewriter[Rule, Pre] {
+  case class ApplyRule(
+      inst: Map[Variable[Rule], (Expr[Pre], Seq[Variable[Pre]])],
+      typeInst: Map[Variable[Rule], Type[Pre]],
+      defaultOrigin: Origin,
+      rule: Expr[Rule],
+  ) extends NonLatchingRewriter[Rule, Pre] {
     val binderOrigins: mutable.Map[Variable[Rule], Origin] = mutable.Map.empty
 
-    def addBinderOrigin(newVar: Ref[Rule,Variable[Rule]], originalVar: Variable[Pre]): Unit = {
+    def addBinderOrigin(
+        newVar: Ref[Rule, Variable[Rule]],
+        originalVar: Variable[Pre],
+    ): Unit = {
       val newOrigin = originalVar.o
-      if (binderOrigins.contains(newVar.decl) && binderOrigins(newVar.decl) != newOrigin) {
-        throw MalformedSimplificationRuleBinders(rule)
-      }
-      else {
-        binderOrigins(newVar.decl) = newOrigin
-      }
+      if (
+        binderOrigins.contains(newVar.decl) &&
+        binderOrigins(newVar.decl) != newOrigin
+      ) { throw MalformedSimplificationRuleBinders(rule) }
+      else { binderOrigins(newVar.decl) = newOrigin }
     }
 
     /* We want to reuse the names of forall binders, we do this by how the binders are captured, e.g.:
-    * axiom starall_star {
-    *   (∀type<any> T, resource r1, resource r2;
-    *     (∀* T t1; (r1!t1) ** (r2!t1)) ==
-    *     ((∀* T t2; (r1!t2)) ** (∀* T t3; (r2!t3))))
-    * }
-    * we capture the name "t1" by the pattern "(r1!t1)" and "(r1!t2) and (r2!t3) to name "t2" and "t3" the same
-    * as we have no other way to relate the forall's since they internally bind to different variables.
-    */
+     * axiom starall_star {
+     *   (∀type<any> T, resource r1, resource r2;
+     *     (∀* T t1; (r1!t1) ** (r2!t1)) ==
+     *     ((∀* T t2; (r1!t2)) ** (∀* T t3; (r2!t3))))
+     * }
+     * we capture the name "t1" by the pattern "(r1!t1)" and "(r1!t2) and (r2!t3) to name "t2" and "t3" the same
+     * as we have no other way to relate the forall's since they internally bind to different variables.
+     */
     def findBinderOrigin(e: Node[Rule]): Unit = {
       e match {
         case FunctionOf(Ref(v), ruleVars) =>
@@ -130,90 +155,126 @@ case class ApplyTermRewriter[Rule, Pre <: Generation]
 
     override def dispatch(o: Origin): Origin = defaultOrigin
 
-    override def dispatch(e: Expr[Rule]): Expr[Pre] = e match {
-      case Local(Ref(v)) =>
-        if(inst.contains(v)) ApplyParametricBindings(Map.empty).dispatch(inst(v)._1)
-        else Local[Pre](succ(v))(e.o)
-      case FunctionOf(Ref(v), ruleVars) =>
-        val (replacement, vars) = inst(v)
-        ApplyParametricBindings(vars.zip(ruleVars.map(ruleVar => succ[Variable[Pre]](ruleVar.decl))).toMap).dispatch(replacement)
-      case e: Binder[Rule] =>
-        findBinderOrigin(e)
-        rewriteDefault(e)
-      case other => rewriteDefault(other)
-    }
+    override def dispatch(e: Expr[Rule]): Expr[Pre] =
+      e match {
+        case Local(Ref(v)) =>
+          if (inst.contains(v))
+            ApplyParametricBindings(Map.empty).dispatch(inst(v)._1)
+          else
+            Local[Pre](succ(v))(e.o)
+        case FunctionOf(Ref(v), ruleVars) =>
+          val (replacement, vars) = inst(v)
+          ApplyParametricBindings(
+            vars.zip(ruleVars.map(ruleVar => succ[Variable[Pre]](ruleVar.decl)))
+              .toMap
+          ).dispatch(replacement)
+        case e: Binder[Rule] =>
+          findBinderOrigin(e)
+          rewriteDefault(e)
+        case other => rewriteDefault(other)
+      }
 
-    override def dispatch(d: Declaration[Rule]): Unit = d match {
-      case v: Variable[Rule] =>
-        variables.succeed(v, new Variable(dispatch(v.t))(binderOrigins.getOrElse(v,defaultOrigin)))
-      case other => rewriteDefault(other)
-    }
+    override def dispatch(d: Declaration[Rule]): Unit =
+      d match {
+        case v: Variable[Rule] =>
+          variables.succeed(
+            v,
+            new Variable(dispatch(v.t))(
+              binderOrigins.getOrElse(v, defaultOrigin)
+            ),
+          )
+        case other => rewriteDefault(other)
+      }
 
-    override def dispatch(t: Type[Rule]): Type[Pre] = t match {
-      case TVar(Ref(v)) => typeInst(v) // PB: maybe this is wrong in contrived situations?
-      case other => rewriteDefault(other)
-    }
+    override def dispatch(t: Type[Rule]): Type[Pre] =
+      t match {
+        case TVar(Ref(v)) =>
+          typeInst(v) // PB: maybe this is wrong in contrived situations?
+        case other => rewriteDefault(other)
+      }
   }
 
-  def apply(rule: (Seq[Variable[Rule]], Expr[Rule], Expr[Rule], Origin), subject: Expr[Pre]): Option[Expr[Pre]] = {
+  def apply(
+      rule: (Seq[Variable[Rule]], Expr[Rule], Expr[Rule], Origin),
+      subject: Expr[Pre],
+  ): Option[Expr[Pre]] = {
     incApply()
     implicit val o: Origin = DiagnosticOrigin
     val (free, pattern, substitute, ruleOrigin) = rule
 
     val debugFilter =
-      debugFilterRule.forall(SourceName.stringToName(_) == ruleOrigin.getPreferredNameOrElse()) &&
-        debugFilterInputKind.forall(_ == subject.getClass.getSimpleName) &&
-        (debugIn.isEmpty || debugIn.exists(name => debugNameStack.exists(_ == name)))
+      debugFilterRule.forall(
+        SourceName.stringToName(_) == ruleOrigin.getPreferredNameOrElse()
+      ) && debugFilterInputKind.forall(_ == subject.getClass.getSimpleName) &&
+        (debugIn.isEmpty ||
+          debugIn.exists(name => debugNameStack.exists(_ == name)))
 
     val inst = mutable.Map[Variable[Rule], (Expr[Pre], Seq[Variable[Pre]])]()
     val typeInst = mutable.Map[Variable[Rule], Type[Pre]]()
     val bindingInst = mutable.Map[Variable[Rule], Variable[Pre]]()
 
-    lazy val debugHeader: String = s"Expression `$subject` does not match rule ${ruleOrigin.getPreferredNameOrElse().snake}, since"
+    lazy val debugHeader: String =
+      s"Expression `$subject` does not match rule ${ruleOrigin.getPreferredNameOrElse().snake}, since"
 
     def declareTypeInst(left: Variable[Rule], right: Type[Pre]): Boolean =
       typeInst.get(left) match {
         case Some(replacement) =>
           val matches = replacement == right
-          if(debugNoMatch && debugFilter && !matches)
-            logger.debug(s"$debugHeader earlier `$left` matched `$replacement`, but now it must match `$right`")
+          if (debugNoMatch && debugFilter && !matches)
+            logger.debug(
+              s"$debugHeader earlier `$left` matched `$replacement`, but now it must match `$right`"
+            )
 
           matches
         case None =>
           typeInst(left) = right
           val leftUpperBound = left.t.asInstanceOf[TType[Rule]].t
-          val matches = leftUpperBound.superTypeOf(right.asInstanceOf[Type[Rule]])
-
-          if(debugNoMatch && debugFilter && !matches) {
-            logger.debug(s"$debugHeader the type-level variable `$left` matched `$right`, but " +
-              s"the upper bound of `$left` (`$leftUpperBound`) is not a supertype of $right.")
+          val matches = leftUpperBound
+            .superTypeOf(right.asInstanceOf[Type[Rule]])
+
+          if (debugNoMatch && debugFilter && !matches) {
+            logger.debug(
+              s"$debugHeader the type-level variable `$left` matched `$right`, but " +
+                s"the upper bound of `$left` (`$leftUpperBound`) is not a supertype of $right."
+            )
           }
 
           matches
       }
 
-    def declareInst(left: Variable[Rule], right: Expr[Pre], leftBindings: Seq[Variable[Rule]]): Boolean = {
+    def declareInst(
+        left: Variable[Rule],
+        right: Expr[Pre],
+        leftBindings: Seq[Variable[Rule]],
+    ): Boolean = {
       lazy val debugLeft = Local[Rule](left.ref)
       inst.get(left) match {
         case Some((replacement, _)) =>
           val matches = replacement == right
 
-          if(debugNoMatch && debugFilter && !matches)
-            logger.debug(s"$debugHeader earlier `$debugLeft` matched `$replacement`, but now it must match `$right`")
+          if (debugNoMatch && debugFilter && !matches)
+            logger.debug(
+              s"$debugHeader earlier `$debugLeft` matched `$replacement`, but now it must match `$right`"
+            )
 
           matches
         case None =>
-          val freeRight = FreeVariables.freeVariables(right).collect {
-            case FreeVariables.ReadFreeVar(Local(Ref(v))) => v
-          }.toSet
+          val freeRight =
+            FreeVariables.freeVariables(right).collect {
+              case FreeVariables.ReadFreeVar(Local(Ref(v))) => v
+            }.toSet
 
-          val freeRightOfBindings = freeRight.intersect(bindingInst.values.toSet)
+          val freeRightOfBindings = freeRight
+            .intersect(bindingInst.values.toSet)
           val declaredAllowedBindings = leftBindings.map(bindingInst).toSet
           val extraBindingDeps = freeRightOfBindings -- declaredAllowedBindings
 
-          if(extraBindingDeps.nonEmpty) {
-            if(debugNoMatch && debugFilter)
-              logger.debug(s"$debugHeader `$debugLeft` matches `$right`, but it is dependent on bindings within the pattern that are not declared as such: ${extraBindingDeps.map(v => Local[Pre](v.ref).toString).mkString(", ")}.")
+          if (extraBindingDeps.nonEmpty) {
+            if (debugNoMatch && debugFilter)
+              logger.debug(
+                s"$debugHeader `$debugLeft` matches `$right`, but it is dependent on bindings within the pattern that are not declared as such: ${extraBindingDeps
+                    .map(v => Local[Pre](v.ref).toString).mkString(", ")}."
+              )
 
             return false
           }
@@ -221,9 +282,12 @@ case class ApplyTermRewriter[Rule, Pre <: Generation]
           inst(left) = (right, leftBindings.map(bindingInst))
           val matches = left.t.superTypeOf(right.t.asInstanceOf[Type[Rule]])
 
-          if(debugNoMatch && debugFilter && !matches)
-            logger.debug(s"$debugHeader `$debugLeft` (typed `${left.t}`) matched `$right` (typed `${right.t}`), " +
-              s"but `${right.t}` is not a subtype of `${left.t}`")
+          if (debugNoMatch && debugFilter && !matches)
+            logger.debug(
+              s"$debugHeader `$debugLeft` (typed `${left
+                  .t}`) matched `$right` (typed `${right.t}`), " +
+                s"but `${right.t}` is not a subtype of `${left.t}`"
+            )
 
           matches
       }
@@ -236,43 +300,53 @@ case class ApplyTermRewriter[Rule, Pre <: Generation]
       case MatchingDeclaration(left: Variable[Rule], right: Variable[Pre]) =>
         bindingInst(left) = right
       case MatchingDeclaration(_, _) =>
-        throw Unreachable("Simplification rules do not declare anything other than variables from binders.")
+        throw Unreachable(
+          "Simplification rules do not declare anything other than variables from binders."
+        )
 
       case MatchingReference(left: Variable[Rule], right: Variable[Pre]) =>
-        if(free.contains(left)) {
-          if(!(left.t match {
-            case TType(_) => declareTypeInst(left, TVar(right.ref))
-            case _ => declareInst(left, Local(right.ref), Nil)
-          })) {
-            return None
-          }
-        } else /* !free.contains(left) */ {
-          if(!bindingInst.get(left).contains(right)) {
-            return None
+        if (free.contains(left)) {
+          if (
+            !(left.t match {
+              case TType(_) => declareTypeInst(left, TVar(right.ref))
+              case _ => declareInst(left, Local(right.ref), Nil)
+            })
+          ) { return None }
+        } else
+          /* !free.contains(left) */ {
+            if (!bindingInst.get(left).contains(right)) { return None }
           }
-        }
       case MatchingReference(_, _) =>
-        throw Unreachable("Simplification rules do not refer to anything other than variables.")
+        throw Unreachable(
+          "Simplification rules do not refer to anything other than variables."
+        )
 
-      case StructuralDifference(Local(Ref(v)), right: Expr[Pre]) if free.contains(v) =>
-        if(!declareInst(v, right, Nil)) return None
+      case StructuralDifference(Local(Ref(v)), right: Expr[Pre])
+          if free.contains(v) =>
+        if (!declareInst(v, right, Nil))
+          return None
 
-      case StructuralDifference(FunctionOf(Ref(v), bindings), right: Expr[Pre]) if free.contains(v) =>
-        if(!declareInst(v, right, bindings.map(_.decl))) return None
+      case StructuralDifference(FunctionOf(Ref(v), bindings), right: Expr[Pre])
+          if free.contains(v) =>
+        if (!declareInst(v, right, bindings.map(_.decl)))
+          return None
 
-      case StructuralDifference(TVar(Ref(v)), right: Type[Pre]) if free.contains(v) =>
-        if(!declareTypeInst(v, right)) return None
+      case StructuralDifference(TVar(Ref(v)), right: Type[Pre])
+          if free.contains(v) =>
+        if (!declareTypeInst(v, right))
+          return None
 
       case StructuralDifference(left, right) =>
-        if(debugNoMatch && debugFilter)
+        if (debugNoMatch && debugFilter)
           logger.debug(s"$debugHeader $left cannot be matched to $right.")
         return None
     }
 
-    val result = ApplyRule(inst.toMap, typeInst.toMap, subject.o, substitute).dispatch(substitute)
+    val result = ApplyRule(inst.toMap, typeInst.toMap, subject.o, substitute)
+      .dispatch(substitute)
 
-    if(debugMatch && debugFilter) {
-      if(debugMatchShort) {
+    if (debugMatch && debugFilter) {
+      if (debugMatchShort) {
         logger.debug(subject.toInlineString)
         logger.debug(s" ~> $result")
       } else {
@@ -280,18 +354,21 @@ case class ApplyTermRewriter[Rule, Pre <: Generation]
         logger.debug(s"Matches:          $pattern")
         if (inst.nonEmpty) {
           logger.debug("With bindings:")
-          inst.toSeq.sortBy { case (k, _) => k.o.getPreferredNameOrElse().camel }.foreach {
-            case (rule, (binding, over)) =>
-              if (over.isEmpty)
-                logger.debug(s"  $rule = $binding")
-              else
-                logger.debug(s"  $rule = ($binding) parametric over ${over.mkString(", ")}")
+          inst.toSeq.sortBy { case (k, _) =>
+            k.o.getPreferredNameOrElse().camel
+          }.foreach { case (rule, (binding, over)) =>
+            if (over.isEmpty)
+              logger.debug(s"  $rule = $binding")
+            else
+              logger.debug(
+                s"  $rule = ($binding) parametric over ${over.mkString(", ")}"
+              )
           }
         }
         if (typeInst.nonEmpty) {
           logger.debug("With type bindings:")
-          typeInst.foreach {
-            case (rule, binding) => logger.debug(s"  $rule = $binding")
+          typeInst.foreach { case (rule, binding) =>
+            logger.debug(s"  $rule = $binding")
           }
         }
         logger.debug(s"Applied to:       $substitute")
@@ -310,15 +387,15 @@ case class ApplyTermRewriter[Rule, Pre <: Generation]
   @tailrec
   final def applyExhaustively(expr: Expr[Pre]): Expr[Pre] =
     applyOnce(expr) match {
-      case Some(e) =>
-        applyExhaustively(e)
+      case Some(e) => applyExhaustively(e)
       case None => expr
     }
 
   case class ApplyRecursively() extends NonLatchingRewriter[Pre, Pre] {
     case object IdentitySucc extends SuccessorsProviderTrafo(allScopes.freeze) {
-      override def preTransform[I <: Declaration[Pre], O <: Declaration[Pre]](pre: I): Option[O] =
-        Some(pre.asInstanceOf[O])
+      override def preTransform[I <: Declaration[Pre], O <: Declaration[Pre]](
+          pre: I
+      ): Option[O] = Some(pre.asInstanceOf[O])
     }
 
     override def succProvider: SuccessorsProvider[Pre, Pre] = IdentitySucc
@@ -332,13 +409,16 @@ case class ApplyTermRewriter[Rule, Pre <: Generation]
         case Some(simplifiedYetAgain) =>
           // The simplification of the child nodes caused the parent node to be simplified again, so we need to
           // recurse into the structure once again.
-          logger.debug(s"Complicated simplification: simplified node $simplifiedBottomUp was simplified yet again to $simplifiedYetAgain")
+          logger.debug(
+            s"Complicated simplification: simplified node $simplifiedBottomUp was simplified yet again to $simplifiedYetAgain"
+          )
           dispatch(simplifiedYetAgain)
         case None => simplifiedBottomUp
       }
     }
 
-    override def dispatch(decl: Declaration[Pre]): Unit = allScopes.anyDeclare(decl)
+    override def dispatch(decl: Declaration[Pre]): Unit =
+      allScopes.anyDeclare(decl)
   }
 
   val simplificationDone: ScopedStack[Unit] = ScopedStack()
@@ -349,25 +429,27 @@ case class ApplyTermRewriter[Rule, Pre <: Generation]
   def incApply(): Unit = {
     countApply += 1
 
-    if(countApply % 10000 == 0) {
-      logger.debug(s"Applied $countApply rules ($countSuccess successfully) to expression $currentExpr")
+    if (countApply % 10000 == 0) {
+      logger.debug(
+        s"Applied $countApply rules ($countSuccess successfully) to expression $currentExpr"
+      )
     }
   }
 
-  def incSuccess(): Unit = {
-    countSuccess += 1
-  }
+  def incSuccess(): Unit = { countSuccess += 1 }
 
   override def dispatch(e: Expr[Pre]): Expr[Post] =
-    if(simplificationDone.nonEmpty) rewriteDefault(e)
-    else simplificationDone.having(()) {
-      updateProgress.top(e.toInlineString)
-      countApply = 0
-      countSuccess = 0
-      currentExpr = e
-      val res = ApplyRecursively().dispatch(e)
-      dispatch(res)
-    }
+    if (simplificationDone.nonEmpty)
+      rewriteDefault(e)
+    else
+      simplificationDone.having(()) {
+        updateProgress.top(e.toInlineString)
+        countApply = 0
+        countSuccess = 0
+        currentExpr = e
+        val res = ApplyRecursively().dispatch(e)
+        dispatch(res)
+      }
 
   override def dispatch(decl: Declaration[Pre]): Unit =
     debugNameStack.having(decl.o.getPreferredNameOrElse().ucamel) {
@@ -377,9 +459,7 @@ case class ApplyTermRewriter[Rule, Pre <: Generation]
   override def dispatch(program: Program[Pre]): Program[Post] = {
     val exprCount = program.map { case _: Expr[Pre] => () }.size
     Progress.dynamicMessages(exprCount) { update =>
-      updateProgress.having(update) {
-        rewriteDefault(program)
-      }
+      updateProgress.having(update) { rewriteDefault(program) }
     }
   }
 }
diff --git a/src/rewrite/vct/rewrite/BranchToIfElse.scala b/src/rewrite/vct/rewrite/BranchToIfElse.scala
index fb8423edb1..391be6c29f 100644
--- a/src/rewrite/vct/rewrite/BranchToIfElse.scala
+++ b/src/rewrite/vct/rewrite/BranchToIfElse.scala
@@ -7,19 +7,24 @@ import vct.col.ast.RewriteHelpers._
 
 case object BranchToIfElse extends RewriterBuilder {
   override def key: String = "branchToIfElse"
-  override def desc: String = "Translate a chain of if/elseif/else to strictly if/else."
+  override def desc: String =
+    "Translate a chain of if/elseif/else to strictly if/else."
 }
 
 case class BranchToIfElse[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case Branch(Nil) => Block(Nil)(stat.o)
-    case Branch(Seq((cond, whenTrue), (BooleanValue(true), whenFalse))) =>
-      Branch(Seq((dispatch(cond), dispatch(whenTrue)), (tt[Post], dispatch(whenFalse))))(stat.o)
-    case Branch((cond, whenTrue) +: tail) =>
-      Branch(Seq(
-        (dispatch(cond), dispatch(whenTrue)),
-        (tt[Post], dispatch(Branch[Pre](tail)(stat.o)))
-      ))(stat.o)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case Branch(Nil) => Block(Nil)(stat.o)
+      case Branch(Seq((cond, whenTrue), (BooleanValue(true), whenFalse))) =>
+        Branch(Seq(
+          (dispatch(cond), dispatch(whenTrue)),
+          (tt[Post], dispatch(whenFalse)),
+        ))(stat.o)
+      case Branch((cond, whenTrue) +: tail) =>
+        Branch(Seq(
+          (dispatch(cond), dispatch(whenTrue)),
+          (tt[Post], dispatch(Branch[Pre](tail)(stat.o))),
+        ))(stat.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/CFloatIntCoercion.scala b/src/rewrite/vct/rewrite/CFloatIntCoercion.scala
index 5eb513f8eb..ea2f730be8 100644
--- a/src/rewrite/vct/rewrite/CFloatIntCoercion.scala
+++ b/src/rewrite/vct/rewrite/CFloatIntCoercion.scala
@@ -1,37 +1,58 @@
 package vct.col.rewrite
 
 import vct.col.ast.`type`.typeclass.TFloats
-import vct.col.ast.{BinExpr, CIntegerValue, CastFloat, CoerceCFloatCInt, CoerceCIntCFloat, CoerceDecreasePrecision, Coercion, Expr, IntegerValue, TCFloat, TCInt, TFloat, TInt, Type}
+import vct.col.ast.{
+  BinExpr,
+  CIntegerValue,
+  CastFloat,
+  CoerceCFloatCInt,
+  CoerceCIntCFloat,
+  CoerceDecreasePrecision,
+  Coercion,
+  Expr,
+  IntegerValue,
+  TCFloat,
+  TCInt,
+  TFloat,
+  TInt,
+  Type,
+}
 import vct.col.origin.Origin
 import vct.col.rewrite.{Generation, RewriterBuilder}
 import vct.col.typerules.CoercingRewriter
 
-
 case object CFloatIntCoercion extends RewriterBuilder {
   override def key: String = "CFloatIntCoercion"
-  override def desc: String = "Places cast from ints and floats from the C backend."
+  override def desc: String =
+    "Places cast from ints and floats from the C backend."
 }
 
-case class CFloatIntCoercion[Pre <: Generation]() extends CoercingRewriter[Pre] {
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = coercion match {
-    case CoerceCFloatCInt(_) => CastFloat(e, TInt())
-    case CoerceCIntCFloat(target) => CastFloat(e, dispatch(target))
-    case CoerceDecreasePrecision(_, target) =>  CastFloat(e, dispatch(target))
-    case other => super.applyCoercion(e, other)
-  }
+case class CFloatIntCoercion[Pre <: Generation]()
+    extends CoercingRewriter[Pre] {
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    coercion match {
+      case CoerceCFloatCInt(_) => CastFloat(e, TInt())
+      case CoerceCIntCFloat(target) => CastFloat(e, dispatch(target))
+      case CoerceDecreasePrecision(_, target) => CastFloat(e, dispatch(target))
+      case other => super.applyCoercion(e, other)
+    }
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TCInt() => TInt()
-    // This is wrong, but since we translate to rationals anyways, this does not matter.
-    // Getting everything to type check otherwise is a pain, since in "coerce" we always coerce
-    // to an arbitrary big float.
-    case TCFloat(e, m) => TFloats.ieee754_32bit
-    case TFloat(e, m) => TFloats.ieee754_32bit
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TCInt() => TInt()
+      // This is wrong, but since we translate to rationals anyways, this does not matter.
+      // Getting everything to type check otherwise is a pain, since in "coerce" we always coerce
+      // to an arbitrary big float.
+      case TCFloat(e, m) => TFloats.ieee754_32bit
+      case TFloat(e, m) => TFloats.ieee754_32bit
+      case other => rewriteDefault(other)
+    }
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case CIntegerValue(v) => IntegerValue(v)(e.o)
-    case other => rewriteDefault(other)
-  }
-}
\ No newline at end of file
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case CIntegerValue(v) => IntegerValue(v)(e.o)
+      case other => rewriteDefault(other)
+    }
+}
diff --git a/src/rewrite/vct/rewrite/CheckContractSatisfiability.scala b/src/rewrite/vct/rewrite/CheckContractSatisfiability.scala
index a54aedb7ee..04f5e18c17 100644
--- a/src/rewrite/vct/rewrite/CheckContractSatisfiability.scala
+++ b/src/rewrite/vct/rewrite/CheckContractSatisfiability.scala
@@ -2,10 +2,31 @@ package vct.col.rewrite
 
 import hre.util.ScopedStack
 import vct.col.ast._
-import vct.col.rewrite.CheckContractSatisfiability.{AssertPassedNontrivialUnsatisfiable, NotWellFormedIgnoreCheckSat}
+import vct.col.rewrite.CheckContractSatisfiability.{
+  AssertPassedNontrivialUnsatisfiable,
+  NotWellFormedIgnoreCheckSat,
+}
 import vct.col.rewrite.util.Extract
-import vct.col.origin.{Blame, ExpectedError, ExpectedErrorFailure, ExpectedErrorNotTripped, ExpectedErrorTrippedTwice, FilterExpectedErrorBlame, NontrivialUnsatisfiable, Origin, PanicBlame, PreferredName, UnsafeDontCare, VerificationFailure}
-import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, RewriterBuilderArg}
+import vct.col.origin.{
+  Blame,
+  ExpectedError,
+  ExpectedErrorFailure,
+  ExpectedErrorNotTripped,
+  ExpectedErrorTrippedTwice,
+  FilterExpectedErrorBlame,
+  NontrivialUnsatisfiable,
+  Origin,
+  PanicBlame,
+  PreferredName,
+  UnsafeDontCare,
+  VerificationFailure,
+}
+import vct.col.rewrite.{
+  Generation,
+  Rewriter,
+  RewriterBuilder,
+  RewriterBuilderArg,
+}
 import vct.col.util.AstBuildHelpers.{ff, foldStar, procedure, unfoldStar}
 
 import scala.collection.mutable.ArrayBuffer
@@ -16,57 +37,82 @@ case object CheckContractSatisfiability extends RewriterBuilderArg[Boolean] {
     "Prove that contracts are not internally contradictory (i.e. unsatisfiable) for methods and other contract bearers, " +
       "except for the contract `false`."
 
-  case class AssertPassedNontrivialUnsatisfiable(contract: ApplicableContract[_]) extends Blame[ExpectedErrorFailure] {
-    override def blame(error: ExpectedErrorFailure): Unit = error match {
-      case _: ExpectedErrorTrippedTwice =>
+  case class AssertPassedNontrivialUnsatisfiable(
+      contract: ApplicableContract[_]
+  ) extends Blame[ExpectedErrorFailure] {
+    override def blame(error: ExpectedErrorFailure): Unit =
+      error match {
+        case _: ExpectedErrorTrippedTwice =>
         // Ignore: Carbon may report the assert failed, even when the contract is not well-formed.
-      case ExpectedErrorNotTripped(_) =>
-        contract.blame.blame(NontrivialUnsatisfiable(contract))
-    }
+        case ExpectedErrorNotTripped(_) =>
+          contract.blame.blame(NontrivialUnsatisfiable(contract))
+      }
   }
 
-  case class NotWellFormedIgnoreCheckSat(err: ExpectedError) extends Blame[VerificationFailure] {
-    override def blame(error: VerificationFailure): Unit =
-      err.trip(error)
+  case class NotWellFormedIgnoreCheckSat(err: ExpectedError)
+      extends Blame[VerificationFailure] {
+    override def blame(error: VerificationFailure): Unit = err.trip(error)
   }
 }
 
-case class CheckContractSatisfiability[Pre <: Generation](doCheck: Boolean = true) extends Rewriter[Pre] {
-  val expectedErrors: ScopedStack[ArrayBuffer[ExpectedError]] = ScopedStack[ArrayBuffer[ExpectedError]]()
-  val wellFormednessBlame: ScopedStack[Blame[VerificationFailure]] = ScopedStack()
+case class CheckContractSatisfiability[Pre <: Generation](
+    doCheck: Boolean = true
+) extends Rewriter[Pre] {
+  val expectedErrors: ScopedStack[ArrayBuffer[ExpectedError]] =
+    ScopedStack[ArrayBuffer[ExpectedError]]()
+  val wellFormednessBlame: ScopedStack[Blame[VerificationFailure]] =
+    ScopedStack()
 
   override def dispatch[T <: VerificationFailure](blame: Blame[T]): Blame[T] =
     wellFormednessBlame.topOption.getOrElse(blame)
 
-  def splitAccountedPredicate(pred: AccountedPredicate[Pre]): Seq[Expr[Pre]] = pred match {
-    case UnitAccountedPredicate(pred) => unfoldStar(pred)
-    case SplitAccountedPredicate(left, right) => splitAccountedPredicate(left) ++ splitAccountedPredicate(right)
-  }
+  def splitAccountedPredicate(pred: AccountedPredicate[Pre]): Seq[Expr[Pre]] =
+    pred match {
+      case UnitAccountedPredicate(pred) => unfoldStar(pred)
+      case SplitAccountedPredicate(left, right) =>
+        splitAccountedPredicate(left) ++ splitAccountedPredicate(right)
+    }
 
-  def checkSatisfiability(contract: ApplicableContract[Pre], n: Option[Declaration[Pre]]): Unit = {
-    implicit val origin: Origin = n.map(_.o).getOrElse(contract.o).where(prefix = "checksat")
+  def checkSatisfiability(
+      contract: ApplicableContract[Pre],
+      n: Option[Declaration[Pre]],
+  ): Unit = {
+    implicit val origin: Origin = n.map(_.o).getOrElse(contract.o)
+      .where(prefix = "checksat")
     foldStar(splitAccountedPredicate(contract.requires)) match {
       case BooleanValue(false) =>
-        // Assume the contract is not intended to be satisfiable
+      // Assume the contract is not intended to be satisfiable
       case pred =>
-        val err = ExpectedError("assertFailed:false", origin, AssertPassedNontrivialUnsatisfiable(contract))
-        val onlyAssertBlame = FilterExpectedErrorBlame(PanicBlame("A boolean assert can only report assertFailed:false"), err)
+        val err = ExpectedError(
+          "assertFailed:false",
+          origin,
+          AssertPassedNontrivialUnsatisfiable(contract),
+        )
+        val onlyAssertBlame = FilterExpectedErrorBlame(
+          PanicBlame("A boolean assert can only report assertFailed:false"),
+          err,
+        )
         expectedErrors.top += err
         val extractObj = Extract[Pre]()
         val result = extractObj.extract(pred)
         val extractObj.Data(ts, in, _, _, _) = extractObj.finish()
         variables.scope {
           globalDeclarations.declare(procedure(
-            blame = PanicBlame("The postcondition of a method checking satisfiability is empty"),
-            contractBlame = UnsafeDontCare.Satisfiability("the precondition of a check-sat method is only there to check it."),
-            requires = UnitAccountedPredicate(
-              wellFormednessBlame.having(NotWellFormedIgnoreCheckSat(err)) {
-                dispatch(result)
-              }
-            )(result.o),
+            blame = PanicBlame(
+              "The postcondition of a method checking satisfiability is empty"
+            ),
+            contractBlame = UnsafeDontCare.Satisfiability(
+              "the precondition of a check-sat method is only there to check it."
+            ),
+            requires =
+              UnitAccountedPredicate(
+                wellFormednessBlame.having(NotWellFormedIgnoreCheckSat(err)) {
+                  dispatch(result)
+                }
+              )(result.o),
             typeArgs = variables.dispatch(ts.keys),
             args = variables.dispatch(in.keys),
-            body = Some(Scope[Post](Nil, Assert(ff)(onlyAssertBlame)))
+            body = Some(Scope[Post](Nil, Assert(ff)(onlyAssertBlame))),
           ))
         }
     }
@@ -84,12 +130,13 @@ case class CheckContractSatisfiability[Pre <: Generation](doCheck: Boolean = tru
   val currentDeclaration: ScopedStack[Declaration[Pre]] = ScopedStack()
 
   override def dispatch(decl: Declaration[Pre]): Unit =
-    currentDeclaration.having(decl) {
-      super.dispatch(decl)
-    }
+    currentDeclaration.having(decl) { super.dispatch(decl) }
 
-  override def dispatch(contract: ApplicableContract[Pre]): ApplicableContract[Post] = {
-    if(doCheck) checkSatisfiability(contract, currentDeclaration.topOption)
+  override def dispatch(
+      contract: ApplicableContract[Pre]
+  ): ApplicableContract[Post] = {
+    if (doCheck)
+      checkSatisfiability(contract, currentDeclaration.topOption)
     rewriteDefault(contract)
   }
-}
\ No newline at end of file
+}
diff --git a/src/rewrite/vct/rewrite/CheckProcessAlgebra.scala b/src/rewrite/vct/rewrite/CheckProcessAlgebra.scala
index 6eca1ac689..87f378717b 100644
--- a/src/rewrite/vct/rewrite/CheckProcessAlgebra.scala
+++ b/src/rewrite/vct/rewrite/CheckProcessAlgebra.scala
@@ -17,158 +17,213 @@ case object CheckProcessAlgebra extends RewriterBuilder {
   override def desc: String = "TODO description"
 }
 
-case class CheckProcessAlgebra[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging {
-  case class ModelPostconditionFailed(process: ModelProcess[_]) extends Blame[CallableFailure] {
-    override def blame(error: CallableFailure): Unit = error match {
-      case post: PostconditionFailed => process.blame.blame(post)
-      case ctx: ContextEverywhereFailedInPost =>
-        PanicBlame("Generated methods for models do not have context_everywhere clauses.").blame(ctx)
-      case _: SignalsFailed | _: ExceptionNotInSignals =>
-        PanicBlame("Generated methods for models do not throw exceptions.").blame(error)
-      case _: TerminationMeasureFailed =>
-        PanicBlame("Generated methods for models do not have termination measures (yet).").blame(error)
-    }
+case class CheckProcessAlgebra[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
+  case class ModelPostconditionFailed(process: ModelProcess[_])
+      extends Blame[CallableFailure] {
+    override def blame(error: CallableFailure): Unit =
+      error match {
+        case post: PostconditionFailed => process.blame.blame(post)
+        case ctx: ContextEverywhereFailedInPost =>
+          PanicBlame(
+            "Generated methods for models do not have context_everywhere clauses."
+          ).blame(ctx)
+        case _: SignalsFailed | _: ExceptionNotInSignals =>
+          PanicBlame("Generated methods for models do not throw exceptions.")
+            .blame(error)
+        case _: TerminationMeasureFailed =>
+          PanicBlame(
+            "Generated methods for models do not have termination measures (yet)."
+          ).blame(error)
+      }
   }
 
-  case class InsufficientPermissionForModelField(modelDeref: ModelDeref[_]) extends Blame[InsufficientPermission] {
-    override def blame(error: InsufficientPermission): Unit = modelDeref.blame.blame(ModelInsufficientPermission(modelDeref))
+  case class InsufficientPermissionForModelField(modelDeref: ModelDeref[_])
+      extends Blame[InsufficientPermission] {
+    override def blame(error: InsufficientPermission): Unit =
+      modelDeref.blame.blame(ModelInsufficientPermission(modelDeref))
   }
 
-  val modelFieldSuccessors: SuccessionMap[ModelField[Pre], InstanceField[Post]] = SuccessionMap()
-  val processSuccessors: SuccessionMap[ModelProcess[Pre], InstanceMethod[Post]] = SuccessionMap()
+  val modelFieldSuccessors
+      : SuccessionMap[ModelField[Pre], InstanceField[Post]] = SuccessionMap()
+  val processSuccessors
+      : SuccessionMap[ModelProcess[Pre], InstanceMethod[Post]] = SuccessionMap()
   val modelSuccessors: SuccessionMap[Model[Pre], Class[Post]] = SuccessionMap()
   val currentModel: ScopedStack[Model[Pre]] = ScopedStack()
 
-  override def dispatch(model: Declaration[Pre]): Unit = model match {
-    //      val x = Function().declareDefault()
-    //      model.succeedDefault(this, x)
-    //      model.rewrite().declareDefault()
-    case model: Model[Pre] =>
-      // We put all permutations of every top-level parallel process
-      // in a map to detect overlapping ones.
-      // I think I'd prefer this to be done on the fly, instead of generating _all_ permutations.
-      // Putting all processes in a set and comparing two sets is better
-      val compositeMap: mutable.Map[Set[Expr[Pre]], ModelProcess[Pre]] = mutable.Map()
-
-      // TODO: Refactor this to separate method. Or, maybe in typechecker/frontend? As it could be part of a well-formedness requirement
-      model.declarations.foreach {
-        case process: ModelProcess[Pre] =>
-          process.impl match {
-            case processPar: ProcessPar[Pre] =>
-              val parallelCompositionElems = processPar.unfoldProcessPar.toSet
-              if (parallelCompositionElems.forall(_.isInstanceOf[ProcessApply[Pre]])) {
-                if (compositeMap.contains(parallelCompositionElems)) {
+  override def dispatch(model: Declaration[Pre]): Unit =
+    model match {
+      //      val x = Function().declareDefault()
+      //      model.succeedDefault(this, x)
+      //      model.rewrite().declareDefault()
+      case model: Model[Pre] =>
+        // We put all permutations of every top-level parallel process
+        // in a map to detect overlapping ones.
+        // I think I'd prefer this to be done on the fly, instead of generating _all_ permutations.
+        // Putting all processes in a set and comparing two sets is better
+        val compositeMap: mutable.Map[Set[Expr[Pre]], ModelProcess[Pre]] =
+          mutable.Map()
+
+        // TODO: Refactor this to separate method. Or, maybe in typechecker/frontend? As it could be part of a well-formedness requirement
+        model.declarations.foreach {
+          case process: ModelProcess[Pre] =>
+            process.impl match {
+              case processPar: ProcessPar[Pre] =>
+                val parallelCompositionElems = processPar.unfoldProcessPar.toSet
+                if (
+                  parallelCompositionElems
+                    .forall(_.isInstanceOf[ProcessApply[Pre]])
+                ) {
+                  if (compositeMap.contains(parallelCompositionElems)) {
+                    logger.warn(
+                      "Collision detected: %s vs. %s have same set of process elements composed in parallel",
+                      process.o.getPreferredNameOrElse().camel,
+                      compositeMap(parallelCompositionElems).o
+                        .getPreferredNameOrElse().camel,
+                    )
+                  } else { compositeMap.put(parallelCompositionElems, process) }
+                } else {
+                  // TODO: Should this be done by typechecking?
                   logger.warn(
-                    "Collision detected: %s vs. %s have same set of process elements composed in parallel",
-                    process.o.getPreferredNameOrElse().camel,
-                    compositeMap(parallelCompositionElems).o.getPreferredNameOrElse().camel
+                    "Process detected that composes non-process elements in parallel"
                   )
-                } else {
-                  compositeMap.put(parallelCompositionElems, process)
                 }
-              } else {
-                // TODO: Should this be done by typechecking?
-                logger.warn("Process detected that composes non-process elements in parallel")
-              }
-            case _ =>
+              case _ =>
+            }
+          case _ =>
+        }
+
+        val newClass =
+          currentModel.having(model) {
+            new Class(
+              Seq(),
+              classDeclarations.collect {
+                model.declarations.foreach(dispatch(_))
+              }._1,
+              Nil,
+              tt,
+            )(model.o)
           }
-        case _ =>
-      }
-
-      val newClass = currentModel.having(model) {
-        new Class(
-          Seq(),
-          classDeclarations.collect {
-            model.declarations.foreach(dispatch(_))
-          }._1, Nil, tt,
-        )(model.o)
-      }
-      globalDeclarations.declare(newClass)
-      modelSuccessors(model) = newClass
-
-    case process: ModelProcess[Pre] =>
-      implicit val o = process.o
-
-      val currentThis = ThisObject[Post](modelSuccessors.ref(currentModel.top))
-
-      def fieldRefToPerm(p: Expr[Post], f: Ref[Pre, ModelField[Pre]]) =
-        fieldPerm[Post](currentThis, modelFieldSuccessors.ref(f.decl), p)
-
-      val fieldPerms = AstBuildHelpers.foldStar(
-        process.modifies.map(f => fieldRefToPerm(WritePerm(), f)) ++
-          process.accessible.map(f => fieldRefToPerm(ReadPerm(), f)))
-
-      val args = variables.dispatch(process.args)
-
-      classDeclarations.declare(new InstanceMethod[Post](
-        TVoid(),
-        args,
-        Nil, Nil,
-        None, // TODO: Body
-        ApplicableContract(
-          // TODO: Is reusing fieldPerms allowed?
-          UnitAccountedPredicate(Star(fieldPerms, rewriteDefault(process.requires))),
-          UnitAccountedPredicate(Star(fieldPerms, rewriteDefault(process.ensures))),
-          tt,
-          Seq(),
-          Seq(),
-          Seq(),
-          None,
-        )(???),
-        false,
-        false
-      )(ModelPostconditionFailed(process)))
-
-    case modelField: ModelField[Pre] =>
-      val instanceField = new InstanceField[Post](dispatch(modelField.t), Nil)(modelField.o)
-      classDeclarations.declare(instanceField)
-      modelFieldSuccessors(modelField) = instanceField
-
-    case other => rewriteDefault(other)
-  }
-
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = expr match {
-    case p @ ProcessApply(process, args) => MethodInvocation[Post](
-        AmbiguousThis()(p.o),
-        processSuccessors.ref(process.decl),
-        args.map(dispatch(_)), Nil, Nil, Nil, Nil,
-      )(null)(p.o)
-
-    case modelDeref: ModelDeref[Pre] =>
-      implicit val o = modelDeref.o
-      val blame = InsufficientPermissionForModelField(modelDeref)
-      Deref[Post](dispatch(modelDeref.obj), modelFieldSuccessors.ref(modelDeref.ref.decl))(blame)
+        globalDeclarations.declare(newClass)
+        modelSuccessors(model) = newClass
+
+      case process: ModelProcess[Pre] =>
+        implicit val o = process.o
+
+        val currentThis = ThisObject[Post](
+          modelSuccessors.ref(currentModel.top)
+        )
+
+        def fieldRefToPerm(p: Expr[Post], f: Ref[Pre, ModelField[Pre]]) =
+          fieldPerm[Post](currentThis, modelFieldSuccessors.ref(f.decl), p)
+
+        val fieldPerms = AstBuildHelpers.foldStar(
+          process.modifies.map(f => fieldRefToPerm(WritePerm(), f)) ++
+            process.accessible.map(f => fieldRefToPerm(ReadPerm(), f))
+        )
+
+        val args = variables.dispatch(process.args)
+
+        classDeclarations.declare(
+          new InstanceMethod[Post](
+            TVoid(),
+            args,
+            Nil,
+            Nil,
+            None, // TODO: Body
+            ApplicableContract(
+              // TODO: Is reusing fieldPerms allowed?
+              UnitAccountedPredicate(
+                Star(fieldPerms, rewriteDefault(process.requires))
+              ),
+              UnitAccountedPredicate(
+                Star(fieldPerms, rewriteDefault(process.ensures))
+              ),
+              tt,
+              Seq(),
+              Seq(),
+              Seq(),
+              None,
+            )(???),
+            false,
+            false,
+          )(ModelPostconditionFailed(process))
+        )
+
+      case modelField: ModelField[Pre] =>
+        val instanceField =
+          new InstanceField[Post](dispatch(modelField.t), Nil)(modelField.o)
+        classDeclarations.declare(instanceField)
+        modelFieldSuccessors(modelField) = instanceField
+
+      case other => rewriteDefault(other)
+    }
 
-    case x => rewriteDefault(x)
-  }
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case p @ ProcessApply(process, args) =>
+        MethodInvocation[Post](
+          AmbiguousThis()(p.o),
+          processSuccessors.ref(process.decl),
+          args.map(dispatch(_)),
+          Nil,
+          Nil,
+          Nil,
+          Nil,
+        )(null)(p.o)
+
+      case modelDeref: ModelDeref[Pre] =>
+        implicit val o = modelDeref.o
+        val blame = InsufficientPermissionForModelField(modelDeref)
+        Deref[Post](
+          dispatch(modelDeref.obj),
+          modelFieldSuccessors.ref(modelDeref.ref.decl),
+        )(blame)
+
+      case x => rewriteDefault(x)
+    }
 
   def inline(a: ModelProcess[Pre], b: Seq[Expr[_]]): Nothing = ???
 
   // TODO: How to determine at what point to rewrite EmptyProcess/ActionApply? When encountered in expandUnguarded?
 
   // PB: added dispatch arbitrarily where demanded
-  def expandUnguarded(p: Expr[Pre]) : Expr[Post] = p match {
-    case p: EmptyProcess[Pre] => p.rewrite()
-    case p: ActionApply[Pre] => p.rewrite()
-    case ProcessApply(process, args) => expandUnguarded(inline(process.decl, args))
-    case ProcessSeq(q, r) => ProcessSeq(expandUnguarded(q), dispatch(r))(p.o)
-    case ProcessChoice(q, r) => ProcessChoice(expandUnguarded(q), expandUnguarded(r))(p.o)
-    case ProcessPar(q, r) => ProcessChoice[Post](leftMerge(expandUnguarded(q), dispatch(r)), leftMerge(expandUnguarded(r), dispatch(q)))(p.o)
-    case ProcessSelect(cond, q, r) =>
-      ProcessSelect(dispatch(cond), expandUnguarded(q), expandUnguarded(r))(p.o)
-    case _ => ???
-  }
-
-
+  def expandUnguarded(p: Expr[Pre]): Expr[Post] =
+    p match {
+      case p: EmptyProcess[Pre] => p.rewrite()
+      case p: ActionApply[Pre] => p.rewrite()
+      case ProcessApply(process, args) =>
+        expandUnguarded(inline(process.decl, args))
+      case ProcessSeq(q, r) => ProcessSeq(expandUnguarded(q), dispatch(r))(p.o)
+      case ProcessChoice(q, r) =>
+        ProcessChoice(expandUnguarded(q), expandUnguarded(r))(p.o)
+      case ProcessPar(q, r) =>
+        ProcessChoice[Post](
+          leftMerge(expandUnguarded(q), dispatch(r)),
+          leftMerge(expandUnguarded(r), dispatch(q)),
+        )(p.o)
+      case ProcessSelect(cond, q, r) =>
+        ProcessSelect(dispatch(cond), expandUnguarded(q), expandUnguarded(r))(
+          p.o
+        )
+      case _ => ???
+    }
 
-  def leftMerge[G](p: Expr[G], q: Expr[G]): Expr[G] = p match {
-    case EmptyProcess() => q
-    case p: ActionApply[G] => ProcessSeq(p, q)(DiagnosticOrigin)
-    case ProcessChoice(pLeft, pRight) => ProcessChoice(leftMerge(pLeft, q), leftMerge(pRight, q))(DiagnosticOrigin)
-    case ProcessSeq(pLeft, pRight) => // TODO
-      ???
-    case ProcessSelect(cond, pLeft, pRight) => ProcessSelect(cond, leftMerge(pLeft, q), leftMerge(pRight, q))(DiagnosticOrigin)
-    case ProcessPar(pLeft, pRight) => ??? // Not allowed
-    case _ => ???
-  }
+  def leftMerge[G](p: Expr[G], q: Expr[G]): Expr[G] =
+    p match {
+      case EmptyProcess() => q
+      case p: ActionApply[G] => ProcessSeq(p, q)(DiagnosticOrigin)
+      case ProcessChoice(pLeft, pRight) =>
+        ProcessChoice(leftMerge(pLeft, q), leftMerge(pRight, q))(
+          DiagnosticOrigin
+        )
+      case ProcessSeq(pLeft, pRight) => // TODO
+        ???
+      case ProcessSelect(cond, pLeft, pRight) =>
+        ProcessSelect(cond, leftMerge(pLeft, q), leftMerge(pRight, q))(
+          DiagnosticOrigin
+        )
+      case ProcessPar(pLeft, pRight) => ??? // Not allowed
+      case _ => ???
+    }
 }
diff --git a/src/rewrite/vct/rewrite/ClassToRef.scala b/src/rewrite/vct/rewrite/ClassToRef.scala
index bc36a9e9ee..32cfe554f9 100644
--- a/src/rewrite/vct/rewrite/ClassToRef.scala
+++ b/src/rewrite/vct/rewrite/ClassToRef.scala
@@ -14,23 +14,19 @@ import scala.collection.mutable
 
 case object ClassToRef extends RewriterBuilder {
   override def key: String = "classToRef"
-  override def desc: String = "Flatten classes into the Ref type, and encode the class type hierarchy operationally."
+  override def desc: String =
+    "Flatten classes into the Ref type, and encode the class type hierarchy operationally."
 
-  private def TypeOfOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("type")),
-      LabelContext("classToRef"),
-    )
-  )
+  private def TypeOfOrigin: Origin =
+    Origin(Seq(PreferredName(Seq("type")), LabelContext("classToRef")))
 
-  private def InstanceOfOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("subtype")),
-      LabelContext("classToRef"),
-    )
-  )
+  private def InstanceOfOrigin: Origin =
+    Origin(Seq(PreferredName(Seq("subtype")), LabelContext("classToRef")))
 
-  case class InstanceNullPreconditionFailed(inner: Blame[InstanceNull], inv: InvokingNode[_]) extends Blame[PreconditionFailed] {
+  case class InstanceNullPreconditionFailed(
+      inner: Blame[InstanceNull],
+      inv: InvokingNode[_],
+  ) extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       inner.blame(InstanceNull(inv))
   }
@@ -39,18 +35,18 @@ case object ClassToRef extends RewriterBuilder {
 case class ClassToRef[Pre <: Generation]() extends Rewriter[Pre] {
   import vct.col.rewrite.ClassToRef._
 
-  private def This: Origin = Origin(
-    Seq(
-      PreferredName(Seq("this")),
-      LabelContext("classToRef"),
-    )
-  )
+  private def This: Origin =
+    Origin(Seq(PreferredName(Seq("this")), LabelContext("classToRef")))
 
   val fieldSucc: SuccessionMap[Field[Pre], SilverField[Post]] = SuccessionMap()
-  val methodSucc: SuccessionMap[InstanceMethod[Pre], Procedure[Post]] = SuccessionMap()
-  val consSucc: SuccessionMap[Constructor[Pre], Procedure[Post]] = SuccessionMap()
-  val functionSucc: SuccessionMap[InstanceFunction[Pre], Function[Post]] = SuccessionMap()
-  val predicateSucc: SuccessionMap[InstancePredicate[Pre], Predicate[Post]] = SuccessionMap()
+  val methodSucc: SuccessionMap[InstanceMethod[Pre], Procedure[Post]] =
+    SuccessionMap()
+  val consSucc: SuccessionMap[Constructor[Pre], Procedure[Post]] =
+    SuccessionMap()
+  val functionSucc: SuccessionMap[InstanceFunction[Pre], Function[Post]] =
+    SuccessionMap()
+  val predicateSucc: SuccessionMap[InstancePredicate[Pre], Predicate[Post]] =
+    SuccessionMap()
 
   val diz: ScopedStack[Expr[Post]] = ScopedStack()
 
@@ -64,17 +60,19 @@ case class ClassToRef[Pre <: Generation]() extends Rewriter[Pre] {
   def makeTypeOf: Function[Post] = {
     implicit val o: Origin = TypeOfOrigin
     val obj = new Variable[Post](TRef())
-    withResult((result: Result[Post]) => function(
-      blame = AbstractApplicable,
-      contractBlame = TrueSatisfiable,
-      returnType = TInt(),
-      args = Seq(obj),
-      ensures = UnitAccountedPredicate(
-        (result >= const(0) && result <= const(typeNumberStore.size)) &&
-          ((obj.get === Null()) ==> (result === const(0))) &&
-          ((obj.get !== Null()) ==> (result !== const(0)))
-      ),
-    ))
+    withResult((result: Result[Post]) =>
+      function(
+        blame = AbstractApplicable,
+        contractBlame = TrueSatisfiable,
+        returnType = TInt(),
+        args = Seq(obj),
+        ensures = UnitAccountedPredicate(
+          (result >= const(0) && result <= const(typeNumberStore.size)) &&
+            ((obj.get === Null()) ==> (result === const(0))) &&
+            ((obj.get !== Null()) ==> (result !== const(0)))
+        ),
+      )
+    )
   }
 
   def makeInstanceOf: Function[Post] = {
@@ -83,243 +81,412 @@ case class ClassToRef[Pre <: Generation]() extends Rewriter[Pre] {
     val sup = new Variable[Post](TInt())
     function(
       blame = PanicBlame("instanceof has no postcondition."),
-      contractBlame = UnsafeDontCare.Satisfiability("that just indicates there are no types"),
+      contractBlame = UnsafeDontCare
+        .Satisfiability("that just indicates there are no types"),
       returnType = TBool(),
       args = Seq(sub, sup),
       requires = UnitAccountedPredicate(
-        sub.get >= const(0) && sub.get <= const(typeNumberStore.size) && sup.get >= const(0) && sup.get <= const(typeNumberStore.size)
+        sub.get >= const(0) && sub.get <= const(typeNumberStore.size) &&
+          sup.get >= const(0) && sup.get <= const(typeNumberStore.size)
       ),
       body = Some(
         ((sub.get === const(0)) ==> tt) &&
-          foldAnd(typeNumberStore.map {
-            case (cls, subNum) =>
-              val supNums = (cls +: cls.transSupportArrows.map(_._2.cls.decl)).distinct.map(typeNumber)
-              (sub.get === const(subNum)) ==> foldOr(supNums.map(supNum => sup.get === const(supNum)))
+          foldAnd(typeNumberStore.map { case (cls, subNum) =>
+            val supNums = (cls +: cls.transSupportArrows.map(_._2.cls.decl))
+              .distinct.map(typeNumber)
+            (sub.get === const(subNum)) ==>
+              foldOr(supNums.map(supNum => sup.get === const(supNum)))
           }.toSeq)
       ),
     )
   }
 
   override def dispatch(program: Program[Pre]): Program[Rewritten[Pre]] =
-    program.rewrite(declarations = globalDeclarations.collect {
-      program.declarations.foreach(dispatch)
-      implicit val o: Origin = TypeOfOrigin
-      typeOf(()) = makeTypeOf
-      globalDeclarations.declare(typeOf(()))
-      instanceOf(()) = makeInstanceOf
-      globalDeclarations.declare(instanceOf(()))
-    }._1)
+    program.rewrite(declarations =
+      globalDeclarations.collect {
+        program.declarations.foreach(dispatch)
+        implicit val o: Origin = TypeOfOrigin
+        typeOf(()) = makeTypeOf
+        globalDeclarations.declare(typeOf(()))
+        instanceOf(()) = makeInstanceOf
+        globalDeclarations.declare(instanceOf(()))
+      }._1
+    )
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case cls: Class[Pre] =>
-      if(cls.typeArgs.nonEmpty) throw vct.result.VerificationError.Unreachable("Class type parameters should be encoded using monomorphization earlier")
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case cls: Class[Pre] =>
+        if (cls.typeArgs.nonEmpty)
+          throw vct.result.VerificationError.Unreachable(
+            "Class type parameters should be encoded using monomorphization earlier"
+          )
 
-      typeNumber(cls)
-      cls.drop()
-      cls.decls.foreach {
-        case function: InstanceFunction[Pre] =>
-          implicit val o: Origin = function.o
-          val thisVar = new Variable[Post](TRef())(This)
-          diz.having(thisVar.get) {
-            functionSucc(function) = globalDeclarations.declare(labelDecls.scope { new Function(
-              returnType = dispatch(function.returnType),
-              args = variables.collect {
-                variables.declare(thisVar)
-                function.args.foreach(dispatch)
-              }._1,
-              typeArgs = variables.dispatch(function.typeArgs),
-              body = function.body.map(dispatch),
-              contract = function.contract.rewrite(
-                requires = SplitAccountedPredicate(
-                  left = UnitAccountedPredicate(thisVar.get !== Null()),
-                  right = SplitAccountedPredicate(
-                    left = UnitAccountedPredicate(
-                      /* FIXME FunctionInvocation[Post](instanceOf.ref(()), Seq(
+        typeNumber(cls)
+        cls.drop()
+        cls.decls.foreach {
+          case function: InstanceFunction[Pre] =>
+            implicit val o: Origin = function.o
+            val thisVar = new Variable[Post](TRef())(This)
+            diz.having(thisVar.get) {
+              functionSucc(function) = globalDeclarations
+                .declare(labelDecls.scope {
+                  new Function(
+                    returnType = dispatch(function.returnType),
+                    args =
+                      variables.collect {
+                        variables.declare(thisVar)
+                        function.args.foreach(dispatch)
+                      }._1,
+                    typeArgs = variables.dispatch(function.typeArgs),
+                    body = function.body.map(dispatch),
+                    contract = function.contract.rewrite(requires =
+                      SplitAccountedPredicate(
+                        left = UnitAccountedPredicate(thisVar.get !== Null()),
+                        right = SplitAccountedPredicate(
+                          left = UnitAccountedPredicate(
+                            /* FIXME FunctionInvocation[Post](instanceOf.ref(()), Seq(
                         FunctionInvocation[Post](typeOf.ref(()), Seq(thisVar.get), Nil, Nil, Nil)(PanicBlame("typeOf requires nothing.")),
                         const(typeNumber(cls)),
-                      ), Nil, Nil, Nil)(PanicBlame("instanceOf requires nothing.")) */ tt[Post]
+                      ), Nil, Nil, Nil)(PanicBlame("instanceOf requires nothing.")) */ tt[
+                              Post
+                            ]
+                          ),
+                          right = dispatch(function.contract.requires),
+                        ),
+                      )
                     ),
-                    right = dispatch(function.contract.requires),
-                  ),
-                )
-              ),
-              inline = function.inline,
-            )(function.blame)(function.o) })
-          }
-        case method: InstanceMethod[Pre] =>
-          implicit val o: Origin = method.o
-          val thisVar = new Variable[Post](TRef())(This)
-          diz.having(thisVar.get) {
-            methodSucc(method) = globalDeclarations.declare(labelDecls.scope { new Procedure(
-              returnType = dispatch(method.returnType),
-              args = variables.collect {
-                variables.declare(thisVar)
-                method.args.foreach(dispatch)
-              }._1,
-              outArgs = variables.dispatch(method.outArgs),
-              typeArgs = variables.dispatch(method.typeArgs),
-              body = method.body.map(dispatch),
-              contract = method.contract.rewrite(
-                requires = SplitAccountedPredicate(
-                  left = UnitAccountedPredicate(thisVar.get !== Null()),
-                  right = SplitAccountedPredicate(
-                    left = UnitAccountedPredicate(
-                      /* FIXME FunctionInvocation[Post](instanceOf.ref(()), Seq(
+                    inline = function.inline,
+                  )(function.blame)(function.o)
+                })
+            }
+          case method: InstanceMethod[Pre] =>
+            implicit val o: Origin = method.o
+            val thisVar = new Variable[Post](TRef())(This)
+            diz.having(thisVar.get) {
+              methodSucc(method) = globalDeclarations.declare(labelDecls.scope {
+                new Procedure(
+                  returnType = dispatch(method.returnType),
+                  args =
+                    variables.collect {
+                      variables.declare(thisVar)
+                      method.args.foreach(dispatch)
+                    }._1,
+                  outArgs = variables.dispatch(method.outArgs),
+                  typeArgs = variables.dispatch(method.typeArgs),
+                  body = method.body.map(dispatch),
+                  contract = method.contract.rewrite(requires =
+                    SplitAccountedPredicate(
+                      left = UnitAccountedPredicate(thisVar.get !== Null()),
+                      right = SplitAccountedPredicate(
+                        left = UnitAccountedPredicate(
+                          /* FIXME FunctionInvocation[Post](instanceOf.ref(()), Seq(
                         FunctionInvocation[Post](typeOf.ref(()), Seq(thisVar.get), Nil, Nil, Nil)(PanicBlame("typeOf requires nothing.")),
                         const(typeNumber(cls)),
-                      ), Nil, Nil, Nil)(PanicBlame("instanceOf requires nothing.")) */ tt[Post]
-                    ),
-                    right = dispatch(method.contract.requires),
+                      ), Nil, Nil, Nil)(PanicBlame("instanceOf requires nothing.")) */ tt[
+                            Post
+                          ]
+                        ),
+                        right = dispatch(method.contract.requires),
+                      ),
+                    )
                   ),
+                  inline = method.inline,
+                  pure = method.pure,
+                )(method.blame)(method.o)
+              })
+            }
+          case cons: Constructor[Pre] =>
+            implicit val o: Origin = cons.o
+            val thisVar = new Variable[Post](TRef())(This)
+            consSucc(cons) = globalDeclarations.declare(labelDecls.scope {
+              new Procedure(
+                returnType = TVoid(),
+                args = variables.collect { cons.args.map(dispatch) }._1,
+                outArgs =
+                  thisVar +:
+                    variables.collect { cons.outArgs.map(dispatch) }._1,
+                typeArgs = variables.collect { cons.typeArgs.map(dispatch) }._1,
+                body = cons.body.map(body =>
+                  diz.having(thisVar.get) {
+                    Block(Seq(
+                      instantiate(cons.cls.decl, thisVar.ref),
+                      dispatch(body),
+                    ))
+                  }
                 ),
-              ),
-              inline = method.inline,
-              pure = method.pure,
-            )(method.blame)(method.o) })
-          }
-        case cons: Constructor[Pre] =>
-          implicit val o: Origin = cons.o
-          val thisVar = new Variable[Post](TRef())(This)
-          consSucc(cons) = globalDeclarations.declare(labelDecls.scope { new Procedure(
-            returnType = TVoid(),
-            args = variables.collect { cons.args.map(dispatch) }._1,
-            outArgs = thisVar +: variables.collect { cons.outArgs.map(dispatch) }._1,
-            typeArgs = variables.collect { cons.typeArgs.map(dispatch) }._1,
-            body = cons.body.map(body => diz.having(thisVar.get) { Block(Seq(
-              instantiate(cons.cls.decl, thisVar.ref),
-              dispatch(body),
-            )) }),
-            contract = diz.having(thisVar.get) { cons.contract.rewrite(
-              ensures = SplitAccountedPredicate(
-                left = UnitAccountedPredicate((thisVar.get !== Null()) &&
-                  (FunctionInvocation[Post](typeOf.ref(()), Seq(thisVar.get), Nil, Nil, Nil)(PanicBlame("typeOf requires nothing"))(cons.o) ===
-                    const(typeNumber(cls))(cons.o))),
-                right = dispatch(cons.contract.ensures),
-              ),
-            )},
-          )(PostBlameSplit.left(PanicBlame("Constructor cannot return null value or value of wrong type."), cons.blame))})
-        case predicate: InstancePredicate[Pre] =>
-          val thisVar = new Variable[Post](TRef())(This)
-          diz.having(thisVar.get(predicate.o)) {
-            predicateSucc(predicate) = globalDeclarations.declare(new Predicate(
-              args = variables.collect {
-                variables.declare(thisVar)
-                predicate.args.foreach(dispatch)
-              }._1,
-              body = predicate.body.map(dispatch),
-              threadLocal = predicate.threadLocal,
-              inline = predicate.inline,
-            )(predicate.o))
-          }
-        case field: Field[Pre] =>
-          fieldSucc(field) = new SilverField(dispatch(field.t))(field.o)
-          globalDeclarations.declare(fieldSucc(field))
-        case _ =>
-          throw ExtraNode
-      }
-    case decl => rewriteDefault(decl)
-  }
+                contract =
+                  diz.having(thisVar.get) {
+                    cons.contract.rewrite(ensures =
+                      SplitAccountedPredicate(
+                        left = UnitAccountedPredicate(
+                          (thisVar.get !== Null()) &&
+                            (FunctionInvocation[Post](
+                              typeOf.ref(()),
+                              Seq(thisVar.get),
+                              Nil,
+                              Nil,
+                              Nil,
+                            )(PanicBlame("typeOf requires nothing"))(cons.o) ===
+                              const(typeNumber(cls))(cons.o))
+                        ),
+                        right = dispatch(cons.contract.ensures),
+                      )
+                    )
+                  },
+              )(PostBlameSplit.left(
+                PanicBlame(
+                  "Constructor cannot return null value or value of wrong type."
+                ),
+                cons.blame,
+              ))
+            })
+          case predicate: InstancePredicate[Pre] =>
+            val thisVar = new Variable[Post](TRef())(This)
+            diz.having(thisVar.get(predicate.o)) {
+              predicateSucc(predicate) = globalDeclarations.declare(
+                new Predicate(
+                  args =
+                    variables.collect {
+                      variables.declare(thisVar)
+                      predicate.args.foreach(dispatch)
+                    }._1,
+                  body = predicate.body.map(dispatch),
+                  threadLocal = predicate.threadLocal,
+                  inline = predicate.inline,
+                )(predicate.o)
+              )
+            }
+          case field: Field[Pre] =>
+            fieldSucc(field) = new SilverField(dispatch(field.t))(field.o)
+            globalDeclarations.declare(fieldSucc(field))
+          case _ => throw ExtraNode
+        }
+      case decl => rewriteDefault(decl)
+    }
 
-  def instantiate(cls: Class[Pre], target: Ref[Post, Variable[Post]])(implicit o: Origin): Statement[Post] = {
+  def instantiate(cls: Class[Pre], target: Ref[Post, Variable[Post]])(
+      implicit o: Origin
+  ): Statement[Post] = {
     Block(Seq(
-      SilverNewRef[Post](target, cls.decls.collect { case field: InstanceField[Pre] => fieldSucc.ref(field) }),
-      Inhale(FunctionInvocation[Post](typeOf.ref(()), Seq(Local(target)), Nil, Nil, Nil)(PanicBlame("typeOf requires nothing.")) === const(typeNumber(cls))),
+      SilverNewRef[Post](
+        target,
+        cls.decls.collect { case field: InstanceField[Pre] =>
+          fieldSucc.ref(field)
+        },
+      ),
+      Inhale(
+        FunctionInvocation[Post](
+          typeOf.ref(()),
+          Seq(Local(target)),
+          Nil,
+          Nil,
+          Nil,
+        )(PanicBlame("typeOf requires nothing.")) === const(typeNumber(cls))
+      ),
     ))
   }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case Instantiate(Ref(cls), Local(Ref(v))) =>
-      instantiate(cls, succ(v))(stat.o)
-    case inv @ InvokeMethod(obj, Ref(method), args, outArgs, typeArgs, givenMap, yields) =>
-      InvokeProcedure[Post](
-        ref = methodSucc.ref(method),
-        args = dispatch(obj) +: args.map(dispatch),
-        outArgs = outArgs.map(dispatch),
-        typeArgs = typeArgs.map(dispatch),
-        givenMap = givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
-        yields = yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
-      )(PreBlameSplit.left(InstanceNullPreconditionFailed(inv.blame, inv), PreBlameSplit.left(PanicBlame("incorrect instance method type?"), inv.blame)))(inv.o)
-    case inv @ InvokeConstructor(Ref(cons), _, out, args, outArgs, typeArgs, givenMap, yields) =>
-      InvokeProcedure[Post](
-        ref = consSucc.ref(cons),
-        args = args.map(dispatch),
-        outArgs = dispatch(out) +: outArgs.map(dispatch),
-        typeArgs = typeArgs.map(dispatch),
-        givenMap = givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
-        yields = yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
-      )(inv.blame)(inv.o)
-    case fold @ Fold(inv: InstancePredicateApply[Pre]) =>
-      Fold(rewriteInstancePredicateApply(inv))(fold.blame)(fold.o)
-    case unfold @ Unfold(inv: InstancePredicateApply[Pre]) =>
-      Unfold(rewriteInstancePredicateApply(inv))(unfold.blame)(unfold.o)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case Instantiate(Ref(cls), Local(Ref(v))) =>
+        instantiate(cls, succ(v))(stat.o)
+      case inv @ InvokeMethod(
+            obj,
+            Ref(method),
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        InvokeProcedure[Post](
+          ref = methodSucc.ref(method),
+          args = dispatch(obj) +: args.map(dispatch),
+          outArgs = outArgs.map(dispatch),
+          typeArgs = typeArgs.map(dispatch),
+          givenMap = givenMap.map { case (Ref(v), e) =>
+            (succ(v), dispatch(e))
+          },
+          yields = yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
+        )(PreBlameSplit.left(
+          InstanceNullPreconditionFailed(inv.blame, inv),
+          PreBlameSplit
+            .left(PanicBlame("incorrect instance method type?"), inv.blame),
+        ))(inv.o)
+      case inv @ InvokeConstructor(
+            Ref(cons),
+            _,
+            out,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        InvokeProcedure[Post](
+          ref = consSucc.ref(cons),
+          args = args.map(dispatch),
+          outArgs = dispatch(out) +: outArgs.map(dispatch),
+          typeArgs = typeArgs.map(dispatch),
+          givenMap = givenMap.map { case (Ref(v), e) =>
+            (succ(v), dispatch(e))
+          },
+          yields = yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
+        )(inv.blame)(inv.o)
+      case fold @ Fold(inv: InstancePredicateApply[Pre]) =>
+        Fold(rewriteInstancePredicateApply(inv))(fold.blame)(fold.o)
+      case unfold @ Unfold(inv: InstancePredicateApply[Pre]) =>
+        Unfold(rewriteInstancePredicateApply(inv))(unfold.blame)(unfold.o)
+      case other => rewriteDefault(other)
+    }
 
-  def rewriteInstancePredicateApply(inv: InstancePredicateApply[Pre]): PredicateApply[Post] =
-    PredicateApply[Post](predicateSucc.ref(inv.ref.decl), dispatch(inv.obj) +: inv.args.map(dispatch), dispatch(inv.perm))(inv.o)
+  def rewriteInstancePredicateApply(
+      inv: InstancePredicateApply[Pre]
+  ): PredicateApply[Post] =
+    PredicateApply[Post](
+      predicateSucc.ref(inv.ref.decl),
+      dispatch(inv.obj) +: inv.args.map(dispatch),
+      dispatch(inv.perm),
+    )(inv.o)
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case u @ Unfolding(inv: InstancePredicateApply[Pre], e) =>
-      Unfolding(rewriteInstancePredicateApply(inv), dispatch(e))(u.blame)(e.o)
-    case inv @ MethodInvocation(obj, Ref(method), args, outArgs, typeArgs, givenMap, yields) =>
-      ProcedureInvocation[Post](
-        ref = methodSucc.ref(method),
-        args = dispatch(obj) +: args.map(dispatch),
-        outArgs = outArgs.map(dispatch),
-        typeArgs = typeArgs.map(dispatch),
-        givenMap = givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
-        yields = yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
-      )(PreBlameSplit.left(InstanceNullPreconditionFailed(inv.blame, inv), PreBlameSplit.left(PanicBlame("incorrect instance method type?"), inv.blame)))(inv.o)
-    case inv @ InstancePredicateApply(obj, Ref(pred), args, perm) =>
-      implicit val o: Origin = inv.o
-      rewriteInstancePredicateApply(inv) &* (dispatch(obj) !== Null())
-    case inv @ InstanceFunctionInvocation(obj, Ref(func), args, typeArgs, givenMap, yields) =>
-      FunctionInvocation[Post](
-        ref = functionSucc.ref(func),
-        args = dispatch(obj) +: args.map(dispatch),
-        typeArgs.map(dispatch),
-        givenMap = givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
-        yields = yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
-      )(PreBlameSplit.left(InstanceNullPreconditionFailed(inv.blame, inv), PreBlameSplit.left(PanicBlame("incorrect instance function type?"), inv.blame)))(inv.o)
-    case ThisObject(_) =>
-      diz.top
-    case deref @ Deref(obj, Ref(field)) =>
-      SilverDeref[Post](dispatch(obj), fieldSucc.ref(field))(deref.blame)(deref.o)
-    case TypeValue(t) => t match {
-      case TClass(Ref(cls), Seq()) => const(typeNumber(cls))(e.o)
-      case other => ???
-    }
-    case TypeOf(value) => FunctionInvocation[Post](typeOf.ref(()), Seq(dispatch(value)), Nil, Nil, Nil)(PanicBlame("typeOf requires nothing"))(e.o)
-    case InstanceOf(value, TypeValue(TUnion(ts))) =>
-      implicit val o: Origin = e.o
-      dispatch(foldOr(ts.map(t => InstanceOf(value, TypeValue(t)))))
-    case InstanceOf(value, typeValue) => FunctionInvocation[Post](instanceOf.ref(()), Seq(
-      FunctionInvocation[Post](typeOf.ref(()), Seq(dispatch(value)), Nil, Nil, Nil)(PanicBlame("typeOf requires nothing"))(e.o),
-      dispatch(typeValue),
-    ), Nil, Nil, Nil)(PanicBlame("instanceOf requires nothing"))(e.o)
-    case Cast(value, typeValue) => dispatch(value) // Discard for now, should assert instanceOf(value, typeValue)
-    case Result(Ref(app)) => app match {
-      case function: Function[Pre] => Result[Post](succ(function))(e.o)
-      case function: InstanceFunction[Pre] => Result[Post](functionSucc.ref(function))(e.o)
-      case procedure: Procedure[Pre] => Result[Post](succ(procedure))(e.o)
-      case method: InstanceMethod[Pre] => Result[Post](methodSucc.ref(method))(e.o)
-      case function: InstanceOperatorFunction[Pre] => throw ExcludedByPassOrder("Instance operator functions are already compiled away", Some(function))
-      case method: InstanceOperatorMethod[Pre] => throw ExcludedByPassOrder("Instance operator methods are already compiled away", Some(method))
-      case function: LlvmSpecFunction[Pre] => throw ExcludedByPassOrder("Llvm spec functions are already compiled away", Some(function))
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case u @ Unfolding(inv: InstancePredicateApply[Pre], e) =>
+        Unfolding(rewriteInstancePredicateApply(inv), dispatch(e))(u.blame)(e.o)
+      case inv @ MethodInvocation(
+            obj,
+            Ref(method),
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        ProcedureInvocation[Post](
+          ref = methodSucc.ref(method),
+          args = dispatch(obj) +: args.map(dispatch),
+          outArgs = outArgs.map(dispatch),
+          typeArgs = typeArgs.map(dispatch),
+          givenMap = givenMap.map { case (Ref(v), e) =>
+            (succ(v), dispatch(e))
+          },
+          yields = yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
+        )(PreBlameSplit.left(
+          InstanceNullPreconditionFailed(inv.blame, inv),
+          PreBlameSplit
+            .left(PanicBlame("incorrect instance method type?"), inv.blame),
+        ))(inv.o)
+      case inv @ InstancePredicateApply(obj, Ref(pred), args, perm) =>
+        implicit val o: Origin = inv.o
+        rewriteInstancePredicateApply(inv) &* (dispatch(obj) !== Null())
+      case inv @ InstanceFunctionInvocation(
+            obj,
+            Ref(func),
+            args,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        FunctionInvocation[Post](
+          ref = functionSucc.ref(func),
+          args = dispatch(obj) +: args.map(dispatch),
+          typeArgs.map(dispatch),
+          givenMap = givenMap.map { case (Ref(v), e) =>
+            (succ(v), dispatch(e))
+          },
+          yields = yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
+        )(PreBlameSplit.left(
+          InstanceNullPreconditionFailed(inv.blame, inv),
+          PreBlameSplit
+            .left(PanicBlame("incorrect instance function type?"), inv.blame),
+        ))(inv.o)
+      case ThisObject(_) => diz.top
+      case deref @ Deref(obj, Ref(field)) =>
+        SilverDeref[Post](dispatch(obj), fieldSucc.ref(field))(deref.blame)(
+          deref.o
+        )
+      case TypeValue(t) =>
+        t match {
+          case TClass(Ref(cls), Seq()) => const(typeNumber(cls))(e.o)
+          case other => ???
+        }
+      case TypeOf(value) =>
+        FunctionInvocation[Post](
+          typeOf.ref(()),
+          Seq(dispatch(value)),
+          Nil,
+          Nil,
+          Nil,
+        )(PanicBlame("typeOf requires nothing"))(e.o)
+      case InstanceOf(value, TypeValue(TUnion(ts))) =>
+        implicit val o: Origin = e.o
+        dispatch(foldOr(ts.map(t => InstanceOf(value, TypeValue(t)))))
+      case InstanceOf(value, typeValue) =>
+        FunctionInvocation[Post](
+          instanceOf.ref(()),
+          Seq(
+            FunctionInvocation[Post](
+              typeOf.ref(()),
+              Seq(dispatch(value)),
+              Nil,
+              Nil,
+              Nil,
+            )(PanicBlame("typeOf requires nothing"))(e.o),
+            dispatch(typeValue),
+          ),
+          Nil,
+          Nil,
+          Nil,
+        )(PanicBlame("instanceOf requires nothing"))(e.o)
+      case Cast(value, typeValue) =>
+        dispatch(
+          value
+        ) // Discard for now, should assert instanceOf(value, typeValue)
+      case Result(Ref(app)) =>
+        app match {
+          case function: Function[Pre] => Result[Post](succ(function))(e.o)
+          case function: InstanceFunction[Pre] =>
+            Result[Post](functionSucc.ref(function))(e.o)
+          case procedure: Procedure[Pre] => Result[Post](succ(procedure))(e.o)
+          case method: InstanceMethod[Pre] =>
+            Result[Post](methodSucc.ref(method))(e.o)
+          case function: InstanceOperatorFunction[Pre] =>
+            throw ExcludedByPassOrder(
+              "Instance operator functions are already compiled away",
+              Some(function),
+            )
+          case method: InstanceOperatorMethod[Pre] =>
+            throw ExcludedByPassOrder(
+              "Instance operator methods are already compiled away",
+              Some(method),
+            )
+          case function: LlvmSpecFunction[Pre] =>
+            throw ExcludedByPassOrder(
+              "Llvm spec functions are already compiled away",
+              Some(function),
+            )
+        }
+      case _ => rewriteDefault(e)
     }
-    case _ => rewriteDefault(e)
-  }
 
-  override def dispatch(t: Type[Pre]): Type[Post] = t match {
-    case TClass(_, _) => TRef()
-    case TAnyClass() => TRef()
-    case t => rewriteDefault(t)
-  }
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    t match {
+      case TClass(_, _) => TRef()
+      case TAnyClass() => TRef()
+      case t => rewriteDefault(t)
+    }
 
-  override def dispatch(loc: Location[Pre]): Location[Post] = loc match {
-    case InstancePredicateLocation(predicate, obj, args) => PredicateLocation[Post](predicateSucc.ref(predicate.decl), dispatch(obj) +: args.map(dispatch))(loc.o)
-    case FieldLocation(obj, field) =>
-      SilverFieldLocation[Post](dispatch(obj), fieldSucc.ref(field.decl))(loc.o)
-    case default => rewriteDefault(default)
-  }
-}
\ No newline at end of file
+  override def dispatch(loc: Location[Pre]): Location[Post] =
+    loc match {
+      case InstancePredicateLocation(predicate, obj, args) =>
+        PredicateLocation[Post](
+          predicateSucc.ref(predicate.decl),
+          dispatch(obj) +: args.map(dispatch),
+        )(loc.o)
+      case FieldLocation(obj, field) =>
+        SilverFieldLocation[Post](dispatch(obj), fieldSucc.ref(field.decl))(
+          loc.o
+        )
+      case default => rewriteDefault(default)
+    }
+}
diff --git a/src/rewrite/vct/rewrite/CollectLocalDeclarations.scala b/src/rewrite/vct/rewrite/CollectLocalDeclarations.scala
index bcb7c83abe..bc61a7daff 100644
--- a/src/rewrite/vct/rewrite/CollectLocalDeclarations.scala
+++ b/src/rewrite/vct/rewrite/CollectLocalDeclarations.scala
@@ -13,20 +13,23 @@ case object CollectLocalDeclarations extends RewriterBuilder {
 }
 
 case class CollectLocalDeclarations[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case LocalDecl(local) =>
-      if(variables.isEmpty) {
-        throw Unreachable("The frontend must not open an execution context (e.g. method body) that does not immediately contain a scope.")
-      }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case LocalDecl(local) =>
+        if (variables.isEmpty) {
+          throw Unreachable(
+            "The frontend must not open an execution context (e.g. method body) that does not immediately contain a scope."
+          )
+        }
 
-      variables.succeed(local, local.rewrite())
-      Block(Nil)(stat.o)
-    case Scope(vars, impl) =>
-      val (newVars, newImpl) = variables.collect {
-        vars.foreach(dispatch)
-        dispatch(impl)
-      }
-      Scope[Post](newVars, newImpl)(stat.o)
-    case other => rewriteDefault(other)
-  }
-}
\ No newline at end of file
+        variables.succeed(local, local.rewrite())
+        Block(Nil)(stat.o)
+      case Scope(vars, impl) =>
+        val (newVars, newImpl) = variables.collect {
+          vars.foreach(dispatch)
+          dispatch(impl)
+        }
+        Scope[Post](newVars, newImpl)(stat.o)
+      case other => rewriteDefault(other)
+    }
+}
diff --git a/src/rewrite/vct/rewrite/ConstantifyFinalFields.scala b/src/rewrite/vct/rewrite/ConstantifyFinalFields.scala
index 155b83d0ac..67ab5cceb6 100644
--- a/src/rewrite/vct/rewrite/ConstantifyFinalFields.scala
+++ b/src/rewrite/vct/rewrite/ConstantifyFinalFields.scala
@@ -13,19 +13,23 @@ import vct.result.VerificationError.UserError
 
 case object ConstantifyFinalFields extends RewriterBuilder {
   override def key: String = "constantFinalFields"
-  override def desc: String = "Encode final fields with functions, so that they are not on the heap."
+  override def desc: String =
+    "Encode final fields with functions, so that they are not on the heap."
 
   case class FinalFieldPerm(loc: FieldLocation[_]) extends UserError {
     override def code: String = "finalFieldPerm"
     override def text: String =
-      loc.o.messageInContext("Specifying permission over final fields is not allowed, since they are treated as constants.")
+      loc.o.messageInContext(
+        "Specifying permission over final fields is not allowed, since they are treated as constants."
+      )
   }
 }
 
 case class ConstantifyFinalFields[Pre <: Generation]() extends Rewriter[Pre] {
   val currentClass: ScopedStack[Class[Pre]] = ScopedStack()
   var finalValueMap: Map[Declaration[Pre], Expr[Pre]] = Map()
-  val fieldFunction: SuccessionMap[InstanceField[Pre], Function[Post]] = SuccessionMap()
+  val fieldFunction: SuccessionMap[InstanceField[Pre], Function[Post]] =
+    SuccessionMap()
   val substituteThisObject: ScopedStack[Expr[Post]] = ScopedStack()
 
   def isFinal(field: InstanceField[Pre]): Boolean =
@@ -34,82 +38,129 @@ case class ConstantifyFinalFields[Pre <: Generation]() extends Rewriter[Pre] {
   // This function is deliberately unclearly called isAllowedValue to avoid making the impression that we are implementing
   // java constexprs or something similar.
   // Below just happens to be the subset needed to encode string literals.
-  def isAllowedValue(e: Expr[Pre]): Boolean = e match {
-    case ThisObject(_) => true
-    case IntegerValue(_) => true
-    case LiteralSeq(_, vals) => vals.forall(isAllowedValue)
-    case FunctionInvocation(func, args, _, givenMap, _) => func.decl.contract.decreases.isDefined &&
-      func.decl.contract.contextEverywhere.t.equals(TBool[Pre]()) &&
-      unfoldPredicate(func.decl.contract.requires).forall(_.t == TBool[Pre]()) &&
-      args.forall(isAllowedValue) && givenMap.forall { case (_, e) => isAllowedValue(e) }
-    case InstanceFunctionInvocation(obj, func, args, _, givenMap, Seq()) =>  func.decl.contract.decreases.isDefined &&
-      func.decl.contract.contextEverywhere.t == TBool[Pre]() &&
-      unfoldPredicate(func.decl.contract.requires).forall(_.t == TBool[Pre]()) &&
-      isAllowedValue(obj) && args.forall(isAllowedValue) && givenMap.forall { case (_, e) => isAllowedValue(e) }
-    case _ => false
-  }
+  def isAllowedValue(e: Expr[Pre]): Boolean =
+    e match {
+      case ThisObject(_) => true
+      case IntegerValue(_) => true
+      case LiteralSeq(_, vals) => vals.forall(isAllowedValue)
+      case FunctionInvocation(func, args, _, givenMap, _) =>
+        func.decl.contract.decreases.isDefined &&
+        func.decl.contract.contextEverywhere.t.equals(TBool[Pre]()) &&
+        unfoldPredicate(func.decl.contract.requires)
+          .forall(_.t == TBool[Pre]()) && args.forall(isAllowedValue) &&
+        givenMap.forall { case (_, e) => isAllowedValue(e) }
+      case InstanceFunctionInvocation(obj, func, args, _, givenMap, Seq()) =>
+        func.decl.contract.decreases.isDefined &&
+        func.decl.contract.contextEverywhere.t == TBool[Pre]() &&
+        unfoldPredicate(func.decl.contract.requires)
+          .forall(_.t == TBool[Pre]()) && isAllowedValue(obj) &&
+        args.forall(isAllowedValue) && givenMap.forall { case (_, e) =>
+          isAllowedValue(e)
+        }
+      case _ => false
+    }
 
   override def dispatch(decl: Program[Pre]): Program[Post] = {
-    finalValueMap = decl.transSubnodes.collect({
-      // Note that we don't check the value of deref here, so if isClosedConstant is extended without care, this
-      // might produce unsoundness in the future. E.g. if variables are present in the init value, this approach fails
-      case Assign(Deref(_, Ref(field)), value) if isFinal(field) && isAllowedValue(value) =>
-        (field, value)
-    }).toMap
+    finalValueMap =
+      decl.transSubnodes.collect({
+        // Note that we don't check the value of deref here, so if isClosedConstant is extended without care, this
+        // might produce unsoundness in the future. E.g. if variables are present in the init value, this approach fails
+        case Assign(Deref(_, Ref(field)), value)
+            if isFinal(field) && isAllowedValue(value) =>
+          (field, value)
+      }).toMap
 
     super.dispatch(decl)
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case cls: Class[Pre] =>
-      currentClass.having(cls) { rewriteDefault(cls) }
-    case field: InstanceField[Pre] =>
-      implicit val o: Origin = field.o
-      if(isFinal(field)) {
-        val `this` = new Variable[Post](TClass(succ(currentClass.top), currentClass.top.typeArgs.map { v: Variable[Pre] => TVar(succ(v)) }))
-        fieldFunction(field) = globalDeclarations.declare(
-          withResult((result: Result[Post]) => function[Post](
-            blame = AbstractApplicable,
-            contractBlame = TrueSatisfiable,
-            returnType = dispatch(field.t),
-            args = Seq(`this`),
-            requires = UnitAccountedPredicate(`this`.get !== Null()),
-            ensures = UnitAccountedPredicate(finalValueMap.get(field) match {
-              case Some(value) => result === substituteThisObject.having(`this`.get) { rewriteDefault(value) }
-              case None => tt[Post]
-            })
-          ))
-        )
-      } else {
-        rewriteDefault(field)
-      }
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case cls: Class[Pre] => currentClass.having(cls) { rewriteDefault(cls) }
+      case field: InstanceField[Pre] =>
+        implicit val o: Origin = field.o
+        if (isFinal(field)) {
+          val `this` =
+            new Variable[Post](TClass(
+              succ(currentClass.top),
+              currentClass.top.typeArgs.map { v: Variable[Pre] =>
+                TVar(succ(v))
+              },
+            ))
+          fieldFunction(field) = globalDeclarations
+            .declare(withResult((result: Result[Post]) =>
+              function[Post](
+                blame = AbstractApplicable,
+                contractBlame = TrueSatisfiable,
+                returnType = dispatch(field.t),
+                args = Seq(`this`),
+                requires = UnitAccountedPredicate(`this`.get !== Null()),
+                ensures = UnitAccountedPredicate(
+                  finalValueMap.get(field) match {
+                    case Some(value) =>
+                      result === substituteThisObject.having(`this`.get) {
+                        rewriteDefault(value)
+                      }
+                    case None => tt[Post]
+                  }
+                ),
+              )
+            ))
+        } else { rewriteDefault(field) }
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case ThisObject(_) if substituteThisObject.nonEmpty =>
-      substituteThisObject.top
-    case Deref(obj, Ref(field)) =>
-      implicit val o: Origin = e.o
-      if(isFinal(field)) FunctionInvocation[Post](fieldFunction.ref(field), Seq(dispatch(obj)), Nil, Nil, Nil)(PanicBlame("requires nothing"))
-      else rewriteDefault(e)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case ThisObject(_) if substituteThisObject.nonEmpty =>
+        substituteThisObject.top
+      case Deref(obj, Ref(field)) =>
+        implicit val o: Origin = e.o
+        if (isFinal(field))
+          FunctionInvocation[Post](
+            fieldFunction.ref(field),
+            Seq(dispatch(obj)),
+            Nil,
+            Nil,
+            Nil,
+          )(PanicBlame("requires nothing"))
+        else
+          rewriteDefault(e)
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(location: Location[Pre]): Location[Post] = location match {
-    case loc @ FieldLocation(_, Ref(field)) if isFinal(field) =>
-      throw FinalFieldPerm(loc)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(location: Location[Pre]): Location[Post] =
+    location match {
+      case loc @ FieldLocation(_, Ref(field)) if isFinal(field) =>
+        throw FinalFieldPerm(loc)
+      case other => rewriteDefault(other)
+    }
 
-  def makeInhale(obj: Expr[Pre], field: InstanceField[Pre], value: Expr[Pre])(implicit o: Origin): Statement[Post] =
-    Assume(FunctionInvocation[Post](fieldFunction.ref(field), Seq(dispatch(obj)), Nil, Nil, Nil)(PanicBlame("requires nothing")) === dispatch(value))
+  def makeInhale(obj: Expr[Pre], field: InstanceField[Pre], value: Expr[Pre])(
+      implicit o: Origin
+  ): Statement[Post] =
+    Assume(
+      FunctionInvocation[Post](
+        fieldFunction.ref(field),
+        Seq(dispatch(obj)),
+        Nil,
+        Nil,
+        Nil,
+      )(PanicBlame("requires nothing")) === dispatch(value)
+    )
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case Assign(Deref(obj, Ref(field)), value) if isFinal(field) && finalValueMap.contains(field) => Block(Nil)(stat.o)
-    case Eval(PreAssignExpression(Deref(obj, Ref(field)), value)) if isFinal(field) && finalValueMap.contains(field) => Block(Nil)(stat.o)
-    case Assign(Deref(obj, Ref(field)), value) if isFinal(field) => makeInhale(obj, field, value)(stat.o)
-    case Eval(PreAssignExpression(Deref(obj, Ref(field)), value)) if isFinal(field) => makeInhale(obj, field, value)(stat.o)
-    case other => rewriteDefault(other)
-  }
-}
\ No newline at end of file
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case Assign(Deref(obj, Ref(field)), value)
+          if isFinal(field) && finalValueMap.contains(field) =>
+        Block(Nil)(stat.o)
+      case Eval(PreAssignExpression(Deref(obj, Ref(field)), value))
+          if isFinal(field) && finalValueMap.contains(field) =>
+        Block(Nil)(stat.o)
+      case Assign(Deref(obj, Ref(field)), value) if isFinal(field) =>
+        makeInhale(obj, field, value)(stat.o)
+      case Eval(PreAssignExpression(Deref(obj, Ref(field)), value))
+          if isFinal(field) =>
+        makeInhale(obj, field, value)(stat.o)
+      case other => rewriteDefault(other)
+    }
+}
diff --git a/src/rewrite/vct/rewrite/DesugarCoalescingOperators.scala b/src/rewrite/vct/rewrite/DesugarCoalescingOperators.scala
index e30074aa64..5fc519844f 100644
--- a/src/rewrite/vct/rewrite/DesugarCoalescingOperators.scala
+++ b/src/rewrite/vct/rewrite/DesugarCoalescingOperators.scala
@@ -4,22 +4,29 @@ import vct.col.ast._
 import vct.col.origin.Origin
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 
-object DesugarCoalescingOperators extends RewriterBuilder{
+object DesugarCoalescingOperators extends RewriterBuilder {
 
   override def key: String = "coalesce"
 
   override def desc: String = "Translating the ?. operator to an implication"
 }
 
-case class DesugarCoalescingOperators[Pre <:Generation]() extends Rewriter[Pre] {
+case class DesugarCoalescingOperators[Pre <: Generation]()
+    extends Rewriter[Pre] {
 
   override def dispatch(e: Expr[Pre]): Expr[Post] = {
-    implicit val o : Origin = e.o
+    implicit val o: Origin = e.o
     e match {
       case CoalesceInstancePredicateApply(obj, ref, args, perm) =>
         Implies(
           Neq(dispatch(obj), Null()),
-          InstancePredicateApply(dispatch(obj), succ(ref.decl), args.map(dispatch), dispatch(perm)))
+          InstancePredicateApply(
+            dispatch(obj),
+            succ(ref.decl),
+            args.map(dispatch),
+            dispatch(perm),
+          ),
+        )
       case other => rewriteDefault(other)
     }
   }
diff --git a/src/rewrite/vct/rewrite/DesugarCollectionOperators.scala b/src/rewrite/vct/rewrite/DesugarCollectionOperators.scala
index a453f1df40..df408e35ce 100644
--- a/src/rewrite/vct/rewrite/DesugarCollectionOperators.scala
+++ b/src/rewrite/vct/rewrite/DesugarCollectionOperators.scala
@@ -8,24 +8,28 @@ import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 
 case object DesugarCollectionOperators extends RewriterBuilder {
   override def key: String = "desugarCollections"
-  override def desc: String = "Desugar various operators related to collections."
+  override def desc: String =
+    "Desugar various operators related to collections."
 }
 
-case class DesugarCollectionOperators[Pre <: Generation]() extends Rewriter[Pre] {
+case class DesugarCollectionOperators[Pre <: Generation]()
+    extends Rewriter[Pre] {
   override def dispatch(e: Expr[Pre]): Expr[Post] = {
     implicit val o: Origin = e.o
     e match {
-      case Cons(head, tail) => Concat(LiteralSeq(dispatch(head.t), Seq(dispatch(head))), dispatch(tail))
+      case Cons(head, tail) =>
+        Concat(
+          LiteralSeq(dispatch(head.t), Seq(dispatch(head))),
+          dispatch(tail),
+        )
       case head @ Head(xs) => SeqSubscript(dispatch(xs), const(0))(head.blame)
       case Tail(xs) => Drop(dispatch(xs), const(1))
-      case Slice(xs, from, to) => Drop(Take(dispatch(xs), dispatch(to)), dispatch(from))
+      case Slice(xs, from, to) =>
+        Drop(Take(dispatch(xs), dispatch(to)), dispatch(from))
       case RemoveAt(xsPre, iPre) =>
         val xs = dispatch(xsPre)
         val i = dispatch(iPre)
-        Concat(
-          Take(xs, i),
-          Drop(xs, i + const(1))
-        )
+        Concat(Take(xs, i), Drop(xs, i + const(1)))
       case Empty(xs) => Size(dispatch(xs)) === const(0)
       case SubSet(xsPre, ysPre) =>
         val (xs, ys) = (dispatch(xsPre), dispatch(ysPre))
diff --git a/src/rewrite/vct/rewrite/DesugarPermissionOperators.scala b/src/rewrite/vct/rewrite/DesugarPermissionOperators.scala
index 0d30ddc8df..d0957ff8da 100644
--- a/src/rewrite/vct/rewrite/DesugarPermissionOperators.scala
+++ b/src/rewrite/vct/rewrite/DesugarPermissionOperators.scala
@@ -2,17 +2,48 @@ package vct.col.rewrite
 
 import vct.col.ast._
 import vct.col.util.AstBuildHelpers._
-import vct.col.rewrite.DesugarPermissionOperators.{FramedArraySubscriptBlame, FramedPointerDerefBlame, PredicateValueError}
-import vct.col.origin.{ArrayInsufficientPermission, ArrayLocationError, ArraySubscriptError, Blame, FramedArrIndex, FramedArrLength, FramedArrLoc, IteratedArrayInjective, Origin, PointerBounds, PointerDerefError, PointerInsufficientPermission, PointerLocationError, PointerSubscriptError, PointsToDeref}
-import vct.col.origin.{FramedArrIndex, FramedArrLength, FramedPtrBlockLength, FramedPtrBlockOffset, FramedPtrOffset, IteratedArrayInjective, IteratedPtrInjective, Origin}
+import vct.col.rewrite.DesugarPermissionOperators.{
+  FramedArraySubscriptBlame,
+  FramedPointerDerefBlame,
+  PredicateValueError,
+}
+import vct.col.origin.{
+  ArrayInsufficientPermission,
+  ArrayLocationError,
+  ArraySubscriptError,
+  Blame,
+  FramedArrIndex,
+  FramedArrLength,
+  FramedArrLoc,
+  IteratedArrayInjective,
+  Origin,
+  PointerBounds,
+  PointerDerefError,
+  PointerInsufficientPermission,
+  PointerLocationError,
+  PointerSubscriptError,
+  PointsToDeref,
+}
+import vct.col.origin.{
+  FramedArrIndex,
+  FramedArrLength,
+  FramedPtrBlockLength,
+  FramedPtrBlockOffset,
+  FramedPtrOffset,
+  IteratedArrayInjective,
+  IteratedPtrInjective,
+  Origin,
+}
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 import vct.result.VerificationError.UserError
 
 case object DesugarPermissionOperators extends RewriterBuilder {
   override def key: String = "desugarPerm"
-  override def desc: String = "Desugar assorted syntactic sugar for permission predicates."
+  override def desc: String =
+    "Desugar assorted syntactic sugar for permission predicates."
 
-  case class FramedArraySubscriptBlame(blame: Blame[ArrayLocationError]) extends Blame[ArraySubscriptError] {
+  case class FramedArraySubscriptBlame(blame: Blame[ArrayLocationError])
+      extends Blame[ArraySubscriptError] {
     override def blame(error: ArraySubscriptError): Unit = {
       error match {
         case error: ArrayLocationError => blame.blame(error)
@@ -21,7 +52,8 @@ case object DesugarPermissionOperators extends RewriterBuilder {
     }
   }
 
-  case class FramedPointerDerefBlame(blame: Blame[PointerLocationError]) extends Blame[PointerDerefError] {
+  case class FramedPointerDerefBlame(blame: Blame[PointerLocationError])
+      extends Blame[PointerDerefError] {
     override def blame(error: PointerDerefError): Unit = {
       error match {
         case error: PointerLocationError => blame.blame(error)
@@ -32,23 +64,35 @@ case object DesugarPermissionOperators extends RewriterBuilder {
 
   case class PredicateValueError(loc: Location[_]) extends UserError {
     override def code: String = "predicateValue"
-    override def text: String = loc.o.messageInContext("The predicate has a location but does not point to a value.")
+    override def text: String =
+      loc.o.messageInContext(
+        "The predicate has a location but does not point to a value."
+      )
   }
 
 }
 
-case class DesugarPermissionOperators[Pre <: Generation]() extends Rewriter[Pre] {
+case class DesugarPermissionOperators[Pre <: Generation]()
+    extends Rewriter[Pre] {
 
   def extractValueFromLocation(loc: Location[Pre]): Expr[Pre] = {
     loc match {
-      case HeapVariableLocation(field) => DerefHeapVariable(field)(PointsToDeref)(loc.o)
+      case HeapVariableLocation(field) =>
+        DerefHeapVariable(field)(PointsToDeref)(loc.o)
       case FieldLocation(obj, field) => Deref(obj, field)(PointsToDeref)(loc.o)
-      case ModelLocation(obj, field) => ModelDeref(obj, field)(PointsToDeref)(loc.o)
-      case SilverFieldLocation(obj, field) => SilverDeref(obj, field)(PointsToDeref)(loc.o)
-      case node @ ArrayLocation(array, subscript) => ArraySubscript(array, subscript)(FramedArraySubscriptBlame(node.blame))(loc.o)
-      case node @ PointerLocation(pointer) => DerefPointer(pointer)(FramedPointerDerefBlame(node.blame))(loc.o)
+      case ModelLocation(obj, field) =>
+        ModelDeref(obj, field)(PointsToDeref)(loc.o)
+      case SilverFieldLocation(obj, field) =>
+        SilverDeref(obj, field)(PointsToDeref)(loc.o)
+      case node @ ArrayLocation(array, subscript) =>
+        ArraySubscript(array, subscript)(FramedArraySubscriptBlame(node.blame))(
+          loc.o
+        )
+      case node @ PointerLocation(pointer) =>
+        DerefPointer(pointer)(FramedPointerDerefBlame(node.blame))(loc.o)
       case PredicateLocation(predicate, args) => throw PredicateValueError(loc)
-      case InstancePredicateLocation(predicate, obj, args) => throw PredicateValueError(loc)
+      case InstancePredicateLocation(predicate, obj, args) =>
+        throw PredicateValueError(loc)
       case AmbiguousLocation(expr) => expr
       case InLinePatternLocation(loc, _) => extractValueFromLocation(loc)
     }
@@ -58,39 +102,75 @@ case class DesugarPermissionOperators[Pre <: Generation]() extends Rewriter[Pre]
     implicit val o: Origin = e.o
     e match {
       case PointsTo(loc1, perm1, value1) =>
-        val (loc, perm, value) = (dispatch(loc1), dispatch(perm1), dispatch(value1))
+        val (loc, perm, value) =
+          (dispatch(loc1), dispatch(perm1), dispatch(value1))
         Perm(loc, perm) &* (dispatch(extractValueFromLocation(loc1)) === value)
       case ValidArray(arr1, len1) =>
         val (arr, len) = (dispatch(arr1), dispatch(len1))
         (arr !== Null()) && (Length(arr)(FramedArrLength) === len)
       case ValidMatrix(mat1, dim01, dim11) =>
-        val (mat, dim0, dim1) = (dispatch(mat1), dispatch(dim01), dispatch(dim11))
-        (mat !== Null()) && (Length(mat)(FramedArrLength) === dim0) &*
-          starall(IteratedArrayInjective, TInt(), row =>
+        val (mat, dim0, dim1) =
+          (dispatch(mat1), dispatch(dim01), dispatch(dim11))
+        (mat !== Null()) && (Length(mat)(FramedArrLength) === dim0) &* starall(
+          IteratedArrayInjective,
+          TInt(),
+          row =>
             (const(0) <= row && row < dim0) ==>
-              Value(ArrayLocation(mat, row)(FramedArrLoc))
-          ) &* forall(TInt(), row =>
+              Value(ArrayLocation(mat, row)(FramedArrLoc)),
+        ) &* forall(
+          TInt(),
+          row =>
             (const(0) <= row && row < dim0) ==>
-              (ArraySubscript(mat, row)(FramedArrIndex) !== Null())
-          ) &* forall(TInt(), row =>
+              (ArraySubscript(mat, row)(FramedArrIndex) !== Null()),
+        ) &* forall(
+          TInt(),
+          row =>
             (const(0) <= row && row < dim0) ==>
-              (Length(ArraySubscript(mat, row)(FramedArrIndex))(FramedArrLength) === dim1)
-          ) &* forall(TInt(), row0 => forall(TInt(), row1 =>
-            (const(0) <= row0 && row0 < dim0 && const(0) <= row1 && row1 < dim0) ==>
-              ((ArraySubscript(mat, row0)(FramedArrIndex) === ArraySubscript(mat, row1)(FramedArrIndex)) ==> (row0 === row1))
-          ))
+              (Length(ArraySubscript(mat, row)(FramedArrIndex))(
+                FramedArrLength
+              ) === dim1),
+        ) &* forall(
+          TInt(),
+          row0 =>
+            forall(
+              TInt(),
+              row1 =>
+                (const(0) <= row0 && row0 < dim0 && const(0) <= row1 &&
+                  row1 < dim0) ==>
+                  ((ArraySubscript(mat, row0)(FramedArrIndex) ===
+                    ArraySubscript(mat, row1)(FramedArrIndex)) ==>
+                    (row0 === row1)),
+            ),
+        )
       case PermPointer(p, len, perm) =>
-        (dispatch(p) !== Null()) &*
-          const(0) <= PointerBlockOffset(dispatch(p))(FramedPtrBlockOffset) + dispatch(len) &*
-          PointerBlockOffset(dispatch(p))(FramedPtrBlockOffset) + dispatch(len) <= PointerBlockLength(dispatch(p))(FramedPtrBlockLength) &*
-          starall(IteratedPtrInjective, TInt(), i =>
-            (const(0) <= i && i < dispatch(len)) ==>
-              Perm(PointerLocation(PointerAdd(dispatch(p), i)(FramedPtrOffset))(FramedPtrOffset), dispatch(perm)))
+        (dispatch(p) !== Null()) &* const(0) <= PointerBlockOffset(dispatch(p))(
+          FramedPtrBlockOffset
+        ) + dispatch(len) &*
+          PointerBlockOffset(dispatch(p))(FramedPtrBlockOffset) + dispatch(
+            len
+          ) <= PointerBlockLength(dispatch(p))(FramedPtrBlockLength) &* starall(
+            IteratedPtrInjective,
+            TInt(),
+            i =>
+              (const(0) <= i && i < dispatch(len)) ==> Perm(
+                PointerLocation(PointerAdd(dispatch(p), i)(FramedPtrOffset))(
+                  FramedPtrOffset
+                ),
+                dispatch(perm),
+              ),
+          )
       case PermPointerIndex(p, idx, perm) =>
-        (dispatch(p) !== Null()) &*
-          const(0) <= PointerBlockOffset(dispatch(p))(FramedPtrBlockOffset) + dispatch(idx) &*
-          PointerBlockOffset(dispatch(p))(FramedPtrBlockOffset) + dispatch(idx) < PointerBlockLength(dispatch(p))(FramedPtrBlockLength) &*
-          Perm(PointerLocation(PointerAdd(dispatch(p), dispatch(idx))(FramedPtrOffset))(FramedPtrOffset), dispatch(perm))
+        (dispatch(p) !== Null()) &* const(0) <= PointerBlockOffset(dispatch(p))(
+          FramedPtrBlockOffset
+        ) + dispatch(idx) &*
+          PointerBlockOffset(dispatch(p))(FramedPtrBlockOffset) + dispatch(
+            idx
+          ) < PointerBlockLength(dispatch(p))(FramedPtrBlockLength) &* Perm(
+            PointerLocation(
+              PointerAdd(dispatch(p), dispatch(idx))(FramedPtrOffset)
+            )(FramedPtrOffset),
+            dispatch(perm),
+          )
       case other => rewriteDefault(other)
     }
   }
diff --git a/src/rewrite/vct/rewrite/Disambiguate.scala b/src/rewrite/vct/rewrite/Disambiguate.scala
index 3cdb95961f..792a8b8ba9 100644
--- a/src/rewrite/vct/rewrite/Disambiguate.scala
+++ b/src/rewrite/vct/rewrite/Disambiguate.scala
@@ -2,7 +2,18 @@ package vct.col.rewrite
 
 import hre.util.ScopedStack
 import vct.col.ast._
-import vct.col.origin.{Blame, DiagnosticOrigin, FrontendAdditiveError, InstanceInvocationFailure, InstanceNull, InvocationFailure, Origin, PlusProviderInvocationFailed, PlusProviderNull, WithContractFailure}
+import vct.col.origin.{
+  Blame,
+  DiagnosticOrigin,
+  FrontendAdditiveError,
+  InstanceInvocationFailure,
+  InstanceNull,
+  InvocationFailure,
+  Origin,
+  PlusProviderInvocationFailed,
+  PlusProviderNull,
+  WithContractFailure,
+}
 import vct.col.ref.Ref
 import vct.col.rewrite.Disambiguate.OperatorToInvocation
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
@@ -13,180 +24,299 @@ import vct.result.VerificationError.Unreachable
 
 case object Disambiguate extends RewriterBuilder {
   override def key: String = "disambiguate"
-  override def desc: String = "Translate ambiguous operators into concrete operators."
+  override def desc: String =
+    "Translate ambiguous operators into concrete operators."
 
-  case class OperatorToInvocation(blame: Blame[FrontendAdditiveError]) extends Blame[InstanceInvocationFailure] {
-    override def blame(error: InstanceInvocationFailure): Unit = error match {
-      case InstanceNull(node) => blame.blame(PlusProviderNull(node))
-      case failure: WithContractFailure => blame.blame(PlusProviderInvocationFailed(failure))
-    }
+  case class OperatorToInvocation(blame: Blame[FrontendAdditiveError])
+      extends Blame[InstanceInvocationFailure] {
+    override def blame(error: InstanceInvocationFailure): Unit =
+      error match {
+        case InstanceNull(node) => blame.blame(PlusProviderNull(node))
+        case failure: WithContractFailure =>
+          blame.blame(PlusProviderInvocationFailed(failure))
+      }
   }
 }
 
 case class Disambiguate[Pre <: Generation]() extends Rewriter[Pre] {
-  val functionSucc: SuccessionMap[InstanceOperatorFunction[Pre], InstanceFunction[Post]] = SuccessionMap()
-  val methodSucc: SuccessionMap[InstanceOperatorMethod[Pre], InstanceMethod[Post]] = SuccessionMap()
+  val functionSucc
+      : SuccessionMap[InstanceOperatorFunction[Pre], InstanceFunction[Post]] =
+    SuccessionMap()
+  val methodSucc
+      : SuccessionMap[InstanceOperatorMethod[Pre], InstanceMethod[Post]] =
+    SuccessionMap()
 
   val currentResult: ScopedStack[Result[Post]] = ScopedStack()
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case f: InstanceOperatorFunction[Pre] =>
-      functionSucc(f) = withResult { result: Result[Post] =>
-        currentResult.having(result) {
-          classDeclarations.declare(new InstanceFunction[Post](
-            dispatch(f.returnType),
-            variables.collect(f.args.map(dispatch(_)))._1,
-            variables.collect(f.typeArgs.map(dispatch(_)))._1,
-            f.body.map(dispatch(_)),
-            dispatch(f.contract),
-            f.inline,
-            f.threadLocal
-          )(f.blame)(f.o))
-        }
-      }(DiagnosticOrigin)
-    case m: InstanceOperatorMethod[Pre] =>
-      methodSucc(m) = withResult { result: Result[Post] =>
-        currentResult.having(result) {
-          classDeclarations.declare(new InstanceMethod[Post](
-            dispatch(m.returnType),
-            variables.collect(m.args.map(dispatch(_)))._1,
-            variables.collect(m.outArgs.map(dispatch(_)))._1,
-            variables.collect(m.typeArgs.map(dispatch(_)))._1,
-            m.body.map(dispatch(_)),
-            dispatch(m.contract),
-            m.inline,
-            m.pure
-          )(m.blame)(m.o))
-        }
-      }(DiagnosticOrigin)
-    case _ => rewriteDefault(decl)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case f: InstanceOperatorFunction[Pre] =>
+        functionSucc(f) =
+          withResult { result: Result[Post] =>
+            currentResult.having(result) {
+              classDeclarations.declare(
+                new InstanceFunction[Post](
+                  dispatch(f.returnType),
+                  variables.collect(f.args.map(dispatch(_)))._1,
+                  variables.collect(f.typeArgs.map(dispatch(_)))._1,
+                  f.body.map(dispatch(_)),
+                  dispatch(f.contract),
+                  f.inline,
+                  f.threadLocal,
+                )(f.blame)(f.o)
+              )
+            }
+          }(DiagnosticOrigin)
+      case m: InstanceOperatorMethod[Pre] =>
+        methodSucc(m) =
+          withResult { result: Result[Post] =>
+            currentResult.having(result) {
+              classDeclarations.declare(
+                new InstanceMethod[Post](
+                  dispatch(m.returnType),
+                  variables.collect(m.args.map(dispatch(_)))._1,
+                  variables.collect(m.outArgs.map(dispatch(_)))._1,
+                  variables.collect(m.typeArgs.map(dispatch(_)))._1,
+                  m.body.map(dispatch(_)),
+                  dispatch(m.contract),
+                  m.inline,
+                  m.pure,
+                )(m.blame)(m.o)
+              )
+            }
+          }(DiagnosticOrigin)
+      case _ => rewriteDefault(decl)
+    }
 
   override def dispatch(e: Expr[Pre]): Expr[Post] = {
     implicit val o: Origin = e.o
     e match {
       case op @ AmbiguousDiv(left, right) =>
-        if (op.isVectorIntOp) VectorFloorDiv(dispatch(left), dispatch(right))(op.blame)
-        else if (op.isVectorOp) VectorFloatDiv(dispatch(left), dispatch(right))(op.blame)
-        else if (op.isIntOp) FloorDiv(dispatch(left), dispatch(right))(op.blame)
-        else FloatDiv(dispatch(left), dispatch(right))(op.blame)
+        if (op.isVectorIntOp)
+          VectorFloorDiv(dispatch(left), dispatch(right))(op.blame)
+        else if (op.isVectorOp)
+          VectorFloatDiv(dispatch(left), dispatch(right))(op.blame)
+        else if (op.isIntOp)
+          FloorDiv(dispatch(left), dispatch(right))(op.blame)
+        else
+          FloatDiv(dispatch(left), dispatch(right))(op.blame)
       case op @ AmbiguousTruncDiv(left, right) =>
-        if (op.isVectorIntOp) VectorTruncDiv(dispatch(left), dispatch(right))(op.blame)
-        else if (op.isVectorOp) VectorFloatDiv(dispatch(left), dispatch(right))(op.blame)
-        else if (op.isIntOp) TruncDiv(dispatch(left), dispatch(right))(op.blame)
-        else FloatDiv(dispatch(left), dispatch(right))(op.blame)
+        if (op.isVectorIntOp)
+          VectorTruncDiv(dispatch(left), dispatch(right))(op.blame)
+        else if (op.isVectorOp)
+          VectorFloatDiv(dispatch(left), dispatch(right))(op.blame)
+        else if (op.isIntOp)
+          TruncDiv(dispatch(left), dispatch(right))(op.blame)
+        else
+          FloatDiv(dispatch(left), dispatch(right))(op.blame)
       case op @ AmbiguousMod(left, right) =>
-        if (op.isVectorOp) VectorMod(dispatch(left), dispatch(right))(op.blame)
-        else Mod(dispatch(left), dispatch(right))(op.blame)
+        if (op.isVectorOp)
+          VectorMod(dispatch(left), dispatch(right))(op.blame)
+        else
+          Mod(dispatch(left), dispatch(right))(op.blame)
       case op @ AmbiguousTruncMod(left, right) =>
-        if (op.isVectorOp) VectorTruncMod(dispatch(left), dispatch(right))(op.blame)
-        else TruncMod(dispatch(left), dispatch(right))(op.blame)
+        if (op.isVectorOp)
+          VectorTruncMod(dispatch(left), dispatch(right))(op.blame)
+        else
+          TruncMod(dispatch(left), dispatch(right))(op.blame)
       case op @ AmbiguousMult(left, right) =>
-        if(op.isProcessOp) ProcessSeq(dispatch(left), dispatch(right))
-        else if(op.isSetOp) SetIntersection(dispatch(left), dispatch(right))
-        else if(op.isBagOp) BagLargestCommon(dispatch(left), dispatch(right))
-        else if (op.isVectorOp) VectorMult(dispatch(left), dispatch(right))
-        else Mult(dispatch(left), dispatch(right))
+        if (op.isProcessOp)
+          ProcessSeq(dispatch(left), dispatch(right))
+        else if (op.isSetOp)
+          SetIntersection(dispatch(left), dispatch(right))
+        else if (op.isBagOp)
+          BagLargestCommon(dispatch(left), dispatch(right))
+        else if (op.isVectorOp)
+          VectorMult(dispatch(left), dispatch(right))
+        else
+          Mult(dispatch(left), dispatch(right))
       case op @ AmbiguousPlus(left, right) =>
-        if(op.isProcessOp) ProcessChoice(dispatch(left), dispatch(right))
-        else if(op.isPointerOp) unfoldPointerAdd(PointerAdd(dispatch(left), dispatch(right))(op.blame))
-        else if(op.isSeqOp) Concat(dispatch(left), dispatch(right))
-        else if(op.isSetOp) SetUnion(dispatch(left), dispatch(right))
-        else if(op.isBagOp) BagAdd(dispatch(left), dispatch(right))
-        else if(op.isStringOp) StringConcat(dispatch(left), dispatch(right))
-        else if(op.getCustomPlusType(OperatorLeftPlus[Pre]()).isDefined) rewritePlusOf(OperatorLeftPlus[Pre](), op)
-        else if(op.getCustomPlusType(OperatorRightPlus[Pre]()).isDefined) rewritePlusOf(OperatorRightPlus[Pre](), op)
-        else if (op.isVectorOp) VectorPlus(dispatch(left), dispatch(right))
-        else Plus(dispatch(left), dispatch(right))
+        if (op.isProcessOp)
+          ProcessChoice(dispatch(left), dispatch(right))
+        else if (op.isPointerOp)
+          unfoldPointerAdd(
+            PointerAdd(dispatch(left), dispatch(right))(op.blame)
+          )
+        else if (op.isSeqOp)
+          Concat(dispatch(left), dispatch(right))
+        else if (op.isSetOp)
+          SetUnion(dispatch(left), dispatch(right))
+        else if (op.isBagOp)
+          BagAdd(dispatch(left), dispatch(right))
+        else if (op.isStringOp)
+          StringConcat(dispatch(left), dispatch(right))
+        else if (op.getCustomPlusType(OperatorLeftPlus[Pre]()).isDefined)
+          rewritePlusOf(OperatorLeftPlus[Pre](), op)
+        else if (op.getCustomPlusType(OperatorRightPlus[Pre]()).isDefined)
+          rewritePlusOf(OperatorRightPlus[Pre](), op)
+        else if (op.isVectorOp)
+          VectorPlus(dispatch(left), dispatch(right))
+        else
+          Plus(dispatch(left), dispatch(right))
       case op @ AmbiguousMinus(left, right) =>
-        if(op.isSetOp) SetMinus(dispatch(left), dispatch(right))
-        else if(op.isPointerOp) PointerAdd(dispatch(left), dispatch(UMinus(right)))(op.blame)
-        else if(op.isBagOp) BagMinus(dispatch(left), dispatch(right))
-        else if (op.isVectorOp) VectorMinus(dispatch(left), dispatch(right))
-        else Minus(dispatch(left), dispatch(right))
+        if (op.isSetOp)
+          SetMinus(dispatch(left), dispatch(right))
+        else if (op.isPointerOp)
+          PointerAdd(dispatch(left), dispatch(UMinus(right)))(op.blame)
+        else if (op.isBagOp)
+          BagMinus(dispatch(left), dispatch(right))
+        else if (op.isVectorOp)
+          VectorMinus(dispatch(left), dispatch(right))
+        else
+          Minus(dispatch(left), dispatch(right))
       case op @ AmbiguousOr(left, right) =>
-        if(op.isProcessOp) ProcessPar(dispatch(left), dispatch(right))
-        else Or(dispatch(left), dispatch(right))
+        if (op.isProcessOp)
+          ProcessPar(dispatch(left), dispatch(right))
+        else
+          Or(dispatch(left), dispatch(right))
       case op: BitOp[Pre] =>
-        val cons = if(op.isBoolOp) op match {
-          case _: AmbiguousComputationalOr[Pre] => Or[Post](_, _)
-          case _: AmbiguousComputationalXor[Pre] => Neq[Post](_, _)
-          case _: AmbiguousComputationalAnd[Pre] => And[Post](_, _)
-        } else op match {
-          case _: AmbiguousComputationalOr[Pre] => ComputationalOr[Post](_, _)
-          case _: AmbiguousComputationalXor[Pre] => ComputationalXor[Post](_, _)
-          case _: AmbiguousComputationalAnd[Pre] => ComputationalAnd[Post](_, _)
-        }
+        val cons =
+          if (op.isBoolOp)
+            op match {
+              case _: AmbiguousComputationalOr[Pre] => Or[Post](_, _)
+              case _: AmbiguousComputationalXor[Pre] => Neq[Post](_, _)
+              case _: AmbiguousComputationalAnd[Pre] => And[Post](_, _)
+            }
+          else
+            op match {
+              case _: AmbiguousComputationalOr[Pre] =>
+                ComputationalOr[Post](_, _)
+              case _: AmbiguousComputationalXor[Pre] =>
+                ComputationalXor[Post](_, _)
+              case _: AmbiguousComputationalAnd[Pre] =>
+                ComputationalAnd[Post](_, _)
+            }
 
         cons(dispatch(op.left), dispatch(op.right))
       case op @ AmbiguousSubscript(collection, index) =>
-        if(op.isPointerOp) PointerSubscript(dispatch(collection), dispatch(index))(op.blame)
-        else if(op.isMapOp) MapGet(dispatch(collection), dispatch(index))(op.blame)
-        else if(op.isArrayOp) ArraySubscript(dispatch(collection), dispatch(index))(op.blame)
-        else if(op.isSeqOp) SeqSubscript(dispatch(collection), dispatch(index))(op.blame)
-        else if(op.isVectorOp) VectorSubscript(dispatch(collection), dispatch(index))(op.blame)
-        else throw Unreachable("AmbiguousSubscript must subscript a pointer, map, array, or seq because of the type check.")
+        if (op.isPointerOp)
+          PointerSubscript(dispatch(collection), dispatch(index))(op.blame)
+        else if (op.isMapOp)
+          MapGet(dispatch(collection), dispatch(index))(op.blame)
+        else if (op.isArrayOp)
+          ArraySubscript(dispatch(collection), dispatch(index))(op.blame)
+        else if (op.isSeqOp)
+          SeqSubscript(dispatch(collection), dispatch(index))(op.blame)
+        else if (op.isVectorOp)
+          VectorSubscript(dispatch(collection), dispatch(index))(op.blame)
+        else
+          throw Unreachable(
+            "AmbiguousSubscript must subscript a pointer, map, array, or seq because of the type check."
+          )
       case op @ AmbiguousMember(x, xs) =>
-        if(op.isMapOp) MapMember(dispatch(x), dispatch(xs))
-        else if(op.isSetOp) SetMember(dispatch(x), dispatch(xs))
-        else if(op.isBagOp) BagMemberCount(dispatch(x), dispatch(xs))
-        else if(op.isSeqOp) SeqMember(dispatch(x), dispatch(xs))
-        else throw Unreachable("AmbiguousMember must query a map, set, bag, or seq because of the type check.")
+        if (op.isMapOp)
+          MapMember(dispatch(x), dispatch(xs))
+        else if (op.isSetOp)
+          SetMember(dispatch(x), dispatch(xs))
+        else if (op.isBagOp)
+          BagMemberCount(dispatch(x), dispatch(xs))
+        else if (op.isSeqOp)
+          SeqMember(dispatch(x), dispatch(xs))
+        else
+          throw Unreachable(
+            "AmbiguousMember must query a map, set, bag, or seq because of the type check."
+          )
       case cmp: AmbiguousComparison[Pre] =>
-        if(cmp.isMapOp) cmp match {
-          case AmbiguousEq(left, right, _) => MapEq(dispatch(left), dispatch(right))
-          case AmbiguousNeq(left, right, _) => Not(MapEq(dispatch(left), dispatch(right)))
-        } else if(cmp.isVectorOp) cmp match {
-          case AmbiguousEq(left, right, _) => VectorEq(dispatch(left), dispatch(right))
-          case AmbiguousNeq(left, right, _) => VectorNeq(dispatch(left), dispatch(right))
-        } else cmp match {
-          case AmbiguousEq(left, right, _) => Eq(dispatch(left), dispatch(right))
-          case AmbiguousNeq(left, right, _) => Neq(dispatch(left), dispatch(right))
-        }
+        if (cmp.isMapOp)
+          cmp match {
+            case AmbiguousEq(left, right, _) =>
+              MapEq(dispatch(left), dispatch(right))
+            case AmbiguousNeq(left, right, _) =>
+              Not(MapEq(dispatch(left), dispatch(right)))
+          }
+        else if (cmp.isVectorOp)
+          cmp match {
+            case AmbiguousEq(left, right, _) =>
+              VectorEq(dispatch(left), dispatch(right))
+            case AmbiguousNeq(left, right, _) =>
+              VectorNeq(dispatch(left), dispatch(right))
+          }
+        else
+          cmp match {
+            case AmbiguousEq(left, right, _) =>
+              Eq(dispatch(left), dispatch(right))
+            case AmbiguousNeq(left, right, _) =>
+              Neq(dispatch(left), dispatch(right))
+          }
       case cmp: AmbiguousOrderOp[Pre] =>
-        if(cmp.isBagOp) cmp match {
-          case AmbiguousGreater(left, right) => SubBag(dispatch(right), dispatch(left))
-          case AmbiguousLess(left, right) => SubBag(dispatch(left), dispatch(right))
-          case AmbiguousGreaterEq(left, right) => SubBagEq(dispatch(right), dispatch(left))
-          case AmbiguousLessEq(left, right) => SubBagEq(dispatch(left), dispatch(right))
-        } else if(cmp.isSetOp) cmp match {
-          case AmbiguousGreater(left, right) => SubSet(dispatch(right), dispatch(left))
-          case AmbiguousLess(left, right) => SubSet(dispatch(left), dispatch(right))
-          case AmbiguousGreaterEq(left, right) => SubSetEq(dispatch(right), dispatch(left))
-          case AmbiguousLessEq(left, right) => SubSetEq(dispatch(left), dispatch(right))
-        } else cmp match {
-          case AmbiguousGreater(left, right) => Greater(dispatch(left), dispatch(right))
-          case AmbiguousLess(left, right) => Less(dispatch(left), dispatch(right))
-          case AmbiguousGreaterEq(left, right) => GreaterEq(dispatch(left), dispatch(right))
-          case AmbiguousLessEq(left, right) => LessEq(dispatch(left), dispatch(right))
-        }
-      case r @ Result(_) if currentResult.nonEmpty => Result(currentResult.top.applicable)(r.o)
+        if (cmp.isBagOp)
+          cmp match {
+            case AmbiguousGreater(left, right) =>
+              SubBag(dispatch(right), dispatch(left))
+            case AmbiguousLess(left, right) =>
+              SubBag(dispatch(left), dispatch(right))
+            case AmbiguousGreaterEq(left, right) =>
+              SubBagEq(dispatch(right), dispatch(left))
+            case AmbiguousLessEq(left, right) =>
+              SubBagEq(dispatch(left), dispatch(right))
+          }
+        else if (cmp.isSetOp)
+          cmp match {
+            case AmbiguousGreater(left, right) =>
+              SubSet(dispatch(right), dispatch(left))
+            case AmbiguousLess(left, right) =>
+              SubSet(dispatch(left), dispatch(right))
+            case AmbiguousGreaterEq(left, right) =>
+              SubSetEq(dispatch(right), dispatch(left))
+            case AmbiguousLessEq(left, right) =>
+              SubSetEq(dispatch(left), dispatch(right))
+          }
+        else
+          cmp match {
+            case AmbiguousGreater(left, right) =>
+              Greater(dispatch(left), dispatch(right))
+            case AmbiguousLess(left, right) =>
+              Less(dispatch(left), dispatch(right))
+            case AmbiguousGreaterEq(left, right) =>
+              GreaterEq(dispatch(left), dispatch(right))
+            case AmbiguousLessEq(left, right) =>
+              LessEq(dispatch(left), dispatch(right))
+          }
+      case r @ Result(_) if currentResult.nonEmpty =>
+        Result(currentResult.top.applicable)(r.o)
       case other => rewriteDefault(other)
     }
   }
 
-  def rewritePlusOf(operator: Operator[Pre], plus: AmbiguousPlus[Pre]): Expr[Post] = {
-    val (subject, other) = if(operator == OperatorLeftPlus[Pre]()) (plus.left, plus.right) else (plus.right, plus.left)
+  def rewritePlusOf(
+      operator: Operator[Pre],
+      plus: AmbiguousPlus[Pre],
+  ): Expr[Post] = {
+    val (subject, other) =
+      if (operator == OperatorLeftPlus[Pre]())
+        (plus.left, plus.right)
+      else
+        (plus.right, plus.left)
     val validOperators = plus.getValidOperatorsOf(operator).get
     validOperators match {
-      case Seq(m: InstanceOperatorMethod[Pre]) => MethodInvocation[Post](
-        dispatch(subject),
-        methodSucc.ref(m),
-        Seq(dispatch(other)),
-        Seq(), Seq(), Seq(), Seq())(OperatorToInvocation(plus.blame))(plus.o)
-      case Seq(f: InstanceOperatorFunction[Pre]) => InstanceFunctionInvocation[Post](
-        dispatch(subject),
-        functionSucc.ref(f),
-        Seq(dispatch(other)),
-        Seq(), Seq(), Seq())(OperatorToInvocation(plus.blame))(plus.o)
+      case Seq(m: InstanceOperatorMethod[Pre]) =>
+        MethodInvocation[Post](
+          dispatch(subject),
+          methodSucc.ref(m),
+          Seq(dispatch(other)),
+          Seq(),
+          Seq(),
+          Seq(),
+          Seq(),
+        )(OperatorToInvocation(plus.blame))(plus.o)
+      case Seq(f: InstanceOperatorFunction[Pre]) =>
+        InstanceFunctionInvocation[Post](
+          dispatch(subject),
+          functionSucc.ref(f),
+          Seq(dispatch(other)),
+          Seq(),
+          Seq(),
+          Seq(),
+        )(OperatorToInvocation(plus.blame))(plus.o)
       case _ => ???
     }
   }
 
-  def unfoldPointerAdd[G](e: PointerAdd[G]): PointerAdd[G] = e.pointer match {
-    case inner @ PointerAdd(_, _) =>
-    val PointerAdd(pointerInner, offsetInner) = unfoldPointerAdd(inner)
-    PointerAdd(pointerInner, Plus(offsetInner, e.offset)(e.o) )(e.blame)(e.o)
-    case _ => e
-  }
+  def unfoldPointerAdd[G](e: PointerAdd[G]): PointerAdd[G] =
+    e.pointer match {
+      case inner @ PointerAdd(_, _) =>
+        val PointerAdd(pointerInner, offsetInner) = unfoldPointerAdd(inner)
+        PointerAdd(pointerInner, Plus(offsetInner, e.offset)(e.o))(e.blame)(e.o)
+      case _ => e
+    }
 }
diff --git a/src/rewrite/vct/rewrite/DisambiguateLocation.scala b/src/rewrite/vct/rewrite/DisambiguateLocation.scala
index b736b461f4..8209136550 100644
--- a/src/rewrite/vct/rewrite/DisambiguateLocation.scala
+++ b/src/rewrite/vct/rewrite/DisambiguateLocation.scala
@@ -11,47 +11,62 @@ case object DisambiguateLocation extends RewriterBuilder {
   case class NotALocation(expr: Expr[_]) extends UserError {
     override def code: String = "notALocation"
 
-    def hint: Option[String] = expr match {
-      case PointerSubscript(_, _) => Some(" (Hint: perhaps you meant to prepend `&`)")
-      case DerefPointer(_) => Some(" (Hint: perhaps you meant to prepend `&`)")
-      case _ => None
-    }
+    def hint: Option[String] =
+      expr match {
+        case PointerSubscript(_, _) =>
+          Some(" (Hint: perhaps you meant to prepend `&`)")
+        case DerefPointer(_) =>
+          Some(" (Hint: perhaps you meant to prepend `&`)")
+        case _ => None
+      }
 
-    override def text: String = expr.o.messageInContext("This expression is not a heap location." + hint.getOrElse(""))
+    override def text: String =
+      expr.o.messageInContext(
+        "This expression is not a heap location." + hint.getOrElse("")
+      )
   }
   override def key: String = "disambiguateLocation"
 
-  override def desc: String = "Translate ambiguous location type into concrete location type."
+  override def desc: String =
+    "Translate ambiguous location type into concrete location type."
 }
 
-case class DisambiguateLocation[Pre <: Generation]() extends Rewriter[Pre]  {
-  def exprToLoc(expr: Expr[Pre], blame: Blame[PointerLocationError])(implicit o: Origin): Location[Post] = expr match {
-    case DerefHeapVariable(ref) =>
-      HeapVariableLocation(succ(ref.decl))
-    case Deref(obj, ref) =>
-      FieldLocation(dispatch(obj), succ(ref.decl))
-    case ModelDeref(obj, ref) =>
-      ModelLocation(dispatch(obj), succ(ref.decl))
-    case SilverDeref(obj, ref) =>
-      SilverFieldLocation(dispatch(obj), succ(ref.decl))
-    case expr@ArraySubscript(arr, index) =>
-      ArrayLocation(dispatch(arr), dispatch(index))(expr.blame)
-    case expr if expr.t.asPointer.isDefined =>
-      PointerLocation(dispatch(expr))(blame)
-    case PredicateApply(ref, args, WritePerm()) =>
-      PredicateLocation(succ(ref.decl), (args.map(dispatch)))
-    case InstancePredicateApply(obj, ref, args, WritePerm()) =>
-      InstancePredicateLocation(succ(ref.decl), dispatch(obj), args.map(dispatch))
-
-    case InlinePattern(inner, pattern, group) =>
-      InLinePatternLocation(exprToLoc(inner, blame), InlinePattern(dispatch(inner), pattern, group)(expr.o))(expr.o)
-
-    case default =>
-      throw NotALocation(default)
-  }
+case class DisambiguateLocation[Pre <: Generation]() extends Rewriter[Pre] {
+  def exprToLoc(expr: Expr[Pre], blame: Blame[PointerLocationError])(
+      implicit o: Origin
+  ): Location[Post] =
+    expr match {
+      case DerefHeapVariable(ref) => HeapVariableLocation(succ(ref.decl))
+      case Deref(obj, ref) => FieldLocation(dispatch(obj), succ(ref.decl))
+      case ModelDeref(obj, ref) => ModelLocation(dispatch(obj), succ(ref.decl))
+      case SilverDeref(obj, ref) =>
+        SilverFieldLocation(dispatch(obj), succ(ref.decl))
+      case expr @ ArraySubscript(arr, index) =>
+        ArrayLocation(dispatch(arr), dispatch(index))(expr.blame)
+      case expr if expr.t.asPointer.isDefined =>
+        PointerLocation(dispatch(expr))(blame)
+      case PredicateApply(ref, args, WritePerm()) =>
+        PredicateLocation(succ(ref.decl), (args.map(dispatch)))
+      case InstancePredicateApply(obj, ref, args, WritePerm()) =>
+        InstancePredicateLocation(
+          succ(ref.decl),
+          dispatch(obj),
+          args.map(dispatch),
+        )
 
-  override def dispatch(loc: Location[Pre]): Location[Post] = loc match {
-    case location@AmbiguousLocation(expr) => exprToLoc(expr, location.blame)(loc.o)
-    case other => rewriteDefault(other)
-  }
+      case InlinePattern(inner, pattern, group) =>
+        InLinePatternLocation(
+          exprToLoc(inner, blame),
+          InlinePattern(dispatch(inner), pattern, group)(expr.o),
+        )(expr.o)
+
+      case default => throw NotALocation(default)
+    }
+
+  override def dispatch(loc: Location[Pre]): Location[Post] =
+    loc match {
+      case location @ AmbiguousLocation(expr) =>
+        exprToLoc(expr, location.blame)(loc.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/EncodeArrayValues.scala b/src/rewrite/vct/rewrite/EncodeArrayValues.scala
index 1c944f82a2..dcb8e47ab8 100644
--- a/src/rewrite/vct/rewrite/EncodeArrayValues.scala
+++ b/src/rewrite/vct/rewrite/EncodeArrayValues.scala
@@ -16,59 +16,82 @@ import scala.collection.mutable
 
 case object EncodeArrayValues extends RewriterBuilder {
   override def key: String = "arrayValues"
-  override def desc: String = "Encode \\values and array creation into functions/methods."
-
-  private val valuesFunctionOrigin: Origin =
-    Origin(Seq(LabelContext("\\values function")))
-
-  private val arrayCreationOrigin: Origin = Origin(Seq(LabelContext("array creation method")))
-
-  private val freeFuncOrigin: Origin = Origin(Seq(LabelContext("pointer free method")))
-
-  case class ArrayValuesPreconditionFailed(values: Values[_]) extends Blame[PreconditionFailed] {
-    override def blame(error: PreconditionFailed): Unit = error.path match {
-      case Seq(FailLeft) =>
-        values.blame.blame(ArrayValuesNull(values))
-      case Seq(FailRight, FailLeft) =>
-        values.blame.blame(ArrayValuesFromNegative(values))
-      case Seq(FailRight, FailRight, FailLeft) =>
-        values.blame.blame(ArrayValuesFromToOrder(values))
-      case Seq(FailRight, FailRight, FailRight, FailLeft) =>
-        values.blame.blame(ArrayValuesToLength(values))
-      case Seq(FailRight, FailRight, FailRight, FailRight) =>
-        values.blame.blame(ArrayValuesPerm(values))
-      case other => throw Unreachable(s"Invalid postcondition path sequence: $other")
-    }
+  override def desc: String =
+    "Encode \\values and array creation into functions/methods."
+
+  private val valuesFunctionOrigin: Origin = Origin(
+    Seq(LabelContext("\\values function"))
+  )
+
+  private val arrayCreationOrigin: Origin = Origin(
+    Seq(LabelContext("array creation method"))
+  )
+
+  private val freeFuncOrigin: Origin = Origin(
+    Seq(LabelContext("pointer free method"))
+  )
+
+  case class ArrayValuesPreconditionFailed(values: Values[_])
+      extends Blame[PreconditionFailed] {
+    override def blame(error: PreconditionFailed): Unit =
+      error.path match {
+        case Seq(FailLeft) => values.blame.blame(ArrayValuesNull(values))
+        case Seq(FailRight, FailLeft) =>
+          values.blame.blame(ArrayValuesFromNegative(values))
+        case Seq(FailRight, FailRight, FailLeft) =>
+          values.blame.blame(ArrayValuesFromToOrder(values))
+        case Seq(FailRight, FailRight, FailRight, FailLeft) =>
+          values.blame.blame(ArrayValuesToLength(values))
+        case Seq(FailRight, FailRight, FailRight, FailRight) =>
+          values.blame.blame(ArrayValuesPerm(values))
+        case other =>
+          throw Unreachable(s"Invalid postcondition path sequence: $other")
+      }
   }
 
-  case class ArrayCreationFailed(arr: NewArray[_]) extends Blame[InvocationFailure] {
-    override def blame(error: InvocationFailure): Unit = error match {
-      case PreconditionFailed(_, _, _) => arr.blame.blame(ArraySize(arr))
-      case ContextEverywhereFailedInPre(_, _) => arr.blame.blame(ArraySize(arr)) // Unnecessary?
-      case other => throw Unreachable(s"Invalid invocation failure: $other")
-    }
+  case class ArrayCreationFailed(arr: NewArray[_])
+      extends Blame[InvocationFailure] {
+    override def blame(error: InvocationFailure): Unit =
+      error match {
+        case PreconditionFailed(_, _, _) => arr.blame.blame(ArraySize(arr))
+        case ContextEverywhereFailedInPre(_, _) =>
+          arr.blame.blame(ArraySize(arr)) // Unnecessary?
+        case other => throw Unreachable(s"Invalid invocation failure: $other")
+      }
   }
 
-  case class PointerArrayCreationFailed(arr: NewPointerArray[_]) extends Blame[InvocationFailure] {
-    override def blame(error: InvocationFailure): Unit = error match {
-      case PreconditionFailed(_, _, _) => arr.blame.blame(ArraySize(arr))
-      case ContextEverywhereFailedInPre(_, _) => arr.blame.blame(ArraySize(arr)) // Unnecessary?
-      case other => throw Unreachable(s"Invalid invocation failure: $other")
-    }
+  case class PointerArrayCreationFailed(arr: NewPointerArray[_])
+      extends Blame[InvocationFailure] {
+    override def blame(error: InvocationFailure): Unit =
+      error match {
+        case PreconditionFailed(_, _, _) => arr.blame.blame(ArraySize(arr))
+        case ContextEverywhereFailedInPre(_, _) =>
+          arr.blame.blame(ArraySize(arr)) // Unnecessary?
+        case other => throw Unreachable(s"Invalid invocation failure: $other")
+      }
   }
 
-  case class PointerFreeFailed[G](free: FreePointer[G], errors: Seq[Expr[G] =>  PointerFreeError]) extends Blame[InvocationFailure] {
-    override def blame(error: InvocationFailure): Unit = error match {
-      case PreconditionFailed(path, _, _) => blame_searcher(path, errors)
-      case other => throw Unreachable(s"Invalid invocation failure: $other")
-    }
+  case class PointerFreeFailed[G](
+      free: FreePointer[G],
+      errors: Seq[Expr[G] => PointerFreeError],
+  ) extends Blame[InvocationFailure] {
+    override def blame(error: InvocationFailure): Unit =
+      error match {
+        case PreconditionFailed(path, _, _) => blame_searcher(path, errors)
+        case other => throw Unreachable(s"Invalid invocation failure: $other")
+      }
 
-    def blame_searcher(path: Seq[AccountedDirection], errors: Seq[Expr[G] =>  PointerFreeError]): Unit = (path, errors) match {
-      case (Seq(FailLeft), e :: _) => free.blame.blame(e(free.pointer))
-      case (Seq(FailRight), _ :: e :: _) => free.blame.blame(e(free.pointer))
-      case (FailRight :: pathTail, _ :: errorsTail) => blame_searcher(pathTail, errorsTail)
-      case _ => throw Unreachable(s"Invalid invocation failure for free")
-    }
+    def blame_searcher(
+        path: Seq[AccountedDirection],
+        errors: Seq[Expr[G] => PointerFreeError],
+    ): Unit =
+      (path, errors) match {
+        case (Seq(FailLeft), e :: _) => free.blame.blame(e(free.pointer))
+        case (Seq(FailRight), _ :: e :: _) => free.blame.blame(e(free.pointer))
+        case (FailRight :: pathTail, _ :: errorsTail) =>
+          blame_searcher(pathTail, errorsTail)
+        case _ => throw Unreachable(s"Invalid invocation failure for free")
+      }
   }
 }
 
@@ -77,30 +100,45 @@ case class EncodeArrayValues[Pre <: Generation]() extends Rewriter[Pre] {
 
   val valuesFunctions: mutable.Map[Type[Pre], Function[Post]] = mutable.Map()
 
-  val arrayCreationMethods: mutable.Map[(Type[Pre], Int, Int, Boolean), Procedure[Post]] = mutable.Map()
+  val arrayCreationMethods
+      : mutable.Map[(Type[Pre], Int, Int, Boolean), Procedure[Post]] = mutable
+    .Map()
 
-  val pointerArrayCreationMethods: mutable.Map[Type[Pre], Procedure[Post]] = mutable.Map()
+  val pointerArrayCreationMethods: mutable.Map[Type[Pre], Procedure[Post]] =
+    mutable.Map()
 
-  val freeMethods: mutable.Map[Type[Post], (Procedure[Post], FreePointer[Pre] => PointerFreeFailed[Pre])] = mutable.Map()
+  val freeMethods: mutable.Map[Type[
+    Post
+  ], (Procedure[Post], FreePointer[Pre] => PointerFreeFailed[Pre])] = mutable
+    .Map()
 
-  def makeFree(t: Type[Post]): (Procedure[Post], FreePointer[Pre] => PointerFreeFailed[Pre])  = {
+  def makeFree(
+      t: Type[Post]
+  ): (Procedure[Post], FreePointer[Pre] => PointerFreeFailed[Pre]) = {
     implicit val o: Origin = freeFuncOrigin
     var errors: Seq[Expr[Pre] => PointerFreeError] = Seq()
 
     val proc = globalDeclarations.declare({
       val (vars, ptr) = variables.collect {
-        val a_var = new Variable[Post](TPointer(t))(o.where(name= "p"))
+        val a_var = new Variable[Post](TPointer(t))(o.where(name = "p"))
         variables.declare(a_var)
         Local[Post](a_var.ref)
       }
       val zero = const[Post](0)
       val size = PointerBlockLength(ptr)(FramedPtrBlockLength)
 
-      val i = new Variable[Post](TInt())(o.where(name= "i"))
-      val j = new Variable[Post](TInt())(o.where(name= "j"))
-      val access = (i: Variable[Post]) => PointerSubscript(ptr, i.get)(FramedPtrOffset)
-
-      val makeStruct = MakeAnns(i, j, size, access(i), Seq(access(i), access(j)))
+      val i = new Variable[Post](TInt())(o.where(name = "i"))
+      val j = new Variable[Post](TInt())(o.where(name = "j"))
+      val access =
+        (i: Variable[Post]) => PointerSubscript(ptr, i.get)(FramedPtrOffset)
+
+      val makeStruct = MakeAnns(
+        i,
+        j,
+        size,
+        access(i),
+        Seq(access(i), access(j)),
+      )
 
       /*@
         requires ptr != NULL;
@@ -111,27 +149,54 @@ case class EncodeArrayValues[Pre <: Generation]() extends Rewriter[Pre] {
         requires (\forall* int i; 0 <= i && i < \pointer_block_length(ptr); Perm(ptr[i], write));
         (and recurse for struct fields)
        */
-      var requiresT: Seq[(Expr[Post], Expr[Pre] => PointerFreeError)] =
-        Seq(
-          (ptr !== Null(), (p: Expr[Pre]) => PointerNull(p)),
-          (PointerBlockOffset(ptr)(FramedPtrBlockOffset) === zero, (p: Expr[Pre]) => PointerOffsetNonZero(p)),
-          (makeStruct.makePerm(i => PointerLocation(PointerAdd(ptr, i.get)(FramedPtrOffset))(FramedPtrOffset),
-              IteratedPtrInjective), (p: Expr[Pre]) => PointerInsufficientFreePermission(p))
-        )
+      var requiresT: Seq[(Expr[Post], Expr[Pre] => PointerFreeError)] = Seq(
+        (ptr !== Null(), (p: Expr[Pre]) => PointerNull(p)),
+        (
+          PointerBlockOffset(ptr)(FramedPtrBlockOffset) === zero,
+          (p: Expr[Pre]) => PointerOffsetNonZero(p),
+        ),
+        (
+          makeStruct.makePerm(
+            i =>
+              PointerLocation(PointerAdd(ptr, i.get)(FramedPtrOffset))(
+                FramedPtrOffset
+              ),
+            IteratedPtrInjective,
+          ),
+          (p: Expr[Pre]) => PointerInsufficientFreePermission(p),
+        ),
+      )
       var requires = (ptr !== Null()) &*
         (PointerBlockOffset(ptr)(FramedPtrBlockOffset) === zero) &*
-        makeStruct.makePerm(i => PointerLocation(PointerAdd(ptr, i.get)(FramedPtrOffset))(FramedPtrOffset),
-          IteratedPtrInjective)
-      requiresT = if (!typeIsRef(t)) requiresT else {
-        // I think this error actually can never happen, since we require full write permission already
-        requiresT :+ (makeStruct.makeUnique(access), (p: Expr[Pre]) => GenericPointerFreeError(p))
-      }
+        makeStruct.makePerm(
+          i =>
+            PointerLocation(PointerAdd(ptr, i.get)(FramedPtrOffset))(
+              FramedPtrOffset
+            ),
+          IteratedPtrInjective,
+        )
+      requiresT =
+        if (!typeIsRef(t))
+          requiresT
+        else {
+          // I think this error actually can never happen, since we require full write permission already
+          requiresT :+
+            (
+              makeStruct.makeUnique(access),
+              (p: Expr[Pre]) => GenericPointerFreeError(p),
+            )
+        }
       // If structure contains structs, the permission for those fields need to be released as well
-      val permFields = t match {
-        case t: TClass[Post] => unwrapStructPerm(access, t, o, makeStruct)
-        case _ => Seq()
-      }
-      requiresT = if (permFields.isEmpty) requiresT else requiresT ++ permFields
+      val permFields =
+        t match {
+          case t: TClass[Post] => unwrapStructPerm(access, t, o, makeStruct)
+          case _ => Seq()
+        }
+      requiresT =
+        if (permFields.isEmpty)
+          requiresT
+        else
+          requiresT ++ permFields
       val requiresPred = foldPredicate(requiresT.map(_._1))
       errors = requiresT.map(_._2)
 
@@ -144,7 +209,7 @@ case class EncodeArrayValues[Pre <: Generation]() extends Rewriter[Pre] {
         typeArgs = Nil,
         body = None,
         requires = requiresPred,
-        decreases = Some(DecreasesClauseNoRecursion[Post]())
+        decreases = Some(DecreasesClauseNoRecursion[Post]()),
       )(o.where("free_" + t.toString))
     })
     (proc, (node: FreePointer[Pre]) => PointerFreeFailed(node, errors))
@@ -160,38 +225,65 @@ case class EncodeArrayValues[Pre <: Generation]() extends Rewriter[Pre] {
     val from = Local[Post](from_var.ref)
     val to = Local[Post](to_var.ref)
 
-    globalDeclarations.declare(withResult((result: Result[Post]) => function[Post](
-      blame = AbstractApplicable,
-      contractBlame = PanicBlame("the function for \\values always has a satisfiable contract"),
-      returnType = TSeq(dispatch(arrayType.element)),
-      args = Seq(arr_var, from_var, to_var),
-      requires =
-        SplitAccountedPredicate(UnitAccountedPredicate(arr !== Null()),
-          SplitAccountedPredicate(UnitAccountedPredicate(const(0) <= from),
-            SplitAccountedPredicate(UnitAccountedPredicate(from <= to),
-              SplitAccountedPredicate(UnitAccountedPredicate(to <= Length(arr)(FramedArrLength)),
-                UnitAccountedPredicate(starall(IteratedArrayInjective, TInt(),
-                  i => (from <= i && i < to) ==> Value(ArrayLocation(arr, i)(FramedArrIndex)),
+    globalDeclarations.declare(withResult((result: Result[Post]) =>
+      function[Post](
+        blame = AbstractApplicable,
+        contractBlame = PanicBlame(
+          "the function for \\values always has a satisfiable contract"
+        ),
+        returnType = TSeq(dispatch(arrayType.element)),
+        args = Seq(arr_var, from_var, to_var),
+        requires = SplitAccountedPredicate(
+          UnitAccountedPredicate(arr !== Null()),
+          SplitAccountedPredicate(
+            UnitAccountedPredicate(const(0) <= from),
+            SplitAccountedPredicate(
+              UnitAccountedPredicate(from <= to),
+              SplitAccountedPredicate(
+                UnitAccountedPredicate(to <= Length(arr)(FramedArrLength)),
+                UnitAccountedPredicate(starall(
+                  IteratedArrayInjective,
+                  TInt(),
+                  i =>
+                    (from <= i && i < to) ==>
+                      Value(ArrayLocation(arr, i)(FramedArrIndex)),
                   i => Seq(Seq(ArraySubscript(arr, i)(TriggerPatternBlame))),
-                )))))),
-      ensures = UnitAccountedPredicate(
-        (Size(result) === to - from) &&
-          forall(TInt(),
-            i => (const(0) <= i && i < to - from) ==> (SeqSubscript(result, i)(FramedSeqIndex) === ArraySubscript(arr, i + from)(FramedArrIndex)),
-            i => Seq(Seq(SeqSubscript(result, i)(TriggerPatternBlame)))
-          ) &* forall(TInt(),
-          i => (from <= i && i < to) ==> (ArraySubscript(arr, i)(FramedArrIndex) === SeqSubscript(result, i - from)(FramedSeqIndex)),
-          i => Seq(Seq(ArraySubscript(arr, i)(TriggerPatternBlame)))
-        )
-      )
-    )(o.where(name="values"))
+                )),
+              ),
+            ),
+          ),
+        ),
+        ensures = UnitAccountedPredicate(
+          (Size(result) === to - from) && forall(
+            TInt(),
+            i =>
+              (const(0) <= i && i < to - from) ==>
+                (SeqSubscript(result, i)(FramedSeqIndex) ===
+                  ArraySubscript(arr, i + from)(FramedArrIndex)),
+            i => Seq(Seq(SeqSubscript(result, i)(TriggerPatternBlame))),
+          ) &* forall(
+            TInt(),
+            i =>
+              (from <= i && i < to) ==>
+                (ArraySubscript(arr, i)(FramedArrIndex) ===
+                  SeqSubscript(result, i - from)(FramedSeqIndex)),
+            i => Seq(Seq(ArraySubscript(arr, i)(TriggerPatternBlame))),
+          )
+        ),
+      )(o.where(name = "values"))
     ))
   }
 
-  def makeCreationMethodFor(elementType: Type[Pre], definedDims: Int, undefinedDims: Int, initialize: Boolean): Procedure[Post] = {
+  def makeCreationMethodFor(
+      elementType: Type[Pre],
+      definedDims: Int,
+      undefinedDims: Int,
+      initialize: Boolean,
+  ): Procedure[Post] = {
     implicit val o: Origin = arrayCreationOrigin
 
-    val dimArgs = (0 until definedDims).map(i => new Variable[Post](TInt())(o.where(name = s"dim$i")))
+    val dimArgs = (0 until definedDims)
+      .map(i => new Variable[Post](TInt())(o.where(name = s"dim$i")))
 
     // ar != null
     // ar.length == dim0
@@ -205,82 +297,171 @@ case class EncodeArrayValues[Pre <: Generation]() extends Rewriter[Pre] {
     // forall ar[i][j] :: ar[i][j] == null
 
     globalDeclarations.declare(withResult((result: Result[Post]) => {
-      val forall = (count: Int,  assn: (Expr[Post], Option[ArrayLocation[Post]]) => Expr[Post]) => {
-        val bindings = (0 until count).map(i => new Variable[Post](TInt())(o.where(name = s"i$i")))
-        val access = (0 until count).foldLeft[Expr[Post]](result)((e, i) => ArraySubscript(e, bindings(i).get)(FramedArrIndex))
-        val cond = foldAnd[Post](bindings.zip(dimArgs).map { case (i, dim) => const(0) <= i.get && i.get < dim.get })
-
-        if(count == 0) assn(result, None)
-        else {
-          val optArrLoc = (0 until (count-1)).foldLeft[Expr[Post]](result)((e,i) => ArraySubscript(e, bindings(i).get)(FramedArrIndex))
-          val location = ArrayLocation(optArrLoc, bindings(count-1).get)(FramedArrIndex)
-          Starall[Post](bindings, Seq(Seq(access)), cond ==> assn(access, Some(location)))(IteratedArrayInjective)
+      val forall =
+        (
+            count: Int,
+            assn: (Expr[Post], Option[ArrayLocation[Post]]) => Expr[Post],
+        ) => {
+          val bindings = (0 until count)
+            .map(i => new Variable[Post](TInt())(o.where(name = s"i$i")))
+          val access = (0 until count).foldLeft[Expr[Post]](result)((e, i) =>
+            ArraySubscript(e, bindings(i).get)(FramedArrIndex)
+          )
+          val cond = foldAnd[Post](bindings.zip(dimArgs).map { case (i, dim) =>
+            const(0) <= i.get && i.get < dim.get
+          })
+
+          if (count == 0)
+            assn(result, None)
+          else {
+            val optArrLoc = (0 until (count - 1))
+              .foldLeft[Expr[Post]](result)((e, i) =>
+                ArraySubscript(e, bindings(i).get)(FramedArrIndex)
+              )
+            val location =
+              ArrayLocation(optArrLoc, bindings(count - 1).get)(FramedArrIndex)
+            Starall[Post](
+              bindings,
+              Seq(Seq(access)),
+              cond ==> assn(access, Some(location)),
+            )(IteratedArrayInjective)
+          }
         }
-      }
 
       var ensures = foldStar((0 until definedDims).map(count => {
-        val injective = if(count > 0) {
-          val leftBindings = (0 until count).map(i => new Variable[Post](TInt())(o.where(name = s"i$i")))
-          val rightBindings = (0 until count).map(i => new Variable[Post](TInt())(o.where(name = s"j$i")))
-
-          val leftRanges = leftBindings.zip(dimArgs).map { case (i, dim) => const[Post](0) <= i.get && i.get < dim.get }
-          val rightRanges = rightBindings.zip(dimArgs).map { case (i, dim) => const[Post](0) <= i.get && i.get < dim.get }
-
-          val rangeCond = foldAnd(leftRanges) && foldAnd(rightRanges)
-
-          val leftAccess = leftBindings.foldLeft[Expr[Post]](result)((e, b) => ArraySubscript(e, b.get)(FramedArrIndex))
-          val rightAccess = rightBindings.foldLeft[Expr[Post]](result)((e, b) => ArraySubscript(e, b.get)(FramedArrIndex))
-
-          val indicesEqual = leftBindings.zip(rightBindings).map { case (l, r) => l.get === r.get }
-
-          Forall[Post](leftBindings ++ rightBindings, Seq(Seq(leftAccess, rightAccess)),
-            rangeCond ==> ((leftAccess === rightAccess) ==> foldAnd(indicesEqual)))
-        } else tt[Post]
-
-        forall(count, (access, _) => access !== Null()) &*
-          forall(count, (access, _) => Length(access)(FramedArrLength) === dimArgs(count).get) &*
-          injective &*
+        val injective =
+          if (count > 0) {
+            val leftBindings = (0 until count)
+              .map(i => new Variable[Post](TInt())(o.where(name = s"i$i")))
+            val rightBindings = (0 until count)
+              .map(i => new Variable[Post](TInt())(o.where(name = s"j$i")))
+
+            val leftRanges = leftBindings.zip(dimArgs).map { case (i, dim) =>
+              const[Post](0) <= i.get && i.get < dim.get
+            }
+            val rightRanges = rightBindings.zip(dimArgs).map { case (i, dim) =>
+              const[Post](0) <= i.get && i.get < dim.get
+            }
+
+            val rangeCond = foldAnd(leftRanges) && foldAnd(rightRanges)
+
+            val leftAccess =
+              leftBindings.foldLeft[Expr[Post]](result)((e, b) =>
+                ArraySubscript(e, b.get)(FramedArrIndex)
+              )
+            val rightAccess =
+              rightBindings.foldLeft[Expr[Post]](result)((e, b) =>
+                ArraySubscript(e, b.get)(FramedArrIndex)
+              )
+
+            val indicesEqual = leftBindings.zip(rightBindings).map {
+              case (l, r) => l.get === r.get
+            }
+
+            Forall[Post](
+              leftBindings ++ rightBindings,
+              Seq(Seq(leftAccess, rightAccess)),
+              rangeCond ==>
+                ((leftAccess === rightAccess) ==> foldAnd(indicesEqual)),
+            )
+          } else
+            tt[Post]
+
+        forall(count, (access, _) => access !== Null()) &* forall(
+          count,
+          (access, _) => Length(access)(FramedArrLength) === dimArgs(count).get,
+        ) &* injective &*
           forall(count + 1, (_, location) => Perm(location.get, WritePerm()))
       }))
 
-      val undefinedValue: Expr[Post] =
-        dispatch(Java.zeroValue(FuncTools.repeat[Type[Pre]](TArray(_), undefinedDims, elementType)))
+      val undefinedValue: Expr[Post] = dispatch(Java.zeroValue(
+        FuncTools.repeat[Type[Pre]](TArray(_), undefinedDims, elementType)
+      ))
 
-      ensures = if(initialize) ensures &* forall(definedDims, (access, _) => access === undefinedValue) else ensures
+      ensures =
+        if (initialize)
+          ensures &*
+            forall(definedDims, (access, _) => access === undefinedValue)
+        else
+          ensures
 
-      val requires = foldAnd(dimArgs.map(argument => GreaterEq(argument.get, const[Post](0))))
+      val requires = foldAnd(
+        dimArgs.map(argument => GreaterEq(argument.get, const[Post](0)))
+      )
       procedure(
         blame = AbstractApplicable,
         contractBlame = TrueSatisfiable,
-        returnType = FuncTools.repeat[Type[Post]](TArray(_), definedDims + undefinedDims, dispatch(elementType)),
+        returnType = FuncTools.repeat[Type[Post]](
+          TArray(_),
+          definedDims + undefinedDims,
+          dispatch(elementType),
+        ),
         args = dimArgs,
         requires = UnitAccountedPredicate(requires),
-        ensures = UnitAccountedPredicate(ensures)
-      )(o.where(name = if(initialize) "make_array_initialized" else "make_array"))
+        ensures = UnitAccountedPredicate(ensures),
+      )(o.where(name =
+        if (initialize)
+          "make_array_initialized"
+        else
+          "make_array"
+      ))
     }))
   }
 
-  def unwrapStructPerm(struct: Variable[Post] => Expr[Post], structType: TClass[Post], origin: Origin,
-                       makeStruct: MakeAnns, visited: Seq[TClass[Post]] = Seq()): Seq[(Expr[Post], Expr[Pre] => PointerFreeError)] = {
-    if (visited.contains(structType)) throw UnsupportedStructPerm(origin) // We do not allow this notation for recursive structs
+  def unwrapStructPerm(
+      struct: Variable[Post] => Expr[Post],
+      structType: TClass[Post],
+      origin: Origin,
+      makeStruct: MakeAnns,
+      visited: Seq[TClass[Post]] = Seq(),
+  ): Seq[(Expr[Post], Expr[Pre] => PointerFreeError)] = {
+    if (visited.contains(structType))
+      throw UnsupportedStructPerm(
+        origin
+      ) // We do not allow this notation for recursive structs
     implicit val o: Origin = origin
 
-    val fields = structType match {
-      case TClass(ref, _) => ref.decl.declarations.collect { case field: InstanceField[Post] => field }
-      case _ => Seq()
-    }
+    val fields =
+      structType match {
+        case TClass(ref, _) =>
+          ref.decl.declarations.collect { case field: InstanceField[Post] =>
+            field
+          }
+        case _ => Seq()
+      }
     val newFieldPerms = fields.map(member => {
-      val loc = (i: Variable[Post]) => Deref[Post](struct(i), member.ref)(DerefPerm)
-      var anns : Seq[(Expr[Post], Expr[Pre] => PointerFreeError)] =
-        Seq((makeStruct.makePerm(i => FieldLocation[Post](struct(i), member.ref), IteratedPtrInjective),
-          (p: Expr[Pre]) => PointerInsufficientFreeFieldPermission(p, Referrable.originName(member))))
-      anns = if(typeIsRef(member.t))
-          anns :+ (makeStruct.makeUnique(loc), (p: Expr[Pre]) => GenericPointerFreeError(p))
-        else anns
+      val loc =
+        (i: Variable[Post]) => Deref[Post](struct(i), member.ref)(DerefPerm)
+      var anns: Seq[(Expr[Post], Expr[Pre] => PointerFreeError)] = Seq((
+        makeStruct.makePerm(
+          i => FieldLocation[Post](struct(i), member.ref),
+          IteratedPtrInjective,
+        ),
+        (p: Expr[Pre]) =>
+          PointerInsufficientFreeFieldPermission(
+            p,
+            Referrable.originName(member),
+          ),
+      ))
+      anns =
+        if (typeIsRef(member.t))
+          anns :+
+            (
+              makeStruct.makeUnique(loc),
+              (p: Expr[Pre]) => GenericPointerFreeError(p),
+            )
+        else
+          anns
       member.t match {
         case newStruct: TClass[Post] =>
           // We recurse, since a field is another struct
-          anns ++ unwrapStructPerm(loc, newStruct, origin, makeStruct, structType +: visited)
+          anns ++ unwrapStructPerm(
+            loc,
+            newStruct,
+            origin,
+            makeStruct,
+            structType +: visited,
+          )
         case _ => anns
       }
     })
@@ -288,11 +469,21 @@ case class EncodeArrayValues[Pre <: Generation]() extends Rewriter[Pre] {
     newFieldPerms.flatten
   }
 
-  case class MakeAnns(i: Variable[Post], j: Variable[Post], size: Expr[Post], trigger: Expr[Post], triggerUnique: Seq[Expr[Post]]){
-    def makePerm(location: Variable[Post] => Location[Post], blame: Blame[ReceiverNotInjective]): Expr[Post] = {
+  case class MakeAnns(
+      i: Variable[Post],
+      j: Variable[Post],
+      size: Expr[Post],
+      trigger: Expr[Post],
+      triggerUnique: Seq[Expr[Post]],
+  ) {
+    def makePerm(
+        location: Variable[Post] => Location[Post],
+        blame: Blame[ReceiverNotInjective],
+    ): Expr[Post] = {
       implicit val o: Origin = arrayCreationOrigin
-      val zero =  const[Post](0)
-      val body = (zero <= i.get && i.get < size) ==> Perm(location(i), WritePerm[Post]())
+      val zero = const[Post](0)
+      val body =
+        (zero <= i.get && i.get < size) ==> Perm(location(i), WritePerm[Post]())
       Starall(Seq(i), Seq(Seq(trigger)), body)(blame)
     }
 
@@ -301,16 +492,17 @@ case class EncodeArrayValues[Pre <: Generation]() extends Rewriter[Pre] {
       val zero = const[Post](0)
       val pre1 = zero <= i.get && i.get < size
       val pre2 = zero <= j.get && j.get < size
-      val body = (pre1 && pre2 && (i.get !== j.get)) ==>
-        (access(i) !== access(j))
+      val body =
+        (pre1 && pre2 && (i.get !== j.get)) ==> (access(i) !== access(j))
       Forall(Seq(i, j), Seq(triggerUnique), body)
     }
   }
 
-  def typeIsRef(t: Type[_]): Boolean = t match {
-    case _ : TClass[_] => true
-    case _ => false
-  }
+  def typeIsRef(t: Type[_]): Boolean =
+    t match {
+      case _: TClass[_] => true
+      case _ => false
+    }
 
   def makePointerCreationMethodFor(elementType: Type[Pre]) = {
     implicit val o: Origin = arrayCreationOrigin
@@ -319,32 +511,52 @@ case class EncodeArrayValues[Pre <: Generation]() extends Rewriter[Pre] {
     // forall ar[i] :: Perm(ar[i], write)
     // (if type ar[i] is pointer or struct):
     // forall i,j :: i!=j ==> ar[i] != ar[j]
-    val sizeArg = new Variable[Post](TInt())(o.where(name= "size"))
-    val zero =  const[Post](0)
+    val sizeArg = new Variable[Post](TInt())(o.where(name = "size"))
+    val zero = const[Post](0)
 
     globalDeclarations.declare(withResult((result: Result[Post]) => {
       val requires = sizeArg.get >= zero
-      val i = new Variable[Post](TInt())(o.where(name= "i"))
-      val j = new Variable[Post](TInt())(o.where(name= "j"))
-      val access = (i: Variable[Post]) => PointerSubscript(result, i.get)(FramedPtrOffset)
-
-      val makeStruct = MakeAnns(i, j, sizeArg.get, access(i), Seq(access(i), access(j)))
+      val i = new Variable[Post](TInt())(o.where(name = "i"))
+      val j = new Variable[Post](TInt())(o.where(name = "j"))
+      val access =
+        (i: Variable[Post]) => PointerSubscript(result, i.get)(FramedPtrOffset)
+
+      val makeStruct = MakeAnns(
+        i,
+        j,
+        sizeArg.get,
+        access(i),
+        Seq(access(i), access(j)),
+      )
 
       var ensures = (result !== Null()) &*
         (PointerBlockLength(result)(FramedPtrBlockLength) === sizeArg.get) &*
         (PointerBlockOffset(result)(FramedPtrBlockOffset) === zero)
       // Pointer location needs pointer add, not pointer subscript
-      ensures = ensures &* makeStruct.makePerm(i => PointerLocation(PointerAdd(result, i.get)(FramedPtrOffset))(FramedPtrOffset), IteratedPtrInjective)
-      ensures = if (!typeIsRef(elementType)) ensures else {
-        ensures &* makeStruct.makeUnique(access)
-      }
-
-      val permFields = dispatch(elementType) match {
-        case t: TClass[Post] => unwrapStructPerm(access, t, o, makeStruct)
-        case _ => Seq()
-      }
+      ensures =
+        ensures &* makeStruct.makePerm(
+          i =>
+            PointerLocation(PointerAdd(result, i.get)(FramedPtrOffset))(
+              FramedPtrOffset
+            ),
+          IteratedPtrInjective,
+        )
+      ensures =
+        if (!typeIsRef(elementType))
+          ensures
+        else { ensures &* makeStruct.makeUnique(access) }
+
+      val permFields =
+        dispatch(elementType) match {
+          case t: TClass[Post] => unwrapStructPerm(access, t, o, makeStruct)
+          case _ => Seq()
+        }
 
-      ensures = if (permFields.isEmpty) ensures else ensures &* foldStar(permFields.map(_._1))
+      ensures =
+        if (permFields.isEmpty)
+          ensures
+        else
+          ensures &* foldStar(permFields.map(_._1))
 
       procedure(
         blame = AbstractApplicable,
@@ -352,8 +564,8 @@ case class EncodeArrayValues[Pre <: Generation]() extends Rewriter[Pre] {
         returnType = TPointer(dispatch(elementType)),
         args = Seq(sizeArg),
         requires = UnitAccountedPredicate(requires),
-        ensures = UnitAccountedPredicate(ensures)
-      )(o.where(name= "make_pointer_array_" + elementType.toString))
+        ensures = UnitAccountedPredicate(ensures),
+      )(o.where(name = "make_pointer_array_" + elementType.toString))
     }))
   }
 
@@ -362,19 +574,46 @@ case class EncodeArrayValues[Pre <: Generation]() extends Rewriter[Pre] {
     e match {
       case values @ Values(arr, from, to) =>
         val arrayType = CoercionUtils.getAnyArrayCoercion(arr.t).get._2
-        val func = valuesFunctions.getOrElseUpdate(arrayType, makeFunctionFor(arrayType))
-        FunctionInvocation[Post](func.ref, Seq(dispatch(arr), dispatch(from), dispatch(to)), Nil, Nil, Nil)(NoContext(ArrayValuesPreconditionFailed(values)))
+        val func = valuesFunctions
+          .getOrElseUpdate(arrayType, makeFunctionFor(arrayType))
+        FunctionInvocation[Post](
+          func.ref,
+          Seq(dispatch(arr), dispatch(from), dispatch(to)),
+          Nil,
+          Nil,
+          Nil,
+        )(NoContext(ArrayValuesPreconditionFailed(values)))
       case newArr @ NewArray(element, dims, moreDims, initialize) =>
-        val method = arrayCreationMethods.getOrElseUpdate((element, dims.size, moreDims, initialize), makeCreationMethodFor(element, dims.size, moreDims, initialize))
-        ProcedureInvocation[Post](method.ref, dims.map(dispatch), Nil, Nil, Nil, Nil)(ArrayCreationFailed(newArr))
+        val method = arrayCreationMethods.getOrElseUpdate(
+          (element, dims.size, moreDims, initialize),
+          makeCreationMethodFor(element, dims.size, moreDims, initialize),
+        )
+        ProcedureInvocation[Post](
+          method.ref,
+          dims.map(dispatch),
+          Nil,
+          Nil,
+          Nil,
+          Nil,
+        )(ArrayCreationFailed(newArr))
       case newPointerArr @ NewPointerArray(element, size) =>
-        val method = pointerArrayCreationMethods.getOrElseUpdate(element, makePointerCreationMethodFor(element))
-        ProcedureInvocation[Post](method.ref, Seq(dispatch(size)), Nil, Nil, Nil, Nil)(PointerArrayCreationFailed(newPointerArr))
+        val method = pointerArrayCreationMethods
+          .getOrElseUpdate(element, makePointerCreationMethodFor(element))
+        ProcedureInvocation[Post](
+          method.ref,
+          Seq(dispatch(size)),
+          Nil,
+          Nil,
+          Nil,
+          Nil,
+        )(PointerArrayCreationFailed(newPointerArr))
       case free @ FreePointer(xs) =>
-        val newXs = dispatch (xs)
+        val newXs = dispatch(xs)
         val TPointer(t) = newXs.t
-        val (freeFunc, freeBlame) = freeMethods.getOrElseUpdate (t, makeFree(t))
-        ProcedureInvocation[Post](freeFunc.ref, Seq (newXs), Nil, Nil, Nil, Nil) (freeBlame(free))(free.o)
+        val (freeFunc, freeBlame) = freeMethods.getOrElseUpdate(t, makeFree(t))
+        ProcedureInvocation[Post](freeFunc.ref, Seq(newXs), Nil, Nil, Nil, Nil)(
+          freeBlame(free)
+        )(free.o)
       case other => rewriteDefault(other)
     }
   }
diff --git a/src/rewrite/vct/rewrite/EncodeAutoValue.scala b/src/rewrite/vct/rewrite/EncodeAutoValue.scala
index e0a1737c37..0e2beaf27f 100644
--- a/src/rewrite/vct/rewrite/EncodeAutoValue.scala
+++ b/src/rewrite/vct/rewrite/EncodeAutoValue.scala
@@ -3,7 +3,18 @@ package vct.rewrite
 import hre.util.ScopedStack
 import vct.col.ast._
 import vct.col.compare.Compare
-import vct.col.origin.{AbstractApplicable, AutoValueLeakCheckFailed, Blame, LabelContext, Origin, PanicBlame, PostBlameSplit, PostconditionFailed, PreferredName, TrueSatisfiable}
+import vct.col.origin.{
+  AbstractApplicable,
+  AutoValueLeakCheckFailed,
+  Blame,
+  LabelContext,
+  Origin,
+  PanicBlame,
+  PostBlameSplit,
+  PostconditionFailed,
+  PreferredName,
+  TrueSatisfiable,
+}
 import vct.col.util.AstBuildHelpers._
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, Rewritten}
 import vct.result.VerificationError.UserError
@@ -15,17 +26,16 @@ case object EncodeAutoValue extends RewriterBuilder {
 
   override def desc: String = "Encodes the AutoValue resource"
 
-  private def AnyReadOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("read$")),
-      LabelContext("encodeAutoValue")
-    )
-  )
+  private def AnyReadOrigin: Origin =
+    Origin(Seq(PreferredName(Seq("read$")), LabelContext("encodeAutoValue")))
 
   case class InvalidAutoValue(e: Expr[_]) extends UserError {
     override def code: String = "invalidAutoValue"
 
-    override def text: String = e.o.messageInContext("The AutoValue resource may only be in pre and postconditions in expressions containing only ?:, **, ==>, and let")
+    override def text: String =
+      e.o.messageInContext(
+        "The AutoValue resource may only be in pre and postconditions in expressions containing only ?:, **, ==>, and let"
+      )
   }
 
   private sealed class PreOrPost
@@ -34,7 +44,8 @@ case object EncodeAutoValue extends RewriterBuilder {
 
   private final case class InPostcondition() extends PreOrPost
 
-  case class AutoValueLeakCheckFailedBlame(app: ContractApplicable[_]) extends Blame[PostconditionFailed] {
+  case class AutoValueLeakCheckFailedBlame(app: ContractApplicable[_])
+      extends Blame[PostconditionFailed] {
     override def blame(error: PostconditionFailed): Unit =
       app.blame.blame(AutoValueLeakCheckFailed(error.failure, app))
   }
@@ -44,45 +55,72 @@ case class EncodeAutoValue[Pre <: Generation]() extends Rewriter[Pre] {
 
   import EncodeAutoValue._
 
-  private val conditionContext: ScopedStack[(PreOrPost, mutable.ArrayBuffer[(Expr[Pre], Expr[Post])])] = ScopedStack()
+  private val conditionContext
+      : ScopedStack[(PreOrPost, mutable.ArrayBuffer[(Expr[Pre], Expr[Post])])] =
+    ScopedStack()
   private val inFunction: ScopedStack[Unit] = ScopedStack()
 
   private lazy val anyRead: Function[Post] = {
     implicit val o: Origin = AnyReadOrigin
     globalDeclarations.declare(withResult((result: Result[Post]) =>
-      function(AbstractApplicable, TrueSatisfiable, returnType = TRational(), ensures = UnitAccountedPredicate(result > NoPerm() &* result < WritePerm()))
+      function(
+        AbstractApplicable,
+        TrueSatisfiable,
+        returnType = TRational(),
+        ensures = UnitAccountedPredicate(
+          result > NoPerm() &* result < WritePerm()
+        ),
+      )
     ))
   }
 
-  override def dispatch(node: Declaration[Pre]): Unit = node match {
-    case app: AbstractFunction[Pre] =>
-      inFunction.having(()) {
-        allScopes.anySucceed(app, app.rewrite(blame = PostBlameSplit.left(AutoValueLeakCheckFailedBlame(app), app.blame)))
-      }
-    case app: AbstractMethod[Pre] =>
-      allScopes.anySucceed(app, app.rewrite(blame = PostBlameSplit.left(AutoValueLeakCheckFailedBlame(app), app.blame)))
-    case _ => super.dispatch(node)
-  }
+  override def dispatch(node: Declaration[Pre]): Unit =
+    node match {
+      case app: AbstractFunction[Pre] =>
+        inFunction.having(()) {
+          allScopes.anySucceed(
+            app,
+            app.rewrite(blame =
+              PostBlameSplit.left(AutoValueLeakCheckFailedBlame(app), app.blame)
+            ),
+          )
+        }
+      case app: AbstractMethod[Pre] =>
+        allScopes.anySucceed(
+          app,
+          app.rewrite(blame =
+            PostBlameSplit.left(AutoValueLeakCheckFailedBlame(app), app.blame)
+          ),
+        )
+      case _ => super.dispatch(node)
+    }
 
-  override def dispatch(node: ApplicableContract[Pre]): ApplicableContract[Post] = {
+  override def dispatch(
+      node: ApplicableContract[Pre]
+  ): ApplicableContract[Post] = {
     implicit val o: Origin = node.o
     val preMap = mutable.ArrayBuffer[(Expr[Pre], Expr[Post])]()
     val postMap = mutable.ArrayBuffer[(Expr[Pre], Expr[Post])]()
-    node.rewrite(requires = conditionContext.having((InPrecondition(), preMap)) {
-      dispatch(node.requires)
-    },
+    node.rewrite(
+      requires =
+        conditionContext.having((InPrecondition(), preMap)) {
+          dispatch(node.requires)
+        },
       ensures = {
-        val predicate = conditionContext.having(((InPostcondition(), postMap))) {
-          dispatch(node.ensures)
-        }
-        val filtered = preMap.filterNot(pre => postMap.exists(post => {
-          Compare.isIsomorphic(pre._1, post._1, matchFreeVariables = true)
-        })).map(pre => pre._2)
+        val predicate =
+          conditionContext.having(((InPostcondition(), postMap))) {
+            dispatch(node.ensures)
+          }
+        val filtered = preMap.filterNot(pre =>
+          postMap.exists(post => {
+            Compare.isIsomorphic(pre._1, post._1, matchFreeVariables = true)
+          })
+        ).map(pre => pre._2)
         SplitAccountedPredicate(
           UnitAccountedPredicate(foldStar(filtered.toSeq)),
-          predicate
+          predicate,
         )
-      }
+      },
     )
   }
 
@@ -99,119 +137,178 @@ case class EncodeAutoValue[Pre <: Generation]() extends Rewriter[Pre] {
         case AutoValue(loc) => {
           val x = new Variable[Post](TRef())
           val postLoc = dispatch(loc)
-          val (genericLocation, obj) = postLoc match {
-            case SilverFieldLocation(obj, field) => (SilverFieldLocation(x.get, field), obj)
-          }
+          val (genericLocation, obj) =
+            postLoc match {
+              case SilverFieldLocation(obj, field) =>
+                (SilverFieldLocation(x.get, field), obj)
+            }
           conditionContext.top match {
             case (InPrecondition(), preMap) =>
-              preMap += ((e, PolarityDependent[Post](onInhale = tt, onExhale = Perm(postLoc, functionInvocation(AbstractApplicable, anyRead.ref)))))
+              preMap +=
+                ((
+                  e,
+                  PolarityDependent[Post](
+                    onInhale = tt,
+                    onExhale = Perm(
+                      postLoc,
+                      functionInvocation(AbstractApplicable, anyRead.ref),
+                    ),
+                  ),
+                ))
               PolarityDependent(
-                onInhale = Perm(postLoc, functionInvocation(AbstractApplicable, anyRead.ref)),
-                onExhale = !ForPerm(Seq(x), genericLocation, ff) &* !ForPerm(Seq(x), genericLocation, x.get !== obj)
+                onInhale = Perm(
+                  postLoc,
+                  functionInvocation(AbstractApplicable, anyRead.ref),
+                ),
+                onExhale =
+                  !ForPerm(Seq(x), genericLocation, ff) &*
+                    !ForPerm(Seq(x), genericLocation, x.get !== obj),
               )
             case (InPostcondition(), postMap) =>
               postMap += ((e, tt))
               PolarityDependent(
-                onInhale = !ForPerm(Seq(x), genericLocation, ff) &* !ForPerm(Seq(x), genericLocation, x.get !== obj),
-                onExhale = Perm(postLoc, functionInvocation(AbstractApplicable, anyRead.ref))
+                onInhale =
+                  !ForPerm(Seq(x), genericLocation, ff) &*
+                    !ForPerm(Seq(x), genericLocation, x.get !== obj),
+                onExhale = Perm(
+                  postLoc,
+                  functionInvocation(AbstractApplicable, anyRead.ref),
+                ),
               )
           }
         }
-        case Let(binding, value, main) => variables.scope {
-          val top = conditionContext.pop()
-          val (b, v) = try {
-            (variables.dispatch(binding), dispatch(value))
-          } finally {
-            conditionContext.push(top)
-          }
-          val mMap = mutable.ArrayBuffer[(Expr[Pre], Expr[Post])]()
-          val m = conditionContext.having((conditionContext.top._1, mMap)) {
-            dispatch(main)
-          }
-          if (mMap.isEmpty) {
-            Let(b, v, m)
-          } else {
-            mMap.foreach(postM => conditionContext.top._2.append((Let(binding, value, postM._1), Let(b, v, postM._2))))
-            conditionContext.top._1 match {
-              case InPrecondition() => Let(b, v, m)
-              case InPostcondition() => Let(b, Old(v, None)(PanicBlame("Old should always be valid in a postcondition")), m)
+        case Let(binding, value, main) =>
+          variables.scope {
+            val top = conditionContext.pop()
+            val (b, v) =
+              try { (variables.dispatch(binding), dispatch(value)) }
+              finally { conditionContext.push(top) }
+            val mMap = mutable.ArrayBuffer[(Expr[Pre], Expr[Post])]()
+            val m =
+              conditionContext.having((conditionContext.top._1, mMap)) {
+                dispatch(main)
+              }
+            if (mMap.isEmpty) { Let(b, v, m) }
+            else {
+              mMap.foreach(postM =>
+                conditionContext.top._2
+                  .append((Let(binding, value, postM._1), Let(b, v, postM._2)))
+              )
+              conditionContext.top._1 match {
+                case InPrecondition() => Let(b, v, m)
+                case InPostcondition() =>
+                  Let(
+                    b,
+                    Old(v, None)(PanicBlame(
+                      "Old should always be valid in a postcondition"
+                    )),
+                    m,
+                  )
+              }
             }
           }
-        }
         case Select(condition, left, right) =>
           val top = conditionContext.pop()
-          val c = try {
-            dispatch(condition)
-          } finally {
-            conditionContext.push(top)
-          }
+          val c =
+            try { dispatch(condition) }
+            finally { conditionContext.push(top) }
           val lMap = mutable.ArrayBuffer[(Expr[Pre], Expr[Post])]()
           val rMap = mutable.ArrayBuffer[(Expr[Pre], Expr[Post])]()
-          val l = conditionContext.having((conditionContext.top._1, lMap)) {
-            dispatch(left)
-          }
-          val r = conditionContext.having((conditionContext.top._1, rMap)) {
-            dispatch(right)
-          }
-          if (lMap.isEmpty && rMap.isEmpty) Select(c, l, r)
+          val l =
+            conditionContext.having((conditionContext.top._1, lMap)) {
+              dispatch(left)
+            }
+          val r =
+            conditionContext.having((conditionContext.top._1, rMap)) {
+              dispatch(right)
+            }
+          if (lMap.isEmpty && rMap.isEmpty)
+            Select(c, l, r)
           else {
-            lMap.foreach(postL => conditionContext.top._2.append((Select(condition, postL._1, tt), Select(Old(c, None)(PanicBlame("Old should always be valid in a postcondition")), postL._2, tt))))
-            rMap.foreach(postR => conditionContext.top._2.append((Select(condition, tt, postR._1), Select(Old(c, None)(PanicBlame("Old should always be valid in a postcondition")), tt, postR._2))))
+            lMap.foreach(postL =>
+              conditionContext.top._2.append((
+                Select(condition, postL._1, tt),
+                Select(
+                  Old(c, None)(PanicBlame(
+                    "Old should always be valid in a postcondition"
+                  )),
+                  postL._2,
+                  tt,
+                ),
+              ))
+            )
+            rMap.foreach(postR =>
+              conditionContext.top._2.append((
+                Select(condition, tt, postR._1),
+                Select(
+                  Old(c, None)(PanicBlame(
+                    "Old should always be valid in a postcondition"
+                  )),
+                  tt,
+                  postR._2,
+                ),
+              ))
+            )
             conditionContext.top._1 match {
               case InPrecondition() => Select(c, l, r)
-              case InPostcondition() => Select(Old(c, None)(PanicBlame("Old should always be valid in a postcondition")), l, r)
+              case InPostcondition() =>
+                Select(
+                  Old(c, None)(PanicBlame(
+                    "Old should always be valid in a postcondition"
+                  )),
+                  l,
+                  r,
+                )
             }
           }
         case Implies(left, right) =>
           val rMap = mutable.ArrayBuffer[(Expr[Pre], Expr[Post])]()
           val top = conditionContext.pop()
-          val l = try {
-            dispatch(left)
-          } finally {
-            conditionContext.push(top);
-          }
-          val r = conditionContext.having((conditionContext.top._1, rMap)) {
-            dispatch(right)
-          }
+          val l =
+            try { dispatch(left) }
+            finally { conditionContext.push(top); }
+          val r =
+            conditionContext.having((conditionContext.top._1, rMap)) {
+              dispatch(right)
+            }
           if (rMap.nonEmpty) {
             conditionContext.top._1 match {
               case InPrecondition() =>
-                rMap.foreach(postR => conditionContext.top._2.append((Implies(left, postR._1), Implies(l, postR._2))))
+                rMap.foreach(postR =>
+                  conditionContext.top._2
+                    .append((Implies(left, postR._1), Implies(l, postR._2)))
+                )
                 Implies(l, r)
               case InPostcondition() =>
                 // We use the values in conditionContext just for checking
                 // duplicates therefore we don't include the old here since
                 // otherwise it wouldn't match the precondition case
-                rMap.foreach(postR => conditionContext.top._2.append((Implies(left, postR._1), tt)))
-                Implies(Old(l, None)(PanicBlame("Old should always be valid in a postcondition")), r)
+                rMap.foreach(postR =>
+                  conditionContext.top._2.append((Implies(left, postR._1), tt))
+                )
+                Implies(
+                  Old(l, None)(PanicBlame(
+                    "Old should always be valid in a postcondition"
+                  )),
+                  r,
+                )
             }
-          } else {
-            Implies(l, r)
-          }
+          } else { Implies(l, r) }
         case Star(left, right) =>
           val top = conditionContext.pop()
           try {
             val lMap = mutable.ArrayBuffer[(Expr[Pre], Expr[Post])]()
             val rMap = mutable.ArrayBuffer[(Expr[Pre], Expr[Post])]()
-            val l = conditionContext.having((top._1, lMap)) {
-              dispatch(left)
-            }
-            val r = conditionContext.having((top._1, rMap)) {
-              dispatch(right)
-            }
+            val l = conditionContext.having((top._1, lMap)) { dispatch(left) }
+            val r = conditionContext.having((top._1, rMap)) { dispatch(right) }
             top._2.addAll(lMap)
             top._2.addAll(rMap)
             Star(l, r)
-          } finally {
-            conditionContext.push(top);
-          }
+          } finally { conditionContext.push(top); }
         case _ =>
           val top = conditionContext.pop()
-          try {
-            e.rewriteDefault()
-          } finally {
-            conditionContext.push(top);
-          }
+          try { e.rewriteDefault() }
+          finally { conditionContext.push(top); }
       }
     }
   }
diff --git a/src/rewrite/vct/rewrite/EncodeChar.scala b/src/rewrite/vct/rewrite/EncodeChar.scala
index 1c6cb2684c..0e9db941e5 100644
--- a/src/rewrite/vct/rewrite/EncodeChar.scala
+++ b/src/rewrite/vct/rewrite/EncodeChar.scala
@@ -9,14 +9,15 @@ case object EncodeChar extends RewriterBuilder {
 }
 
 case class EncodeChar[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = expr match {
-    case CharValue(data) =>
-      const(data)(expr.o)
-    case e => rewriteDefault(e)
-  }
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case CharValue(data) => const(data)(expr.o)
+      case e => rewriteDefault(e)
+    }
 
-  override def dispatch(t: Type[Pre]): Type[Post] = t match {
-    case TChar() => TInt[Post]()(t.o)
-    case t => rewriteDefault(t)
-  }
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    t match {
+      case TChar() => TInt[Post]()(t.o)
+      case t => rewriteDefault(t)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/EncodeCurrentThread.scala b/src/rewrite/vct/rewrite/EncodeCurrentThread.scala
index c4ff262c45..ade6107c58 100644
--- a/src/rewrite/vct/rewrite/EncodeCurrentThread.scala
+++ b/src/rewrite/vct/rewrite/EncodeCurrentThread.scala
@@ -10,27 +10,31 @@ import vct.result.VerificationError.UserError
 
 case object EncodeCurrentThread extends RewriterBuilder {
   override def key: String = "currentThread"
-  override def desc: String = "Translate \\current_thread into an explicit argument to all thread-local contexts."
+  override def desc: String =
+    "Translate \\current_thread into an explicit argument to all thread-local contexts."
 
   private val currentThreadIdOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("tid")),
-      LabelContext("\\current_thread"),
-    )
+    Seq(PreferredName(Seq("tid")), LabelContext("\\current_thread"))
   )
 
   abstract class MisplacedCurrentThreadReference extends UserError {
     override def code: String = "curThreadScope"
   }
 
-  case class MisplacedCurrentThreadConstant(node: CurrentThreadId[_]) extends MisplacedCurrentThreadReference {
+  case class MisplacedCurrentThreadConstant(node: CurrentThreadId[_])
+      extends MisplacedCurrentThreadReference {
     override def text: String =
-      node.o.messageInContext("This reference to \\current_thread is misplaced, since the surrounding declaration is not thread_local.")
+      node.o.messageInContext(
+        "This reference to \\current_thread is misplaced, since the surrounding declaration is not thread_local."
+      )
   }
 
-  case class MisplacedThreadLocalInvocation(node: Node[_]) extends MisplacedCurrentThreadReference {
+  case class MisplacedThreadLocalInvocation(node: Node[_])
+      extends MisplacedCurrentThreadReference {
     override def text: String =
-      node.o.messageInContext("This invocation refers to an applicable that is thread local, but the surrounding context is not thread local.")
+      node.o.messageInContext(
+        "This invocation refers to an applicable that is thread local, but the surrounding context is not thread local."
+      )
   }
 }
 
@@ -39,74 +43,86 @@ case class EncodeCurrentThread[Pre <: Generation]() extends Rewriter[Pre] {
 
   val currentThreadId: ScopedStack[Expr[Post]] = ScopedStack()
 
-  def wantsThreadLocal(app: Applicable[Pre]): Boolean = app match {
-    case predicate: AbstractPredicate[Pre] => predicate.threadLocal
-    case func: AbstractFunction[Pre] => func.threadLocal
+  def wantsThreadLocal(app: Applicable[Pre]): Boolean =
+    app match {
+      case predicate: AbstractPredicate[Pre] => predicate.threadLocal
+      case func: AbstractFunction[Pre] => func.threadLocal
 
-    // PB: although a pure method will become a function, it should really be possible to mark a pure method as thread
-    // local.
-    case m: AbstractMethod[Pre] => !m.pure
-    case m: LlvmFunctionDefinition[Pre] => !m.pure
+      // PB: although a pure method will become a function, it should really be possible to mark a pure method as thread
+      // local.
+      case m: AbstractMethod[Pre] => !m.pure
+      case m: LlvmFunctionDefinition[Pre] => !m.pure
 
-    case _: ADTFunction[Pre] => false
-    case _: ProverFunction[Pre] => false
-    case _: ModelProcess[Pre] => false
-    case _: ModelAction[Pre] => false
-  }
-
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case app: RunMethod[Pre] =>
-      implicit val o: Origin = app.o
-      classDeclarations.succeed(app, app.rewrite(body = app.body.map { body =>
-        val currentThreadVar = new Variable[Post](TInt())(currentThreadIdOrigin)
-        Scope(Seq(currentThreadVar), currentThreadId.having(currentThreadVar.get) { dispatch(body) })
-      }))
-    case app: Applicable[Pre] =>
-      if(wantsThreadLocal(app)) {
-        val currentThreadVar = new Variable[Post](TInt())(currentThreadIdOrigin)
-        currentThreadId.having(Local[Post](currentThreadVar.ref)(currentThreadIdOrigin)) {
-          allScopes.anySucceedOnly(app, allScopes.anyDeclare(app.rewrite(args = variables.collect {
-            variables.declare(currentThreadVar)
-            app.args.foreach(dispatch)
-          }._1)))
-        }
-      } else {
-        rewriteDefault(app)
-      }
-    case other => rewriteDefault(other)
-  }
+      case _: ADTFunction[Pre] => false
+      case _: ProverFunction[Pre] => false
+      case _: ModelProcess[Pre] => false
+      case _: ModelAction[Pre] => false
+    }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case node @ CurrentThreadId() =>
-      if(currentThreadId.isEmpty) {
-        throw MisplacedCurrentThreadConstant(node)
-      } else {
-        currentThreadId.top
-      }
-    case apply: Apply[Pre] =>
-      if(wantsThreadLocal(apply.ref.decl)) {
-        if(currentThreadId.isEmpty) {
-          throw MisplacedThreadLocalInvocation(apply)
-        } else {
-          apply.rewrite(args = currentThreadId.top +: apply.args.map(dispatch))
-        }
-      } else {
-        apply.rewrite()
-      }
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case app: RunMethod[Pre] =>
+        implicit val o: Origin = app.o
+        classDeclarations.succeed(
+          app,
+          app.rewrite(body = app.body.map { body =>
+            val currentThreadVar =
+              new Variable[Post](TInt())(currentThreadIdOrigin)
+            Scope(
+              Seq(currentThreadVar),
+              currentThreadId.having(currentThreadVar.get) { dispatch(body) },
+            )
+          }),
+        )
+      case app: Applicable[Pre] =>
+        if (wantsThreadLocal(app)) {
+          val currentThreadVar =
+            new Variable[Post](TInt())(currentThreadIdOrigin)
+          currentThreadId
+            .having(Local[Post](currentThreadVar.ref)(currentThreadIdOrigin)) {
+              allScopes.anySucceedOnly(
+                app,
+                allScopes.anyDeclare(app.rewrite(args =
+                  variables.collect {
+                    variables.declare(currentThreadVar)
+                    app.args.foreach(dispatch)
+                  }._1
+                )),
+              )
+            }
+        } else { rewriteDefault(app) }
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Rewritten[Pre]] = stat match {
-    case invoke : InvocationStatement[Pre] =>
-      if (wantsThreadLocal(invoke.ref.decl)) {
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case node @ CurrentThreadId() =>
         if (currentThreadId.isEmpty) {
-          throw MisplacedThreadLocalInvocation(invoke)
-        } else {
-          invoke.rewrite(args = currentThreadId.top +: invoke.args.map(dispatch))
-        }
-      } else {
-        invoke.rewrite()
-      }
-    case other => rewriteDefault(other)
-  }
+          throw MisplacedCurrentThreadConstant(node)
+        } else { currentThreadId.top }
+      case apply: Apply[Pre] =>
+        if (wantsThreadLocal(apply.ref.decl)) {
+          if (currentThreadId.isEmpty) {
+            throw MisplacedThreadLocalInvocation(apply)
+          } else {
+            apply
+              .rewrite(args = currentThreadId.top +: apply.args.map(dispatch))
+          }
+        } else { apply.rewrite() }
+      case other => rewriteDefault(other)
+    }
+
+  override def dispatch(stat: Statement[Pre]): Statement[Rewritten[Pre]] =
+    stat match {
+      case invoke: InvocationStatement[Pre] =>
+        if (wantsThreadLocal(invoke.ref.decl)) {
+          if (currentThreadId.isEmpty) {
+            throw MisplacedThreadLocalInvocation(invoke)
+          } else {
+            invoke
+              .rewrite(args = currentThreadId.top +: invoke.args.map(dispatch))
+          }
+        } else { invoke.rewrite() }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/EncodeExtract.scala b/src/rewrite/vct/rewrite/EncodeExtract.scala
index 899338320f..b3036e3518 100644
--- a/src/rewrite/vct/rewrite/EncodeExtract.scala
+++ b/src/rewrite/vct/rewrite/EncodeExtract.scala
@@ -2,7 +2,15 @@ package vct.col.rewrite
 import vct.col.ast._
 import vct.col.origin._
 import vct.col.ref.Ref
-import vct.col.rewrite.EncodeExtract.{ExtractMayNotJumpOut, ExtractMayNotReturn, ExtractedOnlyPost, FramedProofPostconditionFailed, FramedProofPreconditionFailed, LoopInvariantPreconditionFailed, WrongExtractNode}
+import vct.col.rewrite.EncodeExtract.{
+  ExtractMayNotJumpOut,
+  ExtractMayNotReturn,
+  ExtractedOnlyPost,
+  FramedProofPostconditionFailed,
+  FramedProofPreconditionFailed,
+  LoopInvariantPreconditionFailed,
+  WrongExtractNode,
+}
 import vct.col.util.AstBuildHelpers.contract
 import vct.col.util.Substitute
 import vct.result.Message
@@ -14,39 +22,50 @@ case object EncodeExtract extends RewriterBuilder {
 
   case class WrongExtractNode(node: Statement[_]) extends UserError {
     override def code: String = "wrongExtract"
-    override def text: String = node.o.messageInContext("This kind of node cannot be extracted into a separate method")
+    override def text: String =
+      node.o.messageInContext(
+        "This kind of node cannot be extracted into a separate method"
+      )
   }
 
-  case class ExtractedOnlyPost(blame: Blame[PostconditionFailed]) extends Blame[CallableFailure] {
-    override def blame(error: CallableFailure): Unit = error match {
-      case error: PostconditionFailed => blame.blame(error)
-      case error: TerminationMeasureFailed =>
-        PanicBlame("Extracted method cannot recurse by construction").blame(error)
-      case error: ContextEverywhereFailedInPost =>
-        PanicBlame("Extracted method has no context contract").blame(error)
-      case error: SignalsFailed =>
-        PanicBlame("Extracted method cannot throw?").blame(error)
-      case error: ExceptionNotInSignals =>
-        PanicBlame("Extracted method cannot throw?").blame(error)
-    }
+  case class ExtractedOnlyPost(blame: Blame[PostconditionFailed])
+      extends Blame[CallableFailure] {
+    override def blame(error: CallableFailure): Unit =
+      error match {
+        case error: PostconditionFailed => blame.blame(error)
+        case error: TerminationMeasureFailed =>
+          PanicBlame("Extracted method cannot recurse by construction")
+            .blame(error)
+        case error: ContextEverywhereFailedInPost =>
+          PanicBlame("Extracted method has no context contract").blame(error)
+        case error: SignalsFailed =>
+          PanicBlame("Extracted method cannot throw?").blame(error)
+        case error: ExceptionNotInSignals =>
+          PanicBlame("Extracted method cannot throw?").blame(error)
+      }
   }
 
-  case class LoopInvariantPreconditionFailed(invariant: LoopInvariant[_]) extends Blame[PreconditionFailed] {
+  case class LoopInvariantPreconditionFailed(invariant: LoopInvariant[_])
+      extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
-      invariant.blame.blame(LoopInvariantNotEstablished(error.failure, invariant))
+      invariant.blame
+        .blame(LoopInvariantNotEstablished(error.failure, invariant))
   }
 
-  case class FramedProofPreconditionFailed(framedProof: FramedProof[_]) extends Blame[PreconditionFailed] {
+  case class FramedProofPreconditionFailed(framedProof: FramedProof[_])
+      extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       framedProof.blame.blame(FramedProofPreFailed(error.failure, framedProof))
   }
 
-  case class FramedProofPostconditionFailed(framedProof: FramedProof[_]) extends Blame[PostconditionFailed] {
+  case class FramedProofPostconditionFailed(framedProof: FramedProof[_])
+      extends Blame[PostconditionFailed] {
     override def blame(error: PostconditionFailed): Unit =
       framedProof.blame.blame(FramedProofPostFailed(error.failure, framedProof))
   }
 
-  case class ExtractMayNotReturn(extract: Extract[_], ret: Return[_]) extends UserError {
+  case class ExtractMayNotReturn(extract: Extract[_], ret: Return[_])
+      extends UserError {
     override def code: String = "extractReturn"
     override def text: String =
       Message.messagesInContext(
@@ -55,7 +74,11 @@ case object EncodeExtract extends RewriterBuilder {
       )
   }
 
-  case class ExtractMayNotJumpOut(extract: Extract[_], jump: Statement[_], to: LabelDecl[_]) extends UserError {
+  case class ExtractMayNotJumpOut(
+      extract: Extract[_],
+      jump: Statement[_],
+      to: LabelDecl[_],
+  ) extends UserError {
     override def code: String = "extractGoto"
     override def text: String =
       Message.messagesInContext(
@@ -67,14 +90,17 @@ case object EncodeExtract extends RewriterBuilder {
 }
 
 case class EncodeExtract[Pre <: Generation]() extends Rewriter[Pre] {
-  def extracted(region: Extract[Pre],
-                preBlame: Blame[PreconditionFailed],
-                requires: Expr[Pre],
-                body: Statement[Pre],
-                ensures: Expr[Pre],
-                postBlame: Blame[PostconditionFailed])(implicit o: Origin): InvokeProcedure[Post] = {
-
-    body.collectFirst { case ret: Return[Pre] => ret }.foreach(ret => throw ExtractMayNotReturn(region, ret))
+  def extracted(
+      region: Extract[Pre],
+      preBlame: Blame[PreconditionFailed],
+      requires: Expr[Pre],
+      body: Statement[Pre],
+      ensures: Expr[Pre],
+      postBlame: Blame[PostconditionFailed],
+  )(implicit o: Origin): InvokeProcedure[Post] = {
+
+    body.collectFirst { case ret: Return[Pre] => ret }
+      .foreach(ret => throw ExtractMayNotReturn(region, ret))
 
     val jumps = body.collect {
       case s @ Goto(Ref(label)) => label -> s
@@ -84,8 +110,8 @@ case class EncodeExtract[Pre <: Generation]() extends Rewriter[Pre] {
 
     val targets = body.collect { case Label(decl, _) => decl }.toSet
 
-    for((label, s) <- jumps) {
-      if(!targets.contains(label)) {
+    for ((label, s) <- jumps) {
+      if (!targets.contains(label)) {
         throw ExtractMayNotJumpOut(region, s, label)
       }
     }
@@ -95,63 +121,75 @@ case class EncodeExtract[Pre <: Generation]() extends Rewriter[Pre] {
     val newEnsures = extract.extract(ensures)
     val newBody = extract.extract(body)
 
-    val extract.Data(typeMap, inMap, inForOutMap, outMap, inForOutAssign) = extract.finish()
+    val extract.Data(typeMap, inMap, inForOutMap, outMap, inForOutAssign) =
+      extract.finish()
 
-    val fixedRequires = Substitute[Pre](inForOutMap.keys.map {
-      case (in, out) => Local[Pre](out.ref) -> Local[Pre](in.ref)
+    val fixedRequires = Substitute[Pre](inForOutMap.keys.map { case (in, out) =>
+      Local[Pre](out.ref) -> Local[Pre](in.ref)
     }.toMap).dispatch(newRequires)
 
-    val proc = globalDeclarations.declare(new Procedure[Post](
-      returnType = TVoid(),
-      args = variables.dispatch(inMap.keys.toSeq ++ inForOutMap.keys.map(_._1).toSeq),
-      outArgs = variables.dispatch(outMap.keys.toSeq),
-      typeArgs = variables.dispatch(typeMap.keys.toSeq),
-      body = Some(Block(Seq(dispatch(inForOutAssign), dispatch(newBody)))),
-      contract = contract(
-        UnsafeDontCare.Satisfiability("It is acceptable that paths are not reachable in a program."),
-        requires = UnitAccountedPredicate(dispatch(fixedRequires)),
-        ensures = UnitAccountedPredicate(dispatch(newEnsures)),
-        decreases = None, // PB: sadly decreases + extract is therefore not working.
-      ),
-    )(ExtractedOnlyPost(postBlame)))
+    val proc = globalDeclarations.declare(
+      new Procedure[Post](
+        returnType = TVoid(),
+        args = variables
+          .dispatch(inMap.keys.toSeq ++ inForOutMap.keys.map(_._1).toSeq),
+        outArgs = variables.dispatch(outMap.keys.toSeq),
+        typeArgs = variables.dispatch(typeMap.keys.toSeq),
+        body = Some(Block(Seq(dispatch(inForOutAssign), dispatch(newBody)))),
+        contract = contract(
+          UnsafeDontCare.Satisfiability(
+            "It is acceptable that paths are not reachable in a program."
+          ),
+          requires = UnitAccountedPredicate(dispatch(fixedRequires)),
+          ensures = UnitAccountedPredicate(dispatch(newEnsures)),
+          decreases =
+            None, // PB: sadly decreases + extract is therefore not working.
+        ),
+      )(ExtractedOnlyPost(postBlame))
+    )
 
     InvokeProcedure[Post](
       proc.ref,
       args = (inMap.values ++ inForOutMap.values).map(dispatch).toSeq,
       outArgs = outMap.values.map(dispatch).toSeq,
       typeArgs = typeMap.values.map(dispatch).toSeq,
-      givenMap = Nil, yields = Nil,
+      givenMap = Nil,
+      yields = Nil,
     )(NoContext(preBlame))
   }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Rewritten[Pre]] = stat match {
-    case Extract(Label(decl, body)) =>
-      Label(labelDecls.dispatch(decl), dispatch(Extract(body)(stat.o)))(stat.o)
-
-    case extract@Extract(body) => body match {
-      case Loop(_, _, _, blame@LoopInvariant(invariant, _), _) =>
-        extracted(
-          extract,
-          LoopInvariantPreconditionFailed(blame),
-          invariant,
-          body,
-          invariant,
-          PanicBlame("Loop contract implies postcondition immediately"),
-        )(extract.o)
-
-      case proof@FramedProof(pre, body, post) =>
-        extracted(
-          extract,
-          FramedProofPreconditionFailed(proof),
-          pre,
-          body,
-          post,
-          FramedProofPostconditionFailed(proof),
-        )(extract.o)
-
-      case other => throw WrongExtractNode(other)
+  override def dispatch(stat: Statement[Pre]): Statement[Rewritten[Pre]] =
+    stat match {
+      case Extract(Label(decl, body)) =>
+        Label(labelDecls.dispatch(decl), dispatch(Extract(body)(stat.o)))(
+          stat.o
+        )
+
+      case extract @ Extract(body) =>
+        body match {
+          case Loop(_, _, _, blame @ LoopInvariant(invariant, _), _) =>
+            extracted(
+              extract,
+              LoopInvariantPreconditionFailed(blame),
+              invariant,
+              body,
+              invariant,
+              PanicBlame("Loop contract implies postcondition immediately"),
+            )(extract.o)
+
+          case proof @ FramedProof(pre, body, post) =>
+            extracted(
+              extract,
+              FramedProofPreconditionFailed(proof),
+              pre,
+              body,
+              post,
+              FramedProofPostconditionFailed(proof),
+            )(extract.o)
+
+          case other => throw WrongExtractNode(other)
+        }
+
+      case other => rewriteDefault(other)
     }
-
-    case other => rewriteDefault(other)
-  }
 }
diff --git a/src/rewrite/vct/rewrite/EncodeForPermWithValue.scala b/src/rewrite/vct/rewrite/EncodeForPermWithValue.scala
index a6b4e3639c..08dfb7ea9b 100644
--- a/src/rewrite/vct/rewrite/EncodeForPermWithValue.scala
+++ b/src/rewrite/vct/rewrite/EncodeForPermWithValue.scala
@@ -7,26 +7,39 @@ import vct.col.util.Substitute
 
 case object EncodeForPermWithValue extends RewriterBuilder {
   override def key: String = "encodeForPermWithValue"
-  override def desc: String = "Expand \\forperm_with_value over all declared fields"
+  override def desc: String =
+    "Expand \\forperm_with_value over all declared fields"
 }
 
 case class EncodeForPermWithValue[Pre <: Generation]() extends Rewriter[Pre] {
   val currentFields: ScopedStack[Seq[SilverField[Pre]]] = ScopedStack()
 
   override def dispatch(program: Program[Pre]): Program[Post] =
-    currentFields.having(program.declarations.collect { case field: SilverField[Pre] => field }) {
-      rewriteDefault(program)
-    }
+    currentFields.having(program.declarations.collect {
+      case field: SilverField[Pre] => field
+    }) { rewriteDefault(program) }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case ForPermWithValue(binding, body) =>
-      foldAnd(currentFields.top.map { field =>
-        implicit val o: Origin = e.o
-        val obj = new Variable[Pre](TRef())(Origin(Seq(LabelContext("\\forperm_with_value"))).where(name = "obj"))
-        val newBody = Substitute[Pre](Map(binding.get -> SilverDeref[Pre](obj.get, field.ref)(PanicBlame("schematic")))).dispatch(body)
-        dispatch(ForPerm(Seq(obj), SilverFieldLocation[Pre](obj.get, field.ref), newBody))
-      })(e.o)
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case ForPermWithValue(binding, body) =>
+        foldAnd(currentFields.top.map { field =>
+          implicit val o: Origin = e.o
+          val obj =
+            new Variable[Pre](TRef())(
+              Origin(Seq(LabelContext("\\forperm_with_value")))
+                .where(name = "obj")
+            )
+          val newBody = Substitute[Pre](Map(
+            binding.get ->
+              SilverDeref[Pre](obj.get, field.ref)(PanicBlame("schematic"))
+          )).dispatch(body)
+          dispatch(ForPerm(
+            Seq(obj),
+            SilverFieldLocation[Pre](obj.get, field.ref),
+            newBody,
+          ))
+        })(e.o)
 
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/EncodeForkJoin.scala b/src/rewrite/vct/rewrite/EncodeForkJoin.scala
index 6b17994665..961b4e8b2e 100644
--- a/src/rewrite/vct/rewrite/EncodeForkJoin.scala
+++ b/src/rewrite/vct/rewrite/EncodeForkJoin.scala
@@ -14,139 +14,259 @@ object EncodeForkJoin extends RewriterBuilder {
   case class RunnableMethodMissingError(expr: Expr[_]) extends UserError {
     override def code: String = "runnableMethodMissing"
 
-    override def text: String = expr.o.messageInContext("This class is missing a run method.")
+    override def text: String =
+      expr.o.messageInContext("This class is missing a run method.")
   }
 
   override def key: String = "forkJoin"
-  override def desc: String = "Encode fork and join statements with the contract of the run method it refers to."
+  override def desc: String =
+    "Encode fork and join statements with the contract of the run method it refers to."
 
   private def IdleToken(cls: Class[_]): Origin = cls.o.where(prefix = "idle")
 
-  private def RunningToken(cls: Class[_]): Origin = cls.o.where(prefix = "running")
+  private def RunningToken(cls: Class[_]): Origin =
+    cls.o.where(prefix = "running")
 
   private def ForkMethod(cls: Class[_]): Origin = cls.o.where(prefix = "fork")
 
   private def JoinMethod(cls: Class[_]): Origin = cls.o.where(prefix = "join")
 
-  case class ForkInstanceInvocation(fork: Fork[_]) extends Blame[InstanceInvocationFailure] {
-    override def blame(error: InstanceInvocationFailure): Unit = error match {
-      case InstanceNull(_) => fork.blame.blame(ForkNull(fork))
-      case PreconditionFailed(FailLeft +: _, _, _) => fork.blame.blame(RunnableNotIdle(fork))
-      case PreconditionFailed(FailRight +: _, failure, _) => fork.blame.blame(RunnablePreconditionNotEstablished(fork, failure))
-      case PreconditionFailed(_, _, _) => throw BlamePathError
-      case ContextEverywhereFailedInPre(_, _) => PanicBlame("fork method does not have c_e").blame(error)
-    }
+  case class ForkInstanceInvocation(fork: Fork[_])
+      extends Blame[InstanceInvocationFailure] {
+    override def blame(error: InstanceInvocationFailure): Unit =
+      error match {
+        case InstanceNull(_) => fork.blame.blame(ForkNull(fork))
+        case PreconditionFailed(FailLeft +: _, _, _) =>
+          fork.blame.blame(RunnableNotIdle(fork))
+        case PreconditionFailed(FailRight +: _, failure, _) =>
+          fork.blame.blame(RunnablePreconditionNotEstablished(fork, failure))
+        case PreconditionFailed(_, _, _) => throw BlamePathError
+        case ContextEverywhereFailedInPre(_, _) =>
+          PanicBlame("fork method does not have c_e").blame(error)
+      }
   }
 
-  case class JoinInstanceInvocation(join: Join[_]) extends Blame[InstanceInvocationFailure] {
-    override def blame(error: InstanceInvocationFailure): Unit = error match {
-      case InstanceNull(_) => join.blame.blame(JoinNull(join))
-      case PreconditionFailed(_, _, _) => join.blame.blame(RunnableNotRunning(join))
-      case ContextEverywhereFailedInPre(_, _) => PanicBlame("join method does not have c_e").blame(error)
-    }
+  case class JoinInstanceInvocation(join: Join[_])
+      extends Blame[InstanceInvocationFailure] {
+    override def blame(error: InstanceInvocationFailure): Unit =
+      error match {
+        case InstanceNull(_) => join.blame.blame(JoinNull(join))
+        case PreconditionFailed(_, _, _) =>
+          join.blame.blame(RunnableNotRunning(join))
+        case ContextEverywhereFailedInPre(_, _) =>
+          PanicBlame("join method does not have c_e").blame(error)
+      }
   }
 }
 
 case class EncodeForkJoin[Pre <: Generation]() extends Rewriter[Pre] {
   import EncodeForkJoin._
 
-  val idleToken: SuccessionMap[Class[Pre], InstancePredicate[Post]] = SuccessionMap()
-  val runningToken: SuccessionMap[Class[Pre], InstancePredicate[Post]] = SuccessionMap()
+  val idleToken: SuccessionMap[Class[Pre], InstancePredicate[Post]] =
+    SuccessionMap()
+  val runningToken: SuccessionMap[Class[Pre], InstancePredicate[Post]] =
+    SuccessionMap()
 
-  val forkMethod: SuccessionMap[Class[Pre], InstanceMethod[Post]] = SuccessionMap()
-  val joinMethod: SuccessionMap[Class[Pre], InstanceMethod[Post]] = SuccessionMap()
+  val forkMethod: SuccessionMap[Class[Pre], InstanceMethod[Post]] =
+    SuccessionMap()
+  val joinMethod: SuccessionMap[Class[Pre], InstanceMethod[Post]] =
+    SuccessionMap()
 
   val currentClass: ScopedStack[Class[Pre]] = ScopedStack()
 
-  override def dispatch(stat: Statement[Pre]): Statement[Rewritten[Pre]] = stat match {
-    case fork @ Fork(obj) =>
-      implicit val o: Origin = stat.o
-      val cls = getRunnableClass(obj)
-      InvokeMethod[Post](dispatch(obj), forkMethod.ref(cls), Nil, Nil, Nil, Nil, Nil)(ForkInstanceInvocation(fork))
-    case join @ Join(obj) =>
-      implicit val o: Origin = stat.o
-      val cls = getRunnableClass(obj)
-      InvokeMethod[Post](dispatch(obj), joinMethod.ref(cls), Nil, Nil, Nil, Nil, Nil)(JoinInstanceInvocation(join))
-
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(stat: Statement[Pre]): Statement[Rewritten[Pre]] =
+    stat match {
+      case fork @ Fork(obj) =>
+        implicit val o: Origin = stat.o
+        val cls = getRunnableClass(obj)
+        InvokeMethod[Post](
+          dispatch(obj),
+          forkMethod.ref(cls),
+          Nil,
+          Nil,
+          Nil,
+          Nil,
+          Nil,
+        )(ForkInstanceInvocation(fork))
+      case join @ Join(obj) =>
+        implicit val o: Origin = stat.o
+        val cls = getRunnableClass(obj)
+        InvokeMethod[Post](
+          dispatch(obj),
+          joinMethod.ref(cls),
+          Nil,
+          Nil,
+          Nil,
+          Nil,
+          Nil,
+        )(JoinInstanceInvocation(join))
 
-  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] = e match {
-    case vct.col.ast.IdleToken(obj) =>
-      implicit val o: Origin = e.o
-      val cls = getRunnableClass(obj)
-      InstancePredicateApply[Post](dispatch(obj), idleToken.ref(cls), Nil, WritePerm())
-    case vct.col.ast.JoinToken(obj) =>
-      implicit val o: Origin = e.o
-      val cls = getRunnableClass(obj)
-      InstancePredicateApply[Post](dispatch(obj), runningToken.ref(cls), Nil, WritePerm())
-
-    case NewObject(Ref(cls)) =>
-      implicit val o: Origin = e.o
-      cls.decls.collectFirst {
-        case run: RunMethod[Pre] => run
-      } match {
-        case Some(_) =>
-          val obj = new Variable[Post](TClass(succ(cls), Seq()))
-          ScopedExpr(Seq(obj), With(Block(Seq(
-            assignLocal(obj.get, NewObject(succ(cls))),
-            Inhale(InstancePredicateApply[Post](obj.get, idleToken.ref(cls), Nil, WritePerm()))
-          )), obj.get))
-        case None => NewObject(succ(cls))
-      }
+      case other => rewriteDefault(other)
+    }
 
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] =
+    e match {
+      case vct.col.ast.IdleToken(obj) =>
+        implicit val o: Origin = e.o
+        val cls = getRunnableClass(obj)
+        InstancePredicateApply[Post](
+          dispatch(obj),
+          idleToken.ref(cls),
+          Nil,
+          WritePerm(),
+        )
+      case vct.col.ast.JoinToken(obj) =>
+        implicit val o: Origin = e.o
+        val cls = getRunnableClass(obj)
+        InstancePredicateApply[Post](
+          dispatch(obj),
+          runningToken.ref(cls),
+          Nil,
+          WritePerm(),
+        )
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case cls: Class[Pre] => currentClass.having(cls) { rewriteDefault(cls) }
-    case cons: Constructor[Pre] if currentClass.top.collectFirst { case _: RunMethod[Pre] => () }.nonEmpty =>
-      implicit val o: Origin = cons.o
-      cons.rewrite(body = cons.body.map(body => Block(Seq(
-        Inhale(InstancePredicateApply[Post](ThisObject(succ(cons.cls.decl)), idleToken.ref(cons.cls.decl), Nil, WritePerm())),
-        dispatch(body),
-      )))).succeed(cons)
-    case m: RunMethod[Pre] =>
-      implicit val o: Origin = m.o
-      val cls = currentClass.top
-      idleToken(cls) = classDeclarations.declare(new InstancePredicate(Nil, None)(IdleToken(cls)))
-      runningToken(cls) = classDeclarations.declare(new InstancePredicate(Nil, None)(RunningToken(cls)))
-      forkMethod(cls) = classDeclarations.declare(new InstanceMethod(TVoid(), Nil, Nil, Nil, None, contract(
-        blame = UnsafeDontCare.Satisfiability("satisfiability is checked by verifying the run method"),
-        requires = SplitAccountedPredicate(
-          UnitAccountedPredicate(InstancePredicateApply[Post](ThisObject(succ(cls)), idleToken.ref(cls), Nil, WritePerm())),
-          dispatch(m.contract.requires),
-        ),
-        ensures = UnitAccountedPredicate(InstancePredicateApply[Post](ThisObject(succ(cls)), runningToken.ref(cls), Nil, WritePerm()))
-      ))(AbstractApplicable)(ForkMethod(cls)))
-      joinMethod(cls) = classDeclarations.declare(new InstanceMethod(TVoid(), Nil, Nil, Nil, None, contract(
-        blame = PanicBlame("one predicate resource is obviously satisfiable"),
-        requires = UnitAccountedPredicate(InstancePredicateApply[Post](ThisObject(succ(cls)), runningToken.ref(cls), Nil, WritePerm())),
-        ensures = SplitAccountedPredicate(
-          UnitAccountedPredicate(InstancePredicateApply[Post](ThisObject(succ(cls)), idleToken.ref(cls), Nil, WritePerm())),
-          dispatch(m.contract.ensures),
-        ),
-      ))(AbstractApplicable)(JoinMethod(cls)))
-
-      classDeclarations.declare(new InstanceMethod[Post](TVoid(), Nil, Nil, Nil, m.body.map(dispatch), dispatch(m.contract))(m.blame))
-    case other => rewriteDefault(other)
-  }
+      case NewObject(Ref(cls)) =>
+        implicit val o: Origin = e.o
+        cls.decls.collectFirst { case run: RunMethod[Pre] => run } match {
+          case Some(_) =>
+            val obj = new Variable[Post](TClass(succ(cls), Seq()))
+            ScopedExpr(
+              Seq(obj),
+              With(
+                Block(Seq(
+                  assignLocal(obj.get, NewObject(succ(cls))),
+                  Inhale(InstancePredicateApply[Post](
+                    obj.get,
+                    idleToken.ref(cls),
+                    Nil,
+                    WritePerm(),
+                  )),
+                )),
+                obj.get,
+              ),
+            )
+          case None => NewObject(succ(cls))
+        }
+
+      case other => rewriteDefault(other)
+    }
+
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case cls: Class[Pre] => currentClass.having(cls) { rewriteDefault(cls) }
+      case cons: Constructor[Pre] if currentClass.top.collectFirst {
+            case _: RunMethod[Pre] => ()
+          }.nonEmpty =>
+        implicit val o: Origin = cons.o
+        cons.rewrite(body =
+          cons.body.map(body =>
+            Block(Seq(
+              Inhale(InstancePredicateApply[Post](
+                ThisObject(succ(cons.cls.decl)),
+                idleToken.ref(cons.cls.decl),
+                Nil,
+                WritePerm(),
+              )),
+              dispatch(body),
+            ))
+          )
+        ).succeed(cons)
+      case m: RunMethod[Pre] =>
+        implicit val o: Origin = m.o
+        val cls = currentClass.top
+        idleToken(cls) = classDeclarations
+          .declare(new InstancePredicate(Nil, None)(IdleToken(cls)))
+        runningToken(cls) = classDeclarations
+          .declare(new InstancePredicate(Nil, None)(RunningToken(cls)))
+        forkMethod(cls) = classDeclarations.declare(
+          new InstanceMethod(
+            TVoid(),
+            Nil,
+            Nil,
+            Nil,
+            None,
+            contract(
+              blame = UnsafeDontCare.Satisfiability(
+                "satisfiability is checked by verifying the run method"
+              ),
+              requires = SplitAccountedPredicate(
+                UnitAccountedPredicate(InstancePredicateApply[Post](
+                  ThisObject(succ(cls)),
+                  idleToken.ref(cls),
+                  Nil,
+                  WritePerm(),
+                )),
+                dispatch(m.contract.requires),
+              ),
+              ensures = UnitAccountedPredicate(InstancePredicateApply[Post](
+                ThisObject(succ(cls)),
+                runningToken.ref(cls),
+                Nil,
+                WritePerm(),
+              )),
+            ),
+          )(AbstractApplicable)(ForkMethod(cls))
+        )
+        joinMethod(cls) = classDeclarations.declare(
+          new InstanceMethod(
+            TVoid(),
+            Nil,
+            Nil,
+            Nil,
+            None,
+            contract(
+              blame = PanicBlame(
+                "one predicate resource is obviously satisfiable"
+              ),
+              requires = UnitAccountedPredicate(InstancePredicateApply[Post](
+                ThisObject(succ(cls)),
+                runningToken.ref(cls),
+                Nil,
+                WritePerm(),
+              )),
+              ensures = SplitAccountedPredicate(
+                UnitAccountedPredicate(InstancePredicateApply[Post](
+                  ThisObject(succ(cls)),
+                  idleToken.ref(cls),
+                  Nil,
+                  WritePerm(),
+                )),
+                dispatch(m.contract.ensures),
+              ),
+            ),
+          )(AbstractApplicable)(JoinMethod(cls))
+        )
 
-  /**
-    * Performs a check on whether a class has a runnable method to perform an expression that requires it.
-    *   Throws an exception if there is no runnable method.
-    * @param expr - the expression that requires the class to have a runnable method
-    * @return The class of a given object
-    * @throws \RunnableMethodMissingError if the class is detected not to have a Runnable method.
+        classDeclarations.declare(
+          new InstanceMethod[Post](
+            TVoid(),
+            Nil,
+            Nil,
+            Nil,
+            m.body.map(dispatch),
+            dispatch(m.contract),
+          )(m.blame)
+        )
+      case other => rewriteDefault(other)
+    }
+
+  /** Performs a check on whether a class has a runnable method to perform an
+    * expression that requires it. Throws an exception if there is no runnable
+    * method.
+    * @param expr
+    *   \- the expression that requires the class to have a runnable method
+    * @return
+    *   The class of a given object
+    * @throws \RunnableMethodMissingError
+    *   if the class is detected not to have a Runnable method.
     */
   def getRunnableClass(expr: Expr[Pre]): Class[Pre] = {
     val classType = expr.t.asInstanceOf[TClass[Pre]]
-    val check = classType.cls.decl.declarations.collectFirst {
-      case _: RunMethod[Pre] => () //return unit
-    }.nonEmpty
-    if (!check) {
-      throw RunnableMethodMissingError(expr)
-    }
+    val check =
+      classType.cls.decl.declarations.collectFirst { case _: RunMethod[Pre] =>
+        () // return unit
+      }.nonEmpty
+    if (!check) { throw RunnableMethodMissingError(expr) }
     classType.cls.decl
   }
 
diff --git a/src/rewrite/vct/rewrite/EncodeIntrinsicLock.scala b/src/rewrite/vct/rewrite/EncodeIntrinsicLock.scala
index 9f526369a0..c5308b7b26 100644
--- a/src/rewrite/vct/rewrite/EncodeIntrinsicLock.scala
+++ b/src/rewrite/vct/rewrite/EncodeIntrinsicLock.scala
@@ -12,19 +12,23 @@ import scala.collection.mutable
 
 case object EncodeIntrinsicLock extends RewriterBuilder {
   override def key: String = "intrinsicLock"
-  override def desc: String = "Encode the intrinsic lock of objects in Java/PVL."
+  override def desc: String =
+    "Encode the intrinsic lock of objects in Java/PVL."
 
-  case class UnlockInvariantFoldFailed(unlock: Unlock[_]) extends Blame[FoldFailed] {
+  case class UnlockInvariantFoldFailed(unlock: Unlock[_])
+      extends Blame[FoldFailed] {
     override def blame(error: FoldFailed): Unit =
       unlock.blame.blame(UnlockInvariantFailed(unlock, error.failure))
   }
 
-  case class UnlockHeldExhaleFailed(unlock: Unlock[_]) extends Blame[ExhaleFailed] {
+  case class UnlockHeldExhaleFailed(unlock: Unlock[_])
+      extends Blame[ExhaleFailed] {
     override def blame(error: ExhaleFailed): Unit =
       unlock.blame.blame(LockTokenNotHeld(unlock, error.failure))
   }
 
-  case class CommitFailedFoldFailed(commit: Commit[_]) extends Blame[FoldFailed] {
+  case class CommitFailedFoldFailed(commit: Commit[_])
+      extends Blame[FoldFailed] {
     override def blame(error: FoldFailed): Unit =
       commit.blame.blame(CommitFailed(commit, error.failure))
   }
@@ -34,27 +38,35 @@ case object EncodeIntrinsicLock extends RewriterBuilder {
       not.blame.blame(NotifyFailed(not, error.failure))
   }
 
-  private def LockInvariantOrigin(cls: Class[_]): Origin = cls.o.where(prefix = "lockInv")
+  private def LockInvariantOrigin(cls: Class[_]): Origin =
+    cls.o.where(prefix = "lockInv")
 
-  private def HeldTokenOrigin(cls: Class[_]): Origin = cls.o.where(prefix = "lockHeld")
+  private def HeldTokenOrigin(cls: Class[_]): Origin =
+    cls.o.where(prefix = "lockHeld")
 
-  private def CommittedOrigin(cls: Class[_]): Origin = cls.o.where(prefix = "lockCommitted")
+  private def CommittedOrigin(cls: Class[_]): Origin =
+    cls.o.where(prefix = "lockCommitted")
 
-  case class LockLockObjectNull(lock: Lock[_]) extends Blame[InstanceInvocationFailure] {
-    override def blame(error: InstanceInvocationFailure): Unit = error match {
-      case InstanceNull(_) => lock.blame.blame(LockObjectNull(lock))
-      case failure: InvocationFailure => PanicBlame("elp").blame(failure)
-    }
+  case class LockLockObjectNull(lock: Lock[_])
+      extends Blame[InstanceInvocationFailure] {
+    override def blame(error: InstanceInvocationFailure): Unit =
+      error match {
+        case InstanceNull(_) => lock.blame.blame(LockObjectNull(lock))
+        case failure: InvocationFailure => PanicBlame("elp").blame(failure)
+      }
   }
 
-  case class CommittedLockObjectNull(commit: Committed[_]) extends Blame[InstanceInvocationFailure] {
-    override def blame(error: InstanceInvocationFailure): Unit = error match {
-      case InstanceNull(_) => commit.blame.blame(LockObjectNull(commit))
-      case failure: InvocationFailure => PanicBlame("elp").blame(failure)
-    }
+  case class CommittedLockObjectNull(commit: Committed[_])
+      extends Blame[InstanceInvocationFailure] {
+    override def blame(error: InstanceInvocationFailure): Unit =
+      error match {
+        case InstanceNull(_) => commit.blame.blame(LockObjectNull(commit))
+        case failure: InvocationFailure => PanicBlame("elp").blame(failure)
+      }
   }
 
-  case class NotCommittedAssertFailed(lock: Lock[_]) extends Blame[AssertFailed] {
+  case class NotCommittedAssertFailed(lock: Lock[_])
+      extends Blame[AssertFailed] {
     override def blame(error: AssertFailed): Unit =
       lock.blame.blame(LockNotCommitted(lock))
   }
@@ -63,16 +75,23 @@ case object EncodeIntrinsicLock extends RewriterBuilder {
 case class EncodeIntrinsicLock[Pre <: Generation]() extends Rewriter[Pre] {
   import EncodeIntrinsicLock._
 
-  val invariant: SuccessionMap[Class[Pre], InstancePredicate[Post]] = SuccessionMap()
+  val invariant: SuccessionMap[Class[Pre], InstancePredicate[Post]] =
+    SuccessionMap()
   val held: SuccessionMap[Class[Pre], InstancePredicate[Post]] = SuccessionMap()
-  val committed: SuccessionMap[Class[Pre], InstanceFunction[Post]] = SuccessionMap()
+  val committed: SuccessionMap[Class[Pre], InstanceFunction[Post]] =
+    SuccessionMap()
   val needsHeld: mutable.Set[Class[Pre]] = mutable.Set()
   val needsCommitted: mutable.Set[Class[Pre]] = mutable.Set()
 
-  def getClass(obj: Expr[Pre]): Class[Pre] = obj.t match {
-    case TClass(Ref(cls), _) => cls
-    case _ => throw UnreachableAfterTypeCheck("This argument is not a class type.", obj)
-  }
+  def getClass(obj: Expr[Pre]): Class[Pre] =
+    obj.t match {
+      case TClass(Ref(cls), _) => cls
+      case _ =>
+        throw UnreachableAfterTypeCheck(
+          "This argument is not a class type.",
+          obj,
+        )
+    }
 
   def needHeld(e: Expr[Pre]): Unit = {
     needsHeld += getClass(e)
@@ -98,39 +117,87 @@ case class EncodeIntrinsicLock[Pre <: Generation]() extends Rewriter[Pre] {
   def needsInvariant(cls: Class[Pre]): Boolean =
     cls.intrinsicLockInvariant != tt[Pre]
 
-  def needsInvariant(e: Expr[Pre]): Boolean =
-    needsInvariant(getClass(e))
-
-  def getInvariant(obj: Expr[Pre])(implicit o: Origin): InstancePredicateApply[Post] =
-    InstancePredicateApply(dispatch(obj), invariant.ref(getClass(obj)), Nil, WritePerm())
-
-  def getHeld(obj: Expr[Pre])(implicit o: Origin): InstancePredicateApply[Post] =
-    InstancePredicateApply(dispatch(obj), held.ref(getClass(obj)), Nil, WritePerm())
-
-  def getCommitted(obj: Expr[Pre])(blame: Blame[InstanceInvocationFailure])(implicit o: Origin): InstanceFunctionInvocation[Post] =
-    InstanceFunctionInvocation[Post](dispatch(obj), committed.ref(getClass(obj)), Nil, Nil, Nil, Nil)(blame)
-
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case cls: Class[Pre] =>
-      globalDeclarations.succeed(cls, cls.rewrite(decls = classDeclarations.collect {
-        if(needsInvariant(cls)) {
-          invariant(cls) = classDeclarations.declare(
-            new InstancePredicate(Nil, Some(dispatch(cls.intrinsicLockInvariant)))(LockInvariantOrigin(cls)))
-        }
-
-        if(needsHeld.contains(cls)) {
-          held(cls) = classDeclarations.declare(new InstancePredicate(Nil, None)(HeldTokenOrigin(cls)))
-        }
-
-        if(needsCommitted.contains(cls)) {
-          implicit val o: Origin = CommittedOrigin(cls)
-          committed(cls) = classDeclarations.declare(new InstanceFunction(TBool(), Nil, Nil, None, contract(PanicBlame("empty contract"), decreases = Some(DecreasesClauseAssume[Post]())), false)(AbstractApplicable))
-        }
-
-        cls.decls.foreach(dispatch)
-      }._1, intrinsicLockInvariant = tt))
-    case other => rewriteDefault(other)
-  }
+  def needsInvariant(e: Expr[Pre]): Boolean = needsInvariant(getClass(e))
+
+  def getInvariant(
+      obj: Expr[Pre]
+  )(implicit o: Origin): InstancePredicateApply[Post] =
+    InstancePredicateApply(
+      dispatch(obj),
+      invariant.ref(getClass(obj)),
+      Nil,
+      WritePerm(),
+    )
+
+  def getHeld(
+      obj: Expr[Pre]
+  )(implicit o: Origin): InstancePredicateApply[Post] =
+    InstancePredicateApply(
+      dispatch(obj),
+      held.ref(getClass(obj)),
+      Nil,
+      WritePerm(),
+    )
+
+  def getCommitted(obj: Expr[Pre])(
+      blame: Blame[InstanceInvocationFailure]
+  )(implicit o: Origin): InstanceFunctionInvocation[Post] =
+    InstanceFunctionInvocation[Post](
+      dispatch(obj),
+      committed.ref(getClass(obj)),
+      Nil,
+      Nil,
+      Nil,
+      Nil,
+    )(blame)
+
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case cls: Class[Pre] =>
+        globalDeclarations.succeed(
+          cls,
+          cls.rewrite(
+            decls =
+              classDeclarations.collect {
+                if (needsInvariant(cls)) {
+                  invariant(cls) = classDeclarations.declare(
+                    new InstancePredicate(
+                      Nil,
+                      Some(dispatch(cls.intrinsicLockInvariant)),
+                    )(LockInvariantOrigin(cls))
+                  )
+                }
+
+                if (needsHeld.contains(cls)) {
+                  held(cls) = classDeclarations.declare(
+                    new InstancePredicate(Nil, None)(HeldTokenOrigin(cls))
+                  )
+                }
+
+                if (needsCommitted.contains(cls)) {
+                  implicit val o: Origin = CommittedOrigin(cls)
+                  committed(cls) = classDeclarations.declare(
+                    new InstanceFunction(
+                      TBool(),
+                      Nil,
+                      Nil,
+                      None,
+                      contract(
+                        PanicBlame("empty contract"),
+                        decreases = Some(DecreasesClauseAssume[Post]()),
+                      ),
+                      false,
+                    )(AbstractApplicable)
+                  )
+                }
+
+                cls.decls.foreach(dispatch)
+              }._1,
+            intrinsicLockInvariant = tt,
+          ),
+        )
+      case other => rewriteDefault(other)
+    }
 
   override def dispatch(e: Expr[Pre]): Expr[Post] = {
     implicit val o: Origin = e.o
@@ -152,45 +219,64 @@ case class EncodeIntrinsicLock[Pre <: Generation]() extends Rewriter[Pre] {
         )
 
       case lock @ Lock(obj) =>
-        if(needsInvariant(obj))
+        if (needsInvariant(obj))
           Block(Seq(
-            Assert(getCommitted(obj)(LockLockObjectNull(lock)))(NotCommittedAssertFailed(lock)),
+            Assert(getCommitted(obj)(LockLockObjectNull(lock)))(
+              NotCommittedAssertFailed(lock)
+            ),
             Inhale(getInvariant(obj)),
-            Unfold(getInvariant(obj))(PanicBlame("Unfolding a predicate immediately after inhaling it should never fail.")),
+            Unfold(getInvariant(obj))(PanicBlame(
+              "Unfolding a predicate immediately after inhaling it should never fail."
+            )),
             Inhale(getHeld(obj)),
           ))
         else
           Block(Seq(
-            Assert(getCommitted(obj)(LockLockObjectNull(lock)))(NotCommittedAssertFailed(lock)),
+            Assert(getCommitted(obj)(LockLockObjectNull(lock)))(
+              NotCommittedAssertFailed(lock)
+            ),
             Inhale(getHeld(obj)),
           ))
 
       case unlock @ Unlock(obj) =>
-        if(needsInvariant(obj))
+        if (needsInvariant(obj))
           Block(Seq(
             Fold(getInvariant(obj))(UnlockInvariantFoldFailed(unlock)),
-            Exhale(getInvariant(obj))(PanicBlame("Exhaling a predicate immediately after folding it should never fail.")),
+            Exhale(getInvariant(obj))(PanicBlame(
+              "Exhaling a predicate immediately after folding it should never fail."
+            )),
             Exhale(getHeld(obj))(UnlockHeldExhaleFailed(unlock)),
-            Assume(getCommitted(obj)(PanicBlame("Exhaling held predicate should imply != null"))),
+            Assume(getCommitted(obj)(PanicBlame(
+              "Exhaling held predicate should imply != null"
+            ))),
           ))
         else
           Block(Seq(
             Exhale(getHeld(obj))(UnlockHeldExhaleFailed(unlock)),
-            Assume(getCommitted(obj)(PanicBlame("Exhaling held predicate should imply != null"))),
+            Assume(getCommitted(obj)(PanicBlame(
+              "Exhaling held predicate should imply != null"
+            ))),
           ))
 
       case wait @ Wait(obj) =>
-        dispatch(Block(Seq(Unlock(obj)(wait.blame), Lock(obj)(PanicBlame("Lock cannot fail after holding the lock")))))
+        dispatch(Block(Seq(
+          Unlock(obj)(wait.blame),
+          Lock(obj)(PanicBlame("Lock cannot fail after holding the lock")),
+        )))
 
       case notify @ Notify(obj) =>
         Assert(getHeld(obj))(NotifyAssertFailed(notify))
 
       case commit @ Commit(obj) =>
-        if(needsInvariant(obj))
+        if (needsInvariant(obj))
           Block(Seq(
             Fold(getInvariant(obj))(CommitFailedFoldFailed(commit)),
-            Exhale(getInvariant(obj))(PanicBlame("Exhaling a predicate immediately after folding it should never fail.")),
-            Assume(getCommitted(obj)(PanicBlame("Exhaling invariant predicate should imply != null"))),
+            Exhale(getInvariant(obj))(PanicBlame(
+              "Exhaling a predicate immediately after folding it should never fail."
+            )),
+            Assume(getCommitted(obj)(PanicBlame(
+              "Exhaling invariant predicate should imply != null"
+            ))),
           ))
         else
           Assume(getCommitted(obj)(PanicBlame("?")))
diff --git a/src/rewrite/vct/rewrite/EncodeNdIndex.scala b/src/rewrite/vct/rewrite/EncodeNdIndex.scala
index 30c707b087..fe26bd46d6 100644
--- a/src/rewrite/vct/rewrite/EncodeNdIndex.scala
+++ b/src/rewrite/vct/rewrite/EncodeNdIndex.scala
@@ -9,17 +9,14 @@ import scala.collection.mutable
 
 case object EncodeNdIndex extends RewriterBuilder {
   override def key: String = "ndIndex"
-  override def desc: String = "Encode the helper for multi-dimensional index expressions (like i*N+j < N*M)"
+  override def desc: String =
+    "Encode the helper for multi-dimensional index expressions (like i*N+j < N*M)"
 }
 
 case class EncodeNdIndex[Pre <: Generation]() extends Rewriter[Pre] {
   class IndexAdt(dim: Int) {
-    private def IndexAdtOrigin(preferredName: String): Origin = Origin(
-      Seq(
-        PreferredName(Seq(preferredName)),
-        LabelContext("index adt"),
-      )
-    )
+    private def IndexAdtOrigin(preferredName: String): Origin =
+      Origin(Seq(PreferredName(Seq(preferredName)), LabelContext("index adt")))
 
     implicit val o: Origin = IndexAdtOrigin("i")
 
@@ -27,140 +24,266 @@ case class EncodeNdIndex[Pre <: Generation]() extends Rewriter[Pre] {
     val lengthType = TAxiomatic[Post](lengthAdtRef, Nil)
     val lengthTypeArg = Some((lengthAdtRef, Nil))
 
-    val mkLength = new ADTFunction[Post](Seq.fill(dim)(new Variable(TInt())), lengthType)(IndexAdtOrigin(s"length${dim}"))
-    val mkLengthInvs = Seq.fill(dim)(new ADTFunction[Post](Seq(new Variable(lengthType)(IndexAdtOrigin("len"))), TInt())(IndexAdtOrigin(s"length${dim}_inv")))
-    val mkLengthInvAxs = mkLengthInvs.zipWithIndex.map {
-      case (inv, i) =>
-        val vars = Seq.fill(dim)(new Variable[Post](TInt()))
-        val mk = ADTFunctionInvocation[Post](lengthTypeArg, mkLength.ref, vars.map(_.get))
-        val unmk = ADTFunctionInvocation[Post](lengthTypeArg, inv.ref, Seq(mk))
-        new ADTAxiom(Forall(vars, Seq(Seq(mk)), Eq(unmk, vars(i).get)))
+    val mkLength =
+      new ADTFunction[Post](Seq.fill(dim)(new Variable(TInt())), lengthType)(
+        IndexAdtOrigin(s"length${dim}")
+      )
+    val mkLengthInvs =
+      Seq.fill(dim)(
+        new ADTFunction[Post](
+          Seq(new Variable(lengthType)(IndexAdtOrigin("len"))),
+          TInt(),
+        )(IndexAdtOrigin(s"length${dim}_inv"))
+      )
+    val mkLengthInvAxs = mkLengthInvs.zipWithIndex.map { case (inv, i) =>
+      val vars = Seq.fill(dim)(new Variable[Post](TInt()))
+      val mk = ADTFunctionInvocation[Post](
+        lengthTypeArg,
+        mkLength.ref,
+        vars.map(_.get),
+      )
+      val unmk = ADTFunctionInvocation[Post](lengthTypeArg, inv.ref, Seq(mk))
+      new ADTAxiom(Forall(vars, Seq(Seq(mk)), Eq(unmk, vars(i).get)))
     }
 
-    val lengthVal = new ADTFunction[Post](Seq(new Variable(lengthType)), TInt())(IndexAdtOrigin(s"length${dim}_val"))
+    val lengthVal =
+      new ADTFunction[Post](Seq(new Variable(lengthType)), TInt())(
+        IndexAdtOrigin(s"length${dim}_val")
+      )
     val lengthAx = {
       val vars = Seq.fill(dim)(new Variable[Post](TInt()))
-      val mk = ADTFunctionInvocation[Post](lengthTypeArg, mkLength.ref, vars.map(_.get))
-      val valOf = ADTFunctionInvocation[Post](lengthTypeArg, lengthVal.ref, Seq(mk))
+      val mk = ADTFunctionInvocation[Post](
+        lengthTypeArg,
+        mkLength.ref,
+        vars.map(_.get),
+      )
+      val valOf = ADTFunctionInvocation[Post](
+        lengthTypeArg,
+        lengthVal.ref,
+        Seq(mk),
+      )
       val computed = vars.map[Expr[Post]](_.get).reduce(Mult(_, _))
       new ADTAxiom(Forall(vars, Seq(Seq(valOf)), Eq(valOf, computed)))
     }
 
-    val lengthDecls = Seq(mkLength) ++ mkLengthInvs ++ mkLengthInvAxs ++ Seq(lengthVal, lengthAx)
-    val lengthAdt: AxiomaticDataType[Post] = new AxiomaticDataType(lengthDecls, Nil)(IndexAdtOrigin(s"Length${dim}"))
+    val lengthDecls =
+      Seq(mkLength) ++ mkLengthInvs ++ mkLengthInvAxs ++
+        Seq(lengthVal, lengthAx)
+    val lengthAdt: AxiomaticDataType[Post] =
+      new AxiomaticDataType(lengthDecls, Nil)(IndexAdtOrigin(s"Length${dim}"))
 
     val indexAdtRef = new LazyRef[Post, AxiomaticDataType[Post]](indexAdt)
     val indexType = TAxiomatic(indexAdtRef, Nil)
     val indexTypeArg = Some((indexAdtRef, Nil))
 
     val mkIndexTs: Seq[Type[Post]] = Seq.fill(dim)(TInt[Post]()) :+ lengthType
-    val mkIndex = new ADTFunction[Post](
-      args = mkIndexTs.map(new Variable(_)),
-      returnType = indexType
-    )(IndexAdtOrigin(s"index${dim}"))
-    val mkIndexInvs = mkIndexTs.map(t => new ADTFunction[Post](Seq(new Variable(indexType)(IndexAdtOrigin("idx"))), t)(IndexAdtOrigin(s"index${dim}_inv")))
-    val mkIndexInvAxs = mkIndexInvs.zipWithIndex.map {
-      case (inv, i) =>
-        val vars = mkIndexTs.map(t => new Variable[Post](t))
-        val mk = ADTFunctionInvocation[Post](indexTypeArg, mkIndex.ref, vars.map(_.get))
-        val unmk = ADTFunctionInvocation[Post](indexTypeArg, inv.ref, Seq(mk))
-        new ADTAxiom(Forall(vars, Seq(Seq(mk)), Eq(unmk, vars(i).get)))
+    val mkIndex =
+      new ADTFunction[Post](
+        args = mkIndexTs.map(new Variable(_)),
+        returnType = indexType,
+      )(IndexAdtOrigin(s"index${dim}"))
+    val mkIndexInvs = mkIndexTs.map(t =>
+      new ADTFunction[Post](
+        Seq(new Variable(indexType)(IndexAdtOrigin("idx"))),
+        t,
+      )(IndexAdtOrigin(s"index${dim}_inv"))
+    )
+    val mkIndexInvAxs = mkIndexInvs.zipWithIndex.map { case (inv, i) =>
+      val vars = mkIndexTs.map(t => new Variable[Post](t))
+      val mk = ADTFunctionInvocation[Post](
+        indexTypeArg,
+        mkIndex.ref,
+        vars.map(_.get),
+      )
+      val unmk = ADTFunctionInvocation[Post](indexTypeArg, inv.ref, Seq(mk))
+      new ADTAxiom(Forall(vars, Seq(Seq(mk)), Eq(unmk, vars(i).get)))
     }
 
-    val indexVal = new ADTFunction[Post](Seq(new Variable(indexType)), TInt())(IndexAdtOrigin(s"index${dim}_val"))
+    val indexVal =
+      new ADTFunction[Post](Seq(new Variable(indexType)), TInt())(
+        IndexAdtOrigin(s"index${dim}_val")
+      )
     val indexAxs = {
       val indexVars = Seq.fill(dim)(new Variable[Post](TInt()))
       val lengthVars = Seq.fill(dim)(new Variable[Post](TInt()))
-      val lengthMk = ADTFunctionInvocation[Post](lengthTypeArg, mkLength.ref, lengthVars.map(_.get))
-      val valOfLength = ADTFunctionInvocation[Post](lengthTypeArg, lengthVal.ref, Seq(lengthMk))
-      val mk = ADTFunctionInvocation[Post](indexTypeArg, mkIndex.ref, indexVars.map(_.get) :+ lengthMk)
-      val valOf = ADTFunctionInvocation[Post](indexTypeArg, indexVal.ref, Seq(mk))
-      val computed = indexVars.zipWithIndex.map {
-        case (indexVar, i) =>
-          (indexVar +: lengthVars.drop(i + 1)).map[Expr[Post]](_.get).reduce(Mult(_, _))
+      val lengthMk = ADTFunctionInvocation[Post](
+        lengthTypeArg,
+        mkLength.ref,
+        lengthVars.map(_.get),
+      )
+      val valOfLength = ADTFunctionInvocation[Post](
+        lengthTypeArg,
+        lengthVal.ref,
+        Seq(lengthMk),
+      )
+      val mk = ADTFunctionInvocation[Post](
+        indexTypeArg,
+        mkIndex.ref,
+        indexVars.map(_.get) :+ lengthMk,
+      )
+      val valOf = ADTFunctionInvocation[Post](
+        indexTypeArg,
+        indexVal.ref,
+        Seq(mk),
+      )
+      val computed = indexVars.zipWithIndex.map { case (indexVar, i) =>
+        (indexVar +: lengthVars.drop(i + 1)).map[Expr[Post]](_.get)
+          .reduce(Mult(_, _))
       }.reduce(Plus(_, _))
 
-      val axValDef = new ADTAxiom(Forall(indexVars ++ lengthVars, Seq(Seq(valOf)), Eq(valOf, computed)))
+      val axValDef =
+        new ADTAxiom(
+          Forall(indexVars ++ lengthVars, Seq(Seq(valOf)), Eq(valOf, computed))
+        )
 
       val linearCondition = indexVars.zip(lengthVars).map {
-        case (index, length) => const[Post](0) <= index.get && index.get < length.get
+        case (index, length) =>
+          const[Post](0) <= index.get && index.get < length.get
       }.reduce(And(_, _))
 
-      val axLinearLess = new ADTAxiom(Forall(indexVars ++ lengthVars, Seq(Seq(valOf)), Implies(linearCondition, valOf < valOfLength)))
+      val axLinearLess =
+        new ADTAxiom(Forall(
+          indexVars ++ lengthVars,
+          Seq(Seq(valOf)),
+          Implies(linearCondition, valOf < valOfLength),
+        ))
 
       Seq(axValDef, axLinearLess)
     }
 
-    val indexValInvs = Seq.fill(dim)(new ADTFunction[Post](Seq(new Variable(lengthType), new Variable(TInt())), TInt())(IndexAdtOrigin(s"index${dim}_val_inv")))
-    val indexValInvAxs = indexValInvs.zipWithIndex.map {
-      case (inv, i) =>
-        val indexVars = Seq.fill(dim)(new Variable[Post](TInt()))
-        val lengthVars = Seq.fill(dim)(new Variable[Post](TInt()))
-        val lengthMk = ADTFunctionInvocation[Post](lengthTypeArg, mkLength.ref, lengthVars.map(_.get))
-        val valOfLength = ADTFunctionInvocation[Post](lengthTypeArg, lengthVal.ref, Seq(lengthMk))
-        val mk = ADTFunctionInvocation[Post](indexTypeArg, mkIndex.ref, indexVars.map(_.get) :+ lengthMk)
-        val valOf = ADTFunctionInvocation[Post](indexTypeArg, indexVal.ref, Seq(mk))
-        val unValOf = ADTFunctionInvocation[Post](indexTypeArg, inv.ref, Seq(lengthMk, valOf))
-
-        val linearCondition = indexVars.zip(lengthVars).map {
-          case (index, length) => const[Post](0) <= index.get && index.get < length.get
+    val indexValInvs =
+      Seq.fill(dim)(
+        new ADTFunction[Post](
+          Seq(new Variable(lengthType), new Variable(TInt())),
+          TInt(),
+        )(IndexAdtOrigin(s"index${dim}_val_inv"))
+      )
+    val indexValInvAxs = indexValInvs.zipWithIndex.map { case (inv, i) =>
+      val indexVars = Seq.fill(dim)(new Variable[Post](TInt()))
+      val lengthVars = Seq.fill(dim)(new Variable[Post](TInt()))
+      val lengthMk = ADTFunctionInvocation[Post](
+        lengthTypeArg,
+        mkLength.ref,
+        lengthVars.map(_.get),
+      )
+      val valOfLength = ADTFunctionInvocation[Post](
+        lengthTypeArg,
+        lengthVal.ref,
+        Seq(lengthMk),
+      )
+      val mk = ADTFunctionInvocation[Post](
+        indexTypeArg,
+        mkIndex.ref,
+        indexVars.map(_.get) :+ lengthMk,
+      )
+      val valOf = ADTFunctionInvocation[Post](
+        indexTypeArg,
+        indexVal.ref,
+        Seq(mk),
+      )
+      val unValOf = ADTFunctionInvocation[Post](
+        indexTypeArg,
+        inv.ref,
+        Seq(lengthMk, valOf),
+      )
+
+      val linearCondition = indexVars.zip(lengthVars)
+        .map { case (index, length) =>
+          const[Post](0) <= index.get && index.get < length.get
         }.reduce(And(_, _))
 
-        new ADTAxiom(Forall(indexVars ++ lengthVars, Seq(Seq(valOf)), Implies(linearCondition, Eq(unValOf, indexVars(i).get))))
+      new ADTAxiom(Forall(
+        indexVars ++ lengthVars,
+        Seq(Seq(valOf)),
+        Implies(linearCondition, Eq(unValOf, indexVars(i).get)),
+      ))
     }
 
     val linearIndices = (0 until dim).map { definedDims =>
       new ADTFunction[Post](
         Seq.fill(definedDims)(new Variable[Post](TInt())) ++
-        Seq(new Variable[Post](TInt()), new Variable[Post](lengthType)),
-        TBool()
+          Seq(new Variable[Post](TInt()), new Variable[Post](lengthType)),
+        TBool(),
       )(IndexAdtOrigin(s"linear_index${dim}"))
     }
-    val linearIndexAxs = linearIndices.zipWithIndex.map { case (linearIndex, definedDims) =>
-      val lengthVars = Seq.fill(dim)(new Variable[Post](TInt()))
-      val lengthMk = ADTFunctionInvocation[Post](lengthTypeArg, mkLength.ref, lengthVars.map(_.get))
-
-      val valVar = new Variable[Post](TInt())
-
-      val indexVars = Seq.fill(dim)(new Variable[Post](TInt()))
-      val mk = ADTFunctionInvocation[Post](indexTypeArg, mkIndex.ref, indexVars.map(_.get) :+ lengthMk)
-      val valOf = ADTFunctionInvocation[Post](indexTypeArg, indexVal.ref, Seq(mk))
-
-      val lemma = ADTFunctionInvocation[Post](indexTypeArg, linearIndex.ref, indexVars.take(definedDims).map(_.get) ++ Seq(valVar.get, lengthMk))
-
-      val lowerBound = indexVars.zipWithIndex.take(definedDims).map {
-        case (indexVar, i) =>
-          val index = indexVar.get
-          (index +: lengthVars.drop(i + 1).map[Expr[Post]](_.get)).reduce(Mult(_, _))
-      }.reduceOption(Plus(_, _)).getOrElse(const(0))
+    val linearIndexAxs = linearIndices.zipWithIndex.map {
+      case (linearIndex, definedDims) =>
+        val lengthVars = Seq.fill(dim)(new Variable[Post](TInt()))
+        val lengthMk = ADTFunctionInvocation[Post](
+          lengthTypeArg,
+          mkLength.ref,
+          lengthVars.map(_.get),
+        )
 
-      val upperBound = indexVars.zipWithIndex.take(definedDims).map {
-        case (indexVar, i) =>
-          val index = if(i == definedDims-1) indexVar.get + const(1) else indexVar.get
-          (index +: lengthVars.drop(i + 1).map[Expr[Post]](_.get)).reduce(Mult(_, _))
-      }.reduceOption(Plus(_, _)).getOrElse(lengthVars.map[Expr[Post]](_.get).reduce(Mult(_, _)))
+        val valVar = new Variable[Post](TInt())
 
-      val linearCondition = indexVars.zip(lengthVars).map {
-        case (index, length) => const[Post](0) <= index.get && index.get < length.get
-      }
-
-      val definedBound = linearCondition.take(definedDims).reduceOption[Expr[Post]](And(_, _)).getOrElse(tt)
-      val undefinedBound = linearCondition.drop(definedDims).reduce[Expr[Post]](And(_, _))
-
-      new ADTAxiom(Forall(indexVars.take(definedDims) ++ Seq(valVar) ++ lengthVars, Seq(Seq(lemma)),
-        lemma &&
-        Implies(
-          definedBound && lowerBound <= valVar.get && valVar.get < upperBound,
-          Exists(
-            indexVars.drop(definedDims),
-            Seq(Seq(valOf)),
-            undefinedBound && Eq(valOf, valVar.get)
-          )
-        )))
+        val indexVars = Seq.fill(dim)(new Variable[Post](TInt()))
+        val mk = ADTFunctionInvocation[Post](
+          indexTypeArg,
+          mkIndex.ref,
+          indexVars.map(_.get) :+ lengthMk,
+        )
+        val valOf = ADTFunctionInvocation[Post](
+          indexTypeArg,
+          indexVal.ref,
+          Seq(mk),
+        )
+
+        val lemma = ADTFunctionInvocation[Post](
+          indexTypeArg,
+          linearIndex.ref,
+          indexVars.take(definedDims).map(_.get) ++ Seq(valVar.get, lengthMk),
+        )
+
+        val lowerBound = indexVars.zipWithIndex.take(definedDims)
+          .map { case (indexVar, i) =>
+            val index = indexVar.get
+            (index +: lengthVars.drop(i + 1).map[Expr[Post]](_.get))
+              .reduce(Mult(_, _))
+          }.reduceOption(Plus(_, _)).getOrElse(const(0))
+
+        val upperBound = indexVars.zipWithIndex.take(definedDims)
+          .map { case (indexVar, i) =>
+            val index =
+              if (i == definedDims - 1)
+                indexVar.get + const(1)
+              else
+                indexVar.get
+            (index +: lengthVars.drop(i + 1).map[Expr[Post]](_.get))
+              .reduce(Mult(_, _))
+          }.reduceOption(Plus(_, _))
+          .getOrElse(lengthVars.map[Expr[Post]](_.get).reduce(Mult(_, _)))
+
+        val linearCondition = indexVars.zip(lengthVars)
+          .map { case (index, length) =>
+            const[Post](0) <= index.get && index.get < length.get
+          }
+
+        val definedBound = linearCondition.take(definedDims)
+          .reduceOption[Expr[Post]](And(_, _)).getOrElse(tt)
+        val undefinedBound = linearCondition.drop(definedDims)
+          .reduce[Expr[Post]](And(_, _))
+
+        new ADTAxiom(Forall(
+          indexVars.take(definedDims) ++ Seq(valVar) ++ lengthVars,
+          Seq(Seq(lemma)),
+          lemma && Implies(
+            definedBound && lowerBound <= valVar.get && valVar.get < upperBound,
+            Exists(
+              indexVars.drop(definedDims),
+              Seq(Seq(valOf)),
+              undefinedBound && Eq(valOf, valVar.get),
+            ),
+          ),
+        ))
     }
 
-    val indexDecls = Seq(mkIndex) ++ mkIndexInvs ++ mkIndexInvAxs ++ Seq(indexVal) ++ indexAxs ++ indexValInvs ++ indexValInvAxs ++ linearIndices ++ linearIndexAxs
-    val indexAdt: AxiomaticDataType[Post] = new AxiomaticDataType(indexDecls, Nil)(IndexAdtOrigin(s"Index${dim}"))
+    val indexDecls =
+      Seq(mkIndex) ++ mkIndexInvs ++ mkIndexInvAxs ++ Seq(indexVal) ++
+        indexAxs ++ indexValInvs ++ indexValInvAxs ++ linearIndices ++
+        linearIndexAxs
+    val indexAdt: AxiomaticDataType[Post] =
+      new AxiomaticDataType(indexDecls, Nil)(IndexAdtOrigin(s"Index${dim}"))
 
     globalDeclarations.declare(lengthAdt)
     globalDeclarations.declare(indexAdt)
@@ -169,25 +292,55 @@ case class EncodeNdIndex[Pre <: Generation]() extends Rewriter[Pre] {
       ADTFunctionInvocation[Post](lengthTypeArg, mkLength.ref, dims)
 
     def getLengthVal(dims: Seq[Expr[Post]]): Expr[Post] =
-      ADTFunctionInvocation[Post](lengthTypeArg, lengthVal.ref, Seq(getLength(dims)))
+      ADTFunctionInvocation[Post](
+        lengthTypeArg,
+        lengthVal.ref,
+        Seq(getLength(dims)),
+      )
 
-    def getIndexVal(indices: Seq[Expr[Post]], dims: Seq[Expr[Post]]): Expr[Post] =
-      ADTFunctionInvocation[Post](indexTypeArg, indexVal.ref,
-        Seq(ADTFunctionInvocation[Post](indexTypeArg, mkIndex.ref, indices :+ getLength(dims))))
+    def getIndexVal(
+        indices: Seq[Expr[Post]],
+        dims: Seq[Expr[Post]],
+    ): Expr[Post] =
+      ADTFunctionInvocation[Post](
+        indexTypeArg,
+        indexVal.ref,
+        Seq(ADTFunctionInvocation[Post](
+          indexTypeArg,
+          mkIndex.ref,
+          indices :+ getLength(dims),
+        )),
+      )
 
-    def getPartialIndexLemma(indices: Seq[Expr[Post]], linearIndex: Expr[Post], dims: Seq[Expr[Post]]): Expr[Post] =
-      ADTFunctionInvocation[Post](indexTypeArg, linearIndices(indices.size).ref,
-        indices ++ Seq(linearIndex, getLength(dims)))
+    def getPartialIndexLemma(
+        indices: Seq[Expr[Post]],
+        linearIndex: Expr[Post],
+        dims: Seq[Expr[Post]],
+    ): Expr[Post] =
+      ADTFunctionInvocation[Post](
+        indexTypeArg,
+        linearIndices(indices.size).ref,
+        indices ++ Seq(linearIndex, getLength(dims)),
+      )
   }
 
   val indexAdt: mutable.Map[Int, IndexAdt] = mutable.Map()
-  def getIndexAdt(i: Int): IndexAdt = indexAdt.getOrElseUpdate(i, new IndexAdt(i))
-
-  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] = e match {
-    case NdLength(dims) => getIndexAdt(dims.size).getLengthVal(dims.map(dispatch))
-    case NdIndex(indices, dims) => getIndexAdt(indices.size).getIndexVal(indices.map(dispatch), dims.map(dispatch))
-    case NdPartialIndex(indices, linearIndex, dims) =>
-      getIndexAdt(dims.size).getPartialIndexLemma(indices.map(dispatch), dispatch(linearIndex), dims.map(dispatch))
-    case other => rewriteDefault(other)
-  }
+  def getIndexAdt(i: Int): IndexAdt =
+    indexAdt.getOrElseUpdate(i, new IndexAdt(i))
+
+  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] =
+    e match {
+      case NdLength(dims) =>
+        getIndexAdt(dims.size).getLengthVal(dims.map(dispatch))
+      case NdIndex(indices, dims) =>
+        getIndexAdt(indices.size)
+          .getIndexVal(indices.map(dispatch), dims.map(dispatch))
+      case NdPartialIndex(indices, linearIndex, dims) =>
+        getIndexAdt(dims.size).getPartialIndexLemma(
+          indices.map(dispatch),
+          dispatch(linearIndex),
+          dims.map(dispatch),
+        )
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/EncodeProofHelpers.scala b/src/rewrite/vct/rewrite/EncodeProofHelpers.scala
index 3b230f68f3..b543eca9ef 100644
--- a/src/rewrite/vct/rewrite/EncodeProofHelpers.scala
+++ b/src/rewrite/vct/rewrite/EncodeProofHelpers.scala
@@ -7,92 +7,98 @@ import vct.col.util.AstBuildHelpers._
 
 case object EncodeProofHelpers extends RewriterBuilderArg[Boolean] {
   override def key: String = "proofHelpers"
-  override def desc: String = "Encode statements framed with FramedProof, and indeterminate integers."
+  override def desc: String =
+    "Encode statements framed with FramedProof, and indeterminate integers."
 
-  private def Once: Origin = Origin(
-    Seq(
-      PreferredName(Seq("once")),
-      LabelContext("frame while"),
-    )
-  )
+  private def Once: Origin =
+    Origin(Seq(PreferredName(Seq("once")), LabelContext("frame while")))
 
-  private def Indet: Origin = Origin(
-    Seq(
-      PreferredName(Seq("indet")),
-      LabelContext("indeterminate branch"),
+  private def Indet: Origin =
+    Origin(
+      Seq(PreferredName(Seq("indet")), LabelContext("indeterminate branch"))
     )
-  )
 
-  private def Before: Origin = Origin(
-    Seq(
-      PreferredName(Seq("beforeFrame")),
-      LabelContext("before frame"),
-    )
-  )
+  private def Before: Origin =
+    Origin(Seq(PreferredName(Seq("beforeFrame")), LabelContext("before frame")))
 
-  private def BeforeVar(preferredName: String): Origin = Origin(
-    Seq(
-      PreferredName(Seq(preferredName)),
-      LabelContext("frame forperm"),
+  private def BeforeVar(preferredName: String): Origin =
+    Origin(
+      Seq(PreferredName(Seq(preferredName)), LabelContext("frame forperm"))
     )
-  )
 
-  case class FramedProofLoopInvariantFailed(proof: FramedProof[_]) extends Blame[LoopInvariantFailure] {
-    override def blame(error: LoopInvariantFailure): Unit = error match {
-      case LoopInvariantNotEstablished(failure, _) =>
-        proof.blame.blame(FramedProofPreFailed(failure, proof))
-      case LoopInvariantNotMaintained(failure, _) =>
-        proof.blame.blame(FramedProofPostFailed(failure, proof))
-      case LoopTerminationMeasureFailed(_) => PanicBlame("There is no termination measure here").blame(error)
-    }
+  case class FramedProofLoopInvariantFailed(proof: FramedProof[_])
+      extends Blame[LoopInvariantFailure] {
+    override def blame(error: LoopInvariantFailure): Unit =
+      error match {
+        case LoopInvariantNotEstablished(failure, _) =>
+          proof.blame.blame(FramedProofPreFailed(failure, proof))
+        case LoopInvariantNotMaintained(failure, _) =>
+          proof.blame.blame(FramedProofPostFailed(failure, proof))
+        case LoopTerminationMeasureFailed(_) =>
+          PanicBlame("There is no termination measure here").blame(error)
+      }
   }
 }
 
-case class EncodeProofHelpers[Pre <: Generation](inferHeapContextIntoFrame: Boolean = true) extends Rewriter[Pre] {
+case class EncodeProofHelpers[Pre <: Generation](
+    inferHeapContextIntoFrame: Boolean = true
+) extends Rewriter[Pre] {
   import vct.col.rewrite.EncodeProofHelpers._
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case proof @ FramedProof(pre, body, post) =>
-      implicit val o: Origin = stat.o
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case proof @ FramedProof(pre, body, post) =>
+        implicit val o: Origin = stat.o
 
-      val beforeLabel = new LabelDecl[Post]()(Before)
-      val locValue = new Variable[Post](TAnyValue())(BeforeVar("x"))
-      val allLocationsSame =
-        ForPermWithValue(locValue, locValue.get === Old(locValue.get, Some(beforeLabel.ref))(PanicBlame("loop body reached after label before it")))
-      val allLocationsSameOnInhale =
-        if(inferHeapContextIntoFrame) PolarityDependent(allLocationsSame, tt) else tt[Post]
+        val beforeLabel = new LabelDecl[Post]()(Before)
+        val locValue = new Variable[Post](TAnyValue())(BeforeVar("x"))
+        val allLocationsSame = ForPermWithValue(
+          locValue,
+          locValue.get === Old(locValue.get, Some(beforeLabel.ref))(PanicBlame(
+            "loop body reached after label before it"
+          )),
+        )
+        val allLocationsSameOnInhale =
+          if (inferHeapContextIntoFrame)
+            PolarityDependent(allLocationsSame, tt)
+          else
+            tt[Post]
 
-      val once = new Variable[Post](TBool())(Once)
-      val loop = Loop(
-        init = assignLocal(once.get, tt),
-        cond = once.get,
-        update = assignLocal(once.get, ff),
+        val once = new Variable[Post](TBool())(Once)
+        val loop = Loop(
+          init = assignLocal(once.get, tt),
+          cond = once.get,
+          update = assignLocal(once.get, ff),
+          contract =
+            LoopInvariant(
+              (once.get ==> (dispatch(pre) &* allLocationsSameOnInhale)) &*
+                (!once.get ==> dispatch(post)),
+              Some(DecreasesClauseNoRecursion[Post]()),
+            )(FramedProofLoopInvariantFailed(proof)),
+          body = dispatch(body),
+        )
 
-        contract = LoopInvariant(
-          (once.get ==> (dispatch(pre) &* allLocationsSameOnInhale)) &*
-            (!once.get ==> dispatch(post)),
-          Some(DecreasesClauseNoRecursion[Post]()),
-        )(FramedProofLoopInvariantFailed(proof)),
-        body = dispatch(body),
-      )
+        Scope(Seq(once), Block(Seq(Label(beforeLabel, Block(Nil)), loop)))
 
-      Scope(Seq(once), Block(Seq(Label(beforeLabel, Block(Nil)), loop)))
+      case IndetBranch(branches) =>
+        // PB: note that if branches == Nil, this is the same as `inhale false`. This is intended.
+        implicit val o: Origin = stat.o
+        val v = new Variable[Post](TInt())(Indet)
+        Scope(
+          Seq(v),
+          Block(Seq(
+            Inhale(v.get >= const(0)),
+            Inhale(v.get < const(branches.size)),
+            branches match {
+              case Nil => Block(Nil)
+              case branches =>
+                Branch(branches.zipWithIndex.map { case (arm, no) =>
+                  (v.get === const(no), dispatch(arm))
+                })
+            },
+          )),
+        )
 
-    case IndetBranch(branches) =>
-      // PB: note that if branches == Nil, this is the same as `inhale false`. This is intended.
-      implicit val o: Origin = stat.o
-      val v = new Variable[Post](TInt())(Indet)
-      Scope(Seq(v), Block(Seq(
-        Inhale(v.get >= const(0)),
-        Inhale(v.get < const(branches.size)),
-        branches match {
-          case Nil => Block(Nil)
-          case branches => Branch(branches.zipWithIndex.map {
-            case (arm, no) => (v.get === const(no), dispatch(arm))
-          })
-        }
-      )))
-
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/EncodeRange.scala b/src/rewrite/vct/rewrite/EncodeRange.scala
index c140f877eb..ca371a0f0c 100644
--- a/src/rewrite/vct/rewrite/EncodeRange.scala
+++ b/src/rewrite/vct/rewrite/EncodeRange.scala
@@ -8,7 +8,8 @@ import vct.col.util.AstBuildHelpers._
 
 object EncodeRange extends ImportADTBuilder("range")
 
-case class EncodeRange[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class EncodeRange[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   lazy val rangeFile = parse("range")
 
   lazy val rangeSeq = find[Function[Post]](rangeFile, "seq_range")
@@ -17,10 +18,8 @@ case class EncodeRange[Pre <: Generation](importer: ImportADTImporter) extends I
   override def preCoerce(e: Expr[Pre]): Expr[Pre] = {
     implicit val o: Origin = e.o
     e match {
-      case SeqMember(x, Range(from, to)) =>
-        from <= x && x < to
-      case SetMember(x, RangeSet(from, to)) =>
-        from <= x && x < to
+      case SeqMember(x, Range(from, to)) => from <= x && x < to
+      case SetMember(x, RangeSet(from, to)) => from <= x && x < to
       case other => other
     }
   }
@@ -32,13 +31,15 @@ case class EncodeRange[Pre <: Generation](importer: ImportADTImporter) extends I
       case Range(from, to) =>
         functionInvocation(
           PanicBlame("seq_range requires nothing"),
-          rangeSeq.ref, Seq(dispatch(from), dispatch(to)),
+          rangeSeq.ref,
+          Seq(dispatch(from), dispatch(to)),
         )
 
       case RangeSet(from, to) =>
         functionInvocation(
           PanicBlame("set_range requires nothing"),
-          rangeSet.ref, Seq(dispatch(from), dispatch(to)),
+          rangeSet.ref,
+          Seq(dispatch(from), dispatch(to)),
         )
 
       case other => super.postCoerce(other)
diff --git a/src/rewrite/vct/rewrite/EncodeRangedFor.scala b/src/rewrite/vct/rewrite/EncodeRangedFor.scala
index 5815e8d7f8..5e48dcc5e8 100644
--- a/src/rewrite/vct/rewrite/EncodeRangedFor.scala
+++ b/src/rewrite/vct/rewrite/EncodeRangedFor.scala
@@ -1,7 +1,27 @@
 package vct.col.rewrite
 
 import hre.util.ScopedStack
-import vct.col.ast.{Assign, Block, Eval, Expr, IterVariable, IterationContract, Local, LocalDecl, Loop, LoopContract, LoopInvariant, PostAssignExpression, Range, RangedFor, Select, SeqMember, Statement, TInt, Variable}
+import vct.col.ast.{
+  Assign,
+  Block,
+  Eval,
+  Expr,
+  IterVariable,
+  IterationContract,
+  Local,
+  LocalDecl,
+  Loop,
+  LoopContract,
+  LoopInvariant,
+  PostAssignExpression,
+  Range,
+  RangedFor,
+  Select,
+  SeqMember,
+  Statement,
+  TInt,
+  Variable,
+}
 import vct.col.origin.{AssignLocalOk, Origin}
 import vct.col.util.AstBuildHelpers.const
 import vct.col.util.AstBuildHelpers._
@@ -17,44 +37,61 @@ case class EncodeRangedFor[Pre <: Generation]() extends Rewriter[Pre] {
 
   val bounds = ScopedStack[(RangedFor[Pre], Expr[Post])]()
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case rf @ RangedFor(iv @ IterVariable(iVar, fromExpr, toExpr), contract, body) =>
-      implicit val o = iVar.o
-      val i: Local[Post] = Local(succ[Variable[Post]](iVar))(iVar.o)
-
-      val fromVar = new Variable[Post](TInt()(fromExpr.o))(fromExpr.o.where(name = "from"))
-      val from = Local(fromVar.ref[Variable[Post]])(fromExpr.o.where(name = "from"))
-
-      val toVar = new Variable[Post](TInt()(toExpr.o))(toExpr.o.where(name = "to"))
-      val to = Local(toVar.ref[Variable[Post]])(toExpr.o.where(name = "to"))
-
-      Loop(
-        Block(Seq(
-          LocalDecl(fromVar)(fromExpr.o),
-          LocalDecl(toVar)(toExpr.o),
-          LocalDecl(variables.collect(dispatch(iVar))._1.head),
-          Assign(from, dispatch(fromExpr))(AssignLocalOk),
-          Assign(to, dispatch(toExpr))(AssignLocalOk),
-          Assign(i, from)(AssignLocalOk)
-        ))(iVar.o),
-        { implicit val o = iv.o; SeqMember(i, Range(from, to)) },
-        Eval(PostAssignExpression(i, i + const(1))(AssignLocalOk)),
-        bounds.having((rf,
-          { implicit val o = iv.o;
-            Select(from < to,
-              SeqMember(i, Range(from, to + const(1))),
-              i === from)
-          }))(dispatch(contract)),
-        dispatch(body)
-      )(rf.o)
-    case stat => rewriteDefault(stat)
-  }
-
-  override def dispatch(contract: LoopContract[Pre]): LoopContract[Post] = (bounds.topOption, contract) match {
-    case (Some((rf, iBounds)), l: LoopInvariant[Pre]) =>
-      l.rewrite(invariant = (iBounds &* dispatch(l.invariant))(rf.o))
-    case (Some((rf, iBounds)), ic: IterationContract[Pre]) =>
-      ic.rewrite(context_everywhere = (iBounds &* dispatch(ic.context_everywhere))(rf.o))
-    case (None, c) => rewriteDefault(c)
-  }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case rf @ RangedFor(
+            iv @ IterVariable(iVar, fromExpr, toExpr),
+            contract,
+            body,
+          ) =>
+        implicit val o = iVar.o
+        val i: Local[Post] = Local(succ[Variable[Post]](iVar))(iVar.o)
+
+        val fromVar =
+          new Variable[Post](TInt()(fromExpr.o))(
+            fromExpr.o.where(name = "from")
+          )
+        val from =
+          Local(fromVar.ref[Variable[Post]])(fromExpr.o.where(name = "from"))
+
+        val toVar =
+          new Variable[Post](TInt()(toExpr.o))(toExpr.o.where(name = "to"))
+        val to = Local(toVar.ref[Variable[Post]])(toExpr.o.where(name = "to"))
+
+        Loop(
+          Block(Seq(
+            LocalDecl(fromVar)(fromExpr.o),
+            LocalDecl(toVar)(toExpr.o),
+            LocalDecl(variables.collect(dispatch(iVar))._1.head),
+            Assign(from, dispatch(fromExpr))(AssignLocalOk),
+            Assign(to, dispatch(toExpr))(AssignLocalOk),
+            Assign(i, from)(AssignLocalOk),
+          ))(iVar.o),
+          { implicit val o = iv.o; SeqMember(i, Range(from, to)) },
+          Eval(PostAssignExpression(i, i + const(1))(AssignLocalOk)),
+          bounds.having((
+            rf, {
+              implicit val o = iv.o;
+              Select(
+                from < to,
+                SeqMember(i, Range(from, to + const(1))),
+                i === from,
+              )
+            },
+          ))(dispatch(contract)),
+          dispatch(body),
+        )(rf.o)
+      case stat => rewriteDefault(stat)
+    }
+
+  override def dispatch(contract: LoopContract[Pre]): LoopContract[Post] =
+    (bounds.topOption, contract) match {
+      case (Some((rf, iBounds)), l: LoopInvariant[Pre]) =>
+        l.rewrite(invariant = (iBounds &* dispatch(l.invariant))(rf.o))
+      case (Some((rf, iBounds)), ic: IterationContract[Pre]) =>
+        ic.rewrite(context_everywhere =
+          (iBounds &* dispatch(ic.context_everywhere))(rf.o)
+        )
+      case (None, c) => rewriteDefault(c)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/EncodeResourceValues.scala b/src/rewrite/vct/rewrite/EncodeResourceValues.scala
index 7ae7e4894b..531858084e 100644
--- a/src/rewrite/vct/rewrite/EncodeResourceValues.scala
+++ b/src/rewrite/vct/rewrite/EncodeResourceValues.scala
@@ -10,7 +10,12 @@ import vct.col.rewrite.ResolveScale.WrongScale
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, Rewritten}
 import vct.col.util.DeclarationBox
 import vct.result.VerificationError.{SystemError, UserError}
-import vct.rewrite.EncodeResourceValues.{GenericsNotSupported, UnknownResourceValue, UnsupportedResourceValue, WrongResourcePattern}
+import vct.rewrite.EncodeResourceValues.{
+  GenericsNotSupported,
+  UnknownResourceValue,
+  UnsupportedResourceValue,
+  WrongResourcePattern,
+}
 import vct.col.util.AstBuildHelpers.{ExprBuildHelpers, const, forall}
 
 import scala.collection.mutable
@@ -19,7 +24,8 @@ case object EncodeResourceValues extends RewriterBuilder {
   override def key: String = "resourceValues2"
   override def desc: String = "Encode resource value conversions."
 
-  case class UnsupportedResourceValue(node: Node[_], kind: String) extends UserError {
+  case class UnsupportedResourceValue(node: Node[_], kind: String)
+      extends UserError {
     override def code: String = "wrongResourceValue"
     override def text: String =
       node.o.messageInContext(s"$kind cannot yet be stored in a resource value")
@@ -27,7 +33,8 @@ case object EncodeResourceValues extends RewriterBuilder {
 
   case class GenericsNotSupported(node: Node[_]) extends UserError {
     override def code: String = "genericsNotSupported"
-    override def text: String = node.o.messageInContext("Generics not supported")
+    override def text: String =
+      node.o.messageInContext("Generics not supported")
   }
 
   case class UnknownResourceValue(node: Expr[_]) extends SystemError {
@@ -35,11 +42,13 @@ case object EncodeResourceValues extends RewriterBuilder {
   }
 
   case class WrongResourcePattern(node: Node[_]) extends SystemError {
-    override def text: String = node.o.messageInContext("Wrong resource pattern encoding")
+    override def text: String =
+      node.o.messageInContext("Wrong resource pattern encoding")
   }
 }
 
-case class EncodeResourceValues[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging {
+case class EncodeResourceValues[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
   sealed trait ResourcePattern
 
   object ResourcePattern {
@@ -48,149 +57,200 @@ case class EncodeResourceValues[Pre <: Generation]() extends Rewriter[Pre] with
     case class Perm(loc: ResourcePatternLoc) extends ResourcePattern
     case class Value(loc: ResourcePatternLoc) extends ResourcePattern
     case class Predicate(p: col.Predicate[Pre]) extends ResourcePattern
-    case class InstancePredicate(p: col.InstancePredicate[Pre]) extends ResourcePattern
-    case class Star(left: ResourcePattern, right: ResourcePattern) extends ResourcePattern
+    case class InstancePredicate(p: col.InstancePredicate[Pre])
+        extends ResourcePattern
+    case class Star(left: ResourcePattern, right: ResourcePattern)
+        extends ResourcePattern
     case class Implies(res: ResourcePattern) extends ResourcePattern
-    case class Select(whenTrue: ResourcePattern, whenFalse: ResourcePattern) extends ResourcePattern
+    case class Select(whenTrue: ResourcePattern, whenFalse: ResourcePattern)
+        extends ResourcePattern
     // Let, Starall: probably need to support lambda's first?
     // Scale: I don't know about wf concerns, maybe just encode it away first?
 
     sealed trait ResourcePatternLoc
-    final case class HeapVariableLocation(ref: col.HeapVariable[Pre]) extends ResourcePatternLoc
-    final case class FieldLocation(ref: col.InstanceField[Pre]) extends ResourcePatternLoc
-    final case class ModelLocation(ref: col.ModelField[Pre]) extends ResourcePatternLoc
-    final case class SilverFieldLocation(ref: col.SilverField[Pre]) extends ResourcePatternLoc
+    final case class HeapVariableLocation(ref: col.HeapVariable[Pre])
+        extends ResourcePatternLoc
+    final case class FieldLocation(ref: col.InstanceField[Pre])
+        extends ResourcePatternLoc
+    final case class ModelLocation(ref: col.ModelField[Pre])
+        extends ResourcePatternLoc
+    final case class SilverFieldLocation(ref: col.SilverField[Pre])
+        extends ResourcePatternLoc
     final case class ArrayLocation(t: Type[Pre]) extends ResourcePatternLoc
     final case class PointerLocation(t: Type[Pre]) extends ResourcePatternLoc
-    final case class PredicateLocation(ref: col.Predicate[Pre]) extends ResourcePatternLoc
-    final case class InstancePredicateLocation(ref: col.InstancePredicate[Pre]) extends ResourcePatternLoc
-
-    def scan(loc: col.Location[Pre]): ResourcePatternLoc = loc match {
-      case col.HeapVariableLocation(ref) => HeapVariableLocation(ref.decl)
-      case col.FieldLocation(_, field) => FieldLocation(field.decl)
-      case col.ModelLocation(_, field) => ModelLocation(field.decl)
-      case col.SilverFieldLocation(_, field) => SilverFieldLocation(field.decl)
-      case col.ArrayLocation(arr, _) => ArrayLocation(arr.t.asArray.get.element)
-      case col.PointerLocation(ptr) => PointerLocation(ptr.t.asPointer.get.element)
-      case col.PredicateLocation(predicate, _) => PredicateLocation(predicate.decl)
-      case col.InstancePredicateLocation(predicate, _, _) => InstancePredicateLocation(predicate.decl)
-      case col.InLinePatternLocation(loc, _) => scan(loc)
-      case AmbiguousLocation(expr) => throw UnknownResourceValue(expr)
-    }
-
-    def scan(e: Expr[Pre]): ResourcePattern = e match {
-      case s: Scale[Pre] => throw UnsupportedResourceValue(s, "Scaled resources")
-      case s: Starall[Pre] => throw UnsupportedResourceValue(s, "Quantified resources")
-      case l: Let[Pre] => throw UnsupportedResourceValue(l, "Let expressions")
-
-      case e if TBool().superTypeOf(e.t) => Bool
-      case col.Perm(loc, _) => Perm(scan(loc))
-      case col.Value(loc) => Value(scan(loc))
-      case apply: PredicateApply[Pre] => Predicate(apply.ref.decl)
-      case apply: InstancePredicateApply[Pre] => InstancePredicate(apply.ref.decl)
-
-      case col.Star(left, right) => Star(scan(left), scan(right))
-      case col.Implies(_, res) => Implies(scan(res))
-      case col.Select(_, whenTrue, whenFalse) => Select(scan(whenTrue), scan(whenFalse))
+    final case class PredicateLocation(ref: col.Predicate[Pre])
+        extends ResourcePatternLoc
+    final case class InstancePredicateLocation(ref: col.InstancePredicate[Pre])
+        extends ResourcePatternLoc
+
+    def scan(loc: col.Location[Pre]): ResourcePatternLoc =
+      loc match {
+        case col.HeapVariableLocation(ref) => HeapVariableLocation(ref.decl)
+        case col.FieldLocation(_, field) => FieldLocation(field.decl)
+        case col.ModelLocation(_, field) => ModelLocation(field.decl)
+        case col.SilverFieldLocation(_, field) =>
+          SilverFieldLocation(field.decl)
+        case col.ArrayLocation(arr, _) =>
+          ArrayLocation(arr.t.asArray.get.element)
+        case col.PointerLocation(ptr) =>
+          PointerLocation(ptr.t.asPointer.get.element)
+        case col.PredicateLocation(predicate, _) =>
+          PredicateLocation(predicate.decl)
+        case col.InstancePredicateLocation(predicate, _, _) =>
+          InstancePredicateLocation(predicate.decl)
+        case col.InLinePatternLocation(loc, _) => scan(loc)
+        case AmbiguousLocation(expr) => throw UnknownResourceValue(expr)
+      }
 
-      case other => throw UnknownResourceValue(other)
-    }
+    def scan(e: Expr[Pre]): ResourcePattern =
+      e match {
+        case s: Scale[Pre] =>
+          throw UnsupportedResourceValue(s, "Scaled resources")
+        case s: Starall[Pre] =>
+          throw UnsupportedResourceValue(s, "Quantified resources")
+        case l: Let[Pre] => throw UnsupportedResourceValue(l, "Let expressions")
+
+        case e if TBool().superTypeOf(e.t) => Bool
+        case col.Perm(loc, _) => Perm(scan(loc))
+        case col.Value(loc) => Value(scan(loc))
+        case apply: PredicateApply[Pre] => Predicate(apply.ref.decl)
+        case apply: InstancePredicateApply[Pre] =>
+          InstancePredicate(apply.ref.decl)
+
+        case col.Star(left, right) => Star(scan(left), scan(right))
+        case col.Implies(_, res) => Implies(scan(res))
+        case col.Select(_, whenTrue, whenFalse) =>
+          Select(scan(whenTrue), scan(whenFalse))
+
+        case other => throw UnknownResourceValue(other)
+      }
   }
 
-  case class PatternBuilder(index: Int, toValue: Expr[Pre] => Expr[Post], fromValue: Expr[Post] => Expr[Post])
+  case class PatternBuilder(
+      index: Int,
+      toValue: Expr[Pre] => Expr[Post],
+      fromValue: Expr[Post] => Expr[Post],
+  )
 
-  val patternBuilders: ScopedStack[Map[ResourcePattern, PatternBuilder]] = ScopedStack()
+  val patternBuilders: ScopedStack[Map[ResourcePattern, PatternBuilder]] =
+    ScopedStack()
   val valAdt: ScopedStack[AxiomaticDataType[Post]] = ScopedStack()
   val kindFunc: ScopedStack[ADTFunction[Post]] = ScopedStack()
   val arbitraryResourceValue: ScopedStack[Predicate[Post]] = ScopedStack()
 
   def isGeneric(cls: Class[Pre]): Boolean = cls.typeArgs.isEmpty
-  def nonGeneric(cls: Class[Pre]): Unit = if (isGeneric(cls)) throw GenericsNotSupported(cls)
+  def nonGeneric(cls: Class[Pre]): Unit =
+    if (isGeneric(cls))
+      throw GenericsNotSupported(cls)
 
   override def dispatch(program: Program[Pre]): Program[Post] = {
     implicit val o: Origin = program.o
 
-    val patterns = program.collect {
-      case ResourceValue(res) => ResourcePattern.scan(res)
-    }.toIndexedSeq
+    val patterns =
+      program.collect { case ResourceValue(res) => ResourcePattern.scan(res) }
+        .toIndexedSeq
 
     if (patterns.isEmpty) {
-      return patternBuilders.having(Map.empty) {
-        rewriteDefault(program)
-      }
+      return patternBuilders.having(Map.empty) { rewriteDefault(program) }
     }
 
-    val fieldOwner = program.flatCollect {
-      case cls: Class[Pre] => cls.collect {
-        case field: Field[Pre] => field -> cls
-      }
-    }.toMap
+    val fieldOwner =
+      program.flatCollect { case cls: Class[Pre] =>
+        cls.collect { case field: Field[Pre] => field -> cls }
+      }.toMap
 
-    val modelFieldOwner = program.flatCollect {
-      case model: Model[Pre] => model.collect {
-        case field: ModelField[Pre] => field -> model
-      }
-    }.toMap
+    val modelFieldOwner =
+      program.flatCollect { case model: Model[Pre] =>
+        model.collect { case field: ModelField[Pre] => field -> model }
+      }.toMap
 
-    val predicateOwner = program.flatCollect {
-      case cls: Class[Pre] => cls.collect {
-        case pred: InstancePredicate[Pre] => pred -> cls
-      }
-    }.toMap
+    val predicateOwner =
+      program.flatCollect { case cls: Class[Pre] =>
+        cls.collect { case pred: InstancePredicate[Pre] => pred -> cls }
+      }.toMap
 
     program.rewrite(globalDeclarations.collect {
       val adt = DeclarationBox[Post, AxiomaticDataType[Post]]()
       val valType = TAxiomatic(adt.ref, Nil)
-      val kind = new ADTFunction[Post](Seq(new Variable(valType)(o.where(name = "val"))), TInt())(o.where(name = "kind"))
+      val kind =
+        new ADTFunction[Post](
+          Seq(new Variable(valType)(o.where(name = "val"))),
+          TInt(),
+        )(o.where(name = "kind"))
 
       val m = mutable.Map[ResourcePattern, PatternBuilder]()
 
       val decls = patterns.zipWithIndex.flatMap { case (pattern, index) =>
-        def freeTypesLoc(location: ResourcePattern.ResourcePatternLoc): Seq[Type[Post]] = location match {
-          case ResourcePattern.HeapVariableLocation(_) => Nil
-          case ResourcePattern.FieldLocation(f) =>
-            nonGeneric(fieldOwner(f))
-            Seq(TClass(succ(fieldOwner(f)), Seq()))
-          case ResourcePattern.ModelLocation(f) => Seq(TModel(succ(modelFieldOwner(f))))
-          case ResourcePattern.SilverFieldLocation(_) => Seq(TRef())
-          case ResourcePattern.ArrayLocation(t) => Seq(TArray(dispatch(t)), TInt())
-          case ResourcePattern.PointerLocation(t) => Seq(TPointer(dispatch(t)))
-          case ResourcePattern.PredicateLocation(ref) => ref.args.map(_.t).map(dispatch)
-          case ResourcePattern.InstancePredicateLocation(ref) =>
-            nonGeneric(predicateOwner(ref))
-            TClass[Post](succ(predicateOwner(ref)), Seq()) +: ref.args.map(_.t).map(dispatch)
-        }
+        def freeTypesLoc(
+            location: ResourcePattern.ResourcePatternLoc
+        ): Seq[Type[Post]] =
+          location match {
+            case ResourcePattern.HeapVariableLocation(_) => Nil
+            case ResourcePattern.FieldLocation(f) =>
+              nonGeneric(fieldOwner(f))
+              Seq(TClass(succ(fieldOwner(f)), Seq()))
+            case ResourcePattern.ModelLocation(f) =>
+              Seq(TModel(succ(modelFieldOwner(f))))
+            case ResourcePattern.SilverFieldLocation(_) => Seq(TRef())
+            case ResourcePattern.ArrayLocation(t) =>
+              Seq(TArray(dispatch(t)), TInt())
+            case ResourcePattern.PointerLocation(t) =>
+              Seq(TPointer(dispatch(t)))
+            case ResourcePattern.PredicateLocation(ref) =>
+              ref.args.map(_.t).map(dispatch)
+            case ResourcePattern.InstancePredicateLocation(ref) =>
+              nonGeneric(predicateOwner(ref))
+              TClass[Post](succ(predicateOwner(ref)), Seq()) +:
+                ref.args.map(_.t).map(dispatch)
+          }
 
-        def freeTypes(pattern: ResourcePattern): Seq[Type[Post]] = pattern match {
-          case ResourcePattern.Bool => Seq(TBool())
-          case ResourcePattern.Perm(loc) => freeTypesLoc(loc) :+ TRational()
-          case ResourcePattern.Value(loc) => freeTypesLoc(loc)
-          case ResourcePattern.Predicate(p) => p.args.map(_.t).map(dispatch)
-          case ResourcePattern.InstancePredicate(p) =>
-            nonGeneric(predicateOwner(p))
-            TClass[Post](succ(predicateOwner(p)), Seq()) +: p.args.map(_.t).map(dispatch)
-          case ResourcePattern.Star(left, right) => freeTypes(left) ++ freeTypes(right)
-          case ResourcePattern.Implies(res) => freeTypes(res)
-          case ResourcePattern.Select(whenTrue, whenFalse) => freeTypes(whenTrue) ++ freeTypes(whenFalse)
-        }
+        def freeTypes(pattern: ResourcePattern): Seq[Type[Post]] =
+          pattern match {
+            case ResourcePattern.Bool => Seq(TBool())
+            case ResourcePattern.Perm(loc) => freeTypesLoc(loc) :+ TRational()
+            case ResourcePattern.Value(loc) => freeTypesLoc(loc)
+            case ResourcePattern.Predicate(p) => p.args.map(_.t).map(dispatch)
+            case ResourcePattern.InstancePredicate(p) =>
+              nonGeneric(predicateOwner(p))
+              TClass[Post](succ(predicateOwner(p)), Seq()) +: p.args.map(_.t)
+                .map(dispatch)
+            case ResourcePattern.Star(left, right) =>
+              freeTypes(left) ++ freeTypes(right)
+            case ResourcePattern.Implies(res) => freeTypes(res)
+            case ResourcePattern.Select(whenTrue, whenFalse) =>
+              freeTypes(whenTrue) ++ freeTypes(whenFalse)
+          }
 
         val ts = freeTypes(pattern)
 
-        val buildFunc = new ADTFunction(ts.map(new Variable[Post](_)(o.where(name = "x"))), valType)(o.where(name = s"ResVal$index"))
+        val buildFunc =
+          new ADTFunction(
+            ts.map(new Variable[Post](_)(o.where(name = "x"))),
+            valType,
+          )(o.where(name = s"ResVal$index"))
 
         val kindAxiom = {
           val vars = ts.map(new Variable[Post](_)(o.where(name = "x")))
           new ADTAxiom(Forall(
             vars,
             Nil,
-            ADTFunctionInvocation[Post](Some(adt.ref -> Nil), kind.ref, Seq(
-              ADTFunctionInvocation[Post](Some(adt.ref -> Nil), buildFunc.ref, vars.map(v => Local[Post](v.ref)))
-            )) === const(index)
+            ADTFunctionInvocation[Post](
+              Some(adt.ref -> Nil),
+              kind.ref,
+              Seq(ADTFunctionInvocation[Post](
+                Some(adt.ref -> Nil),
+                buildFunc.ref,
+                vars.map(v => Local[Post](v.ref)),
+              )),
+            ) === const(index),
           ))
         }
 
         val getters = ts.zipWithIndex.map { case (t, typeIndex) =>
-          new ADTFunction[Post](Seq(new Variable(valType)(o.where(name = "val"))), t)(o.where(name = s"ResVal${index}_get$typeIndex"))
+          new ADTFunction[Post](
+            Seq(new Variable(valType)(o.where(name = "val"))),
+            t,
+          )(o.where(name = s"ResVal${index}_get$typeIndex"))
         }
 
         val getterAxioms = ts.zipWithIndex.map { case (t, index) =>
@@ -198,139 +258,225 @@ case class EncodeResourceValues[Pre <: Generation]() extends Rewriter[Pre] with
           new ADTAxiom(Forall(
             vars,
             Nil,
-            ADTFunctionInvocation[Post](Some(adt.ref -> Nil), getters(index).ref, Seq(
-              ADTFunctionInvocation[Post](Some(adt.ref -> Nil), buildFunc.ref, vars.map(v => Local[Post](v.ref)))
-            )) === Local(vars(index).ref)
-
+            ADTFunctionInvocation[Post](
+              Some(adt.ref -> Nil),
+              getters(index).ref,
+              Seq(ADTFunctionInvocation[Post](
+                Some(adt.ref -> Nil),
+                buildFunc.ref,
+                vars.map(v => Local[Post](v.ref)),
+              )),
+            ) === Local(vars(index).ref),
           ))
         }
 
-        def makeLoc(loc: Location[Pre], pat: ResourcePattern.ResourcePatternLoc): Seq[Expr[Post]] = (pat, loc) match {
-          case ResourcePattern.HeapVariableLocation(_) -> HeapVariableLocation(_) =>
-            Nil
-          case ResourcePattern.FieldLocation(_) -> FieldLocation(obj, _) =>
-            Seq(dispatch(obj))
-          case ResourcePattern.ModelLocation(_) -> ModelLocation(model, _) =>
-            Seq(dispatch(model))
-          case ResourcePattern.SilverFieldLocation(_) -> SilverFieldLocation(ref, _) =>
-            Seq(dispatch(ref))
-          case ResourcePattern.ArrayLocation(_) -> ArrayLocation(arr, idx) =>
-            Seq(dispatch(arr), dispatch(idx))
-          case ResourcePattern.PointerLocation(_) -> PointerLocation(ptr) =>
-            Seq(dispatch(ptr))
-          case ResourcePattern.PredicateLocation(_) -> PredicateLocation(_, args) =>
-            args.map(dispatch)
-          case ResourcePattern.InstancePredicateLocation(_) -> InstancePredicateLocation(_, obj, args) =>
-            dispatch(obj) +: args.map(dispatch)
-          case _ -> _ => ???
-        }
+        def makeLoc(
+            loc: Location[Pre],
+            pat: ResourcePattern.ResourcePatternLoc,
+        ): Seq[Expr[Post]] =
+          (pat, loc) match {
+            case ResourcePattern.HeapVariableLocation(_) ->
+                HeapVariableLocation(_) =>
+              Nil
+            case ResourcePattern.FieldLocation(_) -> FieldLocation(obj, _) =>
+              Seq(dispatch(obj))
+            case ResourcePattern.ModelLocation(_) -> ModelLocation(model, _) =>
+              Seq(dispatch(model))
+            case ResourcePattern.SilverFieldLocation(_) ->
+                SilverFieldLocation(ref, _) =>
+              Seq(dispatch(ref))
+            case ResourcePattern.ArrayLocation(_) -> ArrayLocation(arr, idx) =>
+              Seq(dispatch(arr), dispatch(idx))
+            case ResourcePattern.PointerLocation(_) -> PointerLocation(ptr) =>
+              Seq(dispatch(ptr))
+            case ResourcePattern.PredicateLocation(_) ->
+                PredicateLocation(_, args) =>
+              args.map(dispatch)
+            case ResourcePattern.InstancePredicateLocation(_) ->
+                InstancePredicateLocation(_, obj, args) =>
+              dispatch(obj) +: args.map(dispatch)
+            case _ -> _ => ???
+          }
 
-        def make(e: Expr[Pre], pat: ResourcePattern): Seq[Expr[Post]] = (pat, e) match {
-          case ResourcePattern.Bool -> e =>
-            Seq(dispatch(e))
-          case ResourcePattern.Perm(locPat) -> Perm(loc, perm) =>
-            makeLoc(loc, locPat) :+ dispatch(perm)
-          case ResourcePattern.Value(locPat) -> Value(loc) =>
-            makeLoc(loc, locPat)
-          case ResourcePattern.Predicate(_) -> PredicateApply(_, args, perm) =>
-            args.map(dispatch) :+ dispatch(perm)
-          case ResourcePattern.InstancePredicate(p) -> InstancePredicateApply(obj, _, args, perm) =>
-            Seq(dispatch(obj)) ++ args.map(dispatch) ++ Seq(dispatch(perm))
-          case ResourcePattern.Star(leftPat, rightPat) -> Star(left, right) =>
-            make(left, leftPat) ++ make(right, rightPat)
-          case ResourcePattern.Implies(pat) -> Implies(cond, res) =>
-            dispatch(cond) +: make(res, pat)
-          case ResourcePattern.Select(whenTruePat, whenFalsePat) -> Select(cond, whenTrue, whenFalse) =>
-            Seq(dispatch(cond)) ++ make(whenTrue, whenTruePat) ++ make(whenFalse, whenFalsePat)
-          case pat -> e =>
-            throw WrongResourcePattern(e)
-        }
+        def make(e: Expr[Pre], pat: ResourcePattern): Seq[Expr[Post]] =
+          (pat, e) match {
+            case ResourcePattern.Bool -> e => Seq(dispatch(e))
+            case ResourcePattern.Perm(locPat) -> Perm(loc, perm) =>
+              makeLoc(loc, locPat) :+ dispatch(perm)
+            case ResourcePattern.Value(locPat) -> Value(loc) =>
+              makeLoc(loc, locPat)
+            case ResourcePattern.Predicate(_) ->
+                PredicateApply(_, args, perm) =>
+              args.map(dispatch) :+ dispatch(perm)
+            case ResourcePattern.InstancePredicate(p) ->
+                InstancePredicateApply(obj, _, args, perm) =>
+              Seq(dispatch(obj)) ++ args.map(dispatch) ++ Seq(dispatch(perm))
+            case ResourcePattern.Star(leftPat, rightPat) -> Star(left, right) =>
+              make(left, leftPat) ++ make(right, rightPat)
+            case ResourcePattern.Implies(pat) -> Implies(cond, res) =>
+              dispatch(cond) +: make(res, pat)
+            case ResourcePattern.Select(whenTruePat, whenFalsePat) ->
+                Select(cond, whenTrue, whenFalse) =>
+              Seq(dispatch(cond)) ++ make(whenTrue, whenTruePat) ++
+                make(whenFalse, whenFalsePat)
+            case pat -> e => throw WrongResourcePattern(e)
+          }
 
-        def toResourceLoc(getters: Seq[Expr[Post]], pat: ResourcePattern.ResourcePatternLoc)(implicit o: Origin): Location[Post] = pat match {
-          case ResourcePattern.HeapVariableLocation(ref) => HeapVariableLocation(succ(ref))
-          case ResourcePattern.FieldLocation(ref) => FieldLocation(getters.head, succ(ref))
-          case ResourcePattern.ModelLocation(ref) => ModelLocation(getters.head, succ(ref))
-          case ResourcePattern.SilverFieldLocation(ref) => SilverFieldLocation(getters.head, succ(ref))
-          case ResourcePattern.ArrayLocation(t) => ArrayLocation(getters(0), getters(1))(PanicBlame("Design flaw: the structure should include wf somehow"))
-          case ResourcePattern.PointerLocation(t) => PointerLocation(getters.head)(PanicBlame("Design flaw: the structure should include wf somehow"))
-          case ResourcePattern.PredicateLocation(ref) => PredicateLocation(succ(ref), getters)
-          case ResourcePattern.InstancePredicateLocation(ref) => InstancePredicateLocation(succ(ref), getters.head, getters.tail)
-        }
+        def toResourceLoc(
+            getters: Seq[Expr[Post]],
+            pat: ResourcePattern.ResourcePatternLoc,
+        )(implicit o: Origin): Location[Post] =
+          pat match {
+            case ResourcePattern.HeapVariableLocation(ref) =>
+              HeapVariableLocation(succ(ref))
+            case ResourcePattern.FieldLocation(ref) =>
+              FieldLocation(getters.head, succ(ref))
+            case ResourcePattern.ModelLocation(ref) =>
+              ModelLocation(getters.head, succ(ref))
+            case ResourcePattern.SilverFieldLocation(ref) =>
+              SilverFieldLocation(getters.head, succ(ref))
+            case ResourcePattern.ArrayLocation(t) =>
+              ArrayLocation(getters(0), getters(1))(PanicBlame(
+                "Design flaw: the structure should include wf somehow"
+              ))
+            case ResourcePattern.PointerLocation(t) =>
+              PointerLocation(getters.head)(PanicBlame(
+                "Design flaw: the structure should include wf somehow"
+              ))
+            case ResourcePattern.PredicateLocation(ref) =>
+              PredicateLocation(succ(ref), getters)
+            case ResourcePattern.InstancePredicateLocation(ref) =>
+              InstancePredicateLocation(succ(ref), getters.head, getters.tail)
+          }
 
-        def toResource(getters: Seq[Expr[Post]], pat: ResourcePattern)(implicit o: Origin): Expr[Post] = pat match {
-          case ResourcePattern.Bool => getters.head
-          case ResourcePattern.Perm(loc) => Perm(toResourceLoc(getters.init, loc), getters.last)
-          case ResourcePattern.Value(loc) => Value(toResourceLoc(getters, loc))
-          case ResourcePattern.Predicate(p) => PredicateApply(succ(p), getters.init, getters.last)
-          case ResourcePattern.InstancePredicate(p) => InstancePredicateApply(getters.head, succ(p), getters.tail.init, getters.last)
-          case ResourcePattern.Star(left, right) =>
-            val split = freeTypes(left).size // indicative of a Really Good Abstraction
-            Star(toResource(getters.take(split), left), toResource(getters.drop(split), right))
-          case ResourcePattern.Implies(res) =>
-            Implies(getters.head, toResource(getters.tail, res))
-          case ResourcePattern.Select(whenTrue, whenFalse) =>
-            val whenTrueCount = freeTypes(whenTrue).size
-            Select(
-              getters.head,
-              toResource(getters.tail.take(whenTrueCount), whenTrue),
-              toResource(getters.tail.drop(whenTrueCount), whenFalse),
-            )
-        }
+        def toResource(getters: Seq[Expr[Post]], pat: ResourcePattern)(
+            implicit o: Origin
+        ): Expr[Post] =
+          pat match {
+            case ResourcePattern.Bool => getters.head
+            case ResourcePattern.Perm(loc) =>
+              Perm(toResourceLoc(getters.init, loc), getters.last)
+            case ResourcePattern.Value(loc) =>
+              Value(toResourceLoc(getters, loc))
+            case ResourcePattern.Predicate(p) =>
+              PredicateApply(succ(p), getters.init, getters.last)
+            case ResourcePattern.InstancePredicate(p) =>
+              InstancePredicateApply(
+                getters.head,
+                succ(p),
+                getters.tail.init,
+                getters.last,
+              )
+            case ResourcePattern.Star(left, right) =>
+              val split =
+                freeTypes(left).size // indicative of a Really Good Abstraction
+              Star(
+                toResource(getters.take(split), left),
+                toResource(getters.drop(split), right),
+              )
+            case ResourcePattern.Implies(res) =>
+              Implies(getters.head, toResource(getters.tail, res))
+            case ResourcePattern.Select(whenTrue, whenFalse) =>
+              val whenTrueCount = freeTypes(whenTrue).size
+              Select(
+                getters.head,
+                toResource(getters.tail.take(whenTrueCount), whenTrue),
+                toResource(getters.tail.drop(whenTrueCount), whenFalse),
+              )
+          }
 
         m(pattern) = PatternBuilder(
           index = index,
-          toValue = e => ADTFunctionInvocation[Post](Some(adt.ref -> Nil), buildFunc.ref, make(e, pattern)),
-          fromValue = e => toResource(getters.map(getter => ADTFunctionInvocation(Some(adt.ref -> Nil), getter.ref, Seq(e))), pattern)
+          toValue =
+            e =>
+              ADTFunctionInvocation[Post](
+                Some(adt.ref -> Nil),
+                buildFunc.ref,
+                make(e, pattern),
+              ),
+          fromValue =
+            e =>
+              toResource(
+                getters.map(getter =>
+                  ADTFunctionInvocation(
+                    Some(adt.ref -> Nil),
+                    getter.ref,
+                    Seq(e),
+                  )
+                ),
+                pattern,
+              ),
         )
 
         buildFunc +: kindAxiom +: (getters ++ getterAxioms)
       }
 
-      adt.fill(globalDeclarations.declare(new AxiomaticDataType[Post](kind +: decls, Nil)(o.where(name = "ResourceVal"))))
+      adt.fill(globalDeclarations.declare(
+        new AxiomaticDataType[Post](kind +: decls, Nil)(
+          o.where(name = "ResourceVal")
+        )
+      ))
 
-      val arbitraryValue = new Predicate(Seq(new Variable(valType)(o.where(name = "val"))), None)(o.where(name = "arbitraryResourceValue"))
+      val arbitraryValue =
+        new Predicate(Seq(new Variable(valType)(o.where(name = "val"))), None)(
+          o.where(name = "arbitraryResourceValue")
+        )
       globalDeclarations.declare(arbitraryValue)
 
       patternBuilders.having(m.toMap) {
         valAdt.having(adt.get) {
           arbitraryResourceValue.having(arbitraryValue) {
-            kindFunc.having(kind) {
-              program.declarations.foreach(dispatch)
-            }
+            kindFunc.having(kind) { program.declarations.foreach(dispatch) }
           }
         }
       }
     }._1)
   }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case ResourceValue(res) =>
-      patternBuilders.top(ResourcePattern.scan(res)).toValue(res)
-
-    case ResourceOfResourceValue(resourceValue) =>
-      implicit val o: Origin = e.o
-      val binding = new Variable[Post](TAxiomatic(valAdt.top.ref, Nil))(e.o.where(name = "v"))
-      val v = Local[Post](binding.ref)
-
-      val alts: Seq[(Expr[Post], Expr[Post])] = patternBuilders.top.values.map { builder =>
-        val cond = ADTFunctionInvocation[Post](Some(valAdt.top.ref -> Nil), kindFunc.top.ref, Seq(v)) === const(builder.index)
-        val res = builder.fromValue(v)
-        cond -> res
-      }.toSeq
-
-      val otherwise = PredicateApply[Post](arbitraryResourceValue.top.ref, Seq(v), WritePerm())
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case ResourceValue(res) =>
+        patternBuilders.top(ResourcePattern.scan(res)).toValue(res)
+
+      case ResourceOfResourceValue(resourceValue) =>
+        implicit val o: Origin = e.o
+        val binding =
+          new Variable[Post](TAxiomatic(valAdt.top.ref, Nil))(
+            e.o.where(name = "v")
+          )
+        val v = Local[Post](binding.ref)
+
+        val alts: Seq[(Expr[Post], Expr[Post])] =
+          patternBuilders.top.values.map { builder =>
+            val cond =
+              ADTFunctionInvocation[Post](
+                Some(valAdt.top.ref -> Nil),
+                kindFunc.top.ref,
+                Seq(v),
+              ) === const(builder.index)
+            val res = builder.fromValue(v)
+            cond -> res
+          }.toSeq
+
+        val otherwise = PredicateApply[Post](
+          arbitraryResourceValue.top.ref,
+          Seq(v),
+          WritePerm(),
+        )
 
-      val select = alts.foldRight[Expr[Post]](otherwise) {
-        case (cond -> res, otherwise) => Select(cond, res, otherwise)
-      }
+        val select =
+          alts.foldRight[Expr[Post]](otherwise) {
+            case (cond -> res, otherwise) => Select(cond, res, otherwise)
+          }
 
-      Let(binding, dispatch(resourceValue), select)
+        Let(binding, dispatch(resourceValue), select)
 
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(t: Type[Pre]): Type[Post] = t match {
-    case TResourceVal() => TAxiomatic(valAdt.top.ref, Nil)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    t match {
+      case TResourceVal() => TAxiomatic(valAdt.top.ref, Nil)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/EncodeSendRecv.scala b/src/rewrite/vct/rewrite/EncodeSendRecv.scala
index c1fafdb2e1..69f7d76ce0 100644
--- a/src/rewrite/vct/rewrite/EncodeSendRecv.scala
+++ b/src/rewrite/vct/rewrite/EncodeSendRecv.scala
@@ -5,8 +5,18 @@ import vct.col.ast.RewriteHelpers._
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, Rewritten}
 import vct.col.ast._
 import vct.col.ast.statement.composite.LoopImpl.IterationContractData
-import vct.col.rewrite.EncodeSendRecv.{DuplicateRecv, SendFailedExhaleFailed, WrongSendRecvPosition}
-import vct.col.origin.{Blame, DiagnosticOrigin, ExhaleFailed, Origin, SendFailed}
+import vct.col.rewrite.EncodeSendRecv.{
+  DuplicateRecv,
+  SendFailedExhaleFailed,
+  WrongSendRecvPosition,
+}
+import vct.col.origin.{
+  Blame,
+  DiagnosticOrigin,
+  ExhaleFailed,
+  Origin,
+  SendFailed,
+}
 import vct.col.ref.Ref
 import vct.col.util.AstBuildHelpers._
 import vct.col.util.Substitute
@@ -22,20 +32,27 @@ case object EncodeSendRecv extends RewriterBuilder {
   case class WrongSendRecvPosition(stat: Statement[_]) extends UserError {
     override def code: String = "wrongSendRecv"
     override def text: String =
-      stat.o.messageInContext("Send and recv may only occur within a parallel block, or loop with an iteration contract, and must be unconditionally executed.")
+      stat.o.messageInContext(
+        "Send and recv may only occur within a parallel block, or loop with an iteration contract, and must be unconditionally executed."
+      )
   }
 
   case class IncorrectSendDependency(dependency: Local[_]) extends UserError {
     override def code: String = "sendResDep"
     override def text: String =
-      dependency.o.messageInContext("This expression may not be constant with respect to the parallel block, or loop with an iteration contract.")
+      dependency.o.messageInContext(
+        "This expression may not be constant with respect to the parallel block, or loop with an iteration contract."
+      )
   }
 
   case class DuplicateRecv(left: Recv[_], right: Recv[_]) extends UserError {
     override def code: String = "dupRecv"
     override def text: String =
       Message.messagesInContext(
-        (left.o, "There must be at most one recv statement for a given send, but there is one here ..."),
+        (
+          left.o,
+          "There must be at most one recv statement for a given send, but there is one here ...",
+        ),
         (right.o, "... and here."),
       )
   }
@@ -58,59 +75,70 @@ case class EncodeSendRecv[Pre <: Generation]() extends Rewriter[Pre] {
     program.rewrite()
   }
 
-  val allowSendRecv: ScopedStack[Option[IterationContractData[Pre]]] = ScopedStack()
+  val allowSendRecv: ScopedStack[Option[IterationContractData[Pre]]] =
+    ScopedStack()
   allowSendRecv.push(None)
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case block: Block[Pre] => rewriteDefault(block)
-    case scope: Scope[Pre] => rewriteDefault(scope)
-    case label: Label[Pre] => rewriteDefault(label)
-
-    case loop @ Loop(_, _, _, IterationContract(_, _, _), _) =>
-      loop.getIterationContractData(DiagnosticOrigin) match {
-        case Left(err) => throw err
-        case Right(data) =>
-          allowSendRecv.having(Some(data)) { rewriteDefault(loop) }
-      }
-
-    case send @ Send(decl, _, res) =>
-      decl.drop()
-      allowSendRecv.top match {
-        case None =>
-          throw WrongSendRecvPosition(stat)
-        case Some(IterationContractData(v, _, upperBound)) =>
-          implicit val o: Origin = send.o
-          Exhale((dispatch(v.get) < dispatch(upperBound) - const(send.delta)) ==> dispatch(res))(SendFailedExhaleFailed(send))(stat.o)
-      }
-
-    case recv @ Recv(Ref(decl)) =>
-      val send = sendOfDecl(decl)
-
-      recvOfDecl.get(decl) match {
-        case Some(value) => throw DuplicateRecv(value, recv)
-        case None => recvOfDecl(decl) = recv
-      }
-
-      allowSendRecv.top match {
-        case None =>
-          throw WrongSendRecvPosition(stat)
-        case Some(IterationContractData(v, lowerBound, _)) =>
-          implicit val o: Origin = recv.o
-          val resource = Substitute(
-            Map[Expr[Pre], Expr[Pre]](v.get -> (v.get - const(send.delta))),
-          ).dispatch(send.res)
-          Inhale((dispatch(v.get) >= dispatch(lowerBound) + const(send.delta)) ==> dispatch(resource))(stat.o)
-      }
-
-    case other => allowSendRecv.having(None) { rewriteDefault(other) }
-  }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case block: Block[Pre] => rewriteDefault(block)
+      case scope: Scope[Pre] => rewriteDefault(scope)
+      case label: Label[Pre] => rewriteDefault(label)
+
+      case loop @ Loop(_, _, _, IterationContract(_, _, _), _) =>
+        loop.getIterationContractData(DiagnosticOrigin) match {
+          case Left(err) => throw err
+          case Right(data) =>
+            allowSendRecv.having(Some(data)) { rewriteDefault(loop) }
+        }
+
+      case send @ Send(decl, _, res) =>
+        decl.drop()
+        allowSendRecv.top match {
+          case None => throw WrongSendRecvPosition(stat)
+          case Some(IterationContractData(v, _, upperBound)) =>
+            implicit val o: Origin = send.o
+            Exhale(
+              (dispatch(v.get) < dispatch(upperBound) - const(send.delta)) ==>
+                dispatch(res)
+            )(SendFailedExhaleFailed(send))(stat.o)
+        }
+
+      case recv @ Recv(Ref(decl)) =>
+        val send = sendOfDecl(decl)
+
+        recvOfDecl.get(decl) match {
+          case Some(value) => throw DuplicateRecv(value, recv)
+          case None => recvOfDecl(decl) = recv
+        }
+
+        allowSendRecv.top match {
+          case None => throw WrongSendRecvPosition(stat)
+          case Some(IterationContractData(v, lowerBound, _)) =>
+            implicit val o: Origin = recv.o
+            val resource = Substitute(
+              Map[Expr[Pre], Expr[Pre]](v.get -> (v.get - const(send.delta)))
+            ).dispatch(send.res)
+            Inhale(
+              (dispatch(v.get) >= dispatch(lowerBound) + const(send.delta)) ==>
+                dispatch(resource)
+            )(stat.o)
+        }
+
+      case other => allowSendRecv.having(None) { rewriteDefault(other) }
+    }
 
-  override def dispatch(parRegion: ParRegion[Pre]): ParRegion[Post] = parRegion match {
-    case block @ ParBlock(_, iters, _, _, _, _) =>
-      iters match {
-        case Seq(v) => allowSendRecv.having(Some(IterationContractData(v.variable, v.from, v.to))) { block.rewrite() }
-        case _ => block.rewrite()
-      }
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(parRegion: ParRegion[Pre]): ParRegion[Post] =
+    parRegion match {
+      case block @ ParBlock(_, iters, _, _, _, _) =>
+        iters match {
+          case Seq(v) =>
+            allowSendRecv
+              .having(Some(IterationContractData(v.variable, v.from, v.to))) {
+                block.rewrite()
+              }
+          case _ => block.rewrite()
+        }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/EncodeString.scala b/src/rewrite/vct/rewrite/EncodeString.scala
index 12b87fbd61..b4c4af9dfc 100644
--- a/src/rewrite/vct/rewrite/EncodeString.scala
+++ b/src/rewrite/vct/rewrite/EncodeString.scala
@@ -1,7 +1,19 @@
 package vct.col.rewrite
 
 import vct.col.ast
-import vct.col.ast.{CharValue, Concat, Expr, LiteralSeq, StringConcat, StringValue, TChar, TInt, TSeq, TString, Type}
+import vct.col.ast.{
+  CharValue,
+  Concat,
+  Expr,
+  LiteralSeq,
+  StringConcat,
+  StringValue,
+  TChar,
+  TInt,
+  TSeq,
+  TString,
+  Type,
+}
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 import vct.col.ast.RewriteHelpers._
 import vct.col.rewrite.EncodeString.toCodepoints
@@ -26,14 +38,19 @@ case object EncodeString extends RewriterBuilder {
 }
 
 case class EncodeString[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = expr match {
-    case StringValue(data) => LiteralSeq[Post](TChar(), toCodepoints(data).map(CharValue(_)(expr.o)))(expr.o)
-    case StringConcat(l, r) => Concat(dispatch(l), dispatch(r))(expr.o)
-    case e => rewriteDefault(e)
-  }
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case StringValue(data) =>
+        LiteralSeq[Post](TChar(), toCodepoints(data).map(CharValue(_)(expr.o)))(
+          expr.o
+        )
+      case StringConcat(l, r) => Concat(dispatch(l), dispatch(r))(expr.o)
+      case e => rewriteDefault(e)
+    }
 
-  override def dispatch(t: Type[Pre]): Type[Post] = t match {
-    case TString() => TSeq[Post](TChar[Post]()(t.o))(t.o)
-    case t => rewriteDefault(t)
-  }
-}
\ No newline at end of file
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    t match {
+      case TString() => TSeq[Post](TChar[Post]()(t.o))(t.o)
+      case t => rewriteDefault(t)
+    }
+}
diff --git a/src/rewrite/vct/rewrite/EnumToDomain.scala b/src/rewrite/vct/rewrite/EnumToDomain.scala
index bd4c4cfc44..c6368adddf 100644
--- a/src/rewrite/vct/rewrite/EnumToDomain.scala
+++ b/src/rewrite/vct/rewrite/EnumToDomain.scala
@@ -23,8 +23,10 @@ case object EnumToDomain extends RewriterBuilder {
 }
 
 case class EnumToDomain[Pre <: Generation]() extends CoercingRewriter[Pre] {
-  val enumSucc: SuccessionMap[Enum[Pre], AxiomaticDataType[Post]] = SuccessionMap()
-  val constSucc: SuccessionMap[EnumConstant[Pre], ADTFunction[Post]] = SuccessionMap()
+  val enumSucc: SuccessionMap[Enum[Pre], AxiomaticDataType[Post]] =
+    SuccessionMap()
+  val constSucc: SuccessionMap[EnumConstant[Pre], ADTFunction[Post]] =
+    SuccessionMap()
   val eqDefs: SuccessionMap[Enum[Pre], ADTFunction[Post]] = SuccessionMap()
   val eqOptDefs: SuccessionMap[Enum[Pre], Function[Post]] = SuccessionMap()
 
@@ -32,108 +34,165 @@ case class EnumToDomain[Pre <: Generation]() extends CoercingRewriter[Pre] {
 
   val currentEnum: ScopedStack[Enum[Pre]] = ScopedStack()
 
-  def enumEq(a: Expr[Post], b: Expr[Post])(implicit enum: Enum[Pre], o: Origin): Expr[Post] =
-    ADTFunctionInvocation(None, eqDefs.ref[Post, ADTFunction[Post]](enum), Seq(a, b))(o)
-
-  def enumOptEq(a: Expr[Post], b: Expr[Post])(implicit enum: Enum[Pre], o: Origin): Expr[Post] =
-    FunctionInvocation(eqOptDefs.ref[Post, Function[Post]](enum), Seq(a, b), Seq(), Seq(), Seq())(PanicBlame("Precondition is trivial"))
+  def enumEq(
+      a: Expr[Post],
+      b: Expr[Post],
+  )(implicit enum: Enum[Pre], o: Origin): Expr[Post] =
+    ADTFunctionInvocation(
+      None,
+      eqDefs.ref[Post, ADTFunction[Post]](enum),
+      Seq(a, b),
+    )(o)
+
+  def enumOptEq(
+      a: Expr[Post],
+      b: Expr[Post],
+  )(implicit enum: Enum[Pre], o: Origin): Expr[Post] =
+    FunctionInvocation(
+      eqOptDefs.ref[Post, Function[Post]](enum),
+      Seq(a, b),
+      Seq(),
+      Seq(),
+      Seq(),
+    )(PanicBlame("Precondition is trivial"))
 
   def getConst(c: EnumConstant[Pre])(implicit o: Origin): Expr[Post] =
-    ADTFunctionInvocation(None, constSucc.ref[Post, ADTFunction[Post]](c), Seq())
+    ADTFunctionInvocation(
+      None,
+      constSucc.ref[Post, ADTFunction[Post]](c),
+      Seq(),
+    )
 
   def T(enum: Enum[Pre])(implicit o: Origin): Type[Post] =
     TAxiomatic(enumSucc.ref[Post, AxiomaticDataType[Post]](enum), Seq())
 
-  override def postCoerce(decl: Declaration[Pre]): Unit = decl match {
-    case enum: ast.Enum[Pre] =>
-      implicit val o = enum.o
-      implicit val enumImp: Enum[Pre] = enum
-      currentEnum.having(enum) {
-        aDTDeclarations.scope {
-          enumSucc(enum) = globalDeclarations.declare(new AxiomaticDataType(
-            aDTDeclarations.collect {
-              enum.constants.foreach(dispatch)
-
-              val eqDef: ADTFunction[Post] = aDTDeclarations.declare(new ADTFunction(Seq(new Variable(T(enum)), new Variable(T(enum))), TBool())(EqOrigin(enum.o)))
-              eqDefs(enum) = eqDef
-              val toIntDef: ADTFunction[Post] = aDTDeclarations.declare(new ADTFunction(Seq(new Variable(T(enum))), TInt())(ToIntOrigin(enum.o)))
-              val toInt: Expr[Post] => Expr[Post] = e => ADTFunctionInvocation(None, toIntDef.ref[ADTFunction[Post]], Seq(e))
-
-              // eqDef
-              aDTDeclarations.declare(new ADTAxiom(
-                foralls[Post](Seq(T(enum), T(enum)), { case Seq(a, b) =>
-                  (InlinePattern(enumEq(a, b))
-                  ===
-                  (toInt(a) === toInt(b)))
-                })))
-
-              // eqPost
-              aDTDeclarations.declare(new ADTAxiom(
-                foralls[Post](Seq(T(enum), T(enum)), { case Seq(a, b) =>
-                  (InlinePattern(enumEq(a, b))
-                    ==>
-                    (a === b))
-                })))
-
-              /// toIntAlts
-              aDTDeclarations.declare(new ADTAxiom(
-                foldAnd(
-                  enum.constants.zipWithIndex.map { case (eConst, i) =>
-                    (toInt(getConst(eConst)) === const(i))
-                  }
+  override def postCoerce(decl: Declaration[Pre]): Unit =
+    decl match {
+      case enum: ast.Enum[Pre] =>
+        implicit val o = enum.o
+        implicit val enumImp: Enum[Pre] = enum
+        currentEnum.having(enum) {
+          aDTDeclarations.scope {
+            enumSucc(enum) = globalDeclarations.declare(new AxiomaticDataType(
+              aDTDeclarations.collect {
+                enum.constants.foreach(dispatch)
+
+                val eqDef: ADTFunction[Post] = aDTDeclarations.declare(
+                  new ADTFunction(
+                    Seq(new Variable(T(enum)), new Variable(T(enum))),
+                    TBool(),
+                  )(EqOrigin(enum.o))
                 )
-              ))
-
-              // toIntRange
-              aDTDeclarations.declare(new ADTAxiom(
-                forall[Post](T(enum), e => (const(0) <= InlinePattern(toInt(e))) && (toInt(e) < const(enum.constants.length)))
-              ))
-            }._1, Seq()))
+                eqDefs(enum) = eqDef
+                val toIntDef: ADTFunction[Post] = aDTDeclarations
+                  .declare(new ADTFunction(Seq(new Variable(T(enum))), TInt())(
+                    ToIntOrigin(enum.o)
+                  ))
+                val toInt: Expr[Post] => Expr[Post] =
+                  e =>
+                    ADTFunctionInvocation(
+                      None,
+                      toIntDef.ref[ADTFunction[Post]],
+                      Seq(e),
+                    )
+
+                // eqDef
+                aDTDeclarations.declare(new ADTAxiom(foralls[Post](
+                  Seq(T(enum), T(enum)),
+                  {
+                    case Seq(a, b) => (
+                      InlinePattern(enumEq(a, b)) === (toInt(a) === toInt(b))
+                    )
+                  },
+                )))
+
+                // eqPost
+                aDTDeclarations.declare(new ADTAxiom(foralls[Post](
+                  Seq(T(enum), T(enum)),
+                  {
+                    case Seq(a, b) => (
+                      InlinePattern(enumEq(a, b)) ==> (a === b)
+                    )
+                  },
+                )))
+
+                /// toIntAlts
+                aDTDeclarations.declare(new ADTAxiom(foldAnd(
+                  enum.constants.zipWithIndex.map {
+                    case (eConst, i) => (toInt(getConst(eConst)) === const(i))
+                  }
+                )))
+
+                // toIntRange
+                aDTDeclarations.declare(new ADTAxiom(forall[Post](
+                  T(enum),
+                  e =>
+                    (const(0) <= InlinePattern(toInt(e))) &&
+                      (toInt(e) < const(enum.constants.length)),
+                )))
+              }._1,
+              Seq(),
+            ))
+          }
         }
-      }
 
-      // eqOptDef
-      val ax = new Variable(TOption(T(enum)))
-      val bx = new Variable(TOption(T(enum)))
-      eqOptDefs(enum) = globalDeclarations.declare(function[Post](
-        args = Seq(ax, bx),
-        returnType = TBool(),
-        body = Some(Select(
-          (ax.get === OptNone()) || (bx.get === OptNone()),
-          ax.get === bx.get,
-          enumEq(OptGet(ax.get)(PanicBlame("None check is done")), OptGet(bx.get)(PanicBlame("None check is done"))))),
-        blame = PanicBlame("Contract should be ok"),
-        contractBlame = PanicBlame("Contract should be satisfiable")
-      )(EqOptOrigin(enum.o)))
-
-    case const: EnumConstant[Pre] =>
-      constSucc(const) = aDTDeclarations.declare(new ADTFunction(Seq(), T(currentEnum.top)(const.o))(const.o))
-    case _ => rewriteDefault(decl)
-  }
+        // eqOptDef
+        val ax = new Variable(TOption(T(enum)))
+        val bx = new Variable(TOption(T(enum)))
+        eqOptDefs(enum) = globalDeclarations.declare(
+          function[Post](
+            args = Seq(ax, bx),
+            returnType = TBool(),
+            body = Some(Select(
+              (ax.get === OptNone()) || (bx.get === OptNone()),
+              ax.get === bx.get,
+              enumEq(
+                OptGet(ax.get)(PanicBlame("None check is done")),
+                OptGet(bx.get)(PanicBlame("None check is done")),
+              ),
+            )),
+            blame = PanicBlame("Contract should be ok"),
+            contractBlame = PanicBlame("Contract should be satisfiable"),
+          )(EqOptOrigin(enum.o))
+        )
+
+      case const: EnumConstant[Pre] =>
+        constSucc(const) = aDTDeclarations
+          .declare(new ADTFunction(Seq(), T(currentEnum.top)(const.o))(const.o))
+      case _ => rewriteDefault(decl)
+    }
 
   object EqTL {
-    def unapply[G](e: Expr[G]): Option[(Expr[G], Type[G])] = e match {
-      case Eq(a, _) => Some((e, a.t))
-      case Neq(a, _) => Some((e, a.t))
-      case _ => None
-    }
+    def unapply[G](e: Expr[G]): Option[(Expr[G], Type[G])] =
+      e match {
+        case Eq(a, _) => Some((e, a.t))
+        case Neq(a, _) => Some((e, a.t))
+        case _ => None
+      }
   }
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case EnumUse(_, const) => OptSome(getConst(const.decl)(e.o))(e.o)
-    case EqTL(Eq(a, b), TEnum(enum)) => enumOptEq(dispatch(a), dispatch(b))(enum.decl, e.o)
-    case EqTL(Neq(a, b), TEnum(enum)) => implicit val o = e.o; !enumOptEq(dispatch(a), dispatch(b))(enum.decl, e.o)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case EnumUse(_, const) => OptSome(getConst(const.decl)(e.o))(e.o)
+      case EqTL(Eq(a, b), TEnum(enum)) =>
+        enumOptEq(dispatch(a), dispatch(b))(enum.decl, e.o)
+      case EqTL(Neq(a, b), TEnum(enum)) =>
+        implicit val o = e.o;
+        !enumOptEq(dispatch(a), dispatch(b))(enum.decl, e.o)
+      case other => rewriteDefault(other)
+    }
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TEnum(enum) => TOption(T(enum.decl)(t.o))(t.o)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TEnum(enum) => TOption(T(enum.decl)(t.o))(t.o)
+      case other => rewriteDefault(other)
+    }
 
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = coercion match {
-    case CoerceNullEnum(_) =>
-      OptNone()(e.o)
-    case other => super.applyCoercion(e, other)
-  }
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    coercion match {
+      case CoerceNullEnum(_) => OptNone()(e.o)
+      case other => super.applyCoercion(e, other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/EvaluationTargetDummy.scala b/src/rewrite/vct/rewrite/EvaluationTargetDummy.scala
index 7445d075be..57fcaf4b49 100644
--- a/src/rewrite/vct/rewrite/EvaluationTargetDummy.scala
+++ b/src/rewrite/vct/rewrite/EvaluationTargetDummy.scala
@@ -8,61 +8,65 @@ import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 
 case object EvaluationTargetDummy extends RewriterBuilder {
   override def key: String = "evaluationTarget"
-  override def desc: String = "Make a target to assign to for evaluations that contain no side effects, but must be well-formed regardless."
+  override def desc: String =
+    "Make a target to assign to for evaluations that contain no side effects, but must be well-formed regardless."
 
-  private def EvaluationOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("evaluationDummy")),
-      LabelContext("evaluate"),
-    )
-  )
+  private def EvaluationOrigin: Origin =
+    Origin(Seq(PreferredName(Seq("evaluationDummy")), LabelContext("evaluate")))
 }
 
 case class EvaluationTargetDummy[Pre <: Generation]() extends Rewriter[Pre] {
   import EvaluationTargetDummy._
 
-  /**
-   * Returns whether it is not possible for the expression to yield verification failures. This is only for output
-   * prettification: it does not need to be complete.
-   */
-  def infallible(e: Expr[Pre]): Boolean = e match {
-    case Local(_) => true
-    case ADTFunctionInvocation(_, _, args) => args.forall(infallible)
+  /** Returns whether it is not possible for the expression to yield
+    * verification failures. This is only for output prettification: it does not
+    * need to be complete.
+    */
+  def infallible(e: Expr[Pre]): Boolean =
+    e match {
+      case Local(_) => true
+      case ADTFunctionInvocation(_, _, args) => args.forall(infallible)
 
-    case Exists(_, _, body) => infallible(body)
-    case Forall(_, _, body) => infallible(body)
-    case Let(_, value, body) => infallible(value) && infallible(body)
+      case Exists(_, _, body) => infallible(body)
+      case Forall(_, _, body) => infallible(body)
+      case Let(_, value, body) => infallible(value) && infallible(body)
 
-    case Plus(left, right) => infallible(left) && infallible(right)
-    case Minus(left, right) => infallible(left) && infallible(right)
-    case Mult(left, right) => infallible(left) && infallible(right)
-    case And(left, right) => infallible(left) && infallible(right)
-    case Or(left, right) => infallible(left) && infallible(right)
-    case Select(cond, whenTrue, whenFalse) => infallible(cond) && infallible(whenTrue) && infallible(whenFalse)
-    case Not(e) => infallible(e)
+      case Plus(left, right) => infallible(left) && infallible(right)
+      case Minus(left, right) => infallible(left) && infallible(right)
+      case Mult(left, right) => infallible(left) && infallible(right)
+      case And(left, right) => infallible(left) && infallible(right)
+      case Or(left, right) => infallible(left) && infallible(right)
+      case Select(cond, whenTrue, whenFalse) =>
+        infallible(cond) && infallible(whenTrue) && infallible(whenFalse)
+      case Not(e) => infallible(e)
 
-    case EitherLeft(e) => infallible(e)
-    case EitherRight(e) => infallible(e)
-    case LiteralBag(_, es) => es.forall(infallible)
-    case LiteralSeq(_, es) => es.forall(infallible)
-    case LiteralSet(_, es) => es.forall(infallible)
-    case LiteralMap(_, _, pairs) => pairs.forall { case (k, v) => infallible(k) && infallible(v) }
-    case LiteralTuple(_, es) => es.forall(infallible)
-    case OptSome(e) => infallible(e)
-    case Range(from, to) => infallible(from) && infallible(to)
+      case EitherLeft(e) => infallible(e)
+      case EitherRight(e) => infallible(e)
+      case LiteralBag(_, es) => es.forall(infallible)
+      case LiteralSeq(_, es) => es.forall(infallible)
+      case LiteralSet(_, es) => es.forall(infallible)
+      case LiteralMap(_, _, pairs) =>
+        pairs.forall { case (k, v) => infallible(k) && infallible(v) }
+      case LiteralTuple(_, es) => es.forall(infallible)
+      case OptSome(e) => infallible(e)
+      case Range(from, to) => infallible(from) && infallible(to)
 
-    case BooleanValue(_) | FloatValue(_, _) | IntegerValue(_) => true
-    case NoPerm() | Null() | OptNone() | ReadPerm() | Void() | WritePerm() => true
+      case BooleanValue(_) | FloatValue(_, _) | IntegerValue(_) => true
+      case NoPerm() | Null() | OptNone() | ReadPerm() | Void() | WritePerm() =>
+        true
 
-    case _ => false
-  }
+      case _ => false
+    }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case Eval(e) if infallible(e) =>
-      Block(Nil)(stat.o)
-    case Eval(other) =>
-      val v = new Variable[Post](dispatch(other.t))(EvaluationOrigin)
-      Scope(Seq(v), assignLocal(v.get(EvaluationOrigin), dispatch(other))(stat.o))(stat.o)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case Eval(e) if infallible(e) => Block(Nil)(stat.o)
+      case Eval(other) =>
+        val v = new Variable[Post](dispatch(other.t))(EvaluationOrigin)
+        Scope(
+          Seq(v),
+          assignLocal(v.get(EvaluationOrigin), dispatch(other))(stat.o),
+        )(stat.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/ExplicitADTTypeArgs.scala b/src/rewrite/vct/rewrite/ExplicitADTTypeArgs.scala
index 860ba80261..3f0b4caf1d 100644
--- a/src/rewrite/vct/rewrite/ExplicitADTTypeArgs.scala
+++ b/src/rewrite/vct/rewrite/ExplicitADTTypeArgs.scala
@@ -13,53 +13,68 @@ import scala.collection.mutable
 
 case object ExplicitADTTypeArgs extends RewriterBuilder {
   override def key: String = "adtTypeArgs"
-  override def desc: String = "Specify explicit type arguments for function invocations in axiomatic datatypes."
+  override def desc: String =
+    "Specify explicit type arguments for function invocations in axiomatic datatypes."
 
-  case class UnspecifiedADTTypeArgs(inv: ADTFunctionInvocation[_]) extends UserError {
+  case class UnspecifiedADTTypeArgs(inv: ADTFunctionInvocation[_])
+      extends UserError {
     override def code: String = "typeArgs"
     override def text: String =
-      inv.o.messageInContext("Missing type parameters for ADT function invocation.")
+      inv.o.messageInContext(
+        "Missing type parameters for ADT function invocation."
+      )
   }
 }
 
 case class ExplicitADTTypeArgs[Pre <: Generation]() extends Rewriter[Pre] {
-  val owner: mutable.Map[ADTFunction[Pre], AxiomaticDataType[Pre]] = mutable.Map()
+  val owner: mutable.Map[ADTFunction[Pre], AxiomaticDataType[Pre]] = mutable
+    .Map()
   val currentAdt: ScopedStack[AxiomaticDataType[Pre]] = ScopedStack()
 
   override def dispatch(program: Program[Pre]): Program[Rewritten[Pre]] = {
     program.declarations.foreach {
-      case adt: AxiomaticDataType[Pre] => adt.decls.foreach {
-        case func: ADTFunction[Pre] => owner(func) = adt
-        case _ =>
-      }
+      case adt: AxiomaticDataType[Pre] =>
+        adt.decls.foreach {
+          case func: ADTFunction[Pre] => owner(func) = adt
+          case _ =>
+        }
       case _ =>
     }
     program.rewrite()
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case adt: AxiomaticDataType[Pre] =>
-      currentAdt.having(adt) {
-        rewriteDefault(adt)
-      }
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case adt: AxiomaticDataType[Pre] =>
+        currentAdt.having(adt) { rewriteDefault(adt) }
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case specified@ADTFunctionInvocation(Some(_), _, _) => rewriteDefault(specified)
-    case unspecified@ADTFunctionInvocation(None, Ref(func), args) =>
-      if (currentAdt.nonEmpty && owner(func) == currentAdt.top) {
-        ADTFunctionInvocation[Post](
-          typeArgs = Some((succ(owner(func)), owner(func).typeArgs.map(v => TVar(succ[Variable[Post]](v))))),
-          ref = succ(func),
-          args = args.map(dispatch),
-        )(e.o)
-      } else {
-        owner(func).typeArgs match {
-          case Nil => ADTFunctionInvocation[Post](Some((succ(owner(func)), Nil)), succ(func), args.map(dispatch))(e.o)
-          case _ => throw UnspecifiedADTTypeArgs(unspecified)
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case specified @ ADTFunctionInvocation(Some(_), _, _) =>
+        rewriteDefault(specified)
+      case unspecified @ ADTFunctionInvocation(None, Ref(func), args) =>
+        if (currentAdt.nonEmpty && owner(func) == currentAdt.top) {
+          ADTFunctionInvocation[Post](
+            typeArgs = Some((
+              succ(owner(func)),
+              owner(func).typeArgs.map(v => TVar(succ[Variable[Post]](v))),
+            )),
+            ref = succ(func),
+            args = args.map(dispatch),
+          )(e.o)
+        } else {
+          owner(func).typeArgs match {
+            case Nil =>
+              ADTFunctionInvocation[Post](
+                Some((succ(owner(func)), Nil)),
+                succ(func),
+                args.map(dispatch),
+              )(e.o)
+            case _ => throw UnspecifiedADTTypeArgs(unspecified)
+          }
         }
-      }
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/ExplicitResourceValues.scala b/src/rewrite/vct/rewrite/ExplicitResourceValues.scala
index 71513f0333..8bf510fb3c 100644
--- a/src/rewrite/vct/rewrite/ExplicitResourceValues.scala
+++ b/src/rewrite/vct/rewrite/ExplicitResourceValues.scala
@@ -1,19 +1,31 @@
 package vct.rewrite
 
-import vct.col.ast.{CoerceResourceResourceVal, CoerceResourceValResource, Coercion, Expr, ResourceOfResourceValue, ResourceValue}
+import vct.col.ast.{
+  CoerceResourceResourceVal,
+  CoerceResourceValResource,
+  Coercion,
+  Expr,
+  ResourceOfResourceValue,
+  ResourceValue,
+}
 import vct.col.origin.Origin
 import vct.col.rewrite.{Generation, RewriterBuilder}
 import vct.col.typerules.CoercingRewriter
 
 case object ExplicitResourceValues extends RewriterBuilder {
   override def key: String = "resourceValues1"
-  override def desc: String = "Encode resoure value <-> resource conversion explicitly in the AST for later accounting."
+  override def desc: String =
+    "Encode resoure value <-> resource conversion explicitly in the AST for later accounting."
 }
 
-case class ExplicitResourceValues[Pre <: Generation]() extends CoercingRewriter[Pre] {
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = coercion match {
-    case CoerceResourceResourceVal() => ResourceValue(e)
-    case CoerceResourceValResource() => ResourceOfResourceValue(e)
-    case other => super.applyCoercion(e, other)
-  }
+case class ExplicitResourceValues[Pre <: Generation]()
+    extends CoercingRewriter[Pre] {
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    coercion match {
+      case CoerceResourceResourceVal() => ResourceValue(e)
+      case CoerceResourceValResource() => ResourceOfResourceValue(e)
+      case other => super.applyCoercion(e, other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/Explode.scala b/src/rewrite/vct/rewrite/Explode.scala
index c548c9cb7b..de8eff03dc 100644
--- a/src/rewrite/vct/rewrite/Explode.scala
+++ b/src/rewrite/vct/rewrite/Explode.scala
@@ -3,7 +3,15 @@ package vct.col.rewrite
 import hre.util.ScopedStack
 import vct.col.ast.RewriteHelpers._
 import vct.col.ast._
-import vct.col.origin.{AbstractApplicable, Blame, Origin, PanicBlame, PreferredName, UnsafeDontCare, VerificationFailure}
+import vct.col.origin.{
+  AbstractApplicable,
+  Blame,
+  Origin,
+  PanicBlame,
+  PreferredName,
+  UnsafeDontCare,
+  VerificationFailure,
+}
 import vct.col.ref.Ref
 import vct.col.rewrite.Explode.{UnknownDeclaration, VerifiedElsewhereBlame}
 import vct.col.util.AstBuildHelpers._
@@ -14,11 +22,15 @@ import scala.collection.mutable.ArrayBuffer
 
 case object Explode extends RewriterBuilderArg[Boolean] {
   override def key: String = "explode"
-  override def desc: String = "Split out verifications over entities, by eliding unrelated declarations and abstracting relevant ones."
+  override def desc: String =
+    "Split out verifications over entities, by eliding unrelated declarations and abstracting relevant ones."
 
-  case class UnknownDeclaration(program: Program[_], decl: Declaration[_]) extends SystemError {
+  case class UnknownDeclaration(program: Program[_], decl: Declaration[_])
+      extends SystemError {
     override def text: String =
-      program.highlight(decl).messageInContext(s"Unknown declaration kind at this point: ${decl.getClass.getSimpleName}")
+      program.highlight(decl).messageInContext(
+        s"Unknown declaration kind at this point: ${decl.getClass.getSimpleName}"
+      )
   }
 
   case object VerifiedElsewhereBlame extends Blame[VerificationFailure] {
@@ -30,26 +42,24 @@ case object Explode extends RewriterBuilderArg[Boolean] {
 
 case class Explode[Pre <: Generation](enable: Boolean) extends Rewriter[Pre] {
   case class FocusedProgram(
-    adts: Seq[AxiomaticDataType[Pre]],
-    fields: Seq[SilverField[Pre]],
-    funcs: Seq[Function[Pre]],
-    predOutlines: Seq[Predicate[Pre]],
-    predBodies: Seq[Predicate[Pre]],
-    procOutlines: Seq[Procedure[Pre]],
-    procBodies: Seq[Procedure[Pre]],
+      adts: Seq[AxiomaticDataType[Pre]],
+      fields: Seq[SilverField[Pre]],
+      funcs: Seq[Function[Pre]],
+      predOutlines: Seq[Predicate[Pre]],
+      predBodies: Seq[Predicate[Pre]],
+      procOutlines: Seq[Procedure[Pre]],
+      procBodies: Seq[Procedure[Pre]],
   ) {
     require(procBodies.forall(procOutlines.contains))
     require(predBodies.forall(predOutlines.contains))
 
     lazy val scanNodes: Seq[Node[Pre]] =
-      adts ++
-        fields ++
-        funcs ++
+      adts ++ fields ++ funcs ++
         // PB: it's probably nonsense to include args, types, but for consistency: all subnodes except the body
-        predOutlines.flatMap(_.args) ++
-        predBodies.flatMap(_.body.toSeq) ++
-        procOutlines.flatMap(p => p.contract +: p.returnType +: (p.args ++ p.outArgs ++ p.typeArgs)) ++
-        procBodies.flatMap(_.body.toSeq)
+        predOutlines.flatMap(_.args) ++ predBodies.flatMap(_.body.toSeq) ++
+        procOutlines.flatMap(p =>
+          p.contract +: p.returnType +: (p.args ++ p.outArgs ++ p.typeArgs)
+        ) ++ procBodies.flatMap(_.body.toSeq)
 
     def fieldUsage: Seq[SilverField[Pre]] =
       scanNodes.flatMap(_.flatCollect {
@@ -99,8 +109,10 @@ case class Explode[Pre <: Generation](enable: Boolean) extends Rewriter[Pre] {
     @tailrec
     final def fixpoint: FocusedProgram = {
       val next = step
-      if(this == next) this
-      else next.fixpoint
+      if (this == next)
+        this
+      else
+        next.fixpoint
     }
 
     def sort(other: FocusedProgram): FocusedProgram =
@@ -121,8 +133,10 @@ case class Explode[Pre <: Generation](enable: Boolean) extends Rewriter[Pre] {
           fields.foreach(dispatch)
           funcs.foreach(dispatch)
           predOutlines.foreach { pred =>
-            if(predBodies.contains(pred)) dispatch(pred)
-            else globalDeclarations.succeed(pred, pred.rewrite(body = None))
+            if (predBodies.contains(pred))
+              dispatch(pred)
+            else
+              globalDeclarations.succeed(pred, pred.rewrite(body = None))
           }
           procOutlines.filterNot(procBodies.contains).foreach { proc =>
             globalDeclarations.succeed(proc, proc.rewrite(body = None))
@@ -132,13 +146,26 @@ case class Explode[Pre <: Generation](enable: Boolean) extends Rewriter[Pre] {
       }._1
 
     def focus(proc: Procedure[Pre]): Seq[GlobalDeclaration[Post]] =
-      sort(FocusedProgram(adts, Nil, funcs.filter(_.contract.decreases.isEmpty), Nil, Nil, Seq(proc), Seq(proc)).fixpoint).toDecls
+      sort(
+        FocusedProgram(
+          adts,
+          Nil,
+          funcs.filter(_.contract.decreases.isEmpty),
+          Nil,
+          Nil,
+          Seq(proc),
+          Seq(proc),
+        ).fixpoint
+      ).toDecls
   }
 
   val verifiedElsewhere: ScopedStack[Unit] = ScopedStack()
 
   override def dispatch[T <: VerificationFailure](blame: Blame[T]): Blame[T] =
-    if(verifiedElsewhere.nonEmpty) VerifiedElsewhereBlame else blame
+    if (verifiedElsewhere.nonEmpty)
+      VerifiedElsewhereBlame
+    else
+      blame
 
   def split(program: Program[Pre]): FocusedProgram = {
     val adts: ArrayBuffer[AxiomaticDataType[Pre]] = ArrayBuffer()
@@ -156,20 +183,41 @@ case class Explode[Pre <: Generation](enable: Boolean) extends Rewriter[Pre] {
       case other => throw UnknownDeclaration(program, other)
     }
 
-    FocusedProgram(adts.toSeq, fields.toSeq, funcs.toSeq, preds.toSeq, preds.toSeq, procs.toSeq, procs.toSeq)
+    FocusedProgram(
+      adts.toSeq,
+      fields.toSeq,
+      funcs.toSeq,
+      preds.toSeq,
+      preds.toSeq,
+      procs.toSeq,
+      procs.toSeq,
+    )
   }
 
   override def dispatch(verification: Verification[Pre]): Verification[Post] =
-    if(enable) verification.rewrite(tasks = verification.tasks.flatMap(explode))
-    else verification.rewrite()
-
-  def make(context: VerificationContext[Pre], decls: => Seq[GlobalDeclaration[Post]]): VerificationContext[Post] =
-    VerificationContext(context.program.rewrite(declarations = decls))(context.o)
-
-  def explode(context: VerificationContext[Pre]): Seq[VerificationContext[Post]] = {
+    if (enable)
+      verification.rewrite(tasks = verification.tasks.flatMap(explode))
+    else
+      verification.rewrite()
+
+  def make(
+      context: VerificationContext[Pre],
+      decls: => Seq[GlobalDeclaration[Post]],
+  ): VerificationContext[Post] =
+    VerificationContext(context.program.rewrite(declarations = decls))(
+      context.o
+    )
+
+  def explode(
+      context: VerificationContext[Pre]
+  ): Seq[VerificationContext[Post]] = {
     val program = split(context.program)
 
-    make(context, globalDeclarations.dispatch(program.adts ++ program.fields ++ program.funcs ++ program.predBodies)) +:
-      program.procBodies.map(proc => make(context, program.focus(proc)))
+    make(
+      context,
+      globalDeclarations.dispatch(
+        program.adts ++ program.fields ++ program.funcs ++ program.predBodies
+      ),
+    ) +: program.procBodies.map(proc => make(context, program.focus(proc)))
   }
 }
diff --git a/src/rewrite/vct/rewrite/ExtractInlineQuantifierPatterns.scala b/src/rewrite/vct/rewrite/ExtractInlineQuantifierPatterns.scala
index 5bace19178..825d188c08 100644
--- a/src/rewrite/vct/rewrite/ExtractInlineQuantifierPatterns.scala
+++ b/src/rewrite/vct/rewrite/ExtractInlineQuantifierPatterns.scala
@@ -11,18 +11,28 @@ import scala.collection.mutable.ArrayBuffer
 
 case object ExtractInlineQuantifierPatterns extends RewriterBuilder {
   override def key: String = "inlineQuantifierPattern"
-  override def desc: String = "Rewrite inline quantifier patterns into triggers."
+  override def desc: String =
+    "Rewrite inline quantifier patterns into triggers."
 
   case class NotAllowedInTrigger(e: Expr[_]) extends UserError {
     override def code: String = "notAllowedInTrigger"
-    override def text: String = e.o.messageInContext("Arithmetic and logic operators are not allowed in triggers.")
+    override def text: String =
+      e.o.messageInContext(
+        "Arithmetic and logic operators are not allowed in triggers."
+      )
   }
 }
 
-case class ExtractInlineQuantifierPatterns[Pre <: Generation]() extends Rewriter[Pre] { outer =>
+case class ExtractInlineQuantifierPatterns[Pre <: Generation]()
+    extends Rewriter[Pre] {
+  outer =>
   // PB: letBindingsHere are all let bindings valid at the site where the trigger is defined: they need to be inlined,
   // since the extraction of the trigger may cross the body of the let.
-  case class Pattern(group: Int, pattern: Expr[Pre], letBindingsHere: Map[Variable[Pre], Expr[Pre]]) {
+  case class Pattern(
+      group: Int,
+      pattern: Expr[Pre],
+      letBindingsHere: Map[Variable[Pre], Expr[Pre]],
+  ) {
     def make(): Expr[Post] = MakePattern(this).dispatch(pattern)
   }
 
@@ -35,118 +45,118 @@ case class ExtractInlineQuantifierPatterns[Pre <: Generation]() extends Rewriter
     override val allScopes = outer.allScopes
     val inScale: ScopedStack[Unit] = ScopedStack()
 
-    override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-      // PB: don't add nodes here just to be conservative: in general all terms are allowable in patterns, *except*
-      // that z3 disallows all Bool-related operators, and Viper additionally disallows all arithmetic operators. Any
-      // other operators is necessarily encoded as an smt function (allowed), or banned due to being a side effect
-      // (later dealt with rigorously).
-      case e if inScale.nonEmpty => e.rewriteDefault()
+    override def dispatch(e: Expr[Pre]): Expr[Post] =
+      e match {
+        // PB: don't add nodes here just to be conservative: in general all terms are allowable in patterns, *except*
+        // that z3 disallows all Bool-related operators, and Viper additionally disallows all arithmetic operators. Any
+        // other operators is necessarily encoded as an smt function (allowed), or banned due to being a side effect
+        // (later dealt with rigorously).
+        case e if inScale.nonEmpty => e.rewriteDefault()
 
-      case And(_, _) | Or(_, _) | Implies(_, _) | Star(_, _) | Wand(_, _) | PolarityDependent(_, _) =>
-        throw NotAllowedInTrigger(e)
+        case And(_, _) | Or(_, _) | Implies(_, _) | Star(_, _) | Wand(_, _) |
+            PolarityDependent(_, _) =>
+          throw NotAllowedInTrigger(e)
 
-      case _: Forall[Pre] | _: Starall[Pre] | _: Exists[Pre] =>
-        throw NotAllowedInTrigger(e)
+        case _: Forall[Pre] | _: Starall[Pre] | _: Exists[Pre] =>
+          throw NotAllowedInTrigger(e)
 
-      case Eq(_, _) | Neq(_, _) | Less(_, _) | Greater(_, _) | LessEq(_, _) | GreaterEq(_, _) =>
-        throw NotAllowedInTrigger(e)
+        case Eq(_, _) | Neq(_, _) | Less(_, _) | Greater(_, _) | LessEq(_, _) |
+            GreaterEq(_, _) =>
+          throw NotAllowedInTrigger(e)
 
-      case Plus(_, _) | Minus(_, _) | Mult(_, _) | FloatDiv(_, _) | RatDiv(_, _) | FloorDiv(_, _) | Mod(_, _) =>
-        throw NotAllowedInTrigger(e)
+        case Plus(_, _) | Minus(_, _) | Mult(_, _) | FloatDiv(_, _) |
+            RatDiv(_, _) | FloorDiv(_, _) | Mod(_, _) =>
+          throw NotAllowedInTrigger(e)
 
-      case InlinePattern(inner, _, _) => dispatch(inner)
+        case InlinePattern(inner, _, _) => dispatch(inner)
 
-      case Local(Ref(v)) if pattern.letBindingsHere.contains(v) => dispatch(pattern.letBindingsHere(v))
+        case Local(Ref(v)) if pattern.letBindingsHere.contains(v) =>
+          dispatch(pattern.letBindingsHere(v))
 
-      case p@PredicateApply(ref, args, perm) =>
-        val newPerm = inScale.having(()){
-          dispatch(perm)
-        }
-        PredicateApply(succ[Predicate[Post]](ref.decl), args.map(dispatch), newPerm)(e.o)
+        case p @ PredicateApply(ref, args, perm) =>
+          val newPerm = inScale.having(()) { dispatch(perm) }
+          PredicateApply(
+            succ[Predicate[Post]](ref.decl),
+            args.map(dispatch),
+            newPerm,
+          )(e.o)
 
-      case e => rewriteDefault(e)
-    }
+        case e => rewriteDefault(e)
+      }
   }
 
   override def dispatch(p: Program[Pre]): Program[Post] =
     letBindings.having(ScopedStack()) { p.rewrite() }
 
-  override def dispatch(loc: Location[Pre]): Location[Post] = loc match {
-    case InLinePatternLocation(loc, pat) =>
-      dispatch(pat)
-      dispatch(loc)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(loc: Location[Pre]): Location[Post] =
+    loc match {
+      case InLinePatternLocation(loc, pat) =>
+        dispatch(pat)
+        dispatch(loc)
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case Let(binding, value, _) =>
-      letBindings.top.having(binding -> value) { rewriteDefault(e) }
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case Let(binding, value, _) =>
+        letBindings.top.having(binding -> value) { rewriteDefault(e) }
 
-    case i: InlinePattern[Pre] =>
-      if(patterns.toSeq.isDefinedAt(i.parent)) {
-        // We only inline let bindings defined inside the current quantifier
-        patterns.toSeq(i.parent) += Pattern(i.group, i.inner, letBindings.top.toSeq.toMap)
-      }
-      dispatch(i.inner)
-
-    case f: Forall[Pre] =>
-      variables.scope {
-        val (patternsHere, body) = patterns.collect {
-          // We only want to inline lets that are defined inside the quantifier
-          letBindings.having(ScopedStack()) {
-            dispatch(f.body)
+      case i: InlinePattern[Pre] =>
+        if (patterns.toSeq.isDefinedAt(i.parent)) {
+          // We only inline let bindings defined inside the current quantifier
+          patterns.toSeq(i.parent) +=
+            Pattern(i.group, i.inner, letBindings.top.toSeq.toMap)
+        }
+        dispatch(i.inner)
+
+      case f: Forall[Pre] =>
+        variables.scope {
+          val (patternsHere, body) = patterns.collect {
+            // We only want to inline lets that are defined inside the quantifier
+            letBindings.having(ScopedStack()) { dispatch(f.body) }
           }
+          val unsortedGroups = patternsHere.groupBy(_.group)
+          val sortedGroups = unsortedGroups.toSeq.sortBy(_._1).map(_._2)
+          val triggers = sortedGroups.map(_.map(_.make()))
+          Forall(
+            bindings = variables.collect { f.bindings.foreach(dispatch) }._1,
+            triggers = f.triggers.map(_.map(dispatch)) ++ triggers,
+            body = body,
+          )(f.o)
         }
-        val unsortedGroups = patternsHere.groupBy(_.group)
-        val sortedGroups = unsortedGroups.toSeq.sortBy(_._1).map(_._2)
-        val triggers = sortedGroups.map(_.map(_.make()))
-        Forall(
-          bindings = variables.collect { f.bindings.foreach(dispatch) }._1,
-          triggers = f.triggers.map(_.map(dispatch)) ++ triggers,
-          body = body
-        )(f.o)
-      }
 
-    case f: Starall[Pre] =>
-      variables.scope {
-        val (patternsHere, body) = patterns.collect {
-          // We only want to inline lets that are defined inside the quantifier
-          letBindings.having(ScopedStack()) {
-            dispatch(f.body)
+      case f: Starall[Pre] =>
+        variables.scope {
+          val (patternsHere, body) = patterns.collect {
+            // We only want to inline lets that are defined inside the quantifier
+            letBindings.having(ScopedStack()) { dispatch(f.body) }
           }
+          val unsortedGroups = patternsHere.groupBy(_.group)
+          val sortedGroups = unsortedGroups.toSeq.sortBy(_._1).map(_._2)
+          val triggers = sortedGroups.map(_.map(_.make()))
+          Starall(
+            bindings = variables.collect { f.bindings.foreach(dispatch) }._1,
+            triggers = f.triggers.map(_.map(dispatch)) ++ triggers,
+            body = body,
+          )(f.blame)(f.o)
         }
-        val unsortedGroups = patternsHere.groupBy(_.group)
-        val sortedGroups = unsortedGroups.toSeq.sortBy(_._1).map(_._2)
-        val triggers = sortedGroups.map(_.map(_.make()))
-        Starall(
-          bindings = variables.collect {
-            f.bindings.foreach(dispatch)
-          }._1,
-          triggers = f.triggers.map(_.map(dispatch)) ++ triggers,
-          body = body
-        )(f.blame)(f.o)
-      }
 
-    case f: Exists[Pre] =>
-      variables.scope {
-        val (patternsHere, body) = patterns.collect {
-          // We only want to inline lets that are defined inside the quantifier
-          letBindings.having(ScopedStack()) {
-            dispatch(f.body)
+      case f: Exists[Pre] =>
+        variables.scope {
+          val (patternsHere, body) = patterns.collect {
+            // We only want to inline lets that are defined inside the quantifier
+            letBindings.having(ScopedStack()) { dispatch(f.body) }
           }
+          val unsortedGroups = patternsHere.groupBy(_.group)
+          val sortedGroups = unsortedGroups.toSeq.sortBy(_._1).map(_._2)
+          val triggers = sortedGroups.map(_.map(_.make()))
+          Exists(
+            bindings = variables.collect { f.bindings.foreach(dispatch) }._1,
+            triggers = f.triggers.map(_.map(dispatch)) ++ triggers,
+            body = body,
+          )(f.o)
         }
-        val unsortedGroups = patternsHere.groupBy(_.group)
-        val sortedGroups = unsortedGroups.toSeq.sortBy(_._1).map(_._2)
-        val triggers = sortedGroups.map(_.map(_.make()))
-        Exists(
-          bindings = variables.collect {
-            f.bindings.foreach(dispatch)
-          }._1,
-          triggers = f.triggers.map(_.map(dispatch)) ++ triggers,
-          body = body
-        )(f.o)
-      }
 
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/FilterSpecIgnore.scala b/src/rewrite/vct/rewrite/FilterSpecIgnore.scala
index f976dbc982..9a074ddb23 100644
--- a/src/rewrite/vct/rewrite/FilterSpecIgnore.scala
+++ b/src/rewrite/vct/rewrite/FilterSpecIgnore.scala
@@ -5,14 +5,19 @@ import vct.col.ast._
 import scala.collection.mutable.ArrayBuffer
 import RewriteHelpers._
 import vct.col.ref.Ref
-import vct.col.rewrite.FilterSpecIgnore.{DanglingIgnoreStart, DeclarationInUse, ExtraIgnoreEnd}
+import vct.col.rewrite.FilterSpecIgnore.{
+  DanglingIgnoreStart,
+  DeclarationInUse,
+  ExtraIgnoreEnd,
+}
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 import vct.result.Message
 import vct.result.VerificationError.UserError
 
 case object FilterSpecIgnore extends RewriterBuilder {
   override def key: String = "specIgnore"
-  override def desc: String = "Remove elements that are ignored with spec_ignore."
+  override def desc: String =
+    "Remove elements that are ignored with spec_ignore."
 
   case class DanglingIgnoreStart(start: SpecIgnoreStart[_]) extends UserError {
     override def code: String = "danglingSpecIgnore"
@@ -28,64 +33,65 @@ case object FilterSpecIgnore extends RewriterBuilder {
 
   case class DeclarationInUse(usage: Node[_], decl: Node[_]) extends UserError {
     override def code: String = "declarationInUse"
-    override def text: String = Message.messagesInContext(
-      (decl.o, "This node cannot be filtered..."),
-      (usage.o, "...because of the usage here")
-    )
+    override def text: String =
+      Message.messagesInContext(
+        (decl.o, "This node cannot be filtered..."),
+        (usage.o, "...because of the usage here"),
+      )
   }
 }
 
 case class FilterSpecIgnore[Pre <: Generation]() extends Rewriter[Pre] {
   var program: Program[Pre] = null
 
-  lazy val keepApplicables: Map[ContractApplicable[Pre], Node[Pre]] = program.collect {
-    case endpoint: Endpoint[Pre] => (endpoint.constructor.decl, endpoint)
-    case invocation: ProcedureInvocation[Pre] => (invocation.ref.decl, invocation)
-  }.toMap
+  lazy val keepApplicables: Map[ContractApplicable[Pre], Node[Pre]] =
+    program.collect {
+      case endpoint: Endpoint[Pre] => (endpoint.constructor.decl, endpoint)
+      case invocation: ProcedureInvocation[Pre] =>
+        (invocation.ref.decl, invocation)
+    }.toMap
 
   override def dispatch(p: Program[Pre]): Program[Post] = {
     this.program = p
     p.rewriteDefault()
   }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case block@Block(statements) =>
-      var opens: Seq[SpecIgnoreStart[_]] = Nil
-      val result = ArrayBuffer[Statement[Post]]()
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case block @ Block(statements) =>
+        var opens: Seq[SpecIgnoreStart[_]] = Nil
+        val result = ArrayBuffer[Statement[Post]]()
 
-      statements.foreach {
-        case start: SpecIgnoreStart[_] =>
-          opens :+= start
-        case end: SpecIgnoreEnd[_] =>
-          opens match {
-            case Nil => throw ExtraIgnoreEnd(end)
-            case _ => opens = opens.init
-          }
-        case other =>
-          if(opens.isEmpty) {
-            result += rewriteDefault(other)
-          }
-      }
+        statements.foreach {
+          case start: SpecIgnoreStart[_] => opens :+= start
+          case end: SpecIgnoreEnd[_] =>
+            opens match {
+              case Nil => throw ExtraIgnoreEnd(end)
+              case _ => opens = opens.init
+            }
+          case other => if (opens.isEmpty) { result += rewriteDefault(other) }
+        }
 
-      opens match {
-        case Nil =>
-        case some => throw DanglingIgnoreStart(some.last)
-      }
+        opens match {
+          case Nil =>
+          case some => throw DanglingIgnoreStart(some.last)
+        }
 
-      block.rewrite(result.toSeq)
-    case other => rewriteDefault(other)
-  }
+        block.rewrite(result.toSeq)
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case app: ContractApplicable[Pre] =>
-      app.contract.requires match {
-        case UnitAccountedPredicate(BooleanValue(false)) =>
-          keepApplicables.get(app) match {
-            case None => app.drop()
-            case Some(usage) => throw DeclarationInUse(usage, app)
-          }
-        case _ => rewriteDefault(decl)
-      }
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case app: ContractApplicable[Pre] =>
+        app.contract.requires match {
+          case UnitAccountedPredicate(BooleanValue(false)) =>
+            keepApplicables.get(app) match {
+              case None => app.drop()
+              case Some(usage) => throw DeclarationInUse(usage, app)
+            }
+          case _ => rewriteDefault(decl)
+        }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/FinalizeArguments.scala b/src/rewrite/vct/rewrite/FinalizeArguments.scala
index 9e59a07507..ace997e89d 100644
--- a/src/rewrite/vct/rewrite/FinalizeArguments.scala
+++ b/src/rewrite/vct/rewrite/FinalizeArguments.scala
@@ -10,47 +10,64 @@ import vct.col.util.SuccessionMap
 
 case object FinalizeArguments extends RewriterBuilder {
   override def key: String = "finalize"
-  override def desc: String = "Make it so the formal parameters of methods are not assigned to."
+  override def desc: String =
+    "Make it so the formal parameters of methods are not assigned to."
 
-  private def FormalParameterOrigin(inner: Origin): Origin = inner.where(prefix = "formal")
+  private def FormalParameterOrigin(inner: Origin): Origin =
+    inner.where(prefix = "formal")
 }
 
 case class FinalizeArguments[Pre <: Generation]() extends Rewriter[Pre] {
   val argLocal: ScopedStack[Map[Variable[Pre], Variable[Post]]] = ScopedStack()
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case method: AbstractMethod[Pre] =>
-      val assignedLocals = method.body.map(_.collect {
-        case Assign(Local(Ref(v)), _) => v
-      }).getOrElse(Nil)
-
-      val argLocals = method.args.intersect(assignedLocals).map(v => v -> new Variable(dispatch(v.t))(v.o)).toMap
-
-      implicit val o: Origin = method.o
-
-      allScopes.anyDeclare(allScopes.anySucceedOnly(method, method.rewrite(
-        args = variables.collect {
-          method.args.map { v =>
-            if(assignedLocals.contains(v)) {
-              variables.succeed(v, new Variable(dispatch(v.t))(FormalParameterOrigin(v.o)))
-            } else { rewriteDefault(v) }
-          }
-        }._1,
-        body = method.body.map(body => Scope[Post](
-          argLocals.values.toSeq,
-          Block(Seq(
-            Block(argLocals.map { case (formal, local) => assignLocal[Post](local.get, Local(succ(formal))) }.toSeq),
-            argLocal.having(argLocals) { dispatch(body) },
-          )),
-        )),
-      )))
-
-    case other => rewriteDefault(other)
-  }
-
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case Local(Ref(v)) if argLocal.nonEmpty && argLocal.top.contains(v) =>
-      Local[Post](argLocal.top(v).ref)(e.o)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case method: AbstractMethod[Pre] =>
+        val assignedLocals = method.body.map(_.collect {
+          case Assign(Local(Ref(v)), _) => v
+        }).getOrElse(Nil)
+
+        val argLocals =
+          method.args.intersect(assignedLocals)
+            .map(v => v -> new Variable(dispatch(v.t))(v.o)).toMap
+
+        implicit val o: Origin = method.o
+
+        allScopes.anyDeclare(allScopes.anySucceedOnly(
+          method,
+          method.rewrite(
+            args =
+              variables.collect {
+                method.args.map { v =>
+                  if (assignedLocals.contains(v)) {
+                    variables.succeed(
+                      v,
+                      new Variable(dispatch(v.t))(FormalParameterOrigin(v.o)),
+                    )
+                  } else { rewriteDefault(v) }
+                }
+              }._1,
+            body = method.body.map(body =>
+              Scope[Post](
+                argLocals.values.toSeq,
+                Block(Seq(
+                  Block(argLocals.map { case (formal, local) =>
+                    assignLocal[Post](local.get, Local(succ(formal)))
+                  }.toSeq),
+                  argLocal.having(argLocals) { dispatch(body) },
+                )),
+              )
+            ),
+          ),
+        ))
+
+      case other => rewriteDefault(other)
+    }
+
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case Local(Ref(v)) if argLocal.nonEmpty && argLocal.top.contains(v) =>
+        Local[Post](argLocal.top(v).ref)(e.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/FloatToRat.scala b/src/rewrite/vct/rewrite/FloatToRat.scala
index 4eea1cf61e..60100ea8bc 100644
--- a/src/rewrite/vct/rewrite/FloatToRat.scala
+++ b/src/rewrite/vct/rewrite/FloatToRat.scala
@@ -17,68 +17,82 @@ import scala.collection.mutable
 
 case object FloatToRat extends RewriterBuilder {
   override def key: String = "floatToRat"
-  override def desc: String = "Converts floating point values and types into rationals, disregarding precision, nan, and other practical concerns"
+  override def desc: String =
+    "Converts floating point values and types into rationals, disregarding precision, nan, and other practical concerns"
 
-  private def CastFuncOrigin(preferredName: String): Origin = Origin(
-    Seq(
-      PreferredName(Seq(preferredName)),
-      LabelContext("float to rat"),
-    )
-  )
+  private def CastFuncOrigin(preferredName: String): Origin =
+    Origin(Seq(PreferredName(Seq(preferredName)), LabelContext("float to rat")))
 }
 
 case class FloatToRat[Pre <: Generation]() extends Rewriter[Pre] {
-  def name(t: TFloat[_]) = t match {
-    case t if t == PVL.float64 => "f64"
-    case t if t == PVL.float32 => "f32"
-    case TFloat(e, m) => s"f${e}_$m"
-  }
+  def name(t: TFloat[_]) =
+    t match {
+      case t if t == PVL.float64 => "f64"
+      case t if t == PVL.float32 => "f32"
+      case TFloat(e, m) => s"f${e}_$m"
+    }
 
-  private val nonDetFloatOrigin: Origin = Origin(Seq(LabelContext("float to rational conversion")))
+  private val nonDetFloatOrigin: Origin = Origin(
+    Seq(LabelContext("float to rational conversion"))
+  )
 
   val nonDetFloat: mutable.Map[Unit, Function[Post]] = mutable.Map()
 
   def getNonDetFloat(): Expr[Post] = {
     val nondetFunc = nonDetFloat.getOrElseUpdate((), makeNondetFloatFunc())
-    FunctionInvocation[Post](nondetFunc.ref, Seq(), Nil, Nil, Nil)(TrueSatisfiable)(nonDetFloatOrigin)
+    FunctionInvocation[Post](nondetFunc.ref, Seq(), Nil, Nil, Nil)(
+      TrueSatisfiable
+    )(nonDetFloatOrigin)
   }
 
   def makeNondetFloatFunc(): Function[Post] = {
-    globalDeclarations.declare(withResult((result: Result[Post]) => function[Post](
-      blame = AbstractApplicable,
-      contractBlame = TrueSatisfiable,
-      returnType = TRational(),
-    )(nonDetFloatOrigin.where(name= "nonDetFloat")))(nonDetFloatOrigin))
-  }
-  
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = expr match {
-    case CastFloat(e, t) if e.t == t => dispatch(e)
-    case CastFloat(e, t: TFloat[Pre]) if e.t.isInstanceOf[TFloat[Pre]] => dispatch(e)
-    case c@CastFloat(e, t: TFloat[Pre]) if CoercionUtils.getCoercion(e.t, TInt()).isDefined =>
-      implicit val o: Origin = c.o
-      dispatch(e) /:/ const(1)
-    case c@CastFloat(e, t: TInt[Pre]) if e.t.isInstanceOf[TFloat[Pre]] =>
-      SmtlibToInt[Post](dispatch(e))(CastFuncOrigin("to_int"))
-    case CastFloat(_, _) => ???
-    case f @ FloatValue(num, _) =>
-      implicit val o: Origin = f.o
-      var numerator = num
-      var denominator = BigInt(1)
-      while (!numerator.isWhole) {
-        numerator = numerator * 10
-        denominator = denominator * 10
-      }
-      const[Post](numerator.toBigIntExact.get) /:/ const(denominator)
-    case div @ FloatDiv(left, right) =>
-      // Normally floats don't fail on division by zero, they get the `inf` value. Rewriting this to not fail on division by zero.
-      implicit val o: Origin = div.o
-      val newRight = dispatch(right)
-      Select(newRight !== const[Post](0) /:/ const(1), RatDiv(dispatch(left), newRight)(div.blame)(div.o), getNonDetFloat())(div.o)
-    case e => rewriteDefault(e)
+    globalDeclarations.declare(
+      withResult((result: Result[Post]) =>
+        function[Post](
+          blame = AbstractApplicable,
+          contractBlame = TrueSatisfiable,
+          returnType = TRational(),
+        )(nonDetFloatOrigin.where(name = "nonDetFloat"))
+      )(nonDetFloatOrigin)
+    )
   }
 
-  override def dispatch(t: Type[Pre]): Type[Post] = t match {
-    case TFloat(_, _) => TRational()(t.o)
-    case t => rewriteDefault(t)
-  }
-}
\ No newline at end of file
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case CastFloat(e, t) if e.t == t => dispatch(e)
+      case CastFloat(e, t: TFloat[Pre]) if e.t.isInstanceOf[TFloat[Pre]] =>
+        dispatch(e)
+      case c @ CastFloat(e, t: TFloat[Pre])
+          if CoercionUtils.getCoercion(e.t, TInt()).isDefined =>
+        implicit val o: Origin = c.o
+        dispatch(e) /:/ const(1)
+      case c @ CastFloat(e, t: TInt[Pre]) if e.t.isInstanceOf[TFloat[Pre]] =>
+        SmtlibToInt[Post](dispatch(e))(CastFuncOrigin("to_int"))
+      case CastFloat(_, _) => ???
+      case f @ FloatValue(num, _) =>
+        implicit val o: Origin = f.o
+        var numerator = num
+        var denominator = BigInt(1)
+        while (!numerator.isWhole) {
+          numerator = numerator * 10
+          denominator = denominator * 10
+        }
+        const[Post](numerator.toBigIntExact.get) /:/ const(denominator)
+      case div @ FloatDiv(left, right) =>
+        // Normally floats don't fail on division by zero, they get the `inf` value. Rewriting this to not fail on division by zero.
+        implicit val o: Origin = div.o
+        val newRight = dispatch(right)
+        Select(
+          newRight !== const[Post](0) /:/ const(1),
+          RatDiv(dispatch(left), newRight)(div.blame)(div.o),
+          getNonDetFloat(),
+        )(div.o)
+      case e => rewriteDefault(e)
+    }
+
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    t match {
+      case TFloat(_, _) => TRational()(t.o)
+      case t => rewriteDefault(t)
+    }
+}
diff --git a/src/rewrite/vct/rewrite/ForLoopToWhileLoop.scala b/src/rewrite/vct/rewrite/ForLoopToWhileLoop.scala
index 6be1988a58..c7fd03f7ab 100644
--- a/src/rewrite/vct/rewrite/ForLoopToWhileLoop.scala
+++ b/src/rewrite/vct/rewrite/ForLoopToWhileLoop.scala
@@ -8,21 +8,27 @@ import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 
 case object ForLoopToWhileLoop extends RewriterBuilder {
   override def key: String = "forLoop"
-  override def desc: String = "Translate for loops into while loops by putting initialization and the update before and in the loop."
+  override def desc: String =
+    "Translate for loops into while loops by putting initialization and the update before and in the loop."
 }
 
 case class ForLoopToWhileLoop[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case Loop(Block(Nil), cond, Block(Nil), contract, body) => rewriteDefault(stat)
-    case loop @ Loop(init, cond, update, contract, body) =>
-      implicit val o: Origin = stat.o
-      Block(Seq(
-        dispatch(init),
-        Loop(Block(Nil), dispatch(cond), Block(Nil), dispatch(contract), Block(Seq(
-          dispatch(body),
-          dispatch(update),
-        ))),
-      ))
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case Loop(Block(Nil), cond, Block(Nil), contract, body) =>
+        rewriteDefault(stat)
+      case loop @ Loop(init, cond, update, contract, body) =>
+        implicit val o: Origin = stat.o
+        Block(Seq(
+          dispatch(init),
+          Loop(
+            Block(Nil),
+            dispatch(cond),
+            Block(Nil),
+            dispatch(contract),
+            Block(Seq(dispatch(body), dispatch(update))),
+          ),
+        ))
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/GivenYieldsToArgs.scala b/src/rewrite/vct/rewrite/GivenYieldsToArgs.scala
index 3689c6c26c..6f087c626b 100644
--- a/src/rewrite/vct/rewrite/GivenYieldsToArgs.scala
+++ b/src/rewrite/vct/rewrite/GivenYieldsToArgs.scala
@@ -11,106 +11,156 @@ import vct.result.VerificationError.UserError
 
 case object GivenYieldsToArgs extends RewriterBuilder {
   override def key: String = "givenYields"
-  override def desc: String = "Promote given and yields parameters into inlined arguments and out-parameters."
+  override def desc: String =
+    "Promote given and yields parameters into inlined arguments and out-parameters."
 
-  case class MissingGivenArg(inv: InvokingNode[_], missing: Variable[_]) extends UserError {
+  case class MissingGivenArg(inv: InvokingNode[_], missing: Variable[_])
+      extends UserError {
     override def code: String = "missingGiven"
     override def text: String =
-      inv.o.messageInContext(s"This invocation is missing the 'given' parameter $missing")
+      inv.o.messageInContext(
+        s"This invocation is missing the 'given' parameter $missing"
+      )
   }
 
-  private def YieldDummy(forArg: Variable[_]): Origin = forArg.o.where(context = "dummy yield receiver", prefix = "dummy")
+  private def YieldDummy(forArg: Variable[_]): Origin =
+    forArg.o.where(context = "dummy yield receiver", prefix = "dummy")
 }
 
 case class GivenYieldsToArgs[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case method: AbstractMethod[Pre] =>
-      allScopes.anySucceedOnly(method, allScopes.anyDeclare(method.rewrite(
-        args = variables.collect {
-          method.args.foreach(dispatch)
-          method.contract.givenArgs.foreach(dispatch)
-        }._1,
-        outArgs = variables.collect {
-          method.outArgs.foreach(dispatch)
-          method.contract.yieldsArgs.foreach(dispatch)
-        }._1,
-      )))
-    case func: AbstractFunction[Pre] =>
-      allScopes.anySucceedOnly(func, allScopes.anyDeclare(func.rewrite(
-        args = variables.collect {
-          func.args.foreach(dispatch)
-          func.contract.givenArgs.foreach(dispatch)
-        }._1,
-      )))
-    case other => rewriteDefault(other)
-  }
-
-  override def dispatch(node: ApplicableContract[Pre]): ApplicableContract[Post] =
-    node.rewrite(givenArgs = Nil, yieldsArgs = Nil)
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case method: AbstractMethod[Pre] =>
+        allScopes.anySucceedOnly(
+          method,
+          allScopes.anyDeclare(method.rewrite(
+            args =
+              variables.collect {
+                method.args.foreach(dispatch)
+                method.contract.givenArgs.foreach(dispatch)
+              }._1,
+            outArgs =
+              variables.collect {
+                method.outArgs.foreach(dispatch)
+                method.contract.yieldsArgs.foreach(dispatch)
+              }._1,
+          )),
+        )
+      case func: AbstractFunction[Pre] =>
+        allScopes.anySucceedOnly(
+          func,
+          allScopes.anyDeclare(func.rewrite(args =
+            variables.collect {
+              func.args.foreach(dispatch)
+              func.contract.givenArgs.foreach(dispatch)
+            }._1
+          )),
+        )
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case inv: AnyMethodInvocation[Pre] =>
-      val givenMap = inv.givenMap.map { case (givenArg, value) => (givenArg.decl, value) }.toMap
-      val yields = inv.yields.map { case (target, yieldArg) => (yieldArg.decl, target) }.toMap
+  override def dispatch(
+      node: ApplicableContract[Pre]
+  ): ApplicableContract[Post] = node.rewrite(givenArgs = Nil, yieldsArgs = Nil)
 
-      val orderedGivenValues = inv.ref.decl.contract.givenArgs.map(givenArg => givenMap.get(givenArg) match {
-        case Some(value) => dispatch(value)
-        case None => throw MissingGivenArg(inv, givenArg)
-      })
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case inv: AnyMethodInvocation[Pre] =>
+        val givenMap =
+          inv.givenMap.map { case (givenArg, value) => (givenArg.decl, value) }
+            .toMap
+        val yields =
+          inv.yields.map { case (target, yieldArg) => (yieldArg.decl, target) }
+            .toMap
 
-      val (yieldDummies, orderedYieldTargets: Seq[Expr[Post]]) =
-        variables.collect {
-          inv.ref.decl.contract.yieldsArgs.map(yieldArg => yields.get(yieldArg) match {
+        val orderedGivenValues = inv.ref.decl.contract.givenArgs.map(givenArg =>
+          givenMap.get(givenArg) match {
             case Some(value) => dispatch(value)
-            case None => variables.declare(new Variable[Post](dispatch(yieldArg.t))(YieldDummy(yieldArg))).get(inv.o)
-          })
-        }
-
-      val newInv = inv.rewrite(
-        args = inv.args.map(dispatch) ++ orderedGivenValues,
-        outArgs = inv.outArgs.map(dispatch) ++ orderedYieldTargets,
-        givenMap = Nil, yields = Nil,
-      )
-
-      yieldDummies match {
-        case Nil => newInv
-        case _ => ScopedExpr(yieldDummies, newInv)(e.o)
-      }
-    case inv: AnyFunctionInvocation[Pre] =>
-      val givenMap = inv.givenMap.map { case (givenArg, value) => (givenArg.decl, value) }.toMap
-      val orderedGivenValues = inv.ref.decl.contract.givenArgs.map(givenArg => givenMap.get(givenArg) match {
-        case Some(value) => dispatch(value)
-        case None => throw MissingGivenArg(inv, givenArg)
-      })
-      inv.rewrite(args = inv.args.map(dispatch) ++ orderedGivenValues, givenMap = Nil, yields = Nil)
-    case e => rewriteDefault(e)
-  }
+            case None => throw MissingGivenArg(inv, givenArg)
+          }
+        )
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case inv: InvocationStatement[Pre] =>
-      val givenMap = inv.givenMap.map { case (givenArg, value) => (givenArg.decl, value) }.toMap
-      val yields = inv.yields.map { case (target, yieldArg) => (yieldArg.decl, target) }.toMap
+        val (yieldDummies, orderedYieldTargets: Seq[Expr[Post]]) = variables
+          .collect {
+            inv.ref.decl.contract.yieldsArgs.map(yieldArg =>
+              yields.get(yieldArg) match {
+                case Some(value) => dispatch(value)
+                case None =>
+                  variables.declare(new Variable[Post](dispatch(yieldArg.t))(
+                    YieldDummy(yieldArg)
+                  )).get(inv.o)
+              }
+            )
+          }
 
-      val orderedGivenValues = inv.ref.decl.contract.givenArgs.map(givenArg => givenMap.get(givenArg) match {
-        case Some(value) => dispatch(value)
-        case None => throw MissingGivenArg(inv, givenArg)
-      })
+        val newInv = inv.rewrite(
+          args = inv.args.map(dispatch) ++ orderedGivenValues,
+          outArgs = inv.outArgs.map(dispatch) ++ orderedYieldTargets,
+          givenMap = Nil,
+          yields = Nil,
+        )
 
-      val (yieldDummies, orderedYieldTargets: Seq[Expr[Post]]) =
-        variables.collect {
-          inv.ref.decl.contract.yieldsArgs.map(yieldArg => yields.get(yieldArg) match {
-            case Some(value) => dispatch(value)
-            case None => variables.declare(new Variable[Post](dispatch(yieldArg.t))(YieldDummy(yieldArg))).get(inv.o)
-          })
+        yieldDummies match {
+          case Nil => newInv
+          case _ => ScopedExpr(yieldDummies, newInv)(e.o)
         }
-
-      Scope(yieldDummies,
+      case inv: AnyFunctionInvocation[Pre] =>
+        val givenMap =
+          inv.givenMap.map { case (givenArg, value) => (givenArg.decl, value) }
+            .toMap
+        val orderedGivenValues = inv.ref.decl.contract.givenArgs.map(givenArg =>
+          givenMap.get(givenArg) match {
+            case Some(value) => dispatch(value)
+            case None => throw MissingGivenArg(inv, givenArg)
+          }
+        )
         inv.rewrite(
           args = inv.args.map(dispatch) ++ orderedGivenValues,
-          outArgs = inv.outArgs.map(dispatch) ++ orderedYieldTargets,
-          givenMap = Nil, yields = Nil,
+          givenMap = Nil,
+          yields = Nil,
         )
-      )(inv.o)
-    case other => rewriteDefault(other)
-  }
+      case e => rewriteDefault(e)
+    }
+
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case inv: InvocationStatement[Pre] =>
+        val givenMap =
+          inv.givenMap.map { case (givenArg, value) => (givenArg.decl, value) }
+            .toMap
+        val yields =
+          inv.yields.map { case (target, yieldArg) => (yieldArg.decl, target) }
+            .toMap
+
+        val orderedGivenValues = inv.ref.decl.contract.givenArgs.map(givenArg =>
+          givenMap.get(givenArg) match {
+            case Some(value) => dispatch(value)
+            case None => throw MissingGivenArg(inv, givenArg)
+          }
+        )
+
+        val (yieldDummies, orderedYieldTargets: Seq[Expr[Post]]) = variables
+          .collect {
+            inv.ref.decl.contract.yieldsArgs.map(yieldArg =>
+              yields.get(yieldArg) match {
+                case Some(value) => dispatch(value)
+                case None =>
+                  variables.declare(new Variable[Post](dispatch(yieldArg.t))(
+                    YieldDummy(yieldArg)
+                  )).get(inv.o)
+              }
+            )
+          }
+
+        Scope(
+          yieldDummies,
+          inv.rewrite(
+            args = inv.args.map(dispatch) ++ orderedGivenValues,
+            outArgs = inv.outArgs.map(dispatch) ++ orderedYieldTargets,
+            givenMap = Nil,
+            yields = Nil,
+          ),
+        )(inv.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/HeapVariableToRef.scala b/src/rewrite/vct/rewrite/HeapVariableToRef.scala
index 3928394630..938b613915 100644
--- a/src/rewrite/vct/rewrite/HeapVariableToRef.scala
+++ b/src/rewrite/vct/rewrite/HeapVariableToRef.scala
@@ -1,7 +1,14 @@
 package vct.rewrite
 
 import vct.col.ast._
-import vct.col.origin.{AbstractApplicable, LabelContext, Origin, PanicBlame, PreferredName, TrueSatisfiable}
+import vct.col.origin.{
+  AbstractApplicable,
+  LabelContext,
+  Origin,
+  PanicBlame,
+  PreferredName,
+  TrueSatisfiable,
+}
 import vct.col.ref.Ref
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, Rewritten}
 import vct.col.util.AstBuildHelpers.{function, functionInvocation}
@@ -9,14 +16,11 @@ import vct.col.util.SuccessionMap
 
 case object HeapVariableToRef extends RewriterBuilder {
   override def key: String = "heapVarToRef"
-  override def desc: String = "Translate global heap variables to the field of a constant Ref"
+  override def desc: String =
+    "Translate global heap variables to the field of a constant Ref"
 
-  private def GlobalsOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("globals")),
-      LabelContext("globals"),
-    )
-  )
+  private def GlobalsOrigin: Origin =
+    Origin(Seq(PreferredName(Seq("globals")), LabelContext("globals")))
 }
 
 case class HeapVariableToRef[Pre <: Generation]() extends Rewriter[Pre] {
@@ -24,29 +28,42 @@ case class HeapVariableToRef[Pre <: Generation]() extends Rewriter[Pre] {
 
   lazy val globalsFunction: Function[Post] = {
     implicit val o: Origin = GlobalsOrigin
-    globalDeclarations.declare(function[Post](AbstractApplicable, TrueSatisfiable, returnType = TRef()))
+    globalDeclarations.declare(
+      function[Post](AbstractApplicable, TrueSatisfiable, returnType = TRef())
+    )
   }
 
   def globals(implicit o: Origin): Expr[Post] =
-    functionInvocation[Post](PanicBlame("Precondition is `true`"), globalsFunction.ref)
+    functionInvocation[Post](
+      PanicBlame("Precondition is `true`"),
+      globalsFunction.ref,
+    )
 
-  val heapVariableField: SuccessionMap[HeapVariable[Pre], SilverField[Post]] = SuccessionMap()
+  val heapVariableField: SuccessionMap[HeapVariable[Pre], SilverField[Post]] =
+    SuccessionMap()
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case v: HeapVariable[Pre] =>
-      heapVariableField(v) = globalDeclarations.declare(new SilverField(dispatch(v.t))(v.o))
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case v: HeapVariable[Pre] =>
+        heapVariableField(v) = globalDeclarations
+          .declare(new SilverField(dispatch(v.t))(v.o))
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case hv @ DerefHeapVariable(Ref(v)) =>
-      SilverDeref[Post](globals(e.o), heapVariableField.ref(v))(hv.blame)(e.o)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case hv @ DerefHeapVariable(Ref(v)) =>
+        SilverDeref[Post](globals(e.o), heapVariableField.ref(v))(hv.blame)(e.o)
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(location: Location[Pre]): Location[Post] = location match {
-    case HeapVariableLocation(Ref(v)) =>
-      SilverFieldLocation[Post](globals(location.o), heapVariableField.ref(v))(location.o)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(location: Location[Pre]): Location[Post] =
+    location match {
+      case HeapVariableLocation(Ref(v)) =>
+        SilverFieldLocation[Post](
+          globals(location.o),
+          heapVariableField.ref(v),
+        )(location.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/InlineApplicables.scala b/src/rewrite/vct/rewrite/InlineApplicables.scala
index 5a986a7a70..acd65d765a 100644
--- a/src/rewrite/vct/rewrite/InlineApplicables.scala
+++ b/src/rewrite/vct/rewrite/InlineApplicables.scala
@@ -3,9 +3,23 @@ package vct.col.rewrite
 import com.typesafe.scalalogging.LazyLogging
 import hre.util.ScopedStack
 import vct.col.ast._
-import vct.col.origin.{AssertFailed, Blame, FoldFailed, LabelContext, Origin, PreferredName, UnfoldFailed}
+import vct.col.origin.{
+  AssertFailed,
+  Blame,
+  FoldFailed,
+  LabelContext,
+  Origin,
+  PreferredName,
+  UnfoldFailed,
+}
 import vct.col.ref.Ref
-import vct.col.rewrite.{Generation, NonLatchingRewriter, Rewriter, RewriterBuilder, Rewritten}
+import vct.col.rewrite.{
+  Generation,
+  NonLatchingRewriter,
+  Rewriter,
+  RewriterBuilder,
+  Rewritten,
+}
 import vct.col.util.AstBuildHelpers._
 import vct.col.util.Substitute
 import vct.result.Message
@@ -17,24 +31,33 @@ import scala.reflect.ClassTag
 
 case object InlineApplicables extends RewriterBuilder {
   override def key: String = "inline"
-  override def desc: String = "Inline applicables into their usage sites for applicables marked inline."
+  override def desc: String =
+    "Inline applicables into their usage sites for applicables marked inline."
 
   case class CyclicInline(applications: Seq[Apply[_]]) extends UserError {
     override def code: String = "cyclicInline"
     override def text: String =
       applications match {
-        case Seq(app) => app.o.messageInContext("This application cannot be inlined, since the applicable refers to itself.")
+        case Seq(app) =>
+          app.o.messageInContext(
+            "This application cannot be inlined, since the applicable refers to itself."
+          )
         case first +: more =>
           Message.messagesInContext(
-            (first.o, "This application cannot be inlined, since it requires inlining ...") +:
-              more.map(apply => (apply.o, "... this application, which requires inlining ...")) :+
-              (first.o, "... this application: a cycle.")
-            : _*
+            (
+              first.o,
+              "This application cannot be inlined, since it requires inlining ...",
+            ) +: more.map(apply =>
+              (apply.o, "... this application, which requires inlining ...")
+            ) :+ (first.o, "... this application: a cycle."): _*
           )
       }
   }
 
-  case class AbstractInlineable(use: Apply[_], inlineable: InlineableApplicable[_]) extends UserError {
+  case class AbstractInlineable(
+      use: Apply[_],
+      inlineable: InlineableApplicable[_],
+  ) extends UserError {
     override def code: String = "abstractInlined"
     override def text: String =
       Message.messagesInContext(
@@ -46,89 +69,121 @@ case object InlineApplicables extends RewriterBuilder {
   case class WrongPredicateLocation(use: Location[_]) extends UserError {
     override def code: String = "wrongInlinePredicate"
     override def text: String =
-      use.o.messageInContext("This location refers to an inline predicate, but it cannot be inlined in this position.")
+      use.o.messageInContext(
+        "This location refers to an inline predicate, but it cannot be inlined in this position."
+      )
   }
 
-  case class ReplaceReturn[G](newStatement: Expr[G] => Statement[G]) extends NonLatchingRewriter[G, G] {
-    case class SuccOrIdentity() extends SuccessorsProviderTrafo[G, G](allScopes.freeze) {
-      override def postTransform[T <: Declaration[G]](pre: Declaration[G], post: Option[T]): Option[T] =
-        Some(post.getOrElse(pre.asInstanceOf[T]))
+  case class ReplaceReturn[G](newStatement: Expr[G] => Statement[G])
+      extends NonLatchingRewriter[G, G] {
+    case class SuccOrIdentity()
+        extends SuccessorsProviderTrafo[G, G](allScopes.freeze) {
+      override def postTransform[T <: Declaration[G]](
+          pre: Declaration[G],
+          post: Option[T],
+      ): Option[T] = Some(post.getOrElse(pre.asInstanceOf[T]))
     }
 
     override def succProvider: SuccessorsProvider[G, G] = SuccOrIdentity()
 
-    override def dispatch(stat: Statement[G]): Statement[G] = stat match {
-      case Return(e) => newStatement(dispatch(e))
-      case other => rewriteDefault(other)
-    }
+    override def dispatch(stat: Statement[G]): Statement[G] =
+      stat match {
+        case Return(e) => newStatement(dispatch(e))
+        case other => rewriteDefault(other)
+      }
   }
 
   private def InlinedOrigin(definition: Origin, usages: Seq[Apply[_]]): Origin =
     Origin(
-      usages.flatMap(usage => LabelContext("inlined from") +: usage.o.originContents) ++
-        (LabelContext("definition") +: definition.originContents)
+      usages.flatMap(usage =>
+        LabelContext("inlined from") +: usage.o.originContents
+      ) ++ (LabelContext("definition") +: definition.originContents)
     )
 
-  private def InlineLetThisOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("self")),
-      LabelContext("this"),
-    )
-  )
+  private def InlineLetThisOrigin: Origin =
+    Origin(Seq(PreferredName(Seq("self")), LabelContext("this")))
 
   case class InlineFoldAssertFailed(fold: Fold[_]) extends Blame[AssertFailed] {
     override def blame(error: AssertFailed): Unit =
       fold.blame.blame(FoldFailed(error.failure, fold))
   }
 
-  case class InlineUnfoldAssertFailed(unfold: Unfold[_]) extends Blame[AssertFailed] {
+  case class InlineUnfoldAssertFailed(unfold: Unfold[_])
+      extends Blame[AssertFailed] {
     override def blame(error: AssertFailed): Unit =
       unfold.blame.blame(UnfoldFailed(error.failure, unfold))
   }
 
-  case class Replacement[Pre](replacing: Expr[Pre], binding: Expr[Pre])(implicit o: Origin) {
+  case class Replacement[Pre](replacing: Expr[Pre], binding: Expr[Pre])(
+      implicit o: Origin
+  ) {
     val withVariable: Variable[Pre] = new Variable(replacing.t)
-    def +(other: Replacements[Pre]): Replacements[Pre] = Replacements(Seq(this)) + other
-    def +(other: Replacement[Pre]): Replacements[Pre] = Replacements(Seq(this)) + other
+    def +(other: Replacements[Pre]): Replacements[Pre] =
+      Replacements(Seq(this)) + other
+    def +(other: Replacement[Pre]): Replacements[Pre] =
+      Replacements(Seq(this)) + other
   }
   case class Replacements[Pre](replacements: Seq[Replacement[Pre]]) {
-    def +(other: Replacements[Pre]): Replacements[Pre] = Replacements(replacements ++ other.replacements)
-    def +(other: Replacement[Pre]): Replacements[Pre] = Replacements(replacements :+ other)
+    def +(other: Replacements[Pre]): Replacements[Pre] =
+      Replacements(replacements ++ other.replacements)
+    def +(other: Replacement[Pre]): Replacements[Pre] =
+      Replacements(replacements :+ other)
 
     def expr(e: Expr[Pre])(implicit o: Origin): Expr[Pre] = {
-      val sub = Substitute[Pre](replacements.map(r => r.replacing -> r.withVariable.get).toMap)
+      val sub = Substitute[Pre](
+        replacements.map(r => r.replacing -> r.withVariable.get).toMap
+      )
       val replaced = sub.labelDecls.scope { sub.dispatch(e) }
-      replacements.foldRight(replaced) {
-        case (replacement, e) => Let(replacement.withVariable, replacement.binding, e)(e.o)
+      replacements.foldRight(replaced) { case (replacement, e) =>
+        Let(replacement.withVariable, replacement.binding, e)(e.o)
       }
     }
 
-    def captureReturn(t: Type[Pre], body: Statement[Pre])(implicit o: Origin): Expr[Pre] = {
+    def captureReturn(t: Type[Pre], body: Statement[Pre])(
+        implicit o: Origin
+    ): Expr[Pre] = {
       val done = Label[Pre](new LabelDecl(), Block(Nil))
       val result = new Variable[Pre](t)
-      val sub = ReplaceReturn((e: Expr[Pre]) => Block(Seq(assignLocal(result.get, e), Goto[Pre](done.decl.ref))))
+      val sub = ReplaceReturn((e: Expr[Pre]) =>
+        Block(Seq(assignLocal(result.get, e), Goto[Pre](done.decl.ref)))
+      )
       val newBody = sub.labelDecls.scope { sub.dispatch(body) }
       ScopedExpr(Seq(result), With(Block(Seq(newBody, done)), result.get))
     }
 
-    def stat(t: Type[Pre], s: Statement[Pre], outReplacements: Replacements[Pre])(implicit o: Origin): Expr[Pre] = {
-      val sub = Substitute[Pre]((this + outReplacements).replacements.map(r => r.replacing -> r.withVariable.get).toMap)
+    def stat(
+        t: Type[Pre],
+        s: Statement[Pre],
+        outReplacements: Replacements[Pre],
+    )(implicit o: Origin): Expr[Pre] = {
+      val sub = Substitute[Pre](
+        (this + outReplacements).replacements
+          .map(r => r.replacing -> r.withVariable.get).toMap
+      )
       // labelDecls is the only scope peeled off by taking the body of the to-be-inlined applicable.
       val replaced = sub.labelDecls.scope { sub.dispatch(s) }
       val capture = captureReturn(t, replaced)
-      ScopedExpr((this + outReplacements).replacements.map(_.withVariable),
-        With(Block(
-          replacements.map(r => assignLocal(r.withVariable.get, r.binding))
-        ), Then(
-          capture, Block(
-            outReplacements.replacements.map(r => Assign(r.binding, r.withVariable.get)(null))
-        )))
+      ScopedExpr(
+        (this + outReplacements).replacements.map(_.withVariable),
+        With(
+          Block(
+            replacements.map(r => assignLocal(r.withVariable.get, r.binding))
+          ),
+          Then(
+            capture,
+            Block(
+              outReplacements.replacements
+                .map(r => Assign(r.binding, r.withVariable.get)(null))
+            ),
+          ),
+        ),
       )
     }
   }
 }
 
-case class InlineApplicables[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging {
+case class InlineApplicables[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
   import InlineApplicables._
 
   val inlineStack: ScopedStack[Apply[Pre]] = ScopedStack()
@@ -141,132 +196,198 @@ case class InlineApplicables[Pre <: Generation]() extends Rewriter[Pre] with Laz
     }
 
   override def dispatch(program: Program[Pre]): Program[Post] = {
-    program.declarations.collect { case cls: Class[Pre] => cls }.foreach { cls =>
-      cls.decls.foreach(classOwner(_) = cls)
+    program.declarations.collect { case cls: Class[Pre] => cls }.foreach {
+      cls => cls.decls.foreach(classOwner(_) = cls)
     }
     rewriteDefault(program)
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case app: InlineableApplicable[Pre] if app.inline =>
-      app.drop()
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case app: InlineableApplicable[Pre] if app.inline => app.drop()
+      case other => rewriteDefault(other)
+    }
 
   @tailrec
-  private def isInlinePredicateApply(e: Expr[Pre]): Boolean = e match {
-    case PredicateApply(Ref(pred), _, _) => pred.inline
-    case InstancePredicateApply(_, Ref(pred), _, _) => pred.inline
-    case Scale(_, res) => isInlinePredicateApply(res)
-    case _ => false
-  }
-
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case f @ Fold(e) if isInlinePredicateApply(e) => Assert(dispatch(e))(InlineFoldAssertFailed(f))(stat.o)
-    case u @ Unfold(e) if isInlinePredicateApply(e) => Assert(dispatch(e))(InlineUnfoldAssertFailed(u))(stat.o)
+  private def isInlinePredicateApply(e: Expr[Pre]): Boolean =
+    e match {
+      case PredicateApply(Ref(pred), _, _) => pred.inline
+      case InstancePredicateApply(_, Ref(pred), _, _) => pred.inline
+      case Scale(_, res) => isInlinePredicateApply(res)
+      case _ => false
+    }
 
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case f @ Fold(e) if isInlinePredicateApply(e) =>
+        Assert(dispatch(e))(InlineFoldAssertFailed(f))(stat.o)
+      case u @ Unfold(e) if isInlinePredicateApply(e) =>
+        Assert(dispatch(e))(InlineUnfoldAssertFailed(u))(stat.o)
 
-  override def dispatch(loc: Location[Pre]): Location[Post] = loc match {
-    case loc @ PredicateLocation(Ref(pred), _) if pred.inline =>
-      throw WrongPredicateLocation(loc)
-    case loc @ InstancePredicateLocation(Ref(pred), _, _) if pred.inline =>
-      throw WrongPredicateLocation(loc)
+      case other => rewriteDefault(other)
+    }
 
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(loc: Location[Pre]): Location[Post] =
+    loc match {
+      case loc @ PredicateLocation(Ref(pred), _) if pred.inline =>
+        throw WrongPredicateLocation(loc)
+      case loc @ InstancePredicateLocation(Ref(pred), _, _) if pred.inline =>
+        throw WrongPredicateLocation(loc)
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case apply: ApplyInlineable[Pre] if apply.ref.decl.inline =>
-      implicit val o: Origin = apply.o
-
-      // Some fanfare here to produce a nice diagnostic when the cycle of applications is large.
-      // First reverse the stack of to-be-inlined applications, since toSeq of a stack presents the head first.
-      // Next skip any declarations that are not equal to the declaration of the current apply: they are unrelated to the cycle.
-      // Finally throw if we have found an apply that has the same declaration as us, but skip that initial apply:
-      // it may not be part of the real cycle (but just the entry into it).
-      inlineStack.toSeq.reverse.dropWhile(_.ref.decl != apply.ref.decl) match {
-        case Nil => // ok
-        case some => throw CyclicInline(some.tail :+ apply)
-      }
+      case other => rewriteDefault(other)
+    }
 
-      inlineStack.having(apply) {
-        lazy val obj = {
-          val instanceApply = apply.asInstanceOf[InstanceApply[Pre]]
-          val cls = classOwner(instanceApply.ref.decl)
-          Replacement(ThisObject[Pre](cls.ref), instanceApply.obj)(InlineLetThisOrigin)
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case apply: ApplyInlineable[Pre] if apply.ref.decl.inline =>
+        implicit val o: Origin = apply.o
+
+        // Some fanfare here to produce a nice diagnostic when the cycle of applications is large.
+        // First reverse the stack of to-be-inlined applications, since toSeq of a stack presents the head first.
+        // Next skip any declarations that are not equal to the declaration of the current apply: they are unrelated to the cycle.
+        // Finally throw if we have found an apply that has the same declaration as us, but skip that initial apply:
+        // it may not be part of the real cycle (but just the entry into it).
+        inlineStack.toSeq.reverse
+          .dropWhile(_.ref.decl != apply.ref.decl) match {
+          case Nil => // ok
+          case some => throw CyclicInline(some.tail :+ apply)
         }
 
-        lazy val args =
-          Replacements(for((arg, v) <- apply.args.zip(apply.ref.decl.args))
-            yield Replacement(v.get, arg)(v.o))
+        inlineStack.having(apply) {
+          lazy val obj = {
+            val instanceApply = apply.asInstanceOf[InstanceApply[Pre]]
+            val cls = classOwner(instanceApply.ref.decl)
+            Replacement(ThisObject[Pre](cls.ref), instanceApply.obj)(
+              InlineLetThisOrigin
+            )
+          }
+
+          lazy val args = Replacements(
+            for ((arg, v) <- apply.args.zip(apply.ref.decl.args))
+              yield Replacement(v.get, arg)(v.o)
+          )
 
-        lazy val givenArgs =
-          Replacements(for((Ref(v), arg) <- apply.asInstanceOf[InvokingNode[Pre]].givenMap)
-            yield Replacement(v.get, arg)(v.o))
+          lazy val givenArgs = Replacements(
+            for (
+              (Ref(v), arg) <- apply.asInstanceOf[InvokingNode[Pre]].givenMap
+            )
+              yield Replacement(v.get, arg)(v.o)
+          )
 
-        lazy val outArgs = {
-          val inv = apply.asInstanceOf[AnyMethodInvocation[Pre]]
-          Replacements(for((out, v) <- inv.outArgs.zip(inv.ref.decl.outArgs))
-            yield Replacement(v.get, out)(v.o))
-        }
+          lazy val outArgs = {
+            val inv = apply.asInstanceOf[AnyMethodInvocation[Pre]]
+            Replacements(
+              for ((out, v) <- inv.outArgs.zip(inv.ref.decl.outArgs))
+                yield Replacement(v.get, out)(v.o)
+            )
+          }
+
+          lazy val yields = Replacements(
+            for ((out, Ref(v)) <- apply.asInstanceOf[InvokingNode[Pre]].yields)
+              yield Replacement(v.get, out)(v.o)
+          )
 
-        lazy val yields =
-          Replacements(for((out, Ref(v)) <- apply.asInstanceOf[InvokingNode[Pre]].yields)
-            yield Replacement(v.get, out)(v.o))
-
-        val replacements = apply.ref.decl.args.map(_.get).zip(apply.args).toMap[Expr[Pre], Expr[Pre]]
-        // TODO: consider type arguments
-        apply match {
-          case PredicateApply(Ref(pred), _, WritePerm()) => // TODO inline predicates with non-write perm
-            dispatch(args.expr(pred.body.getOrElse(throw AbstractInlineable(apply, pred))))
-          case PredicateApply(Ref(pred), _, _) => ???
-          case ProcedureInvocation(Ref(proc), _, _, typeArgs, _, _) =>
-            dispatch((args + givenArgs).stat(apply.t, proc.body.getOrElse(throw AbstractInlineable(apply, proc)), outArgs + yields))
-          case FunctionInvocation(Ref(func), _, typeArgs, _, _) =>
-            dispatch((args + givenArgs).expr(func.body.getOrElse(throw AbstractInlineable(apply, func))))
-
-          case MethodInvocation(_, Ref(method), _, _, typeArgs, _, _) =>
-            dispatch((obj + args + givenArgs).stat(apply.t, method.body.getOrElse(throw AbstractInlineable(apply, method)), outArgs + yields))
-          case InstanceFunctionInvocation(_, Ref(func), _, typeArgs, _, _) =>
-            dispatch((obj + args + givenArgs).expr(func.body.getOrElse(throw AbstractInlineable(apply, func))))
-          case InstancePredicateApply(_, Ref(pred), _, WritePerm()) =>
-            dispatch((obj + args).expr(pred.body.getOrElse(throw AbstractInlineable(apply, pred))))
-          case InstancePredicateApply(_, Ref(pred), _, _) => ???
-          case CoalesceInstancePredicateApply(_, Ref(pred), _, WritePerm()) =>
-            dispatch((obj + args).expr(
-              Implies(
+          val replacements = apply.ref.decl.args.map(_.get).zip(apply.args)
+            .toMap[Expr[Pre], Expr[Pre]]
+          // TODO: consider type arguments
+          apply match {
+            case PredicateApply(
+                  Ref(pred),
+                  _,
+                  WritePerm(),
+                ) => // TODO inline predicates with non-write perm
+              dispatch(args.expr(
+                pred.body.getOrElse(throw AbstractInlineable(apply, pred))
+              ))
+            case PredicateApply(Ref(pred), _, _) => ???
+            case ProcedureInvocation(Ref(proc), _, _, typeArgs, _, _) =>
+              dispatch((args + givenArgs).stat(
+                apply.t,
+                proc.body.getOrElse(throw AbstractInlineable(apply, proc)),
+                outArgs + yields,
+              ))
+            case FunctionInvocation(Ref(func), _, typeArgs, _, _) =>
+              dispatch((args + givenArgs).expr(
+                func.body.getOrElse(throw AbstractInlineable(apply, func))
+              ))
+
+            case MethodInvocation(_, Ref(method), _, _, typeArgs, _, _) =>
+              dispatch((obj + args + givenArgs).stat(
+                apply.t,
+                method.body.getOrElse(throw AbstractInlineable(apply, method)),
+                outArgs + yields,
+              ))
+            case InstanceFunctionInvocation(_, Ref(func), _, typeArgs, _, _) =>
+              dispatch((obj + args + givenArgs).expr(func.body.getOrElse(
+                throw AbstractInlineable(apply, func)
+              )))
+            case InstancePredicateApply(_, Ref(pred), _, WritePerm()) =>
+              dispatch((obj + args).expr(
+                pred.body.getOrElse(throw AbstractInlineable(apply, pred))
+              ))
+            case InstancePredicateApply(_, Ref(pred), _, _) => ???
+            case CoalesceInstancePredicateApply(_, Ref(pred), _, WritePerm()) =>
+              dispatch((obj + args).expr(Implies(
                 Neq(obj.replacing, Null()),
                 pred.body.getOrElse(throw AbstractInlineable(apply, pred)),
-              )
-            ))
-          case CoalesceInstancePredicateApply(_, Ref(pred), _, _) => ???
+              )))
+            case CoalesceInstancePredicateApply(_, Ref(pred), _, _) => ???
+          }
         }
-      }
 
-    case Unfolding(PredicateApply(Ref(pred), args, perm), body) if pred.inline =>
-      With(Block(args.map(dispatch).map(e => Eval(e)(e.o)) :+ Eval(dispatch(perm))(perm.o))(e.o), dispatch(body))(e.o)
-
-    case Unfolding(InstancePredicateApply(obj, Ref(pred), args, perm), body) if pred.inline =>
-      With(Block(
-        Seq(Eval(dispatch(obj))(obj.o)) ++
-          args.map(dispatch).map(e => Eval(e)(e.o)) ++
-          Seq(Eval(dispatch(perm))(perm.o))
-      )(e.o), dispatch(body))(e.o)
-
-    case Perm(loc @ PredicateLocation(pred, args), WritePerm()) if pred.decl.inline =>
-      dispatch(PredicateApply(pred, args, WritePerm()(loc.o))(loc.o))
-
-    case Perm(loc @ InstancePredicateLocation(pred, obj, args), WritePerm()) if pred.decl.inline =>
-      dispatch(InstancePredicateApply(obj, pred, args, WritePerm()(loc.o))(loc.o))
-
-    case Perm(InLinePatternLocation(loc @ PredicateLocation(pred, args), pat), WritePerm()) if pred.decl.inline =>
-      dispatch(InlinePattern(PredicateApply(pred, args, WritePerm()(loc.o))(loc.o))(loc.o))
-
-    case Perm(InLinePatternLocation(loc @ InstancePredicateLocation(pred, obj, args), pat), WritePerm()) if pred.decl.inline =>
-      dispatch(InlinePattern(InstancePredicateApply(obj, pred, args, WritePerm()(loc.o))(loc.o))(loc.o))
+      case Unfolding(PredicateApply(Ref(pred), args, perm), body)
+          if pred.inline =>
+        With(
+          Block(
+            args.map(dispatch).map(e => Eval(e)(e.o)) :+
+              Eval(dispatch(perm))(perm.o)
+          )(e.o),
+          dispatch(body),
+        )(e.o)
+
+      case Unfolding(InstancePredicateApply(obj, Ref(pred), args, perm), body)
+          if pred.inline =>
+        With(
+          Block(
+            Seq(Eval(dispatch(obj))(obj.o)) ++ args.map(dispatch)
+              .map(e => Eval(e)(e.o)) ++ Seq(Eval(dispatch(perm))(perm.o))
+          )(e.o),
+          dispatch(body),
+        )(e.o)
+
+      case Perm(loc @ PredicateLocation(pred, args), WritePerm())
+          if pred.decl.inline =>
+        dispatch(PredicateApply(pred, args, WritePerm()(loc.o))(loc.o))
+
+      case Perm(loc @ InstancePredicateLocation(pred, obj, args), WritePerm())
+          if pred.decl.inline =>
+        dispatch(
+          InstancePredicateApply(obj, pred, args, WritePerm()(loc.o))(loc.o)
+        )
+
+      case Perm(
+            InLinePatternLocation(loc @ PredicateLocation(pred, args), pat),
+            WritePerm(),
+          ) if pred.decl.inline =>
+        dispatch(
+          InlinePattern(PredicateApply(pred, args, WritePerm()(loc.o))(loc.o))(
+            loc.o
+          )
+        )
+
+      case Perm(
+            InLinePatternLocation(
+              loc @ InstancePredicateLocation(pred, obj, args),
+              pat,
+            ),
+            WritePerm(),
+          ) if pred.decl.inline =>
+        dispatch(
+          InlinePattern(
+            InstancePredicateApply(obj, pred, args, WritePerm()(loc.o))(loc.o)
+          )(loc.o)
+        )
 
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/IterationContractToParBlock.scala b/src/rewrite/vct/rewrite/IterationContractToParBlock.scala
index 6ca0ff21b7..9b7f029ece 100644
--- a/src/rewrite/vct/rewrite/IterationContractToParBlock.scala
+++ b/src/rewrite/vct/rewrite/IterationContractToParBlock.scala
@@ -12,76 +12,97 @@ import vct.result.VerificationError.UserError
 
 case object IterationContractToParBlock extends RewriterBuilder {
   override def key: String = "iterationContract"
-  override def desc: String = "Translate loops with an iteration-style contract to a parallel block."
+  override def desc: String =
+    "Translate loops with an iteration-style contract to a parallel block."
 
   val IterationContractOrigin: Origin = Origin(Seq(LabelContext("generated")))
 
   case class VariableReadOutsideParLoop(e: Local[_]) extends UserError {
     override def code: String = "localOutsideParLoop"
-    override def text: String = e.o.messageInContext("This variable may not be read here, since it is used as a loop variable in a loop specified with an iteration contract.")
+    override def text: String =
+      e.o.messageInContext(
+        "This variable may not be read here, since it is used as a loop variable in a loop specified with an iteration contract."
+      )
   }
 
   case class VariableWrittenInParLoop(assign: Assign[_]) extends UserError {
     override def code: String = "writeParVar"
-    override def text: String = assign.o.messageInContext("This variable may not be written to, since it is used as a loop variable in a loop specified with an iteration contract.")
+    override def text: String =
+      assign.o.messageInContext(
+        "This variable may not be written to, since it is used as a loop variable in a loop specified with an iteration contract."
+      )
   }
 }
 
-case class IterationContractToParBlock[Pre <: Generation]() extends Rewriter[Pre] {
+case class IterationContractToParBlock[Pre <: Generation]()
+    extends Rewriter[Pre] {
   import IterationContractToParBlock._
 
   var iterationLoopVariables: Set[Variable[Pre]] = Set.empty
   val currentIterationVariables: ScopedStack[Variable[Pre]] = ScopedStack()
 
   override def dispatch(program: Program[Pre]): Program[Post] = {
-    iterationLoopVariables = program.transSubnodes.collect {
-      case loop @ Loop(_, _, _, contract @ IterationContract(_, _, _), _) =>
-        loop.getIterationContractData(IterationContractOrigin).fold(throw _, identity).v
-    }.toSet
+    iterationLoopVariables =
+      program.transSubnodes.collect {
+        case loop @ Loop(_, _, _, contract @ IterationContract(_, _, _), _) =>
+          loop.getIterationContractData(IterationContractOrigin)
+            .fold(throw _, identity).v
+      }.toSet
 
     program.rewrite()
   }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case loop @ Loop(init, cond, update, contract @ IterationContract(requires, ensures, context_everywhere), body) =>
-      val IterationContractData(v, low, high) = loop.getIterationContractData(IterationContractOrigin).fold(throw _, identity)
-
-      val newV = variables.dispatch(v)
-
-      implicit val o: Origin = loop.o
-      currentIterationVariables.having(v) {
-        sendDecls.scope {
-          val (newVars, newBody) = variables.collect {
-            dispatch(body)
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case loop @ Loop(
+            init,
+            cond,
+            update,
+            contract @ IterationContract(requires, ensures, context_everywhere),
+            body,
+          ) =>
+        val IterationContractData(v, low, high) = loop
+          .getIterationContractData(IterationContractOrigin)
+          .fold(throw _, identity)
+
+        val newV = variables.dispatch(v)
+
+        implicit val o: Origin = loop.o
+        currentIterationVariables.having(v) {
+          sendDecls.scope {
+            val (newVars, newBody) = variables.collect { dispatch(body) }
+            val bodyScope = Scope[Post](newVars, newBody)(body.o)
+
+            ParStatement(
+              ParBlock(
+                decl = new ParBlockDecl(),
+                iters = Seq(IterVariable(newV, dispatch(low), dispatch(high))),
+                requires = dispatch(requires),
+                ensures = dispatch(ensures),
+                context_everywhere = dispatch(context_everywhere),
+                content = bodyScope,
+              )(contract.blame)
+            )
           }
-          val bodyScope = Scope[Post](newVars, newBody)(body.o)
-
-          ParStatement(
-            ParBlock(
-              decl = new ParBlockDecl(),
-              iters = Seq(IterVariable(newV, dispatch(low), dispatch(high))),
-              requires = dispatch(requires),
-              ensures = dispatch(ensures),
-              context_everywhere = dispatch(context_everywhere),
-              content =
-                bodyScope,
-            )(contract.blame)
-          )
         }
-      }
-
-    case a @ Assign(Local(Ref(v)), _) if iterationLoopVariables.contains(v) =>
-      throw VariableWrittenInParLoop(a)
-
-    case s @ Scope(locals, _) =>
-      s.rewrite(locals = variables.dispatch(locals.filterNot(iterationLoopVariables.contains)))
 
-    case other => rewriteDefault(other)
-  }
-
-  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] = e match {
-    case l @ Local(Ref(v)) if iterationLoopVariables.contains(v) && !currentIterationVariables.toSeq.contains(v) =>
-      throw VariableReadOutsideParLoop(l)
-    case other => rewriteDefault(other)
-  }
+      case a @ Assign(Local(Ref(v)), _) if iterationLoopVariables.contains(v) =>
+        throw VariableWrittenInParLoop(a)
+
+      case s @ Scope(locals, _) =>
+        s.rewrite(locals =
+          variables.dispatch(locals.filterNot(iterationLoopVariables.contains))
+        )
+
+      case other => rewriteDefault(other)
+    }
+
+  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] =
+    e match {
+      case l @ Local(Ref(v))
+          if iterationLoopVariables.contains(v) &&
+            !currentIterationVariables.toSeq.contains(v) =>
+        throw VariableReadOutsideParLoop(l)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/MonomorphizeClass.scala b/src/rewrite/vct/rewrite/MonomorphizeClass.scala
index e87f40a2d3..779fa700e4 100644
--- a/src/rewrite/vct/rewrite/MonomorphizeClass.scala
+++ b/src/rewrite/vct/rewrite/MonomorphizeClass.scala
@@ -15,30 +15,40 @@ case object MonomorphizeClass extends RewriterBuilder {
   override def desc: String = "Monomorphize generic classes"
 }
 
-case class MonomorphizeClass[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging {
-  val currentSubstitutions: ScopedStack[Map[Variable[Pre], Type[Pre]]] = ScopedStack()
+case class MonomorphizeClass[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
+  val currentSubstitutions: ScopedStack[Map[Variable[Pre], Type[Pre]]] =
+    ScopedStack()
 
   type Key = (Class[Pre], Seq[Type[Pre]])
-  case class InstantiationContext(cls: Class[Pre],
-                                  typeValues: Seq[Type[Pre]],
-                                  keepBodies: Boolean,
-                                  substitutions: Map[TVar[Pre], Type[Pre]]
-                                  ) {
+  case class InstantiationContext(
+      cls: Class[Pre],
+      typeValues: Seq[Type[Pre]],
+      keepBodies: Boolean,
+      substitutions: Map[TVar[Pre], Type[Pre]],
+  ) {
     def key = (cls, typeValues)
-    def substitute = Substitute(Map.empty[Expr[Pre], Expr[Pre]], typeSubs = substitutions)
+    def substitute =
+      Substitute(Map.empty[Expr[Pre], Expr[Pre]], typeSubs = substitutions)
 
     def evalType(t: Type[Pre]): Type[Pre] = substitute.dispatch(t)
     def evalTypes(ts: Seq[Type[Pre]]): Seq[Type[Pre]] = ts.map(evalType)
   }
   val ctx: ScopedStack[InstantiationContext] = ScopedStack()
 
-  def keepBodies: Boolean = ctx.topOption.map { ctx => ctx.keepBodies }.getOrElse(true)
+  def keepBodies: Boolean =
+    ctx.topOption.map { ctx => ctx.keepBodies }.getOrElse(true)
 
   val knownInstantiations: mutable.LinkedHashSet[Key] = mutable.LinkedHashSet()
   // key: generically instantiated type in pre
-  val genericSucc: SuccessionMap[(Key, Declaration[Pre]), Declaration[Post]] = SuccessionMap()
+  val genericSucc: SuccessionMap[(Key, Declaration[Pre]), Declaration[Post]] =
+    SuccessionMap()
 
-  def instantiate(cls: Class[Pre], typeValues: Seq[Type[Pre]], keepBodies: Boolean): Unit = {
+  def instantiate(
+      cls: Class[Pre],
+      typeValues: Seq[Type[Pre]],
+      keepBodies: Boolean,
+  ): Unit = {
     /* Known limitation: the knownInstantations set does not take into account how a class was instantiated.
     A class can be instantiated both abstractly (without method bodies) and concretely (with method bodies)
     for the same sequence of type arguments, maybe. If that's the case, the knownInstantiations should take the
@@ -47,112 +57,152 @@ case class MonomorphizeClass[Pre <: Generation]() extends Rewriter[Pre] with Laz
      */
     val key = (cls, typeValues)
     if (knownInstantiations.contains(key)) {
-      logger.debug(s"Class ${cls.o.getPreferredNameOrElse().ucamel} with type args $typeValues is already instantiated, so skipping instantiation")
+      logger.debug(
+        s"Class ${cls.o.getPreferredNameOrElse().ucamel} with type args $typeValues is already instantiated, so skipping instantiation"
+      )
       return
     }
-    val mode = if (keepBodies) { "concretely" } else { "abstractly" }
-    logger.debug(s"Instantiating class ${cls.o.getPreferredNameOrElse().ucamel} $mode, args: $typeValues")
+    val mode =
+      if (keepBodies) { "concretely" }
+      else { "abstractly" }
+    logger.debug(
+      s"Instantiating class ${cls.o.getPreferredNameOrElse().ucamel} $mode, args: $typeValues"
+    )
     val newCtx = InstantiationContext(
       cls,
       typeValues,
       keepBodies = keepBodies,
-      substitutions = cls.typeArgs.map { v: Variable[Pre] => TVar(v.ref[Variable[Pre]]) }.zip(typeValues).toMap
+      substitutions =
+        cls.typeArgs.map { v: Variable[Pre] => TVar(v.ref[Variable[Pre]]) }
+          .zip(typeValues).toMap,
     )
     knownInstantiations.add(key)
-    genericSucc((key, cls)) = ctx.having(newCtx) {
-      globalDeclarations.scope {
-        classDeclarations.scope {
-          variables.scope {
-            allScopes.anyDeclare(allScopes.anySucceedOnly(cls, cls.rewrite(typeArgs = Seq())))
+    genericSucc((key, cls)) =
+      ctx.having(newCtx) {
+        globalDeclarations.scope {
+          classDeclarations.scope {
+            variables.scope {
+              allScopes.anyDeclare(
+                allScopes.anySucceedOnly(cls, cls.rewrite(typeArgs = Seq()))
+              )
+            }
           }
         }
       }
-    }
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case cls: Class[Pre] if cls.typeArgs.nonEmpty =>
-      cls.typeArgs.foreach(_.drop())
-      instantiate(cls, cls.typeArgs.map(v => v.t.asInstanceOf[TType[Pre]].t), true)
-    case method: InstanceMethod[Pre] if ctx.nonEmpty =>
-      val newMethod: InstanceMethod[Post] =
-        method.rewrite(body = if(keepBodies) method.body.map(dispatch) else None)
-      genericSucc((ctx.top.key, method)) = newMethod
-      classDeclarations.declare(newMethod)
-      classDeclarations.succeedOnly(method, newMethod)
-    case cons: Constructor[Pre] if ctx.nonEmpty =>
-      val newCons = cons.rewrite(body = if(keepBodies) cons.body.map(dispatch) else None)
-      genericSucc((ctx.top.key, cons)) = newCons
-      classDeclarations.declare(newCons)
-      classDeclarations.succeedOnly(cons, newCons)
-    case field: InstanceField[Pre] if ctx.nonEmpty =>
-      val newField = field.rewrite()
-      genericSucc((ctx.top.key, field)) = newField
-      classDeclarations.declare(newField)
-      classDeclarations.succeedOnly(field, newField)
-    case other =>
-      allScopes.anySucceed(other, other.rewriteDefault())
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case cls: Class[Pre] if cls.typeArgs.nonEmpty =>
+        cls.typeArgs.foreach(_.drop())
+        instantiate(
+          cls,
+          cls.typeArgs.map(v => v.t.asInstanceOf[TType[Pre]].t),
+          true,
+        )
+      case method: InstanceMethod[Pre] if ctx.nonEmpty =>
+        val newMethod: InstanceMethod[Post] = method.rewrite(body =
+          if (keepBodies)
+            method.body.map(dispatch)
+          else
+            None
+        )
+        genericSucc((ctx.top.key, method)) = newMethod
+        classDeclarations.declare(newMethod)
+        classDeclarations.succeedOnly(method, newMethod)
+      case cons: Constructor[Pre] if ctx.nonEmpty =>
+        val newCons = cons.rewrite(body =
+          if (keepBodies)
+            cons.body.map(dispatch)
+          else
+            None
+        )
+        genericSucc((ctx.top.key, cons)) = newCons
+        classDeclarations.declare(newCons)
+        classDeclarations.succeedOnly(cons, newCons)
+      case field: InstanceField[Pre] if ctx.nonEmpty =>
+        val newField = field.rewrite()
+        genericSucc((ctx.top.key, field)) = newField
+        classDeclarations.declare(newField)
+        classDeclarations.succeedOnly(field, newField)
+      case other => allScopes.anySucceed(other, other.rewriteDefault())
+    }
 
-  override def dispatch(t: Type[Pre]): Type[Post] = (t, ctx.topOption) match {
-    case (TClass(Ref(cls), typeArgs), ctx) if typeArgs.nonEmpty =>
-      val typeValues = ctx match {
-        case Some(ctx) => typeArgs.map(ctx.substitute.dispatch)
-        case None => typeArgs
-      }
-      instantiate(cls, typeValues, false)
-      TClass[Post](genericSucc.ref[Post, Class[Post]](((cls, typeValues), cls)), Seq())
-    case (tvar @ TVar(_), Some(ctx)) =>
-      dispatch(ctx.substitutions(tvar))
-    case _ => t.rewriteDefault()
-  }
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    (t, ctx.topOption) match {
+      case (TClass(Ref(cls), typeArgs), ctx) if typeArgs.nonEmpty =>
+        val typeValues =
+          ctx match {
+            case Some(ctx) => typeArgs.map(ctx.substitute.dispatch)
+            case None => typeArgs
+          }
+        instantiate(cls, typeValues, false)
+        TClass[Post](
+          genericSucc.ref[Post, Class[Post]](((cls, typeValues), cls)),
+          Seq(),
+        )
+      case (tvar @ TVar(_), Some(ctx)) => dispatch(ctx.substitutions(tvar))
+      case _ => t.rewriteDefault()
+    }
 
-  override def dispatch(stmt: Statement[Pre]): Statement[Post] = stmt match {
-    case inv: InvokeConstructor[Pre] if inv.classTypeArgs.nonEmpty =>
-      val cls = inv.ref.decl.cls.decl
-      val typeValues = ctx.topOption.map(_.evalTypes(inv.classTypeArgs)).getOrElse(inv.classTypeArgs)
-      instantiate(cls, typeValues, false)
-      inv.rewrite(
-        ref = genericSucc.ref[Post, Constructor[Post]](((cls, typeValues), inv.ref.decl))
-      )
-    case inv: InvokeMethod[Pre]  =>
-      inv.obj.t match {
-        case TClass(Ref(cls), typeArgs) if typeArgs.nonEmpty =>
-          val typeValues = ctx.topOption.map(_.evalTypes(typeArgs)).getOrElse(typeArgs)
-          instantiate(cls, typeValues, false)
-          inv.rewrite(
-            ref = genericSucc.ref[Post, InstanceMethod[Post]](((cls, typeValues), inv.ref.decl))
-          )
-        case _ => inv.rewriteDefault()
-      }
-    case other => other.rewriteDefault()
-  }
+  override def dispatch(stmt: Statement[Pre]): Statement[Post] =
+    stmt match {
+      case inv: InvokeConstructor[Pre] if inv.classTypeArgs.nonEmpty =>
+        val cls = inv.ref.decl.cls.decl
+        val typeValues = ctx.topOption.map(_.evalTypes(inv.classTypeArgs))
+          .getOrElse(inv.classTypeArgs)
+        instantiate(cls, typeValues, false)
+        inv.rewrite(ref =
+          genericSucc
+            .ref[Post, Constructor[Post]](((cls, typeValues), inv.ref.decl))
+        )
+      case inv: InvokeMethod[Pre] =>
+        inv.obj.t match {
+          case TClass(Ref(cls), typeArgs) if typeArgs.nonEmpty =>
+            val typeValues = ctx.topOption.map(_.evalTypes(typeArgs))
+              .getOrElse(typeArgs)
+            instantiate(cls, typeValues, false)
+            inv.rewrite(ref =
+              genericSucc.ref[Post, InstanceMethod[Post]](
+                ((cls, typeValues), inv.ref.decl)
+              )
+            )
+          case _ => inv.rewriteDefault()
+        }
+      case other => other.rewriteDefault()
+    }
 
-  override def dispatch(loc: Location[Pre]): Location[Post] = loc match {
-    case loc @ FieldLocation(obj, Ref(field)) =>
-      obj.t match {
-        case TClass(Ref(cls), typeArgs) if typeArgs.nonEmpty =>
-          val typeArgs1 = ctx.topOption.map(_.evalTypes(typeArgs)).getOrElse(typeArgs)
-          instantiate(cls, typeArgs1, false)
-          loc.rewrite(
-            field = genericSucc.ref[Post, InstanceField[Post]](((cls, typeArgs1), field))
-          )
-        case _ => loc.rewriteDefault()
-      }
-    case _ => loc.rewriteDefault()
-  }
+  override def dispatch(loc: Location[Pre]): Location[Post] =
+    loc match {
+      case loc @ FieldLocation(obj, Ref(field)) =>
+        obj.t match {
+          case TClass(Ref(cls), typeArgs) if typeArgs.nonEmpty =>
+            val typeArgs1 = ctx.topOption.map(_.evalTypes(typeArgs))
+              .getOrElse(typeArgs)
+            instantiate(cls, typeArgs1, false)
+            loc.rewrite(field =
+              genericSucc
+                .ref[Post, InstanceField[Post]](((cls, typeArgs1), field))
+            )
+          case _ => loc.rewriteDefault()
+        }
+      case _ => loc.rewriteDefault()
+    }
 
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = expr match {
-    case deref @ Deref(obj, Ref(field)) =>
-      obj.t match {
-        case TClass(Ref(cls), typeArgs) if typeArgs.nonEmpty =>
-          val typeArgs1 = ctx.topOption.map(_.evalTypes(typeArgs)).getOrElse(typeArgs)
-          instantiate(cls, typeArgs1, false)
-          deref.rewrite(
-            ref = genericSucc.ref[Post, InstanceField[Post]](((cls, typeArgs1), field))
-          )
-        case _ => deref.rewriteDefault()
-      }
-    case _ => expr.rewriteDefault()
-  }
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case deref @ Deref(obj, Ref(field)) =>
+        obj.t match {
+          case TClass(Ref(cls), typeArgs) if typeArgs.nonEmpty =>
+            val typeArgs1 = ctx.topOption.map(_.evalTypes(typeArgs))
+              .getOrElse(typeArgs)
+            instantiate(cls, typeArgs1, false)
+            deref.rewrite(ref =
+              genericSucc
+                .ref[Post, InstanceField[Post]](((cls, typeArgs1), field))
+            )
+          case _ => deref.rewriteDefault()
+        }
+      case _ => expr.rewriteDefault()
+    }
 }
diff --git a/src/rewrite/vct/rewrite/MonomorphizeContractApplicables.scala b/src/rewrite/vct/rewrite/MonomorphizeContractApplicables.scala
index 244dead493..23012710f3 100644
--- a/src/rewrite/vct/rewrite/MonomorphizeContractApplicables.scala
+++ b/src/rewrite/vct/rewrite/MonomorphizeContractApplicables.scala
@@ -14,69 +14,117 @@ import scala.reflect.ClassTag
 
 case object MonomorphizeContractApplicables extends RewriterBuilder {
   override def key: String = "monomorphizeApplicables"
-  override def desc: String = "Monomorphize generic applicable declarations with their usages where Silver does not support generics."
+  override def desc: String =
+    "Monomorphize generic applicable declarations with their usages where Silver does not support generics."
 }
 
-case class MonomorphizeContractApplicables[Pre <: Generation]() extends Rewriter[Pre] {
-  val currentSubstitutions: ScopedStack[Map[Variable[Pre], Type[Post]]] = ScopedStack()
+case class MonomorphizeContractApplicables[Pre <: Generation]()
+    extends Rewriter[Pre] {
+  val currentSubstitutions: ScopedStack[Map[Variable[Pre], Type[Post]]] =
+    ScopedStack()
 
-  val monomorphizedRef: mutable.Map[(ContractApplicable[Pre], Seq[Type[Post]]), Ref[Post, ContractApplicable[Post]]] = mutable.Map()
-  val monomorphizedImpl: mutable.Map[(ContractApplicable[Pre], Seq[Type[Post]]), ContractApplicable[Post]] = mutable.Map()
+  val monomorphizedRef: mutable.Map[
+    (ContractApplicable[Pre], Seq[Type[Post]]),
+    Ref[Post, ContractApplicable[Post]],
+  ] = mutable.Map()
+  val monomorphizedImpl: mutable.Map[
+    (ContractApplicable[Pre], Seq[Type[Post]]),
+    ContractApplicable[Post],
+  ] = mutable.Map()
 
-  def getOrBuild(app: ContractApplicable[Pre], typeValues: Seq[Type[Post]]): Ref[Post, ContractApplicable[Post]] =
+  def getOrBuild(
+      app: ContractApplicable[Pre],
+      typeValues: Seq[Type[Post]],
+  ): Ref[Post, ContractApplicable[Post]] =
     monomorphizedRef.get((app, typeValues)) match {
       case Some(ref) => ref
       case None =>
-        monomorphizedRef((app, typeValues)) = new LazyRef(monomorphizedImpl((app, typeValues)))
-        monomorphizedImpl((app, typeValues)) = currentSubstitutions.having(app.typeArgs.zip(typeValues).toMap) {
-          globalDeclarations.scope {
-            classDeclarations.scope {
-              variables.scope {
-                allScopes.anyDeclare(allScopes.anySucceedOnly(app, app.rewrite(typeArgs = Nil)))
+        monomorphizedRef((app, typeValues)) =
+          new LazyRef(monomorphizedImpl((app, typeValues)))
+        monomorphizedImpl((app, typeValues)) =
+          currentSubstitutions.having(app.typeArgs.zip(typeValues).toMap) {
+            globalDeclarations.scope {
+              classDeclarations.scope {
+                variables.scope {
+                  allScopes.anyDeclare(
+                    allScopes.anySucceedOnly(app, app.rewrite(typeArgs = Nil))
+                  )
+                }
               }
             }
           }
-        }
         monomorphizedRef((app, typeValues))
     }
 
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case app: ContractApplicable[Pre] if app.typeArgs.nonEmpty =>
+        app.typeArgs.foreach(_.drop())
+        getOrBuild(
+          app,
+          app.typeArgs.map(v => dispatch(v.t.asInstanceOf[TType[Pre]].t)),
+        )
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case app: ContractApplicable[Pre] if app.typeArgs.nonEmpty =>
-      app.typeArgs.foreach(_.drop())
-      getOrBuild(app, app.typeArgs.map(v => dispatch(v.t.asInstanceOf[TType[Pre]].t)))
-    case other => rewriteDefault(other)
-  }
-
-  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] = e match {
-    case inv: Invocation[Pre] if inv.ref.decl.typeArgs.nonEmpty =>
-      val typeValues = inv.typeArgs.map(dispatch)
-      val ref = getOrBuild(inv.ref.decl, typeValues)
+  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] =
+    e match {
+      case inv: Invocation[Pre] if inv.ref.decl.typeArgs.nonEmpty =>
+        val typeValues = inv.typeArgs.map(dispatch)
+        val ref = getOrBuild(inv.ref.decl, typeValues)
 
-      inv match {
-        case inv: ProcedureInvocation[Pre] => inv.rewrite(ref = ref.asInstanceOf[Ref[Post, Procedure[Post]]], typeArgs = Nil)
-        case inv: MethodInvocation[Pre] => inv.rewrite(ref = ref.asInstanceOf[Ref[Post, InstanceMethod[Post]]], typeArgs = Nil)
-        case inv: FunctionInvocation[Pre] => inv.rewrite(ref = ref.asInstanceOf[Ref[Post, Function[Post]]], typeArgs = Nil)
-        case inv: InstanceFunctionInvocation[Pre] => inv.rewrite(ref = ref.asInstanceOf[Ref[Post, InstanceFunction[Post]]], typeArgs = Nil)
-      }
-    case other => rewriteDefault(other)
-  }
+        inv match {
+          case inv: ProcedureInvocation[Pre] =>
+            inv.rewrite(
+              ref = ref.asInstanceOf[Ref[Post, Procedure[Post]]],
+              typeArgs = Nil,
+            )
+          case inv: MethodInvocation[Pre] =>
+            inv.rewrite(
+              ref = ref.asInstanceOf[Ref[Post, InstanceMethod[Post]]],
+              typeArgs = Nil,
+            )
+          case inv: FunctionInvocation[Pre] =>
+            inv.rewrite(
+              ref = ref.asInstanceOf[Ref[Post, Function[Post]]],
+              typeArgs = Nil,
+            )
+          case inv: InstanceFunctionInvocation[Pre] =>
+            inv.rewrite(
+              ref = ref.asInstanceOf[Ref[Post, InstanceFunction[Post]]],
+              typeArgs = Nil,
+            )
+        }
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(s: Statement[Pre]): Statement[Post] = s match {
-    case inv: InvocationStatement[Pre] if inv.ref.decl.typeArgs.nonEmpty =>
-      val typeValues = inv.typeArgs.map(dispatch)
-      val ref = getOrBuild(inv.ref.decl, typeValues)
+  override def dispatch(s: Statement[Pre]): Statement[Post] =
+    s match {
+      case inv: InvocationStatement[Pre] if inv.ref.decl.typeArgs.nonEmpty =>
+        val typeValues = inv.typeArgs.map(dispatch)
+        val ref = getOrBuild(inv.ref.decl, typeValues)
 
-      inv match {
-        case inv: InvokeProcedure[Pre] => inv.rewrite(ref = ref.asInstanceOf[Ref[Post, Procedure[Post]]], typeArgs = Nil)
-        case inv: InvokeMethod[Pre] => inv.rewrite(ref = ref.asInstanceOf[Ref[Post, InstanceMethod[Post]]], typeArgs = Nil)
-      }
-    case other => other.rewriteDefault()
-  }
+        inv match {
+          case inv: InvokeProcedure[Pre] =>
+            inv.rewrite(
+              ref = ref.asInstanceOf[Ref[Post, Procedure[Post]]],
+              typeArgs = Nil,
+            )
+          case inv: InvokeMethod[Pre] =>
+            inv.rewrite(
+              ref = ref.asInstanceOf[Ref[Post, InstanceMethod[Post]]],
+              typeArgs = Nil,
+            )
+        }
+      case other => other.rewriteDefault()
+    }
 
-  override def dispatch(t: Type[Pre]): Type[Rewritten[Pre]] = t match {
-    case TVar(Ref(v)) =>
-      currentSubstitutions.topOption.getOrElse(Map.empty[Variable[Pre], Type[Post]]).getOrElse(v, TVar(succ(v)))
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(t: Type[Pre]): Type[Rewritten[Pre]] =
+    t match {
+      case TVar(Ref(v)) =>
+        currentSubstitutions.topOption
+          .getOrElse(Map.empty[Variable[Pre], Type[Post]])
+          .getOrElse(v, TVar(succ(v)))
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/ParBlockEncoder.scala b/src/rewrite/vct/rewrite/ParBlockEncoder.scala
index e9bebaf2a4..e477579d47 100644
--- a/src/rewrite/vct/rewrite/ParBlockEncoder.scala
+++ b/src/rewrite/vct/rewrite/ParBlockEncoder.scala
@@ -15,67 +15,85 @@ import scala.collection.mutable
 case object ParBlockEncoder extends RewriterBuilder {
   override def key: String = "parBlock"
 
-  override def desc: String = "Translate parallel blocks into methods and generate checks for them."
+  override def desc: String =
+    "Translate parallel blocks into methods and generate checks for them."
 
-  private def LowEvalOrigin(v: IterVariable[_]): Origin = v.variable.o.where(prefix="lo")
-  private def HighEvalOrigin(v: IterVariable[_]): Origin = v.variable.o.where(prefix="hi")
+  private def LowEvalOrigin(v: IterVariable[_]): Origin =
+    v.variable.o.where(prefix = "lo")
+  private def HighEvalOrigin(v: IterVariable[_]): Origin =
+    v.variable.o.where(prefix = "hi")
 
-  case class ParBlockNotInjective(block: ParBlock[_], expr: Expr[_]) extends Blame[ReceiverNotInjective] {
+  case class ParBlockNotInjective(block: ParBlock[_], expr: Expr[_])
+      extends Blame[ReceiverNotInjective] {
     override def blame(error: ReceiverNotInjective): Unit =
       block.blame.blame(ParPredicateNotInjective(block, expr))
   }
 
-  case class ParStatementExhaleFailed(region: ParRegion[_]) extends Blame[ExhaleFailed] {
+  case class ParStatementExhaleFailed(region: ParRegion[_])
+      extends Blame[ExhaleFailed] {
     override def blame(error: ExhaleFailed): Unit =
       region.blame.blame(ParPreconditionFailed(error.failure, region))
   }
 
-  case class ParSequenceProofFailed(region: ParRegion[_]) extends Blame[FramedProofFailure] {
-    override def blame(error: FramedProofFailure): Unit = error match {
-      case preFailed@FramedProofPreFailed(_, _) =>
-        PanicBlame("The precondition in the framed proof of a par sequence is `true`").blame(preFailed)
-      case FramedProofPostFailed(failure, _) =>
-        region.blame.blame(ParPreconditionFailed(failure, region))
-    }
+  case class ParSequenceProofFailed(region: ParRegion[_])
+      extends Blame[FramedProofFailure] {
+    override def blame(error: FramedProofFailure): Unit =
+      error match {
+        case preFailed @ FramedProofPreFailed(_, _) =>
+          PanicBlame(
+            "The precondition in the framed proof of a par sequence is `true`"
+          ).blame(preFailed)
+        case FramedProofPostFailed(failure, _) =>
+          region.blame.blame(ParPreconditionFailed(failure, region))
+      }
   }
 
-  case class ParBlockProofFailed(block: ParBlock[_]) extends Blame[FramedProofFailure] {
-    override def blame(error: FramedProofFailure): Unit = error match {
-      case FramedProofPreFailed(failure, _) =>
-        // PB: this is a bit dubious, maybe instead inhale the par precondition and panic here?
-        block.blame.blame(ParPreconditionFailed(failure, block))
-      case FramedProofPostFailed(failure, _) =>
-        block.blame.blame(ParBlockPostconditionFailed(failure, block))
-    }
+  case class ParBlockProofFailed(block: ParBlock[_])
+      extends Blame[FramedProofFailure] {
+    override def blame(error: FramedProofFailure): Unit =
+      error match {
+        case FramedProofPreFailed(failure, _) =>
+          // PB: this is a bit dubious, maybe instead inhale the par precondition and panic here?
+          block.blame.blame(ParPreconditionFailed(failure, block))
+        case FramedProofPostFailed(failure, _) =>
+          block.blame.blame(ParBlockPostconditionFailed(failure, block))
+      }
   }
 
-  case class ParInvariantCannotBeExhaled(invariant: ParInvariant[_]) extends Blame[ExhaleFailed] {
+  case class ParInvariantCannotBeExhaled(invariant: ParInvariant[_])
+      extends Blame[ExhaleFailed] {
     override def blame(error: ExhaleFailed): Unit =
-      invariant.blame.blame(ParInvariantNotEstablished(error.failure, invariant))
+      invariant.blame
+        .blame(ParInvariantNotEstablished(error.failure, invariant))
   }
 
-  case class ParAtomicCannotBeExhaled(atomic: ParAtomic[_]) extends Blame[ExhaleFailed] {
+  case class ParAtomicCannotBeExhaled(atomic: ParAtomic[_])
+      extends Blame[ExhaleFailed] {
     override def blame(error: ExhaleFailed): Unit =
       atomic.blame.blame(ParInvariantNotMaintained(error.failure, atomic))
   }
 
-  case class ParBarrierInvariantExhaleFailed(barrier: ParBarrier[_]) extends Blame[ExhaleFailed] {
+  case class ParBarrierInvariantExhaleFailed(barrier: ParBarrier[_])
+      extends Blame[ExhaleFailed] {
     override def blame(error: ExhaleFailed): Unit =
       barrier.blame.blame(ParBarrierInvariantBroken(error.failure, barrier))
   }
 
-  case class ParBarrierExhaleFailed(barrier: ParBarrier[_]) extends Blame[ExhaleFailed] {
+  case class ParBarrierExhaleFailed(barrier: ParBarrier[_])
+      extends Blame[ExhaleFailed] {
     override def blame(error: ExhaleFailed): Unit =
       barrier.blame.blame(ParBarrierNotEstablished(error.failure, barrier))
   }
 
-  case class ParBarrierProofFailed(barrier: ParBarrier[_]) extends Blame[FramedProofFailure] {
-    override def blame(error: FramedProofFailure): Unit = error match {
-      case FramedProofPreFailed(_, _) =>
-        PanicBlame("Barrier consistency proof requires true").blame(error)
-      case FramedProofPostFailed(failure, _) =>
-        barrier.blame.blame(ParBarrierInconsistent(failure, barrier))
-    }
+  case class ParBarrierProofFailed(barrier: ParBarrier[_])
+      extends Blame[FramedProofFailure] {
+    override def blame(error: FramedProofFailure): Unit =
+      error match {
+        case FramedProofPreFailed(_, _) =>
+          PanicBlame("Barrier consistency proof requires true").blame(error)
+        case FramedProofPostFailed(failure, _) =>
+          barrier.blame.blame(ParBarrierInconsistent(failure, barrier))
+      }
   }
 }
 
@@ -86,7 +104,8 @@ case class ParBlockEncoder[Pre <: Generation]() extends Rewriter[Pre] {
   val blockDecl: mutable.Map[ParBlockDecl[Pre], ParBlock[Pre]] = mutable.Map()
   val invDecl: mutable.Map[ParInvariantDecl[Pre], Expr[Pre]] = mutable.Map()
 
-  val currentRanges: ScopedStack[Map[Variable[Pre], (Expr[Post], Expr[Post])]] = ScopedStack()
+  val currentRanges: ScopedStack[Map[Variable[Pre], (Expr[Post], Expr[Post])]] =
+    ScopedStack()
 
   // We need range values even in layered parallel blocks, since e.g. barriers need them.
   def range(v: Variable[Pre]): (Expr[Post], Expr[Post]) =
@@ -105,98 +124,146 @@ case class ParBlockEncoder[Pre <: Generation]() extends Rewriter[Pre] {
     result.toSet
   }
 
-  def quantify(block: ParBlock[Pre], expr: Expr[Pre], nonEmpty: Boolean)(implicit o: Origin): Expr[Post] = {
+  def quantify(block: ParBlock[Pre], expr: Expr[Pre], nonEmpty: Boolean)(
+      implicit o: Origin
+  ): Expr[Post] = {
     val exprs = AstBuildHelpers.unfoldStar(expr)
     val vars = block.iters.map(_.variable).toSet
 
     val rewrittenExpr = exprs.map(e => {
-      val quantVars = if (nonEmpty) depVars(vars, e) else vars
+      val quantVars =
+        if (nonEmpty)
+          depVars(vars, e)
+        else
+          vars
       val nonQuantVars = vars.diff(quantVars)
 
-      val scale = (x: Expr[Post]) => nonQuantVars.foldLeft(x)((body, iter) => {
-        val scale = to(iter) - from(iter)
-        Scale(scale, body)(PanicBlame("Par block was checked to be non-empty"))(body.o)
-      })
-
-      if(quantVars.isEmpty) scale(dispatch(e))
-      else variables.scope {
-        val range = quantVars.map(v =>
-          from(v) <= Local[Post](succ(v)) &&
-            Local[Post](succ(v)) < to(v)
-        ).reduceOption[Expr[Post]](And(_, _)).getOrElse(tt)
-
-        e match {
-          case Forall(bindings, Nil, body) =>
-            Forall(variables.dispatch(bindings ++ quantVars), Nil, range ==> scale(dispatch(body)))(body.o)
-          case s @ Starall(bindings, Nil, body) =>
-            Starall(variables.dispatch(bindings ++ quantVars), Nil, range ==> scale(dispatch(body)))(s.blame)(body.o)
-          case other =>
-            Starall(variables.dispatch(quantVars), Nil, range ==> scale(dispatch(other)))(ParBlockNotInjective(block, other))(other.o)
+      val scale =
+        (x: Expr[Post]) =>
+          nonQuantVars.foldLeft(x)((body, iter) => {
+            val scale = to(iter) - from(iter)
+            Scale(scale, body)(PanicBlame(
+              "Par block was checked to be non-empty"
+            ))(body.o)
+          })
+
+      if (quantVars.isEmpty)
+        scale(dispatch(e))
+      else
+        variables.scope {
+          val range = quantVars.map(v =>
+            from(v) <= Local[Post](succ(v)) && Local[Post](succ(v)) < to(v)
+          ).reduceOption[Expr[Post]](And(_, _)).getOrElse(tt)
+
+          e match {
+            case Forall(bindings, Nil, body) =>
+              Forall(
+                variables.dispatch(bindings ++ quantVars),
+                Nil,
+                range ==> scale(dispatch(body)),
+              )(body.o)
+            case s @ Starall(bindings, Nil, body) =>
+              Starall(
+                variables.dispatch(bindings ++ quantVars),
+                Nil,
+                range ==> scale(dispatch(body)),
+              )(s.blame)(body.o)
+            case other =>
+              Starall(
+                variables.dispatch(quantVars),
+                Nil,
+                range ==> scale(dispatch(other)),
+              )(ParBlockNotInjective(block, other))(other.o)
+          }
         }
-      }
     })
 
     AstBuildHelpers.foldStar(rewrittenExpr)
   }
 
-  def requires(region: ParRegion[Pre], nonEmpty: Boolean)(implicit o: Origin): Expr[Post] = region match {
-    case ParParallel(regions) => AstBuildHelpers.foldStar(regions.map(requires(_, nonEmpty)))
-    case ParSequential(regions) => regions.headOption.map(requires(_, nonEmpty)).getOrElse(tt)
-    case block: ParBlock[Pre] =>
-      quantify(block, block.context_everywhere &* block.requires, nonEmpty)
-  }
+  def requires(region: ParRegion[Pre], nonEmpty: Boolean)(
+      implicit o: Origin
+  ): Expr[Post] =
+    region match {
+      case ParParallel(regions) =>
+        AstBuildHelpers.foldStar(regions.map(requires(_, nonEmpty)))
+      case ParSequential(regions) =>
+        regions.headOption.map(requires(_, nonEmpty)).getOrElse(tt)
+      case block: ParBlock[Pre] =>
+        quantify(block, block.context_everywhere &* block.requires, nonEmpty)
+    }
 
-  def ensures(region: ParRegion[Pre], nonEmpty: Boolean)(implicit o: Origin): Expr[Post] = region match {
-    case ParParallel(regions) => AstBuildHelpers.foldStar(regions.map(ensures(_, nonEmpty)))
-    case ParSequential(regions) => regions.lastOption.map(ensures(_, nonEmpty)).getOrElse(tt)
-    case block: ParBlock[Pre] =>
-      quantify(block, block.context_everywhere &* block.ensures, nonEmpty)
-  }
+  def ensures(region: ParRegion[Pre], nonEmpty: Boolean)(
+      implicit o: Origin
+  ): Expr[Post] =
+    region match {
+      case ParParallel(regions) =>
+        AstBuildHelpers.foldStar(regions.map(ensures(_, nonEmpty)))
+      case ParSequential(regions) =>
+        regions.lastOption.map(ensures(_, nonEmpty)).getOrElse(tt)
+      case block: ParBlock[Pre] =>
+        quantify(block, block.context_everywhere &* block.ensures, nonEmpty)
+    }
 
   // A variable of this type cannot be altered in a parallel block
-  def isConstType(t: Type[_]): Boolean = t match {
-    case _: NumericType[_] => true
-    case _: TBool[_] => true
-    case _: TChar[_] => true
-    case TSeq(e) => isConstType(e)
-    case TSet(e) => isConstType(e)
-    case TBag(e) => isConstType(e)
-    case TMap(e, v) => isConstType(e) && isConstType(v)
-    case TOption(e) => isConstType(e)
-    case TTuple(es) => es.forall(isConstType)
-    case TEither(l, r) => isConstType(l) && isConstType(r)
-    case _ => false
-  }
+  def isConstType(t: Type[_]): Boolean =
+    t match {
+      case _: NumericType[_] => true
+      case _: TBool[_] => true
+      case _: TChar[_] => true
+      case TSeq(e) => isConstType(e)
+      case TSet(e) => isConstType(e)
+      case TBag(e) => isConstType(e)
+      case TMap(e, v) => isConstType(e) && isConstType(v)
+      case TOption(e) => isConstType(e)
+      case TTuple(es) => es.forall(isConstType)
+      case TEither(l, r) => isConstType(l) && isConstType(r)
+      case _ => false
+    }
 
-  def isConstant(e: Expr[Post]): Boolean = e match {
-    case _ : Constant[Post] => true
-    case l: Local[_] if isConstType(l.t) => true
-    case _: Constant[_] => true
-    case op: BinExpr[Post] => isConstant(op.left) && isConstant(op.right)
-    case _ => false
-  }
+  def isConstant(e: Expr[Post]): Boolean =
+    e match {
+      case _: Constant[Post] => true
+      case l: Local[_] if isConstType(l.t) => true
+      case _: Constant[_] => true
+      case op: BinExpr[Post] => isConstant(op.left) && isConstant(op.right)
+      case _ => false
+    }
 
-  def ranges(region: ParRegion[Pre], rangeValues: mutable.Map[Variable[Pre], (Expr[Post], Expr[Post])]): Statement[Post] = region match {
-    case ParParallel(regions) => Block(regions.map(ranges(_, rangeValues)))(region.o)
-    case ParSequential(regions) => Block(regions.map(ranges(_, rangeValues)))(region.o)
-    case block@ParBlock(decl, iters, _, _, _, _) =>
-      decl.drop()
-      blockDecl(decl) = block
-      Block(iters.foldLeft(Seq[Statement[Post]]()) { case (res, v) =>
-        implicit val o: Origin = v.o
-        val from = dispatch(v.from)
-        val to = dispatch(v.to)
-        val lo = variables.declare(new Variable[Post](TInt())(LowEvalOrigin(v)))
-        val hi = variables.declare(new Variable[Post](TInt())(HighEvalOrigin(v)))
-        val low = if(isConstant(from)) from else lo.get
-        val high = if(isConstant(to)) to else hi.get
-        rangeValues(v.variable) = (low, high)
-        res ++ Seq(
-          assignLocal(lo.get, from),
-          assignLocal(hi.get, to),
-        )
-      })(region.o)
-  }
+  def ranges(
+      region: ParRegion[Pre],
+      rangeValues: mutable.Map[Variable[Pre], (Expr[Post], Expr[Post])],
+  ): Statement[Post] =
+    region match {
+      case ParParallel(regions) =>
+        Block(regions.map(ranges(_, rangeValues)))(region.o)
+      case ParSequential(regions) =>
+        Block(regions.map(ranges(_, rangeValues)))(region.o)
+      case block @ ParBlock(decl, iters, _, _, _, _) =>
+        decl.drop()
+        blockDecl(decl) = block
+        Block(iters.foldLeft(Seq[Statement[Post]]()) { case (res, v) =>
+          implicit val o: Origin = v.o
+          val from = dispatch(v.from)
+          val to = dispatch(v.to)
+          val lo = variables
+            .declare(new Variable[Post](TInt())(LowEvalOrigin(v)))
+          val hi = variables
+            .declare(new Variable[Post](TInt())(HighEvalOrigin(v)))
+          val low =
+            if (isConstant(from))
+              from
+            else
+              lo.get
+          val high =
+            if (isConstant(to))
+              to
+            else
+              hi.get
+          rangeValues(v.variable) = (low, high)
+          res ++ Seq(assignLocal(lo.get, from), assignLocal(hi.get, to))
+        })(region.o)
+    }
 
   def execute(region: ParRegion[Pre], nonEmpty: Boolean): Statement[Post] = {
     implicit val o: Origin = region.o
@@ -206,135 +273,176 @@ case class ParBlockEncoder[Pre <: Generation]() extends Rewriter[Pre] {
     ))
   }
 
-  def check(region: ParRegion[Pre]): Statement[Post] = region match {
-    case ParParallel(regions) =>
-      IndetBranch(regions.map(check))(region.o)
-    case ParSequential(regions) =>
-      IndetBranch(regions.map(check) ++ regions.zip(regions.tail).map {
-        case (leftRegion, rightRegion) =>
-          implicit val o: Origin = region.o
-          FramedProof(tt, Inhale(ensures(leftRegion, false)), requires(rightRegion, false))(ParSequenceProofFailed(rightRegion))
-      })(region.o)
-    case block@ParBlock(decl, iters, context_everywhere, requires, ensures, content) =>
-      implicit val o: Origin = region.o
-      val (vars, (init, blockNonEmpty)) = variables.collect {
-        val initsAndConds = iters.map { v =>
-          dispatch(v.variable)
-          val cond = from(v.variable) < to(v.variable)
-          val init = assignLocal(Local[Post](succ(v.variable)), ChooseFresh(RangeSet(from(v.variable), to(v.variable)))(PanicBlame("under branch from < to")))
-          (init, cond)
+  def check(region: ParRegion[Pre]): Statement[Post] =
+    region match {
+      case ParParallel(regions) => IndetBranch(regions.map(check))(region.o)
+      case ParSequential(regions) =>
+        IndetBranch(regions.map(check) ++ regions.zip(regions.tail).map {
+          case (leftRegion, rightRegion) =>
+            implicit val o: Origin = region.o
+            FramedProof(
+              tt,
+              Inhale(ensures(leftRegion, false)),
+              requires(rightRegion, false),
+            )(ParSequenceProofFailed(rightRegion))
+        })(region.o)
+      case block @ ParBlock(
+            decl,
+            iters,
+            context_everywhere,
+            requires,
+            ensures,
+            content,
+          ) =>
+        implicit val o: Origin = region.o
+        val (vars, (init, blockNonEmpty)) = variables.collect {
+          val initsAndConds = iters.map { v =>
+            dispatch(v.variable)
+            val cond = from(v.variable) < to(v.variable)
+            val init = assignLocal(
+              Local[Post](succ(v.variable)),
+              ChooseFresh(RangeSet(from(v.variable), to(v.variable)))(
+                PanicBlame("under branch from < to")
+              ),
+            )
+            (init, cond)
+          }
+
+          (Block(initsAndConds.map(_._1)), foldAnd(initsAndConds.map(_._2)))
         }
 
-        (Block(initsAndConds.map(_._1)), foldAnd(initsAndConds.map(_._2)))
-      }
-
-      val proof = Scope(vars, Block(Seq(
-        init,
-        FramedProof(
-          pre = dispatch(context_everywhere) &* dispatch(requires),
-          body = dispatch(content),
-          post = dispatch(context_everywhere) &* dispatch(ensures),
-        )(ParBlockProofFailed(block)),
-      )))
+        val proof = Scope(
+          vars,
+          Block(Seq(
+            init,
+            FramedProof(
+              pre = dispatch(context_everywhere) &* dispatch(requires),
+              body = dispatch(content),
+              post = dispatch(context_everywhere) &* dispatch(ensures),
+            )(ParBlockProofFailed(block)),
+          )),
+        )
 
-      Branch(Seq(blockNonEmpty -> proof))
-  }
+        Branch(Seq(blockNonEmpty -> proof))
+    }
 
-  def isParBlock(stat: ParRegion[Pre]): Boolean = stat match {
-    case _: ParBlock[Pre] => true
-    case _ => false
-  }
+  def isParBlock(stat: ParRegion[Pre]): Boolean =
+    stat match {
+      case _: ParBlock[Pre] => true
+      case _ => false
+    }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case ParStatement(region) =>
-      val isSingleBlock: Boolean = isParBlock(region)
-      implicit val o: Origin = stat.o
-      val rangeValues: mutable.Map[Variable[Pre], (Expr[Post], Expr[Post])] = mutable.Map()
-      val (vars, evalRanges) = variables.collect {
-        ranges(region, rangeValues)
-      }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case ParStatement(region) =>
+        val isSingleBlock: Boolean = isParBlock(region)
+        implicit val o: Origin = stat.o
+        val rangeValues: mutable.Map[Variable[Pre], (Expr[Post], Expr[Post])] =
+          mutable.Map()
+        val (vars, evalRanges) = variables.collect {
+          ranges(region, rangeValues)
+        }
 
-      currentRanges.having(rangeValues.toMap) {
-        var res: Statement[Post] =
-          IndetBranch(Seq(
+        currentRanges.having(rangeValues.toMap) {
+          var res: Statement[Post] = IndetBranch(Seq(
             execute(region, isSingleBlock),
-            Block(Seq(check(region), Inhale(ff)))
+            Block(Seq(check(region), Inhale(ff))),
           ))
-        if (isSingleBlock) {
-          val condition: Expr[Post] = foldAnd(rangeValues.values.map { case (low, hi) => low < hi })
-          res = Branch(Seq((condition, res)))
+          if (isSingleBlock) {
+            val condition: Expr[Post] = foldAnd(rangeValues.values.map {
+              case (low, hi) => low < hi
+            })
+            res = Branch(Seq((condition, res)))
+          }
+          Scope(vars, Block(Seq(evalRanges, res)))
         }
-        Scope(vars,
-          Block(Seq(evalRanges, res)))
-      }
 
-    case inv@ParInvariant(decl, dependentInvariant, body) =>
-      implicit val o: Origin = stat.o
-      // PB: this usage is dubious: dependentInvariant can probably contain type variables?
-      val (Seq(frozenInvariant), mappings) = Extract.extract(dependentInvariant)
-
-      decl.drop()
-      invDecl(decl) = frozenInvariant
-
-      Scope(variables.collect {
-        mappings.keys.foreach(dispatch)
-      }._1, Block(Seq(
-        Block(mappings.map { case (v, e) => assignLocal[Post](Local(succ(v)), dispatch(e)) }.toSeq),
-        Exhale(dispatch(frozenInvariant))(ParInvariantCannotBeExhaled(inv)),
-        dispatch(body),
-        Inhale(dispatch(frozenInvariant)),
-      )))
-
-    case atomic@ParAtomic(invDecls, body) =>
-      implicit val o: Origin = atomic.o
-      Block(Seq(
-        Block(invDecls.map { case Ref(decl) => Inhale(dispatch(invDecl(decl))) }),
-        dispatch(body),
-        Block(invDecls.reverse.map { case Ref(decl) => Exhale(dispatch(invDecl(decl)))(ParAtomicCannotBeExhaled(atomic)) }),
-      ))
-
-    case barrier@ParBarrier(Ref(decl), suspendedInvariants, requires, ensures, hint) =>
-      implicit val o: Origin = barrier.o
-      val block = blockDecl(decl)
-      IndetBranch[Post](Seq(
-        // Prove the barrier for all threads (and inhale false)
-        Block(Seq(
-          FramedProof(
-            pre = tt,
-            body = Block(Seq(
-              Inhale(quantify(block, requires, false)),
-              Block(suspendedInvariants.map { case Ref(decl) => Inhale(dispatch(invDecl(decl))) }),
-              dispatch(hint),
-              Block(suspendedInvariants.reverse.map {
-                case Ref(decl) => Exhale(
-                  dispatch(invDecl(decl))
-                )(ParBarrierInvariantExhaleFailed(barrier))
-              }),
-            )),
-            post = quantify(block, ensures, false),
-          )(ParBarrierProofFailed(barrier)),
-          Inhale(ff),
-        )),
-        // Enact the barrier contract for the current thread
+      case inv @ ParInvariant(decl, dependentInvariant, body) =>
+        implicit val o: Origin = stat.o
+        // PB: this usage is dubious: dependentInvariant can probably contain type variables?
+        val (Seq(frozenInvariant), mappings) = Extract
+          .extract(dependentInvariant)
+
+        decl.drop()
+        invDecl(decl) = frozenInvariant
+
+        Scope(
+          variables.collect { mappings.keys.foreach(dispatch) }._1,
+          Block(Seq(
+            Block(mappings.map { case (v, e) =>
+              assignLocal[Post](Local(succ(v)), dispatch(e))
+            }.toSeq),
+            Exhale(dispatch(frozenInvariant))(ParInvariantCannotBeExhaled(inv)),
+            dispatch(body),
+            Inhale(dispatch(frozenInvariant)),
+          )),
+        )
+
+      case atomic @ ParAtomic(invDecls, body) =>
+        implicit val o: Origin = atomic.o
         Block(Seq(
-          Exhale(dispatch(requires))(ParBarrierExhaleFailed(barrier)),
-          Inhale(dispatch(ensures)),
+          Block(invDecls.map { case Ref(decl) =>
+            Inhale(dispatch(invDecl(decl)))
+          }),
+          dispatch(body),
+          Block(invDecls.reverse.map { case Ref(decl) =>
+            Exhale(dispatch(invDecl(decl)))(ParAtomicCannotBeExhaled(atomic))
+          }),
         ))
-      ))
 
-    case other => rewriteDefault(other)
-  }
+      case barrier @ ParBarrier(
+            Ref(decl),
+            suspendedInvariants,
+            requires,
+            ensures,
+            hint,
+          ) =>
+        implicit val o: Origin = barrier.o
+        val block = blockDecl(decl)
+        IndetBranch[Post](Seq(
+          // Prove the barrier for all threads (and inhale false)
+          Block(Seq(
+            FramedProof(
+              pre = tt,
+              body = Block(Seq(
+                Inhale(quantify(block, requires, false)),
+                Block(suspendedInvariants.map { case Ref(decl) =>
+                  Inhale(dispatch(invDecl(decl)))
+                }),
+                dispatch(hint),
+                Block(suspendedInvariants.reverse.map { case Ref(decl) =>
+                  Exhale(dispatch(invDecl(decl)))(
+                    ParBarrierInvariantExhaleFailed(barrier)
+                  )
+                }),
+              )),
+              post = quantify(block, ensures, false),
+            )(ParBarrierProofFailed(barrier)),
+            Inhale(ff),
+          )),
+          // Enact the barrier contract for the current thread
+          Block(Seq(
+            Exhale(dispatch(requires))(ParBarrierExhaleFailed(barrier)),
+            Inhale(dispatch(ensures)),
+          )),
+        ))
+
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] = e match {
-    case ScaleByParBlock(Ref(decl), res) if e.t == TResource[Pre]() =>
-      implicit val o: Origin = e.o
-      val block = blockDecl(decl)
-      block.iters.foldLeft(dispatch(res)) {
-        case (res, v) =>
+  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] =
+    e match {
+      case ScaleByParBlock(Ref(decl), res) if e.t == TResource[Pre]() =>
+        implicit val o: Origin = e.o
+        val block = blockDecl(decl)
+        block.iters.foldLeft(dispatch(res)) { case (res, v) =>
           val scale = to(v.variable) - from(v.variable)
-          Implies(scale > const(0), Scale(const[Post](1) /:/ scale, res)(PanicBlame("framed positive")))
-      }
-    case ScaleByParBlock(Ref(_), res) => dispatch(res)
-    case other => rewriteDefault(other)
-  }
+          Implies(
+            scale > const(0),
+            Scale(const[Post](1) /:/ scale, res)(PanicBlame("framed positive")),
+          )
+        }
+      case ScaleByParBlock(Ref(_), res) => dispatch(res)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/PinCollectionTypes.scala b/src/rewrite/vct/rewrite/PinCollectionTypes.scala
index 7a41fb6736..baa8b20468 100644
--- a/src/rewrite/vct/rewrite/PinCollectionTypes.scala
+++ b/src/rewrite/vct/rewrite/PinCollectionTypes.scala
@@ -6,22 +6,24 @@ import vct.col.typerules.Types
 
 case object PinCollectionTypes extends RewriterBuilder {
   override def key: String = "pinCollectionType"
-  override def desc: String = "Derive and specify the element type of collections that have an inferred type."
+  override def desc: String =
+    "Derive and specify the element type of collections that have an inferred type."
 }
 
 case class PinCollectionTypes[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case UntypedLiteralSeq(values) =>
-      val t = Types.leastCommonSuperType(values.map(_.t))
-      LiteralSeq[Post](dispatch(t), values.map(dispatch))(e.o)
-    case UntypedLiteralSet(values) =>
-      val t = Types.leastCommonSuperType(values.map(_.t))
-      LiteralSet[Post](dispatch(t), values.map(dispatch))(e.o)
-    case UntypedLiteralBag(values) =>
-      val t = Types.leastCommonSuperType(values.map(_.t))
-      LiteralBag[Post](dispatch(t), values.map(dispatch))(e.o)
-    case OptNone() => OptNoneTyped[Post](TNothing()(e.o))(e.o)
-    case OptSome(e) => OptSomeTyped[Post](dispatch(e.t), dispatch(e))(e.o)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case UntypedLiteralSeq(values) =>
+        val t = Types.leastCommonSuperType(values.map(_.t))
+        LiteralSeq[Post](dispatch(t), values.map(dispatch))(e.o)
+      case UntypedLiteralSet(values) =>
+        val t = Types.leastCommonSuperType(values.map(_.t))
+        LiteralSet[Post](dispatch(t), values.map(dispatch))(e.o)
+      case UntypedLiteralBag(values) =>
+        val t = Types.leastCommonSuperType(values.map(_.t))
+        LiteralBag[Post](dispatch(t), values.map(dispatch))(e.o)
+      case OptNone() => OptNoneTyped[Post](TNothing()(e.o))(e.o)
+      case OptSome(e) => OptSomeTyped[Post](dispatch(e.t), dispatch(e))(e.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/PinSilverNodes.scala b/src/rewrite/vct/rewrite/PinSilverNodes.scala
index 09496e4331..93263b8f94 100644
--- a/src/rewrite/vct/rewrite/PinSilverNodes.scala
+++ b/src/rewrite/vct/rewrite/PinSilverNodes.scala
@@ -16,14 +16,23 @@ case object PinSilverNodes extends RewriterBuilder {
 }
 
 case class PinSilverNodes[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case assn @ Assign(target, value) => target match {
-      case Local(Ref(v)) => SilverLocalAssign[Post](succ(v), dispatch(value))(stat.o)
-      case SilverDeref(obj, Ref(field)) => SilverFieldAssign[Post](dispatch(obj), succ(field), dispatch(value))(assn.blame)(stat.o)
-      case other => throw Unreachable("Invalid assignment target (check missing?)")
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case assn @ Assign(target, value) =>
+        target match {
+          case Local(Ref(v)) =>
+            SilverLocalAssign[Post](succ(v), dispatch(value))(stat.o)
+          case SilverDeref(obj, Ref(field)) =>
+            SilverFieldAssign[Post](
+              dispatch(obj),
+              succ(field),
+              dispatch(value),
+            )(assn.blame)(stat.o)
+          case other =>
+            throw Unreachable("Invalid assignment target (check missing?)")
+        }
+      case other => rewriteDefault(other)
     }
-    case other => rewriteDefault(other)
-  }
 
   def collectStarall(body: Expr[Pre]): (Seq[Expr[Pre]], Expr[Pre]) = {
     val (conds, consequent) = unfoldImplies(body)
@@ -32,34 +41,41 @@ case class PinSilverNodes[Pre <: Generation]() extends Rewriter[Pre] {
         bindings.foreach(dispatch)
         val (innerConds, consequent) = collectStarall(body)
         (conds ++ innerConds, consequent)
-      case other =>
-        (conds, other)
+      case other => (conds, other)
     }
   }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case starall @ Starall(bindings, triggers, body) =>
-      implicit val o: Origin = e.o
-      val (newBindings, (conds, consequent)) = variables.collect {
-        bindings.foreach(dispatch)
-        collectStarall(body)
-      }
-      val newBody = foldAnd(conds.map(dispatch)) ==> dispatch(consequent)
-      Starall(newBindings, triggers.map(_.map(dispatch)), newBody)(starall.blame)
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case starall @ Starall(bindings, triggers, body) =>
+        implicit val o: Origin = e.o
+        val (newBindings, (conds, consequent)) = variables.collect {
+          bindings.foreach(dispatch)
+          collectStarall(body)
+        }
+        val newBody = foldAnd(conds.map(dispatch)) ==> dispatch(consequent)
+        Starall(newBindings, triggers.map(_.map(dispatch)), newBody)(
+          starall.blame
+        )
 
-    case Size(xs) =>
-      if(xs.t.asSet.nonEmpty) SilverSetSize(dispatch(xs))(e.o)
-      else if(xs.t.asBag.nonEmpty) SilverBagSize(dispatch(xs))(e.o)
-      else if(xs.t.asMap.nonEmpty) SilverMapSize(dispatch(xs))(e.o)
-      else SilverSeqSize(dispatch(xs))(e.o)
+      case Size(xs) =>
+        if (xs.t.asSet.nonEmpty)
+          SilverSetSize(dispatch(xs))(e.o)
+        else if (xs.t.asBag.nonEmpty)
+          SilverBagSize(dispatch(xs))(e.o)
+        else if (xs.t.asMap.nonEmpty)
+          SilverMapSize(dispatch(xs))(e.o)
+        else
+          SilverSeqSize(dispatch(xs))(e.o)
 
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(t: Type[Pre]): Type[Post] = t match {
-    case TChar() => TInt()
-    case TBoundedInt(_, _) => TInt()
-    case TUnion(Seq(t)) => dispatch(t)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    t match {
+      case TChar() => TInt()
+      case TBoundedInt(_, _) => TInt()
+      case TUnion(Seq(t)) => dispatch(t)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/PrettifyBlocks.scala b/src/rewrite/vct/rewrite/PrettifyBlocks.scala
index 3da588bbcc..82ff1a6161 100644
--- a/src/rewrite/vct/rewrite/PrettifyBlocks.scala
+++ b/src/rewrite/vct/rewrite/PrettifyBlocks.scala
@@ -10,11 +10,15 @@ import scala.collection.mutable.ArrayBuffer
 
 object PrettifyBlocks extends RewriterBuilder {
   override def key: String = "prettifyBlocks"
-  override def desc: String = "Flattens nested blocks/scopes and removes empty blocks/scopes"
+  override def desc: String =
+    "Flattens nested blocks/scopes and removes empty blocks/scopes"
 }
 
 case class PrettifyBlocks[Pre <: Generation]() extends Rewriter[Pre] {
-  def collectVariables(body: Statement[Pre], extra: Seq[Variable[Pre]] = Nil): Statement[Post] = {
+  def collectVariables(
+      body: Statement[Pre],
+      extra: Seq[Variable[Pre]] = Nil,
+  ): Statement[Post] = {
     val (variablesHere, newBody) = variables.collect {
       extra.foreach(dispatch)
       dispatch(body)
@@ -23,62 +27,70 @@ case class PrettifyBlocks[Pre <: Generation]() extends Rewriter[Pre] {
     Scope(variablesHere, newBody)(body.o)
   }
 
-  def dispatchFlatly(stat: Statement[Pre]): Seq[Statement[Post]] = stat match {
-    case Block(statements) => statements.flatMap(dispatchFlatly)
-    case Scope(Nil, body) => dispatchFlatly(body)
-    case Scope(locals, body) if variables.nonEmpty =>
-      locals.foreach(dispatch)
-      dispatchFlatly(body)
-    case other => Seq(dispatch(other))
-  }
-
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case Block(statements) =>
-      Block(statements.flatMap(dispatchFlatly))(stat.o)
-    case Scope(Nil, body) => dispatch(body)
-    case Scope(locals, body) =>
-      if(variables.nonEmpty) {
+  def dispatchFlatly(stat: Statement[Pre]): Seq[Statement[Post]] =
+    stat match {
+      case Block(statements) => statements.flatMap(dispatchFlatly)
+      case Scope(Nil, body) => dispatchFlatly(body)
+      case Scope(locals, body) if variables.nonEmpty =>
         locals.foreach(dispatch)
-        dispatch(body)
-      } else {
-        collectVariables(body, extra = locals)
-      }
+        dispatchFlatly(body)
+      case other => Seq(dispatch(other))
+    }
 
-    case loop @ Loop(_, _, _, _: IterationContract[Pre], body) =>
-      loop.rewrite(body = collectVariables(body))
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case Block(statements) =>
+        Block(statements.flatMap(dispatchFlatly))(stat.o)
+      case Scope(Nil, body) => dispatch(body)
+      case Scope(locals, body) =>
+        if (variables.nonEmpty) {
+          locals.foreach(dispatch)
+          dispatch(body)
+        } else { collectVariables(body, extra = locals) }
 
-    case vec: VecBlock[Pre] =>
-      vec.rewrite(content = collectVariables(vec.content))
+      case loop @ Loop(_, _, _, _: IterationContract[Pre], body) =>
+        loop.rewrite(body = collectVariables(body))
 
-    case act: ModelDo[Pre] =>
-      act.rewrite(impl = collectVariables(act.impl))
+      case vec: VecBlock[Pre] =>
+        vec.rewrite(content = collectVariables(vec.content))
 
-    case pack: WandPackage[Pre] =>
-      pack.rewrite(proof = collectVariables(pack.proof))
+      case act: ModelDo[Pre] => act.rewrite(impl = collectVariables(act.impl))
 
-    case other => rewriteDefault(other)
-  }
+      case pack: WandPackage[Pre] =>
+        pack.rewrite(proof = collectVariables(pack.proof))
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case ScopedExpr(locals, body) =>
-      locals.foreach(dispatch)
-      dispatch(body)
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(parRegion: ParRegion[Pre]): ParRegion[Rewritten[Pre]] = parRegion match {
-    case block: ParBlock[Pre] =>
-      block.rewrite(content = collectVariables(block.content))
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case ScopedExpr(locals, body) =>
+        locals.foreach(dispatch)
+        dispatch(body)
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case method: RunMethod[Pre] =>
-      classDeclarations.succeed(method, method.rewrite(body = method.body.map(collectVariables(_))))
-    case method: AbstractMethod[Pre] =>
-      allScopes.anySucceedOnly(method,
-        allScopes.anyDeclare(
-          method.rewrite(body = method.body.map(collectVariables(_)))))
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(parRegion: ParRegion[Pre]): ParRegion[Rewritten[Pre]] =
+    parRegion match {
+      case block: ParBlock[Pre] =>
+        block.rewrite(content = collectVariables(block.content))
+      case other => rewriteDefault(other)
+    }
+
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case method: RunMethod[Pre] =>
+        classDeclarations.succeed(
+          method,
+          method.rewrite(body = method.body.map(collectVariables(_))),
+        )
+      case method: AbstractMethod[Pre] =>
+        allScopes.anySucceedOnly(
+          method,
+          allScopes.anyDeclare(
+            method.rewrite(body = method.body.map(collectVariables(_)))
+          ),
+        )
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/PropagateContextEverywhere.scala b/src/rewrite/vct/rewrite/PropagateContextEverywhere.scala
index 00221ca661..6cdb955cca 100644
--- a/src/rewrite/vct/rewrite/PropagateContextEverywhere.scala
+++ b/src/rewrite/vct/rewrite/PropagateContextEverywhere.scala
@@ -10,20 +10,24 @@ import vct.col.util.AstBuildHelpers._
 
 case object PropagateContextEverywhere extends RewriterBuilder {
   override def key: String = "propagateContext"
-  override def desc: String = "Propagate context_everywhere declarations into loop invariants and parallel block contracts."
+  override def desc: String =
+    "Propagate context_everywhere declarations into loop invariants and parallel block contracts."
 
-  case class ContextEverywherePreconditionFailed(inv: InvokingNode[_]) extends Blame[PreconditionFailed] {
+  case class ContextEverywherePreconditionFailed(inv: InvokingNode[_])
+      extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       inv.blame.blame(ContextEverywhereFailedInPre(error.failure, inv))
   }
 
-  case class ContextEverywherePostconditionFailed(app: ContractApplicable[_]) extends Blame[PostconditionFailed] {
+  case class ContextEverywherePostconditionFailed(app: ContractApplicable[_])
+      extends Blame[PostconditionFailed] {
     override def blame(error: PostconditionFailed): Unit =
       app.blame.blame(ContextEverywhereFailedInPost(error.failure, app))
   }
 }
 
-case class PropagateContextEverywhere[Pre <: Generation]() extends Rewriter[Pre] {
+case class PropagateContextEverywhere[Pre <: Generation]()
+    extends Rewriter[Pre] {
   import PropagateContextEverywhere._
 
   val invariants: ScopedStack[Seq[Expr[Pre]]] = ScopedStack()
@@ -42,83 +46,133 @@ case class PropagateContextEverywhere[Pre <: Generation]() extends Rewriter[Pre]
   def freshInvariants()(implicit o: Origin): Expr[Post] =
     foldStar(invariants.top.map(dispatch))
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case app: ContractApplicable[Pre] =>
-      allScopes.anyDeclare(allScopes.anySucceedOnly(app, withInvariant(app.contract.contextEverywhere) {
-        app match {
-          case func: AbstractFunction[Pre] =>
-            func.rewrite(blame = PostBlameSplit.left(ContextEverywherePostconditionFailed(app), func.blame))
-          case method: AbstractMethod[Pre] =>
-            method.rewrite(blame = PostBlameSplit.left(ContextEverywherePostconditionFailed(app), method.blame))
-        }
-      }))
-    case other => rewriteDefault(other)
-  }
-
-  override def dispatch(contract: ApplicableContract[Pre]): ApplicableContract[Post] = {
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case app: ContractApplicable[Pre] =>
+        allScopes.anyDeclare(allScopes.anySucceedOnly(
+          app,
+          withInvariant(app.contract.contextEverywhere) {
+            app match {
+              case func: AbstractFunction[Pre] =>
+                func.rewrite(blame =
+                  PostBlameSplit
+                    .left(ContextEverywherePostconditionFailed(app), func.blame)
+                )
+              case method: AbstractMethod[Pre] =>
+                method.rewrite(blame =
+                  PostBlameSplit.left(
+                    ContextEverywherePostconditionFailed(app),
+                    method.blame,
+                  )
+                )
+            }
+          },
+        ))
+      case other => rewriteDefault(other)
+    }
+
+  override def dispatch(
+      contract: ApplicableContract[Pre]
+  ): ApplicableContract[Post] = {
     implicit val o: Origin = contract.o
     contract.rewrite(
       contextEverywhere = tt,
-      requires = SplitAccountedPredicate(UnitAccountedPredicate(freshInvariants()), dispatch(contract.requires)),
-      ensures = SplitAccountedPredicate(UnitAccountedPredicate(freshInvariants()), dispatch(contract.ensures)),
+      requires = SplitAccountedPredicate(
+        UnitAccountedPredicate(freshInvariants()),
+        dispatch(contract.requires),
+      ),
+      ensures = SplitAccountedPredicate(
+        UnitAccountedPredicate(freshInvariants()),
+        dispatch(contract.ensures),
+      ),
     )
   }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case inv: ProcedureInvocation[Pre] =>
-      inv.rewrite(blame = PreBlameSplit.left(ContextEverywherePreconditionFailed(inv), inv.blame))
-    case inv: MethodInvocation[Pre] =>
-      inv.rewrite(blame = PreBlameSplit.left(ContextEverywherePreconditionFailed(inv), inv.blame))
-    case inv: FunctionInvocation[Pre] =>
-      inv.rewrite(blame = PreBlameSplit.left(ContextEverywherePreconditionFailed(inv), inv.blame))
-    case inv: InstanceFunctionInvocation[Pre] =>
-      inv.rewrite(blame = PreBlameSplit.left(ContextEverywherePreconditionFailed(inv), inv.blame))
-    case other => rewriteDefault(other)
-  }
-
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case inv: InvokeProcedure[Pre] =>
-      inv.rewrite(blame = PreBlameSplit.left(ContextEverywherePreconditionFailed(inv), inv.blame))
-    case inv: InvokeMethod[Pre] =>
-      inv.rewrite(blame = PreBlameSplit.left(ContextEverywherePreconditionFailed(inv), inv.blame))
-    case bar: ParBarrier[Pre] =>
-      implicit val o: Origin = bar.o
-      bar.rewrite(
-        requires = freshInvariants() &* dispatch(bar.requires),
-        ensures = freshInvariants() &* dispatch(bar.ensures),
-      )
-    case loop: Loop[Pre] =>
-      implicit val o: Origin = loop.o
-      loop.contract match {
-        case inv @ LoopInvariant(invariant, decreases) =>
-          loop.rewrite(contract = LoopInvariant(freshInvariants() &* dispatch(invariant), decreases.map(dispatch))(inv.blame))
-        case _: IterationContract[Pre] => throw ExtraNode
-      }
-    case frame: FramedProof[Pre] =>
-      implicit val o: Origin = frame.o
-      frame.rewrite(pre = freshInvariants() &* dispatch(frame.pre), post = freshInvariants() &* dispatch(frame.post))
-    case other => rewriteDefault(other)
-  }
-
-  override def dispatch(parRegion: ParRegion[Pre]): ParRegion[Post] = parRegion match {
-    case block: ParBlock[Pre] =>
-      implicit val o: Origin = parRegion.o
-
-      val scaledInvariants = invariants.top.map(inv => ScaleByParBlock[Pre](block.decl.ref, inv))
-
-      invariants.having(scaledInvariants ++ unfoldStar(block.context_everywhere)) {
-        block.rewrite(
-          context_everywhere = freshInvariants()
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case inv: ProcedureInvocation[Pre] =>
+        inv.rewrite(blame =
+          PreBlameSplit
+            .left(ContextEverywherePreconditionFailed(inv), inv.blame)
         )
-      }
-    case ParParallel(regions) =>
-      implicit val o: Origin = parRegion.o
-      val scaledInvariants = invariants.top.map(inv => Scale[Pre](const[Pre](1) /:/ const(regions.size), inv)(
-        PanicBlame("If used, the number of regions is strictly positive")))
-
-      invariants.having(scaledInvariants) {
-        rewriteDefault(parRegion)
-      }
-    case ParSequential(_) => rewriteDefault(parRegion)
-  }
+      case inv: MethodInvocation[Pre] =>
+        inv.rewrite(blame =
+          PreBlameSplit
+            .left(ContextEverywherePreconditionFailed(inv), inv.blame)
+        )
+      case inv: FunctionInvocation[Pre] =>
+        inv.rewrite(blame =
+          PreBlameSplit
+            .left(ContextEverywherePreconditionFailed(inv), inv.blame)
+        )
+      case inv: InstanceFunctionInvocation[Pre] =>
+        inv.rewrite(blame =
+          PreBlameSplit
+            .left(ContextEverywherePreconditionFailed(inv), inv.blame)
+        )
+      case other => rewriteDefault(other)
+    }
+
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case inv: InvokeProcedure[Pre] =>
+        inv.rewrite(blame =
+          PreBlameSplit
+            .left(ContextEverywherePreconditionFailed(inv), inv.blame)
+        )
+      case inv: InvokeMethod[Pre] =>
+        inv.rewrite(blame =
+          PreBlameSplit
+            .left(ContextEverywherePreconditionFailed(inv), inv.blame)
+        )
+      case bar: ParBarrier[Pre] =>
+        implicit val o: Origin = bar.o
+        bar.rewrite(
+          requires = freshInvariants() &* dispatch(bar.requires),
+          ensures = freshInvariants() &* dispatch(bar.ensures),
+        )
+      case loop: Loop[Pre] =>
+        implicit val o: Origin = loop.o
+        loop.contract match {
+          case inv @ LoopInvariant(invariant, decreases) =>
+            loop.rewrite(contract =
+              LoopInvariant(
+                freshInvariants() &* dispatch(invariant),
+                decreases.map(dispatch),
+              )(inv.blame)
+            )
+          case _: IterationContract[Pre] => throw ExtraNode
+        }
+      case frame: FramedProof[Pre] =>
+        implicit val o: Origin = frame.o
+        frame.rewrite(
+          pre = freshInvariants() &* dispatch(frame.pre),
+          post = freshInvariants() &* dispatch(frame.post),
+        )
+      case other => rewriteDefault(other)
+    }
+
+  override def dispatch(parRegion: ParRegion[Pre]): ParRegion[Post] =
+    parRegion match {
+      case block: ParBlock[Pre] =>
+        implicit val o: Origin = parRegion.o
+
+        val scaledInvariants = invariants.top
+          .map(inv => ScaleByParBlock[Pre](block.decl.ref, inv))
+
+        invariants
+          .having(scaledInvariants ++ unfoldStar(block.context_everywhere)) {
+            block.rewrite(context_everywhere = freshInvariants())
+          }
+      case ParParallel(regions) =>
+        implicit val o: Origin = parRegion.o
+        val scaledInvariants = invariants.top.map(inv =>
+          Scale[Pre](const[Pre](1) /:/ const(regions.size), inv)(PanicBlame(
+            "If used, the number of regions is strictly positive"
+          ))
+        )
+
+        invariants.having(scaledInvariants) { rewriteDefault(parRegion) }
+      case ParSequential(_) => rewriteDefault(parRegion)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/PureMethodsToFunctions.scala b/src/rewrite/vct/rewrite/PureMethodsToFunctions.scala
index 87e38ebc41..de05c4c60a 100644
--- a/src/rewrite/vct/rewrite/PureMethodsToFunctions.scala
+++ b/src/rewrite/vct/rewrite/PureMethodsToFunctions.scala
@@ -15,10 +15,15 @@ case object PureMethodsToFunctions extends RewriterBuilder {
 
   val PureMethodOrigin: Origin = Origin(Seq(LabelContext("pure method")))
 
-  case class MethodCannotIntoFunction(method: AbstractMethod[_], explanation: String) extends UserError {
+  case class MethodCannotIntoFunction(
+      method: AbstractMethod[_],
+      explanation: String,
+  ) extends UserError {
     override def code: String = "notPure"
     override def text: String =
-      method.o.messageInContext(s"This method is marked as pure, but it cannot be converted to a function, since $explanation.")
+      method.o.messageInContext(
+        s"This method is marked as pure, but it cannot be converted to a function, since $explanation."
+      )
   }
 }
 
@@ -27,55 +32,81 @@ case class PureMethodsToFunctions[Pre <: Generation]() extends Rewriter[Pre] {
 
   val currentAbstractMethod: ScopedStack[AbstractMethod[Pre]] = ScopedStack()
 
-  def countAssignments(v: Variable[Pre], s: Statement[Pre]): Option[Int] = s match {
-    case Return(_) => Some(0)
-    case Block(stats) =>
-      val x = stats.map(countAssignments(v, _)).fold(Some(0)) {
-        case (Some(a), Some(b)) => Some(a + b)
-        case _ => None
-      }
-      x
-    case Branch(conds) =>
-      val assignmentCounts = conds.map(_._2).map(countAssignments(v, _)).collect {
-        case Some(n) => n
-        case None => return None
-      }
-      if (assignmentCounts.forall(_ <= 1)) {
-        assignmentCounts.maxOption.orElse(Some(0))
-      } else {
-        None
-      }
-    case Assign(Local(ref), _) =>
-      Some(if(ref.decl == v) 1 else 0)
-    case Assign(_, _) => None
-    case _ => None
-  }
+  def countAssignments(v: Variable[Pre], s: Statement[Pre]): Option[Int] =
+    s match {
+      case Return(_) => Some(0)
+      case Block(stats) =>
+        val x =
+          stats.map(countAssignments(v, _)).fold(Some(0)) {
+            case (Some(a), Some(b)) => Some(a + b)
+            case _ => None
+          }
+        x
+      case Branch(conds) =>
+        val assignmentCounts = conds.map(_._2).map(countAssignments(v, _))
+          .collect {
+            case Some(n) => n
+            case None => return None
+          }
+        if (assignmentCounts.forall(_ <= 1)) {
+          assignmentCounts.maxOption.orElse(Some(0))
+        } else { None }
+      case Assign(Local(ref), _) =>
+        Some(
+          if (ref.decl == v)
+            1
+          else
+            0
+        )
+      case Assign(_, _) => None
+      case _ => None
+    }
 
-  def toExpression(stat: Statement[Pre], alt: => Option[Expr[Post]]): Option[Expr[Post]] = {
+  def toExpression(
+      stat: Statement[Pre],
+      alt: => Option[Expr[Post]],
+  ): Option[Expr[Post]] = {
     implicit val o: Origin = DiagnosticOrigin
     stat match {
-      case Return(e) => alt match {
-        case Some(_) => throw MethodCannotIntoFunction(currentAbstractMethod.top, "Dead code after return is not allowed in pure methods")
-        case None => Some(dispatch(e))
-      }
+      case Return(e) =>
+        alt match {
+          case Some(_) =>
+            throw MethodCannotIntoFunction(
+              currentAbstractMethod.top,
+              "Dead code after return is not allowed in pure methods",
+            )
+          case None => Some(dispatch(e))
+        }
       case Block(Nil) => alt
       case Block(stat +: tail) =>
         toExpression(stat, toExpression(Block(tail), alt))
       case Branch(Nil) => alt
       case Branch((BooleanValue(true), impl) +: _) => toExpression(impl, alt)
       case Branch((cond, impl) +: branches) =>
-        Some(Select(dispatch(cond),
+        Some(Select(
+          dispatch(cond),
           toExpression(impl, alt).getOrElse(return None),
-          toExpression(Branch(branches), alt).getOrElse(return None)))
+          toExpression(Branch(branches), alt).getOrElse(return None),
+        ))
       case Scope(locals, impl) =>
         if (!locals.forall(countAssignments(_, impl).exists(_ <= 1))) {
           return None
         }
         toExpression(impl, alt)
-      case Assign(Local(ref), e) => alt match {
-        case Some(exprAlt) => Some(Let[Post](variables.collect { dispatch(ref.decl) }._1.head, dispatch(e), exprAlt))
-        case None => throw MethodCannotIntoFunction(currentAbstractMethod.top, "Pure method cannot end with assign statement")
-      }
+      case Assign(Local(ref), e) =>
+        alt match {
+          case Some(exprAlt) =>
+            Some(Let[Post](
+              variables.collect { dispatch(ref.decl) }._1.head,
+              dispatch(e),
+              exprAlt,
+            ))
+          case None =>
+            throw MethodCannotIntoFunction(
+              currentAbstractMethod.top,
+              "Pure method cannot end with assign statement",
+            )
+        }
 
       case _ => None
     }
@@ -85,46 +116,110 @@ case class PureMethodsToFunctions[Pre <: Generation]() extends Rewriter[Pre] {
     implicit val o: Origin = decl.o
     decl match {
       case proc: Procedure[Pre] if proc.pure =>
-        if(proc.outArgs.nonEmpty) throw MethodCannotIntoFunction(proc,"the method has out parameters")
-        if(proc.contract.signals.nonEmpty) throw MethodCannotIntoFunction(proc,"the method contract contains a signals declaration")
-        globalDeclarations.succeed(proc, new Function(
-          returnType = dispatch(proc.returnType),
-          args = variables.dispatch(proc.args),
-          typeArgs = variables.dispatch(proc.typeArgs),
-          body = currentAbstractMethod.having(proc) { proc.body.map(toExpression(_, None).getOrElse(throw MethodCannotIntoFunction(proc,
-            "the method implementation cannot be restructured into a pure expression"))) },
-          contract = dispatch(proc.contract),
-          inline = proc.inline
-        )(proc.blame)(proc.o))
+        if (proc.outArgs.nonEmpty)
+          throw MethodCannotIntoFunction(proc, "the method has out parameters")
+        if (proc.contract.signals.nonEmpty)
+          throw MethodCannotIntoFunction(
+            proc,
+            "the method contract contains a signals declaration",
+          )
+        globalDeclarations.succeed(
+          proc,
+          new Function(
+            returnType = dispatch(proc.returnType),
+            args = variables.dispatch(proc.args),
+            typeArgs = variables.dispatch(proc.typeArgs),
+            body =
+              currentAbstractMethod.having(proc) {
+                proc.body.map(
+                  toExpression(_, None).getOrElse(
+                    throw MethodCannotIntoFunction(
+                      proc,
+                      "the method implementation cannot be restructured into a pure expression",
+                    )
+                  )
+                )
+              },
+            contract = dispatch(proc.contract),
+            inline = proc.inline,
+          )(proc.blame)(proc.o),
+        )
       case method: InstanceMethod[Pre] if method.pure =>
-        if(method.outArgs.nonEmpty) throw MethodCannotIntoFunction(method, "the method has out parameters")
-        if(method.contract.signals.nonEmpty) throw MethodCannotIntoFunction(method, "the method contract contains a signals declaration")
-        classDeclarations.succeed(method, new InstanceFunction(
-          returnType = dispatch(method.returnType),
-          args = variables.dispatch(method.args),
-          typeArgs = variables.dispatch(method.typeArgs),
-          body = currentAbstractMethod.having(method) { method.body.map(toExpression(_, None).getOrElse(throw MethodCannotIntoFunction(method,
-            "the method implementation cannot be restructured into a pure expression"))) },
-          contract = dispatch(method.contract),
-          inline = method.inline,
-        )(method.blame)(method.o))
+        if (method.outArgs.nonEmpty)
+          throw MethodCannotIntoFunction(
+            method,
+            "the method has out parameters",
+          )
+        if (method.contract.signals.nonEmpty)
+          throw MethodCannotIntoFunction(
+            method,
+            "the method contract contains a signals declaration",
+          )
+        classDeclarations.succeed(
+          method,
+          new InstanceFunction(
+            returnType = dispatch(method.returnType),
+            args = variables.dispatch(method.args),
+            typeArgs = variables.dispatch(method.typeArgs),
+            body =
+              currentAbstractMethod.having(method) {
+                method.body.map(
+                  toExpression(_, None).getOrElse(
+                    throw MethodCannotIntoFunction(
+                      method,
+                      "the method implementation cannot be restructured into a pure expression",
+                    )
+                  )
+                )
+              },
+            contract = dispatch(method.contract),
+            inline = method.inline,
+          )(method.blame)(method.o),
+        )
       case other => rewriteDefault(other)
     }
   }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case inv @ ProcedureInvocation(Ref(proc), args, outArgs, typeArgs, givenMap, yields) =>
-      if(proc.pure)
-        FunctionInvocation[Post](succ(proc), args.map(dispatch), typeArgs.map(dispatch),
-          givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
-          yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) })(inv.blame)(e.o)
-      else rewriteDefault(inv)
-    case inv @ MethodInvocation(obj, Ref(method), args, outArgs, typeArgs, givenMap, yields) =>
-      if(method.pure)
-        InstanceFunctionInvocation[Post](dispatch(obj), succ(method), args.map(dispatch), typeArgs.map(dispatch),
-          givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
-          yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) })(inv.blame)(e.o)
-      else rewriteDefault(inv)
-    case other => rewriteDefault(other)
-  }
-}
\ No newline at end of file
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case inv @ ProcedureInvocation(
+            Ref(proc),
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        if (proc.pure)
+          FunctionInvocation[Post](
+            succ(proc),
+            args.map(dispatch),
+            typeArgs.map(dispatch),
+            givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
+            yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
+          )(inv.blame)(e.o)
+        else
+          rewriteDefault(inv)
+      case inv @ MethodInvocation(
+            obj,
+            Ref(method),
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        if (method.pure)
+          InstanceFunctionInvocation[Post](
+            dispatch(obj),
+            succ(method),
+            args.map(dispatch),
+            typeArgs.map(dispatch),
+            givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
+            yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
+          )(inv.blame)(e.o)
+        else
+          rewriteDefault(inv)
+      case other => rewriteDefault(other)
+    }
+}
diff --git a/src/rewrite/vct/rewrite/QuantifySubscriptAny.scala b/src/rewrite/vct/rewrite/QuantifySubscriptAny.scala
index 681b5a065b..7799f35ca2 100644
--- a/src/rewrite/vct/rewrite/QuantifySubscriptAny.scala
+++ b/src/rewrite/vct/rewrite/QuantifySubscriptAny.scala
@@ -3,24 +3,31 @@ package vct.col.rewrite
 import vct.col.ast._
 import vct.col.util.AstBuildHelpers._
 import vct.col.ast.RewriteHelpers._
-import vct.col.origin.{DiagnosticOrigin, FramedArrIndex, LabelContext, Origin, PreferredName, TriggerPatternBlame}
+import vct.col.origin.{
+  DiagnosticOrigin,
+  FramedArrIndex,
+  LabelContext,
+  Origin,
+  PreferredName,
+  TriggerPatternBlame,
+}
 import vct.result.VerificationError.UserError
 
 case object QuantifySubscriptAny extends RewriterBuilder {
   override def key: String = "any"
-  override def desc: String = "Quantify expressions that are automatically quantified with *."
+  override def desc: String =
+    "Quantify expressions that are automatically quantified with *."
 
   val GeneratedQuantifierOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("i")),
-      LabelContext("* index"),
-    )
+    Seq(PreferredName(Seq("i")), LabelContext("* index"))
   )
 
   case class InvalidAnyPosition(any: Any[_]) extends UserError {
     override def code: String = "any"
-    override def text: String = any.o.messageInContext(
-      "This instance of `*` occurs in a position where VerCors cannot recognize a pattern to quantify.")
+    override def text: String =
+      any.o.messageInContext(
+        "This instance of `*` occurs in a position where VerCors cannot recognize a pattern to quantify."
+      )
   }
 }
 
@@ -38,13 +45,11 @@ case class QuantifySubscriptAny[Pre <: Generation]() extends Rewriter[Pre] {
 
         Starall(
           bindings = Seq(i_var),
-          triggers = Seq(
-            Seq(ArraySubscript(arr, i)(TriggerPatternBlame))
-          ),
+          triggers = Seq(Seq(ArraySubscript(arr, i)(TriggerPatternBlame))),
           body = Implies(
             const[Post](0) <= i && i < Length(arr)(any.blame),
-            Perm(ArrayLocation(arr, i)(FramedArrIndex), perm)
-          )
+            Perm(ArrayLocation(arr, i)(FramedArrIndex), perm),
+          ),
         )(any.blame)
       case Value(ArrayLocation(arrIn, any @ Any())) =>
         val i_var = new Variable[Post](TInt())
@@ -52,13 +57,11 @@ case class QuantifySubscriptAny[Pre <: Generation]() extends Rewriter[Pre] {
         val arr = dispatch(arrIn)
         Starall(
           bindings = Seq(i_var),
-          triggers = Seq(
-            Seq(ArraySubscript(arr, i)(TriggerPatternBlame))
-          ),
+          triggers = Seq(Seq(ArraySubscript(arr, i)(TriggerPatternBlame))),
           body = Implies(
             const[Post](0) <= i && i < Length(arr)(any.blame),
             Value(ArrayLocation(arr, i)(FramedArrIndex)),
-          )
+          ),
         )(any.blame)
       case node: Any[Pre] => throw InvalidAnyPosition(node)
 
diff --git a/src/rewrite/vct/rewrite/ReadToValue.scala b/src/rewrite/vct/rewrite/ReadToValue.scala
index 3600ce05f5..80831802c4 100644
--- a/src/rewrite/vct/rewrite/ReadToValue.scala
+++ b/src/rewrite/vct/rewrite/ReadToValue.scala
@@ -10,21 +10,25 @@ object ReadToValue extends RewriterBuilder {
   case class WildcardError(node: ReadPerm[_]) extends UserError {
     override def code: String = "wildcard"
 
-    override def text: String = node.o.messageInContext("You cannot have a wildcard outside of a permission statement.")
+    override def text: String =
+      node.o.messageInContext(
+        "You cannot have a wildcard outside of a permission statement."
+      )
   }
 
   override def key: String = "readToValue"
 
-  override def desc: String = "Translates \"read\" into wildcard for permission."
+  override def desc: String =
+    "Translates \"read\" into wildcard for permission."
 }
 
-case class ReadToValue[Pre <: Generation]() extends Rewriter[Pre]{
+case class ReadToValue[Pre <: Generation]() extends Rewriter[Pre] {
 
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = expr match {
-    case Perm(loc, ReadPerm()) =>
-      Value(dispatch(loc))(expr.o)
-    case read @ ReadPerm() => throw WildcardError(read)
-    case default => rewriteDefault(default)
-  }
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case Perm(loc, ReadPerm()) => Value(dispatch(loc))(expr.o)
+      case read @ ReadPerm() => throw WildcardError(read)
+      case default => rewriteDefault(default)
+    }
 
 }
diff --git a/src/rewrite/vct/rewrite/RefuteToInvertedAssert.scala b/src/rewrite/vct/rewrite/RefuteToInvertedAssert.scala
index e7ab621a7f..f4535a4024 100644
--- a/src/rewrite/vct/rewrite/RefuteToInvertedAssert.scala
+++ b/src/rewrite/vct/rewrite/RefuteToInvertedAssert.scala
@@ -4,7 +4,18 @@ import hre.util.ScopedStack
 import vct.col.ast.RewriteHelpers.RewriteVerificationContext
 import vct.col.ast._
 import vct.col.rewrite.RefuteToInvertedAssert.AssertPassedRefuteFailed
-import vct.col.origin.{Blame, ExpectedError, ExpectedErrorFailure, ExpectedErrorNotTripped, ExpectedErrorTrippedTwice, FilterExpectedErrorBlame, NontrivialUnsatisfiable, Origin, PanicBlame, RefuteFailed}
+import vct.col.origin.{
+  Blame,
+  ExpectedError,
+  ExpectedErrorFailure,
+  ExpectedErrorNotTripped,
+  ExpectedErrorTrippedTwice,
+  FilterExpectedErrorBlame,
+  NontrivialUnsatisfiable,
+  Origin,
+  PanicBlame,
+  RefuteFailed,
+}
 import vct.col.rewrite._
 import vct.col.util.AstBuildHelpers._
 
@@ -12,20 +23,24 @@ import scala.collection.mutable.ArrayBuffer
 
 case object RefuteToInvertedAssert extends RewriterBuilder {
   override def key: String = "refute"
-  override def desc: String = "Translate refute to an assertion of which the error output is inverted"
-
-  case class AssertPassedRefuteFailed(refute: Refute[_]) extends Blame[ExpectedErrorFailure] {
-    override def blame(error: ExpectedErrorFailure): Unit = error match {
-      case err: ExpectedErrorTrippedTwice =>
-        PanicBlame("A single assert cannot trip twice").blame(err)
-      case ExpectedErrorNotTripped(_) =>
-        refute.blame.blame(RefuteFailed(refute))
-    }
+  override def desc: String =
+    "Translate refute to an assertion of which the error output is inverted"
+
+  case class AssertPassedRefuteFailed(refute: Refute[_])
+      extends Blame[ExpectedErrorFailure] {
+    override def blame(error: ExpectedErrorFailure): Unit =
+      error match {
+        case err: ExpectedErrorTrippedTwice =>
+          PanicBlame("A single assert cannot trip twice").blame(err)
+        case ExpectedErrorNotTripped(_) =>
+          refute.blame.blame(RefuteFailed(refute))
+      }
   }
 }
 
 case class RefuteToInvertedAssert[Pre <: Generation]() extends Rewriter[Pre] {
-  val expectedErrors: ScopedStack[ArrayBuffer[ExpectedError]] = ScopedStack[ArrayBuffer[ExpectedError]]()
+  val expectedErrors: ScopedStack[ArrayBuffer[ExpectedError]] =
+    ScopedStack[ArrayBuffer[ExpectedError]]()
 
   override def dispatch(verification: Verification[Pre]): Verification[Post] = {
     val (errs, tasks) = expectedErrors.collect {
@@ -36,19 +51,27 @@ case class RefuteToInvertedAssert[Pre <: Generation]() extends Rewriter[Pre] {
     Verification(tasks, errs ++ verification.expectedErrors)(verification.o)
   }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case refute @ Refute(assn) =>
-      implicit val o: Origin = stat.o
-      val err = ExpectedError("assertFailed:.*", stat.o, AssertPassedRefuteFailed(refute))
-      expectedErrors.top += err
-      IndetBranch(Seq(
-        Block(Seq(
-          Assert(dispatch(assn))(FilterExpectedErrorBlame(PanicBlame("wrong assert error kind"), err)),
-          Inhale(ff),
-        )),
-        Block(Nil),
-      ))
-
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case refute @ Refute(assn) =>
+        implicit val o: Origin = stat.o
+        val err = ExpectedError(
+          "assertFailed:.*",
+          stat.o,
+          AssertPassedRefuteFailed(refute),
+        )
+        expectedErrors.top += err
+        IndetBranch(Seq(
+          Block(Seq(
+            Assert(dispatch(assn))(FilterExpectedErrorBlame(
+              PanicBlame("wrong assert error kind"),
+              err,
+            )),
+            Inhale(ff),
+          )),
+          Block(Nil),
+        ))
+
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/ResolveExpressionSideChecks.scala b/src/rewrite/vct/rewrite/ResolveExpressionSideChecks.scala
index 24eb058771..a007738e15 100644
--- a/src/rewrite/vct/rewrite/ResolveExpressionSideChecks.scala
+++ b/src/rewrite/vct/rewrite/ResolveExpressionSideChecks.scala
@@ -1,40 +1,47 @@
 package vct.col.rewrite
 
 import vct.col.ast._
-import vct.col.origin.{DiagnosticOrigin, LabelContext, Origin, PanicBlame, PreferredName}
+import vct.col.origin.{
+  DiagnosticOrigin,
+  LabelContext,
+  Origin,
+  PanicBlame,
+  PreferredName,
+}
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, Rewritten}
 import vct.col.util.AstBuildHelpers.{VarBuildHelpers, function}
 
 case object ResolveExpressionSideChecks extends RewriterBuilder {
   override def key: String = "sideChecks"
-  override def desc: String = "Encode with/then annotations that are only the evaluation of an otherwise pure expression."
+  override def desc: String =
+    "Encode with/then annotations that are only the evaluation of an otherwise pure expression."
 
-  private def EvalCheckFunction(preferredName: String = "unknown"): Origin = Origin(
-    Seq(
-      PreferredName(Seq(preferredName)),
-      LabelContext("side check"),
-    )
-  )
+  private def EvalCheckFunction(preferredName: String = "unknown"): Origin =
+    Origin(Seq(PreferredName(Seq(preferredName)), LabelContext("side check")))
 }
 
-case class ResolveExpressionSideChecks[Pre <: Generation]() extends Rewriter[Pre] {
+case class ResolveExpressionSideChecks[Pre <: Generation]()
+    extends Rewriter[Pre] {
   import ResolveExpressionSideChecks._
 
   lazy val withEval: Function[Post] = {
     implicit val o: Origin = EvalCheckFunction()
 
     val t = new Variable[Post](TType(TAnyValue()))(EvalCheckFunction("T"))
-    val checkValue = new Variable[Post](TAnyValue())(EvalCheckFunction("checkedValue"))
+    val checkValue =
+      new Variable[Post](TAnyValue())(EvalCheckFunction("checkedValue"))
     val value = new Variable[Post](TVar(t.ref))(EvalCheckFunction("value"))
 
-    globalDeclarations.declare(function[Post](
-      blame = PanicBlame("witheval ensures nothing"),
-      contractBlame = PanicBlame("witheval requires nothing"),
-      typeArgs = Seq(t),
-      args = Seq(checkValue, value),
-      returnType = TVar(t.ref),
-      body = Some(value.get),
-    )(EvalCheckFunction("withEval")))
+    globalDeclarations.declare(
+      function[Post](
+        blame = PanicBlame("witheval ensures nothing"),
+        contractBlame = PanicBlame("witheval requires nothing"),
+        typeArgs = Seq(t),
+        args = Seq(checkValue, value),
+        returnType = TVar(t.ref),
+        body = Some(value.get),
+      )(EvalCheckFunction("withEval"))
+    )
   }
 
   lazy val thenEval: Function[Post] = {
@@ -42,25 +49,39 @@ case class ResolveExpressionSideChecks[Pre <: Generation]() extends Rewriter[Pre
 
     val t = new Variable[Post](TType(TAnyValue()))(EvalCheckFunction("T"))
     val value = new Variable[Post](TVar(t.ref))(EvalCheckFunction("value"))
-    val checkValue = new Variable[Post](TAnyValue())(EvalCheckFunction("checkedValue"))
+    val checkValue =
+      new Variable[Post](TAnyValue())(EvalCheckFunction("checkedValue"))
 
-    globalDeclarations.declare(function[Post](
-      blame = PanicBlame("theneval ensures nothing"),
-      contractBlame = PanicBlame("theneval requires nothing"),
-      typeArgs = Seq(t),
-      args = Seq(value, checkValue),
-      returnType = TVar(t.ref),
-      body = Some(value.get),
-    )(EvalCheckFunction("thenEval")))
+    globalDeclarations.declare(
+      function[Post](
+        blame = PanicBlame("theneval ensures nothing"),
+        contractBlame = PanicBlame("theneval requires nothing"),
+        typeArgs = Seq(t),
+        args = Seq(value, checkValue),
+        returnType = TVar(t.ref),
+        body = Some(value.get),
+      )(EvalCheckFunction("thenEval"))
+    )
   }
 
-  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] = e match {
-    case With(Eval(check), value) =>
-      FunctionInvocation[Post](withEval.ref, Seq(dispatch(check), dispatch(value)), Seq(dispatch(value.t)), Nil, Nil)(
-        PanicBlame("witheval requires nothing"))(e.o)
-    case Then(value, Eval(check)) =>
-      FunctionInvocation[Post](thenEval.ref, Seq(dispatch(value), dispatch(check)), Seq(dispatch(value.t)), Nil, Nil)(
-        PanicBlame("theneval requires nothing"))(e.o)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] =
+    e match {
+      case With(Eval(check), value) =>
+        FunctionInvocation[Post](
+          withEval.ref,
+          Seq(dispatch(check), dispatch(value)),
+          Seq(dispatch(value.t)),
+          Nil,
+          Nil,
+        )(PanicBlame("witheval requires nothing"))(e.o)
+      case Then(value, Eval(check)) =>
+        FunctionInvocation[Post](
+          thenEval.ref,
+          Seq(dispatch(value), dispatch(check)),
+          Seq(dispatch(value.t)),
+          Nil,
+          Nil,
+        )(PanicBlame("theneval requires nothing"))(e.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/ResolveExpressionSideEffects.scala b/src/rewrite/vct/rewrite/ResolveExpressionSideEffects.scala
index 5e13cfd9d9..0b344f2a41 100644
--- a/src/rewrite/vct/rewrite/ResolveExpressionSideEffects.scala
+++ b/src/rewrite/vct/rewrite/ResolveExpressionSideEffects.scala
@@ -5,9 +5,21 @@ import vct.col.ast.RewriteHelpers._
 import vct.col.util.AstBuildHelpers._
 import vct.col.ast._
 import vct.col.rewrite.error.ExtraNode
-import vct.col.origin.{DerefAssignTarget, DiagnosticOrigin, LabelContext, Origin, PreferredName, SubscriptAssignTarget}
+import vct.col.origin.{
+  DerefAssignTarget,
+  DiagnosticOrigin,
+  LabelContext,
+  Origin,
+  PreferredName,
+  SubscriptAssignTarget,
+}
 import vct.col.ref.Ref
-import vct.col.rewrite.{Generation, NonLatchingRewriter, Rewriter, RewriterBuilder}
+import vct.col.rewrite.{
+  Generation,
+  NonLatchingRewriter,
+  Rewriter,
+  RewriterBuilder,
+}
 import vct.result.VerificationError.{Unreachable, UserError}
 
 import scala.collection.mutable
@@ -16,20 +28,15 @@ import scala.reflect.ClassTag
 
 case object ResolveExpressionSideEffects extends RewriterBuilder {
   override def key: String = "sideEffects"
-  override def desc: String = "Discharge side effects from expression evaluation into its surrounding context."
+  override def desc: String =
+    "Discharge side effects from expression evaluation into its surrounding context."
 
   val SideEffectOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("flatten")),
-      LabelContext("side effect"),
-    )
+    Seq(PreferredName(Seq("flatten")), LabelContext("side effect"))
   )
 
   val ResultVar: Origin = Origin(
-    Seq(
-      PreferredName(Seq("res")),
-      LabelContext("return value"),
-    )
+    Seq(PreferredName(Seq("res")), LabelContext("return value"))
   )
 
   case class DisallowedAssignmentTarget(target: Expr[_]) extends UserError {
@@ -41,31 +48,35 @@ case object ResolveExpressionSideEffects extends RewriterBuilder {
   case class DisallowedSideEffect(effector: Expr[_]) extends UserError {
     override def code: String = "sideEffect"
     override def text: String =
-      effector.o.messageInContext("This expression may have side effects, but it is in a position where that is not allowed.")
+      effector.o.messageInContext(
+        "This expression may have side effects, but it is in a position where that is not allowed."
+      )
   }
 
-  case class DisallowedProofExpression(proofExpression: Expr[_]) extends UserError {
+  case class DisallowedProofExpression(proofExpression: Expr[_])
+      extends UserError {
     override def code: String = "proofExpression"
     override def text: String =
-      proofExpression.o.messageInContext("Cannot evaluate this kind of expression here when combined with expressions that have a side effect.")
+      proofExpression.o.messageInContext(
+        "Cannot evaluate this kind of expression here when combined with expressions that have a side effect."
+      )
   }
 
   val BreakOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("condition_false")),
-      LabelContext("loop exit"),
-    )
+    Seq(PreferredName(Seq("condition_false")), LabelContext("loop exit"))
   )
 }
 
-case class ResolveExpressionSideEffects[Pre <: Generation]() extends Rewriter[Pre] {
+case class ResolveExpressionSideEffects[Pre <: Generation]()
+    extends Rewriter[Pre] {
   import ResolveExpressionSideEffects._
 
   val currentResultVar: ScopedStack[Local[Post]] = ScopedStack()
 
   // executionContext.top contains an acceptor of statements, if side effects in expressions currently have a logical
   // place to be put.
-  val executionContext: ScopedStack[Option[Statement[Post] => Unit]] = ScopedStack()
+  val executionContext: ScopedStack[Option[Statement[Post] => Unit]] =
+    ScopedStack()
 
   def inPure: Boolean = executionContext.isEmpty || executionContext.top.isEmpty
 
@@ -73,7 +84,9 @@ case class ResolveExpressionSideEffects[Pre <: Generation]() extends Rewriter[Pr
   // 1 + 2 --> flat1 = 1; flat2 = 2; flat3 = flat1 + flat2; flat3
   // However, extractions are first stored in this map, and are only flushed to the executionContext if an actual
   // side effect occurs. If not, they are removed from the map and inlined again.
-  val currentlyExtracted: mutable.LinkedHashMap[Variable[Post], (Seq[Expr[Post]], Expr[Post])] = mutable.LinkedHashMap()
+  val currentlyExtracted
+      : mutable.LinkedHashMap[Variable[Post], (Seq[Expr[Post]], Expr[Post])] =
+    mutable.LinkedHashMap()
 
   val flushedExtracted: mutable.Set[Variable[Post]] = mutable.Set()
 
@@ -86,13 +99,14 @@ case class ResolveExpressionSideEffects[Pre <: Generation]() extends Rewriter[Pr
     val allExtracted = currentlyExtracted.toSeq
     currentlyExtracted.clear()
 
-    for((flat, _) <- allExtracted) {
-      flushedExtracted += flat
-    }
+    for ((flat, _) <- allExtracted) { flushedExtracted += flat }
 
-    for((flat, (conditions, pureExpr)) <- allExtracted) {
+    for ((flat, (conditions, pureExpr)) <- allExtracted) {
       executionContext.topOption.flatten match {
-        case None => throw Unreachable("flushExtractedExpressions is not called from pure context.")
+        case None =>
+          throw Unreachable(
+            "flushExtractedExpressions is not called from pure context."
+          )
         case Some(acceptor) =>
           variables.declare(flat)
           implicit val o: Origin = SideEffectOrigin
@@ -100,8 +114,7 @@ case class ResolveExpressionSideEffects[Pre <: Generation]() extends Rewriter[Pr
           val action = assignLocal[Post](Local(flat.ref), pureExpr)
           acceptor(condition match {
             case BooleanValue(true) => action
-            case condition =>
-              Branch(Seq((condition, action)))
+            case condition => Branch(Seq((condition, action)))
           })
       }
     }
@@ -119,44 +132,51 @@ case class ResolveExpressionSideEffects[Pre <: Generation]() extends Rewriter[Pr
 
   case class ReInliner() extends NonLatchingRewriter[Post, Post] {
     // ReInliner does not latch declarations ...
-    override def porcelainRefSucc[RefDecl <: Declaration[Post]](ref: Ref[Post, _])(implicit tag: ClassTag[RefDecl]): Option[Ref[Post, RefDecl]] =
+    override def porcelainRefSucc[RefDecl <: Declaration[Post]](
+        ref: Ref[Post, _]
+    )(implicit tag: ClassTag[RefDecl]): Option[Ref[Post, RefDecl]] =
       Some(ref.asInstanceOf[Ref[Post, RefDecl]])
 
-    override def porcelainRefSeqSucc[RefDecl <: Declaration[Post]](refs: Seq[Ref[Post, _]])(implicit tag: ClassTag[RefDecl]): Option[Seq[Ref[Post, RefDecl]]] =
+    override def porcelainRefSeqSucc[RefDecl <: Declaration[Post]](
+        refs: Seq[Ref[Post, _]]
+    )(implicit tag: ClassTag[RefDecl]): Option[Seq[Ref[Post, RefDecl]]] =
       Some(refs.map(_.asInstanceOf[Ref[Post, RefDecl]]))
 
     // ... but since we need to be able to unpack locals, we latch those, and they are not latched in
     // ResolveExpressionSideEffects.
-    override def dispatch(e: Expr[Post]): Expr[Post] = e match {
-      case Local(Ref(v)) =>
-        currentlyExtracted.remove(v) match {
-          case Some((_, pureExpression)) =>
-            pureExpression
-          case None =>
-            if(flushedExtracted.contains(v)) {
-              Local[Post](v.ref)(e.o)
-            } else {
-              val preV = (v: Variable[Post]).asInstanceOf[Variable[Pre]]
-              Local[Post](ResolveExpressionSideEffects.this.succ(preV))(e.o)
-            }
-        }
-      case other => rewriteDefault(other)
-    }
+    override def dispatch(e: Expr[Post]): Expr[Post] =
+      e match {
+        case Local(Ref(v)) =>
+          currentlyExtracted.remove(v) match {
+            case Some((_, pureExpression)) => pureExpression
+            case None =>
+              if (flushedExtracted.contains(v)) { Local[Post](v.ref)(e.o) }
+              else {
+                val preV = (v: Variable[Post]).asInstanceOf[Variable[Pre]]
+                Local[Post](ResolveExpressionSideEffects.this.succ(preV))(e.o)
+              }
+          }
+        case other => rewriteDefault(other)
+      }
 
-    /**
-      * In case we want to reinline a declaration, we do not want to rewrite it, because it has already been rewritten
-      *   by the root rewriter.
+    /** In case we want to reinline a declaration, we do not want to rewrite it,
+      * because it has already been rewritten by the root rewriter.
       */
-    override def dispatch(decl: Declaration[Post]): Unit = allScopes.anyDeclare(decl)
+    override def dispatch(decl: Declaration[Post]): Unit =
+      allScopes.anyDeclare(decl)
 
   }
 
   def collectVarsIfOuterScope[T](f: => T): (Seq[Variable[Post]], T) = {
-    if(variables.isEmpty) variables.collect(f)
-    else (Nil, f)
+    if (variables.isEmpty)
+      variables.collect(f)
+    else
+      (Nil, f)
   }
 
-  def evaluateOne(e: Expr[Pre]): (Seq[Variable[Post]], Seq[Statement[Post]], Expr[Post]) = {
+  def evaluateOne(
+      e: Expr[Pre]
+  ): (Seq[Variable[Post]], Seq[Statement[Post]], Expr[Post]) = {
     val statements = ArrayBuffer[Statement[Post]]()
 
     val previouslyExtracted = currentlyExtracted.keySet.toSet
@@ -171,28 +191,31 @@ case class ResolveExpressionSideEffects[Pre <: Generation]() extends Rewriter[Pr
       // All extracted expressions are re-inlined, or are flushed as side effects.
       // Exception: if expression evaluation recurses, then either the expressions extracted in the outer evaluation
       // are flushed by us, or they remain exactly in the extracted expressions.
-      assert(currentlyExtracted.isEmpty || currentlyExtracted.keySet.toSet == previouslyExtracted)
+      assert(
+        currentlyExtracted.isEmpty ||
+          currentlyExtracted.keySet.toSet == previouslyExtracted
+      )
 
       (vars, statements.toSeq, result)
     } catch {
       // The expression contains constructs (e.g. \forall) of which the combination with side effects would be confusing ...
       case err: DisallowedProofExpression =>
         // To continue without crashing, restore the situation as before
-        currentlyExtracted --= (currentlyExtracted.keySet.toSet -- previouslyExtracted)
+        currentlyExtracted --=
+          (currentlyExtracted.keySet.toSet -- previouslyExtracted)
         try {
           // ... so try to evaluate it as a pure expression ...
-          executionContext.having(None) {
-            (Nil, Nil, dispatch(e))
-          }
+          executionContext.having(None) { (Nil, Nil, dispatch(e)) }
         } catch {
           // ... when that doesn't work, the problem is the construct (e.g. \forall)
-          case _: DisallowedSideEffect =>
-            throw err
+          case _: DisallowedSideEffect => throw err
         }
     }
   }
 
-  def evaluateAll(es: Seq[Expr[Pre]]): (Seq[Variable[Post]], Seq[Statement[Post]], Seq[Expr[Post]]) = {
+  def evaluateAll(
+      es: Seq[Expr[Pre]]
+  ): (Seq[Variable[Post]], Seq[Statement[Post]], Seq[Expr[Post]]) = {
     implicit val o: Origin = SideEffectOrigin
     /* PB: We do a bit of a hack here, and place all the expressions we want to evaluate into one tuple. This ensures
        that we don't have to think about manually joining the side effects of two subsequent evaluations. For example,
@@ -205,25 +228,39 @@ case class ResolveExpressionSideEffects[Pre <: Generation]() extends Rewriter[Pr
     (variables, sideEffects, result.asInstanceOf[LiteralTuple[Post]].values)
   }
 
-  def frameAll(exprs: Seq[Expr[Pre]], make: Seq[Expr[Post]] => Statement[Post]): Statement[Post] = {
+  def frameAll(
+      exprs: Seq[Expr[Pre]],
+      make: Seq[Expr[Post]] => Statement[Post],
+  ): Statement[Post] = {
     implicit val o: Origin = SideEffectOrigin
     val (variables, sideEffects, result) = evaluateAll(exprs)
     val statement = make(result)
 
     val allStements =
-      if(sideEffects.isEmpty) statement
-      else Block(sideEffects :+ statement)
-
-    if(variables.isEmpty) allStements
-    else Scope(variables, allStements)
+      if (sideEffects.isEmpty)
+        statement
+      else
+        Block(sideEffects :+ statement)
+
+    if (variables.isEmpty)
+      allStements
+    else
+      Scope(variables, allStements)
   }
 
-  def frame(expr: Expr[Pre], make: Expr[Post] => Statement[Post]): Statement[Post] =
-    frameAll(Seq(expr), es => make(es.head))
-  def frame(e1: Expr[Pre], e2: Expr[Pre], make: (Expr[Post], Expr[Post]) => Statement[Post]): Statement[Post] =
-    frameAll(Seq(e1, e2), es => make(es(0), es(1)))
-
-  def doBranches(branches: Seq[(Expr[Pre], Statement[Pre])])(implicit o: Origin): Statement[Post] =
+  def frame(
+      expr: Expr[Pre],
+      make: Expr[Post] => Statement[Post],
+  ): Statement[Post] = frameAll(Seq(expr), es => make(es.head))
+  def frame(
+      e1: Expr[Pre],
+      e2: Expr[Pre],
+      make: (Expr[Post], Expr[Post]) => Statement[Post],
+  ): Statement[Post] = frameAll(Seq(e1, e2), es => make(es(0), es(1)))
+
+  def doBranches(
+      branches: Seq[(Expr[Pre], Statement[Pre])]
+  )(implicit o: Origin): Statement[Post] =
     branches match {
       case Nil => Branch(Nil)
       case (cond, impl) +: tail =>
@@ -231,162 +268,248 @@ case class ResolveExpressionSideEffects[Pre <: Generation]() extends Rewriter[Pr
           case Branch(branches) =>
             frame(cond, cond => Branch((cond, dispatch(impl)) +: branches))
           case otherwise =>
-            frame(cond, cond => Branch(Seq( (cond, dispatch(impl)), (tt, otherwise) )))
+            frame(
+              cond,
+              cond => Branch(Seq((cond, dispatch(impl)), (tt, otherwise))),
+            )
         }
     }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = executionContext.having(None) {
-    implicit val o: Origin = stat.o
-    stat match {
-      case Eval(e) => frame(e, Eval(_))
-      case inv @ InvokeMethod(obj, Ref(method), args, outArgs, typeArgs, givenMap, yields) =>
-        val res = new Variable[Post](dispatch(method.returnType.particularize(method.typeArgs.zip(typeArgs).toMap)))(ResultVar)
-        frameAll(obj +: args, {
-          case obj +: args => Scope(Seq(res),
-            InvokeMethod[Post](
-              obj, succ(method), args, res.get(inv.o) +: outArgs.map(dispatch),
-              typeArgs.map(dispatch),
-              givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
-              yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) })(inv.blame))
-        })
-      case inv @ InvokeProcedure(Ref(method), args, outArgs, typeArgs, givenMap, yields) =>
-        val res = new Variable[Post](dispatch(method.returnType.particularize(method.typeArgs.zip(typeArgs).toMap)))(ResultVar)
-        frameAll(args, args => Scope(Seq(res),
-          InvokeProcedure[Post](succ(method), args,
-            res.get(inv.o) +: outArgs.map(dispatch), typeArgs.map(dispatch),
-            givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
-            yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) })(inv.blame)))
-      case decl: LocalDecl[Pre] => rewriteDefault(decl)
-      case Return(result) =>
-        frame(result, e => Block(Seq(
-          assignLocal(currentResultVar.top, e),
-          Return(Void()),
-        )))
-      case ass @ Assign(target, value) =>
-        frame(PreAssignExpression[Pre](target, value)(ass.blame), Eval(_))
-      case block: Block[Pre] => rewriteDefault(block)
-      case scope: Scope[Pre] => rewriteDefault(scope)
-      case Branch(branches) => doBranches(branches)
-      case Switch(expr, body) => frame(expr, Switch(_, dispatch(body)))
-      case loop @ Loop(init, cond, update, contract, body) =>
-        evaluateOne(cond) match {
-          case (Nil, Nil, cond) =>
-            Loop(dispatch(init), cond, dispatch(update), dispatch(contract), dispatch(body))
-          case (variables, sideEffects, cond) =>
-            val break = new LabelDecl[Post]()(BreakOrigin)
-
-            Block(Seq(
-              Loop(dispatch(init), tt, dispatch(update), dispatch(contract), Block(Seq(
-                Scope(variables,
-                  Block(sideEffects :+ Branch(Seq(Not(cond) -> Goto(break.ref))))),
-                dispatch(body),
-              ))),
-              Label(break, Block(Nil)),
-            ))
-        }
-      case attempt: TryCatchFinally[Pre] => rewriteDefault(attempt)
-      case sync @ Synchronized(obj, body) => frame(obj, Synchronized(_, dispatch(body))(sync.blame))
-      case inv: ParInvariant[Pre] => rewriteDefault(inv)
-      case atomic: ParAtomic[Pre] => rewriteDefault(atomic)
-      case barrier: ParBarrier[Pre] => rewriteDefault(barrier)
-      case vec: VecBlock[Pre] => rewriteDefault(vec) // PB: conceivably we can support side effect in iterator ranges; let's see if someone wants that :)
-      case send: Send[Pre] => rewriteDefault(send)
-      case recv: Recv[Pre] => rewriteDefault(recv)
-      case default: DefaultCase[Pre] => rewriteDefault(default)
-      case Case(pattern) => Case(dispatch(pattern))
-      case label: Label[Pre] => rewriteDefault(label)
-      case goto: Goto[Pre] => rewriteDefault(goto)
-      case exhale: Exhale[Pre] => rewriteDefault(exhale)
-      case assert @ Assert(expr) if TBool().superTypeOf(expr.t) => frame(expr, Assert(_)(assert.blame))
-      case assert: Assert[Pre] => rewriteDefault(assert)
-      case refute: Refute[Pre] => rewriteDefault(refute)
-      case inhale: Inhale[Pre] => rewriteDefault(inhale)
-      case Assume(expr) => frame(expr, Assume(_))
-      case ignore: SpecIgnoreStart[Pre] => rewriteDefault(ignore)
-      case ignore: SpecIgnoreEnd[Pre] => rewriteDefault(ignore)
-      case t @ Throw(obj) => frame(obj, Throw(_)(t.blame))
-      case wait @ Wait(obj) => frame(obj, Wait(_)(wait.blame))
-      case notify @ Notify(obj) => frame(obj, Notify(_)(notify.blame))
-      case f @ Fork(obj) => frame(obj, Fork(_)(f.blame))
-      case j @ Join(obj) => frame(obj, Join(_)(j.blame))
-      case l @ Lock(obj) => frame(obj, Lock(_)(l.blame))
-      case unlock @ Unlock(obj) => frame(obj, Unlock(_)(unlock.blame))
-      case fold: Fold[Pre] => rewriteDefault(fold)
-      case unfold: Unfold[Pre] => rewriteDefault(unfold)
-      case create: WandPackage[Pre] => rewriteDefault(create)
-      case apply: WandApply[Pre] => rewriteDefault(apply)
-      case modelDo: ModelDo[Pre] => rewriteDefault(modelDo)
-      case havoc: Havoc[Pre] => rewriteDefault(havoc) // PB: pretty sure you can only havoc locals?
-      case break: Break[Pre] => rewriteDefault(break)
-      case continue: Continue[Pre] => rewriteDefault(continue)
-      case commit: Commit[Pre] => rewriteDefault(commit)
-      case par: ParStatement[Pre] => rewriteDefault(par)
-      case n: SilverNewRef[Pre] => rewriteDefault(n)
-      case assn: SilverFieldAssign[Pre] => rewriteDefault(assn)
-      case assn: SilverLocalAssign[Pre] => rewriteDefault(assn)
-      case proof: FramedProof[Pre] => rewriteDefault(proof)
-      case extract: Extract[Pre] => rewriteDefault(extract)
-      case branch: IndetBranch[Pre] => rewriteDefault(branch)
-      case LlvmLoop(cond, contract, body) =>
-        evaluateOne(cond) match {
-          case (Nil, Nil, cond) =>
-            LlvmLoop(cond, dispatch(contract), dispatch(body))
-          case (variables, sideEffects, cond) =>
-            val break = new LabelDecl[Post]()(BreakOrigin)
-
-            Block(Seq(
-              LlvmLoop(tt, dispatch(contract), Block(Seq(
-                Scope(variables,
-                  Block(sideEffects :+ Branch(Seq(Not(cond) -> Goto(break.ref))))),
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    executionContext.having(None) {
+      implicit val o: Origin = stat.o
+      stat match {
+        case Eval(e) => frame(e, Eval(_))
+        case inv @ InvokeMethod(
+              obj,
+              Ref(method),
+              args,
+              outArgs,
+              typeArgs,
+              givenMap,
+              yields,
+            ) =>
+          val res =
+            new Variable[Post](dispatch(
+              method.returnType
+                .particularize(method.typeArgs.zip(typeArgs).toMap)
+            ))(ResultVar)
+          frameAll(
+            obj +: args,
+            { case obj +: args =>
+              Scope(
+                Seq(res),
+                InvokeMethod[Post](
+                  obj,
+                  succ(method),
+                  args,
+                  res.get(inv.o) +: outArgs.map(dispatch),
+                  typeArgs.map(dispatch),
+                  givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
+                  yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
+                )(inv.blame),
+              )
+            },
+          )
+        case inv @ InvokeProcedure(
+              Ref(method),
+              args,
+              outArgs,
+              typeArgs,
+              givenMap,
+              yields,
+            ) =>
+          val res =
+            new Variable[Post](dispatch(
+              method.returnType
+                .particularize(method.typeArgs.zip(typeArgs).toMap)
+            ))(ResultVar)
+          frameAll(
+            args,
+            args =>
+              Scope(
+                Seq(res),
+                InvokeProcedure[Post](
+                  succ(method),
+                  args,
+                  res.get(inv.o) +: outArgs.map(dispatch),
+                  typeArgs.map(dispatch),
+                  givenMap.map { case (Ref(v), e) => (succ(v), dispatch(e)) },
+                  yields.map { case (e, Ref(v)) => (dispatch(e), succ(v)) },
+                )(inv.blame),
+              ),
+          )
+        case decl: LocalDecl[Pre] => rewriteDefault(decl)
+        case Return(result) =>
+          frame(
+            result,
+            e =>
+              Block(Seq(assignLocal(currentResultVar.top, e), Return(Void()))),
+          )
+        case ass @ Assign(target, value) =>
+          frame(PreAssignExpression[Pre](target, value)(ass.blame), Eval(_))
+        case block: Block[Pre] => rewriteDefault(block)
+        case scope: Scope[Pre] => rewriteDefault(scope)
+        case Branch(branches) => doBranches(branches)
+        case Switch(expr, body) => frame(expr, Switch(_, dispatch(body)))
+        case loop @ Loop(init, cond, update, contract, body) =>
+          evaluateOne(cond) match {
+            case (Nil, Nil, cond) =>
+              Loop(
+                dispatch(init),
+                cond,
+                dispatch(update),
+                dispatch(contract),
                 dispatch(body),
-              ))),
-              Label(break, Block(Nil)),
-            ))
-        }
-      case rangedFor: RangedFor[Pre] => rewriteDefault(rangedFor)
-      case assign: VeyMontAssignExpression[Pre] => rewriteDefault(assign)
-      case comm: CommunicateX[Pre] => rewriteDefault(comm)
-      case comm: PVLCommunicate[Pre] => rewriteDefault(comm)
-      case comm: CommunicateStatement[Pre] => rewriteDefault(comm)
-      case _: PVLBranch[Pre] => throw ExtraNode
-      case _: PVLLoop[Pre] => throw ExtraNode
-      case _: UnresolvedChorBranch[Pre] => throw ExtraNode
-      case _: UnresolvedChorLoop[Pre] => throw ExtraNode
-      case _: ChorBranch[Pre] => throw ExtraNode
-      case _: ChorLoop[Pre] => throw ExtraNode
-      case _: CStatement[Pre] => throw ExtraNode
-      case _: CPPStatement[Pre] => throw ExtraNode
-      case _: JavaStatement[Pre] => throw ExtraNode
+              )
+            case (variables, sideEffects, cond) =>
+              val break = new LabelDecl[Post]()(BreakOrigin)
+
+              Block(Seq(
+                Loop(
+                  dispatch(init),
+                  tt,
+                  dispatch(update),
+                  dispatch(contract),
+                  Block(Seq(
+                    Scope(
+                      variables,
+                      Block(
+                        sideEffects :+ Branch(Seq(Not(cond) -> Goto(break.ref)))
+                      ),
+                    ),
+                    dispatch(body),
+                  )),
+                ),
+                Label(break, Block(Nil)),
+              ))
+          }
+        case attempt: TryCatchFinally[Pre] => rewriteDefault(attempt)
+        case sync @ Synchronized(obj, body) =>
+          frame(obj, Synchronized(_, dispatch(body))(sync.blame))
+        case inv: ParInvariant[Pre] => rewriteDefault(inv)
+        case atomic: ParAtomic[Pre] => rewriteDefault(atomic)
+        case barrier: ParBarrier[Pre] => rewriteDefault(barrier)
+        case vec: VecBlock[Pre] =>
+          rewriteDefault(
+            vec
+          ) // PB: conceivably we can support side effect in iterator ranges; let's see if someone wants that :)
+        case send: Send[Pre] => rewriteDefault(send)
+        case recv: Recv[Pre] => rewriteDefault(recv)
+        case default: DefaultCase[Pre] => rewriteDefault(default)
+        case Case(pattern) => Case(dispatch(pattern))
+        case label: Label[Pre] => rewriteDefault(label)
+        case goto: Goto[Pre] => rewriteDefault(goto)
+        case exhale: Exhale[Pre] => rewriteDefault(exhale)
+        case assert @ Assert(expr) if TBool().superTypeOf(expr.t) =>
+          frame(expr, Assert(_)(assert.blame))
+        case assert: Assert[Pre] => rewriteDefault(assert)
+        case refute: Refute[Pre] => rewriteDefault(refute)
+        case inhale: Inhale[Pre] => rewriteDefault(inhale)
+        case Assume(expr) => frame(expr, Assume(_))
+        case ignore: SpecIgnoreStart[Pre] => rewriteDefault(ignore)
+        case ignore: SpecIgnoreEnd[Pre] => rewriteDefault(ignore)
+        case t @ Throw(obj) => frame(obj, Throw(_)(t.blame))
+        case wait @ Wait(obj) => frame(obj, Wait(_)(wait.blame))
+        case notify @ Notify(obj) => frame(obj, Notify(_)(notify.blame))
+        case f @ Fork(obj) => frame(obj, Fork(_)(f.blame))
+        case j @ Join(obj) => frame(obj, Join(_)(j.blame))
+        case l @ Lock(obj) => frame(obj, Lock(_)(l.blame))
+        case unlock @ Unlock(obj) => frame(obj, Unlock(_)(unlock.blame))
+        case fold: Fold[Pre] => rewriteDefault(fold)
+        case unfold: Unfold[Pre] => rewriteDefault(unfold)
+        case create: WandPackage[Pre] => rewriteDefault(create)
+        case apply: WandApply[Pre] => rewriteDefault(apply)
+        case modelDo: ModelDo[Pre] => rewriteDefault(modelDo)
+        case havoc: Havoc[Pre] =>
+          rewriteDefault(havoc) // PB: pretty sure you can only havoc locals?
+        case break: Break[Pre] => rewriteDefault(break)
+        case continue: Continue[Pre] => rewriteDefault(continue)
+        case commit: Commit[Pre] => rewriteDefault(commit)
+        case par: ParStatement[Pre] => rewriteDefault(par)
+        case n: SilverNewRef[Pre] => rewriteDefault(n)
+        case assn: SilverFieldAssign[Pre] => rewriteDefault(assn)
+        case assn: SilverLocalAssign[Pre] => rewriteDefault(assn)
+        case proof: FramedProof[Pre] => rewriteDefault(proof)
+        case extract: Extract[Pre] => rewriteDefault(extract)
+        case branch: IndetBranch[Pre] => rewriteDefault(branch)
+        case LlvmLoop(cond, contract, body) =>
+          evaluateOne(cond) match {
+            case (Nil, Nil, cond) =>
+              LlvmLoop(cond, dispatch(contract), dispatch(body))
+            case (variables, sideEffects, cond) =>
+              val break = new LabelDecl[Post]()(BreakOrigin)
+
+              Block(Seq(
+                LlvmLoop(
+                  tt,
+                  dispatch(contract),
+                  Block(Seq(
+                    Scope(
+                      variables,
+                      Block(
+                        sideEffects :+ Branch(Seq(Not(cond) -> Goto(break.ref)))
+                      ),
+                    ),
+                    dispatch(body),
+                  )),
+                ),
+                Label(break, Block(Nil)),
+              ))
+          }
+        case rangedFor: RangedFor[Pre] => rewriteDefault(rangedFor)
+        case assign: VeyMontAssignExpression[Pre] => rewriteDefault(assign)
+        case comm: CommunicateX[Pre] => rewriteDefault(comm)
+        case comm: PVLCommunicate[Pre] => rewriteDefault(comm)
+        case comm: CommunicateStatement[Pre] => rewriteDefault(comm)
+        case _: PVLBranch[Pre] => throw ExtraNode
+        case _: PVLLoop[Pre] => throw ExtraNode
+        case _: UnresolvedChorBranch[Pre] => throw ExtraNode
+        case _: UnresolvedChorLoop[Pre] => throw ExtraNode
+        case _: ChorBranch[Pre] => throw ExtraNode
+        case _: ChorLoop[Pre] => throw ExtraNode
+        case _: CStatement[Pre] => throw ExtraNode
+        case _: CPPStatement[Pre] => throw ExtraNode
+        case _: JavaStatement[Pre] => throw ExtraNode
+      }
     }
-  }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case cons: Constructor[Pre] => rewriteDefault(cons)
-    case method: AbstractMethod[Pre] =>
-      val res = new Variable[Post](dispatch(method.returnType))(ResultVar)
-      currentResultVar.having(Local[Post](res.ref)(ResultVar)) {
-        allScopes.anyDeclare(allScopes.anySucceedOnly(method, method.rewrite(
-          returnType = TVoid()(method.o),
-          outArgs = variables.collect {
-            variables.declare(res)
-            method.outArgs.foreach(dispatch)
-          }._1,
-        )))
-      }
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case cons: Constructor[Pre] => rewriteDefault(cons)
+      case method: AbstractMethod[Pre] =>
+        val res = new Variable[Post](dispatch(method.returnType))(ResultVar)
+        currentResultVar.having(Local[Post](res.ref)(ResultVar)) {
+          allScopes.anyDeclare(allScopes.anySucceedOnly(
+            method,
+            method.rewrite(
+              returnType = TVoid()(method.o),
+              outArgs =
+                variables.collect {
+                  variables.declare(res)
+                  method.outArgs.foreach(dispatch)
+                }._1,
+            ),
+          ))
+        }
+      case other => rewriteDefault(other)
+    }
 
   override def dispatch(e: Expr[Pre]): Expr[Post] =
-    if(inPure) dispatchPure(e)
-    else dispatchImpure(e)
-
-  def dispatchPure(e: Expr[Pre]): Expr[Post] = e match {
-    case Result(_) if currentResultVar.nonEmpty => currentResultVar.top
-    case _: PreAssignExpression[Pre] | _: PostAssignExpression[Pre] | _: With[Pre] | _: Then[Pre] |
-         _: MethodInvocation[Pre] | _: ProcedureInvocation[Pre] =>
-      throw DisallowedSideEffect(e)
-    case other => rewriteDefault(other)
-  }
+    if (inPure)
+      dispatchPure(e)
+    else
+      dispatchImpure(e)
+
+  def dispatchPure(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case Result(_) if currentResultVar.nonEmpty => currentResultVar.top
+      case _: PreAssignExpression[Pre] | _: PostAssignExpression[Pre] |
+          _: With[Pre] | _: Then[Pre] | _: MethodInvocation[Pre] |
+          _: ProcedureInvocation[Pre] =>
+        throw DisallowedSideEffect(e)
+      case other => rewriteDefault(other)
+    }
 
   def inlined(e: Expr[Pre]): Expr[Post] =
     ReInliner().dispatch(dispatchImpure(e))
@@ -406,125 +529,182 @@ case class ResolveExpressionSideEffects[Pre <: Generation]() extends Rewriter[Pr
   }
 
   def assignTarget(target: Expr[Pre]): Expr[Post] = {
-    val result = target match {
-      case Local(Ref(v)) => Local[Post](succ(v))(target.o)
-      case deref @ DerefHeapVariable(Ref(v)) => DerefHeapVariable[Post](succ(v))(deref.blame)(target.o)
-      case Deref(obj, Ref(f)) => Deref[Post](notInlined(obj), succ(f))(DerefAssignTarget)(target.o)
-      case SilverDeref(obj, Ref(f)) => SilverDeref[Post](notInlined(obj), succ(f))(DerefAssignTarget)(target.o)
-      case ArraySubscript(arr, index) => ArraySubscript[Post](notInlined(arr), notInlined(index))(SubscriptAssignTarget)(target.o)
-      case PointerSubscript(arr, index) => PointerSubscript[Post](notInlined(arr), notInlined(index))(SubscriptAssignTarget)(target.o)
-      case deref @ DerefPointer(ptr) => DerefPointer[Post](notInlined(ptr))(deref.blame)(target.o)
-      case VectorSubscript(_, _) => throw DisallowedAssignmentTarget(target)
-      case SeqSubscript(_, _) => throw DisallowedAssignmentTarget(target)
-      case other => ???
-    }
+    val result =
+      target match {
+        case Local(Ref(v)) => Local[Post](succ(v))(target.o)
+        case deref @ DerefHeapVariable(Ref(v)) =>
+          DerefHeapVariable[Post](succ(v))(deref.blame)(target.o)
+        case Deref(obj, Ref(f)) =>
+          Deref[Post](notInlined(obj), succ(f))(DerefAssignTarget)(target.o)
+        case SilverDeref(obj, Ref(f)) =>
+          SilverDeref[Post](notInlined(obj), succ(f))(DerefAssignTarget)(
+            target.o
+          )
+        case ArraySubscript(arr, index) =>
+          ArraySubscript[Post](notInlined(arr), notInlined(index))(
+            SubscriptAssignTarget
+          )(target.o)
+        case PointerSubscript(arr, index) =>
+          PointerSubscript[Post](notInlined(arr), notInlined(index))(
+            SubscriptAssignTarget
+          )(target.o)
+        case deref @ DerefPointer(ptr) =>
+          DerefPointer[Post](notInlined(ptr))(deref.blame)(target.o)
+        case VectorSubscript(_, _) => throw DisallowedAssignmentTarget(target)
+        case SeqSubscript(_, _) => throw DisallowedAssignmentTarget(target)
+        case other => ???
+      }
     flushExtractedExpressions()
     result
   }
 
-  def dispatchImpure(e: Expr[Pre]): Local[Post] = e match {
-    case Local(Ref(v)) =>
-      // We do not take the successor here: ReInliner will do that.
-      val postV = (v: Variable[Pre]).asInstanceOf[Variable[Post]]
-      Local[Post](postV.ref)(e.o)
-
-    case Result(_) if currentResultVar.nonEmpty => currentResultVar.top
-
-    // ## Nodes of which the combination with side effects is ill-defined: ##
-    // PB: we could probably support let in impure contexts, is it useful?
-    // PB: technically only binders are problematic, others are just confusing
-    // e.g. allowing unfolding would enable:
-    //     \unfolding p() in (1 with inhale p())
-    // to verify.
-    case Star(_, _) | Exists(_, _, _) | Forall(_, _, _) | Starall(_, _, _) | Let(_, _, _) | Sum(_, _, _) |
-         Product(_, _, _) | ForPerm(_, _, _) | PolarityDependent(_, _) | Unfolding(_, _) =>
-      throw DisallowedProofExpression(e)
-
-    // ## Nodes that induce an implicit evaluation condition: ##
-    case Select(cond, whenTrue, whenFalse) =>
-      val cond1 = dispatchImpure(cond)
-      val whenTrue1 = currentConditions.having(cond1) { dispatchImpure(whenTrue) }
-      val whenFalse1 = currentConditions.having(Not(cond1)(e.o)) { dispatchImpure(whenFalse) }
-      stored(ReInliner().dispatch(Select(cond1, whenTrue1, whenFalse1)(e.o)), e.t)
-    case Implies(left, right) =>
-      val left1 = dispatchImpure(left)
-      val right1 = currentConditions.having(left1) { dispatchImpure(right) }
-      stored(ReInliner().dispatch(Implies(left1, right1)(e.o)), e.t)
-    case And(left, right) =>
-      val left1 = dispatchImpure(left)
-      val right1 = currentConditions.having(left1) { dispatchImpure(right) }
-      stored(ReInliner().dispatch(And(left1, right1)(e.o)), e.t)
-    case Or(left, right) =>
-      val left1 = dispatchImpure(left)
-      val right1 = currentConditions.having(Not(left1)(e.o)) { dispatchImpure(right) }
-      stored(ReInliner().dispatch(Or(left1, right1)(e.o)), e.t)
-
-    // ## Nodes that induce side effects: ##
-    case ass @ PreAssignExpression(oldTarget, oldValue) =>
-      // target and value could be inline, if it were not for the fact that we need value to return it (since value
-      // may have a more specific type than the target type)
-      val target = assignTarget(oldTarget)
-      val value = notInlined(oldValue)
-      effect(Assign(target, value)(ass.blame)(e.o))
-      stored(value, oldValue.t)
-    case ass @ PostAssignExpression(oldTarget, value) =>
-      val target = assignTarget(oldTarget)
-      val cachedTarget = stored(target, oldTarget.t)
-      effect(Assign(target, inlined(value))(ass.blame)(e.o))
-      stored(cachedTarget, oldTarget.t)
-    case With(pre, value) =>
-      effect(dispatch(pre))
-      dispatchImpure(value)
-    case Then(oldValue, post) =>
-      val value = notInlined(oldValue)
-      effect(dispatch(post))
-      stored(value, oldValue.t)
-    case inv @ MethodInvocation(obj, Ref(method), args, outArgs, typeArgs, givenMap, yields) =>
-      val res = new Variable[Post](dispatch(inv.t))(ResultVar)
-      variables.succeed(res.asInstanceOf[Variable[Pre]], res)
-      effect(InvokeMethod[Post](
-        obj = inlined(obj),
-        ref = succ(method),
-        args = args.map(inlined),
-        outArgs = res.get(inv.o) +: outArgs.map(inlined),
-        typeArgs = typeArgs.map(dispatch),
-        givenMap.map { case (Ref(v), e) => (succ(v), inlined(e)) },
-        yields.map { case (e, Ref(v)) => (inlined(e), succ(v)) },
-      )(inv.blame)(e.o))
-      stored(res.get(SideEffectOrigin), inv.t)
-    case inv @ ProcedureInvocation(Ref(method), args, outArgs, typeArgs, givenMap, yields) =>
-      val res = new Variable[Post](dispatch(method.returnType.particularize(method.typeArgs.zip(typeArgs).toMap)))(ResultVar)
-      variables.succeed(res.asInstanceOf[Variable[Pre]], res)
-      effect(InvokeProcedure[Post](
-        ref = succ(method),
-        args = args.map(inlined),
-        outArgs = res.get(inv.o) +: outArgs.map(inlined),
-        typeArgs = typeArgs.map(dispatch),
-        givenMap.map { case (Ref(v), e) => (succ(v), inlined(e)) },
-        yields.map { case (e, Ref(v)) => (inlined(e), succ(v)) },
-      )(inv.blame)(e.o))
-      stored(res.get(SideEffectOrigin), method.returnType.particularize(inv.typeEnv))
-    case inv @ ConstructorInvocation(Ref(cons), classTypeArgs, args, outArgs, typeArgs, givenMap, yields) =>
-      val typ = TClass[Post](succ(cons.cls.decl), classTypeArgs.map(dispatch))
-      val res = new Variable[Post](typ)(ResultVar)
-      variables.succeed(res.asInstanceOf[Variable[Pre]], res)
-      effect(InvokeConstructor[Post](
-        ref = succ(cons),
-        classTypeArgs = classTypeArgs.map(dispatch),
-        out = res.get(ResultVar),
-        args = args.map(inlined),
-        outArgs = outArgs.map(dispatch),
-        typeArgs = typeArgs.map(dispatch),
-        givenMap.map { case (Ref(v), e) => (succ(v), inlined(e)) },
-        yields.map { case (e, Ref(v)) => (inlined(e), succ(v)) },
-      )(inv.blame)(e.o))
-      stored(res.get(SideEffectOrigin), TClass(cons.cls, classTypeArgs))
-    case NewObject(Ref(cls)) =>
-      val res = new Variable[Post](TClass(succ(cls), Seq()))(ResultVar)
-      variables.succeed(res.asInstanceOf[Variable[Pre]], res)
-      effect(Instantiate[Post](succ(cls), res.get(ResultVar))(e.o))
-      stored(res.get(SideEffectOrigin), TClass(cls.ref, Seq()))
-    case other =>
-      stored(ReInliner().dispatch(rewriteDefault(other)), other.t)
-  }
+  def dispatchImpure(e: Expr[Pre]): Local[Post] =
+    e match {
+      case Local(Ref(v)) =>
+        // We do not take the successor here: ReInliner will do that.
+        val postV = (v: Variable[Pre]).asInstanceOf[Variable[Post]]
+        Local[Post](postV.ref)(e.o)
+
+      case Result(_) if currentResultVar.nonEmpty => currentResultVar.top
+
+      // ## Nodes of which the combination with side effects is ill-defined: ##
+      // PB: we could probably support let in impure contexts, is it useful?
+      // PB: technically only binders are problematic, others are just confusing
+      // e.g. allowing unfolding would enable:
+      //     \unfolding p() in (1 with inhale p())
+      // to verify.
+      case Star(_, _) | Exists(_, _, _) | Forall(_, _, _) | Starall(_, _, _) |
+          Let(_, _, _) | Sum(_, _, _) | Product(_, _, _) | ForPerm(_, _, _) |
+          PolarityDependent(_, _) | Unfolding(_, _) =>
+        throw DisallowedProofExpression(e)
+
+      // ## Nodes that induce an implicit evaluation condition: ##
+      case Select(cond, whenTrue, whenFalse) =>
+        val cond1 = dispatchImpure(cond)
+        val whenTrue1 =
+          currentConditions.having(cond1) { dispatchImpure(whenTrue) }
+        val whenFalse1 =
+          currentConditions.having(Not(cond1)(e.o)) {
+            dispatchImpure(whenFalse)
+          }
+        stored(
+          ReInliner().dispatch(Select(cond1, whenTrue1, whenFalse1)(e.o)),
+          e.t,
+        )
+      case Implies(left, right) =>
+        val left1 = dispatchImpure(left)
+        val right1 = currentConditions.having(left1) { dispatchImpure(right) }
+        stored(ReInliner().dispatch(Implies(left1, right1)(e.o)), e.t)
+      case And(left, right) =>
+        val left1 = dispatchImpure(left)
+        val right1 = currentConditions.having(left1) { dispatchImpure(right) }
+        stored(ReInliner().dispatch(And(left1, right1)(e.o)), e.t)
+      case Or(left, right) =>
+        val left1 = dispatchImpure(left)
+        val right1 =
+          currentConditions.having(Not(left1)(e.o)) { dispatchImpure(right) }
+        stored(ReInliner().dispatch(Or(left1, right1)(e.o)), e.t)
+
+      // ## Nodes that induce side effects: ##
+      case ass @ PreAssignExpression(oldTarget, oldValue) =>
+        // target and value could be inline, if it were not for the fact that we need value to return it (since value
+        // may have a more specific type than the target type)
+        val target = assignTarget(oldTarget)
+        val value = notInlined(oldValue)
+        effect(Assign(target, value)(ass.blame)(e.o))
+        stored(value, oldValue.t)
+      case ass @ PostAssignExpression(oldTarget, value) =>
+        val target = assignTarget(oldTarget)
+        val cachedTarget = stored(target, oldTarget.t)
+        effect(Assign(target, inlined(value))(ass.blame)(e.o))
+        stored(cachedTarget, oldTarget.t)
+      case With(pre, value) =>
+        effect(dispatch(pre))
+        dispatchImpure(value)
+      case Then(oldValue, post) =>
+        val value = notInlined(oldValue)
+        effect(dispatch(post))
+        stored(value, oldValue.t)
+      case inv @ MethodInvocation(
+            obj,
+            Ref(method),
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        val res = new Variable[Post](dispatch(inv.t))(ResultVar)
+        variables.succeed(res.asInstanceOf[Variable[Pre]], res)
+        effect(
+          InvokeMethod[Post](
+            obj = inlined(obj),
+            ref = succ(method),
+            args = args.map(inlined),
+            outArgs = res.get(inv.o) +: outArgs.map(inlined),
+            typeArgs = typeArgs.map(dispatch),
+            givenMap.map { case (Ref(v), e) => (succ(v), inlined(e)) },
+            yields.map { case (e, Ref(v)) => (inlined(e), succ(v)) },
+          )(inv.blame)(e.o)
+        )
+        stored(res.get(SideEffectOrigin), inv.t)
+      case inv @ ProcedureInvocation(
+            Ref(method),
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        val res =
+          new Variable[Post](dispatch(
+            method.returnType.particularize(method.typeArgs.zip(typeArgs).toMap)
+          ))(ResultVar)
+        variables.succeed(res.asInstanceOf[Variable[Pre]], res)
+        effect(
+          InvokeProcedure[Post](
+            ref = succ(method),
+            args = args.map(inlined),
+            outArgs = res.get(inv.o) +: outArgs.map(inlined),
+            typeArgs = typeArgs.map(dispatch),
+            givenMap.map { case (Ref(v), e) => (succ(v), inlined(e)) },
+            yields.map { case (e, Ref(v)) => (inlined(e), succ(v)) },
+          )(inv.blame)(e.o)
+        )
+        stored(
+          res.get(SideEffectOrigin),
+          method.returnType.particularize(inv.typeEnv),
+        )
+      case inv @ ConstructorInvocation(
+            Ref(cons),
+            classTypeArgs,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        val typ = TClass[Post](succ(cons.cls.decl), classTypeArgs.map(dispatch))
+        val res = new Variable[Post](typ)(ResultVar)
+        variables.succeed(res.asInstanceOf[Variable[Pre]], res)
+        effect(
+          InvokeConstructor[Post](
+            ref = succ(cons),
+            classTypeArgs = classTypeArgs.map(dispatch),
+            out = res.get(ResultVar),
+            args = args.map(inlined),
+            outArgs = outArgs.map(dispatch),
+            typeArgs = typeArgs.map(dispatch),
+            givenMap.map { case (Ref(v), e) => (succ(v), inlined(e)) },
+            yields.map { case (e, Ref(v)) => (inlined(e), succ(v)) },
+          )(inv.blame)(e.o)
+        )
+        stored(res.get(SideEffectOrigin), TClass(cons.cls, classTypeArgs))
+      case NewObject(Ref(cls)) =>
+        val res = new Variable[Post](TClass(succ(cls), Seq()))(ResultVar)
+        variables.succeed(res.asInstanceOf[Variable[Pre]], res)
+        effect(Instantiate[Post](succ(cls), res.get(ResultVar))(e.o))
+        stored(res.get(SideEffectOrigin), TClass(cls.ref, Seq()))
+      case other => stored(ReInliner().dispatch(rewriteDefault(other)), other.t)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/ResolveScale.scala b/src/rewrite/vct/rewrite/ResolveScale.scala
index 16197b9737..f8195b3df7 100644
--- a/src/rewrite/vct/rewrite/ResolveScale.scala
+++ b/src/rewrite/vct/rewrite/ResolveScale.scala
@@ -1,8 +1,22 @@
 package vct.col.rewrite
 
 import vct.col.ast._
-import vct.col.rewrite.ResolveScale.{CheckScale, ScaleNegativePreconditionFailed, WrongScale}
-import vct.col.origin.{Blame, DiagnosticOrigin, LabelContext, NoContext, Origin, PanicBlame, PreconditionFailed, PreferredName, ScaleNegative}
+import vct.col.rewrite.ResolveScale.{
+  CheckScale,
+  ScaleNegativePreconditionFailed,
+  WrongScale,
+}
+import vct.col.origin.{
+  Blame,
+  DiagnosticOrigin,
+  LabelContext,
+  NoContext,
+  Origin,
+  PanicBlame,
+  PreconditionFailed,
+  PreferredName,
+  ScaleNegative,
+}
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, Rewritten}
 import vct.col.util.AstBuildHelpers._
 import vct.col.ast.RewriteHelpers._
@@ -10,7 +24,8 @@ import vct.result.VerificationError.UserError
 
 case object ResolveScale extends RewriterBuilder {
   override def key: String = "scale"
-  override def desc: String = "Inline the scale operator into resource expressions."
+  override def desc: String =
+    "Inline the scale operator into resource expressions."
 
   case class WrongScale(scale: Expr[_]) extends UserError {
     override def code: String = "wrongScale"
@@ -18,14 +33,11 @@ case object ResolveScale extends RewriterBuilder {
       scale.o.messageInContext("This kind of expression cannot be scaled.")
   }
 
-  private def CheckScale(preferredName: String = "unknown"): Origin = Origin(
-    Seq(
-      PreferredName(Seq(preferredName)),
-      LabelContext("scale check"),
-    )
-  )
+  private def CheckScale(preferredName: String = "unknown"): Origin =
+    Origin(Seq(PreferredName(Seq(preferredName)), LabelContext("scale check")))
 
-  case class ScaleNegativePreconditionFailed(scale: Scale[_]) extends Blame[PreconditionFailed] {
+  case class ScaleNegativePreconditionFailed(scale: Scale[_])
+      extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       scale.blame.blame(ScaleNegative(scale))
   }
@@ -39,19 +51,25 @@ case class ResolveScale[Pre <: Generation]() extends Rewriter[Pre] {
 
     globalDeclarations.declare(withResult((result: Result[Post]) => {
       function[Post](
-      blame = PanicBlame("scale ensures nothing"),
-      contractBlame = PanicBlame("scale only requires a positive rational"),
-      args = Seq(v),
-      returnType = TRational(),
-      body = Some(v.get),
-      requires = UnitAccountedPredicate(v.get >= const(0)),
-      ensures = UnitAccountedPredicate(result >= const(0)),
-    )(CheckScale("scale"))}))
+        blame = PanicBlame("scale ensures nothing"),
+        contractBlame = PanicBlame("scale only requires a positive rational"),
+        args = Seq(v),
+        returnType = TRational(),
+        body = Some(v.get),
+        requires = UnitAccountedPredicate(v.get >= const(0)),
+        ensures = UnitAccountedPredicate(result >= const(0)),
+      )(CheckScale("scale"))
+    }))
   }
 
   def scaleValue(e: Scale[Pre]): Expr[Post] =
-    FunctionInvocation(checkScaleFunc.ref[Function[Post]], Seq(dispatch(e.scale)), Nil, Nil, Nil)(
-      NoContext(ScaleNegativePreconditionFailed(e)))(e.scale.o)
+    FunctionInvocation(
+      checkScaleFunc.ref[Function[Post]],
+      Seq(dispatch(e.scale)),
+      Nil,
+      Nil,
+      Nil,
+    )(NoContext(ScaleNegativePreconditionFailed(e)))(e.scale.o)
 
   def scale(res: Expr[Pre], amount: Expr[Post]): Expr[Post] = {
     implicit val o: Origin = res.o
@@ -60,20 +78,26 @@ case class ResolveScale[Pre <: Generation]() extends Rewriter[Pre] {
 
       case e if TBool().superTypeOf(e.t) => dispatch(e)
       case Perm(loc, p) => Perm(dispatch(loc), amount * dispatch(p))
-      case Value(loc) =>
-        (amount > NoPerm()) ==> Value(dispatch(loc))
-      case AutoValue(loc) =>
-        (amount > NoPerm()) ==> AutoValue(dispatch(loc))
-      case apply: PredicateApply[Pre] => apply.rewrite(perm = amount * dispatch(apply.perm))
-      case apply: InstancePredicateApply[Pre] => apply.rewrite(perm = amount * dispatch(apply.perm))
+      case Value(loc) => (amount > NoPerm()) ==> Value(dispatch(loc))
+      case AutoValue(loc) => (amount > NoPerm()) ==> AutoValue(dispatch(loc))
+      case apply: PredicateApply[Pre] =>
+        apply.rewrite(perm = amount * dispatch(apply.perm))
+      case apply: InstancePredicateApply[Pre] =>
+        apply.rewrite(perm = amount * dispatch(apply.perm))
 
       case Star(left, right) => scale(left, amount) &* scale(right, amount)
       case Implies(cond, cons) => Implies(dispatch(cond), scale(cons, amount))
-      case Select(cond, whenTrue, whenFalse) => Select(dispatch(cond), scale(whenTrue, amount), scale(whenFalse, amount))
+      case Select(cond, whenTrue, whenFalse) =>
+        Select(
+          dispatch(cond),
+          scale(whenTrue, amount),
+          scale(whenFalse, amount),
+        )
       case s: Starall[Pre] => s.rewrite(body = scale(s.body, amount))
 
       case l: Let[Pre] => l.rewrite(main = scale(l.main, amount))
-      case InlinePattern(inner, parent, group) => InlinePattern(scale(inner, amount), parent, group)
+      case InlinePattern(inner, parent, group) =>
+        InlinePattern(scale(inner, amount), parent, group)
       case other => throw WrongScale(other)
     }
   }
@@ -81,8 +105,7 @@ case class ResolveScale[Pre <: Generation]() extends Rewriter[Pre] {
   override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] = {
     implicit val o: Origin = e.o
     e match {
-      case s: Scale[Pre] =>
-        scale(s.res, scaleValue(s))
+      case s: Scale[Pre] => scale(s.res, scaleValue(s))
       case other => rewriteDefault(other)
     }
   }
diff --git a/src/rewrite/vct/rewrite/RewriteTriggerADTFunctions.scala b/src/rewrite/vct/rewrite/RewriteTriggerADTFunctions.scala
index c3c73ab9c6..2cb6643009 100644
--- a/src/rewrite/vct/rewrite/RewriteTriggerADTFunctions.scala
+++ b/src/rewrite/vct/rewrite/RewriteTriggerADTFunctions.scala
@@ -9,28 +9,31 @@ import vct.col.util.AstBuildHelpers.VarBuildHelpers
 
 case object RewriteTriggerADTFunctions extends RewriterBuilder {
   override def key: String = "rewriteTriggerADTFunctions"
-  override def desc: String = "Rewrite adt forwarding functions in triggers to axiomatic ones."
+  override def desc: String =
+    "Rewrite adt forwarding functions in triggers to axiomatic ones."
 }
 
-case class RewriteTriggerADTFunctions[Pre <: Generation]() extends Rewriter[Pre]  {
+case class RewriteTriggerADTFunctions[Pre <: Generation]()
+    extends Rewriter[Pre] {
 
-    val inTrigger: ScopedStack[Unit] = ScopedStack()
+  val inTrigger: ScopedStack[Unit] = ScopedStack()
 
-    override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
       case f @ Forall(_, triggers, _) =>
-        f.rewrite(triggers = inTrigger.having(()) {
-          triggers.map(_.map(dispatch))
-        })
+        f.rewrite(triggers =
+          inTrigger.having(()) { triggers.map(_.map(dispatch)) }
+        )
 
       case s @ Starall(_, triggers, _) =>
-        s.rewrite(triggers = inTrigger.having(()) {
-          triggers.map(_.map(dispatch))
-        })
+        s.rewrite(triggers =
+          inTrigger.having(()) { triggers.map(_.map(dispatch)) }
+        )
 
       case e @ Exists(_, triggers, _) =>
-        e.rewrite(triggers = inTrigger.having(()) {
-          triggers.map(_.map(dispatch))
-        })
+        e.rewrite(triggers =
+          inTrigger.having(()) { triggers.map(_.map(dispatch)) }
+        )
 
       case other => rewriteDefault(other)
 
diff --git a/src/rewrite/vct/rewrite/SilverIntRatCoercion.scala b/src/rewrite/vct/rewrite/SilverIntRatCoercion.scala
index 646948ec42..4d444ed065 100644
--- a/src/rewrite/vct/rewrite/SilverIntRatCoercion.scala
+++ b/src/rewrite/vct/rewrite/SilverIntRatCoercion.scala
@@ -7,13 +7,17 @@ import vct.col.typerules.CoercingRewriter
 
 case object SilverIntRatCoercion extends RewriterBuilder {
   override def key: String = "silverIntRat"
-  override def desc: String = "Introduce an explicit node to convert integers to rationals for Silver."
+  override def desc: String =
+    "Introduce an explicit node to convert integers to rationals for Silver."
 }
 
-case class SilverIntRatCoercion[Pre <: Generation]() extends CoercingRewriter[Pre] {
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = coercion match {
-    case CoerceIntRat() =>
-      SilverIntToRat(e)
-    case other => super.applyCoercion(e, other)
-  }
-}
\ No newline at end of file
+case class SilverIntRatCoercion[Pre <: Generation]()
+    extends CoercingRewriter[Pre] {
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    coercion match {
+      case CoerceIntRat() => SilverIntToRat(e)
+      case other => super.applyCoercion(e, other)
+    }
+}
diff --git a/src/rewrite/vct/rewrite/SimplifyNestedQuantifiers.scala b/src/rewrite/vct/rewrite/SimplifyNestedQuantifiers.scala
index e47302ecc4..79c91404df 100644
--- a/src/rewrite/vct/rewrite/SimplifyNestedQuantifiers.scala
+++ b/src/rewrite/vct/rewrite/SimplifyNestedQuantifiers.scala
@@ -4,7 +4,15 @@ import com.typesafe.scalalogging.LazyLogging
 import vct.col.ast._
 import vct.col.ast.util.{AnnotationVariableInfoGetter, ExpressionEqualityCheck}
 import vct.col.rewrite.util.Comparison
-import vct.col.origin.{ArrayInsufficientPermission, DiagnosticOrigin, LabelContext, Origin, PanicBlame, PointerBounds, PreferredName}
+import vct.col.origin.{
+  ArrayInsufficientPermission,
+  DiagnosticOrigin,
+  LabelContext,
+  Origin,
+  PanicBlame,
+  PointerBounds,
+  PreferredName,
+}
 import vct.col.ref.Ref
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 import vct.col.util.AstBuildHelpers._
@@ -15,39 +23,33 @@ import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
 import scala.annotation.nowarn
 
-/**
-  * This rewrite pass simplifies expressions of roughly this form:
-  *   forall(i,j: Int . 0 <= i < i_max && 0 <= j < j_max;  xs[a*(i_max*j + i) + b])
-  * and collapses it into a single forall:
-  *   forall(k: Int. b <= k <= i_max*j_max*a + b && k % a == 0; xs[k])
-  *
-  * We also check on if a quantifier takes just a single value. E.g.
-  *   forall(i,j: Int; i == 5 && i < n && i <= j && j < 5; xs[j+i]) ====> 5 < n ==> forall(int j; 0 <= j < 5; xs[j])
+/** This rewrite pass simplifies expressions of roughly this form: forall(i,j:
+  * Int . 0 <= i < i_max && 0 <= j < j_max; xs[a*(i_max*j + i) + b]) and
+  * collapses it into a single forall: forall(k: Int. b <= k <= i_max*j_max*a +
+  * b && k % a == 0; xs[k])
   *
-  * and if a quantifier isn't in the "body" of the forall. E.g.
-  *   forall(i,j: Int. 1 <= i && i< n && 0 < j; xs[j]>0) ====> n > 1 ==> forall(j: Int; 0 < j; xs[j] >0)
+  * We also check on if a quantifier takes just a single value. E.g. forall(i,j:
+  * Int; i == 5 && i < n && i <= j && j < 5; xs[j+i]) ====> 5 < n ==> forall(int
+  * j; 0 <= j < 5; xs[j])
   *
+  * and if a quantifier isn't in the "body" of the forall. E.g. forall(i,j: Int.
+  * 1 <= i && i< n && 0 < j; xs[j]>0) ====> n > 1 ==> forall(j: Int; 0 < j;
+  * xs[j] >0)
   */
 case object SimplifyNestedQuantifiers extends RewriterBuilder {
   override def key: String = "simplifyNestedQuantifiers"
   override def desc: String = "Simplify nested quantifiers."
 }
 
-case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging {
+case class SimplifyNestedQuantifiers[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
 
   val SimplifyNestedQuantifiersOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("unknown")),
-      LabelContext("simplification"),
-    )
+    Seq(PreferredName(Seq("unknown")), LabelContext("simplification"))
   )
 
-  private def BinderOrigin(name: String): Origin = Origin(
-    Seq(
-      PreferredName(Seq(name)),
-      LabelContext("simplification"),
-    )
-  )
+  private def BinderOrigin(name: String): Origin =
+    Origin(Seq(PreferredName(Seq(name)), LabelContext("simplification")))
 
   private implicit val o: Origin = SimplifyNestedQuantifiersOrigin
 
@@ -58,9 +60,17 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
   override def dispatch(e: Expr[Pre]): Expr[Post] = {
     e match {
       case e: Forall[Pre] =>
-        mapUnfoldedStar(e.body, (b: Expr[Pre]) => rewriteBinder(Forall(e.bindings, e.triggers, b)(e.o)))
+        mapUnfoldedStar(
+          e.body,
+          (b: Expr[Pre]) =>
+            rewriteBinder(Forall(e.bindings, e.triggers, b)(e.o)),
+        )
       case e: Starall[Pre] =>
-        mapUnfoldedStar(e.body, (b: Expr[Pre]) => rewriteBinder(Starall(e.bindings, e.triggers, b)(e.blame)(e.o)))
+        mapUnfoldedStar(
+          e.body,
+          (b: Expr[Pre]) =>
+            rewriteBinder(Starall(e.bindings, e.triggers, b)(e.blame)(e.o)),
+        )
       case other => other.rewriteDefault()
     }
   }
@@ -70,31 +80,45 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
       case None =>
         val res = e.rewriteDefault()
         res match {
-          case Starall(_, Nil, body) if !body.exists { case InlinePattern(_, _, _) | InLinePatternLocation(_, _) => true} =>
-            val trigger = e.o.inlineContext(false).map(_.last).getOrElse("unknown context")
-            logger.warn(f"The binder `${e.o.shortPositionText}`:`${trigger} contains no triggers`")
-          case Forall(_, Nil, body) if !body.exists { case InlinePattern(_, _, _) | InLinePatternLocation(_, _) => true } =>
-            val trigger = e.o.inlineContext(false).map(_.last).getOrElse("unknown context")
-            logger.warn(f"The binder `${e.o.shortPositionText}`:`${trigger} contains no triggers`")
+          case Starall(_, Nil, body) if !body.exists {
+                case InlinePattern(_, _, _) | InLinePatternLocation(_, _) =>
+                  true
+              } =>
+            val trigger = e.o.inlineContext(false).map(_.last)
+              .getOrElse("unknown context")
+            logger.warn(
+              f"The binder `${e.o.shortPositionText}`:`${trigger} contains no triggers`"
+            )
+          case Forall(_, Nil, body) if !body.exists {
+                case InlinePattern(_, _, _) | InLinePatternLocation(_, _) =>
+                  true
+              } =>
+            val trigger = e.o.inlineContext(false).map(_.last)
+              .getOrElse("unknown context")
+            logger.warn(
+              f"The binder `${e.o.shortPositionText}`:`${trigger} contains no triggers`"
+            )
           case _ =>
         }
         res
-      case Some(newE)
-      => newE
+      case Some(newE) => newE
     }
   }
 
   override def dispatch(stat: Statement[Pre]): Statement[Post] = {
-    val e = stat match {
-      case Exhale(e) => e
-      case Inhale(e) => e
-      case proof: FramedProof[Pre] => return checkFramedProof(proof)
-      case _ => return stat.rewriteDefault()
-    }
+    val e =
+      stat match {
+        case Exhale(e) => e
+        case Inhale(e) => e
+        case proof: FramedProof[Pre] => return checkFramedProof(proof)
+        case _ => return stat.rewriteDefault()
+      }
 
     val conditions = getConditions(e)
     val infoGetter = new AnnotationVariableInfoGetter[Pre]()
-    equalityChecker = ExpressionEqualityCheck(Some(infoGetter.getInfo(conditions)))
+    equalityChecker = ExpressionEqualityCheck(
+      Some(infoGetter.getInfo(conditions))
+    )
     val result = stat.rewriteDefault()
     equalityChecker = ExpressionEqualityCheck()
     result
@@ -103,7 +127,9 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
   def checkFramedProof(proof: FramedProof[Pre]): Statement[Post] = {
     val conditions_pre = getConditions(proof.pre)
     val infoGetter_pre = new AnnotationVariableInfoGetter[Pre]()
-    equalityChecker = ExpressionEqualityCheck(Some(infoGetter_pre.getInfo(conditions_pre)))
+    equalityChecker = ExpressionEqualityCheck(
+      Some(infoGetter_pre.getInfo(conditions_pre))
+    )
     val pre = dispatch(proof.pre)
 
     val conditions_post = getConditions(proof.post)
@@ -116,26 +142,32 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
     FramedProof[Post](pre, body, post)(proof.blame)(proof.o)
   }
 
-  def getConditions(preds: AccountedPredicate[Pre]): Seq[Expr[Pre]] = preds match {
-    case UnitAccountedPredicate(pred) => getConditions(pred)
-    case SplitAccountedPredicate(left, right) => getConditions(left) ++ getConditions(right)
-  }
+  def getConditions(preds: AccountedPredicate[Pre]): Seq[Expr[Pre]] =
+    preds match {
+      case UnitAccountedPredicate(pred) => getConditions(pred)
+      case SplitAccountedPredicate(left, right) =>
+        getConditions(left) ++ getConditions(right)
+    }
 
-  def getConditions(e: Expr[Pre]): Seq[Expr[Pre]] = e match {
-    case And(left, right) => getConditions(left) ++ getConditions(right)
-    case Star(left, right) => getConditions(left) ++ getConditions(right)
-    case other => Seq[Expr[Pre]](other)
-  }
+  def getConditions(e: Expr[Pre]): Seq[Expr[Pre]] =
+    e match {
+      case And(left, right) => getConditions(left) ++ getConditions(right)
+      case Star(left, right) => getConditions(left) ++ getConditions(right)
+      case other => Seq[Expr[Pre]](other)
+    }
 
   override def dispatch(loopContract: LoopContract[Pre]): LoopContract[Post] = {
-    val loopInvariant: LoopInvariant[Pre] = loopContract match {
-      case l: LoopInvariant[Pre] => l
-      case _ => return dispatch(loopContract)
-    }
+    val loopInvariant: LoopInvariant[Pre] =
+      loopContract match {
+        case l: LoopInvariant[Pre] => l
+        case _ => return dispatch(loopContract)
+      }
 
     val infoGetter = new AnnotationVariableInfoGetter[Pre]()
     val conditions = getConditions(loopInvariant.invariant)
-    equalityChecker = ExpressionEqualityCheck(Some(infoGetter.getInfo(conditions)))
+    equalityChecker = ExpressionEqualityCheck(
+      Some(infoGetter.getInfo(conditions))
+    )
     val invariant = dispatch(loopInvariant.invariant)
     equalityChecker = ExpressionEqualityCheck()
     val decreases = loopInvariant.decreases.map(element => dispatch(element))
@@ -143,39 +175,63 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
     LoopInvariant(invariant, decreases)(loopInvariant.blame)(loopInvariant.o)
   }
 
-  override def dispatch(contract: ApplicableContract[Pre]): ApplicableContract[Post] = {
+  override def dispatch(
+      contract: ApplicableContract[Pre]
+  ): ApplicableContract[Post] = {
     val infoGetter = new AnnotationVariableInfoGetter[Pre]()
     val reqConditions = getConditions(contract.requires)
     val contextConditions = getConditions(contract.contextEverywhere)
     val ensureConditions = getConditions(contract.ensures)
-    equalityChecker = ExpressionEqualityCheck(Some(infoGetter.getInfo(reqConditions ++ contextConditions)))
+    equalityChecker = ExpressionEqualityCheck(
+      Some(infoGetter.getInfo(reqConditions ++ contextConditions))
+    )
     val requires = dispatch(contract.requires)
-    equalityChecker = ExpressionEqualityCheck(Some(infoGetter.getInfo(ensureConditions ++ contextConditions)))
+    equalityChecker = ExpressionEqualityCheck(
+      Some(infoGetter.getInfo(ensureConditions ++ contextConditions))
+    )
     val ensures = dispatch(contract.ensures)
-    equalityChecker = ExpressionEqualityCheck(Some(infoGetter.getInfo(contextConditions)))
+    equalityChecker = ExpressionEqualityCheck(
+      Some(infoGetter.getInfo(contextConditions))
+    )
     val contextEverywhere = dispatch(contract.contextEverywhere)
     equalityChecker = ExpressionEqualityCheck()
 
     val signals = contract.signals.map(element => dispatch(element))
-    val givenArgs = variables.collect { contract.givenArgs.foreach(dispatch) }._1
-    val yieldsArgs = variables.collect {contract.yieldsArgs.foreach(dispatch)}._1
-    val decreases = contract.decreases.map(element => rewriter.dispatch(element))
-
-    ApplicableContract(requires, ensures, contextEverywhere, signals, givenArgs, yieldsArgs, decreases
-      )(contract.blame)(contract.o)
+    val givenArgs =
+      variables.collect { contract.givenArgs.foreach(dispatch) }._1
+    val yieldsArgs =
+      variables.collect { contract.yieldsArgs.foreach(dispatch) }._1
+    val decreases = contract.decreases
+      .map(element => rewriter.dispatch(element))
+
+    ApplicableContract(
+      requires,
+      ensures,
+      contextEverywhere,
+      signals,
+      givenArgs,
+      yieldsArgs,
+      decreases,
+    )(contract.blame)(contract.o)
   }
 
   def rewriteLinearArray(e: Binder[Pre]): Option[Expr[Post]] = {
-    val originalBody = e match {
-      case Forall(_, _, body) => body
-      case Starall(_, _, body) => body
-      case _ => return None
-    }
+    val originalBody =
+      e match {
+        case Forall(_, _, body) => body
+        case Starall(_, _, body) => body
+        case _ => return None
+      }
 
-    if (e.bindings.exists(_.t != TInt())) return None
+    if (e.bindings.exists(_.t != TInt()))
+      return None
 
     // PB: do not attempt to reshape quantifiers that already have patterns
-    if (originalBody.exists { case InlinePattern(_, _, _) | InLinePatternLocation(_, _) => true }) {
+    if (
+      originalBody.exists {
+        case InlinePattern(_, _, _) | InLinePatternLocation(_, _) => true
+      }
+    ) {
       logger.debug(s"Not rewriting $e because it contains patterns")
       return None
     }
@@ -186,31 +242,43 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
     quantifierData.checkIndependentVariables()
 
     // Check if we have valid bounds to rewrite, otherwise we stop
-    if(!quantifierData.checkBounds() || quantifierData.checkOtherBinders()) return quantifierData.result()
+    if (!quantifierData.checkBounds() || quantifierData.checkOtherBinders())
+      return quantifierData.result()
 
     quantifierData.lookForLinearAccesses()
   }
 
-  class RewriteQuantifierData(val bindings: mutable.Set[Variable[Pre]],
-                              var lowerBounds: mutable.Map[Variable[Pre], ArrayBuffer[Expr[Pre]]],
-                              var upperBounds: mutable.Map[Variable[Pre], ArrayBuffer[Expr[Pre]]],
-                              var upperExclusiveBounds: mutable.Map[Variable[Pre], ArrayBuffer[Expr[Pre]]],
-                              var independentConditions: ArrayBuffer[Expr[Pre]],
-                              val dependentConditions: ArrayBuffer[Expr[Pre]],
-                              var body: Expr[Pre],
-                              val originalBinder: Binder[Pre],
-                              val mainRewriter: SimplifyNestedQuantifiers[Pre]
-                             ) {
-    def this(originalBody: Expr[Pre], originalBinder: Binder[Pre], rewriter: SimplifyNestedQuantifiers[Pre]) = {
-      this(originalBinder.bindings.to(mutable.Set),
-        originalBinder.bindings.map(_ -> ArrayBuffer[Expr[Pre]]()).to(mutable.Map),
-        originalBinder.bindings.map(_ -> ArrayBuffer[Expr[Pre]]()).to(mutable.Map),
-        originalBinder.bindings.map(_ -> ArrayBuffer[Expr[Pre]]()).to(mutable.Map),
+  class RewriteQuantifierData(
+      val bindings: mutable.Set[Variable[Pre]],
+      var lowerBounds: mutable.Map[Variable[Pre], ArrayBuffer[Expr[Pre]]],
+      var upperBounds: mutable.Map[Variable[Pre], ArrayBuffer[Expr[Pre]]],
+      var upperExclusiveBounds: mutable.Map[Variable[Pre], ArrayBuffer[
+        Expr[Pre]
+      ]],
+      var independentConditions: ArrayBuffer[Expr[Pre]],
+      val dependentConditions: ArrayBuffer[Expr[Pre]],
+      var body: Expr[Pre],
+      val originalBinder: Binder[Pre],
+      val mainRewriter: SimplifyNestedQuantifiers[Pre],
+  ) {
+    def this(
+        originalBody: Expr[Pre],
+        originalBinder: Binder[Pre],
+        rewriter: SimplifyNestedQuantifiers[Pre],
+    ) = {
+      this(
+        originalBinder.bindings.to(mutable.Set),
+        originalBinder.bindings.map(_ -> ArrayBuffer[Expr[Pre]]())
+          .to(mutable.Map),
+        originalBinder.bindings.map(_ -> ArrayBuffer[Expr[Pre]]())
+          .to(mutable.Map),
+        originalBinder.bindings.map(_ -> ArrayBuffer[Expr[Pre]]())
+          .to(mutable.Map),
         ArrayBuffer[Expr[Pre]](),
         ArrayBuffer[Expr[Pre]](),
         originalBody,
         originalBinder,
-        rewriter
+        rewriter,
       )
     }
 
@@ -220,7 +288,8 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
     def setData(): Unit = {
       val allConditions = unfoldBody(Seq())
       // Split bounds that are independent of any binding variables
-      val (newIndependentConditions, potentialBounds) = allConditions.partition(indepOf(bindings, _))
+      val (newIndependentConditions, potentialBounds) = allConditions
+        .partition(indepOf(bindings, _))
       independentConditions.addAll(newIndependentConditions)
       getBounds(potentialBounds)
     }
@@ -228,17 +297,18 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
     def unfoldBody(prevConditions: Seq[Expr[Pre]]): Seq[Expr[Pre]] = {
       val (allConditions, mainBody) = unfoldImplies[Pre](body)
       val newConditions = prevConditions ++ allConditions
-      val (newVars, secondBody) = mainBody match {
-        case Forall(newVars, _, secondBody) => (newVars, secondBody)
-        case Starall(newVars, _, secondBody) => (newVars, secondBody)
-        case _ =>
-          body = mainBody
-          return newConditions
-      }
+      val (newVars, secondBody) =
+        mainBody match {
+          case Forall(newVars, _, secondBody) => (newVars, secondBody)
+          case Starall(newVars, _, secondBody) => (newVars, secondBody)
+          case _ =>
+            body = mainBody
+            return newConditions
+        }
 
       bindings.addAll(newVars)
 
-      for(v <- newVars){
+      for (v <- newVars) {
         lowerBounds(v) = ArrayBuffer[Expr[Pre]]()
         upperBounds(v) = ArrayBuffer[Expr[Pre]]()
         upperExclusiveBounds(v) = ArrayBuffer[Expr[Pre]]()
@@ -252,69 +322,78 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
     def containsOtherBinders(e: Expr[Pre]): Boolean = {
       e match {
         case _: Binder[Pre] => return true
-        case _ => e.transSubnodes.collectFirst { case e: Binder[Pre] => return true }
+        case _ =>
+          e.transSubnodes.collectFirst { case e: Binder[Pre] => return true }
       }
       false
     }
 
-    /**
-      * Process the potential bounds to be either a bound or just a dependent condition.
-      * @param potentialBounds Bounds to be processed.
+    /** Process the potential bounds to be either a bound or just a dependent
+      * condition.
+      * @param potentialBounds
+      *   Bounds to be processed.
       */
     def getBounds(potentialBounds: Iterable[Expr[Pre]]): Unit = {
-      for (bound <- potentialBounds) {
-        getSingleBound(bound)
-      }
+      for (bound <- potentialBounds) { getSingleBound(bound) }
     }
 
-    def getSingleBound(bound: Expr[Pre]): Unit = Comparison.of(bound) match {
-      // First try to match a simple comparison
-      case Some((_, Comparison.NEQ, _)) => dependentConditions.addOne(bound)
-      case Some((left, comp, right)) =>
-        if (indepOf(bindings, right)) {
-          // x >|>=|==|<=|< 5
-          left match {
-            case Local(Ref(v)) if bindings.contains(v) => addSingleBound(v, right, comp)
-            case Plus(ll, rr) if indepOf(bindings, rr) => getSingleBound(comp.make(ll, right - rr))
-            case Plus(ll, rr) if indepOf(bindings, ll) => getSingleBound(comp.make(rr, right - ll))
-            case Minus(ll, rr) if indepOf(bindings, rr) => getSingleBound(comp.make(ll, right + rr))
+    def getSingleBound(bound: Expr[Pre]): Unit =
+      Comparison.of(bound) match {
+        // First try to match a simple comparison
+        case Some((_, Comparison.NEQ, _)) => dependentConditions.addOne(bound)
+        case Some((left, comp, right)) =>
+          if (indepOf(bindings, right)) {
+            // x >|>=|==|<=|< 5
+            left match {
+              case Local(Ref(v)) if bindings.contains(v) =>
+                addSingleBound(v, right, comp)
+              case Plus(ll, rr) if indepOf(bindings, rr) =>
+                getSingleBound(comp.make(ll, right - rr))
+              case Plus(ll, rr) if indepOf(bindings, ll) =>
+                getSingleBound(comp.make(rr, right - ll))
+              case Minus(ll, rr) if indepOf(bindings, rr) =>
+                getSingleBound(comp.make(ll, right + rr))
+              case _ => dependentConditions.addOne(bound)
+            }
+          } else if (indepOf(bindings, left)) {
+            getSingleBound(comp.flip.make(right, left))
+          } else { dependentConditions.addOne(bound) }
+        case None =>
+          bound match {
+            // If we do not have a simple comparison, we support one special case: i \in {a..b}
+            case SetMember(Local(Ref(v)), RangeSet(from, to))
+                if bindings.contains(v) && indepOf(bindings, from) &&
+                  indepOf(bindings, to) =>
+              addSingleBound(v, from, Comparison.GREATER_EQ)
+              addSingleBound(v, to, Comparison.LESS)
+            case SetMember(left, RangeSet(from, to)) =>
+              getSingleBound(Comparison.GREATER_EQ.make(left, from))
+              getSingleBound(Comparison.LESS.make(left, to))
+            case SeqMember(Local(Ref(v)), Range(from, to))
+                if bindings.contains(v) && indepOf(bindings, from) &&
+                  indepOf(bindings, to) =>
+              addSingleBound(v, from, Comparison.GREATER_EQ)
+              addSingleBound(v, to, Comparison.LESS)
+            case SeqMember(left, Range(from, to)) =>
+              getSingleBound(Comparison.GREATER_EQ.make(left, from))
+              getSingleBound(Comparison.LESS.make(left, to))
             case _ => dependentConditions.addOne(bound)
           }
-        } else if (indepOf(bindings, left)) {
-          getSingleBound(comp.flip.make(right, left))
-        } else {
-          dependentConditions.addOne(bound)
-        }
-      case None => bound match {
-        // If we do not have a simple comparison, we support one special case: i \in {a..b}
-        case SetMember(Local(Ref(v)), RangeSet(from, to))
-          if bindings.contains(v) && indepOf(bindings, from) && indepOf(bindings, to) =>
-          addSingleBound(v, from, Comparison.GREATER_EQ)
-          addSingleBound(v, to, Comparison.LESS)
-        case SetMember(left, RangeSet(from, to)) =>
-          getSingleBound(Comparison.GREATER_EQ.make(left, from))
-          getSingleBound(Comparison.LESS.make(left, to))
-        case SeqMember(Local(Ref(v)), Range(from, to))
-          if bindings.contains(v) && indepOf(bindings, from) && indepOf(bindings, to) =>
-          addSingleBound(v, from, Comparison.GREATER_EQ)
-          addSingleBound(v, to, Comparison.LESS)
-        case SeqMember(left, Range(from, to)) =>
-          getSingleBound(Comparison.GREATER_EQ.make(left, from))
-          getSingleBound(Comparison.LESS.make(left, to))
-        case _ => dependentConditions.addOne(bound)
       }
-    }
 
-    /**
-      * Add a bound like v >= right.
+    /** Add a bound like v >= right.
       */
     @nowarn("msg=xhaust")
-    def addSingleBound(v: Variable[Pre], right: Expr[Pre], comp: Comparison): Unit = {
+    def addSingleBound(
+        v: Variable[Pre],
+        right: Expr[Pre],
+        comp: Comparison,
+    ): Unit = {
       right match {
         // Simplify rules from simplify.pvl come up with these kind of rules (specialize_range_right_i),
         // but we want the original bounds
         case Select(Less(e1, e2), e3, e4) =>
-          if(e1 == e3 && e2 == e4 || e1 == e4 && e2 == e3){
+          if (e1 == e3 && e2 == e4 || e1 == e4 && e2 == e3) {
             addSingleBound(v, e1, comp)
             addSingleBound(v, e2, comp)
             return
@@ -343,27 +422,31 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
       }
     }
 
-    def testPairs[A](xs: Iterable[A], ys: Iterable[A], f: (A,A) => Boolean): Boolean = {
-      for(x <- xs)
-        for(y<-ys)
-          if(f(x,y)) return true
+    def testPairs[A](
+        xs: Iterable[A],
+        ys: Iterable[A],
+        f: (A, A) => Boolean,
+    ): Boolean = {
+      for (x <- xs)
+        for (y <- ys)
+          if (f(x, y))
+            return true
       false
     }
 
-    /** We check if there now any binding variables which resolve to just a single value, which happens if it
-      * has equal lower and upper bounds.
-      * E.g. forall(int i,j; i == 0 && i <= j && j < 5; xs[j+i]) ==> forall(int j; 0 <= j < 5; xs[j])
-      * We just replace each reference to that value, and check our bounds again.
-      * We don't worry if a we have something like x == 5 && x < 0, since that will resolve to 5 < 0, which equally
-      * does not work.
-      * */
+    /** We check if there now any binding variables which resolve to just a
+      * single value, which happens if it has equal lower and upper bounds. E.g.
+      * forall(int i,j; i == 0 && i <= j && j < 5; xs[j+i]) ==> forall(int j; 0
+      * <= j < 5; xs[j]) We just replace each reference to that value, and check
+      * our bounds again. We don't worry if a we have something like x == 5 && x
+      * < 0, since that will resolve to 5 < 0, which equally does not work.
+      */
     def checkSingleValueVariables(): Unit = {
       for (name <- bindings) {
-        val equalBounds =
-          lowerBounds(name).
-            flatMap(x => upperBounds(name)
-              .map(y => (x, y)))
-            .collectFirst { case (x, y) if equalityChecker.equalExpressions(x, y) => x}
+        val equalBounds = lowerBounds(name)
+          .flatMap(x => upperBounds(name).map(y => (x, y))).collectFirst {
+            case (x, y) if equalityChecker.equalExpressions(x, y) => x
+          }
         if (equalBounds.isDefined) {
           // We will put out a new quantifier
           newBinder = true
@@ -380,15 +463,20 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
           val oldDependentBounds = dependentConditions.map(replacer)
           dependentConditions.clear()
 
-          val (new_independentConditions, potentialBounds) = oldDependentBounds.partition(indepOf(bindings, _))
+          val (new_independentConditions, potentialBounds) = oldDependentBounds
+            .partition(indepOf(bindings, _))
           independentConditions.addAll(new_independentConditions)
           getBounds(potentialBounds)
 
           // Bounds for the name, have now become independent conditions
           lowerBounds(name).foreach(lb =>
-            if (lb != newValue) independentConditions.addOne(LessEq(lb, newValue)))
+            if (lb != newValue)
+              independentConditions.addOne(LessEq(lb, newValue))
+          )
           upperBounds(name).foreach(ub =>
-            if (ub != newValue) independentConditions.addOne(LessEq(newValue, ub)))
+            if (ub != newValue)
+              independentConditions.addOne(LessEq(newValue, ub))
+          )
 
           lowerBounds.remove(name)
           upperBounds.remove(name)
@@ -406,7 +494,10 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
       for (name <- bindings) {
         if (indepOf(mutable.Set(name), body)) {
           var independent = true
-          dependentConditions.foreach(s => if (!indepOf(mutable.Set(name), s)) independent = false)
+          dependentConditions.foreach(s =>
+            if (!indepOf(mutable.Set(name), s))
+              independent = false
+          )
           if (independent) {
             // We can freely remove this named variable
             val maxBound = extremeValue(name, maximizing = true)
@@ -424,10 +515,14 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
                 // (forall i; a <= i <= b; ...Perm(ar, x)...) ====> b>=a ==> ...Perm(ar, x*(b-a+1))...
                 independentConditions.addOne(GreaterEq(maxBound, minBound))
 
-                if(body.t == TResource()){
-                  body = Scale(Plus(one, Minus(maxBound, minBound)), body)(
-                    PanicBlame("Error in SimplifyNestedQuantifiers class, implication should make sure scale is" +
-                      " never negative when accessed."))
+                if (body.t == TResource()) {
+                  body =
+                    Scale(Plus(one, Minus(maxBound, minBound)), body)(
+                      PanicBlame(
+                        "Error in SimplifyNestedQuantifiers class, implication should make sure scale is" +
+                          " never negative when accessed."
+                      )
+                    )
                 }
               case _ =>
             }
@@ -436,7 +531,10 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
       }
     }
 
-    def extremeValue(name: Variable[Pre], maximizing: Boolean): Option[Expr[Pre]] = {
+    def extremeValue(
+        name: Variable[Pre],
+        maximizing: Boolean,
+    ): Option[Expr[Pre]] = {
       if (maximizing && upperBounds(name).nonEmpty)
         Some(extremes(upperBounds(name).toSeq, maximizing))
       else if (!maximizing && lowerBounds(name).nonEmpty)
@@ -450,7 +548,11 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
         case expr +: Nil => expr
         case left +: right +: tail =>
           Select(
-            condition = if(maximizing) left > right else left < right,
+            condition =
+              if (maximizing)
+                left > right
+              else
+                left < right,
             whenTrue = extremes(left +: tail, maximizing),
             whenFalse = extremes(right +: tail, maximizing),
           )
@@ -460,46 +562,70 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
     // This allows only forall's to be rewritten, if they have at least one lower and upper bound
     def checkBounds(): Boolean = {
       for (name <- bindings) {
-        //Exit when notAt least one upper && lower bound
-        if (lowerBounds.getOrElse(name, ArrayBuffer()).isEmpty || upperBounds.getOrElse(name, ArrayBuffer()).isEmpty) {
-          return false
-        }
+        // Exit when notAt least one upper && lower bound
+        if (
+          lowerBounds.getOrElse(name, ArrayBuffer()).isEmpty ||
+          upperBounds.getOrElse(name, ArrayBuffer()).isEmpty
+        ) { return false }
       }
       true
     }
 
     // Returns true if contains other binders, which we won't rewrite
     def checkOtherBinders(): Boolean = {
-      independentConditions.foldLeft(containsOtherBinders(body))(_ || containsOtherBinders(_))
+      independentConditions
+        .foldLeft(containsOtherBinders(body))(_ || containsOtherBinders(_))
     }
 
-    case class ForallSubstitute(subs: Map[Variable[Pre], Expr[Post]], indexReplacement: (Expr[Pre], Expr[Post])) extends Rewriter[Pre] {
+    case class ForallSubstitute(
+        subs: Map[Variable[Pre], Expr[Post]],
+        indexReplacement: (Expr[Pre], Expr[Post]),
+    ) extends Rewriter[Pre] {
       override val allScopes = mainRewriter.allScopes
 
-      override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-        case expr if expr == indexReplacement._1  => indexReplacement._2
-        case v: Local[Pre] if subs.contains(v.ref.decl) => subs(v.ref.decl)
-        case other => other.rewriteDefault()
-      }
+      override def dispatch(e: Expr[Pre]): Expr[Post] =
+        e match {
+          case expr if expr == indexReplacement._1 => indexReplacement._2
+          case v: Local[Pre] if subs.contains(v.ref.decl) => subs(v.ref.decl)
+          case other => other.rewriteDefault()
+        }
     }
 
     def lookForLinearAccesses(): Option[Expr[Post]] = {
       val linearAccesses = new FindLinearArrayAccesses(this)
 
-      mainRewriter.variables.collect {linearAccesses.search(body)} match {
+      mainRewriter.variables.collect { linearAccesses.search(body) } match {
         case (bindings, Some(substituteForall)) =>
-          if(bindings.size != 1) throw Unreachable("Only one new variable should be declared with SimplifyNestedQuantifiers.")
-          val sub = ForallSubstitute(substituteForall.substituteOldVars, substituteForall.substituteIndex)
+          if (bindings.size != 1)
+            throw Unreachable(
+              "Only one new variable should be declared with SimplifyNestedQuantifiers."
+            )
+          val sub = ForallSubstitute(
+            substituteForall.substituteOldVars,
+            substituteForall.substituteIndex,
+          )
           val newBody = sub.dispatch(body)
-          val select = Seq(substituteForall.newBounds) ++ independentConditions.map(sub.dispatch) ++
-            dependentConditions.map(sub.dispatch)
-          val main = if (select.nonEmpty) Implies(AstBuildHelpers.foldAnd(select), newBody) else newBody
+          val select =
+            Seq(substituteForall.newBounds) ++
+              independentConditions.map(sub.dispatch) ++
+              dependentConditions.map(sub.dispatch)
+          val main =
+            if (select.nonEmpty)
+              Implies(AstBuildHelpers.foldAnd(select), newBody)
+            else
+              newBody
           @nowarn("msg=xhaust")
-          val forall: Binder[Post] = originalBinder match {
-            case _: Forall[Pre] => Forall(bindings, substituteForall.newTriggers, main)(originalBinder.o)
-            case originalBinder: Starall[Pre] =>
-              Starall(bindings, substituteForall.newTriggers, main)(originalBinder.blame)(originalBinder.o)
-          }
+          val forall: Binder[Post] =
+            originalBinder match {
+              case _: Forall[Pre] =>
+                Forall(bindings, substituteForall.newTriggers, main)(
+                  originalBinder.o
+                )
+              case originalBinder: Starall[Pre] =>
+                Starall(bindings, substituteForall.newTriggers, main)(
+                  originalBinder.blame
+                )(originalBinder.o)
+            }
           Some(forall)
         case (_, None) => result()
       }
@@ -507,151 +633,166 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
 
     def result(): Option[Expr[Post]] = {
       // If we changed something we always return a result, even if we could not rewrite further
-      val res = if(newBinder) {
-        val select = independentConditions
-        if (bindings.isEmpty) {
-          if (select.isEmpty) Some(body) else Some(Implies(AstBuildHelpers.foldAnd(select.toSeq), body))
-        } else {
-          upperExclusiveBounds.foreach {
-            case (n: Variable[Pre], upperBounds: ArrayBuffer[Expr[Pre]]) =>
-              val i: Expr[Pre] = Local(n.ref)
-              upperBounds.foreach(upperBound =>
-                select.addOne(i < upperBound)
-              )
-          }
-          lowerBounds.foreach {
-            case (n: Variable[Pre], lowerBounds: ArrayBuffer[Expr[Pre]]) =>
-              val i: Expr[Pre] = Local(n.ref)
-              lowerBounds.foreach(lowerBound =>
-                select.addOne(lowerBound <= i )
-              )
-          }
-          // PB: In general reordering conditions is not safe, because a condintion may frame the well-formedness of a
-          // subsequent expression. Heuristic: more often than not, independent conditions frame the bounds, which then
-          // frame any other dependent conditions.
-          select ++= dependentConditions
-          val newBody = if (select.nonEmpty) Implies(AstBuildHelpers.foldAnd(select.toSeq), body)
-          else body
-
-          // TODO: Should we get the old triggers? And then filter if the triggers contain variables which
-          //  are not there anymore?
-          @nowarn("msg=xhaust")
-          val forall: Expr[Pre] = originalBinder match{
-            case _: Forall[Pre] => Forall(bindings.toSeq, Seq(), newBody)(originalBinder.o)
-            case e: Starall[Pre] => Starall(bindings.toSeq, Seq(), newBody)(e.blame)(originalBinder.o)
+      val res =
+        if (newBinder) {
+          val select = independentConditions
+          if (bindings.isEmpty) {
+            if (select.isEmpty)
+              Some(body)
+            else
+              Some(Implies(AstBuildHelpers.foldAnd(select.toSeq), body))
+          } else {
+            upperExclusiveBounds.foreach {
+              case (n: Variable[Pre], upperBounds: ArrayBuffer[Expr[Pre]]) =>
+                val i: Expr[Pre] = Local(n.ref)
+                upperBounds.foreach(upperBound => select.addOne(i < upperBound))
+            }
+            lowerBounds.foreach {
+              case (n: Variable[Pre], lowerBounds: ArrayBuffer[Expr[Pre]]) =>
+                val i: Expr[Pre] = Local(n.ref)
+                lowerBounds
+                  .foreach(lowerBound => select.addOne(lowerBound <= i))
+            }
+            // PB: In general reordering conditions is not safe, because a condintion may frame the well-formedness of a
+            // subsequent expression. Heuristic: more often than not, independent conditions frame the bounds, which then
+            // frame any other dependent conditions.
+            select ++= dependentConditions
+            val newBody =
+              if (select.nonEmpty)
+                Implies(AstBuildHelpers.foldAnd(select.toSeq), body)
+              else
+                body
+
+            // TODO: Should we get the old triggers? And then filter if the triggers contain variables which
+            //  are not there anymore?
+            @nowarn("msg=xhaust")
+            val forall: Expr[Pre] =
+              originalBinder match {
+                case _: Forall[Pre] =>
+                  Forall(bindings.toSeq, Seq(), newBody)(originalBinder.o)
+                case e: Starall[Pre] =>
+                  Starall(bindings.toSeq, Seq(), newBody)(e.blame)(
+                    originalBinder.o
+                  )
+              }
+            Some(forall)
           }
-          Some(forall)
-        }
-      } else {
-        None
-      }
+        } else { None }
 
       res.map(mainRewriter.dispatch)
     }
   }
 
   def indepOf[G](bindings: mutable.Set[Variable[G]], e: Expr[G]): Boolean =
-    e.transSubnodes.collectFirst { case Local(ref) if bindings.contains(ref.decl) => () }.isEmpty
+    e.transSubnodes.collectFirst {
+      case Local(ref) if bindings.contains(ref.decl) => ()
+    }.isEmpty
 
   sealed trait Subscript[G] {
     val index: Expr[G]
     val subnodes: Seq[Node[G]]
   }
-  case class Array[G](index: Expr[G], subnodes: Seq[Node[G]], array: Expr[G]) extends Subscript[G]
+  case class Array[G](index: Expr[G], subnodes: Seq[Node[G]], array: Expr[G])
+      extends Subscript[G]
 
-  case class Pointer[G](index: Expr[G], subnodes: Seq[Node[G]], array: Expr[G]) extends Subscript[G]
+  case class Pointer[G](index: Expr[G], subnodes: Seq[Node[G]], array: Expr[G])
+      extends Subscript[G]
 
-  case class Sequence[G](index: Expr[G], subnodes: Seq[Node[G]], array: Expr[G]) extends Subscript[G]
+  case class Sequence[G](index: Expr[G], subnodes: Seq[Node[G]], array: Expr[G])
+      extends Subscript[G]
 
-    class FindLinearArrayAccesses(quantifierData: RewriteQuantifierData){
+  class FindLinearArrayAccesses(quantifierData: RewriteQuantifierData) {
 
-      // Search for linear array expressions
-      def search(e: Node[Pre]): Option[SubstituteForall] = {
-        e match {
-          case e @ ArrayLocation(_, _) =>
-            testSubscript(Array(e.subscript, e.subnodes, e.array))
-          case e @ ArraySubscript(_, _)  =>
-            testSubscript(Array(e.index, e.subnodes, e.arr))
-          case e@SeqSubscript(_, _) =>
-            testSubscript(Sequence(e.index, e.subnodes, e.seq))
-          case e @ PointerSubscript(_, _)  =>
-            testSubscript(Pointer(e.index, e.subnodes, e.pointer))
-          case e @ PointerAdd(_, _) =>
-            testSubscript(Pointer(e.offset, e.subnodes, e.pointer))
-          case _ => e.subnodes.to(LazyList).map(search).collectFirst{case Some(sub) => sub}
-        }
+    // Search for linear array expressions
+    def search(e: Node[Pre]): Option[SubstituteForall] = {
+      e match {
+        case e @ ArrayLocation(_, _) =>
+          testSubscript(Array(e.subscript, e.subnodes, e.array))
+        case e @ ArraySubscript(_, _) =>
+          testSubscript(Array(e.index, e.subnodes, e.arr))
+        case e @ SeqSubscript(_, _) =>
+          testSubscript(Sequence(e.index, e.subnodes, e.seq))
+        case e @ PointerSubscript(_, _) =>
+          testSubscript(Pointer(e.index, e.subnodes, e.pointer))
+        case e @ PointerAdd(_, _) =>
+          testSubscript(Pointer(e.offset, e.subnodes, e.pointer))
+        case _ =>
+          e.subnodes.to(LazyList).map(search).collectFirst { case Some(sub) =>
+            sub
+          }
       }
+    }
 
-      def testSubscript(e: Subscript[Pre]): Option[SubstituteForall] = {
-        if (indepOf(quantifierData.bindings, e.index)) {
-          return None
-        }
-        linearExpression(e) match {
-          case Some(substituteForall) => Some(substituteForall)
-          case None => e.subnodes.to(LazyList).map(search).collectFirst{case Some(sub) => sub}
-        }
+    def testSubscript(e: Subscript[Pre]): Option[SubstituteForall] = {
+      if (indepOf(quantifierData.bindings, e.index)) { return None }
+      linearExpression(e) match {
+        case Some(substituteForall) => Some(substituteForall)
+        case None =>
+          e.subnodes.to(LazyList).map(search).collectFirst { case Some(sub) =>
+            sub
+          }
       }
+    }
 
-      def linearExpression(e: Subscript[Pre]): Option[SubstituteForall] = {
-        val pot = new PotentialLinearExpressions(e)
-        pot.visit(e.index)
-        pot.canRewrite()
-      }
+    def linearExpression(e: Subscript[Pre]): Option[SubstituteForall] = {
+      val pot = new PotentialLinearExpressions(e)
+      pot.visit(e.index)
+      pot.canRewrite()
+    }
 
-      class PotentialLinearExpressions(val arrayIndex: Subscript[Pre]){
-        val linearExpressions: mutable.Map[Variable[Pre], Expr[Pre]] = mutable.Map()
-        var constantExpression: Option[Expr[Pre]] = None
-        var isLinear: Boolean  = true
-        var currentMultiplier: Option[Expr[Pre]] = None
-
-        def visit(e: Expr[Pre]): Unit = {
-          e match{
-            case Plus(left, right) =>
-              // if the first is constant, the second argument cannot be
-              if (isConstant(left)) {
-                addToConstant(left)
-                visit(right)
-              } else if (isConstant(right)) {
-                addToConstant(right)
-                visit(left)
-              } else { // Both arguments contain linear information
-                visit(left)
-                visit(right)
-              }
-            case Minus(left, right) =>
-              // if the first is constant, the second argument cannot be
-              if (isConstant(left)) {
-                addToConstant(left)
-                val oldMultiplier = currentMultiplier
-                multiplyMultiplier(IntegerValue(-1))
-                visit(right)
-                currentMultiplier = oldMultiplier
-              } else if (isConstant(right)) {
-                addToConstant(right, isPlus=false)
-                visit(left)
-              } else { // Both arguments contain linear information
-                visit(left)
-                val oldMultiplier = currentMultiplier
-                multiplyMultiplier(IntegerValue(-1))
-                visit(right)
-                currentMultiplier = oldMultiplier
-              }
-            case Mult(left, right) =>
-              if (isConstant(left)) {
-                val oldMultiplier = currentMultiplier
-                multiplyMultiplier(left)
-                visit(right)
-                currentMultiplier = oldMultiplier
-              } else if (isConstant(right)) {
-                val oldMultiplier = currentMultiplier
-                multiplyMultiplier(right)
-                visit(left)
-                currentMultiplier = oldMultiplier
-              } else {
-                isLinear = false
-              }
-            // TODO: Check if division is right conceptually with an example. Take special care to think about
-            //  the order of division
+    class PotentialLinearExpressions(val arrayIndex: Subscript[Pre]) {
+      val linearExpressions: mutable.Map[Variable[Pre], Expr[Pre]] = mutable
+        .Map()
+      var constantExpression: Option[Expr[Pre]] = None
+      var isLinear: Boolean = true
+      var currentMultiplier: Option[Expr[Pre]] = None
+
+      def visit(e: Expr[Pre]): Unit = {
+        e match {
+          case Plus(left, right) =>
+            // if the first is constant, the second argument cannot be
+            if (isConstant(left)) {
+              addToConstant(left)
+              visit(right)
+            } else if (isConstant(right)) {
+              addToConstant(right)
+              visit(left)
+            } else { // Both arguments contain linear information
+              visit(left)
+              visit(right)
+            }
+          case Minus(left, right) =>
+            // if the first is constant, the second argument cannot be
+            if (isConstant(left)) {
+              addToConstant(left)
+              val oldMultiplier = currentMultiplier
+              multiplyMultiplier(IntegerValue(-1))
+              visit(right)
+              currentMultiplier = oldMultiplier
+            } else if (isConstant(right)) {
+              addToConstant(right, isPlus = false)
+              visit(left)
+            } else { // Both arguments contain linear information
+              visit(left)
+              val oldMultiplier = currentMultiplier
+              multiplyMultiplier(IntegerValue(-1))
+              visit(right)
+              currentMultiplier = oldMultiplier
+            }
+          case Mult(left, right) =>
+            if (isConstant(left)) {
+              val oldMultiplier = currentMultiplier
+              multiplyMultiplier(left)
+              visit(right)
+              currentMultiplier = oldMultiplier
+            } else if (isConstant(right)) {
+              val oldMultiplier = currentMultiplier
+              multiplyMultiplier(right)
+              visit(left)
+              currentMultiplier = oldMultiplier
+            } else { isLinear = false }
+          // TODO: Check if division is right conceptually with an example. Take special care to think about
+          //  the order of division
 //            case e@FloorDiv(left, right) =>
 //              if (isConstant(right)){
 //                val oldMultiplier = currentMultiplier
@@ -661,365 +802,480 @@ case class SimplifyNestedQuantifiers[Pre <: Generation]() extends Rewriter[Pre]
 //              } else {
 //                isLinear = false
 //              }
-            case Local(ref) =>
-              if(quantifierData.bindings.contains(ref.decl)) {
-                linearExpressions get ref.decl match {
-                  case None => linearExpressions(ref.decl) = currentMultiplier.getOrElse(IntegerValue(1))
-                  case Some(old) => linearExpressions(ref.decl) =
-                    Plus(old, currentMultiplier.getOrElse(IntegerValue(1)))
-                }
-              } else {
-                throw Unreachable("We should not end up here, the precondition of \'FindLinearArrayAccesses\' was not uphold.")
+          case Local(ref) =>
+            if (quantifierData.bindings.contains(ref.decl)) {
+              linearExpressions get ref.decl match {
+                case None =>
+                  linearExpressions(ref.decl) = currentMultiplier
+                    .getOrElse(IntegerValue(1))
+                case Some(old) =>
+                  linearExpressions(ref.decl) = Plus(
+                    old,
+                    currentMultiplier.getOrElse(IntegerValue(1)),
+                  )
               }
-            case _ =>
-              isLinear = false
-          }
+            } else {
+              throw Unreachable(
+                "We should not end up here, the precondition of \'FindLinearArrayAccesses\' was not uphold."
+              )
+            }
+          case _ => isLinear = false
         }
+      }
 
-        def canRewrite(): Option[SubstituteForall] = {
-          if(!isLinear) {
-            return None
-          }
+      def canRewrite(): Option[SubstituteForall] = {
+        if (!isLinear) { return None }
 
-          // Checking the preconditions of the check_vars_list function
-          if(quantifierData.bindings.isEmpty) return None
-          for(v <- quantifierData.bindings){
-            if(!(linearExpressions.contains(v) &&
+        // Checking the preconditions of the check_vars_list function
+        if (quantifierData.bindings.isEmpty)
+          return None
+        for (v <- quantifierData.bindings) {
+          if (
+            !(linearExpressions.contains(v) &&
               quantifierData.upperExclusiveBounds.contains(v) &&
               quantifierData.upperExclusiveBounds(v).nonEmpty)
-            ) {
-              return None
-            }
-          }
+          ) { return None }
+        }
 
-          def sortVar(v: Variable[Pre]): Option[BigInt] = equalityChecker.isConstantInt(linearExpressions(v))
-          val vars = quantifierData.bindings.toList.sortBy(sortVar)
+        def sortVar(v: Variable[Pre]): Option[BigInt] =
+          equalityChecker.isConstantInt(linearExpressions(v))
+        val vars = quantifierData.bindings.toList.sortBy(sortVar)
 
-          val res = vars.permutations.map(check_vars_list)
-            .collectFirst({case Some(subst) => subst})
-          res
-        }
+        val res = vars.permutations.map(check_vars_list).collectFirst({
+          case Some(subst) => subst
+        })
+        res
+      }
 
-        /**
-         * This function determines if the vars in this specific order allow the forall to be rewritten to one
-         * forall.
-         *
-         * Precondition:
-         *  * At least one var in `quantifierData.bindings`
-         *  * linearExpressions has an expression for all `vars`
-         *  * quantifierData.upperExclusiveBounds has a non-empty list for all `vars`
-         *  * quantifierData.lowerBounds has a non-empty list for all `vars`
-         *
-         * We are looking for patterns:
-         *   /\_{0 <= i <= k} {xmin_i <= x_i < xmin_i + n_i} : ... ar[Sum_{0 <= i <= k} (a_i * x_i) + b] ...
-         * and we require that for i>0
-         *   a_i >= a_{i-1} * n_{i-1}
-         *   (or equivalent a_i == Prod_{0 <= j < i} {n_j} * a_0 )
-         *
-         * Further more we require that n_i > 0 and a_i > 0 (although I think a_0<0 is also valid)
-         * We can than replace the forall with
-         *   off := b + Sum_{0 <= i <= k} (xmin_i * a_i)
-         *   0 <= x_new - off < a_k * n_k && (x_new - off) % a_0 == 0 : ... ar[x_new] ...
-         * and each x_i gets replaced by
-         * base_k -> x_new - off
-         * base_{i-1} -> base_i % a_i
-         * x_i -> base_i / a_i + xmin_i
-         *
-         * And for each a_i where a_i > a_{i-1} * n_{i-1} (thus was not equal)
-         * We additionally add
-         *  base_{i-1} / a_{i-1} < n_{i-1} (derived from (x_{i-1} < xmin_i + n_{i-1})
+      /** This function determines if the vars in this specific order allow the
+        * forall to be rewritten to one forall.
+        *
+        * Precondition: * At least one var in `quantifierData.bindings` *
+        * linearExpressions has an expression for all `vars` *
+        * quantifierData.upperExclusiveBounds has a non-empty list for all
+        * `vars` * quantifierData.lowerBounds has a non-empty list for all
+        * `vars`
+        *
+        * We are looking for patterns: /\_{0 <= i <= k} {xmin_i <= x_i < xmin_i
+        * + n_i} : ... ar[Sum_{0 <= i <= k} (a_i * x_i) + b] ... and we require
+        * that for i>0 a_i >= a_{i-1} * n_{i-1} (or equivalent a_i == Prod_{0 <=
+        * j < i} {n_j} * a_0 )
+        *
+        * Further more we require that n_i > 0 and a_i > 0 (although I think
+        * a_0<0 is also valid) We can than replace the forall with off := b +
+        * Sum_{0 <= i <= k} (xmin_i * a_i) 0 <= x_new - off < a_k * n_k &&
+        * (x_new - off) % a_0 == 0 : ... ar[x_new] ... and each x_i gets
+        * replaced by base_k -> x_new - off base_{i-1} -> base_i % a_i x_i ->
+        * base_i / a_i + xmin_i
+        *
+        * And for each a_i where a_i > a_{i-1} * n_{i-1} (thus was not equal) We
+        * additionally add base_{i-1} / a_{i-1} < n_{i-1} (derived from (x_{i-1}
+        * < xmin_i + n_{i-1})
         */
 //          TODO ABOVE
-        def check_vars_list(vars: List[Variable[Pre]]): Option[SubstituteForall] = {
-          val x0 = vars.head
-          val a0 = linearExpressions(x0)
-          if(!equalityChecker.isNonZero(a0)) return None
-          // x_{i-1}
-          var xLast = x0
-          var linLast: Expr[Pre] = IntegerValue(0)
-
-          val xmins: mutable.Map[Variable[Pre], Expr[Pre]] = mutable.Map()
-          val remainingLowerBounds: mutable.Map[Variable[Pre], Set[Expr[Pre]]] = mutable.Map()
-          val remainingUpperBounds: mutable.Map[Variable[Pre], Set[Expr[Pre]]] = mutable.Map()
-
-          for(x <- vars.tail){
-            findSuitableBound(x, xLast, linLast) match {
-              case None => return None
-              case Some(FoundBound(lowerBounds, upperBounds, xmin, linExpr)) =>
-                xmins(xLast) = xmin
-                remainingLowerBounds(xLast) = lowerBounds
-                remainingUpperBounds(xLast) = upperBounds
-                xLast = x
-                linLast = linExpr
-            }
+      def check_vars_list(
+          vars: List[Variable[Pre]]
+      ): Option[SubstituteForall] = {
+        val x0 = vars.head
+        val a0 = linearExpressions(x0)
+        if (!equalityChecker.isNonZero(a0))
+          return None
+        // x_{i-1}
+        var xLast = x0
+        var linLast: Expr[Pre] = IntegerValue(0)
+
+        val xmins: mutable.Map[Variable[Pre], Expr[Pre]] = mutable.Map()
+        val remainingLowerBounds: mutable.Map[Variable[Pre], Set[Expr[Pre]]] =
+          mutable.Map()
+        val remainingUpperBounds: mutable.Map[Variable[Pre], Set[Expr[Pre]]] =
+          mutable.Map()
+
+        for (x <- vars.tail) {
+          findSuitableBound(x, xLast, linLast) match {
+            case None => return None
+            case Some(FoundBound(lowerBounds, upperBounds, xmin, linExpr)) =>
+              xmins(xLast) = xmin
+              remainingLowerBounds(xLast) = lowerBounds
+              remainingUpperBounds(xLast) = upperBounds
+              xLast = x
+              linLast = linExpr
           }
-          // We found a replacement!
-          // Make the variable & declaration
-          val newName = vars.map(_.o.getPreferredNameOrElse().camel).mkString("_")
-          val xNew = new Variable[Post](TInt())(BinderOrigin(newName))
-          quantifierData.mainRewriter.variables.declare(xNew)
-
-          val newGen: Expr[Pre] => Expr[Post] = quantifierData.mainRewriter.dispatch
-
-
-
-          // Get a random lowerbound for x_i_last;
-          val lowLast = quantifierData.lowerBounds(xLast).head
-          xmins(xLast) = lowLast
-          remainingLowerBounds(xLast) = quantifierData.lowerBounds(xLast).tail.toSet
-
-          // Get a random upperbound for x_i_last;
-          val upLast = quantifierData.upperExclusiveBounds(xLast).head
-          remainingUpperBounds(xLast) = quantifierData.upperExclusiveBounds(xLast).tail.toSet
-          val nLast = simplifiedMinus(upLast, lowLast)
-
-          // off := b + Sum_{0 <= i <= k} (xmin_i * a_i)
-          var offset: Expr[Pre] = constantExpression match {
+        }
+        // We found a replacement!
+        // Make the variable & declaration
+        val newName = vars.map(_.o.getPreferredNameOrElse().camel).mkString("_")
+        val xNew = new Variable[Post](TInt())(BinderOrigin(newName))
+        quantifierData.mainRewriter.variables.declare(xNew)
+
+        val newGen: Expr[Pre] => Expr[Post] =
+          quantifierData.mainRewriter.dispatch
+
+        // Get a random lowerbound for x_i_last;
+        val lowLast = quantifierData.lowerBounds(xLast).head
+        xmins(xLast) = lowLast
+        remainingLowerBounds(xLast) =
+          quantifierData.lowerBounds(xLast).tail.toSet
+
+        // Get a random upperbound for x_i_last;
+        val upLast = quantifierData.upperExclusiveBounds(xLast).head
+        remainingUpperBounds(xLast) =
+          quantifierData.upperExclusiveBounds(xLast).tail.toSet
+        val nLast = simplifiedMinus(upLast, lowLast)
+
+        // off := b + Sum_{0 <= i <= k} (xmin_i * a_i)
+        var offset: Expr[Pre] =
+          constantExpression match {
             case None => simplifiedMult(a0, xmins(x0))
             case Some(b) => simplifiedPlus(b, simplifiedMult(a0, xmins(x0)))
           }
 
-          for(x_i <- vars.tail){
-            offset = simplifiedPlus(offset, simplifiedMult(linearExpressions(x_i), xmins(x_i)))
-          }
-
-          // base_k == (x_new - off)
-          val xNewVar: Expr[Post] = Local(xNew.ref)
-          var base: Expr[Post]= if(is_value(offset, 0)) xNewVar else Minus(xNewVar, newGen(offset))
-          val replaceMap:  mutable.Map[Variable[Pre], Expr[Post]] = mutable.Map()
-
-          // 0 <= x_new - offset < a_k * n_k
-          var newBounds = And(
-            LessEq( IntegerValue(0), base),
-            Less(base, newGen(simplifiedMult(linearExpressions(xLast), nLast)))
+        for (x_i <- vars.tail) {
+          offset = simplifiedPlus(
+            offset,
+            simplifiedMult(linearExpressions(x_i), xmins(x_i)),
           )
+        }
 
-          // Replace the linear expression with the new variable
-          val replaceIndex = (arrayIndex.index, xNewVar)
-
-          // and each x_i gets replaced by
-          //  x_i -> base_i / a_i + xmin_i
-          for(x <- vars.reverse){
-            var newValue = base
-            val a = linearExpressions(x)
-            val xmin = xmins(x)
-            if(!is_value(a, 1)) newValue = FloorDiv(newValue, newGen(a))(PanicBlame("a not zero"))
-            if(!is_value(xmin, 0)) newValue = Plus(newValue, newGen(xmin))
-            replaceMap(x) = newValue
-
-            // base_{i-1} -> base_i % a_i
-            if(!is_value(a, 1)) base = Mod(base, newGen(a))(PanicBlame("n not zero"))
-          }
-          // Add bound that we stride through our forall if a0 != 1
-          // (base_1 % a_0 == 0) --> base_0 == 0
-          if(!is_value(a0, 1)) newBounds = And(newBounds, Eq(base, IntegerValue(0)))
-
-          val triggerBlame = PanicBlame("Only used as trigger, not as access")
-          val newTriggers : Seq[Seq[Expr[Post]]] = arrayIndex match {
+        // base_k == (x_new - off)
+        val xNewVar: Expr[Post] = Local(xNew.ref)
+        var base: Expr[Post] =
+          if (is_value(offset, 0))
+            xNewVar
+          else
+            Minus(xNewVar, newGen(offset))
+        val replaceMap: mutable.Map[Variable[Pre], Expr[Post]] = mutable.Map()
+
+        // 0 <= x_new - offset < a_k * n_k
+        var newBounds = And(
+          LessEq(IntegerValue(0), base),
+          Less(base, newGen(simplifiedMult(linearExpressions(xLast), nLast))),
+        )
+
+        // Replace the linear expression with the new variable
+        val replaceIndex = (arrayIndex.index, xNewVar)
+
+        // and each x_i gets replaced by
+        //  x_i -> base_i / a_i + xmin_i
+        for (x <- vars.reverse) {
+          var newValue = base
+          val a = linearExpressions(x)
+          val xmin = xmins(x)
+          if (!is_value(a, 1))
+            newValue = FloorDiv(newValue, newGen(a))(PanicBlame("a not zero"))
+          if (!is_value(xmin, 0))
+            newValue = Plus(newValue, newGen(xmin))
+          replaceMap(x) = newValue
+
+          // base_{i-1} -> base_i % a_i
+          if (!is_value(a, 1))
+            base = Mod(base, newGen(a))(PanicBlame("n not zero"))
+        }
+        // Add bound that we stride through our forall if a0 != 1
+        // (base_1 % a_0 == 0) --> base_0 == 0
+        if (!is_value(a0, 1))
+          newBounds = And(newBounds, Eq(base, IntegerValue(0)))
+
+        val triggerBlame = PanicBlame("Only used as trigger, not as access")
+        val newTriggers: Seq[Seq[Expr[Post]]] =
+          arrayIndex match {
             case arrayIndex: Array[Pre] =>
-              Seq(Seq(ArraySubscript(newGen(arrayIndex.array), xNewVar)(triggerBlame)),
-              )
+              Seq(Seq(
+                ArraySubscript(newGen(arrayIndex.array), xNewVar)(triggerBlame)
+              ))
             case seqIndex: Sequence[Pre] =>
-              Seq(Seq(SeqSubscript(newGen(seqIndex.array), xNewVar)(triggerBlame)))
+              Seq(
+                Seq(SeqSubscript(newGen(seqIndex.array), xNewVar)(triggerBlame))
+              )
             case arrayIndex: Pointer[Pre] =>
-              Seq(Seq(PointerSubscript(newGen(arrayIndex.array), xNewVar)(triggerBlame)),
+              Seq(
+                Seq(PointerSubscript(newGen(arrayIndex.array), xNewVar)(
+                  triggerBlame
+                ))
 //                Seq(PointerAdd(newGen(arrayIndex.array), xNewVar)(triggerBlame))
               )
           }
 
-          for(x <- vars){
-            val xNew = replaceMap(x)
-            for(lowerBound <- remainingLowerBounds(x)){
-              newBounds = And(LessEq(newGen(lowerBound), xNew), newBounds)
-            }
-            for(upperBound <- remainingUpperBounds(x)){
-              newBounds = And(Less(xNew, newGen(upperBound)), newBounds)
-            }
+        for (x <- vars) {
+          val xNew = replaceMap(x)
+          for (lowerBound <- remainingLowerBounds(x)) {
+            newBounds = And(LessEq(newGen(lowerBound), xNew), newBounds)
+          }
+          for (upperBound <- remainingUpperBounds(x)) {
+            newBounds = And(Less(xNew, newGen(upperBound)), newBounds)
           }
-
-          Some(SubstituteForall(newBounds, replaceMap.toMap, replaceIndex, newTriggers))
         }
 
-        case class FoundBound(otherLowerBounds: Set[Expr[Pre]], otherUpperBounds: Set[Expr[Pre]], xMin: Expr[Pre], linExpr: Expr[Pre])
-
-        // Check in the other bounds if the specific expressions is present by a bound
-        def isExprUpperBounded(e: Expr[Pre], boundRequired: Expr[Pre]): Boolean = {
-          // Determine if l == e
-          // Then we know that e <= r (or e < r)
-          // Thus if r+1 <= boundRequired ( or r <= boundRequired )
-          // We know that e < boundRequired
-          def lessEqBound(l: Expr[Pre], r: Expr[Pre], eq: Boolean): Boolean = {
-            val checkedR = if(eq) simplifiedPlus(r, IntegerValue(1)) else r
-            equalityChecker.equalExpressions(l, e) &&
-              equalityChecker.lessThenEq(checkedR, boundRequired).getOrElse(false)
-          }
+        Some(SubstituteForall(
+          newBounds,
+          replaceMap.toMap,
+          replaceIndex,
+          newTriggers,
+        ))
+      }
 
-          for(c <- quantifierData.dependentConditions) {
-            c match {
-              case LessEq(l, r) =>
-                if(lessEqBound(l, r, eq = true))
-                  return true
-              case Less(l, r) =>
-                if(lessEqBound(l, r, eq = false)) return true
-              case GreaterEq(l, r) =>
-                // We switch arguments around
-                if(lessEqBound(r, l, eq = true)) return true
-              case Greater(l, r) =>
-                if(lessEqBound(r, l, eq = false)) return true
-              case _ =>
-            }
-          }
-          false
+      case class FoundBound(
+          otherLowerBounds: Set[Expr[Pre]],
+          otherUpperBounds: Set[Expr[Pre]],
+          xMin: Expr[Pre],
+          linExpr: Expr[Pre],
+      )
+
+      // Check in the other bounds if the specific expressions is present by a bound
+      def isExprUpperBounded(
+          e: Expr[Pre],
+          boundRequired: Expr[Pre],
+      ): Boolean = {
+        // Determine if l == e
+        // Then we know that e <= r (or e < r)
+        // Thus if r+1 <= boundRequired ( or r <= boundRequired )
+        // We know that e < boundRequired
+        def lessEqBound(l: Expr[Pre], r: Expr[Pre], eq: Boolean): Boolean = {
+          val checkedR =
+            if (eq)
+              simplifiedPlus(r, IntegerValue(1))
+            else
+              r
+          equalityChecker.equalExpressions(l, e) &&
+          equalityChecker.lessThenEq(checkedR, boundRequired).getOrElse(false)
         }
 
-        def findSuitableBound(x: Variable[Pre], xLast: Variable[Pre], linExpr: Expr[Pre]): Option[FoundBound] = {
-          val a = linearExpressions(x)
-          val aLast = linearExpressions(xLast)
+        for (c <- quantifierData.dependentConditions) {
+          c match {
+            case LessEq(l, r) =>
+              if (lessEqBound(l, r, eq = true))
+                return true
+            case Less(l, r) =>
+              if (lessEqBound(l, r, eq = false))
+                return true
+            case GreaterEq(l, r) =>
+              // We switch arguments around
+              if (lessEqBound(r, l, eq = true))
+                return true
+            case Greater(l, r) =>
+              if (lessEqBound(r, l, eq = false))
+                return true
+            case _ =>
+          }
+        }
+        false
+      }
 
-          var otherUpperBounds: Set[Expr[Pre]] = quantifierData.upperExclusiveBounds(xLast).toSet
-          var otherLowerBounds: Set[Expr[Pre]] = quantifierData.lowerBounds(xLast).toSet
+      def findSuitableBound(
+          x: Variable[Pre],
+          xLast: Variable[Pre],
+          linExpr: Expr[Pre],
+      ): Option[FoundBound] = {
+        val a = linearExpressions(x)
+        val aLast = linearExpressions(xLast)
 
-          for (up <- quantifierData.upperExclusiveBounds(xLast)) {
-            for (low <- quantifierData.lowerBounds(xLast)) {
-              val nLastCandidate = simplifiedMinus(up, low)
+        var otherUpperBounds: Set[Expr[Pre]] =
+          quantifierData.upperExclusiveBounds(xLast).toSet
+        var otherLowerBounds: Set[Expr[Pre]] =
+          quantifierData.lowerBounds(xLast).toSet
 
-              if (equalityChecker.equalExpressions(a, simplifiedMult(aLast, nLastCandidate))) {
-                otherUpperBounds = otherUpperBounds - up
-                otherLowerBounds = otherLowerBounds - low
-                val linLast = simplifiedPlus(simplifiedMult(aLast, simplifiedMinus(Local(xLast.ref), low)), linExpr)
-                return Some(FoundBound(otherLowerBounds, otherUpperBounds, low, linLast))
-              }
+        for (up <- quantifierData.upperExclusiveBounds(xLast)) {
+          for (low <- quantifierData.lowerBounds(xLast)) {
+            val nLastCandidate = simplifiedMinus(up, low)
 
-              if (equalityChecker.lessThenEq(simplifiedMult(aLast, nLastCandidate), a).getOrElse(false)) {
-                // This is also valid, we take a stride of a_i, but in that case it will stop earlier
-                // So we do not remove the upperbound we found
-                otherLowerBounds = otherLowerBounds - low
-                val linLast = simplifiedPlus(simplifiedMult(aLast, simplifiedMinus(Local(xLast.ref), low)), linExpr)
-                return Some(FoundBound(otherLowerBounds, otherUpperBounds, low, linLast))
-              }
+            if (
+              equalityChecker
+                .equalExpressions(a, simplifiedMult(aLast, nLastCandidate))
+            ) {
+              otherUpperBounds = otherUpperBounds - up
+              otherLowerBounds = otherLowerBounds - low
+              val linLast = simplifiedPlus(
+                simplifiedMult(aLast, simplifiedMinus(Local(xLast.ref), low)),
+                linExpr,
+              )
+              return Some(
+                FoundBound(otherLowerBounds, otherUpperBounds, low, linLast)
+              )
             }
-          }
-          // If we have something like f[8*z + 3*y + x] and the bound 3*y+x<8, we are valid as well
-          for (low <- quantifierData.lowerBounds(xLast)) {
-            val linLast = simplifiedPlus(simplifiedMult(aLast, simplifiedMinus(Local(xLast.ref), low)), linExpr)
-            if(isExprUpperBounded(linLast, a)){
+
+            if (
+              equalityChecker
+                .lessThenEq(simplifiedMult(aLast, nLastCandidate), a)
+                .getOrElse(false)
+            ) {
+              // This is also valid, we take a stride of a_i, but in that case it will stop earlier
+              // So we do not remove the upperbound we found
               otherLowerBounds = otherLowerBounds - low
-              return Some(FoundBound(otherLowerBounds, otherUpperBounds, low, linLast))
+              val linLast = simplifiedPlus(
+                simplifiedMult(aLast, simplifiedMinus(Local(xLast.ref), low)),
+                linExpr,
+              )
+              return Some(
+                FoundBound(otherLowerBounds, otherUpperBounds, low, linLast)
+              )
             }
           }
-
-          None
+        }
+        // If we have something like f[8*z + 3*y + x] and the bound 3*y+x<8, we are valid as well
+        for (low <- quantifierData.lowerBounds(xLast)) {
+          val linLast = simplifiedPlus(
+            simplifiedMult(aLast, simplifiedMinus(Local(xLast.ref), low)),
+            linExpr,
+          )
+          if (isExprUpperBounded(linLast, a)) {
+            otherLowerBounds = otherLowerBounds - low
+            return Some(
+              FoundBound(otherLowerBounds, otherUpperBounds, low, linLast)
+            )
+          }
         }
 
+        None
+      }
 
-        def getPlusses(e: Expr[Pre]): (Seq[Expr[Pre]], BigInt) = {
-          e match {
-            case Plus(e1, e2) =>
-              val (s1, i1) = getPlusses(e1)
-              val (s2, i2) = getPlusses(e2)
-              (s1 ++ s2, i1+i2)
-            case e => equalityChecker.isConstantInt(e) match {
+      def getPlusses(e: Expr[Pre]): (Seq[Expr[Pre]], BigInt) = {
+        e match {
+          case Plus(e1, e2) =>
+            val (s1, i1) = getPlusses(e1)
+            val (s2, i2) = getPlusses(e2)
+            (s1 ++ s2, i1 + i2)
+          case e =>
+            equalityChecker.isConstantInt(e) match {
               case Some(i) => (Seq(), i)
               case None => (Seq(e), 0)
             }
-          }
         }
+      }
 
-        def comparePlusses(lhs: Expr[Pre], rhs: Expr[Pre], remainingValue: BigInt) : (Option[Expr[Pre]], Option[Expr[Pre]], BigInt) = {
-          val (lhsP, lhsVal) = getPlusses(lhs)
-          var (rhsP, rhsVal) = getPlusses(rhs)
-          var remainingLeft: Seq[Expr[Pre]] = Seq()
-          var i = 0;
-          while(i < lhsP.size){
-            var found = false
-            var j = 0
-            while(j < rhsP.size && !found){
-              if(equalityChecker.equalExpressions(lhsP(i), rhsP(j))){
-                rhsP = rhsP.diff(Seq(rhsP(j)))
-                found = true
-              }
-              j += 1
-            }
-            if(!found){
-              remainingLeft = remainingLeft ++ Seq(lhsP(i))
+      def comparePlusses(
+          lhs: Expr[Pre],
+          rhs: Expr[Pre],
+          remainingValue: BigInt,
+      ): (Option[Expr[Pre]], Option[Expr[Pre]], BigInt) = {
+        val (lhsP, lhsVal) = getPlusses(lhs)
+        var (rhsP, rhsVal) = getPlusses(rhs)
+        var remainingLeft: Seq[Expr[Pre]] = Seq()
+        var i = 0;
+        while (i < lhsP.size) {
+          var found = false
+          var j = 0
+          while (j < rhsP.size && !found) {
+            if (equalityChecker.equalExpressions(lhsP(i), rhsP(j))) {
+              rhsP = rhsP.diff(Seq(rhsP(j)))
+              found = true
             }
-            i += 1
+            j += 1
           }
-          (remainingLeft.reduceOption(Plus[Pre]), rhsP.reduceOption(Plus[Pre]), remainingValue + lhsVal - rhsVal)
+          if (!found) { remainingLeft = remainingLeft ++ Seq(lhsP(i)) }
+          i += 1
         }
+        (
+          remainingLeft.reduceOption(Plus[Pre]),
+          rhsP.reduceOption(Plus[Pre]),
+          remainingValue + lhsVal - rhsVal,
+        )
+      }
 
-        def simplifiedMinus(lhsArg: Expr[Pre], rhsArg: Expr[Pre], remainingValue: BigInt = 0) : Expr[Pre] = {
-          val (lhs, rhs, value) = comparePlusses(lhsArg, rhsArg, remainingValue) match {
+      def simplifiedMinus(
+          lhsArg: Expr[Pre],
+          rhsArg: Expr[Pre],
+          remainingValue: BigInt = 0,
+      ): Expr[Pre] = {
+        val (lhs, rhs, value) =
+          comparePlusses(lhsArg, rhsArg, remainingValue) match {
             case (Some(lhs), Some(rhs), value) => (lhs, rhs, value)
             case (None, Some(rhs), value) =>
-              if(value != 0) return IntegerValue[Pre](value) - rhs
-              else return IntegerValue[Pre](-1) * rhs
-            case (Some(lhs), None , value) =>
-              if(value != 0) return  IntegerValue[Pre](value) + lhs
-              else return lhs
+              if (value != 0)
+                return IntegerValue[Pre](value) - rhs
+              else
+                return IntegerValue[Pre](-1) * rhs
+            case (Some(lhs), None, value) =>
+              if (value != 0)
+                return IntegerValue[Pre](value) + lhs
+              else
+                return lhs
             case (None, None, value) => return IntegerValue[Pre](value)
           }
 
-          (lhs, rhs) match {
-            case (Mult(l1, r1), Mult(l2, r2)) =>
-              if(equalityChecker.equalExpressions(l1 ,l2)) return Mult(l1, simplifiedMinus(r1, r2, value))
-              else if(equalityChecker.equalExpressions(l1 ,r2)) return Mult(l1, simplifiedMinus(r1, l2, value))
-              else if(equalityChecker.equalExpressions(r1 ,l2)) return Mult(r1, simplifiedMinus(l1, r2, value))
-              else if(equalityChecker.equalExpressions(r1 ,r2)) return Mult(r1, simplifiedMinus(l1, l2, value))
-            case _ =>
-          }
-
-          if(value != 0)
-            IntegerValue[Pre](value) + Minus(lhs, rhs)
-          else
-            Minus(lhs, rhs)
+        (lhs, rhs) match {
+          case (Mult(l1, r1), Mult(l2, r2)) =>
+            if (equalityChecker.equalExpressions(l1, l2))
+              return Mult(l1, simplifiedMinus(r1, r2, value))
+            else if (equalityChecker.equalExpressions(l1, r2))
+              return Mult(l1, simplifiedMinus(r1, l2, value))
+            else if (equalityChecker.equalExpressions(r1, l2))
+              return Mult(r1, simplifiedMinus(l1, r2, value))
+            else if (equalityChecker.equalExpressions(r1, r2))
+              return Mult(r1, simplifiedMinus(l1, l2, value))
+          case _ =>
         }
 
-        def simplifiedPlus(lhs: Expr[Pre], rhs: Expr[Pre]) : Expr[Pre] = {
-          (equalityChecker.isConstantInt(lhs), equalityChecker.isConstantInt(rhs)) match {
-            case (Some(l), Some(r)) => IntegerValue(l + r)
-            case (_, Some(r)) if r == 0 => lhs
-            case (Some(l), _) if l == 0 => rhs
-            case _ => Plus(lhs, rhs)
-          }
-        }
+        if (value != 0)
+          IntegerValue[Pre](value) + Minus(lhs, rhs)
+        else
+          Minus(lhs, rhs)
+      }
 
-        def simplifiedMult(lhs: Expr[Pre], rhs: Expr[Pre]): Expr[Pre] = {
-          if (is_value(lhs, 1)) rhs
-          else if (is_value(rhs, 1)) lhs
-          else Mult(lhs, rhs)
+      def simplifiedPlus(lhs: Expr[Pre], rhs: Expr[Pre]): Expr[Pre] = {
+        (
+          equalityChecker.isConstantInt(lhs),
+          equalityChecker.isConstantInt(rhs),
+        ) match {
+          case (Some(l), Some(r)) => IntegerValue(l + r)
+          case (_, Some(r)) if r == 0 => lhs
+          case (Some(l), _) if l == 0 => rhs
+          case _ => Plus(lhs, rhs)
         }
+      }
 
-        def isConstant(node: Expr[Pre]): Boolean = indepOf(quantifierData.bindings, node)
+      def simplifiedMult(lhs: Expr[Pre], rhs: Expr[Pre]): Expr[Pre] = {
+        if (is_value(lhs, 1))
+          rhs
+        else if (is_value(rhs, 1))
+          lhs
+        else
+          Mult(lhs, rhs)
+      }
 
-        def addToConstant(node : Expr[Pre], isPlus: Boolean = true): Unit = {
-          val added_node: Expr[Pre] = currentMultiplier match  {
+      def isConstant(node: Expr[Pre]): Boolean =
+        indepOf(quantifierData.bindings, node)
+
+      def addToConstant(node: Expr[Pre], isPlus: Boolean = true): Unit = {
+        val added_node: Expr[Pre] =
+          currentMultiplier match {
             case None => node
             case Some(expr) => Mult(expr, node)
           }
-          constantExpression = Some(constantExpression match {
-            case None => if(isPlus) added_node else Mult(IntegerValue(-1), added_node)
-            case Some(expr) => if(isPlus) Plus(expr, added_node) else Minus(expr, added_node)
-          })
-        }
+        constantExpression = Some(constantExpression match {
+          case None =>
+            if (isPlus)
+              added_node
+            else
+              Mult(IntegerValue(-1), added_node)
+          case Some(expr) =>
+            if (isPlus)
+              Plus(expr, added_node)
+            else
+              Minus(expr, added_node)
+        })
+      }
 
-        def multiplyMultiplier(node : Expr[Pre]): Unit ={
-          currentMultiplier match {
-            case None => currentMultiplier = Some(node);
-            case Some(expr) => currentMultiplier = Some(Mult(expr, node))
-          }
+      def multiplyMultiplier(node: Expr[Pre]): Unit = {
+        currentMultiplier match {
+          case None => currentMultiplier = Some(node);
+          case Some(expr) => currentMultiplier = Some(Mult(expr, node))
         }
-
-        def is_value(e: Expr[Pre], x: Int): Boolean =
-          equalityChecker.isConstantInt(e) match {
-            case None => false
-            case Some(y) => y == x
-          }
       }
+
+      def is_value(e: Expr[Pre], x: Int): Boolean =
+        equalityChecker.isConstantInt(e) match {
+          case None => false
+          case Some(y) => y == x
+        }
     }
+  }
 
   // The `newBounds`, will contain all the new equations for "select" part of the forall.
   // The `substituteOldVars` contains a map, so we can replace the old forall variables with new expressions
   // We also store the `linearExpression`, so if we ever come across it, we can replace it with the new variable.
-  case class SubstituteForall(newBounds: Expr[Post], substituteOldVars: Map[Variable[Pre], Expr[Post]], substituteIndex: (Expr[Pre], Expr[Post]), newTriggers: Seq[Seq[Expr[Post]]])
-}
\ No newline at end of file
+  case class SubstituteForall(
+      newBounds: Expr[Post],
+      substituteOldVars: Map[Variable[Pre], Expr[Post]],
+      substituteIndex: (Expr[Pre], Expr[Post]),
+      newTriggers: Seq[Seq[Expr[Post]]],
+  )
+}
diff --git a/src/rewrite/vct/rewrite/SimplifyQuantifiedRelations.scala b/src/rewrite/vct/rewrite/SimplifyQuantifiedRelations.scala
index 27bf3959fa..84cca4514d 100644
--- a/src/rewrite/vct/rewrite/SimplifyQuantifiedRelations.scala
+++ b/src/rewrite/vct/rewrite/SimplifyQuantifiedRelations.scala
@@ -15,182 +15,260 @@ import scala.collection.mutable.ArrayBuffer
 
 case object SimplifyQuantifiedRelations extends RewriterBuilder {
   override def key: String = "simplifyQuantifiedRelations"
-  override def desc: String = "Simplify comparisons of integers that are inside a quantifier."
+  override def desc: String =
+    "Simplify comparisons of integers that are inside a quantifier."
 }
 
-case class SimplifyQuantifiedRelations[Pre <: Generation]() extends Rewriter[Pre] {
+case class SimplifyQuantifiedRelations[Pre <: Generation]()
+    extends Rewriter[Pre] {
   val SimplifyQuantifiedRelationsOrigin: Origin = Origin(
-    Seq(
-      PreferredName(Seq("unknown")),
-      LabelContext("simplification"),
-    )
+    Seq(PreferredName(Seq("unknown")), LabelContext("simplification"))
   )
 
   private implicit val o: Origin = SimplifyQuantifiedRelationsOrigin
   private def one: IntegerValue[Pre] = IntegerValue(1)
 
   def indepOf[G](bindings: Seq[Variable[G]], e: Expr[G]): Boolean =
-    e.transSubnodes.collectFirst { case Local(ref) if bindings.contains(ref.decl) => () }.isEmpty
-
-  case class ExtremeValue(bindings: Seq[Variable[Pre]],
-                          inclusiveLowerBound: Map[Variable[Pre], ArrayBuffer[Expr[Pre]]],
-                          exclusiveUpperBound: Map[Variable[Pre], ArrayBuffer[Expr[Pre]]])
-  {
-    def extremeValue(exprs: Seq[Expr[Pre]], maximizing: Boolean): Expr[Pre] = exprs match {
-      case expr +: Nil => expr
-      case left +: right +: tail =>
-        Select(
-          condition = if(maximizing) left > right else left < right,
-          whenTrue = extremeValue(left +: tail, maximizing),
-          whenFalse = extremeValue(right +: tail, maximizing),
-        )
-    }
+    e.transSubnodes.collectFirst {
+      case Local(ref) if bindings.contains(ref.decl) => ()
+    }.isEmpty
+
+  case class ExtremeValue(
+      bindings: Seq[Variable[Pre]],
+      inclusiveLowerBound: Map[Variable[Pre], ArrayBuffer[Expr[Pre]]],
+      exclusiveUpperBound: Map[Variable[Pre], ArrayBuffer[Expr[Pre]]],
+  ) {
+    def extremeValue(exprs: Seq[Expr[Pre]], maximizing: Boolean): Expr[Pre] =
+      exprs match {
+        case expr +: Nil => expr
+        case left +: right +: tail =>
+          Select(
+            condition =
+              if (maximizing)
+                left > right
+              else
+                left < right,
+            whenTrue = extremeValue(left +: tail, maximizing),
+            whenFalse = extremeValue(right +: tail, maximizing),
+          )
+      }
 
-    def extremeValue(expr: Expr[Pre], maximizing: Boolean): Option[Expr[Pre]] = {
-      val max = (e: Expr[Pre]) => extremeValue(e, maximizing).getOrElse(return None)
-      val min = (e: Expr[Pre]) => extremeValue(e, !maximizing).getOrElse(return None)
+    def extremeValue(
+        expr: Expr[Pre],
+        maximizing: Boolean,
+    ): Option[Expr[Pre]] = {
+      val max =
+        (e: Expr[Pre]) => extremeValue(e, maximizing).getOrElse(return None)
+      val min =
+        (e: Expr[Pre]) => extremeValue(e, !maximizing).getOrElse(return None)
 
       Some(expr match {
         case e if indepOf(bindings, e) => e
         case Local(Ref(v)) =>
-          if(bindings.contains(v)) {
-            val bounds = if(maximizing) exclusiveUpperBound(v) else inclusiveLowerBound(v)
-            if(bounds.isEmpty) return None
-            else if(maximizing) extremeValue(bounds.toSeq, !maximizing) - one
-            else extremeValue(bounds.toSeq, !maximizing)
-          } else {
-            Local(v.ref)
-          }
+          if (bindings.contains(v)) {
+            val bounds =
+              if (maximizing)
+                exclusiveUpperBound(v)
+              else
+                inclusiveLowerBound(v)
+            if (bounds.isEmpty)
+              return None
+            else if (maximizing)
+              extremeValue(bounds.toSeq, !maximizing) - one
+            else
+              extremeValue(bounds.toSeq, !maximizing)
+          } else { Local(v.ref) }
         case UMinus(inner) => min(inner)
         case Plus(left, right) => max(left) + max(right)
         case Minus(left, right) => max(left) - min(right)
         case Mult(left, right) =>
-          extremeValue(Seq(
-            max(left) * max(right),
-            max(left) * min(right),
-            min(left) * max(right),
-            min(left) * min(right)
-          ).distinct, maximizing)
+          extremeValue(
+            Seq(
+              max(left) * max(right),
+              max(left) * min(right),
+              min(left) * max(right),
+              min(left) * min(right),
+            ).distinct,
+            maximizing,
+          )
         case RatDiv(left, right) =>
-          extremeValue(Seq(
-            max(left) /:/ max(right),
-            max(left) /:/ min(right),
-            min(left) /:/ max(right),
-            min(left) /:/ min(right)
-          ).distinct, maximizing)
+          extremeValue(
+            Seq(
+              max(left) /:/ max(right),
+              max(left) /:/ min(right),
+              min(left) /:/ max(right),
+              min(left) /:/ min(right),
+            ).distinct,
+            maximizing,
+          )
         case FloorDiv(left, right) =>
-          extremeValue(Seq(
-            max(left) / max(right),
-            max(left) / min(right),
-            min(left) / max(right),
-            min(left) / min(right)
-          ).distinct, maximizing)
+          extremeValue(
+            Seq(
+              max(left) / max(right),
+              max(left) / min(right),
+              min(left) / max(right),
+              min(left) / min(right),
+            ).distinct,
+            maximizing,
+          )
         case FloatDiv(left, right) =>
-          extremeValue(Seq(
-            max(left) / max(right),
-            max(left) / min(right),
-            min(left) / max(right),
-            min(left) / min(right)
-          ).distinct, maximizing)
+          extremeValue(
+            Seq(
+              max(left) / max(right),
+              max(left) / min(right),
+              min(left) / max(right),
+              min(left) / min(right),
+            ).distinct,
+            maximizing,
+          )
         case Select(condition, whenTrue, whenFalse) => ???
         case _ => return None
       })
     }
 
-    def maximize(expr: Expr[Pre]): Option[Expr[Pre]] = extremeValue(expr, maximizing = true)
-    def minimize(expr: Expr[Pre]): Option[Expr[Pre]] = extremeValue(expr, maximizing = false)
+    def maximize(expr: Expr[Pre]): Option[Expr[Pre]] =
+      extremeValue(expr, maximizing = true)
+    def minimize(expr: Expr[Pre]): Option[Expr[Pre]] =
+      extremeValue(expr, maximizing = false)
   }
 
-  def trySimplify(bindings: Seq[Variable[Pre]], originalBody: Expr[Pre]): Option[Expr[Pre]] = {
-    if(bindings.exists(_.t != TInt())) return None
+  def trySimplify(
+      bindings: Seq[Variable[Pre]],
+      originalBody: Expr[Pre],
+  ): Option[Expr[Pre]] = {
+    if (bindings.exists(_.t != TInt()))
+      return None
 
     // We split the body of the quantifier into its conditions (lhs of implies) and the body (rhs of implies)
     val (allConditions, body) = AstBuildHelpers.unfoldImplies(originalBody)
     // We filter the conditions by whether or not they contain any quantified variable
-    val (globalConditions, bounds) = allConditions.partition(indepOf(bindings, _))
+    val (globalConditions, bounds) = allConditions
+      .partition(indepOf(bindings, _))
 
     // The hope is now that *every* condition in bounds is in the form `i (<|<=|==|>=|>) (bound!i)`
-    val inclusiveLowerBound = bindings.map(_ -> mutable.ArrayBuffer[Expr[Pre]]()).toMap
-    val exclusiveUpperBound = bindings.map(_ -> mutable.ArrayBuffer[Expr[Pre]]()).toMap
+    val inclusiveLowerBound =
+      bindings.map(_ -> mutable.ArrayBuffer[Expr[Pre]]()).toMap
+    val exclusiveUpperBound =
+      bindings.map(_ -> mutable.ArrayBuffer[Expr[Pre]]()).toMap
 
-    for(bound <- bounds) {
+    for (bound <- bounds) {
       // First try to match a simple comparison
       Comparison.of(bound) match {
         case Some((left, comp, right)) =>
-          if(comp == Comparison.NEQ) return None
+          if (comp == Comparison.NEQ)
+            return None
 
           // If we have a simple comparison, one side should be independent of bindings, and the other should be
           // exactly a binding.
-          if(indepOf(bindings, left)) {
+          if (indepOf(bindings, left)) {
             right match {
               case Local(Ref(v)) if bindings.contains(v) =>
-                if(!comp.less) inclusiveLowerBound(v) += (if(comp.eq) left else left + one)
-                if(!comp.greater) exclusiveUpperBound(v) += (if(comp.eq) left + one else left)
+                if (!comp.less)
+                  inclusiveLowerBound(v) +=
+                    (if (comp.eq)
+                       left
+                     else
+                       left + one)
+                if (!comp.greater)
+                  exclusiveUpperBound(v) +=
+                    (if (comp.eq)
+                       left + one
+                     else
+                       left)
               case _ => return None
             }
-          } else if(indepOf(bindings, right)) {
+          } else if (indepOf(bindings, right)) {
             left match {
               case Local(Ref(v)) if bindings.contains(v) =>
-                if(!comp.less) exclusiveUpperBound(v) += (if(comp.eq) right + one else right)
-                if(!comp.greater) inclusiveLowerBound(v) += (if(comp.eq) right else right + one)
+                if (!comp.less)
+                  exclusiveUpperBound(v) +=
+                    (if (comp.eq)
+                       right + one
+                     else
+                       right)
+                if (!comp.greater)
+                  inclusiveLowerBound(v) +=
+                    (if (comp.eq)
+                       right
+                     else
+                       right + one)
               case _ => return None
             }
-          } else return None
-        case None => bound match {
-          // If we do not have a simple comparison, we support one special case: i \in {a..b}
-          case SetMember(Local(Ref(v)), RangeSet(from, to))
-            if bindings.contains(v) && indepOf(bindings, from) && indepOf(bindings, to) =>
-            inclusiveLowerBound(v) += from
-            exclusiveUpperBound(v) += to
-          case _ => return None
-        }
+          } else
+            return None
+        case None =>
+          bound match {
+            // If we do not have a simple comparison, we support one special case: i \in {a..b}
+            case SetMember(Local(Ref(v)), RangeSet(from, to))
+                if bindings.contains(v) && indepOf(bindings, from) &&
+                  indepOf(bindings, to) =>
+              inclusiveLowerBound(v) += from
+              exclusiveUpperBound(v) += to
+            case _ => return None
+          }
       }
     }
 
     // We can now simplify the quantified expression, if the body is a relation (<|<=|==|>=|>) and one side is constant
     // with respect to the bindings
 
-    val newBody = Comparison.of(body) match {
-      case Some((left, baseComp, right)) if Comparison.CONTIGUOUS.contains(baseComp) =>
-        val (const, comp, value) = if(indepOf(bindings, left)) {
-          (left, baseComp, right)
-        } else if(indepOf(bindings, right)) {
-          (right, baseComp.flip, left)
-        } else {
-          return None
-        }
+    val newBody =
+      Comparison.of(body) match {
+        case Some((left, baseComp, right))
+            if Comparison.CONTIGUOUS.contains(baseComp) =>
+          val (const, comp, value) =
+            if (indepOf(bindings, left)) { (left, baseComp, right) }
+            else if (indepOf(bindings, right)) { (right, baseComp.flip, left) }
+            else { return None }
 
-        val maker = ExtremeValue(bindings, inclusiveLowerBound, exclusiveUpperBound)
+          val maker = ExtremeValue(
+            bindings,
+            inclusiveLowerBound,
+            exclusiveUpperBound,
+          )
 
-        val gt = if(!comp.less) Seq(comp.make(const, maker.maximize(value).getOrElse(return None))) else Nil
-        val lt = if(!comp.greater) Seq(comp.make(const, maker.minimize(value).getOrElse(return None))) else Nil
+          val gt =
+            if (!comp.less)
+              Seq(
+                comp.make(const, maker.maximize(value).getOrElse(return None))
+              )
+            else
+              Nil
+          val lt =
+            if (!comp.greater)
+              Seq(
+                comp.make(const, maker.minimize(value).getOrElse(return None))
+              )
+            else
+              Nil
 
-        AstBuildHelpers.foldAnd(gt ++ lt)
-      case _ => return None
-    }
+          AstBuildHelpers.foldAnd(gt ++ lt)
+        case _ => return None
+      }
 
     // Success!
 
     Some(Implies(
-      AstBuildHelpers.foldAnd(globalConditions ++ bindings.flatMap(binding =>
-        inclusiveLowerBound(binding).flatMap(lower =>
-          exclusiveUpperBound(binding).map(upper =>
-            lower < upper
+      AstBuildHelpers.foldAnd(
+        globalConditions ++ bindings.flatMap(binding =>
+          inclusiveLowerBound(binding).flatMap(lower =>
+            exclusiveUpperBound(binding).map(upper => lower < upper)
           )
         )
-      )),
-      newBody
+      ),
+      newBody,
     ))
   }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case e @ Forall(bindings, _, body) =>
-      trySimplify(bindings, body) match {
-        case None => e.rewrite()
-        case Some(e) =>
-          bindings.foreach(_.drop())
-          dispatch(e)
-      }
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case e @ Forall(bindings, _, body) =>
+        trySimplify(bindings, body) match {
+          case None => e.rewrite()
+          case Some(e) =>
+            bindings.foreach(_.drop())
+            dispatch(e)
+        }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/SmtlibToProverTypes.scala b/src/rewrite/vct/rewrite/SmtlibToProverTypes.scala
index 905431126c..8752255d80 100644
--- a/src/rewrite/vct/rewrite/SmtlibToProverTypes.scala
+++ b/src/rewrite/vct/rewrite/SmtlibToProverTypes.scala
@@ -11,205 +11,282 @@ import scala.jdk.StreamConverters.IntStreamHasToScala
 
 case object SmtlibToProverTypes extends RewriterBuilder {
   override def key: String = "smtlib"
-  override def desc: String = "Encode smtlib types and functions into their stringified counterpart"
+  override def desc: String =
+    "Encode smtlib types and functions into their stringified counterpart"
 
   case class NotRepresentable(t: Type[_]) extends UserError {
     override def code: String = "notSmtRepresentable"
-    override def text: String = t.o.messageInContext("This type does not have a stable representation on the smt level yet.")
+    override def text: String =
+      t.o.messageInContext(
+        "This type does not have a stable representation on the smt level yet."
+      )
   }
 }
 
 case class SmtlibToProverTypes[Pre <: Generation]() extends Rewriter[Pre] {
-  def smtTypeString(t: Type[Pre]): String = t match {
-    case TSeq(element) => "$Seq<" + smtTypeString(element) + ">"
-    case TSet(element) => "$Set<" + smtTypeString(element) + ">"
-    case TBag(element) => "$Multiset<" + smtTypeString(element) + ">"
-    case TMap(key, value) => "$Map<" + smtTypeString(key) + "~_" + smtTypeString(value) + ">"
-    case TBool() => "Bool"
-    case TRef() => "$Ref"
-    case TInt() => "Int"
-    case TRational() => "$Perm"
-    case TAxiomatic(adt, args) => adt.decl.o.getPreferredNameOrElse().ucamel + "<" + args.map(smtTypeString).mkString("~_") + ">"
-    case TProverType(ref) => ref.decl.interpretation.collectFirst { case (SmtLib(), int) => int }.get
-    case TSmtlibArray(index, value) => s"(Array ${index.map(smtTypeString).mkString(" ")} ${smtTypeString(value)})"
-    case TSmtlibBitVector(size) => s"(_ BitVec $size)"
-    case TSmtlibRoundingMode() => "RoundingMode"
-    case TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits) => s"(_ FloatingPoint $exponentBits $mantissaAndSignBits)"
-    case TSmtlibString() => "String"
-    case TSmtlibRegLan() => "RegLan"
-    case TSmtlibSeq(element) => s"(Seq ${smtTypeString(element)})"
-    case other => throw NotRepresentable(other)
-  }
+  def smtTypeString(t: Type[Pre]): String =
+    t match {
+      case TSeq(element) => "$Seq<" + smtTypeString(element) + ">"
+      case TSet(element) => "$Set<" + smtTypeString(element) + ">"
+      case TBag(element) => "$Multiset<" + smtTypeString(element) + ">"
+      case TMap(key, value) =>
+        "$Map<" + smtTypeString(key) + "~_" + smtTypeString(value) + ">"
+      case TBool() => "Bool"
+      case TRef() => "$Ref"
+      case TInt() => "Int"
+      case TRational() => "$Perm"
+      case TAxiomatic(adt, args) =>
+        adt.decl.o.getPreferredNameOrElse().ucamel + "<" +
+          args.map(smtTypeString).mkString("~_") + ">"
+      case TProverType(ref) =>
+        ref.decl.interpretation.collectFirst { case (SmtLib(), int) => int }.get
+      case TSmtlibArray(index, value) =>
+        s"(Array ${index.map(smtTypeString).mkString(" ")} ${smtTypeString(value)})"
+      case TSmtlibBitVector(size) => s"(_ BitVec $size)"
+      case TSmtlibRoundingMode() => "RoundingMode"
+      case TSmtlibFloatingPoint(exponentBits, mantissaAndSignBits) =>
+        s"(_ FloatingPoint $exponentBits $mantissaAndSignBits)"
+      case TSmtlibString() => "String"
+      case TSmtlibRegLan() => "RegLan"
+      case TSmtlibSeq(element) => s"(Seq ${smtTypeString(element)})"
+      case other => throw NotRepresentable(other)
+    }
 
   val declaredType: mutable.Map[String, ProverType[Post]] = mutable.Map()
-  val declaredFunc: mutable.Map[(String, Seq[Type[Pre]]), ProverFunction[Post]] = mutable.Map()
+  val declaredFunc
+      : mutable.Map[(String, Seq[Type[Pre]]), ProverFunction[Post]] = mutable
+    .Map()
 
   def getType(t: Type[Pre]): TProverType[Post] = {
     val asText = smtTypeString(t)
-    TProverType(declaredType.getOrElseUpdate(asText, {
-      implicit val o: Origin = t.o
-      globalDeclarations.declare(new ProverType[Post](Seq(SmtLib[Post]() -> asText)))
-    }).ref)
+    TProverType(
+      declaredType.getOrElseUpdate(
+        asText, {
+          implicit val o: Origin = t.o
+          globalDeclarations
+            .declare(new ProverType[Post](Seq(SmtLib[Post]() -> asText)))
+        },
+      ).ref
+    )
   }
 
-  def getExpr(e: Expr[Pre], f: String, args: Expr[Pre]*)(implicit o: Origin): Expr[Post] =
-    ProverFunctionInvocation(declaredFunc.getOrElseUpdate((f, args.map(_.t)), {
-      globalDeclarations.declare(new ProverFunction[Post](
-        Seq(SmtLib[Post]() -> f),
-        args.map(arg => new Variable(dispatch(arg.t))),
-        dispatch(e.t),
-      ))
-    }).ref, args.map(dispatch))
+  def getExpr(e: Expr[Pre], f: String, args: Expr[Pre]*)(
+      implicit o: Origin
+  ): Expr[Post] =
+    ProverFunctionInvocation(
+      declaredFunc.getOrElseUpdate(
+        (f, args.map(_.t)), {
+          globalDeclarations.declare(new ProverFunction[Post](
+            Seq(SmtLib[Post]() -> f),
+            args.map(arg => new Variable(dispatch(arg.t))),
+            dispatch(e.t),
+          ))
+        },
+      ).ref,
+      args.map(dispatch),
+    )
 
-  override def dispatch(t: Type[Pre]): Type[Post] = t match {
-    case t: SmtlibType[Pre] => getType(t)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    t match {
+      case t: SmtlibType[Pre] => getType(t)
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case e: SmtlibExpr[Pre] =>
-      implicit val o: Origin = e.o
-      e match {
-        case SmtlibSelect(arr, is) => getExpr(e, "select", (arr +: is): _*)
-        case SmtlibStore(arr, is, x) => getExpr(e, "store", (arr +: is) :+ x: _*)
-        case SmtlibBitvecLiteral(data) => getExpr(e, data.toSmt)
-        case SmtlibConcat(left, right) => getExpr(e, "concat", left, right)
-        case SmtlibExtract(inclusiveEndIndexFromRight, startIndexFromRight, bv) =>
-          getExpr(e, s"(_ extract $inclusiveEndIndexFromRight $startIndexFromRight)", bv)
-        case SmtlibBvNot(bv) => getExpr(e, "bvnot", bv)
-        case SmtlibBvAnd(left, right) => getExpr(e, "bvand", left, right)
-        case SmtlibBvOr(left, right) => getExpr(e, "bvor", left, right)
-        case SmtlibBvNeg(bv) => getExpr(e, "bvneg", bv)
-        case SmtlibBvAdd(left, right) => getExpr(e, "bvadd", left, right)
-        case SmtlibBvMul(left, right) => getExpr(e, "bvmul", left, right)
-        case SmtlibBvUDiv(left, right) => getExpr(e, "bvudiv", left, right)
-        case SmtlibBvURem(left, right) => getExpr(e, "bvurem", left, right)
-        case SmtlibBvShl(left, right) => getExpr(e, "bvshl", left, right)
-        case SmtlibBvShr(left, right) => getExpr(e, "bvshr", left, right)
-        case SmtlibBvULt(left, right) => getExpr(e, "bvult", left, right)
-        case SmtlibRNE() => getExpr(e, "RNE")
-        case SmtlibRNA() => getExpr(e, "RNA")
-        case SmtlibRTP() => getExpr(e, "RTP")
-        case SmtlibRTN() => getExpr(e, "RTN")
-        case SmtlibRTZ() => getExpr(e, "RTZ")
-        case SmtlibFp(sign, exponent, mantissa) => getExpr(e, "fp", sign, exponent, mantissa)
-        case SmtlibFpAbs(arg) => getExpr(e, "fp.abs", arg)
-        case SmtlibFpNeg(arg) => getExpr(e, "fp.neg", arg)
-        case SmtlibFpAdd(left, right) => getExpr(e, "fp.add", left, right)
-        case SmtlibFpSub(left, right) => getExpr(e, "fp.sub", left, right)
-        case SmtlibFpMul(left, right) => getExpr(e, "fp.mul", left, right)
-        case SmtlibFpDiv(left, right) => getExpr(e, "fp.div", left, right)
-        case SmtlibFpFma(left, right, addend) => getExpr(e, "fp.fma", left, right, addend)
-        case SmtlibFpSqrt(arg) => getExpr(e, "fp.sqrt", arg)
-        case SmtlibFpRem(left, right) => getExpr(e, "fp.rem", left, right)
-        case SmtlibFpRoundToIntegral(arg) => getExpr(e, "fp.roundToIntegral", arg)
-        case SmtlibFpMin(left, right) => getExpr(e, "fp.min", left, right)
-        case SmtlibFpMax(left, right) => getExpr(e, "fp.max", left, right)
-        case SmtlibFpLeq(left, right) => getExpr(e, "fp.leq", left, right)
-        case SmtlibFpLt(left, right) => getExpr(e, "fp.lt", left, right)
-        case SmtlibFpGeq(left, right) => getExpr(e, "fp.geq", left, right)
-        case SmtlibFpGt(left, right) => getExpr(e, "fp.gt", left, right)
-        case SmtlibFpEq(left, right) => getExpr(e, "fp.eq", left, right)
-        case SmtlibFpIsNormal(arg) => getExpr(e, "fp.isNormal", arg)
-        case SmtlibFpIsSubnormal(arg) => getExpr(e, "fp.isSubnormal", arg)
-        case SmtlibFpIsZero(arg) => getExpr(e, "fp.isZero", arg)
-        case SmtlibFpIsInfinite(arg) => getExpr(e, "fp.isInfinite", arg)
-        case SmtlibFpIsNaN(arg) => getExpr(e, "fp.isNaN", arg)
-        case SmtlibFpIsNegative(arg) => getExpr(e, "fp.isNegative", arg)
-        case SmtlibFpIsPositive(arg) => getExpr(e, "fp.isPositive", arg)
-        case SmtlibToFp(bv, exponentBits, mantissaAndSignBits) =>
-          getExpr(e, s"(_ to_fp $exponentBits $mantissaAndSignBits)", bv)
-        case SmtlibFpCast(arg, exponentBits, mantissaAndSignBits) =>
-          getExpr(e, s"(_ to_fp $exponentBits $mantissaAndSignBits)", arg)
-        case SmtlibFpFromReal(arg, exponentBits, mantissaAndSignBits) =>
-          getExpr(e, s"(_ to_fp $exponentBits $mantissaAndSignBits)", arg)
-        case SmtlibFpFromSInt(bv, exponentBits, mantissaAndSignBits) =>
-          getExpr(e, s"(_ to_fp $exponentBits $mantissaAndSignBits)", bv)
-        case SmtlibFpFromUInt(bv, exponentBits, mantissaAndSignBits) =>
-          getExpr(e, s"(_ to_fp_unsigned $exponentBits $mantissaAndSignBits)", bv)
-        case SmtlibFpToReal(arg) => getExpr(e, "fp.to_real", arg)
-        case SmtlibFpToSInt(arg, bits) => getExpr(e, s"(_ fp.to_sbv $bits)", arg)
-        case SmtlibFpToUInt(arg, bits) => getExpr(e, s"(_ fp.to_ubv $bits)", arg)
-        case SmtlibIsInt(arg) => getExpr(e, "is_int", arg)
-        case SmtlibPow(left, right) => getExpr(e, "^", left, right)
-        case SmtlibToInt(arg) => getExpr(e, "to_int", arg)
-        case SmtlibToReal(arg) => getExpr(e, "to_real", arg)
-        case SmtlibLiteralString(data) =>
-          // PB: it seems "\" need not be escaped, except when an *entire* escape sequence occurs in the string
-          //     literally in the string to be escaped. Here we just escape all backslashes, which is one way of
-          //     ensuring we break up any accidental literal escape sequences :)
-          val content = data.codePoints().toScala(Seq).map {
-            case c if 0x20 <= c && c <= 0x7e && c != 0x5c => Character.toString(c)
-            case c => "\\u{" + c.toHexString + "}"
-          }
-          getExpr(e, "\"" + content + "\"")
-        case SmtlibStrConcat(left, right) => getExpr(e, "str.++", left, right)
-        case SmtlibStrLen(arg) => getExpr(e, "str.len", arg)
-        case SmtlibStrLt(left, right) => getExpr(e, "str.<", left, right)
-        case SmtlibStrLeq(left, right) => getExpr(e, "str.<=", left, right)
-        case SmtlibStrAt(str, i) => getExpr(e, "str.at", str, i)
-        case SmtlibSubstr(str, i, n) => getExpr(e, "str.substr", str, i, n)
-        case SmtlibStrPrefixOf(left, right) => getExpr(e, "str.prefixof", left, right)
-        case SmtlibStrSuffixOf(left, right) => getExpr(e, "str.suffixof", left, right)
-        case SmtlibStrContains(left, right) => getExpr(e, "str.contains", left, right)
-        case SmtlibStrIndexOf(haystack, needle, fromIndex) => getExpr(e, "str.indexof", haystack, needle, fromIndex)
-        case SmtlibStrReplace(haystack, needle, replacement) => getExpr(e, "str.replace", haystack, needle, replacement)
-        case SmtlibStrReplaceAll(haystack, needle, replacement) => getExpr(e, "str.replace_all", haystack, needle, replacement)
-        case SmtlibStrReplaceRe(haystack, re, replacement) => getExpr(e, "str.replace_re", haystack, re, replacement)
-        case SmtlibStrReplaceReAll(haystack, re, replacement) => getExpr(e, "str.replace_re_all", haystack, re, replacement)
-        case SmtlibStrIsDigit(arg) => getExpr(e, "str.indexof", arg)
-        case SmtlibStrToCode(arg) => getExpr(e, "str.to_code", arg)
-        case SmtlibStrFromCode(arg) => getExpr(e, "str.from_code", arg)
-        case SmtlibStrToInt(arg) => getExpr(e, "str.to_int", arg)
-        case SmtlibStrFromInt(arg) => getExpr(e, "str.from_int", arg)
-        case SmtlibReFromStr(arg) => getExpr(e, "str.to_re", arg)
-        case SmtlibReContains(re, str) => getExpr(e, "str.in_re", str, re)
-        case SmtlibReNone() => getExpr(e, "re.none")
-        case SmtlibReAll() => getExpr(e, "re.all")
-        case SmtlibReAllChar() => getExpr(e, "re.allchar")
-        case SmtlibReConcat(left, right) => getExpr(e, "re.++", left, right)
-        case SmtlibReUnion(left, right) => getExpr(e, "re.union", left, right)
-        case SmtlibReInter(left, right) => getExpr(e, "re.inter", left, right)
-        case SmtlibReStar(arg) => getExpr(e, "re.*", arg)
-        case SmtlibReComp(arg) => getExpr(e, "re.comp", arg)
-        case SmtlibReDiff(left, right) => getExpr(e, "re.diff", left, right)
-        case SmtlibRePlus(arg) => getExpr(e, "re.+", arg)
-        case SmtlibReOpt(arg) => getExpr(e, "re.opt", arg)
-        case SmtlibReRange(left, right) => getExpr(e, "re.range", left, right)
-        case SmtlibReRepeat(count, arg) => getExpr(e, s"(_ re.^ $count)", arg)
-        case SmtlibReRepeatRange(from, to, arg) => getExpr(e, s"(_ re.loop $from $to)", arg)
-        case Z3BvSub(left, right) => getExpr(e, "bvsub", left, right)
-        case Z3BvSRem(left, right) => getExpr(e, "bvsrem", left, right)
-        case Z3BvSMod(left, right) => getExpr(e, "bvsmod", left, right)
-        case Z3BvSShr(left, right) => getExpr(e, "bvashr", left, right)
-        case Z3BvNand(left, right) => getExpr(e, "bvnand", left, right)
-        case Z3BvNor(left, right) => getExpr(e, "bvnor", left, right)
-        case Z3BvXnor(left, right) => getExpr(e, "bvxnor", left, right)
-        case Z3ArrayConst(domain, codomain, value) =>
-          getExpr(e, s"(as const ${smtTypeString(TSmtlibArray(domain, codomain))})", value)
-        case Z3ArrayOfFunction(ref) =>
-          // https://github.com/utwente-fmt/vercors/issues/1022
-          getExpr(e, s"(_ as-array ${ref.ref.decl.o.getPreferredNameOrElse().camel})")
-        case Z3ArrayMap(ref, args) =>
-          getExpr(e, s"(_ map ${ref.ref.decl.o.getPreferredNameOrElse().camel})", args: _*)
-        case Z3SeqEmpty(elementType) => getExpr(e, s"(as seq.empty (Seq ${smtTypeString(elementType)}))")
-        case Z3SeqUnit(arg) => getExpr(e, "seq.unit", arg)
-        case Z3SeqConcat(left, right) => getExpr(e, "seq.++", left, right)
-        case Z3SeqLen(arg) => getExpr(e, "seq.len", arg)
-        case Z3SeqExtract(seq, offset, len) => getExpr(e, "seq.extract", seq, offset, len)
-        case Z3SeqAt(seq, offset) => getExpr(e, "seq.at", seq, offset)
-        case Z3SeqNth(seq, offset) => getExpr(e, "seq.nth", seq, offset)
-        case Z3SeqContains(seq, subseq) => getExpr(e, "seq.contains", seq, subseq)
-        case Z3SeqPrefixOf(pre, subseq) => getExpr(e, "seq.prefixof", pre, subseq)
-        case Z3SeqSuffixOf(post, seq) => getExpr(e, "seq.suffixof", post, seq)
-        case Z3SeqReplace(haystack, needle, replacement) => getExpr(e, "seq.replace", haystack, needle, replacement)
-        case Z3SeqMap(f, seq) => getExpr(e, "seq.map", f, seq)
-        case Z3SeqMapI(f, offset, seq) => getExpr(e, "seq.mapi", f, offset, seq)
-        case Z3SeqFoldl(f, base, seq) => getExpr(e, "seq.foldl", f, base, seq)
-        case Z3SeqFoldlI(f, offset, base, seq) => getExpr(e, "seq.foldli", f, offset, base, seq)
-        case Z3TransitiveClosure(ref, args) =>
-          getExpr(e, s"(_ transitive-closure ${ref.ref.decl.o.getPreferredNameOrElse().camel})", args: _*)
-      }
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case e: SmtlibExpr[Pre] =>
+        implicit val o: Origin = e.o
+        e match {
+          case SmtlibSelect(arr, is) => getExpr(e, "select", (arr +: is): _*)
+          case SmtlibStore(arr, is, x) =>
+            getExpr(e, "store", (arr +: is) :+ x: _*)
+          case SmtlibBitvecLiteral(data) => getExpr(e, data.toSmt)
+          case SmtlibConcat(left, right) => getExpr(e, "concat", left, right)
+          case SmtlibExtract(
+                inclusiveEndIndexFromRight,
+                startIndexFromRight,
+                bv,
+              ) =>
+            getExpr(
+              e,
+              s"(_ extract $inclusiveEndIndexFromRight $startIndexFromRight)",
+              bv,
+            )
+          case SmtlibBvNot(bv) => getExpr(e, "bvnot", bv)
+          case SmtlibBvAnd(left, right) => getExpr(e, "bvand", left, right)
+          case SmtlibBvOr(left, right) => getExpr(e, "bvor", left, right)
+          case SmtlibBvNeg(bv) => getExpr(e, "bvneg", bv)
+          case SmtlibBvAdd(left, right) => getExpr(e, "bvadd", left, right)
+          case SmtlibBvMul(left, right) => getExpr(e, "bvmul", left, right)
+          case SmtlibBvUDiv(left, right) => getExpr(e, "bvudiv", left, right)
+          case SmtlibBvURem(left, right) => getExpr(e, "bvurem", left, right)
+          case SmtlibBvShl(left, right) => getExpr(e, "bvshl", left, right)
+          case SmtlibBvShr(left, right) => getExpr(e, "bvshr", left, right)
+          case SmtlibBvULt(left, right) => getExpr(e, "bvult", left, right)
+          case SmtlibRNE() => getExpr(e, "RNE")
+          case SmtlibRNA() => getExpr(e, "RNA")
+          case SmtlibRTP() => getExpr(e, "RTP")
+          case SmtlibRTN() => getExpr(e, "RTN")
+          case SmtlibRTZ() => getExpr(e, "RTZ")
+          case SmtlibFp(sign, exponent, mantissa) =>
+            getExpr(e, "fp", sign, exponent, mantissa)
+          case SmtlibFpAbs(arg) => getExpr(e, "fp.abs", arg)
+          case SmtlibFpNeg(arg) => getExpr(e, "fp.neg", arg)
+          case SmtlibFpAdd(left, right) => getExpr(e, "fp.add", left, right)
+          case SmtlibFpSub(left, right) => getExpr(e, "fp.sub", left, right)
+          case SmtlibFpMul(left, right) => getExpr(e, "fp.mul", left, right)
+          case SmtlibFpDiv(left, right) => getExpr(e, "fp.div", left, right)
+          case SmtlibFpFma(left, right, addend) =>
+            getExpr(e, "fp.fma", left, right, addend)
+          case SmtlibFpSqrt(arg) => getExpr(e, "fp.sqrt", arg)
+          case SmtlibFpRem(left, right) => getExpr(e, "fp.rem", left, right)
+          case SmtlibFpRoundToIntegral(arg) =>
+            getExpr(e, "fp.roundToIntegral", arg)
+          case SmtlibFpMin(left, right) => getExpr(e, "fp.min", left, right)
+          case SmtlibFpMax(left, right) => getExpr(e, "fp.max", left, right)
+          case SmtlibFpLeq(left, right) => getExpr(e, "fp.leq", left, right)
+          case SmtlibFpLt(left, right) => getExpr(e, "fp.lt", left, right)
+          case SmtlibFpGeq(left, right) => getExpr(e, "fp.geq", left, right)
+          case SmtlibFpGt(left, right) => getExpr(e, "fp.gt", left, right)
+          case SmtlibFpEq(left, right) => getExpr(e, "fp.eq", left, right)
+          case SmtlibFpIsNormal(arg) => getExpr(e, "fp.isNormal", arg)
+          case SmtlibFpIsSubnormal(arg) => getExpr(e, "fp.isSubnormal", arg)
+          case SmtlibFpIsZero(arg) => getExpr(e, "fp.isZero", arg)
+          case SmtlibFpIsInfinite(arg) => getExpr(e, "fp.isInfinite", arg)
+          case SmtlibFpIsNaN(arg) => getExpr(e, "fp.isNaN", arg)
+          case SmtlibFpIsNegative(arg) => getExpr(e, "fp.isNegative", arg)
+          case SmtlibFpIsPositive(arg) => getExpr(e, "fp.isPositive", arg)
+          case SmtlibToFp(bv, exponentBits, mantissaAndSignBits) =>
+            getExpr(e, s"(_ to_fp $exponentBits $mantissaAndSignBits)", bv)
+          case SmtlibFpCast(arg, exponentBits, mantissaAndSignBits) =>
+            getExpr(e, s"(_ to_fp $exponentBits $mantissaAndSignBits)", arg)
+          case SmtlibFpFromReal(arg, exponentBits, mantissaAndSignBits) =>
+            getExpr(e, s"(_ to_fp $exponentBits $mantissaAndSignBits)", arg)
+          case SmtlibFpFromSInt(bv, exponentBits, mantissaAndSignBits) =>
+            getExpr(e, s"(_ to_fp $exponentBits $mantissaAndSignBits)", bv)
+          case SmtlibFpFromUInt(bv, exponentBits, mantissaAndSignBits) =>
+            getExpr(
+              e,
+              s"(_ to_fp_unsigned $exponentBits $mantissaAndSignBits)",
+              bv,
+            )
+          case SmtlibFpToReal(arg) => getExpr(e, "fp.to_real", arg)
+          case SmtlibFpToSInt(arg, bits) =>
+            getExpr(e, s"(_ fp.to_sbv $bits)", arg)
+          case SmtlibFpToUInt(arg, bits) =>
+            getExpr(e, s"(_ fp.to_ubv $bits)", arg)
+          case SmtlibIsInt(arg) => getExpr(e, "is_int", arg)
+          case SmtlibPow(left, right) => getExpr(e, "^", left, right)
+          case SmtlibToInt(arg) => getExpr(e, "to_int", arg)
+          case SmtlibToReal(arg) => getExpr(e, "to_real", arg)
+          case SmtlibLiteralString(data) =>
+            // PB: it seems "\" need not be escaped, except when an *entire* escape sequence occurs in the string
+            //     literally in the string to be escaped. Here we just escape all backslashes, which is one way of
+            //     ensuring we break up any accidental literal escape sequences :)
+            val content = data.codePoints().toScala(Seq).map {
+              case c if 0x20 <= c && c <= 0x7e && c != 0x5c =>
+                Character.toString(c)
+              case c => "\\u{" + c.toHexString + "}"
+            }
+            getExpr(e, "\"" + content + "\"")
+          case SmtlibStrConcat(left, right) => getExpr(e, "str.++", left, right)
+          case SmtlibStrLen(arg) => getExpr(e, "str.len", arg)
+          case SmtlibStrLt(left, right) => getExpr(e, "str.<", left, right)
+          case SmtlibStrLeq(left, right) => getExpr(e, "str.<=", left, right)
+          case SmtlibStrAt(str, i) => getExpr(e, "str.at", str, i)
+          case SmtlibSubstr(str, i, n) => getExpr(e, "str.substr", str, i, n)
+          case SmtlibStrPrefixOf(left, right) =>
+            getExpr(e, "str.prefixof", left, right)
+          case SmtlibStrSuffixOf(left, right) =>
+            getExpr(e, "str.suffixof", left, right)
+          case SmtlibStrContains(left, right) =>
+            getExpr(e, "str.contains", left, right)
+          case SmtlibStrIndexOf(haystack, needle, fromIndex) =>
+            getExpr(e, "str.indexof", haystack, needle, fromIndex)
+          case SmtlibStrReplace(haystack, needle, replacement) =>
+            getExpr(e, "str.replace", haystack, needle, replacement)
+          case SmtlibStrReplaceAll(haystack, needle, replacement) =>
+            getExpr(e, "str.replace_all", haystack, needle, replacement)
+          case SmtlibStrReplaceRe(haystack, re, replacement) =>
+            getExpr(e, "str.replace_re", haystack, re, replacement)
+          case SmtlibStrReplaceReAll(haystack, re, replacement) =>
+            getExpr(e, "str.replace_re_all", haystack, re, replacement)
+          case SmtlibStrIsDigit(arg) => getExpr(e, "str.indexof", arg)
+          case SmtlibStrToCode(arg) => getExpr(e, "str.to_code", arg)
+          case SmtlibStrFromCode(arg) => getExpr(e, "str.from_code", arg)
+          case SmtlibStrToInt(arg) => getExpr(e, "str.to_int", arg)
+          case SmtlibStrFromInt(arg) => getExpr(e, "str.from_int", arg)
+          case SmtlibReFromStr(arg) => getExpr(e, "str.to_re", arg)
+          case SmtlibReContains(re, str) => getExpr(e, "str.in_re", str, re)
+          case SmtlibReNone() => getExpr(e, "re.none")
+          case SmtlibReAll() => getExpr(e, "re.all")
+          case SmtlibReAllChar() => getExpr(e, "re.allchar")
+          case SmtlibReConcat(left, right) => getExpr(e, "re.++", left, right)
+          case SmtlibReUnion(left, right) => getExpr(e, "re.union", left, right)
+          case SmtlibReInter(left, right) => getExpr(e, "re.inter", left, right)
+          case SmtlibReStar(arg) => getExpr(e, "re.*", arg)
+          case SmtlibReComp(arg) => getExpr(e, "re.comp", arg)
+          case SmtlibReDiff(left, right) => getExpr(e, "re.diff", left, right)
+          case SmtlibRePlus(arg) => getExpr(e, "re.+", arg)
+          case SmtlibReOpt(arg) => getExpr(e, "re.opt", arg)
+          case SmtlibReRange(left, right) => getExpr(e, "re.range", left, right)
+          case SmtlibReRepeat(count, arg) => getExpr(e, s"(_ re.^ $count)", arg)
+          case SmtlibReRepeatRange(from, to, arg) =>
+            getExpr(e, s"(_ re.loop $from $to)", arg)
+          case Z3BvSub(left, right) => getExpr(e, "bvsub", left, right)
+          case Z3BvSRem(left, right) => getExpr(e, "bvsrem", left, right)
+          case Z3BvSMod(left, right) => getExpr(e, "bvsmod", left, right)
+          case Z3BvSShr(left, right) => getExpr(e, "bvashr", left, right)
+          case Z3BvNand(left, right) => getExpr(e, "bvnand", left, right)
+          case Z3BvNor(left, right) => getExpr(e, "bvnor", left, right)
+          case Z3BvXnor(left, right) => getExpr(e, "bvxnor", left, right)
+          case Z3ArrayConst(domain, codomain, value) =>
+            getExpr(
+              e,
+              s"(as const ${smtTypeString(TSmtlibArray(domain, codomain))})",
+              value,
+            )
+          case Z3ArrayOfFunction(ref) =>
+            // https://github.com/utwente-fmt/vercors/issues/1022
+            getExpr(
+              e,
+              s"(_ as-array ${ref.ref.decl.o.getPreferredNameOrElse().camel})",
+            )
+          case Z3ArrayMap(ref, args) =>
+            getExpr(
+              e,
+              s"(_ map ${ref.ref.decl.o.getPreferredNameOrElse().camel})",
+              args: _*
+            )
+          case Z3SeqEmpty(elementType) =>
+            getExpr(e, s"(as seq.empty (Seq ${smtTypeString(elementType)}))")
+          case Z3SeqUnit(arg) => getExpr(e, "seq.unit", arg)
+          case Z3SeqConcat(left, right) => getExpr(e, "seq.++", left, right)
+          case Z3SeqLen(arg) => getExpr(e, "seq.len", arg)
+          case Z3SeqExtract(seq, offset, len) =>
+            getExpr(e, "seq.extract", seq, offset, len)
+          case Z3SeqAt(seq, offset) => getExpr(e, "seq.at", seq, offset)
+          case Z3SeqNth(seq, offset) => getExpr(e, "seq.nth", seq, offset)
+          case Z3SeqContains(seq, subseq) =>
+            getExpr(e, "seq.contains", seq, subseq)
+          case Z3SeqPrefixOf(pre, subseq) =>
+            getExpr(e, "seq.prefixof", pre, subseq)
+          case Z3SeqSuffixOf(post, seq) => getExpr(e, "seq.suffixof", post, seq)
+          case Z3SeqReplace(haystack, needle, replacement) =>
+            getExpr(e, "seq.replace", haystack, needle, replacement)
+          case Z3SeqMap(f, seq) => getExpr(e, "seq.map", f, seq)
+          case Z3SeqMapI(f, offset, seq) =>
+            getExpr(e, "seq.mapi", f, offset, seq)
+          case Z3SeqFoldl(f, base, seq) => getExpr(e, "seq.foldl", f, base, seq)
+          case Z3SeqFoldlI(f, offset, base, seq) =>
+            getExpr(e, "seq.foldli", f, offset, base, seq)
+          case Z3TransitiveClosure(ref, args) =>
+            getExpr(
+              e,
+              s"(_ transitive-closure ${ref.ref.decl.o.getPreferredNameOrElse().camel})",
+              args: _*
+            )
+        }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/TrivialAddrOf.scala b/src/rewrite/vct/rewrite/TrivialAddrOf.scala
index f1a05454fa..edc400f193 100644
--- a/src/rewrite/vct/rewrite/TrivialAddrOf.scala
+++ b/src/rewrite/vct/rewrite/TrivialAddrOf.scala
@@ -1,53 +1,84 @@
 package vct.col.rewrite
 import vct.col.ast._
 import vct.col.origin._
-import vct.col.rewrite.TrivialAddrOf.{SubscriptErrorAddError, UnsupportedLocation}
+import vct.col.rewrite.TrivialAddrOf.{
+  SubscriptErrorAddError,
+  UnsupportedLocation,
+}
 import vct.col.util.AstBuildHelpers.{ExprBuildHelpers, const}
 import vct.result.VerificationError.UserError
 
 case object TrivialAddrOf extends RewriterBuilder {
   override def key: String = "trivialAddrOf"
-  override def desc: String = "Rewrite trivial instances of the address-of operator & to an expression without it."
+  override def desc: String =
+    "Rewrite trivial instances of the address-of operator & to an expression without it."
 
-  case class SubscriptErrorAddError(sub: PointerSubscript[_]) extends Blame[PointerAddError] {
-    override def blame(error: PointerAddError): Unit = error match {
-      case err: PointerNull => sub.blame.blame(err)
-      case err: PointerBounds => sub.blame.blame(err)
-    }
+  case class SubscriptErrorAddError(sub: PointerSubscript[_])
+      extends Blame[PointerAddError] {
+    override def blame(error: PointerAddError): Unit =
+      error match {
+        case err: PointerNull => sub.blame.blame(err)
+        case err: PointerBounds => sub.blame.blame(err)
+      }
   }
 
   case class UnsupportedLocation(loc: Expr[_]) extends UserError {
     override def code: String = "wrongAddrOf"
-    override def text: String = "Non-trivial instances of the address-of operator are not supported."
+    override def text: String =
+      "Non-trivial instances of the address-of operator are not supported."
   }
 }
 
 case class TrivialAddrOf[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case AddrOf(DerefPointer(p)) =>
-      dispatch(p)
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case AddrOf(DerefPointer(p)) => dispatch(p)
 
-    case AddrOf(sub @ PointerSubscript(p, i)) =>
-      PointerAdd(dispatch(p), dispatch(i))(SubscriptErrorAddError(sub))(e.o)
+      case AddrOf(sub @ PointerSubscript(p, i)) =>
+        PointerAdd(dispatch(p), dispatch(i))(SubscriptErrorAddError(sub))(e.o)
 
-    case AddrOf(other) =>
-      throw UnsupportedLocation(other)
-    case assign@PreAssignExpression(target, AddrOf(value)) if value.t.isInstanceOf[TClass[Pre]] =>
-      implicit val o: Origin = assign.o
-      val (newPointer, newTarget, newValue) = rewriteAssign(target, value, assign.blame, assign.o)
-      val newAssign = PreAssignExpression(PointerSubscript(newTarget, const[Post](0))(PanicBlame("Should always be accessible")), newValue)(assign.blame)
-      With(newPointer, newAssign)
-    case other => rewriteDefault(other)
-  }
+      case AddrOf(other) => throw UnsupportedLocation(other)
+      case assign @ PreAssignExpression(target, AddrOf(value))
+          if value.t.isInstanceOf[TClass[Pre]] =>
+        implicit val o: Origin = assign.o
+        val (newPointer, newTarget, newValue) = rewriteAssign(
+          target,
+          value,
+          assign.blame,
+          assign.o,
+        )
+        val newAssign =
+          PreAssignExpression(
+            PointerSubscript(newTarget, const[Post](0))(PanicBlame(
+              "Should always be accessible"
+            )),
+            newValue,
+          )(assign.blame)
+        With(newPointer, newAssign)
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(s: Statement[Pre]): Statement[Post] = s match {
-    case assign@Assign(target, AddrOf(value)) if value.t.isInstanceOf[TClass[Pre]] =>
-      implicit val o: Origin = assign.o
-      val (newPointer, newTarget, newValue) = rewriteAssign(target, value, assign.blame, assign.o)
-      val newAssign = Assign(PointerSubscript(newTarget, const[Post](0))(PanicBlame("Should always be accessible")), newValue)(assign.blame)
-      Block(Seq(newPointer, newAssign))
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(s: Statement[Pre]): Statement[Post] =
+    s match {
+      case assign @ Assign(target, AddrOf(value))
+          if value.t.isInstanceOf[TClass[Pre]] =>
+        implicit val o: Origin = assign.o
+        val (newPointer, newTarget, newValue) = rewriteAssign(
+          target,
+          value,
+          assign.blame,
+          assign.o,
+        )
+        val newAssign =
+          Assign(
+            PointerSubscript(newTarget, const[Post](0))(PanicBlame(
+              "Should always be accessible"
+            )),
+            newValue,
+          )(assign.blame)
+        Block(Seq(newPointer, newAssign))
+      case other => rewriteDefault(other)
+    }
 
   // TODO: AddressOff needs a more structured approach. Now you could assign a local structure to a pointer, and that pointer
   //  keeps the information, whilst in normal C this would be garbage collected away after exiting the function. E.g.
@@ -55,11 +86,21 @@ case class TrivialAddrOf[Pre <: Generation]() extends Rewriter[Pre] {
   //    struct d x;
   //    y = &x;
   //  }
-  def rewriteAssign(target: Expr[Pre], value: Expr[Pre], blame: Blame[AssignFailed], assignO: Origin): (Statement[Post], Expr[Post], Expr[Post]) = {
+  def rewriteAssign(
+      target: Expr[Pre],
+      value: Expr[Pre],
+      blame: Blame[AssignFailed],
+      assignO: Origin,
+  ): (Statement[Post], Expr[Post], Expr[Post]) = {
     implicit val o: Origin = assignO
     val newTarget = dispatch(target)
     val newValue = dispatch(value)
-    val newPointer = Eval(PreAssignExpression(newTarget, NewPointerArray(newValue.t, const[Post](1))(PanicBlame("Size is > 0")))(blame))
+    val newPointer = Eval(
+      PreAssignExpression(
+        newTarget,
+        NewPointerArray(newValue.t, const[Post](1))(PanicBlame("Size is > 0")),
+      )(blame)
+    )
     (newPointer, newTarget, newValue)
   }
 }
diff --git a/src/rewrite/vct/rewrite/TruncDivMod.scala b/src/rewrite/vct/rewrite/TruncDivMod.scala
index 4e74c38906..436f75a10b 100644
--- a/src/rewrite/vct/rewrite/TruncDivMod.scala
+++ b/src/rewrite/vct/rewrite/TruncDivMod.scala
@@ -8,18 +8,18 @@ import vct.result.VerificationError.Unreachable
 
 import scala.collection.mutable
 
-
-case class DivFailed(div:  DividingExpr[_]) extends Blame[InvocationFailure] {
-  override def blame(error: InvocationFailure): Unit = error match {
-    case PreconditionFailed(_, _, _) =>
-      div.blame.blame(ScalarDivByZero(div))
-    case other => throw Unreachable(s"Invalid invocation failure: $other")
-  }
+case class DivFailed(div: DividingExpr[_]) extends Blame[InvocationFailure] {
+  override def blame(error: InvocationFailure): Unit =
+    error match {
+      case PreconditionFailed(_, _, _) => div.blame.blame(ScalarDivByZero(div))
+      case other => throw Unreachable(s"Invalid invocation failure: $other")
+    }
 }
 
 case object TruncDivMod extends RewriterBuilder {
   override def key: String = "truncDivmod"
-  override def desc: String = "Encode truncated division and modulo using euclidean division and modulo."
+  override def desc: String =
+    "Encode truncated division and modulo using euclidean division and modulo."
 }
 
 // In most languages division and modulo are defined as `truncated`, whilst viper uses the `euclidean` definition
@@ -28,78 +28,114 @@ case object TruncDivMod extends RewriterBuilder {
 // https://www.microsoft.com/en-us/research/wp-content/uploads/2016/02/divmodnote-letter.pdf
 case class TruncDivMod[Pre <: Generation]() extends Rewriter[Pre] {
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case mod: TruncMod[Pre] => truncMod(mod)
-    case mod: TruncDiv[Pre] => truncDiv(mod)
-    case other => rewriteDefault(other)
-  }
-
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case mod: TruncMod[Pre] => truncMod(mod)
+      case mod: TruncDiv[Pre] => truncDiv(mod)
+      case other => rewriteDefault(other)
+    }
 
   val truncModFunctions: mutable.Map[Unit, Function[Post]] = mutable.Map()
   val truncDivFunctions: mutable.Map[Unit, Function[Post]] = mutable.Map()
 
   def truncMod(mod: TruncMod[Pre]): Expr[Post] = {
-    val truncModFunc = truncModFunctions.getOrElseUpdate((), makeTruncModFunction())
-    FunctionInvocation[Post](truncModFunc.ref, Seq(dispatch(mod.left), dispatch(mod.right)), Nil, Nil, Nil)(DivFailed(mod))(mod.o)
+    val truncModFunc = truncModFunctions
+      .getOrElseUpdate((), makeTruncModFunction())
+    FunctionInvocation[Post](
+      truncModFunc.ref,
+      Seq(dispatch(mod.left), dispatch(mod.right)),
+      Nil,
+      Nil,
+      Nil,
+    )(DivFailed(mod))(mod.o)
   }
 
   def truncDiv(div: TruncDiv[Pre]): Expr[Post] = {
-    val truncDiv_func = truncDivFunctions.getOrElseUpdate((), makeTruncDivFunction())
-    FunctionInvocation[Post](truncDiv_func.ref, Seq(dispatch(div.left), dispatch(div.right)), Nil, Nil, Nil)(DivFailed(div))(div.o)
+    val truncDiv_func = truncDivFunctions
+      .getOrElseUpdate((), makeTruncDivFunction())
+    FunctionInvocation[Post](
+      truncDiv_func.ref,
+      Seq(dispatch(div.left), dispatch(div.right)),
+      Nil,
+      Nil,
+      Nil,
+    )(DivFailed(div))(div.o)
   }
 
-  def truncFunctionOrigin(operator: String) = Origin(Seq(LabelContext(s"generated at `$operator` operator")))
+  def truncFunctionOrigin(operator: String) =
+    Origin(Seq(LabelContext(s"generated at `$operator` operator")))
 
   /* Make a truncated modulo function.
      It should be equivalent to
       truncMod(a,b) = let mod == (a % b) in (a >= 0 || mod == 0) ? mod : mod - abs(b)
      where / and % are euclidean division and modulo, which Viper uses as default.
-    */
+   */
   def makeTruncModFunction(): Function[Post] = {
     implicit val o: Origin = truncFunctionOrigin("%")
     val new_t = TInt[Post]()
-    val a_var = new Variable[Post](new_t)(truncFunctionOrigin("%").where(name="a"))
-    val b_var = new Variable[Post](new_t)(truncFunctionOrigin("%").where(name="b"))
+    val a_var =
+      new Variable[Post](new_t)(truncFunctionOrigin("%").where(name = "a"))
+    val b_var =
+      new Variable[Post](new_t)(truncFunctionOrigin("%").where(name = "b"))
 
     val a = Local[Post](a_var.ref)
     val b = Local[Post](b_var.ref)
     val absb = Select(b > const(0), b, UMinus(b))
 
-    globalDeclarations.declare(function[Post](
-      blame = PanicBlame("Post-condition cannot fail"),
-      contractBlame = PanicBlame("Pre-condition is always satisfiable"),
-      returnType = new_t,
-      args = Seq(a_var, b_var),
-      requires = UnitAccountedPredicate(b !== const(0)),
-      body = Some(let(new_t, a % b, (mod: Local[Post]) => Select(a >= const(0) || mod === const(0), mod, mod - absb)))
-    )(truncFunctionOrigin("%").where(name="truncMod")))
+    globalDeclarations.declare(
+      function[Post](
+        blame = PanicBlame("Post-condition cannot fail"),
+        contractBlame = PanicBlame("Pre-condition is always satisfiable"),
+        returnType = new_t,
+        args = Seq(a_var, b_var),
+        requires = UnitAccountedPredicate(b !== const(0)),
+        body = Some(let(
+          new_t,
+          a % b,
+          (mod: Local[Post]) =>
+            Select(a >= const(0) || mod === const(0), mod, mod - absb),
+        )),
+      )(truncFunctionOrigin("%").where(name = "truncMod"))
+    )
   }
 
   /* Make a truncated division function.
    It should be equivalent to
     truncDiv(a,b) = let div == (a / b) in let mod == (a % b) in (a >= 0 || mod == 0) ? div : div + (b > 0 ? 1 : -1)
    where / and % are euclidean division and modulo, which Viper uses as default.
-  */
+   */
   def makeTruncDivFunction(): Function[Post] = {
     implicit val o: Origin = truncFunctionOrigin("/")
     val new_t = TInt[Post]()
-    val a_var = new Variable[Post](new_t)(truncFunctionOrigin("/").where(name="a"))
-    val b_var = new Variable[Post](new_t)(truncFunctionOrigin("/").where(name="b"))
+    val a_var =
+      new Variable[Post](new_t)(truncFunctionOrigin("/").where(name = "a"))
+    val b_var =
+      new Variable[Post](new_t)(truncFunctionOrigin("/").where(name = "b"))
 
     val a = Local[Post](a_var.ref)
     val b = Local[Post](b_var.ref)
     val one = Select(b > const(0), const(1), const(-1))
 
-    globalDeclarations.declare(function[Post](
-      blame = PanicBlame("Post-condition cannot fail"),
-      contractBlame = PanicBlame("Pre-condition is always satisfiable"),
-      returnType = new_t,
-      args = Seq(a_var, b_var),
-      requires = UnitAccountedPredicate(b !== const(0)),
-      body = Some(let(new_t, a / b, (div: Local[Post]) =>
-        let(new_t, a % b, (mod: Local[Post]) =>
-          Select(a >= const(0) || mod === const(0), div, div + one))))
-    )(truncFunctionOrigin("/").where(name="truncDiv")))
+    globalDeclarations.declare(
+      function[Post](
+        blame = PanicBlame("Post-condition cannot fail"),
+        contractBlame = PanicBlame("Pre-condition is always satisfiable"),
+        returnType = new_t,
+        args = Seq(a_var, b_var),
+        requires = UnitAccountedPredicate(b !== const(0)),
+        body = Some(let(
+          new_t,
+          a / b,
+          (div: Local[Post]) =>
+            let(
+              new_t,
+              a % b,
+              (mod: Local[Post]) =>
+                Select(a >= const(0) || mod === const(0), div, div + one),
+            ),
+        )),
+      )(truncFunctionOrigin("/").where(name = "truncDiv"))
+    )
   }
 
-}
\ No newline at end of file
+}
diff --git a/src/rewrite/vct/rewrite/TupledQuantifiers.scala b/src/rewrite/vct/rewrite/TupledQuantifiers.scala
index 7804f55e3b..c00edb7808 100644
--- a/src/rewrite/vct/rewrite/TupledQuantifiers.scala
+++ b/src/rewrite/vct/rewrite/TupledQuantifiers.scala
@@ -10,7 +10,8 @@ import scala.collection.mutable
 
 case object TupledQuantifiers extends RewriterBuilder {
   override def key: String = "tupledQuant"
-  override def desc: String = "Collect the bindings of a quantifier into one binding: a tuple"
+  override def desc: String =
+    "Collect the bindings of a quantifier into one binding: a tuple"
 
   case class CollectedBindingsOrigin(vs: Seq[Variable[_]]) extends OriginContent
 
@@ -20,11 +21,17 @@ case object TupledQuantifiers extends RewriterBuilder {
 }
 
 case class TupledQuantifiers[Pre <: Generation]() extends Rewriter[Pre] {
-  val tupledVar: mutable.Map[Variable[Pre], (Variable[Post], Int)] = mutable.Map()
+  val tupledVar: mutable.Map[Variable[Pre], (Variable[Post], Int)] = mutable
+    .Map()
 
-  def collect(bindings: Seq[Variable[Pre]])(implicit o: Origin): Variable[Post] = {
-    val collectedBinding = new Variable[Post](TTuple(bindings.map(_.t).map(dispatch)))(
-      o.where(name = vsToString(bindings)).withContent(CollectedBindingsOrigin(bindings)))
+  def collect(
+      bindings: Seq[Variable[Pre]]
+  )(implicit o: Origin): Variable[Post] = {
+    val collectedBinding =
+      new Variable[Post](TTuple(bindings.map(_.t).map(dispatch)))(
+        o.where(name = vsToString(bindings))
+          .withContent(CollectedBindingsOrigin(bindings))
+      )
     for ((binding, i) <- bindings.zipWithIndex) {
       tupledVar(binding) = (collectedBinding, i)
     }
@@ -35,13 +42,25 @@ case class TupledQuantifiers[Pre <: Generation]() extends Rewriter[Pre] {
     implicit val o: Origin = e.o
     e match {
       case Forall(bindings, triggers, body) =>
-        Forall(Seq(collect(bindings)), triggers.map(_.map(dispatch)), dispatch(body))
+        Forall(
+          Seq(collect(bindings)),
+          triggers.map(_.map(dispatch)),
+          dispatch(body),
+        )
 
       case Exists(bindings, triggers, body) =>
-        Exists(Seq(collect(bindings)), triggers.map(_.map(dispatch)), dispatch(body))
+        Exists(
+          Seq(collect(bindings)),
+          triggers.map(_.map(dispatch)),
+          dispatch(body),
+        )
 
       case s @ Starall(bindings, triggers, body) =>
-        Starall(Seq(collect(bindings)), triggers.map(_.map(dispatch)), dispatch(body))(s.blame)
+        Starall(
+          Seq(collect(bindings)),
+          triggers.map(_.map(dispatch)),
+          dispatch(body),
+        )(s.blame)
 
       case Local(Ref(v)) if tupledVar.contains(v) =>
         TupGet(Local(tupledVar(v)._1.ref), tupledVar(v)._2)
diff --git a/src/rewrite/vct/rewrite/TypeValues.scala b/src/rewrite/vct/rewrite/TypeValues.scala
index f33ab3741a..1521c43c5b 100644
--- a/src/rewrite/vct/rewrite/TypeValues.scala
+++ b/src/rewrite/vct/rewrite/TypeValues.scala
@@ -4,13 +4,14 @@ import vct.col.ast._
 import vct.col.rewrite.{Generation, Rewriter, Rewritten}
 
 case class TypeValues[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] = e match {
-    case TypeValue(t) => ???
-    case TypeOf(value) => ???
-    case InstanceOf(value, typeValue) => ???
-    case Cast(value, typeValue) => ???
-    case SubType(left, right) => ???
-    case SuperType(left, right) => ???
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] =
+    e match {
+      case TypeValue(t) => ???
+      case TypeOf(value) => ???
+      case InstanceOf(value, typeValue) => ???
+      case Cast(value, typeValue) => ???
+      case SubType(left, right) => ???
+      case SuperType(left, right) => ???
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/UntupledQuantifiers.scala b/src/rewrite/vct/rewrite/UntupledQuantifiers.scala
index dec3528da4..90a693370f 100644
--- a/src/rewrite/vct/rewrite/UntupledQuantifiers.scala
+++ b/src/rewrite/vct/rewrite/UntupledQuantifiers.scala
@@ -10,56 +10,86 @@ import scala.collection.mutable
 
 case object UntupledQuantifiers extends RewriterBuilder {
   override def key: String = "untupledQuant"
-  override def desc: String = "Expand out bindings in quantifiers, such as tuples"
+  override def desc: String =
+    "Expand out bindings in quantifiers, such as tuples"
 }
 
 case class UntupledQuantifiers[Pre <: Generation]() extends Rewriter[Pre] {
   val bindingValue: ScopedStack[Map[Variable[Pre], Expr[Post]]] = ScopedStack()
 
-  def expand(bindings: Seq[Variable[Pre]],
-             builder: Seq[Variable[Post]] => Expr[Post],
-             joiner: (Expr[Post], Expr[Post]) => Expr[Post],
-             initBindings: Seq[Variable[Post]] = Nil)(implicit o: Origin): Expr[Post] = {
+  def expand(
+      bindings: Seq[Variable[Pre]],
+      builder: Seq[Variable[Post]] => Expr[Post],
+      joiner: (Expr[Post], Expr[Post]) => Expr[Post],
+      initBindings: Seq[Variable[Post]] = Nil,
+  )(implicit o: Origin): Expr[Post] = {
 
-    if(bindings.isEmpty) return builder(initBindings)
+    if (bindings.isEmpty)
+      return builder(initBindings)
 
     bindings.head.t match {
-      case TBool() => joiner(
-        bindingValue.having(Map(bindings.head -> ff)) { expand(bindings.tail, builder, joiner, initBindings) },
-        bindingValue.having(Map(bindings.head -> tt)) { expand(bindings.tail, builder, joiner, initBindings) },
-      )
+      case TBool() =>
+        joiner(
+          bindingValue.having(Map(bindings.head -> ff)) {
+            expand(bindings.tail, builder, joiner, initBindings)
+          },
+          bindingValue.having(Map(bindings.head -> tt)) {
+            expand(bindings.tail, builder, joiner, initBindings)
+          },
+        )
       case TTuple(preTs) =>
         val ts = preTs.map(dispatch)
-        val vs = ts.zipWithIndex.map { case (t, i) => new Variable[Post](t)(bindings.head.o.originContents.collectFirst{
-          case TupledQuantifiers.CollectedBindingsOrigin(vs) => vs(i).o
-          case _ => o
-          }.get
-        )
+        val vs = ts.zipWithIndex.map { case (t, i) =>
+          new Variable[Post](t)(bindings.head.o.originContents.collectFirst {
+            case TupledQuantifiers.CollectedBindingsOrigin(vs) => vs(i).o
+            case _ => o
+          }.get)
         }
         val value = LiteralTuple[Post](ts, vs.map(_.get))
-        bindingValue.having(Map(bindings.head -> value)) { expand(bindings.tail, builder, joiner, initBindings ++ vs) }
+        bindingValue.having(Map(bindings.head -> value)) {
+          expand(bindings.tail, builder, joiner, initBindings ++ vs)
+        }
 
       case other =>
         val v = new Variable[Post](dispatch(other))
-        bindingValue.having(Map(bindings.head -> v.get)) { expand(bindings.tail, builder, joiner, initBindings :+ v) }
+        bindingValue.having(Map(bindings.head -> v.get)) {
+          expand(bindings.tail, builder, joiner, initBindings :+ v)
+        }
     }
   }
 
-
   override def dispatch(e: Expr[Pre]): Expr[Rewritten[Pre]] = {
     implicit val o: Origin = e.o
     e match {
       case Forall(bindings, triggers, body) =>
-        expand(bindings, bindings => Forall(bindings, triggers.map(_.map(dispatch)), dispatch(body)), And(_, _))
+        expand(
+          bindings,
+          bindings =>
+            Forall(bindings, triggers.map(_.map(dispatch)), dispatch(body)),
+          And(_, _),
+        )
       case Exists(bindings, triggers, body) =>
-        expand(bindings, bindings => Exists(bindings, triggers.map(_.map(dispatch)), dispatch(body)), Or(_, _))
+        expand(
+          bindings,
+          bindings =>
+            Exists(bindings, triggers.map(_.map(dispatch)), dispatch(body)),
+          Or(_, _),
+        )
       case s @ Starall(bindings, triggers, body) =>
-        expand(bindings, bindings => Starall(bindings, triggers.map(_.map(dispatch)), dispatch(body))(s.blame), Star(_, _))
+        expand(
+          bindings,
+          bindings =>
+            Starall(bindings, triggers.map(_.map(dispatch)), dispatch(body))(
+              s.blame
+            ),
+          Star(_, _),
+        )
 
-      case TupGet(v, i) => dispatch(v) match {
-        case LiteralTuple(_, vs) => vs(i)
-        case other => TupGet(other, i)
-      }
+      case TupGet(v, i) =>
+        dispatch(v) match {
+          case LiteralTuple(_, vs) => vs(i)
+          case other => TupGet(other, i)
+        }
 
       case Local(Ref(v)) if bindingValue.exists(_.contains(v)) =>
         bindingValue.find(_.contains(v)).get(v)
diff --git a/src/rewrite/vct/rewrite/adt/ImportADT.scala b/src/rewrite/vct/rewrite/adt/ImportADT.scala
index 083b57b749..08b35817d7 100644
--- a/src/rewrite/vct/rewrite/adt/ImportADT.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportADT.scala
@@ -17,85 +17,98 @@ trait ImportADTImporter {
   def loadAdt[G](name: String): Program[G]
 }
 
-abstract class ImportADTBuilder(adt: String) extends RewriterBuilderArg[ImportADTImporter] {
+abstract class ImportADTBuilder(adt: String)
+    extends RewriterBuilderArg[ImportADTImporter] {
   override def key: String = "adt" + adt.capitalize
-  override def desc: String = s"Import types into vercors that are defined externally, usually via an axiomatic datatype. This pass imports $adt."
+  override def desc: String =
+    s"Import types into vercors that are defined externally, usually via an axiomatic datatype. This pass imports $adt."
 }
 
 case object ImportADT {
-  def typeText(t: Type[_]): String = t match {
-    case _: TNotAValue[_] => throw ExtraNode
-    case TVoid() => "void"
-    case TBool() => "bool"
-    case single: TFloat[_] if single == TFloats.ieee754_32bit => s"float32"
-    case double: TFloat[_] if double == TFloats.ieee754_32bit => s"float64"
-    case TFloat(exponent, mantissa) => s"float${exponent}m$mantissa"
-    case TChar() => "char"
-    case TString() => "string"
-    case TRef() => "ref"
-    case TArray(element) => "arr_" + typeText(element)
-    case TPointer(element) => "ptr_" + typeText(element)
-    case TProcess() => "proc"
-    case TModel(Ref(model)) => model.o.getPreferredNameOrElse().camel
-    case TAxiomatic(Ref(adt), args) => args match {
-      case Nil => adt.o.getPreferredNameOrElse().camel
-      case ts => adt.o.getPreferredNameOrElse().camel + "$" + ts.map(typeText).mkString("__") + "$"
+  def typeText(t: Type[_]): String =
+    t match {
+      case _: TNotAValue[_] => throw ExtraNode
+      case TVoid() => "void"
+      case TBool() => "bool"
+      case single: TFloat[_] if single == TFloats.ieee754_32bit => s"float32"
+      case double: TFloat[_] if double == TFloats.ieee754_32bit => s"float64"
+      case TFloat(exponent, mantissa) => s"float${exponent}m$mantissa"
+      case TChar() => "char"
+      case TString() => "string"
+      case TRef() => "ref"
+      case TArray(element) => "arr_" + typeText(element)
+      case TPointer(element) => "ptr_" + typeText(element)
+      case TProcess() => "proc"
+      case TModel(Ref(model)) => model.o.getPreferredNameOrElse().camel
+      case TAxiomatic(Ref(adt), args) =>
+        args match {
+          case Nil => adt.o.getPreferredNameOrElse().camel
+          case ts =>
+            adt.o.getPreferredNameOrElse().camel + "$" + ts.map(typeText)
+              .mkString("__") + "$"
+        }
+      case TOption(element) => "opt_" + typeText(element)
+      case TTuple(elements) =>
+        "tup$" + elements.map(typeText).mkString("__") + "$"
+      case TEither(left, right) =>
+        "either$" + typeText(left) + "__" + typeText(right) + "$"
+      case TSeq(element) => "seq_" + typeText(element)
+      case TSet(element) => "set_" + typeText(element)
+      case TVector(size, element) =>
+        "vector" + size.toString + "_" + typeText(element)
+      case TBag(element) => "bag_" + typeText(element)
+      case TMatrix(element) => "mat_" + typeText(element)
+      case TType(t) => "typ_" + typeText(t)
+      case TAny() => "top"
+      case TAnyValue() => "any"
+      case TNothing() => "nothing"
+      case TNull() => "null"
+      case TResource() => "res"
+      case TInt() => "int"
+      case TBoundedInt(gte, lt) => "int"
+      case TRational() => "rat"
+      case TFraction() => "fract"
+      case TZFraction() => "zfract"
+      case TMap(key, value) =>
+        "map$" + typeText(key) + "__" + typeText(value) + "$"
+      case TClass(Ref(cls), _) => cls.o.getPreferredNameOrElse().camel
+      case TVar(Ref(v)) => v.o.getPreferredNameOrElse().camel
+      case TUnion(ts) => "union" + ts.map(typeText).mkString("$", "__", "$")
+      case SilverPartialTAxiomatic(Ref(adt), _) =>
+        adt.o.getPreferredNameOrElse().camel
+      case TAnyClass() => "cls"
+      case TEnum(Ref(enum)) => enum.o.getPreferredNameOrElse().camel
+      case TProverType(Ref(t)) => t.o.getPreferredNameOrElse().camel
+      case TChoreography(Ref(prog)) => prog.o.getPreferredNameOrElse().camel
+      case TPVLChoreography(Ref(prog)) => prog.o.getPreferredNameOrElse().camel
+      case TSmtlibArray(index, value) =>
+        "smtarr" + (index :+ value).map(typeText).mkString("$", "__", "$")
+      case TSmtlibBitVector(size) => s"bitvec$size"
+      case TSmtlibFloatingPoint(e, m) => s"fp_${e}_$m"
+      case TSmtlibRegLan() => "reglan"
+      case TSmtlibRoundingMode() => "roundingmode"
+      case TSmtlibSeq(t) => "smtseq$" + typeText(t) + "$"
+      case TSmtlibString() => "smtstr"
+      case TVeyMontChannel(t) => "veymontchan$" + t + "$"
+      case TEndpoint(Ref(thread)) => thread.o.getPreferredNameOrElse().camel
+      case TResourceVal() => "resource"
+      case _: JavaType[_] => throw ExtraNode
+      case _: CType[_] => throw ExtraNode
+      case _: CPPType[_] => throw ExtraNode
+      case _: PVLType[_] => throw ExtraNode
+      case _: SYCLTClass[_] => throw ExtraNode
     }
-    case TOption(element) => "opt_" + typeText(element)
-    case TTuple(elements) => "tup$" + elements.map(typeText).mkString("__") + "$"
-    case TEither(left, right) => "either$" + typeText(left) + "__" + typeText(right) + "$"
-    case TSeq(element) => "seq_" + typeText(element)
-    case TSet(element) => "set_" + typeText(element)
-    case TVector(size, element) => "vector" + size.toString + "_" + typeText(element)
-    case TBag(element) => "bag_" + typeText(element)
-    case TMatrix(element) => "mat_" + typeText(element)
-    case TType(t) => "typ_" + typeText(t)
-    case TAny() => "top"
-    case TAnyValue() => "any"
-    case TNothing() => "nothing"
-    case TNull() => "null"
-    case TResource() => "res"
-    case TInt() => "int"
-    case TBoundedInt(gte, lt) => "int"
-    case TRational() => "rat"
-    case TFraction() => "fract"
-    case TZFraction() => "zfract"
-    case TMap(key, value) => "map$" + typeText(key) + "__" + typeText(value) + "$"
-    case TClass(Ref(cls), _) => cls.o.getPreferredNameOrElse().camel
-    case TVar(Ref(v)) => v.o.getPreferredNameOrElse().camel
-    case TUnion(ts) => "union" + ts.map(typeText).mkString("$", "__", "$")
-    case SilverPartialTAxiomatic(Ref(adt), _) => adt.o.getPreferredNameOrElse().camel
-    case TAnyClass() => "cls"
-    case TEnum(Ref(enum)) => enum.o.getPreferredNameOrElse().camel
-    case TProverType(Ref(t)) => t.o.getPreferredNameOrElse().camel
-    case TChoreography(Ref(prog)) => prog.o.getPreferredNameOrElse().camel
-    case TPVLChoreography(Ref(prog)) => prog.o.getPreferredNameOrElse().camel
-    case TSmtlibArray(index, value) => "smtarr" + (index :+ value).map(typeText).mkString("$" , "__", "$")
-    case TSmtlibBitVector(size) => s"bitvec$size"
-    case TSmtlibFloatingPoint(e, m) => s"fp_${e}_$m"
-    case TSmtlibRegLan() => "reglan"
-    case TSmtlibRoundingMode() => "roundingmode"
-    case TSmtlibSeq(t) => "smtseq$" + typeText(t) + "$"
-    case TSmtlibString() => "smtstr"
-    case TVeyMontChannel(t) => "veymontchan$" + t + "$"
-    case TEndpoint(Ref(thread)) => thread.o.getPreferredNameOrElse().camel
-    case TResourceVal() => "resource"
-    case _: JavaType[_] => throw ExtraNode
-    case _: CType[_] => throw ExtraNode
-    case _: CPPType[_] => throw ExtraNode
-    case _: PVLType[_] => throw ExtraNode
-    case _: SYCLTClass[_] => throw ExtraNode
-  }
 }
 
-abstract class ImportADT[Pre <: Generation](importer: ImportADTImporter) extends CoercingRewriter[Pre] {
+abstract class ImportADT[Pre <: Generation](importer: ImportADTImporter)
+    extends CoercingRewriter[Pre] {
   val globalBlame: ScopedStack[Blame[UnsafeCoercion]] = ScopedStack()
 
   override def postCoerce(program: Program[Pre]): Program[Post] = {
     globalBlame.having(program.blame) {
-      program.rewrite(declarations = globalDeclarations.collect {
-        program.declarations.foreach(dispatch)
-      }._1)
+      program.rewrite(declarations =
+        globalDeclarations.collect { program.declarations.foreach(dispatch) }._1
+      )
     }
   }
 
@@ -105,12 +118,14 @@ abstract class ImportADT[Pre <: Generation](importer: ImportADTImporter) extends
     program.declarations.map(succProvider.computeSucc).map(_.get)
   }
 
-  protected def find[T](decls: Seq[Declaration[Post]], name: String)(implicit tag: ClassTag[T]): T =
+  protected def find[T](decls: Seq[Declaration[Post]], name: String)(
+      implicit tag: ClassTag[T]
+  ): T =
     decls.collectFirst {
-      case decl: T if decl.o.find[SourceName].contains(SourceName(name)) =>
-        decl
+      case decl: T if decl.o.find[SourceName].contains(SourceName(name)) => decl
     }.get
 
-  protected def find[T](decls: Declarator[Post], name: String)(implicit tag: ClassTag[T]): T =
-    find(decls.declarations, name)(tag)
+  protected def find[T](decls: Declarator[Post], name: String)(
+      implicit tag: ClassTag[T]
+  ): T = find(decls.declarations, name)(tag)
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportAny.scala b/src/rewrite/vct/rewrite/adt/ImportAny.scala
index 39817d469c..0e2ee97e58 100644
--- a/src/rewrite/vct/rewrite/adt/ImportAny.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportAny.scala
@@ -1,14 +1,26 @@
 package vct.col.rewrite.adt
 
 import hre.util.ScopedStack
-import vct.col.ast.{AxiomaticDataType, CoerceSomethingAnyValue, Coercion, Expr, Function, FunctionInvocation, TAnyValue, TAxiomatic, TType, Type}
+import vct.col.ast.{
+  AxiomaticDataType,
+  CoerceSomethingAnyValue,
+  Coercion,
+  Expr,
+  Function,
+  FunctionInvocation,
+  TAnyValue,
+  TAxiomatic,
+  TType,
+  Type,
+}
 import vct.col.origin.{Origin, PanicBlame}
 import vct.col.ref.LazyRef
 import vct.col.rewrite.Generation
 
 case object ImportAny extends ImportADTBuilder("any")
 
-case class ImportAny[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportAny[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   val inAnyLoad: ScopedStack[Unit] = ScopedStack()
 
   private lazy val anyFile = inAnyLoad.having(()) { parse("any") }
@@ -16,18 +28,30 @@ case class ImportAny[Pre <: Generation](importer: ImportADTImporter) extends Imp
   private lazy val anyAdt = find[AxiomaticDataType[Post]](anyFile, "any")
   private lazy val anyFrom = find[Function[Post]](anyFile, "as_any")
 
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = coercion match {
-    case CoerceSomethingAnyValue(source) =>
-      FunctionInvocation[Post](anyFrom.ref, Seq(e), Seq(dispatch(source)), Nil, Nil)(PanicBlame("coercing to any requires nothing."))
-    case other => super.applyCoercion(e, other)
-  }
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    coercion match {
+      case CoerceSomethingAnyValue(source) =>
+        FunctionInvocation[Post](
+          anyFrom.ref,
+          Seq(e),
+          Seq(dispatch(source)),
+          Nil,
+          Nil,
+        )(PanicBlame("coercing to any requires nothing."))
+      case other => super.applyCoercion(e, other)
+    }
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TType(TAnyValue()) =>
-      // Only the any adt definition refers to itself, so this is the only place this trick is necessary.
-      if(inAnyLoad.isEmpty) rewriteDefault(t)
-      else TType(TAxiomatic(new LazyRef(anyAdt), Nil))
-    case TAnyValue() => TAxiomatic(anyAdt.ref, Nil)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TType(TAnyValue()) =>
+        // Only the any adt definition refers to itself, so this is the only place this trick is necessary.
+        if (inAnyLoad.isEmpty)
+          rewriteDefault(t)
+        else
+          TType(TAxiomatic(new LazyRef(anyAdt), Nil))
+      case TAnyValue() => TAxiomatic(anyAdt.ref, Nil)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportArray.scala b/src/rewrite/vct/rewrite/adt/ImportArray.scala
index c49d2fcc64..dbc70a7bec 100644
--- a/src/rewrite/vct/rewrite/adt/ImportArray.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportArray.scala
@@ -11,30 +11,33 @@ import vct.col.rewrite.Generation
 import scala.collection.mutable
 
 case object ImportArray extends ImportADTBuilder("array") {
-  private def ArrayField(t: Type[_]): Origin = Origin(
-    Seq(
-      PreferredName(Seq(typeText(t))),
-      LabelContext("array field"),
-    )
-  )
-
-  case class ArrayNullOptNone(inner: Blame[ArrayNull], expr: Expr[_]) extends Blame[OptionNone] {
-    override def blame(error: OptionNone): Unit =
-      inner.blame(ArrayNull(expr))
+  private def ArrayField(t: Type[_]): Origin =
+    Origin(Seq(PreferredName(Seq(typeText(t))), LabelContext("array field")))
+
+  case class ArrayNullOptNone(inner: Blame[ArrayNull], expr: Expr[_])
+      extends Blame[OptionNone] {
+    override def blame(error: OptionNone): Unit = inner.blame(ArrayNull(expr))
   }
 
-  case class ArrayBoundsPreconditionFailed(inner: Blame[ArrayBounds], subscript: Node[_]) extends Blame[PreconditionFailed] {
+  case class ArrayBoundsPreconditionFailed(
+      inner: Blame[ArrayBounds],
+      subscript: Node[_],
+  ) extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       inner.blame(ArrayBounds(subscript))
   }
 
-  case class ArrayFieldInsufficientPermission(inner: Blame[ArrayInsufficientPermission], expr: Expr[_]) extends Blame[InsufficientPermission] {
+  case class ArrayFieldInsufficientPermission(
+      inner: Blame[ArrayInsufficientPermission],
+      expr: Expr[_],
+  ) extends Blame[InsufficientPermission] {
     override def blame(error: InsufficientPermission): Unit =
       inner.blame(ArrayInsufficientPermission(expr))
   }
 }
 
-case class ImportArray[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportArray[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   import ImportArray._
 
   private lazy val arrayFile = parse("array")
@@ -48,46 +51,64 @@ case class ImportArray[Pre <: Generation](importer: ImportADTImporter) extends I
 
   private def getArrayField(arr: Expr[Pre]): Ref[Post, SilverField[Post]] = {
     val tElement = arr.t.asArray.get.element
-    arrayField.getOrElseUpdate(tElement, {
-      globalDeclarations.declare(new SilverField(dispatch(tElement))(ArrayField(tElement)))
-    }).ref
+    arrayField.getOrElseUpdate(
+      tElement, {
+        globalDeclarations
+          .declare(new SilverField(dispatch(tElement))(ArrayField(tElement)))
+      },
+    ).ref
   }
 
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = coercion match {
-    case CoerceNullArray(_) => OptNoneTyped(TAxiomatic(arrayAdt.ref, Nil))
-    case other => super.applyCoercion(e, other)
-  }
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    coercion match {
+      case CoerceNullArray(_) => OptNoneTyped(TAxiomatic(arrayAdt.ref, Nil))
+      case other => super.applyCoercion(e, other)
+    }
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TArray(_) => TOption(TAxiomatic(arrayAdt.ref, Nil))
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TArray(_) => TOption(TAxiomatic(arrayAdt.ref, Nil))
+      case other => rewriteDefault(other)
+    }
+
+  override def postCoerce(location: Location[Pre]): Location[Post] =
+    location match {
+      case loc @ ArrayLocation(arr, index) =>
+        SilverFieldLocation(
+          obj =
+            FunctionInvocation[Post](
+              ref = arrayLoc.ref,
+              args = Seq(
+                OptGet(dispatch(arr))(ArrayNullOptNone(loc.blame, arr))(arr.o),
+                dispatch(index),
+              ),
+              typeArgs = Nil,
+              Nil,
+              Nil,
+            )(NoContext(ArrayBoundsPreconditionFailed(loc.blame, loc)))(loc.o),
+          field = getArrayField(arr),
+        )(loc.o)
+      case other => rewriteDefault(other)
+    }
 
-  override def postCoerce(location: Location[Pre]): Location[Post] = location match {
-    case loc@ArrayLocation(arr, index) =>
-      SilverFieldLocation(
-        obj = FunctionInvocation[Post](
+  def rewriteTopLevelArraySubscriptsInTrigger(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case sub @ ArraySubscript(arr, index) =>
+        implicit val o: Origin = e.o
+        FunctionInvocation[Post](
           ref = arrayLoc.ref,
           args = Seq(
-            OptGet(dispatch(arr))(ArrayNullOptNone(loc.blame, arr))(arr.o),
-            dispatch(index)),
-          typeArgs = Nil, Nil, Nil)(NoContext(ArrayBoundsPreconditionFailed(loc.blame, loc)))(loc.o),
-        field = getArrayField(arr),
-      )(loc.o)
-    case other => rewriteDefault(other)
-  }
-
-  def rewriteTopLevelArraySubscriptsInTrigger(e: Expr[Pre]): Expr[Post] = e match {
-    case sub @ ArraySubscript(arr, index) =>
-      implicit val o: Origin = e.o
-      FunctionInvocation[Post](
-        ref = arrayLoc.ref,
-        args = Seq(
-          OptGet(dispatch(arr))(ArrayNullOptNone(sub.blame, arr))(arr.o),
-          dispatch(index)),
-          typeArgs = Nil, Nil, Nil)(NoContext(ArrayBoundsPreconditionFailed(sub.blame, sub)))
-    case other => rewriteDefault(other)
-  }
+            OptGet(dispatch(arr))(ArrayNullOptNone(sub.blame, arr))(arr.o),
+            dispatch(index),
+          ),
+          typeArgs = Nil,
+          Nil,
+          Nil,
+        )(NoContext(ArrayBoundsPreconditionFailed(sub.blame, sub)))
+      case other => rewriteDefault(other)
+    }
 
   override def postCoerce(e: Expr[Pre]): Expr[Post] = {
     implicit val o: Origin = e.o
@@ -104,21 +125,27 @@ case class ImportArray[Pre <: Generation](importer: ImportADTImporter) extends I
         e.rewrite(triggers =
           triggers.map(_.map(rewriteTopLevelArraySubscriptsInTrigger))
         )
-      case sub@ArraySubscript(arr, index) =>
+      case sub @ ArraySubscript(arr, index) =>
         SilverDeref(
           FunctionInvocation[Post](
             ref = arrayLoc.ref,
             args = Seq(
               OptGet(dispatch(arr))(ArrayNullOptNone(sub.blame, arr))(arr.o),
-              dispatch(index)),
-            typeArgs = Nil, Nil, Nil)(NoContext(ArrayBoundsPreconditionFailed(sub.blame, sub))),
-          field = getArrayField(arr))(ArrayFieldInsufficientPermission(sub.blame, sub))
-      case length@Length(arr) =>
-        ADTFunctionInvocation(None, arrayLen.ref, Seq(
-          OptGet(dispatch(arr))(ArrayNullOptNone(length.blame, arr))(arr.o)
-        ))
+              dispatch(index),
+            ),
+            typeArgs = Nil,
+            Nil,
+            Nil,
+          )(NoContext(ArrayBoundsPreconditionFailed(sub.blame, sub))),
+          field = getArrayField(arr),
+        )(ArrayFieldInsufficientPermission(sub.blame, sub))
+      case length @ Length(arr) =>
+        ADTFunctionInvocation(
+          None,
+          arrayLen.ref,
+          Seq(OptGet(dispatch(arr))(ArrayNullOptNone(length.blame, arr))(arr.o)),
+        )
       case other => rewriteDefault(other)
     }
   }
 }
-
diff --git a/src/rewrite/vct/rewrite/adt/ImportBag.scala b/src/rewrite/vct/rewrite/adt/ImportBag.scala
index 73f9f0404e..bee25e9580 100644
--- a/src/rewrite/vct/rewrite/adt/ImportBag.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportBag.scala
@@ -6,7 +6,8 @@ import vct.col.rewrite.Generation
 
 case object ImportBag extends ImportADTBuilder("bag")
 
-case class ImportBag[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportBag[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   private lazy val bagFile = parse("bag")
 
   private lazy val bagAdt = find[AxiomaticDataType[Post]](bagFile, "bag")
@@ -15,108 +16,131 @@ case class ImportBag[Pre <: Generation](importer: ImportADTImporter) extends Imp
   private lazy val bagSize = find[ADTFunction[Post]](bagAdt, "bag_size")
   private lazy val bagCount = find[ADTFunction[Post]](bagAdt, "bag_count")
   private lazy val bagEmpty = find[ADTFunction[Post]](bagAdt, "bag_empty")
-  private lazy val bagSingleton = find[ADTFunction[Post]](bagAdt, "bag_singleton")
-  private lazy val bagUnionOne = find[ADTFunction[Post]](bagAdt, "bag_union_one")
+  private lazy val bagSingleton = find[ADTFunction[Post]](
+    bagAdt,
+    "bag_singleton",
+  )
+  private lazy val bagUnionOne = find[ADTFunction[Post]](
+    bagAdt,
+    "bag_union_one",
+  )
   private lazy val bagUnion = find[ADTFunction[Post]](bagAdt, "bag_union")
-  private lazy val bagIntersection = find[ADTFunction[Post]](bagAdt, "bag_intersection")
-  private lazy val bagDifference = find[ADTFunction[Post]](bagAdt, "bag_difference")
+  private lazy val bagIntersection = find[ADTFunction[Post]](
+    bagAdt,
+    "bag_intersection",
+  )
+  private lazy val bagDifference = find[ADTFunction[Post]](
+    bagAdt,
+    "bag_difference",
+  )
   private lazy val bagSubbag = find[ADTFunction[Post]](bagAdt, "bag_subbag")
   private lazy val bagEqual = find[ADTFunction[Post]](bagAdt, "bag_equal")
   private lazy val bagSkolem = find[ADTFunction[Post]](bagAdt, "bag_skolem")
   private lazy val bagDisjoint = find[ADTFunction[Post]](bagAdt, "bag_disjoint")
-  private lazy val bagDisjointSkolem = find[ADTFunction[Post]](bagAdt, "bag_disjoint_skolem")
-
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TBag(inner) => TAxiomatic[Post](bagAdt.ref, Seq(dispatch(inner)))(t.o)
-    case other => rewriteDefault(other)
-  }
-
-  def typeArgs(xs: Expr[Pre]): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
+  private lazy val bagDisjointSkolem = find[ADTFunction[Post]](
+    bagAdt,
+    "bag_disjoint_skolem",
+  )
+
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TBag(inner) =>
+        TAxiomatic[Post](bagAdt.ref, Seq(dispatch(inner)))(t.o)
+      case other => rewriteDefault(other)
+    }
+
+  def typeArgs(
+      xs: Expr[Pre]
+  ): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
     typeArgs(xs.t.asBag.get.element)
 
-  def typeArgs(t: Type[Pre]): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
+  def typeArgs(
+      t: Type[Pre]
+  ): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
     Some((bagAdt.ref, Seq(dispatch(t))))
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case Size(xs) if xs.t.asBag.nonEmpty =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs),
-        ref = bagSize.ref,
-        args = Seq(dispatch(xs)),
-      )(e.o)
-
-    case BagMemberCount(x, xs) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs),
-        ref = bagCount.ref,
-        args = Seq(dispatch(xs), dispatch(x)),
-      )(e.o)
-
-    case LiteralBag(element, Nil) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(element),
-        ref = bagEmpty.ref,
-        args = Nil,
-      )(e.o)
-
-    case LiteralBag(element, x +: xs) =>
-      xs.foldLeft(
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case Size(xs) if xs.t.asBag.nonEmpty =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs),
+          ref = bagSize.ref,
+          args = Seq(dispatch(xs)),
+        )(e.o)
+
+      case BagMemberCount(x, xs) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs),
+          ref = bagCount.ref,
+          args = Seq(dispatch(xs), dispatch(x)),
+        )(e.o)
+
+      case LiteralBag(element, Nil) =>
         ADTFunctionInvocation[Post](
           typeArgs = typeArgs(element),
-          ref = bagSingleton.ref,
-          args = Seq(dispatch(x)),
+          ref = bagEmpty.ref,
+          args = Nil,
         )(e.o)
-      ) {
-        case (init, next) =>
+
+      case LiteralBag(element, x +: xs) =>
+        xs.foldLeft(
+          ADTFunctionInvocation[Post](
+            typeArgs = typeArgs(element),
+            ref = bagSingleton.ref,
+            args = Seq(dispatch(x)),
+          )(e.o)
+        ) { case (init, next) =>
           ADTFunctionInvocation[Post](
             typeArgs = typeArgs(element),
             ref = bagUnionOne.ref,
             args = Seq(init, dispatch(next)),
           )(e.o)
-      }
-
-    case union @ BagAdd(xs, ys) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(union.t.element),
-        ref = bagUnion.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case int @ BagLargestCommon(xs, ys) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(int.t.element),
-        ref = bagIntersection.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case min @ BagMinus(xs, ys) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(min.t.element),
-        ref = bagDifference.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case sub @ SubBagEq(xs, ys) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(sub.comparisonType.asBag.get.element),
-        ref = bagSubbag.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case eq @ Eq(xs, ys) if eq.comparisonType.asBag.nonEmpty =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(eq.comparisonType.asBag.get.element),
-        ref = bagEqual.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case neq @ Neq(xs, ys) if neq.comparisonType.asBag.nonEmpty =>
-      Not(ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(neq.comparisonType.asBag.get.element),
-        ref = bagEqual.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o))(e.o)
-
-    case other => rewriteDefault(other)
-  }
+        }
+
+      case union @ BagAdd(xs, ys) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(union.t.element),
+          ref = bagUnion.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case int @ BagLargestCommon(xs, ys) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(int.t.element),
+          ref = bagIntersection.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case min @ BagMinus(xs, ys) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(min.t.element),
+          ref = bagDifference.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case sub @ SubBagEq(xs, ys) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(sub.comparisonType.asBag.get.element),
+          ref = bagSubbag.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case eq @ Eq(xs, ys) if eq.comparisonType.asBag.nonEmpty =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(eq.comparisonType.asBag.get.element),
+          ref = bagEqual.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case neq @ Neq(xs, ys) if neq.comparisonType.asBag.nonEmpty =>
+        Not(
+          ADTFunctionInvocation[Post](
+            typeArgs = typeArgs(neq.comparisonType.asBag.get.element),
+            ref = bagEqual.ref,
+            args = Seq(dispatch(xs), dispatch(ys)),
+          )(e.o)
+        )(e.o)
+
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportEither.scala b/src/rewrite/vct/rewrite/adt/ImportEither.scala
index c401b8c76f..ac894c5140 100644
--- a/src/rewrite/vct/rewrite/adt/ImportEither.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportEither.scala
@@ -1,81 +1,121 @@
 package vct.col.rewrite.adt
 
 import vct.col.ast._
-import vct.col.origin.{Blame, NoContext, NotLeft, NotRight, Origin, PreconditionFailed}
+import vct.col.origin.{
+  Blame,
+  NoContext,
+  NotLeft,
+  NotRight,
+  Origin,
+  PreconditionFailed,
+}
 import vct.col.rewrite.Generation
 
 case object ImportEither extends ImportADTBuilder("either") {
-  case class NotLeftPreconditionFailed(get: GetLeft[_]) extends Blame[PreconditionFailed] {
+  case class NotLeftPreconditionFailed(get: GetLeft[_])
+      extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       get.blame.blame(NotLeft(get))
   }
 
-  case class NotRightPreconditionFailed(get: GetRight[_]) extends Blame[PreconditionFailed] {
+  case class NotRightPreconditionFailed(get: GetRight[_])
+      extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       get.blame.blame(NotRight(get))
   }
 }
 
-case class ImportEither[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportEither[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   import ImportEither._
 
   private lazy val eitherFile = parse("either")
 
-  private lazy val eitherAdt = find[AxiomaticDataType[Post]](eitherFile, "either")
+  private lazy val eitherAdt = find[AxiomaticDataType[Post]](
+    eitherFile,
+    "either",
+  )
   private lazy val eitherLeft = find[ADTFunction[Post]](eitherAdt, "left")
   private lazy val eitherRight = find[ADTFunction[Post]](eitherAdt, "right")
-  private lazy val eitherIsRight = find[ADTFunction[Post]](eitherAdt, "is_right")
-  private lazy val eitherAxGetLeft = find[ADTFunction[Post]](eitherAdt, "either_get_left")
-  private lazy val eitherAxGetRight = find[ADTFunction[Post]](eitherAdt, "either_get_right")
+  private lazy val eitherIsRight = find[ADTFunction[Post]](
+    eitherAdt,
+    "is_right",
+  )
+  private lazy val eitherAxGetLeft = find[ADTFunction[Post]](
+    eitherAdt,
+    "either_get_left",
+  )
+  private lazy val eitherAxGetRight = find[ADTFunction[Post]](
+    eitherAdt,
+    "either_get_right",
+  )
   private lazy val eitherGetLeft = find[Function[Post]](eitherFile, "get_left")
-  private lazy val eitherGetRight = find[Function[Post]](eitherFile, "get_right")
+  private lazy val eitherGetRight = find[Function[Post]](
+    eitherFile,
+    "get_right",
+  )
 
-  def eitherIsRight(e: Expr[Post], leftType: Type[Post], rightType: Type[Post])(implicit o: Origin): Expr[Post] =
+  def eitherIsRight(e: Expr[Post], leftType: Type[Post], rightType: Type[Post])(
+      implicit o: Origin
+  ): Expr[Post] =
     ADTFunctionInvocation(
-      Some((
-        eitherAdt.ref,
-        Seq(leftType, rightType)
-      )),
+      Some((eitherAdt.ref, Seq(leftType, rightType))),
       eitherIsRight.ref,
       Seq(e),
     )
 
-  def eitherGetLeft(e: Expr[Post], leftType: Type[Post], rightType: Type[Post], blame: Blame[PreconditionFailed])(implicit o: Origin): Expr[Post] =
-    FunctionInvocation[Post](eitherGetLeft.ref,
+  def eitherGetLeft(
+      e: Expr[Post],
+      leftType: Type[Post],
+      rightType: Type[Post],
+      blame: Blame[PreconditionFailed],
+  )(implicit o: Origin): Expr[Post] =
+    FunctionInvocation[Post](
+      eitherGetLeft.ref,
       Seq(e),
-      Seq(leftType, rightType), Nil, Nil,
+      Seq(leftType, rightType),
+      Nil,
+      Nil,
     )(NoContext(blame))
 
-  def eitherGetRight(e: Expr[Post], leftType: Type[Post], rightType: Type[Post], blame: Blame[PreconditionFailed])(implicit o: Origin): Expr[Post] =
-    FunctionInvocation[Post](eitherGetRight.ref,
+  def eitherGetRight(
+      e: Expr[Post],
+      leftType: Type[Post],
+      rightType: Type[Post],
+      blame: Blame[PreconditionFailed],
+  )(implicit o: Origin): Expr[Post] =
+    FunctionInvocation[Post](
+      eitherGetRight.ref,
       Seq(e),
-      Seq(leftType, rightType), Nil, Nil,
+      Seq(leftType, rightType),
+      Nil,
+      Nil,
     )(NoContext(blame))
 
-  def eitherLeft(e: Expr[Post], leftType: Type[Post], rightType: Type[Post])(implicit o: Origin): Expr[Post] =
+  def eitherLeft(e: Expr[Post], leftType: Type[Post], rightType: Type[Post])(
+      implicit o: Origin
+  ): Expr[Post] =
     ADTFunctionInvocation[Post](
-      Some((
-        eitherAdt.ref,
-        Seq(leftType, rightType),
-      )),
+      Some((eitherAdt.ref, Seq(leftType, rightType))),
       eitherLeft.ref,
       Seq(e),
     )
 
-  def eitherRight(e: Expr[Post], leftType: Type[Post], rightType: Type[Post])(implicit o: Origin): Expr[Post] =
+  def eitherRight(e: Expr[Post], leftType: Type[Post], rightType: Type[Post])(
+      implicit o: Origin
+  ): Expr[Post] =
     ADTFunctionInvocation[Post](
-      Some((
-        eitherAdt.ref,
-        Seq(leftType, rightType),
-      )),
+      Some((eitherAdt.ref, Seq(leftType, rightType))),
       eitherRight.ref,
       Seq(e),
     )
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TEither(left, right) => TAxiomatic(eitherAdt.ref, Seq(dispatch(left), dispatch(right)))
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TEither(left, right) =>
+        TAxiomatic(eitherAdt.ref, Seq(dispatch(left), dispatch(right)))
+      case other => rewriteDefault(other)
+    }
 
   override def postCoerce(e: Expr[Pre]): Expr[Post] = {
     implicit val o: Origin = e.o
@@ -84,14 +124,32 @@ case class ImportEither[Pre <: Generation](importer: ImportADTImporter) extends
         eitherLeft(dispatch(e), dispatch(e.t), dispatch(TNothing()))
       case EitherRight(e) =>
         eitherRight(dispatch(e), dispatch(TNothing()), dispatch(e.t))
-      case get@GetLeft(e) =>
-        eitherGetLeft(dispatch(e), dispatch(get.eitherType.left), dispatch(get.eitherType.right), NotLeftPreconditionFailed(get))
-      case get@GetRight(e) =>
-        eitherGetRight(dispatch(e), dispatch(get.eitherType.left), dispatch(get.eitherType.right), NotRightPreconditionFailed(get))
-      case is@IsLeft(e) =>
-        Not(eitherIsRight(dispatch(e), dispatch(is.eitherType.left), dispatch(is.eitherType.right)))
-      case is@IsRight(e) =>
-        eitherIsRight(dispatch(e), dispatch(is.eitherType.left), dispatch(is.eitherType.right))
+      case get @ GetLeft(e) =>
+        eitherGetLeft(
+          dispatch(e),
+          dispatch(get.eitherType.left),
+          dispatch(get.eitherType.right),
+          NotLeftPreconditionFailed(get),
+        )
+      case get @ GetRight(e) =>
+        eitherGetRight(
+          dispatch(e),
+          dispatch(get.eitherType.left),
+          dispatch(get.eitherType.right),
+          NotRightPreconditionFailed(get),
+        )
+      case is @ IsLeft(e) =>
+        Not(eitherIsRight(
+          dispatch(e),
+          dispatch(is.eitherType.left),
+          dispatch(is.eitherType.right),
+        ))
+      case is @ IsRight(e) =>
+        eitherIsRight(
+          dispatch(e),
+          dispatch(is.eitherType.left),
+          dispatch(is.eitherType.right),
+        )
       case other => rewriteDefault(other)
     }
   }
diff --git a/src/rewrite/vct/rewrite/adt/ImportFrac.scala b/src/rewrite/vct/rewrite/adt/ImportFrac.scala
index 592735d1a8..8a24c4b0f7 100644
--- a/src/rewrite/vct/rewrite/adt/ImportFrac.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportFrac.scala
@@ -1,28 +1,60 @@
 package vct.col.rewrite.adt
 
-import vct.col.ast.{ADTFunction, ADTFunctionInvocation, AxiomaticDataType, CoerceBoundIntFrac, CoerceBoundIntZFrac, CoerceFracZFrac, CoerceRatZFrac, CoerceZFracFrac, CoerceZFracRat, Coercion, CoercionSequence, Expr, Function, FunctionInvocation, NoPerm, Select, TAxiomatic, TFraction, TZFraction, Type, WritePerm}
+import vct.col.ast.{
+  ADTFunction,
+  ADTFunctionInvocation,
+  AxiomaticDataType,
+  CoerceBoundIntFrac,
+  CoerceBoundIntZFrac,
+  CoerceFracZFrac,
+  CoerceRatZFrac,
+  CoerceZFracFrac,
+  CoerceZFracRat,
+  Coercion,
+  CoercionSequence,
+  Expr,
+  Function,
+  FunctionInvocation,
+  NoPerm,
+  Select,
+  TAxiomatic,
+  TFraction,
+  TZFraction,
+  Type,
+  WritePerm,
+}
 import vct.col.origin._
 import vct.col.rewrite.Generation
 import vct.col.util.AstBuildHelpers._
 
 case object ImportFrac extends ImportADTBuilder("frac") {
-  case class RatZFracPreconditionFailed(inner: Blame[CoerceRatZFracFailed], expr: Expr[_]) extends Blame[PreconditionFailed] {
+  case class RatZFracPreconditionFailed(
+      inner: Blame[CoerceRatZFracFailed],
+      expr: Expr[_],
+  ) extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       inner.blame(CoerceRatZFracFailed(expr))
   }
 
-  case class RatFracPreconditionFailed(inner: Blame[CoerceRatFracFailed], expr: Expr[_]) extends Blame[PreconditionFailed] {
+  case class RatFracPreconditionFailed(
+      inner: Blame[CoerceRatFracFailed],
+      expr: Expr[_],
+  ) extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       inner.blame(CoerceRatFracFailed(expr))
   }
 
-  case class ZFracFracPreconditionFailed(inner: Blame[CoerceZFracFracFailed], expr: Expr[_]) extends Blame[PreconditionFailed] {
+  case class ZFracFracPreconditionFailed(
+      inner: Blame[CoerceZFracFracFailed],
+      expr: Expr[_],
+  ) extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       inner.blame(CoerceZFracFracFailed(expr))
   }
 }
 
-case class ImportFrac[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportFrac[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   import ImportFrac._
 
   private lazy val fracFile = parse("frac")
@@ -35,34 +67,66 @@ case class ImportFrac[Pre <: Generation](importer: ImportADTImporter) extends Im
   private lazy val zfracVal = find[ADTFunction[Post]](zfracAdt, "zfrac_val")
   private lazy val zfracNew = find[Function[Post]](zfracFile, "new_zfrac")
 
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = coercion match {
-    case CoerceZFracRat() =>
-      ADTFunctionInvocation[Post](Some((zfracAdt.ref, Nil)), zfracVal.ref, Seq(e))
-    case CoercionSequence(Seq(CoerceFracZFrac(), CoerceZFracRat())) =>
-      ADTFunctionInvocation(Some((fracAdt.ref, Nil)), fracVal.ref, Seq(e))
-    case CoerceFracZFrac() =>
-      val rat = ADTFunctionInvocation[Post](Some((fracAdt.ref, Nil)), fracVal.ref, Seq(e))
-      FunctionInvocation[Post](zfracNew.ref, Seq(rat), Nil, Nil, Nil)(PanicBlame("a frac always fits in a zfrac."))
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    coercion match {
+      case CoerceZFracRat() =>
+        ADTFunctionInvocation[Post](
+          Some((zfracAdt.ref, Nil)),
+          zfracVal.ref,
+          Seq(e),
+        )
+      case CoercionSequence(Seq(CoerceFracZFrac(), CoerceZFracRat())) =>
+        ADTFunctionInvocation(Some((fracAdt.ref, Nil)), fracVal.ref, Seq(e))
+      case CoerceFracZFrac() =>
+        val rat = ADTFunctionInvocation[Post](
+          Some((fracAdt.ref, Nil)),
+          fracVal.ref,
+          Seq(e),
+        )
+        FunctionInvocation[Post](zfracNew.ref, Seq(rat), Nil, Nil, Nil)(
+          PanicBlame("a frac always fits in a zfrac.")
+        )
 
-    case CoerceRatZFrac() =>
-      FunctionInvocation[Post](zfracNew.ref, Seq(e), Nil, Nil, Nil)(NoContext(RatZFracPreconditionFailed(globalBlame.top, e)))
-    case CoercionSequence(Seq(CoerceRatZFrac(), CoerceZFracFrac())) =>
-      FunctionInvocation[Post](fracNew.ref, Seq(e), Nil, Nil, Nil)(NoContext(RatZFracPreconditionFailed(globalBlame.top, e)))
-    case CoerceZFracFrac() =>
-      val rat = ADTFunctionInvocation[Post](Some((zfracAdt.ref, Nil)), zfracVal.ref, Seq(e))
-      FunctionInvocation[Post](fracNew.ref, Seq(rat), Nil, Nil, Nil)(NoContext(ZFracFracPreconditionFailed(globalBlame.top, e)))
+      case CoerceRatZFrac() =>
+        FunctionInvocation[Post](zfracNew.ref, Seq(e), Nil, Nil, Nil)(NoContext(
+          RatZFracPreconditionFailed(globalBlame.top, e)
+        ))
+      case CoercionSequence(Seq(CoerceRatZFrac(), CoerceZFracFrac())) =>
+        FunctionInvocation[Post](fracNew.ref, Seq(e), Nil, Nil, Nil)(NoContext(
+          RatZFracPreconditionFailed(globalBlame.top, e)
+        ))
+      case CoerceZFracFrac() =>
+        val rat = ADTFunctionInvocation[Post](
+          Some((zfracAdt.ref, Nil)),
+          zfracVal.ref,
+          Seq(e),
+        )
+        FunctionInvocation[Post](fracNew.ref, Seq(rat), Nil, Nil, Nil)(
+          NoContext(ZFracFracPreconditionFailed(globalBlame.top, e))
+        )
 
-    case CoerceBoundIntFrac() =>
-      FunctionInvocation[Post](fracNew.ref, Seq(WritePerm()), Nil, Nil, Nil)(PanicBlame("The constant 1 always fits in a frac."))
-    case CoerceBoundIntZFrac(_) =>
-      FunctionInvocation[Post](zfracNew.ref, Seq(Select(e === const(0), NoPerm(), WritePerm())), Nil, Nil, Nil)(PanicBlame("The constants 0 and 1 always fit in a zfrac."))
+      case CoerceBoundIntFrac() =>
+        FunctionInvocation[Post](fracNew.ref, Seq(WritePerm()), Nil, Nil, Nil)(
+          PanicBlame("The constant 1 always fits in a frac.")
+        )
+      case CoerceBoundIntZFrac(_) =>
+        FunctionInvocation[Post](
+          zfracNew.ref,
+          Seq(Select(e === const(0), NoPerm(), WritePerm())),
+          Nil,
+          Nil,
+          Nil,
+        )(PanicBlame("The constants 0 and 1 always fit in a zfrac."))
 
-    case other => super.applyCoercion(e, other)
-  }
+      case other => super.applyCoercion(e, other)
+    }
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TFraction() => TAxiomatic[Post](fracAdt.ref, Nil)(t.o)
-    case TZFraction() => TAxiomatic(zfracAdt.ref, Nil)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TFraction() => TAxiomatic[Post](fracAdt.ref, Nil)(t.o)
+      case TZFraction() => TAxiomatic(zfracAdt.ref, Nil)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportMap.scala b/src/rewrite/vct/rewrite/adt/ImportMap.scala
index 0342366070..89a9bd825a 100644
--- a/src/rewrite/vct/rewrite/adt/ImportMap.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportMap.scala
@@ -6,7 +6,8 @@ import vct.col.rewrite.{Generation, Rewritten}
 
 case object ImportMap extends ImportADTBuilder("map")
 
-case class ImportMap[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportMap[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   private lazy val mapFile = parse("map")
 
   private lazy val mapAdt = find[AxiomaticDataType[Post]](mapFile, "map")
@@ -26,97 +27,103 @@ case class ImportMap[Pre <: Generation](importer: ImportADTImporter) extends Imp
     Seq(dispatch(mapType.key), dispatch(mapType.value))
   }
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TMap(k, v) => TAxiomatic(mapAdt.ref, Seq(dispatch(k), dispatch(v)))
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TMap(k, v) => TAxiomatic(mapAdt.ref, Seq(dispatch(k), dispatch(v)))
+      case other => rewriteDefault(other)
+    }
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case LiteralMap(keyType, valueType, values) =>
-      implicit val o: Origin = e.o
-      // the right-most values end up in the outer updates, and hence take precedence -> foldLeft
-      values.foldLeft(
-        ADTFunctionInvocation[Post](
-          typeArgs = Some((mapAdt.ref, Seq(dispatch(keyType), dispatch(valueType)))),
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case LiteralMap(keyType, valueType, values) =>
+        implicit val o: Origin = e.o
+        // the right-most values end up in the outer updates, and hence take precedence -> foldLeft
+        values.foldLeft(ADTFunctionInvocation[Post](
+          typeArgs = Some(
+            (mapAdt.ref, Seq(dispatch(keyType), dispatch(valueType)))
+          ),
           ref = mapEmpty.ref,
-          args = Nil
-        )
-      ) {
-        case (partialMap, (key, value)) =>
+          args = Nil,
+        )) { case (partialMap, (key, value)) =>
           ADTFunctionInvocation[Post](
-            typeArgs = Some((mapAdt.ref, Seq(dispatch(keyType), dispatch(valueType)))),
+            typeArgs = Some(
+              (mapAdt.ref, Seq(dispatch(keyType), dispatch(valueType)))
+            ),
             ref = mapUpdate.ref,
-            Seq(partialMap, dispatch(key), dispatch(value))
+            Seq(partialMap, dispatch(key), dispatch(value)),
           )
-      }
+        }
 
-    case MapCons(partialMap, key, value) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = Some((mapAdt.ref, mapTypeArgs(partialMap))),
-        ref = mapUpdate.ref,
-        Seq(dispatch(partialMap), dispatch(key), dispatch(value))
-      )(e.o)
+      case MapCons(partialMap, key, value) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = Some((mapAdt.ref, mapTypeArgs(partialMap))),
+          ref = mapUpdate.ref,
+          Seq(dispatch(partialMap), dispatch(key), dispatch(value)),
+        )(e.o)
 
-    case MapRemove(map, key) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
-        ref = mapRemove.ref,
-        args = Seq(dispatch(map), dispatch(key)),
-      )(e.o)
+      case MapRemove(map, key) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
+          ref = mapRemove.ref,
+          args = Seq(dispatch(map), dispatch(key)),
+        )(e.o)
 
-    case MapEq(left, right) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = Some((mapAdt.ref, mapTypeArgs(left))),
-        ref = mapEqual.ref,
-        Seq(dispatch(left), dispatch(right)),
-      )(e.o)
-    case MapDisjoint(left, right) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = Some((mapAdt.ref, mapTypeArgs(left))),
-        ref = mapDisjoint.ref,
-        Seq(dispatch(left), dispatch(right)),
-      )(e.o)
+      case MapEq(left, right) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = Some((mapAdt.ref, mapTypeArgs(left))),
+          ref = mapEqual.ref,
+          Seq(dispatch(left), dispatch(right)),
+        )(e.o)
+      case MapDisjoint(left, right) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = Some((mapAdt.ref, mapTypeArgs(left))),
+          ref = mapDisjoint.ref,
+          Seq(dispatch(left), dispatch(right)),
+        )(e.o)
 
-    case MapKeySet(map) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
-        ref = mapDomain.ref,
-        args = Seq(dispatch(map)),
-      )(e.o)
-    case MapValueSet(map) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
-        ref = mapValues.ref,
-        args = Seq(dispatch(map)),
-      )(e.o)
-    case MapItemSet(map) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
-        ref = mapItems.ref,
-        args = Seq(dispatch(map)),
-      )(e.o)
+      case MapKeySet(map) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
+          ref = mapDomain.ref,
+          args = Seq(dispatch(map)),
+        )(e.o)
+      case MapValueSet(map) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
+          ref = mapValues.ref,
+          args = Seq(dispatch(map)),
+        )(e.o)
+      case MapItemSet(map) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
+          ref = mapItems.ref,
+          args = Seq(dispatch(map)),
+        )(e.o)
 
-    case MapMember(x, xs) =>
-      SetMember(dispatch(x), ADTFunctionInvocation[Post](
-        typeArgs = Some((mapAdt.ref, mapTypeArgs(xs))),
-        ref = mapDomain.ref,
-        args = Seq(dispatch(xs)),
-      )(e.o))(e.o)
+      case MapMember(x, xs) =>
+        SetMember(
+          dispatch(x),
+          ADTFunctionInvocation[Post](
+            typeArgs = Some((mapAdt.ref, mapTypeArgs(xs))),
+            ref = mapDomain.ref,
+            args = Seq(dispatch(xs)),
+          )(e.o),
+        )(e.o)
 
-    case MapGet(map, key) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
-        ref = mapApply.ref,
-        args = Seq(dispatch(map), dispatch(key)),
-      )(e.o)
+      case MapGet(map, key) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
+          ref = mapApply.ref,
+          args = Seq(dispatch(map), dispatch(key)),
+        )(e.o)
 
-    case Size(map) if map.t.asMap.nonEmpty =>
-      ADTFunctionInvocation[Post](
-        typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
-        ref = mapSize.ref,
-        args = Seq(dispatch(map)),
-      )(e.o)
+      case Size(map) if map.t.asMap.nonEmpty =>
+        ADTFunctionInvocation[Post](
+          typeArgs = Some((mapAdt.ref, mapTypeArgs(map))),
+          ref = mapSize.ref,
+          args = Seq(dispatch(map)),
+        )(e.o)
 
-    case other => rewriteDefault(other)
-  }
-}
\ No newline at end of file
+      case other => rewriteDefault(other)
+    }
+}
diff --git a/src/rewrite/vct/rewrite/adt/ImportMapCompat.scala b/src/rewrite/vct/rewrite/adt/ImportMapCompat.scala
index 07b8937f1c..2b384f7cf6 100644
--- a/src/rewrite/vct/rewrite/adt/ImportMapCompat.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportMapCompat.scala
@@ -5,38 +5,55 @@ import vct.col.rewrite.Generation
 
 case object ImportMapCompat extends ImportADTBuilder("map_compat")
 
-case class ImportMapCompat[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportMapCompat[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   private lazy val mapCompatFile = parse("map_compat")
 
-  private lazy val mapCompatAdt = find[AxiomaticDataType[Post]](mapCompatFile, "map_compat")
+  private lazy val mapCompatAdt = find[AxiomaticDataType[Post]](
+    mapCompatFile,
+    "map_compat",
+  )
   private lazy val mapItems = find[ADTFunction[Post]](mapCompatAdt, "map_items")
-  private lazy val mapDisjoint = find[ADTFunction[Post]](mapCompatAdt, "map_disjoint")
-  private lazy val mapRemove = find[ADTFunction[Post]](mapCompatAdt, "map_remove")
+  private lazy val mapDisjoint = find[ADTFunction[Post]](
+    mapCompatAdt,
+    "map_disjoint",
+  )
+  private lazy val mapRemove = find[ADTFunction[Post]](
+    mapCompatAdt,
+    "map_remove",
+  )
 
   private def mapTypeArgs(map: Expr[Pre]): Seq[Type[Post]] = {
     val mapType: TMap[Pre] = map.t.asMap.get
     Seq(dispatch(mapType.key), dispatch(mapType.value))
   }
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case MapItemSet(map) =>
-      ADTFunctionInvocation[Post](
-        Some((mapCompatAdt.ref, mapTypeArgs(map))),
-        mapItems.ref,
-        Seq(dispatch(map))
-      )(e.o)
-    case disj@MapDisjoint(left, right) =>
-      ADTFunctionInvocation[Post](
-        Some((mapCompatAdt.ref, Seq(dispatch(disj.commonMapType.key), dispatch(disj.commonMapType.value)))),
-        mapDisjoint.ref,
-        Seq(dispatch(left), dispatch(right)),
-      )(e.o)
-    case MapRemove(map, k) =>
-      ADTFunctionInvocation[Post](
-        Some((mapCompatAdt.ref, mapTypeArgs(map))),
-        mapRemove.ref,
-        Seq(dispatch(map), dispatch(k)),
-      )(e.o)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case MapItemSet(map) =>
+        ADTFunctionInvocation[Post](
+          Some((mapCompatAdt.ref, mapTypeArgs(map))),
+          mapItems.ref,
+          Seq(dispatch(map)),
+        )(e.o)
+      case disj @ MapDisjoint(left, right) =>
+        ADTFunctionInvocation[Post](
+          Some((
+            mapCompatAdt.ref,
+            Seq(
+              dispatch(disj.commonMapType.key),
+              dispatch(disj.commonMapType.value),
+            ),
+          )),
+          mapDisjoint.ref,
+          Seq(dispatch(left), dispatch(right)),
+        )(e.o)
+      case MapRemove(map, k) =>
+        ADTFunctionInvocation[Post](
+          Some((mapCompatAdt.ref, mapTypeArgs(map))),
+          mapRemove.ref,
+          Seq(dispatch(map), dispatch(k)),
+        )(e.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportNothing.scala b/src/rewrite/vct/rewrite/adt/ImportNothing.scala
index 4765fd6a4a..e9d8be2024 100644
--- a/src/rewrite/vct/rewrite/adt/ImportNothing.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportNothing.scala
@@ -6,20 +6,34 @@ import vct.col.rewrite.Generation
 
 case object ImportNothing extends ImportADTBuilder("nothing")
 
-case class ImportNothing[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportNothing[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   private lazy val nothingFile = parse("nothing")
 
-  private lazy val nothingAdt = find[AxiomaticDataType[Post]](nothingFile, "nothing")
+  private lazy val nothingAdt = find[AxiomaticDataType[Post]](
+    nothingFile,
+    "nothing",
+  )
   private lazy val nothingAs = find[Function[Post]](nothingFile, "nothing_as")
 
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = coercion match {
-    case CoerceNothingSomething(target) =>
-      FunctionInvocation[Post](nothingAs.ref, Seq(e), Seq(dispatch(target)), Nil, Nil)(PanicBlame("coercing from nothing requires nothing."))
-    case other => super.applyCoercion(e, other)
-  }
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    coercion match {
+      case CoerceNothingSomething(target) =>
+        FunctionInvocation[Post](
+          nothingAs.ref,
+          Seq(e),
+          Seq(dispatch(target)),
+          Nil,
+          Nil,
+        )(PanicBlame("coercing from nothing requires nothing."))
+      case other => super.applyCoercion(e, other)
+    }
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TNothing() => TAxiomatic[Post](nothingAdt.ref, Nil)(t.o)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TNothing() => TAxiomatic[Post](nothingAdt.ref, Nil)(t.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportNull.scala b/src/rewrite/vct/rewrite/adt/ImportNull.scala
index 866335cfff..3cd7b6dd1a 100644
--- a/src/rewrite/vct/rewrite/adt/ImportNull.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportNull.scala
@@ -6,28 +6,32 @@ import vct.col.rewrite.Generation
 
 case object ImportNull extends ImportADTBuilder("null")
 
-case class ImportNull[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportNull[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   private lazy val nullFile = parse("null")
 
   private lazy val nullAdt = find[AxiomaticDataType[Post]](nullFile, "t_null")
   private lazy val nullValue = find[ADTFunction[Post]](nullAdt, "v_null")
 
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = coercion match {
-    case CoerceNullRef() =>
-      SilverNull()
-    case other => super.applyCoercion(e, other)
-  }
-
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TNull() => TAxiomatic[Post](nullAdt.ref, Nil)(t.o)
-    case other => rewriteDefault(other)
-  }
-
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case Null() =>
-      // Uncoerced, so will become TNull
-      ADTFunctionInvocation[Post](None, nullValue.ref, Nil)(e.o)
-    case other => rewriteDefault(other)
-  }
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    coercion match {
+      case CoerceNullRef() => SilverNull()
+      case other => super.applyCoercion(e, other)
+    }
+
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TNull() => TAxiomatic[Post](nullAdt.ref, Nil)(t.o)
+      case other => rewriteDefault(other)
+    }
+
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case Null() =>
+        // Uncoerced, so will become TNull
+        ADTFunctionInvocation[Post](None, nullValue.ref, Nil)(e.o)
+      case other => rewriteDefault(other)
+    }
 }
-
diff --git a/src/rewrite/vct/rewrite/adt/ImportOption.scala b/src/rewrite/vct/rewrite/adt/ImportOption.scala
index e69499203b..0ac9e05c37 100644
--- a/src/rewrite/vct/rewrite/adt/ImportOption.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportOption.scala
@@ -1,66 +1,99 @@
 package vct.col.rewrite.adt
 
 import vct.col.ast._
-import vct.col.origin.{Blame, NoContext, OptionNone, Origin, PanicBlame, PreconditionFailed}
+import vct.col.origin.{
+  Blame,
+  NoContext,
+  OptionNone,
+  Origin,
+  PanicBlame,
+  PreconditionFailed,
+}
 import vct.col.rewrite.Generation
 
 case object ImportOption extends ImportADTBuilder("option") {
-  case class OptionNonePreconditionFailed(access: OptGet[_]) extends Blame[PreconditionFailed] {
+  case class OptionNonePreconditionFailed(access: OptGet[_])
+      extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       access.blame.blame(OptionNone(access))
   }
 }
 
-case class ImportOption[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportOption[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   import ImportOption._
 
   private lazy val optionFile = parse("option")
 
-  private lazy val optionAdt = find[AxiomaticDataType[Post]](optionFile, "option")
+  private lazy val optionAdt = find[AxiomaticDataType[Post]](
+    optionFile,
+    "option",
+  )
   private lazy val optionNone = find[ADTFunction[Post]](optionAdt, "None")
   private lazy val optionSome = find[ADTFunction[Post]](optionAdt, "some")
-  private lazy val optionAxGet = find[ADTFunction[Post]](optionAdt, "option_get")
+  private lazy val optionAxGet = find[ADTFunction[Post]](
+    optionAdt,
+    "option_get",
+  )
   private lazy val optionGet = find[Function[Post]](optionFile, "opt_get")
-  private lazy val optionGetOrElse = find[Function[Post]](optionFile, "opt_or_else")
+  private lazy val optionGetOrElse = find[Function[Post]](
+    optionFile,
+    "opt_or_else",
+  )
 
   def optNone(t: Type[Post])(implicit o: Origin): Expr[Post] =
     ADTFunctionInvocation[Post](
       Some((optionAdt.ref, Seq(t))),
-      optionNone.ref, Nil,
+      optionNone.ref,
+      Nil,
     )
 
   def optSome(e: Expr[Post], t: Type[Post])(implicit o: Origin): Expr[Post] =
     ADTFunctionInvocation[Post](
       Some((optionAdt.ref, Seq(t))),
-      optionSome.ref, Seq(e),
+      optionSome.ref,
+      Seq(e),
     )
 
-  def optGet(e: Expr[Post], t: Type[Post], blame: Blame[PreconditionFailed])(implicit o: Origin): Expr[Post] =
-    FunctionInvocation[Post](optionGet.ref, Seq(e), Seq(t), Nil, Nil)(NoContext(blame))
+  def optGet(e: Expr[Post], t: Type[Post], blame: Blame[PreconditionFailed])(
+      implicit o: Origin
+  ): Expr[Post] =
+    FunctionInvocation[Post](optionGet.ref, Seq(e), Seq(t), Nil, Nil)(NoContext(
+      blame
+    ))
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TOption(element) => TAxiomatic(optionAdt.ref, Seq(dispatch(element)))
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TOption(element) => TAxiomatic(optionAdt.ref, Seq(dispatch(element)))
+      case other => rewriteDefault(other)
+    }
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case OptEmpty(opt) =>
-      Eq(dispatch(opt), optNone(dispatch(opt.t.asOption.get.element))(e.o))(e.o)
-    case OptNone() =>
-      optNone(TNothing())(e.o)
-    case OptNoneTyped(t) =>
-      optNone(dispatch(t))(e.o)
-    case OptSome(element) =>
-      optSome(dispatch(element), dispatch(element.t))(e.o)
-    case OptSomeTyped(t, element) =>
-      optSome(dispatch(element), dispatch(t))(e.o)
-    case access@OptGet(opt) =>
-      optGet(dispatch(opt), dispatch(opt.t.asOption.get.element), OptionNonePreconditionFailed(access))(e.o)
-    case get@OptGetOrElse(opt, alt) =>
-      FunctionInvocation[Post](optionGetOrElse.ref,
-        Seq(dispatch(opt), dispatch(alt)),
-        Seq(dispatch(get.t)), Nil, Nil,
-      )(PanicBlame("opt_or_else requires nothing."))(e.o)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case OptEmpty(opt) =>
+        Eq(dispatch(opt), optNone(dispatch(opt.t.asOption.get.element))(e.o))(
+          e.o
+        )
+      case OptNone() => optNone(TNothing())(e.o)
+      case OptNoneTyped(t) => optNone(dispatch(t))(e.o)
+      case OptSome(element) =>
+        optSome(dispatch(element), dispatch(element.t))(e.o)
+      case OptSomeTyped(t, element) =>
+        optSome(dispatch(element), dispatch(t))(e.o)
+      case access @ OptGet(opt) =>
+        optGet(
+          dispatch(opt),
+          dispatch(opt.t.asOption.get.element),
+          OptionNonePreconditionFailed(access),
+        )(e.o)
+      case get @ OptGetOrElse(opt, alt) =>
+        FunctionInvocation[Post](
+          optionGetOrElse.ref,
+          Seq(dispatch(opt), dispatch(alt)),
+          Seq(dispatch(get.t)),
+          Nil,
+          Nil,
+        )(PanicBlame("opt_or_else requires nothing."))(e.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportPointer.scala b/src/rewrite/vct/rewrite/adt/ImportPointer.scala
index 5cc4805c68..2e81faf964 100644
--- a/src/rewrite/vct/rewrite/adt/ImportPointer.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportPointer.scala
@@ -10,48 +10,68 @@ import vct.col.util.AstBuildHelpers.{ExprBuildHelpers, const}
 import scala.collection.mutable
 
 case object ImportPointer extends ImportADTBuilder("pointer") {
-  private def PointerField(t: Type[_]): Origin = Origin(
-    Seq(
-      PreferredName(Seq(typeText(t))),
-      LabelContext("pointer field"),
-    )
-  )
+  private def PointerField(t: Type[_]): Origin =
+    Origin(Seq(PreferredName(Seq(typeText(t))), LabelContext("pointer field")))
 
-  case class PointerNullOptNone(inner: Blame[PointerNull], expr: Expr[_]) extends Blame[OptionNone] {
-    override def blame(error: OptionNone): Unit =
-      inner.blame(PointerNull(expr))
+  case class PointerNullOptNone(inner: Blame[PointerNull], expr: Expr[_])
+      extends Blame[OptionNone] {
+    override def blame(error: OptionNone): Unit = inner.blame(PointerNull(expr))
   }
 
-  case class PointerBoundsPreconditionFailed(inner: Blame[PointerBounds], expr: Node[_]) extends Blame[PreconditionFailed] {
+  case class PointerBoundsPreconditionFailed(
+      inner: Blame[PointerBounds],
+      expr: Node[_],
+  ) extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       inner.blame(PointerBounds(expr))
   }
 
-  case class DerefPointerBoundsPreconditionFailed(inner: Blame[PointerDerefError], expr: Expr[_]) extends Blame[PreconditionFailed] {
+  case class DerefPointerBoundsPreconditionFailed(
+      inner: Blame[PointerDerefError],
+      expr: Expr[_],
+  ) extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       inner.blame(PointerInsufficientPermission(expr))
   }
 
-
-  case class PointerFieldInsufficientPermission(inner: Blame[PointerInsufficientPermission], expr: Expr[_]) extends Blame[InsufficientPermission] {
+  case class PointerFieldInsufficientPermission(
+      inner: Blame[PointerInsufficientPermission],
+      expr: Expr[_],
+  ) extends Blame[InsufficientPermission] {
     override def blame(error: InsufficientPermission): Unit =
       inner.blame(PointerInsufficientPermission(expr))
   }
 }
 
-case class ImportPointer[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportPointer[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   import ImportPointer._
 
   private lazy val pointerFile = parse("pointer")
 
-  private lazy val blockAdt = find[AxiomaticDataType[Post]](pointerFile, "block")
+  private lazy val blockAdt = find[AxiomaticDataType[Post]](
+    pointerFile,
+    "block",
+  )
   private lazy val blockBase = find[ADTFunction[Post]](blockAdt, "base_addr")
-  private lazy val blockLength = find[ADTFunction[Post]](blockAdt, "block_length")
+  private lazy val blockLength = find[ADTFunction[Post]](
+    blockAdt,
+    "block_length",
+  )
   private lazy val blockLoc = find[ADTFunction[Post]](blockAdt, "loc")
-  private lazy val pointerAdt = find[AxiomaticDataType[Post]](pointerFile, "pointer")
+  private lazy val pointerAdt = find[AxiomaticDataType[Post]](
+    pointerFile,
+    "pointer",
+  )
   private lazy val pointerOf = find[ADTFunction[Post]](pointerAdt, "pointer_of")
-  private lazy val pointerBlock = find[ADTFunction[Post]](pointerAdt, "pointer_block")
-  private lazy val pointerOffset = find[ADTFunction[Post]](pointerAdt, "pointer_offset")
+  private lazy val pointerBlock = find[ADTFunction[Post]](
+    pointerAdt,
+    "pointer_block",
+  )
+  private lazy val pointerOffset = find[ADTFunction[Post]](
+    pointerAdt,
+    "pointer_offset",
+  )
   private lazy val pointerDeref = find[Function[Post]](pointerFile, "ptr_deref")
   private lazy val pointerAdd = find[Function[Post]](pointerFile, "ptr_add")
 
@@ -59,89 +79,144 @@ case class ImportPointer[Pre <: Generation](importer: ImportADTImporter) extends
 
   private def getPointerField(ptr: Expr[Pre]): Ref[Post, SilverField[Post]] = {
     val tElement = dispatch(ptr.t.asPointer.get.element)
-    pointerField.getOrElseUpdate(tElement, {
-      globalDeclarations.declare(new SilverField(tElement)(PointerField(tElement)))
-    }).ref
+    pointerField.getOrElseUpdate(
+      tElement, {
+        globalDeclarations
+          .declare(new SilverField(tElement)(PointerField(tElement)))
+      },
+    ).ref
   }
 
-  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(implicit o: Origin): Expr[Post] = coercion match {
-    case CoerceNullPointer(_) => OptNone()
-    case other => super.applyCoercion(e, other)
-  }
+  override def applyCoercion(e: => Expr[Post], coercion: Coercion[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    coercion match {
+      case CoerceNullPointer(_) => OptNone()
+      case other => super.applyCoercion(e, other)
+    }
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TPointer(_) => TOption(TAxiomatic(pointerAdt.ref, Nil))
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TPointer(_) => TOption(TAxiomatic(pointerAdt.ref, Nil))
+      case other => rewriteDefault(other)
+    }
 
-  override def postCoerce(location: Location[Pre]): Location[Post] = location match {
-    case loc@PointerLocation(pointer) =>
-      SilverFieldLocation(
-        obj = FunctionInvocation[Post](
-          ref = pointerDeref.ref,
-          args = Seq(OptGet(dispatch(pointer))(PointerNullOptNone(loc.blame, pointer))(pointer.o)),
-          typeArgs = Nil, Nil, Nil,
-        )(PanicBlame("ptr_deref requires nothing."))(pointer.o),
-        field = getPointerField(pointer),
-      )(loc.o)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(location: Location[Pre]): Location[Post] =
+    location match {
+      case loc @ PointerLocation(pointer) =>
+        SilverFieldLocation(
+          obj =
+            FunctionInvocation[Post](
+              ref = pointerDeref.ref,
+              args = Seq(
+                OptGet(dispatch(pointer))(
+                  PointerNullOptNone(loc.blame, pointer)
+                )(pointer.o)
+              ),
+              typeArgs = Nil,
+              Nil,
+              Nil,
+            )(PanicBlame("ptr_deref requires nothing."))(pointer.o),
+          field = getPointerField(pointer),
+        )(loc.o)
+      case other => rewriteDefault(other)
+    }
 
   override def postCoerce(e: Expr[Pre]): Expr[Post] = {
     implicit val o: Origin = e.o
     e match {
-      case sub@PointerSubscript(pointer, index) =>
+      case sub @ PointerSubscript(pointer, index) =>
         SilverDeref(
-          obj = FunctionInvocation[Post](
-            ref = pointerDeref.ref,
-            args = Seq(FunctionInvocation[Post](
-              ref = pointerAdd.ref,
-              args = Seq(OptGet(dispatch(pointer))(PointerNullOptNone(sub.blame, pointer)), dispatch(index)),
-              typeArgs = Nil, Nil, Nil)(NoContext(PointerBoundsPreconditionFailed(sub.blame, index)))),
-            typeArgs = Nil, Nil, Nil,
-          )(PanicBlame("ptr_deref requires nothing.")),
+          obj =
+            FunctionInvocation[Post](
+              ref = pointerDeref.ref,
+              args = Seq(
+                FunctionInvocation[Post](
+                  ref = pointerAdd.ref,
+                  args = Seq(
+                    OptGet(dispatch(pointer))(
+                      PointerNullOptNone(sub.blame, pointer)
+                    ),
+                    dispatch(index),
+                  ),
+                  typeArgs = Nil,
+                  Nil,
+                  Nil,
+                )(NoContext(PointerBoundsPreconditionFailed(sub.blame, index)))
+              ),
+              typeArgs = Nil,
+              Nil,
+              Nil,
+            )(PanicBlame("ptr_deref requires nothing.")),
           field = getPointerField(pointer),
         )(PointerFieldInsufficientPermission(sub.blame, sub))
-      case add@PointerAdd(pointer, offset) =>
-        OptSome(FunctionInvocation[Post](
-          ref = pointerAdd.ref,
-          args = Seq(OptGet(dispatch(pointer))(PointerNullOptNone(add.blame, pointer)), dispatch(offset)),
-          typeArgs = Nil, Nil, Nil,
-        )(NoContext(PointerBoundsPreconditionFailed(add.blame, pointer))))
-      case deref@DerefPointer(pointer) =>
+      case add @ PointerAdd(pointer, offset) =>
+        OptSome(
+          FunctionInvocation[Post](
+            ref = pointerAdd.ref,
+            args = Seq(
+              OptGet(dispatch(pointer))(PointerNullOptNone(add.blame, pointer)),
+              dispatch(offset),
+            ),
+            typeArgs = Nil,
+            Nil,
+            Nil,
+          )(NoContext(PointerBoundsPreconditionFailed(add.blame, pointer)))
+        )
+      case deref @ DerefPointer(pointer) =>
         SilverDeref(
-          obj = FunctionInvocation[Post](
-            ref = pointerDeref.ref,
-            args = Seq(FunctionInvocation[Post](
-              ref = pointerAdd.ref,
-              // Always index with zero, otherwise quantifiers with pointers do not get triggered
-              args = Seq(OptGet(dispatch(pointer))(PointerNullOptNone(deref.blame, pointer)), const(0)),
-              typeArgs = Nil, Nil, Nil)(NoContext(DerefPointerBoundsPreconditionFailed(deref.blame, pointer)))),
-            typeArgs = Nil, Nil, Nil,
-          )(PanicBlame("ptr_deref requires nothing.")),
+          obj =
+            FunctionInvocation[Post](
+              ref = pointerDeref.ref,
+              args = Seq(
+                FunctionInvocation[Post](
+                  ref = pointerAdd.ref,
+                  // Always index with zero, otherwise quantifiers with pointers do not get triggered
+                  args = Seq(
+                    OptGet(dispatch(pointer))(
+                      PointerNullOptNone(deref.blame, pointer)
+                    ),
+                    const(0),
+                  ),
+                  typeArgs = Nil,
+                  Nil,
+                  Nil,
+                )(NoContext(
+                  DerefPointerBoundsPreconditionFailed(deref.blame, pointer)
+                ))
+              ),
+              typeArgs = Nil,
+              Nil,
+              Nil,
+            )(PanicBlame("ptr_deref requires nothing.")),
           field = getPointerField(pointer),
         )(PointerFieldInsufficientPermission(deref.blame, deref))
-      case len@PointerBlockLength(pointer) =>
+      case len @ PointerBlockLength(pointer) =>
         ADTFunctionInvocation[Post](
           typeArgs = Some((blockAdt.ref, Nil)),
           ref = blockLength.ref,
           args = Seq(ADTFunctionInvocation[Post](
             typeArgs = Some((pointerAdt.ref, Nil)),
             ref = pointerBlock.ref,
-            args = Seq(OptGet(dispatch(pointer))(PointerNullOptNone(len.blame, pointer)))
-          ))
+            args = Seq(
+              OptGet(dispatch(pointer))(PointerNullOptNone(len.blame, pointer))
+            ),
+          )),
         )
-      case off@PointerBlockOffset(pointer) =>
+      case off @ PointerBlockOffset(pointer) =>
         ADTFunctionInvocation[Post](
           typeArgs = Some((pointerAdt.ref, Nil)),
           ref = pointerOffset.ref,
-          args = Seq(OptGet(dispatch(pointer))(PointerNullOptNone(off.blame, pointer)))
+          args = Seq(
+            OptGet(dispatch(pointer))(PointerNullOptNone(off.blame, pointer))
+          ),
+        )
+      case pointerLen @ PointerLength(pointer) =>
+        postCoerce(
+          PointerBlockLength(pointer)(pointerLen.blame) -
+            PointerBlockOffset(pointer)(pointerLen.blame)
         )
-      case pointerLen@PointerLength(pointer) =>
-        postCoerce(PointerBlockLength(pointer)(pointerLen.blame) - PointerBlockOffset(pointer)(pointerLen.blame))
       case other => rewriteDefault(other)
     }
   }
 }
-
-
diff --git a/src/rewrite/vct/rewrite/adt/ImportSeq.scala b/src/rewrite/vct/rewrite/adt/ImportSeq.scala
index 78f21ab517..f5412a5d96 100644
--- a/src/rewrite/vct/rewrite/adt/ImportSeq.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportSeq.scala
@@ -6,18 +6,28 @@ import vct.col.rewrite.{Generation, Rewritten}
 
 case object ImportSeq extends ImportADTBuilder("seq")
 
-case class ImportSeq[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportSeq[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   private lazy val seqFile = parse("seq")
 
   private lazy val seqAdt = find[AxiomaticDataType[Post]](seqFile, "seq")
   private lazy val seqLength = find[ADTFunction[Post]](seqAdt, "seq_length")
   private lazy val seqIndex = find[ADTFunction[Post]](seqAdt, "seq_index")
   private lazy val seqContains = find[ADTFunction[Post]](seqAdt, "seq_contains")
-  private lazy val seqIndexSkolem = find[ADTFunction[Post]](seqAdt, "seq_idx_skolem")
+  private lazy val seqIndexSkolem = find[ADTFunction[Post]](
+    seqAdt,
+    "seq_idx_skolem",
+  )
   private lazy val seqEqual = find[ADTFunction[Post]](seqAdt, "seq_equal")
-  private lazy val seqDiffSkolem = find[ADTFunction[Post]](seqAdt, "seq_diff_skolem")
+  private lazy val seqDiffSkolem = find[ADTFunction[Post]](
+    seqAdt,
+    "seq_diff_skolem",
+  )
   private lazy val seqEmpty = find[ADTFunction[Post]](seqAdt, "seq_empty")
-  private lazy val seqSingleton = find[ADTFunction[Post]](seqAdt, "seq_singleton")
+  private lazy val seqSingleton = find[ADTFunction[Post]](
+    seqAdt,
+    "seq_singleton",
+  )
   private lazy val seqConcat = find[ADTFunction[Post]](seqAdt, "seq_concat")
   private lazy val seqRange = find[ADTFunction[Post]](seqAdt, "seq_range")
   private lazy val seqUpdate = find[ADTFunction[Post]](seqAdt, "seq_update")
@@ -26,115 +36,125 @@ case class ImportSeq[Pre <: Generation](importer: ImportADTImporter) extends Imp
   private lazy val seqArithAdd = find[ADTFunction[Post]](seqAdt, "seq_+")
   private lazy val seqArithSub = find[ADTFunction[Post]](seqAdt, "seq_-")
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TSeq(t) => TAxiomatic(seqAdt.ref, Seq(dispatch(t)))
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TSeq(t) => TAxiomatic(seqAdt.ref, Seq(dispatch(t)))
+      case other => rewriteDefault(other)
+    }
 
-  def typeArgs(xs: Expr[Pre]): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
+  def typeArgs(
+      xs: Expr[Pre]
+  ): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
     typeArgs(xs.t.asSeq.get.element)
 
-  def typeArgs(t: Type[Pre]): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
+  def typeArgs(
+      t: Type[Pre]
+  ): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
     Some((seqAdt.ref, Seq(dispatch(t))))
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case Size(xs) if xs.t.asSeq.nonEmpty =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs),
-        ref = seqLength.ref,
-        args = Seq(dispatch(xs)),
-      )(e.o)
-
-    case SeqSubscript(xs, i) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs),
-        ref = seqIndex.ref,
-        args = Seq(dispatch(xs), dispatch(i)),
-      )(e.o)
-
-    case SeqMember(x, xs) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs),
-        ref = seqContains.ref,
-        args = Seq(dispatch(xs), dispatch(x)),
-      )(e.o)
-
-    case eq @ Eq(xs, ys) if eq.comparisonType.asSeq.nonEmpty =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(eq.comparisonType.asSeq.get.element),
-        ref = seqEqual.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case eq @ Neq(xs, ys) if eq.comparisonType.asSeq.nonEmpty =>
-      Not(ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(eq.comparisonType.asSeq.get.element),
-        ref = seqEqual.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o))(e.o)
-
-    case concat @ Concat(xs, ys) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(concat.t.asSeq.get.element),
-        ref = seqConcat.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case LiteralSeq(t, Nil) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(t),
-        ref = seqEmpty.ref,
-        args = Nil,
-      )(e.o)
-
-    case LiteralSeq(t, x +: xs) =>
-      xs.foldLeft(
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case Size(xs) if xs.t.asSeq.nonEmpty =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs),
+          ref = seqLength.ref,
+          args = Seq(dispatch(xs)),
+        )(e.o)
+
+      case SeqSubscript(xs, i) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs),
+          ref = seqIndex.ref,
+          args = Seq(dispatch(xs), dispatch(i)),
+        )(e.o)
+
+      case SeqMember(x, xs) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs),
+          ref = seqContains.ref,
+          args = Seq(dispatch(xs), dispatch(x)),
+        )(e.o)
+
+      case eq @ Eq(xs, ys) if eq.comparisonType.asSeq.nonEmpty =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(eq.comparisonType.asSeq.get.element),
+          ref = seqEqual.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case eq @ Neq(xs, ys) if eq.comparisonType.asSeq.nonEmpty =>
+        Not(
+          ADTFunctionInvocation[Post](
+            typeArgs = typeArgs(eq.comparisonType.asSeq.get.element),
+            ref = seqEqual.ref,
+            args = Seq(dispatch(xs), dispatch(ys)),
+          )(e.o)
+        )(e.o)
+
+      case concat @ Concat(xs, ys) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(concat.t.asSeq.get.element),
+          ref = seqConcat.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case LiteralSeq(t, Nil) =>
         ADTFunctionInvocation[Post](
           typeArgs = typeArgs(t),
-          ref = seqSingleton.ref,
-          args = Seq(dispatch(x)),
+          ref = seqEmpty.ref,
+          args = Nil,
         )(e.o)
-      ) {
-        case (init, next) =>
+
+      case LiteralSeq(t, x +: xs) =>
+        xs.foldLeft(
+          ADTFunctionInvocation[Post](
+            typeArgs = typeArgs(t),
+            ref = seqSingleton.ref,
+            args = Seq(dispatch(x)),
+          )(e.o)
+        ) { case (init, next) =>
           ADTFunctionInvocation[Post](
             typeArgs = typeArgs(t),
             ref = seqConcat.ref,
-            args = Seq(init, ADTFunctionInvocation[Post](
-              typeArgs = typeArgs(t),
-              ref = seqSingleton.ref,
-              args = Seq(dispatch(next))
-            )(e.o))
+            args = Seq(
+              init,
+              ADTFunctionInvocation[Post](
+                typeArgs = typeArgs(t),
+                ref = seqSingleton.ref,
+                args = Seq(dispatch(next)),
+              )(e.o),
+            ),
           )(e.o)
-      }
-
-    case Range(from, to) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = Some((seqAdt.ref, Seq(TInt()))),
-        ref = seqRange.ref,
-        args = Seq(dispatch(from), dispatch(to)),
-      )(e.o)
-
-    case SeqUpdate(xs, i, x) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs),
-        ref = seqUpdate.ref,
-        args = Seq(dispatch(xs), dispatch(i), dispatch(x)),
-      )(e.o)
-
-    case Take(xs, n) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs),
-        ref = seqTake.ref,
-        args = Seq(dispatch(xs), dispatch(n)),
-      )(e.o)
-
-    case Drop(xs, n) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs),
-        ref = seqDrop.ref,
-        args = Seq(dispatch(xs), dispatch(n)),
-      )(e.o)
-
-    case other => rewriteDefault(other)
-  }
+        }
+
+      case Range(from, to) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = Some((seqAdt.ref, Seq(TInt()))),
+          ref = seqRange.ref,
+          args = Seq(dispatch(from), dispatch(to)),
+        )(e.o)
+
+      case SeqUpdate(xs, i, x) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs),
+          ref = seqUpdate.ref,
+          args = Seq(dispatch(xs), dispatch(i), dispatch(x)),
+        )(e.o)
+
+      case Take(xs, n) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs),
+          ref = seqTake.ref,
+          args = Seq(dispatch(xs), dispatch(n)),
+        )(e.o)
+
+      case Drop(xs, n) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs),
+          ref = seqDrop.ref,
+          args = Seq(dispatch(xs), dispatch(n)),
+        )(e.o)
+
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportSet.scala b/src/rewrite/vct/rewrite/adt/ImportSet.scala
index 70fa5dbb9b..d927389a08 100644
--- a/src/rewrite/vct/rewrite/adt/ImportSet.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportSet.scala
@@ -6,113 +6,134 @@ import vct.col.rewrite.{Generation, Rewritten}
 
 case object ImportSet extends ImportADTBuilder("set")
 
-case class ImportSet[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportSet[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   private lazy val setFile = parse("set")
 
   private lazy val setAdt = find[AxiomaticDataType[Post]](setFile, "set")
   private lazy val setSize = find[ADTFunction[Post]](setAdt, "set_size")
   private lazy val setIn = find[ADTFunction[Post]](setAdt, "set_in")
   private lazy val setEmpty = find[ADTFunction[Post]](setAdt, "set_empty")
-  private lazy val setSingleton = find[ADTFunction[Post]](setAdt, "set_singleton")
-  private lazy val setUnionOne = find[ADTFunction[Post]](setAdt, "set_union_one")
+  private lazy val setSingleton = find[ADTFunction[Post]](
+    setAdt,
+    "set_singleton",
+  )
+  private lazy val setUnionOne = find[ADTFunction[Post]](
+    setAdt,
+    "set_union_one",
+  )
   private lazy val setUnion = find[ADTFunction[Post]](setAdt, "set_union")
-  private lazy val setIntersection = find[ADTFunction[Post]](setAdt, "set_intersection")
-  private lazy val setDifference = find[ADTFunction[Post]](setAdt, "set_difference")
+  private lazy val setIntersection = find[ADTFunction[Post]](
+    setAdt,
+    "set_intersection",
+  )
+  private lazy val setDifference = find[ADTFunction[Post]](
+    setAdt,
+    "set_difference",
+  )
   private lazy val setSubset = find[ADTFunction[Post]](setAdt, "set_subset")
   private lazy val setEqual = find[ADTFunction[Post]](setAdt, "set_equal")
   private lazy val setSkolem = find[ADTFunction[Post]](setAdt, "set_skolem")
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TSet(inner) => TAxiomatic[Post](setAdt.ref, Seq(dispatch(inner)))(t.o)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TSet(inner) =>
+        TAxiomatic[Post](setAdt.ref, Seq(dispatch(inner)))(t.o)
+      case other => rewriteDefault(other)
+    }
 
-  def typeArgs(xs: Expr[Pre]): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
+  def typeArgs(
+      xs: Expr[Pre]
+  ): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
     typeArgs(xs.t.asSet.get.element)
 
-  def typeArgs(t: Type[Pre]): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
+  def typeArgs(
+      t: Type[Pre]
+  ): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
     Some((setAdt.ref, Seq(dispatch(t))))
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case Size(xs) if xs.t.asSet.nonEmpty =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs),
-        ref = setSize.ref,
-        args = Seq(dispatch(xs)),
-      )(e.o)
-
-    case SetMember(x, xs) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs),
-        ref = setIn.ref,
-        args = Seq(dispatch(xs), dispatch(x)),
-      )(e.o)
-
-    case LiteralSet(element, Nil) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(element),
-        ref = setEmpty.ref,
-        args = Nil,
-      )(e.o)
-
-    case LiteralSet(element, x +: xs) =>
-      xs.foldLeft(
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case Size(xs) if xs.t.asSet.nonEmpty =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs),
+          ref = setSize.ref,
+          args = Seq(dispatch(xs)),
+        )(e.o)
+
+      case SetMember(x, xs) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs),
+          ref = setIn.ref,
+          args = Seq(dispatch(xs), dispatch(x)),
+        )(e.o)
+
+      case LiteralSet(element, Nil) =>
         ADTFunctionInvocation[Post](
           typeArgs = typeArgs(element),
-          ref = setSingleton.ref,
-          args = Seq(dispatch(x)),
+          ref = setEmpty.ref,
+          args = Nil,
         )(e.o)
-      ) {
-        case (init, next) =>
+
+      case LiteralSet(element, x +: xs) =>
+        xs.foldLeft(
+          ADTFunctionInvocation[Post](
+            typeArgs = typeArgs(element),
+            ref = setSingleton.ref,
+            args = Seq(dispatch(x)),
+          )(e.o)
+        ) { case (init, next) =>
           ADTFunctionInvocation[Post](
             typeArgs = typeArgs(element),
             ref = setUnionOne.ref,
             args = Seq(init, dispatch(next)),
           )(e.o)
-      }
-
-    case union @ SetUnion(xs, ys) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(union.t.element),
-        ref = setUnion.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case int @ SetIntersection(xs, ys) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(int.t.element),
-        ref = setIntersection.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case diff @ SetMinus(xs, ys) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(diff.t.element),
-        ref = setDifference.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case SubSetEq(xs, ys) =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(xs.t.asSet.get.element),
-        ref = setSubset.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(e.o)
-
-    case eq @ Eq(xs, ys) if eq.comparisonType.asSet.nonEmpty =>
-      ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(eq.comparisonType.asSeq.get.element),
-        ref = setEqual.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(eq.o)
-
-    case neq @ Neq(xs, ys) if neq.comparisonType.asSet.nonEmpty =>
-      Not(ADTFunctionInvocation[Post](
-        typeArgs = typeArgs(neq.comparisonType.asSeq.get.element),
-        ref = setEqual.ref,
-        args = Seq(dispatch(xs), dispatch(ys)),
-      )(neq.o))(neq.o)
-
-    case other => rewriteDefault(other)
-  }
+        }
+
+      case union @ SetUnion(xs, ys) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(union.t.element),
+          ref = setUnion.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case int @ SetIntersection(xs, ys) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(int.t.element),
+          ref = setIntersection.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case diff @ SetMinus(xs, ys) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(diff.t.element),
+          ref = setDifference.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case SubSetEq(xs, ys) =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(xs.t.asSet.get.element),
+          ref = setSubset.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(e.o)
+
+      case eq @ Eq(xs, ys) if eq.comparisonType.asSet.nonEmpty =>
+        ADTFunctionInvocation[Post](
+          typeArgs = typeArgs(eq.comparisonType.asSeq.get.element),
+          ref = setEqual.ref,
+          args = Seq(dispatch(xs), dispatch(ys)),
+        )(eq.o)
+
+      case neq @ Neq(xs, ys) if neq.comparisonType.asSet.nonEmpty =>
+        Not(
+          ADTFunctionInvocation[Post](
+            typeArgs = typeArgs(neq.comparisonType.asSeq.get.element),
+            ref = setEqual.ref,
+            args = Seq(dispatch(xs), dispatch(ys)),
+          )(neq.o)
+        )(neq.o)
+
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportSetCompat.scala b/src/rewrite/vct/rewrite/adt/ImportSetCompat.scala
index 1b8956f668..8ba9cc4fb7 100644
--- a/src/rewrite/vct/rewrite/adt/ImportSetCompat.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportSetCompat.scala
@@ -5,44 +5,56 @@ import vct.col.origin._
 import vct.col.rewrite.{Generation, Rewriter}
 import vct.col.rewrite.adt.{ImportADT, ImportADTBuilder, ImportADTImporter}
 import vct.col.typerules.CoercingRewriter
-import vct.rewrite.adt.ImportSetCompat.{SetEmptyFreshPreconditionFailed, SetEmptyPreconditionFailed}
+import vct.rewrite.adt.ImportSetCompat.{
+  SetEmptyFreshPreconditionFailed,
+  SetEmptyPreconditionFailed,
+}
 
 case object ImportSetCompat extends ImportADTBuilder("map_compat") {
-  case class SetEmptyPreconditionFailed(choose: Choose[_]) extends Blame[PreconditionFailed] {
+  case class SetEmptyPreconditionFailed(choose: Choose[_])
+      extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       choose.blame.blame(SetEmpty(choose.xs))
   }
 
-  case class SetEmptyFreshPreconditionFailed(choose: ChooseFresh[_]) extends Blame[PreconditionFailed] {
+  case class SetEmptyFreshPreconditionFailed(choose: ChooseFresh[_])
+      extends Blame[PreconditionFailed] {
     override def blame(error: PreconditionFailed): Unit =
       choose.blame.blame(SetEmpty(choose.xs))
   }
 }
 
-case class ImportSetCompat[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportSetCompat[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   private lazy val setCompatFile = parse("set_compat")
 
   private lazy val setChoose = find[Function[Post]](setCompatFile, "set_choose")
-  private lazy val setChooseFresh = find[Procedure[Post]](setCompatFile, "set_choose_fresh")
-
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case choose @ Choose(xs) =>
-      FunctionInvocation[Post](
-        ref = setChoose.ref,
-        args = Seq(dispatch(xs)),
-        typeArgs = Seq(dispatch(choose.t)),
-        givenMap = Nil, yields = Nil,
-      )(NoContext(SetEmptyPreconditionFailed(choose)))(e.o)
-
-    case choose @ ChooseFresh(xs) =>
-      ProcedureInvocation[Post](
-        ref = setChooseFresh.ref,
-        args = Seq(dispatch(xs)),
-        outArgs = Nil,
-        typeArgs = Seq(dispatch(choose.t)),
-        givenMap = Nil, yields = Nil,
-      )(NoContext(SetEmptyFreshPreconditionFailed(choose)))(e.o)
-
-    case other => super.postCoerce(other)
-  }
+  private lazy val setChooseFresh = find[Procedure[Post]](
+    setCompatFile,
+    "set_choose_fresh",
+  )
+
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case choose @ Choose(xs) =>
+        FunctionInvocation[Post](
+          ref = setChoose.ref,
+          args = Seq(dispatch(xs)),
+          typeArgs = Seq(dispatch(choose.t)),
+          givenMap = Nil,
+          yields = Nil,
+        )(NoContext(SetEmptyPreconditionFailed(choose)))(e.o)
+
+      case choose @ ChooseFresh(xs) =>
+        ProcedureInvocation[Post](
+          ref = setChooseFresh.ref,
+          args = Seq(dispatch(xs)),
+          outArgs = Nil,
+          typeArgs = Seq(dispatch(choose.t)),
+          givenMap = Nil,
+          yields = Nil,
+        )(NoContext(SetEmptyFreshPreconditionFailed(choose)))(e.o)
+
+      case other => super.postCoerce(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportTuple.scala b/src/rewrite/vct/rewrite/adt/ImportTuple.scala
index 0d49609df1..b6dea649c5 100644
--- a/src/rewrite/vct/rewrite/adt/ImportTuple.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportTuple.scala
@@ -6,7 +6,8 @@ import vct.col.rewrite.Generation
 
 case object ImportTuple extends ImportADTBuilder("tuple")
 
-case class ImportTuple[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportTuple[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   private lazy val tupleFile = parse("tuple")
 
   private lazy val tupleAdt = find[AxiomaticDataType[Post]](tupleFile, "tuple")
@@ -14,38 +15,53 @@ case class ImportTuple[Pre <: Generation](importer: ImportADTImporter) extends I
   private lazy val tupleFst = find[ADTFunction[Post]](tupleAdt, "fst")
   private lazy val tupleSnd = find[ADTFunction[Post]](tupleAdt, "snd")
 
-  def tupFst(e: Expr[Post], fstType: Type[Post], sndType: Type[Post])(implicit o: Origin): Expr[Post] =
+  def tupFst(e: Expr[Post], fstType: Type[Post], sndType: Type[Post])(
+      implicit o: Origin
+  ): Expr[Post] =
     ADTFunctionInvocation[Post](
       Some((tupleAdt.ref, Seq(fstType, sndType))),
-      tupleFst.ref, Seq(e),
+      tupleFst.ref,
+      Seq(e),
     )
 
-  def tupSnd(e: Expr[Post], fstType: Type[Post], sndType: Type[Post])(implicit o: Origin): Expr[Post] =
+  def tupSnd(e: Expr[Post], fstType: Type[Post], sndType: Type[Post])(
+      implicit o: Origin
+  ): Expr[Post] =
     ADTFunctionInvocation[Post](
       Some((tupleAdt.ref, Seq(fstType, sndType))),
-      tupleSnd.ref, Seq(e),
+      tupleSnd.ref,
+      Seq(e),
     )
 
-  def tup(fst: Expr[Post], fstType: Type[Post], snd: Expr[Post], sndType: Type[Post])(implicit o: Origin): Expr[Post] =
+  def tup(
+      fst: Expr[Post],
+      fstType: Type[Post],
+      snd: Expr[Post],
+      sndType: Type[Post],
+  )(implicit o: Origin): Expr[Post] =
     ADTFunctionInvocation[Post](
       Some((tupleAdt.ref, Seq(fstType, sndType))),
-      tupleTup.ref, Seq(fst, snd),
+      tupleTup.ref,
+      Seq(fst, snd),
     )
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TTuple(Seq(t1, t2)) => TAxiomatic(tupleAdt.ref, Seq(dispatch(t1), dispatch(t2)))
-    case other => rewriteDefault(other)
-  }
-
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case LiteralTuple(Seq(t1, t2), Seq(v1, v2)) =>
-      tup(dispatch(v1), dispatch(t1), dispatch(v2), dispatch(t2))(e.o)
-    case TupGet(tup, 0) =>
-      val ts = tup.t.asTuple.get.elements.map(dispatch)
-      tupFst(dispatch(tup), ts(0), ts(1))(e.o)
-    case TupGet(tup, 1) =>
-      val ts = tup.t.asTuple.get.elements.map(dispatch)
-      tupSnd(dispatch(tup), ts(0), ts(1))(e.o)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TTuple(Seq(t1, t2)) =>
+        TAxiomatic(tupleAdt.ref, Seq(dispatch(t1), dispatch(t2)))
+      case other => rewriteDefault(other)
+    }
+
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case LiteralTuple(Seq(t1, t2), Seq(v1, v2)) =>
+        tup(dispatch(v1), dispatch(t1), dispatch(v2), dispatch(t2))(e.o)
+      case TupGet(tup, 0) =>
+        val ts = tup.t.asTuple.get.elements.map(dispatch)
+        tupFst(dispatch(tup), ts(0), ts(1))(e.o)
+      case TupGet(tup, 1) =>
+        val ts = tup.t.asTuple.get.elements.map(dispatch)
+        tupSnd(dispatch(tup), ts(0), ts(1))(e.o)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportVector.scala b/src/rewrite/vct/rewrite/adt/ImportVector.scala
index 03e4a7e5f8..b8343373bc 100644
--- a/src/rewrite/vct/rewrite/adt/ImportVector.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportVector.scala
@@ -9,39 +9,52 @@ import vct.col.util.AstBuildHelpers._
 import scala.collection.mutable
 
 case object ImportVector extends ImportADTBuilder("vector") {
-  case class VectorBoundsPreconditionFailed(inner: Blame[VectorBoundFailure], subscript: VectorSubscript[_]) extends Blame[PreconditionFailed] {
-    override def blame(error: PreconditionFailed): Unit = error.path match {
-      case FailLeft +: _ => inner.blame(VectorBoundNegative(subscript))
-      case FailRight +: _ => inner.blame(VectorBoundExceedsLength(subscript))
-      case _ => PanicBlame("Should not occur")
-    }
+  case class VectorBoundsPreconditionFailed(
+      inner: Blame[VectorBoundFailure],
+      subscript: VectorSubscript[_],
+  ) extends Blame[PreconditionFailed] {
+    override def blame(error: PreconditionFailed): Unit =
+      error.path match {
+        case FailLeft +: _ => inner.blame(VectorBoundNegative(subscript))
+        case FailRight +: _ => inner.blame(VectorBoundExceedsLength(subscript))
+        case _ => PanicBlame("Should not occur")
+      }
   }
 
-  case class VectorOperatorToInvocation(div: DividingExpr[_]) extends Blame[InvocationFailure] {
-    override def blame(error: InvocationFailure): Unit = error match {
-      case PreconditionFailed(dirs, _, _) => div.blame.blame(VectorDivByZero(div, getNum(dirs)))
-      case _ => PanicBlame("Should not occur")
-    }
+  case class VectorOperatorToInvocation(div: DividingExpr[_])
+      extends Blame[InvocationFailure] {
+    override def blame(error: InvocationFailure): Unit =
+      error match {
+        case PreconditionFailed(dirs, _, _) =>
+          div.blame.blame(VectorDivByZero(div, getNum(dirs)))
+        case _ => PanicBlame("Should not occur")
+      }
   }
 
-  def getNum(dirs: Seq[AccountedDirection], accum:Int =0): Int = dirs match {
-    case FailLeft +: _ => accum
-    case FailRight +: Nil => accum + 1
-    case FailRight +: tail => getNum(tail, accum+1)
-  }
+  def getNum(dirs: Seq[AccountedDirection], accum: Int = 0): Int =
+    dirs match {
+      case FailLeft +: _ => accum
+      case FailRight +: Nil => accum + 1
+      case FailRight +: tail => getNum(tail, accum + 1)
+    }
 
 }
 
-case class ImportVector[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportVector[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   import ImportVector._
   private lazy val vectorFile = parse("vector")
-  private lazy val vectorAdt = find[AxiomaticDataType[Post]](vectorFile, "vector")
+  private lazy val vectorAdt = find[AxiomaticDataType[Post]](
+    vectorFile,
+    "vector",
+  )
   private lazy val vector_loc = find[ADTFunction[Post]](vectorAdt, "vector_loc")
 
   val makeVectorMethods: mutable.Map[BigInt, Function[Post]] = mutable.Map()
 
-  val vectorOpsMethods: mutable.Map[(BigInt, String, Type[Post]), Function[Post]] = mutable.Map()
-
+  val vectorOpsMethods
+      : mutable.Map[(BigInt, String, Type[Post]), Function[Post]] = mutable
+    .Map()
 
   val vLocMethods: mutable.Map[BigInt, Function[Post]] = mutable.Map()
 
@@ -52,17 +65,25 @@ case class ImportVector[Pre <: Generation](importer: ImportADTImporter) extends
      requires 0 <= i;
      requires i < 4;
     pure T v4loc<T>(`vector`<T> a, int i) = `vector`<T>.vector_loc(a, i);
-    */
+     */
     globalDeclarations.declare(withResult((result: Result[Post]) => {
-      val elementTypeVar = new Variable[Post](TType(TAnyValue()))(o.where(name= "T"))
+      val elementTypeVar =
+        new Variable[Post](TType(TAnyValue()))(o.where(name = "T"))
       val elementType = TVar[Post](elementTypeVar.ref)
       val tVec = TAxiomatic[Post](vectorAdt.ref, Seq(elementType))
 
-      val a = new Variable[Post](tVec)(o.where(name= "a"))
-      val i = new Variable[Post](TInt())(o.where(name= "i"))
+      val a = new Variable[Post](tVec)(o.where(name = "a"))
+      val i = new Variable[Post](TInt())(o.where(name = "i"))
 
-      val requires: Seq[Expr[Post]] = Seq(const[Post](0) <= i.get, i.get < const[Post](size))
-      val body = ADTFunctionInvocation[Post](Some((vectorAdt.ref, Seq(elementType))), vector_loc.ref, Seq(a.get, i.get))
+      val requires: Seq[Expr[Post]] = Seq(
+        const[Post](0) <= i.get,
+        i.get < const[Post](size),
+      )
+      val body = ADTFunctionInvocation[Post](
+        Some((vectorAdt.ref, Seq(elementType))),
+        vector_loc.ref,
+        Seq(a.get, i.get),
+      )
 
       function(
         blame = AbstractApplicable,
@@ -71,9 +92,12 @@ case class ImportVector[Pre <: Generation](importer: ImportADTImporter) extends
         body = Some(body),
         returnType = elementType,
         args = Seq(a, i),
-        requires = SplitAccountedPredicate(UnitAccountedPredicate(requires(0)), UnitAccountedPredicate(requires(1))),
-        ensures = UnitAccountedPredicate(tt)
-      )(o.where(name= "v" + size.toString + "loc"))
+        requires = SplitAccountedPredicate(
+          UnitAccountedPredicate(requires(0)),
+          UnitAccountedPredicate(requires(1)),
+        ),
+        ensures = UnitAccountedPredicate(tt),
+      )(o.where(name = "v" + size.toString + "loc"))
     }))
   }
 
@@ -86,14 +110,29 @@ case class ImportVector[Pre <: Generation](importer: ImportADTImporter) extends
      ensures vloc<T>(\result, 2) == x2;
      ensures vloc<T>(\result, 3) == x3;
     pure `vector`<T> make_v4<T>(T x0, T x1, T x2, T x3);
-    */
+     */
     globalDeclarations.declare(withResult((result: Result[Post]) => {
-      val elementTypeVar = new Variable[Post](TType(TAnyValue()))(o.where(name= "T"))
+      val elementTypeVar =
+        new Variable[Post](TType(TAnyValue()))(o.where(name = "T"))
       val elementType = TVar[Post](elementTypeVar.ref)
 
-      val xs = Seq.tabulate(size.toInt)(x => new Variable[Post](elementType)(o.where(name= f"x$x")))
-      val ensures: Seq[Expr[Post]] = xs.zipWithIndex.map({case (x, i) => Eq(
-        makeSubScript(result, const[Post](i), elementType, size, PanicBlame("Cannot Fail"), o), x.get)})
+      val xs =
+        Seq.tabulate(size.toInt)(x =>
+          new Variable[Post](elementType)(o.where(name = f"x$x"))
+        )
+      val ensures: Seq[Expr[Post]] = xs.zipWithIndex.map({ case (x, i) =>
+        Eq(
+          makeSubScript(
+            result,
+            const[Post](i),
+            elementType,
+            size,
+            PanicBlame("Cannot Fail"),
+            o,
+          ),
+          x.get,
+        )
+      })
 
       function(
         blame = AbstractApplicable,
@@ -102,13 +141,22 @@ case class ImportVector[Pre <: Generation](importer: ImportADTImporter) extends
         returnType = TAxiomatic[Post](vectorAdt.ref, Seq(elementType)),
         args = xs,
         requires = UnitAccountedPredicate(tt),
-        ensures = UnitAccountedPredicate(foldAnd(ensures))
-      )(o.where(name= "make_v" + size.toString))
+        ensures = UnitAccountedPredicate(foldAnd(ensures)),
+      )(o.where(name = "make_v" + size.toString))
     }))
   }
 
-  def makeVectorOp(size: BigInt, elementType: Type[Post], isDivOp: Boolean, isCompareOp: Boolean, operator: (Expr[Post], Expr[Post]) => Expr[Post], operatorName: String ): Function[Post] = {
-    implicit val o: Origin = Origin(Seq(LabelContext(f"vector $operatorName method")))
+  def makeVectorOp(
+      size: BigInt,
+      elementType: Type[Post],
+      isDivOp: Boolean,
+      isCompareOp: Boolean,
+      operator: (Expr[Post], Expr[Post]) => Expr[Post],
+      operatorName: String,
+  ): Function[Post] = {
+    implicit val o: Origin = Origin(
+      Seq(LabelContext(f"vector $operatorName method"))
+    )
     /* for instance for size 4 and is a division operator
      decreases;
      requires vloc<T>(y, 0) != 0 && vloc<T>(y, 1) != 0 && vloc<T>(y, 2) != 0 && vloc<T>(y, 3) != 0;
@@ -117,50 +165,107 @@ case class ImportVector[Pre <: Generation](importer: ImportADTImporter) extends
      ensures vloc<T>(\result, 2) == vloc<T>(x, 2) `op` vloc<T>(y, 2);
      ensures vloc<T>(\result, 3) == vloc<T>(x, 3) `op` vloc<T>(y, 3);
     pure `vector`<T> op<T>(`vector`<T> x, `vector`<T> y);
-    */
+     */
     globalDeclarations.declare(withResult((result: Result[Post]) => {
       val vectorType = TAxiomatic[Post](vectorAdt.ref, Seq(elementType))
 
-      val x = new Variable[Post](vectorType)(o.where(name= f"x"))
-      val y = new Variable[Post](vectorType)(o.where(name= f"y"))
+      val x = new Variable[Post](vectorType)(o.where(name = f"x"))
+      val y = new Variable[Post](vectorType)(o.where(name = f"y"))
       val requires =
-        if(isDivOp && size>0) foldPredicate(Seq.tabulate(size.toInt)(i => Neq(
-          makeSubScript(y.get, const[Post](i), elementType, size, PanicBlame("Cannot Fail"), o),
-          const[Post](0))))
-        else UnitAccountedPredicate[Post](tt)
-
-      val ensures: Seq[Expr[Post]] = Seq.tabulate(size.toInt)(i => Eq(
-        makeSubScript(result, const[Post](i), elementType, size, PanicBlame("Cannot Fail"), o), // \result[i]
-        operator(
-          makeSubScript(x.get, const[Post](i), elementType, size, PanicBlame("Cannot Fail"), o), // x[i]
-          makeSubScript(y.get, const[Post](i), elementType, size, PanicBlame("Cannot Fail"), o)  // y[i]
+        if (isDivOp && size > 0)
+          foldPredicate(Seq.tabulate(size.toInt)(i =>
+            Neq(
+              makeSubScript(
+                y.get,
+                const[Post](i),
+                elementType,
+                size,
+                PanicBlame("Cannot Fail"),
+                o,
+              ),
+              const[Post](0),
+            )
+          ))
+        else
+          UnitAccountedPredicate[Post](tt)
+
+      val ensures: Seq[Expr[Post]] =
+        Seq.tabulate(size.toInt)(i =>
+          Eq(
+            makeSubScript(
+              result,
+              const[Post](i),
+              elementType,
+              size,
+              PanicBlame("Cannot Fail"),
+              o,
+            ), // \result[i]
+            operator(
+              makeSubScript(
+                x.get,
+                const[Post](i),
+                elementType,
+                size,
+                PanicBlame("Cannot Fail"),
+                o,
+              ), // x[i]
+              makeSubScript(
+                y.get,
+                const[Post](i),
+                elementType,
+                size,
+                PanicBlame("Cannot Fail"),
+                o,
+              ), // y[i]
+            ),
+          )
         )
-      ))
 
       function(
         blame = AbstractApplicable,
         contractBlame = TrueSatisfiable,
         typeArgs = Nil,
-        returnType = TAxiomatic[Post](vectorAdt.ref, Seq(if(isCompareOp) TInt() else elementType)),
+        returnType = TAxiomatic[Post](
+          vectorAdt.ref,
+          Seq(
+            if (isCompareOp)
+              TInt()
+            else
+              elementType
+          ),
+        ),
         args = Seq(x, y),
         requires = requires,
-        ensures = UnitAccountedPredicate(foldAnd(ensures))
-      )(o.where(name= f"${operatorName}_v" + size.toString))
+        ensures = UnitAccountedPredicate(foldAnd(ensures)),
+      )(o.where(name = f"${operatorName}_v" + size.toString))
     }))
   }
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TVector(size, inner) => TAxiomatic[Post](vectorAdt.ref, Seq(dispatch(inner)))(t.o)
-    case other => other.rewriteDefault()
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TVector(size, inner) =>
+        TAxiomatic[Post](vectorAdt.ref, Seq(dispatch(inner)))(t.o)
+      case other => other.rewriteDefault()
+    }
 
-  def typeArgs(xs: Expr[Pre]): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
+  def typeArgs(
+      xs: Expr[Pre]
+  ): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
     typeArgs(xs.t.asVector.get.element)
 
-  def typeArgs(t: Type[Pre]): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
+  def typeArgs(
+      t: Type[Pre]
+  ): Option[(Ref[Post, AxiomaticDataType[Post]], Seq[Type[Post]])] =
     Some((vectorAdt.ref, Seq(dispatch(t))))
 
-  def makeSubScript(vec: Expr[Post], index: Expr[Post], elementType: Type[Post], size: BigInt, blame: Blame[InvocationFailure], o: Origin) = {
+  def makeSubScript(
+      vec: Expr[Post],
+      index: Expr[Post],
+      elementType: Type[Post],
+      size: BigInt,
+      blame: Blame[InvocationFailure],
+      o: Origin,
+  ) = {
     val vloc = vLocMethods.getOrElseUpdate(size, vlocMake(size))
 
     FunctionInvocation[Post](
@@ -168,85 +273,200 @@ case class ImportVector[Pre <: Generation](importer: ImportADTImporter) extends
       ref = vloc.ref,
       args = Seq(vec, index),
       givenMap = Nil,
-      yields = Nil)(blame)(o)
+      yields = Nil,
+    )(blame)(o)
   }
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case LiteralVector(element, xs) =>
-      val makeVector = makeVectorMethods.getOrElseUpdate(xs.size, makeVectorCreation(xs.size))
-
-      FunctionInvocation[Post](
-        typeArgs = Seq(dispatch(element)),
-        ref = makeVector.ref,
-        args = xs.map[Expr[Post]](dispatch),
-        givenMap = Nil,
-        yields = Nil
-      )(PanicBlame("No requires"))(e.o)
-    case sub@VectorSubscript(vec, index) =>
-      val (size, elementT) = vec.t match {
-        case TVector(size, inner) => (size, inner)
-        case _ => ???
-      }
-      makeSubScript(dispatch(vec), dispatch(index), dispatch(elementT), size,
-        NoContext(VectorBoundsPreconditionFailed(sub.blame, sub)), e.o)
-    case e: VectorBinExpr[Pre] =>
-      val (size, elementTold) = e.t match {
-        case TVector(size, inner) => (size, inner)
-        case _ => ???
-      }
-      val elementT = dispatch(elementTold)
-
-      val divOpBlame = e match { case e: DividingVectorBinExpr[Pre] => Some(e); case _ => None}
-      val divOp = divOpBlame.isDefined
-
-      val vectorOpFunction =
-        e match {
-          case _: VectorEq[Pre] =>
-            val o: Origin = Origin(Seq(LabelContext("vector eq method")))
-            vectorOpsMethods.getOrElseUpdate((size, "eq", elementT), makeVectorOp(size, elementT, isDivOp=divOp, isCompareOp=true, (l,r) => Select(Eq[Post](l, r)(o), const(1)(o), const(0)(o))(o) , "eq"))
-          case _: VectorNeq[Pre] =>
-            val o: Origin = Origin(Seq(LabelContext("vector neq method")))
-            vectorOpsMethods.getOrElseUpdate((size, "neq", elementT), makeVectorOp(size, elementT, isDivOp=divOp, isCompareOp=true, (l,r) => Neq[Post](l, r)(o), "neq"))
-          case _: VectorMult[Pre] =>
-            val o: Origin = Origin(Seq(LabelContext("vector mult method")))
-            vectorOpsMethods.getOrElseUpdate((size, "mult", elementT), makeVectorOp(size, elementT, isDivOp=divOp, isCompareOp=false, (l,r) => Mult[Post](l, r)(o), "mult"))
-          case _: VectorPlus[Pre] =>
-            val o: Origin = Origin(Seq(LabelContext("vector plus method")))
-            vectorOpsMethods.getOrElseUpdate((size, "plus", elementT), makeVectorOp(size, elementT, isDivOp=divOp, isCompareOp=false, (l,r) => Plus[Post](l, r)(o), "plus"))
-          case _: VectorMinus[Pre] =>
-            val o: Origin = Origin(Seq(LabelContext("vector minus method")))
-            vectorOpsMethods.getOrElseUpdate((size, "minus", elementT), makeVectorOp(size, elementT, isDivOp=divOp, isCompareOp=false, (l,r) => Minus[Post](l, r)(o), "minus"))
-          case div: VectorTruncDiv[Pre] =>
-            val o: Origin = Origin(Seq(LabelContext("vector div method")))
-            vectorOpsMethods.getOrElseUpdate((size, "truncDiv", elementT), makeVectorOp(size, elementT, isDivOp=divOp, isCompareOp=false, (l,r) => TruncDiv[Post](l, r)(div.blame)(o), "div"))
-          case div: VectorFloorDiv[Pre] =>
-            val o: Origin = Origin(Seq(LabelContext("vector div method")))
-            vectorOpsMethods.getOrElseUpdate((size, "floorDiv", elementT), makeVectorOp(size, elementT, isDivOp=divOp, isCompareOp=false, (l,r) => FloorDiv[Post](l, r)(div.blame)(o), "div"))
-          case div: VectorFloatDiv[Pre] =>
-            val o: Origin = Origin(Seq(LabelContext("vector div method")))
-            vectorOpsMethods.getOrElseUpdate((size, "floatDiv", elementT), makeVectorOp(size, elementT, isDivOp=divOp, isCompareOp=false, (l,r) => FloatDiv[Post](l, r)(div.blame)(o), "div"))
-          case mod: VectorMod[Pre] =>
-            val o: Origin = Origin(Seq(LabelContext("vector mod method")))
-            vectorOpsMethods.getOrElseUpdate((size, "mod", elementT), makeVectorOp(size, elementT, isDivOp=divOp, isCompareOp=false, (l,r) => Mod[Post](l, r)(mod.blame)(o), "mod"))
-          case mod: VectorTruncMod[Pre] =>
-            val o: Origin = Origin(Seq(LabelContext("vector mod method")))
-            vectorOpsMethods.getOrElseUpdate((size, "truncMod", elementT), makeVectorOp(size, elementT, isDivOp=divOp, isCompareOp=false, (l,r) => TruncMod[Post](l, r)(mod.blame)(o), "mod"))
-        }
-
-      val blame = divOpBlame match {
-        case Some (oldDiv) => VectorOperatorToInvocation(oldDiv)
-        case None => PanicBlame ("No requires")
-      }
-
-      FunctionInvocation[Post](
-        typeArgs = Nil,
-        ref = vectorOpFunction.ref,
-        args = Seq(dispatch(e.left), dispatch(e.right)),
-        givenMap = Nil,
-        yields = Nil
-      )(blame)(e.o)
-    case f: FunctionInvocation[Post] =>
-      e.rewriteDefault()
-    case other => other.rewriteDefault()
-  }
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case LiteralVector(element, xs) =>
+        val makeVector = makeVectorMethods
+          .getOrElseUpdate(xs.size, makeVectorCreation(xs.size))
+
+        FunctionInvocation[Post](
+          typeArgs = Seq(dispatch(element)),
+          ref = makeVector.ref,
+          args = xs.map[Expr[Post]](dispatch),
+          givenMap = Nil,
+          yields = Nil,
+        )(PanicBlame("No requires"))(e.o)
+      case sub @ VectorSubscript(vec, index) =>
+        val (size, elementT) =
+          vec.t match {
+            case TVector(size, inner) => (size, inner)
+            case _ => ???
+          }
+        makeSubScript(
+          dispatch(vec),
+          dispatch(index),
+          dispatch(elementT),
+          size,
+          NoContext(VectorBoundsPreconditionFailed(sub.blame, sub)),
+          e.o,
+        )
+      case e: VectorBinExpr[Pre] =>
+        val (size, elementTold) =
+          e.t match {
+            case TVector(size, inner) => (size, inner)
+            case _ => ???
+          }
+        val elementT = dispatch(elementTold)
+
+        val divOpBlame =
+          e match {
+            case e: DividingVectorBinExpr[Pre] => Some(e); case _ => None
+          }
+        val divOp = divOpBlame.isDefined
+
+        val vectorOpFunction =
+          e match {
+            case _: VectorEq[Pre] =>
+              val o: Origin = Origin(Seq(LabelContext("vector eq method")))
+              vectorOpsMethods.getOrElseUpdate(
+                (size, "eq", elementT),
+                makeVectorOp(
+                  size,
+                  elementT,
+                  isDivOp = divOp,
+                  isCompareOp = true,
+                  (l, r) =>
+                    Select(Eq[Post](l, r)(o), const(1)(o), const(0)(o))(o),
+                  "eq",
+                ),
+              )
+            case _: VectorNeq[Pre] =>
+              val o: Origin = Origin(Seq(LabelContext("vector neq method")))
+              vectorOpsMethods.getOrElseUpdate(
+                (size, "neq", elementT),
+                makeVectorOp(
+                  size,
+                  elementT,
+                  isDivOp = divOp,
+                  isCompareOp = true,
+                  (l, r) => Neq[Post](l, r)(o),
+                  "neq",
+                ),
+              )
+            case _: VectorMult[Pre] =>
+              val o: Origin = Origin(Seq(LabelContext("vector mult method")))
+              vectorOpsMethods.getOrElseUpdate(
+                (size, "mult", elementT),
+                makeVectorOp(
+                  size,
+                  elementT,
+                  isDivOp = divOp,
+                  isCompareOp = false,
+                  (l, r) => Mult[Post](l, r)(o),
+                  "mult",
+                ),
+              )
+            case _: VectorPlus[Pre] =>
+              val o: Origin = Origin(Seq(LabelContext("vector plus method")))
+              vectorOpsMethods.getOrElseUpdate(
+                (size, "plus", elementT),
+                makeVectorOp(
+                  size,
+                  elementT,
+                  isDivOp = divOp,
+                  isCompareOp = false,
+                  (l, r) => Plus[Post](l, r)(o),
+                  "plus",
+                ),
+              )
+            case _: VectorMinus[Pre] =>
+              val o: Origin = Origin(Seq(LabelContext("vector minus method")))
+              vectorOpsMethods.getOrElseUpdate(
+                (size, "minus", elementT),
+                makeVectorOp(
+                  size,
+                  elementT,
+                  isDivOp = divOp,
+                  isCompareOp = false,
+                  (l, r) => Minus[Post](l, r)(o),
+                  "minus",
+                ),
+              )
+            case div: VectorTruncDiv[Pre] =>
+              val o: Origin = Origin(Seq(LabelContext("vector div method")))
+              vectorOpsMethods.getOrElseUpdate(
+                (size, "truncDiv", elementT),
+                makeVectorOp(
+                  size,
+                  elementT,
+                  isDivOp = divOp,
+                  isCompareOp = false,
+                  (l, r) => TruncDiv[Post](l, r)(div.blame)(o),
+                  "div",
+                ),
+              )
+            case div: VectorFloorDiv[Pre] =>
+              val o: Origin = Origin(Seq(LabelContext("vector div method")))
+              vectorOpsMethods.getOrElseUpdate(
+                (size, "floorDiv", elementT),
+                makeVectorOp(
+                  size,
+                  elementT,
+                  isDivOp = divOp,
+                  isCompareOp = false,
+                  (l, r) => FloorDiv[Post](l, r)(div.blame)(o),
+                  "div",
+                ),
+              )
+            case div: VectorFloatDiv[Pre] =>
+              val o: Origin = Origin(Seq(LabelContext("vector div method")))
+              vectorOpsMethods.getOrElseUpdate(
+                (size, "floatDiv", elementT),
+                makeVectorOp(
+                  size,
+                  elementT,
+                  isDivOp = divOp,
+                  isCompareOp = false,
+                  (l, r) => FloatDiv[Post](l, r)(div.blame)(o),
+                  "div",
+                ),
+              )
+            case mod: VectorMod[Pre] =>
+              val o: Origin = Origin(Seq(LabelContext("vector mod method")))
+              vectorOpsMethods.getOrElseUpdate(
+                (size, "mod", elementT),
+                makeVectorOp(
+                  size,
+                  elementT,
+                  isDivOp = divOp,
+                  isCompareOp = false,
+                  (l, r) => Mod[Post](l, r)(mod.blame)(o),
+                  "mod",
+                ),
+              )
+            case mod: VectorTruncMod[Pre] =>
+              val o: Origin = Origin(Seq(LabelContext("vector mod method")))
+              vectorOpsMethods.getOrElseUpdate(
+                (size, "truncMod", elementT),
+                makeVectorOp(
+                  size,
+                  elementT,
+                  isDivOp = divOp,
+                  isCompareOp = false,
+                  (l, r) => TruncMod[Post](l, r)(mod.blame)(o),
+                  "mod",
+                ),
+              )
+          }
+
+        val blame =
+          divOpBlame match {
+            case Some(oldDiv) => VectorOperatorToInvocation(oldDiv)
+            case None => PanicBlame("No requires")
+          }
+
+        FunctionInvocation[Post](
+          typeArgs = Nil,
+          ref = vectorOpFunction.ref,
+          args = Seq(dispatch(e.left), dispatch(e.right)),
+          givenMap = Nil,
+          yields = Nil,
+        )(blame)(e.o)
+      case f: FunctionInvocation[Post] => e.rewriteDefault()
+      case other => other.rewriteDefault()
+    }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportViperOrder.scala b/src/rewrite/vct/rewrite/adt/ImportViperOrder.scala
index fd7295fa51..6fc88e72ee 100644
--- a/src/rewrite/vct/rewrite/adt/ImportViperOrder.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportViperOrder.scala
@@ -6,13 +6,20 @@ import vct.col.rewrite.Generation
 
 case object ImportViperOrder extends ImportADTBuilder("viper_order")
 
-case class ImportViperOrder[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportViperOrder[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   override def postCoerce(program: Program[Pre]): Program[Post] = {
-    program.rewrite(declarations = globalDeclarations.collect {
-      if(program.transSubnodes.collectFirst { case contract: ApplicableContract[Pre] if contract.decreases.nonEmpty => () }.nonEmpty) {
-        parse("viper_order")
-      }
-      program.declarations.foreach(dispatch)
-    }._1)
+    program.rewrite(declarations =
+      globalDeclarations.collect {
+        if (
+          program.transSubnodes.collectFirst {
+            case contract: ApplicableContract[Pre]
+                if contract.decreases.nonEmpty =>
+              ()
+          }.nonEmpty
+        ) { parse("viper_order") }
+        program.declarations.foreach(dispatch)
+      }._1
+    )
   }
 }
diff --git a/src/rewrite/vct/rewrite/adt/ImportVoid.scala b/src/rewrite/vct/rewrite/adt/ImportVoid.scala
index dbbc0027bd..414bdfed90 100644
--- a/src/rewrite/vct/rewrite/adt/ImportVoid.scala
+++ b/src/rewrite/vct/rewrite/adt/ImportVoid.scala
@@ -7,33 +7,38 @@ import vct.col.util.AstBuildHelpers._
 
 case object ImportVoid extends ImportADTBuilder("void")
 
-case class ImportVoid[Pre <: Generation](importer: ImportADTImporter) extends ImportADT[Pre](importer) {
+case class ImportVoid[Pre <: Generation](importer: ImportADTImporter)
+    extends ImportADT[Pre](importer) {
   private lazy val voidFile = parse("void")
 
   private lazy val voidAdt = find[AxiomaticDataType[Post]](voidFile, "void")
   private lazy val voidUnit = find[ADTFunction[Post]](voidAdt, "unit")
 
-  override def postCoerce(t: Type[Pre]): Type[Post] = t match {
-    case TVoid() => TAxiomatic(voidAdt.ref, Nil)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(t: Type[Pre]): Type[Post] =
+    t match {
+      case TVoid() => TAxiomatic(voidAdt.ref, Nil)
+      case other => rewriteDefault(other)
+    }
 
-  override def postCoerce(e: Expr[Pre]): Expr[Post] = e match {
-    case Void() =>
-      ADTFunctionInvocation[Post](None, voidUnit.ref, Nil)(e.o)
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case Void() => ADTFunctionInvocation[Post](None, voidUnit.ref, Nil)(e.o)
+      case other => rewriteDefault(other)
+    }
 
   // PB: dumb hack alert: TVoid and Return(Void()) is (for viper) a marker to indicate that there is no return type.
-  override def postCoerce(decl: Declaration[Pre]): Unit = decl match {
-    case method: AbstractMethod[Pre] if method.returnType == TVoid[Pre]() =>
-      allScopes.anyDeclare(allScopes.anySucceedOnly(method, method.rewrite(returnType = TVoid())))
-    case other => super.postCoerce(other)
-  }
-
-  override def postCoerce(stat: Statement[Pre]): Statement[Post] = stat match {
-    case ret@Return(v@Void()) => ret.rewrite(result = Void()(v.o))
-    case other => rewriteDefault(other)
-  }
+  override def postCoerce(decl: Declaration[Pre]): Unit =
+    decl match {
+      case method: AbstractMethod[Pre] if method.returnType == TVoid[Pre]() =>
+        allScopes.anyDeclare(
+          allScopes.anySucceedOnly(method, method.rewrite(returnType = TVoid()))
+        )
+      case other => super.postCoerce(other)
+    }
+
+  override def postCoerce(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case ret @ Return(v @ Void()) => ret.rewrite(result = Void()(v.o))
+      case other => rewriteDefault(other)
+    }
 }
-
diff --git a/src/rewrite/vct/rewrite/bip/BipVerificationResults.scala b/src/rewrite/vct/rewrite/bip/BipVerificationResults.scala
index 43d70ee7e8..57adb99b6f 100644
--- a/src/rewrite/vct/rewrite/bip/BipVerificationResults.scala
+++ b/src/rewrite/vct/rewrite/bip/BipVerificationResults.scala
@@ -12,32 +12,46 @@ case object BIP {
   case class UnexpectedVerificationResult(text: String) extends SystemError
 
   case class VerificationResults() {
-    val preconditionResults:  mut.Map[BipTransition[_], BipVerificationResult] = mut.LinkedHashMap()
-    val transitionResults: mut.Map[BipTransition[_], BipVerificationResult] = mut.LinkedHashMap()
-    val constructorResults: mut.Map[BipComponent[_], BipVerificationResult] = mut.LinkedHashMap()
-    val componentToTransitions: mut.Map[BipComponent[_], Seq[BipTransition[_]]] = mut.LinkedHashMap()
+    val preconditionResults: mut.Map[BipTransition[_], BipVerificationResult] =
+      mut.LinkedHashMap()
+    val transitionResults: mut.Map[BipTransition[_], BipVerificationResult] =
+      mut.LinkedHashMap()
+    val constructorResults: mut.Map[BipComponent[_], BipVerificationResult] =
+      mut.LinkedHashMap()
+    val componentToTransitions
+        : mut.Map[BipComponent[_], Seq[BipTransition[_]]] = mut.LinkedHashMap()
 
-    def nonEmpty: Boolean = transitionResults.nonEmpty || constructorResults.nonEmpty
+    def nonEmpty: Boolean =
+      transitionResults.nonEmpty || constructorResults.nonEmpty
 
-    def setWith[T](e: T, m: mut.Map[T, BipVerificationResult], result: BipVerificationResult): Unit = m.get(e) match {
-      case Some(Success) => m(e) = result
-      case Some(_) => throw EncodeBip.OverwritingBipResultError()
-      case None => throw EncodeBip.UnexpectedBipResultError()
-    }
+    def setWith[T](
+        e: T,
+        m: mut.Map[T, BipVerificationResult],
+        result: BipVerificationResult,
+    ): Unit =
+      m.get(e) match {
+        case Some(Success) => m(e) = result
+        case Some(_) => throw EncodeBip.OverwritingBipResultError()
+        case None => throw EncodeBip.UnexpectedBipResultError()
+      }
 
-    def reportPreconditionNotVerified(bt: BipTransition[_]): Unit = preconditionResults(bt) match {
-      case Success => preconditionResults(bt) = PreconditionNotVerified
-      case PreconditionNotVerified => // Already on there, don't have to set again
-      case _ => ??? // Any other case should not occur - hence we error here
-    }
+    def reportPreconditionNotVerified(bt: BipTransition[_]): Unit =
+      preconditionResults(bt) match {
+        case Success => preconditionResults(bt) = PreconditionNotVerified
+        case PreconditionNotVerified => // Already on there, don't have to set again
+        case _ => ??? // Any other case should not occur - hence we error here
+      }
 
-    def report(bt: BipTransition[_], result: BipVerificationResult): Unit = setWith(bt, transitionResults, result)
-    def report(bt: BipComponent[_], result: BipVerificationResult): Unit = setWith(bt, constructorResults, result)
+    def report(bt: BipTransition[_], result: BipVerificationResult): Unit =
+      setWith(bt, transitionResults, result)
+    def report(bt: BipComponent[_], result: BipVerificationResult): Unit =
+      setWith(bt, constructorResults, result)
 
-    def declareWith[T](e: T, m: mut.Map[T, BipVerificationResult]): Unit = m.get(e) match {
-      case Some(_) => throw EncodeBip.UnexpectedBipResultError()
-      case None => m(e) = Success
-    }
+    def declareWith[T](e: T, m: mut.Map[T, BipVerificationResult]): Unit =
+      m.get(e) match {
+        case Some(_) => throw EncodeBip.UnexpectedBipResultError()
+        case None => m(e) = Success
+      }
 
     def declare(bc: BipComponent[_], bt: BipTransition[_]): Unit = {
       declareWith(bt, transitionResults)
@@ -47,49 +61,78 @@ case object BIP {
       // This is not unsound, but it is a bit of an unintuitive edge case, as one might not expect unused
       // transitions to end up in the verification report.
       declareWith(bt, preconditionResults)
-      componentToTransitions(bc) = componentToTransitions.getOrElseUpdate(bc, Seq()) :+ bt
+      componentToTransitions(bc) =
+        componentToTransitions.getOrElseUpdate(bc, Seq()) :+ bt
     }
     def declare(bt: BipComponent[_]): Unit = declareWith(bt, constructorResults)
 
     import Standalone._
 
-    implicit def proofResultFromBool(b: Boolean): ProofResult = ProofResult.mk(b)
+    implicit def proofResultFromBool(b: Boolean): ProofResult =
+      ProofResult.mk(b)
 
     def toStandalone(transition: BipTransition[_]): TransitionEntry = {
       val sig = transition.signature
 
-      val preconditionResult: ProofResult = preconditionResults(transition) match {
-        case Success => true
-        case PreconditionNotVerified => false
-        case r => throw UnexpectedVerificationResult(s"Result $r should not occur here")
-      }
+      val preconditionResult: ProofResult =
+        preconditionResults(transition) match {
+          case Success => true
+          case PreconditionNotVerified => false
+          case r =>
+            throw UnexpectedVerificationResult(
+              s"Result $r should not occur here"
+            )
+        }
 
-      TransitionEntry(TransitionSignature(sig.portName, sig.sourceStateName, sig.targetStateName, sig.textualGuard),
+      TransitionEntry(
+        TransitionSignature(
+          sig.portName,
+          sig.sourceStateName,
+          sig.targetStateName,
+          sig.textualGuard,
+        ),
         transitionResults(transition) match {
-          case ComponentInvariantNotMaintained => TransitionResults(preconditionResult, false, false, false)
-          case UpdateFunctionFailure =>           TransitionResults(preconditionResult, false, false, false)
-          case StateInvariantNotMaintained =>     TransitionResults(preconditionResult, true, false, false)
-          case PostconditionNotVerified =>        TransitionResults(preconditionResult, true, true, false)
-          case Success =>                         TransitionResults(preconditionResult, true, true, true)
-          case r => throw UnexpectedVerificationResult(s"Result $r should not occur here")
-        })
+          case ComponentInvariantNotMaintained =>
+            TransitionResults(preconditionResult, false, false, false)
+          case UpdateFunctionFailure =>
+            TransitionResults(preconditionResult, false, false, false)
+          case StateInvariantNotMaintained =>
+            TransitionResults(preconditionResult, true, false, false)
+          case PostconditionNotVerified =>
+            TransitionResults(preconditionResult, true, true, false)
+          case Success =>
+            TransitionResults(preconditionResult, true, true, true)
+          case r =>
+            throw UnexpectedVerificationResult(
+              s"Result $r should not occur here"
+            )
+        },
+      )
     }
 
-    def constructorToStandalone(component: BipComponent[_]): ConstructorReport = constructorResults(component) match {
-      case ConstructorFailure => ConstructorReport(false, false)
-      case ComponentInvariantNotMaintained => ConstructorReport(false, false)
-      case StateInvariantNotMaintained => ConstructorReport(true, false)
-      case Success => ConstructorReport(true, true)
-      case r => throw UnexpectedVerificationResult(s"Result $r should not occur here")
-    }
+    def constructorToStandalone(component: BipComponent[_]): ConstructorReport =
+      constructorResults(component) match {
+        case ConstructorFailure => ConstructorReport(false, false)
+        case ComponentInvariantNotMaintained => ConstructorReport(false, false)
+        case StateInvariantNotMaintained => ConstructorReport(true, false)
+        case Success => ConstructorReport(true, true)
+        case r =>
+          throw UnexpectedVerificationResult(s"Result $r should not occur here")
+      }
 
     def toStandalone(): VerificationReport = {
-      val allComponents = (componentToTransitions.keys.toSeq ++ constructorResults.keys.toSeq).distinct
+      val allComponents =
+        (componentToTransitions.keys.toSeq ++ constructorResults.keys.toSeq)
+          .distinct
       val componentReports = allComponents.map { component =>
-          (component.fqn.mkString("."),
-            ComponentReport(
-              constructorToStandalone(component),
-              componentToTransitions.get(component).map(_.map(toStandalone)).getOrElse(Seq())))
+        (
+          component.fqn.mkString("."),
+          ComponentReport(
+            constructorToStandalone(component),
+            componentToTransitions.get(component).map(_.map(toStandalone))
+              .getOrElse(Seq()),
+          ),
+        )
       }
       VerificationReport(mut.LinkedHashMap.from(componentReports))
     }
@@ -105,30 +148,61 @@ case object BIP {
 
   case object Standalone {
     case object ProofResult {
-      def mk(b: Boolean): ProofResult = if(b) Proven else NotProven
+      def mk(b: Boolean): ProofResult =
+        if (b)
+          Proven
+        else
+          NotProven
     }
     sealed trait ProofResult
     case object Proven extends ProofResult
     case object NotProven extends ProofResult
 
-    case class ConstructorReport(componentInvariant: ProofResult, stateInvariant: ProofResult)
+    case class ConstructorReport(
+        componentInvariant: ProofResult,
+        stateInvariant: ProofResult,
+    )
 
-    case class TransitionSignature(name: String, source: String, target: String, guard: Option[String])
-    case class TransitionResults(precondition: ProofResult, componentInvariant: ProofResult, stateInvariant: ProofResult, postcondition: ProofResult)
-    case class TransitionEntry(signature: TransitionSignature, results: TransitionResults)
-    case class ComponentReport(constructor: ConstructorReport, transitions: Seq[TransitionEntry])
+    case class TransitionSignature(
+        name: String,
+        source: String,
+        target: String,
+        guard: Option[String],
+    )
+    case class TransitionResults(
+        precondition: ProofResult,
+        componentInvariant: ProofResult,
+        stateInvariant: ProofResult,
+        postcondition: ProofResult,
+    )
+    case class TransitionEntry(
+        signature: TransitionSignature,
+        results: TransitionResults,
+    )
+    case class ComponentReport(
+        constructor: ConstructorReport,
+        transitions: Seq[TransitionEntry],
+    )
 
-    case class VerificationReport(components: mut.LinkedHashMap[String, ComponentReport]) {
+    case class VerificationReport(
+        components: mut.LinkedHashMap[String, ComponentReport]
+    ) {
       def toJson(): String = upickle.default.write(this, 2)
       def isEmpty(): Boolean = components.isEmpty
       def nonEmpty(): Boolean = !isEmpty()
     }
 
     object VerificationReport {
-      implicit val rwProven: ReadWriter[ProofResult] = readwriter[String].bimap[ProofResult](
-        { case Proven => "proven"; case NotProven => "not proven" },
-        { provenStr => if(provenStr == "proven") Proven else NotProven }
-      )
+      implicit val rwProven: ReadWriter[ProofResult] = readwriter[String]
+        .bimap[ProofResult](
+          { case Proven => "proven"; case NotProven => "not proven" },
+          { provenStr =>
+            if (provenStr == "proven")
+              Proven
+            else
+              NotProven
+          },
+        )
       implicit val rwConstructor: ReadWriter[ConstructorReport] = macroRW
       implicit val rwComponent: ReadWriter[ComponentReport] = macroRW
       implicit val rwTransitionReport: ReadWriter[TransitionResults] = macroRW
@@ -139,14 +213,23 @@ case object BIP {
         // Default encoding from upickle is to have an empty list, which is wrong for us
         readwriter[ujson.Value].bimap[TransitionSignature](
           { sig =>
-            val o = ujson.Obj("name" -> sig.name, "source" -> sig.source, "target" -> sig.target)
+            val o = ujson.Obj(
+              "name" -> sig.name,
+              "source" -> sig.source,
+              "target" -> sig.target,
+            )
             sig.guard.foreach(g => o.value.put("guard", g))
             o
           },
           { v =>
             val o = v.obj
-            TransitionSignature(o("name").str, o("source").str, o("target").str, o.get("guard").map(_.str))
-          }
+            TransitionSignature(
+              o("name").str,
+              o("source").str,
+              o("target").str,
+              o.get("guard").map(_.str),
+            )
+          },
         )
 
       implicit val rwVerification: ReadWriter[VerificationReport] = {
@@ -154,17 +237,20 @@ case object BIP {
         // and the entry being component reports. The default serializer puts that dict behind a "components" key, as
         // that is the default encoding for case classes. This works around that.
         readwriter[ujson.Value].bimap[VerificationReport](
-          { report => ujson.Obj(report.components.map { case (k, v) => (k, writeJs(v)) }) },
-          { v => VerificationReport(v.obj.value.map { case (k, v) => (k, read[ComponentReport](v)) }) }
+          { report =>
+            ujson.Obj(report.components.map { case (k, v) => (k, writeJs(v)) })
+          },
+          { v =>
+            VerificationReport(v.obj.value.map { case (k, v) =>
+              (k, read[ComponentReport](v))
+            })
+          },
         )
       }
 
       def fromJson(str: String): Either[Exception, VerificationReport] = {
-        try {
-          Right(read[VerificationReport](str))
-        } catch {
-          case e: Exception => Left(e)
-        }
+        try { Right(read[VerificationReport](str)) }
+        catch { case e: Exception => Left(e) }
       }
     }
   }
diff --git a/src/rewrite/vct/rewrite/bip/ComputeBipGlue.scala b/src/rewrite/vct/rewrite/bip/ComputeBipGlue.scala
index 84d0d9c3dc..178f6d4f50 100644
--- a/src/rewrite/vct/rewrite/bip/ComputeBipGlue.scala
+++ b/src/rewrite/vct/rewrite/bip/ComputeBipGlue.scala
@@ -4,9 +4,30 @@ import com.typesafe.scalalogging.LazyLogging
 import org.sosy_lab.java_smt.SolverContextFactory
 import org.sosy_lab.java_smt.SolverContextFactory.Solvers
 import org.sosy_lab.java_smt.api.SolverContext.ProverOptions
-import org.sosy_lab.java_smt.api.{BooleanFormula, BooleanFormulaManager, SolverContext}
+import org.sosy_lab.java_smt.api.{
+  BooleanFormula,
+  BooleanFormulaManager,
+  SolverContext,
+}
 import org.sosy_lab.java_smt.utils.PrettyPrinter
-import vct.col.ast.{BipData, BipGlue, BipGlueAccepts, BipGlueDataWire, BipGlueRequires, BipIncomingData, BipOutgoingData, BipPort, BipPortSynchronization, BipTransition, Class, ClassDeclaration, Declaration, Expr, Node, Program}
+import vct.col.ast.{
+  BipData,
+  BipGlue,
+  BipGlueAccepts,
+  BipGlueDataWire,
+  BipGlueRequires,
+  BipIncomingData,
+  BipOutgoingData,
+  BipPort,
+  BipPortSynchronization,
+  BipTransition,
+  Class,
+  ClassDeclaration,
+  Declaration,
+  Expr,
+  Node,
+  Program,
+}
 import vct.col.ref.Ref
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 
@@ -16,17 +37,20 @@ import scala.util.Using
 
 case object ComputeBipGlue extends RewriterBuilder {
   override def key: String = "computeGlue"
-  override def desc: String = "Encodes BIP glue into SAT to compute all possible synchronizations"
+  override def desc: String =
+    "Encodes BIP glue into SAT to compute all possible synchronizations"
 }
 
 //noinspection JavaAccessorEmptyParenCall
-case class ComputeBipGlue[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging {
+case class ComputeBipGlue[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
   var program: Program[Pre] = _
 
-  def xor(bm: BooleanFormulaManager, bs: Seq[BooleanFormula]): BooleanFormula = bs match {
-    case Seq(b) => b
-    case b +: bs => bm.xor(b, xor(bm, bs))
-  }
+  def xor(bm: BooleanFormulaManager, bs: Seq[BooleanFormula]): BooleanFormula =
+    bs match {
+      case Seq(b) => b
+      case b +: bs => bm.xor(b, xor(bm, bs))
+    }
 
   override def dispatch(program: Program[Pre]): Program[Post] = {
     this.program = program
@@ -40,28 +64,32 @@ case class ComputeBipGlue[Pre <: Generation]() extends Rewriter[Pre] with LazyLo
     val fm = ctx.getFormulaManager
     val bm = fm.getBooleanFormulaManager
 
-    def prefix(n: Node[Pre]): String = n match {
-      case _: BipTransition[Pre] => "t!"
-      case _: BipData[Pre] => "d!"
-      case _: BipPort[Pre] => "p!"
-      case _: BipGlueDataWire[Pre] => "w!"
-      case _ => ???
-    }
+    def prefix(n: Node[Pre]): String =
+      n match {
+        case _: BipTransition[Pre] => "t!"
+        case _: BipData[Pre] => "d!"
+        case _: BipPort[Pre] => "p!"
+        case _: BipGlueDataWire[Pre] => "w!"
+        case _ => ???
+      }
 
-    def unique(n: Node[Pre]): String = uniqueName(prefix(n) + n.o.getPreferredNameOrElse().camel)
+    def unique(n: Node[Pre]): String =
+      uniqueName(prefix(n) + n.o.getPreferredNameOrElse().camel)
 
     def uniqueName(candidate: String): String = {
       var count: Option[Int] = None
       while (true) {
-        val currentCandidate = count match {
-          case Some(n) => s"$candidate$n"
-          case None => candidate
-        }
-        if (names.contains(currentCandidate)) {
-          count = count match {
-            case Some(n) => Some(n + 1)
-            case None => Some(0)
+        val currentCandidate =
+          count match {
+            case Some(n) => s"$candidate$n"
+            case None => candidate
           }
+        if (names.contains(currentCandidate)) {
+          count =
+            count match {
+              case Some(n) => Some(n + 1)
+              case None => Some(0)
+            }
         } else {
           names.add(currentCandidate)
           return currentCandidate
@@ -73,7 +101,8 @@ case class ComputeBipGlue[Pre <: Generation]() extends Rewriter[Pre] with LazyLo
     def name(n: Node[Pre]): String = nodeToName.getOrElseUpdate(n, unique(n))
     def get(n: Node[Pre]): BooleanFormula = {
       n match {
-        case _: BipTransition[Pre] | _: BipGlueDataWire[Pre] | _: BipPort[Pre] | _: BipData[Pre] =>
+        case _: BipTransition[Pre] | _: BipGlueDataWire[Pre] | _: BipPort[Pre] |
+            _: BipData[Pre] =>
         case _ => ???
       }
       bm.makeVariable(name(n))
@@ -84,28 +113,34 @@ case class ComputeBipGlue[Pre <: Generation]() extends Rewriter[Pre] with LazyLo
     def toBooleanFormula(ctx: BipSmt): BooleanFormula
   }
 
-  case class PortEnablesInputsOutputs(port: BipPort[Pre], datas: Seq[BipData[Pre]]) extends Constraint {
+  case class PortEnablesInputsOutputs(
+      port: BipPort[Pre],
+      datas: Seq[BipData[Pre]],
+  ) extends Constraint {
     override def toBooleanFormula(ctx: BipSmt): BooleanFormula =
-      ctx.bm.implication(
-        ctx.get(port),
-        ctx.bm.and(datas.map(ctx.get) :_*)
-      )
+      ctx.bm.implication(ctx.get(port), ctx.bm.and(datas.map(ctx.get): _*))
   }
 
-  case class OutputDataNeedsPort(data: BipOutgoingData[Pre], ports: Seq[BipPort[Pre]]) extends Constraint {
+  case class OutputDataNeedsPort(
+      data: BipOutgoingData[Pre],
+      ports: Seq[BipPort[Pre]],
+  ) extends Constraint {
     override def toBooleanFormula(ctx: BipSmt): BooleanFormula =
-      ctx.bm.implication(
-        ctx.get(data),
-        ctx.bm.or(ports.map(ctx.get): _*)
-      )
+      ctx.bm.implication(ctx.get(data), ctx.bm.or(ports.map(ctx.get): _*))
   }
 
-  case class InputDataNeedsPort(data: BipIncomingData[Pre], ports: Seq[BipPort[Pre]]) extends Constraint {
+  case class InputDataNeedsPort(
+      data: BipIncomingData[Pre],
+      ports: Seq[BipPort[Pre]],
+  ) extends Constraint {
     override def toBooleanFormula(ctx: BipSmt): BooleanFormula =
       ctx.bm.implication(ctx.get(data), ctx.bm.or(ports.map(ctx.get(_)): _*))
   }
 
-  case class InputRequiresOneActiveWire(data: BipIncomingData[Pre], incomingWires: Seq[BipGlueDataWire[Pre]]) extends Constraint {
+  case class InputRequiresOneActiveWire(
+      data: BipIncomingData[Pre],
+      incomingWires: Seq[BipGlueDataWire[Pre]],
+  ) extends Constraint {
     // We require at least one wire to exist for an input - otherwise the model is not well-formed
     // Otherwise, the resulting constraint is: data => xor(Seq()) === data => false === !data
     // Meaning, if there is no incoming wire, an input data can never be turned on.
@@ -114,12 +149,12 @@ case class ComputeBipGlue[Pre <: Generation]() extends Rewriter[Pre] with LazyLo
       val bm = ctx.bm
       bm.implication(
         ctx.get(data),
-        xor(bm, incomingWires.map { wire =>
-          bm.and(
-            ctx.get(wire.dataOut.decl),
-            ctx.get(wire)
-          )
-        })
+        xor(
+          bm,
+          incomingWires.map { wire =>
+            bm.and(ctx.get(wire.dataOut.decl), ctx.get(wire))
+          },
+        ),
       )
     }
   }
@@ -128,10 +163,8 @@ case class ComputeBipGlue[Pre <: Generation]() extends Rewriter[Pre] with LazyLo
     override def toBooleanFormula(ctx: BipSmt): BooleanFormula =
       ctx.bm.implication(
         ctx.get(wire),
-        ctx.bm.and(
-          ctx.get(wire.dataOut.decl),
-          ctx.get(wire.dataIn.decl)
-        ))
+        ctx.bm.and(ctx.get(wire.dataOut.decl), ctx.get(wire.dataIn.decl)),
+      )
   }
 
   case class Requires(requires: Seq[BipGlueRequires[Pre]]) extends Constraint {
@@ -140,32 +173,36 @@ case class ComputeBipGlue[Pre <: Generation]() extends Rewriter[Pre] with LazyLo
 
     val port = requires.head.port.decl
     lazy val others = requires.flatMap(_.others).map(_.decl)
-    override def toBooleanFormula(ctx: BipSmt): BooleanFormula = others match {
-      case Seq() => ctx.bm.makeTrue()
-      case _ =>
-        ctx.bm.implication(
-        ctx.get(port),
-        ctx.bm.or(others.map(ctx.get): _*)
-      )
-    }
+    override def toBooleanFormula(ctx: BipSmt): BooleanFormula =
+      others match {
+        case Seq() => ctx.bm.makeTrue()
+        case _ =>
+          ctx.bm.implication(ctx.get(port), ctx.bm.or(others.map(ctx.get): _*))
+      }
   }
 
-  case class Accepts(accepts: Seq[BipGlueAccepts[Pre]], allPorts: Seq[BipPort[Pre]]) extends Constraint {
+  case class Accepts(
+      accepts: Seq[BipGlueAccepts[Pre]],
+      allPorts: Seq[BipPort[Pre]],
+  ) extends Constraint {
     // There should be > 0 clauses, and all clauses should concern the same port
     assert(accepts.forall(accepts.head.port.decl == _.port.decl))
 
     val port = accepts.head.port.decl
     lazy val others = accepts.flatMap(_.others).map(_.decl).toSet
-    lazy val offPorts = allPorts.collect { case p if !others.contains(p) && p != port => p }
+    lazy val offPorts = allPorts.collect {
+      case p if !others.contains(p) && p != port => p
+    }
 
     override def toBooleanFormula(ctx: BipSmt): BooleanFormula =
       ctx.bm.implication(
         ctx.get(port),
-        ctx.bm.and(offPorts.map { p => ctx.bm.not(ctx.get(p)) }: _*)
+        ctx.bm.and(offPorts.map { p => ctx.bm.not(ctx.get(p)) }: _*),
       )
   }
 
-  case class ExcludeEmptySynchronization(allPorts: Seq[BipPort[Pre]]) extends Constraint {
+  case class ExcludeEmptySynchronization(allPorts: Seq[BipPort[Pre]])
+      extends Constraint {
     override def toBooleanFormula(ctx: BipSmt): BooleanFormula = {
       // At least one of the ports should go off
       ctx.bm.or(allPorts.map(ctx.get): _*)
@@ -173,28 +210,36 @@ case class ComputeBipGlue[Pre <: Generation]() extends Rewriter[Pre] with LazyLo
   }
 
   def computeGlue(glue: BipGlue[Pre]): Seq[BipPortSynchronization[Pre]] = {
-    val relevantDecls: Set[ClassDeclaration[Pre]] = glue.transSubnodes.collect {
-      case BipGlueRequires(Ref(port), requires) =>
-        port +: requires.map(_.decl)
-      case BipGlueAccepts(Ref(port), accepts) => port +: accepts.map(_.decl)
-      case BipGlueDataWire(Ref(from), Ref(to)) => Seq(from, to)
-    }.flatten.toSet
+    val relevantDecls: Set[ClassDeclaration[Pre]] =
+      glue.transSubnodes.collect {
+        case BipGlueRequires(Ref(port), requires) =>
+          port +: requires.map(_.decl)
+        case BipGlueAccepts(Ref(port), accepts) => port +: accepts.map(_.decl)
+        case BipGlueDataWire(Ref(from), Ref(to)) => Seq(from, to)
+      }.flatten.toSet
 
     // Collect all relevant components. It is assumed that if a component is not mentioned in the glue, we can ignore it for computing glue
-    val classes = program.collect {
-      case cls: Class[Pre] if cls.decls.exists(relevantDecls.contains) => cls
-    }.toIndexedSeq
-    val ports = classes.flatMap { cls => cls.decls.collect { // TODO: Use common one for ports
-      case port: BipPort[Pre] => port
-    }}
+    val classes =
+      program.collect {
+        case cls: Class[Pre] if cls.decls.exists(relevantDecls.contains) => cls
+      }.toIndexedSeq
+    val ports = classes.flatMap { cls =>
+      cls.decls.collect { // TODO: Use common one for ports
+        case port: BipPort[Pre] => port
+      }
+    }
 
     val portEnablesInputsOutputs: Seq[Constraint] = classes.flatMap { cls =>
       val ports = cls.decls.collect { case p: BipPort[Pre] => p }
       // There might actually be multiple transitions given a port. However, these should be guaranteed to all have the same input datas.
       // This is because you can put multiple @Transition annotations on a method given a port, but not @Transition annotations for one
       // specific port on many different methods. (According to Larisa)
-      val transitions = cls.decls.collect { case t: BipTransition[Pre] => t.port.decl -> t }.toMap
-      val outgoingDatas = cls.decls.collect { case d: BipOutgoingData[Pre] => d }
+      val transitions =
+        cls.decls.collect { case t: BipTransition[Pre] => t.port.decl -> t }
+          .toMap
+      val outgoingDatas = cls.decls.collect { case d: BipOutgoingData[Pre] =>
+        d
+      }
       ports.map { port =>
         val incomingDatas = transitions(port).data.map(_.decl)
         PortEnablesInputsOutputs(port, outgoingDatas ++ incomingDatas)
@@ -211,7 +256,9 @@ case class ComputeBipGlue[Pre <: Generation]() extends Rewriter[Pre] with LazyLo
       val transitions = cls.decls.collect { case t: BipTransition[Pre] => t }
       val inDatas = transitions.flatMap(_.data.map(_.decl))
       inDatas.map { data =>
-        val ports = transitions.collect { case t if t.data.map(_.decl).contains(data) => t.port.decl }
+        val ports = transitions.collect {
+          case t if t.data.map(_.decl).contains(data) => t.port.decl
+        }
         InputDataNeedsPort(data, ports)
       }
     }
@@ -230,67 +277,95 @@ case class ComputeBipGlue[Pre <: Generation]() extends Rewriter[Pre] with LazyLo
 
     val requires = {
       val requiresPorts = glue.requires.map(_.port.decl).distinct
-      requiresPorts.map { port => Requires(glue.requires.filter(port == _.port.decl)) }
+      requiresPorts.map { port =>
+        Requires(glue.requires.filter(port == _.port.decl))
+      }
     }
     val accepts = {
       val acceptsPorts = glue.accepts.map(_.port.decl).distinct
-      acceptsPorts.map { port => Accepts(glue.accepts.filter(port == _.port.decl), ports) }
+      acceptsPorts.map { port =>
+        Accepts(glue.accepts.filter(port == _.port.decl), ports)
+      }
     }
 
-    val constraints = (portEnablesInputsOutputs
-      ++ outputDataNeedsPort
-      ++ inputDataNeedsPort
-      ++ inputRequiresOneActiveWire
-      ++ requires
-      ++ accepts
-      ++ wireRequiresPorts
-      :+ ExcludeEmptySynchronization(ports)
-      )
+    val constraints =
+      (portEnablesInputsOutputs ++ outputDataNeedsPort ++
+        inputDataNeedsPort ++ inputRequiresOneActiveWire ++ requires ++
+        accepts ++ wireRequiresPorts :+ ExcludeEmptySynchronization(ports))
+
+    Using(SolverContextFactory.createSolverContext(Solvers.SMTINTERPOL)) {
+      ctx =>
+        Using(ctx.newProverEnvironment(
+          ProverOptions.GENERATE_MODELS,
+          ProverOptions.GENERATE_ALL_SAT,
+        )) { prover =>
+          val bipSmt = BipSmt(ctx)
+
+          val formulas = constraints.map(_.toBooleanFormula(bipSmt))
+          val combinedFormula =
+            formulas.fold(bipSmt.bm.makeTrue()) { (l, r) =>
+              bipSmt.bm.and(l, r)
+            }
+          val allVars = bipSmt.fm.extractVariables(combinedFormula).keySet()
+            .asScala.toSeq.sorted.map(bipSmt.bm.makeVariable)
+          logger.debug("=== Formula: all BIP constraints ===")
+          logger.debug(
+            new PrettyPrinter(bipSmt.fm).formulaToString(combinedFormula)
+          )
+          logger.debug("=== End of formula: all BIP constraints ===")
+          formulas.foreach(prover.addConstraint)
+
+          val synchronizations
+              : mutable.ArrayBuffer[BipPortSynchronization[Pre]] = mutable
+            .ArrayBuffer()
+          while (!prover.isUnsat) {
+            val (synchronization, modelFormula) =
+              Using(prover.getModel()) { model =>
+                val enabledPorts = ports.filter { port =>
+                  model.evaluate(bipSmt.get(port))
+                }.map(_.ref)
+                val enabledWires = wires.filter { wire =>
+                  model.evaluate(bipSmt.get(wire))
+                }
+
+                val modelFormula: BooleanFormula = bipSmt.bm
+                  .and(allVars.map { v =>
+                    bipSmt.bm
+                      .equivalence(v, bipSmt.bm.makeBoolean(model.evaluate(v)))
+                  }: _*)
+
+                (
+                  new BipPortSynchronization[Pre](enabledPorts, enabledWires)(
+                    glue.blame
+                  )(glue.o),
+                  modelFormula,
+                )
+              }.get
+
+            logger.debug(synchronization.summarize)
+            synchronizations.addOne(synchronization)
+            prover.addConstraint(bipSmt.bm.not(modelFormula))
+          }
 
-    Using(SolverContextFactory.createSolverContext(Solvers.SMTINTERPOL)) { ctx =>
-      Using(ctx.newProverEnvironment(ProverOptions.GENERATE_MODELS, ProverOptions.GENERATE_ALL_SAT)) { prover =>
-        val bipSmt = BipSmt(ctx)
-
-        val formulas = constraints.map(_.toBooleanFormula(bipSmt))
-        val combinedFormula = formulas.fold(bipSmt.bm.makeTrue()) { (l, r) => bipSmt.bm.and(l, r) }
-        val allVars = bipSmt.fm.extractVariables(combinedFormula).keySet().asScala.toSeq.sorted.map(bipSmt.bm.makeVariable)
-        logger.debug("=== Formula: all BIP constraints ===")
-        logger.debug(new PrettyPrinter(bipSmt.fm).formulaToString(combinedFormula))
-        logger.debug("=== End of formula: all BIP constraints ===")
-        formulas.foreach(prover.addConstraint)
-
-        val synchronizations: mutable.ArrayBuffer[BipPortSynchronization[Pre]] = mutable.ArrayBuffer()
-        while (!prover.isUnsat) {
-          val (synchronization, modelFormula) = Using(prover.getModel()) { model =>
-            val enabledPorts = ports.filter { port => model.evaluate(bipSmt.get(port)) }.map(_.ref)
-            val enabledWires = wires.filter { wire => model.evaluate(bipSmt.get(wire)) }
-
-            val modelFormula: BooleanFormula = bipSmt.bm.and(
-              allVars.map { v => bipSmt.bm.equivalence(v, bipSmt.bm.makeBoolean(model.evaluate(v))) } : _*)
-
-            (new BipPortSynchronization[Pre](enabledPorts, enabledWires)(glue.blame)(glue.o), modelFormula)
-          }.get
-
-          logger.debug(synchronization.summarize)
-          synchronizations.addOne(synchronization)
-          prover.addConstraint(bipSmt.bm.not(modelFormula))
+          logger
+            .debug(s"Possible synchronizations found: ${synchronizations.size}")
+
+          val portInt = ports.map { p => p -> ports.indexOf(p) }.toMap
+          val wireInt = wires.map { w => w -> wires.indexOf(w) }.toMap
+          import scala.math.Ordering.Implicits._ // Required for ordering of Seq[Int]
+          synchronizations.sortBy { synchronization =>
+            (
+              synchronization.ports.map(p => portInt(p.decl)),
+              synchronization.wires.map(wireInt(_)),
+            )
+          }.toSeq
         }
-
-        logger.debug(s"Possible synchronizations found: ${synchronizations.size}")
-
-        val portInt = ports.map { p => p -> ports.indexOf(p) }.toMap
-        val wireInt = wires.map { w => w -> wires.indexOf(w) }.toMap
-        import scala.math.Ordering.Implicits._ // Required for ordering of Seq[Int]
-        synchronizations.sortBy { synchronization =>
-          (synchronization.ports.map(p => portInt(p.decl)), synchronization.wires.map(wireInt(_)))
-        }.toSeq
-      }
     }.get.get
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case glue: BipGlue[Pre] =>
-      computeGlue(glue).foreach(dispatch)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case glue: BipGlue[Pre] => computeGlue(glue).foreach(dispatch)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/bip/EncodeBip.scala b/src/rewrite/vct/rewrite/bip/EncodeBip.scala
index 423b826238..52652b5f84 100644
--- a/src/rewrite/vct/rewrite/bip/EncodeBip.scala
+++ b/src/rewrite/vct/rewrite/bip/EncodeBip.scala
@@ -6,7 +6,12 @@ import vct.col.ast.RewriteHelpers._
 import vct.col.ast._
 import vct.col.origin._
 import vct.col.ref.Ref
-import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, RewriterBuilderArg}
+import vct.col.rewrite.{
+  Generation,
+  Rewriter,
+  RewriterBuilder,
+  RewriterBuilderArg,
+}
 import vct.col.util.AstBuildHelpers.{contract, _}
 import vct.col.util.SuccessionMap
 import vct.result.VerificationError.{SystemError, Unreachable, UserError}
@@ -22,79 +27,116 @@ case object EncodeBip extends RewriterBuilderArg[VerificationResults] {
 
   object ClassBipComponent {
     def unapply[G](cls: Class[G]): Option[(Class[G], BipComponent[G])] = {
-      cls.decls.collectFirst({
-        case bc: BipComponent[G] => (cls, bc)
-      })
+      cls.decls.collectFirst({ case bc: BipComponent[G] => (cls, bc) })
     }
   }
 
-  case class TransitionPostconditionFailed(results: VerificationResults, transition: BipTransition[_]) extends Blame[CallableFailure] {
-    override def blame(error: CallableFailure): Unit = error match {
-      case cf: ContractedFailure => cf match {
-        case PostconditionFailed(Seq(FailLeft), failure, _) =>
-          results.report(transition, ComponentInvariantNotMaintained)
-          transition.blame.blame(BipComponentInvariantNotMaintained(failure, transition))
-        case PostconditionFailed(Seq(FailRight, FailLeft), failure, _) =>
-          results.report(transition, StateInvariantNotMaintained)
-          transition.blame.blame(BipStateInvariantNotMaintained(failure, transition))
-        case PostconditionFailed(Seq(FailRight, FailRight), failure, _) =>
-          results.report(transition, PostconditionNotVerified)
-          transition.blame.blame(BipTransitionPostconditionFailure(failure, transition))
-        case PostconditionFailed(_, _, _) =>
-          throw BlamePathError
-        case ctx: TerminationMeasureFailed => PanicBlame("BIP transition does not have termination measures").blame(ctx)
-        case ctx: ContextEverywhereFailedInPost => PanicBlame("BIP transition does not have context everywhere").blame(ctx)
+  case class TransitionPostconditionFailed(
+      results: VerificationResults,
+      transition: BipTransition[_],
+  ) extends Blame[CallableFailure] {
+    override def blame(error: CallableFailure): Unit =
+      error match {
+        case cf: ContractedFailure =>
+          cf match {
+            case PostconditionFailed(Seq(FailLeft), failure, _) =>
+              results.report(transition, ComponentInvariantNotMaintained)
+              transition.blame
+                .blame(BipComponentInvariantNotMaintained(failure, transition))
+            case PostconditionFailed(Seq(FailRight, FailLeft), failure, _) =>
+              results.report(transition, StateInvariantNotMaintained)
+              transition.blame
+                .blame(BipStateInvariantNotMaintained(failure, transition))
+            case PostconditionFailed(Seq(FailRight, FailRight), failure, _) =>
+              results.report(transition, PostconditionNotVerified)
+              transition.blame
+                .blame(BipTransitionPostconditionFailure(failure, transition))
+            case PostconditionFailed(_, _, _) => throw BlamePathError
+            case ctx: TerminationMeasureFailed =>
+              PanicBlame("BIP transition does not have termination measures")
+                .blame(ctx)
+            case ctx: ContextEverywhereFailedInPost =>
+              PanicBlame("BIP transition does not have context everywhere")
+                .blame(ctx)
+          }
+        case ctx: SignalsFailed =>
+          PanicBlame("BIP transition does not have signals").blame(ctx)
+        case ctx: ExceptionNotInSignals =>
+          PanicBlame("BIP transition does not have signals").blame(ctx)
       }
-      case ctx: SignalsFailed => PanicBlame("BIP transition does not have signals").blame(ctx)
-      case ctx: ExceptionNotInSignals => PanicBlame("BIP transition does not have signals").blame(ctx)
-    }
   }
 
-  case class ForwardComponentInvariantFailed(results: VerificationResults, component: BipComponent[_], constructor: BipConstructor[_]) extends Blame[ExhaleFailed] {
+  case class ForwardComponentInvariantFailed(
+      results: VerificationResults,
+      component: BipComponent[_],
+      constructor: BipConstructor[_],
+  ) extends Blame[ExhaleFailed] {
     override def blame(error: ExhaleFailed): Unit = {
       results.report(component, ComponentInvariantNotMaintained)
-      constructor.blame.blame(BipComponentInvariantNotEstablished(error.failure, constructor))
+      constructor.blame
+        .blame(BipComponentInvariantNotEstablished(error.failure, constructor))
     }
   }
 
-  case class ForwardStateInvariantFailed(results: VerificationResults, component: BipComponent[_], constructor: BipConstructor[_]) extends Blame[ExhaleFailed] {
+  case class ForwardStateInvariantFailed(
+      results: VerificationResults,
+      component: BipComponent[_],
+      constructor: BipConstructor[_],
+  ) extends Blame[ExhaleFailed] {
     override def blame(error: ExhaleFailed): Unit = {
       results.report(component, StateInvariantNotMaintained)
-      constructor.blame.blame(BipStateInvariantNotEstablished(error.failure, constructor))
+      constructor.blame
+        .blame(BipStateInvariantNotEstablished(error.failure, constructor))
     }
   }
 
-  case class ExecuteOnBlame[T <: VerificationFailure](blame: Blame[T])(callback: => Unit) extends Blame[T] {
+  case class ExecuteOnBlame[T <: VerificationFailure](blame: Blame[T])(
+      callback: => Unit
+  ) extends Blame[T] {
     override def blame(error: T): Unit = {
       callback
       blame.blame(error)
     }
   }
 
-  case class ForwardUnsatisfiableBlame(results: VerificationResults, node: Node[_]) extends Blame[NontrivialUnsatisfiable] {
+  case class ForwardUnsatisfiableBlame(
+      results: VerificationResults,
+      node: Node[_],
+  ) extends Blame[NontrivialUnsatisfiable] {
     node match {
       case _: BipGuard[_] | _: BipTransition[_] | _: BipOutgoingData[_] =>
-      case _ => throw Unreachable("Can only construct this blame with bip guard, bip transition, bip outgoing data")
+      case _ =>
+        throw Unreachable(
+          "Can only construct this blame with bip guard, bip transition, bip outgoing data"
+        )
     }
 
-    override def blame(error: NontrivialUnsatisfiable): Unit = node match {
-      case g: BipGuard[_] => g.blame.blame(BipGuardPreconditionUnsatisfiable(g))
-      case transition: BipTransition[_] =>
-        results.reportPreconditionNotVerified(transition)
-        results.report(transition, UpdateFunctionFailure)
-        transition.blame.blame(BipTransitionPreconditionUnsatisfiable(transition))
-      case data: BipOutgoingData[_] => data.blame.blame(BipOutgoingDataPreconditionUnsatisfiable(data))
-      case _ => throw Unreachable("This blame is not constructed for other types of node.")
-    }
+    override def blame(error: NontrivialUnsatisfiable): Unit =
+      node match {
+        case g: BipGuard[_] =>
+          g.blame.blame(BipGuardPreconditionUnsatisfiable(g))
+        case transition: BipTransition[_] =>
+          results.reportPreconditionNotVerified(transition)
+          results.report(transition, UpdateFunctionFailure)
+          transition.blame
+            .blame(BipTransitionPreconditionUnsatisfiable(transition))
+        case data: BipOutgoingData[_] =>
+          data.blame.blame(BipOutgoingDataPreconditionUnsatisfiable(data))
+        case _ =>
+          throw Unreachable(
+            "This blame is not constructed for other types of node."
+          )
+      }
   }
 
-  case class MissingData(guard: BipGuard[_], transition: BipTransition[_]) extends UserError {
+  case class MissingData(guard: BipGuard[_], transition: BipTransition[_])
+      extends UserError {
     // Guard at POS needs data that transition at POS is not supplying!
     override def code: String = "bipMissingData"
     override def text: String = {
       Message.messagesInContext(
         (guard.o, "Data required by this guard..."),
-        (transition.o, "... is not supplied by this transition")
+        (transition.o, "... is not supplied by this transition"),
       )
     }
   }
@@ -111,38 +153,55 @@ case object EncodeBip extends RewriterBuilderArg[VerificationResults] {
     wire.o.where(prefix = "result")
   }
 
-  private def BipSynchronizationOrigin(s: BipTransitionSynchronization[_]): Origin = {
-    s.o.where(name = "synchron___" +
-      s.transitions.map { case Ref(t) => "transition_" + t.signature.asciiSignature }.mkString("_$_"))
+  private def BipSynchronizationOrigin(
+      s: BipTransitionSynchronization[_]
+  ): Origin = {
+    s.o.where(name =
+      "synchron___" + s.transitions.map { case Ref(t) =>
+        "transition_" + t.signature.asciiSignature
+      }.mkString("_$_")
+    )
   }
 
-  private def SynchronizationComponentVariableOrigin(s: BipTransitionSynchronization[_], c: BipComponent[_]): Origin = {
-    s.o.where(name = c.fqn.mkString("."))
-  }
+  private def SynchronizationComponentVariableOrigin(
+      s: BipTransitionSynchronization[_],
+      c: BipComponent[_],
+  ): Origin = { s.o.where(name = c.fqn.mkString(".")) }
 
-  case class ExhalingTransitionPreconditionFailed(results: BIP.VerificationResults, s: BipTransitionSynchronization[_], t: BipTransition[_]) extends Blame[ExhaleFailed] {
+  case class ExhalingTransitionPreconditionFailed(
+      results: BIP.VerificationResults,
+      s: BipTransitionSynchronization[_],
+      t: BipTransition[_],
+  ) extends Blame[ExhaleFailed] {
     override def blame(error: ExhaleFailed): Unit = {
       results.reportPreconditionNotVerified(t)
       s.blame.blame(TransitionPreconditionFailed(s, t, error.failure))
     }
   }
 
-  private def ImplCheckBipTransitionOrigin(c: BipComponent[_], t: BipTransition[_]): Origin = {
-    t.o.where(name = s"transitionImplementationCheck__${c.fqn.mkString("_")}__${
-      t.o.getPreferredNameOrElse().camel}_${t.signature.asciiSignature}")
+  private def ImplCheckBipTransitionOrigin(
+      c: BipComponent[_],
+      t: BipTransition[_],
+  ): Origin = {
+    t.o.where(name =
+      s"transitionImplementationCheck__${c.fqn.mkString("_")}__${t.o
+          .getPreferredNameOrElse().camel}_${t.signature.asciiSignature}"
+    )
   }
 }
 
-case class EncodeBip[Pre <: Generation](results: VerificationResults) extends Rewriter[Pre] with LazyLogging {
+case class EncodeBip[Pre <: Generation](results: VerificationResults)
+    extends Rewriter[Pre] with LazyLogging {
   import vct.col.rewrite.bip.EncodeBip._
 
   implicit class LocalExprBuildHelpers[G](left: Expr[G]) {
-    def &**(right: Expr[G])(implicit origin: Origin): Expr[G] = (left, right) match {
-      case (BooleanValue(true), BooleanValue(true)) => tt[G]
-      case (BooleanValue(true), e) => e
-      case (e, BooleanValue(true)) => e
-      case _ => Star[G](left, right)
-    }
+    def &**(right: Expr[G])(implicit origin: Origin): Expr[G] =
+      (left, right) match {
+        case (BooleanValue(true), BooleanValue(true)) => tt[G]
+        case (BooleanValue(true), e) => e
+        case (e, BooleanValue(true)) => e
+        case _ => Star[G](left, right)
+      }
   }
 
   var program: Program[Pre] = null
@@ -150,58 +209,93 @@ case class EncodeBip[Pre <: Generation](results: VerificationResults) extends Re
   var currentThis: ScopedStack[Expr[Post]] = ScopedStack()
 
   val currentComponent: ScopedStack[BipComponent[Pre]] = ScopedStack()
-  val rewritingBipTransitionBody: ScopedStack[BipTransition[Pre]] = ScopedStack()
-  val rewritingBipConstructorBody: ScopedStack[BipComponent[Pre]] = ScopedStack()
-
-  lazy val classes = program.transSubnodes.collect { case c: Class[Pre] => c }.toIndexedSeq
-  lazy val components = classes.collect { case ClassBipComponent(cls, component) => component }
-  lazy val allPorts = classes.flatMap { cls => cls.decls.collect { case port: BipPort[Pre] => port } }
-  lazy val transitionToClassComponent: Map[BipTransition[Pre], (Class[Pre], BipComponent[Pre])] = classes.collect {
-    case ClassBipComponent(cls, component) =>
-      cls.decls.collect { case transition: BipTransition[Pre] => (transition, (cls, component)) }
-  }.flatten.toMap
-  lazy val dataToClassComponent: Map[BipData[Pre], (Class[Pre], BipComponent[Pre])] = classes.collect {
-    case ClassBipComponent(cls, component) =>
+  val rewritingBipTransitionBody: ScopedStack[BipTransition[Pre]] =
+    ScopedStack()
+  val rewritingBipConstructorBody: ScopedStack[BipComponent[Pre]] =
+    ScopedStack()
+
+  lazy val classes =
+    program.transSubnodes.collect { case c: Class[Pre] => c }.toIndexedSeq
+  lazy val components = classes.collect {
+    case ClassBipComponent(cls, component) => component
+  }
+  lazy val allPorts = classes.flatMap { cls =>
+    cls.decls.collect { case port: BipPort[Pre] => port }
+  }
+  lazy val transitionToClassComponent
+      : Map[BipTransition[Pre], (Class[Pre], BipComponent[Pre])] =
+    classes.collect { case ClassBipComponent(cls, component) =>
+      cls.decls.collect { case transition: BipTransition[Pre] =>
+        (transition, (cls, component))
+      }
+    }.flatten.toMap
+  lazy val dataToClassComponent
+      : Map[BipData[Pre], (Class[Pre], BipComponent[Pre])] =
+    classes.collect { case ClassBipComponent(cls, component) =>
       cls.decls.collect { case data: BipData[Pre] => (data, (cls, component)) }
-  }.flatten.toMap
-  lazy val guardToClass: Map[BipGuard[Pre], Class[Pre]] = classes.flatMap { cls =>
-    cls.decls.collect { case guard: BipGuard[Pre] => (guard, cls) }
-  }.toMap
-  lazy val componentToClass: Map[BipComponent[Pre], Class[Pre]] = classes.collect {
-    case ClassBipComponent(cls, component) => (component, cls)
-  }.toMap
-  lazy val constructorToClassComponent: Map[BipConstructor[Pre], (Class[Pre], BipComponent[Pre])] = classes.collect {
-    case ClassBipComponent(cls, component) => cls.collect {
-      case constructor: BipConstructor[Pre] => (constructor, (cls, component))
-    }
-  }.flatten.toMap
-  lazy val portToComponent: Map[BipPort[Pre], BipComponent[Pre]] = components.flatMap { component =>
-    classOf(component).decls.collect { case p: BipPort[Pre] => (p, component) }
-  }.toMap
+    }.flatten.toMap
+  lazy val guardToClass: Map[BipGuard[Pre], Class[Pre]] =
+    classes.flatMap { cls =>
+      cls.decls.collect { case guard: BipGuard[Pre] => (guard, cls) }
+    }.toMap
+  lazy val componentToClass: Map[BipComponent[Pre], Class[Pre]] =
+    classes.collect { case ClassBipComponent(cls, component) =>
+      (component, cls)
+    }.toMap
+  lazy val constructorToClassComponent
+      : Map[BipConstructor[Pre], (Class[Pre], BipComponent[Pre])] =
+    classes.collect { case ClassBipComponent(cls, component) =>
+      cls.collect { case constructor: BipConstructor[Pre] =>
+        (constructor, (cls, component))
+      }
+    }.flatten.toMap
+  lazy val portToComponent: Map[BipPort[Pre], BipComponent[Pre]] =
+    components.flatMap { component =>
+      classOf(component).decls.collect { case p: BipPort[Pre] =>
+        (p, component)
+      }
+    }.toMap
 
   def classOf(c: BipComponent[Pre]): Class[Pre] = componentToClass(c)
-  def classOf(p: BipPort[Pre]): Class[Pre] = componentToClass(portToComponent(p))
+  def classOf(p: BipPort[Pre]): Class[Pre] =
+    componentToClass(portToComponent(p))
   def classOf(g: BipGuard[Pre]): Class[Pre] = guardToClass(g)
-  def classOf(p: BipConstructor[Pre]): Class[Pre] = constructorToClassComponent(p)._1
-  def classOf(t: BipTransition[Pre]): Class[Pre] = transitionToClassComponent(t)._1
+  def classOf(p: BipConstructor[Pre]): Class[Pre] =
+    constructorToClassComponent(p)._1
+  def classOf(t: BipTransition[Pre]): Class[Pre] =
+    transitionToClassComponent(t)._1
   def classOf(d: BipData[Pre]): Class[Pre] = dataToClassComponent(d)._1
-  def componentOf(p: BipConstructor[Pre]): BipComponent[Pre] = constructorToClassComponent(p)._2
-  def componentOf(t: BipTransition[Pre]): BipComponent[Pre] = transitionToClassComponent(t)._2
-  def componentOf(d: BipData[Pre]): BipComponent[Pre] = dataToClassComponent(d)._2
-
-  val guardSucc: SuccessionMap[BipGuard[Pre], InstanceMethod[Post]] = SuccessionMap()
-  val transitionSucc: SuccessionMap[BipTransition[Pre], InstanceMethod[Post]] = SuccessionMap()
-  val outgoingDataSucc: SuccessionMap[BipOutgoingData[Pre], InstanceMethod[Post]] = SuccessionMap()
-  val synchronizationSucc: SuccessionMap[BipTransitionSynchronization[Pre], Procedure[Post]] = SuccessionMap()
-  val constructorSucc: SuccessionMap[BipConstructor[Pre], Procedure[Post]] = SuccessionMap()
+  def componentOf(p: BipConstructor[Pre]): BipComponent[Pre] =
+    constructorToClassComponent(p)._2
+  def componentOf(t: BipTransition[Pre]): BipComponent[Pre] =
+    transitionToClassComponent(t)._2
+  def componentOf(d: BipData[Pre]): BipComponent[Pre] =
+    dataToClassComponent(d)._2
+
+  val guardSucc: SuccessionMap[BipGuard[Pre], InstanceMethod[Post]] =
+    SuccessionMap()
+  val transitionSucc: SuccessionMap[BipTransition[Pre], InstanceMethod[Post]] =
+    SuccessionMap()
+  val outgoingDataSucc
+      : SuccessionMap[BipOutgoingData[Pre], InstanceMethod[Post]] =
+    SuccessionMap()
+  val synchronizationSucc
+      : SuccessionMap[BipTransitionSynchronization[Pre], Procedure[Post]] =
+    SuccessionMap()
+  val constructorSucc: SuccessionMap[BipConstructor[Pre], Procedure[Post]] =
+    SuccessionMap()
 
   // References to incoming datas can be translated in two ways:
   sealed trait IncomingDataContext
   // The incoming data is stored in some variable
-  case class RewriteToVariableContext(m: Map[BipIncomingData[Pre], Variable[Post]]) extends IncomingDataContext
+  case class RewriteToVariableContext(
+      m: Map[BipIncomingData[Pre], Variable[Post]]
+  ) extends IncomingDataContext
   // The incoming data must be acquired by calling an outgoing data on a certain object, likely some variable, but we keep it abstract here.
   // The important part is that, in the post ast, the type of the expr supports the method resulting from the outgoing data.
-  case class RewriteToOutgoingDataContext(m: Map[BipIncomingData[Pre], (Expr[Post], BipOutgoingData[Pre])]) extends IncomingDataContext
+  case class RewriteToOutgoingDataContext(
+      m: Map[BipIncomingData[Pre], (Expr[Post], BipOutgoingData[Pre])]
+  ) extends IncomingDataContext
 
   val incomingDataContext: ScopedStack[IncomingDataContext] = ScopedStack()
 
@@ -210,230 +304,317 @@ case class EncodeBip[Pre <: Generation](results: VerificationResults) extends Re
     super.dispatch(p)
   }
 
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = expr match {
-    case t @ ThisObject(_) => currentThis.topOption match {
-      case Some(res) => res
-      case None => t.rewrite()
-    }
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case t @ ThisObject(_) =>
+        currentThis.topOption match {
+          case Some(res) => res
+          case None => t.rewrite()
+        }
 
-    case l @ BipLocalIncomingData(Ref(data)) => incomingDataContext.top match {
-      case RewriteToVariableContext(m) => m(data).get(l.o)
-      case RewriteToOutgoingDataContext(m) => methodInvocation(
-        obj = m(data)._1,
-        ref = outgoingDataSucc.ref[Post, InstanceMethod[Post]](m(data)._2),
-        blame = PanicBlame("Querying outgoing data here cannot fail")
-      )(l.o)
-    }
+      case l @ BipLocalIncomingData(Ref(data)) =>
+        incomingDataContext.top match {
+          case RewriteToVariableContext(m) => m(data).get(l.o)
+          case RewriteToOutgoingDataContext(m) =>
+            methodInvocation(
+              obj = m(data)._1,
+              ref = outgoingDataSucc
+                .ref[Post, InstanceMethod[Post]](m(data)._2),
+              blame = PanicBlame("Querying outgoing data here cannot fail"),
+            )(l.o)
+        }
 
-    case invocation @ BipGuardInvocation(obj, Ref(guard)) =>
-      methodInvocation(
-        obj = dispatch(obj),
-        ref = guardSucc.ref[Post, InstanceMethod[Post]](guard),
-        // Sneakily reuse the encoding we define above by retrofitting the refs from the guard definition into a pre-AST expression
-        args = guard.data.map { ref => BipLocalIncomingData[Pre](ref)(invocation.o) }.map(dispatch),
-        blame = PanicBlame("Guard invocation cannot fail as it can only depend on component invariant")
+      case invocation @ BipGuardInvocation(obj, Ref(guard)) =>
+        methodInvocation(
+          obj = dispatch(obj),
+          ref = guardSucc.ref[Post, InstanceMethod[Post]](guard),
+          // Sneakily reuse the encoding we define above by retrofitting the refs from the guard definition into a pre-AST expression
+          args = guard.data.map { ref =>
+            BipLocalIncomingData[Pre](ref)(invocation.o)
+          }.map(dispatch),
+          blame = PanicBlame(
+            "Guard invocation cannot fail as it can only depend on component invariant"
+          ),
         )(expr.o)
 
-    case _ => rewriteDefault(expr)
-  }
+      case _ => rewriteDefault(expr)
+    }
+
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      // Should be implemented through synchronizations within this pass, so they should be dropped
+      case port: BipPort[Pre] => port.drop()
+
+      // Should be implemented as arguments passed to update functions within this pass, so they should be dropped
+      case id: BipIncomingData[Pre] => id.drop()
+
+      case data: BipOutgoingData[Pre] =>
+        implicit val o = DiagnosticOrigin
+        assert(data.pure, "outgoing datas are only allowed to be pure")
+        outgoingDataSucc(data) = classDeclarations.declare(
+          new InstanceMethod[Post](
+            dispatch(data.t),
+            Seq(),
+            Seq(),
+            Seq(),
+            Some(dispatch(data.body)),
+            contract = contract[Post](
+              ForwardUnsatisfiableBlame(null /* not needed */, data),
+              requires = UnitAccountedPredicate(
+                dispatch(currentComponent.top.invariant)
+              ),
+            ),
+            pure = true,
+          )(PanicBlame("Postcondition of data cannot fail"))(data.o)
+        )
+
+      // Is encoded in contracts, so dropped
+      case sp: BipStatePredicate[Pre] => sp.drop()
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    // Should be implemented through synchronizations within this pass, so they should be dropped
-    case port: BipPort[Pre] => port.drop()
-
-    // Should be implemented as arguments passed to update functions within this pass, so they should be dropped
-    case id: BipIncomingData[Pre] => id.drop()
-
-    case data: BipOutgoingData[Pre] =>
-      implicit val o = DiagnosticOrigin
-      assert(data.pure, "outgoing datas are only allowed to be pure")
-      outgoingDataSucc(data) = classDeclarations.declare(new InstanceMethod[Post](
-        dispatch(data.t),
-        Seq(),
-        Seq(),
-        Seq(),
-        Some(dispatch(data.body)),
-        contract = contract[Post](ForwardUnsatisfiableBlame(null /* not needed */, data),
-          requires = UnitAccountedPredicate(dispatch(currentComponent.top.invariant))),
-        pure = true,
-      )(PanicBlame("Postcondition of data cannot fail")
-      )(data.o))
-
-    // Is encoded in contracts, so dropped
-    case sp: BipStatePredicate[Pre] => sp.drop()
-
-    case component: BipComponent[Pre] =>
-      component.drop()
-
-    case guard: BipGuard[Pre] =>
-      implicit val o = guard.o
-      val incomingDataVariables = ListMap.from(guard.data.map { case Ref(data) => (data, new Variable(dispatch(data.t))) })
-      labelDecls.scope {
-        incomingDataContext.having(RewriteToVariableContext(incomingDataVariables)) {
-          guardSucc(guard) = classDeclarations.declare(new InstanceMethod[Post](
-            TBool()(guard.o),
-            incomingDataVariables.values.toSeq,
-            Nil, Nil,
-            Some(dispatch(guard.body)),
-            contract[Post](ForwardUnsatisfiableBlame(null /* not needed */, guard),
-              requires = UnitAccountedPredicate(dispatch(currentComponent.top.invariant))),
-            pure = guard.pure
-          )(PanicBlame("Postcondition of guard cannot fail"))(guard.o))
+      case component: BipComponent[Pre] => component.drop()
+
+      case guard: BipGuard[Pre] =>
+        implicit val o = guard.o
+        val incomingDataVariables = ListMap.from(guard.data.map {
+          case Ref(data) => (data, new Variable(dispatch(data.t)))
+        })
+        labelDecls.scope {
+          incomingDataContext
+            .having(RewriteToVariableContext(incomingDataVariables)) {
+              guardSucc(guard) = classDeclarations.declare(
+                new InstanceMethod[Post](
+                  TBool()(guard.o),
+                  incomingDataVariables.values.toSeq,
+                  Nil,
+                  Nil,
+                  Some(dispatch(guard.body)),
+                  contract[Post](
+                    ForwardUnsatisfiableBlame(null /* not needed */, guard),
+                    requires = UnitAccountedPredicate(
+                      dispatch(currentComponent.top.invariant)
+                    ),
+                  ),
+                  pure = guard.pure,
+                )(PanicBlame("Postcondition of guard cannot fail"))(guard.o)
+              )
+            }
         }
-      }
 
-    case ClassBipComponent(cls, component) =>
-      currentComponent.having(component) {
-        rewriteDefault(cls)
-      }
+      case ClassBipComponent(cls, component) =>
+        currentComponent.having(component) { rewriteDefault(cls) }
+
+      case constructor: BipConstructor[Pre] =>
+        val component = componentOf(constructor)
+        results.declare(component)
+        implicit val o = DiagnosticOrigin
+        val ref = succ[Class[Post]](classOf(constructor))
+        val t = TClass[Post](ref, Seq())
+        rewritingBipConstructorBody.having(component) {
+          constructorSucc(constructor) = globalDeclarations.declare(
+            new Procedure[Post](
+              returnType = TVoid(),
+              args = variables.collect { constructor.args.map(dispatch) }._1,
+              outArgs = Nil,
+              typeArgs = Nil,
+              body = {
+                val resVar = new Variable[Post](t)
+                val res = Local[Post](resVar.ref)
+                currentThis.having(res) {
+                  Some(Scope(
+                    Seq(resVar),
+                    Block(Seq(
+                      assignLocal(res, NewObject(ref)),
+                      dispatch(constructor.body),
+                      Exhale(dispatch(component.initial.decl.expr))(
+                        ForwardStateInvariantFailed(
+                          results,
+                          component,
+                          constructor,
+                        )
+                      ),
+                      Exhale(dispatch(component.invariant))(
+                        ForwardComponentInvariantFailed(
+                          results,
+                          component,
+                          constructor,
+                        )
+                      ),
+                    )),
+                  ))
+                }
+              },
+              contract(
+                requires = UnitAccountedPredicate(
+                  dispatch(constructor.requires)
+                ),
+                blame = constructor.blame,
+              ),
+            )(PanicBlame(
+              "Unexpected error, failing precondition on JavaBIP constructor should not happen"
+            ))(constructor.o)
+          )
+        }
 
-    case constructor: BipConstructor[Pre] =>
-      val component = componentOf(constructor)
-      results.declare(component)
-      implicit val o = DiagnosticOrigin
-      val ref = succ[Class[Post]](classOf(constructor))
-      val t = TClass[Post](ref, Seq())
-      rewritingBipConstructorBody.having(component) {
-        constructorSucc(constructor) = globalDeclarations.declare(
-          new Procedure[Post](
-            returnType = TVoid(),
-            args = variables.collect { constructor.args.map(dispatch) }._1,
-            outArgs = Nil, typeArgs = Nil,
-            body = {
-              val resVar = new Variable[Post](t)
-              val res = Local[Post](resVar.ref)
-              currentThis.having(res) {
-                Some(Scope(Seq(resVar), Block(Seq(
-                  assignLocal(res, NewObject(ref)),
-                  dispatch(constructor.body),
-                  Exhale(dispatch(component.initial.decl.expr))(ForwardStateInvariantFailed(results, component, constructor)),
-                  Exhale(dispatch(component.invariant))(ForwardComponentInvariantFailed(results, component, constructor))
-                ))))
-              }
-            },
-            contract(requires = UnitAccountedPredicate(dispatch(constructor.requires)),
-              blame = constructor.blame)
-          )(PanicBlame("Unexpected error, failing precondition on JavaBIP constructor should not happen"))(constructor.o)
-        )
-      }
+      case transition: BipTransition[Pre] =>
+        implicit val o = DiagnosticOrigin
 
-    case transition: BipTransition[Pre] =>
-      implicit val o = DiagnosticOrigin
-
-      val component = currentComponent.top
-      // Mark that the default case is that verification is succesfull
-      results.declare(component, transition)
-
-      // Better debugging
-      val incomingDataToVariable = ListMap.from(transition.data.map { case Ref(data) =>
-        (data, new Variable(dispatch(data.t)))
-      })
-
-      labelDecls.scope {
-        rewritingBipTransitionBody.having(transition) {
-          transitionSucc(transition) = classDeclarations.declare(new InstanceMethod[Post](
-            TVoid(),
-            incomingDataToVariable.values.toSeq,
-            Nil,
-            Nil,
-            incomingDataContext.having(RewriteToVariableContext(incomingDataToVariable)) {
-              Some(dispatch(transition.body))
-            },
-            contract[Post](ForwardUnsatisfiableBlame(results, transition),
-              requires = UnitAccountedPredicate(
-                dispatch(component.invariant) &**
-                  dispatch(transition.source.decl.expr) &**
-                  incomingDataContext.having(RewriteToVariableContext(incomingDataToVariable)) {
-                    dispatch(transition.guard) &**
-                    dispatch(transition.requires)
-                  }),
-              ensures =
-                // Establish component invariant
-                SplitAccountedPredicate(UnitAccountedPredicate(dispatch(component.invariant)),
-                // Establish state invariant
-                SplitAccountedPredicate(UnitAccountedPredicate(dispatch(transition.target.decl.expr)),
-                // Establish update function postcondition
-                UnitAccountedPredicate(dispatch(transition.ensures))))
+        val component = currentComponent.top
+        // Mark that the default case is that verification is succesfull
+        results.declare(component, transition)
+
+        // Better debugging
+        val incomingDataToVariable = ListMap.from(transition.data.map {
+          case Ref(data) => (data, new Variable(dispatch(data.t)))
+        })
+
+        labelDecls.scope {
+          rewritingBipTransitionBody.having(transition) {
+            transitionSucc(transition) = classDeclarations.declare(
+              new InstanceMethod[Post](
+                TVoid(),
+                incomingDataToVariable.values.toSeq,
+                Nil,
+                Nil,
+                incomingDataContext
+                  .having(RewriteToVariableContext(incomingDataToVariable)) {
+                    Some(dispatch(transition.body))
+                  },
+                contract[Post](
+                  ForwardUnsatisfiableBlame(results, transition),
+                  requires = UnitAccountedPredicate(
+                    dispatch(component.invariant) &**
+                      dispatch(transition.source.decl.expr) &**
+                      incomingDataContext.having(RewriteToVariableContext(
+                        incomingDataToVariable
+                      )) {
+                        dispatch(transition.guard) &**
+                          dispatch(transition.requires)
+                      }
+                  ),
+                  ensures =
+                    // Establish component invariant
+                    SplitAccountedPredicate(
+                      UnitAccountedPredicate(dispatch(component.invariant)),
+                      // Establish state invariant
+                      SplitAccountedPredicate(
+                        UnitAccountedPredicate(
+                          dispatch(transition.target.decl.expr)
+                        ),
+                        // Establish update function postcondition
+                        UnitAccountedPredicate(dispatch(transition.ensures)),
+                      ),
+                    ),
+                ),
+              )(TransitionPostconditionFailed(results, transition))(
+                ImplCheckBipTransitionOrigin(component, transition)
+              )
             )
-          )(TransitionPostconditionFailed(results, transition))(ImplCheckBipTransitionOrigin(component, transition)))
+          }
         }
-      }
 
-    case synchronization: BipTransitionSynchronization[Pre] =>
-      synchronization.drop()
-      implicit val o = DiagnosticOrigin
-      val transitions = synchronization.transitions.map { case Ref(t) => t }
+      case synchronization: BipTransitionSynchronization[Pre] =>
+        synchronization.drop()
+        implicit val o = DiagnosticOrigin
+        val transitions = synchronization.transitions.map { case Ref(t) => t }
 
-      /* Each transition that participates in the synchronization, applies to a specific component.
+        /* Each transition that participates in the synchronization, applies to a specific component.
          We model those components as COL classes. Each synchronization is modeled as a procedure
          that takes for each participating component, an argument to a class instance representing that component.
          We define those variables/arguments here.
-       */
-      val varOf: Map[Declaration[Pre], Local[Post]] = transitions.flatMap { transition =>
-        val v = new Variable[Post](TClass(succ[Class[Post]](classOf(transition)), Seq()))(
-          SynchronizationComponentVariableOrigin(synchronization, componentOf(transition)))
-        Seq((transition, v.get), (classOf(transition), v.get))
-      }.toMap
-
-      /* - Pre:
+         */
+        val varOf: Map[Declaration[Pre], Local[Post]] =
+          transitions.flatMap { transition =>
+            val v =
+              new Variable[Post](
+                TClass(succ[Class[Post]](classOf(transition)), Seq())
+              )(SynchronizationComponentVariableOrigin(
+                synchronization,
+                componentOf(transition),
+              ))
+            Seq((transition, v.get), (classOf(transition), v.get))
+          }.toMap
+
+        /* - Pre:
            - Of each class var of transition:
              - Non null
              - Component invariant
              - State invariant
              - Guard (done further down)
-        */
-      val preconditionComponents: Expr[Post] = foldStar(synchronization.transitions.map { case Ref(transition) =>
-        currentThis.having(varOf(transition)) {
-          (varOf(transition) !== Null()) &**
-            dispatch(componentOf(transition).invariant) &**
-            dispatch(transition.source.decl.expr)
-        }
-      })
+         */
+        val preconditionComponents: Expr[Post] = foldStar(
+          synchronization.transitions.map { case Ref(transition) =>
+            currentThis.having(varOf(transition)) {
+              (varOf(transition) !== Null()) &**
+                dispatch(componentOf(transition).invariant) &**
+                dispatch(transition.source.decl.expr)
+            }
+          }
+        )
 
-      /* Here we construct a mapping of incoming data to invocations of the outgoing data methods, as indicated by data wires
+        /* Here we construct a mapping of incoming data to invocations of the outgoing data methods, as indicated by data wires
          This is needed because in the precondition the variables for exchange of data are not yet assigned, so we just execute
          the guards over literal outgoing data invocations. These are then used when guard invocations are translated
-       */
-      val incomingDataTranslation = ListMap.from(synchronization.wires.map {
-        case BipGlueDataWire(Ref(out), Ref(in)) => (in, (varOf(classOf(out)), out))
-      })
-
-      val preconditionGuards: Expr[Post] = foldStar(synchronization.transitions.map { case Ref(transition) =>
-        currentThis.having(varOf(transition)) {
-          incomingDataContext.having(RewriteToOutgoingDataContext(incomingDataTranslation)) {
-            dispatch(transition.guard)
+         */
+        val incomingDataTranslation = ListMap.from(synchronization.wires.map {
+          case BipGlueDataWire(Ref(out), Ref(in)) =>
+            (in, (varOf(classOf(out)), out))
+        })
+
+        val preconditionGuards: Expr[Post] = foldStar(
+          synchronization.transitions.map { case Ref(transition) =>
+            currentThis.having(varOf(transition)) {
+              incomingDataContext
+                .having(RewriteToOutgoingDataContext(incomingDataTranslation)) {
+                  dispatch(transition.guard)
+                }
+            }
           }
-        }
-      })
+        )
 
-      /*
+        /*
       - Evaluate data wires and assign to var representing output data. Make mapping from data wire to output data var
-       */
-      val incomingDataToVariableContext = ListMap.from(synchronization.wires.map { case BipGlueDataWire(Ref(dataOut), Ref(dataIn)) =>
-        (dataIn, new Variable[Post](dispatch(dataOut.t))(dataIn.o))
-      })
-      val initBlock: Seq[Statement[Post]] = incomingDataContext.having(RewriteToOutgoingDataContext(incomingDataTranslation)) {
-        incomingDataToVariableContext.map { case (dataIn, variable) =>
-          assignLocal[Post](variable.get, dispatch(BipLocalIncomingData(dataIn.ref)))
-        }
-      }.toSeq
+         */
+        val incomingDataToVariableContext = ListMap
+          .from(synchronization.wires.map {
+            case BipGlueDataWire(Ref(dataOut), Ref(dataIn)) =>
+              (dataIn, new Variable[Post](dispatch(dataOut.t))(dataIn.o))
+          })
+        val initBlock: Seq[Statement[Post]] =
+          incomingDataContext
+            .having(RewriteToOutgoingDataContext(incomingDataTranslation)) {
+              incomingDataToVariableContext.map { case (dataIn, variable) =>
+                assignLocal[Post](
+                  variable.get,
+                  dispatch(BipLocalIncomingData(dataIn.ref)),
+                )
+              }
+            }.toSeq
 
-      /*
+        /*
       - Of each class var of transition:
         - Exhale, with class var & data wires substituted in:
           - component invariant
           - source state invariant
         - Exhale, also with substitutions, containing precondition.
           - Separate so we can detect the error easily
-      */
-      val exhales: Seq[Exhale[Post]] = synchronization.transitions.flatMap { case Ref(transition) =>
-        incomingDataContext.having(RewriteToVariableContext(incomingDataToVariableContext)) {
-          val componentStateGuardExhale = Exhale(currentThis.having(varOf(transition)) { foldStar(
-            Seq(dispatch(componentOf(transition).invariant), dispatch(transition.source.decl.expr)) :+
-                dispatch(transition.guard)
-          )})(PanicBlame("Component invariant, state invariant, and transition guard should hold"))
-
-          /* At the time of writing, exhales do not support a system like UnitAccountedPredicate, meaning there's
+         */
+        val exhales: Seq[Exhale[Post]] = synchronization.transitions.flatMap {
+          case Ref(transition) =>
+            incomingDataContext
+              .having(RewriteToVariableContext(incomingDataToVariableContext)) {
+                val componentStateGuardExhale =
+                  Exhale(currentThis.having(varOf(transition)) {
+                    foldStar(
+                      Seq(
+                        dispatch(componentOf(transition).invariant),
+                        dispatch(transition.source.decl.expr),
+                      ) :+ dispatch(transition.guard)
+                    )
+                  })(PanicBlame(
+                    "Component invariant, state invariant, and transition guard should hold"
+                  ))
+
+                /* At the time of writing, exhales do not support a system like UnitAccountedPredicate, meaning there's
              know what part of the exhale failed. Additionally, at the time of writing, the precondition of a transition
              is always a boolean. Hence, we split
 
@@ -449,58 +630,71 @@ case class EncodeBip[Pre <: Generation](results: VerificationResults) extends Re
 
              We don't have to split up the component, state, guard, any further, because those are always implied
              by the precondition of the synchron.
-           */
-          val preconditionExhale = Exhale(currentThis.having(varOf(transition)) {
-                dispatch(transition.requires)
-            })(ExhalingTransitionPreconditionFailed(results, synchronization, transition))
+                 */
+                val preconditionExhale =
+                  Exhale(currentThis.having(varOf(transition)) {
+                    dispatch(transition.requires)
+                  })(ExhalingTransitionPreconditionFailed(
+                    results,
+                    synchronization,
+                    transition,
+                  ))
 
-          Seq(preconditionExhale, componentStateGuardExhale)
+                Seq(preconditionExhale, componentStateGuardExhale)
+              }
         }
-      }
 
-      /*
+        /*
         - Inhale, with class var & data wires substituted in:
           - component invariant
           - target state invariant
           - postcondition
-      */
-      val inhales: Seq[Inhale[Post]] = synchronization.transitions.map { case Ref(transition) =>
-        Inhale(currentThis.having(varOf(transition)) {
-          dispatch(componentOf(transition).invariant) &**
-            dispatch(transition.target.decl.expr) &**
-            dispatch(transition.ensures)
-        })
-      }
+         */
+        val inhales: Seq[Inhale[Post]] = synchronization.transitions.map {
+          case Ref(transition) =>
+            Inhale(currentThis.having(varOf(transition)) {
+              dispatch(componentOf(transition).invariant) &**
+                dispatch(transition.target.decl.expr) &**
+                dispatch(transition.ensures)
+            })
+        }
 
-      /*
+        /*
       - Post:
         - Of each class var of transition:
           - Component invariant
           - New state invariant
-      */
-      val postcondition: Expr[Post] = foldStar(synchronization.transitions.map { case Ref(transition) =>
+         */
+        val postcondition: Expr[Post] = foldStar(
+          synchronization.transitions.map { case Ref(transition) =>
+            currentThis.having(varOf(transition)) {
+              dispatch(componentOf(transition).invariant) &**
+                dispatch(transition.target.decl.expr)
+            }
+          }
+        )
 
-        currentThis.having(varOf(transition)) {
-          dispatch(componentOf(transition).invariant) &**
-          dispatch(transition.target.decl.expr)
-        }
-      })
-
-      synchronizationSucc(synchronization) =
-        globalDeclarations.declare(procedure(
-          args = transitions.map(varOf(_).ref.decl),
-          body = Some(
-            Scope(incomingDataToVariableContext.values.toSeq, Block(initBlock ++ exhales ++ inhales))),
-          requires = UnitAccountedPredicate(preconditionComponents &** preconditionGuards),
-          ensures = UnitAccountedPredicate(postcondition),
-          blame = PanicBlame("Can this contract fail?"),
-          contractBlame = PanicBlame("Can it be unsatisfiable?")
-        )(BipSynchronizationOrigin(synchronization)))
-
-    case _: BipPortSynchronization[Pre] => throw Unreachable("Should be translated away at this point")
-
-    case _ => rewriteDefault(decl)
-  }
+        synchronizationSucc(synchronization) = globalDeclarations.declare(
+          procedure(
+            args = transitions.map(varOf(_).ref.decl),
+            body = Some(Scope(
+              incomingDataToVariableContext.values.toSeq,
+              Block(initBlock ++ exhales ++ inhales),
+            )),
+            requires = UnitAccountedPredicate(
+              preconditionComponents &** preconditionGuards
+            ),
+            ensures = UnitAccountedPredicate(postcondition),
+            blame = PanicBlame("Can this contract fail?"),
+            contractBlame = PanicBlame("Can it be unsatisfiable?"),
+          )(BipSynchronizationOrigin(synchronization))
+        )
+
+      case _: BipPortSynchronization[Pre] =>
+        throw Unreachable("Should be translated away at this point")
+
+      case _ => rewriteDefault(decl)
+    }
 
   /* If:
      - the body of a transition is being rewritten, or
@@ -508,11 +702,17 @@ case class EncodeBip[Pre <: Generation](results: VerificationResults) extends Re
     wrap each blame into another blame. This blame writes reports failure in transition verification results when triggered
    */
   override def dispatch[T <: VerificationFailure](blame: Blame[T]): Blame[T] = {
-    assert(Seq(rewritingBipTransitionBody, rewritingBipConstructorBody).map(_.topOption).count(_.isDefined) <= 1,
-      "should not be rewriting constructors and transitions simultaneously")
-    rewritingBipTransitionBody.topOption.orElse(rewritingBipConstructorBody.topOption) match {
-      case Some(bt: BipTransition[Pre]) => ExecuteOnBlame(blame) { results.report(bt, UpdateFunctionFailure) }
-      case Some(bt: BipComponent[Pre]) => ExecuteOnBlame(blame) { results.report(bt, ConstructorFailure) }
+    assert(
+      Seq(rewritingBipTransitionBody, rewritingBipConstructorBody)
+        .map(_.topOption).count(_.isDefined) <= 1,
+      "should not be rewriting constructors and transitions simultaneously",
+    )
+    rewritingBipTransitionBody.topOption
+      .orElse(rewritingBipConstructorBody.topOption) match {
+      case Some(bt: BipTransition[Pre]) =>
+        ExecuteOnBlame(blame) { results.report(bt, UpdateFunctionFailure) }
+      case Some(bt: BipComponent[Pre]) =>
+        ExecuteOnBlame(blame) { results.report(bt, ConstructorFailure) }
       case _ => super.dispatch(blame)
     }
   }
diff --git a/src/rewrite/vct/rewrite/bip/EncodeBipPermissions.scala b/src/rewrite/vct/rewrite/bip/EncodeBipPermissions.scala
index a7e5c3f521..0591c1d169 100644
--- a/src/rewrite/vct/rewrite/bip/EncodeBipPermissions.scala
+++ b/src/rewrite/vct/rewrite/bip/EncodeBipPermissions.scala
@@ -4,41 +4,51 @@ import hre.util.ScopedStack
 import vct.col.ast.RewriteHelpers._
 import vct.col.ast._
 import vct.col.origin.Origin
-import vct.col.rewrite.bip.EncodeBipPermissions.{GeneratedBipFieldPermissionOrigin, GeneratedBipPermissionsOrigin}
+import vct.col.rewrite.bip.EncodeBipPermissions.{
+  GeneratedBipFieldPermissionOrigin,
+  GeneratedBipPermissionsOrigin,
+}
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 import vct.col.util.AstBuildHelpers
 import vct.col.util.AstBuildHelpers._
 
 case object EncodeBipPermissions extends RewriterBuilder {
   override def key: String = "encodeBipPermissions"
-  override def desc: String = "encodes implicit permission management of BIP models"
+  override def desc: String =
+    "encodes implicit permission management of BIP models"
 
-  private def GeneratedBipPermissionsOrigin(component: BipComponent[_]): Origin = {
-    component.o
-  }
+  private def GeneratedBipPermissionsOrigin(
+      component: BipComponent[_]
+  ): Origin = { component.o }
 
-  private def GeneratedBipFieldPermissionOrigin(component: BipComponent[_], field: InstanceField[_]): Origin =
-    field.o.where(prefix = "bipPerm")
+  private def GeneratedBipFieldPermissionOrigin(
+      component: BipComponent[_],
+      field: InstanceField[_],
+  ): Origin = field.o.where(prefix = "bipPerm")
 }
 
 case class EncodeBipPermissions[Pre <: Generation]() extends Rewriter[Pre] {
   val currentClass: ScopedStack[Class[Pre]] = ScopedStack()
 
-  override def dispatch(node: Declaration[Pre]): Unit = node match {
-    case cls: Class[Pre] =>
-      currentClass.having(cls) {
-        rewriteDefault(cls)
-      }
-    case component: BipComponent[Pre] =>
-      implicit val o = GeneratedBipPermissionsOrigin(component)
-      val fields = currentClass.top.declarations.collect { case f: InstanceField[Pre] if !f.isFinal => f }
-      val diz = ThisObject(succ[Class[Post]](currentClass.top))
-      val fieldPerms = AstBuildHelpers.foldStar(fields.map { f =>
-        implicit val o = GeneratedBipFieldPermissionOrigin(component, f)
-        Perm(FieldLocation(diz, succ[InstanceField[Post]](f)), const(1))
-      })
-      classDeclarations.succeed(component,
-        component.rewrite(invariant = Star(fieldPerms, rewriteDefault(component.invariant))))
-    case x => rewriteDefault(x)
-  }
+  override def dispatch(node: Declaration[Pre]): Unit =
+    node match {
+      case cls: Class[Pre] => currentClass.having(cls) { rewriteDefault(cls) }
+      case component: BipComponent[Pre] =>
+        implicit val o = GeneratedBipPermissionsOrigin(component)
+        val fields = currentClass.top.declarations.collect {
+          case f: InstanceField[Pre] if !f.isFinal => f
+        }
+        val diz = ThisObject(succ[Class[Post]](currentClass.top))
+        val fieldPerms = AstBuildHelpers.foldStar(fields.map { f =>
+          implicit val o = GeneratedBipFieldPermissionOrigin(component, f)
+          Perm(FieldLocation(diz, succ[InstanceField[Post]](f)), const(1))
+        })
+        classDeclarations.succeed(
+          component,
+          component.rewrite(invariant =
+            Star(fieldPerms, rewriteDefault(component.invariant))
+          ),
+        )
+      case x => rewriteDefault(x)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/bip/InstantiateBipSynchronizations.scala b/src/rewrite/vct/rewrite/bip/InstantiateBipSynchronizations.scala
index 962b934b01..cd8e877a3c 100644
--- a/src/rewrite/vct/rewrite/bip/InstantiateBipSynchronizations.scala
+++ b/src/rewrite/vct/rewrite/bip/InstantiateBipSynchronizations.scala
@@ -6,7 +6,12 @@ import vct.col.ast.RewriteHelpers._
 import vct.col.ast._
 import vct.col.origin._
 import vct.col.ref.Ref
-import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, RewriterBuilderArg}
+import vct.col.rewrite.{
+  Generation,
+  Rewriter,
+  RewriterBuilder,
+  RewriterBuilderArg,
+}
 import vct.col.util.AstBuildHelpers.{contract, _}
 import vct.col.util.SuccessionMap
 import vct.result.VerificationError.{SystemError, Unreachable, UserError}
@@ -17,50 +22,72 @@ import scala.collection.mutable.ArrayBuffer
 
 case object InstantiateBipSynchronizations extends RewriterBuilder {
   override def key: String = "instantiateBipSynchronizations"
-  override def desc: String = "Convert synchronizations of ports combinatorially to synchronizations of transitions"
+  override def desc: String =
+    "Convert synchronizations of ports combinatorially to synchronizations of transitions"
 }
 
-case class InstantiateBipSynchronizations[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging {
+case class InstantiateBipSynchronizations[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
   var program: Program[Pre] = null
-  lazy val ports: IndexedSeq[BipPort[Pre]] = program.transSubnodes.collect { case p: BipPort[Pre] => p }.toIndexedSeq
+  lazy val ports: IndexedSeq[BipPort[Pre]] =
+    program.transSubnodes.collect { case p: BipPort[Pre] => p }.toIndexedSeq
   lazy val portToTransitions: ListMap[BipPort[Pre], Seq[BipTransition[Pre]]] = {
     ListMap.from(ports.map { port =>
-      (port, program.transSubnodes.collect { case t: BipTransition[Pre] if t.port.decl == port => t }.toIndexedSeq)
+      (
+        port,
+        program.transSubnodes.collect {
+          case t: BipTransition[Pre] if t.port.decl == port => t
+        }.toIndexedSeq,
+      )
     })
   }
-  lazy val portSynchrons = program.transSubnodes.collect { case s: BipPortSynchronization[Pre] => s }.toIndexedSeq
+  lazy val portSynchrons =
+    program.transSubnodes.collect { case s: BipPortSynchronization[Pre] => s }
+      .toIndexedSeq
 
-  val transitionSynchrons = new ArrayBuffer[BipTransitionSynchronization[Post]]()
+  val transitionSynchrons =
+    new ArrayBuffer[BipTransitionSynchronization[Post]]()
 
   override def dispatch(program: Program[Pre]): Program[Post] = {
     this.program = program
     val p = super.dispatch(program)
     if (transitionSynchrons.nonEmpty) {
-      logger.info(s"Converted ${portSynchrons.size} JavaBIP port synchronizations into ${transitionSynchrons.size} JavaBIP transition synchronizations")
+      logger.info(
+        s"Converted ${portSynchrons.size} JavaBIP port synchronizations into ${transitionSynchrons.size} JavaBIP transition synchronizations"
+      )
       transitionSynchrons.foreach(t => logger.debug(t.summarize))
     }
     p
   }
 
   // Given lists [a b c] [d e f] [g h], I want: [a d g], [a d h], [a e g], [a e h], etc.
-  def pickOneFromEach[T](elems: Seq[Seq[T]]): Seq[Seq[T]] = elems match {
-    case Seq(elems) => elems.map(Seq(_))
-    case Seq() => Seq()
-    case elem +: elems =>
-      val tails = pickOneFromEach(elems)
-      elem.flatMap(e => tails.map(t => e +: t))
-  }
+  def pickOneFromEach[T](elems: Seq[Seq[T]]): Seq[Seq[T]] =
+    elems match {
+      case Seq(elems) => elems.map(Seq(_))
+      case Seq() => Seq()
+      case elem +: elems =>
+        val tails = pickOneFromEach(elems)
+        elem.flatMap(e => tails.map(t => e +: t))
+    }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case sync: BipPortSynchronization[Pre] =>
-      val wires = sync.wires.map(dispatch)
-      val transitionSets = pickOneFromEach(sync.ports.map { case Ref(port) => portToTransitions(port) })
-      val newSyncs = transitionSets.map { transitions =>
-        globalDeclarations.declare(BipTransitionSynchronization[Post](transitions.map(t => succ[BipTransition[Post]](t)), wires)(sync.blame)(sync.o))
-      }
-      transitionSynchrons.addAll(newSyncs)
-      sync.drop()
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case sync: BipPortSynchronization[Pre] =>
+        val wires = sync.wires.map(dispatch)
+        val transitionSets = pickOneFromEach(sync.ports.map { case Ref(port) =>
+          portToTransitions(port)
+        })
+        val newSyncs = transitionSets.map { transitions =>
+          globalDeclarations.declare(
+            BipTransitionSynchronization[Post](
+              transitions.map(t => succ[BipTransition[Post]](t)),
+              wires,
+            )(sync.blame)(sync.o)
+          )
+        }
+        transitionSynchrons.addAll(newSyncs)
+        sync.drop()
 
-    case _ => rewriteDefault(decl)
-  }
+      case _ => rewriteDefault(decl)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/bip/IsolateBipGlue.scala b/src/rewrite/vct/rewrite/bip/IsolateBipGlue.scala
index 7b9969c2e1..17341cea58 100644
--- a/src/rewrite/vct/rewrite/bip/IsolateBipGlue.scala
+++ b/src/rewrite/vct/rewrite/bip/IsolateBipGlue.scala
@@ -5,27 +5,31 @@ import vct.col.ast._
 import vct.col.origin.Origin
 import vct.result.Message
 
-/**
-  * This pass scans the program for bip glues. For each java namespace where there is a glue, only the glue is included,
-  * not the namespace itself. This is because for the JavaBIP paper this namespace containing the glue only contains
-  * configuration code that vercors cannot analyze yet.
+/** This pass scans the program for bip glues. For each java namespace where
+  * there is a glue, only the glue is included, not the namespace itself. This
+  * is because for the JavaBIP paper this namespace containing the glue only
+  * contains configuration code that vercors cannot analyze yet.
   */
 case object IsolateBipGlue extends LazyLogging {
   def isolate[G](p: Program[G]): Program[G] = {
     val declsNew: Seq[GlobalDeclaration[G]] = p.declarations.map {
       case ns: JavaNamespace[G] =>
-        val cleanDecls: Seq[GlobalDeclaration[G]] = ns.declarations.flatMap { decl =>
-          getBipGlues(decl) match {
-            case Seq() => Seq(decl)
-            case glues =>
-              logger.info(Message.messagesInContext(
-                (decl.o, s"In this class, only the following ${glues.size} glues are kept:") +:
-                  glues.zipWithIndex.map { case (g, i) => (g.o, s"glue ${i + 1}") }
-                : _*
-              ))
-              glues.map(g => new JavaBipGlueContainer[G](g)(g.o))
+        val cleanDecls: Seq[GlobalDeclaration[G]] = ns.declarations
+          .flatMap { decl =>
+            getBipGlues(decl) match {
+              case Seq() => Seq(decl)
+              case glues =>
+                logger.info(Message.messagesInContext(
+                  (
+                    decl.o,
+                    s"In this class, only the following ${glues.size} glues are kept:",
+                  ) +: glues.zipWithIndex.map { case (g, i) =>
+                    (g.o, s"glue ${i + 1}")
+                  }: _*
+                ))
+                glues.map(g => new JavaBipGlueContainer[G](g)(g.o))
+            }
           }
-        }
         new JavaNamespace[G](ns.pkg, ns.imports, cleanDecls)(ns.o)
       case decl => decl
     }
@@ -33,7 +37,6 @@ case object IsolateBipGlue extends LazyLogging {
     Program(declsNew)(p.blame)(p.o)
   }
 
-  def getBipGlues[G](d: Declaration[G]): Seq[JavaBipGlue[G]] = d.transSubnodes.collect {
-    case g @ JavaBipGlue(_) => g
-  }
+  def getBipGlues[G](d: Declaration[G]): Seq[JavaBipGlue[G]] =
+    d.transSubnodes.collect { case g @ JavaBipGlue(_) => g }
 }
diff --git a/src/rewrite/vct/rewrite/cfg/CFGGenerator.scala b/src/rewrite/vct/rewrite/cfg/CFGGenerator.scala
index efb627f3a9..dde1a2bdaa 100644
--- a/src/rewrite/vct/rewrite/cfg/CFGGenerator.scala
+++ b/src/rewrite/vct/rewrite/cfg/CFGGenerator.scala
@@ -6,123 +6,196 @@ import vct.col.ast._
 import scala.collection.mutable
 
 case class CFGGenerator[G]() extends LazyLogging {
-  private val found_labels: mutable.Map[LabelDecl[G], CFGNode[G]] = mutable.HashMap[LabelDecl[G], CFGNode[G]]()
-  private val searched_labels: mutable.Map[LabelDecl[G], mutable.Set[CFGNode[G]]] = mutable.HashMap[LabelDecl[G], mutable.Set[CFGNode[G]]]()
-  private val converted_nodes: mutable.Map[GlobalIndex[G], CFGNode[G]] = mutable.HashMap[GlobalIndex[G], CFGNode[G]]()
+  private val found_labels: mutable.Map[LabelDecl[G], CFGNode[G]] = mutable
+    .HashMap[LabelDecl[G], CFGNode[G]]()
+  private val searched_labels
+      : mutable.Map[LabelDecl[G], mutable.Set[CFGNode[G]]] = mutable
+    .HashMap[LabelDecl[G], mutable.Set[CFGNode[G]]]()
+  private val converted_nodes: mutable.Map[GlobalIndex[G], CFGNode[G]] = mutable
+    .HashMap[GlobalIndex[G], CFGNode[G]]()
 
   def generate(entry: InstanceMethod[G]): CFGNode[G] = {
     logger.info("Generating control flow graph")
-    val res = convert(entry.body.get, GlobalIndex[G](mutable.Seq(InitialIndex(entry))))
+    val res = convert(
+      entry.body.get,
+      GlobalIndex[G](mutable.Seq(InitialIndex(entry))),
+    )
     logger.info("Control flow graph generation complete")
     res
   }
 
-  private def convert(node: Statement[G], context: GlobalIndex[G]): CFGNode[G] = {
+  private def convert(
+      node: Statement[G],
+      context: GlobalIndex[G],
+  ): CFGNode[G] = {
     // If a node has already been visited, then it should not be created again
-    if (converted_nodes.contains(context)) return converted_nodes(context)
+    if (converted_nodes.contains(context))
+      return converted_nodes(context)
     // Convert to CFG node depending on type of statement
     node match {
       // If a statement contains an expression, the expression(s) must be evaluated before the statement
       case assign: Assign[_] => assign_to_cfg(assign, context)
-      case stmt: ExpressionContainerStatement[_] => expression_container_to_cfg(stmt, context)
+      case stmt: ExpressionContainerStatement[_] =>
+        expression_container_to_cfg(stmt, context)
       // Handle labels and gotos, since those can occur in arbitrary order
       case label: Label[_] =>
         val cfg_node: CFGNode[G] = statement_to_cfg(node, context)
         // For labels, add them to the label map and add them to any goto statements going to that label
         found_labels.addOne((label.decl, cfg_node))
-        searched_labels.getOrElse(label.decl, mutable.Set()).foreach(g => g.successors.addOne(CFGEdge(cfg_node, None)))
+        searched_labels.getOrElse(label.decl, mutable.Set())
+          .foreach(g => g.successors.addOne(CFGEdge(cfg_node, None)))
         cfg_node
       case goto: Goto[_] =>
         val cfg_node: CFGNode[G] = statement_to_cfg(node, context)
         // For goto statements, if the label could not be resolved, add the statement to the waiting list for the right label
         if (cfg_node.successors.isEmpty) {
-          if (searched_labels.contains(goto.lbl.decl)) searched_labels(goto.lbl.decl).addOne(cfg_node)
-          else searched_labels.addOne((goto.lbl.decl, mutable.Set(cfg_node)))
+          if (searched_labels.contains(goto.lbl.decl))
+            searched_labels(goto.lbl.decl).addOne(cfg_node)
+          else
+            searched_labels.addOne((goto.lbl.decl, mutable.Set(cfg_node)))
         }
         cfg_node
       // Leave all container statements except for invocations out of the CFG with two exceptions: Expressions and the
       // first scope of a run method must remain so that the run method can later still be identified
       case _: InvocationStatement[_] => statement_to_cfg(node, context)
-      case c: ControlContainerStatement[_] if !context.indices.head.isInstanceOf[RunMethodIndex[_]] =>
+      case c: ControlContainerStatement[_]
+          if !context.indices.head.isInstanceOf[RunMethodIndex[_]] =>
         val new_context = context.enter_scope(c)
         // If the new scope is empty (e.g. expression evaluation with no contained statements), transform it normally,
         // since this is the only node that can represent this part of the CFG
-        if (!new_context.has_statement()) statement_to_cfg(c, context)
-        else convert(new_context.resolve().get, new_context)
+        if (!new_context.has_statement())
+          statement_to_cfg(c, context)
+        else
+          convert(new_context.resolve().get, new_context)
       // Any non-special statement is simply converted to a CFG node
       case _ => statement_to_cfg(node, context)
     }
   }
 
-  private def statement_to_cfg(stmt: Statement[G], context: GlobalIndex[G]): CFGNode[G] = {
+  private def statement_to_cfg(
+      stmt: Statement[G],
+      context: GlobalIndex[G],
+  ): CFGNode[G] = {
     val cfg_node: CFGNode[G] = CFGNode(stmt, mutable.Set())
     converted_nodes.addOne((context, cfg_node))
     cfg_node.successors.addAll(find_successors(stmt, context))
     cfg_node
   }
 
-  private def assign_to_cfg(assign: Assign[G], context: GlobalIndex[G]): CFGNode[G] = context.indices.head match {
-    case AssignmentIndex(a, _) if a == assign => statement_to_cfg(assign, context)
-    case _ => convert(Eval(assign.target)(assign.target.o), context.enter_scope(assign))
-  }
-
-  private def expression_container_to_cfg(stmt: ExpressionContainerStatement[G], context: GlobalIndex[G]): CFGNode[G] = context.indices.head match {
-    case ExpressionContainerIndex(s, _) if s == stmt => statement_to_cfg(stmt, context)
-    case _ => convert(Eval(stmt.expr)(stmt.expr.o), context.enter_scope(stmt))
-  }
-
-  private def find_successors(node: Statement[G], context: GlobalIndex[G]): mutable.Set[CFGEdge[G]] = node match {
-    // Exceptional statements
-    // Statements that can jump to another part of the program
-    case Goto(lbl) => found_labels.get(lbl.decl) match {
-      case Some(node) => mutable.Set(CFGEdge(node, None))
-      case None => mutable.Set()
-    }
-    case CGoto(label) => ???
-    // Statements that simultaneously affect other threads
-    case Fork(obj) =>
-      val run_method: RunMethod[G] = obj.t.asClass.get.cls.decl.declarations.collect{ case r: RunMethod[G] => r }.head
-      // Get the successor(s) of the fork statement as well as the new thread, starting with the run method
-      sequential_successor(context).addOne(CFGEdge(convert(run_method.body.get, GlobalIndex[G](mutable.Seq()).enter_scope(run_method)), None))
-    // Statements that jump out of the current control flow context
-    case Return(_) => return_successors(context)
-    case Throw(obj) => mutable.Set(CFGEdge(exception_successor(obj, context), None))
-    case Break(label) => label match {
-      case Some(ref) => ???  // TODO: Handle break label!
-      case None => mutable.Set(CFGEdge(break_successor(context), None))
+  private def assign_to_cfg(
+      assign: Assign[G],
+      context: GlobalIndex[G],
+  ): CFGNode[G] =
+    context.indices.head match {
+      case AssignmentIndex(a, _) if a == assign =>
+        statement_to_cfg(assign, context)
+      case _ =>
+        convert(
+          Eval(assign.target)(assign.target.o),
+          context.enter_scope(assign),
+        )
     }
-    case Continue(label) => label match {
-      case Some(ref) => ???  // TODO: Handle continue label!
-      case None => mutable.Set(CFGEdge(continue_successor(context), None))
+
+  private def expression_container_to_cfg(
+      stmt: ExpressionContainerStatement[G],
+      context: GlobalIndex[G],
+  ): CFGNode[G] =
+    context.indices.head match {
+      case ExpressionContainerIndex(s, _) if s == stmt =>
+        statement_to_cfg(stmt, context)
+      case _ => convert(Eval(stmt.expr)(stmt.expr.o), context.enter_scope(stmt))
     }
-    // Irregular control container statements
-    case IndetBranch(branches) =>
-      mutable.LinkedHashSet.from(branches.zipWithIndex.map(b => CFGEdge(convert(b._1, context.enter_scope(node, b._2)), None)))
-    case s: Switch[_] => handle_switch_statement(s, context.enter_scope(node))
-    case ChorBranch(_, yes, no) => no match {
-      case Some(stmt) => mutable.Set(CFGEdge(convert(yes, context.enter_scope(node, 0)), None), CFGEdge(convert(stmt, context.enter_scope(node, 1)), None))
-      case None => mutable.Set(CFGEdge(convert(yes, context.enter_scope(node)), None))
+
+  private def find_successors(
+      node: Statement[G],
+      context: GlobalIndex[G],
+  ): mutable.Set[CFGEdge[G]] =
+    node match {
+      // Exceptional statements
+      // Statements that can jump to another part of the program
+      case Goto(lbl) =>
+        found_labels.get(lbl.decl) match {
+          case Some(node) => mutable.Set(CFGEdge(node, None))
+          case None => mutable.Set()
+        }
+      case CGoto(label) => ???
+      // Statements that simultaneously affect other threads
+      case Fork(obj) =>
+        val run_method: RunMethod[G] =
+          obj.t.asClass.get.cls.decl.declarations.collect {
+            case r: RunMethod[G] => r
+          }.head
+        // Get the successor(s) of the fork statement as well as the new thread, starting with the run method
+        sequential_successor(context).addOne(CFGEdge(
+          convert(
+            run_method.body.get,
+            GlobalIndex[G](mutable.Seq()).enter_scope(run_method),
+          ),
+          None,
+        ))
+      // Statements that jump out of the current control flow context
+      case Return(_) => return_successors(context)
+      case Throw(obj) =>
+        mutable.Set(CFGEdge(exception_successor(obj, context), None))
+      case Break(label) =>
+        label match {
+          case Some(ref) => ??? // TODO: Handle break label!
+          case None => mutable.Set(CFGEdge(break_successor(context), None))
+        }
+      case Continue(label) =>
+        label match {
+          case Some(ref) => ??? // TODO: Handle continue label!
+          case None => mutable.Set(CFGEdge(continue_successor(context), None))
+        }
+      // Irregular control container statements
+      case IndetBranch(branches) =>
+        mutable.LinkedHashSet.from(branches.zipWithIndex.map(b =>
+          CFGEdge(convert(b._1, context.enter_scope(node, b._2)), None)
+        ))
+      case s: Switch[_] => handle_switch_statement(s, context.enter_scope(node))
+      case ChorBranch(_, yes, no) =>
+        no match {
+          case Some(stmt) =>
+            mutable.Set(
+              CFGEdge(convert(yes, context.enter_scope(node, 0)), None),
+              CFGEdge(convert(stmt, context.enter_scope(node, 1)), None),
+            )
+          case None =>
+            mutable.Set(CFGEdge(convert(yes, context.enter_scope(node)), None))
+        }
+      // Assign statements cannot be easily categorized because they contain two expressions
+      case Assign(_, _) => sequential_successor(context)
+      // Other statements that can be categorized into a broader role for control flow analysis
+      case _: ExpressionContainerStatement[_] => sequential_successor(context)
+      case _: ControlContainerStatement[_] =>
+        evaluate_first(context.enter_scope(node))
+      case _: PurelySequentialStatement[_] => sequential_successor(context)
     }
-    // Assign statements cannot be easily categorized because they contain two expressions
-    case Assign(_, _) => sequential_successor(context)
-    // Other statements that can be categorized into a broader role for control flow analysis
-    case _: ExpressionContainerStatement[_] => sequential_successor(context)
-    case _: ControlContainerStatement[_] => evaluate_first(context.enter_scope(node))
-    case _: PurelySequentialStatement[_] => sequential_successor(context)
-  }
 
   private def evaluate_first(index: GlobalIndex[G]): mutable.Set[CFGEdge[G]] = {
-    if (index.has_statement()) mutable.Set(CFGEdge(resolve_index(index), None))
-    else sequential_successor(index)
+    if (index.has_statement())
+      mutable.Set(CFGEdge(resolve_index(index), None))
+    else
+      sequential_successor(index)
   }
 
-  private def sequential_successor(index: GlobalIndex[G], cond: Option[Expr[G]] = None): mutable.Set[CFGEdge[G]] = {
-    if (index.indices.nonEmpty) index.make_step().map(i => CFGEdge(resolve_index(i._1), Utils.and(i._2, cond)))
-    else mutable.Set(CFGEdge(CFGTerminal(), cond))
+  private def sequential_successor(
+      index: GlobalIndex[G],
+      cond: Option[Expr[G]] = None,
+  ): mutable.Set[CFGEdge[G]] = {
+    if (index.indices.nonEmpty)
+      index.make_step()
+        .map(i => CFGEdge(resolve_index(i._1), Utils.and(i._2, cond)))
+    else
+      mutable.Set(CFGEdge(CFGTerminal(), cond))
   }
 
-  private def handle_switch_statement(switch: Switch[G], context: GlobalIndex[G]): mutable.Set[CFGEdge[G]] = {
-    val switches: Seq[(SwitchCase[G], GlobalIndex[G])] = Utils.find_all_cases(switch.body, context.enter_scope(switch))
+  private def handle_switch_statement(
+      switch: Switch[G],
+      context: GlobalIndex[G],
+  ): mutable.Set[CFGEdge[G]] = {
+    val switches: Seq[(SwitchCase[G], GlobalIndex[G])] = Utils
+      .find_all_cases(switch.body, context.enter_scope(switch))
     var conds: Seq[(Case[G], Eval[G], GlobalIndex[G])] = Seq()
     var default: Option[(DefaultCase[G], GlobalIndex[G])] = None
     for (s <- switches) {
@@ -130,32 +203,46 @@ case class CFGGenerator[G]() extends LazyLogging {
         case c @ Case(pattern) =>
           val cond = Eq(switch.expr, pattern)(c.o)
           // Collect only up to default case
-          if (default.isEmpty) conds = conds :+ (c, Eval(cond)(cond.o), s._2)
+          if (default.isEmpty)
+            conds = conds :+ (c, Eval(cond)(cond.o), s._2)
         case c @ DefaultCase() => default = Some((c, s._2))
       }
     }
     conds = conds.reverse
 
-    var successor_to_previous: mutable.Set[CFGEdge[G]] = default match {
-      case Some(t) => mutable.Set(CFGEdge(convert(t._1, t._2), Some(Utils.negate(conds.head._2.expr))))
-      case None => sequential_successor(context, Some(Utils.negate(conds.head._2.expr)))
-    }
+    var successor_to_previous: mutable.Set[CFGEdge[G]] =
+      default match {
+        case Some(t) =>
+          mutable.Set(
+            CFGEdge(convert(t._1, t._2), Some(Utils.negate(conds.head._2.expr)))
+          )
+        case None =>
+          sequential_successor(context, Some(Utils.negate(conds.head._2.expr)))
+      }
 
     for ((c, i) <- conds.zipWithIndex) {
-      successor_to_previous.addOne(CFGEdge(convert(c._1, c._3), Some(c._2.expr)))
+      successor_to_previous
+        .addOne(CFGEdge(convert(c._1, c._3), Some(c._2.expr)))
       val node = CFGNode(c._2, successor_to_previous)
       // TODO: Should this node be added to the explored nodes? Probably not, as it is a generated node?
-      if (i == conds.size - 1) successor_to_previous = mutable.Set(CFGEdge(node, None))
-      else successor_to_previous = mutable.Set(CFGEdge(node, Some(Utils.negate(conds(i + 1)._2.expr))))
+      if (i == conds.size - 1)
+        successor_to_previous = mutable.Set(CFGEdge(node, None))
+      else
+        successor_to_previous = mutable
+          .Set(CFGEdge(node, Some(Utils.negate(conds(i + 1)._2.expr))))
     }
     successor_to_previous
   }
 
-  private def return_successors(index: GlobalIndex[G]): mutable.Set[CFGEdge[G]] =
+  private def return_successors(
+      index: GlobalIndex[G]
+  ): mutable.Set[CFGEdge[G]] =
     index.return_from_call().map(t => CFGEdge(resolve_index(t._1), t._2))
 
-  private def exception_successor(exception: Expr[G], index: GlobalIndex[G]): CFGEntry[G] =
-    resolve_index(index.handle_exception(exception))
+  private def exception_successor(
+      exception: Expr[G],
+      index: GlobalIndex[G],
+  ): CFGEntry[G] = resolve_index(index.handle_exception(exception))
 
   private def break_successor(index: GlobalIndex[G]): CFGEntry[G] =
     resolve_index(index.handle_break())
@@ -163,8 +250,9 @@ case class CFGGenerator[G]() extends LazyLogging {
   private def continue_successor(index: GlobalIndex[G]): CFGEntry[G] =
     resolve_index(index.continue_innermost_loop())
 
-  private def resolve_index(index: GlobalIndex[G]): CFGEntry[G] = index.resolve() match {
-    case Some(stmt) => convert(stmt, index)
-    case None => CFGTerminal()
-  }
-}
\ No newline at end of file
+  private def resolve_index(index: GlobalIndex[G]): CFGEntry[G] =
+    index.resolve() match {
+      case Some(stmt) => convert(stmt, index)
+      case None => CFGTerminal()
+    }
+}
diff --git a/src/rewrite/vct/rewrite/cfg/CFGNode.scala b/src/rewrite/vct/rewrite/cfg/CFGNode.scala
index ca2587f035..ae55038c04 100644
--- a/src/rewrite/vct/rewrite/cfg/CFGNode.scala
+++ b/src/rewrite/vct/rewrite/cfg/CFGNode.scala
@@ -7,7 +7,8 @@ import scala.collection.mutable
 sealed trait CFGEntry[G] {
   def get_successors: mutable.Set[CFGEdge[G]]
 }
-case class CFGNode[G](ast_node: Node[G], successors: mutable.Set[CFGEdge[G]]) extends CFGEntry[G] {
+case class CFGNode[G](ast_node: Node[G], successors: mutable.Set[CFGEdge[G]])
+    extends CFGEntry[G] {
   override def get_successors: mutable.Set[CFGEdge[G]] = successors
   override def toString: String = ast_node.toInlineString
 }
@@ -16,4 +17,4 @@ case class CFGTerminal[G]() extends CFGEntry[G] {
   override def toString: String = "<TERMINATE>"
 }
 
-case class CFGEdge[G](target: CFGEntry[G], condition: Option[Expr[G]])
\ No newline at end of file
+case class CFGEdge[G](target: CFGEntry[G], condition: Option[Expr[G]])
diff --git a/src/rewrite/vct/rewrite/cfg/CFGPrinter.scala b/src/rewrite/vct/rewrite/cfg/CFGPrinter.scala
index adbbac2a36..27becbc769 100644
--- a/src/rewrite/vct/rewrite/cfg/CFGPrinter.scala
+++ b/src/rewrite/vct/rewrite/cfg/CFGPrinter.scala
@@ -9,24 +9,27 @@ import java.nio.file.Path
 import scala.collection.mutable
 
 case class CFGPrinter[G]() {
-  private val node_names: mutable.Map[CFGEntry[G], String] = mutable.HashMap[CFGEntry[G], String]()
+  private val node_names: mutable.Map[CFGEntry[G], String] = mutable
+    .HashMap[CFGEntry[G], String]()
   private val no_condition: Expr[G] = BooleanValue(value = true)(Origin(Seq()))
   private var node_index: Int = 0
 
   private def print_cfg(writer: Writer): Unit = {
     writer.append("digraph {\n")
     // Write all nodes
-    node_names.foreach(naming => writer.append(naming._2)
-                                       .append(s" [label=${"\""}")
-                                       .append(naming._1.toString)
-                                       .append(s"${"\""}];\n"))
+    node_names.foreach(naming =>
+      writer.append(naming._2).append(s" [label=${"\""}")
+        .append(naming._1.toString).append(s"${"\""}];\n")
+    )
     // Write all edges
-    node_names.foreach(naming => naming._1.get_successors.foreach(edge => writer.append(naming._2)
-                                                                                .append(" -> ")
-                                                                                .append(node_names(edge.target))
-                                                                                .append(s" [label=${"\""}")
-                                                                                .append(edge.condition.getOrElse(no_condition).toInlineString)
-                                                                                .append(s"${"\""}];\n")))
+    node_names.foreach(naming =>
+      naming._1.get_successors.foreach(edge =>
+        writer.append(naming._2).append(" -> ").append(node_names(edge.target))
+          .append(s" [label=${"\""}")
+          .append(edge.condition.getOrElse(no_condition).toInlineString)
+          .append(s"${"\""}];\n")
+      )
+    )
     writer.append("}")
   }
 
diff --git a/src/rewrite/vct/rewrite/cfg/Index.scala b/src/rewrite/vct/rewrite/cfg/Index.scala
index 0f426676de..b002900d1a 100644
--- a/src/rewrite/vct/rewrite/cfg/Index.scala
+++ b/src/rewrite/vct/rewrite/cfg/Index.scala
@@ -12,38 +12,49 @@ case class Step[G](value: Index[G]) extends NextIndex[G] {
   override def get: Index[G] = value
 }
 case class Outgoing[G]() extends NextIndex[G] {
-  override def get: Index[G] = throw new NoSuchElementException("Trying to access outgoing edge")
+  override def get: Index[G] =
+    throw new NoSuchElementException("Trying to access outgoing edge")
 }
 
 case class GlobalIndex[G](indices: mutable.Seq[Index[G]]) {
 
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case GlobalIndex(other_indices) => indices.size == other_indices.size && indices.zip(other_indices).forall(t => t._1.equals(t._2))
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case GlobalIndex(other_indices) =>
+        indices.size == other_indices.size && indices.zip(other_indices)
+          .forall(t => t._1.equals(t._2))
+      case _ => false
+    }
 
   def enter_scope(node: Node[G], index: Int = 0): GlobalIndex[G] =
     GlobalIndex(indices.prepended(Index[G](node, index)))
 
   def make_step(): mutable.Set[(GlobalIndex[G], Option[Expr[G]])] = {
-    if (indices.isEmpty) return mutable.Set((this, None))
+    if (indices.isEmpty)
+      return mutable.Set((this, None))
     val steps: Set[(NextIndex[G], Option[Expr[G]])] = indices.head.make_step()
     val res = mutable.Set[(GlobalIndex[G], Option[Expr[G]])]()
     for (step <- steps) {
       step match {
-        case (Step(index), cond) => res.addOne((GlobalIndex(index +: indices.tail), cond))
-        case (Outgoing(), cond) => res.addAll(GlobalIndex(indices.tail).make_step().map(tup => (tup._1, Utils.and(tup._2, cond))))
+        case (Step(index), cond) =>
+          res.addOne((GlobalIndex(index +: indices.tail), cond))
+        case (Outgoing(), cond) =>
+          res.addAll(GlobalIndex(indices.tail).make_step().map(tup =>
+            (tup._1, Utils.and(tup._2, cond))
+          ))
       }
     }
     res
   }
 
-  def resolve(): Option[Statement[G]] = indices.dropWhile(i => !i.has_statement()).headOption match{
-    case Some(idx) => Some(idx.resolve())
-    case None => None
-  }
+  def resolve(): Option[Statement[G]] =
+    indices.dropWhile(i => !i.has_statement()).headOption match {
+      case Some(idx) => Some(idx.resolve())
+      case None => None
+    }
 
-  def has_statement(): Boolean = indices.nonEmpty && indices.head.has_statement()
+  def has_statement(): Boolean =
+    indices.nonEmpty && indices.head.has_statement()
 
   def return_from_call(): mutable.Set[(GlobalIndex[G], Option[Expr[G]])] = {
     // Find innermost subroutine call
@@ -58,22 +69,33 @@ case class GlobalIndex[G](indices: mutable.Seq[Index[G]]) {
   def handle_exception(e: Expr[G]): GlobalIndex[G] = {
     // Find innermost try-catch block of appropriate type
     val stack: mutable.Seq[Index[G]] = indices.dropWhile {
-      case TryCatchFinallyIndex(stmt, 0) => !stmt.catches.exists(c => c.decl.t.equals(e.t))
+      case TryCatchFinallyIndex(stmt, 0) =>
+        !stmt.catches.exists(c => c.decl.t.equals(e.t))
       case _ => true
     }
     // Unhandled exception
-    if (stack.isEmpty) return GlobalIndex(stack)
+    if (stack.isEmpty)
+      return GlobalIndex(stack)
     // Return to exception handler and go to catch block
     stack.head match {
-      case TryCatchFinallyIndex(stmt, _) => GlobalIndex(TryCatchFinallyIndex(stmt, stmt.catches.indexWhere(c => c.decl.t.equals(e.t)) + 2) +: stack.tail)
+      case TryCatchFinallyIndex(stmt, _) =>
+        GlobalIndex(
+          TryCatchFinallyIndex(
+            stmt,
+            stmt.catches.indexWhere(c => c.decl.t.equals(e.t)) + 2,
+          ) +: stack.tail
+        )
     }
   }
 
   def handle_break(): GlobalIndex[G] = {
     // Find innermost occurrence of either a loop or a switch statement
     val stack: mutable.Seq[Index[G]] = indices.dropWhile {
-      case PVLLoopIndex(_, 0) | LoopIndex(_, 0) => true    // If some godless heathen calls break in the init of a loop, don't consider that loop
-      case PVLLoopIndex(_, _) | LoopIndex(_, _) | RangedForIndex(_) | UnresolvedSeqLoopIndex(_, _) | SeqLoopIndex(_) | SwitchIndex(_) => false
+      case PVLLoopIndex(_, 0) | LoopIndex(_, 0) =>
+        true // If some godless heathen calls break in the init of a loop, don't consider that loop
+      case PVLLoopIndex(_, _) | LoopIndex(_, _) | RangedForIndex(_) |
+          UnresolvedSeqLoopIndex(_, _) | SeqLoopIndex(_) | SwitchIndex(_) =>
+        false
       case _ => true
     }
     // Find the next statement
@@ -85,234 +107,324 @@ case class GlobalIndex[G](indices: mutable.Seq[Index[G]]) {
     // Find innermost loop that could be the target of continue
     val stack: mutable.Seq[Index[G]] = indices.dropWhile {
       case PVLLoopIndex(_, 0) | LoopIndex(_, 0) => true
-      case PVLLoopIndex(_, _) | LoopIndex(_, _) | RangedForIndex(_) | UnresolvedSeqLoopIndex(_, _) | SeqLoopIndex(_) => false
+      case PVLLoopIndex(_, _) | LoopIndex(_, _) | RangedForIndex(_) |
+          UnresolvedSeqLoopIndex(_, _) | SeqLoopIndex(_) =>
+        false
       case _ => true
     }
     stack.head match {
-      case PVLLoopIndex(pvl_loop, _) => GlobalIndex(PVLLoopIndex(pvl_loop, 1) +: stack.tail)
+      case PVLLoopIndex(pvl_loop, _) =>
+        GlobalIndex(PVLLoopIndex(pvl_loop, 1) +: stack.tail)
       case LoopIndex(loop, _) => GlobalIndex(LoopIndex(loop, 1) +: stack.tail)
-      case UnresolvedSeqLoopIndex(unresolved_seq_loop, _) => GlobalIndex(UnresolvedSeqLoopIndex(unresolved_seq_loop, 0) +: stack.tail)
+      case UnresolvedSeqLoopIndex(unresolved_seq_loop, _) =>
+        GlobalIndex(
+          UnresolvedSeqLoopIndex(unresolved_seq_loop, 0) +: stack.tail
+        )
       case RangedForIndex(_) | SeqLoopIndex(_) => GlobalIndex(stack)
     }
   }
 }
 
 sealed trait Index[G] {
-  /**
-   * Defines the set of possible next steps. An index in the returned set indicates that this index can replace the
-   * previous index at the top level of the index stack. A None value indicates that a step is possible, but it reaches
-   * outside the scope of this index to the index below. Along with these steps, this method returns the conditions for
-   * such a step in the form of a boolean expression, or None if a transition is certain to occur.
-   *
-   * @return A set of all steps possible from the current index, along with conditions for taking them
-   */
+
+  /** Defines the set of possible next steps. An index in the returned set
+    * indicates that this index can replace the previous index at the top level
+    * of the index stack. A None value indicates that a step is possible, but it
+    * reaches outside the scope of this index to the index below. Along with
+    * these steps, this method returns the conditions for such a step in the
+    * form of a boolean expression, or None if a transition is certain to occur.
+    *
+    * @return
+    *   A set of all steps possible from the current index, along with
+    *   conditions for taking them
+    */
   def make_step(): Set[(NextIndex[G], Option[Expr[G]])]
 
-  /**
-   * Returns the statement that corresponds to the current index.
-   *
-   * @return The statement at the current index
-   */
+  /** Returns the statement that corresponds to the current index.
+    *
+    * @return
+    *   The statement at the current index
+    */
   def resolve(): Statement[G]
 
-  /**
-   * Determines whether the index contains a statement.
-   *
-   * @return true if the index contains at least one statement, false otherwise
-   */
+  /** Determines whether the index contains a statement.
+    *
+    * @return
+    *   true if the index contains at least one statement, false otherwise
+    */
   def has_statement(): Boolean = true
 }
 
 object Index {
-  def from[G](node: Node[G], index: Int): Index[G] = node match {
-    case instance_method: InstanceMethod[G] => InitialIndex(instance_method)
-    case run_method: RunMethod[G] => RunMethodIndex(run_method)
-    case assign: Assign[G] => AssignmentIndex(assign, index)
-    case pvl_branch: PVLBranch[G] => PVLBranchIndex(pvl_branch, index)
-    case pvl_loop: PVLLoop[G] => PVLLoopIndex(pvl_loop, index)
-    case label: Label[G] => LabelIndex(label)
-    case framed_proof: FramedProof[G] => FramedProofIndex(framed_proof, index)
-    case extract: Extract[G] => ExtractIndex(extract)
-    case eval: Eval[G] => EvalIndex(eval, index)
-    case invoke_procedure: InvokeProcedure[G] => InvokeProcedureIndex(invoke_procedure, index)
-    case invoke_constructor: InvokeConstructor[G] => InvokeConstructorIndex(invoke_constructor, index)
-    case invoke_method: InvokeMethod[G] => InvokeMethodIndex(invoke_method, index)
-    case block: Block[G] => BlockIndex(block, index)
-    case scope: Scope[G] => ScopeIndex(scope)
-    case branch: Branch[G] => BranchIndex(branch, index)
-    case indet_branch: IndetBranch[G] => IndetBranchIndex(indet_branch, index)
-    case switch: Switch[G] => SwitchIndex(switch)
-    case loop: Loop[G] => LoopIndex(loop, index)
-    case ranged_for: RangedFor[G] => RangedForIndex(ranged_for)
-    case try_catch_finally: TryCatchFinally[G] => TryCatchFinallyIndex(try_catch_finally, index)
-    case synchronized: Synchronized[G] => SynchronizedIndex(synchronized)
-    case par_invariant: ParInvariant[G] => ParInvariantIndex(par_invariant)
-    case par_atomic: ParAtomic[G] => ParAtomicIndex(par_atomic)
-    case par_barrier: ParBarrier[G] => ParBarrierIndex(par_barrier)
-    case vec_block: VecBlock[G] => VecBlockIndex(vec_block)
-    case wand_package: WandPackage[G] => WandPackageIndex(wand_package)
-    case model_do: ModelDo[G] => ModelDoIndex(model_do)
-    case cpp_lifetime_scope: CPPLifetimeScope[G] => CPPLifetimeScopeIndex(cpp_lifetime_scope)
-    case unresolved_seq_branch: UnresolvedChorBranch[G] => UnresolvedSeqBranchIndex(unresolved_seq_branch, index)
-    case unresolved_seq_loop: UnresolvedChorLoop[G] => UnresolvedSeqLoopIndex(unresolved_seq_loop, index)
-    case seq_branch: ChorBranch[G] => SeqBranchIndex(seq_branch, index)
-    case seq_loop: ChorLoop[G] => SeqLoopIndex(seq_loop)
-    case veymont_assign_expression: VeyMontAssignExpression[G] => VeyMontAssignExpressionIndex(veymont_assign_expression)
-    case communicatex: CommunicateX[G] => CommunicateXIndex(communicatex)
-    case statement: ExpressionContainerStatement[G] => ExpressionContainerIndex(statement, index)
-  }
+  def from[G](node: Node[G], index: Int): Index[G] =
+    node match {
+      case instance_method: InstanceMethod[G] => InitialIndex(instance_method)
+      case run_method: RunMethod[G] => RunMethodIndex(run_method)
+      case assign: Assign[G] => AssignmentIndex(assign, index)
+      case pvl_branch: PVLBranch[G] => PVLBranchIndex(pvl_branch, index)
+      case pvl_loop: PVLLoop[G] => PVLLoopIndex(pvl_loop, index)
+      case label: Label[G] => LabelIndex(label)
+      case framed_proof: FramedProof[G] => FramedProofIndex(framed_proof, index)
+      case extract: Extract[G] => ExtractIndex(extract)
+      case eval: Eval[G] => EvalIndex(eval, index)
+      case invoke_procedure: InvokeProcedure[G] =>
+        InvokeProcedureIndex(invoke_procedure, index)
+      case invoke_constructor: InvokeConstructor[G] =>
+        InvokeConstructorIndex(invoke_constructor, index)
+      case invoke_method: InvokeMethod[G] =>
+        InvokeMethodIndex(invoke_method, index)
+      case block: Block[G] => BlockIndex(block, index)
+      case scope: Scope[G] => ScopeIndex(scope)
+      case branch: Branch[G] => BranchIndex(branch, index)
+      case indet_branch: IndetBranch[G] => IndetBranchIndex(indet_branch, index)
+      case switch: Switch[G] => SwitchIndex(switch)
+      case loop: Loop[G] => LoopIndex(loop, index)
+      case ranged_for: RangedFor[G] => RangedForIndex(ranged_for)
+      case try_catch_finally: TryCatchFinally[G] =>
+        TryCatchFinallyIndex(try_catch_finally, index)
+      case synchronized: Synchronized[G] => SynchronizedIndex(synchronized)
+      case par_invariant: ParInvariant[G] => ParInvariantIndex(par_invariant)
+      case par_atomic: ParAtomic[G] => ParAtomicIndex(par_atomic)
+      case par_barrier: ParBarrier[G] => ParBarrierIndex(par_barrier)
+      case vec_block: VecBlock[G] => VecBlockIndex(vec_block)
+      case wand_package: WandPackage[G] => WandPackageIndex(wand_package)
+      case model_do: ModelDo[G] => ModelDoIndex(model_do)
+      case cpp_lifetime_scope: CPPLifetimeScope[G] =>
+        CPPLifetimeScopeIndex(cpp_lifetime_scope)
+      case unresolved_seq_branch: UnresolvedChorBranch[G] =>
+        UnresolvedSeqBranchIndex(unresolved_seq_branch, index)
+      case unresolved_seq_loop: UnresolvedChorLoop[G] =>
+        UnresolvedSeqLoopIndex(unresolved_seq_loop, index)
+      case seq_branch: ChorBranch[G] => SeqBranchIndex(seq_branch, index)
+      case seq_loop: ChorLoop[G] => SeqLoopIndex(seq_loop)
+      case veymont_assign_expression: VeyMontAssignExpression[G] =>
+        VeyMontAssignExpressionIndex(veymont_assign_expression)
+      case communicatex: CommunicateX[G] => CommunicateXIndex(communicatex)
+      case statement: ExpressionContainerStatement[G] =>
+        ExpressionContainerIndex(statement, index)
+    }
 
   def apply[G](node: Node[G], index: Int): Index[G] = from(node, index)
 }
 
 // TODO: Handle contract assertions for InitialIndex, RunMethodIndex, FramedProof, RangedForIndex, ???
 
-case class InitialIndex[G](instance_method: InstanceMethod[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+case class InitialIndex[G](instance_method: InstanceMethod[G])
+    extends Index[G] {
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = instance_method.body.get
   override def has_statement(): Boolean = instance_method.body.nonEmpty
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case InitialIndex(m) => m.equals(instance_method)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case InitialIndex(m) => m.equals(instance_method)
+      case _ => false
+    }
 }
 
 case class RunMethodIndex[G](run_method: RunMethod[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = run_method.body.get
   override def has_statement(): Boolean = run_method.body.nonEmpty
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case RunMethodIndex(m) => m.equals(run_method)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case RunMethodIndex(m) => m.equals(run_method)
+      case _ => false
+    }
 }
 
-case class ExpressionContainerIndex[G](statement: ExpressionContainerStatement[G], index: Int) extends Index[G] {
+case class ExpressionContainerIndex[G](
+    statement: ExpressionContainerStatement[G],
+    index: Int,
+) extends Index[G] {
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
-    if (index == 0) Set((Step(ExpressionContainerIndex(statement, 1)), None))
-    else Set((Outgoing(), None))
-  }
-  override def resolve(): Statement[G] = index match {
-    case 0 => Eval(statement.expr)(statement.expr.o)
-    case 1 => statement
-  }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case ExpressionContainerIndex(s, i) => i == index && s.equals(statement)
-    case _ => false
-  }
+    if (index == 0)
+      Set((Step(ExpressionContainerIndex(statement, 1)), None))
+    else
+      Set((Outgoing(), None))
+  }
+  override def resolve(): Statement[G] =
+    index match {
+      case 0 => Eval(statement.expr)(statement.expr.o)
+      case 1 => statement
+    }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case ExpressionContainerIndex(s, i) => i == index && s.equals(statement)
+      case _ => false
+    }
 }
 
 case class AssignmentIndex[G](assign: Assign[G], index: Int) extends Index[G] {
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
-    if (index < 2) Set((Step(AssignmentIndex(assign, index + 1)), None))
-    else Set((Outgoing(), None))
-  }
-  override def resolve(): Statement[G] = index match {
-    case 0 => Eval(assign.target)(assign.target.o)
-    case 1 => Eval(assign.value)(assign.value.o)
-    case 2 => assign
-  }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case AssignmentIndex(a, i) => i == index && a.equals(assign)
-    case _ => false
-  }
+    if (index < 2)
+      Set((Step(AssignmentIndex(assign, index + 1)), None))
+    else
+      Set((Outgoing(), None))
+  }
+  override def resolve(): Statement[G] =
+    index match {
+      case 0 => Eval(assign.target)(assign.target.o)
+      case 1 => Eval(assign.value)(assign.value.o)
+      case 2 => assign
+    }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case AssignmentIndex(a, i) => i == index && a.equals(assign)
+      case _ => false
+    }
 }
 
-case class PVLBranchIndex[G](pvl_branch: PVLBranch[G], index: Int) extends Index[G] {
+case class PVLBranchIndex[G](pvl_branch: PVLBranch[G], index: Int)
+    extends Index[G] {
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
     // Indices 0, 2, 4, ... are the conditions, indices 1, 3, 5, ... are the branch bodies
     if (index % 2 == 0 && index < 2 * (pvl_branch.branches.size - 1))
-      Set((Step(PVLBranchIndex(pvl_branch, index + 2)), Some(Utils.negate(pvl_branch.branches.apply(index / 2)._1))),
-          (Step(PVLBranchIndex(pvl_branch, index + 1)), Some(pvl_branch.branches.apply(index / 2)._1)))
+      Set(
+        (
+          Step(PVLBranchIndex(pvl_branch, index + 2)),
+          Some(Utils.negate(pvl_branch.branches.apply(index / 2)._1)),
+        ),
+        (
+          Step(PVLBranchIndex(pvl_branch, index + 1)),
+          Some(pvl_branch.branches.apply(index / 2)._1),
+        ),
+      )
     else if (index == 2 * (pvl_branch.branches.size - 1))
-      Set((Step(PVLBranchIndex(pvl_branch, index + 1)), Some(pvl_branch.branches.apply(index / 2)._1)),
-          (Outgoing(), Some(Utils.negate(pvl_branch.branches.apply(index / 2)._1))))
-    else Set((Outgoing(), None))
+      Set(
+        (
+          Step(PVLBranchIndex(pvl_branch, index + 1)),
+          Some(pvl_branch.branches.apply(index / 2)._1),
+        ),
+        (
+          Outgoing(),
+          Some(Utils.negate(pvl_branch.branches.apply(index / 2)._1)),
+        ),
+      )
+    else
+      Set((Outgoing(), None))
   }
   override def resolve(): Statement[G] = {
-    if (index % 2 == 0) Eval(pvl_branch.branches.apply(index / 2)._1)(pvl_branch.branches.apply(index / 2)._1.o)
-    else pvl_branch.branches.apply((index - 1) / 2)._2
+    if (index % 2 == 0)
+      Eval(pvl_branch.branches.apply(index / 2)._1)(
+        pvl_branch.branches.apply(index / 2)._1.o
+      )
+    else
+      pvl_branch.branches.apply((index - 1) / 2)._2
   }
   override def has_statement(): Boolean = pvl_branch.branches.nonEmpty
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case PVLBranchIndex(b, i) => i == index && b.equals(pvl_branch)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case PVLBranchIndex(b, i) => i == index && b.equals(pvl_branch)
+      case _ => false
+    }
 }
 
 case class PVLLoopIndex[G](pvl_loop: PVLLoop[G], index: Int) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = index match {
-    case 0 => Set((Step(PVLLoopIndex(pvl_loop, 1)), None))
-    case 1 => Set((Step(PVLLoopIndex(pvl_loop, 2)), None))
-    case 2 => Set((Step(PVLLoopIndex(pvl_loop, 3)), Some(pvl_loop.cond)), (Outgoing(), Some(Utils.negate(pvl_loop.cond))))
-    case 3 => Set((Step(PVLLoopIndex(pvl_loop, 4)), None))
-    case 4 => Set((Step(PVLLoopIndex(pvl_loop, 1)), None))
-  }
-  override def resolve(): Statement[G] = index match {
-    case 0 => pvl_loop.init
-    case 1 => Assert(Utils.loop_contract_to_expression(pvl_loop.contract))(pvl_loop.o)(pvl_loop.o)
-    case 2 => Eval(pvl_loop.cond)(pvl_loop.cond.o)
-    case 3 => pvl_loop.body
-    case 4 => pvl_loop.update
-  }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case PVLLoopIndex(l, i) => i == index && l.equals(pvl_loop)
-    case _ => false
-  }
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    index match {
+      case 0 => Set((Step(PVLLoopIndex(pvl_loop, 1)), None))
+      case 1 => Set((Step(PVLLoopIndex(pvl_loop, 2)), None))
+      case 2 =>
+        Set(
+          (Step(PVLLoopIndex(pvl_loop, 3)), Some(pvl_loop.cond)),
+          (Outgoing(), Some(Utils.negate(pvl_loop.cond))),
+        )
+      case 3 => Set((Step(PVLLoopIndex(pvl_loop, 4)), None))
+      case 4 => Set((Step(PVLLoopIndex(pvl_loop, 1)), None))
+    }
+  override def resolve(): Statement[G] =
+    index match {
+      case 0 => pvl_loop.init
+      case 1 =>
+        Assert(Utils.loop_contract_to_expression(pvl_loop.contract))(
+          pvl_loop.o
+        )(pvl_loop.o)
+      case 2 => Eval(pvl_loop.cond)(pvl_loop.cond.o)
+      case 3 => pvl_loop.body
+      case 4 => pvl_loop.update
+    }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case PVLLoopIndex(l, i) => i == index && l.equals(pvl_loop)
+      case _ => false
+    }
 }
 
 case class LabelIndex[G](label: Label[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = label.stat
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case LabelIndex(l) => l.equals(label)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case LabelIndex(l) => l.equals(label)
+      case _ => false
+    }
 }
 
-case class FramedProofIndex[G](framed_proof: FramedProof[G], index: Int) extends Index[G] {
+case class FramedProofIndex[G](framed_proof: FramedProof[G], index: Int)
+    extends Index[G] {
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
-    if (index < 2) Set((Step(FramedProofIndex(framed_proof, index + 1)), None))
-    else Set((Outgoing(), None))
-  }
-  override def resolve(): Statement[G] = index match {
-    case 0 => Eval(framed_proof.pre)(framed_proof.pre.o)
-    case 1 => Eval(framed_proof.post)(framed_proof.post.o)
-    case 2 => framed_proof.body
-  }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case FramedProofIndex(p, i) => i == index && p.equals(framed_proof)
-    case _ => false
-  }
+    if (index < 2)
+      Set((Step(FramedProofIndex(framed_proof, index + 1)), None))
+    else
+      Set((Outgoing(), None))
+  }
+  override def resolve(): Statement[G] =
+    index match {
+      case 0 => Eval(framed_proof.pre)(framed_proof.pre.o)
+      case 1 => Eval(framed_proof.post)(framed_proof.post.o)
+      case 2 => framed_proof.body
+    }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case FramedProofIndex(p, i) => i == index && p.equals(framed_proof)
+      case _ => false
+    }
 }
 
 case class ExtractIndex[G](extract: Extract[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = extract.contractedStatement
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case ExtractIndex(e) => e.equals(extract)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case ExtractIndex(e) => e.equals(extract)
+      case _ => false
+    }
 }
 
-case class EvalIndex[G](eval: Eval[G], index: Int, subexpressions: Seq[Statement[G]]) extends Index[G] {
-  def this(eval: Eval[G], index: Int) = this(eval, index, Utils.find_all_subexpressions(eval.expr))
+case class EvalIndex[G](
+    eval: Eval[G],
+    index: Int,
+    subexpressions: Seq[Statement[G]],
+) extends Index[G] {
+  def this(eval: Eval[G], index: Int) =
+    this(eval, index, Utils.find_all_subexpressions(eval.expr))
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
-    if (index < subexpressions.size - 1) Set((Step(EvalIndex(eval, index + 1)), None))
-    else Set((Outgoing(), None))
+    if (index < subexpressions.size - 1)
+      Set((Step(EvalIndex(eval, index + 1)), None))
+    else
+      Set((Outgoing(), None))
   }
   override def resolve(): Statement[G] = subexpressions.apply(index)
   override def has_statement(): Boolean = subexpressions.nonEmpty
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case EvalIndex(e, i, _) => i == index && e.equals(eval)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case EvalIndex(e, i, _) => i == index && e.equals(eval)
+      case _ => false
+    }
 }
 object EvalIndex {
-  def apply[G](eval: Eval[G], index: Int): EvalIndex[G] = new EvalIndex(eval, index)
+  def apply[G](eval: Eval[G], index: Int): EvalIndex[G] =
+    new EvalIndex(eval, index)
 }
 
-case class InvokeProcedureIndex[G](invoke_procedure: InvokeProcedure[G], index: Int) extends Index[G] {
+case class InvokeProcedureIndex[G](
+    invoke_procedure: InvokeProcedure[G],
+    index: Int,
+) extends Index[G] {
   // Order of operations:
   // 1. args
   // 2. given
@@ -323,17 +435,23 @@ case class InvokeProcedureIndex[G](invoke_procedure: InvokeProcedure[G], index:
   // 7. postcondition
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
     val args: Seq[Expr[G]] = invoke_procedure.args
-    val givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = invoke_procedure.givenMap
+    val givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] =
+      invoke_procedure.givenMap
     val outArgs: Seq[Expr[G]] = invoke_procedure.outArgs
     val yields: Seq[(Expr[G], Ref[G, Variable[G]])] = invoke_procedure.yields
-    if (index < args.size + givenMap.size + outArgs.size + yields.size + 1 ||
-        index == args.size + givenMap.size + outArgs.size + yields.size + 1 && invoke_procedure.ref.decl.body.nonEmpty)
+    if (
+      index < args.size + givenMap.size + outArgs.size + yields.size + 1 ||
+      index == args.size + givenMap.size + outArgs.size + yields.size + 1 &&
+      invoke_procedure.ref.decl.body.nonEmpty
+    )
       Set((Step(InvokeProcedureIndex(invoke_procedure, index + 1)), None))
-    else Set((Outgoing(), None))
+    else
+      Set((Outgoing(), None))
   }
   override def resolve(): Statement[G] = {
     val args: Seq[Expr[G]] = invoke_procedure.args
-    val givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = invoke_procedure.givenMap
+    val givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] =
+      invoke_procedure.givenMap
     val outArgs: Seq[Expr[G]] = invoke_procedure.outArgs
     val yields: Seq[(Expr[G], Ref[G, Variable[G]])] = invoke_procedure.yields
     if (index < args.size) {
@@ -346,25 +464,46 @@ case class InvokeProcedureIndex[G](invoke_procedure: InvokeProcedure[G], index:
       val expr: Expr[G] = outArgs.apply(index - args.size - givenMap.size)
       Eval(expr)(expr.o)
     } else if (index < args.size + givenMap.size + outArgs.size + yields.size) {
-      val expr: Expr[G] = yields.apply(index - args.size - givenMap.size - outArgs.size)._1
+      val expr: Expr[G] =
+        yields.apply(index - args.size - givenMap.size - outArgs.size)._1
       Eval(expr)(expr.o)
-    } else if (index == args.size + givenMap.size + outArgs.size + yields.size) {
-      val expr: Expr[G] = Star(Utils.contract_to_expression(invoke_procedure.ref.decl.contract.requires), invoke_procedure.ref.decl.contract.contextEverywhere)(invoke_procedure.o)
+    } else if (
+      index == args.size + givenMap.size + outArgs.size + yields.size
+    ) {
+      val expr: Expr[G] =
+        Star(
+          Utils.contract_to_expression(
+            invoke_procedure.ref.decl.contract.requires
+          ),
+          invoke_procedure.ref.decl.contract.contextEverywhere,
+        )(invoke_procedure.o)
       Assert(expr)(expr.o)(expr.o)
-    } else if (index == args.size + givenMap.size + outArgs.size + yields.size + 1 && invoke_procedure.ref.decl.body.nonEmpty) {
-      invoke_procedure.ref.decl.body.get
-    } else {
-      val expr: Expr[G] = Star(Utils.contract_to_expression(invoke_procedure.ref.decl.contract.ensures), invoke_procedure.ref.decl.contract.contextEverywhere)(invoke_procedure.o)
+    } else if (
+      index == args.size + givenMap.size + outArgs.size + yields.size + 1 &&
+      invoke_procedure.ref.decl.body.nonEmpty
+    ) { invoke_procedure.ref.decl.body.get }
+    else {
+      val expr: Expr[G] =
+        Star(
+          Utils
+            .contract_to_expression(invoke_procedure.ref.decl.contract.ensures),
+          invoke_procedure.ref.decl.contract.contextEverywhere,
+        )(invoke_procedure.o)
       Assert(expr)(expr.o)(expr.o)
     }
   }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case InvokeProcedureIndex(p, i) => i == index && p.equals(invoke_procedure)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case InvokeProcedureIndex(p, i) =>
+        i == index && p.equals(invoke_procedure)
+      case _ => false
+    }
 }
 
-case class InvokeConstructorIndex[G](invoke_constructor: InvokeConstructor[G], index: Int) extends Index[G] {
+case class InvokeConstructorIndex[G](
+    invoke_constructor: InvokeConstructor[G],
+    index: Int,
+) extends Index[G] {
   // Order of operations:
   // 1. args
   // 2. given
@@ -374,17 +513,23 @@ case class InvokeConstructorIndex[G](invoke_constructor: InvokeConstructor[G], i
   // 6. constructor body
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
     val args: Seq[Expr[G]] = invoke_constructor.args
-    val givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = invoke_constructor.givenMap
+    val givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] =
+      invoke_constructor.givenMap
     val outArgs: Seq[Expr[G]] = invoke_constructor.outArgs
     val yields: Seq[(Expr[G], Ref[G, Variable[G]])] = invoke_constructor.yields
-    if (index < args.size + givenMap.size + outArgs.size + yields.size + 2 ||
-      index == args.size + givenMap.size + outArgs.size + yields.size + 2 && invoke_constructor.ref.decl.body.nonEmpty)
+    if (
+      index < args.size + givenMap.size + outArgs.size + yields.size + 2 ||
+      index == args.size + givenMap.size + outArgs.size + yields.size + 2 &&
+      invoke_constructor.ref.decl.body.nonEmpty
+    )
       Set((Step(InvokeConstructorIndex(invoke_constructor, index + 1)), None))
-    else Set((Outgoing(), None))
+    else
+      Set((Outgoing(), None))
   }
   override def resolve(): Statement[G] = {
     val args: Seq[Expr[G]] = invoke_constructor.args
-    val givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = invoke_constructor.givenMap
+    val givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] =
+      invoke_constructor.givenMap
     val outArgs: Seq[Expr[G]] = invoke_constructor.outArgs
     val yields: Seq[(Expr[G], Ref[G, Variable[G]])] = invoke_constructor.yields
     if (index < args.size) {
@@ -397,27 +542,48 @@ case class InvokeConstructorIndex[G](invoke_constructor: InvokeConstructor[G], i
       val expr: Expr[G] = outArgs.apply(index - args.size - givenMap.size)
       Eval(expr)(expr.o)
     } else if (index < args.size + givenMap.size + outArgs.size + yields.size) {
-      val expr: Expr[G] = yields.apply(index - args.size - givenMap.size - outArgs.size)._1
+      val expr: Expr[G] =
+        yields.apply(index - args.size - givenMap.size - outArgs.size)._1
       Eval(expr)(expr.o)
-    } else if (index == args.size + givenMap.size + outArgs.size + yields.size) {
-      Eval(invoke_constructor.out)(invoke_constructor.out.o)
-    } else if (index == args.size + givenMap.size + outArgs.size + yields.size + 1) {
-      val expr: Expr[G] = Star(Utils.contract_to_expression(invoke_constructor.ref.decl.contract.requires), invoke_constructor.ref.decl.contract.contextEverywhere)(invoke_constructor.o)
+    } else if (
+      index == args.size + givenMap.size + outArgs.size + yields.size
+    ) { Eval(invoke_constructor.out)(invoke_constructor.out.o) }
+    else if (
+      index == args.size + givenMap.size + outArgs.size + yields.size + 1
+    ) {
+      val expr: Expr[G] =
+        Star(
+          Utils.contract_to_expression(
+            invoke_constructor.ref.decl.contract.requires
+          ),
+          invoke_constructor.ref.decl.contract.contextEverywhere,
+        )(invoke_constructor.o)
       Assert(expr)(expr.o)(expr.o)
-    } else if (index == args.size + givenMap.size + outArgs.size + yields.size + 2 && invoke_constructor.ref.decl.body.nonEmpty) {
-      invoke_constructor.ref.decl.body.get
-    } else {
-      val expr: Expr[G] = Star(Utils.contract_to_expression(invoke_constructor.ref.decl.contract.ensures), invoke_constructor.ref.decl.contract.contextEverywhere)(invoke_constructor.o)
+    } else if (
+      index == args.size + givenMap.size + outArgs.size + yields.size + 2 &&
+      invoke_constructor.ref.decl.body.nonEmpty
+    ) { invoke_constructor.ref.decl.body.get }
+    else {
+      val expr: Expr[G] =
+        Star(
+          Utils.contract_to_expression(
+            invoke_constructor.ref.decl.contract.ensures
+          ),
+          invoke_constructor.ref.decl.contract.contextEverywhere,
+        )(invoke_constructor.o)
       Assert(expr)(expr.o)(expr.o)
     }
   }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case InvokeConstructorIndex(c, i) => i == index && c.equals(invoke_constructor)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case InvokeConstructorIndex(c, i) =>
+        i == index && c.equals(invoke_constructor)
+      case _ => false
+    }
 }
 
-case class InvokeMethodIndex[G](invoke_method: InvokeMethod[G], index: Int) extends Index[G] {
+case class InvokeMethodIndex[G](invoke_method: InvokeMethod[G], index: Int)
+    extends Index[G] {
   // Order of operations:
   // 1. obj
   // 2. args
@@ -430,19 +596,22 @@ case class InvokeMethodIndex[G](invoke_method: InvokeMethod[G], index: Int) exte
     val givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = invoke_method.givenMap
     val outArgs: Seq[Expr[G]] = invoke_method.outArgs
     val yields: Seq[(Expr[G], Ref[G, Variable[G]])] = invoke_method.yields
-    if (index < args.size + givenMap.size + outArgs.size + yields.size + 2 ||
-      index == args.size + givenMap.size + outArgs.size + yields.size + 2 && invoke_method.ref.decl.body.nonEmpty)
+    if (
+      index < args.size + givenMap.size + outArgs.size + yields.size + 2 ||
+      index == args.size + givenMap.size + outArgs.size + yields.size + 2 &&
+      invoke_method.ref.decl.body.nonEmpty
+    )
       Set((Step(InvokeMethodIndex(invoke_method, index + 1)), None))
-    else Set((Outgoing(), None))
+    else
+      Set((Outgoing(), None))
   }
   override def resolve(): Statement[G] = {
     val args: Seq[Expr[G]] = invoke_method.args
     val givenMap: Seq[(Ref[G, Variable[G]], Expr[G])] = invoke_method.givenMap
     val outArgs: Seq[Expr[G]] = invoke_method.outArgs
     val yields: Seq[(Expr[G], Ref[G, Variable[G]])] = invoke_method.yields
-    if (index == 0) {
-      Eval(invoke_method.obj)(invoke_method.obj.o)
-    } else if (index < args.size + 1) {
+    if (index == 0) { Eval(invoke_method.obj)(invoke_method.obj.o) }
+    else if (index < args.size + 1) {
       val expr: Expr[G] = args.apply(index - 1)
       Eval(expr)(expr.o)
     } else if (index < args.size + givenMap.size + 1) {
@@ -451,279 +620,420 @@ case class InvokeMethodIndex[G](invoke_method: InvokeMethod[G], index: Int) exte
     } else if (index < args.size + givenMap.size + outArgs.size + 1) {
       val expr: Expr[G] = outArgs.apply(index - args.size - givenMap.size - 1)
       Eval(expr)(expr.o)
-    } else if (index < args.size + givenMap.size + outArgs.size + yields.size + 1) {
-      val expr: Expr[G] = yields.apply(index - args.size - givenMap.size - outArgs.size - 1)._1
+    } else if (
+      index < args.size + givenMap.size + outArgs.size + yields.size + 1
+    ) {
+      val expr: Expr[G] =
+        yields.apply(index - args.size - givenMap.size - outArgs.size - 1)._1
       Eval(expr)(expr.o)
-    } else if (index == args.size + givenMap.size + outArgs.size + yields.size + 1) {
-      val expr: Expr[G] = Star(Utils.contract_to_expression(invoke_method.ref.decl.contract.requires), invoke_method.ref.decl.contract.contextEverywhere)(invoke_method.o)
+    } else if (
+      index == args.size + givenMap.size + outArgs.size + yields.size + 1
+    ) {
+      val expr: Expr[G] =
+        Star(
+          Utils
+            .contract_to_expression(invoke_method.ref.decl.contract.requires),
+          invoke_method.ref.decl.contract.contextEverywhere,
+        )(invoke_method.o)
       Assert(expr)(expr.o)(expr.o)
-    } else if (index == args.size + givenMap.size + outArgs.size + yields.size + 2 && invoke_method.ref.decl.body.nonEmpty) {
-      invoke_method.ref.decl.body.get
-    } else {
-      val expr: Expr[G] = Star(Utils.contract_to_expression(invoke_method.ref.decl.contract.ensures), invoke_method.ref.decl.contract.contextEverywhere)(invoke_method.o)
+    } else if (
+      index == args.size + givenMap.size + outArgs.size + yields.size + 2 &&
+      invoke_method.ref.decl.body.nonEmpty
+    ) { invoke_method.ref.decl.body.get }
+    else {
+      val expr: Expr[G] =
+        Star(
+          Utils.contract_to_expression(invoke_method.ref.decl.contract.ensures),
+          invoke_method.ref.decl.contract.contextEverywhere,
+        )(invoke_method.o)
       Assert(expr)(expr.o)(expr.o)
     }
   }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case InvokeMethodIndex(m, i) => i == index && m.equals(invoke_method)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case InvokeMethodIndex(m, i) => i == index && m.equals(invoke_method)
+      case _ => false
+    }
 }
 
 case class BlockIndex[G](block: Block[G], index: Int) extends Index[G] {
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
-    if (index < block.statements.size - 1) Set((Step(BlockIndex(block, index + 1)), None))
-    else Set((Outgoing(), None))
+    if (index < block.statements.size - 1)
+      Set((Step(BlockIndex(block, index + 1)), None))
+    else
+      Set((Outgoing(), None))
   }
   override def resolve(): Statement[G] = block.statements.apply(index)
   override def has_statement(): Boolean = block.statements.nonEmpty
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case BlockIndex(b, i) => i == index && b.equals(block)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case BlockIndex(b, i) => i == index && b.equals(block)
+      case _ => false
+    }
 }
 
 case class ScopeIndex[G](scope: Scope[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = scope.body
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case ScopeIndex(s) => s.equals(scope)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case ScopeIndex(s) => s.equals(scope)
+      case _ => false
+    }
 }
 
 case class BranchIndex[G](branch: Branch[G], index: Int) extends Index[G] {
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
     // Indices 0, 2, 4, ... are the conditions, indices 1, 3, 5, ... are the branch bodies
     if (index % 2 == 0 && index < 2 * (branch.branches.size - 1))
-      Set((Step(BranchIndex(branch, index + 2)), Some(Utils.negate(branch.branches.apply(index / 2)._1))),
-          (Step(BranchIndex(branch, index + 1)), Some(branch.branches.apply(index / 2)._1)))
+      Set(
+        (
+          Step(BranchIndex(branch, index + 2)),
+          Some(Utils.negate(branch.branches.apply(index / 2)._1)),
+        ),
+        (
+          Step(BranchIndex(branch, index + 1)),
+          Some(branch.branches.apply(index / 2)._1),
+        ),
+      )
     else if (index == 2 * (branch.branches.size - 1))
-      Set((Step(BranchIndex(branch, index + 1)), Some(branch.branches.apply(index / 2)._1)),
-          (Outgoing(), Some(Utils.negate(branch.branches.apply(index / 2)._1))))
-    else Set((Outgoing(), None))
+      Set(
+        (
+          Step(BranchIndex(branch, index + 1)),
+          Some(branch.branches.apply(index / 2)._1),
+        ),
+        (Outgoing(), Some(Utils.negate(branch.branches.apply(index / 2)._1))),
+      )
+    else
+      Set((Outgoing(), None))
   }
   override def resolve(): Statement[G] = {
-    if (index % 2 == 0) Eval(branch.branches.apply(index / 2)._1)(branch.branches.apply(index / 2)._1.o)
-    else branch.branches.apply((index - 1) / 2)._2
+    if (index % 2 == 0)
+      Eval(branch.branches.apply(index / 2)._1)(
+        branch.branches.apply(index / 2)._1.o
+      )
+    else
+      branch.branches.apply((index - 1) / 2)._2
   }
   override def has_statement(): Boolean = branch.branches.nonEmpty
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case BranchIndex(b, i) => i == index && b.equals(branch)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case BranchIndex(b, i) => i == index && b.equals(branch)
+      case _ => false
+    }
 }
 
-case class IndetBranchIndex[G](indet_branch: IndetBranch[G], index: Int) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+case class IndetBranchIndex[G](indet_branch: IndetBranch[G], index: Int)
+    extends Index[G] {
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = indet_branch.branches.apply(index)
   override def has_statement(): Boolean = indet_branch.branches.nonEmpty
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case IndetBranchIndex(b, i) => i == index && b.equals(indet_branch)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case IndetBranchIndex(b, i) => i == index && b.equals(indet_branch)
+      case _ => false
+    }
 }
 
 case class SwitchIndex[G](switch: Switch[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = switch.body
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case SwitchIndex(s) => s.equals(switch)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case SwitchIndex(s) => s.equals(switch)
+      case _ => false
+    }
 }
 
 case class LoopIndex[G](loop: Loop[G], index: Int) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = index match {
-    case 0 => Set((Step(LoopIndex(loop, 1)), None))
-    case 1 => Set((Step(LoopIndex(loop, 2)), None))
-    case 2 => Set((Step(LoopIndex(loop, 3)), Some(loop.cond)), (Outgoing(), Some(Utils.negate(loop.cond))))
-    case 3 => Set((Step(LoopIndex(loop, 4)), None))
-    case 4 => Set((Step(LoopIndex(loop, 1)), None))
-  }
-  override def resolve(): Statement[G] = index match {
-    case 0 => loop.init
-    case 1 => Assert(Utils.loop_contract_to_expression(loop.contract))(loop.o)(loop.o)
-    case 2 => Eval(loop.cond)(loop.cond.o)
-    case 3 => loop.body
-    case 4 => loop.update
-  }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case LoopIndex(l, i) => i == index && l.equals(loop)
-    case _ => false
-  }
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    index match {
+      case 0 => Set((Step(LoopIndex(loop, 1)), None))
+      case 1 => Set((Step(LoopIndex(loop, 2)), None))
+      case 2 =>
+        Set(
+          (Step(LoopIndex(loop, 3)), Some(loop.cond)),
+          (Outgoing(), Some(Utils.negate(loop.cond))),
+        )
+      case 3 => Set((Step(LoopIndex(loop, 4)), None))
+      case 4 => Set((Step(LoopIndex(loop, 1)), None))
+    }
+  override def resolve(): Statement[G] =
+    index match {
+      case 0 => loop.init
+      case 1 =>
+        Assert(Utils.loop_contract_to_expression(loop.contract))(loop.o)(loop.o)
+      case 2 => Eval(loop.cond)(loop.cond.o)
+      case 3 => loop.body
+      case 4 => loop.update
+    }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case LoopIndex(l, i) => i == index && l.equals(loop)
+      case _ => false
+    }
 }
 
 case class RangedForIndex[G](ranged_for: RangedFor[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Step(this), None), (Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Step(this), None), (Outgoing(), None))
   override def resolve(): Statement[G] = ranged_for.body
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case RangedForIndex(r) => r.equals(ranged_for)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case RangedForIndex(r) => r.equals(ranged_for)
+      case _ => false
+    }
 }
 
-case class TryCatchFinallyIndex[G](try_catch_finally: TryCatchFinally[G], index: Int) extends Index[G] {
+case class TryCatchFinallyIndex[G](
+    try_catch_finally: TryCatchFinally[G],
+    index: Int,
+) extends Index[G] {
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
-    if (index != 1) Set((Step(TryCatchFinallyIndex(try_catch_finally, 1)), None))
-    else Set((Outgoing(), None))
-  }
-  override def resolve(): Statement[G] = index match {
-    case 0 => try_catch_finally.body
-    case 1 => try_catch_finally.after
-    case _ => try_catch_finally.catches.apply(index - 2).body
-  }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case TryCatchFinallyIndex(t, i) => i == index && t.equals(try_catch_finally)
-    case _ => false
-  }
+    if (index != 1)
+      Set((Step(TryCatchFinallyIndex(try_catch_finally, 1)), None))
+    else
+      Set((Outgoing(), None))
+  }
+  override def resolve(): Statement[G] =
+    index match {
+      case 0 => try_catch_finally.body
+      case 1 => try_catch_finally.after
+      case _ => try_catch_finally.catches.apply(index - 2).body
+    }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case TryCatchFinallyIndex(t, i) =>
+        i == index && t.equals(try_catch_finally)
+      case _ => false
+    }
 }
 
-case class SynchronizedIndex[G](synchronized: Synchronized[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+case class SynchronizedIndex[G](synchronized: Synchronized[G])
+    extends Index[G] {
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = synchronized.body
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case SynchronizedIndex(s) => s.equals(synchronized)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case SynchronizedIndex(s) => s.equals(synchronized)
+      case _ => false
+    }
 }
 
-case class ParInvariantIndex[G](par_invariant: ParInvariant[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+case class ParInvariantIndex[G](par_invariant: ParInvariant[G])
+    extends Index[G] {
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = par_invariant.content
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case ParInvariantIndex(p) => p.equals(par_invariant)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case ParInvariantIndex(p) => p.equals(par_invariant)
+      case _ => false
+    }
 }
 
 case class ParAtomicIndex[G](par_atomic: ParAtomic[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = par_atomic.content
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case ParAtomicIndex(p) => p.equals(par_atomic)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case ParAtomicIndex(p) => p.equals(par_atomic)
+      case _ => false
+    }
 }
 
 case class ParBarrierIndex[G](par_barrier: ParBarrier[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = par_barrier.content
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case ParBarrierIndex(p) => p.equals(par_barrier)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case ParBarrierIndex(p) => p.equals(par_barrier)
+      case _ => false
+    }
 }
 
 case class VecBlockIndex[G](vec_block: VecBlock[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = vec_block.content
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case VecBlockIndex(v) => v.equals(vec_block)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case VecBlockIndex(v) => v.equals(vec_block)
+      case _ => false
+    }
 }
 
 case class WandPackageIndex[G](wand_package: WandPackage[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = wand_package.proof
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case WandPackageIndex(w) => w.equals(wand_package)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case WandPackageIndex(w) => w.equals(wand_package)
+      case _ => false
+    }
 }
 
 case class ModelDoIndex[G](model_do: ModelDo[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = model_do.impl
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case ModelDoIndex(m) => m.equals(model_do)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case ModelDoIndex(m) => m.equals(model_do)
+      case _ => false
+    }
 }
 
-case class CPPLifetimeScopeIndex[G](cpp_lifetime_scope: CPPLifetimeScope[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+case class CPPLifetimeScopeIndex[G](cpp_lifetime_scope: CPPLifetimeScope[G])
+    extends Index[G] {
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = cpp_lifetime_scope.body
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case CPPLifetimeScopeIndex(c) => c.equals(cpp_lifetime_scope)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case CPPLifetimeScopeIndex(c) => c.equals(cpp_lifetime_scope)
+      case _ => false
+    }
 }
 
-case class UnresolvedSeqBranchIndex[G](unresolved_seq_branch: UnresolvedChorBranch[G], index: Int) extends Index[G] {
+case class UnresolvedSeqBranchIndex[G](
+    unresolved_seq_branch: UnresolvedChorBranch[G],
+    index: Int,
+) extends Index[G] {
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = {
     // Indices 0, 2, 4, ... are the conditions, indices 1, 3, 5, ... are the branch bodies
     if (index % 2 == 0 && index < 2 * (unresolved_seq_branch.branches.size - 1))
-      Set((Step(UnresolvedSeqBranchIndex(unresolved_seq_branch, index + 2)), Some(Utils.negate(unresolved_seq_branch.branches.apply(index / 2)._1))),
-        (Step(UnresolvedSeqBranchIndex(unresolved_seq_branch, index + 1)), Some(unresolved_seq_branch.branches.apply(index / 2)._1)))
+      Set(
+        (
+          Step(UnresolvedSeqBranchIndex(unresolved_seq_branch, index + 2)),
+          Some(Utils.negate(unresolved_seq_branch.branches.apply(index / 2)._1)),
+        ),
+        (
+          Step(UnresolvedSeqBranchIndex(unresolved_seq_branch, index + 1)),
+          Some(unresolved_seq_branch.branches.apply(index / 2)._1),
+        ),
+      )
     else if (index == 2 * (unresolved_seq_branch.branches.size - 1))
-      Set((Step(UnresolvedSeqBranchIndex(unresolved_seq_branch, index + 1)), Some(unresolved_seq_branch.branches.apply(index / 2)._1)),
-        (Outgoing(), Some(Utils.negate(unresolved_seq_branch.branches.apply(index / 2)._1))))
-    else Set((Outgoing(), None))
+      Set(
+        (
+          Step(UnresolvedSeqBranchIndex(unresolved_seq_branch, index + 1)),
+          Some(unresolved_seq_branch.branches.apply(index / 2)._1),
+        ),
+        (
+          Outgoing(),
+          Some(Utils.negate(unresolved_seq_branch.branches.apply(index / 2)._1)),
+        ),
+      )
+    else
+      Set((Outgoing(), None))
   }
   override def resolve(): Statement[G] = {
-    if (index % 2 == 0) Eval(unresolved_seq_branch.branches.apply(index / 2)._1)(unresolved_seq_branch.branches.apply(index / 2)._1.o)
-    else unresolved_seq_branch.branches.apply((index - 1) / 2)._2
-  }
-  override def has_statement(): Boolean = unresolved_seq_branch.branches.nonEmpty
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case UnresolvedSeqBranchIndex(u, i) => i == index && u.equals(unresolved_seq_branch)
-    case _ => false
-  }
+    if (index % 2 == 0)
+      Eval(unresolved_seq_branch.branches.apply(index / 2)._1)(
+        unresolved_seq_branch.branches.apply(index / 2)._1.o
+      )
+    else
+      unresolved_seq_branch.branches.apply((index - 1) / 2)._2
+  }
+  override def has_statement(): Boolean =
+    unresolved_seq_branch.branches.nonEmpty
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case UnresolvedSeqBranchIndex(u, i) =>
+        i == index && u.equals(unresolved_seq_branch)
+      case _ => false
+    }
 }
 
-case class UnresolvedSeqLoopIndex[G](unresolved_seq_loop: UnresolvedChorLoop[G], index: Int) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = index match {
-    case 0 => Set((Step(UnresolvedSeqLoopIndex(unresolved_seq_loop, 1)), Some(unresolved_seq_loop.cond)),
-                  (Outgoing(), Some(Utils.negate(unresolved_seq_loop.cond))))
-    case 1 => Set((Step(UnresolvedSeqLoopIndex(unresolved_seq_loop, 0)), None))
-  }
-  override def resolve(): Statement[G] = index match {
-    case 0 => Eval(unresolved_seq_loop.cond)(unresolved_seq_loop.cond.o)
-    case 1 => unresolved_seq_loop.body
-  }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case UnresolvedSeqLoopIndex(u, i) => i == index && u.equals(unresolved_seq_loop)
-    case _ => false
-  }
+case class UnresolvedSeqLoopIndex[G](
+    unresolved_seq_loop: UnresolvedChorLoop[G],
+    index: Int,
+) extends Index[G] {
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    index match {
+      case 0 =>
+        Set(
+          (
+            Step(UnresolvedSeqLoopIndex(unresolved_seq_loop, 1)),
+            Some(unresolved_seq_loop.cond),
+          ),
+          (Outgoing(), Some(Utils.negate(unresolved_seq_loop.cond))),
+        )
+      case 1 =>
+        Set((Step(UnresolvedSeqLoopIndex(unresolved_seq_loop, 0)), None))
+    }
+  override def resolve(): Statement[G] =
+    index match {
+      case 0 => Eval(unresolved_seq_loop.cond)(unresolved_seq_loop.cond.o)
+      case 1 => unresolved_seq_loop.body
+    }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case UnresolvedSeqLoopIndex(u, i) =>
+        i == index && u.equals(unresolved_seq_loop)
+      case _ => false
+    }
 }
 
-case class SeqBranchIndex[G](seq_branch: ChorBranch[G], index: Int) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))      // TODO: What are the conditions?
-  override def resolve(): Statement[G] = index match {
-    case 0 => seq_branch.yes
-    case 1 => seq_branch.no.get
-  }
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case SeqBranchIndex(s, i) => i == index && s.equals(seq_branch)
-    case _ => false
-  }
+case class SeqBranchIndex[G](seq_branch: ChorBranch[G], index: Int)
+    extends Index[G] {
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None)) // TODO: What are the conditions?
+  override def resolve(): Statement[G] =
+    index match {
+      case 0 => seq_branch.yes
+      case 1 => seq_branch.no.get
+    }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case SeqBranchIndex(s, i) => i == index && s.equals(seq_branch)
+      case _ => false
+    }
 }
 
 case class SeqLoopIndex[G](seq_loop: ChorLoop[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Step(this), None), (Outgoing(), None))    // TODO: What are the conditions?
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set(
+      (Step(this), None),
+      (Outgoing(), None),
+    ) // TODO: What are the conditions?
   override def resolve(): Statement[G] = seq_loop.body
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case SeqLoopIndex(s) => s.equals(seq_loop)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case SeqLoopIndex(s) => s.equals(seq_loop)
+      case _ => false
+    }
 }
 
-case class VeyMontAssignExpressionIndex[G](veymont_assign_expression: VeyMontAssignExpression[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+case class VeyMontAssignExpressionIndex[G](
+    veymont_assign_expression: VeyMontAssignExpression[G]
+) extends Index[G] {
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = veymont_assign_expression.assign
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case VeyMontAssignExpressionIndex(v) => v.equals(veymont_assign_expression)
-    case _ => false
-  }
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case VeyMontAssignExpressionIndex(v) =>
+        v.equals(veymont_assign_expression)
+      case _ => false
+    }
 }
 
-case class CommunicateXIndex[G](communicatex: CommunicateX[G]) extends Index[G] {
-  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] = Set((Outgoing(), None))
+case class CommunicateXIndex[G](communicatex: CommunicateX[G])
+    extends Index[G] {
+  override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
+    Set((Outgoing(), None))
   override def resolve(): Statement[G] = communicatex.assign
-  override def equals(obj: scala.Any): Boolean = obj match {
-    case CommunicateXIndex(c) => c.equals(communicatex)
-    case _ => false
-  }
-}
\ No newline at end of file
+  override def equals(obj: scala.Any): Boolean =
+    obj match {
+      case CommunicateXIndex(c) => c.equals(communicatex)
+      case _ => false
+    }
+}
diff --git a/src/rewrite/vct/rewrite/cfg/Utils.scala b/src/rewrite/vct/rewrite/cfg/Utils.scala
index 9ba7053ef2..c5a85fc946 100644
--- a/src/rewrite/vct/rewrite/cfg/Utils.scala
+++ b/src/rewrite/vct/rewrite/cfg/Utils.scala
@@ -7,110 +7,213 @@ import vct.col.util.AstBuildHelpers
 
 object Utils {
 
-  def find_all_subexpressions[G](expr: Expr[G]): Seq[Statement[G]] = expr match {
-    // Expressions causing side effects
-    case pae @ PreAssignExpression(target, value) => Seq(Assign(target, value)(pae.blame)(pae.o))
-    case pae @ PostAssignExpression(target, value) => Seq(Assign(target, value)(pae.blame)(pae.o))
-    case With(pre, value) => pre +: find_all_subexpressions(value)
-    case Then(value, post) => find_all_subexpressions(value) :+ post
-    case mi @ MethodInvocation(obj, ref, args, outArgs, typeArgs, givenMap, yields) =>
-      Seq(InvokeMethod(obj, ref, args, outArgs, typeArgs, givenMap, yields)(mi.blame)(mi.o))
-    case ci @ ConstructorInvocation(ref, classTypeArgs, args, outArgs, typeArgs, givenMap, yields) =>
-      Seq(InvokeConstructor(ref, classTypeArgs, get_out_variable(ref.decl.cls, ci.o), args, outArgs, typeArgs, givenMap, yields)(ci.blame)(ci.o))
-    case pi @ ProcedureInvocation(ref, args, outArgs, typeArgs, givenMap, yields) =>
-      Seq(InvokeProcedure(ref, args, outArgs, typeArgs, givenMap, yields)(pi.blame)(pi.o))
-    case no @ NewObject(cls) => Seq(Instantiate(cls, get_out_variable(cls, no.o))(no.o))
-    // Expressions that affect the edge condition
-    case Select(condition, whenTrue, whenFalse) => {
-      val statements: Seq[Statement[G]] = find_all_subexpressions(condition)
-      val true_stmts: Seq[Statement[G]] = find_all_subexpressions(whenTrue)
-      val false_stmts: Seq[Statement[G]] = find_all_subexpressions(whenFalse)
-      var branches: Seq[(Expr[G], Statement[G])] = Seq()
-      if (true_stmts.nonEmpty) branches = branches.appended((condition, Block(true_stmts)(whenTrue.o)))
-      if (false_stmts.nonEmpty) branches = branches.appended((negate(condition), Block(false_stmts)(whenFalse.o)))
-      if (branches.nonEmpty) statements ++ Seq(Branch(branches)(expr.o))
-      else statements
+  def find_all_subexpressions[G](expr: Expr[G]): Seq[Statement[G]] =
+    expr match {
+      // Expressions causing side effects
+      case pae @ PreAssignExpression(target, value) =>
+        Seq(Assign(target, value)(pae.blame)(pae.o))
+      case pae @ PostAssignExpression(target, value) =>
+        Seq(Assign(target, value)(pae.blame)(pae.o))
+      case With(pre, value) => pre +: find_all_subexpressions(value)
+      case Then(value, post) => find_all_subexpressions(value) :+ post
+      case mi @ MethodInvocation(
+            obj,
+            ref,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        Seq(
+          InvokeMethod(obj, ref, args, outArgs, typeArgs, givenMap, yields)(
+            mi.blame
+          )(mi.o)
+        )
+      case ci @ ConstructorInvocation(
+            ref,
+            classTypeArgs,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        Seq(
+          InvokeConstructor(
+            ref,
+            classTypeArgs,
+            get_out_variable(ref.decl.cls, ci.o),
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          )(ci.blame)(ci.o)
+        )
+      case pi @ ProcedureInvocation(
+            ref,
+            args,
+            outArgs,
+            typeArgs,
+            givenMap,
+            yields,
+          ) =>
+        Seq(
+          InvokeProcedure(ref, args, outArgs, typeArgs, givenMap, yields)(
+            pi.blame
+          )(pi.o)
+        )
+      case no @ NewObject(cls) =>
+        Seq(Instantiate(cls, get_out_variable(cls, no.o))(no.o))
+      // Expressions that affect the edge condition
+      case Select(condition, whenTrue, whenFalse) => {
+        val statements: Seq[Statement[G]] = find_all_subexpressions(condition)
+        val true_stmts: Seq[Statement[G]] = find_all_subexpressions(whenTrue)
+        val false_stmts: Seq[Statement[G]] = find_all_subexpressions(whenFalse)
+        var branches: Seq[(Expr[G], Statement[G])] = Seq()
+        if (true_stmts.nonEmpty)
+          branches = branches
+            .appended((condition, Block(true_stmts)(whenTrue.o)))
+        if (false_stmts.nonEmpty)
+          branches = branches
+            .appended((negate(condition), Block(false_stmts)(whenFalse.o)))
+        if (branches.nonEmpty)
+          statements ++ Seq(Branch(branches)(expr.o))
+        else
+          statements
+      }
+      case Implies(left, right) => {
+        val left_stmts: Seq[Statement[G]] = find_all_subexpressions(left)
+        val right_stmts: Seq[Statement[G]] = find_all_subexpressions(right)
+        if (right_stmts.nonEmpty)
+          left_stmts :+ Branch(Seq((left, Block(right_stmts)(right.o))))(expr.o)
+        else
+          left_stmts
+      }
+      case And(left, right) => {
+        val left_stmts: Seq[Statement[G]] = find_all_subexpressions(left)
+        val right_stmts: Seq[Statement[G]] = find_all_subexpressions(right)
+        if (right_stmts.nonEmpty)
+          left_stmts :+ Branch(Seq((left, Block(right_stmts)(right.o))))(expr.o)
+        else
+          left_stmts
+      }
+      case Or(left, right) => {
+        val left_stmts: Seq[Statement[G]] = find_all_subexpressions(left)
+        val right_stmts: Seq[Statement[G]] = find_all_subexpressions(right)
+        if (right_stmts.nonEmpty)
+          left_stmts :+
+            Branch(Seq((negate(left), Block(right_stmts)(right.o))))(expr.o)
+        else
+          left_stmts
+      }
+      // General recursion case
+      case _ =>
+        expr.subnodes.collect { case ex: Expr[G] => ex }
+          .flatMap(e => find_all_subexpressions(e))
     }
-    case Implies(left, right) => {
-      val left_stmts: Seq[Statement[G]] = find_all_subexpressions(left)
-      val right_stmts: Seq[Statement[G]] = find_all_subexpressions(right)
-      if (right_stmts.nonEmpty) left_stmts :+ Branch(Seq((left, Block(right_stmts)(right.o))))(expr.o)
-      else left_stmts
-    }
-    case And(left, right) => {
-      val left_stmts: Seq[Statement[G]] = find_all_subexpressions(left)
-      val right_stmts: Seq[Statement[G]] = find_all_subexpressions(right)
-      if (right_stmts.nonEmpty) left_stmts :+ Branch(Seq((left, Block(right_stmts)(right.o))))(expr.o)
-      else left_stmts
-    }
-    case Or(left, right) => {
-      val left_stmts: Seq[Statement[G]] = find_all_subexpressions(left)
-      val right_stmts: Seq[Statement[G]] = find_all_subexpressions(right)
-      if (right_stmts.nonEmpty) left_stmts :+ Branch(Seq((negate(left), Block(right_stmts)(right.o))))(expr.o)
-      else left_stmts
-    }
-    // General recursion case
-    case _ => expr.subnodes.collect{ case ex: Expr[G] => ex }.flatMap(e => find_all_subexpressions(e))
-  }
 
-  private def get_out_variable[G](cls: Ref[G, Class[G]],  o: Origin): Local[G] = Local(new DirectRef[G, Variable[G]](new Variable(TClass(cls, Seq()))(o)))(o)
+  private def get_out_variable[G](cls: Ref[G, Class[G]], o: Origin): Local[G] =
+    Local(new DirectRef[G, Variable[G]](new Variable(TClass(cls, Seq()))(o)))(o)
 
-  def find_all_cases[G](body: Statement[G], index: GlobalIndex[G]): Seq[(SwitchCase[G], GlobalIndex[G])] = body match {
-    case Switch(_, _) => Seq()
-    // Recursion on statements that can contain case statements
-    case Label(_, stat) => find_all_cases(stat, index.enter_scope(body))
-    case Block(statements) => statements.zipWithIndex.flatMap(t => find_all_cases(t._1, index.enter_scope(body, t._2)))
-    case Scope(_, bod) => find_all_cases(bod, index.enter_scope(body))
-    case PVLBranch(branches) => branches.zipWithIndex.flatMap(t => find_all_cases(t._1._2, index.enter_scope(body, t._2 * 2 + 1)))
-    case PVLLoop(init, _, update, _, bod) => Seq((init, 0), (bod, 2), (update, 3)).flatMap(t => find_all_cases(t._1, index.enter_scope(body, t._2)))
-    case FramedProof(_, bod, _) => find_all_cases(bod, index.enter_scope(body))
-    case Extract(contractedStatement) => find_all_cases(contractedStatement, index.enter_scope(body))
-    case Branch(branches) => branches.zipWithIndex.flatMap(t => find_all_cases(t._1._2, index.enter_scope(body, t._2 * 2 + 1)))
-    case IndetBranch(branches) => branches.zipWithIndex.flatMap(t => find_all_cases(t._1, index.enter_scope(body, t._2)))
-    case Loop(init, _, update, _, bod) => Seq((init, 0), (bod, 2), (update, 3)).flatMap(t => find_all_cases(t._1, index.enter_scope(body, t._2)))
-    case RangedFor(_, _, bod) => find_all_cases(bod, index.enter_scope(body))
-    case TryCatchFinally(bod, after, catches) => Seq((bod, 0), (after, 1)).concat(catches.zipWithIndex.map(t => (t._1.body, t._2 + 2)))
-                                                                          .flatMap(t => find_all_cases(t._1, index.enter_scope(body, t._2)))
-    case Synchronized(_, bod) => find_all_cases(bod, index.enter_scope(body))
-    case ParInvariant(_, _, content) => find_all_cases(content, index.enter_scope(body))
-    case ParAtomic(_, content) => find_all_cases(content, index.enter_scope(body))
-    case ParBarrier(_, _, _, _, content) => find_all_cases(content, index.enter_scope(body))
-    case VecBlock(_, _, _, content) => find_all_cases(content, index.enter_scope(body))
-    case WandPackage(_, proof) => find_all_cases(proof, index.enter_scope(body))
-    case ModelDo(_, _, _, _, impl) => find_all_cases(impl, index.enter_scope(body))
-    case CPPLifetimeScope(bod) => find_all_cases(bod, index.enter_scope(body))
-    case UnresolvedChorBranch(branches) => branches.zipWithIndex.flatMap(t => find_all_cases(t._1._2, index.enter_scope(body, t._2 * 2 + 1)))
-    case UnresolvedChorLoop(_, _, bod) => find_all_cases(bod, index.enter_scope(body))
-    case ChorBranch(_, yes, no) => no match {
-      case Some(stmt) => Seq((yes, 0), (stmt, 1)).flatMap(t => find_all_cases(t._1, index.enter_scope(body)))
-      case None => find_all_cases(yes, index.enter_scope(body))
+  def find_all_cases[G](
+      body: Statement[G],
+      index: GlobalIndex[G],
+  ): Seq[(SwitchCase[G], GlobalIndex[G])] =
+    body match {
+      case Switch(_, _) => Seq()
+      // Recursion on statements that can contain case statements
+      case Label(_, stat) => find_all_cases(stat, index.enter_scope(body))
+      case Block(statements) =>
+        statements.zipWithIndex
+          .flatMap(t => find_all_cases(t._1, index.enter_scope(body, t._2)))
+      case Scope(_, bod) => find_all_cases(bod, index.enter_scope(body))
+      case PVLBranch(branches) =>
+        branches.zipWithIndex.flatMap(t =>
+          find_all_cases(t._1._2, index.enter_scope(body, t._2 * 2 + 1))
+        )
+      case PVLLoop(init, _, update, _, bod) =>
+        Seq((init, 0), (bod, 2), (update, 3))
+          .flatMap(t => find_all_cases(t._1, index.enter_scope(body, t._2)))
+      case FramedProof(_, bod, _) =>
+        find_all_cases(bod, index.enter_scope(body))
+      case Extract(contractedStatement) =>
+        find_all_cases(contractedStatement, index.enter_scope(body))
+      case Branch(branches) =>
+        branches.zipWithIndex.flatMap(t =>
+          find_all_cases(t._1._2, index.enter_scope(body, t._2 * 2 + 1))
+        )
+      case IndetBranch(branches) =>
+        branches.zipWithIndex
+          .flatMap(t => find_all_cases(t._1, index.enter_scope(body, t._2)))
+      case Loop(init, _, update, _, bod) =>
+        Seq((init, 0), (bod, 2), (update, 3))
+          .flatMap(t => find_all_cases(t._1, index.enter_scope(body, t._2)))
+      case RangedFor(_, _, bod) => find_all_cases(bod, index.enter_scope(body))
+      case TryCatchFinally(bod, after, catches) =>
+        Seq((bod, 0), (after, 1))
+          .concat(catches.zipWithIndex.map(t => (t._1.body, t._2 + 2)))
+          .flatMap(t => find_all_cases(t._1, index.enter_scope(body, t._2)))
+      case Synchronized(_, bod) => find_all_cases(bod, index.enter_scope(body))
+      case ParInvariant(_, _, content) =>
+        find_all_cases(content, index.enter_scope(body))
+      case ParAtomic(_, content) =>
+        find_all_cases(content, index.enter_scope(body))
+      case ParBarrier(_, _, _, _, content) =>
+        find_all_cases(content, index.enter_scope(body))
+      case VecBlock(_, _, _, content) =>
+        find_all_cases(content, index.enter_scope(body))
+      case WandPackage(_, proof) =>
+        find_all_cases(proof, index.enter_scope(body))
+      case ModelDo(_, _, _, _, impl) =>
+        find_all_cases(impl, index.enter_scope(body))
+      case CPPLifetimeScope(bod) => find_all_cases(bod, index.enter_scope(body))
+      case UnresolvedChorBranch(branches) =>
+        branches.zipWithIndex.flatMap(t =>
+          find_all_cases(t._1._2, index.enter_scope(body, t._2 * 2 + 1))
+        )
+      case UnresolvedChorLoop(_, _, bod) =>
+        find_all_cases(bod, index.enter_scope(body))
+      case ChorBranch(_, yes, no) =>
+        no match {
+          case Some(stmt) =>
+            Seq((yes, 0), (stmt, 1))
+              .flatMap(t => find_all_cases(t._1, index.enter_scope(body)))
+          case None => find_all_cases(yes, index.enter_scope(body))
+        }
+      case ChorLoop(_, _, bod) => find_all_cases(bod, index.enter_scope(body))
+      case VeyMontAssignExpression(_, assign) =>
+        find_all_cases(assign, index.enter_scope(body))
+      case CommunicateX(_, _, _, assign) =>
+        find_all_cases(assign, index.enter_scope(body))
+      // Recursion end
+      case c: SwitchCase[G] => Seq((c, index))
+      case _ => Seq()
     }
-    case ChorLoop(_, _, bod) => find_all_cases(bod, index.enter_scope(body))
-    case VeyMontAssignExpression(_, assign) => find_all_cases(assign, index.enter_scope(body))
-    case CommunicateX(_, _, _, assign) => find_all_cases(assign, index.enter_scope(body))
-    // Recursion end
-    case c: SwitchCase[G] => Seq((c, index))
-    case _ => Seq()
-  }
 
-  def negate[G](expr: Expr[G]): Expr[G] = expr match {
-    case Not(inner) => inner
-    case BooleanValue(value) => BooleanValue(!value)(expr.o)
-    case _ => Not(expr)(expr.o)
-  }
+  def negate[G](expr: Expr[G]): Expr[G] =
+    expr match {
+      case Not(inner) => inner
+      case BooleanValue(value) => BooleanValue(!value)(expr.o)
+      case _ => Not(expr)(expr.o)
+    }
 
-  def and[G](expr1: Option[Expr[G]], expr2: Option[Expr[G]]): Option[Expr[G]] = expr1 match {
-    case None => expr2
-    case Some(e1) => expr2 match {
-      case None => expr1
-      case Some(e2) => Some(And(e1, e2)(e1.o))  // TODO: Is the origin important?
+  def and[G](expr1: Option[Expr[G]], expr2: Option[Expr[G]]): Option[Expr[G]] =
+    expr1 match {
+      case None => expr2
+      case Some(e1) =>
+        expr2 match {
+          case None => expr1
+          case Some(e2) =>
+            Some(And(e1, e2)(e1.o)) // TODO: Is the origin important?
+        }
     }
-  }
 
-  def loop_contract_to_expression[G](contract: LoopContract[G]): Expr[G] = contract match {
-    case LoopInvariant(inv, _) => inv
-  }
+  def loop_contract_to_expression[G](contract: LoopContract[G]): Expr[G] =
+    contract match { case LoopInvariant(inv, _) => inv }
 
   def contract_to_expression[G](contract: AccountedPredicate[G]): Expr[G] =
-    AstBuildHelpers.unfoldPredicate(contract).reduce((e1, e2) => Star(e1, e2)(e1.o))
+    AstBuildHelpers.unfoldPredicate(contract)
+      .reduce((e1, e2) => Star(e1, e2)(e1.o))
 }
diff --git a/src/rewrite/vct/rewrite/error/ExcludedByPassOrder.scala b/src/rewrite/vct/rewrite/error/ExcludedByPassOrder.scala
index d376b626d5..1fc67aff10 100644
--- a/src/rewrite/vct/rewrite/error/ExcludedByPassOrder.scala
+++ b/src/rewrite/vct/rewrite/error/ExcludedByPassOrder.scala
@@ -4,17 +4,18 @@ import vct.col.ast.Node
 import vct.col.util.CurrentRewriteProgramContext
 import vct.result.VerificationError.SystemError
 
-case class ExcludedByPassOrder(message: String, node: Option[Node[_]]) extends SystemError {
+case class ExcludedByPassOrder(message: String, node: Option[Node[_]])
+    extends SystemError {
   override def text: String = {
     val fullMessage =
       "An AST node or a property of the AST was reached, " +
-        "that should have been excluded by an earlier pass. " +
-        message
+        "that should have been excluded by an earlier pass. " + message
 
     node match {
       case Some(node) =>
         context[CurrentRewriteProgramContext] match {
-          case Some(ctx) => ctx.program.highlight(node).messageInContext(fullMessage)
+          case Some(ctx) =>
+            ctx.program.highlight(node).messageInContext(fullMessage)
           case None => node.o.messageInContext(fullMessage)
         }
       case None => messageContext(fullMessage)
@@ -22,5 +23,8 @@ case class ExcludedByPassOrder(message: String, node: Option[Node[_]]) extends S
   }
 }
 
-object ExtraNode extends ExcludedByPassOrder(
-  "Language-specific type, expression or declaration was encountered, which should have been already resolved", None)
\ No newline at end of file
+object ExtraNode
+    extends ExcludedByPassOrder(
+      "Language-specific type, expression or declaration was encountered, which should have been already resolved",
+      None,
+    )
diff --git a/src/rewrite/vct/rewrite/exc/ContinueToBreak.scala b/src/rewrite/vct/rewrite/exc/ContinueToBreak.scala
index 018de045a9..22fe6e6674 100644
--- a/src/rewrite/vct/rewrite/exc/ContinueToBreak.scala
+++ b/src/rewrite/vct/rewrite/exc/ContinueToBreak.scala
@@ -8,8 +8,6 @@ import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 
 import scala.collection.mutable
 
-
-
 case object ContinueToBreak extends RewriterBuilder {
   override def key: String = "continueToBreak"
   override def desc: String = "Encode continue as a break statement."
@@ -23,31 +21,37 @@ case class ContinueToBreak[Pre <: Generation]() extends Rewriter[Pre] {
     labelDeclOrigin.where(prefix = "continue", context = "loop label")
   }
 
-  val loopLabelToInnerLabel = new mutable.HashMap[LabelDecl[Pre], LabelDecl[Post]]()
-
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case Label(labelDecl, loop: Loop[Pre]) =>
-      val rewrittenBody = dispatch(loop.body)
-
-      // If the loop label appears in the mapping, it means it contains some continue that wants to break
-      // from the inner label. We create a block wrapping the body, labeled with the inner label.
-      val possiblyWrappedBody = loopLabelToInnerLabel.get(labelDecl) match {
-        case Some(innerLabelDecl) =>
-          implicit val o: Origin = innerLabelDecl.o
-          Label(innerLabelDecl, rewrittenBody)
-        case None => rewrittenBody
-      }
-
-      Label(labelDecls.dispatch(labelDecl), loop.rewrite(body = possiblyWrappedBody))(stat.o)
-
-    case c@Continue(Some(Ref(labelDecl))) =>
-      // Reuse an already created inner label or create one
-      val innerLabelDecl = loopLabelToInnerLabel.getOrElseUpdate(
-        labelDecl,
-        new LabelDecl()(ContinueToBreakOrigin(labelDecl.o))
-      )
-      Break(Some(innerLabelDecl.ref))(c.o)
-
-    case other => rewriteDefault(other)
-  }
+  val loopLabelToInnerLabel =
+    new mutable.HashMap[LabelDecl[Pre], LabelDecl[Post]]()
+
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case Label(labelDecl, loop: Loop[Pre]) =>
+        val rewrittenBody = dispatch(loop.body)
+
+        // If the loop label appears in the mapping, it means it contains some continue that wants to break
+        // from the inner label. We create a block wrapping the body, labeled with the inner label.
+        val possiblyWrappedBody =
+          loopLabelToInnerLabel.get(labelDecl) match {
+            case Some(innerLabelDecl) =>
+              implicit val o: Origin = innerLabelDecl.o
+              Label(innerLabelDecl, rewrittenBody)
+            case None => rewrittenBody
+          }
+
+        Label(
+          labelDecls.dispatch(labelDecl),
+          loop.rewrite(body = possiblyWrappedBody),
+        )(stat.o)
+
+      case c @ Continue(Some(Ref(labelDecl))) =>
+        // Reuse an already created inner label or create one
+        val innerLabelDecl = loopLabelToInnerLabel.getOrElseUpdate(
+          labelDecl,
+          new LabelDecl()(ContinueToBreakOrigin(labelDecl.o)),
+        )
+        Break(Some(innerLabelDecl.ref))(c.o)
+
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/exc/EncodeBreakReturn.scala b/src/rewrite/vct/rewrite/exc/EncodeBreakReturn.scala
index 99feba88d9..66e1de14d1 100644
--- a/src/rewrite/vct/rewrite/exc/EncodeBreakReturn.scala
+++ b/src/rewrite/vct/rewrite/exc/EncodeBreakReturn.scala
@@ -16,40 +16,26 @@ import scala.reflect.ClassTag
 
 case object EncodeBreakReturn extends RewriterBuilder {
   override def key: String = "breakReturn"
-  override def desc: String = "Encode break and return with goto or with exceptions."
+  override def desc: String =
+    "Encode break and return with goto or with exceptions."
 
   private def PostLabeledStatementOrigin(label: LabelDecl[_]): Origin =
     label.o.where(prefix = "break", context = "label after")
 
   private def ReturnClass: Origin =
-    Origin(Seq(
-      PreferredName(Seq("return")),
-      LabelContext("return exception"),
-    ))
+    Origin(Seq(PreferredName(Seq("return")), LabelContext("return exception")))
 
   private def ReturnField: Origin =
-    Origin(Seq(
-      PreferredName(Seq("value")),
-      LabelContext("return exception"),
-    ))
+    Origin(Seq(PreferredName(Seq("value")), LabelContext("return exception")))
 
   private def ReturnTarget: Origin =
-    Origin(Seq(
-      PreferredName(Seq("end")),
-      LabelContext("method end"),
-    ))
+    Origin(Seq(PreferredName(Seq("end")), LabelContext("method end")))
 
   private def ReturnVariable: Origin =
-    Origin(Seq(
-      PreferredName(Seq("return")),
-      LabelContext("return value"),
-    ))
+    Origin(Seq(PreferredName(Seq("return")), LabelContext("return value")))
 
   private def BreakException: Origin =
-    Origin(Seq(
-      PreferredName(Seq("break")),
-      LabelContext("break exception"),
-    ))
+    Origin(Seq(PreferredName(Seq("break")), LabelContext("break exception")))
 }
 
 case class EncodeBreakReturn[Pre <: Generation]() extends Rewriter[Pre] {
@@ -70,11 +56,16 @@ case class EncodeBreakReturn[Pre <: Generation]() extends Rewriter[Pre] {
       case method: InstanceOperatorMethod[Pre] => true
     }
 
-  case class BreakReturnToGoto(returnTarget: Option[LabelDecl[Post]], resultVariable: Option[Local[Post]]) extends Rewriter[Pre] {
+  case class BreakReturnToGoto(
+      returnTarget: Option[LabelDecl[Post]],
+      resultVariable: Option[Local[Post]],
+  ) extends Rewriter[Pre] {
     val breakLabels: mutable.Set[LabelDecl[Pre]] = mutable.Set()
-    val postLabeledStatement: SuccessionMap[LabelDecl[Pre], LabelDecl[Post]] = SuccessionMap()
+    val postLabeledStatement: SuccessionMap[LabelDecl[Pre], LabelDecl[Post]] =
+      SuccessionMap()
 
-    override val allScopes: AllScopes[Pre, Post] = EncodeBreakReturn.this.allScopes
+    override val allScopes: AllScopes[Pre, Post] =
+      EncodeBreakReturn.this.allScopes
 
     override def dispatch(stat: Statement[Pre]): Statement[Post] = {
       implicit val o: Origin = stat.o
@@ -83,21 +74,22 @@ case class EncodeBreakReturn[Pre <: Generation]() extends Rewriter[Pre] {
           val newBody = dispatch(stat)
 
           if (breakLabels.contains(decl)) {
-            postLabeledStatement(decl) = new LabelDecl()(PostLabeledStatementOrigin(decl))
+            postLabeledStatement(decl) =
+              new LabelDecl()(PostLabeledStatementOrigin(decl))
             Block(Seq(
               Label(labelDecls.dispatch(decl), Block(Nil)),
               newBody,
               Label(postLabeledStatement(decl), Block(Nil)),
             ))
           } else {
-            Block(Seq(
-              Label(labelDecls.dispatch(decl), Block(Nil)),
-              newBody,
-            ))
+            Block(Seq(Label(labelDecls.dispatch(decl), Block(Nil)), newBody))
           }
 
         case Break(None) =>
-          throw ExcludedByPassOrder("Break statements without a label are made explicit by SpecifyImplicitLabels", Some(stat))
+          throw ExcludedByPassOrder(
+            "Break statements without a label are made explicit by SpecifyImplicitLabels",
+            Some(stat),
+          )
 
         case Break(Some(Ref(label))) =>
           breakLabels += label
@@ -114,10 +106,15 @@ case class EncodeBreakReturn[Pre <: Generation]() extends Rewriter[Pre] {
     }
   }
 
-  case class BreakReturnToException(returnClass: Option[Class[Post]], valueField: Option[InstanceField[Post]]) extends Rewriter[Pre] {
-    val breakLabelException: SuccessionMap[LabelDecl[Pre], Class[Post]] = SuccessionMap()
+  case class BreakReturnToException(
+      returnClass: Option[Class[Post]],
+      valueField: Option[InstanceField[Post]],
+  ) extends Rewriter[Pre] {
+    val breakLabelException: SuccessionMap[LabelDecl[Pre], Class[Post]] =
+      SuccessionMap()
 
-    override val allScopes: AllScopes[Pre, Post] = EncodeBreakReturn.this.allScopes
+    override val allScopes: AllScopes[Pre, Post] =
+      EncodeBreakReturn.this.allScopes
 
     override def dispatch(stat: Statement[Pre]): Statement[Post] = {
       implicit val o: Origin = stat.o
@@ -125,89 +122,129 @@ case class EncodeBreakReturn[Pre <: Generation]() extends Rewriter[Pre] {
         case Label(decl, stat) =>
           val newBody = dispatch(stat)
 
-          if(breakLabelException.contains(decl)) {
+          if (breakLabelException.contains(decl)) {
             TryCatchFinally(
-              body = Block(Seq(Label(labelDecls.dispatch(decl), Block(Nil)), newBody)),
+              body = Block(
+                Seq(Label(labelDecls.dispatch(decl), Block(Nil)), newBody)
+              ),
               after = Block(Nil),
               catches = Seq(CatchClause(
-                decl = new Variable(TClass(breakLabelException.ref(decl), Seq())),
+                decl =
+                  new Variable(TClass(breakLabelException.ref(decl), Seq())),
                 body = Block(Nil),
               )),
             )
           } else {
-            Block(Seq(
-              Label(labelDecls.dispatch(decl), Block(Nil)),
-              newBody,
-            ))
+            Block(Seq(Label(labelDecls.dispatch(decl), Block(Nil)), newBody))
           }
 
         case Break(None) =>
-          throw ExcludedByPassOrder("Break statements without a label are made explicit by SpecifyImplicitLabels", Some(stat))
+          throw ExcludedByPassOrder(
+            "Break statements without a label are made explicit by SpecifyImplicitLabels",
+            Some(stat),
+          )
 
         case Break(Some(Ref(label))) =>
-          val cls = breakLabelException.getOrElseUpdate(label,
-            globalDeclarations.declare(new Class[Post](Nil, Nil, Nil, tt)(BreakException)))
-
-          Throw(NewObject[Post](cls.ref))(PanicBlame("The result of NewObject is never null"))
+          val cls = breakLabelException.getOrElseUpdate(
+            label,
+            globalDeclarations
+              .declare(new Class[Post](Nil, Nil, Nil, tt)(BreakException)),
+          )
+
+          Throw(NewObject[Post](cls.ref))(PanicBlame(
+            "The result of NewObject is never null"
+          ))
 
         case Return(result) =>
           val exc = new Variable[Post](TClass(returnClass.get.ref, Seq()))
-          Scope(Seq(exc), Block(Seq(
-            assignLocal(exc.get, NewObject(returnClass.get.ref)),
-            assignField(exc.get, valueField.get.ref, dispatch(result), PanicBlame("Have write permission immediately after NewObject")),
-            Throw(exc.get)(PanicBlame("The result of NewObject is never null")),
-          )))
+          Scope(
+            Seq(exc),
+            Block(Seq(
+              assignLocal(exc.get, NewObject(returnClass.get.ref)),
+              assignField(
+                exc.get,
+                valueField.get.ref,
+                dispatch(result),
+                PanicBlame("Have write permission immediately after NewObject"),
+              ),
+              Throw(exc.get)(PanicBlame(
+                "The result of NewObject is never null"
+              )),
+            )),
+          )
 
         case other => rewriteDefault(other)
       }
     }
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case method: AbstractMethod[Pre] =>
-      method.body match {
-        case None => rewriteDefault(method)
-        case Some(body) =>
-          allScopes.anyDeclare(allScopes.anySucceedOnly(method, method.rewrite(body = Some({
-            if (needBreakReturnExceptions(body)) {
-              implicit val o: Origin = body.o
-
-              if(needReturn(method)) {
-                val returnField = new InstanceField[Post](dispatch(method.returnType), Nil)(ReturnField)
-                val returnClass = new Class[Post](Nil, Seq(returnField), Nil, tt)(ReturnClass)
-                globalDeclarations.declare(returnClass)
-
-                val caughtReturn = new Variable[Post](TClass(returnClass.ref, Seq()))
-
-                TryCatchFinally(
-                  body = BreakReturnToException(Some(returnClass), Some(returnField)).dispatch(body),
-                  catches = Seq(CatchClause(caughtReturn,
-                    Return(Deref[Post](caughtReturn.get, returnField.ref)(PanicBlame("Permission for the field of a return exception cannot be non-write, as the class is only instantiated at a return site, and caught immediately.")))
-                  )),
-                  after = Block(Nil)
-                )
-              } else {
-                BreakReturnToException(None, None).dispatch(body)
-              }
-            } else {
-              implicit val o: Origin = body.o
-
-              if(needReturn(method)) {
-                val resultTarget = new LabelDecl[Post]()(ReturnTarget)
-                val resultVar = new Variable(dispatch(method.returnType))(ReturnVariable)
-                val newBody = BreakReturnToGoto(Some(resultTarget), Some(resultVar.get(ReturnVariable))).dispatch(body)
-
-                Scope(Seq(resultVar), Block(Seq(
-                  newBody,
-                  Label(resultTarget, Block(Nil)),
-                  Return(resultVar.get),
-                )))
-              } else {
-                BreakReturnToGoto(None, None).dispatch(body)
-              }
-            }
-          }))))
-      }
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case method: AbstractMethod[Pre] =>
+        method.body match {
+          case None => rewriteDefault(method)
+          case Some(body) =>
+            allScopes.anyDeclare(allScopes.anySucceedOnly(
+              method,
+              method.rewrite(body = Some({
+                if (needBreakReturnExceptions(body)) {
+                  implicit val o: Origin = body.o
+
+                  if (needReturn(method)) {
+                    val returnField =
+                      new InstanceField[Post](dispatch(method.returnType), Nil)(
+                        ReturnField
+                      )
+                    val returnClass =
+                      new Class[Post](Nil, Seq(returnField), Nil, tt)(
+                        ReturnClass
+                      )
+                    globalDeclarations.declare(returnClass)
+
+                    val caughtReturn =
+                      new Variable[Post](TClass(returnClass.ref, Seq()))
+
+                    TryCatchFinally(
+                      body = BreakReturnToException(
+                        Some(returnClass),
+                        Some(returnField),
+                      ).dispatch(body),
+                      catches = Seq(CatchClause(
+                        caughtReturn,
+                        Return(Deref[Post](caughtReturn.get, returnField.ref)(
+                          PanicBlame(
+                            "Permission for the field of a return exception cannot be non-write, as the class is only instantiated at a return site, and caught immediately."
+                          )
+                        )),
+                      )),
+                      after = Block(Nil),
+                    )
+                  } else { BreakReturnToException(None, None).dispatch(body) }
+                } else {
+                  implicit val o: Origin = body.o
+
+                  if (needReturn(method)) {
+                    val resultTarget = new LabelDecl[Post]()(ReturnTarget)
+                    val resultVar =
+                      new Variable(dispatch(method.returnType))(ReturnVariable)
+                    val newBody = BreakReturnToGoto(
+                      Some(resultTarget),
+                      Some(resultVar.get(ReturnVariable)),
+                    ).dispatch(body)
+
+                    Scope(
+                      Seq(resultVar),
+                      Block(Seq(
+                        newBody,
+                        Label(resultTarget, Block(Nil)),
+                        Return(resultVar.get),
+                      )),
+                    )
+                  } else { BreakReturnToGoto(None, None).dispatch(body) }
+                }
+              })),
+            ))
+        }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/exc/EncodeTryThrowSignals.scala b/src/rewrite/vct/rewrite/exc/EncodeTryThrowSignals.scala
index 3e243cbfb2..94a90df480 100644
--- a/src/rewrite/vct/rewrite/exc/EncodeTryThrowSignals.scala
+++ b/src/rewrite/vct/rewrite/exc/EncodeTryThrowSignals.scala
@@ -15,70 +15,56 @@ import scala.collection.mutable
 case object EncodeTryThrowSignals extends RewriterBuilder {
   override def key: String = "tryThrowSignals"
 
-  override def desc: String = "Encode try, throw and signals specifications to goto, exception out-parameters and regular postconditions."
+  override def desc: String =
+    "Encode try, throw and signals specifications to goto, exception out-parameters and regular postconditions."
 
   case class ThrowNullAssertFailed(t: Throw[_]) extends Blame[AssertFailed] {
-    override def blame(error: AssertFailed): Unit =
-      t.blame.blame(ThrowNull(t))
+    override def blame(error: AssertFailed): Unit = t.blame.blame(ThrowNull(t))
   }
 
-  case class PackageThrowsAssertFailed(pack: WandPackage[_]) extends Blame[AssertFailed] {
-    override def blame(error: AssertFailed): Unit = pack.blame.blame(PackageThrows(pack))
+  case class PackageThrowsAssertFailed(pack: WandPackage[_])
+      extends Blame[AssertFailed] {
+    override def blame(error: AssertFailed): Unit =
+      pack.blame.blame(PackageThrows(pack))
   }
 
-  private def ExcVar: Origin = Origin(
-    Seq(
-      PreferredName(Seq("exc")),
-      LabelContext("current exception"),
-    )
-  )
+  private def ExcVar: Origin =
+    Origin(Seq(PreferredName(Seq("exc")), LabelContext("current exception")))
 
-  private def CurrentlyHandling: Origin = Origin(
-    Seq(
+  private def CurrentlyHandling: Origin =
+    Origin(Seq(
       PreferredName(Seq("currently_handling_exc")),
       LabelContext("handling exception"),
-    )
-  )
+    ))
 
-  private def ReturnPoint: Origin = Origin(
-    Seq(
-      PreferredName(Seq("bubble")),
-      LabelContext("bubble label"),
-    )
-  )
+  private def ReturnPoint: Origin =
+    Origin(Seq(PreferredName(Seq("bubble")), LabelContext("bubble label")))
 
-  private def CatchLabel: Origin = Origin(
-    Seq(
-      PreferredName(Seq("catches")),
-      LabelContext("catch label"),
-    )
-  )
+  private def CatchLabel: Origin =
+    Origin(Seq(PreferredName(Seq("catches")), LabelContext("catch label")))
 
-  private def FinallyLabel: Origin = Origin(
-    Seq(
-      PreferredName(Seq("finally")),
-      LabelContext("finally label"),
-    )
-  )
+  private def FinallyLabel: Origin =
+    Origin(Seq(PreferredName(Seq("finally")), LabelContext("finally label")))
 
-  private def ExcBeforeLoop: Origin = Origin(
-    Seq(
-      PreferredName(Seq("excBeforeLoop")),
-      LabelContext("loop exception"),
+  private def ExcBeforeLoop: Origin =
+    Origin(
+      Seq(PreferredName(Seq("excBeforeLoop")), LabelContext("loop exception"))
     )
-  )
 
-  case class SignalsClosedPostconditionFailed(method: AbstractMethod[_]) extends Blame[PostconditionFailed] {
+  case class SignalsClosedPostconditionFailed(method: AbstractMethod[_])
+      extends Blame[PostconditionFailed] {
     override def blame(error: PostconditionFailed): Unit =
       method.blame.blame(ExceptionNotInSignals(method))
   }
 
-  case class AssertFailedSignalsNotClosed(method: AbstractMethod[_]) extends Blame[AssertFailed] {
+  case class AssertFailedSignalsNotClosed(method: AbstractMethod[_])
+      extends Blame[AssertFailed] {
     override def blame(error: AssertFailed): Unit =
       method.blame.blame(ExceptionNotInSignals(method))
   }
 
-  case class SignalsFailedPostconditionFailed(method: AbstractMethod[_]) extends Blame[PostconditionFailed] {
+  case class SignalsFailedPostconditionFailed(method: AbstractMethod[_])
+      extends Blame[PostconditionFailed] {
     override def blame(error: PostconditionFailed): Unit =
       method.blame.blame(SignalsFailed(error.failure, method))
   }
@@ -92,15 +78,13 @@ case class EncodeTryThrowSignals[Pre <: Generation]() extends Rewriter[Pre] {
   val exceptionalHandlerEntry: ScopedStack[LabelDecl[Post]] = ScopedStack()
   val returnHandler: ScopedStack[LabelDecl[Post]] = ScopedStack()
 
-
   val needCurrentExceptionRestoration: ScopedStack[Boolean] = ScopedStack()
   needCurrentExceptionRestoration.push(false)
 
   val signalsBinding: ScopedStack[(Variable[Pre], Expr[Post])] = ScopedStack()
   val catchBindings: mutable.Set[Variable[Pre]] = mutable.Set()
 
-  def getExc(implicit o: Origin): Local[Post] =
-    currentException.top.get
+  def getExc(implicit o: Origin): Local[Post] = currentException.top.get
 
   override def dispatch(stat: Statement[Pre]): Statement[Post] = {
     implicit val o: Origin = stat.o
@@ -109,62 +93,73 @@ case class EncodeTryThrowSignals[Pre <: Generation]() extends Rewriter[Pre] {
         val handlersEntry = new LabelDecl[Post]()(CatchLabel)
         val finallyEntry = new LabelDecl[Post]()(FinallyLabel)
 
-        val newBody = exceptionalHandlerEntry.having(handlersEntry) {
-          needCurrentExceptionRestoration.having(false) {
-            dispatch(body)
+        val newBody =
+          exceptionalHandlerEntry.having(handlersEntry) {
+            needCurrentExceptionRestoration.having(false) { dispatch(body) }
           }
-        }
 
         val catchImpl = Block[Post](catches.map {
           case CatchClause(decl, body) =>
             val typedExc = variables.dispatch(decl)
-            Scope(Seq(typedExc), Branch(Seq((
-              (getExc !== Null[Post]()) && InstanceOf(getExc, TypeValue(dispatch(decl.t))),
-              Block(Seq(
-                assignLocal(typedExc.get, Cast(getExc, TypeValue(dispatch(decl.t)))),
-                assignLocal(getExc, Null()),
-                exceptionalHandlerEntry.having(finallyEntry) {
-                  needCurrentExceptionRestoration.having(true) {
-                    dispatch(body)
-                  }
-                },
-              ),
-              )))))
+            Scope(
+              Seq(typedExc),
+              Branch(Seq((
+                (getExc !== Null[Post]()) &&
+                  InstanceOf(getExc, TypeValue(dispatch(decl.t))),
+                Block(Seq(
+                  assignLocal(
+                    typedExc.get,
+                    Cast(getExc, TypeValue(dispatch(decl.t))),
+                  ),
+                  assignLocal(getExc, Null()),
+                  exceptionalHandlerEntry.having(finallyEntry) {
+                    needCurrentExceptionRestoration.having(true) {
+                      dispatch(body)
+                    }
+                  },
+                )),
+              ))),
+            )
         })
 
         val finallyImpl = Block[Post](Seq(
           Label(finallyEntry, Block(Nil)),
-          needCurrentExceptionRestoration.having(true) {
-            dispatch(after)
-          },
-          Branch(Seq((
-            getExc !== Null(),
-            Goto(exceptionalHandlerEntry.top.ref),
-          ))),
+          needCurrentExceptionRestoration.having(true) { dispatch(after) },
+          Branch(
+            Seq((getExc !== Null(), Goto(exceptionalHandlerEntry.top.ref)))
+          ),
         ))
 
-        val (store: Statement[Post], restore: Statement[Post], vars: Seq[Variable[Post]]) = if (needCurrentExceptionRestoration.top) {
-          val tmp = new Variable[Post](TAnyClass())(CurrentlyHandling)
-          (
-            Block[Post](Seq(
-              assignLocal(tmp.get, getExc),
-              assignLocal(getExc, Null()),
-            )),
-            assignLocal[Post](getExc, tmp.get),
-            Seq(tmp),
-          )
-        } else (Block[Post](Nil), Block[Post](Nil), Nil)
-
-        Scope(vars, Block(Seq(
-          store,
-          newBody,
-          Label(handlersEntry, Block(Nil)),
-          catchImpl,
-          finallyImpl,
-          restore,
-        )))
-
-      case t@Throw(obj) =>
+        val (
+          store: Statement[Post],
+          restore: Statement[Post],
+          vars: Seq[Variable[Post]],
+        ) =
+          if (needCurrentExceptionRestoration.top) {
+            val tmp = new Variable[Post](TAnyClass())(CurrentlyHandling)
+            (
+              Block[Post](
+                Seq(assignLocal(tmp.get, getExc), assignLocal(getExc, Null()))
+              ),
+              assignLocal[Post](getExc, tmp.get),
+              Seq(tmp),
+            )
+          } else
+            (Block[Post](Nil), Block[Post](Nil), Nil)
+
+        Scope(
+          vars,
+          Block(Seq(
+            store,
+            newBody,
+            Label(handlersEntry, Block(Nil)),
+            catchImpl,
+            finallyImpl,
+            restore,
+          )),
+        )
+
+      case t @ Throw(obj) =>
         Block(Seq(
           assignLocal(getExc, dispatch(obj)),
           Assert(getExc !== Null())(ThrowNullAssertFailed(t)),
@@ -176,11 +171,12 @@ case class EncodeTryThrowSignals[Pre <: Generation]() extends Rewriter[Pre] {
 
       case inv: InvokeProcedure[Pre] =>
         Block(Seq(
-          inv.rewrite(outArgs = currentException.top.get +: inv.outArgs.map(dispatch)),
-          Branch(Seq((
-            getExc !== Null(),
-            Goto(exceptionalHandlerEntry.top.ref),
-          ))),
+          inv.rewrite(outArgs =
+            currentException.top.get +: inv.outArgs.map(dispatch)
+          ),
+          Branch(
+            Seq((getExc !== Null(), Goto(exceptionalHandlerEntry.top.ref)))
+          ),
         ))
 
       case inv: InvokeMethod[Pre] if inv.ref.decl.contract.signals.isEmpty =>
@@ -188,42 +184,54 @@ case class EncodeTryThrowSignals[Pre <: Generation]() extends Rewriter[Pre] {
 
       case inv: InvokeMethod[Pre] =>
         Block(Seq(
-          inv.rewrite(outArgs = currentException.top.get +: inv.outArgs.map(dispatch)),
-          Branch(Seq((
-            getExc !== Null(),
-            Goto(exceptionalHandlerEntry.top.ref),
-          ))),
+          inv.rewrite(outArgs =
+            currentException.top.get +: inv.outArgs.map(dispatch)
+          ),
+          Branch(
+            Seq((getExc !== Null(), Goto(exceptionalHandlerEntry.top.ref)))
+          ),
         ))
 
       case loop: Loop[Pre] =>
         val beforeLoop = new Variable[Post](TAnyClass())(ExcBeforeLoop)
 
-        Scope(Seq(beforeLoop), Block[Post](Seq(
-          assignLocal(beforeLoop.get, getExc),
-          loop.rewrite(contract = loop.contract match {
-            case inv@LoopInvariant(invariant, decreases) =>
-              LoopInvariant(getExc === beforeLoop.get &* dispatch(invariant), decreases.map(dispatch))(inv.blame)
-            case it: IterationContract[Pre] => rewriteDefault(it)
-          })
-        )))
+        Scope(
+          Seq(beforeLoop),
+          Block[Post](Seq(
+            assignLocal(beforeLoop.get, getExc),
+            loop.rewrite(contract =
+              loop.contract match {
+                case inv @ LoopInvariant(invariant, decreases) =>
+                  LoopInvariant(
+                    getExc === beforeLoop.get &* dispatch(invariant),
+                    decreases.map(dispatch),
+                  )(inv.blame)
+                case it: IterationContract[Pre] => rewriteDefault(it)
+              }
+            ),
+          )),
+        )
 
-      case w@WandPackage(wand, proof) =>
+      case w @ WandPackage(wand, proof) =>
         val exc = new Variable[Post](TAnyClass())(ExcVar)
         val labelHandler = new LabelDecl[Post]()
         val labelDone = new LabelDecl[Post]()
         exceptionalHandlerEntry.having(labelHandler) {
           currentException.having(exc) {
-            WandPackage(dispatch(wand),
-              Scope(Seq(exc),
-                Block(
-                  Seq(
-                    dispatch(proof),
-                    Goto[Post](labelDone.ref),
-                    Label(labelHandler, Block(Nil)),
-                    Assert[Post](BooleanValue(false))(PackageThrowsAssertFailed(w)),
-                    Label(labelDone, Block(Nil)),
-                  ))
-              )
+            WandPackage(
+              dispatch(wand),
+              Scope(
+                Seq(exc),
+                Block(Seq(
+                  dispatch(proof),
+                  Goto[Post](labelDone.ref),
+                  Label(labelHandler, Block(Nil)),
+                  Assert[Post](BooleanValue(false))(PackageThrowsAssertFailed(
+                    w
+                  )),
+                  Label(labelDone, Block(Nil)),
+                )),
+              ),
             )(w.blame)
           }
         }
@@ -232,100 +240,128 @@ case class EncodeTryThrowSignals[Pre <: Generation]() extends Rewriter[Pre] {
     }
   }
 
-  def inlineExtraCondition(condition: Expr[Post], clause: AccountedPredicate[Pre]): AccountedPredicate[Post] = clause match {
-    case UnitAccountedPredicate(pred) =>
-      UnitAccountedPredicate[Post](mapUnfoldedStar(pred, (e: Expr[Pre]) => Implies(condition, dispatch(e))(e.o)))(clause.o)
-    case SplitAccountedPredicate(left, right) =>
-      SplitAccountedPredicate[Post](inlineExtraCondition(condition, left), inlineExtraCondition(condition, right))(clause.o)
-  }
+  def inlineExtraCondition(
+      condition: Expr[Post],
+      clause: AccountedPredicate[Pre],
+  ): AccountedPredicate[Post] =
+    clause match {
+      case UnitAccountedPredicate(pred) =>
+        UnitAccountedPredicate[Post](mapUnfoldedStar(
+          pred,
+          (e: Expr[Pre]) => Implies(condition, dispatch(e))(e.o),
+        ))(clause.o)
+      case SplitAccountedPredicate(left, right) =>
+        SplitAccountedPredicate[Post](
+          inlineExtraCondition(condition, left),
+          inlineExtraCondition(condition, right),
+        )(clause.o)
+    }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case method: AbstractMethod[Pre] if method.contract.signals.isEmpty =>
-      implicit val o: Origin = method.o
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case method: AbstractMethod[Pre] if method.contract.signals.isEmpty =>
+        implicit val o: Origin = method.o
 
-      val exc = new Variable[Post](TAnyClass())(ExcVar)
+        val exc = new Variable[Post](TAnyClass())(ExcVar)
 
-      currentException.having(exc) {
-        lazy val body = method.body.map(body => {
-          val bubble = new LabelDecl[Post]()(ReturnPoint)
+        currentException.having(exc) {
+          lazy val body = method.body.map(body => {
+            val bubble = new LabelDecl[Post]()(ReturnPoint)
 
-          Scope(Seq(exc), Block(Seq(
-            assignLocal(exc.get, Null()),
-            exceptionalHandlerEntry.having(bubble) {
-              currentException.having(exc) {
-                dispatch(body)
-              }
-            },
-            Label(bubble, Block(Nil)),
-            Assert(exc.get === Null())(AssertFailedSignalsNotClosed(method))
-          )))
-        })
-
-        allScopes.anyDeclare(allScopes.anySucceedOnly(method, method.rewrite(
-          body = body,
-        )))
-      }
+            Scope(
+              Seq(exc),
+              Block(Seq(
+                assignLocal(exc.get, Null()),
+                exceptionalHandlerEntry.having(bubble) {
+                  currentException.having(exc) { dispatch(body) }
+                },
+                Label(bubble, Block(Nil)),
+                Assert(exc.get === Null())(AssertFailedSignalsNotClosed(method)),
+              )),
+            )
+          })
 
-    case method: AbstractMethod[Pre] =>
-      implicit val o: Origin = method.o
+          allScopes.anyDeclare(
+            allScopes.anySucceedOnly(method, method.rewrite(body = body))
+          )
+        }
 
-      val exc = new Variable[Post](TAnyClass())(ExcVar)
+      case method: AbstractMethod[Pre] =>
+        implicit val o: Origin = method.o
 
-      currentException.having(exc) {
-        lazy val body = method.body.map(body => {
-          val bubble = new LabelDecl[Post]()(ReturnPoint)
+        val exc = new Variable[Post](TAnyClass())(ExcVar)
 
-          Block(Seq(
-            assignLocal(exc.get, Null()),
-            exceptionalHandlerEntry.having(bubble) {
-              currentException.having(exc) {
-                dispatch(body)
-              }
-            },
-            Label(bubble, Block(Nil)),
-          ))
-        })
+        currentException.having(exc) {
+          lazy val body = method.body.map(body => {
+            val bubble = new LabelDecl[Post]()(ReturnPoint)
+
+            Block(Seq(
+              assignLocal(exc.get, Null()),
+              exceptionalHandlerEntry.having(bubble) {
+                currentException.having(exc) { dispatch(body) }
+              },
+              Label(bubble, Block(Nil)),
+            ))
+          })
 
-        lazy val ensures: AccountedPredicate[Post] = SplitAccountedPredicate(
-          left = UnitAccountedPredicate((exc.get !== Null()) ==> foldOr(method.contract.signals.map {
-            case SignalsClause(binding, _) => InstanceOf(exc.get, TypeValue(dispatch(binding.t)))
-          })),
-          right = SplitAccountedPredicate(
-            left = inlineExtraCondition(exc.get === Null(), method.contract.ensures),
-            right = UnitAccountedPredicate(AstBuildHelpers.foldStar(method.contract.signals.map {
-              case SignalsClause(binding, assn) =>
-                implicit val o: Origin = assn.o
-                binding.drop()
-                ((exc.get !== Null()) && InstanceOf(exc.get, TypeValue(dispatch(binding.t)))) ==>
-                  signalsBinding.having((binding, exc.get)) {
-                    dispatch(assn)
-                  }
-            })),
-          ),
-        )
+          lazy val ensures: AccountedPredicate[Post] = SplitAccountedPredicate(
+            left = UnitAccountedPredicate(
+              (exc.get !== Null()) ==> foldOr(method.contract.signals.map {
+                case SignalsClause(binding, _) =>
+                  InstanceOf(exc.get, TypeValue(dispatch(binding.t)))
+              })
+            ),
+            right = SplitAccountedPredicate(
+              left = inlineExtraCondition(
+                exc.get === Null(),
+                method.contract.ensures,
+              ),
+              right = UnitAccountedPredicate(
+                AstBuildHelpers.foldStar(method.contract.signals.map {
+                  case SignalsClause(binding, assn) =>
+                    implicit val o: Origin = assn.o
+                    binding.drop()
+                    ((exc.get !== Null()) &&
+                      InstanceOf(exc.get, TypeValue(dispatch(binding.t)))) ==>
+                      signalsBinding.having((binding, exc.get)) {
+                        dispatch(assn)
+                      }
+                })
+              ),
+            ),
+          )
 
-        allScopes.anyDeclare(allScopes.anySucceedOnly(method, method.rewrite(
-          blame = PostBlameSplit.left(
-            left = SignalsClosedPostconditionFailed(method),
-            right = PostBlameSplit.right(
-              left = method.blame,
-              right = SignalsFailedPostconditionFailed(method),
+          allScopes.anyDeclare(allScopes.anySucceedOnly(
+            method,
+            method.rewrite(
+              blame = PostBlameSplit.left(
+                left = SignalsClosedPostconditionFailed(method),
+                right = PostBlameSplit.right(
+                  left = method.blame,
+                  right = SignalsFailedPostconditionFailed(method),
+                ),
+              ),
+              body = body,
+              outArgs =
+                variables.collect {
+                  variables.declare(exc); method.outArgs.foreach(dispatch)
+                }._1,
+              contract = method.contract
+                .rewrite(ensures = ensures, signals = Nil),
             ),
-          ),
-          body = body,
-          outArgs = variables.collect { variables.declare(exc); method.outArgs.foreach(dispatch) }._1,
-          contract = method.contract.rewrite(ensures = ensures, signals = Nil),
-        )))
-      }
+          ))
+        }
 
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case Local(Ref(v)) if signalsBinding.nonEmpty && signalsBinding.top._1 == v =>
-      implicit val o: Origin = e.o
-      signalsBinding.top._2
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case Local(Ref(v))
+          if signalsBinding.nonEmpty && signalsBinding.top._1 == v =>
+        implicit val o: Origin = e.o
+        signalsBinding.top._2
 
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/exc/SpecifyImplicitLabels.scala b/src/rewrite/vct/rewrite/exc/SpecifyImplicitLabels.scala
index e2833a5f91..d604f0e8c9 100644
--- a/src/rewrite/vct/rewrite/exc/SpecifyImplicitLabels.scala
+++ b/src/rewrite/vct/rewrite/exc/SpecifyImplicitLabels.scala
@@ -6,10 +6,10 @@ import vct.col.ast._
 import vct.col.origin.Origin
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 
-
 case object SpecifyImplicitLabels extends RewriterBuilder {
   override def key: String = "implicitLabels"
-  override def desc: String = "Give loops and switches a label if it needs one for a break or continue statement."
+  override def desc: String =
+    "Give loops and switches a label if it needs one for a break or continue statement."
 }
 
 case class SpecifyImplicitLabels[Pre <: Generation]() extends Rewriter[Pre] {
@@ -17,31 +17,27 @@ case class SpecifyImplicitLabels[Pre <: Generation]() extends Rewriter[Pre] {
 
   val labelStack = new ScopedStack[LabelDecl[Post]]()
 
-  def isBreakable(s: Statement[_]): Boolean = s match {
-    case _: Loop[_] => true
-    case _: Switch[_] => true
-    case _ => false
-  }
-
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case Label(decl, impl) if isBreakable(impl) =>
-      val newLabel = decl.rewrite()
-      labelDecls.succeedOnly(decl, newLabel)
-      val newImpl = labelStack.having(newLabel) {
-        rewriteDefault(impl)
-      }
-      Label(newLabel, newImpl)(stat.o)
-    case stat if isBreakable(stat) =>
-      implicit val o: Origin = stat.o
-      val labelDecl = new LabelDecl[Post]()(ImplicitLabelOrigin(o))
-      labelStack.having(labelDecl) {
-        Label(labelDecl, rewriteDefault(stat))
-      }
-    case c@Continue(None) =>
-      c.rewrite(Some(labelStack.top.ref))
-    case b@Break(None) =>
-      b.rewrite(Some(labelStack.top.ref))
-
-    case other => rewriteDefault(other)
-  }
+  def isBreakable(s: Statement[_]): Boolean =
+    s match {
+      case _: Loop[_] => true
+      case _: Switch[_] => true
+      case _ => false
+    }
+
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case Label(decl, impl) if isBreakable(impl) =>
+        val newLabel = decl.rewrite()
+        labelDecls.succeedOnly(decl, newLabel)
+        val newImpl = labelStack.having(newLabel) { rewriteDefault(impl) }
+        Label(newLabel, newImpl)(stat.o)
+      case stat if isBreakable(stat) =>
+        implicit val o: Origin = stat.o
+        val labelDecl = new LabelDecl[Post]()(ImplicitLabelOrigin(o))
+        labelStack.having(labelDecl) { Label(labelDecl, rewriteDefault(stat)) }
+      case c @ Continue(None) => c.rewrite(Some(labelStack.top.ref))
+      case b @ Break(None) => b.rewrite(Some(labelStack.top.ref))
+
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/exc/SwitchToGoto.scala b/src/rewrite/vct/rewrite/exc/SwitchToGoto.scala
index 6f46692adc..136a8ce9ad 100644
--- a/src/rewrite/vct/rewrite/exc/SwitchToGoto.scala
+++ b/src/rewrite/vct/rewrite/exc/SwitchToGoto.scala
@@ -23,52 +23,56 @@ case object SwitchToGoto extends RewriterBuilder {
 }
 
 case class SwitchToGoto[Pre <: Generation]() extends Rewriter[Pre] {
-  val currentCases: ScopedStack[ArrayBuffer[(SwitchCase[Pre], LabelDecl[Post])]] = ScopedStack()
+  val currentCases
+      : ScopedStack[ArrayBuffer[(SwitchCase[Pre], LabelDecl[Post])]] =
+    ScopedStack()
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case Switch(expr, body) =>
-      implicit val o: Origin = stat.o
-      val collectedCases = ArrayBuffer[(SwitchCase[Pre], LabelDecl[Post])]()
-      val rewrittenBody = currentCases.having(collectedCases) {
-        dispatch(body)
-      }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case Switch(expr, body) =>
+        implicit val o: Origin = stat.o
+        val collectedCases = ArrayBuffer[(SwitchCase[Pre], LabelDecl[Post])]()
+        val rewrittenBody =
+          currentCases.having(collectedCases) { dispatch(body) }
 
-      val switchValueVariable = new Variable[Post](dispatch(expr.t))
-      val switchValue = switchValueVariable.get
+        val switchValueVariable = new Variable[Post](dispatch(expr.t))
+        val switchValue = switchValueVariable.get
 
-      val normalCaseIfs = Block(collectedCases.collect {
-        case (c: Case[Pre], label) =>
-          Branch(Seq((
-            switchValue === dispatch(c.pattern),
-            Goto[Post](label.ref),
-          )))
-      }.toSeq)
+        val normalCaseIfs = Block(
+          collectedCases.collect { case (c: Case[Pre], label) =>
+            Branch(
+              Seq((switchValue === dispatch(c.pattern), Goto[Post](label.ref)))
+            )
+          }.toSeq
+        )
 
-      val (newBody, defaultLabel) = collectedCases.collectFirst {
-        case (c: DefaultCase[Pre], label) =>
-          (rewrittenBody, label)
-      }.getOrElse {
-        val pastSwitch = new LabelDecl[Post]()
-        (Block(Seq(rewrittenBody, Label(pastSwitch, Block(Nil)))), pastSwitch)
-      }
+        val (newBody, defaultLabel) = collectedCases.collectFirst {
+          case (c: DefaultCase[Pre], label) => (rewrittenBody, label)
+        }.getOrElse {
+          val pastSwitch = new LabelDecl[Post]()
+          (Block(Seq(rewrittenBody, Label(pastSwitch, Block(Nil)))), pastSwitch)
+        }
 
-      Scope(Seq(switchValueVariable), Block(Seq(
-        assignLocal(switchValue, dispatch(expr)),
-        normalCaseIfs,
-        Goto(defaultLabel.ref),
-        newBody,
-      )))
+        Scope(
+          Seq(switchValueVariable),
+          Block(Seq(
+            assignLocal(switchValue, dispatch(expr)),
+            normalCaseIfs,
+            Goto(defaultLabel.ref),
+            newBody,
+          )),
+        )
 
-    case c: SwitchCase[Pre] =>
-      currentCases.topOption match {
-        case None => throw CaseOutsideSwitch(c)
-        case Some(buf) =>
-          implicit val o: Origin = c.o
-          val replacementLabel = new LabelDecl[Post]()
-          buf += ((c, replacementLabel))
-          Label(replacementLabel, Block(Nil))
-      }
+      case c: SwitchCase[Pre] =>
+        currentCases.topOption match {
+          case None => throw CaseOutsideSwitch(c)
+          case Some(buf) =>
+            implicit val o: Origin = c.o
+            val replacementLabel = new LabelDecl[Post]()
+            buf += ((c, replacementLabel))
+            Label(replacementLabel, Block(Nil))
+        }
 
-    case other => rewriteDefault(other)
-  }
-}
\ No newline at end of file
+      case other => rewriteDefault(other)
+    }
+}
diff --git a/src/rewrite/vct/rewrite/lang/LangBipToCol.scala b/src/rewrite/vct/rewrite/lang/LangBipToCol.scala
index 50ee449969..4989e195b6 100644
--- a/src/rewrite/vct/rewrite/lang/LangBipToCol.scala
+++ b/src/rewrite/vct/rewrite/lang/LangBipToCol.scala
@@ -4,9 +4,23 @@ import com.typesafe.scalalogging.LazyLogging
 import vct.col.ast._
 import vct.rewrite.lang.LangBipToCol._
 import vct.col.origin.{DiagnosticOrigin, Origin}
-import vct.col.origin.{BipComponentInvariantNotEstablished, BipConstructorFailure, BipStateInvariantNotEstablished, Blame, DiagnosticOrigin, NontrivialUnsatisfiable, Origin, PanicBlame}
+import vct.col.origin.{
+  BipComponentInvariantNotEstablished,
+  BipConstructorFailure,
+  BipStateInvariantNotEstablished,
+  Blame,
+  DiagnosticOrigin,
+  NontrivialUnsatisfiable,
+  Origin,
+  PanicBlame,
+}
 import vct.col.ref.Ref
-import vct.col.resolve.ctx.{ImplicitDefaultJavaBipStatePredicate, JavaBipStatePredicateTarget, RefJavaBipGuard, RefJavaBipStatePredicate}
+import vct.col.resolve.ctx.{
+  ImplicitDefaultJavaBipStatePredicate,
+  JavaBipStatePredicateTarget,
+  RefJavaBipGuard,
+  RefJavaBipStatePredicate,
+}
 import vct.col.resolve.lang.{JavaAnnotationData => jad}
 import vct.rewrite.lang.LangSpecificToCol
 import vct.col.rewrite.{Generation, Rewritten}
@@ -25,195 +39,308 @@ case object LangBipToCol {
 
   case class WrongTransitionReturnType(m: JavaMethod[_]) extends UserError {
     override def code: String = "bipWrongTransitionReturnType"
-    override def text: String = m.o.messageInContext(s"The return type of this update function should be void, instead of ${m.returnType}")
+    override def text: String =
+      m.o.messageInContext(
+        s"The return type of this update function should be void, instead of ${m.returnType}"
+      )
   }
 
   case class WrongGuardReturnType(m: JavaMethod[_]) extends UserError {
     override def code: String = "bipWrongGuardReturnType"
-    override def text: String = m.o.messageInContext(s"The return type of this guard should be boolean, instead of ${m.returnType}")
+    override def text: String =
+      m.o.messageInContext(
+        s"The return type of this guard should be boolean, instead of ${m.returnType}"
+      )
   }
 
   case class ImpureData(m: JavaMethod[_]) extends UserError {
     override def code: String = "bipImpureData"
-    override def text: String = m.o.messageInContext("This data method should be marked pure with `@Pure`")
+    override def text: String =
+      m.o
+        .messageInContext("This data method should be marked pure with `@Pure`")
   }
 
-  case class ImproperConstructor(c: JavaConstructor[_], msg: String) extends UserError {
+  case class ImproperConstructor(c: JavaConstructor[_], msg: String)
+      extends UserError {
     override def code: String = "bipImproperConstructor"
     override def text: String = c.o.messageInContext(msg)
   }
 
-  case class BipIncomingDataInconsistentType(data: BipData[_], param: JavaParam[_]) extends UserError {
+  case class BipIncomingDataInconsistentType(
+      data: BipData[_],
+      param: JavaParam[_],
+  ) extends UserError {
     override def code: String = "bipInconsistentDataType"
-    override def text: String = Message.messagesInContext(
-      (data.o, s"The data defined here..."),
-      (param.o, s"... is expected to have type ${param.t} by the usage here")
-    )
+    override def text: String =
+      Message.messagesInContext(
+        (data.o, s"The data defined here..."),
+        (param.o, s"... is expected to have type ${param.t} by the usage here"),
+      )
   }
 
-  private def BipPortOrigin(ns: JavaNamespace[_], cls: JavaClass[_], port: jad.BipPort[_]): Origin = {
+  private def BipPortOrigin(
+      ns: JavaNamespace[_],
+      cls: JavaClass[_],
+      port: jad.BipPort[_],
+  ): Origin = {
     port.o.where(name = {
-      val fqn = (ns.name.map (Seq (_) ).getOrElse (Seq () ) :+ cls.name).mkString (".")
+      val fqn = (ns.name.map(Seq(_)).getOrElse(Seq()) :+ cls.name).mkString(".")
       s"($fqn,${port.name})"
     })
   }
 
-  private def BipDataWireOrigin(cls0: JavaClass[_], port0: String, cls1: JavaClass[_], port1: String, o: Origin): Origin = {
+  private def BipDataWireOrigin(
+      cls0: JavaClass[_],
+      port0: String,
+      cls1: JavaClass[_],
+      port1: String,
+      o: Origin,
+  ): Origin = {
     o.where(name = s"(${cls0.name},$port0)->(${cls1.name},$port1)")
   }
 
-  private def BipDataOrigin(ns: JavaNamespace[_], cls: JavaClass[_], data: jad.BipData[_]): Origin = {
+  private def BipDataOrigin(
+      ns: JavaNamespace[_],
+      cls: JavaClass[_],
+      data: jad.BipData[_],
+  ): Origin = {
     data.o.where(name = {
       val fqn = (ns.name.map(Seq(_)).getOrElse(Seq()) :+ cls.name).mkString(".")
       s"($fqn,${data.name})"
     })
   }
 
-  private def BipConstructorOrigin(cls: JavaClassOrInterface[_], c: JavaConstructor[_]): Origin = {
-    c.o.where(prefix = "constructor")
-  }
-
-  case class UntangleBipConstructorFailure(constructor: JavaConstructor[_]) extends Blame[BipConstructorFailure] {
-    override def blame(error: BipConstructorFailure): Unit = error match {
-      case err: NontrivialUnsatisfiable => constructor.contract.blame.blame(err)
-      case err: BipComponentInvariantNotEstablished => constructor.blame.blame(err)
-      case err: BipStateInvariantNotEstablished => constructor.blame.blame(err)
-    }
+  private def BipConstructorOrigin(
+      cls: JavaClassOrInterface[_],
+      c: JavaConstructor[_],
+  ): Origin = { c.o.where(prefix = "constructor") }
+
+  case class UntangleBipConstructorFailure(constructor: JavaConstructor[_])
+      extends Blame[BipConstructorFailure] {
+    override def blame(error: BipConstructorFailure): Unit =
+      error match {
+        case err: NontrivialUnsatisfiable =>
+          constructor.contract.blame.blame(err)
+        case err: BipComponentInvariantNotEstablished =>
+          constructor.blame.blame(err)
+        case err: BipStateInvariantNotEstablished =>
+          constructor.blame.blame(err)
+      }
   }
 }
 
-case class LangBipToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends LazyLogging {
+case class LangBipToCol[Pre <: Generation](rw: LangSpecificToCol[Pre])
+    extends LazyLogging {
   type Post = Rewritten[Pre]
   implicit val implicitRewriter: AbstractRewriter[Pre, Post] = rw
 
-  val defaultStatePredicates: mutable.Map[String, BipStatePredicate[Post]] = mutable.Map()
-  val statePredicates: SuccessionMap[jad.BipStatePredicate[Pre], BipStatePredicate[Post]] = SuccessionMap()
+  val defaultStatePredicates: mutable.Map[String, BipStatePredicate[Post]] =
+    mutable.Map()
+  val statePredicates
+      : SuccessionMap[jad.BipStatePredicate[Pre], BipStatePredicate[Post]] =
+    SuccessionMap()
   val components: SuccessionMap[String, BipComponent[Post]] = SuccessionMap()
-  val dataOut: SuccessionMap[(JavaClass[Pre], String), BipOutgoingData[Post]] = SuccessionMap()
-  val dataIn: SuccessionMap[(JavaClass[Pre], String), BipIncomingData[Post]] = SuccessionMap()
-  val dataInPreType: mutable.LinkedHashMap[(JavaClass[Pre], String), Type[Pre]] = new mutable.LinkedHashMap()
-  val ports: SuccessionMap[(JavaClass[Pre], String), BipPort[Post]] = SuccessionMap()
-
-  val glueSucc: SuccessionMap[JavaBipGlueContainer[Pre], BipGlue[Post]] = SuccessionMap()
-
-  val javaParamSucc: SuccessionMap[JavaParam[Pre], BipIncomingData[Post]] = SuccessionMap()
-  val javaMethodSuccTransition: SuccessionMap[(JavaMethod[Pre], jad.BipTransition[Pre]), BipTransition[Post]] = SuccessionMap()
-  val javaMethodSuccGuard: SuccessionMap[JavaMethod[Pre], BipGuard[Post]] = SuccessionMap()
-  val javaMethodSuccOutgoingData: SuccessionMap[JavaMethod[Pre], BipOutgoingData[Post]] = SuccessionMap()
-
-  def currentClass(): JavaClass[Pre] = rw.java.currentJavaClass.top.asInstanceOf[JavaClass[Pre]]
-
-  def getJavaBipStatePredicate(t: JavaBipStatePredicateTarget[Pre]): Ref[Post, BipStatePredicate[Post]] = t match {
-    case RefJavaBipStatePredicate(_, decl) => statePredicates.ref(decl.data.get.asInstanceOf[jad.BipStatePredicate[Pre]])
-    case ImplicitDefaultJavaBipStatePredicate(state) => defaultStatePredicates.getOrElseUpdate(state, {
-      rw.classDeclarations.declare(new BipStatePredicate[Post](tt)(DiagnosticOrigin))
-    }).ref
-  }
+  val dataOut: SuccessionMap[(JavaClass[Pre], String), BipOutgoingData[Post]] =
+    SuccessionMap()
+  val dataIn: SuccessionMap[(JavaClass[Pre], String), BipIncomingData[Post]] =
+    SuccessionMap()
+  val dataInPreType
+      : mutable.LinkedHashMap[(JavaClass[Pre], String), Type[Pre]] =
+    new mutable.LinkedHashMap()
+  val ports: SuccessionMap[(JavaClass[Pre], String), BipPort[Post]] =
+    SuccessionMap()
+
+  val glueSucc: SuccessionMap[JavaBipGlueContainer[Pre], BipGlue[Post]] =
+    SuccessionMap()
+
+  val javaParamSucc: SuccessionMap[JavaParam[Pre], BipIncomingData[Post]] =
+    SuccessionMap()
+  val javaMethodSuccTransition
+      : SuccessionMap[(JavaMethod[Pre], jad.BipTransition[Pre]), BipTransition[
+        Post
+      ]] = SuccessionMap()
+  val javaMethodSuccGuard: SuccessionMap[JavaMethod[Pre], BipGuard[Post]] =
+    SuccessionMap()
+  val javaMethodSuccOutgoingData
+      : SuccessionMap[JavaMethod[Pre], BipOutgoingData[Post]] = SuccessionMap()
+
+  def currentClass(): JavaClass[Pre] =
+    rw.java.currentJavaClass.top.asInstanceOf[JavaClass[Pre]]
+
+  def getJavaBipStatePredicate(
+      t: JavaBipStatePredicateTarget[Pre]
+  ): Ref[Post, BipStatePredicate[Post]] =
+    t match {
+      case RefJavaBipStatePredicate(_, decl) =>
+        statePredicates
+          .ref(decl.data.get.asInstanceOf[jad.BipStatePredicate[Pre]])
+      case ImplicitDefaultJavaBipStatePredicate(state) =>
+        defaultStatePredicates.getOrElseUpdate(
+          state, {
+            rw.classDeclarations
+              .declare(new BipStatePredicate[Post](tt)(DiagnosticOrigin))
+          },
+        ).ref
+    }
 
   def rewriteParameter(p: JavaParam[Pre]): Ref[Post, BipIncomingData[Post]] = {
     val annData @ jad.BipData(name) = jad.BipData.get(p).get
     val dataTuple = (currentClass(), name)
-    val data = dataInPreType.get(dataTuple) match {
-      case Some(preType) =>
-        if (preType == p.t) {
+    val data =
+      dataInPreType.get(dataTuple) match {
+        case Some(preType) =>
+          if (preType == p.t) { dataIn(dataTuple) }
+          else { throw BipIncomingDataInconsistentType(dataIn(dataTuple), p) }
+        case None =>
+          dataIn(dataTuple) = rw.classDeclarations
+            .declare(new BipIncomingData(rw.dispatch(p.t))(
+              BipDataOrigin(rw.java.namespace.top, currentClass(), annData)
+            ))
+          dataInPreType(dataTuple) = p.t
           dataIn(dataTuple)
-        } else {
-          throw BipIncomingDataInconsistentType(dataIn(dataTuple), p)
-        }
-      case None =>
-        dataIn(dataTuple) = rw.classDeclarations.declare(new BipIncomingData(rw.dispatch(p.t))(
-          BipDataOrigin(rw.java.namespace.top, currentClass(), annData)))
-        dataInPreType(dataTuple) = p.t
-        dataIn(dataTuple)
-    }
+      }
     javaParamSucc(p) = data
     data.ref
   }
 
-  def rewriteTransition(m: JavaMethod[Pre], annotation: JavaAnnotation[Pre], transition: jad.BipTransition[Pre]): Unit = {
-    val jad.BipTransition(portName, source, target, guardText, guard, requires, ensures) = transition
+  def rewriteTransition(
+      m: JavaMethod[Pre],
+      annotation: JavaAnnotation[Pre],
+      transition: jad.BipTransition[Pre],
+  ): Unit = {
+    val jad.BipTransition(
+      portName,
+      source,
+      target,
+      guardText,
+      guard,
+      requires,
+      ensures,
+    ) = transition
 
     if (m.returnType != TVoid[Pre]()) { throw WrongTransitionReturnType(m) }
 
-    val signature = BipTransitionSignature[Post](
-      portName,
-      source.name,
-      target.name,
-      guardText
-    )(transition.o)
-
-    val trans = new BipTransition[Post](
-      signature,
-      ports.ref((currentClass(), portName)),
-      getJavaBipStatePredicate(source),
-      getJavaBipStatePredicate(target),
-      m.parameters.map(rewriteParameter),
-      guard.map(rw.dispatch).getOrElse(tt),
-      rw.dispatch(requires),
-      rw.dispatch(ensures),
-      rw.dispatch(m.body.get))(annotation.blame)(m.o.where(name = m.name))
-
-    javaMethodSuccTransition((m, transition)) = rw.classDeclarations.declare(trans)
+    val signature =
+      BipTransitionSignature[Post](
+        portName,
+        source.name,
+        target.name,
+        guardText,
+      )(transition.o)
+
+    val trans =
+      new BipTransition[Post](
+        signature,
+        ports.ref((currentClass(), portName)),
+        getJavaBipStatePredicate(source),
+        getJavaBipStatePredicate(target),
+        m.parameters.map(rewriteParameter),
+        guard.map(rw.dispatch).getOrElse(tt),
+        rw.dispatch(requires),
+        rw.dispatch(ensures),
+        rw.dispatch(m.body.get),
+      )(annotation.blame)(m.o.where(name = m.name))
+
+    javaMethodSuccTransition((m, transition)) = rw.classDeclarations
+      .declare(trans)
   }
 
   def local(local: JavaLocal[Pre]): Expr[Post] = {
     val Some(RefJavaBipGuard(method)) = local.ref
     BipGuardInvocation(
-      ThisObject(rw.java.javaInstanceClassSuccessor.ref[Post, Class[Post]](rw.java.currentJavaClass.top))(local.o),
-      javaMethodSuccGuard.ref[Post, BipGuard[Post]](method)
+      ThisObject(
+        rw.java.javaInstanceClassSuccessor
+          .ref[Post, Class[Post]](rw.java.currentJavaClass.top)
+      )(local.o),
+      javaMethodSuccGuard.ref[Post, BipGuard[Post]](method),
     )(local.o)
   }
 
   def local(local: JavaLocal[Pre], decl: JavaParam[Pre]): Expr[Post] = {
     val data @ jad.BipData(_) = jad.BipData.get(decl).get
-    BipLocalIncomingData(javaParamSucc.ref[Post, BipIncomingData[Post]](decl))(local.o)
+    BipLocalIncomingData(javaParamSucc.ref[Post, BipIncomingData[Post]](decl))(
+      local.o
+    )
   }
 
-  def rewriteConstructor(constructor: JavaConstructor[Pre], annotation: JavaAnnotation[Pre], data: jad.BipComponent[Pre], generateInit: Expr[Post] => Statement[Post]): Unit = {
+  def rewriteConstructor(
+      constructor: JavaConstructor[Pre],
+      annotation: JavaAnnotation[Pre],
+      data: jad.BipComponent[Pre],
+      generateInit: Expr[Post] => Statement[Post],
+  ): Unit = {
     implicit val o: Origin = constructor.o
-    val contractWithoutRequires = constructor.contract.copy(requires = UnitAccountedPredicate[Pre](tt))(
-      blame = constructor.contract.blame)(o = constructor.o)
+    val contractWithoutRequires =
+      constructor.contract
+        .copy(requires = UnitAccountedPredicate[Pre](tt))(blame =
+          constructor.contract.blame
+        )(o = constructor.o)
     if (contractWithoutRequires.nonEmpty) {
-      throw ImproperConstructor(constructor, "Only precondition is allowed on JavaBIP component constructors")
+      throw ImproperConstructor(
+        constructor,
+        "Only precondition is allowed on JavaBIP component constructors",
+      )
     }
 
-    logger.debug(s"JavaBIP component constructor for ${constructor.o.inlineContextText}")
-    rw.currentThis.having(ThisObject(rw.java.javaInstanceClassSuccessor.ref(rw.java.currentJavaClass.top))) {
+    logger.debug(
+      s"JavaBIP component constructor for ${constructor.o.inlineContextText}"
+    )
+    rw.currentThis.having(ThisObject(
+      rw.java.javaInstanceClassSuccessor.ref(rw.java.currentJavaClass.top)
+    )) {
       rw.labelDecls.scope {
         rw.classDeclarations.declare(
           new BipConstructor(
-            args = rw.variables.collect { constructor.parameters.map(rw.dispatch) }._1,
+            args =
+              rw.variables.collect { constructor.parameters.map(rw.dispatch) }
+                ._1,
             body = Block(Seq(
               generateInit(rw.currentThis.top),
-              rw.dispatch(constructor.body))),
-            requires = foldStar(rw.dispatch(constructor.contract.requires))
-          )(UntangleBipConstructorFailure(constructor))(BipConstructorOrigin(rw.java.currentJavaClass.top, constructor))
+              rw.dispatch(constructor.body),
+            )),
+            requires = foldStar(rw.dispatch(constructor.contract.requires)),
+          )(UntangleBipConstructorFailure(constructor))(
+            BipConstructorOrigin(rw.java.currentJavaClass.top, constructor)
+          )
         )
       }
     }
   }
 
-  def rewriteGuard(method: JavaMethod[Pre], annotation: JavaAnnotation[Pre], guard: jad.BipGuard[Pre]): Unit = {
-    if (method.returnType != TBool[Pre]()) { throw LangBipToCol.WrongGuardReturnType(method) }
+  def rewriteGuard(
+      method: JavaMethod[Pre],
+      annotation: JavaAnnotation[Pre],
+      guard: jad.BipGuard[Pre],
+  ): Unit = {
+    if (method.returnType != TBool[Pre]()) {
+      throw LangBipToCol.WrongGuardReturnType(method)
+    }
 
-    javaMethodSuccGuard(method) = rw.classDeclarations.declare(new BipGuard[Post](
-      method.parameters.map(rewriteParameter),
-      rw.dispatch(method.body.get),
-      true
-    )(annotation.blame)(method.o.where(name = method.name)))
+    javaMethodSuccGuard(method) = rw.classDeclarations.declare(
+      new BipGuard[Post](
+        method.parameters.map(rewriteParameter),
+        rw.dispatch(method.body.get),
+        true,
+      )(annotation.blame)(method.o.where(name = method.name))
+    )
   }
 
-  def rewriteOutgoingData(method: JavaMethod[Pre], annotation: JavaAnnotation[Pre], data: jad.BipData[Pre]): Unit = {
-    if (!jad.BipPure.isPure(method)) {
-      throw ImpureData(method);
-    }
+  def rewriteOutgoingData(
+      method: JavaMethod[Pre],
+      annotation: JavaAnnotation[Pre],
+      data: jad.BipData[Pre],
+  ): Unit = {
+    if (!jad.BipPure.isPure(method)) { throw ImpureData(method); }
 
     javaMethodSuccOutgoingData(method) = rw.classDeclarations.declare(
       new BipOutgoingData(
         rw.dispatch(method.returnType),
         rw.dispatch(method.body.get),
-        jad.BipPure.isPure(method)
-      )(annotation.blame)(BipDataOrigin(rw.java.namespace.top, currentClass(), data)))
+        jad.BipPure.isPure(method),
+      )(annotation.blame)(
+        BipDataOrigin(rw.java.namespace.top, currentClass(), data)
+      )
+    )
     dataOut((currentClass(), data.name)) = javaMethodSuccOutgoingData(method)
   }
 
@@ -221,50 +348,70 @@ case class LangBipToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
     val jad.BipComponent(name, initialState) = jad.BipComponent.get(cls).get
     val allPorts = jad.BipPort.getAll(cls)
 
-    val invariant: Expr[Pre] = jad.BipInvariant.get(cls) match {
-      case Some(value) => value.expr
-      case None => tt[Pre]
-    }
+    val invariant: Expr[Pre] =
+      jad.BipInvariant.get(cls) match {
+        case Some(value) => value.expr
+        case None => tt[Pre]
+      }
 
     // Create bip component marker declaration
     components(name) = rw.classDeclarations.declare(
       new BipComponent(
         rw.java.namespace.top.pkg.get.names :+ cls.name,
         rw.dispatch(invariant),
-        getJavaBipStatePredicate(initialState))(cls.o))
+        getJavaBipStatePredicate(initialState),
+      )(cls.o)
+    )
 
     // Create bip state predicates
-    jad.BipStatePredicate.getAll(cls).foreach { case bspData @ jad.BipStatePredicate(name, expr) =>
-      val bspNode = rw.classDeclarations.declare(
-        new BipStatePredicate[Post](rw.dispatch(expr))(bspData.o.where(name = name)))
-      statePredicates(bspData) = bspNode
+    jad.BipStatePredicate.getAll(cls).foreach {
+      case bspData @ jad.BipStatePredicate(name, expr) =>
+        val bspNode = rw.classDeclarations
+          .declare(new BipStatePredicate[Post](rw.dispatch(expr))(
+            bspData.o.where(name = name)
+          ))
+        statePredicates(bspData) = bspNode
     }
 
     // Create bip ports
     allPorts.foreach { port =>
       assert(port.portType == BipEnforceable[Pre]())
-      ports((cls, port.name)) = rw.classDeclarations.declare(
-        new BipPort(rw.dispatch(port.portType))(BipPortOrigin(rw.java.namespace.top, currentClass(), port)))
+      ports((cls, port.name)) = rw.classDeclarations
+        .declare(new BipPort(rw.dispatch(port.portType))(
+          BipPortOrigin(rw.java.namespace.top, currentClass(), port)
+        ))
     }
   }
 
-  def rewritePortName(portName: JavaBipGlueName[Pre]): Ref[Post, BipPort[Post]] = {
+  def rewritePortName(
+      portName: JavaBipGlueName[Pre]
+  ): Ref[Post, BipPort[Post]] = {
     val Some((cls, name)) = portName.data
     ports.ref((cls, name))
   }
 
   def rewriteAccepts(glue: JavaBipGlueAccepts[Pre]): BipGlueAccepts[Post] =
-    BipGlueAccepts(rewritePortName(glue.port), glue.others.map(rewritePortName))(glue.o)
+    BipGlueAccepts(
+      rewritePortName(glue.port),
+      glue.others.map(rewritePortName),
+    )(glue.o)
 
   def rewriteRequires(glue: JavaBipGlueRequires[Pre]): BipGlueRequires[Post] =
-    BipGlueRequires(rewritePortName(glue.port), glue.others.map(rewritePortName))(glue.o)
-
-  def rewriteSynchron(synchron: JavaBipGlueSynchron[Pre]): (Seq[BipGlueRequires[Post]], Seq[BipGlueAccepts[Post]]) = {
+    BipGlueRequires(
+      rewritePortName(glue.port),
+      glue.others.map(rewritePortName),
+    )(glue.o)
+
+  def rewriteSynchron(
+      synchron: JavaBipGlueSynchron[Pre]
+  ): (Seq[BipGlueRequires[Post]], Seq[BipGlueAccepts[Post]]) = {
     val p0 = rewritePortName(synchron.port0)
     val p1 = rewritePortName(synchron.port1)
     implicit val o = synchron.o
-    (Seq(BipGlueRequires(p0, Seq(p1)), BipGlueRequires(p1, Seq(p0))),
-      Seq(BipGlueAccepts(p0, Seq(p1)), BipGlueAccepts(p1, Seq(p0))))
+    (
+      Seq(BipGlueRequires(p0, Seq(p1)), BipGlueRequires(p1, Seq(p0))),
+      Seq(BipGlueAccepts(p0, Seq(p1)), BipGlueAccepts(p1, Seq(p0))),
+    )
   }
 
   def rewriteDataWire(wire: JavaBipGlueDataWire[Pre]): BipGlueDataWire[Post] = {
@@ -272,7 +419,7 @@ case class LangBipToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
     val Some((clsIn, nameIn)) = wire.dataIn.data
     BipGlueDataWire[Post](
       dataOut.ref((clsOut, nameOut)),
-      dataIn.ref((clsIn, nameIn))
+      dataIn.ref((clsIn, nameIn)),
     )(BipDataWireOrigin(clsOut, nameOut, clsIn, nameIn, wire.o))
   }
 
@@ -286,10 +433,12 @@ case class LangBipToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
 
     val wires = glue.elems.collect { case w: JavaBipGlueDataWire[Pre] => w }
 
-    glueSucc(container) = rw.globalDeclarations.declare(new BipGlue[Post](
+    glueSucc(container) = rw.globalDeclarations.declare(
+      new BipGlue[Post](
         requires.map(rewriteRequires) ++ pairs.flatMap(_._1),
         accepts.map(rewriteAccepts) ++ pairs.flatMap(_._2),
-        wires.map(rewriteDataWire)
-        )(glue.blame)(glue.o))
+        wires.map(rewriteDataWire),
+      )(glue.blame)(glue.o)
+    )
   }
 }
diff --git a/src/rewrite/vct/rewrite/lang/LangCPPToCol.scala b/src/rewrite/vct/rewrite/lang/LangCPPToCol.scala
index f453770a27..e66592de4b 100644
--- a/src/rewrite/vct/rewrite/lang/LangCPPToCol.scala
+++ b/src/rewrite/vct/rewrite/lang/LangCPPToCol.scala
@@ -3,7 +3,16 @@ package vct.rewrite.lang
 import com.typesafe.scalalogging.LazyLogging
 import hre.util.ScopedStack
 import vct.col.ast.util.ExpressionEqualityCheck.isConstantInt
-import vct.col.ast.{CPPLocalDeclaration, Expr, FunctionInvocation, InstanceField, Perm, ProcedureInvocation, SeqSubscript, _}
+import vct.col.ast.{
+  CPPLocalDeclaration,
+  Expr,
+  FunctionInvocation,
+  InstanceField,
+  Perm,
+  ProcedureInvocation,
+  SeqSubscript,
+  _,
+}
 import vct.col.origin._
 import vct.col.ref.Ref
 import vct.col.resolve.NotApplicable
@@ -21,24 +30,36 @@ import scala.collection.mutable
 
 case object LangCPPToCol {
 
-  private case class WrongCPPType(decl: CPPLocalDeclaration[_]) extends UserError {
+  private case class WrongCPPType(decl: CPPLocalDeclaration[_])
+      extends UserError {
     override def code: String = "wrongCPPType"
     override def text: String =
-      decl.o.messageInContext(s"This declaration has a type that is not supported.")
+      decl.o
+        .messageInContext(s"This declaration has a type that is not supported.")
   }
 
-  private case class UnexpectedCPPTypeError(declType: Type[_], init: Expr[_]) extends UserError {
+  private case class UnexpectedCPPTypeError(declType: Type[_], init: Expr[_])
+      extends UserError {
     override def code: String = "unexpectedCPPTypeError"
     override def text: String =
-      init.o.messageInContext(s"Expected the type of this expression to be `$declType`, but got ${init.t}")
+      init.o.messageInContext(
+        s"Expected the type of this expression to be `$declType`, but got ${init.t}"
+      )
   }
 
-  private case class LambdaDefinitionUnsupported(lambda: CPPLambdaDefinition[_]) extends UserError {
-    override def text: String = lambda.o.messageInContext("Lambda expressions are only supported as parameters for invocations of SYCL's submit and parallel_for methods.")
+  private case class LambdaDefinitionUnsupported(lambda: CPPLambdaDefinition[_])
+      extends UserError {
+    override def text: String =
+      lambda.o.messageInContext(
+        "Lambda expressions are only supported as parameters for invocations of SYCL's submit and parallel_for methods."
+      )
     override def code: String = "unsupportedLambdaDefinition"
   }
 
-  private case class CPPDoubleContracted(decl: CPPGlobalDeclaration[_], defn: CPPFunctionDefinition[_]) extends UserError {
+  private case class CPPDoubleContracted(
+      decl: CPPGlobalDeclaration[_],
+      defn: CPPFunctionDefinition[_],
+  ) extends UserError {
     override def code: String = "multipleContracts"
     override def text: String =
       Message.messagesInContext(
@@ -47,368 +68,649 @@ case object LangCPPToCol {
       )
   }
 
-  private abstract class CPPInvocationBlame(kind: String) extends Blame[InvocationFailure] {
+  private abstract class CPPInvocationBlame(kind: String)
+      extends Blame[InvocationFailure] {
     def preconditionFailed(error: PreconditionFailed): Unit
 
-    override def blame(error: InvocationFailure): Unit = error match {
-      case predErr@PreconditionFailed(_, _, _) => preconditionFailed(predErr)
-      case ContextEverywhereFailedInPre(_, _) => PanicBlame(s"${kind.capitalize} do not contain context_everywhere clauses, so cannot fail on a context_everywhere clause.").blame(error)
-    }
+    override def blame(error: InvocationFailure): Unit =
+      error match {
+        case predErr @ PreconditionFailed(_, _, _) =>
+          preconditionFailed(predErr)
+        case ContextEverywhereFailedInPre(_, _) =>
+          PanicBlame(
+            s"${kind.capitalize} do not contain context_everywhere clauses, so cannot fail on a context_everywhere clause."
+          ).blame(error)
+      }
   }
 
   private case class ImpossibleDivByZeroBlame() extends Blame[DivByZero] {
-    override def blame(error: DivByZero): Unit = error.node.o match {
-      case o if o.find[NDRangeDimensionCheck.type].isDefined => PanicBlame(o.messageInContext(
-        "Division by zero is possible when dividing the global range dimension " +
-          "by the local range dimension, but it was already asserted that this is actually impossible."
-      )).blame(error)
-      case _ => PanicBlame("Division by zero is possible here, but it is actually impossible.").blame(error)
-    }
+    override def blame(error: DivByZero): Unit =
+      error.node.o match {
+        case o if o.find[NDRangeDimensionCheck.type].isDefined =>
+          PanicBlame(o.messageInContext(
+            "Division by zero is possible when dividing the global range dimension " +
+              "by the local range dimension, but it was already asserted that this is actually impossible."
+          )).blame(error)
+        case _ =>
+          PanicBlame(
+            "Division by zero is possible here, but it is actually impossible."
+          ).blame(error)
+      }
   }
 
-  private case class KernelLambdaRunMethodBlame(kernelLambda: CPPLambdaDefinition[_]) extends Blame[CallableFailure] {
-    override def blame(error: CallableFailure): Unit = error match {
-      case PostconditionFailed(path, failure, node) =>
-        kernelLambda.blame.blame(SYCLKernelLambdaFailure(KernelPostconditionFailed(failure, Right(kernelLambda))))
-      case TerminationMeasureFailed(applicable, apply, measure) =>
-        PanicBlame("Kernel lambdas do not have a termination measure yet").blame(error)
-      case ContextEverywhereFailedInPost(failure, node) =>
-        PanicBlame("Kernel lambdas do not have context_everywhere specifications").blame(error)
-      case SignalsFailed(failure, node) =>
-        PanicBlame("Kernel lambdas cannot throw exceptions").blame(error)
-      case ExceptionNotInSignals(node) =>
-        PanicBlame("Kernel lambdas cannot throw exceptions").blame(error)
-    }
+  private case class KernelLambdaRunMethodBlame(
+      kernelLambda: CPPLambdaDefinition[_]
+  ) extends Blame[CallableFailure] {
+    override def blame(error: CallableFailure): Unit =
+      error match {
+        case PostconditionFailed(path, failure, node) =>
+          kernelLambda.blame.blame(SYCLKernelLambdaFailure(
+            KernelPostconditionFailed(failure, Right(kernelLambda))
+          ))
+        case TerminationMeasureFailed(applicable, apply, measure) =>
+          PanicBlame("Kernel lambdas do not have a termination measure yet")
+            .blame(error)
+        case ContextEverywhereFailedInPost(failure, node) =>
+          PanicBlame(
+            "Kernel lambdas do not have context_everywhere specifications"
+          ).blame(error)
+        case SignalsFailed(failure, node) =>
+          PanicBlame("Kernel lambdas cannot throw exceptions").blame(error)
+        case ExceptionNotInSignals(node) =>
+          PanicBlame("Kernel lambdas cannot throw exceptions").blame(error)
+      }
   }
 
-  private case class SYCLReassigningOfVariableUnsupported(objectName: String, codeExtension: String, ass: PreAssignExpression[_]) extends UserError {
+  private case class SYCLReassigningOfVariableUnsupported(
+      objectName: String,
+      codeExtension: String,
+      ass: PreAssignExpression[_],
+  ) extends UserError {
     override def code: String = "syclUnsupportedReassigningOf" + codeExtension
-    override def text: String = ass.o.messageInContext(s"Reassigning variables holding a SYCL " + objectName + " is not supported.")
+    override def text: String =
+      ass.o.messageInContext(
+        s"Reassigning variables holding a SYCL " + objectName +
+          " is not supported."
+      )
   }
 
-  private case class SYCLReassigningOfReadonlyAccessor(ass: PreAssignExpression[_]) extends UserError {
+  private case class SYCLReassigningOfReadonlyAccessor(
+      ass: PreAssignExpression[_]
+  ) extends UserError {
     override def code: String = "syclUnsupportedReassigningOfReadonlyAccessor"
-    override def text: String = ass.o.messageInContext(s"Reassigning (an element of) a readonly data accessor is not allowed.")
+    override def text: String =
+      ass.o.messageInContext(
+        s"Reassigning (an element of) a readonly data accessor is not allowed."
+      )
   }
 
-  private case class SYCLContractForCommandGroupUnsupported(contract: ApplicableContract[_]) extends UserError {
+  private case class SYCLContractForCommandGroupUnsupported(
+      contract: ApplicableContract[_]
+  ) extends UserError {
     override def code: String = "syclContractForCommandGroupUnsupported"
-    override def text: String = contract.o.messageInContext(s"Contracts above SYCL command groups are not supported.")
+    override def text: String =
+      contract.o.messageInContext(
+        s"Contracts above SYCL command groups are not supported."
+      )
   }
 
-  private case class SYCLGivenYieldsOnSYCLMethodsUnsupported(inv: CPPInvocation[_]) extends UserError {
+  private case class SYCLGivenYieldsOnSYCLMethodsUnsupported(
+      inv: CPPInvocation[_]
+  ) extends UserError {
     override def code: String = "syclGivenYieldsOnSYCLMethodsUnsupported"
-    override def text: String = inv.o.messageInContext(s"Given and yields annotations are not supported for calls to built-in SYCL methods.")
+    override def text: String =
+      inv.o.messageInContext(
+        s"Given and yields annotations are not supported for calls to built-in SYCL methods."
+      )
   }
 
-  private case class SYCLNoMultipleKernels(decl1: Statement[_], decl2: CPPInvocation[_]) extends UserError {
+  private case class SYCLNoMultipleKernels(
+      decl1: Statement[_],
+      decl2: CPPInvocation[_],
+  ) extends UserError {
     override def code: String = "syclNoMultipleKernels"
-    override def text: String = Message.messagesInContext(
-      decl2.o -> "This kernel declaration is not allowed, as only one kernel declaration is allowed per command group, ...",
-      decl1.o -> "... and there is already a kernel declared here.",
-    )
+    override def text: String =
+      Message.messagesInContext(
+        decl2.o ->
+          "This kernel declaration is not allowed, as only one kernel declaration is allowed per command group, ...",
+        decl1.o -> "... and there is already a kernel declared here.",
+      )
   }
 
   private case class SYCLMissingKernel(decl: Statement[_]) extends UserError {
     override def code: String = "syclMissingKernel"
-    override def text: String = decl.o.messageInContext(s"There is no kernel declaration in this command group.")
+    override def text: String =
+      decl.o.messageInContext(
+        s"There is no kernel declaration in this command group."
+      )
   }
 
-  private case class SYCLNoExtraCodeInCommandGroup(decl: Statement[_]) extends UserError {
+  private case class SYCLNoExtraCodeInCommandGroup(decl: Statement[_])
+      extends UserError {
     override def code: String = "syclNoExtraCodeInCommandGroup"
-    override def text: String = decl.o.messageInContext(s"Non-SYCL code inside command group declarations is not supported.")
+    override def text: String =
+      decl.o.messageInContext(
+        s"Non-SYCL code inside command group declarations is not supported."
+      )
   }
 
-  private case class SYCLIncorrectParallelForLambdaArgument(o: Origin) extends UserError {
+  private case class SYCLIncorrectParallelForLambdaArgument(o: Origin)
+      extends UserError {
     override def code: String = "syclIncorrectParallelForLambdaArgument"
-    override def text: String = o.messageInContext("The second parameter for the parallel_for method, which is a lambda method, " +
-      "only takes one (nd_)item argument, which should match the first (nd_)range parameter of the parallel_for method.")
+    override def text: String =
+      o.messageInContext(
+        "The second parameter for the parallel_for method, which is a lambda method, " +
+          "only takes one (nd_)item argument, which should match the first (nd_)range parameter of the parallel_for method."
+      )
   }
 
-  private case class SYCLItemMethodInvocationBlame(inv: CPPInvocation[_]) extends CPPInvocationBlame("SYCL item methods") {
-    override def preconditionFailed(error: PreconditionFailed): Unit = inv.blame.blame(SYCLItemMethodPreconditionFailed(error.node))
+  private case class SYCLItemMethodInvocationBlame(inv: CPPInvocation[_])
+      extends CPPInvocationBlame("SYCL item methods") {
+    override def preconditionFailed(error: PreconditionFailed): Unit =
+      inv.blame.blame(SYCLItemMethodPreconditionFailed(error.node))
   }
 
-  private case class SYCLItemMethodSeqBoundFailureBlame(inv: CPPInvocation[_]) extends Blame[SeqBoundFailure] {
+  private case class SYCLItemMethodSeqBoundFailureBlame(inv: CPPInvocation[_])
+      extends Blame[SeqBoundFailure] {
     private case class SYCLItemMethodSeqBoundNegativeError() extends UserError {
       override def code: String = "syclItemMethodSeqBoundNegative"
-      override def text: String = inv.o.messageInContext("The dimension parameter may not be negative.")
+      override def text: String =
+        inv.o.messageInContext("The dimension parameter may not be negative.")
     }
 
-    private case class SYCLItemMethodSeqBoundExceedsLengthError() extends UserError {
+    private case class SYCLItemMethodSeqBoundExceedsLengthError()
+        extends UserError {
       override def code: String = "syclItemMethodSeqBoundExceedsLength"
-      override def text: String = inv.o.messageInContext("The dimension parameter should be smaller than the number of dimensions in the (nd_)item..")
+      override def text: String =
+        inv.o.messageInContext(
+          "The dimension parameter should be smaller than the number of dimensions in the (nd_)item.."
+        )
     }
 
-    override def blame(error: SeqBoundFailure): Unit = error match {
-      case SeqBoundNegative(_) => throw SYCLItemMethodSeqBoundNegativeError()
-      case SeqBoundExceedsLength(_) => throw SYCLItemMethodSeqBoundExceedsLengthError()
-    }
+    override def blame(error: SeqBoundFailure): Unit =
+      error match {
+        case SeqBoundNegative(_) => throw SYCLItemMethodSeqBoundNegativeError()
+        case SeqBoundExceedsLength(_) =>
+          throw SYCLItemMethodSeqBoundExceedsLengthError()
+      }
   }
 
   private case class SYCLKernelForkNull(node: Fork[_]) extends UserError {
     override def code: String = "syclKernelForkNull"
-    override def text: String = node.o.messageInContext("This event variable might not be linked to a kernel submission to a queue.")
+    override def text: String =
+      node.o.messageInContext(
+        "This event variable might not be linked to a kernel submission to a queue."
+      )
   }
 
   private case object RangeDimensionCheck extends OriginContent
   private case object NDRangeDimensionCheck extends OriginContent
 
   private def RangeDimensionCheckOrigin(o: Origin): Origin =
-    o
-      .where(name = "RangeDimensionCheck")
-      .withContent(RangeDimensionCheck)
-
-  private def NDRangeDimensionCheckOrigin(o: Origin, dimension: Option[Int] = None): Origin =
-    o
-      .where(name = "NDRangeDimensionCheck", context = s"range dimension ${dimension.getOrElse("?")}")
-      .withContent(NDRangeDimensionCheck)
-
-  private case class SYCLKernelPreconditionNotEstablished(error: WithContractFailure) extends UserError {
+    o.where(name = "RangeDimensionCheck").withContent(RangeDimensionCheck)
+
+  private def NDRangeDimensionCheckOrigin(
+      o: Origin,
+      dimension: Option[Int] = None,
+  ): Origin =
+    o.where(
+      name = "NDRangeDimensionCheck",
+      context = s"range dimension ${dimension.getOrElse("?")}",
+    ).withContent(NDRangeDimensionCheck)
+
+  private case class SYCLKernelPreconditionNotEstablished(
+      error: WithContractFailure
+  ) extends UserError {
     override def code: String = "syclKernelForkPre"
-    override def text: String =  (error.failure, error.failure.node.o) match {
-      case (ContractFalse(_), o) if o.find[RangeDimensionCheck.type].isDefined =>
-        o.messageInContext("All range dimensions should be greater or equal to zero.")
-      case (ContractFalse(_), o) if o.find[NDRangeDimensionCheck.type].isDefined =>
-        o.messageInContext(
-          "Every global range dimension should be divisible by the local range dimension at the same index," +
-          " and the local range dimension should be greater than 0 to avoid division by zero. " +
-          "All global range dimensions should be greater or equal to zero."
-        )
-      case _ => Message.messagesInContext((error.node.o, "The precondition of the kernel may not hold, since ..."), (error.failure.node.o, "... " + error.failure.descCompletion))
-    }
+    override def text: String =
+      (error.failure, error.failure.node.o) match {
+        case (ContractFalse(_), o)
+            if o.find[RangeDimensionCheck.type].isDefined =>
+          o.messageInContext(
+            "All range dimensions should be greater or equal to zero."
+          )
+        case (ContractFalse(_), o)
+            if o.find[NDRangeDimensionCheck.type].isDefined =>
+          o.messageInContext(
+            "Every global range dimension should be divisible by the local range dimension at the same index," +
+              " and the local range dimension should be greater than 0 to avoid division by zero. " +
+              "All global range dimensions should be greater or equal to zero."
+          )
+        case _ =>
+          Message.messagesInContext(
+            (
+              error.node.o,
+              "The precondition of the kernel may not hold, since ...",
+            ),
+            (error.failure.node.o, "... " + error.failure.descCompletion),
+          )
+      }
   }
 
-  private case class SYCLKernelForkBlame(kernel: CPPLambdaDefinition[_]) extends Blame[ForkFailure] {
-    override def blame(error: ForkFailure): Unit = error match {
-      case ForkNull(node) => throw SYCLKernelForkNull(node)
-      case RunnableNotIdle(_) => PanicBlame("This kernel submission has been forked already. This should not happen.").blame(error)
-      case e@RunnablePreconditionNotEstablished(_, _) => throw SYCLKernelPreconditionNotEstablished(e)
-    }
+  private case class SYCLKernelForkBlame(kernel: CPPLambdaDefinition[_])
+      extends Blame[ForkFailure] {
+    override def blame(error: ForkFailure): Unit =
+      error match {
+        case ForkNull(node) => throw SYCLKernelForkNull(node)
+        case RunnableNotIdle(_) =>
+          PanicBlame(
+            "This kernel submission has been forked already. This should not happen."
+          ).blame(error)
+        case e @ RunnablePreconditionNotEstablished(_, _) =>
+          throw SYCLKernelPreconditionNotEstablished(e)
+      }
   }
 
   private case class SYCLKernelJoinBlame() extends Blame[JoinFailure] {
     private case class KernelJoinError(error: JoinFailure) extends UserError {
       override def code: String = "kernelJoinNull"
-      override def text: String = "This event variable might be null or no longer be linked to a kernel submission to a queue."
+      override def text: String =
+        "This event variable might be null or no longer be linked to a kernel submission to a queue."
     }
     override def blame(error: JoinFailure): Unit = throw KernelJoinError(error)
   }
 
-  private case class SYCLKernelParBlockFailureBlame(kernel: CPPLambdaDefinition[_]) extends Blame[ParBlockFailure] {
-    override def blame(error: ParBlockFailure): Unit = error match {
-      case ParPredicateNotInjective(_, predicate) =>
-        kernel.blame.blame(SYCLKernelLambdaFailure(KernelPredicateNotInjective(Right(kernel), predicate)))
-      case preFailed@ParPreconditionFailed(_, _) =>
-        throw SYCLKernelPreconditionNotEstablished(preFailed)
-      case ParBlockPostconditionFailed(failure, _) =>
-        kernel.blame.blame(SYCLKernelLambdaFailure(KernelPostconditionFailed(failure, Right(kernel))))
-      case ParBlockMayNotThrow(_) =>
-        PanicBlame("Please don't throw exceptions from a gpgpu kernel, it's not polite.").blame(error)
-    }
+  private case class SYCLKernelParBlockFailureBlame(
+      kernel: CPPLambdaDefinition[_]
+  ) extends Blame[ParBlockFailure] {
+    override def blame(error: ParBlockFailure): Unit =
+      error match {
+        case ParPredicateNotInjective(_, predicate) =>
+          kernel.blame.blame(SYCLKernelLambdaFailure(
+            KernelPredicateNotInjective(Right(kernel), predicate)
+          ))
+        case preFailed @ ParPreconditionFailed(_, _) =>
+          throw SYCLKernelPreconditionNotEstablished(preFailed)
+        case ParBlockPostconditionFailed(failure, _) =>
+          kernel.blame.blame(SYCLKernelLambdaFailure(
+            KernelPostconditionFailed(failure, Right(kernel))
+          ))
+        case ParBlockMayNotThrow(_) =>
+          PanicBlame(
+            "Please don't throw exceptions from a gpgpu kernel, it's not polite."
+          ).blame(error)
+      }
   }
 
-  private case class SYCLKernelRangeInvalidBlame() extends CPPInvocationBlame("SYCL kernel constructors") {
-    private case class KernelRangeInvalidError(error: PreconditionFailed) extends UserError {
+  private case class SYCLKernelRangeInvalidBlame()
+      extends CPPInvocationBlame("SYCL kernel constructors") {
+    private case class KernelRangeInvalidError(error: PreconditionFailed)
+        extends UserError {
       override def code: String = "syclKernelRangeInvalid"
 
-      override def text: String = error.failure.node.o match {
-        case o if o.find[RangeDimensionCheck.type].isDefined => o.messageInContext("All range dimensions should be greater or equal to zero.")
-        case o if o.find[NDRangeDimensionCheck.type].isDefined => o.messageInContext(
-          "Every global range dimension should be divisible by the local range dimension at the same index," +
-            " and the local range dimension should be greater than 0 to avoid division by zero. " +
-            "All global range dimensions should be greater or equal to zero.")
-        case _ => Message.messagesInContext((error.node.o, "Precondition may not hold, since ..."), (error.failure.node.o, "... " + error.failure.descCompletion))
-      }
+      override def text: String =
+        error.failure.node.o match {
+          case o if o.find[RangeDimensionCheck.type].isDefined =>
+            o.messageInContext(
+              "All range dimensions should be greater or equal to zero."
+            )
+          case o if o.find[NDRangeDimensionCheck.type].isDefined =>
+            o.messageInContext(
+              "Every global range dimension should be divisible by the local range dimension at the same index," +
+                " and the local range dimension should be greater than 0 to avoid division by zero. " +
+                "All global range dimensions should be greater or equal to zero."
+            )
+          case _ =>
+            Message.messagesInContext(
+              (error.node.o, "Precondition may not hold, since ..."),
+              (error.failure.node.o, "... " + error.failure.descCompletion),
+            )
+        }
     }
 
-    def preconditionFailed(error: PreconditionFailed): Unit = throw KernelRangeInvalidError(error)
+    def preconditionFailed(error: PreconditionFailed): Unit =
+      throw KernelRangeInvalidError(error)
   }
 
-  private case class SYCLBufferConstructionFailed(inv: CPPInvocation[_]) extends UserError {
+  private case class SYCLBufferConstructionFailed(inv: CPPInvocation[_])
+      extends UserError {
     override def code: String = "syclBufferConstructionFailed"
 
-    override def text: String = inv.o.messageInContext(
-      "This buffer cannot be constructed because there is insufficient permission to copy and exclusively claim the hostData. " +
-      "Write permission to the hostData over the entire bufferRange is required."
-    )
+    override def text: String =
+      inv.o.messageInContext(
+        "This buffer cannot be constructed because there is insufficient permission to copy and exclusively claim the hostData. " +
+          "Write permission to the hostData over the entire bufferRange is required."
+      )
   }
 
-  private case class SYCLBufferConstructionInvocationBlame(inv: CPPInvocation[_]) extends CPPInvocationBlame("SYCL buffer constructors") {
-    override def preconditionFailed(error: PreconditionFailed): Unit = throw SYCLBufferConstructionFailed(inv)
+  private case class SYCLBufferConstructionInvocationBlame(
+      inv: CPPInvocation[_]
+  ) extends CPPInvocationBlame("SYCL buffer constructors") {
+    override def preconditionFailed(error: PreconditionFailed): Unit =
+      throw SYCLBufferConstructionFailed(inv)
   }
 
-  private case class SYCLBufferConstructionFoldFailedBlame(inv: CPPInvocation[_]) extends Blame[FoldFailed] {
-    override def blame(error: FoldFailed): Unit = throw SYCLBufferConstructionFailed(inv)
+  private case class SYCLBufferConstructionFoldFailedBlame(
+      inv: CPPInvocation[_]
+  ) extends Blame[FoldFailed] {
+    override def blame(error: FoldFailed): Unit =
+      throw SYCLBufferConstructionFailed(inv)
   }
 
-  private case class SYCLBufferDestructionFailed(bufferDecl: Variable[_], scope: CPPLifetimeScope[_]) extends UserError {
+  private case class SYCLBufferDestructionFailed(
+      bufferDecl: Variable[_],
+      scope: CPPLifetimeScope[_],
+  ) extends UserError {
     override def code: String = "syclBufferDestructionFailed"
-    override def text: String = Message.messagesInContext(
-      bufferDecl.o -> "This buffer cannot be destroyed at the end of this scope, ...",
-      scope.o -> "... because the contents of the buffer cannot be copied back to the hostData memory due to insufficient permission to the hostData at the end of this scope.",
-    )
+    override def text: String =
+      Message.messagesInContext(
+        bufferDecl.o ->
+          "This buffer cannot be destroyed at the end of this scope, ...",
+        scope.o ->
+          "... because the contents of the buffer cannot be copied back to the hostData memory due to insufficient permission to the hostData at the end of this scope.",
+      )
   }
 
-  private case class SYCLBufferDestructionInvocationBlame(bufferDecl: Variable[_], scope: CPPLifetimeScope[_]) extends CPPInvocationBlame("SYCL buffer destructors") {
-    override def preconditionFailed(error: PreconditionFailed): Unit = throw SYCLBufferDestructionFailed(bufferDecl, scope)
+  private case class SYCLBufferDestructionInvocationBlame(
+      bufferDecl: Variable[_],
+      scope: CPPLifetimeScope[_],
+  ) extends CPPInvocationBlame("SYCL buffer destructors") {
+    override def preconditionFailed(error: PreconditionFailed): Unit =
+      throw SYCLBufferDestructionFailed(bufferDecl, scope)
   }
 
-  private case class SYCLBufferDestructionUnfoldFailedBlame(bufferDecl: Variable[_], scope: CPPLifetimeScope[_]) extends Blame[UnfoldFailed] {
-    override def blame(error: UnfoldFailed): Unit = throw SYCLBufferDestructionFailed(bufferDecl, scope)
+  private case class SYCLBufferDestructionUnfoldFailedBlame(
+      bufferDecl: Variable[_],
+      scope: CPPLifetimeScope[_],
+  ) extends Blame[UnfoldFailed] {
+    override def blame(error: UnfoldFailed): Unit =
+      throw SYCLBufferDestructionFailed(bufferDecl, scope)
   }
 
-  private case class SYCLAccessorFieldInsufficientReferencePermissionBlame(local: CPPLocal[_]) extends Blame[InsufficientPermission] {
-    private case class SYCLAccessorFieldInsufficientReferencePermissionError(error: InsufficientPermission) extends UserError {
-      override def code: String = "syclAccessorFieldInsufficientReferencePermission"
+  private case class SYCLAccessorFieldInsufficientReferencePermissionBlame(
+      local: CPPLocal[_]
+  ) extends Blame[InsufficientPermission] {
+    private case class SYCLAccessorFieldInsufficientReferencePermissionError(
+        error: InsufficientPermission
+    ) extends UserError {
+      override def code: String =
+        "syclAccessorFieldInsufficientReferencePermission"
       override def text: String = local.o.messageInContext(error.descInContext)
     }
 
-    override def blame(error: InsufficientPermission): Unit = throw SYCLAccessorFieldInsufficientReferencePermissionError(error)
+    override def blame(error: InsufficientPermission): Unit =
+      throw SYCLAccessorFieldInsufficientReferencePermissionError(error)
   }
 
-  private case class SYCLAccessorRangeIndexFieldInsufficientReferencePermissionBlame(inv: CPPInvocation[_]) extends Blame[InsufficientPermission] {
-    override def blame(error: InsufficientPermission): Unit = PanicBlame(inv.o.messageInContext(s"There was not enough permission to access" +
-      s" a field containing the size of an accessor dimension. This should not be possible.")).blame(error)
+  private case class SYCLAccessorRangeIndexFieldInsufficientReferencePermissionBlame(
+      inv: CPPInvocation[_]
+  ) extends Blame[InsufficientPermission] {
+    override def blame(error: InsufficientPermission): Unit =
+      PanicBlame(inv.o.messageInContext(
+        s"There was not enough permission to access" +
+          s" a field containing the size of an accessor dimension. This should not be possible."
+      )).blame(error)
   }
 
-  private case class SYCLRequestedRangeIndexOutOfBoundsBlame(seq: LiteralSeq[_], index: Expr[_]) extends Blame[SeqBoundFailure] {
-    private case class SYCLRangeIndexOutOfBoundsError(error: SeqBoundFailure) extends UserError {
+  private case class SYCLRequestedRangeIndexOutOfBoundsBlame(
+      seq: LiteralSeq[_],
+      index: Expr[_],
+  ) extends Blame[SeqBoundFailure] {
+    private case class SYCLRangeIndexOutOfBoundsError(error: SeqBoundFailure)
+        extends UserError {
       override def code: String = "syclAccessorInsufficientReferencePermission"
-      override def text: String = index.o.messageInContext(s"This parameter is out of bounds, it should be an integer between 0 (inclusive) and ${seq.values.size} (exclusive).")
+      override def text: String =
+        index.o.messageInContext(
+          s"This parameter is out of bounds, it should be an integer between 0 (inclusive) and ${seq.values.size} (exclusive)."
+        )
     }
 
-    override def blame(error: SeqBoundFailure): Unit = throw SYCLRangeIndexOutOfBoundsError(error)
+    override def blame(error: SeqBoundFailure): Unit =
+      throw SYCLRangeIndexOutOfBoundsError(error)
   }
 
-  private case class SYCLWrongNumberOfSubscriptsForAccessor(sub: AmbiguousSubscript[_], numberOfSubs: Int, expectedNumberOfSubs: Int) extends UserError {
+  private case class SYCLWrongNumberOfSubscriptsForAccessor(
+      sub: AmbiguousSubscript[_],
+      numberOfSubs: Int,
+      expectedNumberOfSubs: Int,
+  ) extends UserError {
     override def code: String = "syclWrongNumberOfSubscriptsForAccessor"
-    override def text: String = sub.o.messageInContext(s"Only fully subscripting accessors is allowed. " +
-      s"The current subscripts are ${"[...]".repeat(numberOfSubs)}, but expected ${"[...]".repeat(expectedNumberOfSubs)}.")
+    override def text: String =
+      sub.o.messageInContext(
+        s"Only fully subscripting accessors is allowed. " +
+          s"The current subscripts are ${"[...]".repeat(numberOfSubs)}, but expected ${"[...]"
+              .repeat(expectedNumberOfSubs)}."
+      )
   }
 
-  private case class SYCLKernelRunMethodContractUnsatisfiableBlame(preCondition: UnitAccountedPredicate[_]) extends Blame[NontrivialUnsatisfiable] {
-    override def blame(error: NontrivialUnsatisfiable): Unit = error.node.o match {
-      case o if o.find[SYCLGeneratedAccessorPermissions.type].isDefined =>
-        PanicBlame(o.messageInContext("Generated permissions for this accessor are unsatisfiable, but this should not be possible.")).blame(error)
-      case _ => preCondition.o.blame(error)
-    }
+  private case class SYCLKernelRunMethodContractUnsatisfiableBlame(
+      preCondition: UnitAccountedPredicate[_]
+  ) extends Blame[NontrivialUnsatisfiable] {
+    override def blame(error: NontrivialUnsatisfiable): Unit =
+      error.node.o match {
+        case o if o.find[SYCLGeneratedAccessorPermissions.type].isDefined =>
+          PanicBlame(o.messageInContext(
+            "Generated permissions for this accessor are unsatisfiable, but this should not be possible."
+          )).blame(error)
+        case _ => preCondition.o.blame(error)
+      }
   }
 
-  private case class SYCLKernelConstructorCallableFailureBlame() extends Blame[CallableFailure] {
-    override def blame(error: CallableFailure): Unit = error match {
-      case PostconditionFailed(_, _, node) if node.o.find[SYCLGeneratedAccessorPermissions.type].isDefined =>
-        PanicBlame(node.o.messageInContext("Generated post conditions for this accessor are unsatisfiable, but this should not be possible.")).blame(error)
-      case p@PostconditionFailed(_, failure, node) => Message.messagesInContext((node.o, p.descInContext + ", since ..."), (failure.node.o, "... " + failure.descCompletion))
-      case ContextEverywhereFailedInPost(_, node) if node.o.find[SYCLGeneratedAccessorPermissions.type].isDefined =>
-        PanicBlame(node.o.messageInContext("Generated post conditions for this accessor are unsatisfiable, but this should not be possible.")).blame(error)
-      case c@ContextEverywhereFailedInPost(failure, node) => Message.messagesInContext((node.o, c.descInContext + ", since ..."), (failure.node.o, "... " + failure.descCompletion))
-      case TerminationMeasureFailed(_, _, _) => PanicBlame("This kernel class constructor should always be able to terminate.").blame(error)
-      case SignalsFailed(_, _) | ExceptionNotInSignals(_) => PanicBlame("This kernel class constructor contains no signals clause.").blame(error)
-    }
+  private case class SYCLKernelConstructorCallableFailureBlame()
+      extends Blame[CallableFailure] {
+    override def blame(error: CallableFailure): Unit =
+      error match {
+        case PostconditionFailed(_, _, node)
+            if node.o.find[SYCLGeneratedAccessorPermissions.type].isDefined =>
+          PanicBlame(node.o.messageInContext(
+            "Generated post conditions for this accessor are unsatisfiable, but this should not be possible."
+          )).blame(error)
+        case p @ PostconditionFailed(_, failure, node) =>
+          Message.messagesInContext(
+            (node.o, p.descInContext + ", since ..."),
+            (failure.node.o, "... " + failure.descCompletion),
+          )
+        case ContextEverywhereFailedInPost(_, node)
+            if node.o.find[SYCLGeneratedAccessorPermissions.type].isDefined =>
+          PanicBlame(node.o.messageInContext(
+            "Generated post conditions for this accessor are unsatisfiable, but this should not be possible."
+          )).blame(error)
+        case c @ ContextEverywhereFailedInPost(failure, node) =>
+          Message.messagesInContext(
+            (node.o, c.descInContext + ", since ..."),
+            (failure.node.o, "... " + failure.descCompletion),
+          )
+        case TerminationMeasureFailed(_, _, _) =>
+          PanicBlame(
+            "This kernel class constructor should always be able to terminate."
+          ).blame(error)
+        case SignalsFailed(_, _) | ExceptionNotInSignals(_) =>
+          PanicBlame(
+            "This kernel class constructor contains no signals clause."
+          ).blame(error)
+      }
   }
 
-  private case class SYCLKernelConstructorNontrivialUnsatisfiableBlame(commandGroupO: Origin) extends Blame[NontrivialUnsatisfiable] {
-    private case class SYCLKernelConstructorNontrivialUnsatisfiableError() extends UserError {
+  private case class SYCLKernelConstructorNontrivialUnsatisfiableBlame(
+      commandGroupO: Origin
+  ) extends Blame[NontrivialUnsatisfiable] {
+    private case class SYCLKernelConstructorNontrivialUnsatisfiableError()
+        extends UserError {
       override def code: String = "syclKernelConstructorNontrivialUnsatisfiable"
-      override def text: String = commandGroupO.messageInContext(s"The precondition of the contract of the kernel constructor generated for this command group may be unsatisfiable. If this is intentional, replace it with `requires false`.")
+      override def text: String =
+        commandGroupO.messageInContext(
+          s"The precondition of the contract of the kernel constructor generated for this command group may be unsatisfiable. If this is intentional, replace it with `requires false`."
+        )
     }
 
-    override def blame(error: NontrivialUnsatisfiable): Unit = throw SYCLKernelConstructorNontrivialUnsatisfiableError()
-  }
-
-  private class SYCLAccessorDerefBlame(accField: InstanceField[_]) extends PanicBlame(accField.o.messageInContext("There should always be enough permission to dereference the accessor field."))
-
-  private class SYCLAccessorDimensionDerefBlame(accDimField: InstanceField[_]) extends PanicBlame(accDimField.o.messageInContext("There should always be enough permission to dereference the range dimension field of an accessor."))
-
-  private class SYCLRangeDerefBlame(rangeField: InstanceField[_]) extends PanicBlame(rangeField.o.messageInContext("There should always be enough permission to dereference the range fields."))
-
-  private case class SYCLAccessorArraySubscriptErrorBlame(accSubscript: AmbiguousSubscript[_]) extends Blame[ArraySubscriptError] {
-    private case class SYCLAccessorArraySubscriptArrayInsufficientPermissionError(error: ArrayInsufficientPermission) extends UserError {
-      override def code: String = "syclAccessorArraySubscriptArrayInsufficientPermission"
-      override def text: String = accSubscript.o.messageInContext(error.descInContext)
+    override def blame(error: NontrivialUnsatisfiable): Unit =
+      throw SYCLKernelConstructorNontrivialUnsatisfiableError()
+  }
+
+  private class SYCLAccessorDerefBlame(accField: InstanceField[_])
+      extends PanicBlame(accField.o.messageInContext(
+        "There should always be enough permission to dereference the accessor field."
+      ))
+
+  private class SYCLAccessorDimensionDerefBlame(accDimField: InstanceField[_])
+      extends PanicBlame(accDimField.o.messageInContext(
+        "There should always be enough permission to dereference the range dimension field of an accessor."
+      ))
+
+  private class SYCLRangeDerefBlame(rangeField: InstanceField[_])
+      extends PanicBlame(rangeField.o.messageInContext(
+        "There should always be enough permission to dereference the range fields."
+      ))
+
+  private case class SYCLAccessorArraySubscriptErrorBlame(
+      accSubscript: AmbiguousSubscript[_]
+  ) extends Blame[ArraySubscriptError] {
+    private case class SYCLAccessorArraySubscriptArrayInsufficientPermissionError(
+        error: ArrayInsufficientPermission
+    ) extends UserError {
+      override def code: String =
+        "syclAccessorArraySubscriptArrayInsufficientPermission"
+      override def text: String =
+        accSubscript.o.messageInContext(error.descInContext)
     }
 
-    private case class SYCLAccessorArraySubscriptArrayBoundsError(error: ArrayBounds) extends UserError {
+    private case class SYCLAccessorArraySubscriptArrayBoundsError(
+        error: ArrayBounds
+    ) extends UserError {
       override def code: String = "syclAccessorArraySubscriptArrayBounds"
-      override def text: String = accSubscript.o.messageInContext(error.descInContext)
+      override def text: String =
+        accSubscript.o.messageInContext(error.descInContext)
     }
 
-    override def blame(error: ArraySubscriptError): Unit = error match {
-      case a@ArrayInsufficientPermission(_) => throw SYCLAccessorArraySubscriptArrayInsufficientPermissionError(a)
-      case ArrayNull(_) => PanicBlame(accSubscript.o.messageInContext("It is already stated in generated contracts that the accessor array is not null.")).blame(error)
-      case a@ArrayBounds(_) => throw SYCLAccessorArraySubscriptArrayBoundsError(a)
-    }
+    override def blame(error: ArraySubscriptError): Unit =
+      error match {
+        case a @ ArrayInsufficientPermission(_) =>
+          throw SYCLAccessorArraySubscriptArrayInsufficientPermissionError(a)
+        case ArrayNull(_) =>
+          PanicBlame(accSubscript.o.messageInContext(
+            "It is already stated in generated contracts that the accessor array is not null."
+          )).blame(error)
+        case a @ ArrayBounds(_) =>
+          throw SYCLAccessorArraySubscriptArrayBoundsError(a)
+      }
   }
 
-  private case class SYCLAccessorArraySubscriptLinearizeInvocationBlame(accSubscript: AmbiguousSubscript[_], accessorRef: CPPLocal[_], indices: Seq[Expr[_]]) extends Blame[InvocationFailure] {
-    private case class SYCLAccessorArraySubscriptLinearizePreconditionBlame() extends Blame[PreconditionFailed] {
-      private case class SYCLAccessorArraySubscriptLinearizePreconditionError() extends UserError {
-        override def code: String = "syclAccessorArraySubscriptLinearizePreconditionFailed"
-        override def text: String = accSubscript.o.messageInContext("One or more of the indices may be outside the bounds on the accessor. " +
-          "Try adding pre-conditions which state that the indices are within the accessor bounds, such as:\n" +
-          Seq.range(0, indices.size).map(i => s"context ${indices(i)} < ${accessorRef.name}.get_range().get($i);").mkString("\n"))
+  private case class SYCLAccessorArraySubscriptLinearizeInvocationBlame(
+      accSubscript: AmbiguousSubscript[_],
+      accessorRef: CPPLocal[_],
+      indices: Seq[Expr[_]],
+  ) extends Blame[InvocationFailure] {
+    private case class SYCLAccessorArraySubscriptLinearizePreconditionBlame()
+        extends Blame[PreconditionFailed] {
+      private case class SYCLAccessorArraySubscriptLinearizePreconditionError()
+          extends UserError {
+        override def code: String =
+          "syclAccessorArraySubscriptLinearizePreconditionFailed"
+        override def text: String =
+          accSubscript.o.messageInContext(
+            "One or more of the indices may be outside the bounds on the accessor. " +
+              "Try adding pre-conditions which state that the indices are within the accessor bounds, such as:\n" +
+              Seq.range(0, indices.size).map(i =>
+                s"context ${indices(i)} < ${accessorRef.name}.get_range().get($i);"
+              ).mkString("\n")
+          )
       }
 
-      override def blame(error: PreconditionFailed): Unit = throw SYCLAccessorArraySubscriptLinearizePreconditionError()
+      override def blame(error: PreconditionFailed): Unit =
+        throw SYCLAccessorArraySubscriptLinearizePreconditionError()
     }
 
-    override def blame(error: InvocationFailure): Unit = NoContext(SYCLAccessorArraySubscriptLinearizePreconditionBlame()).blame(error)
+    override def blame(error: InvocationFailure): Unit =
+      NoContext(SYCLAccessorArraySubscriptLinearizePreconditionBlame())
+        .blame(error)
   }
 
-  private case class SYCLBufferOutOfScopeError(accDecl: CPPLocalDeclaration[_]) extends UserError {
+  private case class SYCLBufferOutOfScopeError(accDecl: CPPLocalDeclaration[_])
+      extends UserError {
     override def code: String = "syclBufferOutOfScope"
-    override def text: String = accDecl.o.messageInContext("The buffer has to be declared in the same or higher scope as the accessor declaration.")
+    override def text: String =
+      accDecl.o.messageInContext(
+        "The buffer has to be declared in the same or higher scope as the accessor declaration."
+      )
   }
 
-  private case class SYCLPredicateFoldingNotAllowed(pred: Expr[_]) extends UserError {
+  private case class SYCLPredicateFoldingNotAllowed(pred: Expr[_])
+      extends UserError {
     override def code: String = "syclPredicateFoldingNotAllowed"
 
-    override def text: String = pred.o.messageInContext("This predicate is used internally and is thus not allowed to be (un)folded.")
+    override def text: String =
+      pred.o.messageInContext(
+        "This predicate is used internally and is thus not allowed to be (un)folded."
+      )
   }
 
-  private case class SYCLNoLocalAccessorsInBasicKernel(local: CPPLocal[_]) extends UserError {
+  private case class SYCLNoLocalAccessorsInBasicKernel(local: CPPLocal[_])
+      extends UserError {
     override def code: String = "syclNoLocalAccessorsInBasicKernel"
-    override def text: String = local.o.messageInContext("Local accessors cannot be used in basic kernels.")
+    override def text: String =
+      local.o
+        .messageInContext("Local accessors cannot be used in basic kernels.")
   }
 
-  private case class SYCLLocalAccessorArraySizeBlame(range: Expr[_]) extends Blame[ArraySizeError] {
-    private case class SYCLLocalAccessorArraySizeError(error: ArraySizeError) extends UserError {
+  private case class SYCLLocalAccessorArraySizeBlame(range: Expr[_])
+      extends Blame[ArraySizeError] {
+    private case class SYCLLocalAccessorArraySizeError(error: ArraySizeError)
+        extends UserError {
       override def code: String = "syclLocalAccessorArraySizeError"
 
-      override def text: String = range.o.messageInContext("One or more of the dimensions of the local accessor's range may be negative.")
+      override def text: String =
+        range.o.messageInContext(
+          "One or more of the dimensions of the local accessor's range may be negative."
+        )
     }
 
-    override def blame(error: ArraySizeError): Unit = throw SYCLLocalAccessorArraySizeError(error)
+    override def blame(error: ArraySizeError): Unit =
+      throw SYCLLocalAccessorArraySizeError(error)
   }
 
   private case object SYCLGeneratedAccessorPermissions extends OriginContent
 
-  private def SYCLGeneratedAccessorPermissionsOrigin(accessor: CPPLocalDeclaration[_]): Origin =
-    accessor.o.where(context = "accessor permissions").withContent(SYCLGeneratedAccessorPermissions)
+  private def SYCLGeneratedAccessorPermissionsOrigin(
+      accessor: CPPLocalDeclaration[_]
+  ): Origin =
+    accessor.o.where(context = "accessor permissions")
+      .withContent(SYCLGeneratedAccessorPermissions)
 }
 
-case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends LazyLogging {
+case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre])
+    extends LazyLogging {
   import LangCPPToCol._
   type Post = Rewritten[Pre]
   implicit val implicitRewriter: AbstractRewriter[Pre, Post] = rw
 
-  val cppFunctionSuccessor: SuccessionMap[CPPFunctionDefinition[Pre], Procedure[Post]] = SuccessionMap()
-  val cppFunctionDeclSuccessor: SuccessionMap[(CPPGlobalDeclaration[Pre], Int), Procedure[Post]] = SuccessionMap()
-  val cppNameSuccessor: SuccessionMap[CPPNameTarget[Pre], Variable[Post]] = SuccessionMap()
-  val cppGlobalNameSuccessor: SuccessionMap[CPPNameTarget[Pre], HeapVariable[Post]] = SuccessionMap()
-  val cppCurrentDefinitionParamSubstitutions: ScopedStack[Map[CPPParam[Pre], CPPParam[Pre]]] = ScopedStack()
-
-  val syclHelperFunctions: mutable.Map[String, (Seq[Expr[Post]], Blame[InvocationFailure], Origin) => FunctionInvocation[Post]] = mutable.Map.empty
-  val syclBufferTypeToHostPredicateAndProcedures: mutable.Map[Type[Post], (Predicate[Post], Procedure[Post], Procedure[Post])] = mutable.Map.empty
-  val syclRangeVariableToInitializer: mutable.Map[Variable[Post], Expr[Post]] = mutable.Map.empty
-
-  val syclBufferSuccessor: ScopedStack[mutable.Map[Variable[Post], SYCLBuffer[Post]]] = ScopedStack()
-  val syclAccessorSuccessor: mutable.Map[CPPNameTarget[Pre], SYCLAccessor[Post]] = mutable.Map.empty
-  val syclLocalAccessorVarToDimensions: mutable.Map[Variable[Post], Seq[Expr[Post]]] = mutable.Map.empty
-
-  val currentlyRunningKernels: mutable.Map[Local[Post], Seq[SYCLAccessor[Post]]] = mutable.Map.empty
-  val currentDimensionIterVars: mutable.Map[KernelScopeLevel, mutable.Buffer[IterVariable[Post]]] = mutable.Map.empty
+  val cppFunctionSuccessor
+      : SuccessionMap[CPPFunctionDefinition[Pre], Procedure[Post]] =
+    SuccessionMap()
+  val cppFunctionDeclSuccessor
+      : SuccessionMap[(CPPGlobalDeclaration[Pre], Int), Procedure[Post]] =
+    SuccessionMap()
+  val cppNameSuccessor: SuccessionMap[CPPNameTarget[Pre], Variable[Post]] =
+    SuccessionMap()
+  val cppGlobalNameSuccessor
+      : SuccessionMap[CPPNameTarget[Pre], HeapVariable[Post]] = SuccessionMap()
+  val cppCurrentDefinitionParamSubstitutions
+      : ScopedStack[Map[CPPParam[Pre], CPPParam[Pre]]] = ScopedStack()
+
+  val syclHelperFunctions: mutable.Map[
+    String,
+    (Seq[Expr[Post]], Blame[InvocationFailure], Origin) => FunctionInvocation[
+      Post
+    ],
+  ] = mutable.Map.empty
+  val syclBufferTypeToHostPredicateAndProcedures: mutable.Map[Type[
+    Post
+  ], (Predicate[Post], Procedure[Post], Procedure[Post])] = mutable.Map.empty
+  val syclRangeVariableToInitializer: mutable.Map[Variable[Post], Expr[Post]] =
+    mutable.Map.empty
+
+  val syclBufferSuccessor
+      : ScopedStack[mutable.Map[Variable[Post], SYCLBuffer[Post]]] =
+    ScopedStack()
+  val syclAccessorSuccessor
+      : mutable.Map[CPPNameTarget[Pre], SYCLAccessor[Post]] = mutable.Map.empty
+  val syclLocalAccessorVarToDimensions
+      : mutable.Map[Variable[Post], Seq[Expr[Post]]] = mutable.Map.empty
+
+  val currentlyRunningKernels
+      : mutable.Map[Local[Post], Seq[SYCLAccessor[Post]]] = mutable.Map.empty
+  val currentDimensionIterVars
+      : mutable.Map[KernelScopeLevel, mutable.Buffer[IterVariable[Post]]] =
+    mutable.Map.empty
   var currentKernelType: Option[KernelType] = None
   var currentThis: Option[Expr[Post]] = None
 
@@ -417,64 +719,127 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
   private case class LocalScope() extends KernelScopeLevel("LOCAL_ID")
   private case class GroupScope() extends KernelScopeLevel("GROUP_ID")
 
-  sealed abstract class KernelType(rangeFields: Seq[InstanceField[Post]], rangeValues: Seq[Expr[Post]]) {
-    def getRangeSizeChecksForConstructor(params: mutable.Buffer[Variable[Post]]): Expr[Post]
-    def getConstructorPostConditions(result: Result[Post], params: mutable.Buffer[Variable[Post]]): Seq[Expr[Post]]
+  sealed abstract class KernelType(
+      rangeFields: Seq[InstanceField[Post]],
+      rangeValues: Seq[Expr[Post]],
+  ) {
+    def getRangeSizeChecksForConstructor(
+        params: mutable.Buffer[Variable[Post]]
+    ): Expr[Post]
+    def getConstructorPostConditions(
+        result: Result[Post],
+        params: mutable.Buffer[Variable[Post]],
+    ): Seq[Expr[Post]]
 
     def getRangeFields: Seq[InstanceField[Post]] = rangeFields
     def getRangeValues: Seq[Expr[Post]] = rangeValues
-    def getRangeFieldPermissions(thisObj: Expr[Post]): Seq[Expr[Post]] = rangeFields.map(f => {
-      implicit val o: Origin = f.o
-      Star(Perm[Post](FieldLocation[Post](thisObj, f.ref), ReadPerm()), Deref[Post](thisObj, f.ref)(new SYCLRangeDerefBlame(f)) >= c_const(0))
-    })
+    def getRangeFieldPermissions(thisObj: Expr[Post]): Seq[Expr[Post]] =
+      rangeFields.map(f => {
+        implicit val o: Origin = f.o
+        Star(
+          Perm[Post](FieldLocation[Post](thisObj, f.ref), ReadPerm()),
+          Deref[Post](thisObj, f.ref)(new SYCLRangeDerefBlame(f)) >= c_const(0),
+        )
+      })
   }
-  private case class BasicKernel(rangeO: Origin, rangeFields: Seq[InstanceField[Post]], rangeValues: Seq[Expr[Post]]) extends KernelType(rangeFields, rangeValues) {
-    override def getRangeSizeChecksForConstructor(params: mutable.Buffer[Variable[Post]]): Expr[Post] = foldStar(params.indices.map(i => {
-      implicit val o: Origin = RangeDimensionCheckOrigin(params(i).o)
-      Local[Post](params(i).ref) >= c_const(0)
-    }))(RangeDimensionCheckOrigin(rangeO))
-
-    override def getConstructorPostConditions(result: Result[Post], params: mutable.Buffer[Variable[Post]]): Seq[Expr[Post]] = params.indices.map(i => {
-      implicit val o: Origin = params(i).o
-      Star(
-        Perm(FieldLocation[Post](result, rangeFields(i).ref), ReadPerm()),
-        Deref[Post](result, rangeFields(i).ref)(new SYCLRangeDerefBlame(rangeFields(i))) === Local[Post](params(i).ref)
-      )
-    })
+  private case class BasicKernel(
+      rangeO: Origin,
+      rangeFields: Seq[InstanceField[Post]],
+      rangeValues: Seq[Expr[Post]],
+  ) extends KernelType(rangeFields, rangeValues) {
+    override def getRangeSizeChecksForConstructor(
+        params: mutable.Buffer[Variable[Post]]
+    ): Expr[Post] =
+      foldStar(params.indices.map(i => {
+        implicit val o: Origin = RangeDimensionCheckOrigin(params(i).o)
+        Local[Post](params(i).ref) >= c_const(0)
+      }))(RangeDimensionCheckOrigin(rangeO))
+
+    override def getConstructorPostConditions(
+        result: Result[Post],
+        params: mutable.Buffer[Variable[Post]],
+    ): Seq[Expr[Post]] =
+      params.indices.map(i => {
+        implicit val o: Origin = params(i).o
+        Star(
+          Perm(FieldLocation[Post](result, rangeFields(i).ref), ReadPerm()),
+          Deref[Post](result, rangeFields(i).ref)(new SYCLRangeDerefBlame(
+            rangeFields(i)
+          )) === Local[Post](params(i).ref),
+        )
+      })
   }
-  private case class NDRangeKernel(rangeO: Origin, rangeFields: Seq[InstanceField[Post]], rangeValues: Seq[Expr[Post]]) extends KernelType(rangeFields, rangeValues) {
-    override def getRangeSizeChecksForConstructor(params: mutable.Buffer[Variable[Post]]): Expr[Post] = {
+  private case class NDRangeKernel(
+      rangeO: Origin,
+      rangeFields: Seq[InstanceField[Post]],
+      rangeValues: Seq[Expr[Post]],
+  ) extends KernelType(rangeFields, rangeValues) {
+    override def getRangeSizeChecksForConstructor(
+        params: mutable.Buffer[Variable[Post]]
+    ): Expr[Post] = {
       // Order of rangeFields is group0, local0, group1, local1, ...
       // Order of params is global0, local0, global1, local1, ...
       foldStar(Seq.range(0, params.size, 2).map(i => {
         implicit val o: Origin = NDRangeDimensionCheckOrigin(rangeO, Some(i))
-          (Local[Post](params(i).ref) >= c_const(0)) &&
-          (Local[Post](params(i+1).ref) > c_const(0)) &&
-          (Mod(Local[Post](params(i).ref), Local[Post](params(i+1).ref))(ImpossibleDivByZeroBlame()) === c_const(0))
+        (Local[Post](params(i).ref) >= c_const(0)) &&
+        (Local[Post](params(i + 1).ref) > c_const(0)) &&
+        (Mod(Local[Post](params(i).ref), Local[Post](params(i + 1).ref))(
+          ImpossibleDivByZeroBlame()
+        ) === c_const(0))
       }))(NDRangeDimensionCheckOrigin(rangeO))
     }
 
-    override def getConstructorPostConditions(result: Result[Post], params: mutable.Buffer[Variable[Post]]): Seq[Expr[Post]] = {
+    override def getConstructorPostConditions(
+        result: Result[Post],
+        params: mutable.Buffer[Variable[Post]],
+    ): Seq[Expr[Post]] = {
       // Order of rangeFields is group0, local0, group1, local1, ...
       // Order of params is global0, local0, global1, local1, ...
       Seq.range(0, rangeFields.size, 2).map(i => {
         implicit val o: Origin = params(i).o
         foldStar(Seq(
           Perm(FieldLocation[Post](result, rangeFields(i).ref), ReadPerm()),
-          Deref[Post](result, rangeFields(i).ref)(new SYCLRangeDerefBlame(rangeFields(i))) === FloorDiv(Local[Post](params(i).ref), Local[Post](params(i+1).ref))(ImpossibleDivByZeroBlame()),
-          Perm(FieldLocation[Post](result, rangeFields(i+1).ref), ReadPerm()),
-          Deref[Post](result, rangeFields(i+1).ref)(new SYCLRangeDerefBlame(rangeFields(i+1))) === Local[Post](params(i+1).ref),
-          Deref[Post](result, rangeFields(i).ref)(new SYCLRangeDerefBlame(rangeFields(i))) * Deref[Post](result, rangeFields(i+1).ref)(new SYCLRangeDerefBlame(rangeFields(i+1))) === Local[Post](params(i).ref)
-        ))}
-      )
+          Deref[Post](result, rangeFields(i).ref)(new SYCLRangeDerefBlame(
+            rangeFields(i)
+          )) === FloorDiv(
+            Local[Post](params(i).ref),
+            Local[Post](params(i + 1).ref),
+          )(ImpossibleDivByZeroBlame()),
+          Perm(FieldLocation[Post](result, rangeFields(i + 1).ref), ReadPerm()),
+          Deref[Post](result, rangeFields(i + 1).ref)(new SYCLRangeDerefBlame(
+            rangeFields(i + 1)
+          )) === Local[Post](params(i + 1).ref),
+          Deref[Post](result, rangeFields(i).ref)(new SYCLRangeDerefBlame(
+            rangeFields(i)
+          )) * Deref[Post](result, rangeFields(i + 1).ref)(
+            new SYCLRangeDerefBlame(rangeFields(i + 1))
+          ) === Local[Post](params(i).ref),
+        ))
+      })
     }
   }
 
-  case class SYCLBuffer[Post](hostData: Expr[Post], generatedVar: Variable[Post], range: SYCLRange[Post], typ: SYCLTBuffer[Post])(implicit val o: Origin)
-  case class SYCLAccessor[Post](buffer: SYCLBuffer[Post], accessMode: SYCLAccessMode[Post], instanceField: InstanceField[Post], rangeIndexFields: Seq[InstanceField[Post]])(implicit val o: Origin)
-
-  private def getFromAll[K, V](stack: ScopedStack[mutable.Map[K, V]], key: K): Option[V] = {
-    stack.foreach(map => { if (map.contains(key)) return Some(map(key)) })
+  case class SYCLBuffer[Post](
+      hostData: Expr[Post],
+      generatedVar: Variable[Post],
+      range: SYCLRange[Post],
+      typ: SYCLTBuffer[Post],
+  )(implicit val o: Origin)
+  case class SYCLAccessor[Post](
+      buffer: SYCLBuffer[Post],
+      accessMode: SYCLAccessMode[Post],
+      instanceField: InstanceField[Post],
+      rangeIndexFields: Seq[InstanceField[Post]],
+  )(implicit val o: Origin)
+
+  private def getFromAll[K, V](
+      stack: ScopedStack[mutable.Map[K, V]],
+      key: K,
+  ): Option[V] = {
+    stack.foreach(map => {
+      if (map.contains(key))
+        return Some(map(key))
+    })
     None
   }
 
@@ -484,10 +849,13 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
 
   def rewriteParam(cppParam: CPPParam[Pre]): Unit = {
     cppParam.drop()
-    val varO = cppParam.o.where(name = CPP.getDeclaratorInfo(cppParam.declarator).name)
+    val varO = cppParam.o
+      .where(name = CPP.getDeclaratorInfo(cppParam.declarator).name)
 
-    val v = new Variable[Post](cppParam.specifiers.collectFirst
-      { case t: CPPSpecificationType[Pre] => rw.dispatch(t.t) }.get)(varO)
+    val v =
+      new Variable[Post](cppParam.specifiers.collectFirst {
+        case t: CPPSpecificationType[Pre] => rw.dispatch(t.t)
+      }.get)(varO)
     cppNameSuccessor(RefCPPParam(cppParam)) = v
     rw.variables.declare(v)
   }
@@ -496,16 +864,24 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
     throw LambdaDefinitionUnsupported(lambda)
   }
 
-  def checkPredicateFoldingAllowed(predRes: Expr[Pre]): Unit = predRes match {
-    case CPPInvocation(CPPLocal("sycl::buffer::exclusive_hostData_access", Seq()), _, _, _) => throw SYCLPredicateFoldingNotAllowed(predRes)
-    case _ =>
-  }
+  def checkPredicateFoldingAllowed(predRes: Expr[Pre]): Unit =
+    predRes match {
+      case CPPInvocation(
+            CPPLocal("sycl::buffer::exclusive_hostData_access", Seq()),
+            _,
+            _,
+            _,
+          ) =>
+        throw SYCLPredicateFoldingNotAllowed(predRes)
+      case _ =>
+    }
 
   def storeIfSYCLFunction(f: Function[Pre]): Unit = {
     if (f.o.getPreferredNameOrElse().snake.startsWith("sycl")) {
       syclHelperFunctions.put(
         f.o.getPreferredNameOrElse().snake,
-        (args: Seq[Expr[Post]], blame: Blame[InvocationFailure], o: Origin) => FunctionInvocation[Post](rw.succ(f), args, Nil, Nil, Nil)(blame)(o)
+        (args: Seq[Expr[Post]], blame: Blame[InvocationFailure], o: Origin) =>
+          FunctionInvocation[Post](rw.succ(f), args, Nil, Nil, Nil)(blame)(o),
       )
     }
   }
@@ -514,39 +890,45 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
     func.drop()
     val info = CPP.getDeclaratorInfo(func.declarator)
     val params = info.params.get
-    val returnType = func.specs.collectFirst { case t: CPPSpecificationType[Pre] => rw.dispatch(t.t) }.get
-
-    val (contract, subs: Map[CPPParam[Pre], CPPParam[Pre]]) = func.ref match {
-      case Some(RefCPPGlobalDeclaration(decl, idx)) if decl.decl.contract.nonEmpty =>
-        if (func.contract.nonEmpty) throw CPPDoubleContracted(decl, func)
-        val declParams = CPP.getDeclaratorInfo(decl.decl.inits(idx).decl).params.get
-        (decl.decl.contract, declParams.zip(params).toMap)
-      case _ =>
-        (func.contract, Map.empty)
-    }
+    val returnType =
+      func.specs.collectFirst { case t: CPPSpecificationType[Pre] =>
+        rw.dispatch(t.t)
+      }.get
+
+    val (contract, subs: Map[CPPParam[Pre], CPPParam[Pre]]) =
+      func.ref match {
+        case Some(RefCPPGlobalDeclaration(decl, idx))
+            if decl.decl.contract.nonEmpty =>
+          if (func.contract.nonEmpty)
+            throw CPPDoubleContracted(decl, func)
+          val declParams =
+            CPP.getDeclaratorInfo(decl.decl.inits(idx).decl).params.get
+          (decl.decl.contract, declParams.zip(params).toMap)
+        case _ => (func.contract, Map.empty)
+      }
 
     val namedO = func.o.where(name = info.name)
-    val rewrittenContract = rw.dispatch(contract) // First rewrite contract to register given and yields variables
+    val rewrittenContract = rw
+      .dispatch(
+        contract
+      ) // First rewrite contract to register given and yields variables
 
     val proc =
       cppCurrentDefinitionParamSubstitutions.having(subs) {
-        rw.globalDeclarations.declare(
-          {
-            val rewrittenParams = rw.variables.collect {
-              params.foreach(rw.dispatch)
-            }._1
-            rw.labelDecls.scope {
-              new Procedure[Post](
-                returnType = returnType,
-                args = rewrittenParams,
-                outArgs = Nil,
-                typeArgs = Nil,
-                body = Some(rw.dispatch(func.body)),
-                contract = rewrittenContract,
-              )(func.blame)(namedO)
-            }
+        rw.globalDeclarations.declare({
+          val rewrittenParams =
+            rw.variables.collect { params.foreach(rw.dispatch) }._1
+          rw.labelDecls.scope {
+            new Procedure[Post](
+              returnType = returnType,
+              args = rewrittenParams,
+              outArgs = Nil,
+              typeArgs = Nil,
+              body = Some(rw.dispatch(func.body)),
+              contract = rewrittenContract,
+            )(func.blame)(namedO)
           }
-        )
+        })
       }
 
     cppFunctionSuccessor(func) = proc
@@ -559,7 +941,10 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
   }
 
   def rewriteGlobalDecl(decl: CPPGlobalDeclaration[Pre]): Unit = {
-    val t = decl.decl.specs.collectFirst { case t: CPPSpecificationType[Pre] => rw.dispatch(t.t) }.get
+    val t =
+      decl.decl.specs.collectFirst { case t: CPPSpecificationType[Pre] =>
+        rw.dispatch(t.t)
+      }.get
     for ((init, idx) <- decl.decl.inits.zipWithIndex if init.ref.isEmpty) {
       // If the reference is empty, skip the declaration: the definition is used instead.
       val info = CPP.getDeclaratorInfo(init.decl)
@@ -570,24 +955,28 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
         val namedO = init.o.where(name = info.name)
         info.params match {
           case Some(params) =>
-            cppFunctionDeclSuccessor((decl, idx)) = rw.globalDeclarations.declare(
-              new Procedure[Post](
-                returnType = t,
-                args = rw.variables.collect {
-                  params.foreach(rw.dispatch)
-                }._1,
-                outArgs = Nil,
-                typeArgs = Nil,
-                body = None,
-                contract = rw.dispatch(decl.decl.contract),
-                inline = decl.decl.specs.collectFirst { case CPPInline() => () }.nonEmpty,
-                pure = decl.decl.specs.collectFirst { case CPPPure() => () }.nonEmpty,
-              )(AbstractApplicable)(namedO)
-            )
+            cppFunctionDeclSuccessor((decl, idx)) = rw.globalDeclarations
+              .declare(
+                new Procedure[Post](
+                  returnType = t,
+                  args =
+                    rw.variables.collect { params.foreach(rw.dispatch) }._1,
+                  outArgs = Nil,
+                  typeArgs = Nil,
+                  body = None,
+                  contract = rw.dispatch(decl.decl.contract),
+                  inline =
+                    decl.decl.specs.collectFirst { case CPPInline() => () }
+                      .nonEmpty,
+                  pure =
+                    decl.decl.specs.collectFirst { case CPPPure() => () }
+                      .nonEmpty,
+                )(AbstractApplicable)(namedO)
+              )
             declared = true
           case None =>
-            cppGlobalNameSuccessor(RefCPPGlobalDeclaration(decl, idx)) =
-              rw.globalDeclarations.declare(new HeapVariable(t)(namedO))
+            cppGlobalNameSuccessor(RefCPPGlobalDeclaration(decl, idx)) = rw
+              .globalDeclarations.declare(new HeapVariable(t)(namedO))
         }
       }
     }
@@ -596,12 +985,16 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
   def rewriteLocalDecl(decl: CPPLocalDeclaration[Pre]): Statement[Post] = {
     decl.drop()
 
-    val isArray = decl.decl.specs.collectFirst { case CPPSpecificationType(_: CPPTArray[Pre]) => () }.isDefined
-    if(isArray){
-      return rewriteArrayDeclaration(decl)
-    }
+    val isArray =
+      decl.decl.specs.collectFirst {
+        case CPPSpecificationType(_: CPPTArray[Pre]) => ()
+      }.isDefined
+    if (isArray) { return rewriteArrayDeclaration(decl) }
 
-    val t = decl.decl.specs.collectFirst { case t: CPPSpecificationType[Pre] => rw.dispatch(t.t) }.get
+    val t =
+      decl.decl.specs.collectFirst { case t: CPPSpecificationType[Pre] =>
+        rw.dispatch(t.t)
+      }.get
     decl.decl.specs.foreach {
       case _: CPPSpecificationType[Pre] =>
       case _ => throw WrongCPPType(decl)
@@ -620,7 +1013,8 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
     if (init.init.isDefined) {
       val preValue = init.init.get
       (t, preValue) match {
-        case (SYCLTEvent(), inv: CPPInvocation[Pre]) if inv.ref.get.name == "sycl::queue::submit" =>
+        case (SYCLTEvent(), inv: CPPInvocation[Pre])
+            if inv.ref.get.name == "sycl::queue::submit" =>
           val (block, syclEventRef) = rewriteSYCLQueueSubmit(inv)
           v = syclEventRef
           result = block
@@ -629,34 +1023,46 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
           val postValue = rw.dispatch(preValue)
           v = new Variable(postValue.t)(varO)
           result = Block(Seq(LocalDecl(v), assignLocal(v.get, postValue)))
-        case (SYCLTBuffer(_, _), inv: CPPInvocation[Pre]) if inv.ref.get.isInstanceOf[RefSYCLConstructorDefinition[Pre]] =>
+        case (SYCLTBuffer(_, _), inv: CPPInvocation[Pre])
+            if inv.ref.get.isInstanceOf[RefSYCLConstructorDefinition[Pre]] =>
           // Buffer constructor
           if (!t.superTypeOf(rw.dispatch(inv.t))) {
             throw UnexpectedCPPTypeError(t, inv)
           }
-          val (block, syclBufferRef) = rewriteSYCLBufferConstruction(inv, Some(varO))
+          val (block, syclBufferRef) = rewriteSYCLBufferConstruction(
+            inv,
+            Some(varO),
+          )
           v = syclBufferRef
           result = block
-        case (SYCLTLocalAccessor(_, _), inv: CPPInvocation[Pre]) if inv.ref.get.isInstanceOf[RefSYCLConstructorDefinition[Pre]] =>
+        case (SYCLTLocalAccessor(_, _), inv: CPPInvocation[Pre])
+            if inv.ref.get.isInstanceOf[RefSYCLConstructorDefinition[Pre]] =>
           // Local accessor constructor
           if (!t.superTypeOf(rw.dispatch(inv.t))) {
             throw UnexpectedCPPTypeError(t, inv)
           }
-          val newValue: NewArray[Post] = rw.dispatch(preValue) match {
-            case arr: NewArray[Post] => arr
-            case _ => throw Unreachable("A SYCL local accessor should only be able to be initialized with a constructor that returns a new COL array.")
-          }
-          v = new Variable(newValue.t)(v.o) // new type should be COL array, not local accessor, so update
+          val newValue: NewArray[Post] =
+            rw.dispatch(preValue) match {
+              case arr: NewArray[Post] => arr
+              case _ =>
+                throw Unreachable(
+                  "A SYCL local accessor should only be able to be initialized with a constructor that returns a new COL array."
+                )
+            }
+          v =
+            new Variable(newValue.t)(
+              v.o
+            ) // new type should be COL array, not local accessor, so update
           syclLocalAccessorVarToDimensions(v) = newValue.dims
           result = Block(Seq(LocalDecl(v), assignLocal(v.get, newValue)))
-        case (SYCLTRange(_), _) |  (SYCLTNDRange(_), _) => syclRangeVariableToInitializer(v) = rw.dispatch(preValue)
-        case _ => result = Block(Seq(LocalDecl(v), assignLocal(v.get, rw.dispatch(preValue))))
-      }
-    } else {
-      t match {
-        case _ => result = LocalDecl(v)
+        case (SYCLTRange(_), _) | (SYCLTNDRange(_), _) =>
+          syclRangeVariableToInitializer(v) = rw.dispatch(preValue)
+        case _ =>
+          result = Block(
+            Seq(LocalDecl(v), assignLocal(v.get, rw.dispatch(preValue)))
+          )
       }
-    }
+    } else { t match { case _ => result = LocalDecl(v) } }
     cppNameSuccessor(RefCPPLocalDeclaration(decl, 0)) = v
     result
   }
@@ -668,24 +1074,36 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
       case _: SpecInvocationTarget[Pre] => throw NotAValue(local)
       case ref: RefCPPParam[Pre] =>
         if (cppCurrentDefinitionParamSubstitutions.nonEmpty)
-          Local(cppNameSuccessor.ref(RefCPPParam(cppCurrentDefinitionParamSubstitutions.top.getOrElse(ref.decl, ref.decl))))
+          Local(cppNameSuccessor.ref(RefCPPParam(
+            cppCurrentDefinitionParamSubstitutions.top
+              .getOrElse(ref.decl, ref.decl)
+          )))
         else
           Local(cppNameSuccessor.ref(ref))
       case RefCPPFunctionDefinition(_) => throw NotAValue(local)
-      case ref@RefCPPGlobalDeclaration(decl, initIdx) =>
+      case ref @ RefCPPGlobalDeclaration(decl, initIdx) =>
         CPP.getDeclaratorInfo(decl.decl.inits(initIdx).decl).params match {
-          case None => DerefHeapVariable[Post](cppGlobalNameSuccessor.ref(ref))(local.blame)
+          case None =>
+            DerefHeapVariable[Post](cppGlobalNameSuccessor.ref(ref))(
+              local.blame
+            )
           case Some(_) => throw NotAValue(local)
         }
-      case ref: RefCPPLocalDeclaration[Pre] => CPP.unwrappedType(local.t) match {
-        case _: SYCLTAccessor[Pre] =>
-          // Referencing an accessor variable can only be done in kernels, otherwise an error will already have been thrown
-          val accessor = syclAccessorSuccessor(ref)
-          Deref[Post](currentThis.get, accessor.instanceField.ref)(SYCLAccessorFieldInsufficientReferencePermissionBlame(local))
-        case _: SYCLTLocalAccessor[Pre] if currentKernelType.get.isInstanceOf[BasicKernel] => throw SYCLNoLocalAccessorsInBasicKernel(local)
-        case _: SYCLTRange[Pre] | _: SYCLTNDRange[Pre] => syclRangeVariableToInitializer(cppNameSuccessor(ref))
-        case _ => Local(cppNameSuccessor.ref(ref))
-      }
+      case ref: RefCPPLocalDeclaration[Pre] =>
+        CPP.unwrappedType(local.t) match {
+          case _: SYCLTAccessor[Pre] =>
+            // Referencing an accessor variable can only be done in kernels, otherwise an error will already have been thrown
+            val accessor = syclAccessorSuccessor(ref)
+            Deref[Post](currentThis.get, accessor.instanceField.ref)(
+              SYCLAccessorFieldInsufficientReferencePermissionBlame(local)
+            )
+          case _: SYCLTLocalAccessor[Pre]
+              if currentKernelType.get.isInstanceOf[BasicKernel] =>
+            throw SYCLNoLocalAccessorsInBasicKernel(local)
+          case _: SYCLTRange[Pre] | _: SYCLTNDRange[Pre] =>
+            syclRangeVariableToInitializer(cppNameSuccessor(ref))
+          case _ => Local(cppNameSuccessor.ref(ref))
+        }
       case RefSYCLAccessMode(decl) => rw.dispatch(decl)
       case RefSYCLConstructorDefinition(_) => throw NotAValue(local)
     }
@@ -693,9 +1111,20 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
 
   def preAssignExpr(preAssign: PreAssignExpression[Pre]): Expr[Post] = {
     CPP.unwrappedType(preAssign.target.t) match {
-      case _: SYCLTEvent[Pre] => throw SYCLReassigningOfVariableUnsupported("event", "EventVariable", preAssign)
-      case _: SYCLTBuffer[Pre] => throw SYCLReassigningOfVariableUnsupported("buffer", "Buffer", preAssign)
-      case SYCLTAccessor(_, _, true) => throw SYCLReassigningOfReadonlyAccessor(preAssign)
+      case _: SYCLTEvent[Pre] =>
+        throw SYCLReassigningOfVariableUnsupported(
+          "event",
+          "EventVariable",
+          preAssign,
+        )
+      case _: SYCLTBuffer[Pre] =>
+        throw SYCLReassigningOfVariableUnsupported(
+          "buffer",
+          "Buffer",
+          preAssign,
+        )
+      case SYCLTAccessor(_, _, true) =>
+        throw SYCLReassigningOfReadonlyAccessor(preAssign)
       case _ => rw.rewriteDefault(preAssign)
     }
   }
@@ -703,16 +1132,31 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
   def invocationStatement(eval: Eval[Pre]): Statement[Post] = {
     val inv = eval.expr.asInstanceOf[CPPInvocation[Pre]]
     inv.ref.get.name match {
-      case "sycl::event::wait" if inv.applicable.isInstanceOf[CPPClassMethodOrFieldAccess[Pre]] =>
+      case "sycl::event::wait"
+          if inv.applicable.isInstanceOf[CPPClassMethodOrFieldAccess[Pre]] =>
         implicit val o: Origin = inv.o
-        rw.dispatch(inv.applicable.asInstanceOf[CPPClassMethodOrFieldAccess[Pre]].classInstance) match {
+        rw.dispatch(
+          inv.applicable.asInstanceOf[CPPClassMethodOrFieldAccess[Pre]]
+            .classInstance
+        ) match {
           case localVar: Local[Post] =>
-            val accessors: Seq[SYCLAccessor[Post]] = currentlyRunningKernels.getOrElse(localVar, throw Unreachable(inv.o.messageInContext("Could not find the event variable in the stored running kernels.")))
+            val accessors: Seq[SYCLAccessor[Post]] = currentlyRunningKernels
+              .getOrElse(
+                localVar,
+                throw Unreachable(inv.o.messageInContext(
+                  "Could not find the event variable in the stored running kernels."
+                )),
+              )
             syclKernelTermination(localVar, accessors)
-          case _ => throw Unreachable(inv.o.messageInContext("The object on which the wait() method was called is not a locally declared SYCL event."))
+          case _ =>
+            throw Unreachable(inv.o.messageInContext(
+              "The object on which the wait() method was called is not a locally declared SYCL event."
+            ))
         }
       case "sycl::queue::submit" => rewriteSYCLQueueSubmit(inv)._1
-      case _ if inv.ref.get.isInstanceOf[RefSYCLConstructorDefinition[Pre]] && inv.t.isInstanceOf[SYCLTBuffer[Pre]] =>
+      case _
+          if inv.ref.get.isInstanceOf[RefSYCLConstructorDefinition[Pre]] &&
+            inv.t.isInstanceOf[SYCLTBuffer[Pre]] =>
         rewriteSYCLBufferConstruction(inv)._1
       case _ => rw.rewriteDefault(eval)
     }
@@ -723,204 +1167,375 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
     implicit val o: Origin = inv.o
     inv.ref.get match {
       case spec: SpecInvocationTarget[Pre] =>
-        rw.specInvocation(None, spec, Nil, args, givenMap, yields, inv, inv.blame)
+        rw.specInvocation(
+          None,
+          spec,
+          Nil,
+          args,
+          givenMap,
+          yields,
+          inv,
+          inv.blame,
+        )
       case ref: RefCPPFunctionDefinition[Pre] =>
-        ProcedureInvocation[Post](cppFunctionSuccessor.ref(ref.decl), args.map(rw.dispatch), Nil, Nil,
+        ProcedureInvocation[Post](
+          cppFunctionSuccessor.ref(ref.decl),
+          args.map(rw.dispatch),
+          Nil,
+          Nil,
           givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) })(inv.blame)
+          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
+        )(inv.blame)
       case RefCPPLambdaDefinition(_) => ???
       case e: RefCPPGlobalDeclaration[Pre] => globalInvocation(e, inv)
-      case RefSYCLConstructorDefinition(typ) => syclConstructorInvocation(typ, inv)
+      case RefSYCLConstructorDefinition(typ) =>
+        syclConstructorInvocation(typ, inv)
     }
   }
 
-  def globalInvocation(e: RefCPPGlobalDeclaration[Pre], inv: CPPInvocation[Pre]): Expr[Post] = {
+  def globalInvocation(
+      e: RefCPPGlobalDeclaration[Pre],
+      inv: CPPInvocation[Pre],
+  ): Expr[Post] = {
     val CPPInvocation(applicable, args, givenMap, yields) = inv
     val RefCPPGlobalDeclaration(decls, initIdx) = e
     implicit val o: Origin = inv.o
 
-    val classInstance: Option[Expr[Post]] = applicable match {
-      case CPPClassMethodOrFieldAccess(obj, _) => Some(rw.dispatch(obj))
-      case _ => None
-    }
+    val classInstance: Option[Expr[Post]] =
+      applicable match {
+        case CPPClassMethodOrFieldAccess(obj, _) => Some(rw.dispatch(obj))
+        case _ => None
+      }
 
     e.name match {
-      case "sycl::item::get_id" if args.length == 1 => getSimpleWorkItemId(inv, GlobalScope())
-      case "sycl::item::get_range" if args.length == 1 => getSimpleWorkItemRange(inv, GlobalScope())
-      case "sycl::item::get_linear_id" => getSimpleWorkItemLinearId(inv, GlobalScope())
-      case "sycl::nd_item::get_local_id" if args.length == 1 => getSimpleWorkItemId(inv, LocalScope())
-      case "sycl::nd_item::get_local_range" if args.length == 1 => getSimpleWorkItemRange(inv, LocalScope())
-      case "sycl::nd_item::get_local_linear_id" => getSimpleWorkItemLinearId(inv, LocalScope())
-      case "sycl::nd_item::get_group" if args.length == 1 => getSimpleWorkItemId(inv, GroupScope())
-      case "sycl::nd_item::get_group_range" if args.length == 1 => getSimpleWorkItemRange(inv, GroupScope())
-      case "sycl::nd_item::get_group_linear_id" => getSimpleWorkItemLinearId(inv, GroupScope())
-      case "sycl::nd_item::get_global_id" if args.length == 1 => getGlobalWorkItemId(inv)
-      case "sycl::nd_item::get_global_range" if args.length == 1 => getGlobalWorkItemRange(inv)
-      case "sycl::nd_item::get_global_linear_id" => getGlobalWorkItemLinearId(inv)
-      case "sycl::accessor::get_range" => classInstance match {
-        case Some(Deref(_, ref)) =>
-          val accessor = syclAccessorSuccessor.values.find(acc => ref.decl.equals(acc.instanceField)).get
-          LiteralSeq[Post](TCInt(), accessor.rangeIndexFields.map(f => Deref[Post](currentThis.get, f.ref)(SYCLAccessorRangeIndexFieldInsufficientReferencePermissionBlame(inv))))
-        case _ => throw NotApplicable(inv)
-      }
-      case "sycl::local_accessor::get_range" => classInstance match {
-        case Some(Local(ref)) =>
-          val dimensions = syclLocalAccessorVarToDimensions(ref.decl)
-          LiteralSeq[Post](TCInt(), dimensions)
-        case _ => throw NotApplicable(inv)
-      }
-      case "sycl::range::get" => (classInstance, args) match {
-        case (Some(seq: LiteralSeq[Post]), Seq(arg)) => SeqSubscript(seq, rw.dispatch(arg))(SYCLRequestedRangeIndexOutOfBoundsBlame(seq, arg)) // Range coming from calling get_range() on a (local)accessor
-        case _ => throw NotApplicable(inv)
-      }
+      case "sycl::item::get_id" if args.length == 1 =>
+        getSimpleWorkItemId(inv, GlobalScope())
+      case "sycl::item::get_range" if args.length == 1 =>
+        getSimpleWorkItemRange(inv, GlobalScope())
+      case "sycl::item::get_linear_id" =>
+        getSimpleWorkItemLinearId(inv, GlobalScope())
+      case "sycl::nd_item::get_local_id" if args.length == 1 =>
+        getSimpleWorkItemId(inv, LocalScope())
+      case "sycl::nd_item::get_local_range" if args.length == 1 =>
+        getSimpleWorkItemRange(inv, LocalScope())
+      case "sycl::nd_item::get_local_linear_id" =>
+        getSimpleWorkItemLinearId(inv, LocalScope())
+      case "sycl::nd_item::get_group" if args.length == 1 =>
+        getSimpleWorkItemId(inv, GroupScope())
+      case "sycl::nd_item::get_group_range" if args.length == 1 =>
+        getSimpleWorkItemRange(inv, GroupScope())
+      case "sycl::nd_item::get_group_linear_id" =>
+        getSimpleWorkItemLinearId(inv, GroupScope())
+      case "sycl::nd_item::get_global_id" if args.length == 1 =>
+        getGlobalWorkItemId(inv)
+      case "sycl::nd_item::get_global_range" if args.length == 1 =>
+        getGlobalWorkItemRange(inv)
+      case "sycl::nd_item::get_global_linear_id" =>
+        getGlobalWorkItemLinearId(inv)
+      case "sycl::accessor::get_range" =>
+        classInstance match {
+          case Some(Deref(_, ref)) =>
+            val accessor =
+              syclAccessorSuccessor.values
+                .find(acc => ref.decl.equals(acc.instanceField)).get
+            LiteralSeq[Post](
+              TCInt(),
+              accessor.rangeIndexFields.map(f =>
+                Deref[Post](currentThis.get, f.ref)(
+                  SYCLAccessorRangeIndexFieldInsufficientReferencePermissionBlame(
+                    inv
+                  )
+                )
+              ),
+            )
+          case _ => throw NotApplicable(inv)
+        }
+      case "sycl::local_accessor::get_range" =>
+        classInstance match {
+          case Some(Local(ref)) =>
+            val dimensions = syclLocalAccessorVarToDimensions(ref.decl)
+            LiteralSeq[Post](TCInt(), dimensions)
+          case _ => throw NotApplicable(inv)
+        }
+      case "sycl::range::get" =>
+        (classInstance, args) match {
+          case (Some(seq: LiteralSeq[Post]), Seq(arg)) =>
+            SeqSubscript(seq, rw.dispatch(arg))(
+              SYCLRequestedRangeIndexOutOfBoundsBlame(seq, arg)
+            ) // Range coming from calling get_range() on a (local)accessor
+          case _ => throw NotApplicable(inv)
+        }
 
       case _ =>
-        val procedureRef: Ref[Post, Procedure[Post]] = cppFunctionDeclSuccessor.ref((decls, initIdx))
+        val procedureRef: Ref[Post, Procedure[Post]] = cppFunctionDeclSuccessor
+          .ref((decls, initIdx))
         ProcedureInvocation[Post](
-          procedureRef, args.map(rw.dispatch), Nil, Nil,
+          procedureRef,
+          args.map(rw.dispatch),
+          Nil,
+          Nil,
           givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) }
+          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
         )(inv.blame)
     }
   }
 
-  private def syclConstructorInvocation(typ: SYCLTConstructableClass[Pre], inv: CPPInvocation[Pre]): Expr[Post] = {
+  private def syclConstructorInvocation(
+      typ: SYCLTConstructableClass[Pre],
+      inv: CPPInvocation[Pre],
+  ): Expr[Post] = {
     val CPPInvocation(_, args, _, _) = inv
     implicit val o: Origin = inv.o
 
     typ match {
       case SYCLTRange(_) => SYCLRange[Post](args.map(rw.dispatch))
-      case SYCLTNDRange(_) => SYCLNDRange[Post](rw.dispatch(args.head), rw.dispatch(args(1)))
+      case SYCLTNDRange(_) =>
+        SYCLNDRange[Post](rw.dispatch(args.head), rw.dispatch(args(1)))
       case SYCLTLocalAccessor(typ, _) =>
         val range = rw.dispatch(args.head).asInstanceOf[SYCLRange[Post]]
-        NewArray(rw.dispatch(typ), range.dimensions, 0, false)(SYCLLocalAccessorArraySizeBlame(args.head))
+        NewArray(rw.dispatch(typ), range.dimensions, 0, false)(
+          SYCLLocalAccessorArraySizeBlame(args.head)
+        )
       case _ => ???
     }
   }
 
-  private def rewriteSYCLQueueSubmit(invocation: CPPInvocation[Pre]): (Block[Post], Variable[Post]) = {
+  private def rewriteSYCLQueueSubmit(
+      invocation: CPPInvocation[Pre]
+  ): (Block[Post], Variable[Post]) = {
     // Do not allow given and yields on the invocation
-    if (invocation.givenArgs.nonEmpty || invocation.yields.nonEmpty) throw SYCLGivenYieldsOnSYCLMethodsUnsupported(invocation)
+    if (invocation.givenArgs.nonEmpty || invocation.yields.nonEmpty)
+      throw SYCLGivenYieldsOnSYCLMethodsUnsupported(invocation)
 
     // Get the lambda describing the command group
-    val commandGroup = invocation.args.head.asInstanceOf[CPPLambdaDefinition[Pre]]
+    val commandGroup = invocation.args.head
+      .asInstanceOf[CPPLambdaDefinition[Pre]]
     val commandGroupBody: Statement[Pre] = commandGroup.body
 
     // Do not allow contracts for the command group
-    if (commandGroup.contract.nonEmpty) throw SYCLContractForCommandGroupUnsupported(commandGroup.contract)
+    if (commandGroup.contract.nonEmpty)
+      throw SYCLContractForCommandGroupUnsupported(commandGroup.contract)
 
     // Get the kernel declarations in the command group
-    val collectedKernelDeclarations: Seq[CPPInvocation[Pre]] = findStatements(commandGroupBody, {
-      case Eval(inv: CPPInvocation[Pre]) if inv.ref.isDefined && inv.ref.get.name == "sycl::handler::parallel_for" => Some(inv)
-      case _ => None
-    })
+    val collectedKernelDeclarations: Seq[CPPInvocation[Pre]] = findStatements(
+      commandGroupBody,
+      {
+        case Eval(inv: CPPInvocation[Pre])
+            if inv.ref.isDefined &&
+              inv.ref.get.name == "sycl::handler::parallel_for" =>
+          Some(inv)
+        case _ => None
+      },
+    )
 
     // Make sure there is only one kernel declaration in the command group
     if (collectedKernelDeclarations.isEmpty) {
       throw SYCLMissingKernel(commandGroupBody)
     } else if (collectedKernelDeclarations.size > 1) {
-      throw SYCLNoMultipleKernels(commandGroupBody, collectedKernelDeclarations(1))
-    } else if (collectedKernelDeclarations.head.givenArgs.nonEmpty || collectedKernelDeclarations.head.yields.nonEmpty) {
+      throw SYCLNoMultipleKernels(
+        commandGroupBody,
+        collectedKernelDeclarations(1),
+      )
+    } else if (
+      collectedKernelDeclarations.head.givenArgs.nonEmpty ||
+      collectedKernelDeclarations.head.yields.nonEmpty
+    ) {
       // Do not allow given and yields on the kernel
-      throw SYCLGivenYieldsOnSYCLMethodsUnsupported(collectedKernelDeclarations.head)
+      throw SYCLGivenYieldsOnSYCLMethodsUnsupported(
+        collectedKernelDeclarations.head
+      )
     }
 
     // Create a class that can be used to create a 'this' object
     // It will be linked to the class made near the end of this method.
     val preEventClass: Class[Pre] = new Class(Nil, Nil, Nil, tt)(commandGroup.o)
-    this.currentThis = Some(rw.dispatch(ThisObject[Pre](preEventClass.ref)(preEventClass.o)))
+    this.currentThis = Some(
+      rw.dispatch(ThisObject[Pre](preEventClass.ref)(preEventClass.o))
+    )
 
     // Generate conditions and accessor objects for each accessor declared in the command group
-    val collectedAccessorDeclarations: Seq[CPPLocalDeclaration[Pre]] = findStatements(commandGroupBody, {
-      case CPPDeclarationStatement(decl) if CPP.getBaseTypeFromSpecs(decl.decl.specs).isInstanceOf[SYCLTAccessor[Pre]] => Some(decl)
-      case _ => None
-    })
-    val (accessors, accessorRunMethodConditions, accessorParblockConditions, bufferAccessStatements) = rewriteSYCLAccessorDeclarations(collectedAccessorDeclarations)
+    val collectedAccessorDeclarations: Seq[CPPLocalDeclaration[Pre]] =
+      findStatements(
+        commandGroupBody,
+        {
+          case CPPDeclarationStatement(decl)
+              if CPP.getBaseTypeFromSpecs(decl.decl.specs)
+                .isInstanceOf[SYCLTAccessor[Pre]] =>
+            Some(decl)
+          case _ => None
+        },
+      )
+    val (
+      accessors,
+      accessorRunMethodConditions,
+      accessorParblockConditions,
+      bufferAccessStatements,
+    ) = rewriteSYCLAccessorDeclarations(collectedAccessorDeclarations)
 
     // Generate an array each local accessor declared in the command group
-    val collectedLocalAccessorDeclarations: Seq[CPPLocalDeclaration[Pre]] = findStatements(commandGroupBody, {
-      case CPPDeclarationStatement(decl) if CPP.getBaseTypeFromSpecs(decl.decl.specs).isInstanceOf[SYCLTLocalAccessor[Pre]] => Some(decl)
-      case _ => None
-    })
+    val collectedLocalAccessorDeclarations: Seq[CPPLocalDeclaration[Pre]] =
+      findStatements(
+        commandGroupBody,
+        {
+          case CPPDeclarationStatement(decl)
+              if CPP.getBaseTypeFromSpecs(decl.decl.specs)
+                .isInstanceOf[SYCLTLocalAccessor[Pre]] =>
+            Some(decl)
+          case _ => None
+        },
+      )
 
-    val nrOfCommandGroupStatements = findStatements(commandGroupBody, s => Some(s)).size
+    val nrOfCommandGroupStatements =
+      findStatements(commandGroupBody, s => Some(s)).size
     // Check that there is no other code in the command group other than 1 kernel declaration and the found (local) accessors
-    if (nrOfCommandGroupStatements > 1 + collectedAccessorDeclarations.size + collectedLocalAccessorDeclarations.size) {
-      throw SYCLNoExtraCodeInCommandGroup(commandGroupBody)
-    }
+    if (
+      nrOfCommandGroupStatements >
+        1 + collectedAccessorDeclarations.size +
+        collectedLocalAccessorDeclarations.size
+    ) { throw SYCLNoExtraCodeInCommandGroup(commandGroupBody) }
 
     val kernelDimensions = collectedKernelDeclarations.head.args.head
-    val kernelDeclaration = collectedKernelDeclarations.head.args(1).asInstanceOf[CPPLambdaDefinition[Pre]]
+    val kernelDeclaration = collectedKernelDeclarations.head.args(1)
+      .asInstanceOf[CPPLambdaDefinition[Pre]]
 
     // Get the kernel range type (which also checks if it is valid)
-    val rangeType = getKernelRangeType(kernelDimensions.t, kernelDeclaration.declarator)
+    val rangeType = getKernelRangeType(
+      kernelDimensions.t,
+      kernelDeclaration.declarator,
+    )
 
     // Create a block of code for the kernel body based on what type of kernel it is
-    val (kernelParBlock, contractRequires, contractEnsures) = rangeType match {
-      case SYCLTRange(_) => createBasicKernelBody(kernelDimensions, kernelDeclaration, accessorParblockConditions)
-      case SYCLTNDRange(_) => createNDRangeKernelBody(kernelDimensions, kernelDeclaration, accessorParblockConditions, collectedLocalAccessorDeclarations)
-      case _ => throw Unreachable("Wrong type for the dimensions parameter of the kernel. " +
-        "The dimensions parameter in a kernel declaration is supposed to be of type sycl::range<int> or sycl::nd_range<int>.")
-    }
+    val (kernelParBlock, contractRequires, contractEnsures) =
+      rangeType match {
+        case SYCLTRange(_) =>
+          createBasicKernelBody(
+            kernelDimensions,
+            kernelDeclaration,
+            accessorParblockConditions,
+          )
+        case SYCLTNDRange(_) =>
+          createNDRangeKernelBody(
+            kernelDimensions,
+            kernelDeclaration,
+            accessorParblockConditions,
+            collectedLocalAccessorDeclarations,
+          )
+        case _ =>
+          throw Unreachable(
+            "Wrong type for the dimensions parameter of the kernel. " +
+              "The dimensions parameter in a kernel declaration is supposed to be of type sycl::range<int> or sycl::nd_range<int>."
+          )
+      }
 
     // Create the pre- and postconditions for the run-method that will hold the generated kernel code
     val kernelRunnerPreCondition = {
       implicit val o: Origin = kernelDeclaration.contract.requires.o
-      UnitAccountedPredicate(foldStar(
-        currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++
-        accessorRunMethodConditions :+
-        getKernelQuantifiedCondition(kernelParBlock, removeKernelClassInstancePermissions(contractRequires))
-      )(commandGroupBody.o))
+      UnitAccountedPredicate(
+        foldStar(
+          currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++
+            accessorRunMethodConditions :+ getKernelQuantifiedCondition(
+              kernelParBlock,
+              removeKernelClassInstancePermissions(contractRequires),
+            )
+        )(commandGroupBody.o)
+      )
     }
     val kernelRunnerPostCondition = {
       implicit val o: Origin = kernelDeclaration.contract.ensures.o
-      UnitAccountedPredicate(foldStar(
-        currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++
-          accessorRunMethodConditions :+
-          getKernelQuantifiedCondition(kernelParBlock, removeKernelClassInstancePermissions(contractEnsures))
-      )(commandGroupBody.o))
+      UnitAccountedPredicate(
+        foldStar(
+          currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++
+            accessorRunMethodConditions :+ getKernelQuantifiedCondition(
+              kernelParBlock,
+              removeKernelClassInstancePermissions(contractEnsures),
+            )
+        )(commandGroupBody.o)
+      )
     }
 
     // Declare the newly generated kernel code inside a run-method
-    val kernelRunnerContract = ApplicableContract[Post](kernelRunnerPreCondition, kernelRunnerPostCondition, tt, Nil, Nil, Nil, None)(SYCLKernelRunMethodContractUnsatisfiableBlame(kernelRunnerPreCondition))(commandGroup.o)
-    val kernelRunner = new RunMethod[Post](
-      body = Some(ParStatement[Post](kernelParBlock)(kernelDeclaration.body.o)),
-      contract = kernelRunnerContract,
-    )(KernelLambdaRunMethodBlame(kernelDeclaration))(commandGroup.o)
+    val kernelRunnerContract =
+      ApplicableContract[Post](
+        kernelRunnerPreCondition,
+        kernelRunnerPostCondition,
+        tt,
+        Nil,
+        Nil,
+        Nil,
+        None,
+      )(SYCLKernelRunMethodContractUnsatisfiableBlame(
+        kernelRunnerPreCondition
+      ))(commandGroup.o)
+    val kernelRunner =
+      new RunMethod[Post](
+        body = Some(
+          ParStatement[Post](kernelParBlock)(kernelDeclaration.body.o)
+        ),
+        contract = kernelRunnerContract,
+      )(KernelLambdaRunMethodBlame(kernelDeclaration))(commandGroup.o)
 
     // Create the surrounding class
-    val postEventClass = new Class[Post](
-      typeArgs = Seq(),
-      decls = currentKernelType.get.getRangeFields ++ accessors.flatMap(acc => acc.instanceField +: acc.rangeIndexFields) ++ Seq(kernelRunner),
-      supports = Seq(),
-      intrinsicLockInvariant = tt
-    )(commandGroup.o.where(name = "SYCL_EVENT_CLASS"))
+    val postEventClass =
+      new Class[Post](
+        typeArgs = Seq(),
+        decls =
+          currentKernelType.get.getRangeFields ++
+            accessors
+              .flatMap(acc => acc.instanceField +: acc.rangeIndexFields) ++
+            Seq(kernelRunner),
+        supports = Seq(),
+        intrinsicLockInvariant = tt,
+      )(commandGroup.o.where(name = "SYCL_EVENT_CLASS"))
     rw.globalDeclarations.succeed(preEventClass, postEventClass)
 
     // Create a variable to refer to the class instance
-    val eventClassRef = new Variable[Post](TClass(postEventClass.ref, Seq()))(commandGroup.o.where(name = "sycl_event_ref"))
+    val eventClassRef =
+      new Variable[Post](TClass(postEventClass.ref, Seq()))(
+        commandGroup.o.where(name = "sycl_event_ref")
+      )
     // Store the class ref and read-write accessors to be used when the kernel is done running
-    currentlyRunningKernels.put(eventClassRef.get(commandGroup.o), accessors.filter(acc => acc.accessMode.isInstanceOf[SYCLReadWriteAccess[Post]]))
+    currentlyRunningKernels.put(
+      eventClassRef.get(commandGroup.o),
+      accessors
+        .filter(acc => acc.accessMode.isInstanceOf[SYCLReadWriteAccess[Post]]),
+    )
 
     // Declare a constructor for the class as a separate global method
-    val eventClassConstructor = createEventClassConstructor(accessors, preEventClass, commandGroup.o)
+    val eventClassConstructor = createEventClassConstructor(
+      accessors,
+      preEventClass,
+      commandGroup.o,
+    )
 
     // Create a new class instance and assign it to the class instance variable, then fork that variable
-    val result = (Block[Post](
-      bufferAccessStatements ++
-      Seq(
-        LocalDecl[Post](eventClassRef)(commandGroup.o),
-        assignLocal(
-          eventClassRef.get(commandGroup.o),
-          ProcedureInvocation[Post]( // Call constructor
-            ref = eventClassConstructor.ref,
-            args = currentKernelType.get.getRangeValues ++ accessors.flatMap(acc => acc.buffer.generatedVar.get(acc.buffer.generatedVar.o) +: acc.buffer.range.dimensions.map(dim => dim)),
-            Nil, Nil, Nil, Nil,
-          )(SYCLKernelRangeInvalidBlame())(commandGroup.o)
-        )(commandGroup.o),
-        Fork(eventClassRef.get(eventClassRef.o))(SYCLKernelForkBlame(kernelDeclaration))(invocation.o)
+    val result =
+      (
+        Block[Post](
+          bufferAccessStatements ++ Seq(
+            LocalDecl[Post](eventClassRef)(commandGroup.o),
+            assignLocal(
+              eventClassRef.get(commandGroup.o),
+              ProcedureInvocation[Post]( // Call constructor
+                ref = eventClassConstructor.ref,
+                args =
+                  currentKernelType.get.getRangeValues ++
+                    accessors.flatMap(acc =>
+                      acc.buffer.generatedVar.get(acc.buffer.generatedVar.o) +:
+                        acc.buffer.range.dimensions.map(dim => dim)
+                    ),
+                Nil,
+                Nil,
+                Nil,
+                Nil,
+              )(SYCLKernelRangeInvalidBlame())(commandGroup.o),
+            )(commandGroup.o),
+            Fork(eventClassRef.get(eventClassRef.o))(SYCLKernelForkBlame(
+              kernelDeclaration
+            ))(invocation.o),
+          )
+        )(invocation.o),
+        eventClassRef,
       )
-    )(invocation.o), eventClassRef)
 
     // Reset the global variables as we are done processing the kernel
     currentKernelType = None
@@ -931,12 +1546,20 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
     result
   }
 
-  private def createBasicKernelBody(kernelDimensions: Expr[Pre], kernelDeclaration: CPPLambdaDefinition[Pre], accessorParblockConditions: Seq[Expr[Post]]): (ParBlock[Post], Expr[Post], Expr[Post]) = {
+  private def createBasicKernelBody(
+      kernelDimensions: Expr[Pre],
+      kernelDeclaration: CPPLambdaDefinition[Pre],
+      accessorParblockConditions: Seq[Expr[Post]],
+  ): (ParBlock[Post], Expr[Post], Expr[Post]) = {
     // Register the kernel dimensions
-    val range: Seq[Expr[Post]] = rw.dispatch(kernelDimensions) match {
-      case SYCLRange(dims) => dims
-      case _ => throw Unreachable("The dimensions parameter of the kernel was not rewritten to a range.")
-    }
+    val range: Seq[Expr[Post]] =
+      rw.dispatch(kernelDimensions) match {
+        case SYCLRange(dims) => dims
+        case _ =>
+          throw Unreachable(
+            "The dimensions parameter of the kernel was not rewritten to a range."
+          )
+      }
 
     currentDimensionIterVars.clear()
     currentDimensionIterVars(GlobalScope()) = mutable.Buffer.empty
@@ -945,39 +1568,71 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
       implicit val o: Origin = range(index).o.where(name = s"range$index")
       val instanceField = new InstanceField[Post](TCInt(), Nil)
       rangeFields.append(instanceField)
-      val iterVar = createRangeIterVar(GlobalScope(), index, Deref[Post](currentThis.get, instanceField.ref)(new SYCLRangeDerefBlame(instanceField)))
+      val iterVar = createRangeIterVar(
+        GlobalScope(),
+        index,
+        Deref[Post](currentThis.get, instanceField.ref)(new SYCLRangeDerefBlame(
+          instanceField
+        )),
+      )
       currentDimensionIterVars(GlobalScope()).append(iterVar)
     })
-    currentKernelType = Some(BasicKernel(kernelDimensions.o, rangeFields.toSeq, range))
+    currentKernelType = Some(
+      BasicKernel(kernelDimensions.o, rangeFields.toSeq, range)
+    )
 
     // Get the pre- and postcondition
-    val UnitAccountedPredicate(contractRequires: Expr[Post]) = rw.dispatch(kernelDeclaration.contract.requires)
-    val UnitAccountedPredicate(contractEnsures: Expr[Post]) = rw.dispatch(kernelDeclaration.contract.ensures)
+    val UnitAccountedPredicate(contractRequires: Expr[Post]) = rw
+      .dispatch(kernelDeclaration.contract.requires)
+    val UnitAccountedPredicate(contractEnsures: Expr[Post]) = rw
+      .dispatch(kernelDeclaration.contract.ensures)
     val idLimits = currentDimensionIterVars(GlobalScope()).map(iterVar => {
       implicit val o: Origin = iterVar.o
-      Local[Post](iterVar.variable.ref) >= c_const(0) && Local[Post](iterVar.variable.ref) < iterVar.to
+      Local[Post](iterVar.variable.ref) >= c_const(0) &&
+      Local[Post](iterVar.variable.ref) < iterVar.to
     })
     implicit val o: Origin = kernelDeclaration.o
 
     // Create the parblock representing the kernels
-    val parBlock = ParBlock[Post](
-      decl = new ParBlockDecl[Post]()(o.where(name = "SYCL_BASIC_KERNEL")),
-      iters = currentDimensionIterVars(GlobalScope()).toSeq,
-      context_everywhere = rw.dispatch(kernelDeclaration.contract.contextEverywhere),
-      requires = foldStar(currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++ idLimits ++ accessorParblockConditions :+ contractRequires),
-      ensures = foldStar(currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++ idLimits ++ accessorParblockConditions :+ contractEnsures),
-      content = rw.dispatch(kernelDeclaration.body),
-    )(SYCLKernelParBlockFailureBlame(kernelDeclaration))
+    val parBlock =
+      ParBlock[Post](
+        decl = new ParBlockDecl[Post]()(o.where(name = "SYCL_BASIC_KERNEL")),
+        iters = currentDimensionIterVars(GlobalScope()).toSeq,
+        context_everywhere = rw
+          .dispatch(kernelDeclaration.contract.contextEverywhere),
+        requires = foldStar(
+          currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++
+            idLimits ++ accessorParblockConditions :+ contractRequires
+        ),
+        ensures = foldStar(
+          currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++
+            idLimits ++ accessorParblockConditions :+ contractEnsures
+        ),
+        content = rw.dispatch(kernelDeclaration.body),
+      )(SYCLKernelParBlockFailureBlame(kernelDeclaration))
 
     (parBlock, contractRequires, contractEnsures)
   }
 
-  private def createNDRangeKernelBody(kernelDimensions: Expr[Pre], kernelDeclaration: CPPLambdaDefinition[Pre], accessorParblockConditions: Seq[Expr[Post]], localAccessorDeclarations: Seq[CPPLocalDeclaration[Pre]]): (ParBlock[Post], Expr[Post], Expr[Post]) = {
+  private def createNDRangeKernelBody(
+      kernelDimensions: Expr[Pre],
+      kernelDeclaration: CPPLambdaDefinition[Pre],
+      accessorParblockConditions: Seq[Expr[Post]],
+      localAccessorDeclarations: Seq[CPPLocalDeclaration[Pre]],
+  ): (ParBlock[Post], Expr[Post], Expr[Post]) = {
     // Register the kernel dimensions
-    val (globalRange, localRange): (Seq[Expr[Post]], Seq[Expr[Post]]) = rw.dispatch(kernelDimensions) match {
-      case SYCLNDRange(globalSize: SYCLRange[Post], localRange: SYCLRange[Post]) => (globalSize.dimensions, localRange.dimensions)
-      case _ => throw Unreachable("The dimensions parameter of the kernel was not rewritten to an nd_range.")
-    }
+    val (globalRange, localRange): (Seq[Expr[Post]], Seq[Expr[Post]]) =
+      rw.dispatch(kernelDimensions) match {
+        case SYCLNDRange(
+              globalSize: SYCLRange[Post],
+              localRange: SYCLRange[Post],
+            ) =>
+          (globalSize.dimensions, localRange.dimensions)
+        case _ =>
+          throw Unreachable(
+            "The dimensions parameter of the kernel was not rewritten to an nd_range."
+          )
+      }
 
     currentDimensionIterVars.clear()
     currentDimensionIterVars(LocalScope()) = mutable.Buffer.empty
@@ -985,238 +1640,487 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
     val rangeFields: mutable.Buffer[InstanceField[Post]] = mutable.Buffer.empty
     localRange.indices.foreach(index => {
       {
-        implicit val o: Origin = kernelDimensions.o.where(name = s"group_range$index")
+        implicit val o: Origin = kernelDimensions.o
+          .where(name = s"group_range$index")
         val groupInstanceField = new InstanceField[Post](TCInt(), Nil)
         rangeFields.append(groupInstanceField)
-        val groupIterVar = createRangeIterVar(GroupScope(), index, Deref[Post](currentThis.get, groupInstanceField.ref)(new SYCLRangeDerefBlame(groupInstanceField)))
+        val groupIterVar = createRangeIterVar(
+          GroupScope(),
+          index,
+          Deref[Post](currentThis.get, groupInstanceField.ref)(
+            new SYCLRangeDerefBlame(groupInstanceField)
+          ),
+        )
         currentDimensionIterVars(GroupScope()).append(groupIterVar)
       }
       {
-        implicit val o: Origin = localRange(index).o.where(name = s"local_range$index")
+        implicit val o: Origin = localRange(index).o
+          .where(name = s"local_range$index")
         val localInstanceField = new InstanceField[Post](TCInt(), Nil)
         rangeFields.append(localInstanceField)
-        val localIterVar = createRangeIterVar(LocalScope(), index, Deref[Post](currentThis.get, localInstanceField.ref)(new SYCLRangeDerefBlame(localInstanceField)))
+        val localIterVar = createRangeIterVar(
+          LocalScope(),
+          index,
+          Deref[Post](currentThis.get, localInstanceField.ref)(
+            new SYCLRangeDerefBlame(localInstanceField)
+          ),
+        )
         currentDimensionIterVars(LocalScope()).append(localIterVar)
       }
     })
-    currentKernelType = Some(NDRangeKernel(kernelDimensions.o, rangeFields.toSeq, globalRange.zip(localRange).flatMap(tuple => Seq(tuple._1, tuple._2))))
+    currentKernelType = Some(NDRangeKernel(
+      kernelDimensions.o,
+      rangeFields.toSeq,
+      globalRange.zip(localRange).flatMap(tuple => Seq(tuple._1, tuple._2)),
+    ))
 
     // Add the local accessors
-    val localAccessorDecls: mutable.Buffer[Statement[Post]] = mutable.Buffer.empty
-    val localAccessorVariables: mutable.Buffer[Variable[Post]] = mutable.Buffer.empty
+    val localAccessorDecls: mutable.Buffer[Statement[Post]] =
+      mutable.Buffer.empty
+    val localAccessorVariables: mutable.Buffer[Variable[Post]] =
+      mutable.Buffer.empty
     localAccessorDeclarations.foreach(localAccDecl => {
       localAccessorDecls.append(rewriteLocalDecl(localAccDecl))
-      localAccessorVariables.append(cppNameSuccessor(RefCPPLocalDeclaration(localAccDecl, 0)))
+      localAccessorVariables
+        .append(cppNameSuccessor(RefCPPLocalDeclaration(localAccDecl, 0)))
     })
 
     // Get the pre- and postcondition
-    val UnitAccountedPredicate(contractRequires: Expr[Post]) = rw.dispatch(kernelDeclaration.contract.requires)
-    val UnitAccountedPredicate(contractEnsures: Expr[Post]) = rw.dispatch(kernelDeclaration.contract.ensures)
+    val UnitAccountedPredicate(contractRequires: Expr[Post]) = rw
+      .dispatch(kernelDeclaration.contract.requires)
+    val UnitAccountedPredicate(contractEnsures: Expr[Post]) = rw
+      .dispatch(kernelDeclaration.contract.ensures)
     val localIdLimits = currentDimensionIterVars(LocalScope()).map(iterVar => {
       implicit val o: Origin = iterVar.o
-      Local[Post](iterVar.variable.ref) >= c_const(0) && Local[Post](iterVar.variable.ref) < iterVar.to
+      Local[Post](iterVar.variable.ref) >= c_const(0) &&
+      Local[Post](iterVar.variable.ref) < iterVar.to
     })
     val groupIdLimits = currentDimensionIterVars(GroupScope()).map(iterVar => {
       implicit val o: Origin = iterVar.o
-      Local[Post](iterVar.variable.ref) >= c_const(0) && Local[Post](iterVar.variable.ref) < iterVar.to
+      Local[Post](iterVar.variable.ref) >= c_const(0) &&
+      Local[Post](iterVar.variable.ref) < iterVar.to
     })
 
     implicit val o: Origin = kernelDeclaration.o
 
     // Create the parblock representing the work-items inside work-groups
-    val workItemParBlock = ParStatement[Post](ParBlock[Post](
-      decl = new ParBlockDecl[Post]()(o.where(name = "SYCL_ND_RANGE_KERNEL_WORKITEMS")),
-      iters = currentDimensionIterVars(LocalScope()).toSeq,
-      context_everywhere = rw.dispatch(kernelDeclaration.contract.contextEverywhere),
-      requires = foldStar(currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++ groupIdLimits ++ localIdLimits ++ accessorParblockConditions :+ contractRequires),
-      ensures = foldStar(currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++ groupIdLimits ++ localIdLimits ++ accessorParblockConditions :+ contractEnsures),
-      content = rw.dispatch(kernelDeclaration.body)
-    )(SYCLKernelParBlockFailureBlame(kernelDeclaration)))
-
-    val quantifiedContractRequires = getKernelQuantifiedCondition(workItemParBlock.impl.asInstanceOf[ParBlock[Post]], removeLocalAccessorConditions(contractRequires, localAccessorVariables.toSeq))
-    val quantifiedContractEnsures = getKernelQuantifiedCondition(workItemParBlock.impl.asInstanceOf[ParBlock[Post]], removeLocalAccessorConditions(contractEnsures, localAccessorVariables.toSeq))
+    val workItemParBlock = ParStatement[Post](
+      ParBlock[Post](
+        decl =
+          new ParBlockDecl[Post]()(
+            o.where(name = "SYCL_ND_RANGE_KERNEL_WORKITEMS")
+          ),
+        iters = currentDimensionIterVars(LocalScope()).toSeq,
+        context_everywhere = rw
+          .dispatch(kernelDeclaration.contract.contextEverywhere),
+        requires = foldStar(
+          currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++
+            groupIdLimits ++ localIdLimits ++ accessorParblockConditions :+
+            contractRequires
+        ),
+        ensures = foldStar(
+          currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++
+            groupIdLimits ++ localIdLimits ++ accessorParblockConditions :+
+            contractEnsures
+        ),
+        content = rw.dispatch(kernelDeclaration.body),
+      )(SYCLKernelParBlockFailureBlame(kernelDeclaration))
+    )
+
+    val quantifiedContractRequires = getKernelQuantifiedCondition(
+      workItemParBlock.impl.asInstanceOf[ParBlock[Post]],
+      removeLocalAccessorConditions(
+        contractRequires,
+        localAccessorVariables.toSeq,
+      ),
+    )
+    val quantifiedContractEnsures = getKernelQuantifiedCondition(
+      workItemParBlock.impl.asInstanceOf[ParBlock[Post]],
+      removeLocalAccessorConditions(
+        contractEnsures,
+        localAccessorVariables.toSeq,
+      ),
+    )
 
     // Create the parblock representing the work-groups
-    val workGroupParBlock = ParBlock[Post](
-      decl = new ParBlockDecl[Post]()(o.where(name = "SYCL_ND_RANGE_KERNEL_WORKGROUPS")),
-      iters = currentDimensionIterVars(GroupScope()).toSeq,
-      context_everywhere = tt,
-      requires = foldStar(currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++ groupIdLimits ++ accessorParblockConditions :+ quantifiedContractRequires),
-      ensures = foldStar(currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++ groupIdLimits ++ accessorParblockConditions :+ quantifiedContractEnsures),
-      content = Scope(Nil, Block(localAccessorDecls.toSeq :+ workItemParBlock))
-    )(SYCLKernelParBlockFailureBlame(kernelDeclaration))
+    val workGroupParBlock =
+      ParBlock[Post](
+        decl =
+          new ParBlockDecl[Post]()(
+            o.where(name = "SYCL_ND_RANGE_KERNEL_WORKGROUPS")
+          ),
+        iters = currentDimensionIterVars(GroupScope()).toSeq,
+        context_everywhere = tt,
+        requires = foldStar(
+          currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++
+            groupIdLimits ++ accessorParblockConditions :+
+            quantifiedContractRequires
+        ),
+        ensures = foldStar(
+          currentKernelType.get.getRangeFieldPermissions(currentThis.get) ++
+            groupIdLimits ++ accessorParblockConditions :+
+            quantifiedContractEnsures
+        ),
+        content = Scope(
+          Nil,
+          Block(localAccessorDecls.toSeq :+ workItemParBlock),
+        ),
+      )(SYCLKernelParBlockFailureBlame(kernelDeclaration))
 
     (workGroupParBlock, quantifiedContractRequires, quantifiedContractEnsures)
   }
 
-  private def rewriteSYCLAccessorDeclarations(decls: Seq[CPPLocalDeclaration[Pre]]): (Seq[SYCLAccessor[Post]], Seq[Expr[Post]], Seq[Expr[Post]], Seq[Statement[Post]]) = {
+  private def rewriteSYCLAccessorDeclarations(
+      decls: Seq[CPPLocalDeclaration[Pre]]
+  ): (
+      Seq[SYCLAccessor[Post]],
+      Seq[Expr[Post]],
+      Seq[Expr[Post]],
+      Seq[Statement[Post]],
+  ) = {
     // SYCLBuffer to (accessor object, kernelRunnerConditions, kernelParblockConditions, bufferAccessStatements)
-    val buffersToAccessorResults: mutable.Map[SYCLBuffer[Post], (SYCLAccessor[Post], Expr[Post], Expr[Post], Statement[Post])] = mutable.Map.empty
+    val buffersToAccessorResults: mutable.Map[SYCLBuffer[
+      Post
+    ], (SYCLAccessor[Post], Expr[Post], Expr[Post], Statement[Post])] =
+      mutable.Map.empty
     decls.foreach(decl => {
       val accDecl = decl.decl
-      if (accDecl.inits.nonEmpty && accDecl.inits.head.init.isDefined && accDecl.inits.head.init.get.isInstanceOf[CPPInvocation[Pre]]) {
+      if (
+        accDecl.inits.nonEmpty && accDecl.inits.head.init.isDefined &&
+        accDecl.inits.head.init.get.isInstanceOf[CPPInvocation[Pre]]
+      ) {
         accDecl.inits.head.init.get match {
-          case inv@CPPInvocation(_, Seq(bufferRef: CPPLocal[Pre], _, accessModeRef: CPPLocal[Pre]), _, _) =>
-            rw.dispatch(accessModeRef)  match {
+          case inv @ CPPInvocation(
+                _,
+                Seq(bufferRef: CPPLocal[Pre], _, accessModeRef: CPPLocal[Pre]),
+                _,
+                _,
+              ) =>
+            rw.dispatch(accessModeRef) match {
               case accessMode: SYCLAccessMode[Post] =>
-                val buffer = getFromAll(syclBufferSuccessor, cppNameSuccessor(bufferRef.ref.get)).getOrElse(throw SYCLBufferOutOfScopeError(decl))
-                val accName = buffer.generatedVar.o.getPreferredNameOrElse().ucamel
-                val accO: Origin = SYCLGeneratedAccessorPermissionsOrigin(decl).where(name = accName)
+                val buffer = getFromAll(
+                  syclBufferSuccessor,
+                  cppNameSuccessor(bufferRef.ref.get),
+                ).getOrElse(throw SYCLBufferOutOfScopeError(decl))
+                val accName =
+                  buffer.generatedVar.o.getPreferredNameOrElse().ucamel
+                val accO: Origin = SYCLGeneratedAccessorPermissionsOrigin(decl)
+                  .where(name = accName)
                 val dimO: Origin = SYCLGeneratedAccessorPermissionsOrigin(decl)
-                if (!CPP.getBaseTypeFromSpecs(accDecl.specs).asInstanceOf[SYCLTAccessor[Pre]].superTypeOf(CPP.unwrappedType(inv.t))) {
-                  throw UnexpectedCPPTypeError(CPP.getBaseTypeFromSpecs(accDecl.specs), inv)
+                if (
+                  !CPP.getBaseTypeFromSpecs(accDecl.specs)
+                    .asInstanceOf[SYCLTAccessor[Pre]]
+                    .superTypeOf(CPP.unwrappedType(inv.t))
+                ) {
+                  throw UnexpectedCPPTypeError(
+                    CPP.getBaseTypeFromSpecs(accDecl.specs),
+                    inv,
+                  )
                 }
 
                 buffersToAccessorResults.get(buffer) match {
                   case Some((foundAcc, _, _, _)) =>
                     // Buffer already exists, so skip creation of fields and use already existing fields
-                    val newAcc = SYCLAccessor[Post](buffer, accessMode, foundAcc.instanceField, foundAcc.rangeIndexFields)(accDecl.o)
-                    syclAccessorSuccessor(RefCPPLocalDeclaration(decl, 0)) = newAcc
+                    val newAcc =
+                      SYCLAccessor[Post](
+                        buffer,
+                        accessMode,
+                        foundAcc.instanceField,
+                        foundAcc.rangeIndexFields,
+                      )(accDecl.o)
+                    syclAccessorSuccessor(RefCPPLocalDeclaration(decl, 0)) =
+                      newAcc
 
                     // Upgrade read access to write access if the new accessor wants write access, as is done in the SYCL specification in Table 4 of section 3.8.1 (page 27)
-                    if (foundAcc.accessMode.isInstanceOf[SYCLReadOnlyAccess[Post]] && accessMode.isInstanceOf[SYCLReadWriteAccess[Post]]) {
-                      val (basicPermissions, fieldArrayElementsPermission) = getBasicAccessorPermissions(newAcc, this.currentThis.get)
-                      buffersToAccessorResults(buffer) = (newAcc, Star(basicPermissions, fieldArrayElementsPermission)(accO), basicPermissions, getKernelsWaitingForBuffer(buffer, accessMode, decl))
+                    if (
+                      foundAcc.accessMode
+                        .isInstanceOf[SYCLReadOnlyAccess[Post]] &&
+                      accessMode.isInstanceOf[SYCLReadWriteAccess[Post]]
+                    ) {
+                      val (basicPermissions, fieldArrayElementsPermission) =
+                        getBasicAccessorPermissions(
+                          newAcc,
+                          this.currentThis.get,
+                        )
+                      buffersToAccessorResults(buffer) =
+                        (
+                          newAcc,
+                          Star(basicPermissions, fieldArrayElementsPermission)(
+                            accO
+                          ),
+                          basicPermissions,
+                          getKernelsWaitingForBuffer(buffer, accessMode, decl),
+                        )
                     }
                   case None =>
                     // No accessor for buffer exist in the command group, so make fields and permissions
-                    val instanceField = new InstanceField[Post](buffer.generatedVar.t, Nil)(accO)
-                    val rangeIndexFields = Seq.range(0, buffer.range.dimensions.size).map(i => new InstanceField[Post](TCInt(), Nil)(dimO.where(name = s"${accName}_r$i")))
-                    val newAcc = SYCLAccessor[Post](buffer, accessMode, instanceField, rangeIndexFields)(accDecl.o)
-                    syclAccessorSuccessor(RefCPPLocalDeclaration(decl, 0)) = newAcc
-
-                    val (basicPermissions, fieldArrayElementsPermission) = getBasicAccessorPermissions(newAcc, this.currentThis.get)
-                    buffersToAccessorResults(buffer) = (newAcc, Star(basicPermissions, fieldArrayElementsPermission)(accO), basicPermissions, getKernelsWaitingForBuffer(buffer, accessMode, decl))
+                    val instanceField =
+                      new InstanceField[Post](buffer.generatedVar.t, Nil)(accO)
+                    val rangeIndexFields = Seq
+                      .range(0, buffer.range.dimensions.size).map(i =>
+                        new InstanceField[Post](TCInt(), Nil)(
+                          dimO.where(name = s"${accName}_r$i")
+                        )
+                      )
+                    val newAcc =
+                      SYCLAccessor[Post](
+                        buffer,
+                        accessMode,
+                        instanceField,
+                        rangeIndexFields,
+                      )(accDecl.o)
+                    syclAccessorSuccessor(RefCPPLocalDeclaration(decl, 0)) =
+                      newAcc
+
+                    val (basicPermissions, fieldArrayElementsPermission) =
+                      getBasicAccessorPermissions(newAcc, this.currentThis.get)
+                    buffersToAccessorResults(buffer) =
+                      (
+                        newAcc,
+                        Star(basicPermissions, fieldArrayElementsPermission)(
+                          accO
+                        ),
+                        basicPermissions,
+                        getKernelsWaitingForBuffer(buffer, accessMode, decl),
+                      )
                 }
-              case _ => throw Unreachable(accessModeRef.o.messageInContext("Access mode was rewritten to something invalid."))
+              case _ =>
+                throw Unreachable(accessModeRef.o.messageInContext(
+                  "Access mode was rewritten to something invalid."
+                ))
             }
-          case _ => throw Unreachable(accDecl.inits.head.init.get.o.messageInContext("Accessor declaration is malformed."))
+          case _ =>
+            throw Unreachable(
+              accDecl.inits.head.init.get.o
+                .messageInContext("Accessor declaration is malformed.")
+            )
         }
       } else {
-        throw Unreachable(decl.o.messageInContext("Accessor declaration is malformed."))
+        throw Unreachable(
+          decl.o.messageInContext("Accessor declaration is malformed.")
+        )
       }
     })
 
-    buffersToAccessorResults.values.foldLeft((Nil, Nil, Nil, Nil): (Seq[SYCLAccessor[Post]], Seq[Expr[Post]], Seq[Expr[Post]], Seq[Statement[Post]]))((result, value) => {
-      (result._1 :+ value._1, result._2 :+ value._2, result._3 :+ value._3, result._4 :+ value._4)
+    buffersToAccessorResults.values.foldLeft(
+      (Nil, Nil, Nil, Nil): (
+          Seq[SYCLAccessor[Post]],
+          Seq[Expr[Post]],
+          Seq[Expr[Post]],
+          Seq[Statement[Post]],
+      )
+    )((result, value) => {
+      (
+        result._1 :+ value._1,
+        result._2 :+ value._2,
+        result._3 :+ value._3,
+        result._4 :+ value._4,
+      )
     })
   }
 
-  private def getBasicAccessorPermissions(acc: SYCLAccessor[Post], classObj: Expr[Post]): (Expr[Post], Perm[Post]) = {
-    val perm: Expr[Post] = acc.accessMode match {
-      case SYCLReadWriteAccess() => WritePerm[Post]()(acc.accessMode.o)
-      case SYCLReadOnlyAccess() => ReadPerm[Post]()(acc.accessMode.o)
-    }
+  private def getBasicAccessorPermissions(
+      acc: SYCLAccessor[Post],
+      classObj: Expr[Post],
+  ): (Expr[Post], Perm[Post]) = {
+    val perm: Expr[Post] =
+      acc.accessMode match {
+        case SYCLReadWriteAccess() => WritePerm[Post]()(acc.accessMode.o)
+        case SYCLReadOnlyAccess() => ReadPerm[Post]()(acc.accessMode.o)
+      }
 
-    val rangeIndexDerefs: Seq[Expr[Post]] = acc.rangeIndexFields.map(
-      f => Deref[Post](classObj, f.ref)(new SYCLAccessorDimensionDerefBlame(f))(f.o)
+    val rangeIndexDerefs: Seq[Expr[Post]] = acc.rangeIndexFields.map(f =>
+      Deref[Post](classObj, f.ref)(new SYCLAccessorDimensionDerefBlame(f))(f.o)
     )
 
     (
       foldStar(
-        acc.rangeIndexFields.map(f => Perm(FieldLocation[Post](classObj, f.ref)(f.o), ReadPerm[Post]()(f.o))(f.o)) ++
-        Seq(
-          Perm(FieldLocation[Post](classObj, acc.instanceField.ref)(acc.instanceField.o), ReadPerm()(acc.instanceField.o))(acc.instanceField.o),
+        acc.rangeIndexFields.map(f =>
+          Perm(
+            FieldLocation[Post](classObj, f.ref)(f.o),
+            ReadPerm[Post]()(f.o),
+          )(f.o)
+        ) ++ Seq(
+          Perm(
+            FieldLocation[Post](classObj, acc.instanceField.ref)(
+              acc.instanceField.o
+            ),
+            ReadPerm()(acc.instanceField.o),
+          )(acc.instanceField.o),
           ValidArray(
-            Deref[Post](classObj, acc.instanceField.ref)(new SYCLAccessorDerefBlame(acc.instanceField))(acc.instanceField.o),
-            rangeIndexDerefs.reduce((e1, e2) => (e1 * e2)(acc.buffer.o)))(acc.instanceField.o),
+            Deref[Post](classObj, acc.instanceField.ref)(
+              new SYCLAccessorDerefBlame(acc.instanceField)
+            )(acc.instanceField.o),
+            rangeIndexDerefs.reduce((e1, e2) => (e1 * e2)(acc.buffer.o)),
+          )(acc.instanceField.o),
         )
       )(acc.instanceField.o),
       Perm(
         ArrayLocation(
-          Deref[Post](classObj, acc.instanceField.ref)(new SYCLAccessorDerefBlame(acc.instanceField))(acc.instanceField.o),
-          Any()(PanicBlame("The accessor field is not null as that was proven in the previous conditions."))(acc.instanceField.o)
-        )(PanicBlame("All indices of the accessor array should be accessible"))(acc.instanceField.o),
-        perm
-      )(acc.accessMode.o)
+          Deref[Post](classObj, acc.instanceField.ref)(
+            new SYCLAccessorDerefBlame(acc.instanceField)
+          )(acc.instanceField.o),
+          Any()(PanicBlame(
+            "The accessor field is not null as that was proven in the previous conditions."
+          ))(acc.instanceField.o),
+        )(PanicBlame("All indices of the accessor array should be accessible"))(
+          acc.instanceField.o
+        ),
+        perm,
+      )(acc.accessMode.o),
     )
   }
 
-  private def createEventClassConstructor(accessors: Seq[SYCLAccessor[Post]], preClass: Class[Pre], commandGroupO: Origin): Procedure[Post] = {
+  private def createEventClassConstructor(
+      accessors: Seq[SYCLAccessor[Post]],
+      preClass: Class[Pre],
+      commandGroupO: Origin,
+  ): Procedure[Post] = {
     val t = rw.dispatch(TClass[Pre](preClass.ref, Seq()))
-    rw.globalDeclarations.declare(withResult((result: Result[Post]) => {
-      val constructorPostConditions: mutable.Buffer[Expr[Post]] = mutable.Buffer.empty
-      val constructorArgs: mutable.Buffer[Variable[Post]] = mutable.Buffer.empty
-
-      // Generate expressions that check the bounds of the given range
-      constructorArgs.appendAll(currentKernelType.get.getRangeFields.map(f => new Variable[Post](TCInt())(f.o)))
-      constructorPostConditions.appendAll(currentKernelType.get.getConstructorPostConditions(result, constructorArgs))
-      val preConditions = UnitAccountedPredicate[Post](currentKernelType.get.getRangeSizeChecksForConstructor(constructorArgs))(commandGroupO)
-
-      accessors.foreach(acc => {
-        val newConstructorAccessorArg = new Variable[Post](acc.buffer.generatedVar.t)(acc.instanceField.o)
-        val newConstructorAccessorDimensionArgs = acc.rangeIndexFields.map(f => new Variable[Post](TCInt())(f.o))
-
-        val (basicPermissions, fieldArrayElementsPermission) = getBasicAccessorPermissions(acc, result)
-        constructorPostConditions.append(basicPermissions)
-        constructorPostConditions.append(fieldArrayElementsPermission)
-        constructorPostConditions.append(foldStar[Post](
-          Eq[Post](
-            Deref[Post](result, acc.instanceField.ref)(new SYCLAccessorDerefBlame(acc.instanceField))(acc.instanceField.o),
-            Local[Post](newConstructorAccessorArg.ref)(newConstructorAccessorArg.o)
-          )(newConstructorAccessorArg.o) +:
-          Seq.range(0, acc.rangeIndexFields.size).map(i =>
-            Eq[Post](
-              Deref[Post](result, acc.rangeIndexFields(i).ref)(new SYCLAccessorDimensionDerefBlame(acc.rangeIndexFields(i)))(acc.rangeIndexFields(i).o),
-              Local[Post](newConstructorAccessorDimensionArgs(i).ref)(newConstructorAccessorDimensionArgs(i).o)
-            )(newConstructorAccessorDimensionArgs(i).o)
+    rw.globalDeclarations.declare(
+      withResult((result: Result[Post]) => {
+        val constructorPostConditions: mutable.Buffer[Expr[Post]] =
+          mutable.Buffer.empty
+        val constructorArgs: mutable.Buffer[Variable[Post]] =
+          mutable.Buffer.empty
+
+        // Generate expressions that check the bounds of the given range
+        constructorArgs.appendAll(currentKernelType.get.getRangeFields.map(f =>
+          new Variable[Post](TCInt())(f.o)
+        ))
+        constructorPostConditions.appendAll(
+          currentKernelType.get
+            .getConstructorPostConditions(result, constructorArgs)
+        )
+        val preConditions =
+          UnitAccountedPredicate[Post](
+            currentKernelType.get
+              .getRangeSizeChecksForConstructor(constructorArgs)
+          )(commandGroupO)
+
+        accessors.foreach(acc => {
+          val newConstructorAccessorArg =
+            new Variable[Post](acc.buffer.generatedVar.t)(acc.instanceField.o)
+          val newConstructorAccessorDimensionArgs = acc.rangeIndexFields
+            .map(f => new Variable[Post](TCInt())(f.o))
+
+          val (basicPermissions, fieldArrayElementsPermission) =
+            getBasicAccessorPermissions(acc, result)
+          constructorPostConditions.append(basicPermissions)
+          constructorPostConditions.append(fieldArrayElementsPermission)
+          constructorPostConditions.append(
+            foldStar[Post](
+              Eq[Post](
+                Deref[Post](result, acc.instanceField.ref)(
+                  new SYCLAccessorDerefBlame(acc.instanceField)
+                )(acc.instanceField.o),
+                Local[Post](newConstructorAccessorArg.ref)(
+                  newConstructorAccessorArg.o
+                ),
+              )(newConstructorAccessorArg.o) +:
+                Seq.range(0, acc.rangeIndexFields.size).map(i =>
+                  Eq[Post](
+                    Deref[Post](result, acc.rangeIndexFields(i).ref)(
+                      new SYCLAccessorDimensionDerefBlame(
+                        acc.rangeIndexFields(i)
+                      )
+                    )(acc.rangeIndexFields(i).o),
+                    Local[Post](newConstructorAccessorDimensionArgs(i).ref)(
+                      newConstructorAccessorDimensionArgs(i).o
+                    ),
+                  )(newConstructorAccessorDimensionArgs(i).o)
+                )
+            )(acc.o)
           )
-        )(acc.o))
-
-        constructorArgs.append(newConstructorAccessorArg)
-        constructorArgs.appendAll(newConstructorAccessorDimensionArgs)
-      })
 
-      {
-        implicit val o: Origin = commandGroupO
-        new Procedure[Post](
-          returnType = t,
-          args = constructorArgs.toSeq,
-          outArgs = Seq(), typeArgs = Seq(), body = None,
-          contract = ApplicableContract[Post](
-            preConditions,
-            SplitAccountedPredicate(
-              left = UnitAccountedPredicate((result !== Null()) && (TypeOf(result) === TypeValue(t))),
-              right = UnitAccountedPredicate[Post](foldStar[Post](constructorPostConditions.toSeq :+ IdleToken[Post](result))),
-            ),
-            tt, Seq(), Seq(), Seq(), None
-          )(SYCLKernelConstructorNontrivialUnsatisfiableBlame(commandGroupO))
-        )(SYCLKernelConstructorCallableFailureBlame())(o.where(name = "event_constructor"))
-      }
-    })(commandGroupO))
+          constructorArgs.append(newConstructorAccessorArg)
+          constructorArgs.appendAll(newConstructorAccessorDimensionArgs)
+        })
+
+        {
+          implicit val o: Origin = commandGroupO
+          new Procedure[Post](
+            returnType = t,
+            args = constructorArgs.toSeq,
+            outArgs = Seq(),
+            typeArgs = Seq(),
+            body = None,
+            contract =
+              ApplicableContract[Post](
+                preConditions,
+                SplitAccountedPredicate(
+                  left = UnitAccountedPredicate(
+                    (result !== Null()) && (TypeOf(result) === TypeValue(t))
+                  ),
+                  right = UnitAccountedPredicate[Post](foldStar[Post](
+                    constructorPostConditions.toSeq :+ IdleToken[Post](result)
+                  )),
+                ),
+                tt,
+                Seq(),
+                Seq(),
+                Seq(),
+                None,
+              )(SYCLKernelConstructorNontrivialUnsatisfiableBlame(
+                commandGroupO
+              )),
+          )(SYCLKernelConstructorCallableFailureBlame())(
+            o.where(name = "event_constructor")
+          )
+        }
+      })(commandGroupO)
+    )
   }
 
   // Returns what kind of kernel we are working with and check that the kernel ranges match with the (nd_)item ranges
-  private def getKernelRangeType(complicatedKernelRangeType: Type[Pre], lambdaDeclarator: CPPDeclarator[Pre]): Type[Pre] = {
-    val kernelRangeType = complicatedKernelRangeType match {
-      case primitive: CPPPrimitiveType[Pre] => CPP.getBaseTypeFromSpecs(primitive.specifiers)
-      case typ => typ
-    }
+  private def getKernelRangeType(
+      complicatedKernelRangeType: Type[Pre],
+      lambdaDeclarator: CPPDeclarator[Pre],
+  ): Type[Pre] = {
+    val kernelRangeType =
+      complicatedKernelRangeType match {
+        case primitive: CPPPrimitiveType[Pre] =>
+          CPP.getBaseTypeFromSpecs(primitive.specifiers)
+        case typ => typ
+      }
     val lambdaParams = CPP.paramsFromDeclarator(lambdaDeclarator)
     if (lambdaParams.size != 1) {
       throw SYCLIncorrectParallelForLambdaArgument(lambdaDeclarator.o)
     }
     val lambdaArgType = CPP.getBaseTypeFromSpecs(lambdaParams.head.specifiers)
     (kernelRangeType, lambdaArgType) match {
-      case (SYCLTRange(rangeDimCount), SYCLTItem(itemDimCount)) if rangeDimCount == itemDimCount =>
-      case (SYCLTNDRange(rangeDimCount), SYCLTNDItem(itemDimCount)) if rangeDimCount == itemDimCount =>
+      case (SYCLTRange(rangeDimCount), SYCLTItem(itemDimCount))
+          if rangeDimCount == itemDimCount =>
+      case (SYCLTNDRange(rangeDimCount), SYCLTNDItem(itemDimCount))
+          if rangeDimCount == itemDimCount =>
       case _ => throw SYCLIncorrectParallelForLambdaArgument(lambdaDeclarator.o)
     }
     kernelRangeType
   }
 
   // Generate the IterVariables that are passed to the parblock as ranges
-  private def createRangeIterVar(scope: KernelScopeLevel, dimension: Int, maxRange: Expr[Post])(implicit o: Origin): IterVariable[Post] = {
-    val variable = new Variable[Post](TCInt())(o.where(name = s"${scope.idName}_$dimension"))
+  private def createRangeIterVar(
+      scope: KernelScopeLevel,
+      dimension: Int,
+      maxRange: Expr[Post],
+  )(implicit o: Origin): IterVariable[Post] = {
+    val variable =
+      new Variable[Post](TCInt())(o.where(name = s"${scope.idName}_$dimension"))
     new IterVariable[Post](variable, CIntegerValue(0), maxRange)
   }
 
   // Used for generation the contract for the method wrapping the parblocks
   // Code based on the quantify() method in ParBlockEncoder
-  private def getKernelQuantifiedCondition(block: ParBlock[Post], condition: Expr[Post])(implicit o: Origin): Expr[Post] = {
+  private def getKernelQuantifiedCondition(
+      block: ParBlock[Post],
+      condition: Expr[Post],
+  )(implicit o: Origin): Expr[Post] = {
     val parEncoder = new ParBlockEncoder[Pre]()
-    val rangesMap: mutable.Map[Variable[Post], (Expr[Post], Expr[Post])] = mutable.Map.empty
-    block.iters.map(iterVar => rangesMap.put(iterVar.variable, (iterVar.from, iterVar.to)))
+    val rangesMap: mutable.Map[Variable[Post], (Expr[Post], Expr[Post])] =
+      mutable.Map.empty
+    block.iters.map(iterVar =>
+      rangesMap.put(iterVar.variable, (iterVar.from, iterVar.to))
+    )
 
     val conditions = AstBuildHelpers.unfoldStar(condition)
     val vars = block.iters.map(_.variable).toSet
@@ -1225,206 +2129,451 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
       val quantVars = parEncoder.depVars(vars, cond)
       val nonQuantVars = vars.diff(quantVars)
 
-      val scale = (x: Expr[Post]) => nonQuantVars.foldLeft(x)((body, iter) => {
-        val scale = rangesMap(iter)._2 - rangesMap(iter)._1
-        Scale(scale, body)(PanicBlame("Par block was checked to be non-empty"))
-      })
-
-      if (quantVars.isEmpty) scale(cond)
-      else rw.variables.scope {
-        val range = quantVars.map(v =>
-          rangesMap(v)._1 <= Local[Post](v.ref) &&
-            Local[Post](v.ref) < rangesMap(v)._2
-        ).reduceOption[Expr[Post]](And(_, _)).getOrElse(tt)
-
-        cond match {
-          case Forall(bindings, Nil, body) =>
-            Forall(bindings ++ quantVars, Nil, range ==> scale(body))
-          case s@Starall(bindings, Nil, body) =>
-            Starall(bindings ++ quantVars, Nil, range ==> scale(body))(s.blame)
-          case other =>
-            Starall(quantVars.toSeq, Nil, range ==> scale(other))(ParBlockNotInjective(block, other))
+      val scale =
+        (x: Expr[Post]) =>
+          nonQuantVars.foldLeft(x)((body, iter) => {
+            val scale = rangesMap(iter)._2 - rangesMap(iter)._1
+            Scale(scale, body)(PanicBlame(
+              "Par block was checked to be non-empty"
+            ))
+          })
+
+      if (quantVars.isEmpty)
+        scale(cond)
+      else
+        rw.variables.scope {
+          val range = quantVars.map(v =>
+            rangesMap(v)._1 <= Local[Post](v.ref) &&
+              Local[Post](v.ref) < rangesMap(v)._2
+          ).reduceOption[Expr[Post]](And(_, _)).getOrElse(tt)
+
+          cond match {
+            case Forall(bindings, Nil, body) =>
+              Forall(bindings ++ quantVars, Nil, range ==> scale(body))
+            case s @ Starall(bindings, Nil, body) =>
+              Starall(bindings ++ quantVars, Nil, range ==> scale(body))(
+                s.blame
+              )
+            case other =>
+              Starall(quantVars.toSeq, Nil, range ==> scale(other))(
+                ParBlockNotInjective(block, other)
+              )
+          }
         }
-      }
     })
 
     AstBuildHelpers.foldStar(rewrittenExpr)
   }
 
-  private def getSimpleWorkItemId(inv: CPPInvocation[Pre], level: KernelScopeLevel) (implicit o: Origin) : Expr[Post] = {
-    SeqSubscript[Post](LiteralSeq(TCInt(), currentDimensionIterVars(level).map(iterVar => iterVar.variable.get).toSeq), rw.dispatch(inv.args.head))(SYCLItemMethodSeqBoundFailureBlame(inv))
-  }
-
-  private def getSimpleWorkItemRange(inv: CPPInvocation[Pre], level: KernelScopeLevel)(implicit o: Origin): Expr[Post] = {
-    SeqSubscript[Post](LiteralSeq(TCInt(), currentDimensionIterVars(level).map(iterVar => iterVar.to).toSeq), rw.dispatch(inv.args.head))(SYCLItemMethodSeqBoundFailureBlame(inv))
-  }
-
-  private def getSimpleWorkItemLinearId(inv: CPPInvocation[Pre], level: KernelScopeLevel)(implicit o: Origin): Expr[Post] = {
-    val args: Seq[Expr[Post]] = (currentDimensionIterVars(level).map(iterVar => iterVar.variable.get) ++ currentDimensionIterVars(level).map(iterVar => iterVar.to)).toSeq
+  private def getSimpleWorkItemId(
+      inv: CPPInvocation[Pre],
+      level: KernelScopeLevel,
+  )(implicit o: Origin): Expr[Post] = {
+    SeqSubscript[Post](
+      LiteralSeq(
+        TCInt(),
+        currentDimensionIterVars(level).map(iterVar => iterVar.variable.get)
+          .toSeq,
+      ),
+      rw.dispatch(inv.args.head),
+    )(SYCLItemMethodSeqBoundFailureBlame(inv))
+  }
+
+  private def getSimpleWorkItemRange(
+      inv: CPPInvocation[Pre],
+      level: KernelScopeLevel,
+  )(implicit o: Origin): Expr[Post] = {
+    SeqSubscript[Post](
+      LiteralSeq(
+        TCInt(),
+        currentDimensionIterVars(level).map(iterVar => iterVar.to).toSeq,
+      ),
+      rw.dispatch(inv.args.head),
+    )(SYCLItemMethodSeqBoundFailureBlame(inv))
+  }
+
+  private def getSimpleWorkItemLinearId(
+      inv: CPPInvocation[Pre],
+      level: KernelScopeLevel,
+  )(implicit o: Origin): Expr[Post] = {
+    val args: Seq[Expr[Post]] =
+      (currentDimensionIterVars(level).map(iterVar => iterVar.variable.get) ++
+        currentDimensionIterVars(level).map(iterVar => iterVar.to)).toSeq
 
     currentDimensionIterVars(level).size match {
-      case i@(2 | 3) => syclHelperFunctions(s"sycl_:_:linearize_$i")(args, SYCLItemMethodInvocationBlame(inv), o)
+      case i @ (2 | 3) =>
+        syclHelperFunctions(s"sycl_:_:linearize_$i")(
+          args,
+          SYCLItemMethodInvocationBlame(inv),
+          o,
+        )
       case _ => currentDimensionIterVars(level).head.variable.get
     }
   }
 
-  private def getGlobalWorkItemId(inv: CPPInvocation[Pre])(implicit o: Origin): Expr[Post] = {
+  private def getGlobalWorkItemId(
+      inv: CPPInvocation[Pre]
+  )(implicit o: Origin): Expr[Post] = {
     val args: Seq[Expr[Post]] = Seq(
-      SeqSubscript[Post](LiteralSeq(TCInt(), currentDimensionIterVars(LocalScope()).map(iterVar => iterVar.variable.get).toSeq), rw.dispatch(inv.args.head))(SYCLItemMethodSeqBoundFailureBlame(inv)),
-      SeqSubscript[Post](LiteralSeq(TCInt(), currentDimensionIterVars(GroupScope()).map(iterVar => iterVar.variable.get).toSeq), rw.dispatch(inv.args.head))(SYCLItemMethodSeqBoundFailureBlame(inv)),
-      SeqSubscript[Post](LiteralSeq(TCInt(), currentDimensionIterVars(LocalScope()).map(iterVar => iterVar.to).toSeq), rw.dispatch(inv.args.head))(SYCLItemMethodSeqBoundFailureBlame(inv)),
-      SeqSubscript[Post](LiteralSeq(TCInt(), currentDimensionIterVars(GroupScope()).map(iterVar => iterVar.to).toSeq), rw.dispatch(inv.args.head))(SYCLItemMethodSeqBoundFailureBlame(inv))
+      SeqSubscript[Post](
+        LiteralSeq(
+          TCInt(),
+          currentDimensionIterVars(LocalScope())
+            .map(iterVar => iterVar.variable.get).toSeq,
+        ),
+        rw.dispatch(inv.args.head),
+      )(SYCLItemMethodSeqBoundFailureBlame(inv)),
+      SeqSubscript[Post](
+        LiteralSeq(
+          TCInt(),
+          currentDimensionIterVars(GroupScope())
+            .map(iterVar => iterVar.variable.get).toSeq,
+        ),
+        rw.dispatch(inv.args.head),
+      )(SYCLItemMethodSeqBoundFailureBlame(inv)),
+      SeqSubscript[Post](
+        LiteralSeq(
+          TCInt(),
+          currentDimensionIterVars(LocalScope()).map(iterVar => iterVar.to)
+            .toSeq,
+        ),
+        rw.dispatch(inv.args.head),
+      )(SYCLItemMethodSeqBoundFailureBlame(inv)),
+      SeqSubscript[Post](
+        LiteralSeq(
+          TCInt(),
+          currentDimensionIterVars(GroupScope()).map(iterVar => iterVar.to)
+            .toSeq,
+        ),
+        rw.dispatch(inv.args.head),
+      )(SYCLItemMethodSeqBoundFailureBlame(inv)),
     )
 
-    syclHelperFunctions("sycl_:_:linearize_2")(args, SYCLItemMethodInvocationBlame(inv), o)
+    syclHelperFunctions("sycl_:_:linearize_2")(
+      args,
+      SYCLItemMethodInvocationBlame(inv),
+      o,
+    )
   }
 
-  private def getGlobalWorkItemRange(inv: CPPInvocation[Pre])(implicit o: Origin): Expr[Post] = {
+  private def getGlobalWorkItemRange(
+      inv: CPPInvocation[Pre]
+  )(implicit o: Origin): Expr[Post] = {
     val args: Seq[Expr[Post]] = Seq(
-      SeqSubscript[Post](LiteralSeq(TCInt(), currentDimensionIterVars(LocalScope()).map(iterVar => iterVar.to).toSeq), rw.dispatch(inv.args.head))(SYCLItemMethodSeqBoundFailureBlame(inv)),
-      SeqSubscript[Post](LiteralSeq(TCInt(), currentDimensionIterVars(GroupScope()).map(iterVar => iterVar.to).toSeq), rw.dispatch(inv.args.head))(SYCLItemMethodSeqBoundFailureBlame(inv))
+      SeqSubscript[Post](
+        LiteralSeq(
+          TCInt(),
+          currentDimensionIterVars(LocalScope()).map(iterVar => iterVar.to)
+            .toSeq,
+        ),
+        rw.dispatch(inv.args.head),
+      )(SYCLItemMethodSeqBoundFailureBlame(inv)),
+      SeqSubscript[Post](
+        LiteralSeq(
+          TCInt(),
+          currentDimensionIterVars(GroupScope()).map(iterVar => iterVar.to)
+            .toSeq,
+        ),
+        rw.dispatch(inv.args.head),
+      )(SYCLItemMethodSeqBoundFailureBlame(inv)),
     )
 
-    syclHelperFunctions("sycl_:_:nd_item_:_:get_global_range")(args, SYCLItemMethodInvocationBlame(inv), o)
+    syclHelperFunctions("sycl_:_:nd_item_:_:get_global_range")(
+      args,
+      SYCLItemMethodInvocationBlame(inv),
+      o,
+    )
   }
 
-  private def getGlobalWorkItemLinearId(inv: CPPInvocation[Pre])(implicit o: Origin): Expr[Post] = {
+  private def getGlobalWorkItemLinearId(
+      inv: CPPInvocation[Pre]
+  )(implicit o: Origin): Expr[Post] = {
     val ids = currentDimensionIterVars(GroupScope()).indices.map(i => {
-      getGlobalWorkItemId(CPPInvocation[Pre](tt, Seq(c_const(i)), Nil, Nil)(PanicBlame(s"Method sycl::nd_item::get_global_id($i) should callable here.")))
+      getGlobalWorkItemId(
+        CPPInvocation[Pre](tt, Seq(c_const(i)), Nil, Nil)(PanicBlame(
+          s"Method sycl::nd_item::get_global_id($i) should callable here."
+        ))
+      )
     })
     val ranges = currentDimensionIterVars(GroupScope()).indices.map(i => {
-      getGlobalWorkItemRange(CPPInvocation[Pre](tt, Seq(c_const(i)), Nil, Nil)(PanicBlame(s"Method sycl::nd_item::get_global_range($i) should callable here.")))
+      getGlobalWorkItemRange(
+        CPPInvocation[Pre](tt, Seq(c_const(i)), Nil, Nil)(PanicBlame(
+          s"Method sycl::nd_item::get_global_range($i) should callable here."
+        ))
+      )
     })
 
     ids.size match {
-      case i@(2 | 3) => syclHelperFunctions(s"sycl_:_:linearize_$i")(ids ++ ranges, SYCLItemMethodInvocationBlame(inv), o)
+      case i @ (2 | 3) =>
+        syclHelperFunctions(s"sycl_:_:linearize_$i")(
+          ids ++ ranges,
+          SYCLItemMethodInvocationBlame(inv),
+          o,
+        )
       case _ => ids.head
     }
   }
 
-  private def rewriteSYCLBufferConstruction(inv: CPPInvocation[Pre], maybeVarNameO: Option[Origin] = None): (Statement[Post], Variable[Post]) = {
+  private def rewriteSYCLBufferConstruction(
+      inv: CPPInvocation[Pre],
+      maybeVarNameO: Option[Origin] = None,
+  ): (Statement[Post], Variable[Post]) = {
     implicit val o: Origin = inv.o
     val varNameO = maybeVarNameO.getOrElse(o)
     val preType = inv.t.asInstanceOf[SYCLTBuffer[Pre]]
     val postType = rw.dispatch(preType).asInstanceOf[SYCLTBuffer[Post]]
 
     // Generate or get the exclusive access predicate and copy procedures
-    val (exclusiveAccessPredicate, copyHostDataToBufferProcedure, _) = syclBufferTypeToHostPredicateAndProcedures.get(postType) match {
-      case Some(triple) => triple
-      case None =>
-        val preGeneratedPredicate = preType.generateExclusiveAccessPredicate()
-        val postGeneratedPredicate = postType.generateExclusiveAccessPredicate()
-        rw.globalDeclarations.succeed(preGeneratedPredicate, postGeneratedPredicate)
-        val preCopyHostDataToBufferProcedure = preType.generateCopyHostDataToBufferProcedure()
-        val postCopyHostDataToBufferProcedure = postType.generateCopyHostDataToBufferProcedure()
-        rw.globalDeclarations.succeed(preCopyHostDataToBufferProcedure, postCopyHostDataToBufferProcedure)
-        val preCopyBufferToHostDataProcedure = preType.generateCopyBufferToHostDataProcedure(preGeneratedPredicate.ref)
-        val postCopyBufferToHostDataProcedure = postType.generateCopyBufferToHostDataProcedure(postGeneratedPredicate.ref)
-        rw.globalDeclarations.succeed(preCopyBufferToHostDataProcedure, postCopyBufferToHostDataProcedure)
-
-        syclBufferTypeToHostPredicateAndProcedures.put(postType, (postGeneratedPredicate, postCopyHostDataToBufferProcedure, postCopyBufferToHostDataProcedure))
-        (postGeneratedPredicate, postCopyHostDataToBufferProcedure, postCopyBufferToHostDataProcedure)
-    }
+    val (exclusiveAccessPredicate, copyHostDataToBufferProcedure, _) =
+      syclBufferTypeToHostPredicateAndProcedures.get(postType) match {
+        case Some(triple) => triple
+        case None =>
+          val preGeneratedPredicate = preType.generateExclusiveAccessPredicate()
+          val postGeneratedPredicate = postType
+            .generateExclusiveAccessPredicate()
+          rw.globalDeclarations
+            .succeed(preGeneratedPredicate, postGeneratedPredicate)
+          val preCopyHostDataToBufferProcedure = preType
+            .generateCopyHostDataToBufferProcedure()
+          val postCopyHostDataToBufferProcedure = postType
+            .generateCopyHostDataToBufferProcedure()
+          rw.globalDeclarations.succeed(
+            preCopyHostDataToBufferProcedure,
+            postCopyHostDataToBufferProcedure,
+          )
+          val preCopyBufferToHostDataProcedure = preType
+            .generateCopyBufferToHostDataProcedure(preGeneratedPredicate.ref)
+          val postCopyBufferToHostDataProcedure = postType
+            .generateCopyBufferToHostDataProcedure(postGeneratedPredicate.ref)
+          rw.globalDeclarations.succeed(
+            preCopyBufferToHostDataProcedure,
+            postCopyBufferToHostDataProcedure,
+          )
+
+          syclBufferTypeToHostPredicateAndProcedures.put(
+            postType,
+            (
+              postGeneratedPredicate,
+              postCopyHostDataToBufferProcedure,
+              postCopyBufferToHostDataProcedure,
+            ),
+          )
+          (
+            postGeneratedPredicate,
+            postCopyHostDataToBufferProcedure,
+            postCopyBufferToHostDataProcedure,
+          )
+      }
 
     // Get arguments
     val hostData = rw.dispatch(inv.args.head)
-    val range = rw.dispatch(inv.args(1)) match {
-      case r: SYCLRange[Post] => r
-      case _ => throw Unreachable("The range parameter of the buffer was not rewritten to a range.")
-    }
+    val range =
+      rw.dispatch(inv.args(1)) match {
+        case r: SYCLRange[Post] => r
+        case _ =>
+          throw Unreachable(
+            "The range parameter of the buffer was not rewritten to a range."
+          )
+      }
 
     // Call the method that copies the hostData contents to the buffer
     val args = Seq(hostData, range.size)
-    val copyInv = ProcedureInvocation[Post](copyHostDataToBufferProcedure.ref, args, Nil, Nil, Nil, Nil)(SYCLBufferConstructionInvocationBlame(inv))
+    val copyInv =
+      ProcedureInvocation[Post](
+        copyHostDataToBufferProcedure.ref,
+        args,
+        Nil,
+        Nil,
+        Nil,
+        Nil,
+      )(SYCLBufferConstructionInvocationBlame(inv))
 
     // Fold predicate to gain exclusive access to the hostData
-    val gainExclusiveAccess = Fold(PredicateApply[Post](exclusiveAccessPredicate.ref, args, WritePerm()))(SYCLBufferConstructionFoldFailedBlame(inv))
+    val gainExclusiveAccess =
+      Fold(
+        PredicateApply[Post](exclusiveAccessPredicate.ref, args, WritePerm())
+      )(SYCLBufferConstructionFoldFailedBlame(inv))
 
     val v = new Variable[Post](TArray(postType.typ))(varNameO)
-    syclBufferSuccessor.top.put(v, SYCLBuffer[Post](hostData, v, range, postType))
+    syclBufferSuccessor.top
+      .put(v, SYCLBuffer[Post](hostData, v, range, postType))
 
-    val result: Statement[Post] = Block(Seq(LocalDecl(v), assignLocal(v.get, copyInv), gainExclusiveAccess))
+    val result: Statement[Post] = Block(
+      Seq(LocalDecl(v), assignLocal(v.get, copyInv), gainExclusiveAccess)
+    )
     (result, v)
   }
 
-  private def destroySYCLBuffer(buffer: SYCLBuffer[Post], scope: CPPLifetimeScope[_]): Statement[Post] = {
+  private def destroySYCLBuffer(
+      buffer: SYCLBuffer[Post],
+      scope: CPPLifetimeScope[_],
+  ): Statement[Post] = {
     implicit val o: Origin = buffer.o
 
     // Wait for SYCL kernels that access the buffer to finish executing
-    val kernelsToTerminate = currentlyRunningKernels.filter(tuple => tuple._2.exists(acc => acc.buffer.equals(buffer) && acc.accessMode.isInstanceOf[SYCLReadWriteAccess[Post]]))
-    val kernelTerminations = kernelsToTerminate.map(tuple => syclKernelTermination(tuple._1, tuple._2)).toSeq
+    val kernelsToTerminate = currentlyRunningKernels.filter(tuple =>
+      tuple._2.exists(acc =>
+        acc.buffer.equals(buffer) &&
+          acc.accessMode.isInstanceOf[SYCLReadWriteAccess[Post]]
+      )
+    )
+    val kernelTerminations =
+      kernelsToTerminate.map(tuple => syclKernelTermination(tuple._1, tuple._2))
+        .toSeq
 
     // Get the exclusive access predicate and copy procedures
-    val (exclusiveAccessPredicate, _, copyBufferToHostDataProcedure) = syclBufferTypeToHostPredicateAndProcedures(buffer.typ)
+    val (exclusiveAccessPredicate, _, copyBufferToHostDataProcedure) =
+      syclBufferTypeToHostPredicateAndProcedures(buffer.typ)
 
     // Call the method that copies the buffer contents to the hostData
-    val copyInv = ProcedureInvocation[Post](copyBufferToHostDataProcedure.ref, Seq(buffer.hostData, buffer.generatedVar.get), Nil, Nil, Nil, Nil)(SYCLBufferDestructionInvocationBlame(buffer.generatedVar, scope))
+    val copyInv =
+      ProcedureInvocation[Post](
+        copyBufferToHostDataProcedure.ref,
+        Seq(buffer.hostData, buffer.generatedVar.get),
+        Nil,
+        Nil,
+        Nil,
+        Nil,
+      )(SYCLBufferDestructionInvocationBlame(buffer.generatedVar, scope))
 
     // Unfold predicate to release exclusive access to the hostData
     val args = Seq(buffer.hostData, buffer.range.size)
-    val removeExclusiveAccess = Unfold(PredicateApply[Post](exclusiveAccessPredicate.ref, args, WritePerm()))(SYCLBufferDestructionUnfoldFailedBlame(buffer.generatedVar, scope))
+    val removeExclusiveAccess =
+      Unfold(
+        PredicateApply[Post](exclusiveAccessPredicate.ref, args, WritePerm())
+      )(SYCLBufferDestructionUnfoldFailedBlame(buffer.generatedVar, scope))
 
     Block(kernelTerminations ++ Seq(Eval(copyInv), removeExclusiveAccess))
   }
 
-  private def getKernelsWaitingForBuffer(buffer: SYCLBuffer[Post], mode: SYCLAccessMode[Post], source: CPPLocalDeclaration[Pre]): Statement[Post] = {
+  private def getKernelsWaitingForBuffer(
+      buffer: SYCLBuffer[Post],
+      mode: SYCLAccessMode[Post],
+      source: CPPLocalDeclaration[Pre],
+  ): Statement[Post] = {
     implicit val o: Origin = source.o
 
-    val kernelsToWaitFor: mutable.Map[Local[Post], Seq[SYCLAccessor[Post]]] = mode match {
-      case SYCLReadOnlyAccess() => currentlyRunningKernels.filter(tuple => tuple._2.exists(acc => acc.accessMode.isInstanceOf[SYCLReadWriteAccess[Post]] && acc.buffer.equals(buffer)))
-      case SYCLReadWriteAccess() => currentlyRunningKernels.filter(tuple => tuple._2.exists(acc => acc.buffer.equals(buffer)))
-    }
-
-    Block[Post](kernelsToWaitFor.map(tuple => syclKernelTermination(tuple._1, tuple._2)).toSeq)
-  }
-
-  def rewriteSubscript(sub: AmbiguousSubscript[Pre]): Expr[Post] = sub match {
-    case AmbiguousSubscript(base: CPPLocal[Pre], index) if CPP.unwrappedType(base.t).isInstanceOf[SYCLTAccessor[Pre]] =>
-      CPP.unwrappedType(base.t) match {
-        case SYCLTAccessor(_, 1, _) => ArraySubscript[Post](
-          Deref[Post](
-            currentThis.get,
-            syclAccessorSuccessor(base.ref.get).instanceField.ref
-          )(new SYCLAccessorDerefBlame(syclAccessorSuccessor(base.ref.get).instanceField))(sub.o),
-          rw.dispatch(index)
-        )(SYCLAccessorArraySubscriptErrorBlame(sub))(sub.o)
-        case t: SYCLTAccessor[Pre] => throw SYCLWrongNumberOfSubscriptsForAccessor(sub, 1, t.dimCount)
-        case _ => ???
-      }
-    case AmbiguousSubscript(AmbiguousSubscript(base: CPPLocal[Pre], indexX), indexY) if CPP.unwrappedType(base.t).isInstanceOf[SYCLTAccessor[Pre]] =>
-      implicit val o: Origin = sub.o
-      val accessor = syclAccessorSuccessor(base.ref.get)
-      val linearizeArgs = Seq(rw.dispatch(indexX), rw.dispatch(indexY),
-        Deref[Post](currentThis.get, accessor.rangeIndexFields(0).ref)(new SYCLAccessorDimensionDerefBlame(accessor.rangeIndexFields(0))),
-        Deref[Post](currentThis.get, accessor.rangeIndexFields(1).ref)(new SYCLAccessorDimensionDerefBlame(accessor.rangeIndexFields(1)))
-      )
-      CPP.unwrappedType(base.t) match {
-        case SYCLTAccessor(_, 2, _) => ArraySubscript[Post](
-          Deref[Post](currentThis.get, accessor.instanceField.ref)(new SYCLAccessorDerefBlame(accessor.instanceField)),
-          syclHelperFunctions("sycl_:_:linearize_2")(linearizeArgs, SYCLAccessorArraySubscriptLinearizeInvocationBlame(sub, base, Seq(indexX, indexY)), o)
-        )(SYCLAccessorArraySubscriptErrorBlame(sub))
-        case t: SYCLTAccessor[Pre] => throw SYCLWrongNumberOfSubscriptsForAccessor(sub, 2, t.dimCount)
-        case _ => ???
-      }
-    case AmbiguousSubscript(AmbiguousSubscript(AmbiguousSubscript(base: CPPLocal[Pre], indexX), indexY), indexZ) if CPP.unwrappedType(base.t).isInstanceOf[SYCLTAccessor[Pre]] =>
-      implicit val o: Origin = sub.o
-      val accessor = syclAccessorSuccessor(base.ref.get)
-      val linearizeArgs = Seq(rw.dispatch(indexX), rw.dispatch(indexY), rw.dispatch(indexZ),
-        Deref[Post](currentThis.get, accessor.rangeIndexFields(0).ref)(new SYCLAccessorDimensionDerefBlame(accessor.rangeIndexFields(0))),
-        Deref[Post](currentThis.get, accessor.rangeIndexFields(1).ref)(new SYCLAccessorDimensionDerefBlame(accessor.rangeIndexFields(1))),
-        Deref[Post](currentThis.get, accessor.rangeIndexFields(2).ref)(new SYCLAccessorDimensionDerefBlame(accessor.rangeIndexFields(2)))
-      )
-      CPP.unwrappedType(base.t) match {
-        case SYCLTAccessor(_, 3, _) => ArraySubscript[Post](
-          Deref[Post](currentThis.get, accessor.instanceField.ref)(new SYCLAccessorDerefBlame(accessor.instanceField)),
-          syclHelperFunctions("sycl_:_:linearize_3")(linearizeArgs, SYCLAccessorArraySubscriptLinearizeInvocationBlame(sub, base, Seq(indexX, indexY, indexZ)), o)
-        )(SYCLAccessorArraySubscriptErrorBlame(sub))
-        case t: SYCLTAccessor[Pre] => throw SYCLWrongNumberOfSubscriptsForAccessor(sub, 3, t.dimCount)
-        case _ => ???
+    val kernelsToWaitFor: mutable.Map[Local[Post], Seq[SYCLAccessor[Post]]] =
+      mode match {
+        case SYCLReadOnlyAccess() =>
+          currentlyRunningKernels.filter(tuple =>
+            tuple._2.exists(acc =>
+              acc.accessMode.isInstanceOf[SYCLReadWriteAccess[Post]] &&
+                acc.buffer.equals(buffer)
+            )
+          )
+        case SYCLReadWriteAccess() =>
+          currentlyRunningKernels
+            .filter(tuple => tuple._2.exists(acc => acc.buffer.equals(buffer)))
       }
-    case _ => rw.rewriteDefault(sub)
+
+    Block[Post](
+      kernelsToWaitFor.map(tuple => syclKernelTermination(tuple._1, tuple._2))
+        .toSeq
+    )
   }
 
+  def rewriteSubscript(sub: AmbiguousSubscript[Pre]): Expr[Post] =
+    sub match {
+      case AmbiguousSubscript(base: CPPLocal[Pre], index)
+          if CPP.unwrappedType(base.t).isInstanceOf[SYCLTAccessor[Pre]] =>
+        CPP.unwrappedType(base.t) match {
+          case SYCLTAccessor(_, 1, _) =>
+            ArraySubscript[Post](
+              Deref[Post](
+                currentThis.get,
+                syclAccessorSuccessor(base.ref.get).instanceField.ref,
+              )(new SYCLAccessorDerefBlame(
+                syclAccessorSuccessor(base.ref.get).instanceField
+              ))(sub.o),
+              rw.dispatch(index),
+            )(SYCLAccessorArraySubscriptErrorBlame(sub))(sub.o)
+          case t: SYCLTAccessor[Pre] =>
+            throw SYCLWrongNumberOfSubscriptsForAccessor(sub, 1, t.dimCount)
+          case _ => ???
+        }
+      case AmbiguousSubscript(
+            AmbiguousSubscript(base: CPPLocal[Pre], indexX),
+            indexY,
+          ) if CPP.unwrappedType(base.t).isInstanceOf[SYCLTAccessor[Pre]] =>
+        implicit val o: Origin = sub.o
+        val accessor = syclAccessorSuccessor(base.ref.get)
+        val linearizeArgs = Seq(
+          rw.dispatch(indexX),
+          rw.dispatch(indexY),
+          Deref[Post](currentThis.get, accessor.rangeIndexFields(0).ref)(
+            new SYCLAccessorDimensionDerefBlame(accessor.rangeIndexFields(0))
+          ),
+          Deref[Post](currentThis.get, accessor.rangeIndexFields(1).ref)(
+            new SYCLAccessorDimensionDerefBlame(accessor.rangeIndexFields(1))
+          ),
+        )
+        CPP.unwrappedType(base.t) match {
+          case SYCLTAccessor(_, 2, _) =>
+            ArraySubscript[Post](
+              Deref[Post](currentThis.get, accessor.instanceField.ref)(
+                new SYCLAccessorDerefBlame(accessor.instanceField)
+              ),
+              syclHelperFunctions("sycl_:_:linearize_2")(
+                linearizeArgs,
+                SYCLAccessorArraySubscriptLinearizeInvocationBlame(
+                  sub,
+                  base,
+                  Seq(indexX, indexY),
+                ),
+                o,
+              ),
+            )(SYCLAccessorArraySubscriptErrorBlame(sub))
+          case t: SYCLTAccessor[Pre] =>
+            throw SYCLWrongNumberOfSubscriptsForAccessor(sub, 2, t.dimCount)
+          case _ => ???
+        }
+      case AmbiguousSubscript(
+            AmbiguousSubscript(
+              AmbiguousSubscript(base: CPPLocal[Pre], indexX),
+              indexY,
+            ),
+            indexZ,
+          ) if CPP.unwrappedType(base.t).isInstanceOf[SYCLTAccessor[Pre]] =>
+        implicit val o: Origin = sub.o
+        val accessor = syclAccessorSuccessor(base.ref.get)
+        val linearizeArgs = Seq(
+          rw.dispatch(indexX),
+          rw.dispatch(indexY),
+          rw.dispatch(indexZ),
+          Deref[Post](currentThis.get, accessor.rangeIndexFields(0).ref)(
+            new SYCLAccessorDimensionDerefBlame(accessor.rangeIndexFields(0))
+          ),
+          Deref[Post](currentThis.get, accessor.rangeIndexFields(1).ref)(
+            new SYCLAccessorDimensionDerefBlame(accessor.rangeIndexFields(1))
+          ),
+          Deref[Post](currentThis.get, accessor.rangeIndexFields(2).ref)(
+            new SYCLAccessorDimensionDerefBlame(accessor.rangeIndexFields(2))
+          ),
+        )
+        CPP.unwrappedType(base.t) match {
+          case SYCLTAccessor(_, 3, _) =>
+            ArraySubscript[Post](
+              Deref[Post](currentThis.get, accessor.instanceField.ref)(
+                new SYCLAccessorDerefBlame(accessor.instanceField)
+              ),
+              syclHelperFunctions("sycl_:_:linearize_3")(
+                linearizeArgs,
+                SYCLAccessorArraySubscriptLinearizeInvocationBlame(
+                  sub,
+                  base,
+                  Seq(indexX, indexY, indexZ),
+                ),
+                o,
+              ),
+            )(SYCLAccessorArraySubscriptErrorBlame(sub))
+          case t: SYCLTAccessor[Pre] =>
+            throw SYCLWrongNumberOfSubscriptsForAccessor(sub, 3, t.dimCount)
+          case _ => ???
+        }
+      case _ => rw.rewriteDefault(sub)
+    }
+
   def rewriteLifetimeScope(scope: CPPLifetimeScope[Pre]): Statement[Post] = {
     implicit val o: Origin = scope.o
 
@@ -1433,86 +2582,150 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
     val rewrittenBody = rw.dispatch(scope.body)
 
     // Destroy all buffers and copy their data back to host
-    val bufferDestructions: Seq[Statement[Post]] = syclBufferSuccessor.pop().map(tuple => destroySYCLBuffer(tuple._2, scope)).toSeq
+    val bufferDestructions: Seq[Statement[Post]] =
+      syclBufferSuccessor.pop().map(tuple => destroySYCLBuffer(tuple._2, scope))
+        .toSeq
 
     Block[Post](rewrittenBody +: bufferDestructions)
   }
 
   def deref(deref: CPPClassMethodOrFieldAccess[Pre]): Expr[Post] = {
     deref.ref.get match {
-      case spec: SpecDerefTarget[Pre] => rw.specDeref(deref.classInstance, spec, deref, deref.blame)
+      case spec: SpecDerefTarget[Pre] =>
+        rw.specDeref(deref.classInstance, spec, deref, deref.blame)
       case target: RefCPPGlobalDeclaration[Pre] => ???
       case target: SpecInvocationTarget[Pre] => ???
     }
   }
 
-  private def removeKernelClassInstancePermissions(e: Expr[Post]): Expr[Post] = {
+  private def removeKernelClassInstancePermissions(
+      e: Expr[Post]
+  ): Expr[Post] = {
     implicit val o = e.o
     e match {
-      case s@Starall(bindings, triggers, body) => Starall(bindings, triggers, removeKernelClassInstancePermissions(body))(s.blame)
-      case ModelAbstractState(model, state) => ModelAbstractState(removeKernelClassInstancePermissions(model), removeKernelClassInstancePermissions(state))
-      case ModelState(model, perm, state) => ModelState(removeKernelClassInstancePermissions(model), removeKernelClassInstancePermissions(perm), removeKernelClassInstancePermissions(state))
-      case s@Scale(expr, res) => Scale(removeKernelClassInstancePermissions(expr), removeKernelClassInstancePermissions(res))(s.blame)
-      case Star(left, right) => Star(removeKernelClassInstancePermissions(left), removeKernelClassInstancePermissions(right))
-      case Wand(left, right) => Wand(removeKernelClassInstancePermissions(left), removeKernelClassInstancePermissions(right))
-
-      case ActionPerm(Deref(obj, _), _) if obj.equals(this.currentThis.get) => tt
+      case s @ Starall(bindings, triggers, body) =>
+        Starall(bindings, triggers, removeKernelClassInstancePermissions(body))(
+          s.blame
+        )
+      case ModelAbstractState(model, state) =>
+        ModelAbstractState(
+          removeKernelClassInstancePermissions(model),
+          removeKernelClassInstancePermissions(state),
+        )
+      case ModelState(model, perm, state) =>
+        ModelState(
+          removeKernelClassInstancePermissions(model),
+          removeKernelClassInstancePermissions(perm),
+          removeKernelClassInstancePermissions(state),
+        )
+      case s @ Scale(expr, res) =>
+        Scale(
+          removeKernelClassInstancePermissions(expr),
+          removeKernelClassInstancePermissions(res),
+        )(s.blame)
+      case Star(left, right) =>
+        Star(
+          removeKernelClassInstancePermissions(left),
+          removeKernelClassInstancePermissions(right),
+        )
+      case Wand(left, right) =>
+        Wand(
+          removeKernelClassInstancePermissions(left),
+          removeKernelClassInstancePermissions(right),
+        )
+
+      case ActionPerm(Deref(obj, _), _) if obj.equals(this.currentThis.get) =>
+        tt
       case ModelPerm(Deref(obj, _), _) if obj.equals(this.currentThis.get) => tt
-      case Perm(FieldLocation(obj, _), _) if obj.equals(this.currentThis.get) => tt
-      case PointsTo(FieldLocation(obj, _), _, _) if obj.equals(this.currentThis.get) => tt
-      case Value(FieldLocation(obj, _)) if obj.equals(this.currentThis.get) => tt
-      case Perm(AmbiguousLocation(ArraySubscript(Deref(obj, _), _)), _) if obj.equals(this.currentThis.get) => tt
-      case PointsTo(AmbiguousLocation(ArraySubscript(Deref(obj, _), _)), _, _) if obj.equals(this.currentThis.get) => tt
-      case Value(AmbiguousLocation(ArraySubscript(Deref(obj, _), _))) if obj.equals(this.currentThis.get) => tt
-      case Implies(left, right) => Implies(removeKernelClassInstancePermissions(left), removeKernelClassInstancePermissions(right))
+      case Perm(FieldLocation(obj, _), _) if obj.equals(this.currentThis.get) =>
+        tt
+      case PointsTo(FieldLocation(obj, _), _, _)
+          if obj.equals(this.currentThis.get) =>
+        tt
+      case Value(FieldLocation(obj, _)) if obj.equals(this.currentThis.get) =>
+        tt
+      case Perm(AmbiguousLocation(ArraySubscript(Deref(obj, _), _)), _)
+          if obj.equals(this.currentThis.get) =>
+        tt
+      case PointsTo(AmbiguousLocation(ArraySubscript(Deref(obj, _), _)), _, _)
+          if obj.equals(this.currentThis.get) =>
+        tt
+      case Value(AmbiguousLocation(ArraySubscript(Deref(obj, _), _)))
+          if obj.equals(this.currentThis.get) =>
+        tt
+      case Implies(left, right) =>
+        Implies(
+          removeKernelClassInstancePermissions(left),
+          removeKernelClassInstancePermissions(right),
+        )
 
       case e => e
     }
   }
 
-  private def removeLocalAccessorConditions(conditions: Expr[Post], localAccessorDecls: Seq[Variable[Post]]): Expr[Post] =
-    foldStar(unfoldStar(conditions).filterNot(expr => expr.exists({
-      case l: Local[Post] if localAccessorDecls.contains(l.ref.decl) => true
-    })))(conditions.o)
-
-  private def syclKernelTermination(variable: Local[Post], accessors: Seq[SYCLAccessor[Post]])(implicit o: Origin): Statement[Post] = {
-    currentlyRunningKernels.remove(variable)
-    Block(
-      Join(variable)(SYCLKernelJoinBlame()) +:
-      accessors.collect({
-        case SYCLAccessor(buffer, SYCLReadWriteAccess(), instanceField, _) =>
-          assignLocal(
-            buffer.generatedVar.get,
-            Deref[Post](variable, instanceField.ref)(new SYCLAccessorDerefBlame(instanceField))
-          )
+  private def removeLocalAccessorConditions(
+      conditions: Expr[Post],
+      localAccessorDecls: Seq[Variable[Post]],
+  ): Expr[Post] =
+    foldStar(unfoldStar(conditions).filterNot(expr =>
+      expr.exists({
+        case l: Local[Post] if localAccessorDecls.contains(l.ref.decl) => true
       })
-    )
-  }
+    ))(conditions.o)
 
-  private def findStatements[S](stat: Statement[Pre], pred: Statement[Pre] => Option[S]): Seq[S] = stat match {
-    case Scope(_, body) => findStatements(body, pred)
-    case CPPLifetimeScope(body) => findStatements(body, pred)
-    case Block(statements) => statements.flatMap(s => findStatements(s, pred))
-    case s => pred(s).toSeq
-  }
+  private def syclKernelTermination(
+      variable: Local[Post],
+      accessors: Seq[SYCLAccessor[Post]],
+  )(implicit o: Origin): Statement[Post] = {
+    currentlyRunningKernels.remove(variable)
+    Block(Join(variable)(SYCLKernelJoinBlame()) +: accessors.collect({
+      case SYCLAccessor(buffer, SYCLReadWriteAccess(), instanceField, _) =>
+        assignLocal(
+          buffer.generatedVar.get,
+          Deref[Post](variable, instanceField.ref)(new SYCLAccessorDerefBlame(
+            instanceField
+          )),
+        )
+    }))
+  }
+
+  private def findStatements[S](
+      stat: Statement[Pre],
+      pred: Statement[Pre] => Option[S],
+  ): Seq[S] =
+    stat match {
+      case Scope(_, body) => findStatements(body, pred)
+      case CPPLifetimeScope(body) => findStatements(body, pred)
+      case Block(statements) => statements.flatMap(s => findStatements(s, pred))
+      case s => pred(s).toSeq
+    }
 
-  def assignliteralArray(array: Variable[Post], exprs: Seq[Expr[Pre]], origin: Origin): Seq[Statement[Post]] = {
+  def assignliteralArray(
+      array: Variable[Post],
+      exprs: Seq[Expr[Pre]],
+      origin: Origin,
+  ): Seq[Statement[Post]] = {
     implicit val o: Origin = origin
-    (exprs.zipWithIndex.map {
-      case (value, index) => Assign[Post](AmbiguousSubscript(array.get, c_const(index))(PanicBlame("The explicit initialization of an array in CPP should never generate an assignment that exceeds the bounds of the array")), rw.dispatch(value))(
-        PanicBlame("Assignment for an explicit array initializer cannot fail."))
-      }
-    )
+    (exprs.zipWithIndex.map { case (value, index) =>
+      Assign[Post](
+        AmbiguousSubscript(array.get, c_const(index))(PanicBlame(
+          "The explicit initialization of an array in CPP should never generate an assignment that exceeds the bounds of the array"
+        )),
+        rw.dispatch(value),
+      )(PanicBlame("Assignment for an explicit array initializer cannot fail."))
+    })
   }
 
-  def rewriteArrayDeclaration(decl: CPPLocalDeclaration[Pre]): Statement[Post] = {
+  def rewriteArrayDeclaration(
+      decl: CPPLocalDeclaration[Pre]
+  ): Statement[Post] = {
     // LangTypesToCol makes it so that each declaration only has one init
     val init = decl.decl.inits.head
     val info = CPP.getDeclaratorInfo(init.decl)
     implicit val o: Origin = init.o
 
     decl.decl.specs match {
-      case Seq(CPPSpecificationType(cta@CPPTArray(sizeOption, oldT))) =>
+      case Seq(CPPSpecificationType(cta @ CPPTArray(sizeOption, oldT))) =>
         val t = rw.dispatch(oldT)
         val v = new Variable[Post](TPointer(t))(o.sourceName(info.name))
         cppNameSuccessor(RefCPPLocalDeclaration(decl, 0)) = v
@@ -1523,27 +2736,41 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
             val newArr = NewPointerArray[Post](t, rw.dispatch(size))(cta.blame)
             Block(Seq(LocalDecl(v), assignLocal(v.get, newArr)))
           case (None, Some(CPPLiteralArray(exprs))) =>
-            val newArr = NewPointerArray[Post](t, c_const[Post](exprs.size))(cta.blame)
-            Block(Seq(LocalDecl(v), assignLocal(v.get, newArr)) ++ assignliteralArray(v, exprs, o))
+            val newArr =
+              NewPointerArray[Post](t, c_const[Post](exprs.size))(cta.blame)
+            Block(
+              Seq(LocalDecl(v), assignLocal(v.get, newArr)) ++
+                assignliteralArray(v, exprs, o)
+            )
           case (Some(size), Some(CPPLiteralArray(exprs))) =>
-            val realSize = isConstantInt(size).filter(_ >= 0).getOrElse(throw WrongCPPType(decl))
-            if(realSize < exprs.size) logger.warn(s"Excess elements in array initializer: '${decl}'")
-            val newArr = NewPointerArray[Post](t, c_const[Post](realSize))(cta.blame)
-            Block(Seq(LocalDecl(v), assignLocal(v.get, newArr)) ++ assignliteralArray(v, exprs.take(realSize.intValue), o))
+            val realSize = isConstantInt(size).filter(_ >= 0)
+              .getOrElse(throw WrongCPPType(decl))
+            if (realSize < exprs.size)
+              logger.warn(s"Excess elements in array initializer: '${decl}'")
+            val newArr =
+              NewPointerArray[Post](t, c_const[Post](realSize))(cta.blame)
+            Block(
+              Seq(LocalDecl(v), assignLocal(v.get, newArr)) ++
+                assignliteralArray(v, exprs.take(realSize.intValue), o)
+            )
           case _ => throw WrongCPPType(decl)
         }
       case _ => throw WrongCPPType(decl)
     }
   }
 
-  def result(ref: RefCPPFunctionDefinition[Pre])(implicit o: Origin): Expr[Post] =
-    Result[Post](cppFunctionSuccessor.ref(ref.decl))
+  def result(ref: RefCPPFunctionDefinition[Pre])(
+      implicit o: Origin
+  ): Expr[Post] = Result[Post](cppFunctionSuccessor.ref(ref.decl))
 
-  def result(ref: RefCPPGlobalDeclaration[Pre])(implicit o: Origin): Expr[Post] = {
+  def result(
+      ref: RefCPPGlobalDeclaration[Pre]
+  )(implicit o: Origin): Expr[Post] = {
     val maybeDefinition = ref.decls.decl.inits(ref.initIdx).ref
     maybeDefinition match {
       case Some(defn) => Result[Post](cppFunctionSuccessor.ref(defn.decl))
-      case None => Result[Post](cppFunctionDeclSuccessor.ref((ref.decls, ref.initIdx)))
+      case None =>
+        Result[Post](cppFunctionDeclSuccessor.ref((ref.decls, ref.initIdx)))
     }
   }
 
@@ -1551,4 +2778,4 @@ case class LangCPPToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends L
     // TODO: we should not use pointer here
     TPointer(rw.dispatch(t.innerType))
   }
-}
\ No newline at end of file
+}
diff --git a/src/rewrite/vct/rewrite/lang/LangCToCol.scala b/src/rewrite/vct/rewrite/lang/LangCToCol.scala
index a0d480ca01..bcd6d89252 100644
--- a/src/rewrite/vct/rewrite/lang/LangCToCol.scala
+++ b/src/rewrite/vct/rewrite/lang/LangCToCol.scala
@@ -33,25 +33,32 @@ case object LangCToCol {
   case class MultipleSharedMemoryDeclaration(decl: Node[_]) extends UserError {
     override def code: String = "multipleSharedMemoryDeclaration"
     override def text: String =
-      decl.o.messageInContext(s"We don't support declaring multiple shared memory variables at a single line.")
+      decl.o.messageInContext(
+        s"We don't support declaring multiple shared memory variables at a single line."
+      )
   }
 
   case class WrongGPUKernelParameterType(param: CParam[_]) extends UserError {
     override def code: String = "wrongParameterType"
     override def text: String =
-      param.o.messageInContext(s"This parameter has a type that is not allowed as parameter in a GPU kernel.")
+      param.o.messageInContext(
+        s"This parameter has a type that is not allowed as parameter in a GPU kernel."
+      )
   }
 
   case class WrongGPUType(param: CParam[_]) extends UserError {
     override def code: String = "wrongGPUType"
     override def text: String =
-      param.o.messageInContext(s"This parameter has a type that is not allowed outside of a GPU kernel.")
+      param.o.messageInContext(
+        s"This parameter has a type that is not allowed outside of a GPU kernel."
+      )
   }
 
   case class WrongCType(decl: CLocalDeclaration[_]) extends UserError {
     override def code: String = "wrongCType"
     override def text: String =
-      decl.o.messageInContext(s"This declaration has a type that is not supported.")
+      decl.o
+        .messageInContext(s"This declaration has a type that is not supported.")
   }
 
   case class WrongStructType(decl: Node[_]) extends UserError {
@@ -78,13 +85,17 @@ case object LangCToCol {
   case class WrongGPULocalType(local: CLocalDeclaration[_]) extends UserError {
     override def code: String = "wrongGPULocalType"
     override def text: String =
-      local.o.messageInContext(s"This local declaration has a type that is not allowed inside a GPU kernel.")
+      local.o.messageInContext(
+        s"This local declaration has a type that is not allowed inside a GPU kernel."
+      )
   }
 
   case class NotDynamicSharedMem(e: Expr[_]) extends UserError {
     override def code: String = "notDynamicSharedMem"
     override def text: String =
-      e.o.messageInContext(s"`\\shared_mem_size` should reference a dynamic shared memory location.")
+      e.o.messageInContext(
+        s"`\\shared_mem_size` should reference a dynamic shared memory location."
+      )
   }
 
   case class WrongBarrierSpecifier(b: GpgpuBarrier[_]) extends UserError {
@@ -99,14 +110,27 @@ case object LangCToCol {
       e.o.messageInContext(s"This is unsupported for barrier for now.")
   }
 
-  case class RedistributingBarrier(v: CNameTarget[_], barrier: GpgpuBarrier[_], global: Boolean) extends UserError {
-    def memFence: String = if(global) "CLK_GLOBAL_MEM_FENCE" else "CLK_LOCAL_MEM_FENCE"
+  case class RedistributingBarrier(
+      v: CNameTarget[_],
+      barrier: GpgpuBarrier[_],
+      global: Boolean,
+  ) extends UserError {
+    def memFence: String =
+      if (global)
+        "CLK_GLOBAL_MEM_FENCE"
+      else
+        "CLK_LOCAL_MEM_FENCE"
     override def code: String = "redistributingBarrier"
-    override def text: String =  barrier.o.messageInContext(
-      s"Trying to redistribute the variable `$v` in a GPU barrier, but need the fence `$memFence` to do this.")
+    override def text: String =
+      barrier.o.messageInContext(
+        s"Trying to redistribute the variable `$v` in a GPU barrier, but need the fence `$memFence` to do this."
+      )
   }
 
-  case class CDoubleContracted(decl: CGlobalDeclaration[_], defn: CFunctionDefinition[_]) extends UserError {
+  case class CDoubleContracted(
+      decl: CGlobalDeclaration[_],
+      defn: CFunctionDefinition[_],
+  ) extends UserError {
     override def code: String = "multipleContracts"
     override def text: String =
       Message.messagesInContext(
@@ -115,102 +139,150 @@ case object LangCToCol {
       )
   }
 
-  case class KernelNotInjective(kernel: CGpgpuKernelSpecifier[_]) extends Blame[ReceiverNotInjective] {
+  case class KernelNotInjective(kernel: CGpgpuKernelSpecifier[_])
+      extends Blame[ReceiverNotInjective] {
     override def blame(error: ReceiverNotInjective): Unit =
-      kernel.blame.blame(KernelPredicateNotInjective(Left(kernel), error.resource))
-  }
-
-  case class KernelParFailure(kernel: CGpgpuKernelSpecifier[_]) extends Blame[ParBlockFailure] {
-    override def blame(error: ParBlockFailure): Unit = error match {
-      case ParPredicateNotInjective(_, predicate) =>
-        kernel.blame.blame(KernelPredicateNotInjective(Left(kernel), predicate))
-      case ParPreconditionFailed(_, _) =>
-        PanicBlame("Kernel parallel block precondition cannot fail, since an identical predicate is required before.").blame(error)
-      case ParBlockPostconditionFailed(failure, _) =>
-        kernel.blame.blame(KernelPostconditionFailed(failure, Left(kernel)))
-      case ParBlockMayNotThrow(_) =>
-        PanicBlame("Please don't throw exceptions from a gpgpu kernel, it's not polite.").blame(error)
-    }
+      kernel.blame
+        .blame(KernelPredicateNotInjective(Left(kernel), error.resource))
+  }
+
+  case class KernelParFailure(kernel: CGpgpuKernelSpecifier[_])
+      extends Blame[ParBlockFailure] {
+    override def blame(error: ParBlockFailure): Unit =
+      error match {
+        case ParPredicateNotInjective(_, predicate) =>
+          kernel.blame
+            .blame(KernelPredicateNotInjective(Left(kernel), predicate))
+        case ParPreconditionFailed(_, _) =>
+          PanicBlame(
+            "Kernel parallel block precondition cannot fail, since an identical predicate is required before."
+          ).blame(error)
+        case ParBlockPostconditionFailed(failure, _) =>
+          kernel.blame.blame(KernelPostconditionFailed(failure, Left(kernel)))
+        case ParBlockMayNotThrow(_) =>
+          PanicBlame(
+            "Please don't throw exceptions from a gpgpu kernel, it's not polite."
+          ).blame(error)
+      }
   }
 
-  case class KernelBarrierFailure(barrier: GpgpuBarrier[_]) extends Blame[ParBarrierFailure] {
-    override def blame(error: ParBarrierFailure): Unit = error match {
-      case ParBarrierNotEstablished(failure, _) =>
-        barrier.blame.blame(KernelBarrierNotEstablished(failure, barrier))
-      case ParBarrierInconsistent(failure, _) =>
-        barrier.blame.blame(KernelBarrierInconsistent(failure, barrier))
-      case ParBarrierMayNotThrow(_) =>
-        PanicBlame("Please don't throw exceptions from a gpgpu barrier, it's not polite.").blame(error)
-      case ParBarrierInvariantBroken(failure, _) =>
-        barrier.blame.blame(KernelBarrierInvariantBroken(failure, barrier))
-    }
+  case class KernelBarrierFailure(barrier: GpgpuBarrier[_])
+      extends Blame[ParBarrierFailure] {
+    override def blame(error: ParBarrierFailure): Unit =
+      error match {
+        case ParBarrierNotEstablished(failure, _) =>
+          barrier.blame.blame(KernelBarrierNotEstablished(failure, barrier))
+        case ParBarrierInconsistent(failure, _) =>
+          barrier.blame.blame(KernelBarrierInconsistent(failure, barrier))
+        case ParBarrierMayNotThrow(_) =>
+          PanicBlame(
+            "Please don't throw exceptions from a gpgpu barrier, it's not polite."
+          ).blame(error)
+        case ParBarrierInvariantBroken(failure, _) =>
+          barrier.blame.blame(KernelBarrierInvariantBroken(failure, barrier))
+      }
   }
 
-  case class ArrayMallocFailed(inv: CInvocation[_]) extends Blame[ArraySizeError] {
-    override def blame(error: ArraySizeError): Unit = error match {
-      case ArraySize(arr) =>
-        inv.blame.blame(MallocSize(inv))
-      case other => throw Unreachable(s"Invalid invocation failure: $other")
-    }
+  case class ArrayMallocFailed(inv: CInvocation[_])
+      extends Blame[ArraySizeError] {
+    override def blame(error: ArraySizeError): Unit =
+      error match {
+        case ArraySize(arr) => inv.blame.blame(MallocSize(inv))
+        case other => throw Unreachable(s"Invalid invocation failure: $other")
+      }
   }
 
-  case class StructCopyFailed(assign: PreAssignExpression[_], field: InstanceField[_]) extends Blame[InsufficientPermission] {
+  case class StructCopyFailed(
+      assign: PreAssignExpression[_],
+      field: InstanceField[_],
+  ) extends Blame[InsufficientPermission] {
     override def blame(error: InsufficientPermission): Unit = {
       assign.blame.blame(CopyStructFailed(assign, Referrable.originName(field)))
     }
   }
 
-  case class StructCopyBeforeCallFailed(inv: CInvocation[_], field: InstanceField[_]) extends Blame[InsufficientPermission] {
+  case class StructCopyBeforeCallFailed(
+      inv: CInvocation[_],
+      field: InstanceField[_],
+  ) extends Blame[InsufficientPermission] {
     override def blame(error: InsufficientPermission): Unit = {
-      inv.blame.blame(CopyStructFailedBeforeCall(inv, Referrable.originName(field)))
+      inv.blame
+        .blame(CopyStructFailedBeforeCall(inv, Referrable.originName(field)))
     }
   }
 
-  case class VectorBoundFailed(subscript:  AmbiguousSubscript[_]) extends Blame[InvocationFailure] {
-    override def blame(error: InvocationFailure): Unit = error match {
-      case PreconditionFailed(path, _, _) => path match {
-        case FailLeft +: _ => subscript.blame.blame(VectorBoundNegative(subscript))
-        case FailRight +: _ => subscript.blame.blame(VectorBoundExceedsLength(subscript))
-        case _ => PanicBlame("Should not occur")
+  case class VectorBoundFailed(subscript: AmbiguousSubscript[_])
+      extends Blame[InvocationFailure] {
+    override def blame(error: InvocationFailure): Unit =
+      error match {
+        case PreconditionFailed(path, _, _) =>
+          path match {
+            case FailLeft +: _ =>
+              subscript.blame.blame(VectorBoundNegative(subscript))
+            case FailRight +: _ =>
+              subscript.blame.blame(VectorBoundExceedsLength(subscript))
+            case _ => PanicBlame("Should not occur")
+          }
+        case other => throw Unreachable(s"Invalid invocation failure: $other")
       }
-      case other => throw Unreachable(s"Invalid invocation failure: $other")
-    }
   }
 
   case class UnsupportedCast(c: CCast[_]) extends UserError {
     override def code: String = "unsupportedCast"
-    override def text: String = c.o.messageInContext("This cast is not supported")
+    override def text: String =
+      c.o.messageInContext("This cast is not supported")
   }
 
   case class UnsupportedMalloc(c: Expr[_]) extends UserError {
     override def code: String = "unsupportedMalloc"
-    override def text: String = c.o.messageInContext("Only 'malloc' of the format '(t *) malloc(x*sizeof(t)' is supported.")
+    override def text: String =
+      c.o.messageInContext(
+        "Only 'malloc' of the format '(t *) malloc(x*sizeof(t)' is supported."
+      )
   }
 
   case class UnsupportedSizeof(c: Expr[_]) extends UserError {
     override def code: String = "unsupportedSizeof"
 
-    override def text: String = c.o.messageInContext("The use of 'sizeof' is only supported inside a malloc: '(t *) malloc(x*typeof(t)'.")
+    override def text: String =
+      c.o.messageInContext(
+        "The use of 'sizeof' is only supported inside a malloc: '(t *) malloc(x*typeof(t)'."
+      )
   }
 
   case class UnsupportedStructPerm(o: Origin) extends UserError {
     override def code: String = "unsupportedStructPerm"
-    override def text: String = o.messageInContext("Shorthand for Permissions for structs not possible, since the struct has a cyclic reference")
+    override def text: String =
+      o.messageInContext(
+        "Shorthand for Permissions for structs not possible, since the struct has a cyclic reference"
+      )
   }
 }
 
-case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends LazyLogging {
+case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre])
+    extends LazyLogging {
   import LangCToCol._
   type Post = Rewritten[Pre]
   implicit val implicitRewriter: AbstractRewriter[Pre, Post] = rw
 
-  val cFunctionSuccessor: SuccessionMap[CFunctionDefinition[Pre], Procedure[Post]] = SuccessionMap()
-  val cFunctionDeclSuccessor: SuccessionMap[(CGlobalDeclaration[Pre], Int), Procedure[Post]] = SuccessionMap()
-  val cNameSuccessor: SuccessionMap[CNameTarget[Pre], Variable[Post]] = SuccessionMap()
-  val cGlobalNameSuccessor: SuccessionMap[CNameTarget[Pre], HeapVariable[Post]] = SuccessionMap()
-  val cStructSuccessor: SuccessionMap[CGlobalDeclaration[Pre], Class[Post]] = SuccessionMap()
-  val cStructFieldsSuccessor: SuccessionMap[(CGlobalDeclaration[Pre], CStructMemberDeclarator[Pre]), InstanceField[Post]] = SuccessionMap()
-  val cCurrentDefinitionParamSubstitutions: ScopedStack[Map[CParam[Pre], CParam[Pre]]] = ScopedStack()
+  val cFunctionSuccessor
+      : SuccessionMap[CFunctionDefinition[Pre], Procedure[Post]] =
+    SuccessionMap()
+  val cFunctionDeclSuccessor
+      : SuccessionMap[(CGlobalDeclaration[Pre], Int), Procedure[Post]] =
+    SuccessionMap()
+  val cNameSuccessor: SuccessionMap[CNameTarget[Pre], Variable[Post]] =
+    SuccessionMap()
+  val cGlobalNameSuccessor
+      : SuccessionMap[CNameTarget[Pre], HeapVariable[Post]] = SuccessionMap()
+  val cStructSuccessor: SuccessionMap[CGlobalDeclaration[Pre], Class[Post]] =
+    SuccessionMap()
+  val cStructFieldsSuccessor: SuccessionMap[
+    (CGlobalDeclaration[Pre], CStructMemberDeclarator[Pre]),
+    InstanceField[Post],
+  ] = SuccessionMap()
+  val cCurrentDefinitionParamSubstitutions
+      : ScopedStack[Map[CParam[Pre], CParam[Pre]]] = ScopedStack()
 
   val cudaCurrentThreadIdx: ScopedStack[CudaVec] = ScopedStack()
   val cudaCurrentBlockIdx: ScopedStack[CudaVec] = ScopedStack()
@@ -220,9 +292,13 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
   val cudaCurrentGrid: ScopedStack[ParBlockDecl[Post]] = ScopedStack()
   val cudaCurrentBlock: ScopedStack[ParBlockDecl[Post]] = ScopedStack()
 
-  private val dynamicSharedMemNames: mutable.Set[CNameTarget[Pre]] = mutable.Set()
-  private val dynamicSharedMemLengthVar: mutable.Map[CNameTarget[Pre], Variable[Post]] = mutable.Map()
-  private val staticSharedMemNames: mutable.Map[CNameTarget[Pre], (BigInt, Option[Blame[ArraySizeError]])] = mutable.Map()
+  private val dynamicSharedMemNames: mutable.Set[CNameTarget[Pre]] = mutable
+    .Set()
+  private val dynamicSharedMemLengthVar
+      : mutable.Map[CNameTarget[Pre], Variable[Post]] = mutable.Map()
+  private val staticSharedMemNames
+      : mutable.Map[CNameTarget[Pre], (BigInt, Option[Blame[ArraySizeError]])] =
+    mutable.Map()
   private val globalMemNames: mutable.Set[RefCParam[Pre]] = mutable.Set()
   private var kernelSpecifier: Option[CGpgpuKernelSpecifier[Pre]] = None
 
@@ -232,28 +308,39 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
   private def CStructFieldOrigin(cdecl: CDeclarator[_]): Origin =
     cdecl.o.sourceName(nameFromDeclarator(cdecl))
 
-  private def CudaIndexVariableOrigin(dim: RefCudaVecDim[_]): Origin = Origin(
-    Seq(
+  private def CudaIndexVariableOrigin(dim: RefCudaVecDim[_]): Origin =
+    Origin(Seq(
       PreferredName(Seq(dim.vec.name, dim.name)),
       LabelContext(s"${dim.vec.name}/${dim.name}"),
-    )
-  )
+    ))
 
   class CudaVec(ref: RefCudaVec[Pre])(implicit val o: Origin) {
-    val indices: ListMap[RefCudaVecDim[Pre], Variable[Post]] =
-      ListMap(Seq(RefCudaVecX[Pre](ref), RefCudaVecY[Pre](ref), RefCudaVecZ[Pre](ref)).map(
-        dim => dim -> new Variable[Post](TCInt())(CudaIndexVariableOrigin(dim))
-      ): _*)
+    val indices: ListMap[RefCudaVecDim[Pre], Variable[Post]] = ListMap(
+      Seq(RefCudaVecX[Pre](ref), RefCudaVecY[Pre](ref), RefCudaVecZ[Pre](ref))
+        .map(dim =>
+          dim -> new Variable[Post](TCInt())(CudaIndexVariableOrigin(dim))
+        ): _*
+    )
   }
 
   private def hasNoSharedMemNames(node: Node[Pre]): Boolean = {
-    val allowedNonRefs = Set("get_local_id", "get_group_id", "get_local_size", "get_num_groups", "get_global_size")
+    val allowedNonRefs = Set(
+      "get_local_id",
+      "get_group_id",
+      "get_local_size",
+      "get_num_groups",
+      "get_global_size",
+    )
 
     def varIsNotShared(l: CLocal[Pre]): Boolean = {
       l.ref match {
         case Some(ref: CNameTarget[Pre])
-          if dynamicSharedMemNames.contains(ref) || staticSharedMemNames.contains(ref) => return false
-        case None => if (!allowedNonRefs.contains(l.name)) Unreachable("Should not happen")
+            if dynamicSharedMemNames.contains(ref) ||
+              staticSharedMemNames.contains(ref) =>
+          return false
+        case None =>
+          if (!allowedNonRefs.contains(l.name))
+            Unreachable("Should not happen")
         case _ =>
       }
       true
@@ -263,7 +350,9 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
       // SharedMemSize gets rewritten towards the length of a shared memory name, so is valid in global context
       case _: SharedMemSize[Pre] =>
       case l: CLocal[Pre] => return varIsNotShared(l)
-      case e => if(!e.subnodes.forall(hasNoSharedMemNames)) return false
+      case e =>
+        if (!e.subnodes.forall(hasNoSharedMemNames))
+          return false
     }
     true
   }
@@ -275,58 +364,77 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
   def sharedSize(shared: SharedMemSize[Pre]): Expr[Post] = {
     val SharedMemSize(pointer) = shared
 
-    val res = pointer match {
-      case loc: CLocal[Pre] =>
-        loc.ref flatMap { dynamicSharedMemLengthVar.get } map {v => Local[Post](v.ref)(shared.o)}
-      case _ => None
-    }
+    val res =
+      pointer match {
+        case loc: CLocal[Pre] =>
+          loc.ref flatMap { dynamicSharedMemLengthVar.get } map { v =>
+            Local[Post](v.ref)(shared.o)
+          }
+        case _ => None
+      }
     res.getOrElse(throw NotDynamicSharedMem(pointer))
   }
 
-  def isRatFloatOrInt(t: Type[Pre]): Boolean = getBaseType(t) match {
-    case _: FloatType[Pre] => true
-    case _: TRational[Pre] => true
-    case _: IntType[Pre] => true
-    case _ => false
-  }
+  def isRatFloatOrInt(t: Type[Pre]): Boolean =
+    getBaseType(t) match {
+      case _: FloatType[Pre] => true
+      case _: TRational[Pre] => true
+      case _: IntType[Pre] => true
+      case _ => false
+    }
 
-  def isFloat(t: Type[Pre]): Boolean = getBaseType(t) match {
+  def isFloat(t: Type[Pre]): Boolean =
+    getBaseType(t) match {
       case _: FloatType[Pre] => true
       case _ => false
-  }
+    }
 
-  def getBaseType[G](t: Type[G]): Type[G] = t match {
-    case CPrimitiveType(specs) =>
-      C.getPrimitiveType(specs)
-    case _ => t
-  }
+  def getBaseType[G](t: Type[G]): Type[G] =
+    t match {
+      case CPrimitiveType(specs) => C.getPrimitiveType(specs)
+      case _ => t
+    }
 
-  def castIsId(exprType: Type[Pre], castType: Type[Pre]): Boolean = (castType, getBaseType(exprType)) match {
-    case (tc, te) if tc == te => true
-    case (TCInt(), TBoundedInt(_, _)) => true
-    case (TBoundedInt(_, _), TCInt()) => true
-    case _ => false
-  }
+  def castIsId(exprType: Type[Pre], castType: Type[Pre]): Boolean =
+    (castType, getBaseType(exprType)) match {
+      case (tc, te) if tc == te => true
+      case (TCInt(), TBoundedInt(_, _)) => true
+      case (TBoundedInt(_, _), TCInt()) => true
+      case _ => false
+    }
 
-  def cast(c: CCast[Pre]): Expr[Post] = c match {
-    case CCast(e, t) if castIsId(e.t, t) => rw.dispatch(c.expr)
-    case CCast(e, t) if (isFloat(t) && isRatFloatOrInt(e.t)) || (isRatFloatOrInt(t) && isFloat(e.t)) =>
-      // We can convert between rationals, integers and floats
-      CastFloat[Post](rw.dispatch(c.expr), rw.dispatch(t))(c.o)
-    case CCast(inv @ CInvocation(CLocal("__vercors_malloc"), Seq(arg), Nil, Nil), CTPointer(t2)) =>
-      val (t1, size) = arg match {
-        case SizeOf(t1) if castIsId(t1, t2)  => (t1, c_const[Post](1)(c.o))
-        case AmbiguousMult(l, SizeOf(t1)) if castIsId(t1, t2) => (t1, rw.dispatch(l))
-        case AmbiguousMult(SizeOf(t1), r) if castIsId(t1, t2) => (t1, rw.dispatch(r))
-        case _ => throw UnsupportedMalloc(c)
-      }
-      NewPointerArray(rw.dispatch(t1), size)(ArrayMallocFailed(inv))(c.o)
-    case CCast(CInvocation(CLocal("__vercors_malloc"), _, _, _), _) => throw UnsupportedMalloc(c)
-    case CCast(n@Null(), t) if t.asPointer.isDefined => rw.dispatch(n)
-    case _ => throw UnsupportedCast(c)
-  }
+  def cast(c: CCast[Pre]): Expr[Post] =
+    c match {
+      case CCast(e, t) if castIsId(e.t, t) => rw.dispatch(c.expr)
+      case CCast(e, t)
+          if (isFloat(t) && isRatFloatOrInt(e.t)) ||
+            (isRatFloatOrInt(t) && isFloat(e.t)) =>
+        // We can convert between rationals, integers and floats
+        CastFloat[Post](rw.dispatch(c.expr), rw.dispatch(t))(c.o)
+      case CCast(
+            inv @ CInvocation(CLocal("__vercors_malloc"), Seq(arg), Nil, Nil),
+            CTPointer(t2),
+          ) =>
+        val (t1, size) =
+          arg match {
+            case SizeOf(t1) if castIsId(t1, t2) => (t1, c_const[Post](1)(c.o))
+            case AmbiguousMult(l, SizeOf(t1)) if castIsId(t1, t2) =>
+              (t1, rw.dispatch(l))
+            case AmbiguousMult(SizeOf(t1), r) if castIsId(t1, t2) =>
+              (t1, rw.dispatch(r))
+            case _ => throw UnsupportedMalloc(c)
+          }
+        NewPointerArray(rw.dispatch(t1), size)(ArrayMallocFailed(inv))(c.o)
+      case CCast(CInvocation(CLocal("__vercors_malloc"), _, _, _), _) =>
+        throw UnsupportedMalloc(c)
+      case CCast(n @ Null(), t) if t.asPointer.isDefined => rw.dispatch(n)
+      case _ => throw UnsupportedCast(c)
+    }
 
-  def rewriteGPUParam(cParam: CParam[Pre], kernelSpecifier: CGpgpuKernelSpecifier[Pre]): Unit = {
+  def rewriteGPUParam(
+      cParam: CParam[Pre],
+      kernelSpecifier: CGpgpuKernelSpecifier[Pre],
+  ): Unit = {
     cParam.drop()
     implicit val o: Origin = cParam.o
     val varO = o.sourceName(C.getDeclaratorInfo(cParam.declarator).name)
@@ -335,36 +443,53 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
 
     kernelSpecifier match {
       case OpenCLKernel() =>
-        if(tp.isGlobal && tp.arrayOrPointer && !tp.extern) globalMemNames.add(cRef)
-        else if(tp.isShared && tp.arrayOrPointer && !tp.extern && tp.innerType.isDefined) {
+        if (tp.isGlobal && tp.arrayOrPointer && !tp.extern)
+          globalMemNames.add(cRef)
+        else if (
+          tp.isShared && tp.arrayOrPointer && !tp.extern &&
+          tp.innerType.isDefined
+        ) {
           addDynamicShared(cRef, tp.innerType.get, varO)
           // Return, since shared memory locations are declared and initialized at thread block level, not kernel level
           return
-        }
-        else if(!tp.shared && !tp.global && !tp.arrayOrPointer && !tp.extern) ()
-        else throw WrongGPUKernelParameterType(cParam)
+        } else if (!tp.shared && !tp.global && !tp.arrayOrPointer && !tp.extern)
+          ()
+        else
+          throw WrongGPUKernelParameterType(cParam)
       case CUDAKernel() =>
-        if(!tp.global && !tp.shared && tp.arrayOrPointer && !tp.extern) globalMemNames.add(cRef)
-        else if(!tp.shared && !tp.global && !tp.arrayOrPointer && !tp.extern) ()
-        else throw WrongGPUKernelParameterType(cParam)
+        if (!tp.global && !tp.shared && tp.arrayOrPointer && !tp.extern)
+          globalMemNames.add(cRef)
+        else if (!tp.shared && !tp.global && !tp.arrayOrPointer && !tp.extern)
+          ()
+        else
+          throw WrongGPUKernelParameterType(cParam)
     }
 
-    val v = new Variable[Post](cParam.specifiers.collectFirst
-      { case t: CSpecificationType[Pre] => rw.dispatch(t.t) }.get)(varO)
+    val v =
+      new Variable[Post](cParam.specifiers.collectFirst {
+        case t: CSpecificationType[Pre] => rw.dispatch(t.t)
+      }.get)(varO)
     cNameSuccessor(cRef) = v
     rw.variables.declare(v)
   }
 
   def rewriteParam(cParam: CParam[Pre]): Unit = {
-    if(kernelSpecifier.isDefined) return rewriteGPUParam(cParam, kernelSpecifier.get)
+    if (kernelSpecifier.isDefined)
+      return rewriteGPUParam(cParam, kernelSpecifier.get)
     cParam.specifiers.collectFirst {
       case GPULocal() => throw WrongGPUType(cParam)
       case GPUGlobal() => throw WrongGPUType(cParam)
     }
-    val specType = cParam.specifiers.collectFirst { case t: CSpecificationType[Pre] => rw.dispatch(t.t) }.get
+    val specType =
+      cParam.specifiers.collectFirst { case t: CSpecificationType[Pre] =>
+        rw.dispatch(t.t)
+      }.get
 
     cParam.drop()
-    val v = new Variable[Post](specType)(cParam.o.sourceName(C.getDeclaratorInfo(cParam.declarator).name))
+    val v =
+      new Variable[Post](specType)(
+        cParam.o.sourceName(C.getDeclaratorInfo(cParam.declarator).name)
+      )
     cNameSuccessor(RefCParam(cParam)) = v
     rw.variables.declare(v)
   }
@@ -372,43 +497,50 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
   def rewriteFunctionDef(func: CFunctionDefinition[Pre]): Unit = {
     func.drop()
     val info = C.getDeclaratorInfo(func.declarator)
-    val returnType = func.specs.collectFirst { case t: CSpecificationType[Pre] => rw.dispatch(t.t) }.get
-    val pure = func.specs.collectFirst{case CPure() => ()}.isDefined
-    val inline = func.specs.collectFirst{case CInline() => ()}.isDefined
-
-    val (contract, subs: Map[CParam[Pre], CParam[Pre]]) = func.ref match {
-      case Some(RefCGlobalDeclaration(decl, idx)) if decl.decl.contract.nonEmpty =>
-        if(func.contract.nonEmpty) throw CDoubleContracted(decl, func)
-
-        val declParams = C.getDeclaratorInfo(decl.decl.inits(idx).decl).params.get
-        val defnParams = info.params.get
-
-        (decl.decl.contract, declParams.zip(defnParams).toMap)
-      case _ =>
-        (func.contract, Map.empty)
-    }
+    val returnType =
+      func.specs.collectFirst { case t: CSpecificationType[Pre] =>
+        rw.dispatch(t.t)
+      }.get
+    val pure = func.specs.collectFirst { case CPure() => () }.isDefined
+    val inline = func.specs.collectFirst { case CInline() => () }.isDefined
+
+    val (contract, subs: Map[CParam[Pre], CParam[Pre]]) =
+      func.ref match {
+        case Some(RefCGlobalDeclaration(decl, idx))
+            if decl.decl.contract.nonEmpty =>
+          if (func.contract.nonEmpty)
+            throw CDoubleContracted(decl, func)
+
+          val declParams =
+            C.getDeclaratorInfo(decl.decl.inits(idx).decl).params.get
+          val defnParams = info.params.get
+
+          (decl.decl.contract, declParams.zip(defnParams).toMap)
+        case _ => (func.contract, Map.empty)
+      }
 
     val namedO = func.o.sourceName(info.name)
     val proc =
       cCurrentDefinitionParamSubstitutions.having(subs) {
         rw.globalDeclarations.declare(
-            func.specs.collectFirst { case k: CGpgpuKernelSpecifier[Pre]
-                => kernelProcedure(namedO, contract, info, Some(func.body), k) }
-              .getOrElse( {
-                val params = rw.variables.collect { info.params.get.foreach(rw.dispatch) }._1
-                rw.labelDecls.scope {
-                  new Procedure[Post](
-                    returnType = returnType,
-                    args = params,
-                    outArgs = Nil,
-                    typeArgs = Nil,
-                    body = Some(rw.dispatch(func.body)),
-                    contract = rw.dispatch(contract),
-                    inline = inline,
-                    pure = pure
-                  )(func.blame)(namedO)
-                }
-              } )
+          func.specs.collectFirst { case k: CGpgpuKernelSpecifier[Pre] =>
+            kernelProcedure(namedO, contract, info, Some(func.body), k)
+          }.getOrElse({
+            val params =
+              rw.variables.collect { info.params.get.foreach(rw.dispatch) }._1
+            rw.labelDecls.scope {
+              new Procedure[Post](
+                returnType = returnType,
+                args = params,
+                outArgs = Nil,
+                typeArgs = Nil,
+                body = Some(rw.dispatch(func.body)),
+                contract = rw.dispatch(contract),
+                inline = inline,
+                pure = pure,
+              )(func.blame)(namedO)
+            }
+          })
         )
       }
 
@@ -421,89 +553,133 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     }
   }
 
-  def all(blame: Blame[ReceiverNotInjective])(idx: CudaVec, dim: CudaVec, e: Expr[Post]): Expr[Post] = {
+  def all(
+      blame: Blame[ReceiverNotInjective]
+  )(idx: CudaVec, dim: CudaVec, e: Expr[Post]): Expr[Post] = {
     foldStar(unfoldStar(e).map(allOneExpr(blame)(idx, dim, _)))(e.o)
   }
 
-  def allOneExpr(blame: Blame[ReceiverNotInjective])(idx: CudaVec, dim: CudaVec, e: Expr[Post]): Expr[Post] = {
+  def allOneExpr(
+      blame: Blame[ReceiverNotInjective]
+  )(idx: CudaVec, dim: CudaVec, e: Expr[Post]): Expr[Post] = {
     implicit val o: Origin = e.o
     val vars = findVars(e)
-    val (filteredIdx, otherIdx) = idx.indices.values.zip(dim.indices.values).partition{ case (i, _) => vars.contains(i)}
-
-    val body = otherIdx.map{case (_,range) => range}.foldLeft(e)((newE, scaleFactor) => Scale(scaleFactor.get, newE)(PanicBlame("Framed positive")) )
-    if(filteredIdx.isEmpty){
-      body
-    } else {
-      Starall(filteredIdx.map{case (v,_) => v}.toSeq, Nil, Implies(
-        foldAnd(filteredIdx.map {
-          case (idx, dim) => c_const[Post](0) <= idx.get && idx.get < dim.get
-        }),
-        body
-      ))(blame)
+    val (filteredIdx, otherIdx) = idx.indices.values.zip(dim.indices.values)
+      .partition { case (i, _) => vars.contains(i) }
+
+    val body =
+      otherIdx.map { case (_, range) => range }
+        .foldLeft(e)((newE, scaleFactor) =>
+          Scale(scaleFactor.get, newE)(PanicBlame("Framed positive"))
+        )
+    if (filteredIdx.isEmpty) { body }
+    else {
+      Starall(
+        filteredIdx.map { case (v, _) => v }.toSeq,
+        Nil,
+        Implies(
+          foldAnd(filteredIdx.map { case (idx, dim) =>
+            c_const[Post](0) <= idx.get && idx.get < dim.get
+          }),
+          body,
+        ),
+      )(blame)
     }
   }
 
-  def findVars(e: Node[Post], vars: Set[Variable[Post]] = Set()): Set[Variable[Post]] = e match {
+  def findVars(
+      e: Node[Post],
+      vars: Set[Variable[Post]] = Set(),
+  ): Set[Variable[Post]] =
+    e match {
       case Local(ref) => vars + ref.decl
-      case _ => e.transSubnodes.collect { case Local(Ref(v)) => v}.toSet
-  }
+      case _ => e.transSubnodes.collect { case Local(Ref(v)) => v }.toSet
+    }
 
-  def allThreadsInBlock(blame: Blame[ReceiverNotInjective])(e: Expr[Pre]): Expr[Post] = {
+  def allThreadsInBlock(
+      blame: Blame[ReceiverNotInjective]
+  )(e: Expr[Pre]): Expr[Post] = {
     val thread = new CudaVec(RefCudaThreadIdx())(e.o)
-    cudaCurrentThreadIdx.having(thread) { all(blame)(thread, cudaCurrentBlockDim.top, rw.dispatch(e)) }
+    cudaCurrentThreadIdx.having(thread) {
+      all(blame)(thread, cudaCurrentBlockDim.top, rw.dispatch(e))
+    }
   }
 
-  def allThreadsInGrid(blame: Blame[ReceiverNotInjective])(e: Expr[Pre]): Expr[Post] = {
+  def allThreadsInGrid(
+      blame: Blame[ReceiverNotInjective]
+  )(e: Expr[Pre]): Expr[Post] = {
     val block = new CudaVec(RefCudaBlockIdx())(e.o)
-    cudaCurrentBlockIdx.having(block) { all(blame)(block, cudaCurrentGridDim.top, allThreadsInBlock(blame)(e)) }
+    cudaCurrentBlockIdx.having(block) {
+      all(blame)(block, cudaCurrentGridDim.top, allThreadsInBlock(blame)(e))
+    }
   }
 
-  def getCDecl(d: CNameTarget[Pre]): CDeclarator[Pre] = d match {
-    case RefCParam(decl) => decl.declarator
-    case RefCFunctionDefinition(decl) => decl.declarator
-    case RefCGlobalDeclaration(decls, initIdx) => decls.decl.inits(initIdx).decl
-    case RefCLocalDeclaration(decls, initIdx) => decls.decl.inits(initIdx).decl
-    case _ => throw Unreachable("Should not happen")
-  }
+  def getCDecl(d: CNameTarget[Pre]): CDeclarator[Pre] =
+    d match {
+      case RefCParam(decl) => decl.declarator
+      case RefCFunctionDefinition(decl) => decl.declarator
+      case RefCGlobalDeclaration(decls, initIdx) =>
+        decls.decl.inits(initIdx).decl
+      case RefCLocalDeclaration(decls, initIdx) =>
+        decls.decl.inits(initIdx).decl
+      case _ => throw Unreachable("Should not happen")
+    }
 
-  def getInnerType(t: Type[Post]): Type[Post] = t match {
-    case TArray(element) => element
-    case TPointer(element) => element
-    case _ => throw Unreachable("Already checked on pointer or array type")
-  }
+  def getInnerType(t: Type[Post]): Type[Post] =
+    t match {
+      case TArray(element) => element
+      case TPointer(element) => element
+      case _ => throw Unreachable("Already checked on pointer or array type")
+    }
 
-  def declareSharedMemory(): (Seq[Variable[Post]], (Seq[Variable[Post]], Seq[Statement[Post]])) =
+  def declareSharedMemory()
+      : (Seq[Variable[Post]], (Seq[Variable[Post]], Seq[Statement[Post]])) =
     rw.variables.collect {
-    var declarations: Seq[Variable[Post]] = Seq()
-    var inits: Seq[Statement[Post]] = Seq()
-    dynamicSharedMemNames.foreach(d =>
-    {
-      implicit val o: Origin = getCDecl(d).o
-      val varO: Origin = o.where(name = s"${C.getDeclaratorInfo(getCDecl(d)).name}_size")
-      val v = new Variable[Post](TCInt())(varO)
-      dynamicSharedMemLengthVar(d) = v
-      rw.variables.declare(v)
+      var declarations: Seq[Variable[Post]] = Seq()
+      var inits: Seq[Statement[Post]] = Seq()
+      dynamicSharedMemNames.foreach(d => {
+        implicit val o: Origin = getCDecl(d).o
+        val varO: Origin = o
+          .where(name = s"${C.getDeclaratorInfo(getCDecl(d)).name}_size")
+        val v = new Variable[Post](TCInt())(varO)
+        dynamicSharedMemLengthVar(d) = v
+        rw.variables.declare(v)
 //      val decl: Statement[Post] = LocalDecl(cNameSuccessor(d))
-      val assign: Statement[Post] = assignLocal(Local(cNameSuccessor(d).ref),
-        NewPointerArray[Post](getInnerType(cNameSuccessor(d).t), Local(v.ref))(PanicBlame("Shared memory sizes cannot be negative.")))
-      declarations ++= Seq(cNameSuccessor(d))
-      inits ++= Seq(assign)
-    })
-    staticSharedMemNames.foreach{case (d,(size, blame)) =>
-    implicit val o: Origin = getCDecl(d).o
+        val assign: Statement[Post] = assignLocal(
+          Local(cNameSuccessor(d).ref),
+          NewPointerArray[Post](
+            getInnerType(cNameSuccessor(d).t),
+            Local(v.ref),
+          )(PanicBlame("Shared memory sizes cannot be negative.")),
+        )
+        declarations ++= Seq(cNameSuccessor(d))
+        inits ++= Seq(assign)
+      })
+      staticSharedMemNames.foreach { case (d, (size, blame)) =>
+        implicit val o: Origin = getCDecl(d).o
 //      val decl: Statement[Post] = LocalDecl(cNameSuccessor(d))
-      val assign: Statement[Post] = assignLocal(Local(cNameSuccessor(d).ref),
-        // Since we set the size and blame together, we can assume the blame is not None
-        NewPointerArray[Post](getInnerType(cNameSuccessor(d).t), CIntegerValue(size))(blame.get))
-      declarations ++= Seq(cNameSuccessor(d))
-      inits ++= Seq(assign)
-    }
+        val assign: Statement[Post] = assignLocal(
+          Local(cNameSuccessor(d).ref),
+          // Since we set the size and blame together, we can assume the blame is not None
+          NewPointerArray[Post](
+            getInnerType(cNameSuccessor(d).t),
+            CIntegerValue(size),
+          )(blame.get),
+        )
+        declarations ++= Seq(cNameSuccessor(d))
+        inits ++= Seq(assign)
+      }
 
-    (declarations, inits)
-  }
+      (declarations, inits)
+    }
 
-  def kernelProcedure(o: Origin, contract: ApplicableContract[Pre], info: C.DeclaratorInfo[Pre], body: Option[Statement[Pre]]
-                     , kernelSpec: CGpgpuKernelSpecifier[Pre]): Procedure[Post] = {
+  def kernelProcedure(
+      o: Origin,
+      contract: ApplicableContract[Pre],
+      info: C.DeclaratorInfo[Pre],
+      body: Option[Statement[Pre]],
+      kernelSpec: CGpgpuKernelSpecifier[Pre],
+  ): Procedure[Post] = {
     dynamicSharedMemNames.clear()
     staticSharedMemNames.clear()
     kernelSpecifier = Some(kernelSpec)
@@ -512,23 +688,41 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     val gridDim = new CudaVec(RefCudaGridDim())(o)
     cudaCurrentBlockDim.having(blockDim) {
       cudaCurrentGridDim.having(gridDim) {
-        val args = rw.variables.collect { info.params.get.foreach(rw.dispatch) }._1
+        val args =
+          rw.variables.collect { info.params.get.foreach(rw.dispatch) }._1
         val implFiltered = body.map(init => filterSharedDecl(init))
 
-        rw.variables.collect { dynamicSharedMemNames.foreach(d => rw.variables.declare(cNameSuccessor(d)) ) }
-        rw.variables.collect { staticSharedMemNames.foreach(d => rw.variables.declare(cNameSuccessor(d._1)) ) }
-        val (sharedMemSizes, (sharedMemDecls: Seq[Variable[Post]], sharedMemInits: Seq[Statement[Post]])) = declareSharedMemory()
-
-        val newArgs = blockDim.indices.values.toSeq ++ gridDim.indices.values.toSeq ++ args ++ sharedMemSizes
+        rw.variables.collect {
+          dynamicSharedMemNames
+            .foreach(d => rw.variables.declare(cNameSuccessor(d)))
+        }
+        rw.variables.collect {
+          staticSharedMemNames
+            .foreach(d => rw.variables.declare(cNameSuccessor(d._1)))
+        }
+        val (
+          sharedMemSizes,
+          (
+            sharedMemDecls: Seq[Variable[Post]],
+            sharedMemInits: Seq[Statement[Post]],
+          ),
+        ) = declareSharedMemory()
+
+        val newArgs =
+          blockDim.indices.values.toSeq ++ gridDim.indices.values.toSeq ++
+            args ++ sharedMemSizes
         val newGivenArgs = rw.variables.dispatch(contract.givenArgs)
         val newYieldsArgs = rw.variables.dispatch(contract.yieldsArgs)
         // We add the requirement that a GPU kernel must always have threads (non zero block or grid dimensions)
-        val nonZeroThreads: Expr[Post] = foldStar(
+        val nonZeroThreads: Expr[Post] =
+          foldStar(
             (blockDim.indices.values ++ gridDim.indices.values)
-              .map( v => Less(CIntegerValue(0)(o), v.get(o))(o))
-              .toSeq)(o)
-        val UnitAccountedPredicate(contractRequires: Expr[Pre]) = contract.requires
-        val UnitAccountedPredicate(contractEnsures: Expr[Pre]) = contract.ensures
+              .map(v => Less(CIntegerValue(0)(o), v.get(o))(o)).toSeq
+          )(o)
+        val UnitAccountedPredicate(contractRequires: Expr[Pre]) =
+          contract.requires
+        val UnitAccountedPredicate(contractEnsures: Expr[Pre]) =
+          contract.ensures
 
         val parBody = body.map(impl => {
           implicit val o: Origin = impl.o
@@ -541,43 +735,72 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
             cudaCurrentBlockIdx.having(blockIdx) {
               cudaCurrentGrid.having(gridDecl) {
                 cudaCurrentBlock.having(blockDecl) {
-                  val contextBlock = foldStar(unfoldStar(contract.contextEverywhere)
-                    .filter(hasNoSharedMemNames).map(allThreadsInBlock(KernelNotInjective(kernelSpec))))
-                  val innerContent = ParStatement(ParBlock(
+                  val contextBlock = foldStar(
+                    unfoldStar(contract.contextEverywhere)
+                      .filter(hasNoSharedMemNames)
+                      .map(allThreadsInBlock(KernelNotInjective(kernelSpec)))
+                  )
+                  val innerContent = ParStatement(
+                    ParBlock(
                       decl = blockDecl,
-                      iters = threadIdx.indices.values.zip(blockDim.indices.values).map {
-                        case (index, dim) => IterVariable(index, c_const(0), dim.get)
-                      }.toSeq,
+                      iters =
+                        threadIdx.indices.values.zip(blockDim.indices.values)
+                          .map { case (index, dim) =>
+                            IterVariable(index, c_const(0), dim.get)
+                          }.toSeq,
                       // Context is already inherited
-                      context_everywhere = Star(nonZeroThreads, rw.dispatch(contract.contextEverywhere)),
+                      context_everywhere = Star(
+                        nonZeroThreads,
+                        rw.dispatch(contract.contextEverywhere),
+                      ),
                       requires = rw.dispatch(contractRequires),
                       ensures = rw.dispatch(contractEnsures),
                       content = rw.dispatch(implFiltered.get),
-                    )(KernelParFailure(kernelSpec)))
-                  ParStatement(ParBlock(
-                    decl = gridDecl,
-                    iters = blockIdx.indices.values.zip(gridDim.indices.values).map {
-                      case (index, dim) => IterVariable(index, c_const(0), dim.get)
-                    }.toSeq,
-                    // Context is added to requires and ensures here
-                    context_everywhere = tt,
-                    requires = Star(nonZeroThreads,
-                        Star(contextBlock,
+                    )(KernelParFailure(kernelSpec))
+                  )
+                  ParStatement(
+                    ParBlock(
+                      decl = gridDecl,
+                      iters =
+                        blockIdx.indices.values.zip(gridDim.indices.values)
+                          .map { case (index, dim) =>
+                            IterVariable(index, c_const(0), dim.get)
+                          }.toSeq,
+                      // Context is added to requires and ensures here
+                      context_everywhere = tt,
+                      requires = Star(
+                        nonZeroThreads,
+                        Star(
+                          contextBlock,
                           foldStar(
                             unfoldStar(contractRequires)
                               .filter(hasNoSharedMemNames)
-                              .map(allThreadsInBlock(KernelNotInjective(kernelSpec)))))
+                              .map(allThreadsInBlock(
+                                KernelNotInjective(kernelSpec)
+                              ))
+                          ),
                         ),
-                    ensures = Star(nonZeroThreads,
-                      Star(contextBlock,
-                        foldStar(
-                          unfoldStar(contractEnsures)
-                            .filter(hasNoSharedMemNames)
-                            .map(allThreadsInBlock(KernelNotInjective(kernelSpec)))) )
                       ),
-                    // Add shared memory initialization before beginning of inner parallel block
-                    content =  Scope[Post](sharedMemDecls, Block[Post](sharedMemInits ++ Seq(innerContent)))
-                  )(KernelParFailure(kernelSpec)))
+                      ensures = Star(
+                        nonZeroThreads,
+                        Star(
+                          contextBlock,
+                          foldStar(
+                            unfoldStar(contractEnsures)
+                              .filter(hasNoSharedMemNames)
+                              .map(allThreadsInBlock(
+                                KernelNotInjective(kernelSpec)
+                              ))
+                          ),
+                        ),
+                      ),
+                      // Add shared memory initialization before beginning of inner parallel block
+                      content = Scope[Post](
+                        sharedMemDecls,
+                        Block[Post](sharedMemInits ++ Seq(innerContent)),
+                      ),
+                    )(KernelParFailure(kernelSpec))
+                  )
                 }
               }
             }
@@ -585,29 +808,41 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
         })
 
         val gridContext: Expr[Post] =
-          foldStar(unfoldStar(contract.contextEverywhere)
-            .filter(hasNoSharedMemNames)
-            .map(allThreadsInGrid(KernelNotInjective(kernelSpec))))(o)
-        val requires: Expr[Post] = foldStar(Seq(gridContext, nonZeroThreads)
-          ++ unfoldStar(contractRequires).filter(hasNoSharedMemNames).map(allThreadsInGrid(KernelNotInjective(kernelSpec))) )(o)
-        val ensures: Expr[Post] = foldStar(Seq(gridContext, nonZeroThreads)
-          ++ unfoldStar(contractEnsures).filter(hasNoSharedMemNames).map(allThreadsInGrid(KernelNotInjective(kernelSpec))) )(o)
-        val result = new Procedure[Post](
-          returnType = TVoid(),
-          args = newArgs,
-          outArgs = Nil, typeArgs = Nil,
-          body = parBody,
-          contract = ApplicableContract(
-            UnitAccountedPredicate(requires)(o),
-            UnitAccountedPredicate(ensures)(o),
-            // Context everywhere is already passed down in the body
-            tt,
-            contract.signals.map(rw.dispatch),
-            newGivenArgs,
-            newYieldsArgs,
-            contract.decreases.map(rw.dispatch),
-          )(contract.blame)(contract.o)
-        )(AbstractApplicable)(o)
+          foldStar(
+            unfoldStar(contract.contextEverywhere).filter(hasNoSharedMemNames)
+              .map(allThreadsInGrid(KernelNotInjective(kernelSpec)))
+          )(o)
+        val requires: Expr[Post] =
+          foldStar(
+            Seq(gridContext, nonZeroThreads) ++ unfoldStar(contractRequires)
+              .filter(hasNoSharedMemNames)
+              .map(allThreadsInGrid(KernelNotInjective(kernelSpec)))
+          )(o)
+        val ensures: Expr[Post] =
+          foldStar(
+            Seq(gridContext, nonZeroThreads) ++ unfoldStar(contractEnsures)
+              .filter(hasNoSharedMemNames)
+              .map(allThreadsInGrid(KernelNotInjective(kernelSpec)))
+          )(o)
+        val result =
+          new Procedure[Post](
+            returnType = TVoid(),
+            args = newArgs,
+            outArgs = Nil,
+            typeArgs = Nil,
+            body = parBody,
+            contract =
+              ApplicableContract(
+                UnitAccountedPredicate(requires)(o),
+                UnitAccountedPredicate(ensures)(o),
+                // Context everywhere is already passed down in the body
+                tt,
+                contract.signals.map(rw.dispatch),
+                newGivenArgs,
+                newYieldsArgs,
+                contract.decreases.map(rw.dispatch),
+              )(contract.blame)(contract.o),
+          )(AbstractApplicable)(o)
         kernelSpecifier = None
 
         result
@@ -615,7 +850,10 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     }
   }
 
-  class TypeProperties(specs: Seq[CDeclarationSpecifier[Pre]], decl: CDeclarator[Pre]){
+  class TypeProperties(
+      specs: Seq[CDeclarationSpecifier[Pre]],
+      decl: CDeclarator[Pre],
+  ) {
     var arrayOrPointer = false
     var global = false
     var shared = false
@@ -633,7 +871,9 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
       case CSpecificationType(ctarr @ CTArray(size, t)) =>
         arraySize = size
         innerType = Some(t)
-        sizeBlame = Some(ctarr.blame)  // we set the blame here, together with the size
+        sizeBlame = Some(
+          ctarr.blame
+        ) // we set the blame here, together with the size
         arrayOrPointer = true
       case CExtern() => extern = true
       case _ =>
@@ -643,53 +883,95 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     def isGlobal: Boolean = !shared && global
   }
 
-  def addDynamicShared(cRef: CNameTarget[Pre], t: Type[Pre], o: Origin): Unit = {
+  def addDynamicShared(
+      cRef: CNameTarget[Pre],
+      t: Type[Pre],
+      o: Origin,
+  ): Unit = {
     dynamicSharedMemNames.add(cRef)
     val v = new Variable[Post](TPointer[Post](rw.dispatch(t)))(o)
     cNameSuccessor(cRef) = v
   }
 
-  def addStaticShared(decl:  CDeclarator[Pre], cRef: CNameTarget[Pre], t: Type[Pre], o: Origin,
-                      declStatement: CLocalDeclaration[Pre], arraySize: Option[Expr[Pre]], sizeBlame: Option[Blame[ArraySizeError]]): Unit = arraySize match {
+  def addStaticShared(
+      decl: CDeclarator[Pre],
+      cRef: CNameTarget[Pre],
+      t: Type[Pre],
+      o: Origin,
+      declStatement: CLocalDeclaration[Pre],
+      arraySize: Option[Expr[Pre]],
+      sizeBlame: Option[Blame[ArraySizeError]],
+  ): Unit =
+    arraySize match {
       case Some(CIntegerValue(size)) =>
         val v = new Variable[Post](TPointer[Post](rw.dispatch(t)))(o)
         staticSharedMemNames(cRef) = (size, sizeBlame)
         cNameSuccessor(cRef) = v
       case _ => throw WrongGPULocalType(declStatement)
-  }
+    }
 
   def isShared(s: Statement[Pre]): Boolean = {
-    val decl = s match {
-      case CDeclarationStatement(decl) => decl
-      case Block(Seq(s_inner)) => return isShared(s_inner)
-      case _ => return false
-    }
+    val decl =
+      s match {
+        case CDeclarationStatement(decl) => decl
+        case Block(Seq(s_inner)) => return isShared(s_inner)
+        case _ => return false
+      }
 
     if (decl.decl.inits.size != 1)
       throw MultipleSharedMemoryDeclaration(decl)
 
     val prop = new TypeProperties(decl.decl.specs, decl.decl.inits.head.decl)
-    if (!prop.shared) return false
+    if (!prop.shared)
+      return false
     val init: CInit[Pre] = decl.decl.inits.head
     val varO = decl.o.sourceName(C.getDeclaratorInfo(init.decl).name)
     val cRef = RefCLocalDeclaration(decl, 0)
 
     kernelSpecifier match {
       case Some(CUDAKernel()) =>
-        if (!prop.global && prop.arrayOrPointer && prop.innerType.isDefined && prop.extern) {
+        if (
+          !prop.global && prop.arrayOrPointer && prop.innerType.isDefined &&
+          prop.extern
+        ) {
           addDynamicShared(cRef, prop.innerType.get, varO)
           return true
         }
-        if (!prop.global && prop.arrayOrPointer && prop.innerType.isDefined && !prop.extern) {
-          addStaticShared(init.decl, cRef, prop.innerType.get, varO, decl, prop.arraySize, prop.sizeBlame)
+        if (
+          !prop.global && prop.arrayOrPointer && prop.innerType.isDefined &&
+          !prop.extern
+        ) {
+          addStaticShared(
+            init.decl,
+            cRef,
+            prop.innerType.get,
+            varO,
+            decl,
+            prop.arraySize,
+            prop.sizeBlame,
+          )
           return true
         }
       case Some(OpenCLKernel()) =>
-        if (!prop.global && prop.arrayOrPointer && prop.innerType.isDefined && !prop.extern) {
-          addStaticShared(init.decl, cRef, prop.innerType.get, varO, decl, prop.arraySize, prop.sizeBlame)
+        if (
+          !prop.global && prop.arrayOrPointer && prop.innerType.isDefined &&
+          !prop.extern
+        ) {
+          addStaticShared(
+            init.decl,
+            cRef,
+            prop.innerType.get,
+            varO,
+            decl,
+            prop.arraySize,
+            prop.sizeBlame,
+          )
           return true
         }
-      case None => throw Unreachable(f"This should have been called from inside a GPU kernel scope.")
+      case None =>
+        throw Unreachable(
+          f"This should have been called from inside a GPU kernel scope."
+        )
     }
 
     // We are shared, but couldn't add it
@@ -698,78 +980,113 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
 
   def filterSharedDecl(s: Statement[Pre]): Statement[Pre] = {
     s match {
-      case Scope(locals, block@Block(stats)) =>
+      case Scope(locals, block @ Block(stats)) =>
         Scope(locals, Block(stats.filterNot(isShared))(block.o))(s.o)
       case _ => s
     }
   }
 
   def rewriteStruct(decl: CGlobalDeclaration[Pre]): Unit = {
-    val (decls, sdecl) = decl.decl match {
-      case CDeclaration(_, _, Seq(sdecl@CStructDeclaration(Some(_), decls)), Seq()) => (decls, sdecl)
-      case _ => throw WrongStructType(decl)
-    }
-    val newStruct = new Class[Post](Seq(), rw.classDeclarations.collect {
-        decls.foreach { fieldDecl =>
-          val CStructMemberDeclarator(specs: Seq[CDeclarationSpecifier[Pre]], Seq(x)) = fieldDecl
-          fieldDecl.drop()
-          val t = specs.collectFirst { case t: CSpecificationType[Pre] => rw.dispatch(t.t) }.get
-          cStructFieldsSuccessor((decl, fieldDecl)) =
-            new InstanceField(t = t, flags = Nil)(CStructFieldOrigin(x))
-          rw.classDeclarations.declare(cStructFieldsSuccessor((decl, fieldDecl)))
-        }
-      }._1, Seq(), tt[Post])(CStructOrigin(sdecl))
+    val (decls, sdecl) =
+      decl.decl match {
+        case CDeclaration(
+              _,
+              _,
+              Seq(sdecl @ CStructDeclaration(Some(_), decls)),
+              Seq(),
+            ) =>
+          (decls, sdecl)
+        case _ => throw WrongStructType(decl)
+      }
+    val newStruct =
+      new Class[Post](
+        Seq(),
+        rw.classDeclarations.collect {
+          decls.foreach { fieldDecl =>
+            val CStructMemberDeclarator(
+              specs: Seq[CDeclarationSpecifier[Pre]],
+              Seq(x),
+            ) = fieldDecl
+            fieldDecl.drop()
+            val t =
+              specs.collectFirst { case t: CSpecificationType[Pre] =>
+                rw.dispatch(t.t)
+              }.get
+            cStructFieldsSuccessor((decl, fieldDecl)) =
+              new InstanceField(t = t, flags = Nil)(CStructFieldOrigin(x))
+            rw.classDeclarations
+              .declare(cStructFieldsSuccessor((decl, fieldDecl)))
+          }
+        }._1,
+        Seq(),
+        tt[Post],
+      )(CStructOrigin(sdecl))
 
     rw.globalDeclarations.declare(newStruct)
     cStructSuccessor(decl) = newStruct
   }
 
   def rewriteGlobalDecl(decl: CGlobalDeclaration[Pre]): Unit = {
-    val isStruct = decl.decl.specs.collectFirst { case t: CStructDeclaration[Pre] => () }.isDefined
-    if(isStruct){ rewriteStruct(decl); return}
+    val isStruct =
+      decl.decl.specs.collectFirst { case t: CStructDeclaration[Pre] => () }
+        .isDefined
+    if (isStruct) { rewriteStruct(decl); return }
     val pure = decl.decl.specs.collectFirst { case CPure() => () }.isDefined
     val inline = decl.decl.specs.collectFirst { case CInline() => () }.isDefined
 
-
-    val t = decl.decl.specs.collectFirst { case t: CSpecificationType[Pre] => rw.dispatch(t.t) }.get
-    for((init, idx) <- decl.decl.inits.zipWithIndex if init.ref.isEmpty) {
+    val t =
+      decl.decl.specs.collectFirst { case t: CSpecificationType[Pre] =>
+        rw.dispatch(t.t)
+      }.get
+    for ((init, idx) <- decl.decl.inits.zipWithIndex if init.ref.isEmpty) {
       // If the reference is empty , skip the declaration: the definition is used instead.
       val info = C.getDeclaratorInfo(init.decl)
       info.params match {
         case Some(params) =>
           cFunctionDeclSuccessor((decl, idx)) = rw.globalDeclarations.declare(
-            decl.decl.specs.collectFirst { case k: CGpgpuKernelSpecifier[Pre]
-                => kernelProcedure(init.o, decl.decl.contract, info, None, k) }
-              .getOrElse(
-                new Procedure[Post](
-                  returnType = t,
-                  args = rw.variables.collect { params.foreach(rw.dispatch) }._1,
-                  outArgs = Nil,
-                  typeArgs = Nil,
-                  body = None,
-                  contract = rw.dispatch(decl.decl.contract),
-                  pure = pure,
-                  inline = inline
-                )(AbstractApplicable)(init.o)
-              )
+            decl.decl.specs.collectFirst { case k: CGpgpuKernelSpecifier[Pre] =>
+              kernelProcedure(init.o, decl.decl.contract, info, None, k)
+            }.getOrElse(
+              new Procedure[Post](
+                returnType = t,
+                args = rw.variables.collect { params.foreach(rw.dispatch) }._1,
+                outArgs = Nil,
+                typeArgs = Nil,
+                body = None,
+                contract = rw.dispatch(decl.decl.contract),
+                pure = pure,
+                inline = inline,
+              )(AbstractApplicable)(init.o)
+            )
           )
         case None =>
-          cGlobalNameSuccessor(RefCGlobalDeclaration(decl, idx)) =
-            rw.globalDeclarations.declare(new HeapVariable(t)(init.o))
+          cGlobalNameSuccessor(RefCGlobalDeclaration(decl, idx)) = rw
+            .globalDeclarations.declare(new HeapVariable(t)(init.o))
       }
     }
   }
 
-  def assignliteralArray(array: Variable[Post], exprs: Seq[Expr[Pre]], origin: Origin): Seq[Statement[Post]] = {
+  def assignliteralArray(
+      array: Variable[Post],
+      exprs: Seq[Expr[Pre]],
+      origin: Origin,
+  ): Seq[Statement[Post]] = {
     implicit val o: Origin = origin
-    (exprs.zipWithIndex.map {
-        case (value, index) => Assign[Post](AmbiguousSubscript(array.get, c_const(index))(PanicBlame("The explicit initialization of an array in C should never generate an assignment that exceeds the bounds of the array")), rw.dispatch(value))(
-          PanicBlame("Assignment for an explicit array initializer cannot fail."))
-      }
-    )
+    (exprs.zipWithIndex.map { case (value, index) =>
+      Assign[Post](
+        AmbiguousSubscript(array.get, c_const(index))(PanicBlame(
+          "The explicit initialization of an array in C should never generate an assignment that exceeds the bounds of the array"
+        )),
+        rw.dispatch(value),
+      )(PanicBlame("Assignment for an explicit array initializer cannot fail."))
+    })
   }
 
-  def rewriteVectorDeclaration(decl: CLocalDeclaration[Pre], t: CTVector[Pre], init: CInit[Pre]): Statement[Post] = {
+  def rewriteVectorDeclaration(
+      decl: CLocalDeclaration[Pre],
+      t: CTVector[Pre],
+      init: CInit[Pre],
+  ): Statement[Post] = {
     // LangTypesToCol makes it so that each declaration only has one init
     val info = C.getDeclaratorInfo(init.decl)
     implicit val o: Origin = init.o
@@ -778,20 +1095,31 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     val size = t.intSize
     init.init.get match {
       case CLiteralArray(exprs) if exprs.size == size =>
-        Block(Seq(LocalDecl(v),
-          assignLocal(v.get, LiteralVector[Post](rw.dispatch(t.innerType), exprs.map(rw.dispatch)))))
+        Block(Seq(
+          LocalDecl(v),
+          assignLocal(
+            v.get,
+            LiteralVector[Post](
+              rw.dispatch(t.innerType),
+              exprs.map(rw.dispatch),
+            ),
+          ),
+        ))
       case _ => throw WrongCType(decl)
     }
   }
 
-  def rewriteArrayDeclaration(decl: CLocalDeclaration[Pre], cta: CTArray[Pre]): Statement[Post] = {
+  def rewriteArrayDeclaration(
+      decl: CLocalDeclaration[Pre],
+      cta: CTArray[Pre],
+  ): Statement[Post] = {
     // LangTypesToCol makes it so that each declaration only has one init
     val init = decl.decl.inits.head
     val info = C.getDeclaratorInfo(init.decl)
     implicit val o: Origin = init.o
 
     decl.decl.specs match {
-      case Seq(CSpecificationType(cta@CTArray(sizeOption, oldT))) =>
+      case Seq(CSpecificationType(cta @ CTArray(sizeOption, oldT))) =>
         val t = rw.dispatch(oldT)
         val v = new Variable[Post](TPointer(t))(o.sourceName(info.name))
         cNameSuccessor(RefCLocalDeclaration(decl, 0)) = v
@@ -802,20 +1130,33 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
             val newArr = NewPointerArray[Post](t, rw.dispatch(size))(cta.blame)
             Block(Seq(LocalDecl(v), assignLocal(v.get, newArr)))
           case (None, Some(CLiteralArray(exprs))) =>
-            val newArr = NewPointerArray[Post](t, c_const[Post](exprs.size))(cta.blame)
-            Block(Seq(LocalDecl(v), assignLocal(v.get, newArr)) ++ assignliteralArray(v, exprs, o))
+            val newArr =
+              NewPointerArray[Post](t, c_const[Post](exprs.size))(cta.blame)
+            Block(
+              Seq(LocalDecl(v), assignLocal(v.get, newArr)) ++
+                assignliteralArray(v, exprs, o)
+            )
           case (Some(size), Some(CLiteralArray(exprs))) =>
-            val realSize = isConstantInt(size).filter(_ >= 0).getOrElse(throw WrongCType(decl))
-            if(realSize < exprs.size) logger.warn(s"Excess elements in array initializer: '${decl}'")
-            val newArr = NewPointerArray[Post](t, c_const[Post](realSize))(cta.blame)
-            Block(Seq(LocalDecl(v), assignLocal(v.get, newArr)) ++ assignliteralArray(v, exprs.take(realSize.intValue), o))
+            val realSize = isConstantInt(size).filter(_ >= 0)
+              .getOrElse(throw WrongCType(decl))
+            if (realSize < exprs.size)
+              logger.warn(s"Excess elements in array initializer: '${decl}'")
+            val newArr =
+              NewPointerArray[Post](t, c_const[Post](realSize))(cta.blame)
+            Block(
+              Seq(LocalDecl(v), assignLocal(v.get, newArr)) ++
+                assignliteralArray(v, exprs.take(realSize.intValue), o)
+            )
           case _ => throw WrongCType(decl)
         }
       case _ => throw WrongCType(decl)
     }
   }
 
-  def rewriteStructDeclaration(decl: CLocalDeclaration[Pre], cts: CTStruct[Pre]): Statement[Post] = {
+  def rewriteStructDeclaration(
+      decl: CLocalDeclaration[Pre],
+      cts: CTStruct[Pre],
+  ): Statement[Post] = {
     val init = decl.decl.inits.head
     val info = C.getDeclaratorInfo(init.decl)
     val ref = cts.ref
@@ -827,11 +1168,14 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     val v = new Variable[Post](t)(o.sourceName(info.name))
     cNameSuccessor(RefCLocalDeclaration(decl, 0)) = v
 
-    val initialVal = init.init
-      .map(i =>
-        createStructCopy(rw.dispatch(i), ref.decl, (f: InstanceField[_]) => PanicBlame("Cannot fail due to insufficient perm"))
+    val initialVal = init.init.map(i =>
+      createStructCopy(
+        rw.dispatch(i),
+        ref.decl,
+        (f: InstanceField[_]) =>
+          PanicBlame("Cannot fail due to insufficient perm"),
       )
-      .getOrElse(NewObject[Post](targetClass.ref))
+    ).getOrElse(NewObject[Post](targetClass.ref))
 
     Block(Seq(LocalDecl(v), assignLocal(v.get, initialVal)))
   }
@@ -846,22 +1190,25 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     // LangTypesToCol makes it so that each declaration only has one init
     val init = decl.decl.inits.head
 
-    val t = decl.decl.specs.collectFirst { case t: CSpecificationType[Pre] => t.t }.get match {
-      case t: CTVector[Pre] if init.init.collect({case _: CLiteralArray[Pre] => true}).isDefined => return rewriteVectorDeclaration(decl, t, init)
-      case t: CTArray[Pre] => return rewriteArrayDeclaration(decl, t)
-      case t: CTStruct[Pre] => return rewriteStructDeclaration(decl, t)
-      case t => rw.dispatch(t)
-    }
-
-
+    val t =
+      decl.decl.specs.collectFirst { case t: CSpecificationType[Pre] => t.t }
+        .get match {
+        case t: CTVector[Pre] if init.init.collect({
+              case _: CLiteralArray[Pre] => true
+            }).isDefined =>
+          return rewriteVectorDeclaration(decl, t, init)
+        case t: CTArray[Pre] => return rewriteArrayDeclaration(decl, t)
+        case t: CTStruct[Pre] => return rewriteStructDeclaration(decl, t)
+        case t => rw.dispatch(t)
+      }
 
     val info = C.getDeclaratorInfo(init.decl)
     val v = new Variable[Post](t)(init.o.sourceName(info.name))
     cNameSuccessor(RefCLocalDeclaration(decl, 0)) = v
     implicit val o: Origin = init.o
-    init.init
-      .map(value => Block(Seq(LocalDecl(v), assignLocal(v.get, rw.dispatch(value)))))
-      .getOrElse(LocalDecl(v))
+    init.init.map(value =>
+      Block(Seq(LocalDecl(v), assignLocal(v.get, rw.dispatch(value))))
+    ).getOrElse(LocalDecl(v))
   }
 
   def rewriteGoto(goto: CGoto[Pre]): Statement[Post] =
@@ -876,15 +1223,16 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     barrier.specifiers.foreach {
       case GpuLocalMemoryFence() => localFence = true
       case GpuGlobalMemoryFence() => globalFence = true
-      case GpuZeroMemoryFence(i) => if(i != 0) throw WrongBarrierSpecifier(barrier)
+      case GpuZeroMemoryFence(i) =>
+        if (i != 0)
+          throw WrongBarrierSpecifier(barrier)
     }
-    if(!globalFence || !localFence){
+    if (!globalFence || !localFence) {
       val redist = permissionScanner(barrier)
-      if(!globalFence)
-        redist
-        .intersect(globalMemNames.toSet)
-        .foreach(v => throw RedistributingBarrier(v, barrier, global = true))
-      if(!localFence)
+      if (!globalFence)
+        redist.intersect(globalMemNames.toSet)
+          .foreach(v => throw RedistributingBarrier(v, barrier, global = true))
+      if (!localFence)
         redist
           .intersect(dynamicSharedMemNames.union(dynamicSharedMemNames).toSet)
           .foreach(v => throw RedistributingBarrier(v, barrier, global = false))
@@ -901,32 +1249,40 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
 
   def isPointer(t: Type[Pre]): Boolean = getPointer(t).isDefined
 
-  def getPointer(t: Type[Pre]) : Option[TPointer[Pre]] = getBaseType(t) match {
-    case t@TPointer(_) => Some(t)
-    case _ => None
-  }
+  def getPointer(t: Type[Pre]): Option[TPointer[Pre]] =
+    getBaseType(t) match {
+      case t @ TPointer(_) => Some(t)
+      case _ => None
+    }
 
-  def isNumeric(t: Type[Pre]): Boolean = getBaseType(t) match{
-    case _: NumericType[Pre] => true
-    case _ => false
-  }
+  def isNumeric(t: Type[Pre]): Boolean =
+    getBaseType(t) match {
+      case _: NumericType[Pre] => true
+      case _ => false
+    }
 
-  def searchNames(e: Expr[Pre], original: Node[Pre]): Seq[CNameTarget[Pre]] = e match {
-    case arr : CLocal[Pre] => Seq(arr.ref.get)
-    case PointerAdd(arr : CLocal[Pre], _) => Seq(arr.ref.get)
-    case AmbiguousSubscript(arr : CLocal[Pre], _) => Seq(arr.ref.get)
-    case AmbiguousPlus(l, r) if isPointer(l.t) && isNumeric(r.t) => searchNames(l, original)
-    case AddrOf(inner) => searchNames(inner, original)
-    case _ => throw UnsupportedBarrierPermission(original)
-  }
+  def searchNames(e: Expr[Pre], original: Node[Pre]): Seq[CNameTarget[Pre]] =
+    e match {
+      case arr: CLocal[Pre] => Seq(arr.ref.get)
+      case PointerAdd(arr: CLocal[Pre], _) => Seq(arr.ref.get)
+      case AmbiguousSubscript(arr: CLocal[Pre], _) => Seq(arr.ref.get)
+      case AmbiguousPlus(l, r) if isPointer(l.t) && isNumeric(r.t) =>
+        searchNames(l, original)
+      case AddrOf(inner) => searchNames(inner, original)
+      case _ => throw UnsupportedBarrierPermission(original)
+    }
 
-  def searchNames(loc: Location[Pre], original: Node[Pre]): Seq[CNameTarget[Pre]] = loc match {
-    case ArrayLocation(arr : CLocal[Pre], _) => Seq(arr.ref.get)
-    case PointerLocation(arr : CLocal[Pre]) => Seq(arr.ref.get)
-    case PointerLocation(PointerAdd(arr : CLocal[Pre], _)) => Seq(arr.ref.get)
-    case AmbiguousLocation(expr) => searchNames(expr, original)
-    case _ => throw UnsupportedBarrierPermission(original)
-  }
+  def searchNames(
+      loc: Location[Pre],
+      original: Node[Pre],
+  ): Seq[CNameTarget[Pre]] =
+    loc match {
+      case ArrayLocation(arr: CLocal[Pre], _) => Seq(arr.ref.get)
+      case PointerLocation(arr: CLocal[Pre]) => Seq(arr.ref.get)
+      case PointerLocation(PointerAdd(arr: CLocal[Pre], _)) => Seq(arr.ref.get)
+      case AmbiguousLocation(expr) => searchNames(expr, original)
+      case _ => throw UnsupportedBarrierPermission(original)
+    }
 
   def searchPermission(e: Node[Pre]): Seq[CNameTarget[Pre]] = {
     e match {
@@ -940,7 +1296,7 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     }
   }
 
-  def permissionScanner(barrier: GpgpuBarrier[Pre]): Set[CNameTarget[Pre]] ={
+  def permissionScanner(barrier: GpgpuBarrier[Pre]): Set[CNameTarget[Pre]] = {
     val pres = unfoldStar(barrier.requires).toSet
     val posts = unfoldStar(barrier.ensures).toSet
     val context = pres intersect posts
@@ -952,11 +1308,14 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
   def result(ref: RefCFunctionDefinition[Pre])(implicit o: Origin): Expr[Post] =
     Result[Post](cFunctionSuccessor.ref(ref.decl))
 
-  def result(ref: RefCGlobalDeclaration[Pre])(implicit o: Origin): Expr[Post] = {
+  def result(
+      ref: RefCGlobalDeclaration[Pre]
+  )(implicit o: Origin): Expr[Post] = {
     val maybeDefinition = ref.decls.decl.inits(ref.initIdx).ref
     maybeDefinition match {
       case Some(defn) => Result[Post](cFunctionSuccessor.ref(defn.decl))
-      case None => Result[Post](cFunctionDeclSuccessor.ref((ref.decls, ref.initIdx)))
+      case None =>
+        Result[Post](cFunctionDeclSuccessor.ref((ref.decls, ref.initIdx)))
     }
   }
 
@@ -966,15 +1325,19 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
       case spec: SpecNameTarget[Pre] => rw.specLocal(spec, local, local.blame)
       case _: SpecInvocationTarget[Pre] => throw NotAValue(local)
       case ref: RefCParam[Pre] =>
-        if(cCurrentDefinitionParamSubstitutions.nonEmpty)
-          Local(cNameSuccessor.ref(RefCParam(cCurrentDefinitionParamSubstitutions.top.getOrElse(ref.decl, ref.decl))))
+        if (cCurrentDefinitionParamSubstitutions.nonEmpty)
+          Local(cNameSuccessor.ref(RefCParam(
+            cCurrentDefinitionParamSubstitutions.top
+              .getOrElse(ref.decl, ref.decl)
+          )))
         else
           Local(cNameSuccessor.ref(ref))
       case RefCFunctionDefinition(_) => throw NotAValue(local)
       case ref: RefCStruct[Pre] => throw NotAValue(local)
       case ref @ RefCGlobalDeclaration(decl, initIdx) =>
         C.getDeclaratorInfo(decl.decl.inits(initIdx).decl).params match {
-          case None => DerefHeapVariable[Post](cGlobalNameSuccessor.ref(ref))(local.blame)
+          case None =>
+            DerefHeapVariable[Post](cGlobalNameSuccessor.ref(ref))(local.blame)
           case Some(_) => throw NotAValue(local)
         }
       case ref: RefCLocalDeclaration[Pre] => Local(cNameSuccessor.ref(ref))
@@ -985,37 +1348,51 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
   def deref(deref: CFieldAccess[Pre]): Expr[Post] = {
     implicit val o: Origin = deref.o
 
-    def getCuda(dim: RefCudaVecDim[Pre]): Expr[Post] = dim.vec match {
-      case RefCudaThreadIdx() => cudaCurrentThreadIdx.top.indices(dim).get
-      case RefCudaBlockIdx() => cudaCurrentBlockIdx.top.indices(dim).get
-      case RefCudaBlockDim() => cudaCurrentBlockDim.top.indices(dim).get
-      case RefCudaGridDim() => cudaCurrentGridDim.top.indices(dim).get
-    }
+    def getCuda(dim: RefCudaVecDim[Pre]): Expr[Post] =
+      dim.vec match {
+        case RefCudaThreadIdx() => cudaCurrentThreadIdx.top.indices(dim).get
+        case RefCudaBlockIdx() => cudaCurrentBlockIdx.top.indices(dim).get
+        case RefCudaBlockDim() => cudaCurrentBlockDim.top.indices(dim).get
+        case RefCudaGridDim() => cudaCurrentGridDim.top.indices(dim).get
+      }
 
-    def getVector(i: BigInt): Expr[Post] = AmbiguousSubscript(rw.dispatch(deref.obj), const(i))(PanicBlame("Should be okay"))
+    def getVector(i: BigInt): Expr[Post] =
+      AmbiguousSubscript(rw.dispatch(deref.obj), const(i))(PanicBlame(
+        "Should be okay"
+      ))
 
     deref.ref.get match {
-      case spec: SpecDerefTarget[Pre] => rw.specDeref(deref.obj, spec, deref, deref.blame)
+      case spec: SpecDerefTarget[Pre] =>
+        rw.specDeref(deref.obj, spec, deref, deref.blame)
       case target: SpecInvocationTarget[Pre] => ???
       case dim: RefCudaVecDim[Pre] => getCuda(dim)
       case mem: RefOpenCLVectorMembers[Pre] =>
-        if(mem.idx.size == 1) getVector(mem.idx.head)
+        if (mem.idx.size == 1)
+          getVector(mem.idx.head)
         else {
-          val elementType = deref.obj.t match {
-            case CPrimitiveType(Seq(CSpecificationType(v: TOpenCLVector[Pre]))) => v.innerType
-            case v: TOpenCLVector[Pre] => v.innerType
-            case _ => ???
-          }
+          val elementType =
+            deref.obj.t match {
+              case CPrimitiveType(
+                    Seq(CSpecificationType(v: TOpenCLVector[Pre]))
+                  ) =>
+                v.innerType
+              case v: TOpenCLVector[Pre] => v.innerType
+              case _ => ???
+            }
           LiteralVector[Post](rw.dispatch(elementType), mem.idx.map(getVector))
         }
       case struct: RefCStruct[Pre] => ???
       case struct: RefCStructField[Pre] =>
-        val struct_ref = getBaseType(deref.obj.t) match {
-          case CTStruct(struct_ref) => struct_ref
-          case _: TNotAValue[Pre] => throw TypeUsedAsValue(deref.obj)
-          case _ => ???
-        }
-        Deref[Post](rw.dispatch(deref.obj), cStructFieldsSuccessor.ref((struct_ref.decl, struct.decls)))(deref.blame)
+        val struct_ref =
+          getBaseType(deref.obj.t) match {
+            case CTStruct(struct_ref) => struct_ref
+            case _: TNotAValue[Pre] => throw TypeUsedAsValue(deref.obj)
+            case _ => ???
+          }
+        Deref[Post](
+          rw.dispatch(deref.obj),
+          cStructFieldsSuccessor.ref((struct_ref.decl, struct.decls)),
+        )(deref.blame)
     }
   }
 
@@ -1023,47 +1400,71 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     implicit val o: Origin = deref.o
 
     deref.ref.get match {
-      case RefModelField(decl) => ModelDeref[Post](rw.currentThis.top, rw.succ(decl))(deref.blame)
+      case RefModelField(decl) =>
+        ModelDeref[Post](rw.currentThis.top, rw.succ(decl))(deref.blame)
       case BuiltinField(f) => rw.dispatch(f(deref.struct))
       case target: SpecInvocationTarget[Pre] => ???
       case struct: RefCStruct[Pre] => ???
       case struct: RefCStructField[Pre] =>
         val b: Blame[PointerDerefError] = deref.blame
-        val structRef = getBaseType(deref.struct.t) match {
-          case CTPointer(CTStruct(struct)) => struct
-          case t => throw WrongStructType(t)
-        }
-        Deref[Post](DerefPointer(rw.dispatch(deref.struct))(b), cStructFieldsSuccessor.ref((structRef.decl, struct.decls)))(deref.blame)(deref.o)
+        val structRef =
+          getBaseType(deref.struct.t) match {
+            case CTPointer(CTStruct(struct)) => struct
+            case t => throw WrongStructType(t)
+          }
+        Deref[Post](
+          DerefPointer(rw.dispatch(deref.struct))(b),
+          cStructFieldsSuccessor.ref((structRef.decl, struct.decls)),
+        )(deref.blame)(deref.o)
     }
   }
 
   // Allow a user to write `Perm(p, write)` instead of `Perm(p.x, write) ** Perm(p.y, write)` for `struct p {int x, y}`
-  def unwrapStructPerm(struct: AmbiguousLocation[Post], perm: Expr[Pre], structType: CTStruct[Pre], origin: Origin, visited: Seq[CTStruct[Pre]]= Seq()): Expr[Post] = {
-    if(visited.contains(structType)) throw UnsupportedStructPerm(origin) // We do not allow this notation for recursive structs
+  def unwrapStructPerm(
+      struct: AmbiguousLocation[Post],
+      perm: Expr[Pre],
+      structType: CTStruct[Pre],
+      origin: Origin,
+      visited: Seq[CTStruct[Pre]] = Seq(),
+  ): Expr[Post] = {
+    if (visited.contains(structType))
+      throw UnsupportedStructPerm(
+        origin
+      ) // We do not allow this notation for recursive structs
     implicit val o: Origin = origin
     val blame = PanicBlame("Field permission is framed")
     val Seq(CStructDeclaration(_, fields)) = structType.ref.decl.decl.specs
     val newPerm = rw.dispatch(perm)
     val AmbiguousLocation(newExpr) = struct
     val newFieldPerms = fields.map(member => {
-      val loc = AmbiguousLocation(
-        Deref[Post](
-          newExpr,
-          cStructFieldsSuccessor.ref((structType.ref.decl, member))
-        )(blame)
-      )(struct.blame)
+      val loc =
+        AmbiguousLocation(
+          Deref[Post](
+            newExpr,
+            cStructFieldsSuccessor.ref((structType.ref.decl, member)),
+          )(blame)
+        )(struct.blame)
       member.specs.collectFirst {
         case CSpecificationType(newStruct: CTStruct[Pre]) =>
           // We recurse, since a field is another struct
-          Perm(loc, newPerm) &* unwrapStructPerm(loc, perm, newStruct, origin, structType +: visited)
+          Perm(loc, newPerm) &* unwrapStructPerm(
+            loc,
+            perm,
+            newStruct,
+            origin,
+            structType +: visited,
+          )
       }.getOrElse(Perm(loc, newPerm))
     })
 
     foldStar(newFieldPerms)
   }
 
-
-  def createStructCopy(value: Expr[Post], struct: CGlobalDeclaration[Pre], blame: InstanceField[_] => Blame[InsufficientPermission])(implicit o: Origin): Expr[Post] = {
+  def createStructCopy(
+      value: Expr[Post],
+      struct: CGlobalDeclaration[Pre],
+      blame: InstanceField[_] => Blame[InsufficientPermission],
+  )(implicit o: Origin): Expr[Post] = {
     val targetClass: Class[Post] = cStructSuccessor(struct)
     val t = TClass[Post](targetClass.ref, Seq())
 
@@ -1075,22 +1476,39 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     val fieldAssigns = targetClass.declarations.collect {
       case field: InstanceField[Post] =>
         val ref: Ref[Post, InstanceField[Post]] = field.ref
-        assignField(vCopy.get, ref, Deref[Post](vValue.get, field.ref)(blame(field)), PanicBlame("Assignment should work"))
+        assignField(
+          vCopy.get,
+          ref,
+          Deref[Post](vValue.get, field.ref)(blame(field)),
+          PanicBlame("Assignment should work"),
+        )
     }
 
-    With(Block(Seq(
-      LocalDecl(vCopy),
-      LocalDecl(vValue),
-      assignLocal(vValue.get, value),
-      assignLocal(vCopy.get, NewObject[Post](targetClass.ref))
-    ) ++ fieldAssigns), vCopy.get)
+    With(
+      Block(
+        Seq(
+          LocalDecl(vCopy),
+          LocalDecl(vValue),
+          assignLocal(vValue.get, value),
+          assignLocal(vCopy.get, NewObject[Post](targetClass.ref)),
+        ) ++ fieldAssigns
+      ),
+      vCopy.get,
+    )
   }
 
   def assignStruct(assign: PreAssignExpression[Pre]): Expr[Post] = {
     getBaseType(assign.target.t) match {
       case CTStruct(ref) =>
-        val copy = createStructCopy(rw.dispatch(assign.value), ref.decl, (f: InstanceField[_]) => StructCopyFailed(assign, f))(assign.o)
-        PreAssignExpression(rw.dispatch(assign.target), copy)(AssignLocalOk)(assign.o)
+        val copy =
+          createStructCopy(
+            rw.dispatch(assign.value),
+            ref.decl,
+            (f: InstanceField[_]) => StructCopyFailed(assign, f),
+          )(assign.o)
+        PreAssignExpression(rw.dispatch(assign.target), copy)(AssignLocalOk)(
+          assign.o
+        )
       case _ => throw WrongStructType(assign.target)
     }
   }
@@ -1104,11 +1522,13 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
         (i == 1) ? vector<T>{x[0], v, x[2], x[3]} :
         (i == 2) ? vector<T>{x[0], x[1], v, x[3]} :
         vector<T>{x[0], x[1], x[2], v};
-    */
-    if(size<=0) ???
+     */
+    if (size <= 0)
+      ???
 
     rw.globalDeclarations.declare({
-      val elementTypeVar = new Variable[Post](TType(TAnyValue()))(o.where(name= "T"))
+      val elementTypeVar =
+        new Variable[Post](TType(TAnyValue()))(o.where(name = "T"))
       val elementType = TVar[Post](elementTypeVar.ref)
       val vectorT = TVector(size, elementType)
 
@@ -1117,9 +1537,16 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
       val v = new Variable[Post](elementType)(o.where(name = "v"))
       val req = Seq(c_const[Post](0) <= i.get, i.get < c_const[Post](size))
 
-      val vals: Seq[Expr[Post]] = Seq.range(0, size).map(j => AmbiguousSubscript(x.get, c_const[Post](j))(PanicBlame("Checked")))
-      def f: Int => Expr[Post] = j => LiteralVector(elementType, vals.updated(j, v.get))
-      val body = Seq.range(0, size-1).foldRight(f(size-1))((j: Int, res: Expr[Post]) => Select(i.get === c_const[Post](j), f(j), res))
+      val vals: Seq[Expr[Post]] = Seq.range(0, size).map(j =>
+        AmbiguousSubscript(x.get, c_const[Post](j))(PanicBlame("Checked"))
+      )
+      def f: Int => Expr[Post] =
+        j => LiteralVector(elementType, vals.updated(j, v.get))
+      val body =
+        Seq.range(0, size - 1)
+          .foldRight(f(size - 1))((j: Int, res: Expr[Post]) =>
+            Select(i.get === c_const[Post](j), f(j), res)
+          )
 
       function(
         blame = AbstractApplicable,
@@ -1128,30 +1555,39 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
         args = Seq(x, i, v),
         typeArgs = Seq(elementTypeVar),
         body = Some(body),
-        requires = SplitAccountedPredicate(UnitAccountedPredicate(req(0)), UnitAccountedPredicate(req(1)))
+        requires = SplitAccountedPredicate(
+          UnitAccountedPredicate(req(0)),
+          UnitAccountedPredicate(req(1)),
+        ),
       )
-    }
-    )
+    })
   }
 
   val updateVectorFunction: mutable.Map[Int, Function[Post]] = mutable.Map()
 
   def assignSubscriptVector(assign: PreAssignExpression[Pre]): Expr[Post] = {
 
-    val sub@AmbiguousSubscript(v, i) = assign.target
-    val t = v.t match {
-      case CPrimitiveType(Seq(CSpecificationType(t: CTVector[Pre]))) => t
-      case _ => ???
-    }
+    val sub @ AmbiguousSubscript(v, i) = assign.target
+    val t =
+      v.t match {
+        case CPrimitiveType(Seq(CSpecificationType(t: CTVector[Pre]))) => t
+        case _ => ???
+      }
 
     val size = t.intSize.toInt
     val index = rw.dispatch(i)
     val innerType = t.innerType
 
     val newV = rw.dispatch(v)
-    val f = updateVectorFunction.getOrElseUpdate(size, createUpdateVectorFunction(size))
-    val update = functionInvocation[Post](VectorBoundFailed(sub),
-      f.ref, Seq(newV, index, rw.dispatch(assign.value)), Seq(rw.dispatch(innerType)))(assign.o)
+    val f = updateVectorFunction
+      .getOrElseUpdate(size, createUpdateVectorFunction(size))
+    val update =
+      functionInvocation[Post](
+        VectorBoundFailed(sub),
+        f.ref,
+        Seq(newV, index, rw.dispatch(assign.value)),
+        Seq(rw.dispatch(innerType)),
+      )(assign.o)
 
     PreAssignExpression(newV, update)(assign.blame)(assign.o)
   }
@@ -1160,110 +1596,167 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
   // We want to get v = vector<int>{0, 2, v[2], 1};
   def assignOpenCLVector(assign: PreAssignExpression[Pre]): Expr[Post] = {
     val CFieldAccess(obj, idxs) = assign.target
-    val t = obj.t match {
-      case CPrimitiveType(Seq(CSpecificationType(t: TOpenCLVector[Pre]))) => t
-      case _ => ???
-    }
+    val t =
+      obj.t match {
+        case CPrimitiveType(Seq(CSpecificationType(t: TOpenCLVector[Pre]))) => t
+        case _ => ???
+      }
 
-    val intIdxs = C.openCLVectorAccessString(idxs, t.size).getOrElse(throw WrongOpenCLLiteralVector(assign))
+    val intIdxs = C.openCLVectorAccessString(idxs, t.size)
+      .getOrElse(throw WrongOpenCLLiteralVector(assign))
 
     val lhs_vec = rw.dispatch(obj)
     val rhs = rw.dispatch(assign.value)
     val innerType = rw.dispatch(t.innerType)
 
-    if(intIdxs.length == 1){
+    if (intIdxs.length == 1) {
       // Only one index needs to change
-      val vals: Seq[Expr[Post]] = Seq.tabulate(t.size.toInt)(
-        (i: Int) => {
+      val vals: Seq[Expr[Post]] =
+        Seq.tabulate(t.size.toInt)((i: Int) => {
           val c = intIdxs.count(j => j == i)
-          if (c==0) AmbiguousSubscript(lhs_vec, c_const[Post](i)(assign.target.o))(PanicBlame("Type checked"))(assign.o)
-          else rhs
-        }
-      )
+          if (c == 0)
+            AmbiguousSubscript(lhs_vec, c_const[Post](i)(assign.target.o))(
+              PanicBlame("Type checked")
+            )(assign.o)
+          else
+            rhs
+        })
 
-      return PreAssignExpression(lhs_vec, LiteralVector(innerType, vals)(assign.o))(assign.blame)(assign.o)
+      return PreAssignExpression(
+        lhs_vec,
+        LiteralVector(innerType, vals)(assign.o),
+      )(assign.blame)(assign.o)
     }
 
     // Store the rhs in a variable, it might be a method call that alters the state
     val vectorT = TVector[Post](intIdxs.length, innerType)
     val rhs_val = new Variable[Post](vectorT)(assign.value.o)
-    val before: Statement[Post] = Block[Post](Seq(
-      LocalDecl(rhs_val)(rhs.o),
-      assignLocal(rhs_val.get(rhs.o), rhs)(rhs.o),
-    ))(assign.o)
+    val before: Statement[Post] =
+      Block[Post](Seq(
+        LocalDecl(rhs_val)(rhs.o),
+        assignLocal(rhs_val.get(rhs.o), rhs)(rhs.o),
+      ))(assign.o)
 
     // Assign the correct values
-    val vals: Seq[Expr[Post]] = Seq.tabulate(t.size.toInt)(
-      (i: Int) => {
+    val vals: Seq[Expr[Post]] =
+      Seq.tabulate(t.size.toInt)((i: Int) => {
         val c = intIdxs.count(j => j == i)
-        if(c> 1) throw WrongOpenCLLiteralVector(assign)
-        else if (c==0) AmbiguousSubscript(lhs_vec, c_const[Post](i)(assign.target.o))(PanicBlame("Type checked"))(assign.o)
+        if (c > 1)
+          throw WrongOpenCLLiteralVector(assign)
+        else if (c == 0)
+          AmbiguousSubscript(lhs_vec, c_const[Post](i)(assign.target.o))(
+            PanicBlame("Type checked")
+          )(assign.o)
         else {
           val j = intIdxs.indexOf(i)
-          AmbiguousSubscript(rhs_val.get(rhs.o), c_const[Post](j)(assign.target.o))(PanicBlame("Type checked"))(assign.o)
+          AmbiguousSubscript(
+            rhs_val.get(rhs.o),
+            c_const[Post](j)(assign.target.o),
+          )(PanicBlame("Type checked"))(assign.o)
         }
-      }
-    )
+      })
 
-    With(before, PreAssignExpression(lhs_vec, LiteralVector(innerType, vals)(assign.o))(assign.blame)(assign.o))(assign.o)
+    With(
+      before,
+      PreAssignExpression(lhs_vec, LiteralVector(innerType, vals)(assign.o))(
+        assign.blame
+      )(assign.o),
+    )(assign.o)
   }
 
-  def isCPointer(t: Type[_]) = getBaseType(t) match {
-    case CTPointer(_) => true
-    case _ => false
-  }
+  def isCPointer(t: Type[_]) =
+    getBaseType(t) match {
+      case CTPointer(_) => true
+      case _ => false
+    }
 
-  def indexVectors(e: Expr[Post], askedType: Type[Post], inv: CInvocation[Pre]): Seq[Expr[Post]] = e.t match {
-    case t if t == askedType => Seq(e)
-    case t: TVector[Post] =>
-      Seq.tabulate(t.size.toInt)(i => i)
-        .flatMap(i => indexVectors(AmbiguousSubscript(e, c_const(i)(e.o))(PanicBlame("Type Checked"))(e.o), askedType, inv))
-    case _ => throw WrongOpenCLLiteralVector(inv)
-  }
+  def indexVectors(
+      e: Expr[Post],
+      askedType: Type[Post],
+      inv: CInvocation[Pre],
+  ): Seq[Expr[Post]] =
+    e.t match {
+      case t if t == askedType => Seq(e)
+      case t: TVector[Post] =>
+        Seq.tabulate(t.size.toInt)(i => i)
+          .flatMap(i =>
+            indexVectors(
+              AmbiguousSubscript(e, c_const(i)(e.o))(PanicBlame(
+                "Type Checked"
+              ))(e.o),
+              askedType,
+              inv,
+            )
+          )
+      case _ => throw WrongOpenCLLiteralVector(inv)
+    }
 
-  def unwrapVectorArg(e: Expr[Post], askedType: Type[Post], inv: CInvocation[Pre]): (Seq[Statement[Post]], Seq[Expr[Post]]) = e.t match {
-    case t if t == askedType => (Nil, Seq(e))
-    case _: TVector[Post] =>
-      implicit val o: Origin = e.o
-      val (befores, varE) = e match {
-        case v: Local[Post] => (Nil, v)
-        case _ =>
-          val v = new Variable[Post](e.t)
-          val befores: Seq[Statement[Post]] = Seq(
-            LocalDecl(v),
-            assignLocal(v.get, e))
-          (befores, v.get)
-      }
-      (befores, indexVectors(varE, askedType, inv))
-    case _ => throw WrongOpenCLLiteralVector(inv)
-  }
+  def unwrapVectorArg(
+      e: Expr[Post],
+      askedType: Type[Post],
+      inv: CInvocation[Pre],
+  ): (Seq[Statement[Post]], Seq[Expr[Post]]) =
+    e.t match {
+      case t if t == askedType => (Nil, Seq(e))
+      case _: TVector[Post] =>
+        implicit val o: Origin = e.o
+        val (befores, varE) =
+          e match {
+            case v: Local[Post] => (Nil, v)
+            case _ =>
+              val v = new Variable[Post](e.t)
+              val befores: Seq[Statement[Post]] = Seq(
+                LocalDecl(v),
+                assignLocal(v.get, e),
+              )
+              (befores, v.get)
+          }
+        (befores, indexVectors(varE, askedType, inv))
+      case _ => throw WrongOpenCLLiteralVector(inv)
+    }
 
-  def createOpenCLLiteralVector(size: BigInt, innerType: Type[Pre], inv: CInvocation[Pre]): Expr[Post] = {
+  def createOpenCLLiteralVector(
+      size: BigInt,
+      innerType: Type[Pre],
+      inv: CInvocation[Pre],
+  ): Expr[Post] = {
     implicit val o: Origin = inv.o
-    val (befores: Seq[Statement[Post]], newArgs: Seq[Expr[Post]])
-      = inv.args.map(a => unwrapVectorArg(rw.dispatch(a), rw.dispatch(innerType), inv))
+    val (befores: Seq[Statement[Post]], newArgs: Seq[Expr[Post]]) =
+      inv.args
+        .map(a => unwrapVectorArg(rw.dispatch(a), rw.dispatch(innerType), inv))
         .foldLeft[(Seq[Statement[Post]], Seq[Expr[Post]])](Nil, Nil)(
-          (base, extra) => (base._1 ++ extra._1, base._2 ++ extra._2))
-    if(newArgs.length != size) throw WrongOpenCLLiteralVector(inv)
+          (base, extra) => (base._1 ++ extra._1, base._2 ++ extra._2)
+        )
+    if (newArgs.length != size)
+      throw WrongOpenCLLiteralVector(inv)
     val result = LiteralVector[Post](rw.dispatch(innerType), newArgs)
-    if(befores.nonEmpty) With(Block(befores), result)
-    else result
+    if (befores.nonEmpty)
+      With(Block(befores), result)
+    else
+      result
   }
 
   def invocation(inv: CInvocation[Pre]): Expr[Post] = {
     val CInvocation(applicable, args, givenMap, yields) = inv
 
     inv.ref.get match {
-      case RefOpenCLVectorLiteralCInvocationTarget(size, t) if givenMap.isEmpty && yields.isEmpty =>
+      case RefOpenCLVectorLiteralCInvocationTarget(size, t)
+          if givenMap.isEmpty && yields.isEmpty =>
         return createOpenCLLiteralVector(size, t, inv)
-      case RefOpenCLVectorLiteralCInvocationTarget(size, t) => throw WrongOpenCLLiteralVector(inv)
+      case RefOpenCLVectorLiteralCInvocationTarget(size, t) =>
+        throw WrongOpenCLLiteralVector(inv)
       case _ =>
     }
 
     // Create copy for any direct structure arguments
     val newArgs = args.map(a =>
       getBaseType(a.t) match {
-        case CTStruct(ref) => createStructCopy(rw.dispatch(a), ref.decl, (f: InstanceField[_]) => StructCopyBeforeCallFailed(inv, f))(a.o)
+        case CTStruct(ref) =>
+          createStructCopy(
+            rw.dispatch(a),
+            ref.decl,
+            (f: InstanceField[_]) => StructCopyBeforeCallFailed(inv, f),
+          )(a.o)
         case _ => rw.dispatch(a)
       }
     )
@@ -1271,153 +1764,211 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
     implicit val o: Origin = inv.o
     inv.ref.get match {
       case spec: SpecInvocationTarget[Pre] =>
-        rw.specInvocation(None, spec, Nil, args, givenMap, yields, inv, inv.blame)
+        rw.specInvocation(
+          None,
+          spec,
+          Nil,
+          args,
+          givenMap,
+          yields,
+          inv,
+          inv.blame,
+        )
       case ref: RefCFunctionDefinition[Pre] =>
-        ProcedureInvocation[Post](cFunctionSuccessor.ref(ref.decl), newArgs, Nil, Nil,
+        ProcedureInvocation[Post](
+          cFunctionSuccessor.ref(ref.decl),
+          newArgs,
+          Nil,
+          Nil,
           givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) })(inv.blame)
+          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
+        )(inv.blame)
       case e: RefCGlobalDeclaration[Pre] => globalInvocation(e, inv, newArgs)
     }
   }
 
-  /**
-    * Rewrites a CudaKernelInvocation to a procedure.
-    * @param kernel - the invocation we want to rewrite
-    * @return a Procedure[Post]
+  /** Rewrites a CudaKernelInvocation to a procedure.
+    * @param kernel
+    *   \- the invocation we want to rewrite
+    * @return
+    *   a Procedure[Post]
     */
-  def cudaKernelInvocation(kernel: GpgpuCudaKernelInvocation[Pre]): Expr[Post] = {
-    val GpgpuCudaKernelInvocation(ker, blocks, threads, args, givenMap, yields) = kernel
+  def cudaKernelInvocation(
+      kernel: GpgpuCudaKernelInvocation[Pre]
+  ): Expr[Post] = {
+    val GpgpuCudaKernelInvocation(
+      ker,
+      blocks,
+      threads,
+      args,
+      givenMap,
+      yields,
+    ) = kernel
     implicit val o: Origin = kernel.o
     val one = c_const[Post](1)
     kernel.ref.get match {
       case target: SpecInvocationTarget[_] => ???
       case ref: RefCFunctionDefinition[Pre] =>
-        ProcedureInvocation[Post](cFunctionSuccessor.ref(ref.decl),
-          rw.dispatch(blocks) +: one +:  one
-            +: rw.dispatch(threads) +: one +: one +: args.map(rw.dispatch),
-          Nil, Nil,
+        ProcedureInvocation[Post](
+          cFunctionSuccessor.ref(ref.decl),
+          rw.dispatch(blocks) +: one +: one +: rw.dispatch(threads) +: one +:
+            one +: args.map(rw.dispatch),
+          Nil,
+          Nil,
           givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) })(kernel.blame)
+          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
+        )(kernel.blame)
       case e: RefCGlobalDeclaration[Pre] => ???
     }
   }
 
-  /**
-    * Returns the local id of a thread in a given dimension.
-    * @param index - the dimension for which we want the thread id
-    * @param origin - the origin of the expr node
-    * @return the value of the thread ID in the given dimension
+  /** Returns the local id of a thread in a given dimension.
+    * @param index
+    *   \- the dimension for which we want the thread id
+    * @param origin
+    *   \- the origin of the expr node
+    * @return
+    *   the value of the thread ID in the given dimension
     */
-  def getCudaLocalThread(index: Int, origin: Origin): Expr[Post]  = {
+  def getCudaLocalThread(index: Int, origin: Origin): Expr[Post] = {
     implicit val o: Origin = origin
     cudaCurrentThreadIdx.top.indices.values.toSeq.apply(index).get
   }
 
-  /**
-    * Returns the group id of a thread in a given dimension.
-    * @param index - the dimension for which we want the thread id
-    * @param origin - the origin of the expr node
-    * @return the value of the thread ID in the given dimension
+  /** Returns the group id of a thread in a given dimension.
+    * @param index
+    *   \- the dimension for which we want the thread id
+    * @param origin
+    *   \- the origin of the expr node
+    * @return
+    *   the value of the thread ID in the given dimension
     */
-  def getCudaGroupThread(index: Int, origin: Origin): Expr[Post]  = {
+  def getCudaGroupThread(index: Int, origin: Origin): Expr[Post] = {
     implicit val o: Origin = origin
     cudaCurrentBlockIdx.top.indices.values.toSeq.apply(index).get
   }
 
-  /**
-    * Returns the local size of a given dimension.
-    * @param index - the dimension for which we query its size
-    * @param origin - the origin of the expr node
-    * @return the value of the size of the given dimension.
+  /** Returns the local size of a given dimension.
+    * @param index
+    *   \- the dimension for which we query its size
+    * @param origin
+    *   \- the origin of the expr node
+    * @return
+    *   the value of the size of the given dimension.
     */
   def getCudaLocalSize(index: Int, origin: Origin): Expr[Post] = {
     implicit val o: Origin = origin
     cudaCurrentBlockDim.top.indices.values.toSeq.apply(index).get
   }
 
-  /**
-    * Returns the global size of a given dimension.
-    * @param index - the dimension for which we query the global size.
-    * @param o - the origin of the expr node
-    * @return the value of the global size of the given dimension.
+  /** Returns the global size of a given dimension.
+    * @param index
+    *   \- the dimension for which we query the global size.
+    * @param o
+    *   \- the origin of the expr node
+    * @return
+    *   the value of the global size of the given dimension.
     */
   def getCudaGroupSize(index: Int, o: Origin): Expr[Post] = {
     implicit val origin: Origin = o
     cudaCurrentGridDim.top.indices.values.toSeq.apply(index).get
   }
 
-  /**
-    * Rewrites a LocalThreadId and translates it to a linear ID value. The expression is equivalent to the openCL
-    *   method "get_local_linear_id".
-    * @param local - the node we want to rewrite
-    * @return an expression equal to the linear ID of the local thread
+  /** Rewrites a LocalThreadId and translates it to a linear ID value. The
+    * expression is equivalent to the openCL method "get_local_linear_id".
+    * @param local
+    *   \- the node we want to rewrite
+    * @return
+    *   an expression equal to the linear ID of the local thread
     */
   def cudaLocalThreadId(local: LocalThreadId[Pre]): Expr[Post] = {
     implicit val o: Origin = local.o
     Plus(
       Mult(
-        Mult(getCudaLocalThread(2, o), getCudaLocalSize(1, o)), // get_local_id(2) * get_local_size(1)
-      getCudaLocalSize(0, o)                                           //  * get_local_size(0)
-      ),                                                                      //  +
+        Mult(
+          getCudaLocalThread(2, o),
+          getCudaLocalSize(1, o),
+        ), // get_local_id(2) * get_local_size(1)
+        getCudaLocalSize(0, o), //  * get_local_size(0)
+      ), //  +
       Plus(
-        Mult(getCudaLocalThread(1, o), getCudaLocalSize(0, o)), //  get_local_id(1) * get_local_size(0)
-        getCudaLocalThread(0, o)                                       //  + get_local_id(0)
-      )
+        Mult(
+          getCudaLocalThread(1, o),
+          getCudaLocalSize(0, o),
+        ), //  get_local_id(1) * get_local_size(0)
+        getCudaLocalThread(0, o), //  + get_local_id(0)
+      ),
     )
   }
 
-  /**
-    * Rewrites a GlobalThreadId into a linear ID value. The expression is equivalent to the openCL
-    *   method "get_global_linear_id".
-    * We assume the global_offset is 0 in our calculation.
-    * @param global - the node we want to rewrite
-    * @return an expression equal to the linear global id of the thread.
+  /** Rewrites a GlobalThreadId into a linear ID value. The expression is
+    * equivalent to the openCL method "get_global_linear_id". We assume the
+    * global_offset is 0 in our calculation.
+    * @param global
+    *   \- the node we want to rewrite
+    * @return
+    *   an expression equal to the linear global id of the thread.
     */
   def cudaGlobalThreadId(global: GlobalThreadId[Pre]): Expr[Post] = {
     implicit val o: Origin = global.o
-    val res =
-      (getGlobalId(2)*getGlobalSize(1)*getGlobalSize(0)) +
-        getGlobalId(1)*getGlobalSize(0) + getGlobalId(0)
+    val res = (getGlobalId(2) * getGlobalSize(1) * getGlobalSize(0)) +
+      getGlobalId(1) * getGlobalSize(0) + getGlobalId(0)
     return res;
   }
 
   def getGlobalId(idx: Int)(implicit o: Origin): Expr[Post] = {
-    getCudaGroupThread(idx, o) * getCudaLocalSize(idx, o) + getCudaLocalThread(idx, o)
+    getCudaGroupThread(idx, o) * getCudaLocalSize(idx, o) +
+      getCudaLocalThread(idx, o)
   }
 
   def getGlobalSize(idx: Int)(implicit o: Origin): Expr[Post] = {
-    getCudaLocalSize(idx, o)*getCudaGroupSize(idx, o)
+    getCudaLocalSize(idx, o) * getCudaGroupSize(idx, o)
   }
 
-  def globalInvocation(e: RefCGlobalDeclaration[Pre], inv: CInvocation[Pre], rewrittenArgs: Seq[Expr[Post]]): Expr[Post] = {
+  def globalInvocation(
+      e: RefCGlobalDeclaration[Pre],
+      inv: CInvocation[Pre],
+      rewrittenArgs: Seq[Expr[Post]],
+  ): Expr[Post] = {
     val CInvocation(_, args, givenMap, yields) = inv
     val RefCGlobalDeclaration(decls, initIdx) = e
     implicit val o: Origin = inv.o
 
     (e.name, args, givenMap, yields) match {
       case (_, _, g, y) if g.nonEmpty || y.nonEmpty =>
-      case("__vercors_free", Seq(xs), _, _) if isCPointer(xs.t) =>
+      case ("__vercors_free", Seq(xs), _, _) if isCPointer(xs.t) =>
         return FreePointer[Post](rw.dispatch(xs))(inv.blame)(inv.o)
       case _ => ()
     }
 
-    val arg = if (args.size == 1) {
-      args.head match {
-        case CIntegerValue(i) if i >= 0 && i < 3 => Some(i.toInt)
-        case _ => None
-      }
-    } else None
+    val arg =
+      if (args.size == 1) {
+        args.head match {
+          case CIntegerValue(i) if i >= 0 && i < 3 => Some(i.toInt)
+          case _ => None
+        }
+      } else
+        None
 
     (e.name, arg) match {
       case ("get_local_id", Some(i)) => getCudaLocalThread(i, o)
       case ("get_group_id", Some(i)) => getCudaGroupThread(i, o)
       case ("get_local_size", Some(i)) => getCudaLocalSize(i, o)
-      case ("get_global_size", Some(i)) => getCudaGroupSize(i, o) * getCudaLocalSize(i, o)
+      case ("get_global_size", Some(i)) =>
+        getCudaGroupSize(i, o) * getCudaLocalSize(i, o)
       case ("get_num_groups", Some(i)) => getCudaGroupSize(i, o)
-      case ("get_global_id", Some(i)) => getCudaLocalSize(i, o) * getCudaGroupThread(i, o) + getCudaLocalThread(i, o)
-      case _ => ProcedureInvocation[Post](cFunctionDeclSuccessor.ref((decls, initIdx)), rewrittenArgs, Nil, Nil,
-        givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-        yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) })(inv.blame)
+      case ("get_global_id", Some(i)) =>
+        getCudaLocalSize(i, o) * getCudaGroupThread(i, o) +
+          getCudaLocalThread(i, o)
+      case _ =>
+        ProcedureInvocation[Post](
+          cFunctionDeclSuccessor.ref((decls, initIdx)),
+          rewrittenArgs,
+          Nil,
+          Nil,
+          givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
+          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
+        )(inv.blame)
     }
   }
 
@@ -1426,13 +1977,15 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
   }
 
   def vectorType(t: CType[Pre]): Type[Post] = {
-    val (intSize, innerType) = t match {
-      case t: CTVector[Pre] => (t.intSize, t.innerType)
-      case t: TOpenCLVector[Pre] => (t.size, t.innerType)
-      case _ => throw WrongVectorType(t)
-    }
+    val (intSize, innerType) =
+      t match {
+        case t: CTVector[Pre] => (t.intSize, t.innerType)
+        case t: TOpenCLVector[Pre] => (t.size, t.innerType)
+        case _ => throw WrongVectorType(t)
+      }
     rw.dispatch(innerType) match {
-      case innerType@(TCInt() | TCFloat(_,_)) => TVector(intSize, innerType)(t.o)
+      case innerType @ (TCInt() | TCFloat(_, _)) =>
+        TVector(intSize, innerType)(t.o)
       case _ => throw WrongVectorType(t)
     }
   }
@@ -1443,7 +1996,8 @@ case class LangCToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends Laz
   }
 
   def structType(t: CTStruct[Pre]): Type[Post] = {
-    val targetClass = new LazyRef[Post, Class[Post]](cStructSuccessor(t.ref.decl))
+    val targetClass =
+      new LazyRef[Post, Class[Post]](cStructSuccessor(t.ref.decl))
     TClass[Post](targetClass, Seq())(t.o)
   }
 }
diff --git a/src/rewrite/vct/rewrite/lang/LangJavaToCol.scala b/src/rewrite/vct/rewrite/lang/LangJavaToCol.scala
index 2c9b552d21..7a65f46ca6 100644
--- a/src/rewrite/vct/rewrite/lang/LangJavaToCol.scala
+++ b/src/rewrite/vct/rewrite/lang/LangJavaToCol.scala
@@ -22,9 +22,10 @@ case object LangJavaToCol {
   private def JavaFieldOrigin(fields: JavaFields[_], idx: Int): Origin =
     fields.decls(idx).o.where(name = fields.decls(idx).name)
 
-  private def JavaLocalOrigin(locals: JavaLocalDeclaration[_], idx: Int): Origin = {
-    locals.decls(idx).o.where(name = locals.decls(idx).name)
-  }
+  private def JavaLocalOrigin(
+      locals: JavaLocalDeclaration[_],
+      idx: Int,
+  ): Origin = { locals.decls(idx).o.where(name = locals.decls(idx).name) }
 
   private def JavaConstructorOrigin(cons: JavaConstructor[_]): Origin = {
     cons.o.where(name = cons.name)
@@ -34,9 +35,9 @@ case object LangJavaToCol {
     method.o.where(name = method.name)
   }
 
-  private def JavaAnnotationMethodOrigin(method: JavaAnnotationMethod[_]): Origin = {
-    method.o.where(name = method.name)
-  }
+  private def JavaAnnotationMethodOrigin(
+      method: JavaAnnotationMethod[_]
+  ): Origin = { method.o.where(name = method.name) }
 
   private def JavaInstanceClassOrigin(cls: JavaClassOrInterface[_]): Origin = {
     cls.o.where(name = cls.name)
@@ -46,70 +47,112 @@ case object LangJavaToCol {
     cls.o.where(name = cls.name + "Statics")
   }
 
-  private def JavaStaticsClassSingletonOrigin(cls: JavaClassOrInterface[_]): Origin = {
-    cls.o.where(name = cls.name + "StaticsSingleton")
-  }
+  private def JavaStaticsClassSingletonOrigin(
+      cls: JavaClassOrInterface[_]
+  ): Origin = { cls.o.where(name = cls.name + "StaticsSingleton") }
 
   private def JavaInlineArrayInitializerOrigin(inner: Origin): Origin = {
     inner.where(name = "arrayInitializer")
   }
 
-  case class InvalidArrayInitializerNesting(initializer: JavaLiteralArray[_]) extends UserError {
-    override def text: String = initializer.o.messageInContext("This literal array is nested more deeply than its indicated type allows.")
+  case class InvalidArrayInitializerNesting(initializer: JavaLiteralArray[_])
+      extends UserError {
+    override def text: String =
+      initializer.o.messageInContext(
+        "This literal array is nested more deeply than its indicated type allows."
+      )
     override def code: String = "invalidNesting"
   }
 
-  case class NotSupportedInJavaLangStringClass(decl: ClassDeclaration[_]) extends UserError {
-    override def code: String = decl.o.messageInContext("This declaration is not supported in the java.lang.String class")
+  case class NotSupportedInJavaLangStringClass(decl: ClassDeclaration[_])
+      extends UserError {
+    override def code: String =
+      decl.o.messageInContext(
+        "This declaration is not supported in the java.lang.String class"
+      )
     override def text: String = "notSupportedInStringClass"
   }
 
-  case class GenericJavaNotSupported(decl: JavaClassOrInterface[_]) extends UserError {
-    override def code: String = decl.o.messageInContext("Generic Java classes not supported")
+  case class GenericJavaNotSupported(decl: JavaClassOrInterface[_])
+      extends UserError {
+    override def code: String =
+      decl.o.messageInContext("Generic Java classes not supported")
     override def text: String = "genericJavaClass"
   }
 }
 
-case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends LazyLogging {
+case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre])
+    extends LazyLogging {
   import LangJavaToCol._
   type Post = Rewritten[Pre]
   implicit val implicitRewriter: AbstractRewriter[Pre, Post] = rw
 
   val namespace: ScopedStack[JavaNamespace[Pre]] = ScopedStack()
-  val javaInstanceClassSuccessor: SuccessionMap[JavaClassOrInterface[Pre], Class[Post]] = SuccessionMap()
-  val javaStaticsClassSuccessor: SuccessionMap[JavaClassOrInterface[Pre], Class[Post]] = SuccessionMap()
-  val javaStaticsFunctionSuccessor: SuccessionMap[JavaClassOrInterface[Pre], Function[Post]] = SuccessionMap()
-
-  val javaFieldsSuccessor: SuccessionMap[(JavaFields[Pre], Int), InstanceField[Post]] = SuccessionMap()
-  val javaLocalsSuccessor: SuccessionMap[(JavaLocalDeclaration[Pre], Int), Variable[Post]] = SuccessionMap()
-  val javaParamSuccessor: SuccessionMap[JavaParam[Pre], Variable[Post]] = SuccessionMap()
-
-  val javaMethod: SuccessionMap[JavaMethod[Pre], InstanceMethod[Post]] = SuccessionMap()
-  val javaConstructor: SuccessionMap[JavaConstructor[Pre], Constructor[Post]] = SuccessionMap()
-  val javaDefaultConstructor: SuccessionMap[JavaClassOrInterface[Pre], JavaConstructor[Pre]] = SuccessionMap()
-
-  val javaClassDeclToJavaClass: mutable.Map[JavaClassDeclaration[Pre], JavaClassOrInterface[Pre]] = mutable.Map()
+  val javaInstanceClassSuccessor
+      : SuccessionMap[JavaClassOrInterface[Pre], Class[Post]] = SuccessionMap()
+  val javaStaticsClassSuccessor
+      : SuccessionMap[JavaClassOrInterface[Pre], Class[Post]] = SuccessionMap()
+  val javaStaticsFunctionSuccessor
+      : SuccessionMap[JavaClassOrInterface[Pre], Function[Post]] =
+    SuccessionMap()
+
+  val javaFieldsSuccessor
+      : SuccessionMap[(JavaFields[Pre], Int), InstanceField[Post]] =
+    SuccessionMap()
+  val javaLocalsSuccessor
+      : SuccessionMap[(JavaLocalDeclaration[Pre], Int), Variable[Post]] =
+    SuccessionMap()
+  val javaParamSuccessor: SuccessionMap[JavaParam[Pre], Variable[Post]] =
+    SuccessionMap()
+
+  val javaMethod: SuccessionMap[JavaMethod[Pre], InstanceMethod[Post]] =
+    SuccessionMap()
+  val javaConstructor: SuccessionMap[JavaConstructor[Pre], Constructor[Post]] =
+    SuccessionMap()
+  val javaDefaultConstructor
+      : SuccessionMap[JavaClassOrInterface[Pre], JavaConstructor[Pre]] =
+    SuccessionMap()
+
+  val javaClassDeclToJavaClass
+      : mutable.Map[JavaClassDeclaration[Pre], JavaClassOrInterface[Pre]] =
+    mutable.Map()
 
   val currentJavaClass: ScopedStack[JavaClassOrInterface[Pre]] = ScopedStack()
 
-  def isJavaStatic(decl: ClassDeclaration[_]): Boolean = decl match {
-    case init: JavaSharedInitialization[_] => init.isStatic
-    case fields: JavaFields[_] => fields.modifiers.collectFirst { case JavaStatic() => () }.nonEmpty
-    case method: JavaMethod[_] => method.modifiers.collectFirst { case JavaStatic() => () }.nonEmpty
-    case _: JavaConstructor[_] => false
-    case _: ClassDeclaration[_] => false // FIXME we should have a way of translating static specification-type declarations
-  }
+  def isJavaStatic(decl: ClassDeclaration[_]): Boolean =
+    decl match {
+      case init: JavaSharedInitialization[_] => init.isStatic
+      case fields: JavaFields[_] =>
+        fields.modifiers.collectFirst { case JavaStatic() => () }.nonEmpty
+      case method: JavaMethod[_] =>
+        method.modifiers.collectFirst { case JavaStatic() => () }.nonEmpty
+      case _: JavaConstructor[_] => false
+      case _: ClassDeclaration[_] =>
+        false // FIXME we should have a way of translating static specification-type declarations
+    }
 
-  def makeJavaClass(prefName: String, decls: Seq[ClassDeclaration[Pre]], ref: Ref[Post, Class[Post]], isStaticPart: Boolean)(implicit o: Origin): Unit = {
+  def makeJavaClass(
+      prefName: String,
+      decls: Seq[ClassDeclaration[Pre]],
+      ref: Ref[Post, Class[Post]],
+      isStaticPart: Boolean,
+  )(implicit o: Origin): Unit = {
     // First, declare all the fields, so we can refer to them.
     decls.foreach {
       case fields: JavaFields[Pre] =>
         fields.drop()
-        for((JavaVariableDeclaration(_, dims, _), idx) <- fields.decls.zipWithIndex) {
+        for (
+          (JavaVariableDeclaration(_, dims, _), idx) <-
+            fields.decls.zipWithIndex
+        ) {
           javaFieldsSuccessor((fields, idx)) =
             new InstanceField(
-              t = FuncTools.repeat(TArray[Post](_), dims, rw.dispatch(fields.t)),
-              flags = fields.modifiers.collect { case JavaFinal() => new Final[Post]() })(JavaFieldOrigin(fields, idx))
+              t = FuncTools
+                .repeat(TArray[Post](_), dims, rw.dispatch(fields.t)),
+              flags = fields.modifiers.collect { case JavaFinal() =>
+                new Final[Post]()
+              },
+            )(JavaFieldOrigin(fields, idx))
           rw.classDeclarations.declare(javaFieldsSuccessor((fields, idx)))
         }
       case _ =>
@@ -118,78 +161,115 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
     // Each constructor performs in order:
     // 1. the inline initialization of all fields
 
-    val fieldInit = (diz: Expr[Post]) => Block[Post](decls.collect {
-      case fields: JavaFields[Pre]  =>
-        Block(for((JavaVariableDeclaration(_, dims, init), idx) <- fields.decls.zipWithIndex)
-          yield init match {
-            case Some(value) =>
-              assignField[Post](
-                obj = diz,
-                field = javaFieldsSuccessor.ref((fields, idx)),
-                value = rw.dispatch(value),
-                blame = PanicBlame("The inline initialization of a field must have permission, because it is the first initialization that happens.")
-              )
-            case None if fields.modifiers.collectFirst { case JavaFinal() => () }.isEmpty =>
-              assignField[Post](
-                obj = diz,
-                field = javaFieldsSuccessor.ref((fields, idx)),
-                value = Java.zeroValue(FuncTools.repeat(TArray[Post](_), dims, rw.dispatch(fields.t))),
-                blame = PanicBlame("The inline initialization of a field must have permission, because it is the first initialization that happens.")
-              )
-            case None /* if modifiers contains final */ =>
-              Block(Nil)
-          }
-        )
-    })
+    val fieldInit =
+      (diz: Expr[Post]) =>
+        Block[Post](decls.collect { case fields: JavaFields[Pre] =>
+          Block(
+            for (
+              (JavaVariableDeclaration(_, dims, init), idx) <-
+                fields.decls.zipWithIndex
+            )
+              yield init match {
+                case Some(value) =>
+                  assignField[Post](
+                    obj = diz,
+                    field = javaFieldsSuccessor.ref((fields, idx)),
+                    value = rw.dispatch(value),
+                    blame = PanicBlame(
+                      "The inline initialization of a field must have permission, because it is the first initialization that happens."
+                    ),
+                  )
+                case None if fields.modifiers.collectFirst { case JavaFinal() =>
+                      ()
+                    }.isEmpty =>
+                  assignField[Post](
+                    obj = diz,
+                    field = javaFieldsSuccessor.ref((fields, idx)),
+                    value = Java.zeroValue(
+                      FuncTools
+                        .repeat(TArray[Post](_), dims, rw.dispatch(fields.t))
+                    ),
+                    blame = PanicBlame(
+                      "The inline initialization of a field must have permission, because it is the first initialization that happens."
+                    ),
+                  )
+                case None /* if modifiers contains final */ => Block(Nil)
+              }
+          )
+        })
 
     // 2. the shared initialization blocks
 
-    val sharedInit = (diz: Expr[Post]) => {
-      rw.currentThis.having(diz) {
-        Block(decls.collect {
-          case init: JavaSharedInitialization[Pre] => rw.dispatch(init.initialization)
-        })
+    val sharedInit =
+      (diz: Expr[Post]) => {
+        rw.currentThis.having(diz) {
+          Block(decls.collect { case init: JavaSharedInitialization[Pre] =>
+            rw.dispatch(init.initialization)
+          })
+        }
       }
-    }
 
     // 3. the body of the constructor
 
-    val declsDefault = if(decls.collect { case _: JavaConstructor[Pre] => () }.isEmpty) {
-      val fieldPerms: UnitAccountedPredicate[Pre] = if (BipComponent.get(currentJavaClass.top).isDefined) {
-        // Permissions are managed by bip permission generation & the bip component invariant, so
-        // don't generate permissions here
-        UnitAccountedPredicate(tt)
-      } else {
-        UnitAccountedPredicate(foldStar(decls.collect {
-          case fields: JavaFields[Pre] if fields.modifiers.collectFirst { case JavaFinal() => () }.isEmpty =>
-            fields.decls.indices.map(decl => {
-              val local = JavaLocal[Pre](fields.decls(decl).name)(DerefPerm)
-              local.ref = Some(RefJavaField[Pre](fields, decl))
-              Perm(AmbiguousLocation(local)(PanicBlame("Field location is not a pointer.")), WritePerm())
-            })
-        }.flatten))
-      }
+    val declsDefault =
+      if (decls.collect { case _: JavaConstructor[Pre] => () }.isEmpty) {
+        val fieldPerms: UnitAccountedPredicate[Pre] =
+          if (BipComponent.get(currentJavaClass.top).isDefined) {
+            // Permissions are managed by bip permission generation & the bip component invariant, so
+            // don't generate permissions here
+            UnitAccountedPredicate(tt)
+          } else {
+            UnitAccountedPredicate(foldStar(decls.collect {
+              case fields: JavaFields[Pre] if fields.modifiers.collectFirst {
+                    case JavaFinal() => ()
+                  }.isEmpty =>
+                fields.decls.indices.map(decl => {
+                  val local = JavaLocal[Pre](fields.decls(decl).name)(DerefPerm)
+                  local.ref = Some(RefJavaField[Pre](fields, decl))
+                  Perm(
+                    AmbiguousLocation(local)(PanicBlame(
+                      "Field location is not a pointer."
+                    )),
+                    WritePerm(),
+                  )
+                })
+            }.flatten))
+          }
 
-      val cons = new JavaConstructor[Pre](
-        modifiers = Nil,
-        name = prefName,
-        parameters = Nil,
-        typeParameters = Nil,
-        signals = Nil,
-        body = Block(Nil),
-        contract = ApplicableContract[Pre](
-          requires = UnitAccountedPredicate(tt),
-          /* Hack: don't generate the permissions for the default constructor. Problem: the "local" method further down will use
+        val cons =
+          new JavaConstructor[Pre](
+            modifiers = Nil,
+            name = prefName,
+            parameters = Nil,
+            typeParameters = Nil,
+            signals = Nil,
+            body = Block(Nil),
+            contract =
+              ApplicableContract[Pre](
+                requires = UnitAccountedPredicate(tt),
+                /* Hack: don't generate the permissions for the default constructor. Problem: the "local" method further down will use
              the Statics function instead of \result from the procedure. Statics constructor is only used for static final
              field assignments required for ConstantifyFinalFields.
-           */
-          ensures = if(isStaticPart) UnitAccountedPredicate(tt[Pre]) else fieldPerms,
-          contextEverywhere = tt, signals = Nil, givenArgs = Nil, yieldsArgs = Nil, decreases = None,
-        )(TrueSatisfiable)
-      )(PanicBlame("The postcondition of a default constructor cannot fail."))
-      if (!isStaticPart) javaDefaultConstructor(currentJavaClass.top) = cons
-      cons +: decls
-    } else decls
+                 */
+                ensures =
+                  if (isStaticPart)
+                    UnitAccountedPredicate(tt[Pre])
+                  else
+                    fieldPerms,
+                contextEverywhere = tt,
+                signals = Nil,
+                givenArgs = Nil,
+                yieldsArgs = Nil,
+                decreases = None,
+              )(TrueSatisfiable),
+          )(PanicBlame(
+            "The postcondition of a default constructor cannot fail."
+          ))
+        if (!isStaticPart)
+          javaDefaultConstructor(currentJavaClass.top) = cons
+        cons +: decls
+      } else
+        decls
 
     declsDefault.foreach {
       case cons: JavaConstructor[Pre] =>
@@ -199,26 +279,43 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
         val `this` = ThisObject(ref)
 
         val results = currentJavaClass.top.modifiers.collect {
-          case annotation@JavaAnnotationEx(_, _, component@JavaAnnotationData.BipComponent(_, _)) if !isStaticPart =>
-            rw.bip.rewriteConstructor(cons, annotation, component, diz => Block[Post](Seq(fieldInit(diz), sharedInit(diz))))
+          case annotation @ JavaAnnotationEx(
+                _,
+                _,
+                component @ JavaAnnotationData.BipComponent(_, _),
+              ) if !isStaticPart =>
+            rw.bip.rewriteConstructor(
+              cons,
+              annotation,
+              component,
+              diz => Block[Post](Seq(fieldInit(diz), sharedInit(diz))),
+            )
         }
         if (results.isEmpty) { // We didn't execute the bip rewrite, so we do the normal one
           rw.labelDecls.scope {
             javaConstructor(cons) = rw.classDeclarations.declare(
               new Constructor[Post](
                 cls = ref,
-                args = rw.variables.collect { cons.parameters.map(rw.dispatch) }._1,
+                args =
+                  rw.variables.collect { cons.parameters.map(rw.dispatch) }._1,
                 outArgs = Nil,
                 typeArgs = Nil,
-                body = Some(rw.currentThis.having(`this`) { Block(Seq(
-                  fieldInit(`this`),
-                  sharedInit(`this`),
-                  rw.dispatch(cons.body),
-                )) }),
-                contract = rw.currentThis.having(`this`) { cons.contract.rewrite(
-                  signals = cons.contract.signals.map(rw.dispatch) ++
-                    cons.signals.map(t => SignalsClause(new Variable(rw.dispatch(t)), tt)),
-                )},
+                body = Some(rw.currentThis.having(`this`) {
+                  Block(Seq(
+                    fieldInit(`this`),
+                    sharedInit(`this`),
+                    rw.dispatch(cons.body),
+                  ))
+                }),
+                contract =
+                  rw.currentThis.having(`this`) {
+                    cons.contract.rewrite(signals =
+                      cons.contract.signals.map(rw.dispatch) ++
+                        cons.signals.map(t =>
+                          SignalsClause(new Variable(rw.dispatch(t)), tt)
+                        )
+                    )
+                  },
               )(cons.blame)(JavaConstructorOrigin(cons))
             )
           }
@@ -226,26 +323,42 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
       case method: JavaMethod[Pre] =>
         // For each javabip annotation that we encounter, execute a rewrite
         val results = method.modifiers.collect {
-          case annotation @ JavaAnnotationEx(_, _, guard: JavaAnnotationData.BipGuard[Pre]) =>
+          case annotation @ JavaAnnotationEx(
+                _,
+                _,
+                guard: JavaAnnotationData.BipGuard[Pre],
+              ) =>
             rw.bip.rewriteGuard(method, annotation, guard)
-          case annotation @ JavaAnnotationEx(_, _, transition : JavaAnnotationData.BipTransition[Pre]) =>
+          case annotation @ JavaAnnotationEx(
+                _,
+                _,
+                transition: JavaAnnotationData.BipTransition[Pre],
+              ) =>
             rw.bip.rewriteTransition(method, annotation, transition)
-          case annotation @ JavaAnnotationEx(_, _, data: JavaAnnotationData.BipData[Pre]) =>
+          case annotation @ JavaAnnotationEx(
+                _,
+                _,
+                data: JavaAnnotationData.BipData[Pre],
+              ) =>
             rw.bip.rewriteOutgoingData(method, annotation, data)
         }
         // If no rewrites were triggered, it must be a regular java method, so execute the default rewrite
-        if (results.isEmpty) {
-          rw.dispatch(method)
-        }
+        if (results.isEmpty) { rw.dispatch(method) }
 
       case method: JavaAnnotationMethod[Pre] =>
-        rw.classDeclarations.succeed(method, new InstanceMethod(
-          returnType = rw.dispatch(method.returnType),
-          args = Nil,
-          outArgs = Nil, typeArgs = Nil,
-          body = None,
-          contract = contract(TrueSatisfiable)
-        )(PanicBlame("Verification of annotation method cannot fail"))(JavaAnnotationMethodOrigin(method)))
+        rw.classDeclarations.succeed(
+          method,
+          new InstanceMethod(
+            returnType = rw.dispatch(method.returnType),
+            args = Nil,
+            outArgs = Nil,
+            typeArgs = Nil,
+            body = None,
+            contract = contract(TrueSatisfiable),
+          )(PanicBlame("Verification of annotation method cannot fail"))(
+            JavaAnnotationMethodOrigin(method)
+          ),
+        )
       case _: JavaSharedInitialization[Pre] =>
       case _: JavaFields[Pre] =>
       case other => rw.dispatch(other)
@@ -255,82 +368,121 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
   def rewriteMethod(method: JavaMethod[Pre]): Unit = {
     implicit val o: Origin = method.o
     rw.labelDecls.scope {
-      javaMethod(method) = rw.classDeclarations.declare(new InstanceMethod(
-        returnType = rw.dispatch(method.returnType),
-        args = rw.variables.collect(method.parameters.map(rw.dispatch(_)))._1,
-        outArgs = Nil, typeArgs = Nil,
-        body = method.modifiers.collectFirst { case sync@JavaSynchronized() => sync } match {
-          case Some(sync) => method.body.map(body => Synchronized(rw.currentThis.top, rw.dispatch(body))(sync.blame)(method.o))
-          case None => method.body.map(rw.dispatch)
-        },
-        contract = method.contract.rewrite(
-          signals = method.contract.signals.map(rw.dispatch) ++
-            method.signals.map(t => SignalsClause(new Variable(rw.dispatch(t)), tt)),
-        ),
-        inline = method.modifiers.collectFirst { case JavaInline() => () }.nonEmpty,
-        pure = method.modifiers.collectFirst { case JavaPure() => () }.nonEmpty,
-      )(method.blame)(JavaMethodOrigin(method)))
+      javaMethod(method) = rw.classDeclarations.declare(
+        new InstanceMethod(
+          returnType = rw.dispatch(method.returnType),
+          args = rw.variables.collect(method.parameters.map(rw.dispatch(_)))._1,
+          outArgs = Nil,
+          typeArgs = Nil,
+          body =
+            method.modifiers.collectFirst { case sync @ JavaSynchronized() =>
+              sync
+            } match {
+              case Some(sync) =>
+                method.body.map(body =>
+                  Synchronized(rw.currentThis.top, rw.dispatch(body))(
+                    sync.blame
+                  )(method.o)
+                )
+              case None => method.body.map(rw.dispatch)
+            },
+          contract = method.contract.rewrite(signals =
+            method.contract.signals.map(rw.dispatch) ++
+              method.signals
+                .map(t => SignalsClause(new Variable(rw.dispatch(t)), tt))
+          ),
+          inline =
+            method.modifiers.collectFirst { case JavaInline() => () }.nonEmpty,
+          pure =
+            method.modifiers.collectFirst { case JavaPure() => () }.nonEmpty,
+        )(method.blame)(JavaMethodOrigin(method))
+      )
     }
   }
 
-
   def rewriteParameter(param: JavaParam[Pre]): Unit =
-    if (BipData.get(param).isDefined) {
-      rw.bip.rewriteParameter(param)
-    } else {
-      javaParamSuccessor(param) =
-        rw.variables.declare(new Variable(rw.dispatch(param.t))(param.o.where(name = param.name)))
+    if (BipData.get(param).isDefined) { rw.bip.rewriteParameter(param) }
+    else {
+      javaParamSuccessor(param) = rw.variables
+        .declare(new Variable(rw.dispatch(param.t))(
+          param.o.where(name = param.name)
+        ))
     }
 
   def rewriteClass(cls: JavaClassOrInterface[Pre]): Unit = {
     implicit val o: Origin = cls.o
 
-    cls.decls.collect({
-      case decl: JavaClassDeclaration[Pre] =>
-        javaClassDeclToJavaClass(decl) = cls
+    cls.decls.collect({ case decl: JavaClassDeclaration[Pre] =>
+      javaClassDeclToJavaClass(decl) = cls
     })
 
     currentJavaClass.having(cls) {
       val instDecls = cls.decls.filter(!isJavaStatic(_))
       val staticDecls = cls.decls.filter(isJavaStatic)
 
-      val lockInvariant = cls match {
-        case clazz: JavaClass[Pre] => clazz.intrinsicLockInvariant
-        case _: JavaInterface[Pre] => tt[Pre]
-        case _: JavaAnnotationInterface[Pre] => tt[Pre]
-      }
+      val lockInvariant =
+        cls match {
+          case clazz: JavaClass[Pre] => clazz.intrinsicLockInvariant
+          case _: JavaInterface[Pre] => tt[Pre]
+          case _: JavaAnnotationInterface[Pre] => tt[Pre]
+        }
 
-      val instanceClass = rw.currentThis.having(ThisObject(javaInstanceClassSuccessor.ref(cls))) {
-        new Class[Post](
-          rw.variables.dispatch(cls.typeParams)(rw),
-          rw.classDeclarations.collect {
-            makeJavaClass(cls.name, instDecls, javaInstanceClassSuccessor.ref(cls), isStaticPart = false)
-            cls match {
-              case cls: JavaClass[Pre] if BipComponent.get(cls).isDefined =>
-                rw.bip.generateComponent(cls)
-              case _ =>
-            }
-          }._1,
-          cls.supports.map(rw.dispatch),
-          rw.dispatch(lockInvariant)
-        )(JavaInstanceClassOrigin(cls))
-      }
+      val instanceClass =
+        rw.currentThis.having(ThisObject(javaInstanceClassSuccessor.ref(cls))) {
+          new Class[Post](
+            rw.variables.dispatch(cls.typeParams)(rw),
+            rw.classDeclarations.collect {
+              makeJavaClass(
+                cls.name,
+                instDecls,
+                javaInstanceClassSuccessor.ref(cls),
+                isStaticPart = false,
+              )
+              cls match {
+                case cls: JavaClass[Pre] if BipComponent.get(cls).isDefined =>
+                  rw.bip.generateComponent(cls)
+                case _ =>
+              }
+            }._1,
+            cls.supports.map(rw.dispatch),
+            rw.dispatch(lockInvariant),
+          )(JavaInstanceClassOrigin(cls))
+        }
 
       rw.globalDeclarations.declare(instanceClass)
       javaInstanceClassSuccessor(cls) = instanceClass
 
-      if(staticDecls.nonEmpty) {
-        val staticsClass = new Class[Post](Seq(), rw.classDeclarations.collect {
-          rw.currentThis.having(ThisObject(javaStaticsClassSuccessor.ref(cls))) {
-            makeJavaClass(cls.name + "Statics", staticDecls, javaStaticsClassSuccessor.ref(cls), isStaticPart = true)
-          }
-        }._1, Nil, tt)(JavaStaticsClassOrigin(cls))
+      if (staticDecls.nonEmpty) {
+        val staticsClass =
+          new Class[Post](
+            Seq(),
+            rw.classDeclarations.collect {
+              rw.currentThis
+                .having(ThisObject(javaStaticsClassSuccessor.ref(cls))) {
+                  makeJavaClass(
+                    cls.name + "Statics",
+                    staticDecls,
+                    javaStaticsClassSuccessor.ref(cls),
+                    isStaticPart = true,
+                  )
+                }
+            }._1,
+            Nil,
+            tt,
+          )(JavaStaticsClassOrigin(cls))
 
         rw.globalDeclarations.declare(staticsClass)
         val t = TClass[Post](staticsClass.ref, Seq())
         val singleton = withResult((res: Result[Post]) =>
-          function(AbstractApplicable, TrueSatisfiable, returnType = t,
-            ensures = UnitAccountedPredicate((res !== Null()) && (TypeOf(res) === TypeValue(t))))(JavaStaticsClassSingletonOrigin(cls)))
+          function(
+            AbstractApplicable,
+            TrueSatisfiable,
+            returnType = t,
+            ensures = UnitAccountedPredicate(
+              (res !== Null()) && (TypeOf(res) === TypeValue(t))
+            ),
+          )(JavaStaticsClassSingletonOrigin(cls))
+        )
         rw.globalDeclarations.declare(singleton)
         javaStaticsClassSuccessor(cls) = staticsClass
         javaStaticsFunctionSuccessor(cls) = singleton
@@ -351,7 +503,10 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
     implicit val o: Origin = locals.o
     locals.decls.zipWithIndex.foreach {
       case (JavaVariableDeclaration(_, dims, _), idx) =>
-        val v = new Variable[Post](FuncTools.repeat(TArray[Post](_), dims, rw.dispatch(locals.t)))(JavaLocalOrigin(locals, idx))
+        val v =
+          new Variable[Post](
+            FuncTools.repeat(TArray[Post](_), dims, rw.dispatch(locals.t))
+          )(JavaLocalOrigin(locals, idx))
         javaLocalsSuccessor((locals, idx)) = v
         rw.variables.declare(v)
     }
@@ -359,22 +514,39 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
 
   def initLocal(locals: JavaLocalDeclaration[Pre]): Statement[Post] = {
     implicit val o: Origin = locals.o
-    Block(for((JavaVariableDeclaration(_, dims, init), i) <- locals.decls.zipWithIndex)
-      yield assignLocal(Local(javaLocalsSuccessor.ref((locals, i))), init match {
-        case Some(value) => rw.dispatch(value)
-        case None => Java.zeroValue(FuncTools.repeat(TArray[Post](_), dims, rw.dispatch(locals.t)))
-      })
+    Block(
+      for (
+        (JavaVariableDeclaration(_, dims, init), i) <- locals.decls.zipWithIndex
+      )
+        yield assignLocal(
+          Local(javaLocalsSuccessor.ref((locals, i))),
+          init match {
+            case Some(value) => rw.dispatch(value)
+            case None =>
+              Java.zeroValue(
+                FuncTools.repeat(TArray[Post](_), dims, rw.dispatch(locals.t))
+              )
+          },
+        )
     )
   }
 
-  /**
-   * Provides the singleton object needed to access static fields/methods of a class.
-   * @param cls - class for which we get the static singleton (lazy, because the class may not yet be known)
-   * @return a singleton object to access static class fields/methods
-   */
-  def statics(cls: => JavaClassOrInterface[Pre])(implicit o: Origin): Expr[Post] = {
-    val classStaticsFunction: LazyRef[Post, Function[Post]] = new LazyRef(javaStaticsFunctionSuccessor(cls))
-    FunctionInvocation[Post](classStaticsFunction, Nil, Nil, Nil, Nil)(PanicBlame("Statics singleton function requires nothing."))
+  /** Provides the singleton object needed to access static fields/methods of a
+    * class.
+    * @param cls
+    *   \- class for which we get the static singleton (lazy, because the class
+    *   may not yet be known)
+    * @return
+    *   a singleton object to access static class fields/methods
+    */
+  def statics(
+      cls: => JavaClassOrInterface[Pre]
+  )(implicit o: Origin): Expr[Post] = {
+    val classStaticsFunction: LazyRef[Post, Function[Post]] =
+      new LazyRef(javaStaticsFunctionSuccessor(cls))
+    FunctionInvocation[Post](classStaticsFunction, Nil, Nil, Nil, Nil)(
+      PanicBlame("Statics singleton function requires nothing.")
+    )
   }
 
   def local(local: JavaLocal[Pre]): Expr[Post] = {
@@ -382,19 +554,22 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
 
     local.ref.get match {
       case spec: SpecNameTarget[Pre] => rw.specLocal(spec, local, local.blame)
-      case RefJavaParam(decl) if BipData.get(decl).isDefined => rw.bip.local(local, decl)
+      case RefJavaParam(decl) if BipData.get(decl).isDefined =>
+        rw.bip.local(local, decl)
       case RefJavaParam(decl) => Local(javaParamSuccessor.ref(decl))
       case RefUnloadedJavaNamespace(names) => throw NotAValue(local)
-      case RefJavaClass(decl) =>
-        throw NotAValue(local)
+      case RefJavaClass(decl) => throw NotAValue(local)
       case RefJavaField(decls, idx) =>
-        if(decls.modifiers.contains(JavaStatic[Pre]())) {
+        if (decls.modifiers.contains(JavaStatic[Pre]())) {
           Deref[Post](
             obj = statics(javaClassDeclToJavaClass(decls)),
             ref = javaFieldsSuccessor.ref((decls, idx)),
           )(local.blame)
         } else {
-          Deref[Post](rw.currentThis.top, javaFieldsSuccessor.ref((decls, idx)))(local.blame)
+          Deref[Post](
+            rw.currentThis.top,
+            javaFieldsSuccessor.ref((decls, idx)),
+          )(local.blame)
         }
       case RefJavaBipGuard(_) => rw.bip.local(local)
       case RefJavaLocalDeclaration(decls, idx) =>
@@ -406,7 +581,8 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
     implicit val o: Origin = deref.o
 
     deref.ref.get match {
-      case spec: SpecDerefTarget[Pre] => rw.specDeref(deref.obj, spec, deref, deref.blame)
+      case spec: SpecDerefTarget[Pre] =>
+        rw.specDeref(deref.obj, spec, deref, deref.blame)
       case _: SpecTypeNameTarget[Pre] => throw NotAValue(deref)
       case RefJavaClass(decl) => throw NotAValue(deref)
       case RefUnloadedJavaNamespace(names) => throw NotAValue(deref)
@@ -417,7 +593,10 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
             ref = javaFieldsSuccessor.ref((decls, idx)),
           )(deref.blame)
         } else {
-          Deref[Post](rw.dispatch(deref.obj), javaFieldsSuccessor.ref((decls, idx)))(deref.blame)
+          Deref[Post](
+            rw.dispatch(deref.obj),
+            javaFieldsSuccessor.ref((decls, idx)),
+          )(deref.blame)
         }
     }
   }
@@ -427,13 +606,24 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
     implicit val o: Origin = inv.o
     inv.ref.get match {
       case spec: SpecInvocationTarget[Pre] =>
-        rw.specInvocation(inv.obj, spec, inv.typeParams, args, givenMap, yields, inv, inv.blame)
+        rw.specInvocation(
+          inv.obj,
+          spec,
+          inv.typeParams,
+          args,
+          givenMap,
+          yields,
+          inv,
+          inv.blame,
+        )
       case RefJavaMethod(decl) =>
-        if(decl.modifiers.contains(JavaStatic[Pre]())) {
+        if (decl.modifiers.contains(JavaStatic[Pre]())) {
           MethodInvocation[Post](
             obj = statics(javaClassDeclToJavaClass(decl)),
             ref = javaMethod.ref(decl),
-            args = args.map(rw.dispatch), outArgs = Nil, typeParams.map(rw.dispatch),
+            args = args.map(rw.dispatch),
+            outArgs = Nil,
+            typeParams.map(rw.dispatch),
             givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
             yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
           )(inv.blame)
@@ -441,7 +631,9 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
           MethodInvocation[Post](
             obj = obj.map(rw.dispatch).getOrElse(rw.currentThis.top),
             ref = javaMethod.ref(decl),
-            args = args.map(rw.dispatch), outArgs = Nil, typeParams.map(rw.dispatch),
+            args = args.map(rw.dispatch),
+            outArgs = Nil,
+            typeParams.map(rw.dispatch),
             givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
             yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
           )(inv.blame)
@@ -450,7 +642,11 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
         MethodInvocation[Post](
           obj = obj.map(rw.dispatch).getOrElse(rw.currentThis.top),
           ref = rw.succ(decl),
-          args = Nil, outArgs = Nil, Nil, Nil, Nil
+          args = Nil,
+          outArgs = Nil,
+          Nil,
+          Nil,
+          Nil,
         )(inv.blame)
     }
   }
@@ -461,16 +657,30 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
     inv.ref.get match {
       case RefModel(decl) => ModelNew[Post](rw.succ(decl))
       case RefJavaConstructor(cons) =>
-        ConstructorInvocation[Post](javaConstructor.ref(cons), Seq(), args.map(rw.dispatch), Nil, typeParams.map(rw.dispatch),
+        ConstructorInvocation[Post](
+          javaConstructor.ref(cons),
+          Seq(),
+          args.map(rw.dispatch),
+          Nil,
+          typeParams.map(rw.dispatch),
           givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) })(inv.blame)
+          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
+        )(inv.blame)
       case ImplicitDefaultJavaConstructor(_) =>
         val cls = t.asInstanceOf[JavaTClass[Pre]].ref.decl
-        val ref = new LazyRef[Post, Constructor[Post]](javaConstructor(javaDefaultConstructor(cls)))
-        ConstructorInvocation[Post](ref, Seq(),
-          args.map(rw.dispatch), Nil, typeParams.map(rw.dispatch),
+        val ref =
+          new LazyRef[Post, Constructor[Post]](javaConstructor(
+            javaDefaultConstructor(cls)
+          ))
+        ConstructorInvocation[Post](
+          ref,
+          Seq(),
+          args.map(rw.dispatch),
+          Nil,
+          typeParams.map(rw.dispatch),
           givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) })(inv.blame)
+          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
+        )(inv.blame)
     }
   }
 
@@ -478,38 +688,75 @@ case class LangJavaToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
     rw.dispatch(arr.initializer)
 
   def newDefaultArray(arr: JavaNewDefaultArray[Pre]): Expr[Post] =
-    NewArray(rw.dispatch(arr.baseType), arr.specifiedDims.map(rw.dispatch), arr.moreDims, true)(arr.blame)(arr.o)
+    NewArray(
+      rw.dispatch(arr.baseType),
+      arr.specifiedDims.map(rw.dispatch),
+      arr.moreDims,
+      true,
+    )(arr.blame)(arr.o)
 
   def literalArray(arr: JavaLiteralArray[Pre]): Expr[Post] = {
     implicit val o: Origin = JavaInlineArrayInitializerOrigin(arr.o)
     val array = new Variable[Post](rw.dispatch(arr.typeContext.get))
-    ScopedExpr[Post](Seq(array), With(Block(
-      assignLocal(array.get, NewArray(rw.dispatch(arr.typeContext.get.element), Seq(const[Post](arr.exprs.size)), 0, true)
-      (PanicBlame("Assignment for an explicit array initializer cannot fail.")))
-        +: arr.exprs.zipWithIndex.map {
-          case (value, index) => Assign[Post](AmbiguousSubscript(array.get, const(index))(JavaArrayInitializerBlame), rw.dispatch(value))(
-            PanicBlame("Assignment for an explicit array initializer cannot fail."))
-        }
-    ), array.get))
+    ScopedExpr[Post](
+      Seq(array),
+      With(
+        Block(
+          assignLocal(
+            array.get,
+            NewArray(
+              rw.dispatch(arr.typeContext.get.element),
+              Seq(const[Post](arr.exprs.size)),
+              0,
+              true,
+            )(PanicBlame(
+              "Assignment for an explicit array initializer cannot fail."
+            )),
+          ) +: arr.exprs.zipWithIndex.map { case (value, index) =>
+            Assign[Post](
+              AmbiguousSubscript(array.get, const(index))(
+                JavaArrayInitializerBlame
+              ),
+              rw.dispatch(value),
+            )(PanicBlame(
+              "Assignment for an explicit array initializer cannot fail."
+            ))
+          }
+        ),
+        array.get,
+      ),
+    )
   }
 
   def stringValue(str: JavaStringValue[Pre]): Expr[Post] = {
     val JavaTClass(Ref(stringClass), Seq()) = str.t
-    val intern: JavaMethod[Pre] = stringClass.declarations.collectFirst {
-      case m: JavaMethod[Pre] if m.name == "vercorsIntern" => m
-    }.get
+    val intern: JavaMethod[Pre] =
+      stringClass.declarations.collectFirst {
+        case m: JavaMethod[Pre] if m.name == "vercorsIntern" => m
+      }.get
 
-    val classStaticsFunction: LazyRef[Post, Function[Post]] = new LazyRef(javaStaticsFunctionSuccessor(stringClass))
+    val classStaticsFunction: LazyRef[Post, Function[Post]] =
+      new LazyRef(javaStaticsFunctionSuccessor(stringClass))
     MethodInvocation[Post](
-      obj = FunctionInvocation[Post](classStaticsFunction, Nil, Nil, Nil, Nil)(PanicBlame("Class static cannot fail"))(str.o),
+      obj =
+        FunctionInvocation[Post](classStaticsFunction, Nil, Nil, Nil, Nil)(
+          PanicBlame("Class static cannot fail")
+        )(str.o),
       ref = javaMethod.ref(intern),
       args = Seq(StringValue(str.data)(str.o)),
-      Nil, Nil, Nil, Nil
+      Nil,
+      Nil,
+      Nil,
+      Nil,
     )(PanicBlame("Interning cannot fail"))(str.o)
   }
 
-  def classType(t: JavaTClass[Pre]): Type[Post] = t.ref.decl match {
-    case classOrInterface: JavaClassOrInterface[Pre] =>
-      TClass(javaInstanceClassSuccessor.ref(classOrInterface), t.typeArgs.map(rw.dispatch))
-  }
+  def classType(t: JavaTClass[Pre]): Type[Post] =
+    t.ref.decl match {
+      case classOrInterface: JavaClassOrInterface[Pre] =>
+        TClass(
+          javaInstanceClassSuccessor.ref(classOrInterface),
+          t.typeArgs.map(rw.dispatch),
+        )
+    }
 }
diff --git a/src/rewrite/vct/rewrite/lang/LangLLVMToCol.scala b/src/rewrite/vct/rewrite/lang/LangLLVMToCol.scala
index 426632e76d..162774a74c 100644
--- a/src/rewrite/vct/rewrite/lang/LangLLVMToCol.scala
+++ b/src/rewrite/vct/rewrite/lang/LangLLVMToCol.scala
@@ -13,20 +13,23 @@ import vct.rewrite.lang.LangLLVMToCol.UnexpectedLlvmNode
 case object LangLLVMToCol {
   case class UnexpectedLlvmNode(node: Node[_]) extends SystemError {
     override def text: String =
-      context[CurrentProgramContext]
-        .map(_.highlight(node))
-        .getOrElse(node.o)
-        .messageInContext("VerCors assumes this node does not occur here in llvm input.")
+      context[CurrentProgramContext].map(_.highlight(node)).getOrElse(node.o)
+        .messageInContext(
+          "VerCors assumes this node does not occur here in llvm input."
+        )
   }
 }
 
-case class LangLLVMToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends LazyLogging {
+case class LangLLVMToCol[Pre <: Generation](rw: LangSpecificToCol[Pre])
+    extends LazyLogging {
   type Post = Rewritten[Pre]
   implicit val implicitRewriter: AbstractRewriter[Pre, Post] = rw
 
-  private val llvmFunctionMap: SuccessionMap[LlvmFunctionDefinition[Pre], Procedure[Post]] = SuccessionMap()
-  private val specFunctionMap: SuccessionMap[LlvmSpecFunction[Pre], Function[Post]] = SuccessionMap()
-
+  private val llvmFunctionMap
+      : SuccessionMap[LlvmFunctionDefinition[Pre], Procedure[Post]] =
+    SuccessionMap()
+  private val specFunctionMap
+      : SuccessionMap[LlvmSpecFunction[Pre], Function[Post]] = SuccessionMap()
 
   def rewriteLocal(local: LlvmLocal[Pre]): Expr[Post] = {
     implicit val o: Origin = local.o
@@ -39,86 +42,106 @@ case class LangLLVMToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
       rw.globalDeclarations.declare(
         new Procedure[Post](
           returnType = rw.dispatch(func.returnType),
-          args = rw.variables.collect {
-            func.args.foreach(rw.dispatch)
-          }._1,
+          args = rw.variables.collect { func.args.foreach(rw.dispatch) }._1,
           outArgs = Nil,
           typeArgs = Nil,
-          body = if (func.pure) Some(GotoEliminator(func.functionBody match { case scope: Scope[Pre] => scope; case other => throw UnexpectedLlvmNode(other) }).eliminate()) else Some(rw.dispatch(func.functionBody)),
+          body =
+            if (func.pure)
+              Some(GotoEliminator(func.functionBody match {
+                case scope: Scope[Pre] => scope;
+                case other => throw UnexpectedLlvmNode(other)
+              }).eliminate())
+            else
+              Some(rw.dispatch(func.functionBody)),
           contract = rw.dispatch(func.contract.data.get),
-          pure = func.pure
+          pure = func.pure,
         )(func.blame)
       )
     }
     llvmFunctionMap.update(func, procedure)
   }
 
-  def rewriteAmbiguousFunctionInvocation(inv: LlvmAmbiguousFunctionInvocation[Pre]): Invocation[Post] = {
+  def rewriteAmbiguousFunctionInvocation(
+      inv: LlvmAmbiguousFunctionInvocation[Pre]
+  ): Invocation[Post] = {
     implicit val o: Origin = inv.o
     inv.ref.get.decl match {
-      case func: LlvmFunctionDefinition[Pre] => new ProcedureInvocation[Post](
-        ref = new LazyRef[Post, Procedure[Post]](llvmFunctionMap(func)),
-        args = inv.args.map(rw.dispatch),
-        givenMap = inv.givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-        yields = inv.yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
-        outArgs = Seq.empty,
-        typeArgs = Seq.empty
-      )(inv.blame)
-      case func: LlvmSpecFunction[Pre] => new FunctionInvocation[Post](
-        ref = new LazyRef[Post, Function[Post]](specFunctionMap(func)),
-        args = inv.args.map(rw.dispatch),
-        givenMap = inv.givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-        yields = inv.yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
-        typeArgs = Seq.empty
-      )(inv.blame)
+      case func: LlvmFunctionDefinition[Pre] =>
+        new ProcedureInvocation[Post](
+          ref = new LazyRef[Post, Procedure[Post]](llvmFunctionMap(func)),
+          args = inv.args.map(rw.dispatch),
+          givenMap = inv.givenMap.map { case (Ref(v), e) =>
+            (rw.succ(v), rw.dispatch(e))
+          },
+          yields = inv.yields.map { case (e, Ref(v)) =>
+            (rw.dispatch(e), rw.succ(v))
+          },
+          outArgs = Seq.empty,
+          typeArgs = Seq.empty,
+        )(inv.blame)
+      case func: LlvmSpecFunction[Pre] =>
+        new FunctionInvocation[Post](
+          ref = new LazyRef[Post, Function[Post]](specFunctionMap(func)),
+          args = inv.args.map(rw.dispatch),
+          givenMap = inv.givenMap.map { case (Ref(v), e) =>
+            (rw.succ(v), rw.dispatch(e))
+          },
+          yields = inv.yields.map { case (e, Ref(v)) =>
+            (rw.dispatch(e), rw.succ(v))
+          },
+          typeArgs = Seq.empty,
+        )(inv.blame)
     }
 
   }
 
-  def rewriteFunctionInvocation(inv: LlvmFunctionInvocation[Pre]): ProcedureInvocation[Post] = {
+  def rewriteFunctionInvocation(
+      inv: LlvmFunctionInvocation[Pre]
+  ): ProcedureInvocation[Post] = {
     implicit val o: Origin = inv.o
     new ProcedureInvocation[Post](
       ref = new LazyRef[Post, Procedure[Post]](llvmFunctionMap(inv.ref.decl)),
       args = inv.args.map(rw.dispatch),
-      givenMap = inv.givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-      yields = inv.yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
+      givenMap = inv.givenMap.map { case (Ref(v), e) =>
+        (rw.succ(v), rw.dispatch(e))
+      },
+      yields = inv.yields.map { case (e, Ref(v)) =>
+        (rw.dispatch(e), rw.succ(v))
+      },
       outArgs = Seq.empty,
-      typeArgs = Seq.empty
+      typeArgs = Seq.empty,
     )(inv.blame)
   }
 
   def rewriteGlobal(decl: LlvmGlobal[Pre]): Unit = {
     implicit val o: Origin = decl.o
     decl.data.get.foreach { decl =>
-      rw.globalDeclarations.declare(
-        decl match {
-          case function: LlvmSpecFunction[Pre] =>
-            val rwFunction = new Function[Post](
+      rw.globalDeclarations.declare(decl match {
+        case function: LlvmSpecFunction[Pre] =>
+          val rwFunction =
+            new Function[Post](
               rw.dispatch(function.returnType),
-              rw.variables.collect {
-                function.args.foreach(rw.dispatch)
-              }._1,
-              rw.variables.collect {
-                function.typeArgs.foreach(rw.dispatch)
-              }._1,
+              rw.variables.collect { function.args.foreach(rw.dispatch) }._1,
+              rw.variables.collect { function.typeArgs.foreach(rw.dispatch) }
+                ._1,
               function.body match {
                 case Some(body) => Some(rw.dispatch(body))
                 case None => None
               },
               rw.dispatch(function.contract),
               function.inline,
-              function.threadLocal
+              function.threadLocal,
             )(function.blame)
-            specFunctionMap.update(function, rwFunction)
-            rwFunction
-          case other => throw UnexpectedLlvmNode(other)
-        }
-      )
+          specFunctionMap.update(function, rwFunction)
+          rwFunction
+        case other => throw UnexpectedLlvmNode(other)
+      })
     }
   }
 
-  def result(ref: RefLlvmFunctionDefinition[Pre])(implicit o: Origin): Expr[Post] =
-    Result[Post](llvmFunctionMap.ref(ref.decl))
+  def result(ref: RefLlvmFunctionDefinition[Pre])(
+      implicit o: Origin
+  ): Expr[Post] = Result[Post](llvmFunctionMap.ref(ref.decl))
 
   /*
   Elimination works by replacing every goto with the block its referring too
@@ -127,33 +150,32 @@ case class LangLLVMToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
   This of course only works for acyclic CFGs as otherwise replacement would be infinitely recursive.
   Loop restructuring should be handled by VCLLVM as it has much more analytical and contextual information about
   the program.
-  */
+   */
   case class GotoEliminator(bodyScope: Scope[Pre]) extends LazyLogging {
-    val labelDeclMap: Map[LabelDecl[Pre], Label[Pre]] = bodyScope.body match {
-      case block: Block[Pre] =>
-        block.statements.map {
-          case label: Label[Pre] => (label.decl, label)
-          case other => throw UnexpectedLlvmNode(other)
-        }.toMap
-      case other => throw UnexpectedLlvmNode(other)
-    }
+    val labelDeclMap: Map[LabelDecl[Pre], Label[Pre]] =
+      bodyScope.body match {
+        case block: Block[Pre] =>
+          block.statements.map {
+            case label: Label[Pre] => (label.decl, label)
+            case other => throw UnexpectedLlvmNode(other)
+          }.toMap
+        case other => throw UnexpectedLlvmNode(other)
+      }
 
     def eliminate(): Scope[Post] = {
       bodyScope match {
-        case scope: Scope[Pre] => Scope[Post](
-          rw.variables.collect {
-            scope.locals.foreach(rw.dispatch)
-          }._1,
-          scope.body match {
-            case bodyBlock: Block[Pre] => Block[Post](
-              bodyBlock.statements.head match {
-                case label: Label[Pre] => Seq(eliminate(label))
-                case other => throw UnexpectedLlvmNode(other)
-              }
-            )(scope.body.o)
-            case other => throw UnexpectedLlvmNode(other)
-          }
-        )(scope.o)
+        case scope: Scope[Pre] =>
+          Scope[Post](
+            rw.variables.collect { scope.locals.foreach(rw.dispatch) }._1,
+            scope.body match {
+              case bodyBlock: Block[Pre] =>
+                Block[Post](bodyBlock.statements.head match {
+                  case label: Label[Pre] => Seq(eliminate(label))
+                  case other => throw UnexpectedLlvmNode(other)
+                })(scope.body.o)
+              case other => throw UnexpectedLlvmNode(other)
+            },
+          )(scope.o)
         case other => throw UnexpectedLlvmNode(other)
       }
     }
@@ -163,12 +185,21 @@ case class LangLLVMToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
       label.stat match {
         case block: Block[Pre] =>
           block.statements.last match {
-            case goto: Goto[Pre] => Block[Post](block.statements.dropRight(1).map(rw.dispatch) ++ eliminate(labelDeclMap(goto.lbl.decl)).statements)
-            case _: Return[Pre] => rw.dispatch(block) match {
-              case block: Block[Post] => block
-              case other => throw UnexpectedLlvmNode(other)
-            }
-            case branch: Branch[Pre] => Block[Post](block.statements.dropRight(1).map(rw.dispatch) :+ eliminate(branch))
+            case goto: Goto[Pre] =>
+              Block[Post](
+                block.statements.dropRight(1).map(rw.dispatch) ++
+                  eliminate(labelDeclMap(goto.lbl.decl)).statements
+              )
+            case _: Return[Pre] =>
+              rw.dispatch(block) match {
+                case block: Block[Post] => block
+                case other => throw UnexpectedLlvmNode(other)
+              }
+            case branch: Branch[Pre] =>
+              Block[Post](
+                block.statements.dropRight(1).map(rw.dispatch) :+
+                  eliminate(branch)
+              )
             case other => throw UnexpectedLlvmNode(other)
           }
         case other => throw UnexpectedLlvmNode(other)
@@ -177,13 +208,15 @@ case class LangLLVMToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends
 
     def eliminate(branch: Branch[Pre]): Branch[Post] = {
       implicit val o: Origin = branch.o
-      Branch[Post](
-        branch.branches.map(
-          bs => (rw.dispatch(bs._1), bs._2 match {
+      Branch[Post](branch.branches.map(bs =>
+        (
+          rw.dispatch(bs._1),
+          bs._2 match {
             case goto: Goto[Pre] => eliminate(labelDeclMap(goto.lbl.decl))
             case other => throw UnexpectedLlvmNode(other)
-          })
-        ))
+          },
+        )
+      ))
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/rewrite/vct/rewrite/lang/LangPVLToCol.scala b/src/rewrite/vct/rewrite/lang/LangPVLToCol.scala
index c153bb1e83..4952f2eae4 100644
--- a/src/rewrite/vct/rewrite/lang/LangPVLToCol.scala
+++ b/src/rewrite/vct/rewrite/lang/LangPVLToCol.scala
@@ -8,7 +8,36 @@ import vct.col.util.AstBuildHelpers._
 import vct.col.ast.RewriteHelpers._
 import vct.rewrite.lang.LangSpecificToCol.{NotAValue, ThisVar}
 import vct.col.ref.Ref
-import vct.col.resolve.ctx.{BuiltinField, BuiltinInstanceMethod, ImplicitDefaultPVLConstructor, PVLBuiltinInstanceMethod, RefADTFunction, RefAxiomaticDataType, RefClass, RefEndpoint, RefEnum, RefEnumConstant, RefField, RefFunction, RefInstanceFunction, RefInstanceMethod, RefInstancePredicate, RefModel, RefModelAction, RefModelField, RefModelProcess, RefPVLConstructor, RefPVLEndpoint, RefPredicate, RefProcedure, RefProverFunction, RefVariable, SpecDerefTarget, SpecInvocationTarget, SpecNameTarget}
+import vct.col.resolve.ctx.{
+  BuiltinField,
+  BuiltinInstanceMethod,
+  ImplicitDefaultPVLConstructor,
+  PVLBuiltinInstanceMethod,
+  RefADTFunction,
+  RefAxiomaticDataType,
+  RefClass,
+  RefEndpoint,
+  RefEnum,
+  RefEnumConstant,
+  RefField,
+  RefFunction,
+  RefInstanceFunction,
+  RefInstanceMethod,
+  RefInstancePredicate,
+  RefModel,
+  RefModelAction,
+  RefModelField,
+  RefModelProcess,
+  RefPVLConstructor,
+  RefPVLEndpoint,
+  RefPredicate,
+  RefProcedure,
+  RefProverFunction,
+  RefVariable,
+  SpecDerefTarget,
+  SpecInvocationTarget,
+  SpecNameTarget,
+}
 import vct.col.util.{AstBuildHelpers, SuccessionMap}
 import vct.col.resolve.ctx.{ImplicitDefaultPVLConstructor, PVLConstructorTarget}
 import vct.rewrite.lang.LangPVLToCol.ModelConstructorNotSupported
@@ -16,35 +45,48 @@ import vct.result.VerificationError.SystemError
 
 case object LangPVLToCol {
   case class ModelConstructorNotSupported() extends SystemError {
-    override def text: String = "VerCors attempted to get the constructor of a model, but this is not yet supported"
+    override def text: String =
+      "VerCors attempted to get the constructor of a model, but this is not yet supported"
   }
 }
 
-case class LangPVLToCol[Pre <: Generation](rw: LangSpecificToCol[Pre], veymontGeneratePermissions: Boolean) extends LazyLogging {
+case class LangPVLToCol[Pre <: Generation](
+    rw: LangSpecificToCol[Pre],
+    veymontGeneratePermissions: Boolean,
+) extends LazyLogging {
   type Post = Rewritten[Pre]
   implicit val implicitRewriter: AbstractRewriter[Pre, Post] = rw
 
-  val pvlDefaultConstructor: SuccessionMap[Class[Pre], Constructor[Post]] = SuccessionMap()
-  val pvlConstructor: SuccessionMap[PVLConstructor[Pre], Constructor[Post]] = SuccessionMap()
+  val pvlDefaultConstructor: SuccessionMap[Class[Pre], Constructor[Post]] =
+    SuccessionMap()
+  val pvlConstructor: SuccessionMap[PVLConstructor[Pre], Constructor[Post]] =
+    SuccessionMap()
 
-  def constructorSucc(ref: PVLConstructorTarget[Pre]): Ref[Post, Constructor[Post]] = ref match {
-    case ImplicitDefaultPVLConstructor(cls) => pvlDefaultConstructor.ref(cls)
-    case RefPVLConstructor(cons) => pvlConstructor.ref(cons)
-    case RefModel(_) => throw new ModelConstructorNotSupported()
-  }
+  def constructorSucc(
+      ref: PVLConstructorTarget[Pre]
+  ): Ref[Post, Constructor[Post]] =
+    ref match {
+      case ImplicitDefaultPVLConstructor(cls) => pvlDefaultConstructor.ref(cls)
+      case RefPVLConstructor(cons) => pvlConstructor.ref(cons)
+      case RefModel(_) => throw new ModelConstructorNotSupported()
+    }
 
   def rewriteConstructor(cons: PVLConstructor[Pre]): Unit = {
     implicit val o: Origin = cons.o
     pvlConstructor(cons) =
       rw.currentThis.having(ThisObject(rw.succ(rw.currentClass.top))) {
-        rw.classDeclarations.declare(new Constructor[Post](
-          cls = rw.succ(rw.currentClass.top),
-          args = rw.variables.dispatch(cons.args),
-          outArgs = Nil,
-          typeArgs = Nil,
-          body = cons.body.map(rw.dispatch),
-          contract = rw.dispatch(cons.contract),
-        )(cons.blame)(cons.o.where(name = s"constructor${rw.currentClass.top.o.getPreferredNameOrElse().ucamel}")))
+        rw.classDeclarations.declare(
+          new Constructor[Post](
+            cls = rw.succ(rw.currentClass.top),
+            args = rw.variables.dispatch(cons.args),
+            outArgs = Nil,
+            typeArgs = Nil,
+            body = cons.body.map(rw.dispatch),
+            contract = rw.dispatch(cons.contract),
+          )(cons.blame)(cons.o.where(name =
+            s"constructor${rw.currentClass.top.o.getPreferredNameOrElse().ucamel}"
+          ))
+        )
       }
   }
 
@@ -52,24 +94,42 @@ case class LangPVLToCol[Pre <: Generation](rw: LangSpecificToCol[Pre], veymontGe
     if (cls.decls.collectFirst { case _: PVLConstructor[Pre] => () }.isEmpty) {
       implicit val o: Origin = cls.o
       val `this` = ThisObject(rw.succ[Class[Post]](cls))
-      val defaultBlame = PanicBlame("The postcondition of a default constructor cannot fail.")
-
-      val checkRunnable = cls.decls.collectFirst {
-        case _: RunMethod[Pre] => ()
-      }.nonEmpty
-
-      pvlDefaultConstructor(cls) = rw.classDeclarations.declare(new Constructor[Post](
-        rw.succ(cls),
-        Nil, Nil, Nil,
-        Some(Scope(Nil, Block(Nil))),
-        ApplicableContract(
-          UnitAccountedPredicate(tt),
-          UnitAccountedPredicate(AstBuildHelpers.foldStar(cls.decls.collect {
-            case field: InstanceField[Pre] if field.flags.collectFirst { case _: Final[Pre] => () }.isEmpty && !veymontGeneratePermissions =>
-              fieldPerm[Post](`this`, rw.succ(field), WritePerm())
-          }) &* (if (checkRunnable) IdleToken(`this`) else tt)), tt, Nil, Nil, Nil, None,
-        )(TrueSatisfiable)
-      )(defaultBlame))
+      val defaultBlame = PanicBlame(
+        "The postcondition of a default constructor cannot fail."
+      )
+
+      val checkRunnable =
+        cls.decls.collectFirst { case _: RunMethod[Pre] => () }.nonEmpty
+
+      pvlDefaultConstructor(cls) = rw.classDeclarations.declare(
+        new Constructor[Post](
+          rw.succ(cls),
+          Nil,
+          Nil,
+          Nil,
+          Some(Scope(Nil, Block(Nil))),
+          ApplicableContract(
+            UnitAccountedPredicate(tt),
+            UnitAccountedPredicate(
+              AstBuildHelpers.foldStar(cls.decls.collect {
+                case field: InstanceField[Pre] if field.flags.collectFirst {
+                      case _: Final[Pre] => ()
+                    }.isEmpty && !veymontGeneratePermissions =>
+                  fieldPerm[Post](`this`, rw.succ(field), WritePerm())
+              }) &*
+                (if (checkRunnable)
+                   IdleToken(`this`)
+                 else
+                   tt)
+            ),
+            tt,
+            Nil,
+            Nil,
+            Nil,
+            None,
+          )(TrueSatisfiable),
+        )(defaultBlame)
+      )
     }
   }
 
@@ -78,16 +138,20 @@ case class LangPVLToCol[Pre <: Generation](rw: LangSpecificToCol[Pre], veymontGe
 
     local.ref.get match {
       case spec: SpecNameTarget[Pre] => rw.specLocal(spec, local, local.blame)
-      case RefField(decl) => Deref[Post](rw.currentThis.top, rw.succ(decl))(local.blame)
-      case endpoint: RefPVLEndpoint[Pre] => rw.veymont.rewriteEndpointUse(endpoint, local)
+      case RefField(decl) =>
+        Deref[Post](rw.currentThis.top, rw.succ(decl))(local.blame)
+      case endpoint: RefPVLEndpoint[Pre] =>
+        rw.veymont.rewriteEndpointUse(endpoint, local)
     }
   }
 
   def deref(deref: PVLDeref[Pre]): Expr[Post] = {
     implicit val o: Origin = deref.o
     deref.ref.get match {
-      case spec: SpecDerefTarget[Pre] => rw.specDeref(deref.obj, spec, deref, deref.blame)
-      case RefField(decl) => Deref[Post](rw.dispatch(deref.obj), rw.succ(decl))(deref.blame)
+      case spec: SpecDerefTarget[Pre] =>
+        rw.specDeref(deref.obj, spec, deref, deref.blame)
+      case RefField(decl) =>
+        Deref[Post](rw.dispatch(deref.obj), rw.succ(decl))(deref.blame)
     }
   }
 
@@ -97,53 +161,104 @@ case class LangPVLToCol[Pre <: Generation](rw: LangSpecificToCol[Pre], veymontGe
 
     inv.ref.get match {
       case spec: SpecInvocationTarget[Pre] =>
-        rw.specInvocation(inv.obj, spec, typeArgs, args, givenMap, yields, inv, inv.blame)
-      case PVLBuiltinInstanceMethod(f) =>
-        rw.dispatch(f(obj.get)(args))
+        rw.specInvocation(
+          inv.obj,
+          spec,
+          typeArgs,
+          args,
+          givenMap,
+          yields,
+          inv,
+          inv.blame,
+        )
+      case PVLBuiltinInstanceMethod(f) => rw.dispatch(f(obj.get)(args))
     }
   }
 
   def newClass(inv: PVLNew[Pre]): Expr[Post] = {
     val PVLNew(t, typeArgs, args, givenMap, yields) = inv
-    val classTypeArgs = t match {
-      case TClass(_, typeArgs) => typeArgs
-      case _ => Seq()
-    }
+    val classTypeArgs =
+      t match {
+        case TClass(_, typeArgs) => typeArgs
+        case _ => Seq()
+      }
     implicit val o: Origin = inv.o
     inv.ref.get match {
       case RefModel(decl) => ModelNew[Post](rw.succ(decl))
       case RefPVLConstructor(decl) =>
-        ConstructorInvocation[Post](pvlConstructor.ref(decl), classTypeArgs.map(rw.dispatch), args.map(rw.dispatch),
-          Nil, typeArgs.map(rw.dispatch),
+        ConstructorInvocation[Post](
+          pvlConstructor.ref(decl),
+          classTypeArgs.map(rw.dispatch),
+          args.map(rw.dispatch),
+          Nil,
+          typeArgs.map(rw.dispatch),
           givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) })(inv.blame)
+          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
+        )(inv.blame)
       case ImplicitDefaultPVLConstructor(_) =>
-        ConstructorInvocation[Post](pvlDefaultConstructor.ref(t.asInstanceOf[TClass[Pre]].cls.decl), classTypeArgs.map(rw.dispatch),
-          args.map(rw.dispatch), Nil, typeArgs.map(rw.dispatch),
+        ConstructorInvocation[Post](
+          pvlDefaultConstructor.ref(t.asInstanceOf[TClass[Pre]].cls.decl),
+          classTypeArgs.map(rw.dispatch),
+          args.map(rw.dispatch),
+          Nil,
+          typeArgs.map(rw.dispatch),
           givenMap.map { case (Ref(v), e) => (rw.succ(v), rw.dispatch(e)) },
-          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) })(inv.blame)
+          yields.map { case (e, Ref(v)) => (rw.dispatch(e), rw.succ(v)) },
+        )(inv.blame)
     }
   }
 
   def branch(branch: PVLBranch[Pre]): Statement[Post] =
-    Branch(branch.branches.map { case (e, s) => (rw.dispatch(e), rw.dispatch(s)) })(branch.o)
+    Branch(branch.branches.map { case (e, s) =>
+      (rw.dispatch(e), rw.dispatch(s))
+    })(branch.o)
 
-  def loop(loop: PVLLoop[Pre]): Statement[Post] = loop match {
-    case PVLLoop(init, cond, update, contract, body) =>
-      Loop(rw.dispatch(init), rw.dispatch(cond), rw.dispatch(update), rw.dispatch(contract), rw.dispatch(body))(loop.o)
-  }
+  def loop(loop: PVLLoop[Pre]): Statement[Post] =
+    loop match {
+      case PVLLoop(init, cond, update, contract, body) =>
+        Loop(
+          rw.dispatch(init),
+          rw.dispatch(cond),
+          rw.dispatch(update),
+          rw.dispatch(contract),
+          rw.dispatch(body),
+        )(loop.o)
+    }
 
   def rewriteMainMethod(main: VeSUVMainMethod[Pre]): Unit = {
     implicit val o: Origin = main.o
     main.drop()
-    val body: Option[Statement[Post]] = main.body match {
-      case None => None
-      case Some(s) => Some(s.rewriteDefault())
-    }
-    val empty_pred: AccountedPredicate[Post] = UnitAccountedPredicate(BooleanValue(value = true))
+    val body: Option[Statement[Post]] =
+      main.body match {
+        case None => None
+        case Some(s) => Some(s.rewriteDefault())
+      }
+    val empty_pred: AccountedPredicate[Post] = UnitAccountedPredicate(
+      BooleanValue(value = true)
+    )
     // TODO: Where does the blame come from?
-    val contract: ApplicableContract[Post] = ApplicableContract(empty_pred, empty_pred, BooleanValue(value = true), Seq(), Seq(), Seq(), None)(o)
-    val new_main: Procedure[Post] = new Procedure(TVoid(), Seq(), Seq(), Seq(), body, contract, false, false, true)(main.blame)
+    val contract: ApplicableContract[Post] =
+      ApplicableContract(
+        empty_pred,
+        empty_pred,
+        BooleanValue(value = true),
+        Seq(),
+        Seq(),
+        Seq(),
+        None,
+      )(o)
+    val new_main: Procedure[Post] =
+      new Procedure(
+        TVoid(),
+        Seq(),
+        Seq(),
+        Seq(),
+        body,
+        contract,
+        false,
+        false,
+        true,
+      )(main.blame)
     new_main.declare()
   }
 }
diff --git a/src/rewrite/vct/rewrite/lang/LangSilverToCol.scala b/src/rewrite/vct/rewrite/lang/LangSilverToCol.scala
index 965bf9b463..29f971d25d 100644
--- a/src/rewrite/vct/rewrite/lang/LangSilverToCol.scala
+++ b/src/rewrite/vct/rewrite/lang/LangSilverToCol.scala
@@ -6,14 +6,18 @@ import vct.col.rewrite.{Generation, Rewritten}
 import vct.result.VerificationError.UserError
 
 case object LangSilverToCol {
-  case class IncompleteTypeArgs(t: SilverPartialADTFunctionInvocation[_]) extends UserError {
+  case class IncompleteTypeArgs(t: SilverPartialADTFunctionInvocation[_])
+      extends UserError {
     override def code: String = "incompleteTypeArgs"
     override def text: String =
-      t.o.messageInContext("This function invocation does not specify all generic types for the domain.")
+      t.o.messageInContext(
+        "This function invocation does not specify all generic types for the domain."
+      )
   }
 }
 
-case class LangSilverToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extends LazyLogging {
+case class LangSilverToCol[Pre <: Generation](rw: LangSpecificToCol[Pre])
+    extends LazyLogging {
   import LangSilverToCol._
   type Post = Rewritten[Pre]
   implicit val implicitRewriter: AbstractRewriter[Pre, Post] = rw
@@ -22,9 +26,17 @@ case class LangSilverToCol[Pre <: Generation](rw: LangSpecificToCol[Pre]) extend
     inv.maybeTypeArgs match {
       case None => throw IncompleteTypeArgs(inv)
       case Some(typeArgs) =>
-        ADTFunctionInvocation[Post](Some(rw.succ(inv.adt), typeArgs.map(rw.dispatch)), rw.succ(inv.function), inv.args.map(rw.dispatch))(inv.o)
+        ADTFunctionInvocation[Post](
+          Some(rw.succ(inv.adt), typeArgs.map(rw.dispatch)),
+          rw.succ(inv.function),
+          inv.args.map(rw.dispatch),
+        )(inv.o)
     }
 
   def nonemptyMap(map: SilverUntypedNonemptyLiteralMap[Pre]): Expr[Post] =
-    LiteralMap(rw.dispatch(map.keyType), rw.dispatch(map.valueType), map.values.map { case (k, v) => (rw.dispatch(k), rw.dispatch(v)) })(map.o)
+    LiteralMap(
+      rw.dispatch(map.keyType),
+      rw.dispatch(map.valueType),
+      map.values.map { case (k, v) => (rw.dispatch(k), rw.dispatch(v)) },
+    )(map.o)
 }
diff --git a/src/rewrite/vct/rewrite/lang/LangSpecificToCol.scala b/src/rewrite/vct/rewrite/lang/LangSpecificToCol.scala
index 83ee82398b..213997930e 100644
--- a/src/rewrite/vct/rewrite/lang/LangSpecificToCol.scala
+++ b/src/rewrite/vct/rewrite/lang/LangSpecificToCol.scala
@@ -8,292 +8,397 @@ import vct.col.origin._
 import vct.col.ref.Ref
 import vct.col.resolve.ctx._
 import vct.col.resolve.lang.Java
-import vct.col.rewrite.{Generation, Rewriter, RewriterBuilderArg, RewriterBuilderArg2}
+import vct.col.rewrite.{
+  Generation,
+  Rewriter,
+  RewriterBuilderArg,
+  RewriterBuilderArg2,
+}
 import vct.result.VerificationError.UserError
 import vct.rewrite.lang.LangSpecificToCol.NotAValue
 
 case object LangSpecificToCol extends RewriterBuilderArg2[Boolean, Boolean] {
   override def key: String = "langSpecific"
-  override def desc: String = "Translate language-specific constructs to a common subset of nodes."
+  override def desc: String =
+    "Translate language-specific constructs to a common subset of nodes."
 
-  def ThisVar(): Origin = Origin(
-    Seq(
-      PreferredName(Seq("this")),
-      LabelContext("constructor this"),
-    )
-  )
+  def ThisVar(): Origin =
+    Origin(Seq(PreferredName(Seq("this")), LabelContext("constructor this")))
 
   case class NotAValue(value: Expr[_]) extends UserError {
     override def code: String = "notAValue"
-    override def text: String = value.o.messageInContext("Could not resolve this expression to a value.")
+    override def text: String =
+      value.o.messageInContext("Could not resolve this expression to a value.")
   }
 }
 
-case class LangSpecificToCol[Pre <: Generation](veymontGeneratePermissions: Boolean = false, veymontAllowAssign: Boolean = false) extends Rewriter[Pre] with LazyLogging {
+case class LangSpecificToCol[Pre <: Generation](
+    veymontGeneratePermissions: Boolean = false,
+    veymontAllowAssign: Boolean = false,
+) extends Rewriter[Pre] with LazyLogging {
   val java: LangJavaToCol[Pre] = LangJavaToCol(this)
   val bip: LangBipToCol[Pre] = LangBipToCol(this)
   val c: LangCToCol[Pre] = LangCToCol(this)
   val cpp: LangCPPToCol[Pre] = LangCPPToCol(this)
   val pvl: LangPVLToCol[Pre] = LangPVLToCol(this, veymontGeneratePermissions)
-  val veymont: LangVeyMontToCol[Pre] = LangVeyMontToCol(this, veymontAllowAssign)
+  val veymont: LangVeyMontToCol[Pre] = LangVeyMontToCol(
+    this,
+    veymontAllowAssign,
+  )
   val silver: LangSilverToCol[Pre] = LangSilverToCol(this)
   val llvm: LangLLVMToCol[Pre] = LangLLVMToCol(this)
 
   val currentThis: ScopedStack[Expr[Post]] = ScopedStack()
   val currentClass: ScopedStack[Class[Pre]] = ScopedStack()
 
-  def specLocal(target: SpecNameTarget[Pre], e: Expr[Pre], blame: Blame[DerefInsufficientPermission]): Expr[Post] = target match {
-    case RefAxiomaticDataType(_) => throw NotAValue(e)
-    case RefClass(_) => throw NotAValue(e)
-    case RefEnum(_) => throw NotAValue(e)
-    case RefEnumConstant(enum, decl) => EnumUse[Post](succ(enum.get), succ(decl))(e.o)
-    case RefVariable(decl) => Local[Post](succ(decl))(e.o)
-    case RefModelField(decl) => ModelDeref[Post](currentThis.top, succ(decl))(blame)(e.o)
-  }
+  def specLocal(
+      target: SpecNameTarget[Pre],
+      e: Expr[Pre],
+      blame: Blame[DerefInsufficientPermission],
+  ): Expr[Post] =
+    target match {
+      case RefAxiomaticDataType(_) => throw NotAValue(e)
+      case RefClass(_) => throw NotAValue(e)
+      case RefEnum(_) => throw NotAValue(e)
+      case RefEnumConstant(enum, decl) =>
+        EnumUse[Post](succ(enum.get), succ(decl))(e.o)
+      case RefVariable(decl) => Local[Post](succ(decl))(e.o)
+      case RefModelField(decl) =>
+        ModelDeref[Post](currentThis.top, succ(decl))(blame)(e.o)
+    }
 
-  def specDeref(obj: Expr[Pre], target: SpecDerefTarget[Pre], e: Expr[Pre], blame: Blame[DerefInsufficientPermission]): Expr[Post] = target match {
-    case RefEnumConstant(enum, decl) => EnumUse[Post](succ(enum.get), succ(decl))(e.o)
-    case RefModelField(decl) => ModelDeref[Post](dispatch(obj), succ(decl))(blame)(e.o)
-    case BuiltinField(f) => dispatch(f(obj))
-  }
+  def specDeref(
+      obj: Expr[Pre],
+      target: SpecDerefTarget[Pre],
+      e: Expr[Pre],
+      blame: Blame[DerefInsufficientPermission],
+  ): Expr[Post] =
+    target match {
+      case RefEnumConstant(enum, decl) =>
+        EnumUse[Post](succ(enum.get), succ(decl))(e.o)
+      case RefModelField(decl) =>
+        ModelDeref[Post](dispatch(obj), succ(decl))(blame)(e.o)
+      case BuiltinField(f) => dispatch(f(obj))
+    }
 
-  def specInvocation(objPre: Option[Expr[Pre]],
-                     target: SpecInvocationTarget[Pre],
-                     typeArgs: Seq[Type[Pre]],
-                     args: Seq[Expr[Pre]],
-                     givenArgsPre: Seq[(Ref[Pre, Variable[Pre]], Expr[Pre])],
-                     yieldsPre: Seq[(Expr[Pre], Ref[Pre, Variable[Pre]])],
-                     e: Expr[Pre],
-                     blame: Blame[FrontendInvocationError]
-                    ): Expr[Post] = {
+  def specInvocation(
+      objPre: Option[Expr[Pre]],
+      target: SpecInvocationTarget[Pre],
+      typeArgs: Seq[Type[Pre]],
+      args: Seq[Expr[Pre]],
+      givenArgsPre: Seq[(Ref[Pre, Variable[Pre]], Expr[Pre])],
+      yieldsPre: Seq[(Expr[Pre], Ref[Pre, Variable[Pre]])],
+      e: Expr[Pre],
+      blame: Blame[FrontendInvocationError],
+  ): Expr[Post] = {
     implicit val o: Origin = e.o
     lazy val obj = objPre.map(dispatch).getOrElse(currentThis.top)
-    lazy val givenArgs = givenArgsPre.map { case (Ref(v), e) => (succ[Variable[Post]](v), dispatch(e)) }
-    lazy val yields = yieldsPre.map { case (e, Ref(v)) => (dispatch(e), succ[Variable[Post]](v)) }
+    lazy val givenArgs = givenArgsPre.map { case (Ref(v), e) =>
+      (succ[Variable[Post]](v), dispatch(e))
+    }
+    lazy val yields = yieldsPre.map { case (e, Ref(v)) =>
+      (dispatch(e), succ[Variable[Post]](v))
+    }
 
     target match {
-      case RefFunction(decl) => FunctionInvocation[Post](succ(decl), args.map(dispatch), typeArgs.map(dispatch), givenArgs, yields)(blame)
-      case RefProcedure(decl) => ProcedureInvocation[Post](succ(decl), args.map(dispatch), Nil, typeArgs.map(dispatch), givenArgs, yields)(blame)
-      case RefPredicate(decl) => PredicateApply[Post](succ(decl), args.map(dispatch), WritePerm())
-      case RefADTFunction(decl) => ADTFunctionInvocation(None, succ(decl), args.map(dispatch))
-      case RefProverFunction(decl) => ProverFunctionInvocation(succ(decl), args.map(dispatch))
-
-      case RefInstanceFunction(decl) => InstanceFunctionInvocation[Post](obj, succ(decl), args.map(dispatch), typeArgs.map(dispatch), givenArgs, yields)(blame)
-      case RefInstanceMethod(decl) => MethodInvocation[Post](obj, succ(decl), args.map(dispatch), Nil, typeArgs.map(dispatch), givenArgs, yields)(blame)
-      case RefInstancePredicate(decl) => InstancePredicateApply[Post](obj, succ(decl), args.map(dispatch), WritePerm())
-
-      case RefModelProcess(decl) => ProcessApply[Post](succ(decl), args.map(dispatch))
-      case RefModelAction(decl) => ActionApply[Post](succ(decl), args.map(dispatch))
+      case RefFunction(decl) =>
+        FunctionInvocation[Post](
+          succ(decl),
+          args.map(dispatch),
+          typeArgs.map(dispatch),
+          givenArgs,
+          yields,
+        )(blame)
+      case RefProcedure(decl) =>
+        ProcedureInvocation[Post](
+          succ(decl),
+          args.map(dispatch),
+          Nil,
+          typeArgs.map(dispatch),
+          givenArgs,
+          yields,
+        )(blame)
+      case RefPredicate(decl) =>
+        PredicateApply[Post](succ(decl), args.map(dispatch), WritePerm())
+      case RefADTFunction(decl) =>
+        ADTFunctionInvocation(None, succ(decl), args.map(dispatch))
+      case RefProverFunction(decl) =>
+        ProverFunctionInvocation(succ(decl), args.map(dispatch))
+
+      case RefInstanceFunction(decl) =>
+        InstanceFunctionInvocation[Post](
+          obj,
+          succ(decl),
+          args.map(dispatch),
+          typeArgs.map(dispatch),
+          givenArgs,
+          yields,
+        )(blame)
+      case RefInstanceMethod(decl) =>
+        MethodInvocation[Post](
+          obj,
+          succ(decl),
+          args.map(dispatch),
+          Nil,
+          typeArgs.map(dispatch),
+          givenArgs,
+          yields,
+        )(blame)
+      case RefInstancePredicate(decl) =>
+        InstancePredicateApply[Post](
+          obj,
+          succ(decl),
+          args.map(dispatch),
+          WritePerm(),
+        )
+
+      case RefModelProcess(decl) =>
+        ProcessApply[Post](succ(decl), args.map(dispatch))
+      case RefModelAction(decl) =>
+        ActionApply[Post](succ(decl), args.map(dispatch))
 
       case BuiltinInstanceMethod(f) => dispatch(f(objPre.get)(args))
     }
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case model: Model[Pre] =>
-      implicit val o: Origin = model.o
-      currentThis.having(ThisModel[Post](succ(model))) {
-        globalDeclarations.succeed(model, model.rewrite())
-      }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case model: Model[Pre] =>
+        implicit val o: Origin = model.o
+        currentThis.having(ThisModel[Post](succ(model))) {
+          globalDeclarations.succeed(model, model.rewrite())
+        }
 
-    case ns: JavaNamespace[Pre] => java.rewriteNamespace(ns)
-    case cls: JavaClassOrInterface[Pre] => java.rewriteClass(cls)
-    case p: JavaParam[Pre] => java.rewriteParameter(p)
-
-    case cons: PVLConstructor[Pre] => pvl.rewriteConstructor(cons)
-    case main: VeSUVMainMethod[Pre] => pvl.rewriteMainMethod(main)
-
-    case method: JavaMethod[Pre] => java.rewriteMethod(method)
-
-    case unit: CTranslationUnit[Pre] => c.rewriteUnit(unit)
-    case cParam: CParam[Pre] => c.rewriteParam(cParam)
-    case func: CFunctionDefinition[Pre] => c.rewriteFunctionDef(func)
-    case decl: CGlobalDeclaration[Pre] => c.rewriteGlobalDecl(decl)
-    case decl: CLocalDeclaration[Pre] => ???
-
-    case unit: CPPTranslationUnit[Pre] => cpp.rewriteUnit(unit)
-    case cppParam: CPPParam[Pre] => cpp.rewriteParam(cppParam)
-    case func: CPPFunctionDefinition[Pre] => cpp.rewriteFunctionDef(func)
-    case decl: CPPGlobalDeclaration[Pre] =>
-      cpp.rewriteGlobalDecl(decl)
-    case decl: CPPLocalDeclaration[Pre] => ???
-    case func: Function[Pre] => {
-      rewriteDefault(func)
-      cpp.storeIfSYCLFunction(func)
-    }
+      case ns: JavaNamespace[Pre] => java.rewriteNamespace(ns)
+      case cls: JavaClassOrInterface[Pre] => java.rewriteClass(cls)
+      case p: JavaParam[Pre] => java.rewriteParameter(p)
+
+      case cons: PVLConstructor[Pre] => pvl.rewriteConstructor(cons)
+      case main: VeSUVMainMethod[Pre] => pvl.rewriteMainMethod(main)
+
+      case method: JavaMethod[Pre] => java.rewriteMethod(method)
+
+      case unit: CTranslationUnit[Pre] => c.rewriteUnit(unit)
+      case cParam: CParam[Pre] => c.rewriteParam(cParam)
+      case func: CFunctionDefinition[Pre] => c.rewriteFunctionDef(func)
+      case decl: CGlobalDeclaration[Pre] => c.rewriteGlobalDecl(decl)
+      case decl: CLocalDeclaration[Pre] => ???
+
+      case unit: CPPTranslationUnit[Pre] => cpp.rewriteUnit(unit)
+      case cppParam: CPPParam[Pre] => cpp.rewriteParam(cppParam)
+      case func: CPPFunctionDefinition[Pre] => cpp.rewriteFunctionDef(func)
+      case decl: CPPGlobalDeclaration[Pre] => cpp.rewriteGlobalDecl(decl)
+      case decl: CPPLocalDeclaration[Pre] => ???
+      case func: Function[Pre] => {
+        rewriteDefault(func)
+        cpp.storeIfSYCLFunction(func)
+      }
 
-    case func: LlvmFunctionDefinition[Pre] => llvm.rewriteFunctionDef(func)
-    case global: LlvmGlobal[Pre] => llvm.rewriteGlobal(global)
+      case func: LlvmFunctionDefinition[Pre] => llvm.rewriteFunctionDef(func)
+      case global: LlvmGlobal[Pre] => llvm.rewriteGlobal(global)
 
-    case cls: Class[Pre] =>
-      currentClass.having(cls) {
-        currentThis.having(ThisObject[Post](succ(cls))(cls.o)) {
-          val decls = classDeclarations.collect {
-            cls.decls.foreach(dispatch)
-            pvl.maybeDeclareDefaultConstructor(cls)
-          }._1
+      case cls: Class[Pre] =>
+        currentClass.having(cls) {
+          currentThis.having(ThisObject[Post](succ(cls))(cls.o)) {
+            val decls =
+              classDeclarations.collect {
+                cls.decls.foreach(dispatch)
+                pvl.maybeDeclareDefaultConstructor(cls)
+              }._1
 
-          globalDeclarations.succeed(cls, cls.rewrite(decls = decls))
+            globalDeclarations.succeed(cls, cls.rewrite(decls = decls))
+          }
         }
-      }
 
-    case glue: JavaBipGlueContainer[Pre] => bip.rewriteGlue(glue)
+      case glue: JavaBipGlueContainer[Pre] => bip.rewriteGlue(glue)
 
-    case chor: PVLChoreography[Pre] => veymont.rewriteChoreography(chor)
+      case chor: PVLChoreography[Pre] => veymont.rewriteChoreography(chor)
 
-    case other => rewriteDefault(other)
-  }
-
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case stmt if veymont.currentProg.nonEmpty && !veymont.currentStatement.topOption.contains(stmt) =>
-      veymont.rewriteStatement(stmt)
-    case scope @ Scope(locals, body) =>
-      def scanScope(node: Node[Pre]): Unit = node match {
-        case Scope(_, _) =>
-        case JavaLocalDeclarationStatement(locals: JavaLocalDeclaration[Pre]) => java.declareLocal(locals)
-        case other => other.subnodes.foreach(scanScope)
-      }
+      case other => rewriteDefault(other)
+    }
 
-      scope.rewrite(locals = variables.collect {
-        locals.foreach(dispatch)
-        scanScope(body)
-      }._1)
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case stmt
+          if veymont.currentProg.nonEmpty &&
+            !veymont.currentStatement.topOption.contains(stmt) =>
+        veymont.rewriteStatement(stmt)
+      case scope @ Scope(locals, body) =>
+        def scanScope(node: Node[Pre]): Unit =
+          node match {
+            case Scope(_, _) =>
+            case JavaLocalDeclarationStatement(
+                  locals: JavaLocalDeclaration[Pre]
+                ) =>
+              java.declareLocal(locals)
+            case other => other.subnodes.foreach(scanScope)
+          }
 
-    case branch: PVLBranch[Pre] => pvl.branch(branch)
-    case loop: PVLLoop[Pre] => pvl.loop(loop)
+        scope.rewrite(locals =
+          variables.collect {
+            locals.foreach(dispatch)
+            scanScope(body)
+          }._1
+        )
 
-    case JavaLocalDeclarationStatement(locals: JavaLocalDeclaration[Pre]) => java.initLocal(locals)
+      case branch: PVLBranch[Pre] => pvl.branch(branch)
+      case loop: PVLLoop[Pre] => pvl.loop(loop)
 
-    case CDeclarationStatement(decl) => c.rewriteLocal(decl)
-    case CPPDeclarationStatement(decl) => cpp.rewriteLocalDecl(decl)
-    case scope: CPPLifetimeScope[Pre] => cpp.rewriteLifetimeScope(scope)
-    case goto: CGoto[Pre] => c.rewriteGoto(goto)
-    case barrier: GpgpuBarrier[Pre] => c.gpuBarrier(barrier)
+      case JavaLocalDeclarationStatement(locals: JavaLocalDeclaration[Pre]) =>
+        java.initLocal(locals)
 
-    case eval@Eval(CPPInvocation(_, _, _, _)) => cpp.invocationStatement(eval)
+      case CDeclarationStatement(decl) => c.rewriteLocal(decl)
+      case CPPDeclarationStatement(decl) => cpp.rewriteLocalDecl(decl)
+      case scope: CPPLifetimeScope[Pre] => cpp.rewriteLifetimeScope(scope)
+      case goto: CGoto[Pre] => c.rewriteGoto(goto)
+      case barrier: GpgpuBarrier[Pre] => c.gpuBarrier(barrier)
 
-    case fold: Fold[Pre] => {
-      cpp.checkPredicateFoldingAllowed(fold.res)
-      rewriteDefault(fold)
-    }
-    case unfold: Unfold[Pre] => {
-      cpp.checkPredicateFoldingAllowed(unfold.res)
-      rewriteDefault(unfold)
-    }
+      case eval @ Eval(CPPInvocation(_, _, _, _)) =>
+        cpp.invocationStatement(eval)
 
-    case other => rewriteDefault(other)
-  }
-
-  override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-    case stmt if veymont.currentProg.nonEmpty && !veymont.currentExpr.topOption.contains(e) =>
-      veymont.rewriteExpr(e)
-    case result @ AmbiguousResult() =>
-      implicit val o: Origin = result.o
-      result.ref.get match {
-        case ref: RefCFunctionDefinition[Pre] => c.result(ref)
-        case ref: RefCGlobalDeclaration[Pre] => c.result(ref)
-        case ref: RefCPPFunctionDefinition[Pre] => cpp.result(ref)
-        case ref: RefCPPGlobalDeclaration[Pre] => cpp.result(ref)
-        case ref: RefLlvmFunctionDefinition[Pre] => llvm.result(ref)
-        case RefFunction(decl) => Result[Post](anySucc(decl))
-        case RefProcedure(decl) => Result[Post](anySucc(decl))
-        case RefJavaMethod(decl) => Result[Post](java.javaMethod.ref(decl))
-        case RefJavaAnnotationMethod(decL) => ???
-        case RefInstanceFunction(decl) => Result[Post](anySucc(decl))
-        case RefInstanceMethod(decl) => Result[Post](anySucc(decl))
-        case RefInstanceOperatorFunction(decl) => Result[Post](anySucc(decl))
-        case RefInstanceOperatorMethod(decl) => Result[Post](anySucc(decl))
-        case RefLlvmSpecFunction(decl) => Result[Post](anySucc(decl))
+      case fold: Fold[Pre] => {
+        cpp.checkPredicateFoldingAllowed(fold.res)
+        rewriteDefault(fold)
       }
-
-    case diz @ AmbiguousThis() =>
-      currentThis.top
-
-    case local: JavaLocal[Pre] => java.local(local)
-    case deref: JavaDeref[Pre] => java.deref(deref)
-    case inv: JavaInvocation[Pre] => java.invocation(inv)
-    case inv: JavaNewClass[Pre] => java.newClass(inv)
-    case arr: JavaNewLiteralArray[Pre] => java.newLiteralArray(arr)
-    case arr: JavaNewDefaultArray[Pre] => java.newDefaultArray(arr)
-    case str: JavaStringValue[Pre] => java.stringValue(str)
-    case arr: JavaLiteralArray[Pre] => java.literalArray(arr)
-
-    case Cast(inner, TypeValue(t)) if t == Java.float[Pre] || t == Java.double[Pre] =>
-      CastFloat(dispatch(inner), dispatch(t))(e.o)
-
-    case local: PVLLocal[Pre] => pvl.local(local)
-    case deref: PVLDeref[Pre] => pvl.deref(deref)
-    case inv: PVLNew[Pre] => pvl.newClass(inv)
-    case inv: PVLInvocation[Pre] => pvl.invocation(inv)
-
-    case local: CLocal[Pre] => c.local(local)
-    case deref: CFieldAccess[Pre] => c.deref(deref)
-    case deref: CStructDeref[Pre] => c.deref(deref)
-    case inv: CInvocation[Pre] => c.invocation(inv)
-
-    case shared: SharedMemSize[Pre] => c.sharedSize(shared)
-    case kernel: GpgpuCudaKernelInvocation[Pre] => c.cudaKernelInvocation(kernel)
-    case local: LocalThreadId[Pre] => c.cudaLocalThreadId(local)
-    case global: GlobalThreadId[Pre] => c.cudaGlobalThreadId(global)
-    case cast: CCast[Pre] => c.cast(cast)
-    case sizeof: SizeOf[Pre] => throw LangCToCol.UnsupportedSizeof(sizeof)
-
-    case Perm(a@AmbiguousLocation(expr), perm)
-      if c.getBaseType(expr.t).isInstanceOf[CTStruct[Pre]] =>
-      c.getBaseType(expr.t) match {
-        case structType: CTStruct[Pre] => c.unwrapStructPerm(dispatch(a).asInstanceOf[AmbiguousLocation[Post]], perm, structType, e.o)
+      case unfold: Unfold[Pre] => {
+        cpp.checkPredicateFoldingAllowed(unfold.res)
+        rewriteDefault(unfold)
       }
-    case local: CPPLocal[Pre] => cpp.local(local)
-    case deref: CPPClassMethodOrFieldAccess[Pre] => cpp.deref(deref)
-    case inv: CPPInvocation[Pre] => cpp.invocation(inv)
-    case lambda: CPPLambdaDefinition[Pre] => cpp.rewriteLambdaDefinition(lambda)
-    case arrSub@AmbiguousSubscript(_, _) => cpp.rewriteSubscript(arrSub)
-    case unfolding: Unfolding[Pre] => {
-      cpp.checkPredicateFoldingAllowed(unfolding.res)
-      rewriteDefault(unfolding)
+
+      case other => rewriteDefault(other)
     }
 
-    case assign: PreAssignExpression[Pre] =>
-      assign.target match {
-        case AmbiguousSubscript(v, _) =>
-          v.t match {
-            case CPrimitiveType(specs)  if specs.collectFirst { case CSpecificationType(_: CTVector[Pre]) => () }.isDefined =>
-              return c.assignSubscriptVector(assign)
-            case _ =>
-          }
-        case CFieldAccess(obj, _) =>
-          obj.t match {
-            case CPrimitiveType(specs)  if specs.collectFirst { case CSpecificationType(_: TOpenCLVector[Pre]) => () }.isDefined =>
-              return c.assignOpenCLVector(assign)
-            case _ =>
-          }
-        case _ =>
-      }
-      assign.target.t match {
-        case CPrimitiveType(specs) if specs.collectFirst { case CSpecificationType(_: CTStruct[Pre]) => () }.isDefined =>
-          c.assignStruct(assign)
-        case CPPPrimitiveType(_) => cpp.preAssignExpr(assign)
-        case _ => rewriteDefault(assign)
+  override def dispatch(e: Expr[Pre]): Expr[Post] =
+    e match {
+      case stmt
+          if veymont.currentProg.nonEmpty &&
+            !veymont.currentExpr.topOption.contains(e) =>
+        veymont.rewriteExpr(e)
+      case result @ AmbiguousResult() =>
+        implicit val o: Origin = result.o
+        result.ref.get match {
+          case ref: RefCFunctionDefinition[Pre] => c.result(ref)
+          case ref: RefCGlobalDeclaration[Pre] => c.result(ref)
+          case ref: RefCPPFunctionDefinition[Pre] => cpp.result(ref)
+          case ref: RefCPPGlobalDeclaration[Pre] => cpp.result(ref)
+          case ref: RefLlvmFunctionDefinition[Pre] => llvm.result(ref)
+          case RefFunction(decl) => Result[Post](anySucc(decl))
+          case RefProcedure(decl) => Result[Post](anySucc(decl))
+          case RefJavaMethod(decl) => Result[Post](java.javaMethod.ref(decl))
+          case RefJavaAnnotationMethod(decL) => ???
+          case RefInstanceFunction(decl) => Result[Post](anySucc(decl))
+          case RefInstanceMethod(decl) => Result[Post](anySucc(decl))
+          case RefInstanceOperatorFunction(decl) => Result[Post](anySucc(decl))
+          case RefInstanceOperatorMethod(decl) => Result[Post](anySucc(decl))
+          case RefLlvmSpecFunction(decl) => Result[Post](anySucc(decl))
+        }
+
+      case diz @ AmbiguousThis() => currentThis.top
+
+      case local: JavaLocal[Pre] => java.local(local)
+      case deref: JavaDeref[Pre] => java.deref(deref)
+      case inv: JavaInvocation[Pre] => java.invocation(inv)
+      case inv: JavaNewClass[Pre] => java.newClass(inv)
+      case arr: JavaNewLiteralArray[Pre] => java.newLiteralArray(arr)
+      case arr: JavaNewDefaultArray[Pre] => java.newDefaultArray(arr)
+      case str: JavaStringValue[Pre] => java.stringValue(str)
+      case arr: JavaLiteralArray[Pre] => java.literalArray(arr)
+
+      case Cast(inner, TypeValue(t))
+          if t == Java.float[Pre] || t == Java.double[Pre] =>
+        CastFloat(dispatch(inner), dispatch(t))(e.o)
+
+      case local: PVLLocal[Pre] => pvl.local(local)
+      case deref: PVLDeref[Pre] => pvl.deref(deref)
+      case inv: PVLNew[Pre] => pvl.newClass(inv)
+      case inv: PVLInvocation[Pre] => pvl.invocation(inv)
+
+      case local: CLocal[Pre] => c.local(local)
+      case deref: CFieldAccess[Pre] => c.deref(deref)
+      case deref: CStructDeref[Pre] => c.deref(deref)
+      case inv: CInvocation[Pre] => c.invocation(inv)
+
+      case shared: SharedMemSize[Pre] => c.sharedSize(shared)
+      case kernel: GpgpuCudaKernelInvocation[Pre] =>
+        c.cudaKernelInvocation(kernel)
+      case local: LocalThreadId[Pre] => c.cudaLocalThreadId(local)
+      case global: GlobalThreadId[Pre] => c.cudaGlobalThreadId(global)
+      case cast: CCast[Pre] => c.cast(cast)
+      case sizeof: SizeOf[Pre] => throw LangCToCol.UnsupportedSizeof(sizeof)
+
+      case Perm(a @ AmbiguousLocation(expr), perm)
+          if c.getBaseType(expr.t).isInstanceOf[CTStruct[Pre]] =>
+        c.getBaseType(expr.t) match {
+          case structType: CTStruct[Pre] =>
+            c.unwrapStructPerm(
+              dispatch(a).asInstanceOf[AmbiguousLocation[Post]],
+              perm,
+              structType,
+              e.o,
+            )
+        }
+      case local: CPPLocal[Pre] => cpp.local(local)
+      case deref: CPPClassMethodOrFieldAccess[Pre] => cpp.deref(deref)
+      case inv: CPPInvocation[Pre] => cpp.invocation(inv)
+      case lambda: CPPLambdaDefinition[Pre] =>
+        cpp.rewriteLambdaDefinition(lambda)
+      case arrSub @ AmbiguousSubscript(_, _) => cpp.rewriteSubscript(arrSub)
+      case unfolding: Unfolding[Pre] => {
+        cpp.checkPredicateFoldingAllowed(unfolding.res)
+        rewriteDefault(unfolding)
       }
 
-    case inv: SilverPartialADTFunctionInvocation[Pre] => silver.adtInvocation(inv)
-    case map: SilverUntypedNonemptyLiteralMap[Pre] => silver.nonemptyMap(map)
+      case assign: PreAssignExpression[Pre] =>
+        assign.target match {
+          case AmbiguousSubscript(v, _) =>
+            v.t match {
+              case CPrimitiveType(specs) if specs.collectFirst {
+                    case CSpecificationType(_: CTVector[Pre]) => ()
+                  }.isDefined =>
+                return c.assignSubscriptVector(assign)
+              case _ =>
+            }
+          case CFieldAccess(obj, _) =>
+            obj.t match {
+              case CPrimitiveType(specs) if specs.collectFirst {
+                    case CSpecificationType(_: TOpenCLVector[Pre]) => ()
+                  }.isDefined =>
+                return c.assignOpenCLVector(assign)
+              case _ =>
+            }
+          case _ =>
+        }
+        assign.target.t match {
+          case CPrimitiveType(specs) if specs.collectFirst {
+                case CSpecificationType(_: CTStruct[Pre]) => ()
+              }.isDefined =>
+            c.assignStruct(assign)
+          case CPPPrimitiveType(_) => cpp.preAssignExpr(assign)
+          case _ => rewriteDefault(assign)
+        }
 
-    case inv: LlvmFunctionInvocation[Pre] => llvm.rewriteFunctionInvocation(inv)
-    case inv: LlvmAmbiguousFunctionInvocation[Pre] => llvm.rewriteAmbiguousFunctionInvocation(inv)
-    case local: LlvmLocal[Pre] => llvm.rewriteLocal(local)
+      case inv: SilverPartialADTFunctionInvocation[Pre] =>
+        silver.adtInvocation(inv)
+      case map: SilverUntypedNonemptyLiteralMap[Pre] => silver.nonemptyMap(map)
 
-    case other => rewriteDefault(other)
-  }
+      case inv: LlvmFunctionInvocation[Pre] =>
+        llvm.rewriteFunctionInvocation(inv)
+      case inv: LlvmAmbiguousFunctionInvocation[Pre] =>
+        llvm.rewriteAmbiguousFunctionInvocation(inv)
+      case local: LlvmLocal[Pre] => llvm.rewriteLocal(local)
 
-  override def dispatch(t: Type[Pre]): Type[Post] = t match {
-    case t: JavaTClass[Pre] => java.classType(t)
-    case t: CTPointer[Pre] => c.pointerType(t)
-    case t: CTVector[Pre] => c.vectorType(t)
-    case t: TOpenCLVector[Pre] => c.vectorType(t)
-    case t: CTArray[Pre] => c.arrayType(t)
-    case t: CTStruct[Pre] => c.structType(t)
-    case t: CPPTArray[Pre] => cpp.arrayType(t)
-    case other => rewriteDefault(other)
-  }
+      case other => rewriteDefault(other)
+    }
+
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    t match {
+      case t: JavaTClass[Pre] => java.classType(t)
+      case t: CTPointer[Pre] => c.pointerType(t)
+      case t: CTVector[Pre] => c.vectorType(t)
+      case t: TOpenCLVector[Pre] => c.vectorType(t)
+      case t: CTArray[Pre] => c.arrayType(t)
+      case t: CTStruct[Pre] => c.structType(t)
+      case t: CPPTArray[Pre] => cpp.arrayType(t)
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/lang/LangTypesToCol.scala b/src/rewrite/vct/rewrite/lang/LangTypesToCol.scala
index 4ab0b2f7cd..6b7f9fe8eb 100644
--- a/src/rewrite/vct/rewrite/lang/LangTypesToCol.scala
+++ b/src/rewrite/vct/rewrite/lang/LangTypesToCol.scala
@@ -14,12 +14,16 @@ import scala.reflect.ClassTag
 
 case object LangTypesToCol extends RewriterBuilder {
   override def key: String = "langTypes"
-  override def desc: String = "Translate language-specific types (such as named types) to specific internal types."
+  override def desc: String =
+    "Translate language-specific types (such as named types) to specific internal types."
 
-  case class IncompleteTypeArgs(t: SilverPartialTAxiomatic[_]) extends UserError {
+  case class IncompleteTypeArgs(t: SilverPartialTAxiomatic[_])
+      extends UserError {
     override def code: String = "incompleteTypeArgs"
     override def text: String =
-      t.o.messageInContext("This type does not specify all generic types for the domain.")
+      t.o.messageInContext(
+        "This type does not specify all generic types for the domain."
+      )
   }
 
   case class EmptyInlineDecl(d: CLocalDeclaration[_]) extends UserError {
@@ -31,25 +35,38 @@ case object LangTypesToCol extends RewriterBuilder {
 }
 
 case class LangTypesToCol[Pre <: Generation]() extends Rewriter[Pre] {
-  override def porcelainRefSucc[RefDecl <: Declaration[Rewritten[Pre]]](ref: Ref[Pre, _])(implicit tag: ClassTag[RefDecl]): Option[Ref[Rewritten[Pre], RefDecl]] =
+  override def porcelainRefSucc[RefDecl <: Declaration[Rewritten[Pre]]](
+      ref: Ref[Pre, _]
+  )(implicit tag: ClassTag[RefDecl]): Option[Ref[Rewritten[Pre], RefDecl]] =
     ref match {
       // Retain unresolved references to be resolved by LangSpecificToCol
-      case unresolved: UnresolvedRef[_, _] if !unresolved.isResolved => Some(new UnresolvedRef[Post, RefDecl](unresolved.name))
+      case unresolved: UnresolvedRef[_, _] if !unresolved.isResolved =>
+        Some(new UnresolvedRef[Post, RefDecl](unresolved.name))
       case _ => None
     }
 
-  override def porcelainRefSeqSucc[RefDecl <: Declaration[Rewritten[Pre]]](refs: Seq[Ref[Pre, _]])(implicit tag: ClassTag[RefDecl]): Option[Seq[Ref[Rewritten[Pre], RefDecl]]] =
-    if(refs.forall(_.isInstanceOf[UnresolvedRef[_, _]]))
+  override def porcelainRefSeqSucc[RefDecl <: Declaration[Rewritten[Pre]]](
+      refs: Seq[Ref[Pre, _]]
+  )(
+      implicit tag: ClassTag[RefDecl]
+  ): Option[Seq[Ref[Rewritten[Pre], RefDecl]]] =
+    if (refs.forall(_.isInstanceOf[UnresolvedRef[_, _]]))
       Some(refs.map(porcelainRefSucc[RefDecl]).map(_.get))
-    else None
-
-  def specType(target: SpecTypeNameTarget[Pre], args: Seq[Type[Pre]]): Type[Post] = target match {
-    case RefAxiomaticDataType(decl) => TAxiomatic[Post](succ(decl), args.map(dispatch))
-    case RefModel(decl) => TModel[Post](succ(decl))
-    case RefEnum(enum) => TEnum[Post](succ(enum))
-    case RefProverType(typ) => TProverType[Post](succ(typ))
-    case RefVariable(decl) => TVar[Post](succ(decl))
-  }
+    else
+      None
+
+  def specType(
+      target: SpecTypeNameTarget[Pre],
+      args: Seq[Type[Pre]],
+  ): Type[Post] =
+    target match {
+      case RefAxiomaticDataType(decl) =>
+        TAxiomatic[Post](succ(decl), args.map(dispatch))
+      case RefModel(decl) => TModel[Post](succ(decl))
+      case RefEnum(enum) => TEnum[Post](succ(enum))
+      case RefProverType(typ) => TProverType[Post](succ(typ))
+      case RefVariable(decl) => TVar[Post](succ(decl))
+    }
 
   override def dispatch(t: Type[Pre]): Type[Post] = {
     implicit val o: Origin = t.o
@@ -58,8 +75,14 @@ case class LangTypesToCol[Pre <: Generation]() extends Rewriter[Pre] {
         t.ref.get match {
           case spec: SpecTypeNameTarget[Pre] => specType(spec, Nil)
           case RefJavaClass(decl) =>
-            assert(t.names.init.map(_._2).forall((x: Option[Seq[Type[Pre]]]) => x.isEmpty))
-            val x = JavaTClass[Post](succ(decl), t.names.last._2.getOrElse(Nil).map(dispatch))
+            assert(
+              t.names.init.map(_._2)
+                .forall((x: Option[Seq[Type[Pre]]]) => x.isEmpty)
+            )
+            val x = JavaTClass[Post](
+              succ(decl),
+              t.names.last._2.getOrElse(Nil).map(dispatch),
+            )
             x
         }
       case t @ PVLNamedType(_, typeArgs) =>
@@ -69,162 +92,217 @@ case class LangTypesToCol[Pre <: Generation]() extends Rewriter[Pre] {
         }
       case t @ CPrimitiveType(specs) =>
         dispatch(C.getPrimitiveType(specs, context = Some(t)))
-      case t@CPPPrimitiveType(specs) =>
+      case t @ CPPPrimitiveType(specs) =>
         dispatch(CPP.getBaseTypeFromSpecs(specs, context = Some(t)))
       case t @ SilverPartialTAxiomatic(Ref(adt), partialTypeArgs) =>
-        if(partialTypeArgs.map(_._1.decl).toSet != adt.typeArgs.toSet)
+        if (partialTypeArgs.map(_._1.decl).toSet != adt.typeArgs.toSet)
           throw IncompleteTypeArgs(t)
-        TAxiomatic(succ(adt), adt.typeArgs.map(arg => dispatch(t.partialTypeArgs.find(_._1.decl == arg).get._2)))
+        TAxiomatic(
+          succ(adt),
+          adt.typeArgs.map(arg =>
+            dispatch(t.partialTypeArgs.find(_._1.decl == arg).get._2)
+          ),
+        )
       case other => rewriteDefault(other)
     }
   }
 
-  def normalizeCDeclaration(specifiers: Seq[CDeclarationSpecifier[Pre]],
-                            declarator: CDeclarator[Pre],
-                            context: Option[Node[Pre]] = None)
-                           (implicit o: Origin): (Seq[CDeclarationSpecifier[Post]], CDeclarator[Post]) = {
+  def normalizeCDeclaration(
+      specifiers: Seq[CDeclarationSpecifier[Pre]],
+      declarator: CDeclarator[Pre],
+      context: Option[Node[Pre]] = None,
+  )(
+      implicit o: Origin
+  ): (Seq[CDeclarationSpecifier[Post]], CDeclarator[Post]) = {
     val info = C.getDeclaratorInfo(declarator)
     val baseType = C.getPrimitiveType(specifiers, context)
-    val otherSpecifiers = specifiers.filter(!_.isInstanceOf[CTypeSpecifier[Pre]]).map(dispatch)
-    val newSpecifiers = CSpecificationType[Post](dispatch(info.typeOrReturnType(baseType))) +: otherSpecifiers
-    val newDeclarator = info.params match {
-      case Some(params) =>
-        // PB TODO: varargs is discarded here.
-        CTypedFunctionDeclarator[Post](
-          cParams.dispatch(params),
-          varargs = false,
-          CName(info.name)
-        )
-      case None =>
-        CName[Post](info.name)
-    }
+    val otherSpecifiers = specifiers
+      .filter(!_.isInstanceOf[CTypeSpecifier[Pre]]).map(dispatch)
+    val newSpecifiers =
+      CSpecificationType[Post](dispatch(info.typeOrReturnType(baseType))) +:
+        otherSpecifiers
+    val newDeclarator =
+      info.params match {
+        case Some(params) =>
+          // PB TODO: varargs is discarded here.
+          CTypedFunctionDeclarator[Post](
+            cParams.dispatch(params),
+            varargs = false,
+            CName(info.name),
+          )
+        case None => CName[Post](info.name)
+      }
 
     (newSpecifiers, newDeclarator)
   }
 
-  def normalizeCPPDeclaration(specifiers: Seq[CPPDeclarationSpecifier[Pre]],
-                            declarator: CPPDeclarator[Pre],
-                            context: Option[Node[Pre]] = None)
-                           (implicit o: Origin): (Seq[CPPDeclarationSpecifier[Post]], CPPDeclarator[Post]) = {
-    val info = CPP.getDeclaratorInfo(declarator, context.getOrElse(false).isInstanceOf[CPPParam[Pre]])
+  def normalizeCPPDeclaration(
+      specifiers: Seq[CPPDeclarationSpecifier[Pre]],
+      declarator: CPPDeclarator[Pre],
+      context: Option[Node[Pre]] = None,
+  )(
+      implicit o: Origin
+  ): (Seq[CPPDeclarationSpecifier[Post]], CPPDeclarator[Post]) = {
+    val info = CPP.getDeclaratorInfo(
+      declarator,
+      context.getOrElse(false).isInstanceOf[CPPParam[Pre]],
+    )
     val baseType = CPP.getBaseTypeFromSpecs(specifiers, context)
     if (info.isReference && !baseType.isInstanceOf[SYCLTHandler[Pre]]) {
       // Only accept reference parameters for type sycl::handler, as we only need & support for a lambda method with that parameter
       throw CPP.CPPTypeNotSupported(Some(declarator))
     }
-    val otherSpecifiers = specifiers.filter(!_.isInstanceOf[CPPTypeSpecifier[Pre]]).map(dispatch)
-    val newSpecifiers = CPPSpecificationType[Post](dispatch(info.typeOrReturnType(baseType))) +: otherSpecifiers
-    val newDeclarator = info.params match {
-      case Some(params) =>
-        // PB TODO: varargs is discarded here.
-        CPPTypedFunctionDeclarator[Post](
-          cPPParams.dispatch(params),
-          varargs = false,
-          CPPName(info.name)
-        )
-      case None =>
-        CPPName[Post](info.name)
-    }
+    val otherSpecifiers = specifiers
+      .filter(!_.isInstanceOf[CPPTypeSpecifier[Pre]]).map(dispatch)
+    val newSpecifiers =
+      CPPSpecificationType[Post](dispatch(info.typeOrReturnType(baseType))) +:
+        otherSpecifiers
+    val newDeclarator =
+      info.params match {
+        case Some(params) =>
+          // PB TODO: varargs is discarded here.
+          CPPTypedFunctionDeclarator[Post](
+            cPPParams.dispatch(params),
+            varargs = false,
+            CPPName(info.name),
+          )
+        case None => CPPName[Post](info.name)
+      }
 
     (newSpecifiers, newDeclarator)
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case param: CParam[Pre] =>
-      val (specs, decl) = normalizeCDeclaration(param.specifiers, param.declarator, context = Some(param))(param.o)
-      cParams.declare(new CParam(specs, decl)(param.o))
-    case declaration: CLocalDeclaration[Pre] =>
-      declaration.decl.inits.foreach(init => {
-        implicit val o: Origin = init.o
-        val (specs, decl) = normalizeCDeclaration(declaration.decl.specs, init.decl, context = Some(declaration))
-        cLocalDeclarations.declare(declaration.rewrite(
-          decl = declaration.decl.rewrite(
-            specs = specs,
-            inits = Seq(
-              CInit(decl, init.init.map(dispatch)),
-            ),
-          ),
-        ))
-      })
-    case declaration: CGlobalDeclaration[Pre] =>
-      declaration.decl match {
-        case CDeclaration(_, _, Seq(_: CStructDeclaration[Pre]), Seq()) =>
-          globalDeclarations.succeed(declaration, declaration.rewriteDefault())
-        case decl =>
-          decl.inits.foreach(init => {
-            implicit val o: Origin = init.o
-            val (specs, decl1) = normalizeCDeclaration(decl.specs, init.decl, context = Some(declaration))
-            globalDeclarations.declare(declaration.rewrite(
-              decl = declaration.decl.rewrite(
-                specs = specs,
-                inits = Seq(
-                  CInit(decl1, init.init.map(dispatch)),
-                ),
-              ),
-            ))
-          })
-      }
-    case declaration: CStructMemberDeclarator[Pre] =>
-      declaration.decls.foreach(decl => {
-        implicit val o: Origin = decl.o
-        val (specs, newDecl) = normalizeCDeclaration(declaration.specs, decl, context = Some(declaration))
-        cStructMemberDeclarators.declare(declaration.rewrite(
-         specs = specs,
-          decls = Seq(newDecl)
-        ))
-      })
-    case declaration: CFunctionDefinition[Pre] =>
-      implicit val o: Origin = declaration.o
-      val (specs, decl) = normalizeCDeclaration(declaration.specs, declaration.declarator, context = Some(declaration))
-      globalDeclarations.declare(declaration.rewrite(specs = specs, declarator = decl))
-    case param: CPPParam[Pre] =>
-      val (specs, decl) = normalizeCPPDeclaration(param.specifiers, param.declarator, context = Some(param))(param.o)
-      cPPParams.declare(new CPPParam(specs, decl)(param.o))
-    case declaration: CPPLocalDeclaration[Pre] =>
-      declaration.decl.inits.foreach(init => {
-        implicit val o: Origin = init.o
-        val (specs, decl) = normalizeCPPDeclaration(declaration.decl.specs, init.decl, context = Some(declaration))
-        cPPLocalDeclarations.declare(declaration.rewrite(
-          decl = declaration.decl.rewrite(
-            specs = specs,
-            inits = Seq(
-              CPPInit(decl, init.init.map(dispatch)),
-            ),
-          ),
-        ))
-      })
-    case declaration: CPPGlobalDeclaration[Pre] =>
-      declaration.decl.inits.foreach(init => {
-        implicit val o: Origin = init.o
-        val (specs, decl) = normalizeCPPDeclaration(declaration.decl.specs, init.decl, context = Some(declaration))
-        globalDeclarations.declare(declaration.rewrite(
-          decl = declaration.decl.rewrite(
-            specs = specs,
-            inits = Seq(
-              CPPInit(decl, init.init.map(dispatch)),
-            ),
-          ),
-        ))
-      })
-    case declaration: CPPFunctionDefinition[Pre] =>
-      implicit val o: Origin = declaration.o
-      val (specs, decl) = normalizeCPPDeclaration(declaration.specs, declaration.declarator, context = Some(declaration))
-      globalDeclarations.declare(declaration.rewrite(specs = specs, declarator = decl))
-    case cls: JavaClass[Pre] =>
-      rewriteDefault(cls)
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case param: CParam[Pre] =>
+        val (specs, decl) =
+          normalizeCDeclaration(
+            param.specifiers,
+            param.declarator,
+            context = Some(param),
+          )(param.o)
+        cParams.declare(new CParam(specs, decl)(param.o))
+      case declaration: CLocalDeclaration[Pre] =>
+        declaration.decl.inits.foreach(init => {
+          implicit val o: Origin = init.o
+          val (specs, decl) = normalizeCDeclaration(
+            declaration.decl.specs,
+            init.decl,
+            context = Some(declaration),
+          )
+          cLocalDeclarations.declare(declaration.rewrite(decl =
+            declaration.decl.rewrite(
+              specs = specs,
+              inits = Seq(CInit(decl, init.init.map(dispatch))),
+            )
+          ))
+        })
+      case declaration: CGlobalDeclaration[Pre] =>
+        declaration.decl match {
+          case CDeclaration(_, _, Seq(_: CStructDeclaration[Pre]), Seq()) =>
+            globalDeclarations
+              .succeed(declaration, declaration.rewriteDefault())
+          case decl =>
+            decl.inits.foreach(init => {
+              implicit val o: Origin = init.o
+              val (specs, decl1) = normalizeCDeclaration(
+                decl.specs,
+                init.decl,
+                context = Some(declaration),
+              )
+              globalDeclarations.declare(declaration.rewrite(decl =
+                declaration.decl.rewrite(
+                  specs = specs,
+                  inits = Seq(CInit(decl1, init.init.map(dispatch))),
+                )
+              ))
+            })
+        }
+      case declaration: CStructMemberDeclarator[Pre] =>
+        declaration.decls.foreach(decl => {
+          implicit val o: Origin = decl.o
+          val (specs, newDecl) = normalizeCDeclaration(
+            declaration.specs,
+            decl,
+            context = Some(declaration),
+          )
+          cStructMemberDeclarators
+            .declare(declaration.rewrite(specs = specs, decls = Seq(newDecl)))
+        })
+      case declaration: CFunctionDefinition[Pre] =>
+        implicit val o: Origin = declaration.o
+        val (specs, decl) = normalizeCDeclaration(
+          declaration.specs,
+          declaration.declarator,
+          context = Some(declaration),
+        )
+        globalDeclarations
+          .declare(declaration.rewrite(specs = specs, declarator = decl))
+      case param: CPPParam[Pre] =>
+        val (specs, decl) =
+          normalizeCPPDeclaration(
+            param.specifiers,
+            param.declarator,
+            context = Some(param),
+          )(param.o)
+        cPPParams.declare(new CPPParam(specs, decl)(param.o))
+      case declaration: CPPLocalDeclaration[Pre] =>
+        declaration.decl.inits.foreach(init => {
+          implicit val o: Origin = init.o
+          val (specs, decl) = normalizeCPPDeclaration(
+            declaration.decl.specs,
+            init.decl,
+            context = Some(declaration),
+          )
+          cPPLocalDeclarations.declare(declaration.rewrite(decl =
+            declaration.decl.rewrite(
+              specs = specs,
+              inits = Seq(CPPInit(decl, init.init.map(dispatch))),
+            )
+          ))
+        })
+      case declaration: CPPGlobalDeclaration[Pre] =>
+        declaration.decl.inits.foreach(init => {
+          implicit val o: Origin = init.o
+          val (specs, decl) = normalizeCPPDeclaration(
+            declaration.decl.specs,
+            init.decl,
+            context = Some(declaration),
+          )
+          globalDeclarations.declare(declaration.rewrite(decl =
+            declaration.decl.rewrite(
+              specs = specs,
+              inits = Seq(CPPInit(decl, init.init.map(dispatch))),
+            )
+          ))
+        })
+      case declaration: CPPFunctionDefinition[Pre] =>
+        implicit val o: Origin = declaration.o
+        val (specs, decl) = normalizeCPPDeclaration(
+          declaration.specs,
+          declaration.declarator,
+          context = Some(declaration),
+        )
+        globalDeclarations
+          .declare(declaration.rewrite(specs = specs, declarator = decl))
+      case cls: JavaClass[Pre] => rewriteDefault(cls)
+      case other => rewriteDefault(other)
+    }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case CDeclarationStatement(local) =>
-      val (locals, _) = cLocalDeclarations.collect { dispatch(local) }
-      if(locals.isEmpty && local.decl.specs.collectFirst{case CInline() => }.nonEmpty)
-        throw EmptyInlineDecl(local)
-      Block(locals.map(CDeclarationStatement(_)(stat.o)))(stat.o)
-    case CPPDeclarationStatement(local) =>
-      val (locals, _) = cPPLocalDeclarations.collect { dispatch(local) }
-      Block(locals.map(CPPDeclarationStatement(_)(stat.o)))(stat.o)
-
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case CDeclarationStatement(local) =>
+        val (locals, _) = cLocalDeclarations.collect { dispatch(local) }
+        if (
+          locals.isEmpty &&
+          local.decl.specs.collectFirst { case CInline() => }.nonEmpty
+        )
+          throw EmptyInlineDecl(local)
+        Block(locals.map(CDeclarationStatement(_)(stat.o)))(stat.o)
+      case CPPDeclarationStatement(local) =>
+        val (locals, _) = cPPLocalDeclarations.collect { dispatch(local) }
+        Block(locals.map(CPPDeclarationStatement(_)(stat.o)))(stat.o)
+
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/lang/LangVeyMontToCol.scala b/src/rewrite/vct/rewrite/lang/LangVeyMontToCol.scala
index 9f24052768..8306d90838 100644
--- a/src/rewrite/vct/rewrite/lang/LangVeyMontToCol.scala
+++ b/src/rewrite/vct/rewrite/lang/LangVeyMontToCol.scala
@@ -16,58 +16,75 @@ import vct.rewrite.veymont.InferEndpointContexts
 case object LangVeyMontToCol {
   case class NoRunMethod(prog: PVLChoreography[_]) extends UserError {
     override def code: String = "noRunMethod"
-    override def text: String = prog.o.messageInContext(
-      s"This `seq_program` has no `run` method."
-    )
+    override def text: String =
+      prog.o.messageInContext(s"This `seq_program` has no `run` method.")
   }
 
   case class AssignNotAllowed(assign: Assign[_]) extends UserError {
     override def code: String = "assignNotAllowed"
-    override def text: String = assign.o.messageInContext(
-      "Plain assignment is not allowed in `seq_program`. Use `:=` instead."
-    )
+    override def text: String =
+      assign.o.messageInContext(
+        "Plain assignment is not allowed in `seq_program`. Use `:=` instead."
+      )
   }
 }
 
-case class LangVeyMontToCol[Pre <: Generation](rw: LangSpecificToCol[Pre], allowAssign: Boolean = false) extends LazyLogging {
+case class LangVeyMontToCol[Pre <: Generation](
+    rw: LangSpecificToCol[Pre],
+    allowAssign: Boolean = false,
+) extends LazyLogging {
   type Post = Rewritten[Pre]
   implicit val implicitRewriter: AbstractRewriter[Pre, Post] = rw
 
-  val chorSucc: SuccessionMap[PVLChoreography[Pre], Choreography[Post]] = SuccessionMap()
-  val endpointSucc: SuccessionMap[PVLEndpoint[Pre], Endpoint[Post]] = SuccessionMap()
-  val commSucc: SuccessionMap[PVLCommunicate[Pre], Communicate[Post]] = SuccessionMap()
+  val chorSucc: SuccessionMap[PVLChoreography[Pre], Choreography[Post]] =
+    SuccessionMap()
+  val endpointSucc: SuccessionMap[PVLEndpoint[Pre], Endpoint[Post]] =
+    SuccessionMap()
+  val commSucc: SuccessionMap[PVLCommunicate[Pre], Communicate[Post]] =
+    SuccessionMap()
 
   val currentProg: ScopedStack[PVLChoreography[Pre]] = ScopedStack()
   val currentStatement: ScopedStack[Statement[Pre]] = ScopedStack()
   val currentExpr: ScopedStack[Expr[Pre]] = ScopedStack()
 
-  def rewriteCommunicate(comm: PVLCommunicate[Pre], inv: Expr[Pre]): CommunicateStatement[Post] = {
-    val newComm = new Communicate[Post](
+  def rewriteCommunicate(
+      comm: PVLCommunicate[Pre],
+      inv: Expr[Pre],
+  ): CommunicateStatement[Post] = {
+    val newComm =
+      new Communicate[Post](
         rw.dispatch(inv),
         Some(endpointSucc.ref(comm.inferredReceiver.get)),
         rw.dispatch(comm.target),
         Some(endpointSucc.ref(comm.inferredSender.get)),
-        rw.dispatch(comm.msg))(comm.blame)(comm.o)
+        rw.dispatch(comm.msg),
+      )(comm.blame)(comm.o)
     commSucc(comm) = newComm
     CommunicateStatement(newComm)(comm.o)
   }
 
-  def rewriteCommunicate(comm: PVLCommunicate[Pre]): CommunicateStatement[Post] =
-    rewriteCommunicate(comm, tt)
+  def rewriteCommunicate(
+      comm: PVLCommunicate[Pre]
+  ): CommunicateStatement[Post] = rewriteCommunicate(comm, tt)
 
-  def rewriteChannelInv(inv: PVLChannelInvariant[Pre]): CommunicateStatement[Post] =
+  def rewriteChannelInv(
+      inv: PVLChannelInvariant[Pre]
+  ): CommunicateStatement[Post] =
     rewriteCommunicate(inv.comm.asInstanceOf[PVLCommunicate[Pre]], inv.inv)
 
-  def rewriteEndpointName(name: PVLEndpointName[Pre]): Ref[Post, Endpoint[Post]] =
-    endpointSucc.ref(name.ref.get.decl)
+  def rewriteEndpointName(
+      name: PVLEndpointName[Pre]
+  ): Ref[Post, Endpoint[Post]] = endpointSucc.ref(name.ref.get.decl)
 
   def rewriteEndpoint(endpoint: PVLEndpoint[Pre]): Unit =
-    endpointSucc(endpoint) = rw.endpoints.declare(new Endpoint(
-      rw.succ[Class[Post]](endpoint.cls.decl),
-      endpoint.typeArgs.map(rw.dispatch),
-      rw.pvl.constructorSucc(endpoint.ref.get),
-      endpoint.args.map(rw.dispatch)
-    )(endpoint.blame)(endpoint.o))
+    endpointSucc(endpoint) = rw.endpoints.declare(
+      new Endpoint(
+        rw.succ[Class[Post]](endpoint.cls.decl),
+        endpoint.typeArgs.map(rw.dispatch),
+        rw.pvl.constructorSucc(endpoint.ref.get),
+        endpoint.args.map(rw.dispatch),
+      )(endpoint.blame)(endpoint.o)
+    )
 
   def rewriteChoreography(prog: PVLChoreography[Pre]): Unit = {
     implicit val o: Origin = prog.o
@@ -77,65 +94,83 @@ case class LangVeyMontToCol[Pre <: Generation](rw: LangSpecificToCol[Pre], allow
           new Choreography(
             rw.dispatch(prog.contract),
             rw.variables.collect(prog.args.map(rw.dispatch(_)))._1,
-            rw.endpoints.collect(
-              prog.declarations.foreach {
-                case endpoint: PVLEndpoint[Pre] => rewriteEndpoint(endpoint)
-                case _ =>
-              },
-            )._1,
+            rw.endpoints.collect(prog.declarations.foreach {
+              case endpoint: PVLEndpoint[Pre] => rewriteEndpoint(endpoint)
+              case _ =>
+            })._1,
             None,
-            prog.declarations.collectFirst {
-              case run: PVLChorRun[Pre] => rewriteRun(run)
+            prog.declarations.collectFirst { case run: PVLChorRun[Pre] =>
+              rewriteRun(run)
             }.getOrElse(throw NoRunMethod(prog)),
-            rw.classDeclarations.collect(
-              prog.declarations.foreach {
-                case _: PVLChorRun[Pre] =>
-                case _: PVLEndpoint[Pre] =>
-                case decl => rw.dispatch(decl)
-              }
-            )._1
+            rw.classDeclarations.collect(prog.declarations.foreach {
+              case _: PVLChorRun[Pre] =>
+              case _: PVLEndpoint[Pre] =>
+              case decl => rw.dispatch(decl)
+            })._1,
           )(prog.blame)(prog.o)
         )
       }
     }
   }
 
-  def rewriteEndpointUse(endpoint: RefPVLEndpoint[Pre], local: PVLLocal[Pre]): EndpointName[Post] =
+  def rewriteEndpointUse(
+      endpoint: RefPVLEndpoint[Pre],
+      local: PVLLocal[Pre],
+  ): EndpointName[Post] =
     EndpointName[Post](endpointSucc.ref(endpoint.decl))(local.o)
 
-  def rewriteRun(run: PVLChorRun[Pre]): ChorRun[Post]  = {
-      run.drop()
-      ChorRun(rw.dispatch(run.body), rw.dispatch(run.contract))(run.blame)(run.o)
+  def rewriteRun(run: PVLChorRun[Pre]): ChorRun[Post] = {
+    run.drop()
+    ChorRun(rw.dispatch(run.body), rw.dispatch(run.contract))(run.blame)(run.o)
   }
 
   def rewriteBranch(branch: PVLBranch[Pre]): UnresolvedChorBranch[Post] =
-    UnresolvedChorBranch(branch.branches.map { case (e, s) => (rw.dispatch(e), rw.dispatch(s)) })(branch.blame)(branch.o)
+    UnresolvedChorBranch(branch.branches.map { case (e, s) =>
+      (rw.dispatch(e), rw.dispatch(s))
+    })(branch.blame)(branch.o)
 
   def rewriteLoop(loop: PVLLoop[Pre]): UnresolvedChorLoop[Post] =
-    UnresolvedChorLoop(rw.dispatch(loop.cond), rw.dispatch(loop.contract), rw.dispatch(loop.body))(loop.blame)(loop.o)
-
-  def rewriteStatement(stmt: Statement[Pre]): Statement[Post] = stmt match {
-    case stmt @ PVLChorStatement(endpointName, inner) =>
-      ChorStatement[Post](
-        endpointName.map(rewriteEndpointName),
-        inner.rewriteDefault()
-      )(stmt.blame)(stmt.o)
-    case _: Block[Pre] | _: Scope[Pre] => currentStatement.having(stmt) { rw.dispatch(stmt) }
-    case branch: PVLBranch[Pre] => rewriteBranch(branch)
-    case loop: PVLLoop[Pre] => rewriteLoop(loop)
-    case comm: PVLCommunicate[Pre] => rewriteCommunicate(comm)
-    case inv: PVLChannelInvariant[Pre] => rewriteChannelInv(inv)
-    case stmt => currentStatement.having(stmt) {
-      ChorStatement(None, rw.dispatch(stmt))(PanicBlame("Arbitratry statement blame missing"))(stmt.o)
+    UnresolvedChorLoop(
+      rw.dispatch(loop.cond),
+      rw.dispatch(loop.contract),
+      rw.dispatch(loop.body),
+    )(loop.blame)(loop.o)
+
+  def rewriteStatement(stmt: Statement[Pre]): Statement[Post] =
+    stmt match {
+      case stmt @ PVLChorStatement(endpointName, inner) =>
+        ChorStatement[Post](
+          endpointName.map(rewriteEndpointName),
+          inner.rewriteDefault(),
+        )(stmt.blame)(stmt.o)
+      case _: Block[Pre] | _: Scope[Pre] =>
+        currentStatement.having(stmt) { rw.dispatch(stmt) }
+      case branch: PVLBranch[Pre] => rewriteBranch(branch)
+      case loop: PVLLoop[Pre] => rewriteLoop(loop)
+      case comm: PVLCommunicate[Pre] => rewriteCommunicate(comm)
+      case inv: PVLChannelInvariant[Pre] => rewriteChannelInv(inv)
+      case stmt =>
+        currentStatement.having(stmt) {
+          ChorStatement(None, rw.dispatch(stmt))(PanicBlame(
+            "Arbitratry statement blame missing"
+          ))(stmt.o)
+        }
     }
-  }
 
-  def rewriteExpr(expr: Expr[Pre]): Expr[Post] = expr match {
-    case PVLChorPerm(endpoint, loc, perm) =>
-      ChorPerm[Post](rewriteEndpointName(endpoint), rw.dispatch(loc), rw.dispatch(perm))(expr.o)
-    case expr @ PVLSender() => Sender[Post](commSucc.ref(expr.ref.get))(expr.o)
-    case expr @ PVLReceiver() => Receiver[Post](commSucc.ref(expr.ref.get))(expr.o)
-    case expr @ PVLMessage() => Message[Post](commSucc.ref(expr.ref.get))(expr.o)
-    case expr => currentExpr.having(expr) { rw.dispatch(expr) }
-  }
+  def rewriteExpr(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case PVLChorPerm(endpoint, loc, perm) =>
+        ChorPerm[Post](
+          rewriteEndpointName(endpoint),
+          rw.dispatch(loc),
+          rw.dispatch(perm),
+        )(expr.o)
+      case expr @ PVLSender() =>
+        Sender[Post](commSucc.ref(expr.ref.get))(expr.o)
+      case expr @ PVLReceiver() =>
+        Receiver[Post](commSucc.ref(expr.ref.get))(expr.o)
+      case expr @ PVLMessage() =>
+        Message[Post](commSucc.ref(expr.ref.get))(expr.o)
+      case expr => currentExpr.having(expr) { rw.dispatch(expr) }
+    }
 }
diff --git a/src/rewrite/vct/rewrite/lang/NoSupportSelfLoop.scala b/src/rewrite/vct/rewrite/lang/NoSupportSelfLoop.scala
index b56fcacdf4..de0cfe57c6 100644
--- a/src/rewrite/vct/rewrite/lang/NoSupportSelfLoop.scala
+++ b/src/rewrite/vct/rewrite/lang/NoSupportSelfLoop.scala
@@ -6,13 +6,21 @@ import RewriteHelpers._
 
 case object NoSupportSelfLoop extends RewriterBuilder {
   override def key: String = "removeSupportSelfLoop"
-  override def desc: String = "Remove the self-loop in java.lang.Object extends java.lang.Object."
+  override def desc: String =
+    "Remove the self-loop in java.lang.Object extends java.lang.Object."
 }
 
 case class NoSupportSelfLoop[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case cls: Class[Pre] =>
-      globalDeclarations.succeed(cls, cls.rewrite(supports = cls.supports.filter(_.asClass.get.cls.decl != cls).map(_.rewriteDefault())))
-    case other => rewriteDefault(other)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case cls: Class[Pre] =>
+        globalDeclarations.succeed(
+          cls,
+          cls.rewrite(supports =
+            cls.supports.filter(_.asClass.get.cls.decl != cls)
+              .map(_.rewriteDefault())
+          ),
+        )
+      case other => rewriteDefault(other)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/lang/ReplaceSYCLTypes.scala b/src/rewrite/vct/rewrite/lang/ReplaceSYCLTypes.scala
index c13bf85659..884b210dbf 100644
--- a/src/rewrite/vct/rewrite/lang/ReplaceSYCLTypes.scala
+++ b/src/rewrite/vct/rewrite/lang/ReplaceSYCLTypes.scala
@@ -5,12 +5,14 @@ import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 
 case object ReplaceSYCLTypes extends RewriterBuilder {
   override def key: String = "replaceSYCLTypes"
-  override def desc: String = "Replaces leftover SYCL types with col's 'ref' type."
+  override def desc: String =
+    "Replaces leftover SYCL types with col's 'ref' type."
 }
 
 case class ReplaceSYCLTypes[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(t: Type[Pre]): Type[Post] = t match {
-    case _: SYCLTClass[Pre] => TRef()
-    case _ => rewriteDefault(t)
-  }
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    t match {
+      case _: SYCLTClass[Pre] => TRef()
+      case _ => rewriteDefault(t)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/rasi/AbstractProcess.scala b/src/rewrite/vct/rewrite/rasi/AbstractProcess.scala
index 2aefe33314..6629422a03 100644
--- a/src/rewrite/vct/rewrite/rasi/AbstractProcess.scala
+++ b/src/rewrite/vct/rewrite/rasi/AbstractProcess.scala
@@ -5,177 +5,392 @@ import vct.rewrite.cfg.{CFGEdge, CFGEntry, CFGNode, CFGTerminal}
 
 import scala.collection.mutable
 
-
 // TODO: Can only one thread per class instance be launched?
 case class AbstractProcess[G](obj: Expr[G]) {
 
-  /**
-   * Simulates an atomic execution step for this process on the given abstract state.
-   *
-   * @param starting_state Abstract starting state
-   * @return A description of all reachable post-states
-   */
+  /** Simulates an atomic execution step for this process on the given abstract
+    * state.
+    *
+    * @param starting_state
+    *   Abstract starting state
+    * @return
+    *   A description of all reachable post-states
+    */
   def atomic_step(starting_state: AbstractState[G]): RASISuccessor[G] = {
-    val (atomic, successor): (Boolean, RASISuccessor[G]) = small_step(starting_state.processes(this), starting_state)
+    val (atomic, successor): (Boolean, RASISuccessor[G]) = small_step(
+      starting_state.processes(this),
+      starting_state,
+    )
 
-    var end_states: Set[AbstractState[G]] = if (!atomic) successor.successors else Set.empty[AbstractState[G]]
-    var intermediate: Set[AbstractState[G]] = if (atomic) successor.successors else Set.empty[AbstractState[G]]
+    var end_states: Set[AbstractState[G]] =
+      if (!atomic)
+        successor.successors
+      else
+        Set.empty[AbstractState[G]]
+    var intermediate: Set[AbstractState[G]] =
+      if (atomic)
+        successor.successors
+      else
+        Set.empty[AbstractState[G]]
     var explored: Set[AbstractState[G]] = intermediate
 
     var variables: Set[ConcreteVariable[G]] = successor.deciding_variables
 
     while (intermediate.nonEmpty) {
-      val next: Set[(Boolean, RASISuccessor[G])] = intermediate.map(s => small_step_if_atomic(s, starting_state))
+      val next: Set[(Boolean, RASISuccessor[G])] = intermediate
+        .map(s => small_step_if_atomic(s, starting_state))
 
       variables ++= next.map(s => s._2).flatMap(s => s.deciding_variables)
-      end_states ++= next.filter(s => !s._1).map(s => s._2).flatMap(s => s.successors)
-      intermediate = next.filter(s => s._1).map(s => s._2).flatMap(s => s.successors).diff(explored)
+      end_states ++= next.filter(s => !s._1).map(s => s._2)
+        .flatMap(s => s.successors)
+      intermediate = next.filter(s => s._1).map(s => s._2)
+        .flatMap(s => s.successors).diff(explored)
       explored ++= intermediate
     }
 
     RASISuccessor(variables, end_states)
   }
 
-  /**
-   * Tests if another small step can be executed without breaking the current atomic block, and if so, executes the next
-   * small step.
-   *
-   * @param state Current abstract state
-   * @param initial_state State before the atomic step
-   * @return A tuple of a boolean indicating if atomic progress could be made and a descriptor of all successor states
-   */
-  private def small_step_if_atomic(state: AbstractState[G], initial_state: AbstractState[G]): (Boolean, RASISuccessor[G]) = {
+  /** Tests if another small step can be executed without breaking the current
+    * atomic block, and if so, executes the next small step.
+    *
+    * @param state
+    *   Current abstract state
+    * @param initial_state
+    *   State before the atomic step
+    * @return
+    *   A tuple of a boolean indicating if atomic progress could be made and a
+    *   descriptor of all successor states
+    */
+  private def small_step_if_atomic(
+      state: AbstractState[G],
+      initial_state: AbstractState[G],
+  ): (Boolean, RASISuccessor[G]) = {
     val vars_changed: Boolean = state.valuations != initial_state.valuations
-    if (!state.processes.contains(this) || (vars_changed && !is_atomic(state.processes(this)))) (false, RASISuccessor(Set(), Set(state)))
-    else small_step(state.processes(this), state)
+    if (
+      !state.processes.contains(this) ||
+      (vars_changed && !is_atomic(state.processes(this)))
+    )
+      (false, RASISuccessor(Set(), Set(state)))
+    else
+      small_step(state.processes(this), state)
   }
 
-  /**
-   * Makes a small step in the symbolic execution. Executes the effect of the given CFG node on the given abstract state
-   * and returns a tuple of a boolean indicating whether progress was made and a set of all possible successor states.
-   *
-   * @param node CFG node to simulate
-   * @param state Current abstract state
-   * @return A tuple of a boolean indicating whether progress was made and a descriptor of all successor states
-   */
-  private def small_step(node: CFGEntry[G], state: AbstractState[G]): (Boolean, RASISuccessor[G]) = node match {
-    case CFGTerminal() => (false, RASISuccessor(Set(), Set(state.without_process(this))))
-    case CFGNode(n, succ) => n match {
-      // Assign statements change the state of variables directly (if they appear in the valuation)
-      case Assign(target, value) => (true, target.t match {
-        case _: IntType[_] | TBool() => take_viable_edges(succ, state, RASISuccessor(Set(), Set(state.with_valuation(target, state.resolve_expression(value)))))
-        case _: TSeq[_] => take_viable_edges(succ, state, RASISuccessor(Set(), Set(state.with_updated_collection(target, value))))   // TODO: Consider arrays
-        case _ => take_viable_edges_from_state(succ, state)
-      })
-      case Havoc(loc) => (true, take_viable_edges(succ, state, RASISuccessor(Set(), Set(state.with_valuation(loc, UncertainValue.uncertain_of(loc.t))))))
-      // Statements that induce assumptions about the state, such as assume, inhale, or a method's postcondition, might change the state implicitly
-      case Assume(assn) => (true, take_viable_edges(succ, state, state.with_assumption(assn)))
-      case Inhale(res) => (true, take_viable_edges(succ, state, state.with_assumption(res)))
-      // Abstract procedures, constructors and methods are defined by their postconditions      TODO: Handle local variables
-      case InvokeProcedure(ref, args, _, _, _, _) => (true, ref.decl.body match {
-        case Some(_) => take_viable_edges_from_state(succ, state)
-        case None => take_viable_edges(succ, state, state.with_postcondition(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args))))
-      })
-      case InvokeConstructor(ref, _, _, args, _, _, _, _) => (true, ref.decl.body match {
-        case Some(_) => take_viable_edges_from_state(succ, state)
-        case None => take_viable_edges(succ, state, state.with_postcondition(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args))))
-      })
-      case InvokeMethod(_, ref, args, _, _, _, _) => (true, ref.decl.body match {
-        case Some(_) => take_viable_edges_from_state(succ, state)
-        case None => take_viable_edges(succ, state, state.with_postcondition(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args))))
-      })
-      // TODO: Handle local variables
-      case Return(result) => (true, take_viable_edges_from_state(succ, state))
-      // TODO: What do wait and notify do?
-      case Wait(obj) => (true, take_viable_edges_from_state(succ, state))
-      case Notify(obj) => (true, take_viable_edges_from_state(succ, state))
-      // Lock and Unlock manipulate the global lock and are potentially blocking      TODO: Differentiate between locks!
-      case Lock(_) => state.lock match {
-        case Some(proc) => if (!proc.equals(this)) (false, RASISuccessor(Set(), Set(state)))
-                           else throw new IllegalStateException("Trying to lock already acquired lock")
-        case None => (true, take_viable_edges(succ, state, RASISuccessor(Set(), Set(state.locked_by(this)))))
-      }
-      case Unlock(_) => state.lock match {    // Progress was made, but the atomic flag is still false to allow other processes to execute
-        case Some(proc) => if (proc.equals(this)) (false, take_viable_edges(succ, state, RASISuccessor(Set(), Set(state.unlocked()))))
-                           else throw new IllegalStateException("Trying to unlock lock owned by other process")
-        case None => throw new IllegalStateException("Trying to unlock unlocked lock")
-      }
-      // When forking a new process, make the step of creating it simultaneously to the normal steps
-      case Fork(obj) =>
-        val edges: (mutable.Set[CFGEdge[G]], mutable.Set[CFGEdge[G]]) = succ.partition(e => e.target match {
-          case CFGTerminal() => false
-          case CFGNode(t, _) => t.equals(obj.t.asClass.get.cls.decl.declarations.collect{ case r: RunMethod[G] => r }.head.body.get)
-        })
-        val relevant: Boolean = edges._1.size == 1 && (edges._1.head.target match {
-          case CFGTerminal() => false
-          case target: CFGNode[G] => new StaticScanner(target, state).scan_can_change_variables()
-        })
-        (true, take_viable_edges(edges._2, state, RASISuccessor(Set(), Set(if (relevant) state.with_process_at(AbstractProcess(obj), edges._1.head.target) else state))))
-      case Join(obj) =>
-        if (state.processes.keys.forall(p => p.obj != obj)) (true, take_viable_edges_from_state(succ, state))
-        else (false, RASISuccessor(Set(), Set(state)))
-      // Everything else does not affect the state, so simply go to the next step
-      case _ => (true, take_viable_edges_from_state(succ, state))
+  /** Makes a small step in the symbolic execution. Executes the effect of the
+    * given CFG node on the given abstract state and returns a tuple of a
+    * boolean indicating whether progress was made and a set of all possible
+    * successor states.
+    *
+    * @param node
+    *   CFG node to simulate
+    * @param state
+    *   Current abstract state
+    * @return
+    *   A tuple of a boolean indicating whether progress was made and a
+    *   descriptor of all successor states
+    */
+  private def small_step(
+      node: CFGEntry[G],
+      state: AbstractState[G],
+  ): (Boolean, RASISuccessor[G]) =
+    node match {
+      case CFGTerminal() =>
+        (false, RASISuccessor(Set(), Set(state.without_process(this))))
+      case CFGNode(n, succ) =>
+        n match {
+          // Assign statements change the state of variables directly (if they appear in the valuation)
+          case Assign(target, value) =>
+            (
+              true,
+              target.t match {
+                case _: IntType[_] | TBool() =>
+                  take_viable_edges(
+                    succ,
+                    state,
+                    RASISuccessor(
+                      Set(),
+                      Set(state.with_valuation(
+                        target,
+                        state.resolve_expression(value),
+                      )),
+                    ),
+                  )
+                case _: TSeq[_] =>
+                  take_viable_edges(
+                    succ,
+                    state,
+                    RASISuccessor(
+                      Set(),
+                      Set(state.with_updated_collection(target, value)),
+                    ),
+                  ) // TODO: Consider arrays
+                case _ => take_viable_edges_from_state(succ, state)
+              },
+            )
+          case Havoc(loc) =>
+            (
+              true,
+              take_viable_edges(
+                succ,
+                state,
+                RASISuccessor(
+                  Set(),
+                  Set(
+                    state
+                      .with_valuation(loc, UncertainValue.uncertain_of(loc.t))
+                  ),
+                ),
+              ),
+            )
+          // Statements that induce assumptions about the state, such as assume, inhale, or a method's postcondition, might change the state implicitly
+          case Assume(assn) =>
+            (true, take_viable_edges(succ, state, state.with_assumption(assn)))
+          case Inhale(res) =>
+            (true, take_viable_edges(succ, state, state.with_assumption(res)))
+          // Abstract procedures, constructors and methods are defined by their postconditions      TODO: Handle local variables
+          case InvokeProcedure(ref, args, _, _, _, _) =>
+            (
+              true,
+              ref.decl.body match {
+                case Some(_) => take_viable_edges_from_state(succ, state)
+                case None =>
+                  take_viable_edges(
+                    succ,
+                    state,
+                    state.with_postcondition(
+                      ref.decl.contract.ensures,
+                      Map.from(ref.decl.args.zip(args)),
+                    ),
+                  )
+              },
+            )
+          case InvokeConstructor(ref, _, _, args, _, _, _, _) =>
+            (
+              true,
+              ref.decl.body match {
+                case Some(_) => take_viable_edges_from_state(succ, state)
+                case None =>
+                  take_viable_edges(
+                    succ,
+                    state,
+                    state.with_postcondition(
+                      ref.decl.contract.ensures,
+                      Map.from(ref.decl.args.zip(args)),
+                    ),
+                  )
+              },
+            )
+          case InvokeMethod(_, ref, args, _, _, _, _) =>
+            (
+              true,
+              ref.decl.body match {
+                case Some(_) => take_viable_edges_from_state(succ, state)
+                case None =>
+                  take_viable_edges(
+                    succ,
+                    state,
+                    state.with_postcondition(
+                      ref.decl.contract.ensures,
+                      Map.from(ref.decl.args.zip(args)),
+                    ),
+                  )
+              },
+            )
+          // TODO: Handle local variables
+          case Return(result) =>
+            (true, take_viable_edges_from_state(succ, state))
+          // TODO: What do wait and notify do?
+          case Wait(obj) => (true, take_viable_edges_from_state(succ, state))
+          case Notify(obj) => (true, take_viable_edges_from_state(succ, state))
+          // Lock and Unlock manipulate the global lock and are potentially blocking      TODO: Differentiate between locks!
+          case Lock(_) =>
+            state.lock match {
+              case Some(proc) =>
+                if (!proc.equals(this))
+                  (false, RASISuccessor(Set(), Set(state)))
+                else
+                  throw new IllegalStateException(
+                    "Trying to lock already acquired lock"
+                  )
+              case None =>
+                (
+                  true,
+                  take_viable_edges(
+                    succ,
+                    state,
+                    RASISuccessor(Set(), Set(state.locked_by(this))),
+                  ),
+                )
+            }
+          case Unlock(_) =>
+            state.lock match { // Progress was made, but the atomic flag is still false to allow other processes to execute
+              case Some(proc) =>
+                if (proc.equals(this))
+                  (
+                    false,
+                    take_viable_edges(
+                      succ,
+                      state,
+                      RASISuccessor(Set(), Set(state.unlocked())),
+                    ),
+                  )
+                else
+                  throw new IllegalStateException(
+                    "Trying to unlock lock owned by other process"
+                  )
+              case None =>
+                throw new IllegalStateException(
+                  "Trying to unlock unlocked lock"
+                )
+            }
+          // When forking a new process, make the step of creating it simultaneously to the normal steps
+          case Fork(obj) =>
+            val edges: (mutable.Set[CFGEdge[G]], mutable.Set[CFGEdge[G]]) = succ
+              .partition(e =>
+                e.target match {
+                  case CFGTerminal() => false
+                  case CFGNode(t, _) =>
+                    t.equals(obj.t.asClass.get.cls.decl.declarations.collect {
+                      case r: RunMethod[G] => r
+                    }.head.body.get)
+                }
+              )
+            val relevant: Boolean =
+              edges._1.size == 1 &&
+                (edges._1.head.target match {
+                  case CFGTerminal() => false
+                  case target: CFGNode[G] =>
+                    new StaticScanner(target, state)
+                      .scan_can_change_variables(None)
+                })
+            (
+              true,
+              take_viable_edges(
+                edges._2,
+                state,
+                RASISuccessor(
+                  Set(),
+                  Set(
+                    if (relevant)
+                      state.with_process_at(
+                        AbstractProcess(obj),
+                        edges._1.head.target,
+                      )
+                    else
+                      state
+                  ),
+                ),
+              ),
+            )
+          case Join(obj) =>
+            if (state.processes.keys.forall(p => p.obj != obj))
+              (true, take_viable_edges_from_state(succ, state))
+            else
+              (false, RASISuccessor(Set(), Set(state)))
+          // Everything else does not affect the state, so simply go to the next step
+          case _ => (true, take_viable_edges_from_state(succ, state))
+        }
     }
-  }
 
-  /**
-   * Helper function for <code>take_viable_edges</code> if there is no other change to the state.
-   */
-  private def take_viable_edges_from_state(edges: mutable.Set[CFGEdge[G]], state: AbstractState[G]): RASISuccessor[G] =
+  /** Helper function for <code>take_viable_edges</code> if there is no other
+    * change to the state.
+    */
+  private def take_viable_edges_from_state(
+      edges: mutable.Set[CFGEdge[G]],
+      state: AbstractState[G],
+  ): RASISuccessor[G] =
     take_viable_edges(edges, state, RASISuccessor(Set(), Set(state)))
-  /**
-   * Returns a successor object representing all states reachable in one state from the given starting state with the
-   * given control flow graph edges.
-   *
-   * @param edges Edges that are possible to take (might not be enabled)
-   * @param starting_state Starting state for the step
-   * @param new_states A descriptor containing possible initial states for the transition, in case another operation has
-   *                   been conducted on <code>starting_state</code>, e.g. changed variable valuations
-   * @return A successor object that contains all possible successor states
-   */
-  private def take_viable_edges(edges: mutable.Set[CFGEdge[G]], starting_state: AbstractState[G], new_states: RASISuccessor[G]): RASISuccessor[G] = {
-    val enabled_edges: (Set[CFGEdge[G]], Set[ConcreteVariable[G]]) = viable_edges(edges, starting_state)
-    RASISuccessor(new_states.deciding_variables ++ enabled_edges._2, enabled_edges._1.flatMap(e => new_states.successors.map(s => take_edge(e, s))))
+
+  /** Returns a successor object representing all states reachable in one state
+    * from the given starting state with the given control flow graph edges.
+    *
+    * @param edges
+    *   Edges that are possible to take (might not be enabled)
+    * @param starting_state
+    *   Starting state for the step
+    * @param new_states
+    *   A descriptor containing possible initial states for the transition, in
+    *   case another operation has been conducted on
+    *   <code>starting_state</code>, e.g. changed variable valuations
+    * @return
+    *   A successor object that contains all possible successor states
+    */
+  private def take_viable_edges(
+      edges: mutable.Set[CFGEdge[G]],
+      starting_state: AbstractState[G],
+      new_states: RASISuccessor[G],
+  ): RASISuccessor[G] = {
+    val enabled_edges: (Set[CFGEdge[G]], Set[ConcreteVariable[G]]) =
+      viable_edges(edges, starting_state)
+    RASISuccessor(
+      new_states.deciding_variables ++ enabled_edges._2,
+      enabled_edges._1
+        .flatMap(e => new_states.successors.map(s => take_edge(e, s)))
+        .flatMap(s => s.split_values()),
+    )
   }
 
-  /**
-   * Filters out CFG edges from a given set based on whether they would be viable in the given abstract state. Also
-   * returns the set of variables that can cause nondeterministic overapproximation in this step.
-   *
-   * @param edges A set of CFG edges
-   * @param state Current abstract state
-   * @return A tuple with a set of those entries of <code>edges</code> whose conditions could evaluate to
-   *         <code>true</code> in the given <code>state</code> and a set of variables that caused overapproximation in
-   *         this step
-   */
-  private def viable_edges(edges: mutable.Set[CFGEdge[G]], state: AbstractState[G]): (Set[CFGEdge[G]], Set[ConcreteVariable[G]]) = {
-    val viable: Set[CFGEdge[G]] = edges.filter(e => e.condition.isEmpty || state.resolve_boolean_expression(e.condition.get).can_be_true).toSet
-    val variables: Set[ConcreteVariable[G]] = new VariableSelector(state).deciding_variables(viable.map(e => e.condition))
+  /** Filters out CFG edges from a given set based on whether they would be
+    * viable in the given abstract state. Also returns the set of variables that
+    * can cause nondeterministic overapproximation in this step.
+    *
+    * @param edges
+    *   A set of CFG edges
+    * @param state
+    *   Current abstract state
+    * @return
+    *   A tuple with a set of those entries of <code>edges</code> whose
+    *   conditions could evaluate to <code>true</code> in the given
+    *   <code>state</code> and a set of variables that caused overapproximation
+    *   in this step
+    */
+  private def viable_edges(
+      edges: mutable.Set[CFGEdge[G]],
+      state: AbstractState[G],
+  ): (Set[CFGEdge[G]], Set[ConcreteVariable[G]]) = {
+    val viable: Set[CFGEdge[G]] =
+      edges.filter(e =>
+        e.condition.isEmpty || state.resolve_boolean_expression(e.condition.get)
+          .can_be_true
+      ).toSet
+    val variables: Set[ConcreteVariable[G]] = new VariableSelector(state)
+      .deciding_variables(viable.map(e => e.condition))
     (viable, variables)
   }
 
-  /**
-   * Returns the abstract state that results in this process taking a transition in the CFG.
-   *
-   * @param edge CFG transition edge to take
-   * @param state Current abstract state
-   * @return Copy of <code>state</code> with this process at the target node of the CFG transition
-   */
-  private def take_edge(edge: CFGEdge[G], state: AbstractState[G]): AbstractState[G] =
+  /** Returns the abstract state that results in this process taking a
+    * transition in the CFG.
+    *
+    * @param edge
+    *   CFG transition edge to take
+    * @param state
+    *   Current abstract state
+    * @return
+    *   Copy of <code>state</code> with this process at the target node of the
+    *   CFG transition
+    */
+  private def take_edge(
+      edge: CFGEdge[G],
+      state: AbstractState[G],
+  ): AbstractState[G] =
     state.with_process_at(this, edge.target).with_condition(edge.condition)
 
-  /**
-   * Checks whether the considered block is still atomic when adding the next node.
-   *
-   * @param node CFG node that might be considered next
-   * @return <code>false</code> if the node checks the global invariant, <code>true</code> otherwise
-   */
-  private def is_atomic(node: CFGEntry[G]): Boolean = node match {
-    case CFGTerminal() => true
-    case CFGNode(n, _) => n match {
-      case Assert(res) => !Utils.contains_global_invariant(res)
-      case _ => true
+  /** Checks whether the considered block is still atomic when adding the next
+    * node.
+    *
+    * @param node
+    *   CFG node that might be considered next
+    * @return
+    *   <code>false</code> if the node checks the global invariant,
+    *   <code>true</code> otherwise
+    */
+  private def is_atomic(node: CFGEntry[G]): Boolean =
+    node match {
+      case CFGTerminal() => true
+      case CFGNode(n, _) =>
+        n match {
+          case Assert(res) => !Utils.contains_global_invariant(res)
+          case _ => true
+        }
     }
-  }
 }
diff --git a/src/rewrite/vct/rewrite/rasi/AbstractState.scala b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
index b92044490c..4239a1be5c 100644
--- a/src/rewrite/vct/rewrite/rasi/AbstractState.scala
+++ b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
@@ -5,112 +5,201 @@ import vct.rewrite.cfg.CFGEntry
 
 import scala.collection.immutable.HashMap
 
-case class AbstractState[G](valuations: Map[ConcreteVariable[G], UncertainValue],
-                            processes: HashMap[AbstractProcess[G], CFGEntry[G]],
-                            lock: Option[AbstractProcess[G]],
-                            parameters: Map[FieldVariable[G], UncertainValue]) {
-  /**
-   * Main function of the abstract state. For all processes that could potentially run, execute all possible next steps.
-   *
-   * @return The set of possible successor states
-   */
+case class AbstractState[G](
+    valuations: Map[ConcreteVariable[G], UncertainValue],
+    processes: HashMap[AbstractProcess[G], CFGEntry[G]],
+    lock: Option[AbstractProcess[G]],
+    parameters: Map[FieldVariable[G], UncertainValue],
+) {
+
+  /** Main function of the abstract state. For all processes that could
+    * potentially run, execute all possible next steps.
+    *
+    * @return
+    *   The set of possible successor states
+    */
   def successors(): RASISuccessor[G] = {
-    RASISuccessor.from(processes.keySet.filter(p => lock.isEmpty || lock.get.equals(p)).map(p => p.atomic_step(this)))
+    RASISuccessor.from(
+      processes.keySet.filter(p => lock.isEmpty || lock.get.equals(p))
+        .map(p => p.atomic_step(this))
+    )
   }
 
-  /**
-   * Updates the state by changing the program counter for a process.
-   *
-   * @param process Process to update
-   * @param position New position of the process
-   * @return An abstract state that is a copy of this one with the updated process location
-   */
-  def with_process_at(process: AbstractProcess[G], position: CFGEntry[G]): AbstractState[G] =
-    AbstractState(valuations, processes.removed(process) + (process -> position), lock, parameters)
+  /** Updates the state by changing the program counter for a process.
+    *
+    * @param process
+    *   Process to update
+    * @param position
+    *   New position of the process
+    * @return
+    *   An abstract state that is a copy of this one with the updated process
+    *   location
+    */
+  def with_process_at(
+      process: AbstractProcess[G],
+      position: CFGEntry[G],
+  ): AbstractState[G] =
+    AbstractState(
+      valuations,
+      processes.removed(process) + (process -> position),
+      lock,
+      parameters,
+    )
 
-  /**
-   * Updates the state by removing a process from the active list.
-   *
-   * @param process Process to remove
-   * @return An abstract state that is a copy of this one without the given process
-   */
+  /** Updates the state by removing a process from the active list.
+    *
+    * @param process
+    *   Process to remove
+    * @return
+    *   An abstract state that is a copy of this one without the given process
+    */
   def without_process(process: AbstractProcess[G]): AbstractState[G] =
     AbstractState(valuations, processes.removed(process), lock, parameters)
 
-  /**
-   * Updates the state by locking the global lock.
-   *
-   * @param process Process that should hold the global lock
-   * @return An abstract state that is a copy of this one with the lock held by the given process
-   */
+  /** Updates the state by locking the global lock.
+    *
+    * @param process
+    *   Process that should hold the global lock
+    * @return
+    *   An abstract state that is a copy of this one with the lock held by the
+    *   given process
+    */
   def locked_by(process: AbstractProcess[G]): AbstractState[G] =
     AbstractState(valuations, processes, Some(process), parameters)
 
-  /**
-   * Updates the state by unlocking the global lock.
-   *
-   * @return An abstract state that is a copy of this one with the global lock unlocked
-   */
+  /** Updates the state by unlocking the global lock.
+    *
+    * @return
+    *   An abstract state that is a copy of this one with the global lock
+    *   unlocked
+    */
   def unlocked(): AbstractState[G] =
     AbstractState(valuations, processes, None, parameters)
 
-  /**
-   * Updates the state by adding a path condition to its knowledge of parameters (to avoid infeasible assumptions about
-   * potential paths).
-   *
-   * @param cond Path condition; can be <code>None</code>, which is equivalent to <code>true</code>
-   * @return An abstract state that is a copy of this one with the path condition taken into account
-   */
-  def with_condition(cond: Option[Expr[G]]): AbstractState[G] = cond match {
-    case None => this
-    case Some(expr) =>
-      val c = new ConstraintSolver(this, valuations.keySet.union(parameters.keySet.asInstanceOf[Set[ConcreteVariable[G]]]), false)
-                                  .resolve_assumption(expr)
-                                  .filter(m => !m.is_impossible)
-                                  .reduce((m1, m2) => m1 || m2)
-                                  .resolve
-      AbstractState(valuations.map(v => v._1 -> (if (c.contains(v._1)) v._2.intersection(c(v._1)) else v._2)),
-                    processes,
-                    lock,
-                    parameters.map(v => v._1 -> (if (c.contains(v._1)) v._2.intersection(c(v._1)) else v._2)))
+  /** Splits this state such that every variable for which this is possible only
+    * has a single value in any of the resulting states. Variables for which
+    * this is not possible have their uncertain value copied into all substates.
+    *
+    * @return
+    *   A set of states that, in total, represents the same valuations as this
+    *   state, with each resulting state containing only variable valuations
+    *   that are as sharp as possible
+    */
+  def split_values(): Set[AbstractState[G]] = {
+    val valuation_sets: Iterable[Set[(ConcreteVariable[G], UncertainValue)]] =
+      valuations.map(t => t._2.split.getOrElse(Set(t._2)).map(v => t._1 -> v))
+    Utils.cartesian_product(valuation_sets)
+      .map(vs => AbstractState(Map.from(vs), processes, lock, parameters))
   }
 
-  /**
-   * Updates the state by updating the value of a certain variable.
-   *
-   * @param variable Variable to update
-   * @param value New value for the variable
-   * @return An abstract state that is a copy of this one with the valuation for the given variable changed
-   */
-  def with_valuation(variable: Expr[G], value: UncertainValue): AbstractState[G] = variable_from_expr(variable) match {
-    case Some(concrete_variable) => AbstractState(valuations + (concrete_variable -> value), processes, lock, parameters)
-    case None => this
-  }
+  /** Updates the state by adding a path condition to its knowledge of
+    * parameters (to avoid infeasible assumptions about potential paths).
+    *
+    * @param cond
+    *   Path condition; can be <code>None</code>, which is equivalent to
+    *   <code>true</code>
+    * @return
+    *   An abstract state that is a copy of this one with the path condition
+    *   taken into account
+    */
+  def with_condition(cond: Option[Expr[G]]): AbstractState[G] =
+    cond match {
+      case None => this
+      case Some(expr) =>
+        val c =
+          new ConstraintSolver(
+            this,
+            valuations.keySet
+              .union(parameters.keySet.asInstanceOf[Set[ConcreteVariable[G]]]),
+            false,
+          ).resolve_assumption(expr).filter(m => !m.is_impossible)
+            .reduce((m1, m2) => m1 || m2).resolve
+        AbstractState(
+          valuations.map(v =>
+            v._1 ->
+              (if (c.contains(v._1))
+                 v._2.intersection(c(v._1))
+               else
+                 v._2)
+          ),
+          processes,
+          lock,
+          parameters.map(v =>
+            v._1 ->
+              (if (c.contains(v._1))
+                 v._2.intersection(c(v._1))
+               else
+                 v._2)
+          ),
+        )
+    }
+
+  /** Updates the state by updating the value of a certain variable.
+    *
+    * @param variable
+    *   Variable to update
+    * @param value
+    *   New value for the variable
+    * @return
+    *   An abstract state that is a copy of this one with the valuation for the
+    *   given variable changed
+    */
+  def with_valuation(
+      variable: Expr[G],
+      value: UncertainValue,
+  ): AbstractState[G] =
+    variable_from_expr(variable) match {
+      case Some(concrete_variable) =>
+        AbstractState(
+          valuations + (concrete_variable -> value),
+          processes,
+          lock,
+          parameters,
+        )
+      case None => this
+    }
 
-  /**
-   * Updates the state by adding a different valuation map to override or expand the valuations of this state. This is
-   * equivalent to calling <code>with_valuation</code> repeatedly with the entries of the new map.
-   *
-   * @param vals A new valuation map
-   * @return An abstract state that is a copy of this one with the updated valuation
-   */
-  def with_new_valuation(vals: Map[ConcreteVariable[G], UncertainValue]): AbstractState[G] =
+  /** Updates the state by adding a different valuation map to override or
+    * expand the valuations of this state. This is equivalent to calling
+    * <code>with_valuation</code> repeatedly with the entries of the new map.
+    *
+    * @param vals
+    *   A new valuation map
+    * @return
+    *   An abstract state that is a copy of this one with the updated valuation
+    */
+  def with_new_valuation(
+      vals: Map[ConcreteVariable[G], UncertainValue]
+  ): AbstractState[G] =
     AbstractState(valuations ++ vals, processes, lock, parameters)
 
-  /**
-   * Updates the state by updating all variables that are affected by an update to a collection.
-   *
-   * @param variable The collection that should be updated
-   * @param assigned New value for the collection
-   * @return An abstract state that is a copy of this one with the values of all variables that are affected by the
-   *         collection updated accordingly
-   */
-  def with_updated_collection(variable: Expr[G], assigned: Expr[G]): AbstractState[G] = {
-    val affected: Set[ConcreteVariable[G]] = valuations.keySet.filter(v => v.is_contained_by(variable, this))
-    val indexed: Set[IndexedVariable[G]] = affected.collect{ case v: IndexedVariable[G] => v }
-    val size: Set[SizeVariable[G]] = affected.collect{ case v: SizeVariable[G] => v }
-    if (affected.isEmpty) return this
-    val by_index: Map[Int, IndexedVariable[G]] = Map.from(indexed.map(v => (v.i, v)))
+  /** Updates the state by updating all variables that are affected by an update
+    * to a collection.
+    *
+    * @param variable
+    *   The collection that should be updated
+    * @param assigned
+    *   New value for the collection
+    * @return
+    *   An abstract state that is a copy of this one with the values of all
+    *   variables that are affected by the collection updated accordingly
+    */
+  def with_updated_collection(
+      variable: Expr[G],
+      assigned: Expr[G],
+  ): AbstractState[G] = {
+    val affected: Set[ConcreteVariable[G]] = valuations.keySet
+      .filter(v => v.is_contained_by(variable, this))
+    val indexed: Set[IndexedVariable[G]] = affected.collect {
+      case v: IndexedVariable[G] => v
+    }
+    val size: Set[SizeVariable[G]] = affected.collect {
+      case v: SizeVariable[G] => v
+    }
+    if (affected.isEmpty)
+      return this
+    val by_index: Map[Int, IndexedVariable[G]] = Map
+      .from(indexed.map(v => (v.i, v)))
     val new_values: UncertainSequence = resolve_collection_expression(assigned)
     var vals: Map[ConcreteVariable[G], UncertainValue] = valuations
     by_index.foreach(t => vals = vals + (t._2 -> new_values.get(t._1)))
@@ -118,320 +207,656 @@ case class AbstractState[G](valuations: Map[ConcreteVariable[G], UncertainValue]
     AbstractState(vals, processes, lock, parameters)
   }
 
-
-  /**
-   * Updates the state by taking a specification in the form of an assumption into account. Also returns the variables
-   * that could cause nondeterministic overapproximation in this operation.
-   *
-   * @param assumption Boolean expression expressing a state update
-   * @return A descriptor for states that comply with the given assumption, given this state as the pre-state
-   */
+  /** Updates the state by taking a specification in the form of an assumption
+    * into account. Also returns the variables that could cause nondeterministic
+    * overapproximation in this operation.
+    *
+    * @param assumption
+    *   Boolean expression expressing a state update
+    * @return
+    *   A descriptor for states that comply with the given assumption, given
+    *   this state as the pre-state
+    */
   def with_assumption(assumption: Expr[G]): RASISuccessor[G] = {
-    val constraints: Set[Map[ConcreteVariable[G], UncertainValue]] = new ConstraintSolver(this, valuations.keySet, is_contract = false)
-                                                                                .resolve_assumption(assumption)
-                                                                                .filter(m => !m.is_impossible)
-                                                                                .map(m => Utils.resolvable_to_concrete(m.resolve))
-                                                                                .filter(m => m.forall(t => !t._2.intersection(valuations(t._1)).is_impossible))
+    val constraints: Set[Map[ConcreteVariable[G], UncertainValue]] =
+      new ConstraintSolver(this, valuations.keySet, is_contract = false)
+        .resolve_assumption(assumption).filter(m => !m.is_impossible)
+        .map(m => Utils.resolvable_to_concrete(m.resolve)).filter(m =>
+          m.forall(t => !t._2.intersection(valuations(t._1)).is_impossible)
+        )
 
-    val variables: Set[ConcreteVariable[G]] = new VariableSelector(this).distinguishing_variables(constraints, Some(assumption))
+    val variables: Set[ConcreteVariable[G]] = new VariableSelector(this)
+      .distinguishing_variables(constraints, Some(assumption))
 
-    RASISuccessor(variables,                // For an assumption, the added conditions don't overwrite the previous state
-                  constraints.map(m => AbstractState(Utils.val_intersect(valuations, m), processes, lock, parameters)))
+    RASISuccessor(
+      variables, // For an assumption, the added conditions don't overwrite the previous state
+      constraints.map(m =>
+        AbstractState(
+          Utils.val_intersect(valuations, m),
+          processes,
+          lock,
+          parameters,
+        )
+      ),
+    )
   }
 
-  /**
-   * Updates the state by assuming a postcondition. Also returns the variables that could cause nondeterministic
-   * overapproximation in this operation
-   *
-   * @param post Postcondition that alters the state
-   * @param args A map from the method parameters to the given arguments, to be textually replaced
-   * @return A descriptor for states that comply with the given postcondition, given this state as the pre-state
-   */
-  def with_postcondition(post: AccountedPredicate[G], args: Map[Variable[G], Expr[G]]): RASISuccessor[G] = {
-    val assumption: Expr[G] = Utils.unify_expression(Utils.contract_to_expression(post), args)
-    val constraints: Set[Map[ConcreteVariable[G], UncertainValue]] = new ConstraintSolver(this, valuations.keySet, is_contract = true)
-                                                                                  .resolve_assumption(assumption)
-                                                                                  .filter(m => !m.is_impossible)
-                                                                                  .map(m => Utils.resolvable_to_concrete(m.resolve))
+  /** Updates the state by assuming a postcondition. Also returns the variables
+    * that could cause nondeterministic overapproximation in this operation
+    *
+    * @param post
+    *   Postcondition that alters the state
+    * @param args
+    *   A map from the method parameters to the given arguments, to be textually
+    *   replaced
+    * @return
+    *   A descriptor for states that comply with the given postcondition, given
+    *   this state as the pre-state
+    */
+  def with_postcondition(
+      post: AccountedPredicate[G],
+      args: Map[Variable[G], Expr[G]],
+  ): RASISuccessor[G] = {
+    val assumption: Expr[G] = Utils
+      .unify_expression(Utils.contract_to_expression(post), args)
+    val constraints: Set[Map[ConcreteVariable[G], UncertainValue]] =
+      new ConstraintSolver(this, valuations.keySet, is_contract = true)
+        .resolve_assumption(assumption).filter(m => !m.is_impossible)
+        .map(m => Utils.resolvable_to_concrete(m.resolve))
 
-    val variables: Set[ConcreteVariable[G]] = new VariableSelector(this).distinguishing_variables(constraints, Some(assumption))
+    val variables: Set[ConcreteVariable[G]] = new VariableSelector(this)
+      .distinguishing_variables(constraints, Some(assumption))
 
-    RASISuccessor(variables,                              // A postcondition simply overwrites the values it specifies
-                  constraints.map(m => AbstractState(valuations.map(e => e._1 -> m.getOrElse(e._1, e._2)), processes, lock, parameters)))
+    RASISuccessor(
+      variables, // A postcondition simply overwrites the values it specifies
+      constraints.map(m =>
+        AbstractState(
+          valuations.map(e => e._1 -> m.getOrElse(e._1, e._2)),
+          processes,
+          lock,
+          parameters,
+        )
+      ),
+    )
   }
 
-  /**
-   * Evaluates an expression and returns an uncertain value, depending on the type of expression and the values it can
-   * take with the given level of abstraction. This method can only handle single-value types, not collections.
-   *
-   * @param expr COL expression to resolve
-   * @return An uncertain value of the correct type
-   */
-  def resolve_expression(expr: Expr[G], is_old: Boolean = false, is_contract: Boolean = false): UncertainValue = expr.t match {
-    case _: IntType[_] => resolve_integer_expression(expr, is_old, is_contract)
-    case _: TBool[_] | _: TResource[_] => resolve_boolean_expression(expr, is_old, is_contract)
-    case _ => throw new IllegalArgumentException(s"Type ${expr.t.toInlineString} is not supported")
-  }
+  /** Evaluates an expression and returns an uncertain value, depending on the
+    * type of expression and the values it can take with the given level of
+    * abstraction. This method can only handle single-value types, not
+    * collections.
+    *
+    * @param expr
+    *   COL expression to resolve
+    * @return
+    *   An uncertain value of the correct type
+    */
+  def resolve_expression(
+      expr: Expr[G],
+      is_old: Boolean = false,
+      is_contract: Boolean = false,
+  ): UncertainValue =
+    expr.t match {
+      case _: IntType[_] =>
+        resolve_integer_expression(expr, is_old, is_contract)
+      case _: TBool[_] | _: TResource[_] =>
+        resolve_boolean_expression(expr, is_old, is_contract)
+      case _ =>
+        throw new IllegalArgumentException(
+          s"Type ${expr.t.toInlineString} is not supported"
+        )
+    }
 
-  /**
-   * Evaluates an integer expression and returns an uncertain integer value.
-   *
-   * @param expr integer-type COL expression
-   * @return An uncertain value that represents all possible valuations of the given expression
-   */
-  def resolve_integer_expression(expr: Expr[G], is_old: Boolean = false, is_contract: Boolean = false): UncertainIntegerValue = expr match {
-    case CIntegerValue(value) => UncertainIntegerValue.single(value.intValue)
-    case IntegerValue(value) => UncertainIntegerValue.single(value.intValue)
-    case SizeOf(tname) => UncertainIntegerValue.above(1)    // TODO: Can we use more information about sizeof?
-    case UMinus(arg) => -resolve_integer_expression(arg, is_old, is_contract)
-    case AmbiguousMult(left, right) => resolve_integer_expression(left, is_old, is_contract) * resolve_integer_expression(right, is_old, is_contract)
-    case AmbiguousPlus(left, right) => resolve_integer_expression(left, is_old, is_contract) + resolve_integer_expression(right, is_old, is_contract)
-    case AmbiguousMinus(left, right) => resolve_integer_expression(left, is_old, is_contract) - resolve_integer_expression(right, is_old, is_contract)
-    case Exp(left, right) => resolve_integer_expression(left, is_old, is_contract).pow(resolve_integer_expression(right, is_old, is_contract))
-    case Plus(left, right) => resolve_integer_expression(left, is_old, is_contract) + resolve_integer_expression(right, is_old, is_contract)
-    case Minus(left, right) => resolve_integer_expression(left, is_old, is_contract) - resolve_integer_expression(right, is_old, is_contract)
-    case Mult(left, right) => resolve_integer_expression(left, is_old, is_contract) * resolve_integer_expression(right, is_old, is_contract)
-    case FloorDiv(left, right) => resolve_integer_expression(left, is_old, is_contract) / resolve_integer_expression(right, is_old, is_contract)
-    case Mod(left, right) => resolve_integer_expression(left, is_old, is_contract) % resolve_integer_expression(right, is_old, is_contract)
-    // Bit operations destroy any knowledge of integer state       TODO: Support bit operations?
-    case BitNot(_) => UncertainIntegerValue.uncertain()
-    case AmbiguousComputationalOr(_, _) => UncertainIntegerValue.uncertain()
-    case AmbiguousComputationalXor(_, _) => UncertainIntegerValue.uncertain()
-    case AmbiguousComputationalAnd(_, _) => UncertainIntegerValue.uncertain()
-    case ComputationalOr(_, _) => UncertainIntegerValue.uncertain()
-    case ComputationalXor(_, _) => UncertainIntegerValue.uncertain()
-    case ComputationalAnd(_, _) => UncertainIntegerValue.uncertain()
-    case BitAnd(_, _) => UncertainIntegerValue.uncertain()
-    case BitOr(_, _) => UncertainIntegerValue.uncertain()
-    case BitXor(_, _) => UncertainIntegerValue.uncertain()
-    case BitShl(_, _) => UncertainIntegerValue.uncertain()
-    case BitShr(_, _) => UncertainIntegerValue.uncertain()
-    case BitUShr(_, _) => UncertainIntegerValue.uncertain()
-    case Select(cond, ift, iff) =>
-      var value: UncertainIntegerValue = UncertainIntegerValue.empty()
-      if (resolve_boolean_expression(cond, is_old, is_contract).can_be_true) {
-        value = value.union(resolve_integer_expression(ift, is_old, is_contract)).asInstanceOf[UncertainIntegerValue]
-      }
-      if (resolve_boolean_expression(cond, is_old, is_contract).can_be_false) {
-        value = value.union(resolve_integer_expression(iff, is_old, is_contract)).asInstanceOf[UncertainIntegerValue]
-      }
-      value
-    case Old(exp, at) => at match {
-      case Some(_) => throw new IllegalArgumentException(s"Cannot resolve labelled old expression ${expr.toInlineString}")
-      case None => resolve_integer_expression(exp, is_old = true, is_contract)
+  /** Evaluates an integer expression and returns an uncertain integer value.
+    *
+    * @param expr
+    *   integer-type COL expression
+    * @return
+    *   An uncertain value that represents all possible valuations of the given
+    *   expression
+    */
+  def resolve_integer_expression(
+      expr: Expr[G],
+      is_old: Boolean = false,
+      is_contract: Boolean = false,
+  ): UncertainIntegerValue =
+    expr match {
+      case CIntegerValue(value) => UncertainIntegerValue.single(value.intValue)
+      case IntegerValue(value) => UncertainIntegerValue.single(value.intValue)
+      case SizeOf(tname) =>
+        UncertainIntegerValue
+          .above(1) // TODO: Can we use more information about sizeof?
+      case UMinus(arg) => -resolve_integer_expression(arg, is_old, is_contract)
+      case AmbiguousMult(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) *
+          resolve_integer_expression(right, is_old, is_contract)
+      case AmbiguousPlus(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) +
+          resolve_integer_expression(right, is_old, is_contract)
+      case AmbiguousMinus(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) -
+          resolve_integer_expression(right, is_old, is_contract)
+      case Exp(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract)
+          .pow(resolve_integer_expression(right, is_old, is_contract))
+      case Plus(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) +
+          resolve_integer_expression(right, is_old, is_contract)
+      case Minus(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) -
+          resolve_integer_expression(right, is_old, is_contract)
+      case Mult(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) *
+          resolve_integer_expression(right, is_old, is_contract)
+      case FloorDiv(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) /
+          resolve_integer_expression(right, is_old, is_contract)
+      case Mod(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) %
+          resolve_integer_expression(right, is_old, is_contract)
+      // Bit operations destroy any knowledge of integer state       TODO: Support bit operations?
+      case BitNot(_) => UncertainIntegerValue.uncertain()
+      case AmbiguousComputationalOr(_, _) => UncertainIntegerValue.uncertain()
+      case AmbiguousComputationalXor(_, _) => UncertainIntegerValue.uncertain()
+      case AmbiguousComputationalAnd(_, _) => UncertainIntegerValue.uncertain()
+      case ComputationalOr(_, _) => UncertainIntegerValue.uncertain()
+      case ComputationalXor(_, _) => UncertainIntegerValue.uncertain()
+      case ComputationalAnd(_, _) => UncertainIntegerValue.uncertain()
+      case BitAnd(_, _) => UncertainIntegerValue.uncertain()
+      case BitOr(_, _) => UncertainIntegerValue.uncertain()
+      case BitXor(_, _) => UncertainIntegerValue.uncertain()
+      case BitShl(_, _) => UncertainIntegerValue.uncertain()
+      case BitShr(_, _) => UncertainIntegerValue.uncertain()
+      case BitUShr(_, _) => UncertainIntegerValue.uncertain()
+      case Select(cond, ift, iff) =>
+        var value: UncertainIntegerValue = UncertainIntegerValue.empty()
+        if (resolve_boolean_expression(cond, is_old, is_contract).can_be_true) {
+          value = value
+            .union(resolve_integer_expression(ift, is_old, is_contract))
+            .asInstanceOf[UncertainIntegerValue]
+        }
+        if (
+          resolve_boolean_expression(cond, is_old, is_contract).can_be_false
+        ) {
+          value = value
+            .union(resolve_integer_expression(iff, is_old, is_contract))
+            .asInstanceOf[UncertainIntegerValue]
+        }
+        value
+      case Old(exp, at) =>
+        at match {
+          case Some(_) =>
+            throw new IllegalArgumentException(
+              s"Cannot resolve labelled old expression ${expr.toInlineString}"
+            )
+          case None =>
+            resolve_integer_expression(exp, is_old = true, is_contract)
+        }
+      case Local(_) | DerefHeapVariable(_) | Deref(_, _) | DerefPointer(_) |
+          AmbiguousSubscript(_, _) | SeqSubscript(_, _) | ArraySubscript(_, _) |
+          PointerSubscript(_, _) =>
+        variable_from_expr(expr) match {
+          case Some(v) =>
+            if (is_contract && !is_old)
+              UncertainIntegerValue.uncertain()
+            else
+              valuations(v).asInstanceOf[UncertainIntegerValue]
+          case None =>
+            parameter_from_expr(expr) match {
+              case Some(v) => parameters(v).asInstanceOf[UncertainIntegerValue]
+              case None => UncertainIntegerValue.uncertain()
+            }
+        }
+      case Length(arr) =>
+        variable_from_expr(expr) match {
+          case Some(v) =>
+            if (is_contract && !is_old)
+              UncertainIntegerValue.above(0)
+            else
+              valuations(v).asInstanceOf[UncertainIntegerValue]
+          case None => resolve_collection_expression(arr).len
+        }
+      case Size(obj) =>
+        variable_from_expr(expr) match {
+          case Some(v) =>
+            if (is_contract && !is_old)
+              UncertainIntegerValue.above(0)
+            else
+              valuations(v).asInstanceOf[UncertainIntegerValue]
+          case None => resolve_collection_expression(obj).len
+        }
+      case ProcedureInvocation(ref, args, _, _, _, _) =>
+        get_subroutine_return(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+          ref.decl.returnType,
+        ).asInstanceOf[UncertainIntegerValue]
+      case MethodInvocation(_, ref, args, _, _, _, _) =>
+        get_subroutine_return(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+          ref.decl.returnType,
+        ).asInstanceOf[UncertainIntegerValue]
+      case FunctionInvocation(ref, args, _, _, _) =>
+        get_subroutine_return(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+          ref.decl.returnType,
+        ).asInstanceOf[UncertainIntegerValue]
+      case InstanceFunctionInvocation(_, ref, args, _, _, _) =>
+        get_subroutine_return(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+          ref.decl.returnType,
+        ).asInstanceOf[UncertainIntegerValue]
+      case Result(_) => UncertainIntegerValue.uncertain()
+      case AmbiguousResult() => UncertainIntegerValue.uncertain()
     }
-    case Local(_) | DerefHeapVariable(_) | Deref(_, _) | DerefPointer(_) | AmbiguousSubscript(_, _) | SeqSubscript(_, _) | ArraySubscript(_, _) | PointerSubscript(_, _) =>
-      variable_from_expr(expr) match {
-        case Some(v) =>
-          if (is_contract && !is_old) UncertainIntegerValue.uncertain()
-          else valuations(v).asInstanceOf[UncertainIntegerValue]
-        case None => parameter_from_expr(expr) match {
-          case Some(v) => parameters(v).asInstanceOf[UncertainIntegerValue]
-          case None => UncertainIntegerValue.uncertain()
+
+  /** Evaluates a boolean expression and returns an uncertain boolean value.
+    *
+    * @param expr
+    *   boolean-type COL expression
+    * @return
+    *   An uncertain boolean value that represents all possible values that the
+    *   given expression can take on
+    */
+  def resolve_boolean_expression(
+      expr: Expr[G],
+      is_old: Boolean = false,
+      is_contract: Boolean = false,
+  ): UncertainBooleanValue =
+    expr match {
+      case BooleanValue(value) => UncertainBooleanValue.from(value)
+      case Not(arg) => !resolve_boolean_expression(arg)
+      case AmbiguousOr(left, right) =>
+        resolve_boolean_expression(left, is_old, is_contract) ||
+        resolve_boolean_expression(right, is_old, is_contract)
+      case Star(left, right) =>
+        resolve_boolean_expression(left, is_old, is_contract) &&
+        resolve_boolean_expression(right, is_old, is_contract)
+      case And(left, right) =>
+        resolve_boolean_expression(left, is_old, is_contract) &&
+        resolve_boolean_expression(right, is_old, is_contract)
+      case Or(left, right) =>
+        resolve_boolean_expression(left, is_old, is_contract) ||
+        resolve_boolean_expression(right, is_old, is_contract)
+      case Implies(left, right) =>
+        (!resolve_boolean_expression(left, is_old, is_contract)) ||
+        resolve_boolean_expression(right, is_old, is_contract)
+      case Eq(left, right) =>
+        handle_equality(left, right, is_old, is_contract, negate = false)
+      case Neq(left, right) =>
+        handle_equality(left, right, is_old, is_contract, negate = true)
+      case AmbiguousGreater(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) >
+          resolve_integer_expression(right, is_old, is_contract)
+      case AmbiguousLess(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) <
+          resolve_integer_expression(right, is_old, is_contract)
+      case AmbiguousGreaterEq(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) >=
+          resolve_integer_expression(right, is_old, is_contract)
+      case AmbiguousLessEq(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) <=
+          resolve_integer_expression(right, is_old, is_contract)
+      case Greater(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) >
+          resolve_integer_expression(right, is_old, is_contract)
+      case Less(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) <
+          resolve_integer_expression(right, is_old, is_contract)
+      case GreaterEq(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) >=
+          resolve_integer_expression(right, is_old, is_contract)
+      case LessEq(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) <=
+          resolve_integer_expression(right, is_old, is_contract)
+      case Select(cond, ift, iff) =>
+        var value: UncertainBooleanValue = UncertainBooleanValue.empty()
+        if (resolve_boolean_expression(cond, is_old, is_contract).can_be_true) {
+          value = value
+            .union(resolve_boolean_expression(ift, is_old, is_contract))
+            .asInstanceOf[UncertainBooleanValue]
         }
-      }
-    case Length(arr) => variable_from_expr(expr) match {
-      case Some(v) =>
-        if (is_contract && !is_old) UncertainIntegerValue.above(0)
-        else valuations(v).asInstanceOf[UncertainIntegerValue]
-      case None => resolve_collection_expression(arr).len
+        if (
+          resolve_boolean_expression(cond, is_old, is_contract).can_be_false
+        ) {
+          value = value
+            .union(resolve_boolean_expression(iff, is_old, is_contract))
+            .asInstanceOf[UncertainBooleanValue]
+        }
+        value
+      case Old(exp, at) =>
+        at match {
+          case Some(_) =>
+            throw new IllegalArgumentException(
+              s"Cannot resolve labelled old expression ${expr.toInlineString}"
+            )
+          case None =>
+            resolve_boolean_expression(exp, is_old = true, is_contract)
+        }
+      case Local(_) | DerefHeapVariable(_) | Deref(_, _) | DerefPointer(_) |
+          AmbiguousSubscript(_, _) | SeqSubscript(_, _) | ArraySubscript(_, _) |
+          PointerSubscript(_, _) =>
+        variable_from_expr(expr) match {
+          case Some(v) =>
+            if (is_contract && !is_old)
+              UncertainBooleanValue.uncertain()
+            else
+              valuations(v).asInstanceOf[UncertainBooleanValue]
+          case None =>
+            parameter_from_expr(expr) match {
+              case Some(v) => parameters(v).asInstanceOf[UncertainBooleanValue]
+              case None => UncertainBooleanValue.uncertain()
+            }
+        }
+      case ProcedureInvocation(ref, args, _, _, _, _) =>
+        get_subroutine_return(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+          ref.decl.returnType,
+        ).asInstanceOf[UncertainBooleanValue]
+      case MethodInvocation(_, ref, args, _, _, _, _) =>
+        get_subroutine_return(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+          ref.decl.returnType,
+        ).asInstanceOf[UncertainBooleanValue]
+      case FunctionInvocation(ref, args, _, _, _) =>
+        get_subroutine_return(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+          ref.decl.returnType,
+        ).asInstanceOf[UncertainBooleanValue]
+      case InstanceFunctionInvocation(_, ref, args, _, _, _) =>
+        get_subroutine_return(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+          ref.decl.returnType,
+        ).asInstanceOf[UncertainBooleanValue]
+      case Held(_) =>
+        UncertainBooleanValue
+          .from(
+            lock.nonEmpty
+          ) // TODO: This means that ANY process holds the lock!
+      case Scale(_, res) =>
+        resolve_boolean_expression(
+          res,
+          is_old,
+          is_contract,
+        ) // TODO: Do anything with permission fraction?
+      case PredicateApply(
+            ref,
+            args,
+            _,
+          ) => // TODO: Do anything with permission fraction?
+        if (ref.decl.body.nonEmpty)
+          UncertainBooleanValue
+            .from(
+              true
+            ) // resolve_boolean_expression(Utils.unify_expression(ref.decl.body.get, Map.from(ref.decl.args.zip(args))))
+        else
+          ??? // TODO: Track resource ownership?
+      case InstancePredicateApply(
+            _,
+            ref,
+            args,
+            _,
+          ) => // TODO: Do anything with permission fraction?
+        if (ref.decl.body.nonEmpty)
+          UncertainBooleanValue
+            .from(
+              true
+            ) // resolve_boolean_expression(Utils.unify_expression(ref.decl.body.get, Map.from(ref.decl.args.zip(args))))
+        else
+          ??? // TODO: Track resource ownership?
+      case Perm(_, _) =>
+        UncertainBooleanValue
+          .from(true) // TODO: Do anything with permissions/resources?
+      case _: Binder[_] =>
+        UncertainBooleanValue.from(true) // TODO: How to handle quantifiers?!
+      case Result(_) => UncertainBooleanValue.uncertain()
+      case AmbiguousResult() => UncertainBooleanValue.uncertain()
     }
-    case Size(obj) => variable_from_expr(expr) match {
-      case Some(v) =>
-        if (is_contract && !is_old) UncertainIntegerValue.above(0)
-        else valuations(v).asInstanceOf[UncertainIntegerValue]
-      case None => resolve_collection_expression(obj).len
+
+  /** Evaluates a collection expression and returns an uncertain collection
+    * value.
+    *
+    * @param expr
+    *   collection-type COL expression
+    * @return
+    *   An uncertain collection value that represents all possible values that
+    *   the given expression can take on, possibly of uncertain length and with
+    *   uncertain values at uncertain indices
+    */
+  def resolve_collection_expression(
+      expr: Expr[G],
+      is_old: Boolean = false,
+      is_contract: Boolean = false,
+  ): UncertainSequence =
+    expr match {
+      // Literals
+      case LiteralSeq(element, values) =>
+        UncertainSequence(
+          UncertainIntegerValue.single(values.size),
+          values.zipWithIndex.map(t =>
+            UncertainIntegerValue.single(t._2) ->
+              resolve_expression(t._1, is_old, is_contract)
+          ),
+          element,
+        )
+      case UntypedLiteralSeq(values) =>
+        UncertainSequence(
+          UncertainIntegerValue.single(values.size),
+          values.zipWithIndex.map(t =>
+            UncertainIntegerValue.single(t._2) ->
+              resolve_expression(t._1, is_old, is_contract)
+          ),
+          values.head.t,
+        )
+      // Variables
+      case d: Deref[_] => collection_from_variable(d, is_old, is_contract)
+      // Array operations
+      case Values(arr, from, to) =>
+        resolve_collection_expression(arr, is_old, is_contract).slice(
+          resolve_integer_expression(from, is_old, is_contract),
+          resolve_integer_expression(to, is_old, is_contract),
+        )
+      // TODO: Implement array semantics
+      case NewArray(element, dims, moreDims, initialize) =>
+        UncertainSequence.uncertain(element)
+      // Sequence operations
+      case Cons(x, xs) =>
+        resolve_collection_expression(xs, is_old, is_contract)
+          .prepend(resolve_expression(x, is_old, is_contract))
+      case AmbiguousPlus(xs, ys) =>
+        resolve_collection_expression(xs, is_old, is_contract)
+          .concat(resolve_collection_expression(ys, is_old, is_contract))
+      case Concat(xs, ys) =>
+        resolve_collection_expression(xs, is_old, is_contract)
+          .concat(resolve_collection_expression(ys, is_old, is_contract))
+      case Drop(xs, count) =>
+        resolve_collection_expression(xs, is_old, is_contract)
+          .drop(resolve_integer_expression(count, is_old, is_contract))
+      case Take(xs, count) =>
+        resolve_collection_expression(xs, is_old, is_contract)
+          .take(resolve_integer_expression(count, is_old, is_contract))
+      case SeqUpdate(xs, i, x) =>
+        resolve_collection_expression(xs, is_old, is_contract).updated(
+          resolve_integer_expression(i, is_old, is_contract),
+          resolve_expression(x, is_old, is_contract),
+        )
+      case RemoveAt(xs, i) =>
+        resolve_collection_expression(xs, is_old, is_contract)
+          .remove(resolve_integer_expression(i, is_old, is_contract))
+      case Slice(xs, from, to) =>
+        resolve_collection_expression(xs, is_old, is_contract).slice(
+          resolve_integer_expression(from, is_old, is_contract),
+          resolve_integer_expression(to, is_old, is_contract),
+        )
+      // Other expressions that can evaluate to a collection
+      case Select(cond, ift, iff) =>
+        val condition: UncertainBooleanValue = resolve_boolean_expression(
+          cond,
+          is_old,
+          is_contract,
+        )
+        val ift_seq: UncertainSequence = resolve_collection_expression(
+          ift,
+          is_old,
+          is_contract,
+        )
+        val iff_seq: UncertainSequence = resolve_collection_expression(
+          iff,
+          is_old,
+          is_contract,
+        )
+        if (condition.can_be_true && condition.can_be_false)
+          ift_seq.union(iff_seq)
+        else if (condition.can_be_true)
+          ift_seq
+        else if (condition.can_be_false)
+          iff_seq
+        else
+          UncertainSequence.empty(ift_seq.t)
+      case Old(expr, _) =>
+        resolve_collection_expression(expr, is_old = true, is_contract)
     }
-    case ProcedureInvocation(ref, args, _, _, _, _) =>
-      get_subroutine_return(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)), ref.decl.returnType).asInstanceOf[UncertainIntegerValue]
-    case MethodInvocation(_, ref, args, _, _, _, _) =>
-      get_subroutine_return(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)), ref.decl.returnType).asInstanceOf[UncertainIntegerValue]
-    case FunctionInvocation(ref, args, _, _, _) =>
-      get_subroutine_return(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)), ref.decl.returnType).asInstanceOf[UncertainIntegerValue]
-    case InstanceFunctionInvocation(_, ref, args, _, _, _) =>
-      get_subroutine_return(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)), ref.decl.returnType).asInstanceOf[UncertainIntegerValue]
-    case Result(_) => UncertainIntegerValue.uncertain()
-    case AmbiguousResult() => UncertainIntegerValue.uncertain()
-  }
 
-  /**
-   * Evaluates a boolean expression and returns an uncertain boolean value.
-   *
-   * @param expr boolean-type COL expression
-   * @return An uncertain boolean value that represents all possible values that the given expression can take on
-   */
-  def resolve_boolean_expression(expr: Expr[G], is_old: Boolean = false, is_contract: Boolean = false): UncertainBooleanValue = expr match {
-    case BooleanValue(value) => UncertainBooleanValue.from(value)
-    case Not(arg) => !resolve_boolean_expression(arg)
-    case AmbiguousOr(left, right) => resolve_boolean_expression(left, is_old, is_contract) || resolve_boolean_expression(right, is_old, is_contract)
-    case Star(left, right) => resolve_boolean_expression(left, is_old, is_contract) && resolve_boolean_expression(right, is_old, is_contract)
-    case And(left, right) => resolve_boolean_expression(left, is_old, is_contract) && resolve_boolean_expression(right, is_old, is_contract)
-    case Or(left, right) => resolve_boolean_expression(left, is_old, is_contract) || resolve_boolean_expression(right, is_old, is_contract)
-    case Implies(left, right) => (!resolve_boolean_expression(left, is_old, is_contract)) || resolve_boolean_expression(right, is_old, is_contract)
-    case Eq(left, right) => handle_equality(left, right, is_old, is_contract, negate = false)
-    case Neq(left, right) => handle_equality(left, right, is_old, is_contract, negate = true)
-    case AmbiguousGreater(left, right) => resolve_integer_expression(left, is_old, is_contract) > resolve_integer_expression(right, is_old, is_contract)
-    case AmbiguousLess(left, right) => resolve_integer_expression(left, is_old, is_contract) < resolve_integer_expression(right, is_old, is_contract)
-    case AmbiguousGreaterEq(left, right) => resolve_integer_expression(left, is_old, is_contract) >= resolve_integer_expression(right, is_old, is_contract)
-    case AmbiguousLessEq(left, right) => resolve_integer_expression(left, is_old, is_contract) <= resolve_integer_expression(right, is_old, is_contract)
-    case Greater(left, right) => resolve_integer_expression(left, is_old, is_contract) > resolve_integer_expression(right, is_old, is_contract)
-    case Less(left, right) => resolve_integer_expression(left, is_old, is_contract) < resolve_integer_expression(right, is_old, is_contract)
-    case GreaterEq(left, right) => resolve_integer_expression(left, is_old, is_contract) >= resolve_integer_expression(right, is_old, is_contract)
-    case LessEq(left, right) => resolve_integer_expression(left, is_old, is_contract) <= resolve_integer_expression(right, is_old, is_contract)
-    case Select(cond, ift, iff) =>
-      var value: UncertainBooleanValue = UncertainBooleanValue.empty()
-      if (resolve_boolean_expression(cond, is_old, is_contract).can_be_true) {
-        value = value.union(resolve_boolean_expression(ift, is_old, is_contract)).asInstanceOf[UncertainBooleanValue]
+  private def collection_from_variable(
+      deref: Deref[G],
+      is_old: Boolean,
+      is_contract: Boolean,
+  ): UncertainSequence = {
+    val affected: Set[IndexedVariable[G]] = valuations.keySet
+      .filter(v => v.is_contained_by(deref, this)).collect {
+        case v: IndexedVariable[_] => v
       }
-      if (resolve_boolean_expression(cond, is_old, is_contract).can_be_false) {
-        value = value.union(resolve_boolean_expression(iff, is_old, is_contract)).asInstanceOf[UncertainBooleanValue]
+    val size_var: Option[SizeVariable[G]] = valuations.keySet
+      .filter(v => v.is_contained_by(deref, this)).collectFirst {
+        case v: SizeVariable[_] => v
       }
-      value
-    case Old(exp, at) => at match {
-      case Some(_) => throw new IllegalArgumentException(s"Cannot resolve labelled old expression ${expr.toInlineString}")
-      case None => resolve_boolean_expression(exp, is_old = true, is_contract)
-    }
-    case Local(_) | DerefHeapVariable(_) | Deref(_, _) | DerefPointer(_) | AmbiguousSubscript(_, _) | SeqSubscript(_, _) | ArraySubscript(_, _) | PointerSubscript(_, _) =>
-      variable_from_expr(expr) match {
-        case Some(v) =>
-          if (is_contract && !is_old) UncertainBooleanValue.uncertain()
-          else valuations(v).asInstanceOf[UncertainBooleanValue]
-        case None => parameter_from_expr(expr) match {
-          case Some(v) => parameters(v).asInstanceOf[UncertainBooleanValue]
-          case None => UncertainBooleanValue.uncertain()
-        }
+    val len: Option[UncertainIntegerValue] = size_var
+      .map(v => valuations(v).asInstanceOf[UncertainIntegerValue])
+    val t: Type[G] =
+      deref.ref.decl.t match {
+        case TArray(element) => element
+        case TSeq(element) => element
+        case _ =>
+          throw new IllegalArgumentException(
+            s"Unsupported collection type ${deref.ref.decl.t.toInlineString}"
+          )
       }
-    case ProcedureInvocation(ref, args, _, _, _, _) =>
-      get_subroutine_return(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)), ref.decl.returnType).asInstanceOf[UncertainBooleanValue]
-    case MethodInvocation(_, ref, args, _, _, _, _) =>
-      get_subroutine_return(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)), ref.decl.returnType).asInstanceOf[UncertainBooleanValue]
-    case FunctionInvocation(ref, args, _, _, _) =>
-      get_subroutine_return(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)), ref.decl.returnType).asInstanceOf[UncertainBooleanValue]
-    case InstanceFunctionInvocation(_, ref, args, _, _, _) =>
-      get_subroutine_return(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)), ref.decl.returnType).asInstanceOf[UncertainBooleanValue]
-    case Held(_) => UncertainBooleanValue.from(lock.nonEmpty)   // TODO: This means that ANY process holds the lock!
-    case Scale(_, res) => resolve_boolean_expression(res, is_old, is_contract)   // TODO: Do anything with permission fraction?
-    case PredicateApply(ref, args, _) =>                    // TODO: Do anything with permission fraction?
-      if (ref.decl.body.nonEmpty) UncertainBooleanValue.from(true)   //resolve_boolean_expression(Utils.unify_expression(ref.decl.body.get, Map.from(ref.decl.args.zip(args))))
-      else ???    // TODO: Track resource ownership?
-    case InstancePredicateApply(_, ref, args, _) =>         // TODO: Do anything with permission fraction?
-      if (ref.decl.body.nonEmpty) UncertainBooleanValue.from(true)   //resolve_boolean_expression(Utils.unify_expression(ref.decl.body.get, Map.from(ref.decl.args.zip(args))))
-      else ???    // TODO: Track resource ownership?
-    case Perm(_, _) => UncertainBooleanValue.from(true)     // TODO: Do anything with permissions/resources?
-    case _: Binder[_] => UncertainBooleanValue.from(true)   // TODO: How to handle quantifiers?!
-    case Result(_) => UncertainBooleanValue.uncertain()
-    case AmbiguousResult() => UncertainBooleanValue.uncertain()
+    if (is_contract && !is_old)
+      UncertainSequence.uncertain(t)
+    else
+      UncertainSequence(
+        len.getOrElse(UncertainIntegerValue.above(
+          if (affected.isEmpty)
+            0
+          else
+            affected.map(v => v.i).max
+        )),
+        affected.map(v => UncertainIntegerValue.single(v.i) -> valuations(v))
+          .toSeq,
+        t,
+      )
   }
 
-  /**
-   * Evaluates a collection expression and returns an uncertain collection value.
-   *
-   * @param expr collection-type COL expression
-   * @return An uncertain collection value that represents all possible values that the given expression can take on,
-   *         possibly of uncertain length and with uncertain values at uncertain indices
-   */
-  def resolve_collection_expression(expr: Expr[G], is_old: Boolean = false, is_contract: Boolean = false): UncertainSequence = expr match {
-    // Literals
-    case LiteralSeq(element, values) =>
-      UncertainSequence(UncertainIntegerValue.single(values.size),
-        values.zipWithIndex.map(t => UncertainIntegerValue.single(t._2) -> resolve_expression(t._1, is_old, is_contract)),
-        element)
-    case UntypedLiteralSeq(values) =>
-      UncertainSequence(UncertainIntegerValue.single(values.size),
-        values.zipWithIndex.map(t => UncertainIntegerValue.single(t._2) -> resolve_expression(t._1, is_old, is_contract)),
-        values.head.t)
-    // Variables
-    case d: Deref[_] => collection_from_variable(d, is_old, is_contract)
-    // Array operations
-    case Values(arr, from, to) =>
-      resolve_collection_expression(arr, is_old, is_contract).slice(resolve_integer_expression(from, is_old, is_contract),
-                                                                    resolve_integer_expression(to, is_old, is_contract))
-    // TODO: Implement array semantics
-    case NewArray(element, dims, moreDims, initialize) => UncertainSequence.uncertain(element)
-    // Sequence operations
-    case Cons(x, xs) =>
-      resolve_collection_expression(xs, is_old, is_contract).prepend(resolve_expression(x, is_old, is_contract))
-    case AmbiguousPlus(xs, ys) =>
-      resolve_collection_expression(xs, is_old, is_contract).concat(resolve_collection_expression(ys, is_old, is_contract))
-    case Concat(xs, ys) =>
-      resolve_collection_expression(xs, is_old, is_contract).concat(resolve_collection_expression(ys, is_old, is_contract))
-    case Drop(xs, count) =>
-      resolve_collection_expression(xs, is_old, is_contract).drop(resolve_integer_expression(count, is_old, is_contract))
-    case Take(xs, count) =>
-      resolve_collection_expression(xs, is_old, is_contract).take(resolve_integer_expression(count, is_old, is_contract))
-    case SeqUpdate(xs, i, x) =>
-      resolve_collection_expression(xs, is_old, is_contract).updated(resolve_integer_expression(i, is_old, is_contract),
-                                                                     resolve_expression(x, is_old, is_contract))
-    case RemoveAt(xs, i) =>
-      resolve_collection_expression(xs, is_old, is_contract).remove(resolve_integer_expression(i, is_old, is_contract))
-    case Slice(xs, from, to) =>
-      resolve_collection_expression(xs, is_old, is_contract).slice(resolve_integer_expression(from, is_old, is_contract),
-                                                                   resolve_integer_expression(to, is_old, is_contract))
-    // Other expressions that can evaluate to a collection
-    case Select(cond, ift, iff) =>
-      val condition: UncertainBooleanValue = resolve_boolean_expression(cond, is_old, is_contract)
-      val ift_seq: UncertainSequence = resolve_collection_expression(ift, is_old, is_contract)
-      val iff_seq: UncertainSequence = resolve_collection_expression(iff, is_old, is_contract)
-      if (condition.can_be_true && condition.can_be_false) ift_seq.union(iff_seq)
-      else if (condition.can_be_true) ift_seq
-      else if (condition.can_be_false) iff_seq
-      else UncertainSequence.empty(ift_seq.t)
-    case Old(expr, _) => resolve_collection_expression(expr, is_old = true, is_contract)
-  }
-
-  private def collection_from_variable(deref: Deref[G], is_old: Boolean, is_contract: Boolean): UncertainSequence = {
-    val affected: Set[IndexedVariable[G]] = valuations.keySet.filter(v => v.is_contained_by(deref, this)).collect{ case v: IndexedVariable[_] => v }
-    val size_var: Option[SizeVariable[G]] = valuations.keySet.filter(v => v.is_contained_by(deref, this)).collectFirst{ case v: SizeVariable[_] => v }
-    val len: Option[UncertainIntegerValue] = size_var.map(v => valuations(v).asInstanceOf[UncertainIntegerValue])
-    val t: Type[G] = deref.ref.decl.t match {
-      case TArray(element) => element
-      case TSeq(element) => element
-      case _ => throw new IllegalArgumentException(s"Unsupported collection type ${deref.ref.decl.t.toInlineString}")
-    }
-    if (is_contract && !is_old) UncertainSequence.uncertain(t)
-    else UncertainSequence(len.getOrElse(UncertainIntegerValue.above(if (affected.isEmpty) 0 else affected.map(v => v.i).max)),
-                           affected.map(v => UncertainIntegerValue.single(v.i) -> valuations(v)).toSeq,
-                           t)
-  }
-
-  private def get_subroutine_return(post: AccountedPredicate[G], args: Map[Variable[G], Expr[G]], return_type: Type[G]): UncertainValue =
-    get_return(Utils.unify_expression(Utils.contract_to_expression(post), args), return_type)
+  private def get_subroutine_return(
+      post: AccountedPredicate[G],
+      args: Map[Variable[G], Expr[G]],
+      return_type: Type[G],
+  ): UncertainValue =
+    get_return(
+      Utils.unify_expression(Utils.contract_to_expression(post), args),
+      return_type,
+    )
 
-  private def get_return(contract: Expr[G], return_type: Type[G]): UncertainValue = {
+  private def get_return(
+      contract: Expr[G],
+      return_type: Type[G],
+  ): UncertainValue = {
     val result_var: ResultVariable[G] = ResultVariable(return_type)
     val result_set: Set[ResolvableVariable[G]] = Set(result_var)
-    val constraints: Set[ConstraintMap[G]] = new ConstraintSolver(this, result_set, true).resolve_assumption(contract).filter(m => !m.is_impossible)
-    val possible_vals: Set[UncertainValue] = constraints.map(m => m.resolve.getOrElse(result_var, UncertainValue.uncertain_of(return_type)))
+    val constraints: Set[ConstraintMap[G]] =
+      new ConstraintSolver(this, result_set, true).resolve_assumption(contract)
+        .filter(m => !m.is_impossible)
+    val possible_vals: Set[UncertainValue] = constraints.map(m =>
+      m.resolve.getOrElse(result_var, UncertainValue.uncertain_of(return_type))
+    )
     possible_vals.reduce((v1, v2) => v1.union(v2))
   }
 
-  private def handle_equality(left: Expr[G], right: Expr[G], is_old: Boolean, is_contract: Boolean, negate: Boolean): UncertainBooleanValue = left.t match {
-    case _: IntType[_] | TBool() =>
-      val left_val: UncertainValue = resolve_expression(left, is_old, is_contract)
-      val right_val: UncertainValue = resolve_expression(right, is_old, is_contract)
-      if (!negate) left_val == right_val else left_val != right_val
-    case _: TSeq[_] | TArray(_) =>
-      val left_coll: UncertainSequence = resolve_collection_expression(left, is_old, is_contract)
-      val right_coll: UncertainSequence = resolve_collection_expression(right, is_old, is_contract)
-      val equals: UncertainBooleanValue = left_coll == right_coll
-      if (!negate) equals else !equals
-    case _ => UncertainBooleanValue.from(true)    // TODO: The justification for this is that the program will be verified anyway,
-                                                  //  so object equality does not need to be considered; does that make sense?
-  }
+  private def handle_equality(
+      left: Expr[G],
+      right: Expr[G],
+      is_old: Boolean,
+      is_contract: Boolean,
+      negate: Boolean,
+  ): UncertainBooleanValue =
+    left.t match {
+      case _: IntType[_] | TBool() =>
+        val left_val: UncertainValue = resolve_expression(
+          left,
+          is_old,
+          is_contract,
+        )
+        val right_val: UncertainValue = resolve_expression(
+          right,
+          is_old,
+          is_contract,
+        )
+        if (!negate)
+          left_val == right_val
+        else
+          left_val != right_val
+      case _: TSeq[_] | TArray(_) =>
+        val left_coll: UncertainSequence = resolve_collection_expression(
+          left,
+          is_old,
+          is_contract,
+        )
+        val right_coll: UncertainSequence = resolve_collection_expression(
+          right,
+          is_old,
+          is_contract,
+        )
+        val equals: UncertainBooleanValue = left_coll == right_coll
+        if (!negate)
+          equals
+        else
+          !equals
+      case _ =>
+        UncertainBooleanValue
+          .from(
+            true
+          ) // TODO: The justification for this is that the program will be verified anyway,
+      //  so object equality does not need to be considered; does that make sense?
+    }
 
-  private def variable_from_expr(variable: Expr[G]): Option[ConcreteVariable[G]] =
-    valuations.keys.collectFirst{ case c: ConcreteVariable[G] if c.is(variable, this) => c }
+  private def variable_from_expr(
+      variable: Expr[G]
+  ): Option[ConcreteVariable[G]] =
+    valuations.keys.collectFirst {
+      case c: ConcreteVariable[G] if c.is(variable, this) => c
+    }
 
   private def parameter_from_expr(variable: Expr[G]): Option[FieldVariable[G]] =
-    parameters.keys.collectFirst{ case f: FieldVariable[G] if f.is(variable, this) => f }
+    parameters.keys.collectFirst {
+      case f: FieldVariable[G] if f.is(variable, this) => f
+    }
 
-  /**
-   * Returns an expression to represent this state of the form <code>variable1 == value1 && variable2 == value2 && ...</code>
-   *
-   * @return An expression that encodes this state
-   */
+  /** Returns an expression to represent this state of the form <code>variable1
+    * \== value1 && variable2 == value2 && ...</code>
+    *
+    * @return
+    *   An expression that encodes this state
+    */
   def to_expression: Expr[G] = {
-    val sorted_valuations = valuations.toSeq.sortWith((t1, t2) => t1._1.compare(t2._1))
-    sorted_valuations.map(v => v._2.to_expression(v._1.to_expression)).reduce((e1, e2) => And(e1, e2)(e1.o))
+    val sorted_valuations = valuations.toSeq
+      .sortWith((t1, t2) => t1._1.compare(t2._1))
+    sorted_valuations.map(v => v._2.to_expression(v._1.to_expression))
+      .reduce((e1, e2) => And(e1, e2)(e1.o))
   }
 }
diff --git a/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala b/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala
index 68efd8db51..67cd0540f1 100644
--- a/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala
+++ b/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala
@@ -2,176 +2,240 @@ package vct.rewrite.rasi
 
 import vct.col.ast._
 
-/**
- * A variable whose value can possibly be resolved in an abstract state.
- */
+/** A variable whose value can possibly be resolved in an abstract state.
+  */
 sealed trait ResolvableVariable[G] {
-  /**
-   * Determines whether this variable corresponds to the given expression in the given state.
-   *
-   * @param expr COL expression
-   * @param state Abstract state to evaluate the expression in
-   * @return <code>true</code> if the expression represents this variable, <code>false</code> otherwise
-   */
+
+  /** Determines whether this variable corresponds to the given expression in
+    * the given state.
+    *
+    * @param expr
+    *   COL expression
+    * @param state
+    *   Abstract state to evaluate the expression in
+    * @return
+    *   <code>true</code> if the expression represents this variable,
+    *   <code>false</code> otherwise
+    */
   def is(expr: Expr[G], state: AbstractState[G]): Boolean
 
-  /**
-   * Determines whether this variable is contained in the given expression in the given state, e.g. if this variable
-   * represents an index in a collection and the expression represents the collection.
-   *
-   * @param expr COL expression
-   * @param state Abstract state to evaluate the expression in
-   * @return <code>true</code> if the object represented by the expression contains this variable, <code>false</code>
-   *         otherwise
-   */
+  /** Determines whether this variable is contained in the given expression in
+    * the given state, e.g. if this variable represents an index in a collection
+    * and the expression represents the collection.
+    *
+    * @param expr
+    *   COL expression
+    * @param state
+    *   Abstract state to evaluate the expression in
+    * @return
+    *   <code>true</code> if the object represented by the expression contains
+    *   this variable, <code>false</code> otherwise
+    */
   def is_contained_by(expr: Expr[G], state: AbstractState[G]): Boolean
 
-  /**
-   * Returns the type of this variable.
-   *
-   * @return The COL type of this variable
-   */
+  /** Returns the type of this variable.
+    *
+    * @return
+    *   The COL type of this variable
+    */
   def t: Type[G]
 }
 
-
-/**
- * A virtual variable representing a subroutine return.
- */
-case class ResultVariable[G](return_type: Type[G]) extends ResolvableVariable[G] {
-  override def is(expr: Expr[G], state: AbstractState[G]): Boolean = expr match {
-    case AmbiguousResult() | Result(_) => true
-    case _ => false
-  }
-  override def is_contained_by(expr: Expr[G], state: AbstractState[G]): Boolean = is(expr, state)
+/** A virtual variable representing a subroutine return.
+  */
+case class ResultVariable[G](return_type: Type[G])
+    extends ResolvableVariable[G] {
+  override def is(expr: Expr[G], state: AbstractState[G]): Boolean =
+    expr match {
+      case AmbiguousResult() | Result(_) => true
+      case _ => false
+    }
+  override def is_contained_by(
+      expr: Expr[G],
+      state: AbstractState[G],
+  ): Boolean = is(expr, state)
   override def t: Type[G] = return_type
 }
 
-
-/**
- * A variable that can be tracked in the abstract state.
- */
+/** A variable that can be tracked in the abstract state.
+  */
 sealed trait ConcreteVariable[G] extends ResolvableVariable[G] {
-  /**
-   * Creates an expression that represents this variable in COL.
-   *
-   * @return A COL expression representing this variable
-   */
+
+  /** Creates an expression that represents this variable in COL.
+    *
+    * @return
+    *   A COL expression representing this variable
+    */
   def to_expression: Expr[G]
 
-  protected def field_equals(expr: Expr[G], field: InstanceField[G]): Boolean = expr match {
-    // TODO: Support other types of expressions? Take object into account?
-    case Deref(_, f) => f.decl.equals(field)
-    case _ => false
-  }
-
-  protected def variable_equals(expr: Expr[G], variable: Variable[G]): Boolean = expr match {
-    // TODO: Are there other ways to refer to variables?
-    case Local(ref) => ref.decl.equals(variable)
-    case _ => false
-  }
-
-  /**
-   * Defines an ordering among concrete variables.
-   *
-   * @param other Variable to be compared to
-   * @return <code>true</code> if <code>this > other</code>, <code>false</code> otherwise
-   */
+  protected def field_equals(expr: Expr[G], field: InstanceField[G]): Boolean =
+    expr match {
+      // TODO: Support other types of expressions? Take object into account?
+      case Deref(_, f) => f.decl.equals(field)
+      case _ => false
+    }
+
+  protected def variable_equals(expr: Expr[G], variable: Variable[G]): Boolean =
+    expr match {
+      // TODO: Are there other ways to refer to variables?
+      case Local(ref) => ref.decl.equals(variable)
+      case _ => false
+    }
+
+  /** Defines an ordering among concrete variables.
+    *
+    * @param other
+    *   Variable to be compared to
+    * @return
+    *   <code>true</code> if <code>this > other</code>, <code>false</code>
+    *   otherwise
+    */
   def compare(other: ConcreteVariable[G]): Boolean
 }
 
-
-/**
- * A variable that represents a local variable in the COL system.
- */
+/** A variable that represents a local variable in the COL system.
+  */
 case class LocalVariable[G](variable: Variable[G]) extends ConcreteVariable[G] {
-  override def is(expr: Expr[G], state: AbstractState[G]): Boolean = variable_equals(expr, variable)
-  override def is_contained_by(expr: Expr[G], state: AbstractState[G]): Boolean = is(expr, state)
+  override def is(expr: Expr[G], state: AbstractState[G]): Boolean =
+    variable_equals(expr, variable)
+  override def is_contained_by(
+      expr: Expr[G],
+      state: AbstractState[G],
+  ): Boolean = is(expr, state)
   override def to_expression: Expr[G] = Local[G](variable.ref)(variable.o)
   override def t: Type[G] = variable.t
-  override def compare(other: ConcreteVariable[G]): Boolean = other match {
-    case LocalVariable(v) => v.toInlineString > variable.toInlineString
-    case _ => false
-  }
+  override def compare(other: ConcreteVariable[G]): Boolean =
+    other match {
+      case LocalVariable(v) => v.toInlineString > variable.toInlineString
+      case _ => false
+    }
 }
 
-
-/**
- * A variable representing a field (attribute) of a COL class.
- */
-case class FieldVariable[G](field: InstanceField[G]) extends ConcreteVariable[G] {
-  override def is(expr: Expr[G], state: AbstractState[G]): Boolean = field_equals(expr, field)
-  override def is_contained_by(expr: Expr[G], state: AbstractState[G]): Boolean = is(expr, state)
-  override def to_expression: Expr[G] = Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o)
+/** A variable representing a field (attribute) of a COL class.
+  */
+case class FieldVariable[G](field: InstanceField[G])
+    extends ConcreteVariable[G] {
+  override def is(expr: Expr[G], state: AbstractState[G]): Boolean =
+    field_equals(expr, field)
+  override def is_contained_by(
+      expr: Expr[G],
+      state: AbstractState[G],
+  ): Boolean = is(expr, state)
+  override def to_expression: Expr[G] =
+    Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o)
   override def t: Type[G] = field.t
-  override def compare(other: ConcreteVariable[G]): Boolean = other match {
-    case LocalVariable(_) => true
-    case FieldVariable(f) => f.toInlineString > field.toInlineString
-    case SizeVariable(_) => false
-    case IndexedVariable(_, _) => false
-  }
+  override def compare(other: ConcreteVariable[G]): Boolean =
+    other match {
+      case LocalVariable(_) => true
+      case FieldVariable(f) => f.toInlineString > field.toInlineString
+      case SizeVariable(_) => false
+      case IndexedVariable(_, _) => false
+    }
 }
 
-
 // TODO: Generalize size and indexed variables for local variables
 
-
-/**
- * A variable representing the size of a collection.
- */
-case class SizeVariable[G](field: InstanceField[G]) extends ConcreteVariable[G] {
-  override def is(expr: Expr[G], state: AbstractState[G]): Boolean = expr match {
-    case Size(obj) => field_equals(obj, field)
-    case _ => false
-  }
-  override def is_contained_by(expr: Expr[G], state: AbstractState[G]): Boolean = is(expr, state) || field_equals(expr, field)
-  override def to_expression: Expr[G] = Size(Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o))(field.o)
+/** A variable representing the size of a collection.
+  */
+case class SizeVariable[G](field: InstanceField[G])
+    extends ConcreteVariable[G] {
+  override def is(expr: Expr[G], state: AbstractState[G]): Boolean =
+    expr match {
+      case Size(obj) => field_equals(obj, field)
+      case _ => false
+    }
+  override def is_contained_by(
+      expr: Expr[G],
+      state: AbstractState[G],
+  ): Boolean = is(expr, state) || field_equals(expr, field)
+  override def to_expression: Expr[G] =
+    Size(Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o))(
+      field.o
+    )
   override def t: Type[G] = TInt()(field.o)
-  override def compare(other: ConcreteVariable[G]): Boolean = other match {
-    case LocalVariable(_) => true
-    case FieldVariable(_) => true
-    case SizeVariable(f) => f.toInlineString > field.toInlineString
-    case IndexedVariable(_, _) => false
-  }
+  override def compare(other: ConcreteVariable[G]): Boolean =
+    other match {
+      case LocalVariable(_) => true
+      case FieldVariable(_) => true
+      case SizeVariable(f) => f.toInlineString > field.toInlineString
+      case IndexedVariable(_, _) => false
+    }
 }
 
-
-/**
- * A variable representing an index of a collection.
- */
-case class IndexedVariable[G](field: InstanceField[G], i: Int) extends ConcreteVariable[G] {
-  override def is(expr: Expr[G], state: AbstractState[G]): Boolean = expr match {
-    case AmbiguousSubscript(collection, index) => field_equals(collection, field) && i == state.resolve_integer_expression(index).try_to_resolve().getOrElse(-1)
-    case SeqSubscript(seq, index) => field_equals(seq, field) && i == state.resolve_integer_expression(index).try_to_resolve().getOrElse(-1)
-    case ArraySubscript(arr, index) => field_equals(arr, field) && i == state.resolve_integer_expression(index).try_to_resolve().getOrElse(-1)
-    case PointerSubscript(pointer, index) => field_equals(pointer, field) && i == state.resolve_integer_expression(index).try_to_resolve().getOrElse(-1)
-    case _ => false
-  }
-  override def is_contained_by(expr: Expr[G], state: AbstractState[G]): Boolean = expr match {
-    // TODO: What about nested drops/takes?
-    case Drop(xs, count) => field_equals(xs, field) && state.resolve_integer_expression(count).try_to_resolve().getOrElse(i + 1) < i
-    case Take(xs, count) => field_equals(xs, field) && state.resolve_integer_expression(count).try_to_resolve().getOrElse(i - 1) >= i
-    case Slice(xs, from, to) => field_equals(xs, field) &&
-                                state.resolve_integer_expression(from).try_to_resolve().getOrElse(i + 1) < i &&
-                                state.resolve_integer_expression(to).try_to_resolve().getOrElse(i - 1) >= i
-    case _ => field_equals(expr, field) || is(expr, state)
-  }
-  override def to_expression: Expr[G] = field.t match {
-    case TSeq(_) => SeqSubscript(Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o), IntegerValue(i)(field.o))(field.o)(field.o)
-    case TArray(_) => ArraySubscript(Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o), IntegerValue(i)(field.o))(field.o)(field.o)
-    case TPointer(_) => PointerSubscript(Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o), IntegerValue(i)(field.o))(field.o)(field.o)
-  }
-  override def t: Type[G] = field.t match {
-    case TSeq(element) => element
-    case TArray(element) => element
-    case TPointer(element) => element
-  }
-  override def compare(other: ConcreteVariable[G]): Boolean = other match {
-    case LocalVariable(_) => true
-    case FieldVariable(_) => true
-    case SizeVariable(_) => true
-    case IndexedVariable(f, ind) =>
-      if (f != field) f.toInlineString > field.toInlineString
-      else ind > i
-  }
+/** A variable representing an index of a collection.
+  */
+case class IndexedVariable[G](field: InstanceField[G], i: Int)
+    extends ConcreteVariable[G] {
+  override def is(expr: Expr[G], state: AbstractState[G]): Boolean =
+    expr match {
+      case AmbiguousSubscript(collection, index) =>
+        field_equals(collection, field) &&
+        i == state.resolve_integer_expression(index).try_to_resolve()
+          .getOrElse(-1)
+      case SeqSubscript(seq, index) =>
+        field_equals(seq, field) && i == state.resolve_integer_expression(index)
+          .try_to_resolve().getOrElse(-1)
+      case ArraySubscript(arr, index) =>
+        field_equals(arr, field) && i == state.resolve_integer_expression(index)
+          .try_to_resolve().getOrElse(-1)
+      case PointerSubscript(pointer, index) =>
+        field_equals(pointer, field) &&
+        i == state.resolve_integer_expression(index).try_to_resolve()
+          .getOrElse(-1)
+      case _ => false
+    }
+  override def is_contained_by(
+      expr: Expr[G],
+      state: AbstractState[G],
+  ): Boolean =
+    expr match {
+      // TODO: What about nested drops/takes?
+      case Drop(xs, count) =>
+        field_equals(xs, field) && state.resolve_integer_expression(count)
+          .try_to_resolve().getOrElse(i + 1) < i
+      case Take(xs, count) =>
+        field_equals(xs, field) && state.resolve_integer_expression(count)
+          .try_to_resolve().getOrElse(i - 1) >= i
+      case Slice(xs, from, to) =>
+        field_equals(xs, field) && state.resolve_integer_expression(from)
+          .try_to_resolve().getOrElse(i + 1) < i &&
+        state.resolve_integer_expression(to).try_to_resolve()
+          .getOrElse(i - 1) >= i
+      case _ => field_equals(expr, field) || is(expr, state)
+    }
+  override def to_expression: Expr[G] =
+    field.t match {
+      case TSeq(_) =>
+        SeqSubscript(
+          Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o),
+          IntegerValue(i)(field.o),
+        )(field.o)(field.o)
+      case TArray(_) =>
+        ArraySubscript(
+          Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o),
+          IntegerValue(i)(field.o),
+        )(field.o)(field.o)
+      case TPointer(_) =>
+        PointerSubscript(
+          Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o),
+          IntegerValue(i)(field.o),
+        )(field.o)(field.o)
+    }
+  override def t: Type[G] =
+    field.t match {
+      case TSeq(element) => element
+      case TArray(element) => element
+      case TPointer(element) => element
+    }
+  override def compare(other: ConcreteVariable[G]): Boolean =
+    other match {
+      case LocalVariable(_) => true
+      case FieldVariable(_) => true
+      case SizeVariable(_) => true
+      case IndexedVariable(f, ind) =>
+        if (f != field)
+          f.toInlineString > field.toInlineString
+        else
+          ind > i
+    }
 }
diff --git a/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala b/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala
index 364be398e3..1755f0289a 100644
--- a/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala
+++ b/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala
@@ -1,58 +1,81 @@
 package vct.rewrite.rasi
 
-case class ConstraintMap[G](constraints: Map[ResolvableVariable[G], UncertainValue]) {
-  /**
-   * Concatenates the constraints from two constraint maps into one. This is semantically equivalent to an "and"
-   * operation on the two constraint sets.
-   *
-   * @param other Constraint map to concatenate this one with
-   * @return A new constraint map representing the conjunction of the arguments
-   */
+case class ConstraintMap[G](
+    constraints: Map[ResolvableVariable[G], UncertainValue]
+) {
+
+  /** Concatenates the constraints from two constraint maps into one. This is
+    * semantically equivalent to an "and" operation on the two constraint sets.
+    *
+    * @param other
+    *   Constraint map to concatenate this one with
+    * @return
+    *   A new constraint map representing the conjunction of the arguments
+    */
   def &&(other: ConstraintMap[G]): ConstraintMap[G] =
-    ConstraintMap(constraints ++ other.constraints.map{ case (k, v) => k -> v.intersection(constraints.getOrElse(k, UncertainValue.uncertain_of(v.t[G]))) })
-
-  /**
-   * Combines the constraints from two constraint maps into one that represents the disjunction of both inputs. The
-   * result will contain only constraints on variables that occur in both maps, and these will be mapped to the union of
-   * the sets of possible values they were mapped to in either input map.
-   *
-   * @param other Constraint map to combine this one with
-   * @return A new constraint map representing the disjunction of the arguments
-   */
+    ConstraintMap(constraints ++ other.constraints.map { case (k, v) =>
+      k -> v.intersection(
+        constraints.getOrElse(k, UncertainValue.uncertain_of(v.t[G]))
+      )
+    })
+
+  /** Combines the constraints from two constraint maps into one that represents
+    * the disjunction of both inputs. The result will contain only constraints
+    * on variables that occur in both maps, and these will be mapped to the
+    * union of the sets of possible values they were mapped to in either input
+    * map.
+    *
+    * @param other
+    *   Constraint map to combine this one with
+    * @return
+    *   A new constraint map representing the disjunction of the arguments
+    */
   def ||(other: ConstraintMap[G]): ConstraintMap[G] =
-    ConstraintMap.from_cons(constraints.keySet.intersect(other.constraints.keySet).map(k => k -> constraints(k).union(other.constraints(k))))
-
-  /**
-   * Resolves the various constraints placed on each variable in the map and returns a simpler map mapping every
-   * variable to exactly one uncertain value.
-   *
-   * @return A representation of this map in which each variable is mapped to one uncertain value
-   */
+    ConstraintMap.from_cons(
+      constraints.keySet.intersect(other.constraints.keySet)
+        .map(k => k -> constraints(k).union(other.constraints(k)))
+    )
+
+  /** Resolves the various constraints placed on each variable in the map and
+    * returns a simpler map mapping every variable to exactly one uncertain
+    * value.
+    *
+    * @return
+    *   A representation of this map in which each variable is mapped to one
+    *   uncertain value
+    */
   def resolve: Map[ResolvableVariable[G], UncertainValue] = constraints
 
-  /**
-   * Checks whether this map's valuation is impossible. A valuation is impossible if any variable is mapped to an empty
-   * set of potential values.
-   *
-   * @return <code>true</code> if any variable is mapped to an impossible value, <code>false</code> otherwise
-   */
+  /** Checks whether this map's valuation is impossible. A valuation is
+    * impossible if any variable is mapped to an empty set of potential values.
+    *
+    * @return
+    *   <code>true</code> if any variable is mapped to an impossible value,
+    *   <code>false</code> otherwise
+    */
   def is_impossible: Boolean = resolve.exists(t => t._2.is_impossible)
 
-  /**
-   * Checks whether the constraint map is empty. An empty map represents the constraint of all variables to the
-   * uncertain value of their respective type. As such, a map containing only perfectly uncertain valuations is also
-   * considered empty.
-   *
-   * @return <code>true</code> if the map does not constrain any variable, <code>false</code> otherwise
-   */
-  def is_empty: Boolean = resolve.forall(t => t._2 == UncertainValue.uncertain_of(t._1.t))
+  /** Checks whether the constraint map is empty. An empty map represents the
+    * constraint of all variables to the uncertain value of their respective
+    * type. As such, a map containing only perfectly uncertain valuations is
+    * also considered empty.
+    *
+    * @return
+    *   <code>true</code> if the map does not constrain any variable,
+    *   <code>false</code> otherwise
+    */
+  def is_empty: Boolean =
+    resolve.forall(t => t._2 == UncertainValue.uncertain_of(t._1.t))
 }
 case object ConstraintMap {
-  def from[G](variable: ResolvableVariable[G], value: UncertainValue): ConstraintMap[G] =
-    ConstraintMap(Map.from(Seq(variable -> value)))
+  def from[G](
+      variable: ResolvableVariable[G],
+      value: UncertainValue,
+  ): ConstraintMap[G] = ConstraintMap(Map.from(Seq(variable -> value)))
 
-  def from_cons[G](cons: Set[(ResolvableVariable[G], UncertainValue)]): ConstraintMap[G] =
-    ConstraintMap(Map.from(cons.map(t => t._1 -> t._2)))
+  def from_cons[G](
+      cons: Set[(ResolvableVariable[G], UncertainValue)]
+  ): ConstraintMap[G] = ConstraintMap(Map.from(cons.map(t => t._1 -> t._2)))
 
   def empty[G]: ConstraintMap[G] = ConstraintMap(Map.empty)
 
diff --git a/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala b/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala
index ddf558f67d..f43b4ef49d 100644
--- a/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala
+++ b/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala
@@ -2,55 +2,95 @@ package vct.rewrite.rasi
 
 import vct.col.ast._
 
-class ConstraintSolver[G](state: AbstractState[G], vars: Set[_ <: ResolvableVariable[G]], is_contract: Boolean) {
-
-  /**
-   * Resolves the constraints necessary to make the given boolean expression true. If there are multiple disjoint
-   * possibilities to make it true, returns one constraint for each possibility separately.
-   *
-   * @param expr Boolean formula to be resolved to a constraint
-   * @return A set of constraint maps mapping variables to possible values
-   */
+class ConstraintSolver[G](
+    state: AbstractState[G],
+    vars: Set[_ <: ResolvableVariable[G]],
+    is_contract: Boolean,
+) {
+
+  /** Resolves the constraints necessary to make the given boolean expression
+    * true. If there are multiple disjoint possibilities to make it true,
+    * returns one constraint for each possibility separately.
+    *
+    * @param expr
+    *   Boolean formula to be resolved to a constraint
+    * @return
+    *   A set of constraint maps mapping variables to possible values
+    */
   def resolve_assumption(expr: Expr[G]): Set[ConstraintMap[G]] = resolve(expr)
 
-  private def resolve(expr: Expr[G], negate: Boolean = false): Set[ConstraintMap[G]] = expr match {
-    // Consider boolean/separation logic operators
-    case Not(arg) => this.resolve(arg, !negate)
-    case AmbiguousOr(left, right) =>
-      if (!negate) handle_or(left, right)
-      else handle_and(left, right, neg_left = true, neg_right = true)
-    case Star(left, right) =>
-      if (!negate) handle_and(left, right)
-      else handle_or(left, right, neg_left = true, neg_right = true)
-    case And(left, right) =>
-      if (!negate) handle_and(left, right)
-      else handle_or(left, right, neg_left = true, neg_right = true)
-    case Or(left, right) =>
-      if (!negate) handle_or(left, right)
-      else handle_and(left, right, neg_left = true, neg_right = true)
-    case Implies(left, right) =>
-      if (!negate) handle_or(left, right, neg_left = true)
-      else handle_and(left, right, neg_right = true)
-    // Atomic comparisons, if they contain a concrete variable, can actually affect the state
-    case c: Comparison[G] => handle_update(c, negate)
-    // Boolean variables could appear in the assumption without any comparison
-    case e: Expr[G] if vars.exists(v => v.is(e, state)) => Set(ConstraintMap.from(get_var(e).get, UncertainBooleanValue.from(!negate)))
-    // If there are variables in the state that are not tracked that make this valuation impossible, make an impossible constraint
-    case e: Expr[G] if state.valuations.exists(v => v._1.is(e, state)) =>
-      val state_entry: Option[(ConcreteVariable[G], UncertainValue)] = state.valuations.collectFirst{ case (k, v) if k.is(e, state) => (k, v) }
-      if (state_entry.get._2.can_be_equal(UncertainBooleanValue.from(!negate))) Set(ConstraintMap.empty[G])
-      else Set(ConstraintMap.impossible(Set(state_entry.get._1)))
-    // TODO: What other expressions could affect the state?
-    case _ => Set(ConstraintMap.empty[G])
-  }
+  private def resolve(
+      expr: Expr[G],
+      negate: Boolean = false,
+  ): Set[ConstraintMap[G]] =
+    expr match {
+      // Consider boolean/separation logic operators
+      case Not(arg) => this.resolve(arg, !negate)
+      case AmbiguousOr(left, right) =>
+        if (!negate)
+          handle_or(left, right)
+        else
+          handle_and(left, right, neg_left = true, neg_right = true)
+      case Star(left, right) =>
+        if (!negate)
+          handle_and(left, right)
+        else
+          handle_or(left, right, neg_left = true, neg_right = true)
+      case And(left, right) =>
+        if (!negate)
+          handle_and(left, right)
+        else
+          handle_or(left, right, neg_left = true, neg_right = true)
+      case Or(left, right) =>
+        if (!negate)
+          handle_or(left, right)
+        else
+          handle_and(left, right, neg_left = true, neg_right = true)
+      case Implies(left, right) =>
+        if (!negate)
+          handle_or(left, right, neg_left = true)
+        else
+          handle_and(left, right, neg_right = true)
+      // Atomic comparisons, if they contain a concrete variable, can actually affect the state
+      case c: Comparison[G] => handle_update(c, negate)
+      // Boolean variables could appear in the assumption without any comparison
+      case e: Expr[G] if vars.exists(v => v.is(e, state)) =>
+        Set(
+          ConstraintMap
+            .from(get_var(e).get, UncertainBooleanValue.from(!negate))
+        )
+      // If there are variables in the state that are not tracked that make this valuation impossible, make an impossible constraint
+      case e: Expr[G] if state.valuations.exists(v => v._1.is(e, state)) =>
+        val state_entry: Option[(ConcreteVariable[G], UncertainValue)] = state
+          .valuations.collectFirst { case (k, v) if k.is(e, state) => (k, v) }
+        if (
+          state_entry.get._2.can_be_equal(UncertainBooleanValue.from(!negate))
+        )
+          Set(ConstraintMap.empty[G])
+        else
+          Set(ConstraintMap.impossible(Set(state_entry.get._1)))
+      // TODO: What other expressions could affect the state?
+      case _ => Set(ConstraintMap.empty[G])
+    }
 
-  private def handle_and(left: Expr[G], right: Expr[G], neg_left: Boolean = false, neg_right: Boolean = false): Set[ConstraintMap[G]] = {
-    val left_is_possible: UncertainBooleanValue = state.resolve_boolean_expression(left, is_old = false, is_contract)
-    val right_is_possible: UncertainBooleanValue = state.resolve_boolean_expression(right, is_old = false, is_contract)
-    val possible_left: Boolean = (neg_left && left_is_possible.can_be_false) || (!neg_left && left_is_possible.can_be_true)
-    val possible_right: Boolean = (neg_right && right_is_possible.can_be_false) || (!neg_right && right_is_possible.can_be_true)
+  private def handle_and(
+      left: Expr[G],
+      right: Expr[G],
+      neg_left: Boolean = false,
+      neg_right: Boolean = false,
+  ): Set[ConstraintMap[G]] = {
+    val left_is_possible: UncertainBooleanValue = state
+      .resolve_boolean_expression(left, is_old = false, is_contract)
+    val right_is_possible: UncertainBooleanValue = state
+      .resolve_boolean_expression(right, is_old = false, is_contract)
+    val possible_left: Boolean = (neg_left && left_is_possible.can_be_false) ||
+      (!neg_left && left_is_possible.can_be_true)
+    val possible_right: Boolean =
+      (neg_right && right_is_possible.can_be_false) ||
+        (!neg_right && right_is_possible.can_be_true)
 
-    if (!possible_left || !possible_right) Set(ConstraintMap.impossible(vars))
+    if (!possible_left || !possible_right)
+      Set(ConstraintMap.impossible(vars))
     else {
       val left_constraints: Set[ConstraintMap[G]] = resolve(left, neg_left)
       val right_constraints: Set[ConstraintMap[G]] = resolve(right, neg_right)
@@ -58,167 +98,342 @@ class ConstraintSolver[G](state: AbstractState[G], vars: Set[_ <: ResolvableVari
     }
   }
 
-  private def handle_or(left: Expr[G], right: Expr[G], neg_left: Boolean = false, neg_right: Boolean = false): Set[ConstraintMap[G]] = {
-    val left_is_possible: UncertainBooleanValue = state.resolve_boolean_expression(left, is_old = false, is_contract)
-    val right_is_possible: UncertainBooleanValue = state.resolve_boolean_expression(right, is_old = false, is_contract)
-    val possible_left: Boolean = (neg_left && left_is_possible.can_be_false) || (!neg_left && left_is_possible.can_be_true)
-    val possible_right: Boolean = (neg_right && right_is_possible.can_be_false) || (!neg_right && right_is_possible.can_be_true)
+  private def handle_or(
+      left: Expr[G],
+      right: Expr[G],
+      neg_left: Boolean = false,
+      neg_right: Boolean = false,
+  ): Set[ConstraintMap[G]] = {
+    val left_is_possible: UncertainBooleanValue = state
+      .resolve_boolean_expression(left, is_old = false, is_contract)
+    val right_is_possible: UncertainBooleanValue = state
+      .resolve_boolean_expression(right, is_old = false, is_contract)
+    val possible_left: Boolean = (neg_left && left_is_possible.can_be_false) ||
+      (!neg_left && left_is_possible.can_be_true)
+    val possible_right: Boolean =
+      (neg_right && right_is_possible.can_be_false) ||
+        (!neg_right && right_is_possible.can_be_true)
 
-    if (!possible_left && !possible_right) Set(ConstraintMap.impossible(vars))
-    else if (!possible_left) resolve(right, neg_right)
-    else if (!possible_right) resolve(left, neg_left)
+    if (!possible_left && !possible_right)
+      Set(ConstraintMap.impossible(vars))
+    else if (!possible_left)
+      resolve(right, neg_right)
+    else if (!possible_right)
+      resolve(left, neg_left)
     else {
       // Both branches are viable
       val pure_left: Boolean = is_pure(left)
       val pure_right: Boolean = is_pure(right)
       // If one side is pure and the other has an effect on the state, treat this "or" as an implication. If both sides
       // update the state, treat it as a split in the state space instead
-      if (pure_left && pure_right) Set(ConstraintMap.empty[G])
-      else if (pure_left) handle_implies(left, right, !neg_left, neg_right)
-      else if (pure_right) handle_implies(right, left, !neg_right, neg_left)
-      else resolve(left, neg_left) ++ resolve(right, neg_right)
+      if (pure_left && pure_right)
+        Set(ConstraintMap.empty[G])
+      else if (pure_left)
+        handle_implies(left, right, !neg_left, neg_right)
+      else if (pure_right)
+        handle_implies(right, left, !neg_right, neg_left)
+      else
+        resolve(left, neg_left) ++ resolve(right, neg_right)
     }
   }
 
-  private def handle_implies(left: Expr[G], right: Expr[G], neg_left: Boolean = false, neg_right: Boolean = false): Set[ConstraintMap[G]] = {
-    val resolve_left: UncertainBooleanValue = state.resolve_boolean_expression(left, is_old = false, is_contract)
+  private def handle_implies(
+      left: Expr[G],
+      right: Expr[G],
+      neg_left: Boolean = false,
+      neg_right: Boolean = false,
+  ): Set[ConstraintMap[G]] = {
+    val resolve_left: UncertainBooleanValue = state
+      .resolve_boolean_expression(left, is_old = false, is_contract)
     var res: Set[ConstraintMap[G]] = Set()
-    if (neg_left && resolve_left.can_be_false || (!neg_left) && resolve_left.can_be_true) {
+    if (
+      neg_left && resolve_left.can_be_false || (!neg_left) &&
+      resolve_left.can_be_true
+    ) {
       val constraints: Set[ConstraintMap[G]] = resolve(right, neg_right)
-      val variables = vars.asInstanceOf[Set[ResolvableVariable[G]]].diff(constraints.flatMap(c => c.resolve.keySet))
-      val path_condition: ConstraintMap[G] = resolve_path_condition(if (neg_left) Not(left)(left.o) else left, variables)
+      val variables = vars.asInstanceOf[Set[ResolvableVariable[G]]]
+        .diff(constraints.flatMap(c => c.resolve.keySet))
+      val path_condition: ConstraintMap[G] = resolve_path_condition(
+        if (neg_left)
+          Not(left)(left.o)
+        else
+          left,
+        variables,
+      )
       res = res ++ constraints.map(m => m && path_condition)
     }
-    if (neg_left && resolve_left.can_be_true || (!neg_left) && resolve_left.can_be_false) {
-      val path_condition: ConstraintMap[G] = ConstraintMap.empty[G] // TODO: resolve_path_condition(if (neg_left) left else Not(left)(left.o), vars)
+    if (
+      neg_left && resolve_left.can_be_true || (!neg_left) &&
+      resolve_left.can_be_false
+    ) {
+      val path_condition: ConstraintMap[G] = ConstraintMap
+        .empty[G] // TODO: resolve_path_condition(if (neg_left) left else Not(left)(left.o), vars)
       res = res + path_condition
     }
     res
   }
 
-  private def handle_update(comp: Comparison[G], negate: Boolean): Set[ConstraintMap[G]] = {
+  private def handle_update(
+      comp: Comparison[G],
+      negate: Boolean,
+  ): Set[ConstraintMap[G]] = {
     val pure_left = is_pure(comp.left)
     val pure_right = is_pure(comp.right)
-    if (pure_left == pure_right) return Set(ConstraintMap.empty[G])
+    if (pure_left == pure_right)
+      return Set(ConstraintMap.empty[G])
     // Now, exactly one side is pure, and the other contains a concrete variable
     // Resolve the variable and the other side of the equation
     comp.left.t match {
-      case _: TSeq[_] | _: TArray[_] => handle_collection_update(comp, pure_left, negate)
+      case _: TSeq[_] | _: TArray[_] =>
+        handle_collection_update(comp, pure_left, negate)
       case _ => handle_single_update(comp, pure_left, negate)
     }
   }
 
-  private def is_pure(node: Node[G]): Boolean = node match {
-    // The old value of a variable is always pure, since it cannot be updated
-    case _: Old[_] => true
-    case e: UnExpr[_] => e.subnodes.forall(n => is_pure(n))
-    case e: BinExpr[_] => e.subnodes.forall(n => is_pure(n))
-    case e: Expr[_] => if (vars.exists(v => v.is_contained_by(e, state))) false else e.subnodes.forall(n => is_pure(n))
-    case _ => true
-  }
+  private def is_pure(node: Node[G]): Boolean =
+    node match {
+      // The old value of a variable is always pure, since it cannot be updated
+      case _: Old[_] => true
+      case e: UnExpr[_] => e.subnodes.forall(n => is_pure(n))
+      case e: BinExpr[_] => e.subnodes.forall(n => is_pure(n))
+      case e: Expr[_] =>
+        if (vars.exists(v => v.is_contained_by(e, state)))
+          false
+        else
+          e.subnodes.forall(n => is_pure(n))
+      case _ => true
+    }
 
-  private def handle_single_update(comp: Comparison[G], pure_left: Boolean, negate: Boolean): Set[ConstraintMap[G]] = {
-    val expr: Expr[G] = if (pure_left) comp.right else comp.left
-    val value: UncertainValue = if (pure_left) state.resolve_expression(comp.left) else state.resolve_expression(comp.right)
+  private def handle_single_update(
+      comp: Comparison[G],
+      pure_left: Boolean,
+      negate: Boolean,
+  ): Set[ConstraintMap[G]] = {
+    val expr: Expr[G] =
+      if (pure_left)
+        comp.right
+      else
+        comp.left
+    val value: UncertainValue =
+      if (pure_left)
+        state.resolve_expression(comp.left)
+      else
+        state.resolve_expression(comp.right)
 
     comp match {
-      case _: Eq[_] => Set(if (!negate) expr_equals(expr, value) else expr_equals(expr, value.complement()))
-      case _: Neq[_] => Set(if (!negate) expr_equals(expr, value.complement()) else expr_equals(expr, value))
-      case AmbiguousGreater(_, _) | Greater(_, _) => limit_variable(expr, value.asInstanceOf[UncertainIntegerValue], pure_left == negate, negate)
-      case AmbiguousGreaterEq(_, _) | GreaterEq(_, _) => limit_variable(expr, value.asInstanceOf[UncertainIntegerValue], pure_left == negate, !negate)
-      case AmbiguousLessEq(_, _) | LessEq(_, _) => limit_variable(expr, value.asInstanceOf[UncertainIntegerValue], pure_left != negate, !negate)
-      case AmbiguousLess(_, _) | Less(_, _) => limit_variable(expr, value.asInstanceOf[UncertainIntegerValue], pure_left != negate, negate)
+      case _: Eq[_] =>
+        Set(
+          if (!negate)
+            expr_equals(expr, value)
+          else
+            expr_equals(expr, value.complement())
+        )
+      case _: Neq[_] =>
+        Set(
+          if (!negate)
+            expr_equals(expr, value.complement())
+          else
+            expr_equals(expr, value)
+        )
+      case AmbiguousGreater(_, _) | Greater(_, _) =>
+        limit_variable(
+          expr,
+          value.asInstanceOf[UncertainIntegerValue],
+          pure_left == negate,
+          negate,
+        )
+      case AmbiguousGreaterEq(_, _) | GreaterEq(_, _) =>
+        limit_variable(
+          expr,
+          value.asInstanceOf[UncertainIntegerValue],
+          pure_left == negate,
+          !negate,
+        )
+      case AmbiguousLessEq(_, _) | LessEq(_, _) =>
+        limit_variable(
+          expr,
+          value.asInstanceOf[UncertainIntegerValue],
+          pure_left != negate,
+          !negate,
+        )
+      case AmbiguousLess(_, _) | Less(_, _) =>
+        limit_variable(
+          expr,
+          value.asInstanceOf[UncertainIntegerValue],
+          pure_left != negate,
+          negate,
+        )
     }
   }
 
-  private def limit_variable(expr: Expr[G], b: UncertainIntegerValue, var_greater: Boolean, can_be_equal: Boolean): Set[ConstraintMap[G]] = {
+  private def limit_variable(
+      expr: Expr[G],
+      b: UncertainIntegerValue,
+      var_greater: Boolean,
+      can_be_equal: Boolean,
+  ): Set[ConstraintMap[G]] = {
     if (var_greater) {
-      if (can_be_equal) Set(expr_equals(expr, b.above_eq()))
-      else Set(expr_equals(expr, b.above()))
-    }
-    else {
-      if (can_be_equal) Set(expr_equals(expr, b.below_eq()))
-      else Set(expr_equals(expr, b.below()))
+      if (can_be_equal)
+        Set(expr_equals(expr, b.above_eq()))
+      else
+        Set(expr_equals(expr, b.above()))
+    } else {
+      if (can_be_equal)
+        Set(expr_equals(expr, b.below_eq()))
+      else
+        Set(expr_equals(expr, b.below()))
     }
   }
 
-  private def expr_equals(expr: Expr[G], value: UncertainValue): ConstraintMap[G] = {
-    if (get_var(expr).nonEmpty) ConstraintMap.from(get_var(expr).get, value)
-    else expr match {
-      case UMinus(arg) => expr_equals(arg, -value.asInstanceOf[UncertainIntegerValue])
-      case AmbiguousPlus(left, right) => plus_equals(left, right, value.asInstanceOf[UncertainIntegerValue])
-      case Plus(left, right) => plus_equals(left, right, value.asInstanceOf[UncertainIntegerValue])
-      case AmbiguousMinus(left, right) => minus_equals(left, right, value.asInstanceOf[UncertainIntegerValue])
-      case Minus(left, right) => minus_equals(left, right, value.asInstanceOf[UncertainIntegerValue])
-      case _ => ConstraintMap.empty[G]
-    }
+  private def expr_equals(
+      expr: Expr[G],
+      value: UncertainValue,
+  ): ConstraintMap[G] = {
+    if (get_var(expr).nonEmpty)
+      ConstraintMap.from(get_var(expr).get, value)
+    else
+      expr match {
+        case UMinus(arg) =>
+          expr_equals(arg, -value.asInstanceOf[UncertainIntegerValue])
+        case AmbiguousPlus(left, right) =>
+          plus_equals(left, right, value.asInstanceOf[UncertainIntegerValue])
+        case Plus(left, right) =>
+          plus_equals(left, right, value.asInstanceOf[UncertainIntegerValue])
+        case AmbiguousMinus(left, right) =>
+          minus_equals(left, right, value.asInstanceOf[UncertainIntegerValue])
+        case Minus(left, right) =>
+          minus_equals(left, right, value.asInstanceOf[UncertainIntegerValue])
+        case _ => ConstraintMap.empty[G]
+      }
   }
 
-  private def plus_equals(left: Expr[G], right: Expr[G], value: UncertainIntegerValue): ConstraintMap[G] =
-    expr_equals(left, value - state.resolve_integer_expression(right)) && expr_equals(right, value - state.resolve_integer_expression(left))
+  private def plus_equals(
+      left: Expr[G],
+      right: Expr[G],
+      value: UncertainIntegerValue,
+  ): ConstraintMap[G] =
+    expr_equals(left, value - state.resolve_integer_expression(right)) &&
+      expr_equals(right, value - state.resolve_integer_expression(left))
 
-  private def minus_equals(left: Expr[G], right: Expr[G], value: UncertainIntegerValue): ConstraintMap[G] = {
-    expr_equals(left, value + state.resolve_integer_expression(right)) && expr_equals(right, state.resolve_integer_expression(right) - value)
+  private def minus_equals(
+      left: Expr[G],
+      right: Expr[G],
+      value: UncertainIntegerValue,
+  ): ConstraintMap[G] = {
+    expr_equals(left, value + state.resolve_integer_expression(right)) &&
+    expr_equals(right, state.resolve_integer_expression(right) - value)
   }
 
-  private def handle_collection_update(comp: Comparison[G], pure_left: Boolean, negate: Boolean): Set[ConstraintMap[G]] = {
-    val variable: Expr[G] = if (pure_left) comp.right else comp.left
-    val value: UncertainSequence = state.resolve_collection_expression(if (pure_left) comp.left else comp.right)
-    val indices: Set[(IndexedVariable[G], Int)] = get_contained_indices(variable)
+  private def handle_collection_update(
+      comp: Comparison[G],
+      pure_left: Boolean,
+      negate: Boolean,
+  ): Set[ConstraintMap[G]] = {
+    val variable: Expr[G] =
+      if (pure_left)
+        comp.right
+      else
+        comp.left
+    val value: UncertainSequence = state.resolve_collection_expression(
+      if (pure_left)
+        comp.left
+      else
+        comp.right
+    )
+    val indices: Set[(IndexedVariable[G], Int)] = get_contained_indices(
+      variable
+    )
     val size_vars: Set[SizeVariable[G]] = get_size_vars(variable)
 
-    val index_update_map: Set[(ResolvableVariable[G], UncertainValue)] = indices.map(t => (t._1, value.get(t._2)))
-    val size_update_map: Set[(ResolvableVariable[G], UncertainValue)] = size_vars.map(v => (v, value.len))
+    val index_update_map: Set[(ResolvableVariable[G], UncertainValue)] = indices
+      .map(t => (t._1, value.get(t._2)))
+    val size_update_map: Set[(ResolvableVariable[G], UncertainValue)] =
+      size_vars.map(v => (v, value.len))
     val update_map = index_update_map ++ size_update_map
 
     comp match {
       case _: Eq[_] if !negate => Set(ConstraintMap.from_cons(update_map))
       case _: Neq[_] if negate => Set(ConstraintMap.from_cons(update_map))
-      case _ => throw new IllegalArgumentException(s"The operator ${comp.toInlineString} is not supported for collections")
+      case _ =>
+        throw new IllegalArgumentException(
+          s"The operator ${comp.toInlineString} is not supported for collections"
+        )
     }
   }
 
-  private def get_contained_indices(variable: Expr[G]): Set[(IndexedVariable[G], Int)] = variable match {
-    case LiteralSeq(_, _) | UntypedLiteralSeq(_) | Old(_, _) => Set()
-    case d: Deref[_] =>
-      val variables: Set[IndexedVariable[G]] = vars.filter(v => v.is_contained_by(d, state)).collect{ case v: IndexedVariable[G] => v }
-      variables.map(v => (v, v.i))
-    case Take(xs, count) => state.resolve_integer_expression(count).try_to_resolve() match {
-      case None => ???
-      case Some(i) => get_contained_indices(xs).filter(t => t._2 < i)
+  private def get_contained_indices(
+      variable: Expr[G]
+  ): Set[(IndexedVariable[G], Int)] =
+    variable match {
+      case LiteralSeq(_, _) | UntypedLiteralSeq(_) | Old(_, _) => Set()
+      case d: Deref[_] =>
+        val variables: Set[IndexedVariable[G]] = vars
+          .filter(v => v.is_contained_by(d, state)).collect {
+            case v: IndexedVariable[G] => v
+          }
+        variables.map(v => (v, v.i))
+      case Take(xs, count) =>
+        state.resolve_integer_expression(count).try_to_resolve() match {
+          case None => ???
+          case Some(i) => get_contained_indices(xs).filter(t => t._2 < i)
+        }
+      case Drop(xs, count) =>
+        state.resolve_integer_expression(count).try_to_resolve() match {
+          case None => ???
+          case Some(i) =>
+            get_contained_indices(xs).filter(t => t._2 >= i)
+              .map(t => (t._1, t._2 - i))
+        }
+      case Slice(xs, from, to) =>
+        state.resolve_integer_expression(from).try_to_resolve() match {
+          case None => ???
+          case Some(l) =>
+            state.resolve_integer_expression(to).try_to_resolve() match {
+              case None => ???
+              case Some(u) =>
+                get_contained_indices(xs).filter(t => l <= t._2 && t._2 < u)
+                  .map(t => (t._1, t._2 - l))
+            }
+        }
+      case Concat(left, right) =>
+        state.resolve_collection_expression(left).len.try_to_resolve() match {
+          case None => ???
+          case Some(i) =>
+            get_contained_indices(left) ++ get_contained_indices(right)
+              .map(t => (t._1, t._2 + i))
+        }
+      case AmbiguousPlus(left, right) =>
+        state.resolve_collection_expression(left).len.try_to_resolve() match {
+          case None => ???
+          case Some(i) =>
+            get_contained_indices(left) ++ get_contained_indices(right)
+              .map(t => (t._1, t._2 + i))
+        }
+      case Select(cond, ift, iff) =>
+        val condition = state.resolve_boolean_expression(cond)
+        if (condition.can_be_true && !condition.can_be_false)
+          get_contained_indices(ift)
+        else if (condition.can_be_false && !condition.can_be_true)
+          get_contained_indices(iff)
+        else
+          ???
     }
-    case Drop(xs, count) => state.resolve_integer_expression(count).try_to_resolve() match {
-      case None => ???
-      case Some(i) => get_contained_indices(xs).filter(t => t._2 >= i).map(t => (t._1, t._2 - i))
-    }
-    case Slice(xs, from, to) => state.resolve_integer_expression(from).try_to_resolve() match {
-      case None => ???
-      case Some(l) => state.resolve_integer_expression(to).try_to_resolve() match {
-        case None => ???
-        case Some(u) => get_contained_indices(xs).filter(t => l <= t._2 && t._2 < u).map(t => (t._1, t._2 - l))
-      }
-    }
-    case Concat(left, right) => state.resolve_collection_expression(left).len.try_to_resolve() match {
-      case None => ???
-      case Some(i) => get_contained_indices(left) ++ get_contained_indices(right).map(t => (t._1, t._2 + i))
-    }
-    case AmbiguousPlus(left, right) => state.resolve_collection_expression(left).len.try_to_resolve() match {
-      case None => ???
-      case Some(i) => get_contained_indices(left) ++ get_contained_indices(right).map(t => (t._1, t._2 + i))
-    }
-    case Select(cond, ift, iff) =>
-      val condition = state.resolve_boolean_expression(cond)
-      if (condition.can_be_true && !condition.can_be_false) get_contained_indices(ift)
-      else if (condition.can_be_false && !condition.can_be_true) get_contained_indices(iff)
-      else ???
-  }
 
-  private def resolve_path_condition(cond: Expr[G], variables: Set[_ <: ResolvableVariable[G]]): ConstraintMap[G] = {
-    new ConstraintSolver(state, variables, false).resolve_assumption(Utils.remove_old(cond)).reduce((m1, m2) => m1 || m2)
+  private def resolve_path_condition(
+      cond: Expr[G],
+      variables: Set[_ <: ResolvableVariable[G]],
+  ): ConstraintMap[G] = {
+    new ConstraintSolver(state, variables, false)
+      .resolve_assumption(Utils.remove_old(cond)).reduce((m1, m2) => m1 || m2)
   }
 
   private def get_size_vars(variable: Expr[G]): Set[SizeVariable[G]] =
-    vars.filter(v => v.is_contained_by(variable, state)).collect{ case v: SizeVariable[G] => v }
+    vars.filter(v => v.is_contained_by(variable, state)).collect {
+      case v: SizeVariable[G] => v
+    }
 
-  private def get_var(expr: Expr[G]): Option[ResolvableVariable[G]] = vars.collectFirst{ case v: ResolvableVariable[G] if v.is(expr, state) => v }
+  private def get_var(expr: Expr[G]): Option[ResolvableVariable[G]] =
+    vars.collectFirst {
+      case v: ResolvableVariable[G] if v.is(expr, state) => v
+    }
 }
diff --git a/src/rewrite/vct/rewrite/rasi/Interval.scala b/src/rewrite/vct/rewrite/rasi/Interval.scala
index 03b0804183..56d8a85370 100644
--- a/src/rewrite/vct/rewrite/rasi/Interval.scala
+++ b/src/rewrite/vct/rewrite/rasi/Interval.scala
@@ -4,71 +4,90 @@ import vct.col.ast._
 
 sealed abstract class IntervalSize {
   def get: Int
-  def +(other: IntervalSize): IntervalSize = this match {
-    case Infinite() => Infinite()
-    case Finite(v1) => other match {
+  def +(other: IntervalSize): IntervalSize =
+    this match {
       case Infinite() => Infinite()
-      case Finite(v2) => Finite(v1 + v2)
+      case Finite(v1) =>
+        other match {
+          case Infinite() => Infinite()
+          case Finite(v2) => Finite(v1 + v2)
+        }
     }
-  }
-  def >=(other: IntervalSize): Boolean = this match {
-    case Infinite() => true
-    case Finite(v1) => other match {
-      case Infinite() => false
-      case Finite(v2) => v1 >= v2
+  def >=(other: IntervalSize): Boolean =
+    this match {
+      case Infinite() => true
+      case Finite(v1) =>
+        other match {
+          case Infinite() => false
+          case Finite(v2) => v1 >= v2
+        }
     }
-  }
 }
 case class Finite(value: Int) extends IntervalSize {
   override def get: Int = value
 }
 case class Infinite() extends IntervalSize {
-  override def get: Int = throw new NoSuchElementException("Accessing infinite interval size element")
+  override def get: Int =
+    throw new NoSuchElementException("Accessing infinite interval size element")
 }
 
-/**
- * An interval represents a set of integers. It can be empty (type <code>EmptyInterval</code>), unbounded (type
- * <code>UnboundedInterval</code>), bounded by two integers (type <code>BoundedInterval</code>), below an upper bound
- * (type <code>UpperBoundedInterval</code>), above a lower bound (type <code>LowerBoundedInterval</code>) or a union of
- * a finite set of other intervals (type <code>MultiInterval</code>). If it is bounded, then the bounds are contained in
- * the interval.
- *
- * An interval supports the following operations:
- *
- * SIZE OPERATIONS
- *   - <code>empty()</code> returns <code>true</code> if the interval is empty and <code>false</code> otherwise
- *   - <code>non_empty()</code> returns <code>false</code> if the interval is empty and <code>true</code> otherwise
- *   - <code>size()</code> returns the size of the interval in the form of <code>Finite(n)</code> if the interval is
- *   finite and of size <code>n</code>, or <code>Infinite()</code> otherwise
- *
- * SET OPERATIONS
- *   - <code>intersection(Interval)</code> returns the intersection between this interval and the argument
- *   - <code>union(Interval)</code> returns the union of this interval and the argument
- *   - <code>complement()</code> returns the interval representing all integers that are not contained in this interval
- *
- * ARITHMETIC OPERATIONS
- *   - <code>below_max()</code> returns an interval whose upper bound is the maximum entry in this interval, or an
- *   unbounded interval if there is no maximum
- *   - <code>above_min()</code> returns an interval whose lower bound is the minimum entry in this interval, or an
- *   unbounded interval if there is no minimum
- *   - <code>+</code> returns the interval representing the set of sums of entries in both intervals
- *   - <code>-</code> returns the interval representing the set of subtractions of entries of the second interval from
- *   entries in the first
- *   - <code>*</code> returns the interval overapproximating the set of products from both intervals. Since this is not
- *   generally a contiguous interval, this overapproximates to the interval between the minimum and maximum product or,
- *   if multiple such intervals can be defined, to the union of these intervals
- *   - <code>unary_-</code> returns the element-wise negation of this interval
- *   - <code>/</code> NOT IMPLEMENTED
- *   - <code>%</code> NOT IMPLEMENTED
- *   - <code>pow</code> NOT IMPLEMENTED
- *
- * ADMINISTRATIVE OPERATIONS
- *   - <code>sub_intervals()</code> returns the minimum set of contiguous intervals this interval is a union of
- *   - <code>try_to_resolve()</code> if this interval contains exactly one integer, returns this integer, otherwise
- *   returns <code>None</code>
- *   - <code>to_expression(Variable)</code> returns an expression indicating that the given variable is within this
- *   interval
- */
+/** An interval represents a set of integers. It can be empty (type
+  * <code>EmptyInterval</code>), unbounded (type
+  * <code>UnboundedInterval</code>), bounded by two integers (type
+  * <code>BoundedInterval</code>), below an upper bound (type
+  * <code>UpperBoundedInterval</code>), above a lower bound (type
+  * <code>LowerBoundedInterval</code>) or a union of a finite set of other
+  * intervals (type <code>MultiInterval</code>). If it is bounded, then the
+  * bounds are contained in the interval.
+  *
+  * An interval supports the following operations:
+  *
+  * SIZE OPERATIONS
+  *   - <code>empty()</code> returns <code>true</code> if the interval is empty
+  *     and <code>false</code> otherwise
+  *   - <code>non_empty()</code> returns <code>false</code> if the interval is
+  *     empty and <code>true</code> otherwise
+  *   - <code>size()</code> returns the size of the interval in the form of
+  *     <code>Finite(n)</code> if the interval is finite and of size
+  *     <code>n</code>, or <code>Infinite()</code> otherwise
+  *
+  * SET OPERATIONS
+  *   - <code>intersection(Interval)</code> returns the intersection between
+  *     this interval and the argument
+  *   - <code>union(Interval)</code> returns the union of this interval and the
+  *     argument
+  *   - <code>complement()</code> returns the interval representing all integers
+  *     that are not contained in this interval
+  *
+  * ARITHMETIC OPERATIONS
+  *   - <code>below_max()</code> returns an interval whose upper bound is the
+  *     maximum entry in this interval, or an unbounded interval if there is no
+  *     maximum
+  *   - <code>above_min()</code> returns an interval whose lower bound is the
+  *     minimum entry in this interval, or an unbounded interval if there is no
+  *     minimum
+  *   - <code>+</code> returns the interval representing the set of sums of
+  *     entries in both intervals
+  *   - <code>-</code> returns the interval representing the set of subtractions
+  *     of entries of the second interval from entries in the first
+  *   - <code>*</code> returns the interval overapproximating the set of
+  *     products from both intervals. Since this is not generally a contiguous
+  *     interval, this overapproximates to the interval between the minimum and
+  *     maximum product or, if multiple such intervals can be defined, to the
+  *     union of these intervals
+  *   - <code>unary_-</code> returns the element-wise negation of this interval
+  *   - <code>/</code> NOT IMPLEMENTED
+  *   - <code>%</code> NOT IMPLEMENTED
+  *   - <code>pow</code> NOT IMPLEMENTED
+  *
+  * ADMINISTRATIVE OPERATIONS
+  *   - <code>sub_intervals()</code> returns the minimum set of contiguous
+  *     intervals this interval is a union of
+  *   - <code>try_to_resolve()</code> if this interval contains exactly one
+  *     integer, returns this integer, otherwise returns <code>None</code>
+  *   - <code>to_expression(Variable)</code> returns an expression indicating
+  *     that the given variable is within this interval
+  */
 sealed abstract class Interval {
   def empty(): Boolean
   def non_empty(): Boolean = !empty()
@@ -81,14 +100,17 @@ sealed abstract class Interval {
   def above_min(): Interval
   def +(other: Interval): Interval
   def -(other: Interval): Interval = this.+(-other)
-  def *(other: Interval): Interval    // TODO: Modeling the multiple of an interval as an interval is imprecise
+  def *(
+      other: Interval
+  ): Interval // TODO: Modeling the multiple of an interval as an interval is imprecise
   def /(other: Interval): Interval
   def %(other: Interval): Interval
   def unary_- : Interval
-  def pow(other:Interval): Interval
+  def pow(other: Interval): Interval
   def sub_intervals(): Set[Interval] = Set(this)
+  def values: Option[Set[Int]]
   def try_to_resolve(): Option[Int]
-  def to_expression[G](variable: Expr[G]): Expr[G]    // TODO: Use proper origin
+  def to_expression[G](variable: Expr[G]): Expr[G] // TODO: Use proper origin
 }
 
 case object EmptyInterval extends Interval {
@@ -106,66 +128,92 @@ case object EmptyInterval extends Interval {
   override def %(other: Interval): Interval = this
   override def unary_- : Interval = this
   override def pow(other: Interval): Interval = this
+  override def values: Option[Set[Int]] = Some(Set.empty[Int])
   override def try_to_resolve(): Option[Int] = None
-  override def to_expression[G](variable: Expr[G]): Expr[G] = BooleanValue(value = false)(variable.o)
+  override def to_expression[G](variable: Expr[G]): Expr[G] =
+    BooleanValue(value = false)(variable.o)
 }
 
 case class MultiInterval(intervals: Set[Interval]) extends Interval {
-  override def empty(): Boolean = intervals.isEmpty || intervals.forall(i => i.empty())
+  override def empty(): Boolean =
+    intervals.isEmpty || intervals.forall(i => i.empty())
 
-  override def size(): IntervalSize = intervals.toSeq.map(i => i.size()).reduce((s1, s2) => s1 + s2)
+  override def size(): IntervalSize =
+    intervals.toSeq.map(i => i.size()).reduce((s1, s2) => s1 + s2)
 
   override def intersection(other: Interval): Interval = {
     val is = merge_intersecting(intervals.map(i => i.intersection(other)))
-    if (is.size > 1) MultiInterval(is)
-    else is.head
+    if (is.size > 1)
+      MultiInterval(is)
+    else
+      is.head
   }
 
   override def union(other: Interval): Interval = {
-    val (intersecting, non_intersecting) = intervals.partition(i => i.intersection(other).non_empty())
+    val (intersecting, non_intersecting) = intervals
+      .partition(i => i.intersection(other).non_empty())
     // Merge together intervals that are connected by the new interval
-    val new_intervals = non_intersecting + intersecting.fold(other)((i1, i2) => i1.union(i2))
+    val new_intervals =
+      non_intersecting + intersecting.fold(other)((i1, i2) => i1.union(i2))
     // It could be that all intervals are now connected into one
-    if (new_intervals.size > 1) MultiInterval(new_intervals)
-    else new_intervals.head
+    if (new_intervals.size > 1)
+      MultiInterval(new_intervals)
+    else
+      new_intervals.head
   }
 
-  override def complement(): Interval = intervals.foldLeft[Interval](UnboundedInterval)((i1, i2) => i1.intersection(i2.complement()))
+  override def complement(): Interval =
+    intervals.foldLeft[Interval](UnboundedInterval)((i1, i2) =>
+      i1.intersection(i2.complement())
+    )
 
-  override def is_subset_of(other: Interval): Boolean = intervals.forall(p => p.is_subset_of(other))
+  override def is_subset_of(other: Interval): Boolean =
+    intervals.forall(p => p.is_subset_of(other))
 
-  override def below_max(): Interval = intervals.foldLeft[Interval](EmptyInterval)((i1, i2) => i1.union(i2.below_max()))
+  override def below_max(): Interval =
+    intervals
+      .foldLeft[Interval](EmptyInterval)((i1, i2) => i1.union(i2.below_max()))
 
-  override def above_min(): Interval = intervals.foldLeft[Interval](EmptyInterval)((i1, i2) => i1.union(i2.above_min()))
+  override def above_min(): Interval =
+    intervals
+      .foldLeft[Interval](EmptyInterval)((i1, i2) => i1.union(i2.above_min()))
 
   override def +(other: Interval): Interval = {
     val new_intervals = intervals.map(i => i + other)
     // It could be that all intervals are now connected into one
-    if (new_intervals.size > 1) MultiInterval(new_intervals)
-    else new_intervals.head
+    if (new_intervals.size > 1)
+      MultiInterval(new_intervals)
+    else
+      new_intervals.head
   }
 
   override def *(other: Interval): Interval = {
     val new_intervals = intervals.map(i => i * other)
     // It could be that all intervals are now connected into one
-    if (new_intervals.size > 1) MultiInterval(new_intervals)
-    else new_intervals.head
+    if (new_intervals.size > 1)
+      MultiInterval(new_intervals)
+    else
+      new_intervals.head
   }
 
   override def /(other: Interval): Interval = {
     var new_intervals = intervals.map(i => i / other)
     new_intervals = merge_intersecting(new_intervals)
     // It could be that all intervals are now connected into one
-    if (new_intervals.size > 1) MultiInterval(new_intervals)
-    else new_intervals.head
+    if (new_intervals.size > 1)
+      MultiInterval(new_intervals)
+    else
+      new_intervals.head
   }
 
   override def %(other: Interval): Interval = {
     var new_intervals = intervals.map(i => i % other)
     new_intervals = merge_intersecting(new_intervals)
     // It could be that all intervals are now connected into one
-    if (new_intervals.size > 1) MultiInterval(new_intervals)
-    else new_intervals.head
+    if (new_intervals.size > 1)
+      MultiInterval(new_intervals)
+    else
+      new_intervals.head
   }
 
   override def unary_- : Interval = MultiInterval(intervals.map(i => -i))
@@ -173,141 +221,223 @@ case class MultiInterval(intervals: Set[Interval]) extends Interval {
   override def pow(other: Interval): Interval = {
     val new_intervals = intervals.map(i => i.pow(other))
     // It could be that all intervals are now connected into one
-    if (new_intervals.size > 1) MultiInterval(new_intervals)
-    else new_intervals.head
+    if (new_intervals.size > 1)
+      MultiInterval(new_intervals)
+    else
+      new_intervals.head
   }
 
-  private def merge_intersecting(is: Set[Interval]): Set[Interval] = MultiInterval(is).sub_intervals().reduce((i1, i2) => i1.union(i2)).sub_intervals()
+  private def merge_intersecting(is: Set[Interval]): Set[Interval] =
+    MultiInterval(is).sub_intervals().reduce((i1, i2) => i1.union(i2))
+      .sub_intervals()
 
-  override def sub_intervals(): Set[Interval] = intervals.flatMap(i => i.sub_intervals())
+  override def sub_intervals(): Set[Interval] =
+    intervals.flatMap(i => i.sub_intervals())
+
+  override def values: Option[Set[Int]] = {
+    intervals.map(i => i.values).reduce((o1, o2) =>
+      if (o1.isEmpty || o2.isEmpty)
+        None
+      else
+        Some(o1.get ++ o2.get)
+    )
+  }
 
   override def try_to_resolve(): Option[Int] = {
-    if (intervals.count(i => i != EmptyInterval) == 1) intervals.filter(i => i != EmptyInterval).head.try_to_resolve()
-    else None
+    if (intervals.count(i => i != EmptyInterval) == 1)
+      intervals.filter(i => i != EmptyInterval).head.try_to_resolve()
+    else
+      None
   }
 
   override def to_expression[G](variable: Expr[G]): Expr[G] = {
-    intervals.map(i => i.to_expression(variable)).reduce((e1, e2) => Or(e1, e2)(variable.o))
+    val sorted: Seq[Interval] = merge_intersecting(intervals).toSeq
+      .sortWith((i1, i2) => i1.below_max().is_subset_of(i2.below_max()))
+    sorted.map(i => i.to_expression(variable))
+      .reduce((e1, e2) => Or(e1, e2)(variable.o))
   }
 }
 
 case class BoundedInterval(lower: Int, upper: Int) extends Interval {
   override def empty(): Boolean = lower > upper
 
-  override def size(): IntervalSize = Finite(scala.math.max(upper - lower + 1, 0))
-
-  override def intersection(other: Interval): Interval = other match {
-    case EmptyInterval => other
-    case mi: MultiInterval => mi.intersection(this)
-    case BoundedInterval(low, up) =>
-      if (up <= upper && up >= lower || low <= upper && low >= lower) BoundedInterval(scala.math.max(low, lower), scala.math.min(up, upper))
-      else EmptyInterval
-    case LowerBoundedInterval(low) =>
-      if (upper >= low) BoundedInterval(scala.math.max(low, lower), upper)
-      else EmptyInterval
-    case UpperBoundedInterval(up) =>
-      if (lower <= up) BoundedInterval(lower, scala.math.min(up, upper))
-      else EmptyInterval
-    case UnboundedInterval => this
-  }
+  override def size(): IntervalSize =
+    Finite(scala.math.max(upper - lower + 1, 0))
+
+  override def intersection(other: Interval): Interval =
+    other match {
+      case EmptyInterval => other
+      case mi: MultiInterval => mi.intersection(this)
+      case BoundedInterval(low, up) =>
+        if (up <= upper && up >= lower || low <= upper && low >= lower)
+          BoundedInterval(scala.math.max(low, lower), scala.math.min(up, upper))
+        else
+          EmptyInterval
+      case LowerBoundedInterval(low) =>
+        if (upper >= low)
+          BoundedInterval(scala.math.max(low, lower), upper)
+        else
+          EmptyInterval
+      case UpperBoundedInterval(up) =>
+        if (lower <= up)
+          BoundedInterval(lower, scala.math.min(up, upper))
+        else
+          EmptyInterval
+      case UnboundedInterval => this
+    }
 
-  override def union(other: Interval): Interval = other match {
-    case EmptyInterval => this
-    case mi: MultiInterval => mi.union(this)
-    case BoundedInterval(low, up) =>
-      if (up <= upper + 1 && up >= lower - 1 || low <= upper + 1 && low >= lower - 1) BoundedInterval(scala.math.min(low, lower), scala.math.max(up, upper))
-      else MultiInterval(Set(this, other))
-    case LowerBoundedInterval(low) =>
-      if (upper + 1 >= low) LowerBoundedInterval(scala.math.min(low, lower))
-      else MultiInterval(Set(this, other))
-    case UpperBoundedInterval(up) =>
-      if (lower - 1 <= up) UpperBoundedInterval(scala.math.max(up, upper))
-      else MultiInterval(Set(this, other))
-    case UnboundedInterval => other
-  }
+  override def union(other: Interval): Interval =
+    other match {
+      case EmptyInterval => this
+      case mi: MultiInterval => mi.union(this)
+      case BoundedInterval(low, up) =>
+        if (
+          up <= upper + 1 && up >= lower - 1 ||
+          low <= upper + 1 && low >= lower - 1
+        )
+          BoundedInterval(scala.math.min(low, lower), scala.math.max(up, upper))
+        else
+          MultiInterval(Set(this, other))
+      case LowerBoundedInterval(low) =>
+        if (upper + 1 >= low)
+          LowerBoundedInterval(scala.math.min(low, lower))
+        else
+          MultiInterval(Set(this, other))
+      case UpperBoundedInterval(up) =>
+        if (lower - 1 <= up)
+          UpperBoundedInterval(scala.math.max(up, upper))
+        else
+          MultiInterval(Set(this, other))
+      case UnboundedInterval => other
+    }
 
   override def complement(): Interval =
-    MultiInterval(Set(UpperBoundedInterval(lower - 1), LowerBoundedInterval(upper + 1)))
-
-  override def is_subset_of(other: Interval): Boolean = empty() || (other match {
-    case EmptyInterval => false
-    case MultiInterval(intervals) => intervals.exists(p => is_subset_of(p))
-    case BoundedInterval(low, up) => low <= lower && up >= upper
-    case LowerBoundedInterval(low) => low <= lower
-    case UpperBoundedInterval(up) => up >= upper
-    case UnboundedInterval => true
-  })
+    MultiInterval(
+      Set(UpperBoundedInterval(lower - 1), LowerBoundedInterval(upper + 1))
+    )
+
+  override def is_subset_of(other: Interval): Boolean =
+    empty() ||
+      (other match {
+        case EmptyInterval => false
+        case MultiInterval(intervals) => intervals.exists(p => is_subset_of(p))
+        case BoundedInterval(low, up) => low <= lower && up >= upper
+        case LowerBoundedInterval(low) => low <= lower
+        case UpperBoundedInterval(up) => up >= upper
+        case UnboundedInterval => true
+      })
 
   override def below_max(): Interval = UpperBoundedInterval(upper)
 
   override def above_min(): Interval = LowerBoundedInterval(lower)
 
-  override def +(other: Interval): Interval = other match {
-    case EmptyInterval | UnboundedInterval => other
-    case mi: MultiInterval => mi.+(this)
-    case BoundedInterval(low, up) => BoundedInterval(lower + low, upper + up)
-    case LowerBoundedInterval(low) => LowerBoundedInterval(lower + low)
-    case UpperBoundedInterval(up) => UpperBoundedInterval(upper + up)
-  }
+  override def +(other: Interval): Interval =
+    other match {
+      case EmptyInterval | UnboundedInterval => other
+      case mi: MultiInterval => mi.+(this)
+      case BoundedInterval(low, up) => BoundedInterval(lower + low, upper + up)
+      case LowerBoundedInterval(low) => LowerBoundedInterval(lower + low)
+      case UpperBoundedInterval(up) => UpperBoundedInterval(upper + up)
+    }
 
-  override def *(other: Interval): Interval = other match {
-    case EmptyInterval | UnboundedInterval => other
-    case mi: MultiInterval => mi.*(this)
-    case BoundedInterval(low, up) => BoundedInterval(Utils.prod_min(low, up, lower, upper), Utils.prod_max(low, up, lower, upper))
-    case LowerBoundedInterval(low) =>
-      if (lower < 0 && upper > 0) UnboundedInterval
-      else if (lower >= 0) LowerBoundedInterval(scala.math.min(low * upper, low * lower))
-      else UpperBoundedInterval(scala.math.max(low * upper, low * lower))
-    case UpperBoundedInterval(up) =>
-      if (lower < 0 && upper > 0) UnboundedInterval
-      else if (lower >= 0) UpperBoundedInterval(scala.math.max(up * lower, up * upper))
-      else LowerBoundedInterval(scala.math.min(up * lower, up * upper))
-  }
+  override def *(other: Interval): Interval =
+    other match {
+      case EmptyInterval | UnboundedInterval => other
+      case mi: MultiInterval => mi.*(this)
+      case BoundedInterval(low, up) =>
+        BoundedInterval(
+          Utils.prod_min(low, up, lower, upper),
+          Utils.prod_max(low, up, lower, upper),
+        )
+      case LowerBoundedInterval(low) =>
+        if (lower < 0 && upper > 0)
+          UnboundedInterval
+        else if (lower >= 0)
+          LowerBoundedInterval(scala.math.min(low * upper, low * lower))
+        else
+          UpperBoundedInterval(scala.math.max(low * upper, low * lower))
+      case UpperBoundedInterval(up) =>
+        if (lower < 0 && upper > 0)
+          UnboundedInterval
+        else if (lower >= 0)
+          UpperBoundedInterval(scala.math.max(up * lower, up * upper))
+        else
+          LowerBoundedInterval(scala.math.min(up * lower, up * upper))
+    }
 
-  override def /(other: Interval): Interval = other match {
-    case EmptyInterval => other
-    case MultiInterval(intervals) => ???
-    case BoundedInterval(low, up) => ???
-    case LowerBoundedInterval(low) =>
-      if (low < 0) BoundedInterval(-Utils.abs_max(lower, upper), Utils.abs_max(lower, upper))
-      else BoundedInterval(scala.math.min(lower / low, 0), scala.math.max(upper / low, 0))
-    case UpperBoundedInterval(up) => ???
-    case UnboundedInterval => BoundedInterval(-Utils.abs_max(lower, upper), Utils.abs_max(lower, upper))
-  }
+  override def /(other: Interval): Interval =
+    other match {
+      case EmptyInterval => other
+      case MultiInterval(intervals) => ???
+      case BoundedInterval(low, up) => ???
+      case LowerBoundedInterval(low) =>
+        if (low < 0)
+          BoundedInterval(
+            -Utils.abs_max(lower, upper),
+            Utils.abs_max(lower, upper),
+          )
+        else
+          BoundedInterval(
+            scala.math.min(lower / low, 0),
+            scala.math.max(upper / low, 0),
+          )
+      case UpperBoundedInterval(up) => ???
+      case UnboundedInterval =>
+        BoundedInterval(
+          -Utils.abs_max(lower, upper),
+          Utils.abs_max(lower, upper),
+        )
+    }
 
-  override def %(other: Interval): Interval = other match {
-    case EmptyInterval => other
-    case MultiInterval(intervals) => ???
-    case BoundedInterval(low, up) => ???
-    case LowerBoundedInterval(low) => ???
-    case UpperBoundedInterval(up) => ???
-    case UnboundedInterval =>
-      if (lower < 0) BoundedInterval(lower, scala.math.max(0, upper))
-      else BoundedInterval(0, upper)
-  }
+  override def %(other: Interval): Interval =
+    other match {
+      case EmptyInterval => other
+      case MultiInterval(intervals) => ???
+      case BoundedInterval(low, up) => ???
+      case LowerBoundedInterval(low) => ???
+      case UpperBoundedInterval(up) => ???
+      case UnboundedInterval =>
+        if (lower < 0)
+          BoundedInterval(lower, scala.math.max(0, upper))
+        else
+          BoundedInterval(0, upper)
+    }
 
   override def unary_- : Interval = BoundedInterval(-upper, -lower)
 
-  override def pow(other: Interval): Interval = other match {
-    case EmptyInterval => other
-    case MultiInterval(intervals) => ???
-    case BoundedInterval(low, up) => ???
-    case LowerBoundedInterval(low) => ???
-    case UpperBoundedInterval(up) => ???
-    case UnboundedInterval =>
-      if (lower < -1) other
-      else if (lower == -1) LowerBoundedInterval(-1)
-      else LowerBoundedInterval(0)
-  }
+  override def pow(other: Interval): Interval =
+    other match {
+      case EmptyInterval => other
+      case MultiInterval(intervals) => ???
+      case BoundedInterval(low, up) => ???
+      case LowerBoundedInterval(low) => ???
+      case UpperBoundedInterval(up) => ???
+      case UnboundedInterval =>
+        if (lower < -1)
+          other
+        else if (lower == -1)
+          LowerBoundedInterval(-1)
+        else
+          LowerBoundedInterval(0)
+    }
+
+  override def values: Option[Set[Int]] = Some(lower.to(upper).toSet)
 
   override def try_to_resolve(): Option[Int] = {
-    if (lower == upper) Some(upper)
-    else None
+    if (lower == upper)
+      Some(upper)
+    else
+      None
   }
 
   override def to_expression[G](variable: Expr[G]): Expr[G] = {
-    if (lower == upper) Eq(variable, IntegerValue(upper)(variable.o))(variable.o)
-    else And(LessEq(variable, IntegerValue(upper)(variable.o))(variable.o), GreaterEq(variable, IntegerValue(lower)(variable.o))(variable.o))(variable.o)
+    if (lower == upper)
+      Eq(variable, IntegerValue(upper)(variable.o))(variable.o)
+    else
+      And(
+        LessEq(variable, IntegerValue(upper)(variable.o))(variable.o),
+        GreaterEq(variable, IntegerValue(lower)(variable.o))(variable.o),
+      )(variable.o)
   }
 }
 
@@ -316,64 +446,84 @@ case class LowerBoundedInterval(lower: Int) extends Interval {
 
   override def size(): IntervalSize = Infinite()
 
-  override def intersection(other: Interval): Interval = other match {
-    case EmptyInterval => other
-    case mi: MultiInterval => mi.intersection(this)
-    case BoundedInterval(low, up) =>
-      if (up >= lower) BoundedInterval(scala.math.max(lower, low), up)
-      else EmptyInterval
-    case LowerBoundedInterval(low) => LowerBoundedInterval(scala.math.max(low, lower))
-    case UpperBoundedInterval(up) =>
-      if (up >= lower) BoundedInterval(lower, up)
-      else EmptyInterval
-    case UnboundedInterval => this
-  }
+  override def intersection(other: Interval): Interval =
+    other match {
+      case EmptyInterval => other
+      case mi: MultiInterval => mi.intersection(this)
+      case BoundedInterval(low, up) =>
+        if (up >= lower)
+          BoundedInterval(scala.math.max(lower, low), up)
+        else
+          EmptyInterval
+      case LowerBoundedInterval(low) =>
+        LowerBoundedInterval(scala.math.max(low, lower))
+      case UpperBoundedInterval(up) =>
+        if (up >= lower)
+          BoundedInterval(lower, up)
+        else
+          EmptyInterval
+      case UnboundedInterval => this
+    }
 
-  override def union(other: Interval): Interval = other match {
-    case EmptyInterval => this
-    case mi: MultiInterval => mi.union(this)
-    case BoundedInterval(low, up) =>
-      if (up + 1 >= lower) LowerBoundedInterval(scala.math.min(low, lower))
-      else MultiInterval(Set(other, this))
-    case LowerBoundedInterval(low) => LowerBoundedInterval(scala.math.min(low, lower))
-    case UpperBoundedInterval(up) =>
-      if (up + 1 >= lower) UnboundedInterval
-      else MultiInterval(Set(other, this))
-    case UnboundedInterval => other
-  }
+  override def union(other: Interval): Interval =
+    other match {
+      case EmptyInterval => this
+      case mi: MultiInterval => mi.union(this)
+      case BoundedInterval(low, up) =>
+        if (up + 1 >= lower)
+          LowerBoundedInterval(scala.math.min(low, lower))
+        else
+          MultiInterval(Set(other, this))
+      case LowerBoundedInterval(low) =>
+        LowerBoundedInterval(scala.math.min(low, lower))
+      case UpperBoundedInterval(up) =>
+        if (up + 1 >= lower)
+          UnboundedInterval
+        else
+          MultiInterval(Set(other, this))
+      case UnboundedInterval => other
+    }
 
   override def complement(): Interval = UpperBoundedInterval(lower - 1)
 
-  override def is_subset_of(other: Interval): Boolean = other match {
-    case EmptyInterval | BoundedInterval(_, _) | UpperBoundedInterval(_) => false
-    case MultiInterval(intervals) => intervals.exists(p => is_subset_of(p))
-    case LowerBoundedInterval(low) => low <= lower
-    case UnboundedInterval => true
-  }
+  override def is_subset_of(other: Interval): Boolean =
+    other match {
+      case EmptyInterval | BoundedInterval(_, _) | UpperBoundedInterval(_) =>
+        false
+      case MultiInterval(intervals) => intervals.exists(p => is_subset_of(p))
+      case LowerBoundedInterval(low) => low <= lower
+      case UnboundedInterval => true
+    }
 
   override def below_max(): Interval = UnboundedInterval
 
   override def above_min(): Interval = this
 
-  override def +(other: Interval): Interval = other match {
-    case EmptyInterval | UnboundedInterval => other
-    case mi: MultiInterval => mi.+(this)
-    case BoundedInterval(low, _) => LowerBoundedInterval(lower + low)
-    case LowerBoundedInterval(low) => LowerBoundedInterval(lower + low)
-    case UpperBoundedInterval(_) => UnboundedInterval
-  }
+  override def +(other: Interval): Interval =
+    other match {
+      case EmptyInterval | UnboundedInterval => other
+      case mi: MultiInterval => mi.+(this)
+      case BoundedInterval(low, _) => LowerBoundedInterval(lower + low)
+      case LowerBoundedInterval(low) => LowerBoundedInterval(lower + low)
+      case UpperBoundedInterval(_) => UnboundedInterval
+    }
 
-  override def *(other: Interval): Interval = other match {
-    case EmptyInterval | UnboundedInterval => other
-    case mi: MultiInterval => mi.*(this)
-    case bi: BoundedInterval => bi.*(this)
-    case LowerBoundedInterval(low) =>
-      if (low < 0 || lower < 0) UnboundedInterval
-      else LowerBoundedInterval(low * lower)
-    case UpperBoundedInterval(up) =>
-      if (lower < 0 || up > 0) UnboundedInterval
-      else UpperBoundedInterval(up * lower)
-  }
+  override def *(other: Interval): Interval =
+    other match {
+      case EmptyInterval | UnboundedInterval => other
+      case mi: MultiInterval => mi.*(this)
+      case bi: BoundedInterval => bi.*(this)
+      case LowerBoundedInterval(low) =>
+        if (low < 0 || lower < 0)
+          UnboundedInterval
+        else
+          LowerBoundedInterval(low * lower)
+      case UpperBoundedInterval(up) =>
+        if (lower < 0 || up > 0)
+          UnboundedInterval
+        else
+          UpperBoundedInterval(up * lower)
+    }
 
   override def /(other: Interval): Interval = ???
 
@@ -383,9 +533,12 @@ case class LowerBoundedInterval(lower: Int) extends Interval {
 
   override def pow(other: Interval): Interval = ???
 
+  override def values: Option[Set[Int]] = None
+
   override def try_to_resolve(): Option[Int] = None
 
-  override def to_expression[G](variable: Expr[G]): Expr[G] = GreaterEq(variable, IntegerValue(lower)(variable.o))(variable.o)
+  override def to_expression[G](variable: Expr[G]): Expr[G] =
+    GreaterEq(variable, IntegerValue(lower)(variable.o))(variable.o)
 }
 
 case class UpperBoundedInterval(upper: Int) extends Interval {
@@ -393,64 +546,84 @@ case class UpperBoundedInterval(upper: Int) extends Interval {
 
   override def size(): IntervalSize = Infinite()
 
-  override def intersection(other: Interval): Interval = other match {
-    case EmptyInterval => other
-    case mi: MultiInterval => mi.intersection(this)
-    case BoundedInterval(low, up) =>
-      if (low <= upper) BoundedInterval(low, scala.math.min(up, upper))
-      else EmptyInterval
-    case LowerBoundedInterval(low) =>
-      if (low <= upper) BoundedInterval(low, upper)
-      else EmptyInterval
-    case UpperBoundedInterval(up) => UpperBoundedInterval(scala.math.min(up, upper))
-    case UnboundedInterval => this
-  }
+  override def intersection(other: Interval): Interval =
+    other match {
+      case EmptyInterval => other
+      case mi: MultiInterval => mi.intersection(this)
+      case BoundedInterval(low, up) =>
+        if (low <= upper)
+          BoundedInterval(low, scala.math.min(up, upper))
+        else
+          EmptyInterval
+      case LowerBoundedInterval(low) =>
+        if (low <= upper)
+          BoundedInterval(low, upper)
+        else
+          EmptyInterval
+      case UpperBoundedInterval(up) =>
+        UpperBoundedInterval(scala.math.min(up, upper))
+      case UnboundedInterval => this
+    }
 
-  override def union(other: Interval): Interval = other match {
-    case EmptyInterval => this
-    case mi: MultiInterval => mi.union(this)
-    case BoundedInterval(low, up) =>
-      if (low - 1 <= upper) UpperBoundedInterval(scala.math.max(upper, up))
-      else MultiInterval(Set(this, other))
-    case LowerBoundedInterval(low) =>
-      if (low - 1 <= upper) UnboundedInterval
-      else MultiInterval(Set(this, other))
-    case UpperBoundedInterval(up) => UpperBoundedInterval(scala.math.max(upper, up))
-    case UnboundedInterval => other
-  }
+  override def union(other: Interval): Interval =
+    other match {
+      case EmptyInterval => this
+      case mi: MultiInterval => mi.union(this)
+      case BoundedInterval(low, up) =>
+        if (low - 1 <= upper)
+          UpperBoundedInterval(scala.math.max(upper, up))
+        else
+          MultiInterval(Set(this, other))
+      case LowerBoundedInterval(low) =>
+        if (low - 1 <= upper)
+          UnboundedInterval
+        else
+          MultiInterval(Set(this, other))
+      case UpperBoundedInterval(up) =>
+        UpperBoundedInterval(scala.math.max(upper, up))
+      case UnboundedInterval => other
+    }
 
   override def complement(): Interval = LowerBoundedInterval(upper + 1)
 
-  override def is_subset_of(other: Interval): Boolean = other match {
-    case EmptyInterval | BoundedInterval(_, _) | LowerBoundedInterval(_) => false
-    case MultiInterval(intervals) => intervals.exists(p => is_subset_of(p))
-    case UpperBoundedInterval(up) => up >= upper
-    case UnboundedInterval => true
-  }
+  override def is_subset_of(other: Interval): Boolean =
+    other match {
+      case EmptyInterval | BoundedInterval(_, _) | LowerBoundedInterval(_) =>
+        false
+      case MultiInterval(intervals) => intervals.exists(p => is_subset_of(p))
+      case UpperBoundedInterval(up) => up >= upper
+      case UnboundedInterval => true
+    }
 
   override def below_max(): Interval = this
 
   override def above_min(): Interval = UnboundedInterval
 
-  override def +(other: Interval): Interval = other match {
-    case EmptyInterval | UnboundedInterval => other
-    case mi: MultiInterval => mi.+(this)
-    case BoundedInterval(_, up) => UpperBoundedInterval(upper + up)
-    case LowerBoundedInterval(_) => UnboundedInterval
-    case UpperBoundedInterval(up) => UpperBoundedInterval(upper + up)
-  }
+  override def +(other: Interval): Interval =
+    other match {
+      case EmptyInterval | UnboundedInterval => other
+      case mi: MultiInterval => mi.+(this)
+      case BoundedInterval(_, up) => UpperBoundedInterval(upper + up)
+      case LowerBoundedInterval(_) => UnboundedInterval
+      case UpperBoundedInterval(up) => UpperBoundedInterval(upper + up)
+    }
 
-  override def *(other: Interval): Interval = other match {
-    case EmptyInterval | UnboundedInterval => other
-    case mi: MultiInterval => mi.*(this)
-    case bi: BoundedInterval => bi.*(this)
-    case LowerBoundedInterval(low) =>
-      if (low < 0 || upper > 0) UnboundedInterval
-      else UpperBoundedInterval(low * upper)
-    case UpperBoundedInterval(up) =>
-      if (up > 0 || upper > 0) UnboundedInterval
-      else LowerBoundedInterval(up * upper)
-  }
+  override def *(other: Interval): Interval =
+    other match {
+      case EmptyInterval | UnboundedInterval => other
+      case mi: MultiInterval => mi.*(this)
+      case bi: BoundedInterval => bi.*(this)
+      case LowerBoundedInterval(low) =>
+        if (low < 0 || upper > 0)
+          UnboundedInterval
+        else
+          UpperBoundedInterval(low * upper)
+      case UpperBoundedInterval(up) =>
+        if (up > 0 || upper > 0)
+          UnboundedInterval
+        else
+          LowerBoundedInterval(up * upper)
+    }
 
   override def /(other: Interval): Interval = ???
 
@@ -460,9 +633,12 @@ case class UpperBoundedInterval(upper: Int) extends Interval {
 
   override def pow(other: Interval): Interval = ???
 
+  override def values: Option[Set[Int]] = None
+
   override def try_to_resolve(): Option[Int] = None
 
-  override def to_expression[G](variable: Expr[G]): Expr[G] = LessEq(variable, IntegerValue(upper)(variable.o))(variable.o)
+  override def to_expression[G](variable: Expr[G]): Expr[G] =
+    LessEq(variable, IntegerValue(upper)(variable.o))(variable.o)
 }
 
 case object UnboundedInterval extends Interval {
@@ -477,23 +653,38 @@ case object UnboundedInterval extends Interval {
   override def +(other: Interval): Interval = this
   override def *(other: Interval): Interval = this
   override def /(other: Interval): Interval = this
-  override def %(other: Interval): Interval = other match {
-    case UnboundedInterval | EmptyInterval => other
-    case mi: MultiInterval =>
-      val intvs = mi.sub_intervals()
-      if (intvs.collect{case LowerBoundedInterval(_) | UpperBoundedInterval(_) | UnboundedInterval => 0}.nonEmpty)
-        return this
-      val max = intvs.map{case EmptyInterval => 0; case BoundedInterval(lower, upper) => Utils.abs_max(lower, upper)}.max - 1
-      if (max <= 0) EmptyInterval
-      else BoundedInterval(-max, max)
-    case BoundedInterval(lower, upper) =>
-      val max = Utils.abs_max(lower, upper) - 1
-      BoundedInterval(-max, max)
-    case LowerBoundedInterval(_) => this
-    case UpperBoundedInterval(_) => this
-  }
+  override def %(other: Interval): Interval =
+    other match {
+      case UnboundedInterval | EmptyInterval => other
+      case mi: MultiInterval =>
+        val intvs = mi.sub_intervals()
+        if (
+          intvs.collect {
+            case LowerBoundedInterval(_) | UpperBoundedInterval(_) |
+                UnboundedInterval =>
+              0
+          }.nonEmpty
+        )
+          return this
+        val max =
+          intvs.map {
+            case EmptyInterval => 0;
+            case BoundedInterval(lower, upper) => Utils.abs_max(lower, upper)
+          }.max - 1
+        if (max <= 0)
+          EmptyInterval
+        else
+          BoundedInterval(-max, max)
+      case BoundedInterval(lower, upper) =>
+        val max = Utils.abs_max(lower, upper) - 1
+        BoundedInterval(-max, max)
+      case LowerBoundedInterval(_) => this
+      case UpperBoundedInterval(_) => this
+    }
   override def unary_- : Interval = this
   override def pow(other: Interval): Interval = this
+  override def values: Option[Set[Int]] = None
   override def try_to_resolve(): Option[Int] = None
-  override def to_expression[G](variable: Expr[G]): Expr[G] = BooleanValue(value = true)(variable.o)
-}
\ No newline at end of file
+  override def to_expression[G](variable: Expr[G]): Expr[G] =
+    BooleanValue(value = true)(variable.o)
+}
diff --git a/src/rewrite/vct/rewrite/rasi/RASIConnection.scala b/src/rewrite/vct/rewrite/rasi/RASIConnection.scala
index 60c05aeda2..fea92d4f64 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIConnection.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIConnection.scala
@@ -1,11 +1,22 @@
 package vct.rewrite.rasi
 
-case class RASISuccessor[G](deciding_variables: Set[ConcreteVariable[G]], successors: Set[AbstractState[G]]) {
-  def edges(start: AbstractState[G]): Set[RASIEdge[G]] = successors.map(s => RASIEdge(start, deciding_variables, s))
+case class RASISuccessor[G](
+    deciding_variables: Set[ConcreteVariable[G]],
+    successors: Set[AbstractState[G]],
+) {
+  def edges(start: AbstractState[G]): Set[RASIEdge[G]] =
+    successors.map(s => RASIEdge(start, deciding_variables, s))
 }
 case object RASISuccessor {
   def from[G](successors: Iterable[RASISuccessor[G]]): RASISuccessor[G] =
-    RASISuccessor(successors.flatMap(s => s.deciding_variables).toSet, successors.flatMap(s => s.successors).toSet)
+    RASISuccessor(
+      successors.flatMap(s => s.deciding_variables).toSet,
+      successors.flatMap(s => s.successors).toSet,
+    )
 }
 
-case class RASIEdge[G](from: AbstractState[G], vars: Set[ConcreteVariable[G]], to: AbstractState[G])
+case class RASIEdge[G](
+    from: AbstractState[G],
+    vars: Set[ConcreteVariable[G]],
+    to: AbstractState[G],
+)
diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index 521980969d..d9c36d4191 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -1,7 +1,15 @@
 package vct.rewrite.rasi
 
 import com.typesafe.scalalogging.LazyLogging
-import vct.col.ast.{Deref, Expr, InstanceField, InstanceMethod, InstancePredicate, Null, Or}
+import vct.col.ast.{
+  Deref,
+  Expr,
+  InstanceField,
+  InstanceMethod,
+  InstancePredicate,
+  Null,
+  Or,
+}
 import vct.col.origin.Origin
 import vct.rewrite.cfg.{CFGEntry, CFGGenerator}
 
@@ -10,40 +18,76 @@ import scala.collection.immutable.HashMap
 import scala.collection.mutable
 
 class RASIGenerator[G] extends LazyLogging {
-  private val found_states: mutable.ArrayBuffer[AbstractState[G]] = mutable.ArrayBuffer()
-  private val found_edges: mutable.ArrayBuffer[RASIEdge[G]] = mutable.ArrayBuffer()
-  private val current_branches: mutable.ArrayBuffer[AbstractState[G]] = mutable.ArrayBuffer()
-
-  def execute(entry_point: InstanceMethod[G], vars: Set[ConcreteVariable[G]], parameter_invariant: InstancePredicate[G]): Expr[G] =
-    generate_rasi(CFGGenerator().generate(entry_point), vars, parameter_invariant)
-
-  def test(entry_point: InstanceMethod[G], vars: Set[ConcreteVariable[G]], parameter_invariant: InstancePredicate[G], out_path: Path): Unit =
-    print_state_space(CFGGenerator().generate(entry_point), vars, parameter_invariant, out_path)
-
-  private def generate_rasi(node: CFGEntry[G], vars: Set[ConcreteVariable[G]], parameter_invariant: InstancePredicate[G]): Expr[G] = {
+  private val found_states: mutable.ArrayBuffer[AbstractState[G]] = mutable
+    .ArrayBuffer()
+  private val found_edges: mutable.ArrayBuffer[RASIEdge[G]] = mutable
+    .ArrayBuffer()
+  private val current_branches: mutable.ArrayBuffer[AbstractState[G]] = mutable
+    .ArrayBuffer()
+
+  def execute(
+      entry_point: InstanceMethod[G],
+      vars: Set[ConcreteVariable[G]],
+      parameter_invariant: InstancePredicate[G],
+  ): Expr[G] =
+    generate_rasi(
+      CFGGenerator().generate(entry_point),
+      vars,
+      parameter_invariant,
+    )
+
+  def test(
+      entry_point: InstanceMethod[G],
+      vars: Set[ConcreteVariable[G]],
+      parameter_invariant: InstancePredicate[G],
+      out_path: Path,
+  ): Unit =
+    print_state_space(
+      CFGGenerator().generate(entry_point),
+      vars,
+      parameter_invariant,
+      out_path,
+    )
+
+  private def generate_rasi(
+      node: CFGEntry[G],
+      vars: Set[ConcreteVariable[G]],
+      parameter_invariant: InstancePredicate[G],
+  ): Expr[G] = {
     explore(node, vars, parameter_invariant)
     val distinct_states = found_states.distinctBy(s => s.valuations)
     logger.debug(s"${distinct_states.size} distinct states found")
-    distinct_states.map(s => s.to_expression).reduce((e1, e2) => Or(e1, e2)(e1.o))
+    distinct_states.map(s => s.to_expression)
+      .reduce((e1, e2) => Or(e1, e2)(e1.o))
   }
 
-  private def print_state_space(node: CFGEntry[G], vars: Set[ConcreteVariable[G]], parameter_invariant: InstancePredicate[G], out_path: Path): Unit = {
+  private def print_state_space(
+      node: CFGEntry[G],
+      vars: Set[ConcreteVariable[G]],
+      parameter_invariant: InstancePredicate[G],
+      out_path: Path,
+  ): Unit = {
     explore(node, vars, parameter_invariant)
     val (ns, es) = reduce_redundant_states()
     logger.debug(s"${ns.size} distinct states found")
     Utils.print(ns, es, out_path)
   }
 
-  private def explore(node: CFGEntry[G], vars: Set[ConcreteVariable[G]], parameter_invariant: InstancePredicate[G]): Unit = {
+  private def explore(
+      node: CFGEntry[G],
+      vars: Set[ConcreteVariable[G]],
+      parameter_invariant: InstancePredicate[G],
+  ): Unit = {
     logger.info("Starting RASI generation")
     val start_time: Long = System.nanoTime()
     var last_measurement: Long = start_time
 
-    val initial_state = AbstractState(get_initial_values(vars),
-                                      HashMap((AbstractProcess[G](Null()(Origin(Seq()))), node)),
-                                      None,
-                                      get_parameter_constraints(parameter_invariant))
-                          .with_condition(parameter_invariant.body)
+    val initial_state = AbstractState(
+      get_initial_values(vars),
+      HashMap((AbstractProcess[G](Null()(Origin(Seq()))), node)),
+      None,
+      get_parameter_constraints(parameter_invariant),
+    ).with_condition(parameter_invariant.body)
 
     found_states += initial_state
     current_branches += initial_state
@@ -56,12 +100,17 @@ class RASIGenerator[G] extends LazyLogging {
 
       val successor: RASISuccessor[G] = curr.successors()
       found_edges.addAll(successor.edges(curr))
-      successor.successors.foreach(s => if (!found_states.contains(s)) {found_states += s; current_branches += s})
+      successor.successors.foreach(s =>
+        if (!found_states.contains(s)) {
+          found_states += s; current_branches += s
+        }
+      )
       i = i + 1
       if (System.nanoTime() - last_measurement > 5_000_000_000L) {
         last_measurement = System.nanoTime()
         val time = (last_measurement - start_time) / 1_000_000L
-        logger.debug(s"[Runtime ${time}ms] Iteration $i: ${found_states.size} states found, ${current_branches.size} yet to explore")
+        logger.debug(s"[Runtime ${time}ms] Iteration $i: ${found_states
+            .size} states found, ${current_branches.size} yet to explore")
       }
     }
 
@@ -72,25 +121,51 @@ class RASIGenerator[G] extends LazyLogging {
 
     // The initial state converts to simply "true", so it would make the RASI trivial
     found_states.filterInPlace(s => s.valuations != initial_state.valuations)
-    found_edges.filterInPlace(e => e.from.valuations != initial_state.valuations && e.to.valuations != initial_state.valuations)
-
-    logger.debug(s"In total, ${found_states.size} states and ${found_edges.size} edges were found")
-    logger.debug(s"${found_edges.count(e => e.vars.nonEmpty)} edges have variable annotations")
+    found_edges.filterInPlace(e =>
+      e.from.valuations != initial_state.valuations &&
+        e.to.valuations != initial_state.valuations
+    )
+
+    logger.debug(
+      s"In total, ${found_states.size} states and ${found_edges.size} edges were found"
+    )
+    logger.debug(
+      s"${found_edges.count(e => e.vars.nonEmpty)} edges have variable annotations"
+    )
   }
 
-  private def get_initial_values(vars: Set[ConcreteVariable[G]]): Map[ConcreteVariable[G], UncertainValue] = {
+  private def get_initial_values(
+      vars: Set[ConcreteVariable[G]]
+  ): Map[ConcreteVariable[G], UncertainValue] = {
     Map.from(vars.map(v => (v, UncertainValue.uncertain_of(v.t))))
   }
 
-  private def get_parameter_constraints(parameter_invariant: InstancePredicate[G]): Map[FieldVariable[G], UncertainValue] = {
+  private def get_parameter_constraints(
+      parameter_invariant: InstancePredicate[G]
+  ): Map[FieldVariable[G], UncertainValue] = {
     val pred = parameter_invariant.body.get
-    val parameters: Seq[InstanceField[G]] = pred.transSubnodes.collect{ case f: Deref[G] => f }.map(d => d.ref.decl)
-    Map.from(parameters.map(f => FieldVariable(f) -> UncertainValue.uncertain_of(f.t)))
+    val parameters: Seq[InstanceField[G]] = pred.transSubnodes.collect {
+      case f: Deref[G] => f
+    }.map(d => d.ref.decl)
+    Map.from(
+      parameters.map(f => FieldVariable(f) -> UncertainValue.uncertain_of(f.t))
+    )
   }
 
-  private def reduce_redundant_states(): (Seq[AbstractState[G]], Seq[(AbstractState[G], AbstractState[G])]) = {
-    val state_groups: Map[Expr[G], mutable.ArrayBuffer[AbstractState[G]]] = Map.from(found_states.groupBy(s => s.to_expression))
-    val edge_groups: Seq[(AbstractState[G], AbstractState[G])] = Seq.from(found_edges.map(e => (state_groups(e.from.to_expression).head, state_groups(e.to.to_expression).head)))
-    (state_groups.values.toSeq.map(v => v.head), edge_groups.distinct.filter(t => t._1 != t._2))
+  private def reduce_redundant_states()
+      : (Seq[AbstractState[G]], Seq[(AbstractState[G], AbstractState[G])]) = {
+    val state_groups: Map[Expr[G], mutable.ArrayBuffer[AbstractState[G]]] = Map
+      .from(found_states.groupBy(s => s.to_expression))
+    val edge_groups: Seq[(AbstractState[G], AbstractState[G])] = Seq
+      .from(found_edges.map(e =>
+        (
+          state_groups(e.from.to_expression).head,
+          state_groups(e.to.to_expression).head,
+        )
+      ))
+    (
+      state_groups.values.toSeq.map(v => v.head),
+      edge_groups.distinct.filter(t => t._1 != t._2),
+    )
   }
 }
diff --git a/src/rewrite/vct/rewrite/rasi/StaticScanner.scala b/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
index 17d042e97b..cd63dc36a5 100644
--- a/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
+++ b/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
@@ -6,54 +6,89 @@ import vct.rewrite.cfg.{CFGEntry, CFGNode}
 import scala.collection.mutable
 
 class StaticScanner[G](initial_node: CFGNode[G], state: AbstractState[G]) {
-  private val explored_nodes: mutable.Set[CFGEntry[G]] = mutable.Set.empty[CFGEntry[G]]
+  private val explored_nodes: mutable.Set[CFGEntry[G]] = mutable.Set
+    .empty[CFGEntry[G]]
 
-  def scan_can_change_variables(): Boolean = {
+  def scan_can_change_variables(until: Option[CFGNode[G]]): Boolean = {
+    if (until.nonEmpty)
+      explored_nodes.add(until.get)
     scan_for_var_changes_from_node(initial_node)
   }
 
   private def scan_for_var_changes_from_node(node: CFGNode[G]): Boolean = {
-    if (explored_nodes.contains(node)) return false
+    if (explored_nodes.contains(node))
+      return false
     explored_nodes.add(node)
-    node_changes_vars(node) || node.successors.map(e => e.target)
-                                   .collect{ case n: CFGNode[G] => n }
-                                   .exists(n => scan_for_var_changes_from_node(n))
+    node_changes_vars(node) || node.successors.map(e => e.target).collect {
+      case n: CFGNode[G] => n
+    }.exists(n => scan_for_var_changes_from_node(n))
   }
 
-  private def node_changes_vars(node: CFGNode[G]): Boolean = node.ast_node match {
-    case Assign(target, value) => assignment_changes_vars(target, value)
-    case Havoc(loc) => state.valuations.keySet.exists(v => v.is_contained_by(loc, state))
-    case Assume(assn) => assumption_changes_vars(assn)
-    case Inhale(res) => assumption_changes_vars(res)
-    case InvokeProcedure(ref, args, _, _, _, _) if !ref.decl.pure && ref.decl.body.isEmpty =>
-      postcondition_changes_vars(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)))
-    case InvokeConstructor(ref, _, _, args, _, _, _, _) if !ref.decl.pure && ref.decl.body.isEmpty =>
-      postcondition_changes_vars(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)))
-    case InvokeMethod(_, ref, args, _, _, _, _) if !ref.decl.pure && ref.decl.body.isEmpty =>
-      postcondition_changes_vars(ref.decl.contract.ensures, Map.from(ref.decl.args.zip(args)))
-    case _ => false
-  }
+  private def node_changes_vars(node: CFGNode[G]): Boolean =
+    node.ast_node match {
+      case Assign(target, value) => assignment_changes_vars(target, value)
+      case Havoc(loc) =>
+        state.valuations.keySet.exists(v => v.is_contained_by(loc, state))
+      case Assume(assn) => assumption_changes_vars(assn)
+      case Inhale(res) => assumption_changes_vars(res)
+      case InvokeProcedure(ref, args, _, _, _, _)
+          if !ref.decl.pure && ref.decl.body.isEmpty =>
+        postcondition_changes_vars(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+        )
+      case InvokeConstructor(ref, _, _, args, _, _, _, _)
+          if !ref.decl.pure && ref.decl.body.isEmpty =>
+        postcondition_changes_vars(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+        )
+      case InvokeMethod(_, ref, args, _, _, _, _)
+          if !ref.decl.pure && ref.decl.body.isEmpty =>
+        postcondition_changes_vars(
+          ref.decl.contract.ensures,
+          Map.from(ref.decl.args.zip(args)),
+        )
+      case _ => false
+    }
 
-  private def assignment_changes_vars(target: Expr[G], value: Expr[G]): Boolean = {
-    if (!state.valuations.keySet.exists(v => v.is_contained_by(target, state))) return false
+  private def assignment_changes_vars(
+      target: Expr[G],
+      value: Expr[G],
+  ): Boolean = {
+    if (!state.valuations.keySet.exists(v => v.is_contained_by(target, state)))
+      return false
     target.t match {
       // If it is a single-value variable, any assignment can change it
       case _: IntType[_] | _: TBool[_] | _: TResource[_] => true
       // If it is a collection, an update might only change other indices than those tracked
       // Therefore: evaluate the assignment explicitly to see if it affects the tracked variables      TODO: Consider arrays
-      case _: TSeq[_] => state.to_expression != state.with_updated_collection(target, value).to_expression
+      case _: TSeq[_] =>
+        state.to_expression != state.with_updated_collection(target, value)
+          .to_expression
     }
   }
 
   private def assumption_changes_vars(assumption: Expr[G]): Boolean = {
-    val potential_successor: RASISuccessor[G] = state.with_assumption(assumption)
-    if (potential_successor.successors.size != 1) true
-    else state.to_expression != potential_successor.successors.head.to_expression
+    val potential_successor: RASISuccessor[G] = state
+      .with_assumption(assumption)
+    if (potential_successor.successors.size != 1)
+      true
+    else
+      state.to_expression != potential_successor.successors.head.to_expression
   }
 
-  private def postcondition_changes_vars(postcondition: AccountedPredicate[G], params: Map[Variable[G], Expr[G]]): Boolean = {
-    val potential_successor: RASISuccessor[G] = state.with_postcondition(postcondition, params)
-    if (potential_successor.successors.size != 1) true
-    else state.to_expression != potential_successor.successors.head.to_expression
+  private def postcondition_changes_vars(
+      postcondition: AccountedPredicate[G],
+      params: Map[Variable[G], Expr[G]],
+  ): Boolean = {
+    val potential_successor: RASISuccessor[G] = state
+      .with_postcondition(postcondition, params)
+    if (potential_successor.successors.size != 1)
+      true
+    else
+      state.to_expression != potential_successor.successors.head.to_expression
   }
+
+  def scan_for_important_variables: Set[ConcreteVariable[G]] = ???
 }
diff --git a/src/rewrite/vct/rewrite/rasi/UncertainValue.scala b/src/rewrite/vct/rewrite/rasi/UncertainValue.scala
index d0cc6d003a..273ff2afaf 100644
--- a/src/rewrite/vct/rewrite/rasi/UncertainValue.scala
+++ b/src/rewrite/vct/rewrite/rasi/UncertainValue.scala
@@ -15,198 +15,315 @@ trait UncertainValue {
   def ==(other: UncertainValue): UncertainBooleanValue
   def !=(other: UncertainValue): UncertainBooleanValue
   def t[G]: Type[G]
+  def split: Option[Set[UncertainValue]]
 }
 case object UncertainValue {
-  def uncertain_of(t: Type[_]): UncertainValue = t match {
-    case _: IntType[_] => UncertainIntegerValue.uncertain()
-    case _: TBool[_] => UncertainBooleanValue.uncertain()
-  }
-  def empty_of(t: Type[_]): UncertainValue = t match {
-    case _: IntType[_] => UncertainIntegerValue.empty()
-    case _: TBool[_] => UncertainBooleanValue.empty()
-  }
+  def uncertain_of(t: Type[_]): UncertainValue =
+    t match {
+      case _: IntType[_] => UncertainIntegerValue.uncertain()
+      case _: TBool[_] => UncertainBooleanValue.uncertain()
+    }
+  def empty_of(t: Type[_]): UncertainValue =
+    t match {
+      case _: IntType[_] => UncertainIntegerValue.empty()
+      case _: TBool[_] => UncertainBooleanValue.empty()
+    }
 }
 
-case class UncertainBooleanValue(can_be_true: Boolean, can_be_false: Boolean) extends UncertainValue {
-  override def can_be_equal(other: UncertainValue): Boolean = other match {
-    case UncertainBooleanValue(t, f) => can_be_true && t || can_be_false && f
-    case _ => false
-  }
+case class UncertainBooleanValue(can_be_true: Boolean, can_be_false: Boolean)
+    extends UncertainValue {
+  override def can_be_equal(other: UncertainValue): Boolean =
+    other match {
+      case UncertainBooleanValue(t, f) => can_be_true && t || can_be_false && f
+      case _ => false
+    }
 
-  override def can_be_unequal(other: UncertainValue): Boolean = other match {
-    case UncertainBooleanValue(t, f) => can_be_true && f || can_be_false && t
-    case _ => true
-  }
+  override def can_be_unequal(other: UncertainValue): Boolean =
+    other match {
+      case UncertainBooleanValue(t, f) => can_be_true && f || can_be_false && t
+      case _ => true
+    }
 
   override def is_impossible: Boolean = !can_be_true && !can_be_false
 
-  override def is_subset_of(other: UncertainValue): Boolean = other match {
-    case UncertainBooleanValue(t, f) => (t || !can_be_true) && (f || !can_be_false)
-    case _ => false
-  }
+  override def is_subset_of(other: UncertainValue): Boolean =
+    other match {
+      case UncertainBooleanValue(t, f) =>
+        (t || !can_be_true) && (f || !can_be_false)
+      case _ => false
+    }
 
   override def complement(): UncertainValue = !this
 
-  override def intersection(other: UncertainValue): UncertainValue = other match {
-    case UncertainBooleanValue(t, f) => UncertainBooleanValue(can_be_true && t, can_be_false && f)
-    case _ => throw new IllegalArgumentException("Trying to intersect boolean with a different type")
-  }
+  override def intersection(other: UncertainValue): UncertainValue =
+    other match {
+      case UncertainBooleanValue(t, f) =>
+        UncertainBooleanValue(can_be_true && t, can_be_false && f)
+      case _ =>
+        throw new IllegalArgumentException(
+          "Trying to intersect boolean with a different type"
+        )
+    }
 
-  override def union(other: UncertainValue): UncertainValue = other match {
-    case UncertainBooleanValue(t, f) => UncertainBooleanValue(can_be_true || t, can_be_false || f)
-    case _ => throw new IllegalArgumentException("Trying to union boolean with a different type")
-  }
+  override def union(other: UncertainValue): UncertainValue =
+    other match {
+      case UncertainBooleanValue(t, f) =>
+        UncertainBooleanValue(can_be_true || t, can_be_false || f)
+      case _ =>
+        throw new IllegalArgumentException(
+          "Trying to union boolean with a different type"
+        )
+    }
 
   override def to_expression[G](variable: Expr[G]): Expr[G] = {
-    if (can_be_true && can_be_false) BooleanValue(value = true)(variable.o)
-    else if (can_be_true) variable
-    else if (can_be_false) Not(variable)(variable.o)
-    else BooleanValue(value = false)(variable.o)
+    if (can_be_true && can_be_false)
+      BooleanValue(value = true)(variable.o)
+    else if (can_be_true)
+      variable
+    else if (can_be_false)
+      Not(variable)(variable.o)
+    else
+      BooleanValue(value = false)(variable.o)
   }
 
-  override def ==(other: UncertainValue): UncertainBooleanValue = other match {
-    case b: UncertainBooleanValue => this == b
-    case _ => UncertainBooleanValue.from(false)
-  }
+  override def ==(other: UncertainValue): UncertainBooleanValue =
+    other match {
+      case b: UncertainBooleanValue => this == b
+      case _ => UncertainBooleanValue.from(false)
+    }
 
-  override def !=(other: UncertainValue): UncertainBooleanValue = other match {
-    case b: UncertainBooleanValue => this != b
-    case _ => UncertainBooleanValue.from(true)
-  }
+  override def !=(other: UncertainValue): UncertainBooleanValue =
+    other match {
+      case b: UncertainBooleanValue => this != b
+      case _ => UncertainBooleanValue.from(true)
+    }
 
   override def t[G]: Type[G] = TBool[G]()
 
+  override def split: Option[Set[UncertainValue]] = {
+    if (is_impossible)
+      None
+    else {
+      var res: Set[UncertainValue] = Set.empty[UncertainValue]
+      if (can_be_true)
+        res += UncertainBooleanValue.from(true)
+      if (can_be_false)
+        res += UncertainBooleanValue.from(false)
+      Some(res)
+    }
+  }
+
   def try_to_resolve(): Option[Boolean] = {
-    if (can_be_true && !can_be_false) Some(true)
-    else if (can_be_false && !can_be_true) Some(false)
-    else None
+    if (can_be_true && !can_be_false)
+      Some(true)
+    else if (can_be_false && !can_be_true)
+      Some(false)
+    else
+      None
   }
 
   def &&(other: UncertainBooleanValue): UncertainBooleanValue =
-    UncertainBooleanValue(can_be_true && other.can_be_true, can_be_false || other.can_be_false)
+    UncertainBooleanValue(
+      can_be_true && other.can_be_true,
+      can_be_false || other.can_be_false,
+    )
   def ||(other: UncertainBooleanValue): UncertainBooleanValue =
-    UncertainBooleanValue(can_be_true || other.can_be_true, can_be_false && other.can_be_false)
+    UncertainBooleanValue(
+      can_be_true || other.can_be_true,
+      can_be_false && other.can_be_false,
+    )
   def unary_! : UncertainBooleanValue =
     UncertainBooleanValue(can_be_false, can_be_true)
   def ^(other: UncertainBooleanValue): UncertainBooleanValue =
-    UncertainBooleanValue(can_be_true && other.can_be_false || can_be_false && other.can_be_true,
-                          can_be_true && other.can_be_true || can_be_false && other.can_be_false)
+    UncertainBooleanValue(
+      can_be_true && other.can_be_false || can_be_false && other.can_be_true,
+      can_be_true && other.can_be_true || can_be_false && other.can_be_false,
+    )
   def ==(other: UncertainBooleanValue): UncertainBooleanValue =
-    UncertainBooleanValue(can_be_true && other.can_be_true || can_be_false && other.can_be_false,
-                          can_be_true && other.can_be_false || can_be_false && other.can_be_true)
+    UncertainBooleanValue(
+      can_be_true && other.can_be_true || can_be_false && other.can_be_false,
+      can_be_true && other.can_be_false || can_be_false && other.can_be_true,
+    )
   def !=(other: UncertainBooleanValue): UncertainBooleanValue = this ^ other
 }
 case object UncertainBooleanValue {
-  def empty(): UncertainBooleanValue = UncertainBooleanValue(can_be_true = false, can_be_false = false)
-  def from(bool: Boolean): UncertainBooleanValue = UncertainBooleanValue(bool, !bool)
-  def uncertain(): UncertainBooleanValue = UncertainBooleanValue(can_be_true = true, can_be_false = true)
+  def empty(): UncertainBooleanValue =
+    UncertainBooleanValue(can_be_true = false, can_be_false = false)
+  def from(bool: Boolean): UncertainBooleanValue =
+    UncertainBooleanValue(bool, !bool)
+  def uncertain(): UncertainBooleanValue =
+    UncertainBooleanValue(can_be_true = true, can_be_false = true)
 }
 
 case class UncertainIntegerValue(value: Interval) extends UncertainValue {
-  override def can_be_equal(other: UncertainValue): Boolean = other match {
-    case UncertainIntegerValue(v) => value.intersection(v).non_empty()
-    case _ => false
-  }
+  override def can_be_equal(other: UncertainValue): Boolean =
+    other match {
+      case UncertainIntegerValue(v) => value.intersection(v).non_empty()
+      case _ => false
+    }
 
-  override def can_be_unequal(other: UncertainValue): Boolean = other match {
-    case UncertainIntegerValue(v) => value.empty() || v.empty() || (value.union(v).size() match {
-        case Infinite() => true
-        case Finite(size) => size != 1
-      })
-    case _ => true
-  }
+  override def can_be_unequal(other: UncertainValue): Boolean =
+    other match {
+      case UncertainIntegerValue(v) =>
+        value.empty() || v.empty() ||
+        (value.union(v).size() match {
+          case Infinite() => true
+          case Finite(size) => size != 1
+        })
+      case _ => true
+    }
 
   override def is_impossible: Boolean = value.empty()
 
-  override def is_subset_of(other: UncertainValue): Boolean = other match {
-    case UncertainIntegerValue(v) => value.is_subset_of(v)
-    case _ => false
-  }
+  override def is_subset_of(other: UncertainValue): Boolean =
+    other match {
+      case UncertainIntegerValue(v) => value.is_subset_of(v)
+      case _ => false
+    }
 
-  override def complement(): UncertainValue = value match {
-    case BoundedInterval(lower, upper) if lower == upper => UncertainIntegerValue(value.complement())
-    case _ => UncertainIntegerValue.uncertain()
-  }
+  override def complement(): UncertainValue =
+    value match {
+      case BoundedInterval(lower, upper) if lower == upper =>
+        UncertainIntegerValue(value.complement())
+      case _ => UncertainIntegerValue.uncertain()
+    }
 
-  override def intersection(other: UncertainValue): UncertainValue = other match {
-    case UncertainIntegerValue(v) => UncertainIntegerValue(value.intersection(v))
-    case _ => throw new IllegalArgumentException("Trying to intersect integer with different type")
-  }
+  override def intersection(other: UncertainValue): UncertainValue =
+    other match {
+      case UncertainIntegerValue(v) =>
+        UncertainIntegerValue(value.intersection(v))
+      case _ =>
+        throw new IllegalArgumentException(
+          "Trying to intersect integer with different type"
+        )
+    }
 
-  override def union(other: UncertainValue): UncertainValue = other match {
-    case UncertainIntegerValue(v) => UncertainIntegerValue(value.union(v))
-    case _ => throw new IllegalArgumentException("Trying to union integer with different type")
-  }
+  override def union(other: UncertainValue): UncertainValue =
+    other match {
+      case UncertainIntegerValue(v) => UncertainIntegerValue(value.union(v))
+      case _ =>
+        throw new IllegalArgumentException(
+          "Trying to union integer with different type"
+        )
+    }
 
-  override def to_expression[G](variable: Expr[G]): Expr[G] = value.to_expression(variable)
+  override def to_expression[G](variable: Expr[G]): Expr[G] =
+    value.to_expression(variable)
 
-  override def ==(other: UncertainValue): UncertainBooleanValue = other match {
-    case i: UncertainIntegerValue => this == i
-    case _ => UncertainBooleanValue.from(false)
-  }
+  override def ==(other: UncertainValue): UncertainBooleanValue =
+    other match {
+      case i: UncertainIntegerValue => this == i
+      case _ => UncertainBooleanValue.from(false)
+    }
 
-  override def !=(other: UncertainValue): UncertainBooleanValue = other match {
-    case i: UncertainIntegerValue => this != i
-    case _ => UncertainBooleanValue.from(true)
-  }
+  override def !=(other: UncertainValue): UncertainBooleanValue =
+    other match {
+      case i: UncertainIntegerValue => this != i
+      case _ => UncertainBooleanValue.from(true)
+    }
 
   override def t[G]: Type[G] = TInt[G]()
 
+  override def split: Option[Set[UncertainValue]] =
+    value.values match {
+      case None => None
+      case Some(ints) => Some(ints.map(i => UncertainIntegerValue.single(i)))
+    }
+
   def try_to_resolve(): Option[Int] = value.try_to_resolve()
 
-  def below_eq(): UncertainIntegerValue = UncertainIntegerValue(value.below_max())
-  def below(): UncertainIntegerValue = below_eq() + UncertainIntegerValue.single(-1)
-  def above_eq(): UncertainIntegerValue = UncertainIntegerValue(value.above_min())
-  def above(): UncertainIntegerValue = above_eq() + UncertainIntegerValue.single(1)
+  def below_eq(): UncertainIntegerValue =
+    UncertainIntegerValue(value.below_max())
+  def below(): UncertainIntegerValue =
+    below_eq() + UncertainIntegerValue.single(-1)
+  def above_eq(): UncertainIntegerValue =
+    UncertainIntegerValue(value.above_min())
+  def above(): UncertainIntegerValue =
+    above_eq() + UncertainIntegerValue.single(1)
 
   def ==(other: UncertainIntegerValue): UncertainBooleanValue =
     UncertainBooleanValue(can_be_equal(other), can_be_unequal(other))
   def !=(other: UncertainIntegerValue): UncertainBooleanValue =
     UncertainBooleanValue(can_be_unequal(other), can_be_equal(other))
   def >=(other: UncertainIntegerValue): UncertainBooleanValue =
-    UncertainBooleanValue(value.below_max().intersection(other.value).non_empty(),
-                          value.above_min().intersection(other.value.below_max()).size() >= Finite(2))
+    UncertainBooleanValue(
+      value.below_max().intersection(other.value).non_empty(),
+      value.above_min().intersection(other.value.below_max()).size() >=
+        Finite(2),
+    )
   def <=(other: UncertainIntegerValue): UncertainBooleanValue =
-    UncertainBooleanValue(value.above_min().intersection(other.value).non_empty(),
-                          value.below_max().intersection(other.value.above_min()).size() >= Finite(2))
+    UncertainBooleanValue(
+      value.above_min().intersection(other.value).non_empty(),
+      value.below_max().intersection(other.value.above_min()).size() >=
+        Finite(2),
+    )
   def >(other: UncertainIntegerValue): UncertainBooleanValue = !(this <= other)
   def <(other: UncertainIntegerValue): UncertainBooleanValue = !(this >= other)
 
   def unary_- : UncertainIntegerValue = UncertainIntegerValue(-value)
-  def +(other: UncertainIntegerValue): UncertainIntegerValue = UncertainIntegerValue(value + other.value)
-  def -(other: UncertainIntegerValue): UncertainIntegerValue = UncertainIntegerValue(value - other.value)
-  def *(other: UncertainIntegerValue): UncertainIntegerValue = UncertainIntegerValue(value * other.value)
-  def /(other: UncertainIntegerValue): UncertainIntegerValue = UncertainIntegerValue.uncertain() // TODO: UncertainIntegerValue(value / other.value)
-  def %(other: UncertainIntegerValue): UncertainIntegerValue = UncertainIntegerValue.uncertain() // TODO: UncertainIntegerValue(value % other.value)
-  def pow(other: UncertainIntegerValue): UncertainIntegerValue = UncertainIntegerValue.uncertain() // TODO: UncertainIntegerValue(value.pow(other.value))
+  def +(other: UncertainIntegerValue): UncertainIntegerValue =
+    UncertainIntegerValue(value + other.value)
+  def -(other: UncertainIntegerValue): UncertainIntegerValue =
+    UncertainIntegerValue(value - other.value)
+  def *(other: UncertainIntegerValue): UncertainIntegerValue =
+    UncertainIntegerValue(value * other.value)
+  def /(other: UncertainIntegerValue): UncertainIntegerValue =
+    UncertainIntegerValue
+      .uncertain() // TODO: UncertainIntegerValue(value / other.value)
+  def %(other: UncertainIntegerValue): UncertainIntegerValue =
+    UncertainIntegerValue
+      .uncertain() // TODO: UncertainIntegerValue(value % other.value)
+  def pow(other: UncertainIntegerValue): UncertainIntegerValue =
+    UncertainIntegerValue
+      .uncertain() // TODO: UncertainIntegerValue(value.pow(other.value))
 }
 case object UncertainIntegerValue {
   def empty(): UncertainIntegerValue = UncertainIntegerValue(EmptyInterval)
-  def uncertain(): UncertainIntegerValue = UncertainIntegerValue(UnboundedInterval)
-  def above(int: Int): UncertainIntegerValue = UncertainIntegerValue(LowerBoundedInterval(int))
-  def single(int: Int): UncertainIntegerValue = UncertainIntegerValue(BoundedInterval(int, int))
+  def uncertain(): UncertainIntegerValue =
+    UncertainIntegerValue(UnboundedInterval)
+  def above(int: Int): UncertainIntegerValue =
+    UncertainIntegerValue(LowerBoundedInterval(int))
+  def single(int: Int): UncertainIntegerValue =
+    UncertainIntegerValue(BoundedInterval(int, int))
 }
 
-case class UncertainSequence(len: UncertainIntegerValue, values: Seq[(UncertainIntegerValue, UncertainValue)], t: Type[_]) {
+case class UncertainSequence(
+    len: UncertainIntegerValue,
+    values: Seq[(UncertainIntegerValue, UncertainValue)],
+    t: Type[_],
+) {
   def ==(other: UncertainSequence): UncertainBooleanValue = {
-    if (len.intersection(other.len).is_impossible) return UncertainBooleanValue.from(false)
-    if (values.exists(t1 => t1._1.try_to_resolve().nonEmpty && other.values.exists(t2 => !t2._1.intersection(t1._1).is_impossible && t2._2.can_be_unequal(t1._2))))
+    if (len.intersection(other.len).is_impossible)
+      return UncertainBooleanValue.from(false)
+    if (
+      values.exists(t1 =>
+        t1._1.try_to_resolve().nonEmpty && other.values.exists(t2 =>
+          !t2._1.intersection(t1._1).is_impossible &&
+            t2._2.can_be_unequal(t1._2)
+        )
+      )
+    )
       return UncertainBooleanValue.from(false)
     val length: Option[Int] = len.try_to_resolve()
     val other_length: Option[Int] = other.len.try_to_resolve()
-    if (length.nonEmpty && other_length.nonEmpty && length.get == other_length.get) {
+    if (
+      length.nonEmpty && other_length.nonEmpty && length.get == other_length.get
+    ) {
       for (i <- Range(0, length.get)) {
-        val values_index: Int = values.indexWhere(t => t._1.try_to_resolve().getOrElse(-1) == i)
-        val other_values_index: Int = other.values.indexWhere(t => t._1.try_to_resolve().getOrElse(-1) == i)
+        val values_index: Int = values
+          .indexWhere(t => t._1.try_to_resolve().getOrElse(-1) == i)
+        val other_values_index: Int = other.values
+          .indexWhere(t => t._1.try_to_resolve().getOrElse(-1) == i)
         if (values_index >= 0 && other_values_index >= 0) {
           val value = values(values_index)._2
           val other_value = other.values(other_values_index)._2
-          if (!value.can_be_unequal(other_value)) return UncertainBooleanValue.uncertain()
-        }
-        else return UncertainBooleanValue.uncertain()
+          if (!value.can_be_unequal(other_value))
+            return UncertainBooleanValue.uncertain()
+        } else
+          return UncertainBooleanValue.uncertain()
       }
-    }
-    else return UncertainBooleanValue.uncertain()
+    } else
+      return UncertainBooleanValue.uncertain()
     // Only if the lengths are exactly the same and perfectly certain,
     // and every value in between is defined in both sequences and perfectly certain and equal,
     // only then are two uncertain sequences definitely equal
@@ -214,58 +331,118 @@ case class UncertainSequence(len: UncertainIntegerValue, values: Seq[(UncertainI
   }
 
   def union(other: UncertainSequence): UncertainSequence = {
-    if (t != other.t) throw new IllegalArgumentException("Unioning sequences of different types")
-    UncertainSequence(len.union(other.len).asInstanceOf[UncertainIntegerValue], combine_values(values, other.values), t)
+    if (t != other.t)
+      throw new IllegalArgumentException(
+        "Unioning sequences of different types"
+      )
+    UncertainSequence(
+      len.union(other.len).asInstanceOf[UncertainIntegerValue],
+      combine_values(values, other.values),
+      t,
+    )
   }
 
   def concat(other: UncertainSequence): UncertainSequence =
     UncertainSequence(len + other.len, values ++ shift(other.values, len), t)
 
   def prepend(value: UncertainValue): UncertainSequence =
-    UncertainSequence(len + UncertainIntegerValue.single(1), (UncertainIntegerValue.single(0) -> value) +: shift(values, UncertainIntegerValue.single(1)), t)
-
-  def updated(index: UncertainIntegerValue, value: UncertainValue): UncertainSequence =
-    UncertainSequence(len, values.filter(e => !e._1.can_be_equal(index)) :+ index -> value, t)
+    UncertainSequence(
+      len + UncertainIntegerValue.single(1),
+      (UncertainIntegerValue.single(0) -> value) +:
+        shift(values, UncertainIntegerValue.single(1)),
+      t,
+    )
+
+  def updated(
+      index: UncertainIntegerValue,
+      value: UncertainValue,
+  ): UncertainSequence =
+    UncertainSequence(
+      len,
+      values.filter(e => !e._1.can_be_equal(index)) :+ index -> value,
+      t,
+    )
 
   def remove(index: UncertainIntegerValue): UncertainSequence = {
-    val (before, after) = values.filter(e => !e._1.can_be_equal(index)).partition(e => (e._1 < index).can_be_true)
-    UncertainSequence(len - UncertainIntegerValue.single(1), before ++ shift(after, UncertainIntegerValue.single(-1)), t)
+    val (before, after) = values.filter(e => !e._1.can_be_equal(index))
+      .partition(e => (e._1 < index).can_be_true)
+    UncertainSequence(
+      len - UncertainIntegerValue.single(1),
+      before ++ shift(after, UncertainIntegerValue.single(-1)),
+      t,
+    )
   }
 
   def take(num: UncertainIntegerValue): UncertainSequence =
-    UncertainSequence(num, values.filter(t => t._1.<(num).can_be_true).map(t => t._1.intersection(num.below()).asInstanceOf[UncertainIntegerValue] -> t._2), t)
+    UncertainSequence(
+      num,
+      values.filter(t => t._1.<(num).can_be_true).map(t =>
+        t._1.intersection(num.below()).asInstanceOf[UncertainIntegerValue] ->
+          t._2
+      ),
+      t,
+    )
 
   def drop(num: UncertainIntegerValue): UncertainSequence = {
-    val red: UncertainIntegerValue = num.intersection(len.below()).asInstanceOf[UncertainIntegerValue]
-    val remaining: Seq[(UncertainIntegerValue, UncertainValue)] = values.filter(t => t._1.>=(red).can_be_true).map(t => t._1.intersection(red.above_eq()).asInstanceOf[UncertainIntegerValue] -> t._2)
-    UncertainSequence(if (red.value.non_empty()) len - red else UncertainIntegerValue.single(0), shift(remaining, -red), t)
+    val red: UncertainIntegerValue = num.intersection(len.below())
+      .asInstanceOf[UncertainIntegerValue]
+    val remaining: Seq[(UncertainIntegerValue, UncertainValue)] = values
+      .filter(t => t._1.>=(red).can_be_true).map(t =>
+        t._1.intersection(red.above_eq()).asInstanceOf[UncertainIntegerValue] ->
+          t._2
+      )
+    UncertainSequence(
+      if (red.value.non_empty())
+        len - red
+      else
+        UncertainIntegerValue.single(0),
+      shift(remaining, -red),
+      t,
+    )
   }
 
-  def slice(lower: UncertainIntegerValue, upper: UncertainIntegerValue): UncertainSequence =
-    take(upper).drop(lower)
+  def slice(
+      lower: UncertainIntegerValue,
+      upper: UncertainIntegerValue,
+  ): UncertainSequence = take(upper).drop(lower)
 
   def get(index: Int): UncertainValue = {
-    if (index < 0) throw new IllegalArgumentException(s"Trying to access negative index $index")
+    if (index < 0)
+      throw new IllegalArgumentException(
+        s"Trying to access negative index $index"
+      )
     val i = values.indexWhere(t => t._1.try_to_resolve().getOrElse(-1) == index)
-    if (i >= 0) values(i)._2
-    else UncertainValue.uncertain_of(t)
+    if (i >= 0)
+      values(i)._2
+    else
+      UncertainValue.uncertain_of(t)
   }
 
-  private def combine_values(v1: Seq[(UncertainIntegerValue, UncertainValue)], v2: Seq[(UncertainIntegerValue, UncertainValue)]): Seq[(UncertainIntegerValue, UncertainValue)] = {
+  private def combine_values(
+      v1: Seq[(UncertainIntegerValue, UncertainValue)],
+      v2: Seq[(UncertainIntegerValue, UncertainValue)],
+  ): Seq[(UncertainIntegerValue, UncertainValue)] = {
     var res: Seq[(UncertainIntegerValue, UncertainValue)] = Seq()
     for (v <- v1) {
       for (comp <- v2) {
-        if (v._1.is_subset_of(comp._1) && v._2.is_subset_of(comp._2)) res :+= comp
-        else if (comp._1.is_subset_of(v._1) && comp._2.is_subset_of(v._2)) res :+= v
+        if (v._1.is_subset_of(comp._1) && v._2.is_subset_of(comp._2))
+          res :+= comp
+        else if (comp._1.is_subset_of(v._1) && comp._2.is_subset_of(v._2))
+          res :+= v
       }
     }
     res.distinct
   }
 
-  private def shift(sequence: Seq[(UncertainIntegerValue, UncertainValue)], value: UncertainIntegerValue): Seq[(UncertainIntegerValue, UncertainValue)] =
+  private def shift(
+      sequence: Seq[(UncertainIntegerValue, UncertainValue)],
+      value: UncertainIntegerValue,
+  ): Seq[(UncertainIntegerValue, UncertainValue)] =
     sequence.map(e => (e._1 + value, e._2))
 }
 case object UncertainSequence {
-  def uncertain(t: Type[_]): UncertainSequence = UncertainSequence(UncertainIntegerValue.above(0), Seq(), t)
-  def empty(t: Type[_]): UncertainSequence = UncertainSequence(UncertainIntegerValue.empty(), Seq(), t)
-}
\ No newline at end of file
+  def uncertain(t: Type[_]): UncertainSequence =
+    UncertainSequence(UncertainIntegerValue.above(0), Seq(), t)
+  def empty(t: Type[_]): UncertainSequence =
+    UncertainSequence(UncertainIntegerValue.empty(), Seq(), t)
+}
diff --git a/src/rewrite/vct/rewrite/rasi/Utils.scala b/src/rewrite/vct/rewrite/rasi/Utils.scala
index e41641fdda..23bb142896 100644
--- a/src/rewrite/vct/rewrite/rasi/Utils.scala
+++ b/src/rewrite/vct/rewrite/rasi/Utils.scala
@@ -8,135 +8,226 @@ import java.io.Writer
 import java.nio.file.Path
 
 case object Utils {
-  /**
-   * Returns the maximum absolute value between the two arguments.
-   *
-   * @param a Integer argument 1
-   * @param b Integer argument 2
-   * @return <code>max{|a|, |b|}</code>
-   */
+
+  /** Returns the maximum absolute value between the two arguments.
+    *
+    * @param a
+    *   Integer argument 1
+    * @param b
+    *   Integer argument 2
+    * @return
+    *   <code>max{|a|, |b|}</code>
+    */
   def abs_max(a: Int, b: Int): Int = Seq(-a, a, -b, b).max
 
-  /**
-   * Maximum product between either <code>a1</code> or <code>a2</code> and either <code>b1</code> or <code>b2</code>.
-   *
-   * @param a1 Alternative group 1
-   * @param a2 Alternative group 1
-   * @param b1 Alternative group 2
-   * @param b2 Alternative group 2
-   * @return <code>max{a1*b1, a2*b1, a2*b1, a2*b2}</code>
-   */
-  def prod_max(a1: Int, a2: Int, b1: Int, b2: Int): Int = Seq(a1 * b1, a1 * b2, a2 * b1, a2 * b2).max
-
-  /**
-   * Minimum product between either <code>a1</code> or <code>a2</code> and either <code>b1</code> or <code>b2</code>.
-   *
-   * @param a1 Alternative group 1
-   * @param a2 Alternative group 1
-   * @param b1 Alternative group 2
-   * @param b2 Alternative group 2
-   * @return <code>min{a1*b1, a2*b1, a2*b1, a2*b2}</code>
-   */
-  def prod_min(a1: Int, a2: Int, b1: Int, b2: Int): Int = Seq(a1 * b1, a1 * b2, a2 * b1, a2 * b2).min
-
-  /**
-   * Transforms a loop contract to an invariant, if possible.
-   *
-   * @param contract Loop contract
-   * @return Loop invariant represented by <code>contract</code>
-   */
-  def loop_contract_to_expression[G](contract: LoopContract[G]): Expr[G] = contract match {
-    case LoopInvariant(inv, _) => inv
+  /** Maximum product between either <code>a1</code> or <code>a2</code> and
+    * either <code>b1</code> or <code>b2</code>.
+    *
+    * @param a1
+    *   Alternative group 1
+    * @param a2
+    *   Alternative group 1
+    * @param b1
+    *   Alternative group 2
+    * @param b2
+    *   Alternative group 2
+    * @return
+    *   <code>max{a1*b1, a2*b1, a2*b1, a2*b2}</code>
+    */
+  def prod_max(a1: Int, a2: Int, b1: Int, b2: Int): Int =
+    Seq(a1 * b1, a1 * b2, a2 * b1, a2 * b2).max
+
+  /** Minimum product between either <code>a1</code> or <code>a2</code> and
+    * either <code>b1</code> or <code>b2</code>.
+    *
+    * @param a1
+    *   Alternative group 1
+    * @param a2
+    *   Alternative group 1
+    * @param b1
+    *   Alternative group 2
+    * @param b2
+    *   Alternative group 2
+    * @return
+    *   <code>min{a1*b1, a2*b1, a2*b1, a2*b2}</code>
+    */
+  def prod_min(a1: Int, a2: Int, b1: Int, b2: Int): Int =
+    Seq(a1 * b1, a1 * b2, a2 * b1, a2 * b2).min
+
+  /** Computes the cartesian product of an arbitrary number of input sequences.
+    *
+    * @param inputs
+    *   A collection containing all inputs for the cartesian product
+    * @tparam T
+    *   Element type of the input sets
+    * @return
+    *   Set of ordered sequences with one element for each input set
+    */
+  def cartesian_product[T](inputs: Iterable[Set[T]]): Set[Seq[T]] = {
+    if (inputs.isEmpty)
+      Set.empty[Seq[T]]
+    else if (inputs.size == 1)
+      inputs.head.map(v => Seq(v))
+    else
+      inputs.head.flatMap(e => cartesian_product(inputs.tail).map(s => e +: s))
   }
 
-  /**
-   * Transforms an accounted predicate from a subroutine contract into a boolean/resource expression.
-   *
-   * @param contract Subroutine contract
-   * @return Boolean expression representing <code>contract</code>
-   */
+  /** Transforms a loop contract to an invariant, if possible.
+    *
+    * @param contract
+    *   Loop contract
+    * @return
+    *   Loop invariant represented by <code>contract</code>
+    */
+  def loop_contract_to_expression[G](contract: LoopContract[G]): Expr[G] =
+    contract match { case LoopInvariant(inv, _) => inv }
+
+  /** Transforms an accounted predicate from a subroutine contract into a
+    * boolean/resource expression.
+    *
+    * @param contract
+    *   Subroutine contract
+    * @return
+    *   Boolean expression representing <code>contract</code>
+    */
   def contract_to_expression[G](contract: AccountedPredicate[G]): Expr[G] =
-    AstBuildHelpers.unfoldPredicate(contract).reduce((e1, e2) => Star(e1, e2)(e1.o))
-
-  /**
-   * Substitutes free variables in a boolean expression for other given expressions according to the given map.
-   *
-   * @param cond Boolean condition, potentially containing free variables
-   * @param args A map from free variables in <code>cond</code> to expressions to be substituted
-   * @return The given condition with free variables replaced
-   */
-  def unify_expression[G](cond: Expr[G], args: Map[Variable[G], Expr[G]]): Expr[G] =
-    Substitute(args.map[Expr[G], Expr[G]]{ case (v, e) => Local[G](v.ref)(v.o) -> Old(e, None)(e.o)(e.o) }).dispatch(cond)
-
-  /**
-   * Removes <code>\old</code> keywords from an expression.
-   *
-   * @param cond Expression to transform
-   * @return Same expression as <code>cond</code> but with <code>\old</code> specifications removed
-   */
+    AstBuildHelpers.unfoldPredicate(contract)
+      .reduce((e1, e2) => Star(e1, e2)(e1.o))
+
+  /** Substitutes free variables in a boolean expression for other given
+    * expressions according to the given map.
+    *
+    * @param cond
+    *   Boolean condition, potentially containing free variables
+    * @param args
+    *   A map from free variables in <code>cond</code> to expressions to be
+    *   substituted
+    * @return
+    *   The given condition with free variables replaced
+    */
+  def unify_expression[G](
+      cond: Expr[G],
+      args: Map[Variable[G], Expr[G]],
+  ): Expr[G] =
+    Substitute(args.map[Expr[G], Expr[G]] { case (v, e) =>
+      Local[G](v.ref)(v.o) -> Old(e, None)(e.o)(e.o)
+    }).dispatch(cond)
+
+  /** Removes <code>\old</code> keywords from an expression.
+    *
+    * @param cond
+    *   Expression to transform
+    * @return
+    *   Same expression as <code>cond</code> but with <code>\old</code>
+    *   specifications removed
+    */
   def remove_old[G](cond: Expr[G]): Expr[G] =
-    Substitute(Map.from[Expr[G], Expr[G]](cond.transSubnodes.collect{ case o @ Old(expr, _) => o -> expr })).dispatch(cond)
-
-  /**
-   * Determines whether an expression contains a reference to the global invariant.
-   *
-   * @param node COL node containing an expression
-   * @return <code>true</code> if <code>node</code> or one of its subnodes refers to the global invariant,
-   *         <code>false</code> otherwise
-   */
-  def contains_global_invariant[G](node: Node[G]): Boolean = node match {
-    case InstancePredicateApply(_, ref, _, _) =>
-      if (ref.decl.o.getPreferredName.get.snake.equals("global_invariant")) true
-      else contains_global_invariant(ref.decl.body.getOrElse(BooleanValue(value = true)(node.o)))
-    case e: Expr[G] => e.subnodes.exists(n => contains_global_invariant(n))
-    case _ => false
-  }
+    Substitute(Map.from[Expr[G], Expr[G]](cond.transSubnodes.collect {
+      case o @ Old(expr, _) => o -> expr
+    })).dispatch(cond)
+
+  /** Determines whether an expression contains a reference to the global
+    * invariant.
+    *
+    * @param node
+    *   COL node containing an expression
+    * @return
+    *   <code>true</code> if <code>node</code> or one of its subnodes refers to
+    *   the global invariant, <code>false</code> otherwise
+    */
+  def contains_global_invariant[G](node: Node[G]): Boolean =
+    node match {
+      case InstancePredicateApply(_, ref, _, _) =>
+        if (ref.decl.o.getPreferredName.get.snake.equals("global_invariant"))
+          true
+        else
+          contains_global_invariant(
+            ref.decl.body.getOrElse(BooleanValue(value = true)(node.o))
+          )
+      case e: Expr[G] => e.subnodes.exists(n => contains_global_invariant(n))
+      case _ => false
+    }
+
+  /** Transforms a valuation on resolvable variables to a valuation on concrete
+    * variables.
+    *
+    * @param m
+    *   Valuation on resolvable variables
+    * @return
+    *   Same valuation with all non-trackable variables removed
+    */
+  def resolvable_to_concrete[G](
+      m: Map[ResolvableVariable[G], UncertainValue]
+  ): Map[ConcreteVariable[G], UncertainValue] =
+    m.filter(t => t._1.isInstanceOf[ConcreteVariable[G]])
+      .map(t => t._1.asInstanceOf[ConcreteVariable[G]] -> t._2)
+
+  /** Computes the intersection of two variable valuations.
+    *
+    * @param v1
+    *   Valuation
+    * @param v2
+    *   Valuation
+    * @return
+    *   The concatenation of <code>v1</code> and <code>v2</code>, with elements
+    *   contained in both valuations mapped to the intersection of both
+    */
+  def val_intersect[G](
+      v1: Map[ConcreteVariable[G], UncertainValue],
+      v2: Map[ConcreteVariable[G], UncertainValue],
+  ): Map[ConcreteVariable[G], UncertainValue] =
+    v1 ++ v2.map { case (k, v) =>
+      k -> v.intersection(v1.getOrElse(k, UncertainValue.uncertain_of(v.t[G])))
+    }
 
-  /**
-   * Transforms a valuation on resolvable variables to a valuation on concrete variables.
-   *
-   * @param m Valuation on resolvable variables
-   * @return Same valuation with all non-trackable variables removed
-   */
-  def resolvable_to_concrete[G](m: Map[ResolvableVariable[G], UncertainValue]): Map[ConcreteVariable[G], UncertainValue] =
-    m.filter(t => t._1.isInstanceOf[ConcreteVariable[G]]).map(t => t._1.asInstanceOf[ConcreteVariable[G]] -> t._2)
-
-  /**
-   * Computes the intersection of two variable valuations.
-   *
-   * @param v1 Valuation
-   * @param v2 Valuation
-   * @return The concatenation of <code>v1</code> and <code>v2</code>, with elements contained in both valuations
-   *         mapped to the intersection of both
-   */
-  def val_intersect[G](v1: Map[ConcreteVariable[G], UncertainValue], v2: Map[ConcreteVariable[G], UncertainValue]): Map[ConcreteVariable[G], UncertainValue] =
-    v1 ++ v2.map{ case (k, v) => k -> v.intersection(v1.getOrElse(k, UncertainValue.uncertain_of(v.t[G]))) }
-
-  /**
-   * Prints out the graph defined by the given states and edges to DOT format.
-   *
-   * @param states States of the graph, each representing an abstract state
-   * @param edges Edges of the graph
-   * @param out Path to the output file to write to
-   */
-  def print[G](states: Seq[AbstractState[G]], edges: Seq[(AbstractState[G], AbstractState[G])], out: Path): Unit = {
-    val node_names: Map[AbstractState[G], String] = Map.from(states.zipWithIndex.map(t => (t._1, s"n${t._2}")))
-    RWFile(out).write(w => print_state_space(node_names, edges, w, states.head.to_expression.toInlineString.length > 100))
+  /** Prints out the graph defined by the given states and edges to DOT format.
+    *
+    * @param states
+    *   States of the graph, each representing an abstract state
+    * @param edges
+    *   Edges of the graph
+    * @param out
+    *   Path to the output file to write to
+    */
+  def print[G](
+      states: Seq[AbstractState[G]],
+      edges: Seq[(AbstractState[G], AbstractState[G])],
+      out: Path,
+  ): Unit = {
+    val node_names: Map[AbstractState[G], String] = Map
+      .from(states.zipWithIndex.map(t => (t._1, s"n${t._2}")))
+    RWFile(out).write(w =>
+      print_state_space(
+        node_names,
+        edges,
+        w,
+        states.head.to_expression.toInlineString.length > 100,
+      )
+    )
   }
 
-  private def print_state_space[G](names: Map[AbstractState[G], String],
-                                   edges: Seq[(AbstractState[G], AbstractState[G])],
-                                   writer: Writer,
-                                   shorten_labels: Boolean = false): Unit = {
+  private def print_state_space[G](
+      names: Map[AbstractState[G], String],
+      edges: Seq[(AbstractState[G], AbstractState[G])],
+      writer: Writer,
+      shorten_labels: Boolean = false,
+  ): Unit = {
     writer.append("digraph {\n")
-    names.foreach(t => writer.append(t._2)
-                             .append(s"[label=${"\""}")
-                             .append(if (shorten_labels) t._2 else t._1.to_expression.toInlineString)
-                             .append(s"${"\""}];${if (shorten_labels) s" /* ${t._1.to_expression.toInlineString} */" else ""}\n"))
-    edges.foreach(t => writer.append(names(t._1))
-                             .append(" -> ")
-                             .append(names(t._2))
-                             .append(";\n"))
+    names.foreach(t =>
+      writer.append(t._2).append(s"[label=${"\""}").append(
+        if (shorten_labels)
+          t._2
+        else
+          t._1.to_expression.toInlineString
+      ).append(s"${"\""}];${if (shorten_labels)
+          s" /* ${t._1.to_expression.toInlineString} */"
+        else
+          ""}\n")
+    )
+    edges.foreach(t =>
+      writer.append(names(t._1)).append(" -> ").append(names(t._2))
+        .append(";\n")
+    )
     writer.append("}")
   }
 }
diff --git a/src/rewrite/vct/rewrite/rasi/VariableSelector.scala b/src/rewrite/vct/rewrite/rasi/VariableSelector.scala
index eeb07d86c9..a523806750 100644
--- a/src/rewrite/vct/rewrite/rasi/VariableSelector.scala
+++ b/src/rewrite/vct/rewrite/rasi/VariableSelector.scala
@@ -4,93 +4,158 @@ import vct.col.ast._
 
 class VariableSelector[G](initial_state: AbstractState[G]) {
 
-  /**
-   * Finds the untracked variables that distinguish the evaluation of the given expression between the given valuations
-   * of tracked variables.
-   *
-   * @param valuations A set of different valuations of tracked variables, each of which can potentially evaluate to
-   *                   <code>true</code> on the given expression
-   * @param expr Expression in which the valuations should be distinguished; <code>None</code> means <code>true</code>
-   * @return A set of all variables that could, had they been known, have distinguished between at least two of the
-   *         given valuations
-   */
-  def distinguishing_variables(valuations: Set[Map[ConcreteVariable[G], UncertainValue]], expr: Option[Expr[G]]): Set[ConcreteVariable[G]] = {
-    if (valuations.size <= 1) return Set.empty[ConcreteVariable[G]]
+  /** Finds the untracked variables that distinguish the evaluation of the given
+    * expression between the given valuations of tracked variables.
+    *
+    * @param valuations
+    *   A set of different valuations of tracked variables, each of which can
+    *   potentially evaluate to <code>true</code> on the given expression
+    * @param expr
+    *   Expression in which the valuations should be distinguished;
+    *   <code>None</code> means <code>true</code>
+    * @return
+    *   A set of all variables that could, had they been known, have
+    *   distinguished between at least two of the given valuations
+    */
+  def distinguishing_variables(
+      valuations: Set[Map[ConcreteVariable[G], UncertainValue]],
+      expr: Option[Expr[G]],
+  ): Set[ConcreteVariable[G]] = {
+    if (valuations.size <= 1)
+      return Set.empty[ConcreteVariable[G]]
 
-    val states: Seq[AbstractState[G]] = valuations.toSeq.map(v => initial_state.with_new_valuation(v))
-    val constraints: Seq[Set[ConstraintMap[G]]] = states.map(s => satisfying_valuations(s, expr)).filter(s => s.exists(m => !m.is_empty))
-    if (constraints.isEmpty) Set.empty[ConcreteVariable[G]]
-    else var_differences(constraints)
+    val states: Seq[AbstractState[G]] = valuations.toSeq
+      .map(v => initial_state.with_new_valuation(v))
+    val constraints: Seq[Set[ConstraintMap[G]]] = states
+      .map(s => satisfying_valuations(s, expr))
+      .filter(s => s.exists(m => !m.is_empty))
+    if (constraints.isEmpty)
+      Set.empty[ConcreteVariable[G]]
+    else
+      var_differences(constraints)
   }
 
-  /**
-   * Finds the untracked variables that distinguish between the given conditions in the initial state given by this
-   * object.
-   *
-   * @param conditions A set of conditions, each of which can potentially evaluate to <code>true</code> in the initial
-   *                   state
-   * @return A set of all variables that could, had they been known, have distinguished between at least two of the
-   *         given conditions
-   */
-  def deciding_variables(conditions: Set[Option[Expr[G]]]): Set[ConcreteVariable[G]] = {
-    if (conditions.size <= 1) return Set.empty[ConcreteVariable[G]]
+  /** Finds the untracked variables that distinguish between the given
+    * conditions in the initial state given by this object.
+    *
+    * @param conditions
+    *   A set of conditions, each of which can potentially evaluate to
+    *   <code>true</code> in the initial state
+    * @return
+    *   A set of all variables that could, had they been known, have
+    *   distinguished between at least two of the given conditions
+    */
+  def deciding_variables(
+      conditions: Set[Option[Expr[G]]]
+  ): Set[ConcreteVariable[G]] = {
+    if (conditions.size <= 1)
+      return Set.empty[ConcreteVariable[G]]
 
-    val constraints: Seq[Set[ConstraintMap[G]]] = conditions.toSeq.map(e => satisfying_valuations(initial_state, e)).filter(s => s.exists(m => !m.is_empty))
-    if (constraints.isEmpty) Set.empty[ConcreteVariable[G]]
-    else var_differences(constraints)
+    val constraints: Seq[Set[ConstraintMap[G]]] = conditions.toSeq
+      .map(e => satisfying_valuations(initial_state, e))
+      .filter(s => s.exists(m => !m.is_empty))
+    if (constraints.isEmpty)
+      Set.empty[ConcreteVariable[G]]
+    else
+      var_differences(constraints)
   }
 
-  private def satisfying_valuations(state: AbstractState[G], expr: Option[Expr[G]]): Set[ConstraintMap[G]] = expr match {
-    case None => Set(ConstraintMap.empty[G])
-    case Some(e) =>
-      if (!state.resolve_boolean_expression(e).can_be_false) Set(ConstraintMap.empty[G])
-      else {
-        val variables: Set[ResolvableVariable[G]] = free_variables(initial_state, e)
-        new ConstraintSolver(state, variables, is_contract = false).resolve_assumption(e).filter(m => !m.is_impossible)
-      }
-  }
+  private def satisfying_valuations(
+      state: AbstractState[G],
+      expr: Option[Expr[G]],
+  ): Set[ConstraintMap[G]] =
+    expr match {
+      case None => Set(ConstraintMap.empty[G])
+      case Some(e) =>
+        if (!state.resolve_boolean_expression(e).can_be_false)
+          Set(ConstraintMap.empty[G])
+        else {
+          val variables: Set[ResolvableVariable[G]] = free_variables(
+            initial_state,
+            e,
+          )
+          new ConstraintSolver(state, variables, is_contract = false)
+            .resolve_assumption(e).filter(m => !m.is_impossible)
+        }
+    }
 
-  private def free_variables(state: AbstractState[G], expr: Expr[G]): Set[ResolvableVariable[G]] = expr.t match {
-    case _: IntType[_] | _: TBool[_] | _: TResource[_] =>
-      expr match {
-        case d @ Deref(_, ref) => if (state.valuations.exists(t => t._1.is_contained_by(d, state))) Set() else Set(FieldVariable(ref.decl))
-        case l @ Local(ref) => if (state.valuations.exists(t => t._1.is(l, state))) Set () else Set(LocalVariable(ref.decl))
-        case a @ AmbiguousSubscript(collection, index) => create_indexed_var_if_needed(state, a, collection, index)
-        case s @ SeqSubscript(seq, index) => create_indexed_var_if_needed(state, s, seq, index)
-        case a @ ArraySubscript(arr, index) => create_indexed_var_if_needed(state, a, arr, index)
-        case s @ Size(obj) =>
-          if (state.valuations.exists(t => t._1.is(s, state))) Set()
-          else obj match {
-            case Deref(_, ref) => Set(SizeVariable(ref.decl))
-          }
-        case _ => expr.subnodes.toSet[Node[G]].collect[Expr[G]]{ case e: Expr[_] => e }.flatMap(e => free_variables(state, e))
-      }
-    case _ => Set()
-  }
+  private def free_variables(
+      state: AbstractState[G],
+      expr: Expr[G],
+  ): Set[ResolvableVariable[G]] =
+    expr.t match {
+      case _: IntType[_] | _: TBool[_] | _: TResource[_] =>
+        expr match {
+          case d @ Deref(_, ref) =>
+            if (state.valuations.exists(t => t._1.is_contained_by(d, state)))
+              Set()
+            else
+              Set(FieldVariable(ref.decl))
+          case l @ Local(ref) =>
+            if (state.valuations.exists(t => t._1.is(l, state)))
+              Set()
+            else
+              Set(LocalVariable(ref.decl))
+          case a @ AmbiguousSubscript(collection, index) =>
+            create_indexed_var_if_needed(state, a, collection, index)
+          case s @ SeqSubscript(seq, index) =>
+            create_indexed_var_if_needed(state, s, seq, index)
+          case a @ ArraySubscript(arr, index) =>
+            create_indexed_var_if_needed(state, a, arr, index)
+          case s @ Size(obj) =>
+            if (state.valuations.exists(t => t._1.is(s, state)))
+              Set()
+            else
+              obj match { case Deref(_, ref) => Set(SizeVariable(ref.decl)) }
+          case _ =>
+            expr.subnodes.toSet[Node[G]].collect[Expr[G]] { case e: Expr[_] =>
+              e
+            }.flatMap(e => free_variables(state, e))
+        }
+      case _ => Set()
+    }
 
-  private def create_indexed_var_if_needed(state: AbstractState[G], expr: Expr[G], collection: Expr[G], subscript: Expr[G]): Set[ResolvableVariable[G]] = {
-    if (state.valuations.exists(t => t._1.is(expr, state))) Set()
+  private def create_indexed_var_if_needed(
+      state: AbstractState[G],
+      expr: Expr[G],
+      collection: Expr[G],
+      subscript: Expr[G],
+  ): Set[ResolvableVariable[G]] = {
+    if (state.valuations.exists(t => t._1.is(expr, state)))
+      Set()
     else {
-      val field: InstanceField[G] = collection match {
-        case Deref(_, ref) => ref.decl
-        case _ => throw new IllegalStateException("Collection value is not dereferenced instance field!")
-      }
-      val index: Option[Int] = state.resolve_integer_expression(subscript).try_to_resolve()
-      if (index.isEmpty) Set()
-      else Set(IndexedVariable(field, index.get))
+      val field: InstanceField[G] =
+        collection match {
+          case Deref(_, ref) => ref.decl
+          case _ =>
+            throw new IllegalStateException(
+              "Collection value is not dereferenced instance field!"
+            )
+        }
+      val index: Option[Int] = state.resolve_integer_expression(subscript)
+        .try_to_resolve()
+      if (index.isEmpty || index.get < 0)
+        Set()
+      else
+        Set(IndexedVariable(field, index.get))
     }
   }
 
-  private def var_differences(constraints: Seq[Set[ConstraintMap[G]]]): Set[ConcreteVariable[G]] = {
+  private def var_differences(
+      constraints: Seq[Set[ConstraintMap[G]]]
+  ): Set[ConcreteVariable[G]] = {
     // TODO: This causes some overapproximation, since constraints between the different variables are broken up. These
     //       should probably be handled as sets of constraint maps, but that makes the meaning much more difficult to
     //       keep track of
-    val c: Seq[Map[ConcreteVariable[G], UncertainValue]] = constraints.map(s => Utils.resolvable_to_concrete(s.reduce((m1, m2) => m1 || m2).resolve))
+    val c: Seq[Map[ConcreteVariable[G], UncertainValue]] = constraints.map(s =>
+      Utils.resolvable_to_concrete(s.reduce((m1, m2) => m1 || m2).resolve)
+    )
     val vars: Seq[ConcreteVariable[G]] = c.flatMap(m => m.keySet)
     var s: Set[ConcreteVariable[G]] = Set()
     for (v <- vars) {
       val t: Seq[UncertainValue] = c.filter(m => m.contains(v)).map(m => m(v))
-      if (t.exists(_ != t.head)) s += v
+      if (t.exists(_ != t.head))
+        s += v
     }
     s
   }
diff --git a/src/rewrite/vct/rewrite/util/Comparison.scala b/src/rewrite/vct/rewrite/util/Comparison.scala
index ed884e081c..c13e6ae1ff 100644
--- a/src/rewrite/vct/rewrite/util/Comparison.scala
+++ b/src/rewrite/vct/rewrite/util/Comparison.scala
@@ -17,42 +17,50 @@ case object Comparison {
   val TRUE: Comparison = Comparison(less = true, eq = true, greater = true)
   val FALSE: Comparison = Comparison()
 
-  def of[G](comparison: Expr[G]): Option[(Expr[G], Comparison, Expr[G])] = Some(comparison match {
-    case Less(left, right) => (left, LESS, right)
-    case LessEq(left, right) => (left, LESS_EQ, right)
-    case Eq(left, right) => (left, EQ, right)
-    case GreaterEq(left, right) => (left, GREATER_EQ, right)
-    case Greater(left, right) => (left, GREATER, right)
-    case Neq(left, right) => (left, NEQ, right)
-    case _ => return None
-  })
-
-  def matching[G](comparand: Expr[G], comparison: Expr[G]): Option[(Comparison, Expr[G])] =
+  def of[G](comparison: Expr[G]): Option[(Expr[G], Comparison, Expr[G])] =
+    Some(comparison match {
+      case Less(left, right) => (left, LESS, right)
+      case LessEq(left, right) => (left, LESS_EQ, right)
+      case Eq(left, right) => (left, EQ, right)
+      case GreaterEq(left, right) => (left, GREATER_EQ, right)
+      case Greater(left, right) => (left, GREATER, right)
+      case Neq(left, right) => (left, NEQ, right)
+      case _ => return None
+    })
+
+  def matching[G](
+      comparand: Expr[G],
+      comparison: Expr[G],
+  ): Option[(Comparison, Expr[G])] =
     of(comparison) match {
       case Some((left, comp, right)) =>
-        if(left == comparand) Some((comp, right))
-        else if(right == comparand) Some((comp.flip, left))
-        else None
+        if (left == comparand)
+          Some((comp, right))
+        else if (right == comparand)
+          Some((comp.flip, left))
+        else
+          None
       case None => None
     }
 }
 
-case class Comparison(less: Boolean = false, eq: Boolean = false, greater: Boolean = false) {
-  def flip: Comparison = Comparison(
-    less = greater,
-    eq = eq,
-    greater = less,
-  )
-
-  def make[G](left: Expr[G], right: Expr[G])(implicit o: Origin): Expr[G] = this match {
-    case Comparison(false, false, false) => ff
-    case Comparison(true, true, true) => tt
-    case Comparison(true, false, true) => Neq(left, right)
-
-    case Comparison(true, false, false) => Less(left, right)
-    case Comparison(true, true, false) => LessEq(left, right)
-    case Comparison(false, true, false) => Eq(left, right)
-    case Comparison(false, true, true) => GreaterEq(left, right)
-    case Comparison(false, false, true) => Greater(left, right)
-  }
+case class Comparison(
+    less: Boolean = false,
+    eq: Boolean = false,
+    greater: Boolean = false,
+) {
+  def flip: Comparison = Comparison(less = greater, eq = eq, greater = less)
+
+  def make[G](left: Expr[G], right: Expr[G])(implicit o: Origin): Expr[G] =
+    this match {
+      case Comparison(false, false, false) => ff
+      case Comparison(true, true, true) => tt
+      case Comparison(true, false, true) => Neq(left, right)
+
+      case Comparison(true, false, false) => Less(left, right)
+      case Comparison(true, true, false) => LessEq(left, right)
+      case Comparison(false, true, false) => Eq(left, right)
+      case Comparison(false, true, true) => GreaterEq(left, right)
+      case Comparison(false, false, true) => Greater(left, right)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/util/Extract.scala b/src/rewrite/vct/rewrite/util/Extract.scala
index 707e3e4438..95ef8f02d9 100644
--- a/src/rewrite/vct/rewrite/util/Extract.scala
+++ b/src/rewrite/vct/rewrite/util/Extract.scala
@@ -2,7 +2,13 @@ package vct.col.rewrite.util
 
 import vct.col.ast._
 import vct.col.origin._
-import vct.col.rewrite.util.FreeVariables.{FreeThisModel, FreeThisObject, ReadFreeVar, ReadTypeVar, WriteFreeVar}
+import vct.col.rewrite.util.FreeVariables.{
+  FreeThisModel,
+  FreeThisObject,
+  ReadFreeVar,
+  ReadTypeVar,
+  WriteFreeVar,
+}
 import vct.col.util.AstBuildHelpers.{VarBuildHelpers, assignLocal}
 import vct.col.util.Substitute
 import vct.result.VerificationError.UserError
@@ -10,21 +16,18 @@ import vct.result.VerificationError.UserError
 import scala.collection.immutable.ListMap
 import scala.collection.mutable
 
-/**
- * Substitute fresh variables for values that are free under a node (or nodes)
- */
+/** Substitute fresh variables for values that are free under a node (or nodes)
+  */
 case object Extract {
-  private def ExtractOrigin(name: String): Origin = Origin(
-    Seq(
-      PreferredName(Seq(name)),
-      LabelContext("extracted"),
-    )
-  )
-
-  /**
-   * Note: expressions must be free of assignments to locals (not necessarily all side effects), and type variables.
-   */
-  def extract[G](nodes: Expr[G]*): (Seq[Expr[G]], ListMap[Variable[G], Expr[G]]) = {
+  private def ExtractOrigin(name: String): Origin =
+    Origin(Seq(PreferredName(Seq(name)), LabelContext("extracted")))
+
+  /** Note: expressions must be free of assignments to locals (not necessarily
+    * all side effects), and type variables.
+    */
+  def extract[G](
+      nodes: Expr[G]*
+  ): (Seq[Expr[G]], ListMap[Variable[G], Expr[G]]) = {
     val extract = Extract[G]()
     val result = nodes.map(extract.extract)
     val extract.Data(ts, in, inForOut, out, _) = extract.finish()
@@ -47,8 +50,12 @@ case class Extract[G]() {
   private val write = mutable.Set[Local[G]]()
   private val read = mutable.Set[Local[G]]()
 
-  def getOrElseUpdate(free: FreeVariables.FreeVariable[G], update: => Variable[G]): Variable[G] =
-    if(map.contains(free)) map(free)
+  def getOrElseUpdate(
+      free: FreeVariables.FreeVariable[G],
+      update: => Variable[G],
+  ): Variable[G] =
+    if (map.contains(free))
+      map(free)
     else {
       val newVariable = update
       map += free -> newVariable
@@ -59,21 +66,42 @@ case class Extract[G]() {
     FreeVariables.freeVariables(node).collect {
       case free @ ReadFreeVar(v) =>
         read += v
-        v -> Local(getOrElseUpdate(free, new Variable(extract(v.t))(v.ref.decl.o)).ref[Variable[G]])(ExtractOrigin(""))
+        v -> Local(
+          getOrElseUpdate(free, new Variable(extract(v.t))(v.ref.decl.o))
+            .ref[Variable[G]]
+        )(ExtractOrigin(""))
       case WriteFreeVar(v) =>
         write += v
-        v -> Local(getOrElseUpdate(ReadFreeVar(v), new Variable(extract(v.t))(v.ref.decl.o)).ref[Variable[G]])(ExtractOrigin(""))
+        v -> Local(
+          getOrElseUpdate(
+            ReadFreeVar(v),
+            new Variable(extract(v.t))(v.ref.decl.o),
+          ).ref[Variable[G]]
+        )(ExtractOrigin(""))
       case free @ FreeThisObject(t) =>
-        if (t.cls.decl.typeArgs.nonEmpty) throw GenericsNotSupported(t.cls.decl)
-        t -> Local(getOrElseUpdate(free, new Variable(extract(TClass(t.cls, Seq())))(ExtractOrigin("this"))).ref[Variable[G]])(ExtractOrigin(""))
+        if (t.cls.decl.typeArgs.nonEmpty)
+          throw GenericsNotSupported(t.cls.decl)
+        t -> Local(
+          getOrElseUpdate(
+            free,
+            new Variable(extract(TClass(t.cls, Seq())))(ExtractOrigin("this")),
+          ).ref[Variable[G]]
+        )(ExtractOrigin(""))
       case free @ FreeThisModel(t) =>
-        t -> Local(getOrElseUpdate(free, new Variable(extract(TModel(t.cls)))(ExtractOrigin("this"))).ref[Variable[G]])(ExtractOrigin(""))
+        t -> Local(
+          getOrElseUpdate(
+            free,
+            new Variable(extract(TModel(t.cls)))(ExtractOrigin("this")),
+          ).ref[Variable[G]]
+        )(ExtractOrigin(""))
     }.to(ListMap)
 
   private def updateTypes(node: Node[G]): ListMap[TVar[G], Type[G]] =
-    FreeVariables.freeVariables(node).collect {
-      case free@ReadTypeVar(v) => v ->
-        TVar(getOrElseUpdate(free, new Variable(v.ref.decl.t)(v.ref.decl.o)).ref[Variable[G]])(ExtractOrigin(""))
+    FreeVariables.freeVariables(node).collect { case free @ ReadTypeVar(v) =>
+      v -> TVar(
+        getOrElseUpdate(free, new Variable(v.ref.decl.t)(v.ref.decl.o))
+          .ref[Variable[G]]
+      )(ExtractOrigin(""))
     }.to(ListMap)
 
   def extract(expr: Expr[G]): Expr[G] =
@@ -82,25 +110,25 @@ case class Extract[G]() {
   def extract(typ: Type[G]): Type[G] =
     Substitute(updateExprs(typ), updateTypes(typ)).dispatch(typ)
 
-  /**
-   * Note: statements must not have jumps into them, or jumps out of the statement.
-   */
+  /** Note: statements must not have jumps into them, or jumps out of the
+    * statement.
+    */
   def extract(stat: Statement[G]): Statement[G] = {
     val sub = Substitute(updateExprs(stat), updateTypes(stat))
-    sub.labelDecls.scope {
-      sub.dispatch(stat)
-    }
+    sub.labelDecls.scope { sub.dispatch(stat) }
   }
 
-  case class Data(types: ListMap[Variable[G], Type[G]],
-                  in: ListMap[Variable[G], Expr[G]],
-                  inForOut: ListMap[(Variable[G], Variable[G]), Expr[G]],
-                  out: ListMap[Variable[G], Expr[G]],
-                  initialAssignments: Statement[G])
+  case class Data(
+      types: ListMap[Variable[G], Type[G]],
+      in: ListMap[Variable[G], Expr[G]],
+      inForOut: ListMap[(Variable[G], Variable[G]), Expr[G]],
+      out: ListMap[Variable[G], Expr[G]],
+      initialAssignments: Statement[G],
+  )
 
   def finish(): Data = {
-    val types = map.collect {
-      case (ReadTypeVar(v), extracted) => extracted -> v
+    val types = map.collect { case (ReadTypeVar(v), extracted) =>
+      extracted -> v
     }.to(ListMap)
 
     // Locals that are not written: their usage becomes a parameter
@@ -112,15 +140,20 @@ case class Extract[G]() {
 
     // Locals that are written and read: get an initial value as a parameter, all usages are an out parameter
     val inForOut = map.collect {
-      case (ReadFreeVar(v), extracted) if read.contains(v) && write.contains(v) =>
+      case (ReadFreeVar(v), extracted)
+          if read.contains(v) && write.contains(v) =>
         (new Variable[G](extract(v.t))(v.ref.decl.o), extracted) -> v
     }.to(ListMap)
 
     // Locals that are written and read: the out parameter is assigned the initial value immediately
-    val initialAssignments = Block((for(((in, out), _) <- inForOut) yield {
-      implicit val o: Origin = in.o
-      assignLocal(out.get, in.get)
-    }).toSeq)(ExtractOrigin(""))
+    val initialAssignments =
+      Block(
+        (for (((in, out), _) <- inForOut)
+          yield {
+            implicit val o: Origin = in.o
+            assignLocal(out.get, in.get)
+          }).toSeq
+      )(ExtractOrigin(""))
 
     // Locals that are written: get an out parameter. The initial value is skipped if not read.
     val out = map.collect {
@@ -129,4 +162,4 @@ case class Extract[G]() {
 
     Data(types, in, inForOut, out, initialAssignments)
   }
-}
\ No newline at end of file
+}
diff --git a/src/rewrite/vct/rewrite/util/FreeVariables.scala b/src/rewrite/vct/rewrite/util/FreeVariables.scala
index 1bf5298850..77d3bf6eda 100644
--- a/src/rewrite/vct/rewrite/util/FreeVariables.scala
+++ b/src/rewrite/vct/rewrite/util/FreeVariables.scala
@@ -1,6 +1,18 @@
 package vct.col.rewrite.util
 
-import vct.col.ast.{AnyMethodInvocation, Assign, InvocationStatement, InvokingNode, Local, Node, PostAssignExpression, PreAssignExpression, TVar, ThisModel, ThisObject}
+import vct.col.ast.{
+  AnyMethodInvocation,
+  Assign,
+  InvocationStatement,
+  InvokingNode,
+  Local,
+  Node,
+  PostAssignExpression,
+  PreAssignExpression,
+  TVar,
+  ThisModel,
+  ThisObject,
+}
 import vct.col.check.CheckContext
 
 object FreeVariables {
@@ -11,27 +23,43 @@ object FreeVariables {
   case class FreeThisObject[G](t: ThisObject[G]) extends FreeVariable[G]
   case class FreeThisModel[G](t: ThisModel[G]) extends FreeVariable[G]
 
-  private def flatFreeVariables[G](node: Node[G], scope: CheckContext[G]): Set[FreeVariable[G]] = node match {
-    case local@Local(ref) if !scope.inScope(ref) => Set(ReadFreeVar(local))
-    case tVar@TVar(ref) if !scope.inScope(ref) => Set(ReadTypeVar(tVar))
-    case Assign(local@Local(ref), _) if !scope.inScope(ref) => Set(WriteFreeVar(local))
-    case PreAssignExpression(local@Local(ref), _) if !scope.inScope(ref) => Set(WriteFreeVar(local))
-    case PostAssignExpression(local@Local(ref), _) if !scope.inScope(ref) => Set(WriteFreeVar(local))
-    case inv: InvocationStatement[G] =>
-      inv.outArgs.collect { case l@Local(ref) if !scope.inScope(ref) => WriteFreeVar(l) }.toSet ++
-        inv.yields.collect { case (l@Local(ref), _) if !scope.inScope(ref) => WriteFreeVar(l) }.toSet
-    case inv: AnyMethodInvocation[G] =>
-      inv.outArgs.collect { case l@Local(ref) if !scope.inScope(ref) => WriteFreeVar(l) }.toSet ++
-        inv.yields.collect { case (l@Local(ref), _) if !scope.inScope(ref) => WriteFreeVar(l) }.toSet
-    case diz: ThisObject[G] => Set(FreeThisObject(diz))
-    case diz: ThisModel[G] => Set(FreeThisModel(diz))
-    case _ => Set.empty
-  }
+  private def flatFreeVariables[G](
+      node: Node[G],
+      scope: CheckContext[G],
+  ): Set[FreeVariable[G]] =
+    node match {
+      case local @ Local(ref) if !scope.inScope(ref) => Set(ReadFreeVar(local))
+      case tVar @ TVar(ref) if !scope.inScope(ref) => Set(ReadTypeVar(tVar))
+      case Assign(local @ Local(ref), _) if !scope.inScope(ref) =>
+        Set(WriteFreeVar(local))
+      case PreAssignExpression(local @ Local(ref), _) if !scope.inScope(ref) =>
+        Set(WriteFreeVar(local))
+      case PostAssignExpression(local @ Local(ref), _) if !scope.inScope(ref) =>
+        Set(WriteFreeVar(local))
+      case inv: InvocationStatement[G] =>
+        inv.outArgs.collect {
+          case l @ Local(ref) if !scope.inScope(ref) => WriteFreeVar(l)
+        }.toSet ++ inv.yields.collect {
+          case (l @ Local(ref), _) if !scope.inScope(ref) => WriteFreeVar(l)
+        }.toSet
+      case inv: AnyMethodInvocation[G] =>
+        inv.outArgs.collect {
+          case l @ Local(ref) if !scope.inScope(ref) => WriteFreeVar(l)
+        }.toSet ++ inv.yields.collect {
+          case (l @ Local(ref), _) if !scope.inScope(ref) => WriteFreeVar(l)
+        }.toSet
+      case diz: ThisObject[G] => Set(FreeThisObject(diz))
+      case diz: ThisModel[G] => Set(FreeThisModel(diz))
+      case _ => Set.empty
+    }
 
-  /**
-   * Scans the values (variables) that are defined outside this node
-   */
-  def freeVariables[G](node: Node[G], scope: CheckContext[G] = CheckContext[G]()): Set[FreeVariable[G]] =
+  /** Scans the values (variables) that are defined outside this node
+    */
+  def freeVariables[G](
+      node: Node[G],
+      scope: CheckContext[G] = CheckContext[G](),
+  ): Set[FreeVariable[G]] =
     flatFreeVariables(node, scope) ++
-      node.subnodes.flatMap(freeVariables(_, node.enterCheckContext(scope))).toSet
+      node.subnodes.flatMap(freeVariables(_, node.enterCheckContext(scope)))
+        .toSet
 }
diff --git a/src/rewrite/vct/rewrite/veymont/ChannelInfo.scala b/src/rewrite/vct/rewrite/veymont/ChannelInfo.scala
index dd2764359b..c03d115b94 100644
--- a/src/rewrite/vct/rewrite/veymont/ChannelInfo.scala
+++ b/src/rewrite/vct/rewrite/veymont/ChannelInfo.scala
@@ -3,6 +3,8 @@ package vct.rewrite.veymont
 import vct.col.ast.{Type, CommunicateX}
 import vct.col.rewrite.Generation
 
-class ChannelInfo[Pre <: Generation](val comExpr: CommunicateX[Pre], val channelType: Type[Pre], val channelName: String) {
-
-}
+class ChannelInfo[Pre <: Generation](
+    val comExpr: CommunicateX[Pre],
+    val channelType: Type[Pre],
+    val channelName: String,
+) {}
diff --git a/src/rewrite/vct/rewrite/veymont/DeduplicateChorGuards.scala b/src/rewrite/vct/rewrite/veymont/DeduplicateChorGuards.scala
index 4d3252a04e..b8b18ec4a9 100644
--- a/src/rewrite/vct/rewrite/veymont/DeduplicateChorGuards.scala
+++ b/src/rewrite/vct/rewrite/veymont/DeduplicateChorGuards.scala
@@ -14,35 +14,45 @@ import scala.collection.mutable
 
 object DeduplicateChorGuards extends RewriterBuilder {
   override def key: String = "deduplicateSeqGuards"
-  override def desc: String = "Deduplicates SeqGuard nodes with syntactically identical endpoints"
+  override def desc: String =
+    "Deduplicates SeqGuard nodes with syntactically identical endpoints"
 }
 
 case class DeduplicateChorGuards[Pre <: Generation]() extends Rewriter[Pre] {
-  override def dispatch(statement: Statement[Pre]): Statement[Post] = statement match {
-    case branch: ChorBranch[Pre] =>
-      val guards: Seq[EndpointGuard[Pre]] = branch.guards.map {
-        case guard: EndpointGuard[Pre] => guard
-        case guard: UnpointedGuard[Pre] => ??? // Excluded by RemoveUnpointedGuard
-      }
-      branch.rewrite(guards = dedup(guards))
+  override def dispatch(statement: Statement[Pre]): Statement[Post] =
+    statement match {
+      case branch: ChorBranch[Pre] =>
+        val guards: Seq[EndpointGuard[Pre]] = branch.guards.map {
+          case guard: EndpointGuard[Pre] => guard
+          case guard: UnpointedGuard[Pre] =>
+            ??? // Excluded by RemoveUnpointedGuard
+        }
+        branch.rewrite(guards = dedup(guards))
 
-    case loop: ChorLoop[Pre] =>
-      val guards: Seq[EndpointGuard[Pre]] = loop.guards.map {
-        case guard: EndpointGuard[Pre] => guard
-        case guard: UnpointedGuard[Pre] => ??? // Excluded by RemoveUnpointedGuard
-      }
-      loop.rewrite(guards = dedup(guards))
+      case loop: ChorLoop[Pre] =>
+        val guards: Seq[EndpointGuard[Pre]] = loop.guards.map {
+          case guard: EndpointGuard[Pre] => guard
+          case guard: UnpointedGuard[Pre] =>
+            ??? // Excluded by RemoveUnpointedGuard
+        }
+        loop.rewrite(guards = dedup(guards))
 
-    case _ => rewriteDefault(statement)
-  }
+      case _ => rewriteDefault(statement)
+    }
 
   def dedup(guards: Seq[EndpointGuard[Pre]]): Seq[EndpointGuard[Post]] = {
-    val m: mutable.LinkedHashMap[Endpoint[Pre], Seq[Expr[Pre]]] = mutable.LinkedHashMap()
+    val m: mutable.LinkedHashMap[Endpoint[Pre], Seq[Expr[Pre]]] = mutable
+      .LinkedHashMap()
     guards.foreach { guard =>
-      m.updateWith(guard.endpoint.decl)(exprs => Some(exprs.getOrElse(Nil) :+ guard.condition))
+      m.updateWith(guard.endpoint.decl)(exprs =>
+        Some(exprs.getOrElse(Nil) :+ guard.condition)
+      )
     }
     m.iterator.map { case (endpoint, exprs) =>
-      EndpointGuard[Post](succ(endpoint), foldAnd(exprs.map(dispatch))(DiagnosticOrigin))(exprs.head.o)
+      EndpointGuard[Post](
+        succ(endpoint),
+        foldAnd(exprs.map(dispatch))(DiagnosticOrigin),
+      )(exprs.head.o)
     }.toSeq
   }
 }
diff --git a/src/rewrite/vct/rewrite/veymont/EncodeChannels.scala b/src/rewrite/vct/rewrite/veymont/EncodeChannels.scala
index c1eba3506a..5a0d2dc111 100644
--- a/src/rewrite/vct/rewrite/veymont/EncodeChannels.scala
+++ b/src/rewrite/vct/rewrite/veymont/EncodeChannels.scala
@@ -2,7 +2,32 @@ package vct.rewrite.veymont
 
 import com.typesafe.scalalogging.LazyLogging
 import hre.util.ScopedStack
-import vct.col.ast.{Assign, Block, ChorStatement, Choreography, Class, Communicate, CommunicateStatement, Constructor, ConstructorInvocation, Declaration, Deref, Endpoint, EndpointName, Eval, InstanceField, InstanceMethod, Local, Program, Scope, Statement, TClass, TVar, Type, Variable}
+import vct.col.ast.{
+  Assign,
+  Block,
+  ChorStatement,
+  Choreography,
+  Class,
+  Communicate,
+  CommunicateStatement,
+  Constructor,
+  ConstructorInvocation,
+  Declaration,
+  Deref,
+  Endpoint,
+  EndpointName,
+  Eval,
+  InstanceField,
+  InstanceMethod,
+  Local,
+  Program,
+  Scope,
+  Statement,
+  TClass,
+  TVar,
+  Type,
+  Variable,
+}
 import vct.col.origin.{Name, PanicBlame, SourceName}
 import vct.col.ref.Ref
 import vct.col.rewrite.adt.ImportADTImporter
@@ -15,27 +40,43 @@ import scala.reflect.ClassTag
 
 object EncodeChannels extends RewriterBuilderArg[ImportADTImporter] {
   override def key: String = "encodeChannels"
-  override def desc: String = "Encodes VeyMont channels as fields on endpoints, and communicate statements as method invocations on endpoints."
+  override def desc: String =
+    "Encodes VeyMont channels as fields on endpoints, and communicate statements as method invocations on endpoints."
 }
 
-case class EncodeChannels[Pre <: Generation](importer: ImportADTImporter) extends Rewriter[Pre] with LazyLogging with VeymontContext[Pre] {
+case class EncodeChannels[Pre <: Generation](importer: ImportADTImporter)
+    extends Rewriter[Pre] with LazyLogging with VeymontContext[Pre] {
 
-  private lazy val channelPre = importer.loadAdt[Pre]("genericChannel").declarations
+  private lazy val channelPre =
+    importer.loadAdt[Pre]("genericChannel").declarations
 
   lazy val genericChannelClass = find[Pre, Class[Pre]](channelPre, "Channel")
   lazy val genericChannelDecls = genericChannelClass.decls
-  lazy val genericChannelConstructor = find[Pre, Constructor[Pre]](genericChannelDecls)
-  lazy val genericChannelWrite = find[Pre, InstanceMethod[Pre]](genericChannelDecls, "writeValue")
-  lazy val genericChannelRead = find[Pre, InstanceMethod[Pre]](genericChannelDecls, "readValue")
+  lazy val genericChannelConstructor = find[Pre, Constructor[Pre]](
+    genericChannelDecls
+  )
+  lazy val genericChannelWrite = find[Pre, InstanceMethod[Pre]](
+    genericChannelDecls,
+    "writeValue",
+  )
+  lazy val genericChannelRead = find[Pre, InstanceMethod[Pre]](
+    genericChannelDecls,
+    "readValue",
+  )
 
   val channelClassSucc = SuccessionMap[Communicate[Pre], Class[Post]]()
-  val channelConstructorSucc = SuccessionMap[Communicate[Pre], Constructor[Post]]()
+  val channelConstructorSucc =
+    SuccessionMap[Communicate[Pre], Constructor[Post]]()
   val channelWriteSucc = SuccessionMap[Communicate[Pre], InstanceMethod[Post]]()
   val channelReadSucc = SuccessionMap[Communicate[Pre], InstanceMethod[Post]]()
 
-  protected def find[G, T](decls: Seq[Declaration[G]], name: String = null)(implicit tag: ClassTag[T]): T =
+  protected def find[G, T](decls: Seq[Declaration[G]], name: String = null)(
+      implicit tag: ClassTag[T]
+  ): T =
     decls.collectFirst {
-      case decl: T if name == null || decl.o.find[SourceName].contains(SourceName(name)) =>
+      case decl: T
+          if name == null ||
+            decl.o.find[SourceName].contains(SourceName(name)) =>
         decl
     }.get
 
@@ -48,8 +89,10 @@ case class EncodeChannels[Pre <: Generation](importer: ImportADTImporter) extend
   def generateChannel(comm: Communicate[Pre]): Unit =
     currentCommunicate.having(comm) { dispatch(genericChannelClass) }
 
-  val fieldOfCommunicate = SuccessionMap[(Endpoint[Pre], Communicate[Pre]), InstanceField[Post]]()
-  val localOfCommunicate = mutable.LinkedHashMap[Communicate[Pre], Variable[Post]]()
+  val fieldOfCommunicate =
+    SuccessionMap[(Endpoint[Pre], Communicate[Pre]), InstanceField[Post]]()
+  val localOfCommunicate = mutable
+    .LinkedHashMap[Communicate[Pre], Variable[Post]]()
 
   override def dispatch(p: Program[Pre]): Program[Post] = {
     mappings.program = p
@@ -57,92 +100,116 @@ case class EncodeChannels[Pre <: Generation](importer: ImportADTImporter) extend
   }
 
   def channelName(comm: Communicate[_]): Name =
-    Name.names(comm.sender.get.decl.o.getPreferredNameOrElse(),
-      comm.receiver.get.decl.o.getPreferredNameOrElse())
-
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case chor: Choreography[Pre] =>
-      implicit val o = chor.o
-      currentChoreography.having(chor) {
-        def commVar(comm: Communicate[Pre]): Variable[Post] = {
-          val t = channelType(comm)
-          val v = new Variable(t)(chor.o.where(indirect = channelName(comm)))
-          localOfCommunicate(comm) = v
-          v
-        }
+    Name.names(
+      comm.sender.get.decl.o.getPreferredNameOrElse(),
+      comm.receiver.get.decl.o.getPreferredNameOrElse(),
+    )
+
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case chor: Choreography[Pre] =>
+        implicit val o = chor.o
+        currentChoreography.having(chor) {
+          def commVar(comm: Communicate[Pre]): Variable[Post] = {
+            val t = channelType(comm)
+            val v = new Variable(t)(chor.o.where(indirect = channelName(comm)))
+            localOfCommunicate(comm) = v
+            v
+          }
 
-        def instantiateComm(comm: Communicate[Pre]): Statement[Post] = {
-          val v = localOfCommunicate(comm)
-          assignLocal(
-            local = Local[Post](v.ref),
-            value = ConstructorInvocation[Post](
-              ref = channelConstructorSucc(comm).ref,
-              classTypeArgs = Seq(dispatch(comm.msg.t)),
-              args = Seq(), outArgs = Seq(), typeArgs = Seq(), givenMap = Seq(), yields = Seq()
-            )(PanicBlame("Should be safe")))
-        }
+          def instantiateComm(comm: Communicate[Pre]): Statement[Post] = {
+            val v = localOfCommunicate(comm)
+            assignLocal(
+              local = Local[Post](v.ref),
+              value =
+                ConstructorInvocation[Post](
+                  ref = channelConstructorSucc(comm).ref,
+                  classTypeArgs = Seq(dispatch(comm.msg.t)),
+                  args = Seq(),
+                  outArgs = Seq(),
+                  typeArgs = Seq(),
+                  givenMap = Seq(),
+                  yields = Seq(),
+                )(PanicBlame("Should be safe")),
+            )
+          }
+
+          def assignComm(
+              comm: Communicate[Pre],
+              endpoint: Endpoint[Pre],
+          ): Statement[Post] = {
+            assignField(
+              obj = EndpointName[Post](succ(endpoint)),
+              field = fieldOfCommunicate.ref((endpoint, comm)),
+              value = localOfCommunicate(comm).get,
+              blame = PanicBlame("Should be safe"),
+            )
+          }
 
-        def assignComm(comm: Communicate[Pre], endpoint: Endpoint[Pre]): Statement[Post] = {
-          assignField(
-            obj = EndpointName[Post](succ(endpoint)),
-            field = fieldOfCommunicate.ref((endpoint, comm)),
-            value = localOfCommunicate(comm).get,
-            blame = PanicBlame("Should be safe")
-          )
+          chor.rewrite(preRun = {
+            communicatesOf(chor).foreach(generateChannel)
+            val vars = communicatesOf(chor).map(commVar)
+            val instantiatedComms: Seq[Statement[Post]] = communicatesOf(chor)
+              .map(instantiateComm)
+            val assignComms: Seq[Statement[Post]] = chor.endpoints
+              .flatMap { endpoint =>
+                communicatesOf(chor).map { comm => assignComm(comm, endpoint) }
+              }
+            Some(Scope(vars, Block(instantiatedComms ++ assignComms)))
+          }).succeed(chor)
         }
 
-        chor.rewrite(preRun = {
-          communicatesOf(chor).foreach(generateChannel)
-          val vars = communicatesOf(chor).map(commVar)
-          val instantiatedComms: Seq[Statement[Post]] = communicatesOf(chor).map(instantiateComm)
-          val assignComms: Seq[Statement[Post]] = chor.endpoints.flatMap { endpoint => communicatesOf(chor).map { comm => assignComm(comm, endpoint) } }
-          Some(Scope(vars, Block(instantiatedComms ++ assignComms)))
-        }).succeed(chor)
-      }
-
-    case cls: Class[Pre] if isEndpointClass(cls) =>
-      cls.rewrite(
-        decls = classDeclarations.collect {
-          cls.decls.foreach(dispatch)
-          communicatesOf(choreographyOf(cls)).foreach { comm =>
-            val f = new InstanceField[Post](channelType(comm), Seq())(comm.o.where(indirect = channelName(comm)))
-            fieldOfCommunicate((endpointOf(cls), comm)) = f
-            f.declare()
-          }
-        }._1
-      ).succeed(cls)
-
-    case cls: Class[Pre] if cls == genericChannelClass =>
-      globalDeclarations.scope {
-        classDeclarations.scope {
-          variables.scope {
-            currentMsgTVar.having(cls.typeArgs.head) {
-              channelClassSucc(currentCommunicate.top) = cls.rewrite(typeArgs = Seq()).succeed(cls)
+      case cls: Class[Pre] if isEndpointClass(cls) =>
+        cls.rewrite(decls =
+          classDeclarations.collect {
+            cls.decls.foreach(dispatch)
+            communicatesOf(choreographyOf(cls)).foreach { comm =>
+              val f =
+                new InstanceField[Post](channelType(comm), Seq())(
+                  comm.o.where(indirect = channelName(comm))
+                )
+              fieldOfCommunicate((endpointOf(cls), comm)) = f
+              f.declare()
+            }
+          }._1
+        ).succeed(cls)
+
+      case cls: Class[Pre] if cls == genericChannelClass =>
+        globalDeclarations.scope {
+          classDeclarations.scope {
+            variables.scope {
+              currentMsgTVar.having(cls.typeArgs.head) {
+                channelClassSucc(currentCommunicate.top) = cls
+                  .rewrite(typeArgs = Seq()).succeed(cls)
+              }
             }
           }
         }
-      }
-    case cons: Constructor[Pre] if cons == genericChannelConstructor =>
-      channelConstructorSucc(currentCommunicate.top) = cons.rewriteDefault().succeed(cons)
-    case m: InstanceMethod[Pre] if m == genericChannelWrite =>
-      channelWriteSucc(currentCommunicate.top) = m.rewriteDefault().succeed(m)
-    case m: InstanceMethod[Pre] if m == genericChannelRead =>
-      channelReadSucc(currentCommunicate.top) = m.rewriteDefault().succeed(m)
-
-    case _ => super.dispatch(decl)
-  }
-
-  override def dispatch(t: Type[Pre]): Type[Post] = t match {
-    case TVar(Ref(v)) if currentMsgTVar.topOption.contains(v) => dispatch(currentCommunicate.top.msg.t)
-    case _ => t.rewriteDefault()
-  }
-
-  override def dispatch(stmt: Statement[Pre]): Statement[Post] = stmt match {
-    case CommunicateStatement(comm: Communicate[Pre]) =>
-      implicit val o = comm.o
-      Block[Post](Seq(sendOf(comm), receiveOf(comm)))(comm.o)
-    case _ => stmt.rewriteDefault()
-  }
+      case cons: Constructor[Pre] if cons == genericChannelConstructor =>
+        channelConstructorSucc(currentCommunicate.top) = cons.rewriteDefault()
+          .succeed(cons)
+      case m: InstanceMethod[Pre] if m == genericChannelWrite =>
+        channelWriteSucc(currentCommunicate.top) = m.rewriteDefault().succeed(m)
+      case m: InstanceMethod[Pre] if m == genericChannelRead =>
+        channelReadSucc(currentCommunicate.top) = m.rewriteDefault().succeed(m)
+
+      case _ => super.dispatch(decl)
+    }
+
+  override def dispatch(t: Type[Pre]): Type[Post] =
+    t match {
+      case TVar(Ref(v)) if currentMsgTVar.topOption.contains(v) =>
+        dispatch(currentCommunicate.top.msg.t)
+      case _ => t.rewriteDefault()
+    }
+
+  override def dispatch(stmt: Statement[Pre]): Statement[Post] =
+    stmt match {
+      case CommunicateStatement(comm: Communicate[Pre]) =>
+        implicit val o = comm.o
+        Block[Post](Seq(sendOf(comm), receiveOf(comm)))(comm.o)
+      case _ => stmt.rewriteDefault()
+    }
 
   def sendOf(comm: Communicate[Pre]): Statement[Post] = {
     implicit val o = comm.o
@@ -150,28 +217,37 @@ case class EncodeChannels[Pre <: Generation](importer: ImportADTImporter) extend
     ChorStatement[Post](
       Some(succ(sender)),
       Eval(methodInvocation[Post](
-        obj = Deref[Post](
-          EndpointName(succ(sender)),
-          fieldOfCommunicate.ref[Post, InstanceField[Post]]((sender, comm)))(PanicBlame("Permission for fields should be propagated in entire choreography")),
+        obj =
+          Deref[Post](
+            EndpointName(succ(sender)),
+            fieldOfCommunicate.ref[Post, InstanceField[Post]]((sender, comm)),
+          )(PanicBlame(
+            "Permission for fields should be propagated in entire choreography"
+          )),
         ref = channelWriteSucc.ref[Post, InstanceMethod[Post]](comm),
         args = Seq(dispatch(comm.msg)),
-        blame = PanicBlame("TODO: sending should be safe")
-      )))(PanicBlame("TODO: ChorStatement blame?"))
+        blame = PanicBlame("TODO: sending should be safe"),
+      )),
+    )(PanicBlame("TODO: ChorStatement blame?"))
   }
 
   def receiveOf(comm: Communicate[Pre]): Statement[Post] = {
     implicit val o = comm.o
     val Some(Ref(receiver)) = comm.receiver
-    ChorStatement[Post](Some(succ[Endpoint[Post]](receiver)),
+    ChorStatement[Post](
+      Some(succ[Endpoint[Post]](receiver)),
       Assign(
         dispatch(comm.target),
         methodInvocation[Post](
-          obj = Deref[Post](
-            EndpointName[Post](succ(receiver)),
-            fieldOfCommunicate.ref((receiver, comm)))(PanicBlame("Should be safe")),
+          obj =
+            Deref[Post](
+              EndpointName[Post](succ(receiver)),
+              fieldOfCommunicate.ref((receiver, comm)),
+            )(PanicBlame("Should be safe")),
           ref = channelReadSucc.ref[Post, InstanceMethod[Post]](comm),
-          blame = PanicBlame("Should be safe")),
-      )(PanicBlame("TODO 2"))
+          blame = PanicBlame("Should be safe"),
+        ),
+      )(PanicBlame("TODO 2")),
     )(PanicBlame("TODO: ChorStatement blame?"))
   }
 }
diff --git a/src/rewrite/vct/rewrite/veymont/EncodeChorBranchUnanimity.scala b/src/rewrite/vct/rewrite/veymont/EncodeChorBranchUnanimity.scala
index 3e1d84d48b..0b872d62c9 100644
--- a/src/rewrite/vct/rewrite/veymont/EncodeChorBranchUnanimity.scala
+++ b/src/rewrite/vct/rewrite/veymont/EncodeChorBranchUnanimity.scala
@@ -3,97 +3,136 @@ package vct.rewrite.veymont
 import hre.util.ScopedStack
 import vct.col.ast.RewriteHelpers._
 import vct.col.ast._
-import vct.col.origin.{AssertFailed, Blame, BranchUnanimityFailed, LoopUnanimityNotEstablished, LoopUnanimityNotMaintained, Origin}
+import vct.col.origin.{
+  AssertFailed,
+  Blame,
+  BranchUnanimityFailed,
+  LoopUnanimityNotEstablished,
+  LoopUnanimityNotMaintained,
+  Origin,
+}
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 import vct.col.util.AstBuildHelpers._
 import vct.col.util.SuccessionMap
 import vct.result.VerificationError.UserError
-import vct.rewrite.veymont.EncodeChorBranchUnanimity.{ForwardBranchUnanimity, ForwardLoopUnanimityNotEstablished, ForwardLoopUnanimityNotMaintained}
+import vct.rewrite.veymont.EncodeChorBranchUnanimity.{
+  ForwardBranchUnanimity,
+  ForwardLoopUnanimityNotEstablished,
+  ForwardLoopUnanimityNotMaintained,
+}
 
 import scala.collection.mutable
 
-object EncodeChorBranchUnanimity  extends RewriterBuilder {
+object EncodeChorBranchUnanimity extends RewriterBuilder {
   override def key: String = "encodeSeqBranchUnanimity"
-  override def desc: String = "Encodes the branch unanimity requirement imposed by VeyMont on branches and loops in seq_program nodes."
-
-  case class ForwardBranchUnanimity(branch: ChorBranch[_], c1: ChorGuard[_], c2: ChorGuard[_]) extends Blame[AssertFailed] {
+  override def desc: String =
+    "Encodes the branch unanimity requirement imposed by VeyMont on branches and loops in seq_program nodes."
+
+  case class ForwardBranchUnanimity(
+      branch: ChorBranch[_],
+      c1: ChorGuard[_],
+      c2: ChorGuard[_],
+  ) extends Blame[AssertFailed] {
     override def blame(error: AssertFailed): Unit =
       branch.blame.blame(BranchUnanimityFailed(c1, c2))
   }
 
-  case class ForwardLoopUnanimityNotEstablished(loop: ChorLoop[_], c1: ChorGuard[_], c2: ChorGuard[_]) extends Blame[AssertFailed] {
+  case class ForwardLoopUnanimityNotEstablished(
+      loop: ChorLoop[_],
+      c1: ChorGuard[_],
+      c2: ChorGuard[_],
+  ) extends Blame[AssertFailed] {
     override def blame(error: AssertFailed): Unit =
       loop.blame.blame(LoopUnanimityNotEstablished(c1, c2))
   }
 
-  case class ForwardLoopUnanimityNotMaintained(loop: ChorLoop[_], c1: ChorGuard[_], c2: ChorGuard[_]) extends Blame[AssertFailed] {
+  case class ForwardLoopUnanimityNotMaintained(
+      loop: ChorLoop[_],
+      c1: ChorGuard[_],
+      c2: ChorGuard[_],
+  ) extends Blame[AssertFailed] {
     override def blame(error: AssertFailed): Unit =
       loop.blame.blame(LoopUnanimityNotMaintained(c1, c2))
   }
 }
 
-case class EncodeChorBranchUnanimity[Pre <: Generation]() extends Rewriter[Pre] {
+case class EncodeChorBranchUnanimity[Pre <: Generation]()
+    extends Rewriter[Pre] {
 
   val currentLoop = ScopedStack[ChorLoop[Pre]]()
 
-  override def dispatch(statement: Statement[Pre]): Statement[Post] = statement match {
-    case branch @ ChorBranch(guards, yes, no) =>
-      implicit val o = statement.o
-
-      val assertions: Block[Post] = Block(guards.indices.init.map { i =>
-        Assert(rewriteGuard(guards(i)) === rewriteGuard(guards(i + 1)))(
-          ForwardBranchUnanimity(branch, guards(i), guards(i + 1)))
-      })
-
-      Block(Seq(
-        assertions,
-        Branch[Post](
-          Seq((foldAnd(guards.map(rewriteGuard)), dispatch(yes))) ++
-            no.map { no => Seq((tt[Post], dispatch(no))) }.getOrElse(Nil))
-      ))
-
-    case loop @ ChorLoop(guards, contract, body) =>
-      implicit val o = statement.o
-
-      val establishAssertions: Statement[Post] = Block(guards.indices.init.map { i =>
-        Assert(rewriteGuard(guards(i)) === rewriteGuard(guards(i + 1)))(
-          ForwardLoopUnanimityNotEstablished(loop, guards(i), guards(i + 1)))
-      })
-
-      val maintainAssertions: Statement[Post] = Block(guards.indices.init.map { i =>
-        Assert(rewriteGuard(guards(i)) === rewriteGuard(guards(i + 1)))(
-          ForwardLoopUnanimityNotMaintained(loop, guards(i), guards(i + 1)))
-      })
-
-      val finalLoop: Loop[Post] = Loop(
-        establishAssertions,
-        foldAnd(guards.map(rewriteGuard)),
-        maintainAssertions,
-        currentLoop.having(loop) {
-          dispatch(contract)
-        },
-        dispatch(body)
-      )
-
-      finalLoop
-
-    case statement => rewriteDefault(statement)
-  }
-
-  def rewriteGuard(guard: ChorGuard[Pre]): Expr[Post] = dispatch(guard.condition)
+  override def dispatch(statement: Statement[Pre]): Statement[Post] =
+    statement match {
+      case branch @ ChorBranch(guards, yes, no) =>
+        implicit val o = statement.o
+
+        val assertions: Block[Post] = Block(guards.indices.init.map { i =>
+          Assert(rewriteGuard(guards(i)) === rewriteGuard(guards(i + 1)))(
+            ForwardBranchUnanimity(branch, guards(i), guards(i + 1))
+          )
+        })
+
+        Block(Seq(
+          assertions,
+          Branch[Post](
+            Seq((foldAnd(guards.map(rewriteGuard)), dispatch(yes))) ++ no.map {
+              no => Seq((tt[Post], dispatch(no)))
+            }.getOrElse(Nil)
+          ),
+        ))
+
+      case loop @ ChorLoop(guards, contract, body) =>
+        implicit val o = statement.o
+
+        val establishAssertions: Statement[Post] = Block(
+          guards.indices.init.map { i =>
+            Assert(rewriteGuard(guards(i)) === rewriteGuard(guards(i + 1)))(
+              ForwardLoopUnanimityNotEstablished(loop, guards(i), guards(i + 1))
+            )
+          }
+        )
+
+        val maintainAssertions: Statement[Post] = Block(
+          guards.indices.init.map { i =>
+            Assert(rewriteGuard(guards(i)) === rewriteGuard(guards(i + 1)))(
+              ForwardLoopUnanimityNotMaintained(loop, guards(i), guards(i + 1))
+            )
+          }
+        )
+
+        val finalLoop: Loop[Post] = Loop(
+          establishAssertions,
+          foldAnd(guards.map(rewriteGuard)),
+          maintainAssertions,
+          currentLoop.having(loop) { dispatch(contract) },
+          dispatch(body),
+        )
+
+        finalLoop
+
+      case statement => rewriteDefault(statement)
+    }
+
+  def rewriteGuard(guard: ChorGuard[Pre]): Expr[Post] =
+    dispatch(guard.condition)
 
   def allEqual[G](exprs: Seq[Expr[G]])(implicit o: Origin): Expr[G] =
     foldAnd[G](exprs.indices.init.map(i => exprs(i) === exprs(i + 1)))
 
-  override def dispatch(contract: LoopContract[Pre]): LoopContract[Post] = (currentLoop.topOption, contract) match {
-    case (Some(loop), inv: LoopInvariant[Pre]) =>
-      implicit val o = contract.o
-      inv.rewrite(invariant = dispatch(inv.invariant) &* allEqual(loop.guards.map(rewriteGuard)))
-    case (Some(loop), inv @ IterationContract(requires, ensures, _)) =>
-      implicit val o = contract.o
-      inv.rewrite(
-        requires = dispatch(requires) &* allEqual(loop.guards.map(rewriteGuard)),
-        ensures = dispatch(ensures) &* allEqual(loop.guards.map(rewriteGuard)))
-    case _ => rewriteDefault(contract)
-  }
+  override def dispatch(contract: LoopContract[Pre]): LoopContract[Post] =
+    (currentLoop.topOption, contract) match {
+      case (Some(loop), inv: LoopInvariant[Pre]) =>
+        implicit val o = contract.o
+        inv.rewrite(invariant =
+          dispatch(inv.invariant) &* allEqual(loop.guards.map(rewriteGuard))
+        )
+      case (Some(loop), inv @ IterationContract(requires, ensures, _)) =>
+        implicit val o = contract.o
+        inv.rewrite(
+          requires =
+            dispatch(requires) &* allEqual(loop.guards.map(rewriteGuard)),
+          ensures = dispatch(ensures) &* allEqual(loop.guards.map(rewriteGuard)),
+        )
+      case _ => rewriteDefault(contract)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/veymont/EncodeChoreography.scala b/src/rewrite/vct/rewrite/veymont/EncodeChoreography.scala
index a940f80f3b..76f4f9513c 100644
--- a/src/rewrite/vct/rewrite/veymont/EncodeChoreography.scala
+++ b/src/rewrite/vct/rewrite/veymont/EncodeChoreography.scala
@@ -2,13 +2,78 @@ package vct.rewrite.veymont
 
 import com.typesafe.scalalogging.LazyLogging
 import hre.util.ScopedStack
-import vct.col.ast.{Assert, Assign, Block, ChorPerm, ChorRun, ChorStatement, Choreography, Class, Communicate, CommunicateStatement, Declaration, Deref, Endpoint, EndpointName, Eval, Expr, InstanceMethod, Local, LocalDecl, MethodInvocation, Message, Node, Perm, Procedure, Receiver, Scope, Sender, Statement, TClass, TVoid, ThisChoreography, Variable}
-import vct.col.origin.{AssertFailed, AssignFailed, AssignLocalOk, Blame, CallableFailure, ChorAssignFailure, ContextEverywhereFailedInPost, ContextEverywhereFailedInPre, ContractedFailure, DiagnosticOrigin, EndpointContextEverywhereFailedInPre, EndpointPreconditionFailed, ExceptionNotInSignals, InsufficientPermission, InvocationFailure, Origin, PanicBlame, ParticipantsNotDistinct, PostconditionFailed, PreconditionFailed, SeqAssignInsufficientPermission, SeqCallableFailure, SeqRunContextEverywhereFailedInPre, SeqRunPreconditionFailed, SignalsFailed, TerminationMeasureFailed, VerificationFailure}
+import vct.col.ast.{
+  Assert,
+  Assign,
+  Block,
+  ChorPerm,
+  ChorRun,
+  ChorStatement,
+  Choreography,
+  Class,
+  Communicate,
+  CommunicateStatement,
+  Declaration,
+  Deref,
+  Endpoint,
+  EndpointName,
+  Eval,
+  Expr,
+  InstanceMethod,
+  Local,
+  LocalDecl,
+  MethodInvocation,
+  Message,
+  Node,
+  Perm,
+  Procedure,
+  Receiver,
+  Scope,
+  Sender,
+  Statement,
+  TClass,
+  TVoid,
+  ThisChoreography,
+  Variable,
+}
+import vct.col.origin.{
+  AssertFailed,
+  AssignFailed,
+  AssignLocalOk,
+  Blame,
+  CallableFailure,
+  ChorAssignFailure,
+  ContextEverywhereFailedInPost,
+  ContextEverywhereFailedInPre,
+  ContractedFailure,
+  DiagnosticOrigin,
+  EndpointContextEverywhereFailedInPre,
+  EndpointPreconditionFailed,
+  ExceptionNotInSignals,
+  InsufficientPermission,
+  InvocationFailure,
+  Origin,
+  PanicBlame,
+  ParticipantsNotDistinct,
+  PostconditionFailed,
+  PreconditionFailed,
+  SeqAssignInsufficientPermission,
+  SeqCallableFailure,
+  SeqRunContextEverywhereFailedInPre,
+  SeqRunPreconditionFailed,
+  SignalsFailed,
+  TerminationMeasureFailed,
+  VerificationFailure,
+}
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 import vct.col.util.AstBuildHelpers._
 import vct.col.util.SuccessionMap
 import vct.result.VerificationError.{Unreachable, UserError}
-import EncodeChoreography.{AssertFailedToParticipantsNotDistinct, AssignFailedToSeqAssignFailure, CallableFailureToSeqCallableFailure}
+import EncodeChoreography.{
+  AssertFailedToParticipantsNotDistinct,
+  AssignFailedToSeqAssignFailure,
+  CallableFailureToSeqCallableFailure,
+}
 import vct.col.ref.Ref
 import vct.rewrite.veymont
 
@@ -20,12 +85,15 @@ object EncodeChoreography extends RewriterBuilder {
 
   object SignalsAlwaysEmpty extends PanicBlame("signals always empty")
 
-  case class CallableFailureToSeqCallableFailure(seqBlame: Blame[SeqCallableFailure]) extends Blame[CallableFailure] {
-    override def blame(error: CallableFailure): Unit = error match {
-      case failure: SeqCallableFailure => seqBlame.blame(failure)
-      case SignalsFailed(failure, node) => SignalsAlwaysEmpty.blame(error)
-      case ExceptionNotInSignals(node) => SignalsAlwaysEmpty.blame(error)
-    }
+  case class CallableFailureToSeqCallableFailure(
+      seqBlame: Blame[SeqCallableFailure]
+  ) extends Blame[CallableFailure] {
+    override def blame(error: CallableFailure): Unit =
+      error match {
+        case failure: SeqCallableFailure => seqBlame.blame(failure)
+        case SignalsFailed(failure, node) => SignalsAlwaysEmpty.blame(error)
+        case ExceptionNotInSignals(node) => SignalsAlwaysEmpty.blame(error)
+      }
   }
 
 //  case class InsufficientPermissionToAccessFailure(access: Access[_]) extends Blame[VerificationFailure] {
@@ -38,31 +106,44 @@ object EncodeChoreography extends RewriterBuilder {
 //    }
 //  }
 
-  case class AssignFailedToSeqAssignFailure(assign: ChorStatement[_]) extends Blame[AssignFailed] {
+  case class AssignFailedToSeqAssignFailure(assign: ChorStatement[_])
+      extends Blame[AssignFailed] {
     override def blame(error: AssignFailed): Unit =
       assign.blame.blame(SeqAssignInsufficientPermission(assign))
   }
 
   case class ToSeqRunFailure(run: ChorRun[_]) extends Blame[InvocationFailure] {
-    override def blame(error: InvocationFailure): Unit = error match {
-      case PreconditionFailed(path, failure, node) => run.blame.blame(SeqRunPreconditionFailed(path, failure, run))
-      case ContextEverywhereFailedInPre(failure, node) => run.blame.blame(SeqRunContextEverywhereFailedInPre(failure, run))
-    }
+    override def blame(error: InvocationFailure): Unit =
+      error match {
+        case PreconditionFailed(path, failure, node) =>
+          run.blame.blame(SeqRunPreconditionFailed(path, failure, run))
+        case ContextEverywhereFailedInPre(failure, node) =>
+          run.blame.blame(SeqRunContextEverywhereFailedInPre(failure, run))
+      }
   }
 
-  case class InvocationFailureToEndpointFailure(endpoint: Endpoint[_]) extends Blame[InvocationFailure] {
-    override def blame(error: InvocationFailure): Unit = error match {
-      case PreconditionFailed(path, failure, _) => endpoint.blame.blame(EndpointPreconditionFailed(path, failure, endpoint))
-      case ContextEverywhereFailedInPre(failure, _) => endpoint.blame.blame(EndpointContextEverywhereFailedInPre(failure, endpoint))
-    }
+  case class InvocationFailureToEndpointFailure(endpoint: Endpoint[_])
+      extends Blame[InvocationFailure] {
+    override def blame(error: InvocationFailure): Unit =
+      error match {
+        case PreconditionFailed(path, failure, _) =>
+          endpoint.blame
+            .blame(EndpointPreconditionFailed(path, failure, endpoint))
+        case ContextEverywhereFailedInPre(failure, _) =>
+          endpoint.blame
+            .blame(EndpointContextEverywhereFailedInPre(failure, endpoint))
+      }
   }
 
-  case class AssertFailedToParticipantsNotDistinct(comm: Communicate[_]) extends Blame[AssertFailed] {
-    override def blame(error: AssertFailed): Unit = comm.blame.blame(ParticipantsNotDistinct(comm))
+  case class AssertFailedToParticipantsNotDistinct(comm: Communicate[_])
+      extends Blame[AssertFailed] {
+    override def blame(error: AssertFailed): Unit =
+      comm.blame.blame(ParticipantsNotDistinct(comm))
   }
 }
 
-case class EncodeChoreography[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging {
+case class EncodeChoreography[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
   import EncodeChoreography._
 
   val currentProg: ScopedStack[Choreography[Pre]] = ScopedStack()
@@ -74,196 +155,284 @@ case class EncodeChoreography[Pre <: Generation]() extends Rewriter[Pre] with La
   case object Top extends Mode
   case class InProg(prog: Choreography[Pre]) extends Mode
   case class InRun(prog: Choreography[Pre], run: ChorRun[Pre]) extends Mode
-  case class InMethod(prog: Choreography[Pre], method: InstanceMethod[Pre]) extends Mode
-
-  def mode: Mode = (currentProg.topOption, currentRun.topOption, currentInstanceMethod.topOption) match {
-    case (None, None, None) => Top
-    case (Some(prog), None, None) => InProg(prog)
-    case (Some(prog), Some(run), None) => InRun(prog, run)
-    case (Some(prog), None, Some(method)) => InMethod(prog, method)
-    case (None, None, Some(_)) => Top
-    case (_, _, _) => throw Unreachable("AST structure should prevent this case")
-  }
+  case class InMethod(prog: Choreography[Pre], method: InstanceMethod[Pre])
+      extends Mode
+
+  def mode: Mode =
+    (
+      currentProg.topOption,
+      currentRun.topOption,
+      currentInstanceMethod.topOption,
+    ) match {
+      case (None, None, None) => Top
+      case (Some(prog), None, None) => InProg(prog)
+      case (Some(prog), Some(run), None) => InRun(prog, run)
+      case (Some(prog), None, Some(method)) => InMethod(prog, method)
+      case (None, None, Some(_)) => Top
+      case (_, _, _) =>
+        throw Unreachable("AST structure should prevent this case")
+    }
 
   val runSucc: mut.Map[ChorRun[Pre], Procedure[Post]] = mut.LinkedHashMap()
-  val progSucc: SuccessionMap[Choreography[Pre], Procedure[Post]] = SuccessionMap()
-  val methodSucc: SuccessionMap[InstanceMethod[Pre], Procedure[Post]] = SuccessionMap()
-  val endpointSucc: SuccessionMap[(Mode, Endpoint[Pre]), Variable[Post]] = SuccessionMap()
-  val variableSucc: SuccessionMap[(Mode, Variable[Pre]), Variable[Post]] = SuccessionMap()
+  val progSucc: SuccessionMap[Choreography[Pre], Procedure[Post]] =
+    SuccessionMap()
+  val methodSucc: SuccessionMap[InstanceMethod[Pre], Procedure[Post]] =
+    SuccessionMap()
+  val endpointSucc: SuccessionMap[(Mode, Endpoint[Pre]), Variable[Post]] =
+    SuccessionMap()
+  val variableSucc: SuccessionMap[(Mode, Variable[Pre]), Variable[Post]] =
+    SuccessionMap()
   val msgSucc: SuccessionMap[Communicate[Pre], Variable[Post]] = SuccessionMap()
 
-  override def dispatch(decl: Declaration[Pre]): Unit = (mode, decl) match {
-    case (Top, prog: Choreography[Pre]) => currentProg.having(prog) {
-      // First generate a procedure that implements the run method
-      rewriteRun(prog)
-
-      // And also process all auxiliary instance methods
-      prog.decls.foreach(dispatch)
-
-      // Then generate a procedure that initializes all the endpoints and calls the run procedure
-      // First set up the succesor variables that will be encoding the seq_program argument and endpoints
-      implicit val o = prog.o
-      prog.endpoints.foreach(_.drop())
-      for (endpoint <- prog.endpoints) {
-        endpointSucc((mode, endpoint)) = new Variable(dispatch(endpoint.t))(endpoint.o)
-      }
-
-      // Maintain successor for seq_prog argument variables manually, as two contexts are maintained
-      // The main procedure context and run procedure contex
-      prog.params.foreach(_.drop())
-      for(arg <- prog.params) {
-        variableSucc((mode, arg)) = new Variable(dispatch(arg.t))(arg.o)
-      }
-
-      // For each endpoint, make a local variable and initialize it using the constructor referenced in the endpoint
-      val endpointsInit = prog.endpoints.map { endpoint =>
-        Assign(Local[Post](endpointSucc((mode, endpoint)).ref),
-          constructorInvocation[Post](
-            classTypeArgs = endpoint.typeArgs.map(dispatch),
-            ref = succ(endpoint.constructor.decl),
-            args = endpoint.args.map(dispatch),
-            blame = InvocationFailureToEndpointFailure(endpoint)
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    (mode, decl) match {
+      case (Top, prog: Choreography[Pre]) =>
+        currentProg.having(prog) {
+          // First generate a procedure that implements the run method
+          rewriteRun(prog)
+
+          // And also process all auxiliary instance methods
+          prog.decls.foreach(dispatch)
+
+          // Then generate a procedure that initializes all the endpoints and calls the run procedure
+          // First set up the succesor variables that will be encoding the seq_program argument and endpoints
+          implicit val o = prog.o
+          prog.endpoints.foreach(_.drop())
+          for (endpoint <- prog.endpoints) {
+            endpointSucc((mode, endpoint)) =
+              new Variable(dispatch(endpoint.t))(endpoint.o)
+          }
+
+          // Maintain successor for seq_prog argument variables manually, as two contexts are maintained
+          // The main procedure context and run procedure contex
+          prog.params.foreach(_.drop())
+          for (arg <- prog.params) {
+            variableSucc((mode, arg)) = new Variable(dispatch(arg.t))(arg.o)
+          }
+
+          // For each endpoint, make a local variable and initialize it using the constructor referenced in the endpoint
+          val endpointsInit = prog.endpoints.map { endpoint =>
+            Assign(
+              Local[Post](endpointSucc((mode, endpoint)).ref),
+              constructorInvocation[Post](
+                classTypeArgs = endpoint.typeArgs.map(dispatch),
+                ref = succ(endpoint.constructor.decl),
+                args = endpoint.args.map(dispatch),
+                blame = InvocationFailureToEndpointFailure(endpoint),
+              ),
+            )(AssignLocalOk)
+          }
+
+          // Invoke the run procedure with the seq_program arguments, as well as all the endpoints
+          val invokeRun = Eval(procedureInvocation[Post](
+            ref = runSucc(prog.run).ref,
+            args =
+              prog.params
+                .map(arg => Local[Post](variableSucc((mode, arg)).ref)) ++
+                prog.endpoints.map(endpoint =>
+                  Local[Post](endpointSucc((mode, endpoint)).ref)
+                ),
+            blame = ToSeqRunFailure(prog.run),
+          ))
+
+          // Scope the endpoint vars and combine initialization and run method invocation
+          val body = Scope(
+            prog.endpoints.map(endpoint => endpointSucc((mode, endpoint))),
+            Block(endpointsInit :+ invokeRun),
           )
-        )(AssignLocalOk)
-      }
-
-      // Invoke the run procedure with the seq_program arguments, as well as all the endpoints
-      val invokeRun = Eval(procedureInvocation[Post](
-        ref = runSucc(prog.run).ref,
-        args = prog.params.map(arg => Local[Post](variableSucc((mode, arg)).ref)) ++
-          prog.endpoints.map(endpoint => Local[Post](endpointSucc((mode, endpoint)).ref)),
-        blame = ToSeqRunFailure(prog.run)
-      ))
-
-      // Scope the endpoint vars and combine initialization and run method invocation
-      val body = Scope(
-        prog.endpoints.map(endpoint => endpointSucc((mode, endpoint))),
-        Block(endpointsInit :+ invokeRun)
-      )
 
-      progSucc(prog) = globalDeclarations.declare(new Procedure(
-        returnType = TVoid(), outArgs = Seq(), typeArgs = Seq(),
-        args = prog.params.map(arg => variableSucc((mode, arg))),
-        contract = dispatch(prog.contract),
-        body = Some(body)
-      )(CallableFailureToSeqCallableFailure(prog.blame)))
-    }
-
-    case (InProg(prog), method: InstanceMethod[Pre]) => currentInstanceMethod.having(method) {
-      for (endpoint <- prog.endpoints) {
-        endpointSucc((mode, endpoint)) = new Variable(TClass(succ[Class[Post]](endpoint.cls.decl), Seq()))(endpoint.o)
-      }
-
-      prog.params.foreach(_.drop())
-      for (arg <- prog.params) {
-        variableSucc((mode, arg)) = new Variable(dispatch(arg.t))(arg.o)
-      }
+          progSucc(prog) = globalDeclarations.declare(
+            new Procedure(
+              returnType = TVoid(),
+              outArgs = Seq(),
+              typeArgs = Seq(),
+              args = prog.params.map(arg => variableSucc((mode, arg))),
+              contract = dispatch(prog.contract),
+              body = Some(body),
+            )(CallableFailureToSeqCallableFailure(prog.blame))
+          )
+        }
+
+      case (InProg(prog), method: InstanceMethod[Pre]) =>
+        currentInstanceMethod.having(method) {
+          for (endpoint <- prog.endpoints) {
+            endpointSucc((mode, endpoint)) =
+              new Variable(TClass(succ[Class[Post]](endpoint.cls.decl), Seq()))(
+                endpoint.o
+              )
+          }
+
+          prog.params.foreach(_.drop())
+          for (arg <- prog.params) {
+            variableSucc((mode, arg)) = new Variable(dispatch(arg.t))(arg.o)
+          }
+
+          methodSucc(method) = globalDeclarations.declare(
+            new Procedure(
+              args =
+                prog.params.map(arg => variableSucc((mode, arg))) ++
+                  prog.endpoints
+                    .map(endpoint => endpointSucc((mode, endpoint))),
+              body = method.body.map(dispatch),
+              outArgs = Nil,
+              typeArgs = Nil,
+              returnType = dispatch(method.returnType),
+              contract = dispatch(method.contract),
+            )(method.blame)(method.o)
+          )
+        }
 
-      methodSucc(method) = globalDeclarations.declare(new Procedure(
-        args = prog.params.map(arg => variableSucc((mode, arg))) ++
-          prog.endpoints.map(endpoint => endpointSucc((mode, endpoint))),
-        body = method.body.map(dispatch),
-        outArgs = Nil, typeArgs = Nil, returnType = dispatch(method.returnType), contract = dispatch(method.contract)
-      )(method.blame)(method.o))
+      case _ => rewriteDefault(decl)
     }
 
-    case _ => rewriteDefault(decl)
-  }
-
   def rewriteRun(prog: Choreography[Pre]): Unit = {
     val run = prog.run
-    implicit val o: Origin = run.o.where(name = currentProg.top.o.getPreferredNameOrElse().snake + "_run")
+    implicit val o: Origin = run.o
+      .where(name = currentProg.top.o.getPreferredNameOrElse().snake + "_run")
 
     currentRun.having(run) {
       for (endpoint <- prog.endpoints) {
-        endpointSucc((mode, endpoint)) = new Variable(dispatch(endpoint.t))(endpoint.o)
+        endpointSucc((mode, endpoint)) =
+          new Variable(dispatch(endpoint.t))(endpoint.o)
       }
 
       for (arg <- prog.params) {
         variableSucc((mode, arg)) = new Variable(dispatch(arg.t))(arg.o)
       }
 
-      runSucc(run) = globalDeclarations.declare(new Procedure(
-        args = prog.params.map(arg => variableSucc((mode, arg))) ++
-          prog.endpoints.map(endpoint => endpointSucc((mode, endpoint))),
-        contract = dispatch(run.contract),
-        body = Some(dispatch(run.body)),
-        outArgs = Seq(), typeArgs = Seq(),
-        returnType = TVoid(),
-      )(CallableFailureToSeqCallableFailure(run.blame)))
+      runSucc(run) = globalDeclarations.declare(
+        new Procedure(
+          args =
+            prog.params.map(arg => variableSucc((mode, arg))) ++
+              prog.endpoints.map(endpoint => endpointSucc((mode, endpoint))),
+          contract = dispatch(run.contract),
+          body = Some(dispatch(run.body)),
+          outArgs = Seq(),
+          typeArgs = Seq(),
+          returnType = TVoid(),
+        )(CallableFailureToSeqCallableFailure(run.blame))
+      )
     }
   }
 
-  override def dispatch(stat: Statement[Pre]): Statement[Post] = stat match {
-    case assign@ChorStatement(None, Assign(target, e)) =>
-      throw new Exception(assign.o.messageInContext("ChorStatement with None!"))
-    case assign@ChorStatement(Some(Ref(endpoint)), Assign(target, e)) =>
-      logger.warn(s"Ignoring endpoint annotation on chor assign statement ${assign.o.shortPosition.map("at " + _).getOrElse("")}")
-      implicit val o = assign.o
-      if (endpoint != InferEndpointContexts.getEndpoint(target)) {
-        throw new Exception(assign.o.messageInContext("Assign endpoint in value does not match endpoint that was annotated or inferred"))
-      }
-      Assign(dispatch(target), dispatch(e))(AssignFailedToSeqAssignFailure(assign))
-    case CommunicateStatement(comm: Communicate[Pre]) =>
-      implicit val o = comm.o
-      val Some(Ref(receiver)) = comm.receiver
-      val Some(Ref(sender)) = comm.sender
-      if (InferEndpointContexts.getEndpoint(comm.target) != receiver || InferEndpointContexts.getEndpoint(comm.msg) != sender) {
-        throw new Exception(comm.o.messageInContext("sender/receiver does not match message/target"))
-      }
+  override def dispatch(stat: Statement[Pre]): Statement[Post] =
+    stat match {
+      case assign @ ChorStatement(None, Assign(target, e)) =>
+        throw new Exception(
+          assign.o.messageInContext("ChorStatement with None!")
+        )
+      case assign @ ChorStatement(Some(Ref(endpoint)), Assign(target, e)) =>
+        logger
+          .warn(s"Ignoring endpoint annotation on chor assign statement ${assign
+              .o.shortPosition.map("at " + _).getOrElse("")}")
+        implicit val o = assign.o
+        if (endpoint != InferEndpointContexts.getEndpoint(target)) {
+          throw new Exception(assign.o.messageInContext(
+            "Assign endpoint in value does not match endpoint that was annotated or inferred"
+          ))
+        }
+        Assign(dispatch(target), dispatch(e))(AssignFailedToSeqAssignFailure(
+          assign
+        ))
+      case CommunicateStatement(comm: Communicate[Pre]) =>
+        implicit val o = comm.o
+        val Some(Ref(receiver)) = comm.receiver
+        val Some(Ref(sender)) = comm.sender
+        if (
+          InferEndpointContexts.getEndpoint(comm.target) != receiver ||
+          InferEndpointContexts.getEndpoint(comm.msg) != sender
+        ) {
+          throw new Exception(
+            comm.o
+              .messageInContext("sender/receiver does not match message/target")
+          )
+        }
 
-      val equalityTest: Statement[Post] =
-        if(receiver.t == sender.t)
-          Assert[Post](endpointSucc((mode, receiver)).get !== endpointSucc((mode, sender)).get
+        val equalityTest: Statement[Post] =
+          if (receiver.t == sender.t)
+            Assert[Post](
+              endpointSucc((mode, receiver)).get !==
+                endpointSucc((mode, sender)).get
             )(AssertFailedToParticipantsNotDistinct(comm))
-        else
-          Block(Nil)
-
-      msgSucc(comm) = new Variable(dispatch(comm.msg.t))(comm.o.where(name = "msg"))
-
-      Scope(Seq(msgSucc(comm)), Block(Seq(
-        equalityTest,
-        // Assign to msg,
-        Assign(msgSucc(comm).get, dispatch(comm.msg))(PanicBlame("Should be safe")),
-        // Assert channel invariant over msg, sender, receiver
-        Assert(currentCommunicate.having(comm) { dispatch(comm.invariant) })(PanicBlame("Channel invariant assert failed")),
-        Assign[Post](dispatch(comm.target), msgSucc(comm).get)(PanicBlame("TODO: Assignment from communicate failed"))
-      )))
-    case CommunicateStatement(comm: Communicate[Pre]) =>
-      throw new Exception(comm.o.messageInContext("Either the sender or receiver was not annotated for or not inferred!"))
-    case ChorStatement(_, stat) => dispatch(stat)
-    case stat => rewriteDefault(stat)
-  }
+          else
+            Block(Nil)
+
+        msgSucc(comm) =
+          new Variable(dispatch(comm.msg.t))(comm.o.where(name = "msg"))
+
+        Scope(
+          Seq(msgSucc(comm)),
+          Block(Seq(
+            equalityTest,
+            // Assign to msg,
+            Assign(msgSucc(comm).get, dispatch(comm.msg))(PanicBlame(
+              "Should be safe"
+            )),
+            // Assert channel invariant over msg, sender, receiver
+            Assert(currentCommunicate.having(comm) {
+              dispatch(comm.invariant)
+            })(PanicBlame("Channel invariant assert failed")),
+            Assign[Post](dispatch(comm.target), msgSucc(comm).get)(PanicBlame(
+              "TODO: Assignment from communicate failed"
+            )),
+          )),
+        )
+      case CommunicateStatement(comm: Communicate[Pre]) =>
+        throw new Exception(comm.o.messageInContext(
+          "Either the sender or receiver was not annotated for or not inferred!"
+        ))
+      case ChorStatement(_, stat) => dispatch(stat)
+      case stat => rewriteDefault(stat)
+    }
 
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = (mode, expr) match {
-    case (mode, EndpointName(Ref(endpoint))) =>
-      endpointSucc((mode, endpoint)).get(expr.o)
-    case (mode, Local(Ref(v))) if mode != Top && currentProg.top.params.contains(v) =>
-      variableSucc((mode, v)).get(expr.o)
-    case (mode, invocation @ MethodInvocation(ThisChoreography(_), Ref(method), args, _, _, _, _)) if mode != Top =>
-      implicit val o = invocation.o
-      val prog = currentProg.top
-      assert(args.isEmpty)
-      procedureInvocation(
-        ref = methodSucc.ref(method),
-        args = prog.params.map(arg => Local[Post](variableSucc.ref((mode, arg)))(arg.o)) ++
-          prog.endpoints.map(endpoint => Local[Post](endpointSucc.ref((mode, endpoint)))(invocation.o)),
-        blame = invocation.blame
-      )
-    case (mode, p @ ChorPerm(Ref(endpoint), loc, perm)) =>
-      if (endpoint != InferEndpointContexts.getEndpoint(loc)) {
-        throw new Exception(p.o.messageInContext("Endpoint in obj does not match inferred/annotated endpoint"))
-      }
-      Perm(dispatch(loc), dispatch(perm))(p.o)
-    case (mode, Sender(Ref(comm))) =>
-      implicit val o = expr.o
-      endpointSucc((mode, comm.sender.get.decl)).get
-    case (mode, Receiver(Ref(comm))) =>
-      implicit val o = expr.o
-      endpointSucc((mode, comm.receiver.get.decl)).get
-    case (mode, Message(Ref(comm))) =>
-      implicit val o = expr.o
-      msgSucc(comm).get
-    case (_, expr) => rewriteDefault(expr)
-  }
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    (mode, expr) match {
+      case (mode, EndpointName(Ref(endpoint))) =>
+        endpointSucc((mode, endpoint)).get(expr.o)
+      case (mode, Local(Ref(v)))
+          if mode != Top && currentProg.top.params.contains(v) =>
+        variableSucc((mode, v)).get(expr.o)
+      case (
+            mode,
+            invocation @ MethodInvocation(
+              ThisChoreography(_),
+              Ref(method),
+              args,
+              _,
+              _,
+              _,
+              _,
+            ),
+          ) if mode != Top =>
+        implicit val o = invocation.o
+        val prog = currentProg.top
+        assert(args.isEmpty)
+        procedureInvocation(
+          ref = methodSucc.ref(method),
+          args =
+            prog.params
+              .map(arg => Local[Post](variableSucc.ref((mode, arg)))(arg.o)) ++
+              prog.endpoints.map(endpoint =>
+                Local[Post](endpointSucc.ref((mode, endpoint)))(invocation.o)
+              ),
+          blame = invocation.blame,
+        )
+      case (mode, p @ ChorPerm(Ref(endpoint), loc, perm)) =>
+        if (endpoint != InferEndpointContexts.getEndpoint(loc)) {
+          throw new Exception(p.o.messageInContext(
+            "Endpoint in obj does not match inferred/annotated endpoint"
+          ))
+        }
+        Perm(dispatch(loc), dispatch(perm))(p.o)
+      case (mode, Sender(Ref(comm))) =>
+        implicit val o = expr.o
+        endpointSucc((mode, comm.sender.get.decl)).get
+      case (mode, Receiver(Ref(comm))) =>
+        implicit val o = expr.o
+        endpointSucc((mode, comm.receiver.get.decl)).get
+      case (mode, Message(Ref(comm))) =>
+        implicit val o = expr.o
+        msgSucc(comm).get
+      case (_, expr) => rewriteDefault(expr)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/veymont/EncodeChoreographyParameters.scala b/src/rewrite/vct/rewrite/veymont/EncodeChoreographyParameters.scala
index be5a987311..e86486d36c 100644
--- a/src/rewrite/vct/rewrite/veymont/EncodeChoreographyParameters.scala
+++ b/src/rewrite/vct/rewrite/veymont/EncodeChoreographyParameters.scala
@@ -2,82 +2,111 @@ package vct.rewrite.veymont
 
 import com.typesafe.scalalogging.LazyLogging
 import hre.util.ScopedStack
-import vct.col.ast.{Block, Choreography, Class, Declaration, Endpoint, EndpointName, Expr, InstanceField, Local, Program, Variable}
+import vct.col.ast.{
+  Block,
+  Choreography,
+  Class,
+  Declaration,
+  Endpoint,
+  EndpointName,
+  Expr,
+  InstanceField,
+  Local,
+  Program,
+  Variable,
+}
 import vct.col.origin.{Name, PanicBlame}
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 import vct.col.util.SuccessionMap
 import vct.col.util.AstBuildHelpers._
 
-
 object EncodeChoreographyParameters extends RewriterBuilder {
   override def key: String = "encodeChoreographyParameters"
-  override def desc: String = "Encode choreography parameters as fields on all endpoint types."
+  override def desc: String =
+    "Encode choreography parameters as fields on all endpoint types."
 }
 
-/**
- * This is a rewrite that encodes choreography parameters as endpoint fields in a separate class. It was abandoned because
- * the connection between parameters and the respective fields in each endpoint class is lost between this pass and the generateImplementation pass.
- * For that reason I decided to move this concern into the GenerateImplementation pass, as all information necessary
- * is available there, at the cost of additional complexity in the rewrite.
- *
- * Can probably be deleted once the veymont artefact is in a finished state.
- */
-case class EncodeChoreographyParameters[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging {
+/** This is a rewrite that encodes choreography parameters as endpoint fields in
+  * a separate class. It was abandoned because the connection between parameters
+  * and the respective fields in each endpoint class is lost between this pass
+  * and the generateImplementation pass. For that reason I decided to move this
+  * concern into the GenerateImplementation pass, as all information necessary
+  * is available there, at the cost of additional complexity in the rewrite.
+  *
+  * Can probably be deleted once the veymont artefact is in a finished state.
+  */
+case class EncodeChoreographyParameters[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
   val currentSeqProg = ScopedStack[Choreography[Pre]]()
 
   var program: Program[Pre] = null
-  lazy val choreographies = program.declarations.collect { case p: Choreography[Pre] => p }
+  lazy val choreographies = program.declarations.collect {
+    case p: Choreography[Pre] => p
+  }
   lazy val allEndpoints = choreographies.flatMap { _.endpoints }
   lazy val endpointOfClass: Map[Class[Pre], Endpoint[Pre]] =
     allEndpoints.map { endpoint => (endpoint.cls.decl, endpoint) }.toMap
-  lazy val choreographyOfEndpoint: Map[Endpoint[Pre], Choreography[Pre]] = choreographies.flatMap { chor =>
-    chor.endpoints.map { ep => (ep, chor) }
-  }.toMap
+  lazy val choreographyOfEndpoint: Map[Endpoint[Pre], Choreography[Pre]] =
+    choreographies.flatMap { chor => chor.endpoints.map { ep => (ep, chor) } }
+      .toMap
 
   // For each endpoint and input variable, there is a unique instance field (on the class of the endpoint)
-  val endpointParamFields = SuccessionMap[(Endpoint[Pre], Variable[Pre]), InstanceField[Post]]()
+  val endpointParamFields =
+    SuccessionMap[(Endpoint[Pre], Variable[Pre]), InstanceField[Post]]()
 
   override def dispatch(p: Program[Pre]): Program[Post] = {
     program = p
     super.dispatch(p)
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case p: Choreography[Pre] =>
-      implicit val o = p.o
-      currentSeqProg.having(p) {
-        allScopes.anySucceed(p, p.rewrite(
-          preRun = {
-            val paramAssigns = p.endpoints.flatMap { endpoint =>
-              p.params.map { param =>
-                assignField[Post](
-                  EndpointName[Post](succ(endpoint)),
-                  endpointParamFields.ref((endpoint, param)),
-                  Local(succ(param)),
-                  blame = PanicBlame("Should be safe")
-                )
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case p: Choreography[Pre] =>
+        implicit val o = p.o
+        currentSeqProg.having(p) {
+          allScopes.anySucceed(
+            p,
+            p.rewrite(preRun = {
+              val paramAssigns = p.endpoints.flatMap { endpoint =>
+                p.params.map { param =>
+                  assignField[Post](
+                    EndpointName[Post](succ(endpoint)),
+                    endpointParamFields.ref((endpoint, param)),
+                    Local(succ(param)),
+                    blame = PanicBlame("Should be safe"),
+                  )
+                }
               }
-            }
 
-            val preRun = p.preRun.map(s => Seq(dispatch(s))).getOrElse(Seq())
-            Some(Block(preRun ++ paramAssigns))
-          }
-        ))
-      }
-    case cls: Class[Pre] if endpointOfClass.contains(cls) =>
-      val endpoint = endpointOfClass(cls)
-      val chor = choreographyOfEndpoint(endpoint)
-      implicit val o = chor.o
-      val additionFields = chor.params.map { param =>
-        val f = new InstanceField(dispatch(param.t), Seq())(param.o.where(
-          indirect = Name.names(chor.o.getPreferredNameOrElse(), Name("p"), param.o.getPreferredNameOrElse())
-        ))
-        endpointParamFields((endpoint, param)) = f
-        f
-      }
-      allScopes.anySucceed(cls, cls.rewrite(decls = classDeclarations.dispatch(cls.decls) ++ additionFields))
-    case _ => super.dispatch(decl)
-  }
+              val preRun = p.preRun.map(s => Seq(dispatch(s))).getOrElse(Seq())
+              Some(Block(preRun ++ paramAssigns))
+            }),
+          )
+        }
+      case cls: Class[Pre] if endpointOfClass.contains(cls) =>
+        val endpoint = endpointOfClass(cls)
+        val chor = choreographyOfEndpoint(endpoint)
+        implicit val o = chor.o
+        val additionFields = chor.params.map { param =>
+          val f =
+            new InstanceField(dispatch(param.t), Seq())(param.o.where(indirect =
+              Name.names(
+                chor.o.getPreferredNameOrElse(),
+                Name("p"),
+                param.o.getPreferredNameOrElse(),
+              )
+            ))
+          endpointParamFields((endpoint, param)) = f
+          f
+        }
+        allScopes.anySucceed(
+          cls,
+          cls.rewrite(decls =
+            classDeclarations.dispatch(cls.decls) ++ additionFields
+          ),
+        )
+      case _ => super.dispatch(decl)
+    }
 
   override def dispatch(expr: Expr[Pre]): Expr[Post] = ???
 }
diff --git a/src/rewrite/vct/rewrite/veymont/EncodeEndpointInequalities.scala b/src/rewrite/vct/rewrite/veymont/EncodeEndpointInequalities.scala
index 8944bff23e..1e99743752 100644
--- a/src/rewrite/vct/rewrite/veymont/EncodeEndpointInequalities.scala
+++ b/src/rewrite/vct/rewrite/veymont/EncodeEndpointInequalities.scala
@@ -2,69 +2,120 @@ package vct.rewrite.veymont
 
 import com.typesafe.scalalogging.LazyLogging
 import hre.util.ScopedStack
-import vct.col.ast.{ApplicableContract, Choreography, Declaration, Endpoint, EndpointName, Expr, IterationContract, LoopContract, LoopInvariant, Program, SplitAccountedPredicate, UnitAccountedPredicate}
-import vct.col.origin.{AssertFailed, Blame, BranchUnanimityFailed, LoopUnanimityNotEstablished, LoopUnanimityNotMaintained, Origin}
+import vct.col.ast.{
+  ApplicableContract,
+  Choreography,
+  Declaration,
+  Endpoint,
+  EndpointName,
+  Expr,
+  IterationContract,
+  LoopContract,
+  LoopInvariant,
+  Program,
+  SplitAccountedPredicate,
+  UnitAccountedPredicate,
+}
+import vct.col.origin.{
+  AssertFailed,
+  Blame,
+  BranchUnanimityFailed,
+  LoopUnanimityNotEstablished,
+  LoopUnanimityNotMaintained,
+  Origin,
+}
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 import vct.col.util.AstBuildHelpers._
 import vct.col.util.SuccessionMap
 import vct.result.VerificationError.UserError
-import vct.rewrite.veymont.EncodeChorBranchUnanimity.{ForwardBranchUnanimity, ForwardLoopUnanimityNotEstablished, ForwardLoopUnanimityNotMaintained}
+import vct.rewrite.veymont.EncodeChorBranchUnanimity.{
+  ForwardBranchUnanimity,
+  ForwardLoopUnanimityNotEstablished,
+  ForwardLoopUnanimityNotMaintained,
+}
 import vct.col.util.AstBuildHelpers._
 import vct.result.VerificationError
 
 import scala.collection.mutable
 
-
 object EncodeEndpointInequalities extends RewriterBuilder {
   override def key: String = "encodeEndpointInequalities"
-  override def desc: String = "Encodes inequalities of endpoints in contracts and loop invariants within choreographies"
+  override def desc: String =
+    "Encodes inequalities of endpoints in contracts and loop invariants within choreographies"
 }
 
-case class EncodeEndpointInequalities[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging with VeymontContext[Pre]  {
+case class EncodeEndpointInequalities[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging with VeymontContext[Pre] {
 
   val inequalityMap = mutable.LinkedHashMap[Choreography[Pre], Expr[Post]]()
-  def currentInequality: Expr[Post] = inequalityMap.getOrElseUpdate(currentChoreography.top, makeInequalities(currentChoreography.top))
+  def currentInequality: Expr[Post] =
+    inequalityMap.getOrElseUpdate(
+      currentChoreography.top,
+      makeInequalities(currentChoreography.top),
+    )
   def makeInequalities(chor: Choreography[Pre]): Expr[Post] = {
     // Computation of the inequality expression is done lazily such that when it is computed within a choreography,
     // the endpoints are in scope and their successors will be available to `succ`.
-    def makeInequalitySets(endpoints: Seq[Endpoint[Pre]]): Seq[(Endpoint[Pre], Seq[Endpoint[Pre]])] = endpoints match {
-      case xs if xs.length <= 1 => Seq()
-      case endpoint +: targets =>
-        (endpoint, targets) +: makeInequalitySets(targets)
-    }
+    def makeInequalitySets(
+        endpoints: Seq[Endpoint[Pre]]
+    ): Seq[(Endpoint[Pre], Seq[Endpoint[Pre]])] =
+      endpoints match {
+        case xs if xs.length <= 1 => Seq()
+        case endpoint +: targets =>
+          (endpoint, targets) +: makeInequalitySets(targets)
+      }
     implicit val o = chor.o
-    foldStar(makeInequalitySets(chor.endpoints).flatMap { case (endpoint, others) =>
-      others.map { other =>
-        EndpointName[Post](succ(endpoint)) !== EndpointName[Post](succ(other))
+    foldStar(
+      makeInequalitySets(chor.endpoints).flatMap { case (endpoint, others) =>
+        others.map { other =>
+          EndpointName[Post](succ(endpoint)) !== EndpointName[Post](succ(other))
+        }
       }
-    })
+    )
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case chor: Choreography[Pre] => currentChoreography.having(chor) {
-      globalDeclarations.succeed(chor, chor.rewrite(contract = chor.contract.rewriteDefault()))
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case chor: Choreography[Pre] =>
+        currentChoreography.having(chor) {
+          globalDeclarations.succeed(
+            chor,
+            chor.rewrite(contract = chor.contract.rewriteDefault()),
+          )
+        }
+      case _ => super.dispatch(decl)
     }
-    case _ => super.dispatch(decl)
-  }
 
-  override def dispatch(contract: ApplicableContract[Pre]): ApplicableContract[Post] = contract match {
-    case InChor(_, contract) =>
-      implicit val o = contract.o
-      contract.rewrite(
-        requires = SplitAccountedPredicate(UnitAccountedPredicate(currentInequality), dispatch(contract.requires)),
-        ensures = SplitAccountedPredicate(UnitAccountedPredicate(currentInequality), dispatch(contract.ensures)))
-    case _ => super.dispatch(contract)
-  }
-  
-  override def dispatch(contract: LoopContract[Pre]): LoopContract[Post] = contract match {
-    case InChor(_, inv: LoopInvariant[Pre]) =>
-      implicit val o = contract.o
-      inv.rewrite(currentInequality &* dispatch(inv.invariant))
-    case InChor(_, contract: IterationContract[Pre]) =>
-      implicit val o = contract.o
-      contract.rewrite(
-        requires = currentInequality &* dispatch(contract.requires),
-        ensures = currentInequality &* dispatch(contract.ensures))
-    case _ => super.dispatch(contract)
-  }
+  override def dispatch(
+      contract: ApplicableContract[Pre]
+  ): ApplicableContract[Post] =
+    contract match {
+      case InChor(_, contract) =>
+        implicit val o = contract.o
+        contract.rewrite(
+          requires = SplitAccountedPredicate(
+            UnitAccountedPredicate(currentInequality),
+            dispatch(contract.requires),
+          ),
+          ensures = SplitAccountedPredicate(
+            UnitAccountedPredicate(currentInequality),
+            dispatch(contract.ensures),
+          ),
+        )
+      case _ => super.dispatch(contract)
+    }
+
+  override def dispatch(contract: LoopContract[Pre]): LoopContract[Post] =
+    contract match {
+      case InChor(_, inv: LoopInvariant[Pre]) =>
+        implicit val o = contract.o
+        inv.rewrite(currentInequality &* dispatch(inv.invariant))
+      case InChor(_, contract: IterationContract[Pre]) =>
+        implicit val o = contract.o
+        contract.rewrite(
+          requires = currentInequality &* dispatch(contract.requires),
+          ensures = currentInequality &* dispatch(contract.ensures),
+        )
+      case _ => super.dispatch(contract)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/veymont/EncodeUnpointedGuard.scala b/src/rewrite/vct/rewrite/veymont/EncodeUnpointedGuard.scala
index ce1049d3c3..b8b9ab68b7 100644
--- a/src/rewrite/vct/rewrite/veymont/EncodeUnpointedGuard.scala
+++ b/src/rewrite/vct/rewrite/veymont/EncodeUnpointedGuard.scala
@@ -14,48 +14,50 @@ import scala.collection.immutable.ListSet
 
 object EncodeUnpointedGuard extends RewriterBuilder {
   override def key: String = "encodeUnpointedGuard"
-  override def desc: String = "Encodes unpointed guard by duplicating the condition to all guards currently participating"
+  override def desc: String =
+    "Encodes unpointed guard by duplicating the condition to all guards currently participating"
 }
 
 case class EncodeUnpointedGuard[Pre <: Generation]() extends Rewriter[Pre] {
   val currentParticipants: ScopedStack[ListSet[Endpoint[Pre]]] = ScopedStack()
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case prog: Choreography[Pre] => currentParticipants.having(ListSet.from(prog.endpoints)) {
-      rewriteDefault(prog)
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case prog: Choreography[Pre] =>
+        currentParticipants.having(ListSet.from(prog.endpoints)) {
+          rewriteDefault(prog)
+        }
+
+      case decl => rewriteDefault(decl)
+    }
+
+  override def dispatch(statement: Statement[Pre]): Statement[Post] =
+    statement match {
+      case branch: ChorBranch[Pre] =>
+        val newParticipants =
+          if (branch.hasUnpointed) { currentParticipants.top }
+          else { ListSet.from(branch.participants) }
+        currentParticipants.having(newParticipants) {
+          branch.rewrite(guards = branch.guards.flatMap(rewriteGuard))
+        }
+
+      case loop: ChorLoop[Pre] =>
+        val newParticipants =
+          if (loop.hasUnpointed) { currentParticipants.top }
+          else { ListSet.from(loop.participants) }
+        currentParticipants.having(newParticipants) {
+          loop.rewrite(guards = loop.guards.flatMap(rewriteGuard))
+        }
+
+      case statement => rewriteDefault(statement)
     }
 
-    case decl => rewriteDefault(decl)
-  }
-
-  override def dispatch(statement: Statement[Pre]): Statement[Post] = statement match {
-    case branch: ChorBranch[Pre] =>
-      val newParticipants = if (branch.hasUnpointed) {
-        currentParticipants.top
-      } else {
-        ListSet.from(branch.participants)
-      }
-      currentParticipants.having(newParticipants) {
-        branch.rewrite(guards = branch.guards.flatMap(rewriteGuard))
-      }
-
-    case loop: ChorLoop[Pre] =>
-      val newParticipants = if (loop.hasUnpointed) {
-        currentParticipants.top
-      } else {
-        ListSet.from(loop.participants)
-      }
-      currentParticipants.having(newParticipants) {
-        loop.rewrite(guards = loop.guards.flatMap(rewriteGuard))
-      }
-
-    case statement => rewriteDefault(statement)
-  }
-
-  def rewriteGuard(guard: ChorGuard[Pre]): Seq[ChorGuard[Post]] = guard match {
-    case guard: EndpointGuard[Pre] => Seq(guard.rewriteDefault())
-    case UnpointedGuard(expr) => currentParticipants.top.map { endpoint =>
-      EndpointGuard[Post](succ(endpoint), dispatch(expr))(guard.o)
-    }.toSeq
-  }
+  def rewriteGuard(guard: ChorGuard[Pre]): Seq[ChorGuard[Post]] =
+    guard match {
+      case guard: EndpointGuard[Pre] => Seq(guard.rewriteDefault())
+      case UnpointedGuard(expr) =>
+        currentParticipants.top.map { endpoint =>
+          EndpointGuard[Post](succ(endpoint), dispatch(expr))(guard.o)
+        }.toSeq
+    }
 }
diff --git a/src/rewrite/vct/rewrite/veymont/GenerateChoreographyPermissions.scala b/src/rewrite/vct/rewrite/veymont/GenerateChoreographyPermissions.scala
index 1b4e6ee85a..b66fa3c90b 100644
--- a/src/rewrite/vct/rewrite/veymont/GenerateChoreographyPermissions.scala
+++ b/src/rewrite/vct/rewrite/veymont/GenerateChoreographyPermissions.scala
@@ -14,10 +14,13 @@ import scala.collection.immutable.ListSet
 
 object GenerateChoreographyPermissions extends RewriterBuilderArg[Boolean] {
   override def key: String = "generateChoreographyPermissions"
-  override def desc: String = "Generates permissions for fields of some types (classes, int, bool, and arrays of these) for constructs used inside seq_program."
+  override def desc: String =
+    "Generates permissions for fields of some types (classes, int, bool, and arrays of these) for constructs used inside seq_program."
 }
 
-case class GenerateChoreographyPermissions[Pre <: Generation](enabled: Boolean = false) extends Rewriter[Pre] with LazyLogging {
+case class GenerateChoreographyPermissions[Pre <: Generation](
+    enabled: Boolean = false
+) extends Rewriter[Pre] with LazyLogging {
 
   val currentPerm: ScopedStack[Expr[Post]] = ScopedStack()
   val currentProg: ScopedStack[Choreography[Pre]] = ScopedStack()
@@ -38,105 +41,160 @@ case class GenerateChoreographyPermissions[Pre <: Generation](enabled: Boolean =
                          SeqRun:  endpoints       endpoints               endpoints
    */
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case fun: Function[Pre] if enabled =>
-      globalDeclarations.succeed(fun, fun.rewrite(
-        contract = prependContract(fun.contract, variablesPerm(fun.args)(fun.o), tt)(fun.o)
-      ))
-    case proc: Procedure[Pre] if enabled =>
-      implicit val o = proc.o
-      globalDeclarations.succeed(proc, proc.rewrite(
-        contract = prependContract(
-          proc.contract,
-          variablesPerm(proc.args),
-          variablesPerm(proc.args) &* resultPerm(proc)(proc.o)),
-        body = proc.body.map(body => currentPerm.having(variablesPerm(proc.args)) { dispatch(body) })
-      ))
-
-    case cons: Constructor[Pre] if enabled =>
-      implicit val o = cons.o
-      classDeclarations.succeed(cons, cons.rewrite(
-        contract = prependContract(
-          cons.contract,
-          tt,
-          variablesPerm(cons.args) &* currentPerm.top,
-        ),
-        body = cons.body.map(body => currentPerm.having(variablesPerm(cons.args)) { dispatch(body) })
-      ))
-
-    case cls: Class[Pre] if enabled => currentPerm.having(classPerm(cls)) { rewriteDefault(cls) }
-
-    case fun: InstanceFunction[Pre] if enabled =>
-      implicit val o = fun.o
-      classDeclarations.succeed(fun, fun.rewrite(
-        contract = prependContract(
-          fun.contract,
-          currentPerm.top &* variablesPerm(fun.args),
-          tt)))
-
-    case method: InstanceMethod[Pre] if enabled && currentProg.nonEmpty =>
-      implicit val o = method.o
-      classDeclarations.succeed(method, method.rewrite(
-        contract = prependContract(
-          method.contract,
-          endpointsPerm(participants(method).toSeq),
-          endpointsPerm(participants(method).toSeq)
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case fun: Function[Pre] if enabled =>
+        globalDeclarations.succeed(
+          fun,
+          fun.rewrite(contract =
+            prependContract(fun.contract, variablesPerm(fun.args)(fun.o), tt)(
+              fun.o
+            )
+          ),
         )
-      ))
-
-    case method: InstanceMethod[Pre] if enabled =>
-      // Permission generation for InstanceMethods in classes
-      implicit val o = method.o
-      classDeclarations.succeed(method, method.rewrite(
-        contract = prependContract(
-          method.contract,
-          currentPerm.top &* variablesPerm(method.args),
-          if(!method.pure) currentPerm.top &* resultPerm(method) else tt
+      case proc: Procedure[Pre] if enabled =>
+        implicit val o = proc.o
+        globalDeclarations.succeed(
+          proc,
+          proc.rewrite(
+            contract = prependContract(
+              proc.contract,
+              variablesPerm(proc.args),
+              variablesPerm(proc.args) &* resultPerm(proc)(proc.o),
+            ),
+            body = proc.body.map(body =>
+              currentPerm.having(variablesPerm(proc.args)) { dispatch(body) }
+            ),
+          ),
         )
-      ))
-
-    case prog: Choreography[Pre] if enabled =>
-      val run = prog.run
-      currentProg.having(prog) {
-        globalDeclarations.succeed(prog, prog.rewrite(
-          contract = prependContract(
-            prog.contract,
-            variablesPerm(prog.params)(prog.o),
-            variablesPerm(prog.params)(prog.o)
-          )(prog.o),
-          run = run.rewrite(
+
+      case cons: Constructor[Pre] if enabled =>
+        implicit val o = cons.o
+        classDeclarations.succeed(
+          cons,
+          cons.rewrite(
             contract = prependContract(
-              run.contract,
-              endpointsPerm(prog.endpoints)(run.o),
-              endpointsPerm(prog.endpoints)(run.o),
-            )(run.o),
-            body = currentPerm.having(endpointsPerm(prog.endpoints)(run.o)) {
-              rewriteDefault(run.body)
-            })))
-      }
-
-    case decl => rewriteDefault(decl)
-  }
+              cons.contract,
+              tt,
+              variablesPerm(cons.args) &* currentPerm.top,
+            ),
+            body = cons.body.map(body =>
+              currentPerm.having(variablesPerm(cons.args)) { dispatch(body) }
+            ),
+          ),
+        )
+
+      case cls: Class[Pre] if enabled =>
+        currentPerm.having(classPerm(cls)) { rewriteDefault(cls) }
+
+      case fun: InstanceFunction[Pre] if enabled =>
+        implicit val o = fun.o
+        classDeclarations.succeed(
+          fun,
+          fun.rewrite(contract =
+            prependContract(
+              fun.contract,
+              currentPerm.top &* variablesPerm(fun.args),
+              tt,
+            )
+          ),
+        )
+
+      case method: InstanceMethod[Pre] if enabled && currentProg.nonEmpty =>
+        implicit val o = method.o
+        classDeclarations.succeed(
+          method,
+          method.rewrite(contract =
+            prependContract(
+              method.contract,
+              endpointsPerm(participants(method).toSeq),
+              endpointsPerm(participants(method).toSeq),
+            )
+          ),
+        )
+
+      case method: InstanceMethod[Pre] if enabled =>
+        // Permission generation for InstanceMethods in classes
+        implicit val o = method.o
+        classDeclarations.succeed(
+          method,
+          method.rewrite(contract =
+            prependContract(
+              method.contract,
+              currentPerm.top &* variablesPerm(method.args),
+              if (!method.pure)
+                currentPerm.top &* resultPerm(method)
+              else
+                tt,
+            )
+          ),
+        )
+
+      case prog: Choreography[Pre] if enabled =>
+        val run = prog.run
+        currentProg.having(prog) {
+          globalDeclarations.succeed(
+            prog,
+            prog.rewrite(
+              contract =
+                prependContract(
+                  prog.contract,
+                  variablesPerm(prog.params)(prog.o),
+                  variablesPerm(prog.params)(prog.o),
+                )(prog.o),
+              run = run.rewrite(
+                contract =
+                  prependContract(
+                    run.contract,
+                    endpointsPerm(prog.endpoints)(run.o),
+                    endpointsPerm(prog.endpoints)(run.o),
+                  )(run.o),
+                body =
+                  currentPerm.having(endpointsPerm(prog.endpoints)(run.o)) {
+                    rewriteDefault(run.body)
+                  },
+              ),
+            ),
+          )
+        }
+
+      case decl => rewriteDefault(decl)
+    }
 
-  def prependContract(contract: ApplicableContract[Pre], pre: Expr[Post], post: Expr[Post])(implicit o: Origin) =
+  def prependContract(
+      contract: ApplicableContract[Pre],
+      pre: Expr[Post],
+      post: Expr[Post],
+  )(implicit o: Origin) =
     contract.rewrite(
-      requires = pre match {
-        case BooleanValue(true) => dispatch(contract.requires)
-        case pre => SplitAccountedPredicate[Post](UnitAccountedPredicate(pre), dispatch(contract.requires))
-      },
-      ensures = post match {
-        case BooleanValue(true) => dispatch(contract.ensures)
-        case post => SplitAccountedPredicate[Post](UnitAccountedPredicate(post), dispatch(contract.ensures))
-      }
+      requires =
+        pre match {
+          case BooleanValue(true) => dispatch(contract.requires)
+          case pre =>
+            SplitAccountedPredicate[Post](
+              UnitAccountedPredicate(pre),
+              dispatch(contract.requires),
+            )
+        },
+      ensures =
+        post match {
+          case BooleanValue(true) => dispatch(contract.ensures)
+          case post =>
+            SplitAccountedPredicate[Post](
+              UnitAccountedPredicate(post),
+              dispatch(contract.ensures),
+            )
+        },
     )
 
-  override def dispatch(statement: Statement[Pre]): Statement[Post] = statement match {
-    case loop: ChorLoop[Pre] =>
-      currentPerm.having(endpointsPerm(participants(statement).toSeq)(loop.contract.o)) {
-        loop.rewriteDefault()
-      }
-    case statement => rewriteDefault(statement)
-  }
+  override def dispatch(statement: Statement[Pre]): Statement[Post] =
+    statement match {
+      case loop: ChorLoop[Pre] =>
+        currentPerm.having(
+          endpointsPerm(participants(statement).toSeq)(loop.contract.o)
+        ) { loop.rewriteDefault() }
+      case statement => rewriteDefault(statement)
+    }
 
   override def dispatch(loopContract: LoopContract[Pre]): LoopContract[Post] =
     (currentPerm.topOption, loopContract) match {
@@ -147,27 +205,34 @@ case class GenerateChoreographyPermissions[Pre <: Generation](enabled: Boolean =
         implicit val o = loopContract.o
         iteration.rewrite(
           requires = perm &* dispatch(iteration.requires),
-          ensures = perm &* dispatch(iteration.ensures))
+          ensures = perm &* dispatch(iteration.ensures),
+        )
       case _ => rewriteDefault(loopContract)
     }
 
   def endpointPerm(endpoint: Endpoint[Pre])(implicit o: Origin): Expr[Post] =
     transitivePerm(EndpointName[Post](succ(endpoint)), endpoint.t)
 
-  def endpointsPerm(endpoints: Seq[Endpoint[Pre]])(implicit o: Origin): Expr[Post] =
-    foldStar(endpoints.map(endpointPerm))
+  def endpointsPerm(endpoints: Seq[Endpoint[Pre]])(
+      implicit o: Origin
+  ): Expr[Post] = foldStar(endpoints.map(endpointPerm))
 
   def variablePerm(variable: Variable[Pre]): Expr[Post] =
-    transitivePerm(Local[Post](succ(variable))(variable.o), variable.t)(variable.o)
+    transitivePerm(Local[Post](succ(variable))(variable.o), variable.t)(
+      variable.o
+    )
 
-  def variablesPerm(variables: Seq[Variable[Pre]])(implicit o: Origin): Expr[Post] =
-    foldStar(variables.map(variablePerm))
+  def variablesPerm(variables: Seq[Variable[Pre]])(
+      implicit o: Origin
+  ): Expr[Post] = foldStar(variables.map(variablePerm))
 
   def resultPerm(app: ContractApplicable[Pre])(implicit o: Origin): Expr[Post] =
     transitivePerm(Result[Post](anySucc(app)), app.returnType)
 
   def classPerm(cls: Class[Pre]): Expr[Post] =
-    transitivePerm(ThisObject[Post](succ(cls))(cls.o), TClass(cls.ref, Seq()))(cls.o)
+    transitivePerm(ThisObject[Post](succ(cls))(cls.o), TClass(cls.ref, Seq()))(
+      cls.o
+    )
 
   /*
 
@@ -185,33 +250,56 @@ case class GenerateChoreographyPermissions[Pre <: Generation](enabled: Boolean =
 
    */
 
-  def transitivePerm(e: Expr[Post], t: Type[Pre])(implicit o: Origin): Expr[Post] = t match {
-    case TArray(u) =>
-      (e !== Null()) &*
-      starall[Post](
-        /* Only with --assumeinjectivityoninhale. However, this will be deleted in later versions of veymont,
+  def transitivePerm(e: Expr[Post], t: Type[Pre])(
+      implicit o: Origin
+  ): Expr[Post] =
+    t match {
+      case TArray(u) =>
+        (e !== Null()) &* starall[Post](
+          /* Only with --assumeinjectivityoninhale. However, this will be deleted in later versions of veymont,
                  so it's fine if its incomplete */
-        PanicBlame("Quantifying over an array should be injective."),
-        TInt(),
-        (i: Local[Post]) => ((const[Post](0) <= i) && (i < Length(e)(PanicBlame("Array is guaranteed non-null")))) ==>
+          PanicBlame("Quantifying over an array should be injective."),
+          TInt(),
+          (i: Local[Post]) =>
+            ((const[Post](0) <= i) &&
+              (i < Length(e)(PanicBlame("Array is guaranteed non-null")))) ==>
 //          (arrayPerm(e, i, WritePerm(), PanicBlame("Encoding guarantees well-formedness")) &*
-            (Perm(ArrayLocation(e, i)(PanicBlame("Encoding guarantees well-formedness")), WritePerm()) &*
-              transitivePerm(ArraySubscript(e, i)(PanicBlame("Encoding guarantees well-formedness")), u))
-      )
-    case TClass(Ref(cls), _) if !generatingClasses.contains(cls) =>
-      generatingClasses.having(cls) {
-        foldStar(cls.collect { case f: InstanceField[Pre] => fieldTransitivePerm(e, f)(f.o) })
-      }
-    case TClass(Ref(cls), _) =>
-      // The class we are generating permission for has already been encountered when going through the chain
-      // of fields. So we cut off the computation
-      logger.warn(s"Not generating permissions for recursive occurrence of ${cls.o.getPreferredNameOrElse().ucamel}. Circular datastructures are not supported by permission generation")
-      tt
-    case _ => tt
-  }
+              (Perm(
+                ArrayLocation(e, i)(PanicBlame(
+                  "Encoding guarantees well-formedness"
+                )),
+                WritePerm(),
+              ) &* transitivePerm(
+                ArraySubscript(e, i)(PanicBlame(
+                  "Encoding guarantees well-formedness"
+                )),
+                u,
+              )),
+        )
+      case TClass(Ref(cls), _) if !generatingClasses.contains(cls) =>
+        generatingClasses.having(cls) {
+          foldStar(cls.collect { case f: InstanceField[Pre] =>
+            fieldTransitivePerm(e, f)(f.o)
+          })
+        }
+      case TClass(Ref(cls), _) =>
+        // The class we are generating permission for has already been encountered when going through the chain
+        // of fields. So we cut off the computation
+        logger.warn(
+          s"Not generating permissions for recursive occurrence of ${cls.o.getPreferredNameOrElse().ucamel}. Circular datastructures are not supported by permission generation"
+        )
+        tt
+      case _ => tt
+    }
 
-  def fieldTransitivePerm(`this`: Expr[Post], f: InstanceField[Pre])(implicit o: Origin): Expr[Post] = {
-    fieldPerm[Post](`this`, succ(f), WritePerm()) &*
-      transitivePerm(Deref[Post](`this`, succ(f))(PanicBlame("Permission for this field is already established")), f.t)
+  def fieldTransitivePerm(`this`: Expr[Post], f: InstanceField[Pre])(
+      implicit o: Origin
+  ): Expr[Post] = {
+    fieldPerm[Post](`this`, succ(f), WritePerm()) &* transitivePerm(
+      Deref[Post](`this`, succ(f))(PanicBlame(
+        "Permission for this field is already established"
+      )),
+      f.t,
+    )
   }
 }
diff --git a/src/rewrite/vct/rewrite/veymont/GenerateImplementation.scala b/src/rewrite/vct/rewrite/veymont/GenerateImplementation.scala
index d7678d67bd..06e100d262 100644
--- a/src/rewrite/vct/rewrite/veymont/GenerateImplementation.scala
+++ b/src/rewrite/vct/rewrite/veymont/GenerateImplementation.scala
@@ -2,7 +2,68 @@ package vct.rewrite.veymont
 
 import com.typesafe.scalalogging.LazyLogging
 import hre.util.ScopedStack
-import vct.col.ast.{AbstractRewriter, ApplicableContract, Assert, Assign, Block, BooleanValue, Branch, ChorBranch, ChorGuard, ChorLoop, ChorPerm, ChorRun, ChorStatement, Choreography, Class, ClassDeclaration, CommunicateX, ConstructorInvocation, Declaration, Deref, Endpoint, EndpointGuard, EndpointName, Eval, Expr, Fork, InstanceField, InstanceMethod, JavaClass, JavaConstructor, JavaInvocation, JavaLocal, JavaMethod, JavaNamedType, JavaParam, JavaPublic, JavaTClass, Join, Local, Loop, MethodInvocation, NewObject, Node, Null, Perm, Procedure, Program, RunMethod, Scope, Star, Statement, TClass, TVeyMontChannel, TVoid, ThisChoreography, ThisObject, Type, UnitAccountedPredicate, Variable, VeyMontAssignExpression}
+import vct.col.ast.{
+  AbstractRewriter,
+  ApplicableContract,
+  Assert,
+  Assign,
+  Block,
+  BooleanValue,
+  Branch,
+  ChorBranch,
+  ChorGuard,
+  ChorLoop,
+  ChorPerm,
+  ChorRun,
+  ChorStatement,
+  Choreography,
+  Class,
+  ClassDeclaration,
+  CommunicateX,
+  ConstructorInvocation,
+  Declaration,
+  Deref,
+  Endpoint,
+  EndpointGuard,
+  EndpointName,
+  Eval,
+  Expr,
+  Fork,
+  InstanceField,
+  InstanceMethod,
+  JavaClass,
+  JavaConstructor,
+  JavaInvocation,
+  JavaLocal,
+  JavaMethod,
+  JavaNamedType,
+  JavaParam,
+  JavaPublic,
+  JavaTClass,
+  Join,
+  Local,
+  Loop,
+  MethodInvocation,
+  NewObject,
+  Node,
+  Null,
+  Perm,
+  Procedure,
+  Program,
+  RunMethod,
+  Scope,
+  Star,
+  Statement,
+  TClass,
+  TVeyMontChannel,
+  TVoid,
+  ThisChoreography,
+  ThisObject,
+  Type,
+  UnitAccountedPredicate,
+  Variable,
+  VeyMontAssignExpression,
+}
 import vct.col.origin.{AssignLocalOk, Name, Origin, PanicBlame}
 import vct.col.ref.Ref
 import vct.col.resolve.ctx.RefJavaMethod
@@ -11,14 +72,23 @@ import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, Rewritten}
 import vct.col.util.SuccessionMap
 import vct.col.util.AstBuildHelpers._
 import vct.result.VerificationError.{Unreachable, UserError}
-import vct.rewrite.veymont.GenerateImplementation.{ChannelFieldOrigin, ParalleliseEndpointsError, RunMethodOrigin, ThreadClassOrigin, getChannelClassName, getThreadClassName, getVarName}
+import vct.rewrite.veymont.GenerateImplementation.{
+  ChannelFieldOrigin,
+  ParalleliseEndpointsError,
+  RunMethodOrigin,
+  ThreadClassOrigin,
+  getChannelClassName,
+  getThreadClassName,
+  getVarName,
+}
 
 import scala.collection.mutable
 
 object GenerateImplementation extends RewriterBuilder {
   override def key: String = "generateImplementation"
 
-  override def desc: String = "Generate classes for VeyMont threads in parallel program"
+  override def desc: String =
+    "Generate classes for VeyMont threads in parallel program"
 
   private val channelClassName = "Channel"
   private val threadClassName = "Thread"
@@ -26,12 +96,13 @@ object GenerateImplementation extends RewriterBuilder {
   def getChannelClassName(channelType: Type[_]): String =
     channelType.toString.capitalize + channelClassName
 
-  def getThreadClassName(thread: Endpoint[_]) : String =
+  def getThreadClassName(thread: Endpoint[_]): String =
     thread.o.getPreferredNameOrElse().ucamel + threadClassName
 
   def getVarName(v: Variable[_]) = v.o.getPreferredNameOrElse()
 
-  case class ParalleliseEndpointsError(node : Node[_], msg: String) extends UserError {
+  case class ParalleliseEndpointsError(node: Node[_], msg: String)
+      extends UserError {
     override def code: String = "paralleliseEndpointsError"
     override def text: String = node.o.messageInContext(msg)
   }
@@ -39,57 +110,95 @@ object GenerateImplementation extends RewriterBuilder {
   private def ThreadClassOrigin(thread: Endpoint[_]): Origin =
     thread.o.where(name = getThreadClassName(thread))
 
-  private def ChannelFieldOrigin(channelName: String, assign: Statement[_]): Origin =
-    assign.o.where(name = channelName)
+  private def ChannelFieldOrigin(
+      channelName: String,
+      assign: Statement[_],
+  ): Origin = assign.o.where(name = channelName)
 
   private def RunMethodOrigin(runMethod: ChorRun[_]): Origin =
     runMethod.o.where(name = "run")
 }
 
-case class GenerateImplementation[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging { outer =>
-
-  val threadBuildingBlocks: ScopedStack[ThreadBuildingBlocks[Pre]] = ScopedStack()
-  val threadClassSucc: SuccessionMap[Endpoint[Pre],Class[Post]] = SuccessionMap()
-  val threadMethodSucc: SuccessionMap[(Endpoint[Pre],ClassDeclaration[Pre]),InstanceMethod[Post]] = SuccessionMap()
-  val runSucc: mutable.LinkedHashMap[Choreography[Pre], Procedure[Post]] = mutable.LinkedHashMap()
-  private val givenClassSucc: SuccessionMap[Type[Pre],Class[Post]] = SuccessionMap()
-  private val givenClassConstrSucc: SuccessionMap[Type[Pre],Procedure[Pre]] = SuccessionMap()
-  val endpointLocals: SuccessionMap[Endpoint[Pre], Variable[Post]] = SuccessionMap()
+case class GenerateImplementation[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
+  outer =>
+
+  val threadBuildingBlocks: ScopedStack[ThreadBuildingBlocks[Pre]] =
+    ScopedStack()
+  val threadClassSucc: SuccessionMap[Endpoint[Pre], Class[Post]] =
+    SuccessionMap()
+  val threadMethodSucc
+      : SuccessionMap[(Endpoint[Pre], ClassDeclaration[Pre]), InstanceMethod[
+        Post
+      ]] = SuccessionMap()
+  val runSucc: mutable.LinkedHashMap[Choreography[Pre], Procedure[Post]] =
+    mutable.LinkedHashMap()
+  private val givenClassSucc: SuccessionMap[Type[Pre], Class[Post]] =
+    SuccessionMap()
+  private val givenClassConstrSucc: SuccessionMap[Type[Pre], Procedure[Pre]] =
+    SuccessionMap()
+  val endpointLocals: SuccessionMap[Endpoint[Pre], Variable[Post]] =
+    SuccessionMap()
 
   // For each endpoint and input variable, there is a unique instance field (on the class of the endpoint)
-  val endpointParamFields = SuccessionMap[(Endpoint[Pre], Variable[Pre]), InstanceField[Post]]()
+  val endpointParamFields =
+    SuccessionMap[(Endpoint[Pre], Variable[Pre]), InstanceField[Post]]()
   // For each endpoint and another endpoint, there is a unique instance field (on the class of the endpoint) with a reference to the second endpoint
-  val endpointPeerFields = SuccessionMap[(Endpoint[Pre], Endpoint[Pre]), InstanceField[Post]]()
+  val endpointPeerFields =
+    SuccessionMap[(Endpoint[Pre], Endpoint[Pre]), InstanceField[Post]]()
 
   var program: Program[Pre] = null
-  lazy val choreographies: Seq[Choreography[Pre]] = program.declarations.collect { case chor: Choreography[Pre] => chor }
+  lazy val choreographies: Seq[Choreography[Pre]] = program.declarations
+    .collect { case chor: Choreography[Pre] => chor }
   lazy val allEndpoints = choreographies.flatMap { _.endpoints }
   lazy val endpointToChoreography: Map[Endpoint[Pre], Choreography[Pre]] =
-    choreographies.flatMap { chor => chor.endpoints.map(ep => (ep, chor)) }.toMap
+    choreographies.flatMap { chor => chor.endpoints.map(ep => (ep, chor)) }
+      .toMap
   lazy val endpointClassToEndpoint: Map[Class[Pre], Endpoint[Pre]] =
-    choreographies.flatMap { chor => chor.endpoints.map(endpoint => (endpoint.cls.decl, endpoint)) }.toMap
-
-  def isEndpointClass(c: Class[Pre]): Boolean = endpointClassToEndpoint.contains(c)
-  def choreographyOf(c: Class[Pre]): Choreography[Pre] = endpointToChoreography(endpointClassToEndpoint(c))
+    choreographies.flatMap { chor =>
+      chor.endpoints.map(endpoint => (endpoint.cls.decl, endpoint))
+    }.toMap
+
+  def isEndpointClass(c: Class[Pre]): Boolean =
+    endpointClassToEndpoint.contains(c)
+  def choreographyOf(c: Class[Pre]): Choreography[Pre] =
+    endpointToChoreography(endpointClassToEndpoint(c))
   def endpointOf(c: Class[Pre]): Endpoint[Pre] = endpointClassToEndpoint(c)
-  def isChoreographyParam(v: Variable[Pre]): Boolean = choreographies.exists { chor => chor.params.contains(v) }
+  def isChoreographyParam(v: Variable[Pre]): Boolean =
+    choreographies.exists { chor => chor.params.contains(v) }
 
   val currentChoreography = ScopedStack[Choreography[Pre]]()
   val currentEndpoint = ScopedStack[Endpoint[Pre]]()
 
-  def inChoreography: Boolean = currentChoreography.nonEmpty && currentEndpoint.isEmpty
-  def inEndpoint: Boolean = currentChoreography.nonEmpty && currentEndpoint.nonEmpty
+  def inChoreography: Boolean =
+    currentChoreography.nonEmpty && currentEndpoint.isEmpty
+  def inEndpoint: Boolean =
+    currentChoreography.nonEmpty && currentEndpoint.nonEmpty
 
   object InChor {
     def unapply[T](t: T): Option[(Choreography[Pre], T)] =
-      if(inChoreography) Some((currentChoreography.top, t)) else None
-    def unapply: Option[Choreography[Pre]] = if(inChoreography) currentChoreography.topOption else None
+      if (inChoreography)
+        Some((currentChoreography.top, t))
+      else
+        None
+    def unapply: Option[Choreography[Pre]] =
+      if (inChoreography)
+        currentChoreography.topOption
+      else
+        None
   }
 
   object InEndpoint {
     def unapply[T](t: T): Option[(Choreography[Pre], Endpoint[Pre], T)] =
-      if(inEndpoint) Some((currentChoreography.top, currentEndpoint.top, t)) else None
-    def unapply: Option[(Choreography[Pre], Endpoint[Pre])] = if(inEndpoint) Some((currentChoreography.top, currentEndpoint.top)) else None
+      if (inEndpoint)
+        Some((currentChoreography.top, currentEndpoint.top, t))
+      else
+        None
+    def unapply: Option[(Choreography[Pre], Endpoint[Pre])] =
+      if (inEndpoint)
+        Some((currentChoreography.top, currentEndpoint.top))
+      else
+        None
   }
 
   val currentThis = ScopedStack[ThisObject[Post]]()
@@ -99,21 +208,24 @@ case class GenerateImplementation[Pre <: Generation]() extends Rewriter[Pre] wit
     super.dispatch(program)
   }
 
-  override def dispatch(decl: Declaration[Pre]) : Unit = {
+  override def dispatch(decl: Declaration[Pre]): Unit = {
     decl match {
       case p: Procedure[Pre] => super.dispatch(p)
       case cls: Class[Pre] if isEndpointClass(cls) =>
         val chor = choreographyOf(cls)
         val endpoint = endpointOf(cls)
         currentThis.having(ThisObject[Post](succ(cls))(cls.o)) {
-          globalDeclarations.succeed(cls, cls.rewrite(
-            decls = classDeclarations.collect {
-              cls.decls.foreach(dispatch)
-              generateRunMethod(chor, endpointOf(cls))
-              generateParamFields(chor, endpoint)
-              generatePeerFields(chor, endpoint)
-            }._1
-          ))
+          globalDeclarations.succeed(
+            cls,
+            cls.rewrite(decls =
+              classDeclarations.collect {
+                cls.decls.foreach(dispatch)
+                generateRunMethod(chor, endpointOf(cls))
+                generateParamFields(chor, endpoint)
+                generatePeerFields(chor, endpoint)
+              }._1
+            ),
+          )
         }
       case cls: Class[Pre] => super.dispatch(cls)
       case chor: Choreography[Pre] =>
@@ -122,20 +234,25 @@ case class GenerateImplementation[Pre <: Generation]() extends Rewriter[Pre] wit
           chor.endpoints.foreach(_.drop())
           implicit val o = chor.o
 
-          chor.endpoints.foreach(endpoint => endpointLocals(endpoint) = new Variable(dispatch(endpoint.t))(endpoint.o))
+          chor.endpoints.foreach(endpoint =>
+            endpointLocals(endpoint) =
+              new Variable(dispatch(endpoint.t))(endpoint.o)
+          )
 
-          val initEndpoints =
-            chor.endpoints.map { endpoint =>
-              assignLocal[Post](
-                endpointLocals(endpoint).get,
-                ConstructorInvocation[Post](
-                  ref = succ(endpoint.constructor.decl),
-                  classTypeArgs = endpoint.typeArgs.map(dispatch),
-                  args = endpoint.args.map(dispatch),
-                  outArgs = Seq(), typeArgs = Seq(), givenMap = Seq(), yields = Seq()
-                )(PanicBlame("Should be safe"))
-              )
-            }
+          val initEndpoints = chor.endpoints.map { endpoint =>
+            assignLocal[Post](
+              endpointLocals(endpoint).get,
+              ConstructorInvocation[Post](
+                ref = succ(endpoint.constructor.decl),
+                classTypeArgs = endpoint.typeArgs.map(dispatch),
+                args = endpoint.args.map(dispatch),
+                outArgs = Seq(),
+                typeArgs = Seq(),
+                givenMap = Seq(),
+                yields = Seq(),
+              )(PanicBlame("Should be safe")),
+            )
+          }
 
           // Initialize the fields on each endpoint class, representing the parameters of the choreography, and other endpoints
           val auxFieldAssigns = chor.endpoints.flatMap { endpoint =>
@@ -144,132 +261,179 @@ case class GenerateImplementation[Pre <: Generation]() extends Rewriter[Pre] wit
                 endpointLocals(endpoint).get,
                 endpointParamFields.ref((endpoint, param)),
                 Local(succ(param)),
-                blame = PanicBlame("Should be safe")
+                blame = PanicBlame("Should be safe"),
               )
             } ++ chor.endpoints.map { peer =>
               assignField[Post](
                 endpointLocals(endpoint).get,
                 endpointPeerFields.ref((endpoint, peer)),
                 endpointLocals(peer).get,
-                blame = PanicBlame("Should be safe")
+                blame = PanicBlame("Should be safe"),
               )
             }
           }
 
-          val forkJoins = chor.endpoints.map {
-            endpoint => Fork[Post](endpointLocals(endpoint).get)(PanicBlame(""))
-          } ++ chor.endpoints.map {
-            endpoint => Join[Post](endpointLocals(endpoint).get)(PanicBlame(""))
-          }
+          val forkJoins =
+            chor.endpoints.map { endpoint =>
+              Fork[Post](endpointLocals(endpoint).get)(PanicBlame(""))
+            } ++ chor.endpoints.map { endpoint =>
+              Join[Post](endpointLocals(endpoint).get)(PanicBlame(""))
+            }
 
           val mainBody = Scope(
             chor.endpoints.map(endpointLocals(_)),
-            Block(initEndpoints ++ auxFieldAssigns ++ forkJoins)(chor.o)
+            Block(initEndpoints ++ auxFieldAssigns ++ forkJoins)(chor.o),
           )
 
-          globalDeclarations.declare(procedure(
-            args = variables.dispatch(chor.params),
-            body = Some(mainBody),
-            blame = PanicBlame("TODO: Procedure"),
-            contractBlame = PanicBlame("TODO: Procedure contract"),
-          )(chor.o))
+          globalDeclarations.declare(
+            procedure(
+              args = variables.dispatch(chor.params),
+              body = Some(mainBody),
+              blame = PanicBlame("TODO: Procedure"),
+              contractBlame = PanicBlame("TODO: Procedure contract"),
+            )(chor.o)
+          )
         }
       case other => rewriteDefault(other)
     }
   }
 
-  def generateRunMethod(chor: Choreography[Pre], endpoint: Endpoint[Pre]): Unit = {
+  def generateRunMethod(
+      chor: Choreography[Pre],
+      endpoint: Endpoint[Pre],
+  ): Unit = {
     val run = chor.run
     implicit val o = run.o
     currentChoreography.having(chor) {
       currentEndpoint.having(endpoint) {
-        classDeclarations.declare(new RunMethod(
-          body = Some(dispatch(run.body)),
-          contract = dispatch(run.contract)
-        )(PanicBlame("")))
+        classDeclarations.declare(
+          new RunMethod(
+            body = Some(dispatch(run.body)),
+            contract = dispatch(run.contract),
+          )(PanicBlame(""))
+        )
       }
     }
   }
 
-  def generateParamFields(chor: Choreography[Pre], endpoint: Endpoint[Pre]): Unit =
+  def generateParamFields(
+      chor: Choreography[Pre],
+      endpoint: Endpoint[Pre],
+  ): Unit =
     chor.params.foreach { param =>
-      val f = new InstanceField(dispatch(param.t), Seq())(param.o.where(
-        indirect = Name.names(chor.o.getPreferredNameOrElse(), Name("p"), param.o.getPreferredNameOrElse())
-      ))
+      val f =
+        new InstanceField(dispatch(param.t), Seq())(param.o.where(indirect =
+          Name.names(
+            chor.o.getPreferredNameOrElse(),
+            Name("p"),
+            param.o.getPreferredNameOrElse(),
+          )
+        ))
       classDeclarations.declare(f)
       endpointParamFields((endpoint, param)) = f
     }
 
-  def generatePeerFields(chor: Choreography[Pre], endpoint: Endpoint[Pre]): Unit =
+  def generatePeerFields(
+      chor: Choreography[Pre],
+      endpoint: Endpoint[Pre],
+  ): Unit =
     chor.endpoints.foreach { peer =>
-      val f = new InstanceField(dispatch(peer.t), Seq())(endpoint.o.where(
-        indirect = Name.names(peer.o.getPreferredNameOrElse())
-      ))
+      val f =
+        new InstanceField(dispatch(peer.t), Seq())(
+          endpoint.o
+            .where(indirect = Name.names(peer.o.getPreferredNameOrElse()))
+        )
       classDeclarations.declare(f)
       endpointPeerFields((endpoint, peer)) = f
     }
 
   override def dispatch(statement: Statement[Pre]): Statement[Post] = {
-    if (currentEndpoint.nonEmpty) projectStatement(statement)
-    else super.dispatch(statement)
-  }
-
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = expr match {
-    case InChor(_, EndpointName(Ref(endpoint)))=>
-      Local[Post](endpointLocals.ref(endpoint))(expr.o)
-    case InEndpoint(_, endpoint, EndpointName(Ref(peer))) =>
-      implicit val o = expr.o
-      // TODO (RR): Also need to generate (read) permissions for all these fields!
-      Deref[Post](currentThis.top, endpointPeerFields.ref((endpoint, peer)))(PanicBlame("Shouldn't happen"))
-    case InEndpoint(_, endpoint, Local(Ref(v))) if currentChoreography.nonEmpty && currentEndpoint.nonEmpty && isChoreographyParam(v) =>
-      implicit val o = expr.o
-      Deref[Post](currentThis.top, endpointParamFields.ref((endpoint, v)))(PanicBlame("Shouldn't happen"))
-    case InEndpoint(_, endpoint, expr) => projectExpression(expr, endpoint)
-    case _ => expr.rewriteDefault()
-  }
-
-  def projectStatement(statement: Statement[Pre]): Statement[Post] = statement match {
-    // Whitelist statements that do not need an endpoint context
-    case ChorStatement(None, statement) => statement match {
-      case _: Branch[Pre] | _: Loop[Pre] => projectStatement(statement)
-      case _ => throw new Exception("Encountered ChorStatement without endpoint context")
+    if (currentEndpoint.nonEmpty)
+      projectStatement(statement)
+    else
+      super.dispatch(statement)
+  }
+
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case InChor(_, EndpointName(Ref(endpoint))) =>
+        Local[Post](endpointLocals.ref(endpoint))(expr.o)
+      case InEndpoint(_, endpoint, EndpointName(Ref(peer))) =>
+        implicit val o = expr.o
+        // TODO (RR): Also need to generate (read) permissions for all these fields!
+        Deref[Post](currentThis.top, endpointPeerFields.ref((endpoint, peer)))(
+          PanicBlame("Shouldn't happen")
+        )
+      case InEndpoint(_, endpoint, Local(Ref(v)))
+          if currentChoreography.nonEmpty && currentEndpoint.nonEmpty &&
+            isChoreographyParam(v) =>
+        implicit val o = expr.o
+        Deref[Post](currentThis.top, endpointParamFields.ref((endpoint, v)))(
+          PanicBlame("Shouldn't happen")
+        )
+      case InEndpoint(_, endpoint, expr) => projectExpression(expr, endpoint)
+      case _ => expr.rewriteDefault()
     }
-    case ChorStatement(Some(Ref(endpoint)), inner) if endpoint == currentEndpoint.top => inner match {
-      case assign: Assign[Pre] => assign.rewriteDefault()
-      case eval: Eval[Pre] => eval.rewriteDefault()
+
+  def projectStatement(statement: Statement[Pre]): Statement[Post] =
+    statement match {
+      // Whitelist statements that do not need an endpoint context
+      case ChorStatement(None, statement) =>
+        statement match {
+          case _: Branch[Pre] | _: Loop[Pre] => projectStatement(statement)
+          case _ =>
+            throw new Exception(
+              "Encountered ChorStatement without endpoint context"
+            )
+        }
+      case ChorStatement(Some(Ref(endpoint)), inner)
+          if endpoint == currentEndpoint.top =>
+        inner match {
+          case assign: Assign[Pre] => assign.rewriteDefault()
+          case eval: Eval[Pre] => eval.rewriteDefault()
+        }
+      // Ignore statements that do not match the current endpoint
+      case ChorStatement(_, _) => Block(Seq())(statement.o)
+      case branch: ChorBranch[Pre]
+          if branch.guards.map(_.endpointOpt.get)
+            .contains(currentEndpoint.top) =>
+        implicit val o = branch.o
+        Branch[Post](
+          Seq(
+            (projectExpression(branch.guards)(branch.o), dispatch(branch.yes))
+          ) ++ branch.no.map(no => Seq((tt[Post], dispatch(no))))
+            .getOrElse(Seq())
+        )
+      case chorLoop: ChorLoop[Pre]
+          if chorLoop.guards.map(_.endpointOpt.get)
+            .contains(currentEndpoint.top) =>
+        implicit val o = chorLoop.o
+        loop(
+          cond = projectExpression(chorLoop.guards)(chorLoop.o),
+          body = dispatch(chorLoop.body),
+          contract = dispatch(chorLoop.contract),
+        )
+      case _: ChorBranch[Pre] | _: ChorLoop[Pre] => Block(Seq())(statement.o)
+      case block: Block[Pre] => block.rewriteDefault()
+      case s => throw new Exception(s"Unsupported: $s")
     }
-    // Ignore statements that do not match the current endpoint
-    case ChorStatement(_, _) => Block(Seq())(statement.o)
-    case branch: ChorBranch[Pre] if branch.guards.map(_.endpointOpt.get).contains(currentEndpoint.top) =>
-      implicit val o = branch.o
-      Branch[Post](
-        Seq((projectExpression(branch.guards)(branch.o), dispatch(branch.yes)))
-        ++ branch.no.map(no => Seq((tt[Post], dispatch(no)))).getOrElse(Seq())
-      )
-    case chorLoop: ChorLoop[Pre] if chorLoop.guards.map(_.endpointOpt.get).contains(currentEndpoint.top) =>
-      implicit val o = chorLoop.o
-      loop(
-        cond = projectExpression(chorLoop.guards)(chorLoop.o),
-        body = dispatch(chorLoop.body),
-        contract = dispatch(chorLoop.contract)
-      )
-    case _: ChorBranch[Pre] | _: ChorLoop[Pre] => Block(Seq())(statement.o)
-    case block: Block[Pre] => block.rewriteDefault()
-    case s =>
-      throw new Exception(s"Unsupported: $s")
-  }
 
-  def projectExpression(guards: Seq[ChorGuard[Pre]])(implicit o: Origin): Expr[Post] = foldStar(guards.collect {
-    case EndpointGuard(Ref(endpoint), cond) if endpoint == currentEndpoint.top => dispatch(cond)
-  })
+  def projectExpression(
+      guards: Seq[ChorGuard[Pre]]
+  )(implicit o: Origin): Expr[Post] =
+    foldStar(guards.collect {
+      case EndpointGuard(Ref(endpoint), cond)
+          if endpoint == currentEndpoint.top =>
+        dispatch(cond)
+    })
 
-  def projectExpression(expr: Expr[Pre], endpoint: Endpoint[Pre]): Expr[Post] = expr match {
-    case ChorPerm(Ref(other), loc, perm) if endpoint == other =>
-      Perm(dispatch(loc), dispatch(perm))(expr.o)
-    case ChorPerm(Ref(other), _, _) if endpoint != other =>
-      tt
-    case _ => expr.rewriteDefault()
-  }
+  def projectExpression(expr: Expr[Pre], endpoint: Endpoint[Pre]): Expr[Post] =
+    expr match {
+      case ChorPerm(Ref(other), loc, perm) if endpoint == other =>
+        Perm(dispatch(loc), dispatch(perm))(expr.o)
+      case ChorPerm(Ref(other), _, _) if endpoint != other => tt
+      case _ => expr.rewriteDefault()
+    }
 
   //
   // Old code after this
@@ -278,101 +442,168 @@ case class GenerateImplementation[Pre <: Generation]() extends Rewriter[Pre] wit
   private def dispatchThread(thread: Endpoint[Pre]): Unit = {
     if (threadBuildingBlocks.nonEmpty) {
       val threadRes: ThreadBuildingBlocks[Pre] = threadBuildingBlocks.top
-      val threadMethods: Seq[ClassDeclaration[Post]] = createThreadMethod(thread, threadRes)
+      val threadMethods: Seq[ClassDeclaration[Post]] = createThreadMethod(
+        thread,
+        threadRes,
+      )
       createThreadClass(thread, threadRes, threadMethods)
-    } else rewriteDefault(thread)
+    } else
+      rewriteDefault(thread)
   }
 
   private def dispatchThreads(seqProg: Choreography[Pre]): Unit = {
-    val (channelClasses,indexedChannelInfo) = extractChannelInfo(seqProg)
-    channelClasses.foreach{ case (t,c) =>
-      globalDeclarations.declare(c)
-    }
+    val (channelClasses, indexedChannelInfo) = extractChannelInfo(seqProg)
+    channelClasses.foreach { case (t, c) => globalDeclarations.declare(c) }
     seqProg.endpoints.foreach(thread => {
-      val threadField = new InstanceField[Post](TClass(givenClassSucc.ref(thread.t), Seq()), Nil)(thread.o)
-      val channelFields = getChannelFields(thread, indexedChannelInfo, channelClasses)
-      threadBuildingBlocks.having(new ThreadBuildingBlocks(seqProg.run, seqProg.decls, channelFields, channelClasses, thread, threadField)) {
-        dispatch(thread)
-      }
+      val threadField =
+        new InstanceField[Post](
+          TClass(givenClassSucc.ref(thread.t), Seq()),
+          Nil,
+        )(thread.o)
+      val channelFields = getChannelFields(
+        thread,
+        indexedChannelInfo,
+        channelClasses,
+      )
+      threadBuildingBlocks.having(new ThreadBuildingBlocks(
+        seqProg.run,
+        seqProg.decls,
+        channelFields,
+        channelClasses,
+        thread,
+        threadField,
+      )) { dispatch(thread) }
     })
   }
 
   private def dispatchGivenClass(c: Class[Pre]): Class[Post] = {
     val rw = GivenClassRewriter()
-    val gc = c.rewrite(
-      decls = classDeclarations.collect {
-        (givenClassConstrSucc.get(TClass(c.ref, Seq())).get +: c.declarations).foreach(d => rw.dispatch(d))
-      }._1
-    )(rw)
-    givenClassSucc.update(TClass(c.ref, Seq()),gc)
+    val gc =
+      c.rewrite(decls =
+        classDeclarations.collect {
+          (givenClassConstrSucc.get(TClass(c.ref, Seq())).get +: c.declarations)
+            .foreach(d => rw.dispatch(d))
+        }._1
+      )(rw)
+    givenClassSucc.update(TClass(c.ref, Seq()), gc)
     gc
   }
 
   case class GivenClassRewriter() extends Rewriter[Pre] {
     override val allScopes = outer.allScopes
 
-    val rewritingConstr: ScopedStack[(Seq[Variable[Pre]],TClass[Pre])] = ScopedStack()
-
-    override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-      case p: Procedure[Pre] => p.returnType match {
-        case tc: TClass[Pre] => rewritingConstr.having(p.args,tc){ classDeclarations.declare(createClassConstructor(p)) };
-        case _ => ??? //("This procedure is expected to have a class as return type");
+    val rewritingConstr: ScopedStack[(Seq[Variable[Pre]], TClass[Pre])] =
+      ScopedStack()
+
+    override def dispatch(decl: Declaration[Pre]): Unit =
+      decl match {
+        case p: Procedure[Pre] =>
+          p.returnType match {
+            case tc: TClass[Pre] =>
+              rewritingConstr.having(p.args, tc) {
+                classDeclarations.declare(createClassConstructor(p))
+              };
+            case _ =>
+              ??? // ("This procedure is expected to have a class as return type");
+          }
+        case other => rewriteDefault(other)
       }
-      case other => rewriteDefault(other)
-    }
 
     // PB: from what I understand this restores a constructor from a generated procedure, so this should be refactored
     // once we make constructors first class.
     def createClassConstructor(p: Procedure[Pre]): JavaConstructor[Post] =
-      new JavaConstructor[Post](Seq(JavaPublic[Post]()(p.o)),
+      new JavaConstructor[Post](
+        Seq(JavaPublic[Post]()(p.o)),
         rewritingConstr.top._2.cls.decl.o.getPreferredNameOrElse().ucamel,
         p.args.map(createJavaParam),
         variables.dispatch(p.typeArgs),
         Seq.empty,
         p.body match {
-          case Some(s: Scope[Pre]) => s.body match {
-            case b: Block[Pre] => dispatch(Block(b.statements.tail.dropRight(1))(p.o))
-            case other => dispatch(other)
-          }
-          case Some(_) => throw Unreachable("The body of a procedure always starts with a Scope.")
+          case Some(s: Scope[Pre]) =>
+            s.body match {
+              case b: Block[Pre] =>
+                dispatch(Block(b.statements.tail.dropRight(1))(p.o))
+              case other => dispatch(other)
+            }
+          case Some(_) =>
+            throw Unreachable(
+              "The body of a procedure always starts with a Scope."
+            )
           case None => Block(Seq.empty)(p.o)
         },
-        p.contract.rewrite(ensures = UnitAccountedPredicate[Post](BooleanValue(true)(p.o))(p.o)))(null)(p.o)
+        p.contract.rewrite(ensures =
+          UnitAccountedPredicate[Post](BooleanValue(true)(p.o))(p.o)
+        ),
+      )(null)(p.o)
 
     def createJavaParam(v: Variable[Pre]): JavaParam[Post] =
       new JavaParam[Post](Seq.empty, getVarName(v).camel, dispatch(v.t))(v.o)
 
-    override def dispatch(e: Expr[Pre]): Expr[Post] = e match {
-      case l: Local[Pre] =>
-        if(rewritingConstr.nonEmpty && rewritingConstr.top._1.contains(l.ref.decl))
-          JavaLocal[Post](getVarName(l.ref.decl).camel)(null)(e.o)
-        else rewriteDefault(l)
-      case t: ThisObject[Pre] =>
-        val thisClassType = TClass(t.cls, Seq())
-        if(rewritingConstr.nonEmpty && rewritingConstr.top._2 == thisClassType)
-          ThisObject(givenClassSucc.ref[Post,Class[Post]](thisClassType))(t.o)
-        else rewriteDefault(t)
-      case d: Deref[Pre] =>
-        if(rewritingConstr.nonEmpty)
-          d.obj match {
-            case _: Local[Pre] => d.rewrite(obj = ThisObject(givenClassSucc.ref[Post,Class[Post]](rewritingConstr.top._2))(d.o))
-            case other => rewriteDefault(other)
-          }
-        else rewriteDefault(d)
-      case other => rewriteDefault(other)
-    }
+    override def dispatch(e: Expr[Pre]): Expr[Post] =
+      e match {
+        case l: Local[Pre] =>
+          if (
+            rewritingConstr.nonEmpty &&
+            rewritingConstr.top._1.contains(l.ref.decl)
+          )
+            JavaLocal[Post](getVarName(l.ref.decl).camel)(null)(e.o)
+          else
+            rewriteDefault(l)
+        case t: ThisObject[Pre] =>
+          val thisClassType = TClass(t.cls, Seq())
+          if (
+            rewritingConstr.nonEmpty && rewritingConstr.top._2 == thisClassType
+          )
+            ThisObject(givenClassSucc.ref[Post, Class[Post]](thisClassType))(
+              t.o
+            )
+          else
+            rewriteDefault(t)
+        case d: Deref[Pre] =>
+          if (rewritingConstr.nonEmpty)
+            d.obj match {
+              case _: Local[Pre] =>
+                d.rewrite(obj =
+                  ThisObject(
+                    givenClassSucc
+                      .ref[Post, Class[Post]](rewritingConstr.top._2)
+                  )(d.o)
+                )
+              case other => rewriteDefault(other)
+            }
+          else
+            rewriteDefault(d)
+        case other => rewriteDefault(other)
+      }
   }
 
-  private def extractChannelInfo(seqProg: Choreography[Pre]): (Map[Type[Pre], JavaClass[Post]], Seq[ChannelInfo[Pre]]) = {
-    val channelInfo = getChannelNamesAndTypes(seqProg.run.body) ++ collectChannelsFromMethods(seqProg)
-    val indexedChannelInfo: Seq[ChannelInfo[Pre]] = channelInfo.groupBy(_.channelName).values.flatMap(chanInfoSeq =>
-      if (chanInfoSeq.size <= 1) chanInfoSeq
-      else chanInfoSeq.zipWithIndex.map { case (chanInfo, index) => new ChannelInfo(chanInfo.comExpr, chanInfo.channelType, chanInfo.channelName + index) }).toSeq
+  private def extractChannelInfo(
+      seqProg: Choreography[Pre]
+  ): (Map[Type[Pre], JavaClass[Post]], Seq[ChannelInfo[Pre]]) = {
+    val channelInfo =
+      getChannelNamesAndTypes(seqProg.run.body) ++
+        collectChannelsFromMethods(seqProg)
+    val indexedChannelInfo: Seq[ChannelInfo[Pre]] =
+      channelInfo.groupBy(_.channelName).values.flatMap(chanInfoSeq =>
+        if (chanInfoSeq.size <= 1)
+          chanInfoSeq
+        else
+          chanInfoSeq.zipWithIndex.map { case (chanInfo, index) =>
+            new ChannelInfo(
+              chanInfo.comExpr,
+              chanInfo.channelType,
+              chanInfo.channelName + index,
+            )
+          }
+      ).toSeq
     val channelClasses = generateChannelClasses(indexedChannelInfo)
     (channelClasses, indexedChannelInfo)
   }
 
-  private def createThreadMethod(thread: Endpoint[Pre], threadRes: ThreadBuildingBlocks[Pre]) = {
+  private def createThreadMethod(
+      thread: Endpoint[Pre],
+      threadRes: ThreadBuildingBlocks[Pre],
+  ) = {
     threadRes.methods.map { preMethod =>
       val postMethod = getThreadMethodFromDecl(thread)(preMethod)
       threadMethodSucc.update((thread, preMethod), postMethod)
@@ -380,75 +611,147 @@ case class GenerateImplementation[Pre <: Generation]() extends Rewriter[Pre] wit
     }
   }
 
-  private def createThreadClass(thread: Endpoint[Pre], threadRes: ThreadBuildingBlocks[Pre], threadMethods: Seq[ClassDeclaration[Post]]): Unit = {
-    val threadConstr = createThreadClassConstructor(thread,threadRes.threadField)
+  private def createThreadClass(
+      thread: Endpoint[Pre],
+      threadRes: ThreadBuildingBlocks[Pre],
+      threadMethods: Seq[ClassDeclaration[Post]],
+  ): Unit = {
+    val threadConstr = createThreadClassConstructor(
+      thread,
+      threadRes.threadField,
+    )
     val threadRun = getThreadRunMethod(threadRes.runMethod)
     classDeclarations.scope {
-      val threadClass = new Class[Post](Seq(),
-        (threadRes.threadField +: threadRes.channelFields.values.toSeq) ++ (threadConstr +: threadRun +: threadMethods), Seq(), BooleanValue(true)(thread.o))(ThreadClassOrigin(thread))
+      val threadClass =
+        new Class[Post](
+          Seq(),
+          (threadRes.threadField +: threadRes.channelFields.values.toSeq) ++
+            (threadConstr +: threadRun +: threadMethods),
+          Seq(),
+          BooleanValue(true)(thread.o),
+        )(ThreadClassOrigin(thread))
       globalDeclarations.declare(threadClass)
       threadClassSucc.update(thread, threadClass)
     }
   }
 
-  private def createThreadClassConstructor(thread: Endpoint[Pre], threadField: InstanceField[Post]): JavaConstructor[Post] = {
-    val threadConstrArgBlocks = thread.args.map{
-      case l: Local[Pre] => (l.ref.decl.o.getPreferredNameOrElse(),dispatch(l.t))
-      case other => throw ParalleliseEndpointsError(other,"This node is expected to be an argument of seq_prog, and have type Local")
+  private def createThreadClassConstructor(
+      thread: Endpoint[Pre],
+      threadField: InstanceField[Post],
+  ): JavaConstructor[Post] = {
+    val threadConstrArgBlocks = thread.args.map {
+      case l: Local[Pre] =>
+        (l.ref.decl.o.getPreferredNameOrElse(), dispatch(l.t))
+      case other =>
+        throw ParalleliseEndpointsError(
+          other,
+          "This node is expected to be an argument of seq_prog, and have type Local",
+        )
     }
-    val threadConstrArgs: Seq[JavaParam[Post]] =
-      threadConstrArgBlocks.map{ case (a,t) => new JavaParam[Post](Seq.empty, a.camel, t)(ThreadClassOrigin(thread)) }
-    val passedArgs = threadConstrArgs.map(a => JavaLocal[Post](a.name)(null)(ThreadClassOrigin(thread)))
-    // TODO: The next check cannot fail anymore
-    val threadTypeName = thread.t match { //TODO: replace by using givenClassSucc
-      case tc: TClass[Pre] => tc.cls.decl.o.getPreferredNameOrElse()
-      case _ => throw ParalleliseEndpointsError(thread, "This type is expected to be a class")
+    val threadConstrArgs: Seq[JavaParam[Post]] = threadConstrArgBlocks.map {
+      case (a, t) =>
+        new JavaParam[Post](Seq.empty, a.camel, t)(ThreadClassOrigin(thread))
     }
+    val passedArgs = threadConstrArgs
+      .map(a => JavaLocal[Post](a.name)(null)(ThreadClassOrigin(thread)))
+    // TODO: The next check cannot fail anymore
+    val threadTypeName =
+      thread.t match { // TODO: replace by using givenClassSucc
+        case tc: TClass[Pre] => tc.cls.decl.o.getPreferredNameOrElse()
+        case _ =>
+          throw ParalleliseEndpointsError(
+            thread,
+            "This type is expected to be a class",
+          )
+      }
     val threadConstrBody = {
-      Assign(getThisVeyMontDeref(thread,ThreadClassOrigin(thread),threadField),
-      JavaInvocation[Post](None, Seq.empty, "new " + threadTypeName.ucamel, passedArgs, Seq.empty, Seq.empty)(null)(ThreadClassOrigin(thread)))(null)(ThreadClassOrigin(thread))
+      Assign(
+        getThisVeyMontDeref(thread, ThreadClassOrigin(thread), threadField),
+        JavaInvocation[Post](
+          None,
+          Seq.empty,
+          "new " + threadTypeName.ucamel,
+          passedArgs,
+          Seq.empty,
+          Seq.empty,
+        )(null)(ThreadClassOrigin(thread)),
+      )(null)(ThreadClassOrigin(thread))
     }
-    val threadConstrContract = new ApplicableContract[Post](
-      UnitAccountedPredicate[Post](BooleanValue(true)(ThreadClassOrigin(thread)))(ThreadClassOrigin(thread)),
-      UnitAccountedPredicate[Post](BooleanValue(true)(ThreadClassOrigin(thread)))(ThreadClassOrigin(thread)),
-      BooleanValue(true)(ThreadClassOrigin(thread)),
-      Seq.empty, Seq.empty, Seq.empty, None)(null)(ThreadClassOrigin(thread))
+    val threadConstrContract =
+      new ApplicableContract[Post](
+        UnitAccountedPredicate[Post](
+          BooleanValue(true)(ThreadClassOrigin(thread))
+        )(ThreadClassOrigin(thread)),
+        UnitAccountedPredicate[Post](
+          BooleanValue(true)(ThreadClassOrigin(thread))
+        )(ThreadClassOrigin(thread)),
+        BooleanValue(true)(ThreadClassOrigin(thread)),
+        Seq.empty,
+        Seq.empty,
+        Seq.empty,
+        None,
+      )(null)(ThreadClassOrigin(thread))
     new JavaConstructor[Post](
       Seq(JavaPublic[Post]()(ThreadClassOrigin(thread))),
       getThreadClassName(thread),
       threadConstrArgs,
-      Seq.empty, Seq.empty,
+      Seq.empty,
+      Seq.empty,
       threadConstrBody,
-      threadConstrContract)(ThreadClassOrigin(thread))(ThreadClassOrigin(thread))
+      threadConstrContract,
+    )(ThreadClassOrigin(thread))(ThreadClassOrigin(thread))
   }
 
-  private def getThreadMethodFromDecl(thread: Endpoint[Pre])(decl: ClassDeclaration[Pre]): InstanceMethod[Post]  = decl match {
-    case m: InstanceMethod[Pre] => getThreadMethod(m)
-    case _ => throw ParalleliseEndpointsError(thread, "Methods of seq_program need to be of type InstanceMethod")
-  }
+  private def getThreadMethodFromDecl(
+      thread: Endpoint[Pre]
+  )(decl: ClassDeclaration[Pre]): InstanceMethod[Post] =
+    decl match {
+      case m: InstanceMethod[Pre] => getThreadMethod(m)
+      case _ =>
+        throw ParalleliseEndpointsError(
+          thread,
+          "Methods of seq_program need to be of type InstanceMethod",
+        )
+    }
 
-  private def getChannelFields(thread: Endpoint[Pre], channelInfo: Seq[ChannelInfo[Pre]], channelClasses: Map[Type[Pre],JavaClass[Post]]): Map[(CommunicateX[Pre],Origin),InstanceField[Post]] = {
-    channelInfo
-      .filter( chanInfo => chanInfo.comExpr.receiver.decl == thread || chanInfo.comExpr.sender.decl == thread)
-      .map { chanInfo =>
-        val chanFieldOrigin = ChannelFieldOrigin(chanInfo.channelName,chanInfo.comExpr.assign)
-        val chanField = new InstanceField[Post](TVeyMontChannel(getChannelClassName(chanInfo.channelType)), Nil)(chanFieldOrigin)
-        ((chanInfo.comExpr, chanInfo.comExpr.o), chanField)
-      }.toMap
+  private def getChannelFields(
+      thread: Endpoint[Pre],
+      channelInfo: Seq[ChannelInfo[Pre]],
+      channelClasses: Map[Type[Pre], JavaClass[Post]],
+  ): Map[(CommunicateX[Pre], Origin), InstanceField[Post]] = {
+    channelInfo.filter(chanInfo =>
+      chanInfo.comExpr.receiver.decl == thread ||
+        chanInfo.comExpr.sender.decl == thread
+    ).map { chanInfo =>
+      val chanFieldOrigin = ChannelFieldOrigin(
+        chanInfo.channelName,
+        chanInfo.comExpr.assign,
+      )
+      val chanField =
+        new InstanceField[Post](
+          TVeyMontChannel(getChannelClassName(chanInfo.channelType)),
+          Nil,
+        )(chanFieldOrigin)
+      ((chanInfo.comExpr, chanInfo.comExpr.o), chanField)
+    }.toMap
   }
 
-  private def generateChannelClasses(channelInfo: Seq[ChannelInfo[Pre]]) : Map[Type[Pre],JavaClass[Post]] = {
+  private def generateChannelClasses(
+      channelInfo: Seq[ChannelInfo[Pre]]
+  ): Map[Type[Pre], JavaClass[Post]] = {
     val channelTypes = channelInfo.map(_.channelType).toSet
     channelTypes.map(channelType =>
       channelType -> {
-        val chanClassPre = (/* channelClass */ ???).asInstanceOf[JavaClass[Pre]]
+        val chanClassPre = ( /* channelClass */ ???)
+          .asInstanceOf[JavaClass[Pre]]
         val rw = ChannelClassGenerator(channelType)
         chanClassPre.rewrite(
           name = getChannelClassName(channelType),
           modifiers = Seq.empty,
-          decls = classDeclarations.collect {
-            chanClassPre.decls.foreach(d => rw.dispatch(d))
-          }._1
+          decls =
+            classDeclarations.collect {
+              chanClassPre.decls.foreach(d => rw.dispatch(d))
+            }._1,
         )(rw)
       }
     ).toMap
@@ -457,93 +760,147 @@ case class GenerateImplementation[Pre <: Generation]() extends Rewriter[Pre] wit
   case class ChannelClassGenerator(channelType: Type[_]) extends Rewriter[Pre] {
     override val allScopes = outer.allScopes
 
-    override def dispatch(t: Type[Pre]): Type[Post] = t match {
-      case jnt: JavaNamedType[Pre] =>
-        if (jnt.names.head._1 == "MessageType") {
-          dispatch(channelType.asInstanceOf[Type[Pre]])
-        } else rewriteDefault(jnt)
-      case _ => rewriteDefault(t)
-    }
+    override def dispatch(t: Type[Pre]): Type[Post] =
+      t match {
+        case jnt: JavaNamedType[Pre] =>
+          if (jnt.names.head._1 == "MessageType") {
+            dispatch(channelType.asInstanceOf[Type[Pre]])
+          } else
+            rewriteDefault(jnt)
+        case _ => rewriteDefault(t)
+      }
 
-    override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-      case jc: JavaConstructor[Pre] => classDeclarations.declare(jc.rewrite(name = getChannelClassName(channelType)))
-      case other => rewriteDefault(other)
-    }
+    override def dispatch(decl: Declaration[Pre]): Unit =
+      decl match {
+        case jc: JavaConstructor[Pre] =>
+          classDeclarations
+            .declare(jc.rewrite(name = getChannelClassName(channelType)))
+        case other => rewriteDefault(other)
+      }
   }
 
   private def collectChannelsFromMethods(seqProg: Choreography[Pre]) =
     seqProg.decls.flatMap {
       case m: InstanceMethod[Pre] =>
-        m.body.map(getChannelNamesAndTypes).getOrElse(throw ParalleliseEndpointsError(m, "Abstract methods are not supported inside `seq_prog`."))
-      case other => throw ParalleliseEndpointsError(other, "seq_program method expected")
+        m.body.map(getChannelNamesAndTypes).getOrElse(
+          throw ParalleliseEndpointsError(
+            m,
+            "Abstract methods are not supported inside `seq_prog`.",
+          )
+        )
+      case other =>
+        throw ParalleliseEndpointsError(other, "seq_program method expected")
     }
 
-  private def getChannelNamesAndTypes(s: Statement[Pre]): Seq[ChannelInfo[Pre]] = {
-    s.collect { case e@CommunicateX(recv, sender, chanType, assign) =>
-      new ChannelInfo(e,chanType, recv.decl.o.getPreferredNameOrElse().ucamel
-        + sender.decl.o.getPreferredNameOrElse().camel + "Channel")
+  private def getChannelNamesAndTypes(
+      s: Statement[Pre]
+  ): Seq[ChannelInfo[Pre]] = {
+    s.collect { case e @ CommunicateX(recv, sender, chanType, assign) =>
+      new ChannelInfo(
+        e,
+        chanType,
+        recv.decl.o.getPreferredNameOrElse().ucamel +
+          sender.decl.o.getPreferredNameOrElse().camel + "Channel",
+      )
     }
   }
 
-  private def getThreadMethod(method : InstanceMethod[Pre]): InstanceMethod[Post] = {
+  private def getThreadMethod(
+      method: InstanceMethod[Pre]
+  ): InstanceMethod[Post] = {
     new InstanceMethod[Post](
-        dispatch(method.returnType),
-        variables.dispatch(method.args),
-        variables.dispatch(method.outArgs),
-        variables.dispatch(method.typeArgs),
-        method.body.map(dispatch),
-        dispatch(method.contract))(method.blame)(method.o)
+      dispatch(method.returnType),
+      variables.dispatch(method.args),
+      variables.dispatch(method.outArgs),
+      variables.dispatch(method.typeArgs),
+      method.body.map(dispatch),
+      dispatch(method.contract),
+    )(method.blame)(method.o)
   }
 
   private def getThreadRunMethod(run: ChorRun[Pre]): InstanceMethod[Post] = {
     new InstanceMethod[Post](
       TVoid[Post](),
-      Seq.empty,Seq.empty,Seq.empty,
+      Seq.empty,
+      Seq.empty,
+      Seq.empty,
       Some(dispatch(run.body)),
-      dispatch(run.contract))(PanicBlame("TODO: Convert InstanceMethod blame to SeqRun blame")/* run.blame */)(RunMethodOrigin(run))
+      dispatch(run.contract),
+    )(PanicBlame(
+      "TODO: Convert InstanceMethod blame to SeqRun blame"
+    ) /* run.blame */ )(RunMethodOrigin(run))
   }
 
   def dispatchExpr(node: Expr[Pre]): Expr[Post] = {
-    if(threadBuildingBlocks.nonEmpty) {
+    if (threadBuildingBlocks.nonEmpty) {
       val thread = threadBuildingBlocks.top.thread
       node match {
         // TODO: Disabled this because the AST changed, repair
         // case c: SeqGuard[Pre] => paralleliseThreadCondition(node, thread, c)
         case m: MethodInvocation[Pre] => updateThreadRefMethodInvoc(thread, m)
         case d: Deref[Pre] => updateThreadRefInDeref(node, thread, d)
-        case t: EndpointName[Pre] => updateThreadRefVeyMontDeref(node, thread, t)
+        case t: EndpointName[Pre] =>
+          updateThreadRefVeyMontDeref(node, thread, t)
         case _ => rewriteDefault(node)
       }
-    } else rewriteDefault(node)
+    } else
+      rewriteDefault(node)
   }
 
-  private def updateThreadRefVeyMontDeref(node: Expr[Pre], thread: Endpoint[Pre], t: EndpointName[Pre]) = {
+  private def updateThreadRefVeyMontDeref(
+      node: Expr[Pre],
+      thread: Endpoint[Pre],
+      t: EndpointName[Pre],
+  ) = {
     if (t.ref.decl == thread) {
       getThisVeyMontDeref(thread, t.o, threadBuildingBlocks.top.threadField)
-    } else rewriteDefault(node)
+    } else
+      rewriteDefault(node)
   }
 
-  private def updateThreadRefInDeref(node: Expr[Pre], thread: Endpoint[Pre], d: Deref[Pre]) = {
+  private def updateThreadRefInDeref(
+      node: Expr[Pre],
+      thread: Endpoint[Pre],
+      d: Deref[Pre],
+  ) = {
     d.obj match {
       case t: EndpointName[Pre] if t.ref.decl == thread =>
-        d.rewrite(
-          obj = getThisVeyMontDeref(thread, d.o, threadBuildingBlocks.top.threadField)
+        d.rewrite(obj =
+          getThisVeyMontDeref(thread, d.o, threadBuildingBlocks.top.threadField)
         )
       case _ => rewriteDefault(node)
     }
   }
 
-  private def updateThreadRefMethodInvoc(thread: Endpoint[Pre], m: MethodInvocation[Pre]) = {
+  private def updateThreadRefMethodInvoc(
+      thread: Endpoint[Pre],
+      m: MethodInvocation[Pre],
+  ) = {
     m.obj match {
-      case threadRef: EndpointName[Pre] => ??? // m.rewrite(obj = EndpointNameExpr(dispatch(threadRef)))
-      case _ => threadMethodSucc.get((thread, m.ref.decl)) match {
-        case Some(postMethod) => m.rewrite(obj = dispatch(m.obj), ref = postMethod.ref[InstanceMethod[Post]], m.args.map(dispatch))
-        case None => throw ParalleliseEndpointsError(m, "No successor for this method found")
-      }
+      case threadRef: EndpointName[Pre] =>
+        ??? // m.rewrite(obj = EndpointNameExpr(dispatch(threadRef)))
+      case _ =>
+        threadMethodSucc.get((thread, m.ref.decl)) match {
+          case Some(postMethod) =>
+            m.rewrite(
+              obj = dispatch(m.obj),
+              ref = postMethod.ref[InstanceMethod[Post]],
+              m.args.map(dispatch),
+            )
+          case None =>
+            throw ParalleliseEndpointsError(
+              m,
+              "No successor for this method found",
+            )
+        }
     }
   }
 
-  private def paralleliseThreadCondition(node: Expr[Pre], thread: Endpoint[Pre], c: ChorGuard[Pre]) = {
+  private def paralleliseThreadCondition(
+      node: Expr[Pre],
+      thread: Endpoint[Pre],
+      c: ChorGuard[Pre],
+  ) = {
     ???
     // TODO: Broke this because AST changed, repair
 //    c.conditions.find { case (threadRef, _) =>
@@ -554,74 +911,158 @@ case class GenerateImplementation[Pre <: Generation]() extends Rewriter[Pre] wit
 //    }
   }
 
-  private def getThisVeyMontDeref(thread: Endpoint[Pre], o: Origin, threadField: InstanceField[Rewritten[Pre]]) = {
-    Deref(ThisObject(threadClassSucc.ref[Post, Class[Post]](thread))(thread.o), threadField.ref[InstanceField[Post]])(null)(o)
-  }
-
-  def dispatchStatement(st : Statement[Pre]) : Statement[Post] = {
-      if (threadBuildingBlocks.nonEmpty) {
-        val thread = threadBuildingBlocks.top.thread
-        st match {
-          case v: CommunicateX[Pre] =>
-            paralleliseVeyMontCommExpr(thread, v, createParComBlocks(thread, v))
-          case v@VeyMontAssignExpression(threadRef, assign) =>
-            if (threadRef.decl == thread)
-              dispatch(assign)
-            else Block(Seq.empty)(assign.o)
-          case a: Assign[Pre] => Assign(dispatch(a.target),dispatch(a.value))(a.blame)(a.o)
-          case Branch(_) => rewriteDefault(st)
-          case Loop(_, _, _, _, _) => rewriteDefault(st)
-          case Scope(_, _) => rewriteDefault(st)
-          case Block(_) => rewriteDefault(st)
-          case Eval(expr) => paralleliseMethodInvocation(st, thread, expr)
-          case _: Assert[Pre] => Block(Seq.empty)(st.o)
-          case _ => throw ParalleliseEndpointsError(st, "Statement not allowed in seq_program")
-        }
-      } else rewriteDefault(st)
-    }
+  private def getThisVeyMontDeref(
+      thread: Endpoint[Pre],
+      o: Origin,
+      threadField: InstanceField[Rewritten[Pre]],
+  ) = {
+    Deref(
+      ThisObject(threadClassSucc.ref[Post, Class[Post]](thread))(thread.o),
+      threadField.ref[InstanceField[Post]],
+    )(null)(o)
+  }
 
-  private def createParComBlocks(thread: Endpoint[Pre], v: CommunicateX[Pre]): ParallelCommExprBuildingBlocks[Pre] = {
+  def dispatchStatement(st: Statement[Pre]): Statement[Post] = {
+    if (threadBuildingBlocks.nonEmpty) {
+      val thread = threadBuildingBlocks.top.thread
+      st match {
+        case v: CommunicateX[Pre] =>
+          paralleliseVeyMontCommExpr(thread, v, createParComBlocks(thread, v))
+        case v @ VeyMontAssignExpression(threadRef, assign) =>
+          if (threadRef.decl == thread)
+            dispatch(assign)
+          else
+            Block(Seq.empty)(assign.o)
+        case a: Assign[Pre] =>
+          Assign(dispatch(a.target), dispatch(a.value))(a.blame)(a.o)
+        case Branch(_) => rewriteDefault(st)
+        case Loop(_, _, _, _, _) => rewriteDefault(st)
+        case Scope(_, _) => rewriteDefault(st)
+        case Block(_) => rewriteDefault(st)
+        case Eval(expr) => paralleliseMethodInvocation(st, thread, expr)
+        case _: Assert[Pre] => Block(Seq.empty)(st.o)
+        case _ =>
+          throw ParalleliseEndpointsError(
+            st,
+            "Statement not allowed in seq_program",
+          )
+      }
+    } else
+      rewriteDefault(st)
+  }
+
+  private def createParComBlocks(
+      thread: Endpoint[Pre],
+      v: CommunicateX[Pre],
+  ): ParallelCommExprBuildingBlocks[Pre] = {
     val channelField = threadBuildingBlocks.top.channelFields((v, v.o))
     val channelClass = threadBuildingBlocks.top.channelClasses(v.chanType)
-    val thisChanField = Deref(ThisObject(threadClassSucc.ref[Post, Class[Post]](thread))(thread.o), channelField.ref[InstanceField[Post]])(null)(v.assign.o)
+    val thisChanField =
+      Deref(
+        ThisObject(threadClassSucc.ref[Post, Class[Post]](thread))(thread.o),
+        channelField.ref[InstanceField[Post]],
+      )(null)(v.assign.o)
     val assignment = v.assign.asInstanceOf[Assign[Pre]]
-    new ParallelCommExprBuildingBlocks(channelField, channelClass, thisChanField, assignment)
+    new ParallelCommExprBuildingBlocks(
+      channelField,
+      channelClass,
+      thisChanField,
+      assignment,
+    )
   }
 
-  private def paralleliseMethodInvocation(st: Statement[Pre], thread: Endpoint[Pre], expr: Expr[Pre]): Statement[Post] = {
+  private def paralleliseMethodInvocation(
+      st: Statement[Pre],
+      thread: Endpoint[Pre],
+      expr: Expr[Pre],
+  ): Statement[Post] = {
     expr match {
-      case m: MethodInvocation[Pre] => m.obj match {
-        case _: ThisChoreography[Pre] => Eval(m.rewrite(obj = ThisObject(threadClassSucc.ref[Post, Class[Post]](thread))(thread.o), ref = threadMethodSucc.ref[Post, InstanceMethod[Post]]((thread, m.ref.decl))))(st.o)
+      case m: MethodInvocation[Pre] =>
+        m.obj match {
+          case _: ThisChoreography[Pre] =>
+            Eval(m.rewrite(
+              obj =
+                ThisObject(threadClassSucc.ref[Post, Class[Post]](thread))(
+                  thread.o
+                ),
+              ref = threadMethodSucc
+                .ref[Post, InstanceMethod[Post]]((thread, m.ref.decl)),
+            ))(st.o)
 //        case EndpointNameExpr(d: EndpointName[Pre]) => ??? // if (d.ref.decl == thread) Eval(dispatch(expr))(st.o) else Block(Seq.empty)(st.o)
-        case _ => throw ParalleliseEndpointsError(st, "Statement not allowed in seq_program")
-      }
-      case _ => throw ParalleliseEndpointsError(st, "Statement not allowed in seq_program")
+          case _ =>
+            throw ParalleliseEndpointsError(
+              st,
+              "Statement not allowed in seq_program",
+            )
+        }
+      case _ =>
+        throw ParalleliseEndpointsError(
+          st,
+          "Statement not allowed in seq_program",
+        )
     }
   }
 
-  private def paralleliseVeyMontCommExpr(thread: Endpoint[Pre], v: CommunicateX[Pre], blocks: ParallelCommExprBuildingBlocks[Pre]): Statement[Post] = {
+  private def paralleliseVeyMontCommExpr(
+      thread: Endpoint[Pre],
+      v: CommunicateX[Pre],
+      blocks: ParallelCommExprBuildingBlocks[Pre],
+  ): Statement[Post] = {
     if (v.receiver.decl == thread) {
-      val readMethod = findChannelClassMethod(v, blocks.channelClass, "readValue")
-      val assignValue = JavaInvocation(Some(blocks.thisChanField), Seq.empty, "readValue", Seq.empty, Seq.empty, Seq.empty)(null)(v.o)
+      val readMethod = findChannelClassMethod(
+        v,
+        blocks.channelClass,
+        "readValue",
+      )
+      val assignValue =
+        JavaInvocation(
+          Some(blocks.thisChanField),
+          Seq.empty,
+          "readValue",
+          Seq.empty,
+          Seq.empty,
+          Seq.empty,
+        )(null)(v.o)
       assignValue.ref = Some(RefJavaMethod(readMethod))
       Assign(dispatch(blocks.assign.target), assignValue)(null)(v.o)
     } else if (v.sender.decl == thread) {
-      val writeMethod = findChannelClassMethod(v, blocks.channelClass, "writeValue")
-      val writeInvoc = JavaInvocation(Some(blocks.thisChanField), Seq.empty, "writeValue", Seq(dispatch(blocks.assign.value)), Seq.empty, Seq.empty)(null)(v.o)
+      val writeMethod = findChannelClassMethod(
+        v,
+        blocks.channelClass,
+        "writeValue",
+      )
+      val writeInvoc =
+        JavaInvocation(
+          Some(blocks.thisChanField),
+          Seq.empty,
+          "writeValue",
+          Seq(dispatch(blocks.assign.value)),
+          Seq.empty,
+          Seq.empty,
+        )(null)(v.o)
       writeInvoc.ref = Some(RefJavaMethod(writeMethod))
       Eval(writeInvoc)(v.o)
-    }
-    else Block(Seq.empty)(blocks.assign.o)
+    } else
+      Block(Seq.empty)(blocks.assign.o)
   }
 
-  private def findChannelClassMethod(v: CommunicateX[Pre], channelClass: JavaClass[Post], methodName: String): JavaMethod[Post] = {
+  private def findChannelClassMethod(
+      v: CommunicateX[Pre],
+      channelClass: JavaClass[Post],
+      methodName: String,
+  ): JavaMethod[Post] = {
     val method = channelClass.decls.find {
       case jm: JavaMethod[Post] => jm.name == methodName
       case _ => false
     }
     method match {
-      case Some(m : JavaMethod[Post]) => m
-      case _ => throw ParalleliseEndpointsError(v, "Could not find method `" + methodName + "' for channel class " + channelClass.name)
+      case Some(m: JavaMethod[Post]) => m
+      case _ =>
+        throw ParalleliseEndpointsError(
+          v,
+          "Could not find method `" + methodName + "' for channel class " +
+            channelClass.name,
+        )
     }
   }
 
diff --git a/src/rewrite/vct/rewrite/veymont/InferEndpointContexts.scala b/src/rewrite/vct/rewrite/veymont/InferEndpointContexts.scala
index 27e66f28bd..3edce218ae 100644
--- a/src/rewrite/vct/rewrite/veymont/InferEndpointContexts.scala
+++ b/src/rewrite/vct/rewrite/veymont/InferEndpointContexts.scala
@@ -2,7 +2,69 @@ package vct.rewrite.veymont
 
 import com.typesafe.scalalogging.LazyLogging
 import hre.util.ScopedStack
-import vct.col.ast.{AbstractRewriter, AmbiguousLocation, ApplicableContract, Assert, Assign, Block, BooleanValue, Branch, ChorGuard, ChorPerm, ChorRun, ChorStatement, Choreography, Class, ClassDeclaration, Communicate, CommunicateStatement, CommunicateX, ConstructorInvocation, Declaration, Deref, Endpoint, EndpointName, Eval, Expr, FieldLocation, Fork, InstanceField, InstanceMethod, JavaClass, JavaConstructor, JavaInvocation, JavaLocal, JavaMethod, JavaNamedType, JavaParam, JavaPublic, JavaTClass, Join, Local, Location, Loop, MethodInvocation, NewObject, Node, Null, Perm, Procedure, Program, RunMethod, Scope, Statement, TClass, TVeyMontChannel, TVoid, ThisChoreography, ThisObject, Type, UnitAccountedPredicate, Variable, VeyMontAssignExpression}
+import vct.col.ast.{
+  AbstractRewriter,
+  AmbiguousLocation,
+  ApplicableContract,
+  Assert,
+  Assign,
+  Block,
+  BooleanValue,
+  Branch,
+  ChorGuard,
+  ChorPerm,
+  ChorRun,
+  ChorStatement,
+  Choreography,
+  Class,
+  ClassDeclaration,
+  Communicate,
+  CommunicateStatement,
+  CommunicateX,
+  ConstructorInvocation,
+  Declaration,
+  Deref,
+  Endpoint,
+  EndpointName,
+  Eval,
+  Expr,
+  FieldLocation,
+  Fork,
+  InstanceField,
+  InstanceMethod,
+  JavaClass,
+  JavaConstructor,
+  JavaInvocation,
+  JavaLocal,
+  JavaMethod,
+  JavaNamedType,
+  JavaParam,
+  JavaPublic,
+  JavaTClass,
+  Join,
+  Local,
+  Location,
+  Loop,
+  MethodInvocation,
+  NewObject,
+  Node,
+  Null,
+  Perm,
+  Procedure,
+  Program,
+  RunMethod,
+  Scope,
+  Statement,
+  TClass,
+  TVeyMontChannel,
+  TVoid,
+  ThisChoreography,
+  ThisObject,
+  Type,
+  UnitAccountedPredicate,
+  Variable,
+  VeyMontAssignExpression,
+}
 import vct.col.origin.{AssignLocalOk, Origin, PanicBlame}
 import vct.col.ref.Ref
 import vct.col.resolve.ctx.RefJavaMethod
@@ -11,27 +73,50 @@ import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, Rewritten}
 import vct.col.util.SuccessionMap
 import vct.col.util.AstBuildHelpers._
 import vct.result.VerificationError.{SystemError, Unreachable, UserError}
-import vct.rewrite.veymont.GenerateImplementation.{ChannelFieldOrigin, ParalleliseEndpointsError, RunMethodOrigin, ThreadClassOrigin, getChannelClassName, getThreadClassName, getVarName}
-import vct.rewrite.veymont.InferEndpointContexts.{EndpointInferenceUndefined, MultipleImplicitEndpointsError, NoImplicitEndpointError, getEndpoint}
+import vct.rewrite.veymont.GenerateImplementation.{
+  ChannelFieldOrigin,
+  ParalleliseEndpointsError,
+  RunMethodOrigin,
+  ThreadClassOrigin,
+  getChannelClassName,
+  getThreadClassName,
+  getVarName,
+}
+import vct.rewrite.veymont.InferEndpointContexts.{
+  EndpointInferenceUndefined,
+  MultipleImplicitEndpointsError,
+  NoImplicitEndpointError,
+  getEndpoint,
+}
 
 import scala.collection.mutable
 
 object InferEndpointContexts extends RewriterBuilder {
   override def key: String = "inferEndpointContexts"
-  override def desc: String = "Infer endpoint context for ChorStatement nodes that require one but do not have it yet, such as assignment."
+  override def desc: String =
+    "Infer endpoint context for ChorStatement nodes that require one but do not have it yet, such as assignment."
 
   case class NoImplicitEndpointError(expr: Expr[_]) extends UserError {
     override def code: String = "noImplicitEndpoint"
-    override def text: String = expr.o.messageInContext("Cannot infer an endpoint context for this expression.")
+    override def text: String =
+      expr.o.messageInContext(
+        "Cannot infer an endpoint context for this expression."
+      )
   }
 
   case class MultipleImplicitEndpointsError(expr: Expr[_]) extends UserError {
     override def code: String = "multipleImplicitEndpoints"
-    override def text: String = expr.o.messageInContext("This expression references multiple distinct endpoints, whereas only one is expected.")
+    override def text: String =
+      expr.o.messageInContext(
+        "This expression references multiple distinct endpoints, whereas only one is expected."
+      )
   }
 
   case class EndpointInferenceUndefined(stmt: Node[_]) extends SystemError {
-    override def text: String = stmt.o.messageInContext("It is not defined whether an endpoint context should be inferred for this node")
+    override def text: String =
+      stmt.o.messageInContext(
+        "It is not defined whether an endpoint context should be inferred for this node"
+      )
   }
 
   def getEndpoints[G](expr: Expr[G]): Seq[Endpoint[G]] =
@@ -39,55 +124,67 @@ object InferEndpointContexts extends RewriterBuilder {
       case EndpointName(Ref(endpoint)) => endpoint
     }).toSeq
 
-  def getEndpoint[G](expr: Expr[G]): Endpoint[G] = getEndpoints(expr) match {
-    case Seq(endpoint) => endpoint
-    case Seq() => throw NoImplicitEndpointError(expr)
-    case _ => throw MultipleImplicitEndpointsError(expr)
-  }
+  def getEndpoint[G](expr: Expr[G]): Endpoint[G] =
+    getEndpoints(expr) match {
+      case Seq(endpoint) => endpoint
+      case Seq() => throw NoImplicitEndpointError(expr)
+      case _ => throw MultipleImplicitEndpointsError(expr)
+    }
 
-  def getEndpoint[G](loc: Location[G]): Endpoint[G] = loc match {
-    case FieldLocation(obj, _) => getEndpoint(obj)
-    case AmbiguousLocation(deref) => getEndpoint(deref)
-    case _ => throw EndpointInferenceUndefined(loc)
-  }
+  def getEndpoint[G](loc: Location[G]): Endpoint[G] =
+    loc match {
+      case FieldLocation(obj, _) => getEndpoint(obj)
+      case AmbiguousLocation(deref) => getEndpoint(deref)
+      case _ => throw EndpointInferenceUndefined(loc)
+    }
 }
 
-case class InferEndpointContexts[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging {
+case class InferEndpointContexts[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging {
   val inChor = ScopedStack[Boolean]()
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case chor: Choreography[Pre] =>
-      chor.rewrite(
-        preRun = inChor.having(true) { chor.preRun.map(dispatch) },
-        run = inChor.having(true) { dispatch(chor.run) }
-      ).succeed(chor)
-    case comm: Communicate[Pre] =>
-      implicit val o = comm.o
-      comm.rewrite(
-        receiver = comm.receiver.map(_.decl).orElse(Some(getEndpoint[Pre](comm.target))).map(succ[Endpoint[Post]](_)),
-        sender = comm.sender.map(_.decl).orElse(Some(getEndpoint[Pre](comm.msg))).map(succ[Endpoint[Post]](_)),
-      ).succeed(comm)
-    case _ => super.dispatch(decl)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case chor: Choreography[Pre] =>
+        chor.rewrite(
+          preRun = inChor.having(true) { chor.preRun.map(dispatch) },
+          run = inChor.having(true) { dispatch(chor.run) },
+        ).succeed(chor)
+      case comm: Communicate[Pre] =>
+        implicit val o = comm.o
+        comm.rewrite(
+          receiver = comm.receiver.map(_.decl)
+            .orElse(Some(getEndpoint[Pre](comm.target)))
+            .map(succ[Endpoint[Post]](_)),
+          sender = comm.sender.map(_.decl)
+            .orElse(Some(getEndpoint[Pre](comm.msg)))
+            .map(succ[Endpoint[Post]](_)),
+        ).succeed(comm)
+      case _ => super.dispatch(decl)
+    }
 
-  override def dispatch(stmt: Statement[Pre]): Statement[Post] = stmt match {
-    // Whitelist statements that do not need a context
-    case s @ ChorStatement(None, assign: Assign[Pre]) =>
-      val endpoint: Endpoint[Pre] = getEndpoint(assign.target)
-      s.rewrite(endpoint = Some(succ(endpoint)))
-    case s @ ChorStatement(None, assert: Assert[Pre]) =>
-      val endpoint: Endpoint[Pre] = getEndpoint(assert.expr)
-      s.rewrite(endpoint = Some(succ(endpoint)))
-    case s @ ChorStatement(None, Eval(invoke: MethodInvocation[Pre])) =>
-      val endpoint: Endpoint[Pre] = getEndpoint(invoke.obj)
-      s.rewrite(endpoint = Some(succ(endpoint)))
-    case s @ ChorStatement(None, _) => throw EndpointInferenceUndefined(s)
-    case s => s.rewriteDefault()
-  }
+  override def dispatch(stmt: Statement[Pre]): Statement[Post] =
+    stmt match {
+      // Whitelist statements that do not need a context
+      case s @ ChorStatement(None, assign: Assign[Pre]) =>
+        val endpoint: Endpoint[Pre] = getEndpoint(assign.target)
+        s.rewrite(endpoint = Some(succ(endpoint)))
+      case s @ ChorStatement(None, assert: Assert[Pre]) =>
+        val endpoint: Endpoint[Pre] = getEndpoint(assert.expr)
+        s.rewrite(endpoint = Some(succ(endpoint)))
+      case s @ ChorStatement(None, Eval(invoke: MethodInvocation[Pre])) =>
+        val endpoint: Endpoint[Pre] = getEndpoint(invoke.obj)
+        s.rewrite(endpoint = Some(succ(endpoint)))
+      case s @ ChorStatement(None, _) => throw EndpointInferenceUndefined(s)
+      case s => s.rewriteDefault()
+    }
 
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = expr match {
-    case p @ Perm(loc, perm) if inChor.topOption.contains(true) =>
-      ChorPerm[Post](succ(getEndpoint(loc)), dispatch(loc), dispatch(perm))(p.o)
-    case _ => expr.rewriteDefault()
-  }
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case p @ Perm(loc, perm) if inChor.topOption.contains(true) =>
+        ChorPerm[Post](succ(getEndpoint(loc)), dispatch(loc), dispatch(perm))(
+          p.o
+        )
+      case _ => expr.rewriteDefault()
+    }
 }
diff --git a/src/rewrite/vct/rewrite/veymont/ParallelCommExprBuildingBlocks.scala b/src/rewrite/vct/rewrite/veymont/ParallelCommExprBuildingBlocks.scala
index 9faf3047be..06bf399cde 100644
--- a/src/rewrite/vct/rewrite/veymont/ParallelCommExprBuildingBlocks.scala
+++ b/src/rewrite/vct/rewrite/veymont/ParallelCommExprBuildingBlocks.scala
@@ -3,7 +3,9 @@ package vct.rewrite.veymont
 import vct.col.ast.{Assign, Deref, InstanceField, JavaClass}
 import vct.col.rewrite.{Generation, Rewritten}
 
-class ParallelCommExprBuildingBlocks[Pre <: Generation](val channelField: InstanceField[Rewritten[Pre]], val channelClass: JavaClass[Rewritten[Pre]],
-                                                         val thisChanField: Deref[Rewritten[Pre]], val assign: Assign[Pre] ) {
-
-}
+class ParallelCommExprBuildingBlocks[Pre <: Generation](
+    val channelField: InstanceField[Rewritten[Pre]],
+    val channelClass: JavaClass[Rewritten[Pre]],
+    val thisChanField: Deref[Rewritten[Pre]],
+    val assign: Assign[Pre],
+) {}
diff --git a/src/rewrite/vct/rewrite/veymont/SpecializeEndpointClasses.scala b/src/rewrite/vct/rewrite/veymont/SpecializeEndpointClasses.scala
index 96d1e52ab5..177c4064b5 100644
--- a/src/rewrite/vct/rewrite/veymont/SpecializeEndpointClasses.scala
+++ b/src/rewrite/vct/rewrite/veymont/SpecializeEndpointClasses.scala
@@ -3,12 +3,75 @@ package vct.rewrite.veymont
 import com.typesafe.scalalogging.LazyLogging
 import hre.util.ScopedStack
 import vct.col.ast.util.Declarator
-import vct.col.ast.{AbstractRewriter, ApplicableContract, Assert, Assign, Block, BooleanValue, Branch, ChorGuard, ChorRun, ChorStatement, Choreography, Class, ClassDeclaration, Communicate, CommunicateX, Constructor, ConstructorInvocation, Declaration, Deref, Endpoint, EndpointName, Eval, Expr, GlobalDeclaration, InstanceField, InstanceMethod, JavaClass, JavaConstructor, JavaInvocation, JavaLocal, JavaMethod, JavaNamedType, JavaParam, JavaPublic, JavaTClass, Local, LocalDecl, Loop, MethodInvocation, NewObject, Node, Procedure, Program, RunMethod, Scope, Statement, TClass, TVeyMontChannel, TVoid, ThisChoreography, ThisObject, Type, UnitAccountedPredicate, Variable, VeyMontAssignExpression, WritePerm}
+import vct.col.ast.{
+  AbstractRewriter,
+  ApplicableContract,
+  Assert,
+  Assign,
+  Block,
+  BooleanValue,
+  Branch,
+  ChorGuard,
+  ChorRun,
+  ChorStatement,
+  Choreography,
+  Class,
+  ClassDeclaration,
+  Communicate,
+  CommunicateX,
+  Constructor,
+  ConstructorInvocation,
+  Declaration,
+  Deref,
+  Endpoint,
+  EndpointName,
+  Eval,
+  Expr,
+  GlobalDeclaration,
+  InstanceField,
+  InstanceMethod,
+  JavaClass,
+  JavaConstructor,
+  JavaInvocation,
+  JavaLocal,
+  JavaMethod,
+  JavaNamedType,
+  JavaParam,
+  JavaPublic,
+  JavaTClass,
+  Local,
+  LocalDecl,
+  Loop,
+  MethodInvocation,
+  NewObject,
+  Node,
+  Procedure,
+  Program,
+  RunMethod,
+  Scope,
+  Statement,
+  TClass,
+  TVeyMontChannel,
+  TVoid,
+  ThisChoreography,
+  ThisObject,
+  Type,
+  UnitAccountedPredicate,
+  Variable,
+  VeyMontAssignExpression,
+  WritePerm,
+}
 import vct.col.origin.{Name, Origin, PanicBlame, SourceName}
 import vct.col.ref.Ref
 import vct.col.resolve.ctx.RefJavaMethod
 import vct.col.rewrite.adt.{ImportADT, ImportADTImporter}
-import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder, RewriterBuilderArg, Rewritten}
+import vct.col.rewrite.{
+  Generation,
+  Rewriter,
+  RewriterBuilder,
+  RewriterBuilderArg,
+  Rewritten,
+}
 import vct.col.util.SuccessionMap
 import vct.result.VerificationError.{Unreachable, UserError}
 import vct.col.util.AstBuildHelpers._
@@ -16,71 +79,93 @@ import vct.result.VerificationError
 
 object SpecializeEndpointClasses extends RewriterBuilder {
   override def key: String = "specializeEndpointClasses"
-  override def desc: String = "Replaces classes of endpoints with new classes that contain an instance of the original class, allowing for further transformation of the endpoint class. Also generates auxiliary annotations for endpoints, such as distinctness."
+  override def desc: String =
+    "Replaces classes of endpoints with new classes that contain an instance of the original class, allowing for further transformation of the endpoint class. Also generates auxiliary annotations for endpoints, such as distinctness."
 }
 
-case class SpecializeEndpointClasses[Pre <: Generation]() extends Rewriter[Pre] with LazyLogging with VeymontContext[Pre] {
+case class SpecializeEndpointClasses[Pre <: Generation]()
+    extends Rewriter[Pre] with LazyLogging with VeymontContext[Pre] {
 
   val implFieldOfEndpoint = SuccessionMap[Endpoint[Pre], InstanceField[Post]]()
   val classOfEndpoint = SuccessionMap[Endpoint[Pre], Class[Post]]()
 
-  override def dispatch(expr: Expr[Pre]): Expr[Post] = expr match {
-    case name @ EndpointName(Ref(endpoint)) =>
-      implicit val o = name.o
-      Deref[Post](name.rewriteDefault(), implFieldOfEndpoint.ref(endpoint))(PanicBlame("Should be safe"))
-    case _ => expr.rewriteDefault()
-  }
-
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case chor: Choreography[Pre] => currentChoreography.having(chor) {
-      super.dispatch(chor)
+  override def dispatch(expr: Expr[Pre]): Expr[Post] =
+    expr match {
+      case name @ EndpointName(Ref(endpoint)) =>
+        implicit val o = name.o
+        Deref[Post](name.rewriteDefault(), implFieldOfEndpoint.ref(endpoint))(
+          PanicBlame("Should be safe")
+        )
+      case _ => expr.rewriteDefault()
     }
 
-    case endpoint: Endpoint[Pre] =>
-      implicit val o = endpoint.o
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case chor: Choreography[Pre] =>
+        currentChoreography.having(chor) { super.dispatch(chor) }
 
-      val implField = new InstanceField[Post](dispatch(endpoint.t), Seq())(o.where(name = "impl"))
-      implFieldOfEndpoint(endpoint) = implField
+      case endpoint: Endpoint[Pre] =>
+        implicit val o = endpoint.o
 
-      val constructor: Constructor[Post] = {
-        val implArg = new Variable(dispatch(endpoint.t))
-        val `this` = new ThisObject[Post](classOfEndpoint.ref(endpoint))
-        new Constructor[Post](
-          cls = classOfEndpoint.ref(endpoint),
-          args = Seq(implArg),
-          contract = contract[Post](
-            blame = PanicBlame("TODO"),
-            ensures = UnitAccountedPredicate(
-              fieldPerm[Post](`this`, implField.ref, WritePerm()) &*
-                (Deref[Post](`this`, implField.ref)(PanicBlame("Deref cannot fail")) === implArg.get))
-          ),
-          body = Some(assignField[Post](ThisObject(classOfEndpoint.ref(endpoint)), implField.ref, implArg.get, PanicBlame("Cannot fail"))),
-          outArgs = Seq(), typeArgs = Seq(),
-        )(PanicBlame("Postcondition cannot fail"))
-      }
+        val implField =
+          new InstanceField[Post](dispatch(endpoint.t), Seq())(
+            o.where(name = "impl")
+          )
+        implFieldOfEndpoint(endpoint) = implField
 
-      val wrapperClass = new Class[Post](
-        typeArgs = Seq(), supports = Seq(), intrinsicLockInvariant = tt,
-        decls = Seq(
-          implField,
-          constructor
-        )
-      )(endpoint.o.where(indirect = Name.names(Name("Endpoint"), endpoint.o.getPreferredNameOrElse())))
-      classOfEndpoint(endpoint) = wrapperClass
-      globalDeclarations.declare(wrapperClass)
+        val constructor: Constructor[Post] = {
+          val implArg = new Variable(dispatch(endpoint.t))
+          val `this` = new ThisObject[Post](classOfEndpoint.ref(endpoint))
+          new Constructor[Post](
+            cls = classOfEndpoint.ref(endpoint),
+            args = Seq(implArg),
+            contract = contract[Post](
+              blame = PanicBlame("TODO"),
+              ensures = UnitAccountedPredicate(
+                fieldPerm[Post](`this`, implField.ref, WritePerm()) &*
+                  (Deref[Post](`this`, implField.ref)(PanicBlame(
+                    "Deref cannot fail"
+                  )) === implArg.get)
+              ),
+            ),
+            body = Some(assignField[Post](
+              ThisObject(classOfEndpoint.ref(endpoint)),
+              implField.ref,
+              implArg.get,
+              PanicBlame("Cannot fail"),
+            )),
+            outArgs = Seq(),
+            typeArgs = Seq(),
+          )(PanicBlame("Postcondition cannot fail"))
+        }
+
+        val wrapperClass =
+          new Class[Post](
+            typeArgs = Seq(),
+            supports = Seq(),
+            intrinsicLockInvariant = tt,
+            decls = Seq(implField, constructor),
+          )(endpoint.o.where(indirect =
+            Name.names(Name("Endpoint"), endpoint.o.getPreferredNameOrElse())
+          ))
+        classOfEndpoint(endpoint) = wrapperClass
+        globalDeclarations.declare(wrapperClass)
 
-      allScopes.anySucceed(endpoint, endpoint.rewrite[Post](
-        cls = wrapperClass.ref,
-        typeArgs = Seq(),
-        constructor = constructor.ref,
-        args = Seq(constructorInvocation[Post](
-          ref = succ(endpoint.constructor.decl),
-          classTypeArgs = endpoint.typeArgs.map(dispatch),
-          args = endpoint.args.map(dispatch),
-          blame = PanicBlame("Not implemented")
-        )),
-        blame = PanicBlame("Unreachable")
-      ))
-    case _ => super.dispatch(decl)
-  }
+        allScopes.anySucceed(
+          endpoint,
+          endpoint.rewrite[Post](
+            cls = wrapperClass.ref,
+            typeArgs = Seq(),
+            constructor = constructor.ref,
+            args = Seq(constructorInvocation[Post](
+              ref = succ(endpoint.constructor.decl),
+              classTypeArgs = endpoint.typeArgs.map(dispatch),
+              args = endpoint.args.map(dispatch),
+              blame = PanicBlame("Not implemented"),
+            )),
+            blame = PanicBlame("Unreachable"),
+          ),
+        )
+      case _ => super.dispatch(decl)
+    }
 }
diff --git a/src/rewrite/vct/rewrite/veymont/SplitChorGuards.scala b/src/rewrite/vct/rewrite/veymont/SplitChorGuards.scala
index 410e5c13a9..71071f76ff 100644
--- a/src/rewrite/vct/rewrite/veymont/SplitChorGuards.scala
+++ b/src/rewrite/vct/rewrite/veymont/SplitChorGuards.scala
@@ -9,25 +9,33 @@ import vct.col.ref.Ref
 import vct.col.rewrite.{Generation, Rewriter, RewriterBuilder}
 import vct.col.util.AstBuildHelpers._
 import vct.result.VerificationError.UserError
-import vct.rewrite.veymont.SplitChorGuards.{MultipleEndpoints, SeqProgParticipantErrors}
+import vct.rewrite.veymont.SplitChorGuards.{
+  MultipleEndpoints,
+  SeqProgParticipantErrors,
+}
 
 import scala.collection.immutable.ListSet
 import scala.collection.mutable
 
 object SplitChorGuards extends RewriterBuilder {
   override def key: String = "splitChorGuards"
-  override def desc: String = "Lifts conditions in loops and conditionals into the ChorGuard AST node, stratifying the condition per endpoint."
+  override def desc: String =
+    "Lifts conditions in loops and conditionals into the ChorGuard AST node, stratifying the condition per endpoint."
 
   case class MultipleEndpoints(e: Expr[_]) extends UserError {
     override def code: String = "multipleEndpoints"
-    override def text: String = e.o.messageInContext("This expression references multiple endpoints, but that is not yet supported.")
+    override def text: String =
+      e.o.messageInContext(
+        "This expression references multiple endpoints, but that is not yet supported."
+      )
   }
 
-  case class SeqProgParticipantErrors(es: Seq[SeqProgParticipant]) extends UserError {
+  case class SeqProgParticipantErrors(es: Seq[SeqProgParticipant])
+      extends UserError {
     override def code: String = "seqProgParticipantErrors"
-    override def text: String = es.map {
-      case err: SeqProgParticipant => err.message { n => n.o }
-    }.mkString("\n")
+    override def text: String =
+      es.map { case err: SeqProgParticipant => err.message { n => n.o } }
+        .mkString("\n")
   }
 }
 
@@ -38,44 +46,49 @@ case class SplitChorGuards[Pre <: Generation]() extends Rewriter[Pre] {
   override def dispatch(prog: Program[Pre]): Program[Post] = {
     val newProg = prog.rewrite()
     val errors = newProg.check
-    val seqBranchErrors = errors.collect {
-      case err: SeqProgParticipant => err
-    }
+    val seqBranchErrors = errors.collect { case err: SeqProgParticipant => err }
     if (errors.nonEmpty && errors.length == seqBranchErrors.length) {
       throw SeqProgParticipantErrors(seqBranchErrors)
     }
     newProg
   }
 
-  override def dispatch(decl: Declaration[Pre]): Unit = decl match {
-    case prog: Choreography[Pre] =>
-      currentProg.having(prog) {
-        rewriteDefault(prog)
-      }
-    case decl => rewriteDefault(decl)
-  }
+  override def dispatch(decl: Declaration[Pre]): Unit =
+    decl match {
+      case prog: Choreography[Pre] =>
+        currentProg.having(prog) { rewriteDefault(prog) }
+      case decl => rewriteDefault(decl)
+    }
 
-  override def dispatch(statement: Statement[Pre]): Statement[Post] = statement match {
-    case branch: UnresolvedChorBranch[Pre] =>
-      assert(branch.branches.nonEmpty)
-      unfoldBranch(branch.branches)(branch.blame, branch.o)
+  override def dispatch(statement: Statement[Pre]): Statement[Post] =
+    statement match {
+      case branch: UnresolvedChorBranch[Pre] =>
+        assert(branch.branches.nonEmpty)
+        unfoldBranch(branch.branches)(branch.blame, branch.o)
 
-    case loop: UnresolvedChorLoop[Pre] if currentProg.nonEmpty =>
-      ChorLoop(
-        inferSeqGuard(loop.cond),
-        dispatch(loop.contract),
-        dispatch(loop.body)
-      )(loop.blame)(loop.o)
+      case loop: UnresolvedChorLoop[Pre] if currentProg.nonEmpty =>
+        ChorLoop(
+          inferSeqGuard(loop.cond),
+          dispatch(loop.contract),
+          dispatch(loop.body),
+        )(loop.blame)(loop.o)
 
-    case statement => rewriteDefault(statement)
-  }
+      case statement => rewriteDefault(statement)
+    }
 
-  def unfoldBranch(branches: Seq[(Expr[Pre], Statement[Pre])])(implicit blame: Blame[SeqBranchFailure], o: Origin): ChorBranch[Post] = branches match {
-    case Seq((e, s)) => ChorBranch(inferSeqGuard(e), dispatch(s), None)(blame)
-    case (e, s) +: (otherYes +: branches) =>
-      ChorBranch(inferSeqGuard(e), dispatch(s), Some(unfoldBranch(otherYes +: branches)))(blame)
-    case _ => ???
-  }
+  def unfoldBranch(
+      branches: Seq[(Expr[Pre], Statement[Pre])]
+  )(implicit blame: Blame[SeqBranchFailure], o: Origin): ChorBranch[Post] =
+    branches match {
+      case Seq((e, s)) => ChorBranch(inferSeqGuard(e), dispatch(s), None)(blame)
+      case (e, s) +: (otherYes +: branches) =>
+        ChorBranch(
+          inferSeqGuard(e),
+          dispatch(s),
+          Some(unfoldBranch(otherYes +: branches)),
+        )(blame)
+      case _ => ???
+    }
 
   // Infer guard conditions based on the classic syntactical restrictions - endpoint dereferences determine which
   // endpoint is evaluating the expression.
@@ -83,11 +96,15 @@ case class SplitChorGuards[Pre <: Generation]() extends Rewriter[Pre] {
     val exprs = {
       // Ensure the "true" expression is kept
       val es = unfoldStar(e)
-      if (es.isEmpty) Seq(e) else es
+      if (es.isEmpty)
+        Seq(e)
+      else
+        es
     }
     val pointed = exprs.map(point)
     pointed.map {
-      case (Some(endpoint), expr) => EndpointGuard[Post](succ(endpoint), dispatch(expr))(expr.o)
+      case (Some(endpoint), expr) =>
+        EndpointGuard[Post](succ(endpoint), dispatch(expr))(expr.o)
       case (None, expr) => UnpointedGuard(dispatch(expr))(expr.o)
     }
   }
@@ -99,7 +116,10 @@ case class SplitChorGuards[Pre <: Generation]() extends Rewriter[Pre] {
         // expr is totally in context of one endpoint and whatever else is in scope
         (Some(endpoint), e)
       case Seq() => (None, e)
-      case _ => throw MultipleEndpoints(e) // Expr uses multiple endpoints - for now we should disallow that.
+      case _ =>
+        throw MultipleEndpoints(
+          e
+        ) // Expr uses multiple endpoints - for now we should disallow that.
     }
   }
 }
diff --git a/src/rewrite/vct/rewrite/veymont/StructureCheck.scala b/src/rewrite/vct/rewrite/veymont/StructureCheck.scala
index 0745a9d1a4..c457377b9d 100644
--- a/src/rewrite/vct/rewrite/veymont/StructureCheck.scala
+++ b/src/rewrite/vct/rewrite/veymont/StructureCheck.scala
@@ -10,9 +10,11 @@ object StructureCheck extends RewriterBuilder {
 
   override def key: String = "structureCheck"
 
-  override def desc: String = "Check if program adheres to syntax of VeyMont input program"
+  override def desc: String =
+    "Check if program adheres to syntax of VeyMont input program"
 
-  case class VeyMontStructCheckError(node : Node[_], msg: String) extends UserError { //SystemErrir fir unreachable errros
+  case class VeyMontStructCheckError(node: Node[_], msg: String)
+      extends UserError { // SystemErrir fir unreachable errros
     override def code: String = "veyMontStructCheckError"
 
     override def text: String = node.o.messageInContext(msg)
@@ -26,66 +28,103 @@ case class StructureCheck[Pre <: Generation]() extends Rewriter[Pre] {
 
   override def dispatch(decl: Declaration[Pre]): Unit =
     decl match {
-      case dcl: Choreography[Pre] => inSeqProg.having(()) {
-        rewriteDefault(dcl)
-      }
+      case dcl: Choreography[Pre] =>
+        inSeqProg.having(()) { rewriteDefault(dcl) }
       case m: InstanceMethod[Pre] =>
         if (inSeqProg.nonEmpty && m.args.nonEmpty)
-          throw VeyMontStructCheckError(m, "Methods in seq_program cannot have any arguments!")
-        else if(inSeqProg.nonEmpty && m.returnType != TVoid[Pre]())
-          throw VeyMontStructCheckError(m, "Methods in seq_program cannot have a non-void return type!")
-        else rewriteDefault(decl)
+          throw VeyMontStructCheckError(
+            m,
+            "Methods in seq_program cannot have any arguments!",
+          )
+        else if (inSeqProg.nonEmpty && m.returnType != TVoid[Pre]())
+          throw VeyMontStructCheckError(
+            m,
+            "Methods in seq_program cannot have a non-void return type!",
+          )
+        else
+          rewriteDefault(decl)
       case r: RunMethod[Pre] =>
-        if(r.body.isEmpty)
-          throw VeyMontStructCheckError(r, "Method run in seq_program needs to have a body!")
-        else rewriteDefault(decl)
+        if (r.body.isEmpty)
+          throw VeyMontStructCheckError(
+            r,
+            "Method run in seq_program needs to have a body!",
+          )
+        else
+          rewriteDefault(decl)
       case _ => rewriteDefault(decl)
     }
 
-  override def dispatch(prog : Program[Pre]) : Program[Post] = {
-    if(!prog.declarations.exists {
-      case dcl: Choreography[Pre] =>
-        if(dcl.endpoints.isEmpty)
-          throw VeyMontStructCheckError(dcl,"A seq_program needs to have at least 1 thread, but none was found!")
-        else true
-      case _ => false
-    })
-      throw VeyMontStructCheckError(prog,"VeyMont requires a seq_program, but none was found!")
-    else rewriteDefault(prog)
+  override def dispatch(prog: Program[Pre]): Program[Post] = {
+    if (
+      !prog.declarations.exists {
+        case dcl: Choreography[Pre] =>
+          if (dcl.endpoints.isEmpty)
+            throw VeyMontStructCheckError(
+              dcl,
+              "A seq_program needs to have at least 1 thread, but none was found!",
+            )
+          else
+            true
+        case _ => false
+      }
+    )
+      throw VeyMontStructCheckError(
+        prog,
+        "VeyMont requires a seq_program, but none was found!",
+      )
+    else
+      rewriteDefault(prog)
   }
 
-  override def dispatch(st : Statement[Pre]) : Statement[Post] = {
-    if(inSeqProg.nonEmpty)
+  override def dispatch(st: Statement[Pre]): Statement[Post] = {
+    if (inSeqProg.nonEmpty)
       st match {
-        case CommunicateX(_,_,_,_) => rewriteDefault(st)
-        case VeyMontAssignExpression(_,_) => rewriteDefault (st)
-        case Assign(_,_) => rewriteDefault (st)
+        case CommunicateX(_, _, _, _) => rewriteDefault(st)
+        case VeyMontAssignExpression(_, _) => rewriteDefault(st)
+        case Assign(_, _) => rewriteDefault(st)
         case Branch(_) => rewriteDefault(st)
-        case Loop(_,_,_,_,_) => rewriteDefault(st)
-        case Scope(_,_) => rewriteDefault(st)
+        case Loop(_, _, _, _, _) => rewriteDefault(st)
+        case Scope(_, _) => rewriteDefault(st)
         case Block(_) => rewriteDefault(st)
         case Eval(expr) => checkMethodCall(st, expr)
         case Assert(_) => rewriteDefault(st)
-        case _ => throw VeyMontStructCheckError(st,"Statement not allowed in seq_program")
+        case _ =>
+          throw VeyMontStructCheckError(
+            st,
+            "Statement not allowed in seq_program",
+          )
       }
-    else rewriteDefault(st)
+    else
+      rewriteDefault(st)
   }
 
-
-  private def checkMethodCall(st: Statement[Pre], expr: Expr[Pre]): Statement[Post] = {
+  private def checkMethodCall(
+      st: Statement[Pre],
+      expr: Expr[Pre],
+  ): Statement[Post] = {
     expr match {
-      case MethodInvocation(obj, _, args, _, _, _, _) => obj match {
-        case ThisChoreography(_) =>
-          if (args.isEmpty) rewriteDefault(st)
-          else throw VeyMontStructCheckError(st, "Calls to methods in seq_program cannot have any arguments!")
+      case MethodInvocation(obj, _, args, _, _, _, _) =>
+        obj match {
+          case ThisChoreography(_) =>
+            if (args.isEmpty)
+              rewriteDefault(st)
+            else
+              throw VeyMontStructCheckError(
+                st,
+                "Calls to methods in seq_program cannot have any arguments!",
+              )
 //        case EndpointName(thread) => ???
           // val argderefs = ??? // args.flatMap(getDerefsFromExpr)
           // val argthreads = argderefs.map(d => ???) // getThreadDeref(d, VeyMontStructCheckError(st, "A method call on a thread object may only refer to a thread in its arguments!")))
           // if (argthreads.forall(_ == thread.decl))
           //   rewriteDefault(st)
           // else throw VeyMontStructCheckError(st, "A method call on a thread object may only refer to same thread in its arguments!")
-        case _ => throw VeyMontStructCheckError(st, "This kind of method call is not allowed in seq_program")
-      }
+          case _ =>
+            throw VeyMontStructCheckError(
+              st,
+              "This kind of method call is not allowed in seq_program",
+            )
+        }
       case _ => throw VeyMontStructCheckError(st, "This is not a method call")
     }
   }
diff --git a/src/rewrite/vct/rewrite/veymont/ThreadBuildingBlocks.scala b/src/rewrite/vct/rewrite/veymont/ThreadBuildingBlocks.scala
index b90d587014..4b7bb0a44c 100644
--- a/src/rewrite/vct/rewrite/veymont/ThreadBuildingBlocks.scala
+++ b/src/rewrite/vct/rewrite/veymont/ThreadBuildingBlocks.scala
@@ -1,15 +1,24 @@
 package vct.rewrite.veymont
 
-import vct.col.ast.{ClassDeclaration, CommunicateX, Endpoint, InstanceField, JavaClass, ChorRun, Type}
+import vct.col.ast.{
+  ClassDeclaration,
+  CommunicateX,
+  Endpoint,
+  InstanceField,
+  JavaClass,
+  ChorRun,
+  Type,
+}
 import vct.col.origin.Origin
 import vct.col.rewrite.{Generation, Rewritten}
 
 class ThreadBuildingBlocks[Pre <: Generation](
-                                               val runMethod: ChorRun[Pre],
-                                               val methods: Seq[ClassDeclaration[Pre]],
-                                               val channelFields: Map[(CommunicateX[Pre],Origin),InstanceField[Rewritten[Pre]]],
-                                               val channelClasses: Map[Type[Pre],JavaClass[Rewritten[Pre]]],
-                                               val thread: Endpoint[Pre],
-                                               val threadField: InstanceField[Rewritten[Pre]]) {
-
-}
+    val runMethod: ChorRun[Pre],
+    val methods: Seq[ClassDeclaration[Pre]],
+    val channelFields: Map[(CommunicateX[Pre], Origin), InstanceField[
+      Rewritten[Pre]
+    ]],
+    val channelClasses: Map[Type[Pre], JavaClass[Rewritten[Pre]]],
+    val thread: Endpoint[Pre],
+    val threadField: InstanceField[Rewritten[Pre]],
+) {}
diff --git a/src/rewrite/vct/rewrite/veymont/VeymontContext.scala b/src/rewrite/vct/rewrite/veymont/VeymontContext.scala
index 3abe6e2f48..735d841d40 100644
--- a/src/rewrite/vct/rewrite/veymont/VeymontContext.scala
+++ b/src/rewrite/vct/rewrite/veymont/VeymontContext.scala
@@ -1,24 +1,37 @@
 package vct.rewrite.veymont
 
 import hre.util.ScopedStack
-import vct.col.ast.{Choreography, Class, Communicate, Endpoint, Program, Variable}
+import vct.col.ast.{
+  Choreography,
+  Class,
+  Communicate,
+  Endpoint,
+  Program,
+  Variable,
+}
 import vct.col.rewrite.Generation
 
 trait VeymontContext[Pre <: Generation] {
   object mappings {
     var program: Program[Pre] = null
 
-    lazy val choreographyToCommunicates: Map[Choreography[Pre], Seq[Communicate[Pre]]] = choreographies.map { c =>
-      (c, c.collect { case comm: Communicate[Pre] => comm }.toIndexedSeq)
-    }.toMap
+    lazy val choreographyToCommunicates
+        : Map[Choreography[Pre], Seq[Communicate[Pre]]] =
+      choreographies.map { c =>
+        (c, c.collect { case comm: Communicate[Pre] => comm }.toIndexedSeq)
+      }.toMap
     lazy val allEndpoints = choreographies.flatMap { _.endpoints }
     lazy val endpointToChoreography: Map[Endpoint[Pre], Choreography[Pre]] =
-      choreographies.flatMap { chor => chor.endpoints.map(ep => (ep, chor)) }.toMap
+      choreographies.flatMap { chor => chor.endpoints.map(ep => (ep, chor)) }
+        .toMap
     lazy val endpointClassToEndpoint: Map[Class[Pre], Endpoint[Pre]] =
-      choreographies.flatMap { chor => chor.endpoints.map(endpoint => (endpoint.cls.decl, endpoint)) }.toMap
+      choreographies.flatMap { chor =>
+        chor.endpoints.map(endpoint => (endpoint.cls.decl, endpoint))
+      }.toMap
   }
 
-  lazy val choreographies: Seq[Choreography[Pre]] = mappings.program.collect { case c: Choreography[Pre] => c }.toIndexedSeq
+  lazy val choreographies: Seq[Choreography[Pre]] =
+    mappings.program.collect { case c: Choreography[Pre] => c }.toIndexedSeq
 
   def communicatesOf(chor: Choreography[Pre]) =
     mappings.choreographyToCommunicates(chor)
@@ -28,23 +41,40 @@ trait VeymontContext[Pre <: Generation] {
     mappings.endpointToChoreography(mappings.endpointClassToEndpoint(c))
   def endpointOf(c: Class[Pre]): Endpoint[Pre] =
     mappings.endpointClassToEndpoint(c)
-  def isChoreographyParam(v: Variable[Pre]): Boolean = choreographies.exists { chor => chor.params.contains(v) }
+  def isChoreographyParam(v: Variable[Pre]): Boolean =
+    choreographies.exists { chor => chor.params.contains(v) }
 
   val currentChoreography = ScopedStack[Choreography[Pre]]()
   val currentEndpoint = ScopedStack[Endpoint[Pre]]()
 
-  def inChoreography: Boolean = currentChoreography.nonEmpty && currentEndpoint.isEmpty
-  def inEndpoint: Boolean = currentChoreography.nonEmpty && currentEndpoint.nonEmpty
+  def inChoreography: Boolean =
+    currentChoreography.nonEmpty && currentEndpoint.isEmpty
+  def inEndpoint: Boolean =
+    currentChoreography.nonEmpty && currentEndpoint.nonEmpty
 
   object InChor {
     def unapply[T](t: T): Option[(Choreography[Pre], T)] =
-      if(inChoreography) Some((currentChoreography.top, t)) else None
-    def unapply: Option[Choreography[Pre]] = if(inChoreography) currentChoreography.topOption else None
+      if (inChoreography)
+        Some((currentChoreography.top, t))
+      else
+        None
+    def unapply: Option[Choreography[Pre]] =
+      if (inChoreography)
+        currentChoreography.topOption
+      else
+        None
   }
 
   object InEndpoint {
     def unapply[T](t: T): Option[(Choreography[Pre], Endpoint[Pre], T)] =
-      if(inEndpoint) Some((currentChoreography.top, currentEndpoint.top, t)) else None
-    def unapply: Option[(Choreography[Pre], Endpoint[Pre])] = if(inEndpoint) Some((currentChoreography.top, currentEndpoint.top)) else None
+      if (inEndpoint)
+        Some((currentChoreography.top, currentEndpoint.top, t))
+      else
+        None
+    def unapply: Option[(Choreography[Pre], Endpoint[Pre])] =
+      if (inEndpoint)
+        Some((currentChoreography.top, currentEndpoint.top))
+      else
+        None
   }
 }
diff --git a/src/serialize/com/google/protobuf/ForwardingByteString.scala b/src/serialize/com/google/protobuf/ForwardingByteString.scala
index 04e298fc03..aae5495c61 100644
--- a/src/serialize/com/google/protobuf/ForwardingByteString.scala
+++ b/src/serialize/com/google/protobuf/ForwardingByteString.scala
@@ -4,17 +4,15 @@ import java.nio.ByteBuffer
 import java.nio.charset.Charset
 import java.util
 
-/**
- * Utility class that forwards all calls to an underlying ByteString
- * Idea: either underlying is lazily computed so some convenient methods
- * can be specialized efficiently, or this class just wraps an already existing
- * ByteString.
- */
+/** Utility class that forwards all calls to an underlying ByteString Idea:
+  * either underlying is lazily computed so some convenient methods can be
+  * specialized efficiently, or this class just wraps an already existing
+  * ByteString.
+  */
 abstract class ForwardingByteString extends ByteString {
   def underlying: ByteString
 
-  override def byteAt(index: Int): Byte =
-    underlying.byteAt(index)
+  override def byteAt(index: Int): Byte = underlying.byteAt(index)
 
   override def internalByteAt(index: Int): Byte =
     underlying.internalByteAt(index)
@@ -22,20 +20,25 @@ abstract class ForwardingByteString extends ByteString {
   override def substring(beginIndex: Int, endIndex: Int): ByteString =
     underlying.substring(beginIndex, endIndex)
 
-  override def copyToInternal(target: Array[Byte], sourceOffset: Int, targetOffset: Int, numberToCopy: Int): Unit =
+  override def copyToInternal(
+      target: Array[Byte],
+      sourceOffset: Int,
+      targetOffset: Int,
+      numberToCopy: Int,
+  ): Unit =
     underlying.copyToInternal(target, sourceOffset, targetOffset, numberToCopy)
 
-  override def copyTo(target: ByteBuffer): Unit =
-    underlying.copyTo(target)
+  override def copyTo(target: ByteBuffer): Unit = underlying.copyTo(target)
 
-  override def writeTo(out: OutputStream): Unit =
-    underlying.writeTo(out)
+  override def writeTo(out: OutputStream): Unit = underlying.writeTo(out)
 
-  override def writeTo(out: ByteOutput): Unit =
-    underlying.writeTo(out)
+  override def writeTo(out: ByteOutput): Unit = underlying.writeTo(out)
 
-  override def writeToInternal(out: OutputStream, sourceOffset: Int, numberToWrite: Int): Unit =
-    underlying.writeTo(out, sourceOffset, numberToWrite)
+  override def writeToInternal(
+      out: OutputStream,
+      sourceOffset: Int,
+      numberToWrite: Int,
+  ): Unit = underlying.writeTo(out, sourceOffset, numberToWrite)
 
   override def writeToReverse(byteOutput: ByteOutput): Unit =
     underlying.writeToReverse(byteOutput)
@@ -49,27 +52,21 @@ abstract class ForwardingByteString extends ByteString {
   override def toStringInternal(charset: Charset): String =
     underlying.toStringInternal(charset)
 
-  override def isValidUtf8: Boolean =
-    underlying.isValidUtf8
+  override def isValidUtf8: Boolean = underlying.isValidUtf8
 
   override def partialIsValidUtf8(state: Int, offset: Int, length: Int): Int =
     underlying.partialIsValidUtf8(state, offset, length)
 
-  override def newInput(): InputStream =
-    underlying.newInput()
+  override def newInput(): InputStream = underlying.newInput()
 
-  override def newCodedInput(): CodedInputStream =
-    underlying.newCodedInput()
+  override def newCodedInput(): CodedInputStream = underlying.newCodedInput()
 
-  override def getTreeDepth: Int =
-    underlying.getTreeDepth
+  override def getTreeDepth: Int = underlying.getTreeDepth
 
-  override def isBalanced: Boolean =
-    underlying.isBalanced
+  override def isBalanced: Boolean = underlying.isBalanced
 
   override def partialHash(h: Int, offset: Int, length: Int): Int =
     underlying.partialHash(h, offset, length)
 
-  override def equals(obj: scala.Any): Boolean =
-    underlying.equals(obj)
+  override def equals(obj: scala.Any): Boolean = underlying.equals(obj)
 }
diff --git a/src/serialize/com/google/protobuf/StreamingByteString.scala b/src/serialize/com/google/protobuf/StreamingByteString.scala
index 935821d0c7..270b1c3585 100644
--- a/src/serialize/com/google/protobuf/StreamingByteString.scala
+++ b/src/serialize/com/google/protobuf/StreamingByteString.scala
@@ -2,10 +2,10 @@ package com.google.protobuf
 
 import java.io.ByteArrayOutputStream
 
-/**
- * ForwardingByteString that optimizes for writing literal generated messages.
- */
-trait StreamingByteString { this: ForwardingByteString =>
+/** ForwardingByteString that optimizes for writing literal generated messages.
+  */
+trait StreamingByteString {
+  this: ForwardingByteString =>
   override lazy val underlying: ByteString = {
     val buf = new Array[Byte](size())
     val out = CodedOutputStream.newInstance(buf)
@@ -20,6 +20,8 @@ trait StreamingByteString { this: ForwardingByteString =>
   override def writeTo(out: ByteOutput): Unit =
     out match {
       case out: CodedOutputStream => streamTo(out)
-      case other => CodedOutputStream.newInstance(other, CodedOutputStream.DEFAULT_BUFFER_SIZE)
+      case other =>
+        CodedOutputStream
+          .newInstance(other, CodedOutputStream.DEFAULT_BUFFER_SIZE)
     }
 }
diff --git a/src/serialize/vct/serialize/LiteralOpaqueMessageBytes.scala b/src/serialize/vct/serialize/LiteralOpaqueMessageBytes.scala
index 9543d42432..847b7f01d9 100644
--- a/src/serialize/vct/serialize/LiteralOpaqueMessageBytes.scala
+++ b/src/serialize/vct/serialize/LiteralOpaqueMessageBytes.scala
@@ -2,7 +2,7 @@ package vct.serialize
 
 import com.google.protobuf.ByteString
 
-class LiteralOpaqueMessageBytes(override val underlying: ByteString) extends OpaqueMessageBytes {
-  override def size(): Int =
-    underlying.size()
+class LiteralOpaqueMessageBytes(override val underlying: ByteString)
+    extends OpaqueMessageBytes {
+  override def size(): Int = underlying.size()
 }
diff --git a/src/serialize/vct/serialize/OpaqueMessageBytes.scala b/src/serialize/vct/serialize/OpaqueMessageBytes.scala
index 9956fbc55e..487b7751ca 100644
--- a/src/serialize/vct/serialize/OpaqueMessageBytes.scala
+++ b/src/serialize/vct/serialize/OpaqueMessageBytes.scala
@@ -5,14 +5,13 @@ import scalapb.{GeneratedMessage, TypeMapper}
 
 object OpaqueMessageBytes {
   implicit val protobufBimap: TypeMapper[ByteString, OpaqueMessageBytes] =
-    TypeMapper(
-      (bs: ByteString) => (new LiteralOpaqueMessageBytes(bs): OpaqueMessageBytes)
-    )(
-      identity[OpaqueMessageBytes]
-    )
+    TypeMapper((bs: ByteString) =>
+      (new LiteralOpaqueMessageBytes(bs): OpaqueMessageBytes)
+    )(identity[OpaqueMessageBytes])
 }
 
 abstract class OpaqueMessageBytes extends ForwardingByteString {
-  def parseAs[T <: GeneratedMessage](implicit companion: scalapb.GeneratedMessageCompanion[T]): T =
-    companion.parseFrom(newCodedInput())
+  def parseAs[T <: GeneratedMessage](
+      implicit companion: scalapb.GeneratedMessageCompanion[T]
+  ): T = companion.parseFrom(newCodedInput())
 }
diff --git a/src/serialize/vct/serialize/StreamingOpaqueMessageBytes.scala b/src/serialize/vct/serialize/StreamingOpaqueMessageBytes.scala
index 86eeb58c98..1ffc4434f1 100644
--- a/src/serialize/vct/serialize/StreamingOpaqueMessageBytes.scala
+++ b/src/serialize/vct/serialize/StreamingOpaqueMessageBytes.scala
@@ -4,7 +4,8 @@ import com.google.protobuf.{ByteString, CodedOutputStream, StreamingByteString}
 
 import java.io.ByteArrayOutputStream
 
-abstract class StreamingOpaqueMessageBytes extends OpaqueMessageBytes with StreamingByteString {
+abstract class StreamingOpaqueMessageBytes
+    extends OpaqueMessageBytes with StreamingByteString {
   override def streamTo(output: CodedOutputStream): Unit
   override def size(): Int
-}
\ No newline at end of file
+}
diff --git a/src/viper/viper/api/SilverTreeCompare.scala b/src/viper/viper/api/SilverTreeCompare.scala
index 035d8307e8..269e44d3fe 100644
--- a/src/viper/viper/api/SilverTreeCompare.scala
+++ b/src/viper/viper/api/SilverTreeCompare.scala
@@ -1,6 +1,14 @@
 package viper.api
 
-import viper.silver.ast.{And, DomainFuncApp, LocalVarDecl, Node, Or, Seqn, Typed}
+import viper.silver.ast.{
+  And,
+  DomainFuncApp,
+  LocalVarDecl,
+  Node,
+  Or,
+  Seqn,
+  Typed,
+}
 import viper.silver.frontend.{SilFrontend, SilFrontendConfig}
 import viper.silver.verifier.{AbstractError, NoVerifier, Verifier}
 
@@ -14,12 +22,13 @@ object DummyFrontend extends SilFrontend() {
   override def configureVerifier(args: Seq[String]): SilFrontendConfig = ???
 }
 
-/**
-  * Compare trees of silver for differences. Used to determine differences between our silver output and the same silver
-  * as it's parsed.
+/** Compare trees of silver for differences. Used to determine differences
+  * between our silver output and the same silver as it's parsed.
   */
 object SilverTreeCompare {
-  def syntacticSugarIssues(node: Node): Either[Seq[AbstractError], Seq[(Node, Node)]] = {
+  def syntacticSugarIssues(
+      node: Node
+  ): Either[Seq[AbstractError], Seq[(Node, Node)]] = {
     val tmp = Files.createTempFile("vercors-output-", ".sil")
 
     try {
@@ -34,81 +43,75 @@ object SilverTreeCompare {
       frontend.semanticAnalysis()
       frontend.translation()
 
-      if (frontend.errors.nonEmpty) {
-        Left(frontend.errors)
-      } else {
-        Right(compare(node, frontend.translationResult))
-      }
-    } finally {
-      Files.delete(tmp)
-    }
+      if (frontend.errors.nonEmpty) { Left(frontend.errors) }
+      else { Right(compare(node, frontend.translationResult)) }
+    } finally { Files.delete(tmp) }
   }
 
-  private def subnodesWithoutType(node: Node): Seq[Node] = node match {
-    case typ: Typed => subnodes(typ).init
-    case other => subnodes(other)
-  }
+  private def subnodesWithoutType(node: Node): Seq[Node] =
+    node match {
+      case typ: Typed => subnodes(typ).init
+      case other => subnodes(other)
+    }
 
-  private def subnodes(node: Node): Seq[Node] = node match {
-    case DomainFuncApp(_, args, map) =>
-      args ++ map.toSeq.sortBy(pair => pair._1.name).flatMap(pair => Seq(pair._1, pair._2))
-    case other => other.subnodes
-  }
+  private def subnodes(node: Node): Seq[Node] =
+    node match {
+      case DomainFuncApp(_, args, map) =>
+        args ++ map.toSeq.sortBy(pair => pair._1.name)
+          .flatMap(pair => Seq(pair._1, pair._2))
+      case other => other.subnodes
+    }
 
-  /**
-    * Sequences are translated strangely by both vercors and viper. We put separate blocks for locals and statements,
-    * so we end up with blocks with locals & 1 statement, and no locals and some statements. Viper translates
-    * declarations by leaving an empty block in place of a declaration statement. The solution is to flatly collect
-    * directly nested blocks.
+  /** Sequences are translated strangely by both vercors and viper. We put
+    * separate blocks for locals and statements, so we end up with blocks with
+    * locals & 1 statement, and no locals and some statements. Viper translates
+    * declarations by leaving an empty block in place of a declaration
+    * statement. The solution is to flatly collect directly nested blocks.
     */
   def collectSeqn(seqn: Seqn): Seq[Node] =
-    seqn.scopedDecls.collect {
-      case local: LocalVarDecl => local
-    } ++ seqn.ss.flatMap {
-      case seqn: Seqn => collectSeqn(seqn)
-      case other => Seq(other)
-    }
+    seqn.scopedDecls.collect { case local: LocalVarDecl => local } ++
+      seqn.ss.flatMap {
+        case seqn: Seqn => collectSeqn(seqn)
+        case other => Seq(other)
+      }
 
-  /**
-    * Here due to this parsing detail:
-    * (a && (b && c)).toString == "a && b && c"
-    * parse("a && b && c") == ((a && b) && c)
-    * This distinction is not interesting to report.
+  /** Here due to this parsing detail: (a && (b && c)).toString == "a && b && c"
+    * parse("a && b && c") == ((a && b) && c) This distinction is not
+    * interesting to report.
     */
   def collectFlatly[T <: Node](node: T): Seq[Node] = {
     subnodesWithoutType(node).flatMap {
-      case child if child.getClass == node.getClass =>
-        collectFlatly(child)
+      case child if child.getClass == node.getClass => collectFlatly(child)
       case other => Seq(other)
     }
   }
 
-  /**
-    * Use a custom flattener (e.g. collectCons above) for a node, instead of .subnodes.
+  /** Use a custom flattener (e.g. collectCons above) for a node, instead of
+    * .subnodes.
     */
-  def compare[T <: Node](left: T, right: T, flattener: T => Seq[Node]): Seq[(Node, Node)] = {
+  def compare[T <: Node](
+      left: T,
+      right: T,
+      flattener: T => Seq[Node],
+  ): Seq[(Node, Node)] = {
     val leftChildren = flattener(left)
     val rightChildren = flattener(right)
 
-    if (leftChildren.size != rightChildren.size) {
-      Seq((left, right))
-    } else {
-      leftChildren.zip(rightChildren).flatMap {
-        case (left, right) => compare(left, right)
+    if (leftChildren.size != rightChildren.size) { Seq((left, right)) }
+    else {
+      leftChildren.zip(rightChildren).flatMap { case (left, right) =>
+        compare(left, right)
       }
     }
   }
 
-  def compare(left: Node, right: Node): Seq[(Node, Node)] = (left, right) match {
-    case (left: Seqn, right: Seqn) =>
-      compare(left, right, collectSeqn)
-    case (left: And, right: And) =>
-      compare(left, right, collectFlatly)
-    case (left: Or, right: Or) =>
-      compare(left, right, collectFlatly)
-    case (left, right) if left.getClass != right.getClass =>
-      Seq((left, right))
-    case _ =>
-      compare[Node](left, right, subnodes)
-  }
+  def compare(left: Node, right: Node): Seq[(Node, Node)] =
+    (left, right) match {
+      case (left: Seqn, right: Seqn) => compare(left, right, collectSeqn)
+      case (left: And, right: And) => compare(left, right, collectFlatly)
+      case (left: Or, right: Or) => compare(left, right, collectFlatly)
+      case (left, right) if left.getClass != right.getClass =>
+        Seq((left, right))
+      case _ => compare[Node](left, right, subnodes)
+    }
 }
diff --git a/src/viper/viper/api/backend/SilverBackend.scala b/src/viper/viper/api/backend/SilverBackend.scala
index 63f1061b44..2e1161e85e 100644
--- a/src/viper/viper/api/backend/SilverBackend.scala
+++ b/src/viper/viper/api/backend/SilverBackend.scala
@@ -7,10 +7,24 @@ import vct.col.origin.AccountedDirection
 import vct.col.{ast => col, origin => blame}
 import vct.result.VerificationError.SystemError
 import viper.api.SilverTreeCompare
-import viper.api.transform.{ColToSilver, NodeInfo, NopViperReporter, SilverParserDummyFrontend}
+import viper.api.transform.{
+  ColToSilver,
+  NodeInfo,
+  NopViperReporter,
+  SilverParserDummyFrontend,
+}
 import viper.silver.ast.Infoed
 import viper.silver.plugin.SilverPluginManager
-import viper.silver.plugin.standard.termination.{FunctionTerminationError, LoopTerminationError, MethodTerminationError, TerminationConditionFalse, TupleBoundedFalse, TupleConditionFalse, TupleDecreasesFalse, TupleSimpleFalse}
+import viper.silver.plugin.standard.termination.{
+  FunctionTerminationError,
+  LoopTerminationError,
+  MethodTerminationError,
+  TerminationConditionFalse,
+  TupleBoundedFalse,
+  TupleConditionFalse,
+  TupleDecreasesFalse,
+  TupleSimpleFalse,
+}
 import viper.silver.reporter.Reporter
 import viper.silver.verifier._
 import viper.silver.verifier.errors._
@@ -20,53 +34,66 @@ import java.nio.file.{Files, Path}
 import scala.reflect.ClassTag
 import scala.util.{Try, Using}
 
-trait SilverBackend extends Backend[(silver.Program, Map[Int, col.Node[_]])] with LazyLogging {
+trait SilverBackend
+    extends Backend[(silver.Program, Map[Int, col.Node[_]])] with LazyLogging {
   case class NotSupported(text: String) extends SystemError
   case class ViperCrashed(text: String) extends SystemError
 
-  case class ConsistencyErrors(errors: Seq[ConsistencyError]) extends SystemError {
+  case class ConsistencyErrors(errors: Seq[ConsistencyError])
+      extends SystemError {
     override def text: String =
-      "The silver AST delivered to viper is not valid:\n" + errors.map(_.toString).mkString(" - ", "\n - ", "")
+      "The silver AST delivered to viper is not valid:\n" +
+        errors.map(_.toString).mkString(" - ", "\n - ", "")
   }
 
   case class PluginErrors(errors: Seq[AbstractError]) extends SystemError {
     override def text: String =
-      "An error occurred in a viper plugin, which should always be prevented:\n" + errors.map(_.toString).mkString(" - ", "\n - ", "")
+      "An error occurred in a viper plugin, which should always be prevented:\n" +
+        errors.map(_.toString).mkString(" - ", "\n - ", "")
   }
 
   case class NoInfo(node: silver.Infoed) extends SystemError {
-    override def text: String = node match {
-      case posed: silver.Positioned =>
-        s"At ${posed.pos.toString}: node has no info (`$node`)"
-      case _ =>
-        s"node has no info (`$node`)"
-    }
+    override def text: String =
+      node match {
+        case posed: silver.Positioned =>
+          s"At ${posed.pos.toString}: node has no info (`$node`)"
+        case _ => s"node has no info (`$node`)"
+      }
   }
 
-  def createVerifier(reporter: Reporter, nodeFromUniqueId: Map[Int, col.Node[_]]): (Verifier, SilverPluginManager)
+  def createVerifier(
+      reporter: Reporter,
+      nodeFromUniqueId: Map[Int, col.Node[_]],
+  ): (Verifier, SilverPluginManager)
   def stopVerifier(verifier: Verifier): Unit
 
-  private def info[T <: col.Node[_]](node: silver.Infoed)(implicit tag: ClassTag[T]): NodeInfo[T] =
-    node.info.getAllInfos[NodeInfo[T]]
-      .headOption.getOrElse(throw NoInfo(node))
+  private def info[T <: col.Node[_]](
+      node: silver.Infoed
+  )(implicit tag: ClassTag[T]): NodeInfo[T] =
+    node.info.getAllInfos[NodeInfo[T]].headOption.getOrElse(throw NoInfo(node))
 
-  private def get[T <: col.Node[_]](node: silver.Infoed): T =
-    info(node).node
+  private def get[T <: col.Node[_]](node: silver.Infoed): T = info(node).node
 
   private def path(node: silver.Node): Seq[AccountedDirection] =
     info(node.asInstanceOf[silver.Infoed]).predicatePath.get
 
-  def transform(colProgram: col.Program[_], output: Option[Path]): (silver.Program, Map[Int, col.Node[_]]) = {
-    Progress.stages(Seq("Translation" -> 2, "Diagnostic Output" -> 2, "Check" -> 7, "Check Idempotency" -> 9)) { next =>
+  def transform(
+      colProgram: col.Program[_],
+      output: Option[Path],
+  ): (silver.Program, Map[Int, col.Node[_]]) = {
+    Progress.stages(Seq(
+      "Translation" -> 2,
+      "Diagnostic Output" -> 2,
+      "Check" -> 7,
+      "Check Idempotency" -> 9,
+    )) { next =>
       val (silverProgram, nodeFromUniqueId) = ColToSilver.transform(colProgram)
 
       next()
 
-      val silverProgramString =
-        silverProgram
-          .toString()
-          .replace("requires decreases", "decreases")
-          .replace("invariant decreases", "decreases")
+      val silverProgramString = silverProgram.toString()
+        .replace("requires decreases", "decreases")
+        .replace("invariant decreases", "decreases")
 
       output.map(RWFile(_)).foreach(_.write { writer =>
         writer.write(silverProgramString)
@@ -87,41 +114,49 @@ trait SilverBackend extends Backend[(silver.Program, Map[Int, col.Node[_]])] wit
 
         SilverParserDummyFrontend().parse(RWFile(f, doWatch = false)) match {
           case Left(errors) =>
-            logger.warn("Possible viper bug: silver AST does not reparse when printing as text")
-            for(error <- errors) {
-              logger.warn(error.toString)
-            }
+            logger.warn(
+              "Possible viper bug: silver AST does not reparse when printing as text"
+            )
+            for (error <- errors) { logger.warn(error.toString) }
           case Right(reparsedProgram) =>
             SilverTreeCompare.compare(silverProgram, reparsedProgram) match {
               case Nil =>
               case diffs =>
-                logger.debug("Possible VerCors bug: reparsing the silver AST as text causes the AST to be different:")
-                for((left, right) <- diffs) {
-                  logger.debug(s" - Left: ${left.getClass.getSimpleName}: $left")
-                  logger.debug(s" - Right: ${right.getClass.getSimpleName}: $right")
+                logger.debug(
+                  "Possible VerCors bug: reparsing the silver AST as text causes the AST to be different:"
+                )
+                for ((left, right) <- diffs) {
+                  logger
+                    .debug(s" - Left: ${left.getClass.getSimpleName}: $left")
+                  logger
+                    .debug(s" - Right: ${right.getClass.getSimpleName}: $right")
                 }
             }
         }
-      } finally {
-        Files.delete(f)
-      }
+      } finally { Files.delete(f) }
 
       (silverProgram, nodeFromUniqueId)
     }
   }
 
-  override def submit(intermediateProgram: (silver.Program, Map[Int, col.Node[_]])): Boolean = {
+  override def submit(
+      intermediateProgram: (silver.Program, Map[Int, col.Node[_]])
+  ): Boolean = {
     val (silverProgram, nodeFromUniqueId) = intermediateProgram
     val (verifier, plugins) = createVerifier(NopViperReporter, nodeFromUniqueId)
 
     try {
-      val transformedProgram = plugins.beforeVerify(silverProgram) match {
-        case Some(program) => program
-        case None => throw PluginErrors(plugins.errors)
-      }
+      val transformedProgram =
+        plugins.beforeVerify(silverProgram) match {
+          case Some(program) => program
+          case None => throw PluginErrors(plugins.errors)
+        }
 
       val backendVerifies =
-        plugins.mapVerificationResult(transformedProgram, verifier.verify(transformedProgram)) match {
+        plugins.mapVerificationResult(
+          transformedProgram,
+          verifier.verify(transformedProgram),
+        ) match {
           case Success => true
           case Failure(errors) =>
             logger.debug(errors.toString())
@@ -130,225 +165,290 @@ trait SilverBackend extends Backend[(silver.Program, Map[Int, col.Node[_]])] wit
         }
 
       backendVerifies
-    } finally {
-      stopVerifier(verifier)
-    }
+    } finally { stopVerifier(verifier) }
   }
 
-  def processError(error: AbstractError): Unit = error match {
-    case err: AbstractVerificationError => err match {
-      case Internal(node, reason, _) =>
-        throw ViperCrashed(s"Viper returned an internal error at ${Try(node.toString()).getOrElse("?")}: $reason")
-      case AssignmentFailed(node, reason, _) =>
-        get[col.SilverAssign[_]](node) match {
-          case fieldAssign@col.SilverFieldAssign(_, _, _) =>
+  def processError(error: AbstractError): Unit =
+    error match {
+      case err: AbstractVerificationError =>
+        err match {
+          case Internal(node, reason, _) =>
+            throw ViperCrashed(
+              s"Viper returned an internal error at ${Try(node.toString())
+                  .getOrElse("?")}: $reason"
+            )
+          case AssignmentFailed(node, reason, _) =>
+            get[col.SilverAssign[_]](node) match {
+              case fieldAssign @ col.SilverFieldAssign(_, _, _) =>
+                reason match {
+                  case reasons.InsufficientPermission(access)
+                      if get[col.Node[_]](access) == fieldAssign =>
+                    fieldAssign.blame
+                      .blame(blame.AssignFieldFailed(fieldAssign))
+                  case otherReason => defer(otherReason)
+                }
+              case col.SilverLocalAssign(_, _) => defer(reason)
+            }
+          case CallFailed(_, reason, _) => defer(reason)
+          case ContractNotWellformed(node, reason, _) => defer(reason)
+          case PreconditionInCallFalse(node, reason, _) =>
+            val invocation = get[col.InvokeProcedure[_]](node)
+            invocation.blame.blame(blame.PreconditionFailed(
+              path(reason.offendingNode),
+              getFailure(reason),
+              invocation,
+            ))
+          case PreconditionInAppFalse(node, reason, _) =>
+            val invocation = get[col.FunctionInvocation[_]](node)
+            invocation.blame.blame(blame.PreconditionFailed(
+              path(reason.offendingNode),
+              getFailure(reason),
+              invocation,
+            ))
+          case ExhaleFailed(node, reason, _) =>
+            val exhale = get[col.Exhale[_]](node)
             reason match {
-              case reasons.InsufficientPermission(access) if get[col.Node[_]](access) == fieldAssign =>
-                fieldAssign.blame.blame(blame.AssignFieldFailed(fieldAssign))
-              case otherReason =>
-                defer(otherReason)
+              case reasons.InsufficientPermission(permNode) =>
+                get[col.Node[_]](permNode) match {
+                  case _: col.Perm[_] | _: col.PredicateApply[_] |
+                      _: col.Value[_] =>
+                    exhale.blame
+                      .blame(blame.ExhaleFailed(getFailure(reason), exhale))
+                  case _ => defer(reason)
+                }
+              case reasons.AssertionFalse(_) | reasons.NegativePermission(_) =>
+                exhale.blame
+                  .blame(blame.ExhaleFailed(getFailure(reason), exhale))
+              case otherReason => defer(otherReason)
             }
-          case col.SilverLocalAssign(_, _) =>
-            defer(reason)
-        }
-      case CallFailed(_, reason, _) =>
-        defer(reason)
-      case ContractNotWellformed(node, reason, _) =>
-        defer(reason)
-      case PreconditionInCallFalse(node, reason, _) =>
-        val invocation = get[col.InvokeProcedure[_]](node)
-        invocation.blame.blame(blame.PreconditionFailed(path(reason.offendingNode), getFailure(reason), invocation))
-      case PreconditionInAppFalse(node, reason, _) =>
-        val invocation = get[col.FunctionInvocation[_]](node)
-        invocation.blame.blame(blame.PreconditionFailed(path(reason.offendingNode), getFailure(reason), invocation))
-      case ExhaleFailed(node, reason, _) =>
-        val exhale = get[col.Exhale[_]](node)
-        reason match {
-          case reasons.InsufficientPermission(permNode) => get[col.Node[_]](permNode) match {
-            case _: col.Perm[_] | _: col.PredicateApply[_] | _: col.Value[_] =>
-              exhale.blame.blame(blame.ExhaleFailed(getFailure(reason), exhale))
-            case _ =>
-              defer(reason)
-          }
-          case reasons.AssertionFalse(_) | reasons.NegativePermission(_) =>
-            exhale.blame.blame(blame.ExhaleFailed(getFailure(reason), exhale))
-          case otherReason =>
-            defer(otherReason)
-        }
-      case InhaleFailed(node, reason, _) =>
-        defer(reason)
-      case IfFailed(node, reason, _) =>
-        defer(reason)
-      case WhileFailed(node, reason, _) =>
-        defer(reason)
-      case AssertFailed(node, reason, _) =>
-        val assert = get[col.Assert[_]](node)
-        reason match {
-          case reasons.InsufficientPermission(permNode) => get[col.Node[_]](permNode) match {
-            case _: col.Perm[_] | _: col.PredicateApply[_] | _: col.Value[_] =>
-              assert.blame.blame(blame.AssertFailed(getFailure(reason), assert))
-            case _ =>
-              defer(reason)
-          }
-          case reasons.AssertionFalse(_) | reasons.NegativePermission(_) =>
-            assert.blame.blame(blame.AssertFailed(getFailure(reason), assert))
-          case otherReason =>
-            defer(otherReason)
-        }
-      case PostconditionViolated(_, member, reason, _) =>
-        val applicable = get[col.ContractApplicable[_]](member)
-        applicable.blame.blame(blame.PostconditionFailed(path(reason.offendingNode), getFailure(reason), applicable))
-      case FoldFailed(node, reason, _) =>
-        val fold = get[col.Fold[_]](node)
-        reason match {
-          case reasons.InsufficientPermission(access) =>
-            if(node.contains(access)) {
-              defer(reason)
-            } else {
-              fold.blame.blame(blame.FoldFailed(getFailure(reason), fold))
+          case InhaleFailed(node, reason, _) => defer(reason)
+          case IfFailed(node, reason, _) => defer(reason)
+          case WhileFailed(node, reason, _) => defer(reason)
+          case AssertFailed(node, reason, _) =>
+            val assert = get[col.Assert[_]](node)
+            reason match {
+              case reasons.InsufficientPermission(permNode) =>
+                get[col.Node[_]](permNode) match {
+                  case _: col.Perm[_] | _: col.PredicateApply[_] |
+                      _: col.Value[_] =>
+                    assert.blame
+                      .blame(blame.AssertFailed(getFailure(reason), assert))
+                  case _ => defer(reason)
+                }
+              case reasons.AssertionFalse(_) | reasons.NegativePermission(_) =>
+                assert.blame
+                  .blame(blame.AssertFailed(getFailure(reason), assert))
+              case otherReason => defer(otherReason)
             }
-          case reasons.AssertionFalse(_) | reasons.NegativePermission(_) =>
-            fold.blame.blame(blame.FoldFailed(getFailure(reason), fold))
-          case otherReason =>
-            defer(otherReason)
-        }
-      case UnfoldFailed(node, reason, _) =>
-        reason match {
-          case reasons.InsufficientPermission(access) =>
-            get[col.Node[_]](access) match {
-              case col.PredicateApply(_, _, _) =>
-                val unfold = get[col.Unfold[_]](node)
-                unfold.blame.blame(blame.UnfoldFailed(getFailure(reason), unfold))
-              case _ =>
-                defer(reason)
+          case PostconditionViolated(_, member, reason, _) =>
+            val applicable = get[col.ContractApplicable[_]](member)
+            applicable.blame.blame(blame.PostconditionFailed(
+              path(reason.offendingNode),
+              getFailure(reason),
+              applicable,
+            ))
+          case FoldFailed(node, reason, _) =>
+            val fold = get[col.Fold[_]](node)
+            reason match {
+              case reasons.InsufficientPermission(access) =>
+                if (node.contains(access)) { defer(reason) }
+                else {
+                  fold.blame.blame(blame.FoldFailed(getFailure(reason), fold))
+                }
+              case reasons.AssertionFalse(_) | reasons.NegativePermission(_) =>
+                fold.blame.blame(blame.FoldFailed(getFailure(reason), fold))
+              case otherReason => defer(otherReason)
             }
-          case otherReason =>
-            defer(otherReason)
-        }
-      case LoopInvariantNotPreserved(node, reason, _) =>
-        val invariant = info(node).invariant.get
-        invariant.blame.blame(blame.LoopInvariantNotMaintained(getFailure(reason), invariant))
-      case LoopInvariantNotEstablished(node, reason, _) =>
-        val invariant = info(node).invariant.get
-        invariant.blame.blame(blame.LoopInvariantNotEstablished(getFailure(reason), invariant))
-      case FunctionNotWellformed(_, reason, _) =>
-        defer(reason)
-      case PredicateNotWellformed(_, reason, _) =>
-        defer(reason)
-      case FunctionTerminationError(node: Infoed, reason, _) =>
-        val apply = get[col.Invocation[_]](node)
-        apply.ref.decl.blame.blame(blame.TerminationMeasureFailed(apply.ref.decl, apply, getDecreasesClause(reason)))
-      case MethodTerminationError(node: Infoed, reason, _) =>
-        val apply = get[col.Invocation[_]](node)
-        apply.ref.decl.blame.blame(blame.TerminationMeasureFailed(apply.ref.decl, apply, getDecreasesClause(reason)))
-      case LoopTerminationError(node: Infoed, reason, _) =>
-        val decreases = get[col.DecreasesClause[_]](node)
-        info(node).invariant.get.blame.blame(blame.LoopTerminationMeasureFailed(decreases))
-      case TerminationFailed(node, reason, cached) =>
-        throw NotSupported(s"Vercors does not support termination measures from Viper")
-      case PackageFailed(node, reason, _) =>
-        val packageNode = get[col.WandPackage[_]](node)
-        reason match {
-          case reasons.AssertionFalse(_) | reasons.NegativePermission(_) =>
-            packageNode.blame.blame(blame.PackageFailed(getFailure(reason), packageNode))
-          case reasons.InsufficientPermission(permNode) =>
-            get[col.Node[_]](permNode) match {
-              case col.Perm(_, _) | col.PredicateApply(_, _, _) | col.Value(_) =>
-                packageNode.blame.blame(blame.PackageFailed(getFailure(reason), packageNode))
-              case _ =>
-                defer(reason)
+          case UnfoldFailed(node, reason, _) =>
+            reason match {
+              case reasons.InsufficientPermission(access) =>
+                get[col.Node[_]](access) match {
+                  case col.PredicateApply(_, _, _) =>
+                    val unfold = get[col.Unfold[_]](node)
+                    unfold.blame
+                      .blame(blame.UnfoldFailed(getFailure(reason), unfold))
+                  case _ => defer(reason)
+                }
+              case otherReason => defer(otherReason)
             }
-          case _ =>
-            defer(reason)
-        }
-      case ApplyFailed(node, reason, _) =>
-        val applyNode = get[col.WandApply[_]](node)
-        reason match {
-          case reasons.AssertionFalse(_) | reasons.NegativePermission(_) =>
-            applyNode.blame.blame(blame.WandApplyFailed(getFailure(reason),applyNode)) // take the blame
-          case reasons.InsufficientPermission(permNode) =>
-            get[col.Node[_]](permNode) match {
-              case col.Perm(_, _) | col.PredicateApply(_, _, _) | col.Value(_) =>
-                applyNode.blame.blame(blame.WandApplyFailed(getFailure(reason),applyNode)) // take the blame
-              case _ =>
-                defer(reason)
+          case LoopInvariantNotPreserved(node, reason, _) =>
+            val invariant = info(node).invariant.get
+            invariant.blame.blame(
+              blame.LoopInvariantNotMaintained(getFailure(reason), invariant)
+            )
+          case LoopInvariantNotEstablished(node, reason, _) =>
+            val invariant = info(node).invariant.get
+            invariant.blame.blame(
+              blame.LoopInvariantNotEstablished(getFailure(reason), invariant)
+            )
+          case FunctionNotWellformed(_, reason, _) => defer(reason)
+          case PredicateNotWellformed(_, reason, _) => defer(reason)
+          case FunctionTerminationError(node: Infoed, reason, _) =>
+            val apply = get[col.Invocation[_]](node)
+            apply.ref.decl.blame.blame(blame.TerminationMeasureFailed(
+              apply.ref.decl,
+              apply,
+              getDecreasesClause(reason),
+            ))
+          case MethodTerminationError(node: Infoed, reason, _) =>
+            val apply = get[col.Invocation[_]](node)
+            apply.ref.decl.blame.blame(blame.TerminationMeasureFailed(
+              apply.ref.decl,
+              apply,
+              getDecreasesClause(reason),
+            ))
+          case LoopTerminationError(node: Infoed, reason, _) =>
+            val decreases = get[col.DecreasesClause[_]](node)
+            info(node).invariant.get.blame
+              .blame(blame.LoopTerminationMeasureFailed(decreases))
+          case TerminationFailed(node, reason, cached) =>
+            throw NotSupported(
+              s"Vercors does not support termination measures from Viper"
+            )
+          case PackageFailed(node, reason, _) =>
+            val packageNode = get[col.WandPackage[_]](node)
+            reason match {
+              case reasons.AssertionFalse(_) | reasons.NegativePermission(_) =>
+                packageNode.blame
+                  .blame(blame.PackageFailed(getFailure(reason), packageNode))
+              case reasons.InsufficientPermission(permNode) =>
+                get[col.Node[_]](permNode) match {
+                  case col.Perm(_, _) | col.PredicateApply(_, _, _) | col
+                        .Value(_) =>
+                    packageNode.blame.blame(
+                      blame.PackageFailed(getFailure(reason), packageNode)
+                    )
+                  case _ => defer(reason)
+                }
+              case _ => defer(reason)
+            }
+          case ApplyFailed(node, reason, _) =>
+            val applyNode = get[col.WandApply[_]](node)
+            reason match {
+              case reasons.AssertionFalse(_) | reasons.NegativePermission(_) =>
+                applyNode.blame.blame(
+                  blame.WandApplyFailed(getFailure(reason), applyNode)
+                ) // take the blame
+              case reasons.InsufficientPermission(permNode) =>
+                get[col.Node[_]](permNode) match {
+                  case col.Perm(_, _) | col.PredicateApply(_, _, _) | col
+                        .Value(_) =>
+                    applyNode.blame.blame(
+                      blame.WandApplyFailed(getFailure(reason), applyNode)
+                    ) // take the blame
+                  case _ => defer(reason)
+                }
+              case reasons.MagicWandChunkNotFound(magicWand) =>
+                applyNode.blame.blame(blame.WandApplyFailed(
+                  blame.InsufficientPermissionToExhale(get(magicWand)),
+                  applyNode,
+                ))
+              case _ => defer(reason)
             }
-          case reasons.MagicWandChunkNotFound(magicWand) =>
-            applyNode.blame.blame(blame.WandApplyFailed(blame.InsufficientPermissionToExhale(get(magicWand)), applyNode))
-          case _ =>
-            defer(reason)
+          case MagicWandNotWellformed(_, _, _) =>
+            throw NotSupported(
+              s"Vercors does not support magic wands from Viper"
+            )
+          case LetWandFailed(_, _, _) =>
+            throw NotSupported(
+              s"Vercors does not support magic wands from Viper"
+            )
+          case HeuristicsFailed(_, _, _) =>
+            throw NotSupported(
+              s"Vercors does not support magic wands from Viper"
+            )
+          case ErrorWrapperWithExampleTransformer(_, _) =>
+            throw NotSupported(
+              s"Vercors does not support counterexamples from Viper"
+            )
+          case VerificationErrorWithCounterexample(_, _, _, _, _) =>
+            throw NotSupported(
+              s"Vercors does not support counterexamples from Viper"
+            )
+          case other =>
+            throw NotSupported(
+              s"Viper returned an error that VerCors does not recognize: $other"
+            )
         }
-      case MagicWandNotWellformed(_, _, _) =>
-        throw NotSupported(s"Vercors does not support magic wands from Viper")
-      case LetWandFailed(_, _, _) =>
-        throw NotSupported(s"Vercors does not support magic wands from Viper")
-      case HeuristicsFailed(_, _, _) =>
-        throw NotSupported(s"Vercors does not support magic wands from Viper")
-      case ErrorWrapperWithExampleTransformer(_, _) =>
-        throw NotSupported(s"Vercors does not support counterexamples from Viper")
-      case VerificationErrorWithCounterexample(_, _, _, _, _) =>
-        throw NotSupported(s"Vercors does not support counterexamples from Viper")
+      case AbortedExceptionally(throwable) =>
+        throwable.printStackTrace()
+        throw ViperCrashed(s"Viper has crashed: $throwable")
       case other =>
-        throw NotSupported(s"Viper returned an error that VerCors does not recognize: $other")
+        throw NotSupported(
+          s"Viper returned an error that VerCors does not recognize: $other"
+        )
     }
-    case AbortedExceptionally(throwable) =>
-      throwable.printStackTrace()
-      throw ViperCrashed(s"Viper has crashed: $throwable")
-    case other =>
-      throw NotSupported(s"Viper returned an error that VerCors does not recognize: $other")
-  }
 
-  def getFailure(reason: ErrorReason): blame.ContractFailure = reason match {
-    case reasons.AssertionFalse(expr) => blame.ContractFalse(get[col.Expr[_]](expr))
-    case reasons.InsufficientPermission(access) => blame.InsufficientPermissionToExhale(get[col.Expr[_]](access))
-    case reasons.MagicWandChunkNotFound(wand) => blame.InsufficientPermissionToExhale(get[col.Expr[_]](wand))
-    case reasons.NegativePermission(p) => blame.NegativePermissionValue(info(p).permissionValuePermissionNode.get) // need to fetch access
-    case _ => ???
-  }
+  def getFailure(reason: ErrorReason): blame.ContractFailure =
+    reason match {
+      case reasons.AssertionFalse(expr) =>
+        blame.ContractFalse(get[col.Expr[_]](expr))
+      case reasons.InsufficientPermission(access) =>
+        blame.InsufficientPermissionToExhale(get[col.Expr[_]](access))
+      case reasons.MagicWandChunkNotFound(wand) =>
+        blame.InsufficientPermissionToExhale(get[col.Expr[_]](wand))
+      case reasons.NegativePermission(p) =>
+        blame
+          .NegativePermissionValue(
+            info(p).permissionValuePermissionNode.get
+          ) // need to fetch access
+      case _ => ???
+    }
 
-  def getDecreasesClause(reason: ErrorReason): col.DecreasesClause[_] = reason match {
-    case TerminationConditionFalse(node) =>
-      throw NotSupported("Vercors does not support termination measure conditions from Viper")
-    case TupleConditionFalse(_) =>
-      throw NotSupported("Vercors does not support termination measure conditions from Viper")
+  def getDecreasesClause(reason: ErrorReason): col.DecreasesClause[_] =
+    reason match {
+      case TerminationConditionFalse(node) =>
+        throw NotSupported(
+          "Vercors does not support termination measure conditions from Viper"
+        )
+      case TupleConditionFalse(_) =>
+        throw NotSupported(
+          "Vercors does not support termination measure conditions from Viper"
+        )
 
-    case TupleSimpleFalse(node: Infoed) =>
-      // PB: simple == (not decreasing || not bounded)
-      get[col.DecreasesClause[_]](node)
-    case TupleDecreasesFalse(node: Infoed) => get[col.DecreasesClause[_]](node)
-    case TupleBoundedFalse(node: Infoed) => get[col.DecreasesClause[_]](node)
+      case TupleSimpleFalse(node: Infoed) =>
+        // PB: simple == (not decreasing || not bounded)
+        get[col.DecreasesClause[_]](node)
+      case TupleDecreasesFalse(node: Infoed) =>
+        get[col.DecreasesClause[_]](node)
+      case TupleBoundedFalse(node: Infoed) => get[col.DecreasesClause[_]](node)
 
-    case other =>
-      throw NotSupported(s"Viper returned an error reason that VerCors does not recognize: $other")
-  }
+      case other =>
+        throw NotSupported(
+          s"Viper returned an error reason that VerCors does not recognize: $other"
+        )
+    }
 
-  def defer(reason: ErrorReason): Unit = reason match {
-    case reasons.DivisionByZero(e) =>
-      val division = info(e).dividingExpr.get
-      division.blame.blame(blame.ScalarDivByZero(division))
-    case reasons.InsufficientPermission(f@silver.FieldAccess(_, _)) =>
-      val deref = get[col.SilverDeref[_]](f)
-      deref.blame.blame(blame.InsufficientPermission(deref))
-    case reasons.InsufficientPermission(p@silver.PredicateAccess(_, _)) =>
-      val unfolding = info(p).unfolding.get
-      unfolding.blame.blame(blame.UnfoldFailed(getFailure(reason), unfolding))
-    case reasons.QPAssertionNotInjective(access: silver.ResourceAccess) =>
-      val starall = info(access).starall.get
-      starall.blame.blame(blame.ReceiverNotInjective(starall, get(access)))
-    case reasons.LabelledStateNotReached(expr) =>
-      val old = get[col.Old[_]](expr)
-      old.blame.blame(blame.LabelNotReached(old))
-    case reasons.SeqIndexNegative(_, idx) =>
-      val subscript = info(idx).seqIndexSubscriptNode.get
-      subscript.blame.blame(blame.SeqBoundNegative(subscript))
-    case reasons.SeqIndexExceedsLength(_, idx) =>
-      val subscript = info(idx).seqIndexSubscriptNode.get
-      subscript.blame.blame(blame.SeqBoundExceedsLength(subscript))
-    case reasons.MapKeyNotContained(_, key) =>
-      val get = info(key).mapGet.get
-      get.blame.blame(blame.MapKeyError(get))
+  def defer(reason: ErrorReason): Unit =
+    reason match {
+      case reasons.DivisionByZero(e) =>
+        val division = info(e).dividingExpr.get
+        division.blame.blame(blame.ScalarDivByZero(division))
+      case reasons.InsufficientPermission(f @ silver.FieldAccess(_, _)) =>
+        val deref = get[col.SilverDeref[_]](f)
+        deref.blame.blame(blame.InsufficientPermission(deref))
+      case reasons.InsufficientPermission(p @ silver.PredicateAccess(_, _)) =>
+        val unfolding = info(p).unfolding.get
+        unfolding.blame.blame(blame.UnfoldFailed(getFailure(reason), unfolding))
+      case reasons.QPAssertionNotInjective(access: silver.ResourceAccess) =>
+        val starall = info(access).starall.get
+        starall.blame.blame(blame.ReceiverNotInjective(starall, get(access)))
+      case reasons.LabelledStateNotReached(expr) =>
+        val old = get[col.Old[_]](expr)
+        old.blame.blame(blame.LabelNotReached(old))
+      case reasons.SeqIndexNegative(_, idx) =>
+        val subscript = info(idx).seqIndexSubscriptNode.get
+        subscript.blame.blame(blame.SeqBoundNegative(subscript))
+      case reasons.SeqIndexExceedsLength(_, idx) =>
+        val subscript = info(idx).seqIndexSubscriptNode.get
+        subscript.blame.blame(blame.SeqBoundExceedsLength(subscript))
+      case reasons.MapKeyNotContained(_, key) =>
+        val get = info(key).mapGet.get
+        get.blame.blame(blame.MapKeyError(get))
 
-    case other =>
-      throw NotSupported(s"Viper returned an error reason that VerCors does not recognize: $other")
-  }
-}
\ No newline at end of file
+      case other =>
+        throw NotSupported(
+          s"Viper returned an error reason that VerCors does not recognize: $other"
+        )
+    }
+}
diff --git a/src/viper/viper/api/backend/carbon/Carbon.scala b/src/viper/viper/api/backend/carbon/Carbon.scala
index 555bad8854..49142fcf38 100644
--- a/src/viper/viper/api/backend/carbon/Carbon.scala
+++ b/src/viper/viper/api/backend/carbon/Carbon.scala
@@ -13,40 +13,51 @@ import viper.silver.{ast => silver}
 import java.nio.file.Path
 
 case class Carbon(
-  z3Path: Path = Resources.getZ3Path,
-  boogiePath: Path = Resources.getBoogiePath,
-  printFile: Option[Path] = None,
-  proverLogFile: Option[Path] = None,
-  options: Seq[String] = Nil,
+    z3Path: Path = Resources.getZ3Path,
+    boogiePath: Path = Resources.getBoogiePath,
+    printFile: Option[Path] = None,
+    proverLogFile: Option[Path] = None,
+    options: Seq[String] = Nil,
 ) extends SilverBackend {
-  override def submit(intermediateProgram: (silver.Program, Map[Int, col.Node[_]])): Boolean = synchronized { super.submit(intermediateProgram) }
-
-  override def createVerifier(reporter: Reporter, nodeFromUniqueId: Map[Int, col.Node[_]]): (viper.carbon.CarbonVerifier, SilverPluginManager) = {
+  override def submit(
+      intermediateProgram: (silver.Program, Map[Int, col.Node[_]])
+  ): Boolean = synchronized { super.submit(intermediateProgram) }
+
+  override def createVerifier(
+      reporter: Reporter,
+      nodeFromUniqueId: Map[Int, col.Node[_]],
+  ): (viper.carbon.CarbonVerifier, SilverPluginManager) = {
     val carbon = viper.carbon.CarbonVerifier(reporter)
 
-    val carbonConfig = Seq(
-      "--z3Exe", z3Path.toString,
-      "--boogieExe", boogiePath.toString,
-    ) ++ (printFile match {
-      case Some(p) => Seq("--print", p.toString)
-      case _ => Nil
-    }) ++ (proverLogFile match {
-      case Some(p) => Seq("--proverLog", p.toString)
-      case _ => Nil
-    }) ++ options ++ Seq("-")
+    val carbonConfig =
+      Seq("--z3Exe", z3Path.toString, "--boogieExe", boogiePath.toString) ++
+        (printFile match {
+          case Some(p) => Seq("--print", p.toString)
+          case _ => Nil
+        }) ++
+        (proverLogFile match {
+          case Some(p) => Seq("--proverLog", p.toString)
+          case _ => Nil
+        }) ++ options ++ Seq("-")
 
     carbon.parseCommandLine(carbonConfig)
 
     carbon.start()
 
-    val plugins = SilverPluginManager(Some(Seq(
-      "viper.silver.plugin.standard.termination.TerminationPlugin",
-    ).mkString(":")))(carbon.reporter, getLogger("viper.silver.plugin").asInstanceOf[ch.qos.logback.classic.Logger], carbon.config, null)
+    val plugins =
+      SilverPluginManager(Some(
+        Seq("viper.silver.plugin.standard.termination.TerminationPlugin")
+          .mkString(":")
+      ))(
+        carbon.reporter,
+        getLogger("viper.silver.plugin")
+          .asInstanceOf[ch.qos.logback.classic.Logger],
+        carbon.config,
+        null,
+      )
 
     (carbon, plugins)
   }
 
-  override def stopVerifier(verifier: Verifier): Unit = {
-    verifier.stop()
-  }
+  override def stopVerifier(verifier: Verifier): Unit = { verifier.stop() }
 }
diff --git a/src/viper/viper/api/backend/silicon/BranchRecordTask.scala b/src/viper/viper/api/backend/silicon/BranchRecordTask.scala
index cba06cd889..4416a8e120 100644
--- a/src/viper/viper/api/backend/silicon/BranchRecordTask.scala
+++ b/src/viper/viper/api/backend/silicon/BranchRecordTask.scala
@@ -2,14 +2,21 @@ package viper.api.backend.silicon
 
 import hre.progress.ProgressRender
 import hre.progress.task.{AbstractTask, Task}
-import viper.api.backend.silicon.SiliconLogListener.{BranchCondition, BranchConditionExp, BranchConditionNone, BranchConditionTerm}
+import viper.api.backend.silicon.SiliconLogListener.{
+  BranchCondition,
+  BranchConditionExp,
+  BranchConditionNone,
+  BranchConditionTerm,
+}
 
-case class BranchRecordTask(superTask: AbstractTask, cond: BranchCondition) extends Task {
-  override def profilingBreadcrumb: String = cond match {
-    case BranchConditionExp(e) => CachedExpRender(e)
-    case BranchConditionTerm(e) => e.toString
-    case BranchConditionNone(at, count) => s"alternative $at/$count"
-  }
+case class BranchRecordTask(superTask: AbstractTask, cond: BranchCondition)
+    extends Task {
+  override def profilingBreadcrumb: String =
+    cond match {
+      case BranchConditionExp(e) => CachedExpRender(e)
+      case BranchConditionTerm(e) => e.toString
+      case BranchConditionNone(at, count) => s"alternative $at/$count"
+    }
 
   override def renderHere: ProgressRender = ProgressRender(profilingBreadcrumb)
 }
diff --git a/src/viper/viper/api/backend/silicon/CachedExpRender.scala b/src/viper/viper/api/backend/silicon/CachedExpRender.scala
index a025eda2e2..ca3e45eab5 100644
--- a/src/viper/viper/api/backend/silicon/CachedExpRender.scala
+++ b/src/viper/viper/api/backend/silicon/CachedExpRender.scala
@@ -5,8 +5,8 @@ import viper.silver.ast.Node
 import scala.collection.mutable
 
 case object CachedExpRender {
-  private val cache: ThreadLocal[mutable.WeakHashMap[Node, String]] = ThreadLocal.withInitial(() => mutable.WeakHashMap())
+  private val cache: ThreadLocal[mutable.WeakHashMap[Node, String]] =
+    ThreadLocal.withInitial(() => mutable.WeakHashMap())
 
-  def apply(e: Node): String =
-    cache.get().getOrElseUpdate(e, e.toString())
+  def apply(e: Node): String = cache.get().getOrElseUpdate(e, e.toString())
 }
diff --git a/src/viper/viper/api/backend/silicon/DataRecordTask.scala b/src/viper/viper/api/backend/silicon/DataRecordTask.scala
index 9c5387b0c2..3191058835 100644
--- a/src/viper/viper/api/backend/silicon/DataRecordTask.scala
+++ b/src/viper/viper/api/backend/silicon/DataRecordTask.scala
@@ -2,39 +2,68 @@ package viper.api.backend.silicon
 
 import hre.progress.ProgressRender
 import hre.progress.task.{AbstractTask, Task}
-import viper.silicon.logger.records.data.{CommentRecord, ConsumeRecord, DataRecord, DeciderAssertRecord, ExecuteRecord, FunctionRecord, MethodRecord, PredicateRecord, ProduceRecord, ProverAssertRecord}
+import viper.silicon.logger.records.data.{
+  CommentRecord,
+  ConsumeRecord,
+  DataRecord,
+  DeciderAssertRecord,
+  ExecuteRecord,
+  FunctionRecord,
+  MethodRecord,
+  PredicateRecord,
+  ProduceRecord,
+  ProverAssertRecord,
+}
 
-case class DataRecordTask(superTask: AbstractTask, record: DataRecord) extends Task {
-  def renderMaybeShort(short: Boolean): ProgressRender = record match {
-    case r: FunctionRecord => Util.renderOrigin(r.value, "Verifying", short = true)
-    case r: PredicateRecord => Util.renderOrigin(r.value, "Verifying", short = true)
-    case r: MethodRecord => Util.renderOrigin(r.value, "Verifying", short = true)
-    case r: ExecuteRecord => Util.renderOrigin(r.value, "Executing", short)
-    case r: ConsumeRecord => Util.renderOrigin(r.value, "Exhaling", short)
-    case r: ProduceRecord => Util.renderOrigin(r.value, "Inhaling", short)
-    case r: CommentRecord => ProgressRender(s"/*${r.comment}*/")
-    case r: DeciderAssertRecord => ProgressRender(s"Asserting ${r.term.toString.replaceAll("[\n ]+", " ")}")
-    case r: ProverAssertRecord =>  ProgressRender(s"Asserting ${r.term.toString.replaceAll("[\n ]+", " ")}")
-  }
+case class DataRecordTask(superTask: AbstractTask, record: DataRecord)
+    extends Task {
+  def renderMaybeShort(short: Boolean): ProgressRender =
+    record match {
+      case r: FunctionRecord =>
+        Util.renderOrigin(r.value, "Verifying", short = true)
+      case r: PredicateRecord =>
+        Util.renderOrigin(r.value, "Verifying", short = true)
+      case r: MethodRecord =>
+        Util.renderOrigin(r.value, "Verifying", short = true)
+      case r: ExecuteRecord => Util.renderOrigin(r.value, "Executing", short)
+      case r: ConsumeRecord => Util.renderOrigin(r.value, "Exhaling", short)
+      case r: ProduceRecord => Util.renderOrigin(r.value, "Inhaling", short)
+      case r: CommentRecord => ProgressRender(s"/*${r.comment}*/")
+      case r: DeciderAssertRecord =>
+        ProgressRender(
+          s"Asserting ${r.term.toString.replaceAll("[\n ]+", " ")}"
+        )
+      case r: ProverAssertRecord =>
+        ProgressRender(
+          s"Asserting ${r.term.toString.replaceAll("[\n ]+", " ")}"
+        )
+    }
 
   override def renderHere: ProgressRender = renderMaybeShort(short = false)
   override def renderHereShort: ProgressRender = renderMaybeShort(short = true)
 
-  override def profilingBreadcrumb: String = record match {
-    case r: FunctionRecord => s"Function ${r.value.name}"
-    case r: PredicateRecord => s"Predicate ${r.value.name}"
-    case r: MethodRecord => s"Method ${r.value.name}"
-    case r: ExecuteRecord => s"${CachedExpRender(r.value).replaceAll("[\n ]+", " ")}"
-    case r: ConsumeRecord => s"Exhale ${CachedExpRender(r.value).replaceAll("[\n ]+", " ")}"
-    case r: ProduceRecord => s"Inhale ${CachedExpRender(r.value).replaceAll("[\n ]+", " ")}"
-    case r: CommentRecord => s"/*${r.comment}*/"
-    case r: DeciderAssertRecord => s"Assert ${r.term.toString.replaceAll("[\n ]+", " ")}"
-    case r: ProverAssertRecord => s"Assert ${r.term.toString.replaceAll("[\n ]+", " ")}"
-  }
+  override def profilingBreadcrumb: String =
+    record match {
+      case r: FunctionRecord => s"Function ${r.value.name}"
+      case r: PredicateRecord => s"Predicate ${r.value.name}"
+      case r: MethodRecord => s"Method ${r.value.name}"
+      case r: ExecuteRecord =>
+        s"${CachedExpRender(r.value).replaceAll("[\n ]+", " ")}"
+      case r: ConsumeRecord =>
+        s"Exhale ${CachedExpRender(r.value).replaceAll("[\n ]+", " ")}"
+      case r: ProduceRecord =>
+        s"Inhale ${CachedExpRender(r.value).replaceAll("[\n ]+", " ")}"
+      case r: CommentRecord => s"/*${r.comment}*/"
+      case r: DeciderAssertRecord =>
+        s"Assert ${r.term.toString.replaceAll("[\n ]+", " ")}"
+      case r: ProverAssertRecord =>
+        s"Assert ${r.term.toString.replaceAll("[\n ]+", " ")}"
+    }
 
   override def hashCode(): Int = record.id
-  override def equals(other: Any): Boolean = other match {
-    case DataRecordTask(_, other) => other.id == record.id
-    case _ => false
-  }
+  override def equals(other: Any): Boolean =
+    other match {
+      case DataRecordTask(_, other) => other.id == record.id
+      case _ => false
+    }
 }
diff --git a/src/viper/viper/api/backend/silicon/Silicon.scala b/src/viper/viper/api/backend/silicon/Silicon.scala
index 8313848ff2..0fd0ab0b6e 100644
--- a/src/viper/viper/api/backend/silicon/Silicon.scala
+++ b/src/viper/viper/api/backend/silicon/Silicon.scala
@@ -25,32 +25,24 @@ import scala.util.matching.{Regex, UnanchoredRegex}
 final class ConcurrentListAppender[E] extends AppenderBase[E] {
   var es: mutable.ArrayBuffer[E] = new mutable.ArrayBuffer[E]()
 
-  override def append(e: E): Unit = {
-    this.synchronized {
-      es.addOne(e)
-    }
-  }
+  override def append(e: E): Unit = { this.synchronized { es.addOne(e) } }
 
-  def getAll(): Seq[E] = {
-    this.synchronized {
-      es.clone().toSeq
-    }
-  }
+  def getAll(): Seq[E] = { this.synchronized { es.clone().toSeq } }
 }
 
 @nowarn("any") // due to be removed
 case class Silicon(
-  z3Settings: Map[String, String] = Map.empty,
-  z3Path: Path = Resources.getZ3Path,
-  numberOfParallelVerifiers: Option[Int] = None,
-  proverLogFile: Option[Path] = None,
-  printQuantifierStatistics: Boolean = false,
-  reportOnNoProgress: Boolean = true,
-  traceBranchConditions: Boolean = false,
-  branchConditionReportInterval: Option[Int] = Some(1000),
-  timeoutValue: Int = 30,
-  totalTimeOut: Int = 0,
-  options: Seq[String] = Nil,
+    z3Settings: Map[String, String] = Map.empty,
+    z3Path: Path = Resources.getZ3Path,
+    numberOfParallelVerifiers: Option[Int] = None,
+    proverLogFile: Option[Path] = None,
+    printQuantifierStatistics: Boolean = false,
+    reportOnNoProgress: Boolean = true,
+    traceBranchConditions: Boolean = false,
+    branchConditionReportInterval: Option[Int] = Some(1000),
+    timeoutValue: Int = 30,
+    totalTimeOut: Int = 0,
+    options: Seq[String] = Nil,
 ) extends SilverBackend {
 
   var la: ConcurrentListAppender[ILoggingEvent] = null
@@ -59,11 +51,15 @@ case class Silicon(
   var reportedQuantifiers = false
   var intermediatePrinterTimer: Timer = null
 
-  override def createVerifier(reporter: Reporter, nodeFromUniqueId: Map[Int, Node[_]]): (viper.silicon.Silicon, SilverPluginManager) = {
+  override def createVerifier(
+      reporter: Reporter,
+      nodeFromUniqueId: Map[Int, Node[_]],
+  ): (viper.silicon.Silicon, SilverPluginManager) = {
     this.nodeFromUniqueId = nodeFromUniqueId
 
     if (printQuantifierStatistics) {
-      val l = LoggerFactory.getLogger("viper.silicon.decider.Z3ProverStdIO").asInstanceOf[Logger]
+      val l = LoggerFactory.getLogger("viper.silicon.decider.Z3ProverStdIO")
+        .asInstanceOf[Logger]
       l.setLevel(Level.INFO)
       la = new ConcurrentListAppender[ILoggingEvent]()
       la.setName("quantifier-instantations-appender")
@@ -71,10 +67,15 @@ case class Silicon(
       l.setAdditive(false) // Prevent bubbling up
       l.addAppender(la)
 
-      intermediatePrinterTimer = new Timer("[VerCors] Silicon quantifier report timer")
-      intermediatePrinterTimer.schedule(new TimerTask {
-        override def run(): Unit = shortQuantifierReport()
-      }, 5000, 5000)
+      intermediatePrinterTimer =
+        new Timer("[VerCors] Silicon quantifier report timer")
+      intermediatePrinterTimer.schedule(
+        new TimerTask {
+          override def run(): Unit = shortQuantifierReport()
+        },
+        5000,
+        5000,
+      )
 
       shutdownHookThread = sys.addShutdownHook({
         longQuantifierReport()
@@ -84,21 +85,29 @@ case class Silicon(
 
     val silicon = new viper.silicon.Silicon(reporter)
 
-    val z3Config = z3Settings.map{case (k, v) => s"$k=$v"}.mkString(" ")
+    val z3Config = z3Settings.map { case (k, v) => s"$k=$v" }.mkString(" ")
 
     var siliconConfig = Seq(
-      "--assertTimeout", (timeoutValue*1000).toString,
-      "--timeout", totalTimeOut.toString,
-      "--z3Exe", z3Path.toString,
-      "--z3ConfigArgs", z3Config,
+      "--assertTimeout",
+      (timeoutValue * 1000).toString,
+      "--timeout",
+      totalTimeOut.toString,
+      "--z3Exe",
+      z3Path.toString,
+      "--z3ConfigArgs",
+      z3Config,
       "--ideModeAdvanced",
     )
 
-    if(proverLogFile.isDefined) {
+    if (proverLogFile.isDefined) {
       // PB: note: enableTempDirectory works unexpectedly: it only enables the logging of smtlib provers and does
       //     not create the typical tmp directory. The temp directory is also not prepended to proverLogFile when it is
       //     supplied.
-      siliconConfig ++= Seq("--enableTempDirectory", "--proverLogFile", proverLogFile.get.toString)
+      siliconConfig ++= Seq(
+        "--enableTempDirectory",
+        "--proverLogFile",
+        proverLogFile.get.toString,
+      )
     }
 
     numberOfParallelVerifiers match {
@@ -112,13 +121,25 @@ case class Silicon(
     siliconConfig :+= "-"
 
     silicon.parseCommandLine(siliconConfig)
-    silicon.symbExLog = SiliconLogListener(reportOnNoProgress, traceBranchConditions, branchConditionReportInterval)
+    silicon.symbExLog = SiliconLogListener(
+      reportOnNoProgress,
+      traceBranchConditions,
+      branchConditionReportInterval,
+    )
 
     silicon.start()
 
-    val plugins = SilverPluginManager(Some(Seq(
-      "viper.silver.plugin.standard.termination.TerminationPlugin",
-    ).mkString(":")))(silicon.reporter, getLogger("viper.silver.plugin").asInstanceOf[ch.qos.logback.classic.Logger], silicon.config, null)
+    val plugins =
+      SilverPluginManager(Some(
+        Seq("viper.silver.plugin.standard.termination.TerminationPlugin")
+          .mkString(":")
+      ))(
+        silicon.reporter,
+        getLogger("viper.silver.plugin")
+          .asInstanceOf[ch.qos.logback.classic.Logger],
+        silicon.config,
+        null,
+      )
 
     (silicon, plugins)
   }
@@ -133,47 +154,56 @@ case class Silicon(
       > that gets applied to quantifiers and it is also possible to define cost functions through configuration. Roughly,
       > the cost of a quantifier instantiation should correspond to the preference of when to instantiate it.
    */
-  case class QuantifierInstanceReport(e: Either[String, Expr[_]], instances: Int, maxGeneration: Int, maxCost: Int)
+  case class QuantifierInstanceReport(
+      e: Either[String, Expr[_]],
+      instances: Int,
+      maxGeneration: Int,
+      maxCost: Int,
+  )
 
   // TODO: Refactor this code to keep the parsed quantifier stats around, possibly only the biggest ones, only poll for new ones,
   //       and print ignored lines.
   //       Also, integrate with SymbExLogger/SiliconLogListener, for code  reuse and to get similar presentation/behaviour.
   // Parses z3 quantifier output into our own report data structure
   // Format info: https://github.com/Z3Prover/z3/blob/z3-4.8.6/src/smt/smt_quantifier.cpp#L173-L181
-  val quantifierStatFormatR: UnanchoredRegex = raw"\[quantifier_instances]\s*(\S+)\s*:\s*(\S+)\s*:\s*(\S+)\s*:\s*(\S+)".r.unanchored
+  val quantifierStatFormatR: UnanchoredRegex =
+    raw"\[quantifier_instances]\s*(\S+)\s*:\s*(\S+)\s*:\s*(\S+)\s*:\s*(\S+)".r
+      .unanchored
   val uniqueIdR: Regex = raw".*unique_id=(\d+)".r
   def getQuantifierInstanceReports(): Seq[QuantifierInstanceReport] = {
-    la.getAll()
-      .map(_.toString)
-      .collect {
-        case quantifierStatFormatR(qid, numInstances, maxGeneration, maxCost) =>
-          val id = qid match {
+    la.getAll().map(_.toString).collect {
+      case quantifierStatFormatR(qid, numInstances, maxGeneration, maxCost) =>
+        val id =
+          qid match {
             case uniqueIdR(intId) =>
               Right(nodeFromUniqueId(intId.toInt).asInstanceOf[Expr[_]])
             case _ => Left(qid)
           }
-          QuantifierInstanceReport(id, numInstances.toInt, maxGeneration.toInt, maxCost.toInt)
-      }
-      .map(r => (r.e, r))
-      .sortBy(_._2.instances)
-      .toMap.values.toSeq
+        QuantifierInstanceReport(
+          id,
+          numInstances.toInt,
+          maxGeneration.toInt,
+          maxCost.toInt,
+        )
+    }.map(r => (r.e, r)).sortBy(_._2.instances).toMap.values.toSeq
   }
 
   def longQuantifierReport(): Unit = {
     val reports = getQuantifierInstanceReports()
     if (reports.nonEmpty) {
-      logger.info("Reporting quantifier instances statistics in descending order:")
+      logger
+        .info("Reporting quantifier instances statistics in descending order:")
       for (report <- reports.sortBy(_.instances).reverse) {
         report.e match {
           case Right(e) =>
             logger.info(e.o.messageInContext(
-              s"instances: ${report.instances} (gen: ${report.maxGeneration}, cost: ${report.maxCost})"))
+              s"instances: ${report.instances} (gen: ${report
+                  .maxGeneration}, cost: ${report.maxCost})"
+            ))
           case Left(n) =>
-            logger.info(
-              s"""${Message.BOLD_HR}Backend quantifier: $n
+            logger.info(s"""${Message.BOLD_HR}Backend quantifier: $n
                  |instances: ${report.instances} (gen: ${report.maxGeneration}, cost: ${report.maxCost})
-                 |${Message.BOLD_HR}""".stripMargin
-            )
+                 |${Message.BOLD_HR}""".stripMargin)
         }
       }
     }
@@ -184,18 +214,28 @@ case class Silicon(
     if (reports.nonEmpty) {
       logger.info("=== Quantifier instantiation statistics ===")
       val orderedReports = reports.sortBy(_.instances).reverse
-      val cutReports = if (logger.underlying.isDebugEnabled) orderedReports else orderedReports.take(10)
+      val cutReports =
+        if (logger.underlying.isDebugEnabled)
+          orderedReports
+        else
+          orderedReports.take(10)
       for (report <- cutReports) {
         report.e match {
           case Right(e) =>
             val o = e.o
-            logger.info(s"${o.shortPositionText}: inst: ${report.instances} (gen: ${report.maxGeneration}, cost: ${report.maxCost})")
+            logger.info(
+              s"${o.shortPositionText}: inst: ${report.instances} (gen: ${report
+                  .maxGeneration}, cost: ${report.maxCost})"
+            )
           case Left(n) =>
-            logger.info(s"$n: inst: ${report.instances} (gen: ${report.maxGeneration}, cost: ${report.maxCost})")
+            logger.info(s"$n: inst: ${report.instances} (gen: ${report
+                .maxGeneration}, cost: ${report.maxCost})")
         }
       }
       if (cutReports.length < orderedReports.length) {
-        logger.info(s"Omitting ${orderedReports.length - cutReports.length} other quantifiers...")
+        logger.info(
+          s"Omitting ${orderedReports.length - cutReports.length} other quantifiers..."
+        )
       }
     }
   }
@@ -209,9 +249,7 @@ case class Silicon(
     if (printQuantifierStatistics) {
       intermediatePrinterTimer.cancel()
       shutdownHookThread.remove()
-      if (!reportedQuantifiers) {
-        longQuantifierReport()
-      }
+      if (!reportedQuantifiers) { longQuantifierReport() }
     }
   }
 }
diff --git a/src/viper/viper/api/backend/silicon/SiliconLogListener.scala b/src/viper/viper/api/backend/silicon/SiliconLogListener.scala
index bffd27f25d..47a8690f1c 100644
--- a/src/viper/viper/api/backend/silicon/SiliconLogListener.scala
+++ b/src/viper/viper/api/backend/silicon/SiliconLogListener.scala
@@ -3,11 +3,20 @@ package viper.api.backend.silicon
 import com.typesafe.scalalogging.LazyLogging
 import hre.progress.TaskRegistry
 import hre.progress.task.{AbstractTask, Task}
-import viper.api.backend.silicon.SiliconLogListener.{BranchCondition, BranchConditionExp, BranchConditionNone, BranchConditionTerm}
+import viper.api.backend.silicon.SiliconLogListener.{
+  BranchCondition,
+  BranchConditionExp,
+  BranchConditionNone,
+  BranchConditionTerm,
+}
 import viper.api.transform.NodeInfo
 import viper.silicon.decider.PathConditionStack
 import viper.silicon.logger.records.data._
-import viper.silicon.logger.records.scoping.{CloseScopeRecord, OpenScopeRecord, ScopingRecord}
+import viper.silicon.logger.records.scoping.{
+  CloseScopeRecord,
+  OpenScopeRecord,
+  ScopingRecord,
+}
 import viper.silicon.logger.records.structural.BranchingRecord
 import viper.silicon.logger.{MemberSymbExLogger, SymbExLogger}
 import viper.silicon.state.terms
@@ -31,23 +40,35 @@ case object SiliconLogListener {
 }
 
 case class SiliconLogListener(
-  reportOnNoProgress: Boolean,
-  traceBranchConditions: Boolean,
-  branchConditionReportInterval: Option[Int],
+    reportOnNoProgress: Boolean,
+    traceBranchConditions: Boolean,
+    branchConditionReportInterval: Option[Int],
 ) extends SymbExLogger[SiliconMemberLogListener] {
   val superTask: Option[AbstractTask] =
-    if(TaskRegistry.enabled) Some(TaskRegistry.currentTaskInThread)
-    else None
-
-  override protected def newEntityLogger(member: Member, pcs: PathConditionStack): SiliconMemberLogListener = {
+    if (TaskRegistry.enabled)
+      Some(TaskRegistry.currentTaskInThread)
+    else
+      None
+
+  override protected def newEntityLogger(
+      member: Member,
+      pcs: PathConditionStack,
+  ): SiliconMemberLogListener = {
     val log = new SiliconMemberLogListener(this, member, pcs, superTask)
     SiliconLogListener.logs += log
     log
   }
 }
 
-class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: PathConditionStack, superTask: Option[AbstractTask]) extends MemberSymbExLogger(log, member, pcs) with LazyLogging {
-  var openScopeFrames: List[mutable.LinkedHashMap[Int, DataRecord]] = List(mutable.LinkedHashMap())
+class SiliconMemberLogListener(
+    log: SiliconLogListener,
+    member: Member,
+    pcs: PathConditionStack,
+    superTask: Option[AbstractTask],
+) extends MemberSymbExLogger(log, member, pcs) with LazyLogging {
+  var openScopeFrames: List[mutable.LinkedHashMap[Int, DataRecord]] = List(
+    mutable.LinkedHashMap()
+  )
   var branchScopeCloseRecords: List[mutable.Set[Int]] = List(mutable.Set())
   var branchConditions: List[BranchCondition] = List()
   var branchUpdates: Int = 0
@@ -58,7 +79,8 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
   def siliconProgress(): Unit = {
     taskProgress()
 
-    if(!log.reportOnNoProgress) return
+    if (!log.reportOnNoProgress)
+      return
 
     currentTimerTask.foreach(_.cancel())
     timer.purge()
@@ -68,7 +90,10 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
     })
 
     try {
-      timer.schedule(currentTimerTask.get, SiliconLogListener.NO_PROGRESS_TIMEOUT.toMillis)
+      timer.schedule(
+        currentTimerTask.get,
+        SiliconLogListener.NO_PROGRESS_TIMEOUT.toMillis,
+      )
     } catch {
       case e: IllegalStateException =>
         println("what")
@@ -78,53 +103,65 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
 
   def done(): Unit = {
     timer.cancel()
-    if(superTask.nonEmpty)
-      currentTaskStack = updateTaskStack(currentTaskStack, superTask.get, Nil, Nil, Nil)
+    if (superTask.nonEmpty)
+      currentTaskStack = updateTaskStack(
+        currentTaskStack,
+        superTask.get,
+        Nil,
+        Nil,
+        Nil,
+      )
   }
 
-  def where(node: Node): Option[String] = Util.getOrigin(node).map(_.shortPositionText)
+  def where(node: Node): Option[String] =
+    Util.getOrigin(node).map(_.shortPositionText)
+
+  def printRecords(
+      records: mutable.LinkedHashMap[Int, DataRecord],
+      excludedBy: Map[Int, Int],
+  ): Unit = {
+    for (record <- records.values.toSeq.sortBy(_.id)) {
+      val at =
+        record match {
+          case member: MemberRecord => where(member.value)
+          case exec: ExecuteRecord => where(exec.value)
+          case produce: ProduceRecord => where(produce.value)
+          case consume: ConsumeRecord => where(consume.value)
+          case _ => None
+        }
 
-  def printRecords(records: mutable.LinkedHashMap[Int, DataRecord], excludedBy: Map[Int, Int]): Unit = {
-    for(record <- records.values.toSeq.sortBy(_.id)) {
-      val at = record match {
-        case member: MemberRecord => where(member.value)
-        case exec: ExecuteRecord => where(exec.value)
-        case produce: ProduceRecord => where(produce.value)
-        case consume: ConsumeRecord => where(consume.value)
-        case _ => None
-      }
+      if (at.nonEmpty) { logger.info(s"    At ${at.get}:") }
 
-      if(at.nonEmpty) {
-        logger.info(s"    At ${at.get}:")
-      }
-
-      if(excludedBy.contains(record.id)) {
-        logger.info(s"      [finished in branch ${excludedBy(record.id)}]: $record")
-      } else {
-        logger.info(s"      $record")
-      }
+      if (excludedBy.contains(record.id)) {
+        logger
+          .info(s"      [finished in branch ${excludedBy(record.id)}]: $record")
+      } else { logger.info(s"      $record") }
     }
   }
 
   def printDetailedState(): Unit = {
     val exclude = branchScopeCloseRecords.flatMap(_.toSeq).toSet
 
-    val excludedBy = branchScopeCloseRecords.zipWithIndex.flatMap {
-      case (excluded, idx) => excluded.map(_ -> idx)
-    }.toMap
+    val excludedBy =
+      branchScopeCloseRecords.zipWithIndex.flatMap { case (excluded, idx) =>
+        excluded.map(_ -> idx)
+      }.toMap
 
-    logger.warn("Silicon has been working on the same proof goal for over 10 seconds.")
+    logger.warn(
+      "Silicon has been working on the same proof goal for over 10 seconds."
+    )
     logger.info("Current state of silicon worker:")
     printRecords(openScopeFrames.last, excludedBy)
 
-    for(((records, idx), condition) <- openScopeFrames.init.zipWithIndex.zip(branchConditions).reverse) {
+    for (
+      ((records, idx), condition) <-
+        openScopeFrames.init.zipWithIndex.zip(branchConditions).reverse
+    ) {
       condition match {
-        case BranchConditionExp(cond) =>
-          logger.info(s"  [$idx] $cond")
-        case BranchConditionTerm(cond) =>
-          logger.info(s"  [$idx] $cond")
+        case BranchConditionExp(cond) => logger.info(s"  [$idx] $cond")
+        case BranchConditionTerm(cond) => logger.info(s"  [$idx] $cond")
         case BranchConditionNone(at, count) =>
-          logger.info(s"  [$idx] <indeterminate branch ${at+1} of $count>")
+          logger.info(s"  [$idx] <indeterminate branch ${at + 1} of $count>")
       }
 
       printRecords(records, excludedBy)
@@ -133,7 +170,13 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
 
   var currentTaskStack: Seq[Task] = Nil
 
-  def updateTaskStack(taskStack: Seq[Task], superTask: AbstractTask, records: Seq[DataRecord], branches: Seq[BranchCondition], finalAsserts: Seq[DataRecord]): Seq[Task] =
+  def updateTaskStack(
+      taskStack: Seq[Task],
+      superTask: AbstractTask,
+      records: Seq[DataRecord],
+      branches: Seq[BranchCondition],
+      finalAsserts: Seq[DataRecord],
+  ): Seq[Task] =
     (taskStack, records, branches, finalAsserts) match {
       case (Nil, Nil, Nil, Nil) => Nil
       case (tasks, Nil, Nil, Nil) =>
@@ -145,12 +188,21 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
         task.start()
         task +: updateTaskStack(Nil, task, records, branches, finalAsserts)
       case (task +: tasks, Nil, Nil, finalAssert +: finalAsserts) =>
-        if (task.superTask == superTask && task == DataRecordTask(superTask, finalAssert)) {
+        if (
+          task.superTask == superTask &&
+          task == DataRecordTask(superTask, finalAssert)
+        ) {
           task +: updateTaskStack(tasks, task, records, branches, finalAsserts)
         } else {
           tasks.reverse.foreach(_.end())
           task.end()
-          updateTaskStack(Nil, superTask, records, branches, finalAssert +: finalAsserts)
+          updateTaskStack(
+            Nil,
+            superTask,
+            records,
+            branches,
+            finalAssert +: finalAsserts,
+          )
         }
 
       case (Nil, Nil, branch +: branches, _) =>
@@ -158,7 +210,7 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
         task.start()
         task +: updateTaskStack(Nil, task, Nil, branches, finalAsserts)
       case (task +: tasks, Nil, branch +: branches, _) =>
-        if(task == BranchRecordTask(superTask, branch)) {
+        if (task == BranchRecordTask(superTask, branch)) {
           task +: updateTaskStack(tasks, task, Nil, branches, finalAsserts)
         } else {
           tasks.reverse.foreach(_.end())
@@ -171,26 +223,33 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
         task.start()
         task +: updateTaskStack(Nil, task, records, branches, finalAsserts)
       case (task +: tasks, record +: records, _, _) =>
-        if(task.superTask == superTask && task == DataRecordTask(superTask, record)) {
+        if (
+          task.superTask == superTask &&
+          task == DataRecordTask(superTask, record)
+        ) {
           task +: updateTaskStack(tasks, task, records, branches, finalAsserts)
         } else {
           tasks.reverse.foreach(_.end())
           task.end()
-          updateTaskStack(Nil, superTask, record +: records, branches, finalAsserts)
+          updateTaskStack(
+            Nil,
+            superTask,
+            record +: records,
+            branches,
+            finalAsserts,
+          )
         }
     }
 
   def taskProgress(): Unit = {
-    if(this.superTask.isEmpty) return
+    if (this.superTask.isEmpty)
+      return
     val superTask = this.superTask.get
 
     val BANNED_COMMENTS = Set("Retry")
 
-    val records =
-      openScopeFrames
-        .reverse
-        .flatMap(_.values)
-        .filter(r => !branchScopeCloseRecords.exists(_.contains(r.id)))
+    val records = openScopeFrames.reverse.flatMap(_.values)
+      .filter(r => !branchScopeCloseRecords.exists(_.contains(r.id)))
 
     val primaryTaskRecords = records.collect {
       case r: MemberRecord => r
@@ -209,37 +268,44 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
       case r: ProverAssertRecord => r
     }
 
-    currentTaskStack = updateTaskStack(currentTaskStack, superTask, primaryTaskRecords, conditions, finalAsserts.toSeq)
+    currentTaskStack = updateTaskStack(
+      currentTaskStack,
+      superTask,
+      primaryTaskRecords,
+      conditions,
+      finalAsserts.toSeq,
+    )
   }
 
   def updateBranch(indicator: String): Unit = {
-    if(log.traceBranchConditions) {
-      val textCond = branchConditions.head match {
-        case BranchConditionExp(e) => e.toString()
-        case BranchConditionTerm(e) => e.toString
-        case BranchConditionNone(at, count) => s"alternative $at/$count"
-      }
+    if (log.traceBranchConditions) {
+      val textCond =
+        branchConditions.head match {
+          case BranchConditionExp(e) => e.toString()
+          case BranchConditionTerm(e) => e.toString
+          case BranchConditionNone(at, count) => s"alternative $at/$count"
+        }
       val indent = "  ".repeat(branchConditions.size)
       logger.info(s"${member.name}: ${indent}${indicator} ${textCond}")
     }
 
     branchUpdates += 1
     val modulus = log.branchConditionReportInterval
-    if(modulus.nonEmpty && branchUpdates % modulus.get == 0) {
-      logger.warn(s"Silicon has explored ${branchUpdates} branch traces for entity ${member.name}.")
+    if (modulus.nonEmpty && branchUpdates % modulus.get == 0) {
+      logger.warn(
+        s"Silicon has explored ${branchUpdates} branch traces for entity ${member.name}."
+      )
       logger.info("Current branch information:")
       // PB: heuristic: the oldest branch is earliest in the text input, so present that first.
       branchConditions.reverse.foreach {
-        case BranchConditionExp(e) => where(e) match {
-          case None =>
-            logger.info(s" - $e")
-          case Some(pos) =>
-            logger.info(s" - At $pos: $e")
-        }
-        case BranchConditionTerm(t) =>
-          logger.info(s" - $t")
+        case BranchConditionExp(e) =>
+          where(e) match {
+            case None => logger.info(s" - $e")
+            case Some(pos) => logger.info(s" - At $pos: $e")
+          }
+        case BranchConditionTerm(t) => logger.info(s" - $t")
         case BranchConditionNone(at, count) =>
-          logger.info(s" - alternative ${at+1} of $count")
+          logger.info(s" - alternative ${at + 1} of $count")
       }
     }
   }
@@ -249,14 +315,15 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
     siliconProgress()
   }
 
-  override def appendScopingRecord(r: ScopingRecord, ignoreBranchingStack: Boolean): Unit = {
+  override def appendScopingRecord(
+      r: ScopingRecord,
+      ignoreBranchingStack: Boolean,
+  ): Unit = {
     r match {
       case r: CloseScopeRecord =>
-        if(openScopeFrames.head.contains(r.refId)) {
+        if (openScopeFrames.head.contains(r.refId)) {
           openScopeFrames.head.remove(r.refId)
-        } else {
-          branchScopeCloseRecords.head += r.refId
-        }
+        } else { branchScopeCloseRecords.head += r.refId }
       case _: OpenScopeRecord => // This is just done from datarecord; safe to ignore.
     }
 
@@ -270,38 +337,38 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
     openScopeFrames +:= mutable.LinkedHashMap()
     branchScopeCloseRecords +:= mutable.Set()
 
-    if(r.getBranchInfos.size == 2) {
-      if(r.conditionExp.nonEmpty) {
+    if (r.getBranchInfos.size == 2) {
+      if (r.conditionExp.nonEmpty) {
         branchConditions +:= BranchConditionExp(r.conditionExp.get)
-      } else if(r.condition.nonEmpty) {
+      } else if (r.condition.nonEmpty) {
         branchConditions +:= BranchConditionTerm(r.condition.get)
-      } else {
-        branchConditions +:= BranchConditionNone(0, r.getBranches.size)
-      }
-    } else {
-      branchConditions +:= BranchConditionNone(0, r.getBranches.size)
-    }
+      } else { branchConditions +:= BranchConditionNone(0, r.getBranches.size) }
+    } else { branchConditions +:= BranchConditionNone(0, r.getBranches.size) }
 
     updateBranch("->")
     siliconProgress()
   }
 
-  def invert(term: Term): Term = term match {
-    case terms.Not(e) => e
-    case other => terms.Not(other)
-  }
+  def invert(term: Term): Term =
+    term match {
+      case terms.Not(e) => e
+      case other => terms.Not(other)
+    }
 
-  def invert(e: Exp): Exp = e match {
-    case Not(e) => e
-    case other => Not(other)(pos = e.pos, info = e.info)
-  }
+  def invert(e: Exp): Exp =
+    e match {
+      case Not(e) => e
+      case other => Not(other)(pos = e.pos, info = e.info)
+    }
 
   def advanceBranch(): Unit =
-    branchConditions = (branchConditions.head match {
-      case BranchConditionExp(e) => BranchConditionExp(invert(e))
-      case BranchConditionTerm(t) => BranchConditionTerm(invert(t))
-      case BranchConditionNone(at, count) => BranchConditionNone(at + 1, count)
-    }) +: branchConditions.tail
+    branchConditions =
+      (branchConditions.head match {
+        case BranchConditionExp(e) => BranchConditionExp(invert(e))
+        case BranchConditionTerm(t) => BranchConditionTerm(invert(t))
+        case BranchConditionNone(at, count) =>
+          BranchConditionNone(at + 1, count)
+      }) +: branchConditions.tail
 
   override def doSwitchToNextBranch(uidBranchPoint: Int): Unit = {
     openScopeFrames.head.clear()
@@ -323,10 +390,8 @@ class SiliconMemberLogListener(log: SiliconLogListener, member: Member, pcs: Pat
     updateBranch("<-")
     openScopeFrames = openScopeFrames.tail
 
-    for(closeRecord <- branchScopeCloseRecords.head) {
-      for(frame <- openScopeFrames) {
-        frame.remove(closeRecord)
-      }
+    for (closeRecord <- branchScopeCloseRecords.head) {
+      for (frame <- openScopeFrames) { frame.remove(closeRecord) }
     }
 
     branchScopeCloseRecords = branchScopeCloseRecords.tail
diff --git a/src/viper/viper/api/backend/silicon/Util.scala b/src/viper/viper/api/backend/silicon/Util.scala
index 14199076eb..863c2185f8 100644
--- a/src/viper/viper/api/backend/silicon/Util.scala
+++ b/src/viper/viper/api/backend/silicon/Util.scala
@@ -8,11 +8,16 @@ import viper.silver.ast.{Infoed, Node}
 case object Util {
   def getOrigin(node: Node): Option[Origin] =
     node match {
-      case node: Infoed => node.info.getUniqueInfo[NodeInfo[vct.col.ast.Node[_]]].map(_.node.o)
+      case node: Infoed =>
+        node.info.getUniqueInfo[NodeInfo[vct.col.ast.Node[_]]].map(_.node.o)
       case _ => None
     }
 
-  def renderOrigin(node: Node, message: String, short: Boolean): ProgressRender = {
+  def renderOrigin(
+      node: Node,
+      message: String,
+      short: Boolean,
+  ): ProgressRender = {
     val o = getOrigin(node)
 
     o match {
diff --git a/src/viper/viper/api/transform/ColSilverParser.scala b/src/viper/viper/api/transform/ColSilverParser.scala
index 23e10a6b36..765288d7a7 100644
--- a/src/viper/viper/api/transform/ColSilverParser.scala
+++ b/src/viper/viper/api/transform/ColSilverParser.scala
@@ -8,9 +8,19 @@ import vct.parsers.{ParseResult, Parser}
 import java.io.Reader
 
 case class ColSilverParser(blameProvider: BlameProvider) extends Parser {
-  override def parse[G](readable: Readable, baseOrigin: Origin = Origin(Nil)): ParseResult[G] =
+  override def parse[G](
+      readable: Readable,
+      baseOrigin: Origin = Origin(Nil),
+  ): ParseResult[G] =
     ParseResult(SilverToCol.parse(readable, blameProvider).declarations, Nil)
 
-  override def parseReader[G](reader: Reader, baseOrigin: Origin = Origin(Nil)): ParseResult[G] =
-    ParseResult(SilverToCol.parse(ReaderReadable("<unknown>", reader), blameProvider).declarations, Nil)
+  override def parseReader[G](
+      reader: Reader,
+      baseOrigin: Origin = Origin(Nil),
+  ): ParseResult[G] =
+    ParseResult(
+      SilverToCol.parse(ReaderReadable("<unknown>", reader), blameProvider)
+        .declarations,
+      Nil,
+    )
 }
diff --git a/src/viper/viper/api/transform/ColToSilver.scala b/src/viper/viper/api/transform/ColToSilver.scala
index f8b3c77ced..9ca1a94c77 100644
--- a/src/viper/viper/api/transform/ColToSilver.scala
+++ b/src/viper/viper/api/transform/ColToSilver.scala
@@ -8,7 +8,11 @@ import vct.col.util.AstBuildHelpers.unfoldStar
 import vct.col.{ast => col}
 import vct.result.VerificationError.{SystemError, Unreachable}
 import viper.silver.ast.TypeVar
-import viper.silver.plugin.standard.termination.{DecreasesClause, DecreasesTuple, DecreasesWildcard}
+import viper.silver.plugin.standard.termination.{
+  DecreasesClause,
+  DecreasesTuple,
+  DecreasesWildcard,
+}
 import viper.silver.{ast => silver}
 
 import scala.collection.immutable.ListMap
@@ -16,7 +20,9 @@ import scala.collection.mutable
 import scala.collection.mutable.ArrayBuffer
 
 object ColToSilver {
-  def transform(program: col.Program[_]): (silver.Program, Map[Int, col.Node[_]]) = {
+  def transform(
+      program: col.Program[_]
+  ): (silver.Program, Map[Int, col.Node[_]]) = {
     val cts = ColToSilver(program)
     val p = cts.transform()
     (p, cts.nodeFromUniqueId.toMap)
@@ -30,7 +36,8 @@ case class ColToSilver(program: col.Program[_]) {
   val predicates: ArrayBuffer[silver.Predicate] = ArrayBuffer()
   val methods: ArrayBuffer[silver.Method] = ArrayBuffer()
 
-  val nameStack: mutable.Stack[mutable.Map[col.Declaration[_], (String, Int)]] = mutable.Stack()
+  val nameStack: mutable.Stack[mutable.Map[col.Declaration[_], (String, Int)]] =
+    mutable.Stack()
   var names: mutable.Map[col.Declaration[_], (String, Int)] = mutable.Map()
   val currentPredicatePath: ScopedStack[Seq[AccountedDirection]] = ScopedStack()
   val currentInvariant: ScopedStack[col.LoopInvariant[_]] = ScopedStack()
@@ -43,31 +50,32 @@ case class ColToSilver(program: col.Program[_]) {
 
   case class NotSupported(node: col.Node[_]) extends SystemError {
     override def text: String =
-      program.highlight(node).messageInContext(s"This kind of node (${node.getClass.getSimpleName}) is not supported by silver directly. Is there a rewrite missing?")
+      program.highlight(node).messageInContext(
+        s"This kind of node (${node.getClass.getSimpleName}) is not supported by silver directly. Is there a rewrite missing?"
+      )
   }
 
-  def ??(node: col.Node[_]): Nothing =
-    throw NotSupported(node)
+  def ??(node: col.Node[_]): Nothing = throw NotSupported(node)
 
   def push(): Unit = nameStack.push(names.clone())
   def pop(): Unit = names = nameStack.pop()
 
   def unpackName(name: String): (String, Int) = {
     val m = "^(.*?)([1-9][0-9]*)?$".r.findFirstMatchIn(name).get
-    if(Option(m.group(2)).isDefined) {
+    if (Option(m.group(2)).isDefined) {
       (m.group(1), Integer.parseInt(m.group(2)))
-    } else {
-      (m.group(1), 0)
-    }
+    } else { (m.group(1), 0) }
   }
 
   def packName(name: String, index: Int): String =
-    if(index == 0) name
-    else s"$name$index"
-
+    if (index == 0)
+      name
+    else
+      s"$name$index"
 
   def sanitize(name: String): String = {
-    if(name.isEmpty) return "_"
+    if (name.isEmpty)
+      return "_"
 
     val sanitized = name.flatMap {
       case '$' => "$"
@@ -90,25 +98,24 @@ case class ColToSilver(program: col.Program[_]) {
     }
   }
 
-  /**
-   * Give the declaration a silver-appropriate name that is as close as possible to the preferred name
-   */
+  /** Give the declaration a silver-appropriate name that is as close as
+    * possible to the preferred name
+    */
   def name(decl: col.Declaration[_], nameF: Name => String): String =
-    if(names.contains(decl)) {
-      ???
-    } else {
+    if (names.contains(decl)) { ??? }
+    else {
       var (name, index) = unpackName(nameF(decl.o.getPreferredNameOrElse()))
       name = sanitize(name)
-      while(names.values.exists(_ == (name, index)) || silver.utility.Consistency.reservedNames.contains(packName(name, index))) {
-        index += 1
-      }
+      while (
+        names.values.exists(_ == (name, index)) ||
+        silver.utility.Consistency.reservedNames.contains(packName(name, index))
+      ) { index += 1 }
       names(decl) = (name, index)
       packName(name, index)
     }
 
-  /**
-   * Evaluate f within a new scope
-   */
+  /** Evaluate f within a new scope
+    */
   def scoped[T](f: => T): T = {
     push()
     val result = f
@@ -116,29 +123,25 @@ case class ColToSilver(program: col.Program[_]) {
     result
   }
 
-  /**
-   * Name decl in the current scope, then evaluate f within a new scopegroupCount
-   */
+  /** Name decl in the current scope, then evaluate f within a new
+    * scopegroupCount
+    */
   def scoped[T](decl: col.Declaration[_], nameF: Name => String)(f: => T): T = {
     name(decl, nameF)
     scoped(f)
   }
 
-  /**
-   * Retrieve the name for this reference
-   */
+  /** Retrieve the name for this reference
+    */
   def ref[G](r: Ref[G, _ <: col.Declaration[G]]): String = ref(r.decl)
 
-  /**
-   * Retrieve the name for this declaration
-   */
+  /** Retrieve the name for this declaration
+    */
   def ref(decl: col.Declaration[_]): String =
-    if(names.contains(decl)) {
+    if (names.contains(decl)) {
       val (name, index) = names(decl)
       packName(name, index)
-    } else {
-      throw Unreachable(s"Declaration was not yet named: $decl")
-    }
+    } else { throw Unreachable(s"Declaration was not yet named: $decl") }
 
   var uniquePosId: Int = 0
   val nodeFromUniqueId: mutable.Map[Int, col.Node[_]] = mutable.Map()
@@ -147,7 +150,9 @@ case class ColToSilver(program: col.Program[_]) {
     uniquePosId += 1
     nodeFromUniqueId(uniquePosId) = node
     // Replace : with -, as the colon interferes with z3's quantifier statistics output, which uses a colon as a separator
-    silver.VirtualPosition(s"${node.o.shortPositionText.replace(':', '-')};unique_id=$uniquePosId")
+    silver.VirtualPosition(
+      s"${node.o.shortPositionText.replace(':', '-')};unique_id=$uniquePosId"
+    )
   }
 
   def transform(): silver.Program = {
@@ -156,96 +161,156 @@ case class ColToSilver(program: col.Program[_]) {
       case decl: col.ProverType[_] => name(decl, _.ucamel)
       case decl => name(decl, _.camel)
     }
-    program.declarations.collect { case adt: col.AxiomaticDataType[_] => adt }.flatMap(_.typeArgs).foreach(name(_, _.usnake))
-    program.declarations.collect { case adt: col.AxiomaticDataType[_] => adt }.flatMap(_.decls).collect { case func: col.ADTFunction[_] => func }.foreach(name(_, _.snake))
-    program.declarations.collect { case field: col.SilverField[_] => field }.foreach(field => fields(field) = silver.Field(ref(field), typ(field.t))(pos=pos(field), info=NodeInfo(field)))
+    program.declarations.collect { case adt: col.AxiomaticDataType[_] => adt }
+      .flatMap(_.typeArgs).foreach(name(_, _.usnake))
+    program.declarations.collect { case adt: col.AxiomaticDataType[_] => adt }
+      .flatMap(_.decls).collect { case func: col.ADTFunction[_] => func }
+      .foreach(name(_, _.snake))
+    program.declarations.collect { case field: col.SilverField[_] => field }
+      .foreach(field =>
+        fields(field) =
+          silver.Field(ref(field), typ(field.t))(
+            pos = pos(field),
+            info = NodeInfo(field),
+          )
+      )
     program.declarations.foreach(collect)
-    silver.Program(domains.toSeq, fields.values.toSeq, functions.toSeq, predicates.toSeq, methods.toSeq, extensions=Seq())()
+    silver.Program(
+      domains.toSeq,
+      fields.values.toSeq,
+      functions.toSeq,
+      predicates.toSeq,
+      methods.toSeq,
+      extensions = Seq(),
+    )()
   }
 
-  def collect(decl: col.GlobalDeclaration[_]): Unit = decl match {
-    case t: col.ProverType[_] =>
-      domains += silver.Domain(
-        name = ref(t),
-        typVars = Nil,
-        functions = Nil,
-        axioms = Nil,
-        interpretations = Some(interpretations(t.interpretation)),
-      )(pos=pos(t), info=NodeInfo(t))
-    case function: col.ProverFunction[_] =>
-      val domainName = "$domain$" + ref(function)
-      domains += silver.Domain(
-        name = domainName,
-        typVars = Nil,
-        axioms = Nil,
-        functions = Seq(silver.DomainFunc(
-          name = ref(function),
-          formalArgs = function.args.map(variable),
-          typ = typ(function.returnType),
-          unique = false,
-          interpretation = function.interpretation.collectFirst { case col.SmtLib() -> int => int },
-        )(pos=pos(function), info=NodeInfo(function), domainName=domainName)),
-      )(pos=pos(function), info=NodeInfo(function))
-    case field: col.SilverField[_] =>
+  def collect(decl: col.GlobalDeclaration[_]): Unit =
+    decl match {
+      case t: col.ProverType[_] =>
+        domains += silver.Domain(
+          name = ref(t),
+          typVars = Nil,
+          functions = Nil,
+          axioms = Nil,
+          interpretations = Some(interpretations(t.interpretation)),
+        )(pos = pos(t), info = NodeInfo(t))
+      case function: col.ProverFunction[_] =>
+        val domainName = "$domain$" + ref(function)
+        domains += silver.Domain(
+          name = domainName,
+          typVars = Nil,
+          axioms = Nil,
+          functions = Seq(
+            silver.DomainFunc(
+              name = ref(function),
+              formalArgs = function.args.map(variable),
+              typ = typ(function.returnType),
+              unique = false,
+              interpretation = function.interpretation.collectFirst {
+                case col.SmtLib() -> int => int
+              },
+            )(
+              pos = pos(function),
+              info = NodeInfo(function),
+              domainName = domainName,
+            )
+          ),
+        )(pos = pos(function), info = NodeInfo(function))
+      case field: col.SilverField[_] =>
       // nop
-    case rule: col.SimplificationRule[_] =>
-      ??(rule)
-    case function: col.Function[_] if !function.inline && function.typeArgs.isEmpty=>
-      scoped {
-        functions += silver.Function(
-          ref(function),
-          function.args.map(variable),
-          typ(function.returnType),
-          pred(function.contract.requires) ++ function.contract.decreases.toSeq.map(decreases),
-          pred(function.contract.ensures),
-          function.body.map(exp),
-        )(pos=pos(function), info=NodeInfo(function))
-      }
-    case procedure: col.Procedure[_] if procedure.returnType == col.TVoid() && !procedure.inline && !procedure.pure && procedure.typeArgs.isEmpty =>
-      scoped {
-        val labelDecls = procedure.body.toSeq.flatMap(_.transSubnodes.collect {
-          case l: col.LabelDecl[_] => silver.Label(name(l, _.usnake), Seq())(pos=pos(l), info=NodeInfo(l))
-        })
-        methods += silver.Method(
-          ref(procedure),
-          procedure.args.map(variable),
-          procedure.outArgs.map(variable),
-          pred(procedure.contract.requires) ++ procedure.contract.decreases.toSeq.map(decreases),
-          pred(procedure.contract.ensures),
-          procedure.body.map(body => silver.Seqn(Seq(block(body)), labelDecls)(pos=pos(body), info=NodeInfo(body)))
-        )(pos=pos(procedure), info=NodeInfo(procedure))
-      }
-    case predicate: col.Predicate[_] if !predicate.inline && !predicate.threadLocal =>
-      scoped {
-        predicates += silver.Predicate(
-          ref(predicate),
-          predicate.args.map(variable),
-          predicate.body.map(exp)
-        )(pos=pos(predicate), info=NodeInfo(predicate))
-      }
-    case adt: col.AxiomaticDataType[_] =>
-      domains += silver.Domain(
-        name = ref(adt),
-        typVars = adt.typeArgs.map(v => silver.TypeVar(ref(v))),
-        functions = adt.decls.collect {
-          case func: col.ADTFunction[_] => scoped {
-            silver.DomainFunc(ref(func), func.args.map(variable), typ(func.returnType), unique = false)(pos = pos(func), info = NodeInfo(func), domainName = ref(adt))
-          }
-        },
-        axioms = adt.decls.collect {
-          case ax: col.ADTAxiom[_] =>
-            silver.AnonymousDomainAxiom(exp(ax.axiom))(pos=pos(ax), info=NodeInfo(ax), domainName=ref(adt))
-        },
-      )(pos=pos(adt), info=NodeInfo(adt))
-    case other =>
-      ??(other)
-  }
+      case rule: col.SimplificationRule[_] => ??(rule)
+      case function: col.Function[_]
+          if !function.inline && function.typeArgs.isEmpty =>
+        scoped {
+          functions += silver.Function(
+            ref(function),
+            function.args.map(variable),
+            typ(function.returnType),
+            pred(function.contract.requires) ++
+              function.contract.decreases.toSeq.map(decreases),
+            pred(function.contract.ensures),
+            function.body.map(exp),
+          )(pos = pos(function), info = NodeInfo(function))
+        }
+      case procedure: col.Procedure[_]
+          if procedure.returnType == col.TVoid() && !procedure.inline &&
+            !procedure.pure && procedure.typeArgs.isEmpty =>
+        scoped {
+          val labelDecls = procedure.body.toSeq
+            .flatMap(_.transSubnodes.collect { case l: col.LabelDecl[_] =>
+              silver.Label(name(l, _.usnake), Seq())(
+                pos = pos(l),
+                info = NodeInfo(l),
+              )
+            })
+          methods += silver.Method(
+            ref(procedure),
+            procedure.args.map(variable),
+            procedure.outArgs.map(variable),
+            pred(procedure.contract.requires) ++
+              procedure.contract.decreases.toSeq.map(decreases),
+            pred(procedure.contract.ensures),
+            procedure.body.map(body =>
+              silver.Seqn(Seq(block(body)), labelDecls)(
+                pos = pos(body),
+                info = NodeInfo(body),
+              )
+            ),
+          )(pos = pos(procedure), info = NodeInfo(procedure))
+        }
+      case predicate: col.Predicate[_]
+          if !predicate.inline && !predicate.threadLocal =>
+        scoped {
+          predicates += silver.Predicate(
+            ref(predicate),
+            predicate.args.map(variable),
+            predicate.body.map(exp),
+          )(pos = pos(predicate), info = NodeInfo(predicate))
+        }
+      case adt: col.AxiomaticDataType[_] =>
+        domains += silver.Domain(
+          name = ref(adt),
+          typVars = adt.typeArgs.map(v => silver.TypeVar(ref(v))),
+          functions = adt.decls.collect { case func: col.ADTFunction[_] =>
+            scoped {
+              silver.DomainFunc(
+                ref(func),
+                func.args.map(variable),
+                typ(func.returnType),
+                unique = false,
+              )(pos = pos(func), info = NodeInfo(func), domainName = ref(adt))
+            }
+          },
+          axioms = adt.decls.collect { case ax: col.ADTAxiom[_] =>
+            silver.AnonymousDomainAxiom(exp(ax.axiom))(
+              pos = pos(ax),
+              info = NodeInfo(ax),
+              domainName = ref(adt),
+            )
+          },
+        )(pos = pos(adt), info = NodeInfo(adt))
+      case other => ??(other)
+    }
 
-  def decreases(clause: col.DecreasesClause[_]): DecreasesClause = clause match {
-    case col.DecreasesClauseAssume() => DecreasesWildcard(condition = None)(pos=pos(clause), info=NodeInfo(clause))
-    case col.DecreasesClauseNoRecursion() => DecreasesTuple(Nil, condition = None)(pos=pos(clause), info=NodeInfo(clause))
-    case col.DecreasesClauseTuple(exprs) => DecreasesTuple(exprs.map(exp), condition = None)(pos=pos(clause), info=NodeInfo(clause))
-  }
+  def decreases(clause: col.DecreasesClause[_]): DecreasesClause =
+    clause match {
+      case col.DecreasesClauseAssume() =>
+        DecreasesWildcard(condition = None)(
+          pos = pos(clause),
+          info = NodeInfo(clause),
+        )
+      case col.DecreasesClauseNoRecursion() =>
+        DecreasesTuple(Nil, condition = None)(
+          pos = pos(clause),
+          info = NodeInfo(clause),
+        )
+      case col.DecreasesClauseTuple(exprs) =>
+        DecreasesTuple(exprs.map(exp), condition = None)(
+          pos = pos(clause),
+          info = NodeInfo(clause),
+        )
+    }
 
   def interpretations(interpretation: Seq[(col.ProverLanguage[_], String)]) =
     interpretation.map {
@@ -254,33 +319,45 @@ case class ColToSilver(program: col.Program[_]) {
     }.to(ListMap)
 
   def variable(v: col.Variable[_]): silver.LocalVarDecl =
-    silver.LocalVarDecl(name(v, _.camel), typ(v.t))(pos=pos(v), info=NodeInfo(v))
+    silver.LocalVarDecl(name(v, _.camel), typ(v.t))(
+      pos = pos(v),
+      info = NodeInfo(v),
+    )
 
   def adtTypeArgs(adt: col.AxiomaticDataType[_]): Seq[TypeVar] =
     adt.typeArgs.map(v => silver.TypeVar(ref(v)))
 
-  def typ(t: col.Type[_]): silver.Type = t match {
-    case col.TBool() => silver.Bool
-    case col.TInt() => silver.Int
-    case col.TRational() => silver.Perm
-    case col.TRef() => silver.Ref
-    case col.TSeq(element) => silver.SeqType(typ(element))
-    case col.TSet(element) => silver.SetType(typ(element))
-    case col.TBag(element) => silver.MultisetType(typ(element))
-    case col.TMap(key, value) => silver.MapType(typ(key), typ(value))
-    case col.TVar(Ref(v)) => silver.TypeVar(ref(v))
-    case col.TAxiomatic(Ref(adt), args) =>
-      val typeArgs = adtTypeArgs(adt)
-      silver.DomainType(ref(adt), ListMap(typeArgs.zip(args.map(typ)) : _*))(typeArgs)
-    case col.TProverType(Ref(t)) =>
-      silver.BackendType(ref(t), interpretations(t.interpretation))
-    case other => ??(other)
-  }
+  def typ(t: col.Type[_]): silver.Type =
+    t match {
+      case col.TBool() => silver.Bool
+      case col.TInt() => silver.Int
+      case col.TRational() => silver.Perm
+      case col.TRef() => silver.Ref
+      case col.TSeq(element) => silver.SeqType(typ(element))
+      case col.TSet(element) => silver.SetType(typ(element))
+      case col.TBag(element) => silver.MultisetType(typ(element))
+      case col.TMap(key, value) => silver.MapType(typ(key), typ(value))
+      case col.TVar(Ref(v)) => silver.TypeVar(ref(v))
+      case col.TAxiomatic(Ref(adt), args) =>
+        val typeArgs = adtTypeArgs(adt)
+        silver.DomainType(ref(adt), ListMap(typeArgs.zip(args.map(typ)): _*))(
+          typeArgs
+        )
+      case col.TProverType(Ref(t)) =>
+        silver.BackendType(ref(t), interpretations(t.interpretation))
+      case other => ??(other)
+    }
 
-  def pred(e: col.AccountedPredicate[_], path: Seq[AccountedDirection] = Nil): Seq[silver.Exp] = e match {
-    case col.UnitAccountedPredicate(pred) => currentPredicatePath.having(path) { unfoldStar(pred).map(exp) }
-    case col.SplitAccountedPredicate(left, right) => pred(left, path :+ FailLeft) ++ pred(right, path :+ FailRight)
-  }
+  def pred(
+      e: col.AccountedPredicate[_],
+      path: Seq[AccountedDirection] = Nil,
+  ): Seq[silver.Exp] =
+    e match {
+      case col.UnitAccountedPredicate(pred) =>
+        currentPredicatePath.having(path) { unfoldStar(pred).map(exp) }
+      case col.SplitAccountedPredicate(left, right) =>
+        pred(left, path :+ FailLeft) ++ pred(right, path :+ FailRight)
+    }
 
   def expInfo[T <: col.Node[_]](e: T): NodeInfo[T] = {
     val result = NodeInfo(e)
@@ -293,241 +370,487 @@ case class ColToSilver(program: col.Program[_]) {
     result
   }
 
-  def exp(e: col.Expr[_]): silver.Exp = e match {
-    case col.BooleanValue(value) => silver.BoolLit(value)(pos=pos(e), info=expInfo(e))
-    case col.IntegerValue(value) => silver.IntLit(value)(pos=pos(e), info=expInfo(e))
-    case col.SilverNull() => silver.NullLit()(pos=pos(e), info=expInfo(e))
-    case col.Result(Ref(app)) => silver.Result(typ(app.returnType))(pos=pos(e), info=expInfo(e))
-
-    case col.NoPerm() => silver.NoPerm()(pos=pos(e), info=expInfo(e))
-    case col.WritePerm() => silver.FullPerm()(pos=pos(e), info=expInfo(e))
-
-    case col.LiteralSeq(t, Nil) => silver.EmptySeq(typ(t))(pos=pos(e), info=expInfo(e))
-    case col.LiteralSet(t, Nil) => silver.EmptySet(typ(t))(pos=pos(e), info=expInfo(e))
-    case col.LiteralBag(t, Nil) => silver.EmptyMultiset(typ(t))(pos=pos(e), info=expInfo(e))
-    case col.LiteralMap(k, v, Nil) => silver.EmptyMap(typ(k), typ(v))(pos=pos(e), info=expInfo(e))
-    case col.LiteralSeq(_, xs) => silver.ExplicitSeq(xs.map(exp))(pos=pos(e), info=expInfo(e))
-    case col.LiteralSet(_, xs) => silver.ExplicitSet(xs.map(exp))(pos=pos(e), info=expInfo(e))
-    case col.LiteralBag(_, xs) => silver.ExplicitMultiset(xs.map(exp))(pos=pos(e), info=expInfo(e))
-    case col.LiteralMap(_, _, xs) => silver.ExplicitMap(xs.map { case (k, v) => silver.Maplet(exp(k), exp(v))(pos=pos(e), info=expInfo(e)) })(pos=pos(e), info=expInfo(e))
-
-    case col.SilverSeqSize(obj) => silver.SeqLength(exp(obj))(pos=pos(e), info=expInfo(e))
-    case col.SilverSetSize(obj) => silver.AnySetCardinality(exp(obj))(pos=pos(e), info=expInfo(e))
-    case col.SilverBagSize(obj) => silver.AnySetCardinality(exp(obj))(pos=pos(e), info=expInfo(e))
-    case col.SilverMapSize(obj) => silver.MapCardinality(exp(obj))(pos=pos(e), info=expInfo(e))
-
-    case col.Exists(bindings, triggers, body) =>
-      scoped { silver.Exists(bindings.map(variable), triggers.map(trigger), exp(body))(pos=pos(e), info=expInfo(e)) }
-    case col.Forall(bindings, triggers, body) =>
-      scoped { silver.Forall(bindings.map(variable), triggers.map(trigger), exp(body))(pos=pos(e), info=expInfo(e)) }
-    case starall @ col.Starall(bindings, triggers, body) =>
-      scoped {
-        currentStarall.having(starall) {
-          val newBindings = bindings.map(variable)
-          val newTriggers = inTriggers.having(()) {
-             triggers.map(trigger)
+  def exp(e: col.Expr[_]): silver.Exp =
+    e match {
+      case col.BooleanValue(value) =>
+        silver.BoolLit(value)(pos = pos(e), info = expInfo(e))
+      case col.IntegerValue(value) =>
+        silver.IntLit(value)(pos = pos(e), info = expInfo(e))
+      case col.SilverNull() => silver.NullLit()(pos = pos(e), info = expInfo(e))
+      case col.Result(Ref(app)) =>
+        silver.Result(typ(app.returnType))(pos = pos(e), info = expInfo(e))
+
+      case col.NoPerm() => silver.NoPerm()(pos = pos(e), info = expInfo(e))
+      case col.WritePerm() => silver.FullPerm()(pos = pos(e), info = expInfo(e))
+
+      case col.LiteralSeq(t, Nil) =>
+        silver.EmptySeq(typ(t))(pos = pos(e), info = expInfo(e))
+      case col.LiteralSet(t, Nil) =>
+        silver.EmptySet(typ(t))(pos = pos(e), info = expInfo(e))
+      case col.LiteralBag(t, Nil) =>
+        silver.EmptyMultiset(typ(t))(pos = pos(e), info = expInfo(e))
+      case col.LiteralMap(k, v, Nil) =>
+        silver.EmptyMap(typ(k), typ(v))(pos = pos(e), info = expInfo(e))
+      case col.LiteralSeq(_, xs) =>
+        silver.ExplicitSeq(xs.map(exp))(pos = pos(e), info = expInfo(e))
+      case col.LiteralSet(_, xs) =>
+        silver.ExplicitSet(xs.map(exp))(pos = pos(e), info = expInfo(e))
+      case col.LiteralBag(_, xs) =>
+        silver.ExplicitMultiset(xs.map(exp))(pos = pos(e), info = expInfo(e))
+      case col.LiteralMap(_, _, xs) =>
+        silver.ExplicitMap(xs.map { case (k, v) =>
+          silver.Maplet(exp(k), exp(v))(pos = pos(e), info = expInfo(e))
+        })(pos = pos(e), info = expInfo(e))
+
+      case col.SilverSeqSize(obj) =>
+        silver.SeqLength(exp(obj))(pos = pos(e), info = expInfo(e))
+      case col.SilverSetSize(obj) =>
+        silver.AnySetCardinality(exp(obj))(pos = pos(e), info = expInfo(e))
+      case col.SilverBagSize(obj) =>
+        silver.AnySetCardinality(exp(obj))(pos = pos(e), info = expInfo(e))
+      case col.SilverMapSize(obj) =>
+        silver.MapCardinality(exp(obj))(pos = pos(e), info = expInfo(e))
+
+      case col.Exists(bindings, triggers, body) =>
+        scoped {
+          silver.Exists(
+            bindings.map(variable),
+            triggers.map(trigger),
+            exp(body),
+          )(pos = pos(e), info = expInfo(e))
+        }
+      case col.Forall(bindings, triggers, body) =>
+        scoped {
+          silver.Forall(
+            bindings.map(variable),
+            triggers.map(trigger),
+            exp(body),
+          )(pos = pos(e), info = expInfo(e))
+        }
+      case starall @ col.Starall(bindings, triggers, body) =>
+        scoped {
+          currentStarall.having(starall) {
+            val newBindings = bindings.map(variable)
+            val newTriggers = inTriggers.having(()) { triggers.map(trigger) }
+            val foralls: Seq[silver.Forall] = silver.utility
+              .QuantifiedPermissions.desugarSourceQuantifiedPermissionSyntax(
+                silver.Forall(newBindings, newTriggers, exp(body))(
+                  pos = pos(e),
+                  info = expInfo(e),
+                )
+              )
+
+            foralls.reduce[silver.Exp] { case (l, r) =>
+              silver.And(l, r)(pos = pos(e), info = expInfo(e))
+            }
           }
-          val foralls: Seq[silver.Forall] = silver.utility.QuantifiedPermissions.desugarSourceQuantifiedPermissionSyntax(
-            silver.Forall(newBindings, newTriggers, exp(body))(pos=pos(e), info=expInfo(e))
+        }
+      case col.Let(binding, value, main) =>
+        scoped {
+          silver.Let(variable(binding), exp(value), exp(main))(
+            pos = pos(e),
+            info = expInfo(e),
           )
+        }
+      case col.ForPerm(bindings, loc, body) =>
+        scoped {
+          silver.ForPerm(
+            bindings.map(variable),
+            loc match {
+              case SilverFieldLocation(obj, field) =>
+                silver.FieldAccess(exp(obj), fields(field.decl))(
+                  pos = pos(loc),
+                  info = expInfo(obj),
+                )
+              case PredicateLocation(predicate, args) =>
+                silver.PredicateAccess(args.map(exp), ref(predicate))(
+                  pos = pos(loc),
+                  info = expInfo(e),
+                )
+              case other => ??(other)
+            },
+            exp(body),
+          )(pos = pos(e), info = expInfo(e))
+        }
+      case col.Not(arg) => silver.Not(exp(arg))(pos = pos(e), info = expInfo(e))
+      case col.And(left, right) =>
+        silver.And(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.Star(left, right) =>
+        silver.And(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.Implies(left, right) =>
+        silver.Implies(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.Or(left, right) =>
+        silver.Or(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.PolarityDependent(onInhale, onExhale) =>
+        silver.InhaleExhaleExp(exp(onInhale), exp(onExhale))(
+          pos = pos(e),
+          info = expInfo(e),
+        )
+
+      case res @ col.Perm(col.SilverFieldLocation(obj, Ref(field)), perm) =>
+        val permValue = exp(perm)
+        permValue.info.asInstanceOf[NodeInfo[_]].permissionValuePermissionNode =
+          Some(res)
+        silver.FieldAccessPredicate(
+          silver.FieldAccess(exp(obj), fields(field))(
+            pos = pos(res),
+            info = expInfo(res),
+          ),
+          permValue,
+        )(pos = pos(res), info = expInfo(res))
+      case res: col.PredicateApply[_] =>
+        if (inTriggers.nonEmpty) { return predInTrigger(res) }
+        val silver = pred(res)
+        silver.perm.info.asInstanceOf[NodeInfo[_]]
+          .permissionValuePermissionNode = Some(res)
+        silver
+      case col.Wand(left, right) =>
+        silver.MagicWand(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.CurPerm(loc) =>
+        loc match {
+          case col.PredicateLocation(predicate, args) =>
+            silver.CurrentPerm(
+              silver.PredicateAccess(args.map(exp), ref(predicate))(
+                pos = pos(e),
+                info = expInfo(e),
+              )
+            )(pos = pos(e), info = expInfo(e))
+          case col.SilverFieldLocation(obj, field) =>
+            silver.CurrentPerm(silver.FieldAccess(exp(obj), fields(field.decl))(
+              pos = pos(e),
+              info = expInfo(e),
+            ))(pos = pos(e), info = expInfo(e))
+          case default => ??(default)
+        }
+      case col.Value(loc) =>
+        loc match {
+          case col.SilverFieldLocation(obj, field) =>
+            silver.FieldAccessPredicate(
+              silver.FieldAccess(exp(obj), fields(field.decl))(
+                pos = pos(loc),
+                info = expInfo(e),
+              ),
+              silver.WildcardPerm()(),
+            )(pos = pos(e), info = expInfo(e))
+          case col.PredicateLocation(predicate, args) =>
+            silver.PredicateAccessPredicate(
+              silver.PredicateAccess(args.map(exp), ref(predicate))(
+                pos = pos(loc),
+                NodeInfo(loc),
+              ),
+              silver.WildcardPerm()(),
+            )(pos = pos(e), expInfo(e))
+          case default => ??(default)
+        }
+      case col.Local(v) =>
+        silver.LocalVar(ref(v), typ(v.decl.t))(pos = pos(e), info = expInfo(e))
+      case col.SilverDeref(obj, ref) =>
+        silver.FieldAccess(exp(obj), fields(ref.decl))(
+          pos = pos(e),
+          info = expInfo(e),
+        )
+      case col.FunctionInvocation(f, args, Nil, Nil, Nil) =>
+        silver.FuncApp(ref(f), args.map(exp))(
+          pos(e),
+          expInfo(e),
+          typ(f.decl.returnType),
+          silver.NoTrafos,
+        )
+      case inv @ col.ADTFunctionInvocation(typeArgs, Ref(func), args) =>
+        typeArgs match {
+          case Some((Ref(adt), typeArgs)) =>
+            silver.DomainFuncApp(
+              ref(func),
+              args.map(exp),
+              ListMap(adtTypeArgs(adt).zip(typeArgs.map(typ)): _*),
+            )(pos(e), expInfo(e), typ(inv.t), ref(adt), silver.NoTrafos)
+          case None => ??(inv)
+        }
+      case inv @ col.ProverFunctionInvocation(Ref(func), args) =>
+        silver.BackendFuncApp(ref(func), args.map(exp))(
+          pos(e),
+          expInfo(e),
+          typ(func.returnType),
+          func.interpretation.collectFirst { case col.SmtLib() -> int => int }
+            .get,
+          silver.NoTrafos,
+        )
+      case u @ col.Unfolding(p: col.PredicateApply[_], body) =>
+        silver.Unfolding(currentUnfolding.having(u) { pred(p) }, exp(body))(
+          pos = pos(e),
+          info = expInfo(e),
+        )
+      case col.Select(condition, whenTrue, whenFalse) =>
+        silver.CondExp(exp(condition), exp(whenTrue), exp(whenFalse))(
+          pos = pos(e),
+          info = expInfo(e),
+        )
+      case col.Old(expr, None) =>
+        silver.Old(exp(expr))(pos = pos(e), info = expInfo(e))
+      case col.Old(expr, Some(lbl)) =>
+        silver.LabelledOld(exp(expr), ref(lbl))(pos = pos(e), info = expInfo(e))
+
+      case col.UMinus(arg) =>
+        silver.Minus(exp(arg))(pos = pos(e), info = expInfo(e))
+
+      case op @ col.Plus(left, right) if op.isIntOp =>
+        silver.Add(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case op @ col.Minus(left, right) if op.isIntOp =>
+        silver.Sub(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case op @ col.Mult(left, right) if op.isIntOp =>
+        silver.Mul(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case op @ col.Mod(left, right) if op.isIntOp =>
+        currentDividingExpr.having(op) {
+          silver.Mod(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+        }
 
-          foralls.reduce[silver.Exp] { case (l, r) => silver.And(l, r)(pos=pos(e), info=expInfo(e)) }
+      case op @ col.Plus(left, right) if !op.isIntOp =>
+        silver.PermAdd(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case op @ col.Minus(left, right) if !op.isIntOp =>
+        silver.PermSub(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case op @ col.Mult(left, right) if !op.isIntOp =>
+        silver.PermMul(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case op @ col.Mod(left, right) if !op.isIntOp => ??(op)
+
+      case div @ col.RatDiv(left, right)
+          if right.t.isInstanceOf[col.TRational[_]] =>
+        currentDividingExpr.having(div) {
+          silver
+            .PermPermDiv(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+        }
+      case div @ col.RatDiv(left, right) =>
+        currentDividingExpr.having(div) {
+          silver.PermDiv(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+        }
+      case div @ col.FloorDiv(left, right) =>
+        currentDividingExpr.having(div) {
+          silver.Div(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
         }
-      }
-    case col.Let(binding, value, main) =>
-      scoped { silver.Let(variable(binding), exp(value), exp(main))(pos=pos(e), info=expInfo(e)) }
-    case col.ForPerm(bindings, loc, body) =>
-      scoped {
-        silver.ForPerm(bindings.map(variable), loc match {
-          case SilverFieldLocation(obj, field) => silver.FieldAccess(exp(obj), fields(field.decl))(pos=pos(loc), info=expInfo(obj))
-          case PredicateLocation(predicate, args) => silver.PredicateAccess(args.map(exp), ref(predicate))(pos=pos(loc), info=expInfo(e))
-          case other => ??(other)
-        }, exp(body))(pos=pos(e), info=expInfo(e))
-      }
-    case col.Not(arg) => silver.Not(exp(arg))(pos=pos(e), info=expInfo(e))
-    case col.And(left, right) => silver.And(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.Star(left, right) => silver.And(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.Implies(left, right) => silver.Implies(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.Or(left, right) => silver.Or(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.PolarityDependent(onInhale, onExhale) => silver.InhaleExhaleExp(exp(onInhale), exp(onExhale))(pos=pos(e), info=expInfo(e))
-
-    case res @ col.Perm(col.SilverFieldLocation(obj, Ref(field)), perm) =>
-      val permValue = exp(perm)
-      permValue.info.asInstanceOf[NodeInfo[_]].permissionValuePermissionNode = Some(res)
-      silver.FieldAccessPredicate(silver.FieldAccess(exp(obj), fields(field))(pos=pos(res), info=expInfo(res)), permValue)(pos=pos(res), info=expInfo(res))
-    case res: col.PredicateApply[_] =>
-      if(inTriggers.nonEmpty){
-        return predInTrigger(res)
-      }
-      val silver = pred(res)
-      silver.perm.info.asInstanceOf[NodeInfo[_]].permissionValuePermissionNode = Some(res)
-      silver
-    case col.Wand(left, right) => silver.MagicWand(exp(left), exp(right))(pos = pos(e), info=expInfo(e))
-    case col.CurPerm(loc) => loc match {
-      case col.PredicateLocation(predicate, args) => silver.CurrentPerm(silver.PredicateAccess(args.map(exp), ref(predicate))(pos=pos(e), info=expInfo(e)))(pos=pos(e), info=expInfo(e))
-      case col.SilverFieldLocation(obj, field) => silver.CurrentPerm(silver.FieldAccess(exp(obj), fields(field.decl))(pos=pos(e), info=expInfo(e)))(pos=pos(e), info=expInfo(e))
-      case default => ??(default)
-    }
-    case col.Value(loc) => loc match {
-      case col.SilverFieldLocation(obj, field) =>
-        silver.FieldAccessPredicate(silver.FieldAccess(exp(obj), fields(field.decl))(pos=pos(loc), info=expInfo(e)), silver.WildcardPerm()())(pos=pos(e), info=expInfo(e))
-      case col.PredicateLocation(predicate, args) =>
-        silver.PredicateAccessPredicate(silver.PredicateAccess(args.map(exp), ref(predicate))(pos = pos(loc), NodeInfo(loc)), silver.WildcardPerm()())(pos = pos(e), expInfo(e))
-      case default => ??(default)
-    }
-    case col.Local(v) => silver.LocalVar(ref(v), typ(v.decl.t))(pos=pos(e), info=expInfo(e))
-    case col.SilverDeref(obj, ref) => silver.FieldAccess(exp(obj), fields(ref.decl))(pos=pos(e), info=expInfo(e))
-    case col.FunctionInvocation(f, args, Nil, Nil, Nil) =>
-      silver.FuncApp(ref(f), args.map(exp))(pos(e), expInfo(e), typ(f.decl.returnType), silver.NoTrafos)
-    case inv @ col.ADTFunctionInvocation(typeArgs, Ref(func), args) => typeArgs match {
-      case Some((Ref(adt), typeArgs)) =>
-        silver.DomainFuncApp(ref(func), args.map(exp), ListMap(adtTypeArgs(adt).zip(typeArgs.map(typ)) : _*))(pos(e), expInfo(e), typ(inv.t), ref(adt), silver.NoTrafos)
-      case None => ??(inv)
-    }
-    case inv @ col.ProverFunctionInvocation(Ref(func), args) =>
-      silver.BackendFuncApp(ref(func), args.map(exp))(pos(e), expInfo(e), typ(func.returnType), func.interpretation.collectFirst { case col.SmtLib() -> int => int }.get, silver.NoTrafos)
-    case u @ col.Unfolding(p: col.PredicateApply[_], body) =>
-      silver.Unfolding(
-        currentUnfolding.having(u) { pred(p) },
-        exp(body))(pos=pos(e), info=expInfo(e))
-    case col.Select(condition, whenTrue, whenFalse) => silver.CondExp(exp(condition), exp(whenTrue), exp(whenFalse))(pos=pos(e), info=expInfo(e))
-    case col.Old(expr, None) => silver.Old(exp(expr))(pos=pos(e), info=expInfo(e))
-    case col.Old(expr, Some(lbl)) => silver.LabelledOld(exp(expr), ref(lbl))(pos=pos(e), info=expInfo(e))
-
-    case col.UMinus(arg) => silver.Minus(exp(arg))(pos=pos(e), info=expInfo(e))
-
-    case op @ col.Plus(left, right) if op.isIntOp => silver.Add(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case op @ col.Minus(left, right) if op.isIntOp => silver.Sub(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case op @ col.Mult(left, right) if op.isIntOp => silver.Mul(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case op @ col.Mod(left, right) if op.isIntOp =>
-      currentDividingExpr.having(op) {
-        silver.Mod(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-      }
-
-    case op @ col.Plus(left, right) if !op.isIntOp => silver.PermAdd(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case op @ col.Minus(left, right) if !op.isIntOp => silver.PermSub(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case op @ col.Mult(left, right) if !op.isIntOp => silver.PermMul(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case op @ col.Mod(left, right) if !op.isIntOp => ??(op)
-
-    case div @ col.RatDiv(left, right) if right.t.isInstanceOf[col.TRational[_]] =>
-      currentDividingExpr.having(div) {
-        silver.PermPermDiv(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-      }
-    case div @ col.RatDiv(left, right) =>
-      currentDividingExpr.having(div) {
-        silver.PermDiv(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-      }
-    case div @ col.FloorDiv(left, right) =>
-      currentDividingExpr.having(div) {
-        silver.Div(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-      }
-
-    case col.SilverIntToRat(col.NoPerm()) => silver.NoPerm()(pos=pos(e), info=expInfo(e))
-    case col.SilverIntToRat(col.WritePerm()) => silver.FullPerm()(pos=pos(e), info=expInfo(e))
-    case col.SilverIntToRat(perm) => silver.IntPermMul(exp(perm), silver.FullPerm()(pos=pos(e), info=expInfo(e)))(pos=pos(e), info=expInfo(e))
-
-    case col.Eq(left, right) => silver.EqCmp(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.Neq(left, right) => silver.NeCmp(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.Greater(left, right) => silver.GtCmp(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.Less(left, right) => silver.LtCmp(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.GreaterEq(left, right) => silver.GeCmp(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.LessEq(left, right) => silver.LeCmp(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.SubSetEq(left, right) => silver.AnySetSubset(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.SubBagEq(left, right) => silver.AnySetSubset(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.MapEq(left, right) => silver.EqCmp(exp(left), exp(right))(pos=pos(e), info=expInfo(e))
-    case col.MapDisjoint(left, right) => ???
-
-    case subscript@col.SeqSubscript(seq, index) =>
-      val silverIndex = exp(index)
-      silverIndex.info.asInstanceOf[NodeInfo[_]].seqIndexSubscriptNode = Some(subscript)
-      silver.SeqIndex(exp(seq), silverIndex)(pos=pos(e), info=expInfo(e))
-    case col.Range(from, to) => silver.RangeSeq(exp(from), exp(to))(pos=pos(e), info=expInfo(e))
-    case col.Drop(xs, count) => silver.SeqDrop(exp(xs), exp(count))(pos=pos(e), info=expInfo(e))
-    case col.Take(xs, count) => silver.SeqTake(exp(xs), exp(count))(pos=pos(e), info=expInfo(e))
-    case col.SeqUpdate(xs, i, x) => silver.SeqUpdate(exp(xs), exp(i), exp(x))(pos=pos(e), info=expInfo(e))
-    case col.Concat(xs, ys) => silver.SeqAppend(exp(xs), exp(ys))(pos=pos(e), info=expInfo(e))
-
-    case col.SetMember(x, xs) => silver.AnySetContains(exp(x), exp(xs))(pos=pos(e), info=expInfo(e))
-    case col.SeqMember(x, xs) => silver.SeqContains(exp(x), exp(xs))(pos=pos(e), info=expInfo(e))
-    case col.BagMemberCount(x, xs) => silver.AnySetContains(exp(x), exp(xs))(pos=pos(e), info=expInfo(e))
-    case col.MapMember(x, xs) => silver.MapContains(exp(x), exp(xs))(pos=pos(e), info=expInfo(e))
-
-    case col.SetMinus(xs, ys) => silver.AnySetMinus(exp(xs), exp(ys))(pos=pos(e), info=expInfo(e))
-    case col.BagMinus(xs, ys) => silver.AnySetMinus(exp(xs), exp(ys))(pos=pos(e), info=expInfo(e))
-    case col.SetUnion(xs, ys) => silver.AnySetUnion(exp(xs), exp(ys))(pos=pos(e), info=expInfo(e))
-    case col.BagAdd(xs, ys) => silver.AnySetUnion(exp(xs), exp(ys))(pos=pos(e), info=expInfo(e))
-    case col.SetIntersection(xs, ys) => silver.AnySetIntersection(exp(xs), exp(ys))(pos=pos(e), info=expInfo(e))
-    case col.BagLargestCommon(xs, ys) => silver.AnySetIntersection(exp(xs), exp(ys))(pos=pos(e), info=expInfo(e))
-
-    case col.MapCons(m, k, v) => silver.MapUpdate(exp(m), exp(k), exp(v))(pos=pos(e), info=expInfo(e))
-    case col.MapKeySet(m) => silver.MapDomain(exp(m))(pos=pos(e), info=expInfo(e))
-    case col.MapValueSet(m) => silver.MapRange(exp(m))(pos=pos(e), info=expInfo(e))
-    case col.MapItemSet(m) => ???
-    case col.MapRemove(m, k) => ???
-    case get @ col.MapGet(m, k) => currentMapGet.having(get) {
-      silver.MapLookup(exp(m), exp(k))(pos=pos(e), info=expInfo(e))
-    }
 
-    case other => ??(other)
-  }
+      case col.SilverIntToRat(col.NoPerm()) =>
+        silver.NoPerm()(pos = pos(e), info = expInfo(e))
+      case col.SilverIntToRat(col.WritePerm()) =>
+        silver.FullPerm()(pos = pos(e), info = expInfo(e))
+      case col.SilverIntToRat(perm) =>
+        silver.IntPermMul(
+          exp(perm),
+          silver.FullPerm()(pos = pos(e), info = expInfo(e)),
+        )(pos = pos(e), info = expInfo(e))
+
+      case col.Eq(left, right) =>
+        silver.EqCmp(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.Neq(left, right) =>
+        silver.NeCmp(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.Greater(left, right) =>
+        silver.GtCmp(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.Less(left, right) =>
+        silver.LtCmp(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.GreaterEq(left, right) =>
+        silver.GeCmp(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.LessEq(left, right) =>
+        silver.LeCmp(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.SubSetEq(left, right) =>
+        silver
+          .AnySetSubset(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.SubBagEq(left, right) =>
+        silver
+          .AnySetSubset(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.MapEq(left, right) =>
+        silver.EqCmp(exp(left), exp(right))(pos = pos(e), info = expInfo(e))
+      case col.MapDisjoint(left, right) => ???
+
+      case subscript @ col.SeqSubscript(seq, index) =>
+        val silverIndex = exp(index)
+        silverIndex.info.asInstanceOf[NodeInfo[_]].seqIndexSubscriptNode = Some(
+          subscript
+        )
+        silver.SeqIndex(exp(seq), silverIndex)(pos = pos(e), info = expInfo(e))
+      case col.Range(from, to) =>
+        silver.RangeSeq(exp(from), exp(to))(pos = pos(e), info = expInfo(e))
+      case col.Drop(xs, count) =>
+        silver.SeqDrop(exp(xs), exp(count))(pos = pos(e), info = expInfo(e))
+      case col.Take(xs, count) =>
+        silver.SeqTake(exp(xs), exp(count))(pos = pos(e), info = expInfo(e))
+      case col.SeqUpdate(xs, i, x) =>
+        silver
+          .SeqUpdate(exp(xs), exp(i), exp(x))(pos = pos(e), info = expInfo(e))
+      case col.Concat(xs, ys) =>
+        silver.SeqAppend(exp(xs), exp(ys))(pos = pos(e), info = expInfo(e))
+
+      case col.SetMember(x, xs) =>
+        silver.AnySetContains(exp(x), exp(xs))(pos = pos(e), info = expInfo(e))
+      case col.SeqMember(x, xs) =>
+        silver.SeqContains(exp(x), exp(xs))(pos = pos(e), info = expInfo(e))
+      case col.BagMemberCount(x, xs) =>
+        silver.AnySetContains(exp(x), exp(xs))(pos = pos(e), info = expInfo(e))
+      case col.MapMember(x, xs) =>
+        silver.MapContains(exp(x), exp(xs))(pos = pos(e), info = expInfo(e))
+
+      case col.SetMinus(xs, ys) =>
+        silver.AnySetMinus(exp(xs), exp(ys))(pos = pos(e), info = expInfo(e))
+      case col.BagMinus(xs, ys) =>
+        silver.AnySetMinus(exp(xs), exp(ys))(pos = pos(e), info = expInfo(e))
+      case col.SetUnion(xs, ys) =>
+        silver.AnySetUnion(exp(xs), exp(ys))(pos = pos(e), info = expInfo(e))
+      case col.BagAdd(xs, ys) =>
+        silver.AnySetUnion(exp(xs), exp(ys))(pos = pos(e), info = expInfo(e))
+      case col.SetIntersection(xs, ys) =>
+        silver
+          .AnySetIntersection(exp(xs), exp(ys))(pos = pos(e), info = expInfo(e))
+      case col.BagLargestCommon(xs, ys) =>
+        silver
+          .AnySetIntersection(exp(xs), exp(ys))(pos = pos(e), info = expInfo(e))
+
+      case col.MapCons(m, k, v) =>
+        silver
+          .MapUpdate(exp(m), exp(k), exp(v))(pos = pos(e), info = expInfo(e))
+      case col.MapKeySet(m) =>
+        silver.MapDomain(exp(m))(pos = pos(e), info = expInfo(e))
+      case col.MapValueSet(m) =>
+        silver.MapRange(exp(m))(pos = pos(e), info = expInfo(e))
+      case col.MapItemSet(m) => ???
+      case col.MapRemove(m, k) => ???
+      case get @ col.MapGet(m, k) =>
+        currentMapGet.having(get) {
+          silver.MapLookup(exp(m), exp(k))(pos = pos(e), info = expInfo(e))
+        }
+
+      case other => ??(other)
+    }
 
   def trigger(patterns: Seq[col.Expr[_]]): silver.Trigger =
     silver.Trigger(patterns.map(exp))()
 
   def pred(p: col.PredicateApply[_]): silver.PredicateAccessPredicate =
-    silver.PredicateAccessPredicate(silver.PredicateAccess(p.args.map(exp), ref(p.ref))(pos=pos(p), info=expInfo(p)), exp(p.perm))(pos=pos(p), info=expInfo(p))
+    silver.PredicateAccessPredicate(
+      silver.PredicateAccess(p.args.map(exp), ref(p.ref))(
+        pos = pos(p),
+        info = expInfo(p),
+      ),
+      exp(p.perm),
+    )(pos = pos(p), info = expInfo(p))
 
   def predInTrigger(p: col.PredicateApply[_]): silver.PredicateAccess =
-    silver.PredicateAccess(p.args.map(exp), ref(p.ref))(pos=pos(p), info=expInfo(p))
-
-  def acc(e: col.Expr[_]): silver.LocationAccess = e match {
-    case col.PredicateApply(Ref(pred), args, _) => silver.PredicateAccess(args.map(exp), ref(pred))(pos=pos(pred), info=expInfo(pred))
-    case col.SilverDeref(obj, Ref(field)) => silver.FieldAccess(exp(obj), fields(field))(pos=pos(e), info=expInfo(e))
-    case other => ??(other)
-  }
+    silver.PredicateAccess(p.args.map(exp), ref(p.ref))(
+      pos = pos(p),
+      info = expInfo(p),
+    )
+
+  def acc(e: col.Expr[_]): silver.LocationAccess =
+    e match {
+      case col.PredicateApply(Ref(pred), args, _) =>
+        silver.PredicateAccess(args.map(exp), ref(pred))(
+          pos = pos(pred),
+          info = expInfo(pred),
+        )
+      case col.SilverDeref(obj, Ref(field)) =>
+        silver
+          .FieldAccess(exp(obj), fields(field))(pos = pos(e), info = expInfo(e))
+      case other => ??(other)
+    }
 
-  def stat(s: col.Statement[_]): silver.Stmt = s match {
-    case inv@col.InvokeProcedure(method, args, outArgs, Nil, Nil, Nil) =>
-      silver.MethodCall(ref(method), args.map(exp), outArgs.collect { case col.Local(Ref(arg)) => silver.LocalVar(ref(arg), typ(arg.t))()})(
-        pos(s), NodeInfo(inv), silver.NoTrafos)
-    case col.SilverFieldAssign(obj, field, value) =>
-      silver.FieldAssign(silver.FieldAccess(exp(obj), fields(field.decl))(pos=pos(s), info=NodeInfo(s)), exp(value))(pos=pos(s), info=NodeInfo(s))
-    case col.SilverLocalAssign(v, value) =>
-      silver.LocalVarAssign(silver.LocalVar(ref(v), typ(v.decl.t))(pos=pos(s), info=NodeInfo(s)), exp(value))(pos=pos(s), info=NodeInfo(s))
-    case col.Block(statements) => silver.Seqn(statements.map(stat), Seq())(pos=pos(s), info=NodeInfo(s))
-    case col.Scope(locals, body) =>
-      val silverLocals = locals.map(variable)
-      silver.Seqn(Seq(stat(body)), silverLocals)(pos=pos(s), info=NodeInfo(s))
-    case col.Branch(Seq((cond, whenTrue), (col.BooleanValue(true), whenFalse))) => silver.If(exp(cond), block(whenTrue), block(whenFalse))(pos=pos(s), info=NodeInfo(s))
-    case col.Loop(col.Block(Nil), cond, col.Block(Nil), invNode @ col.LoopInvariant(inv, decrClause), body) =>
-      silver.While(exp(cond), currentInvariant.having(invNode) { unfoldStar(inv).map(exp) ++ decrClause.map(decreases).toSeq }, block(body))(pos=pos(s), info=NodeInfo(s))
-    case col.Label(decl, col.Block(Nil)) => silver.Label(ref(decl), Seq())(pos=pos(s), info=NodeInfo(s))
-    case col.Goto(lbl) => silver.Goto(ref(lbl))(pos=pos(s), info=NodeInfo(s))
-    case col.Return(col.Void()) => silver.Seqn(Nil, Nil)(pos=pos(s), info=NodeInfo(s))
-    case col.Exhale(res) => silver.Exhale(exp(res))(pos=pos(s), info=NodeInfo(s))
-    case col.Assert(assn) => silver.Assert(exp(assn))(pos=pos(s), info=NodeInfo(s))
-    case col.Inhale(res) => silver.Inhale(exp(res))(pos=pos(s), info=NodeInfo(s))
-    case col.Assume(assn) =>
-      // PB: OK, since assn is type-checked boolean and hence equivalent.
-      silver.Inhale(exp(assn))(pos=pos(s), info=NodeInfo(s))
-    case col.Fold(p: col.PredicateApply[_]) => silver.Fold(pred(p))(pos=pos(s), info=NodeInfo(s))
-    case col.Unfold(p: col.PredicateApply[_]) => silver.Unfold(pred(p))(pos=pos(s), info=NodeInfo(s))
-    case col.SilverNewRef(v, fs) => silver.NewStmt(silver.LocalVar(ref(v), typ(v.decl.t))(), fs.map(ref => fields(ref.decl)))(pos=pos(s), info=NodeInfo(s))
-    case col.WandPackage(wand @ col.Wand(left, right), proof) =>
-      silver.Package(
-        silver.MagicWand(exp(left), exp(right))(pos = pos(wand), info=NodeInfo(wand)), stat(proof) match {
-          // ugly hack to fix scoping issue in viper
-          case seqn: silver.Seqn => seqn
-          case other => silver.Seqn(Seq(other), Nil)(pos = pos(proof), info=NodeInfo(proof))
-        }
-      )(pos = pos(s), info=NodeInfo(s))
-    case col.WandApply(wand @ col.Wand(left, right)) =>
-      silver.Apply(silver.MagicWand(exp(left), exp(right))(pos = pos(wand), info=NodeInfo(wand)))(pos = pos(s), info=NodeInfo(s))
-    case other => ??(other)
-  }
+  def stat(s: col.Statement[_]): silver.Stmt =
+    s match {
+      case inv @ col.InvokeProcedure(method, args, outArgs, Nil, Nil, Nil) =>
+        silver.MethodCall(
+          ref(method),
+          args.map(exp),
+          outArgs.collect { case col.Local(Ref(arg)) =>
+            silver.LocalVar(ref(arg), typ(arg.t))()
+          },
+        )(pos(s), NodeInfo(inv), silver.NoTrafos)
+      case col.SilverFieldAssign(obj, field, value) =>
+        silver.FieldAssign(
+          silver.FieldAccess(exp(obj), fields(field.decl))(
+            pos = pos(s),
+            info = NodeInfo(s),
+          ),
+          exp(value),
+        )(pos = pos(s), info = NodeInfo(s))
+      case col.SilverLocalAssign(v, value) =>
+        silver.LocalVarAssign(
+          silver
+            .LocalVar(ref(v), typ(v.decl.t))(pos = pos(s), info = NodeInfo(s)),
+          exp(value),
+        )(pos = pos(s), info = NodeInfo(s))
+      case col.Block(statements) =>
+        silver
+          .Seqn(statements.map(stat), Seq())(pos = pos(s), info = NodeInfo(s))
+      case col.Scope(locals, body) =>
+        val silverLocals = locals.map(variable)
+        silver
+          .Seqn(Seq(stat(body)), silverLocals)(pos = pos(s), info = NodeInfo(s))
+      case col.Branch(
+            Seq((cond, whenTrue), (col.BooleanValue(true), whenFalse))
+          ) =>
+        silver.If(exp(cond), block(whenTrue), block(whenFalse))(
+          pos = pos(s),
+          info = NodeInfo(s),
+        )
+      case col.Loop(
+            col.Block(Nil),
+            cond,
+            col.Block(Nil),
+            invNode @ col.LoopInvariant(inv, decrClause),
+            body,
+          ) =>
+        silver.While(
+          exp(cond),
+          currentInvariant.having(invNode) {
+            unfoldStar(inv).map(exp) ++ decrClause.map(decreases).toSeq
+          },
+          block(body),
+        )(pos = pos(s), info = NodeInfo(s))
+      case col.Label(decl, col.Block(Nil)) =>
+        silver.Label(ref(decl), Seq())(pos = pos(s), info = NodeInfo(s))
+      case col.Goto(lbl) =>
+        silver.Goto(ref(lbl))(pos = pos(s), info = NodeInfo(s))
+      case col.Return(col.Void()) =>
+        silver.Seqn(Nil, Nil)(pos = pos(s), info = NodeInfo(s))
+      case col.Exhale(res) =>
+        silver.Exhale(exp(res))(pos = pos(s), info = NodeInfo(s))
+      case col.Assert(assn) =>
+        silver.Assert(exp(assn))(pos = pos(s), info = NodeInfo(s))
+      case col.Inhale(res) =>
+        silver.Inhale(exp(res))(pos = pos(s), info = NodeInfo(s))
+      case col.Assume(assn) =>
+        // PB: OK, since assn is type-checked boolean and hence equivalent.
+        silver.Inhale(exp(assn))(pos = pos(s), info = NodeInfo(s))
+      case col.Fold(p: col.PredicateApply[_]) =>
+        silver.Fold(pred(p))(pos = pos(s), info = NodeInfo(s))
+      case col.Unfold(p: col.PredicateApply[_]) =>
+        silver.Unfold(pred(p))(pos = pos(s), info = NodeInfo(s))
+      case col.SilverNewRef(v, fs) =>
+        silver.NewStmt(
+          silver.LocalVar(ref(v), typ(v.decl.t))(),
+          fs.map(ref => fields(ref.decl)),
+        )(pos = pos(s), info = NodeInfo(s))
+      case col.WandPackage(wand @ col.Wand(left, right), proof) =>
+        silver.Package(
+          silver.MagicWand(exp(left), exp(right))(
+            pos = pos(wand),
+            info = NodeInfo(wand),
+          ),
+          stat(proof) match {
+            // ugly hack to fix scoping issue in viper
+            case seqn: silver.Seqn => seqn
+            case other =>
+              silver
+                .Seqn(Seq(other), Nil)(pos = pos(proof), info = NodeInfo(proof))
+          },
+        )(pos = pos(s), info = NodeInfo(s))
+      case col.WandApply(wand @ col.Wand(left, right)) =>
+        silver.Apply(silver.MagicWand(exp(left), exp(right))(
+          pos = pos(wand),
+          info = NodeInfo(wand),
+        ))(pos = pos(s), info = NodeInfo(s))
+      case other => ??(other)
+    }
 
-  def block(s: col.Statement[_]): silver.Seqn = stat(s) match {
-    case seqn: silver.Seqn => seqn
-    case other => silver.Seqn(Seq(other), Seq())(pos=pos(s), info=NodeInfo(s))
-  }
+  def block(s: col.Statement[_]): silver.Seqn =
+    stat(s) match {
+      case seqn: silver.Seqn => seqn
+      case other =>
+        silver.Seqn(Seq(other), Seq())(pos = pos(s), info = NodeInfo(s))
+    }
 }
diff --git a/src/viper/viper/api/transform/SilverParserDummyFrontend.scala b/src/viper/viper/api/transform/SilverParserDummyFrontend.scala
index 9b09f29fb5..366f483188 100644
--- a/src/viper/viper/api/transform/SilverParserDummyFrontend.scala
+++ b/src/viper/viper/api/transform/SilverParserDummyFrontend.scala
@@ -12,13 +12,19 @@ import scala.annotation.nowarn
 // We can only refactor this once silver starts using trait parameters (or the suggested workaround)
 // So we silence the warning because it is not useful.
 @nowarn("msg=.*early initializers are deprecated.*")
-case class SilverParserDummyFrontend() extends {
-  // early initializer: reporter must be populated before initialization of superclass SilFrontend
-  override val reporter: Reporter = NopViperReporter
-} with SilFrontend {
-  private val noVerifier: viper.silver.verifier.NoVerifier = new viper.silver.verifier.NoVerifier
-
-  def parse(input: String, diagnosticsPath: Path): Either[Seq[AbstractError], Program] = {
+case class SilverParserDummyFrontend()
+    extends {
+      // early initializer: reporter must be populated before initialization of superclass SilFrontend
+      override val reporter: Reporter = NopViperReporter
+    }
+    with SilFrontend {
+  private val noVerifier: viper.silver.verifier.NoVerifier =
+    new viper.silver.verifier.NoVerifier
+
+  def parse(
+      input: String,
+      diagnosticsPath: Path,
+  ): Either[Seq[AbstractError], Program] = {
     init(noVerifier)
 
     _state = DefaultStates.InputSet
@@ -50,5 +56,6 @@ case class SilverParserDummyFrontend() extends {
   override def createVerifier(fullCmd: String): Verifier = noVerifier
 
   case object SilverParserDummyConfig extends SilFrontendConfig(Nil, "dummy")
-  override def configureVerifier(args: Seq[String]): SilFrontendConfig = SilverParserDummyConfig
+  override def configureVerifier(args: Seq[String]): SilFrontendConfig =
+    SilverParserDummyConfig
 }
diff --git a/src/viper/viper/api/transform/SilverToCol.scala b/src/viper/viper/api/transform/SilverToCol.scala
index 6c0f9ffb85..a4aede3165 100644
--- a/src/viper/viper/api/transform/SilverToCol.scala
+++ b/src/viper/viper/api/transform/SilverToCol.scala
@@ -7,9 +7,28 @@ import vct.col.util.AstBuildHelpers._
 import vct.col.{ast => col}
 import vct.parsers.transform.BlameProvider
 import vct.result.VerificationError.UserError
-import viper.api.transform.SilverToCol.{SilverNodeNotSupported, SilverPositionOrigin}
-import viper.silver.ast.{AbstractSourcePosition, FilePosition, HasIdentifier, HasLineColumn, IdentifierPosition, LineColumnPosition, NoPosition, SourcePosition, TranslatedPosition, VirtualPosition}
-import viper.silver.plugin.standard.termination.{DecreasesClause, DecreasesStar, DecreasesTuple, DecreasesWildcard}
+import viper.api.transform.SilverToCol.{
+  SilverNodeNotSupported,
+  SilverPositionOrigin,
+}
+import viper.silver.ast.{
+  AbstractSourcePosition,
+  FilePosition,
+  HasIdentifier,
+  HasLineColumn,
+  IdentifierPosition,
+  LineColumnPosition,
+  NoPosition,
+  SourcePosition,
+  TranslatedPosition,
+  VirtualPosition,
+}
+import viper.silver.plugin.standard.termination.{
+  DecreasesClause,
+  DecreasesStar,
+  DecreasesTuple,
+  DecreasesWildcard,
+}
 import viper.silver.verifier.AbstractError
 import viper.silver.{ast => silver}
 
@@ -23,7 +42,11 @@ case object SilverToCol {
         val start = position.start
         val end = position.end.getOrElse(start)
         Origin(Seq(
-          PositionRange(start.line-1, end.line-1, Some((start.column-1, end.column-1))),
+          PositionRange(
+            start.line - 1,
+            end.line - 1,
+            Some((start.column - 1, end.column - 1)),
+          ),
           ReadableOrigin(RWFile(position.file)),
         ))
       case FilePosition(file, vline, col) =>
@@ -32,9 +55,7 @@ case object SilverToCol {
           ReadableOrigin(RWFile(file)),
         ))
       case LineColumnPosition(line, column) =>
-        Origin(Seq(
-          PositionRange(line, line, Some((column, column)))
-        ))
+        Origin(Seq(PositionRange(line, line, Some((column, column)))))
       case VirtualPosition(identifier) => Origin(Seq(LabelContext(identifier)))
       case _ => Origin(Nil)
     }
@@ -42,69 +63,95 @@ case object SilverToCol {
   case class SilverNodeNotSupported(node: silver.Node) extends UserError {
     override def code: String = "silverNodeNotSupported"
     override def text: String =
-      s"This kind of silver node is not supported in VerCors yet: $node" + (node match {
-        case pos: silver.Positioned => s" (at ${pos.pos})"
-        case _ => ""
-      })
+      s"This kind of silver node is not supported in VerCors yet: $node" +
+        (node match {
+          case pos: silver.Positioned => s" (at ${pos.pos})"
+          case _ => ""
+        })
   }
 
-  case class SilverFrontendParseError(path: Path, errors: Seq[AbstractError]) extends UserError {
+  case class SilverFrontendParseError(path: Path, errors: Seq[AbstractError])
+      extends UserError {
     override def code: String = "silverFrontendError"
     override def text: String =
-      s"Could not parse file $path. " + (errors match {
-        case Nil => "However, viper did not specify an error. (?)"
-        case errors => "Viper said:\n" + errors.map(_.toString).mkString("\n")
-      })
+      s"Could not parse file $path. " +
+        (errors match {
+          case Nil => "However, viper did not specify an error. (?)"
+          case errors => "Viper said:\n" + errors.map(_.toString).mkString("\n")
+        })
   }
 
-  def transform[G](diagnosticPath: Path, in: Either[Seq[AbstractError], silver.Program], blameProvider: BlameProvider): col.Program[G] =
+  def transform[G](
+      diagnosticPath: Path,
+      in: Either[Seq[AbstractError], silver.Program],
+      blameProvider: BlameProvider,
+  ): col.Program[G] =
     in match {
       case Right(program) => SilverToCol(program, blameProvider).transform()
-      case Left(errors) => throw SilverFrontendParseError(diagnosticPath, errors)
+      case Left(errors) =>
+        throw SilverFrontendParseError(diagnosticPath, errors)
     }
 
   def parse[G](path: Path, blameProvider: BlameProvider): col.Program[G] =
     transform(path, SilverParserDummyFrontend().parse(path), blameProvider)
 
-  def parse[G](input: String, diagnosticPath: Path, blameProvider: BlameProvider): col.Program[G] =
-    transform(diagnosticPath, SilverParserDummyFrontend().parse(input, diagnosticPath), blameProvider)
-
-  def parse[G](readable: Readable, blameProvider: BlameProvider): col.Program[G] =
-    transform(Paths.get(readable.fileName), SilverParserDummyFrontend().parse(readable), blameProvider)
+  def parse[G](
+      input: String,
+      diagnosticPath: Path,
+      blameProvider: BlameProvider,
+  ): col.Program[G] =
+    transform(
+      diagnosticPath,
+      SilverParserDummyFrontend().parse(input, diagnosticPath),
+      blameProvider,
+    )
+
+  def parse[G](
+      readable: Readable,
+      blameProvider: BlameProvider,
+  ): col.Program[G] =
+    transform(
+      Paths.get(readable.fileName),
+      SilverParserDummyFrontend().parse(readable),
+      blameProvider,
+    )
 }
 
-case class SilverToCol[G](program: silver.Program, blameProvider: BlameProvider) {
+case class SilverToCol[G](
+    program: silver.Program,
+    blameProvider: BlameProvider,
+) {
   def origin(node: silver.Positioned, sourceName: String = ""): Origin =
-    if(sourceName.nonEmpty) SilverPositionOrigin(node).sourceName(sourceName)
-    else node match {
-      case node: silver.Declaration => SilverPositionOrigin(node).sourceName(node.name)
-      case _ => SilverPositionOrigin(node)
-    }
+    if (sourceName.nonEmpty)
+      SilverPositionOrigin(node).sourceName(sourceName)
+    else
+      node match {
+        case node: silver.Declaration =>
+          SilverPositionOrigin(node).sourceName(node.name)
+        case _ => SilverPositionOrigin(node)
+      }
 
   def blame(node: silver.Positioned): Blame[VerificationFailure] =
     node.pos match {
-      case pos: AbstractSourcePosition => blameProvider(
-        pos.start.line - 1,
-        pos.end.map(_.line).getOrElse(pos.start.line) - 1,
-        Some((
-          pos.start.column - 1,
-          pos.end.map(_.column - 1).getOrElse(pos.start.column),
-        )),
-      )
+      case pos: AbstractSourcePosition =>
+        blameProvider(
+          pos.start.line - 1,
+          pos.end.map(_.line).getOrElse(pos.start.line) - 1,
+          Some((
+            pos.start.column - 1,
+            pos.end.map(_.column - 1).getOrElse(pos.start.column),
+          )),
+        )
       case _ => blameProvider(0, 0, Some((0, 1)))
     }
 
-  def ??(node: silver.Node): Nothing =
-    throw SilverNodeNotSupported(node)
+  def ??(node: silver.Node): Nothing = throw SilverNodeNotSupported(node)
 
   def transform(): col.Program[G] =
-    col.Program(
-      declarations =
-        program.domains.map(transform) ++
-          program.fields.map(transform) ++
-          program.functions.map(transform) ++
-          program.predicates.map(transform) ++
-          program.methods.map(transform),
+    col.Program(declarations =
+      program.domains.map(transform) ++ program.fields.map(transform) ++
+        program.functions.map(transform) ++ program.predicates.map(transform) ++
+        program.methods.map(transform)
     )(blame(program))(origin(program))
 
   def transform(domain: silver.Domain): col.AxiomaticDataType[G] =
@@ -128,13 +175,17 @@ case class SilverToCol[G](program: silver.Program, blameProvider: BlameProvider)
   def transform(field: silver.Field): col.SilverField[G] =
     new col.SilverField(transform(field.typ))(origin(field))
 
-  def partitionDecreases(exps: Seq[silver.Exp]): (Seq[silver.Exp], Seq[DecreasesClause]) =
+  def partitionDecreases(
+      exps: Seq[silver.Exp]
+  ): (Seq[silver.Exp], Seq[DecreasesClause]) =
     exps.partitionMap {
       case decreases: DecreasesClause => Right(decreases)
       case other => Left(other)
     }
 
-  def partitionContract(contracted: silver.Contracted): (Seq[silver.Exp], Seq[silver.Exp], Option[DecreasesClause]) = {
+  def partitionContract(
+      contracted: silver.Contracted
+  ): (Seq[silver.Exp], Seq[silver.Exp], Option[DecreasesClause]) = {
     val (pres, decreases1) = partitionDecreases(contracted.pres)
     val (posts, decreases2) = partitionDecreases(contracted.posts)
 
@@ -147,14 +198,18 @@ case class SilverToCol[G](program: silver.Program, blameProvider: BlameProvider)
     (pres, posts, decreases)
   }
 
-  def transform(clause: DecreasesClause): Option[col.DecreasesClause[G]] = clause match {
-    case DecreasesTuple(_, Some(cond)) => ??(cond)
-    case DecreasesTuple(Nil, None) => Some(col.DecreasesClauseNoRecursion()(origin(clause)))
-    case DecreasesTuple(exps, None) => Some(col.DecreasesClauseTuple(exps.map(transform))(origin(clause)))
-    case DecreasesWildcard(Some(cond)) => ??(cond)
-    case DecreasesWildcard(None) => Some(col.DecreasesClauseAssume()(origin(clause)))
-    case DecreasesStar() => None
-  }
+  def transform(clause: DecreasesClause): Option[col.DecreasesClause[G]] =
+    clause match {
+      case DecreasesTuple(_, Some(cond)) => ??(cond)
+      case DecreasesTuple(Nil, None) =>
+        Some(col.DecreasesClauseNoRecursion()(origin(clause)))
+      case DecreasesTuple(exps, None) =>
+        Some(col.DecreasesClauseTuple(exps.map(transform))(origin(clause)))
+      case DecreasesWildcard(Some(cond)) => ??(cond)
+      case DecreasesWildcard(None) =>
+        Some(col.DecreasesClauseAssume()(origin(clause)))
+      case DecreasesStar() => None
+    }
 
   def transform(func: silver.Function): col.Function[G] = {
     val (pres, posts, decreases) = partitionContract(func)
@@ -164,30 +219,41 @@ case class SilverToCol[G](program: silver.Program, blameProvider: BlameProvider)
       args = func.formalArgs.map(transform),
       typeArgs = Nil,
       body = func.body.map(transform),
-      contract = col.ApplicableContract(
-        requires = col.UnitAccountedPredicate(foldStar(pres.map(transform))(origin(func)))(origin(func)),
-        ensures = col.UnitAccountedPredicate(foldStar(posts.map(transform))(origin(func)))(origin(func)),
-        contextEverywhere = tt, signals = Nil, givenArgs = Nil, yieldsArgs = Nil,
-        decreases = decreases.flatMap(transform),
-      )(blame(func))(origin(func)),
+      contract =
+        col.ApplicableContract(
+          requires =
+            col.UnitAccountedPredicate(
+              foldStar(pres.map(transform))(origin(func))
+            )(origin(func)),
+          ensures =
+            col.UnitAccountedPredicate(
+              foldStar(posts.map(transform))(origin(func))
+            )(origin(func)),
+          contextEverywhere = tt,
+          signals = Nil,
+          givenArgs = Nil,
+          yieldsArgs = Nil,
+          decreases = decreases.flatMap(transform),
+        )(blame(func))(origin(func)),
       inline = false,
       threadLocal = false,
     )(blame(func))(origin(func))
   }
 
-  def transform(v: silver.AnyLocalVarDecl): col.Variable[G] = v match {
-    case silver.LocalVarDecl(_, typ) =>
-      new col.Variable(transform(typ))(origin(v))
-    case silver.UnnamedLocalVarDecl(typ) =>
-      new col.Variable(transform(typ))(origin(v, "dummy"))
-  }
+  def transform(v: silver.AnyLocalVarDecl): col.Variable[G] =
+    v match {
+      case silver.LocalVarDecl(_, typ) =>
+        new col.Variable(transform(typ))(origin(v))
+      case silver.UnnamedLocalVarDecl(typ) =>
+        new col.Variable(transform(typ))(origin(v, "dummy"))
+    }
 
   def transform(pred: silver.Predicate): col.Predicate[G] =
     new col.Predicate(
       args = pred.formalArgs.map(transform),
       body = pred.body.map(transform),
       threadLocal = false,
-      inline = false
+      inline = false,
     )(origin(pred))
 
   def transform(proc: silver.Method): col.Procedure[G] = {
@@ -199,101 +265,126 @@ case class SilverToCol[G](program: silver.Program, blameProvider: BlameProvider)
       outArgs = proc.formalReturns.map(transform),
       typeArgs = Nil,
       body = proc.body.map(transform),
-      contract = col.ApplicableContract(
-        requires = col.UnitAccountedPredicate(foldStar(pres.map(transform))(origin(proc)))(origin(proc)),
-        ensures = col.UnitAccountedPredicate(foldStar(posts.map(transform))(origin(proc)))(origin(proc)),
-        contextEverywhere = tt, signals = Nil, givenArgs = Nil, yieldsArgs = Nil,
-        decreases = decreases.flatMap(transform),
-      )(blame(proc))(origin(proc)),
+      contract =
+        col.ApplicableContract(
+          requires =
+            col.UnitAccountedPredicate(
+              foldStar(pres.map(transform))(origin(proc))
+            )(origin(proc)),
+          ensures =
+            col.UnitAccountedPredicate(
+              foldStar(posts.map(transform))(origin(proc))
+            )(origin(proc)),
+          contextEverywhere = tt,
+          signals = Nil,
+          givenArgs = Nil,
+          yieldsArgs = Nil,
+          decreases = decreases.flatMap(transform),
+        )(blame(proc))(origin(proc)),
       inline = false,
       pure = false,
     )(blame(proc))(origin(proc))
   }
 
-  def transform(s: silver.Stmt): col.Statement[G] = s match {
-    case silver.NewStmt(lhs, fields) =>
-      col.SilverNewRef(transform(lhs).ref, fields.map(f => new UnresolvedRef[G, col.SilverField[G]](f.name)))(origin(s))
-    case silver.LocalVarAssign(lhs, rhs) =>
-      assignLocal(transform(lhs), transform(rhs))(origin(s))
-    case silver.FieldAssign(lhs, rhs) =>
-      col.Assign(transform(lhs), transform(rhs))(blame(s))(origin(s))
-    case silver.MethodCall(methodName, args, targets) =>
-      col.InvokeProcedure[G](
-        ref = new UnresolvedRef(methodName),
-        args = args.map(transform),
-        outArgs = targets.map(transform),
-        typeArgs = Nil, givenMap = Nil, yields = Nil,
-      )(blame(s))(origin(s))
-    case silver.Exhale(exp) =>
-      col.Exhale(transform(exp))(blame(s))(origin(s))
-    case silver.Inhale(exp) =>
-      col.Inhale(transform(exp))(origin(s))
-    case silver.Assert(exp) =>
-      col.Assert(transform(exp))(blame(s))(origin(s))
-    case silver.Assume(exp) =>
-      col.Assume(transform(exp))(origin(s))
-    case silver.Fold(acc) =>
-      col.Fold(transform(acc))(blame(s))(origin(s))
-    case silver.Unfold(acc) =>
-      col.Unfold(transform(acc))(blame(s))(origin(s))
-    case silver.Seqn(ss, scopedDecls) =>
-      val vars = scopedDecls.flatMap {
-        case decl @ silver.LocalVarDecl(_, typ) => Seq(new col.Variable(transform(typ))(origin(decl)))
-        case _: silver.Label => Nil // scoped by the method for us
-        case other: silver.Declaration with silver.Node => ??(other)
-        case _: silver.Declaration => ??? // unreachable
-      }
-      col.Scope(vars, col.Block(ss.map(transform))(origin(s)))(origin(s))
-    case silver.If(cond, thn, els) =>
-      col.Branch(Seq(
-        (transform(cond), transform(thn)),
-        (tt[G], transform(els)),
-      ))(origin(s))
-    case silver.While(cond, invs, body) =>
-      col.Loop(
-        init = col.Block(Nil)(origin(s)),
-        cond = transform(cond),
-        update = col.Block(Nil)(origin(s)),
-        contract = col.LoopInvariant(foldStar(invs.map(transform))(origin(s)), None)(blame(s))(origin(s)),
-        body = transform(body),
-      )(origin(s))
-    case silver.Label(name, invs) =>
-      col.Label[G](new col.LabelDecl()(origin(s, name)), col.Block(Nil)(origin(s)))(origin(s))
-    case silver.Goto(target) =>
-      col.Goto[G](new UnresolvedRef(target))(origin(s))
-    case silver.LocalVarDeclStmt(decl) =>
-      col.LocalDecl(transform(decl))(origin(s))
-
-    case silver.Package(wand, proofScript) => ??(s)
-    case silver.Apply(exp) => ??(s)
-    case silver.Quasihavoc(_, _) => ??(s)
-    case silver.Quasihavocall(_, _, _) => ??(s)
-
-    case stmt: silver.ExtensionStmt => ??(stmt)
-  }
+  def transform(s: silver.Stmt): col.Statement[G] =
+    s match {
+      case silver.NewStmt(lhs, fields) =>
+        col.SilverNewRef(
+          transform(lhs).ref,
+          fields.map(f => new UnresolvedRef[G, col.SilverField[G]](f.name)),
+        )(origin(s))
+      case silver.LocalVarAssign(lhs, rhs) =>
+        assignLocal(transform(lhs), transform(rhs))(origin(s))
+      case silver.FieldAssign(lhs, rhs) =>
+        col.Assign(transform(lhs), transform(rhs))(blame(s))(origin(s))
+      case silver.MethodCall(methodName, args, targets) =>
+        col.InvokeProcedure[G](
+          ref = new UnresolvedRef(methodName),
+          args = args.map(transform),
+          outArgs = targets.map(transform),
+          typeArgs = Nil,
+          givenMap = Nil,
+          yields = Nil,
+        )(blame(s))(origin(s))
+      case silver.Exhale(exp) => col.Exhale(transform(exp))(blame(s))(origin(s))
+      case silver.Inhale(exp) => col.Inhale(transform(exp))(origin(s))
+      case silver.Assert(exp) => col.Assert(transform(exp))(blame(s))(origin(s))
+      case silver.Assume(exp) => col.Assume(transform(exp))(origin(s))
+      case silver.Fold(acc) => col.Fold(transform(acc))(blame(s))(origin(s))
+      case silver.Unfold(acc) => col.Unfold(transform(acc))(blame(s))(origin(s))
+      case silver.Seqn(ss, scopedDecls) =>
+        val vars = scopedDecls.flatMap {
+          case decl @ silver.LocalVarDecl(_, typ) =>
+            Seq(new col.Variable(transform(typ))(origin(decl)))
+          case _: silver.Label => Nil // scoped by the method for us
+          case other: silver.Declaration with silver.Node => ??(other)
+          case _: silver.Declaration => ??? // unreachable
+        }
+        col.Scope(vars, col.Block(ss.map(transform))(origin(s)))(origin(s))
+      case silver.If(cond, thn, els) =>
+        col.Branch(
+          Seq((transform(cond), transform(thn)), (tt[G], transform(els)))
+        )(origin(s))
+      case silver.While(cond, invs, body) =>
+        col.Loop(
+          init = col.Block(Nil)(origin(s)),
+          cond = transform(cond),
+          update = col.Block(Nil)(origin(s)),
+          contract =
+            col.LoopInvariant(foldStar(invs.map(transform))(origin(s)), None)(
+              blame(s)
+            )(origin(s)),
+          body = transform(body),
+        )(origin(s))
+      case silver.Label(name, invs) =>
+        col.Label[G](
+          new col.LabelDecl()(origin(s, name)),
+          col.Block(Nil)(origin(s)),
+        )(origin(s))
+      case silver.Goto(target) =>
+        col.Goto[G](new UnresolvedRef(target))(origin(s))
+      case silver.LocalVarDeclStmt(decl) =>
+        col.LocalDecl(transform(decl))(origin(s))
+
+      case silver.Package(wand, proofScript) => ??(s)
+      case silver.Apply(exp) => ??(s)
+      case silver.Quasihavoc(_, _) => ??(s)
+      case silver.Quasihavocall(_, _, _) => ??(s)
+
+      case stmt: silver.ExtensionStmt => ??(stmt)
+    }
 
-  def transform(t: silver.Type): col.Type[G] = t match {
-    case silver.Int => col.TInt()
-    case silver.Bool => col.TBool()
-    case silver.Perm => col.TRational()
-    case silver.Ref => col.TRef()
-    case silver.Wand => col.TResource()
-    case silver.SeqType(elementType) => col.TSeq(transform(elementType))
-    case silver.SetType(elementType) => col.TSet(transform(elementType))
-    case silver.MultisetType(elementType) => col.TBag(transform(elementType))
-    case silver.MapType(keyType, valueType) => col.TMap(transform(keyType), transform(valueType))
-    case silver.DomainType(domainName, partialTypVarsMap) =>
-      col.SilverPartialTAxiomatic(new UnresolvedRef(domainName), partialTypVarsMap.toSeq.map { case (k, v) => (new UnresolvedRef(k.name), transform(v)) })
-    case silver.TypeVar(name) => col.TVar(new UnresolvedRef(name))
-
-    case silver.InternalType => ??(t)
-    case silver.BackendType(boogieName, smtName) => ??(t)
-    case extensionType: silver.ExtensionType => ??(extensionType)
-  }
+  def transform(t: silver.Type): col.Type[G] =
+    t match {
+      case silver.Int => col.TInt()
+      case silver.Bool => col.TBool()
+      case silver.Perm => col.TRational()
+      case silver.Ref => col.TRef()
+      case silver.Wand => col.TResource()
+      case silver.SeqType(elementType) => col.TSeq(transform(elementType))
+      case silver.SetType(elementType) => col.TSet(transform(elementType))
+      case silver.MultisetType(elementType) => col.TBag(transform(elementType))
+      case silver.MapType(keyType, valueType) =>
+        col.TMap(transform(keyType), transform(valueType))
+      case silver.DomainType(domainName, partialTypVarsMap) =>
+        col.SilverPartialTAxiomatic(
+          new UnresolvedRef(domainName),
+          partialTypVarsMap.toSeq.map { case (k, v) =>
+            (new UnresolvedRef(k.name), transform(v))
+          },
+        )
+      case silver.TypeVar(name) => col.TVar(new UnresolvedRef(name))
+
+      case silver.InternalType => ??(t)
+      case silver.BackendType(boogieName, smtName) => ??(t)
+      case extensionType: silver.ExtensionType => ??(extensionType)
+    }
 
-  def transform(e: silver.LocalVar): col.Local[G] = col.Local[G](new UnresolvedRef(e.name))(origin(e))
+  def transform(e: silver.LocalVar): col.Local[G] =
+    col.Local[G](new UnresolvedRef(e.name))(origin(e))
 
-  def transform(trigger: silver.Trigger): Seq[col.Expr[G]] = trigger.exps.map(transform)
+  def transform(trigger: silver.Trigger): Seq[col.Expr[G]] =
+    trigger.exps.map(transform)
 
   def transform(e: silver.Exp): col.Expr[G] = {
     implicit val o: Origin = origin(e)
@@ -301,70 +392,118 @@ case class SilverToCol[G](program: silver.Program, blameProvider: BlameProvider)
     e match {
       case silver.Add(left, right) => col.Plus(f(left), f(right))
       case silver.And(left, right) =>
-        if (e.isPure) col.And(f(left), f(right))
-        else col.Star(f(left), f(right))
+        if (e.isPure)
+          col.And(f(left), f(right))
+        else
+          col.Star(f(left), f(right))
       case silver.AnySetCardinality(s) => col.Size(f(s))
       case silver.AnySetContains(elem, s) =>
-        if(s.typ.isInstanceOf[silver.SetType]) col.SetMember(f(elem), f(s))
-        else col.BagMemberCount(f(elem), f(s))
+        if (s.typ.isInstanceOf[silver.SetType])
+          col.SetMember(f(elem), f(s))
+        else
+          col.BagMemberCount(f(elem), f(s))
       case silver.AnySetIntersection(left, right) =>
-        if(left.typ.isInstanceOf[silver.SetType]) col.SetIntersection(f(left), f(right))
-        else col.BagLargestCommon(f(left), f(right))
+        if (left.typ.isInstanceOf[silver.SetType])
+          col.SetIntersection(f(left), f(right))
+        else
+          col.BagLargestCommon(f(left), f(right))
       case silver.AnySetMinus(left, right) =>
-        if(left.typ.isInstanceOf[silver.SetType]) col.SetMinus(f(left), f(right))
-        else col.BagMinus(f(left), f(right))
+        if (left.typ.isInstanceOf[silver.SetType])
+          col.SetMinus(f(left), f(right))
+        else
+          col.BagMinus(f(left), f(right))
       case silver.AnySetSubset(left, right) =>
-        if(left.typ.isInstanceOf[silver.SetType]) col.SubSetEq(f(left), f(right))
-        else col.SubBagEq(f(left), f(right))
+        if (left.typ.isInstanceOf[silver.SetType])
+          col.SubSetEq(f(left), f(right))
+        else
+          col.SubBagEq(f(left), f(right))
       case silver.AnySetUnion(left, right) =>
-        if(left.typ.isInstanceOf[silver.SetType]) col.SetUnion(f(left), f(right))
-        else col.BagAdd(f(left), f(right))
+        if (left.typ.isInstanceOf[silver.SetType])
+          col.SetUnion(f(left), f(right))
+        else
+          col.BagAdd(f(left), f(right))
       case silver.CondExp(cond, thn, els) => col.Select(f(cond), f(thn), f(els))
-      case silver.CurrentPerm(res) => col.CurPerm(col.AmbiguousLocation(f(res))(vct.col.origin.PanicBlame("Silver does not have pointers.")))
+      case silver.CurrentPerm(res) =>
+        col.CurPerm(col.AmbiguousLocation(f(res))(
+          vct.col.origin.PanicBlame("Silver does not have pointers.")
+        ))
       case silver.Div(left, right) => col.FloorDiv(f(left), f(right))(blame(e))
       case silver.DomainFuncApp(funcname, args, typVarMap) =>
-        col.SilverPartialADTFunctionInvocation(funcname, args.map(f), typVarMap.toSeq.map {
-          case (v, t) => (new UnresolvedRef[G, col.Variable[G]](v.name), transform(t))
-        })
-      case silver.EmptyMap(keyType, valueType) => col.LiteralMap(transform(keyType), transform(valueType), Nil)
-      case silver.EmptyMultiset(elemTyp) => col.LiteralBag(transform(elemTyp), Nil)
+        col.SilverPartialADTFunctionInvocation(
+          funcname,
+          args.map(f),
+          typVarMap.toSeq.map { case (v, t) =>
+            (new UnresolvedRef[G, col.Variable[G]](v.name), transform(t))
+          },
+        )
+      case silver.EmptyMap(keyType, valueType) =>
+        col.LiteralMap(transform(keyType), transform(valueType), Nil)
+      case silver.EmptyMultiset(elemTyp) =>
+        col.LiteralBag(transform(elemTyp), Nil)
       case silver.EmptySeq(elemTyp) => col.LiteralSeq(transform(elemTyp), Nil)
       case silver.EmptySet(elemTyp) => col.LiteralSet(transform(elemTyp), Nil)
       case silver.EqCmp(left, right) => col.Eq(f(left), f(right))
-      case silver.Exists(variables, triggers, exp) => col.Exists(variables.map(transform), triggers.map(transform), f(exp))
-      case silver.ExplicitMap(elems) => col.SilverUntypedNonemptyLiteralMap(elems.map {
-        case silver.Maplet(k, v) => (f(k), f(v))
-        case other => ??(other)
-      })
+      case silver.Exists(variables, triggers, exp) =>
+        col.Exists(variables.map(transform), triggers.map(transform), f(exp))
+      case silver.ExplicitMap(elems) =>
+        col.SilverUntypedNonemptyLiteralMap(elems.map {
+          case silver.Maplet(k, v) => (f(k), f(v))
+          case other => ??(other)
+        })
       case silver.ExplicitMultiset(elems) => col.UntypedLiteralBag(elems.map(f))
       case silver.ExplicitSeq(elems) => col.UntypedLiteralSeq(elems.map(f))
       case silver.ExplicitSet(elems) => col.UntypedLiteralSet(elems.map(f))
       case silver.FalseLit() => col.BooleanValue(false)
-      case silver.FieldAccess(rcv, field) => col.SilverDeref[G](f(rcv), new UnresolvedRef(field.name))(blame(e))
-      case silver.FieldAccessPredicate(loc, perm) => col.Perm[G](col.SilverFieldLocation[G](f(loc.rcv), new UnresolvedRef(loc.field.name)), f(perm))
+      case silver.FieldAccess(rcv, field) =>
+        col.SilverDeref[G](f(rcv), new UnresolvedRef(field.name))(blame(e))
+      case silver.FieldAccessPredicate(loc, perm) =>
+        col.Perm[G](
+          col.SilverFieldLocation[G](
+            f(loc.rcv),
+            new UnresolvedRef(loc.field.name),
+          ),
+          f(perm),
+        )
       case silver.Forall(variables, triggers, exp) =>
-        if(exp.isPure) col.Forall(variables.map(transform), triggers.map(transform), f(exp))
-        else col.Starall(variables.map(transform), triggers.map(transform), f(exp))(blame(e))
-      case silver.FractionalPerm(left, right) => col.RatDiv(f(left), f(right))(blame(e))
+        if (exp.isPure)
+          col.Forall(variables.map(transform), triggers.map(transform), f(exp))
+        else
+          col
+            .Starall(variables.map(transform), triggers.map(transform), f(exp))(
+              blame(e)
+            )
+      case silver.FractionalPerm(left, right) =>
+        col.RatDiv(f(left), f(right))(blame(e))
       case silver.FullPerm() => col.WritePerm()
-      case silver.FuncApp(funcname, args) => col.FunctionInvocation[G](new UnresolvedRef(funcname), args.map(f), Nil, Nil, Nil)(blame(e))
+      case silver.FuncApp(funcname, args) =>
+        col.FunctionInvocation[G](
+          new UnresolvedRef(funcname),
+          args.map(f),
+          Nil,
+          Nil,
+          Nil,
+        )(blame(e))
       case silver.GeCmp(left, right) => col.GreaterEq(f(left), f(right))
       case silver.GtCmp(left, right) => col.Greater(f(left), f(right))
       case silver.Implies(left, right) => col.Implies(f(left), f(right))
       case silver.IntLit(i) => col.IntegerValue(i)
       case silver.IntPermMul(left, right) => col.Mult(f(left), f(right))
-      case silver.LabelledOld(exp, oldLabel) => col.Old[G](f(exp), Some(new UnresolvedRef(oldLabel)))(blame(e))
+      case silver.LabelledOld(exp, oldLabel) =>
+        col.Old[G](f(exp), Some(new UnresolvedRef(oldLabel)))(blame(e))
       case silver.LeCmp(left, right) => col.LessEq(f(left), f(right))
-      case silver.Let(variable, exp, body) => col.Let(transform(variable), f(exp), f(body))
+      case silver.Let(variable, exp, body) =>
+        col.Let(transform(variable), f(exp), f(body))
       case v @ silver.LocalVar(name, typ) => transform(v)
       case silver.LtCmp(left, right) => col.Less(f(left), f(right))
       case silver.MapCardinality(base) => col.Size(f(base))
       case silver.MapContains(key, base) => col.MapMember(f(key), f(base))
       case silver.MapDomain(base) => col.MapKeySet(f(base))
-      case silver.Maplet(key, value) => col.SilverUntypedNonemptyLiteralMap(Seq((f(key), f(value))))
+      case silver.Maplet(key, value) =>
+        col.SilverUntypedNonemptyLiteralMap(Seq((f(key), f(value))))
       case silver.MapLookup(base, key) => col.MapGet(f(base), f(key))(blame(e))
       case silver.MapRange(base) => col.MapValueSet(f(base))
-      case silver.MapUpdate(base, key, value) => col.MapCons(f(base), f(key), f(value))
+      case silver.MapUpdate(base, key, value) =>
+        col.MapCons(f(base), f(key), f(value))
       case silver.Minus(exp) => col.UMinus(f(exp))
       case silver.Mod(left, right) => col.Mod(f(left), f(right))(blame(e))
       case silver.Mul(left, right) => col.Mult(f(left), f(right))
@@ -375,8 +514,10 @@ case class SilverToCol[G](program: silver.Program, blameProvider: BlameProvider)
       case silver.Old(exp) => col.Old(f(exp), None)(blame(e))
       case silver.Or(left, right) => col.Or(f(left), f(right))
       case silver.PermAdd(left, right) => col.Plus(f(left), f(right))
-      case silver.PermDiv(left, right) => col.RatDiv(f(left), f(right))(blame(e))
-      case silver.PermPermDiv(left, right) => col.RatDiv(f(left), f(right))(blame(e))
+      case silver.PermDiv(left, right) =>
+        col.RatDiv(f(left), f(right))(blame(e))
+      case silver.PermPermDiv(left, right) =>
+        col.RatDiv(f(left), f(right))(blame(e))
       case silver.PermGeCmp(left, right) => col.GreaterEq(f(left), f(right))
       case silver.PermGtCmp(left, right) => col.Greater(f(left), f(right))
       case silver.PermLeCmp(left, right) => col.LessEq(f(left), f(right))
@@ -384,9 +525,21 @@ case class SilverToCol[G](program: silver.Program, blameProvider: BlameProvider)
       case silver.PermMinus(exp) => col.UMinus(f(exp))
       case silver.PermMul(left, right) => col.Mult(f(left), f(right))
       case silver.PermSub(left, right) => col.Minus(f(left), f(right))
-      case silver.PredicateAccess(args, predicateName) => col.PredicateApply(new UnresolvedRef(predicateName), args.map(f), col.WritePerm())
-      case silver.PredicateAccessPredicate(silver.PredicateAccess(args, predicateName), perm) =>
-        col.PredicateApply(new UnresolvedRef(predicateName), args.map(f), f(perm))
+      case silver.PredicateAccess(args, predicateName) =>
+        col.PredicateApply(
+          new UnresolvedRef(predicateName),
+          args.map(f),
+          col.WritePerm(),
+        )
+      case silver.PredicateAccessPredicate(
+            silver.PredicateAccess(args, predicateName),
+            perm,
+          ) =>
+        col.PredicateApply(
+          new UnresolvedRef(predicateName),
+          args.map(f),
+          f(perm),
+        )
       case silver.RangeSeq(low, high) => col.Range(f(low), f(high))
       case silver.Result(typ) => col.AmbiguousResult()
       case silver.SeqAppend(left, right) => col.Concat(f(left), f(right))
@@ -395,10 +548,12 @@ case class SilverToCol[G](program: silver.Program, blameProvider: BlameProvider)
       case silver.SeqIndex(s, idx) => col.SeqSubscript(f(s), f(idx))(blame(e))
       case silver.SeqLength(s) => col.Size(f(s))
       case silver.SeqTake(s, n) => col.Take(f(s), f(n))
-      case silver.SeqUpdate(s, idx, elem) => col.SeqUpdate(f(s), f(idx), f(elem))
+      case silver.SeqUpdate(s, idx, elem) =>
+        col.SeqUpdate(f(s), f(idx), f(elem))
       case silver.Sub(left, right) => col.Minus(f(left), f(right))
       case silver.TrueLit() => col.BooleanValue(true)
-      case silver.Unfolding(acc, body) => col.Unfolding(f(acc), f(body))(blame(e))
+      case silver.Unfolding(acc, body) =>
+        col.Unfolding(f(acc), f(body))(blame(e))
       case silver.WildcardPerm() => col.ReadPerm()
 
       case silver.ForPerm(variables, resource, body) => ??(e)

From b8800af7c52f7a6f91b177258acfe0f5f14aa209 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Wed, 29 May 2024 13:51:32 +0200
Subject: [PATCH 02/23] Fixed missed merge

---
 src/rewrite/vct/rewrite/rasi/Interval.scala | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/rewrite/vct/rewrite/rasi/Interval.scala b/src/rewrite/vct/rewrite/rasi/Interval.scala
index ff7320a58c..56d8a85370 100644
--- a/src/rewrite/vct/rewrite/rasi/Interval.scala
+++ b/src/rewrite/vct/rewrite/rasi/Interval.scala
@@ -420,11 +420,8 @@ case class BoundedInterval(lower: Int, upper: Int) extends Interval {
         else
           LowerBoundedInterval(0)
     }
-<<<<<<< HEAD
 
   override def values: Option[Set[Int]] = Some(lower.to(upper).toSet)
-=======
->>>>>>> dev
 
   override def try_to_resolve(): Option[Int] = {
     if (lower == upper)

From 1fbe4e7cbac13aa95caed1036b93f780c84a288a Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Wed, 29 May 2024 16:32:13 +0200
Subject: [PATCH 03/23] Updated RASI generator for new types in node.scala

---
 src/rewrite/vct/rewrite/rasi/AbstractState.scala | 16 ++++++++++++++++
 .../vct/rewrite/rasi/ConstraintSolver.scala      | 10 ++++++----
 src/rewrite/vct/rewrite/rasi/StaticScanner.scala | 14 +++++++++-----
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/rewrite/vct/rewrite/rasi/AbstractState.scala b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
index 4239a1be5c..673aea322b 100644
--- a/src/rewrite/vct/rewrite/rasi/AbstractState.scala
+++ b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
@@ -347,9 +347,21 @@ case class AbstractState[G](
       case Mult(left, right) =>
         resolve_integer_expression(left, is_old, is_contract) *
           resolve_integer_expression(right, is_old, is_contract)
+      case AmbiguousDiv(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) /
+          resolve_integer_expression(right, is_old, is_contract)
+      case AmbiguousTruncDiv(left, right) =>    // TODO: Handle this?
+        resolve_integer_expression(left, is_old, is_contract) /
+          resolve_integer_expression(right, is_old, is_contract)
       case FloorDiv(left, right) =>
         resolve_integer_expression(left, is_old, is_contract) /
           resolve_integer_expression(right, is_old, is_contract)
+      case AmbiguousMod(left, right) =>
+        resolve_integer_expression(left, is_old, is_contract) %
+          resolve_integer_expression(right, is_old, is_contract)
+      case AmbiguousTruncMod(left, right) =>    // TODO: Handle this?
+        resolve_integer_expression(left, is_old, is_contract) %
+          resolve_integer_expression(right, is_old, is_contract)
       case Mod(left, right) =>
         resolve_integer_expression(left, is_old, is_contract) %
           resolve_integer_expression(right, is_old, is_contract)
@@ -483,8 +495,12 @@ case class AbstractState[G](
       case Implies(left, right) =>
         (!resolve_boolean_expression(left, is_old, is_contract)) ||
         resolve_boolean_expression(right, is_old, is_contract)
+      case AmbiguousEq(left, right, _) =>
+        handle_equality(left, right, is_old, is_contract, negate = false)
       case Eq(left, right) =>
         handle_equality(left, right, is_old, is_contract, negate = false)
+      case AmbiguousNeq(left, right, _) =>
+        handle_equality(left, right, is_old, is_contract, negate = true)
       case Neq(left, right) =>
         handle_equality(left, right, is_old, is_contract, negate = true)
       case AmbiguousGreater(left, right) =>
diff --git a/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala b/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala
index f43b4ef49d..4fafe4093e 100644
--- a/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala
+++ b/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala
@@ -221,14 +221,14 @@ class ConstraintSolver[G](
         state.resolve_expression(comp.right)
 
     comp match {
-      case _: Eq[_] =>
+      case _: Eq[_] | _: AmbiguousEq[_] =>
         Set(
           if (!negate)
             expr_equals(expr, value)
           else
             expr_equals(expr, value.complement())
         )
-      case _: Neq[_] =>
+      case _: Neq[_] | _: AmbiguousNeq[_] =>
         Set(
           if (!negate)
             expr_equals(expr, value.complement())
@@ -352,8 +352,10 @@ class ConstraintSolver[G](
     val update_map = index_update_map ++ size_update_map
 
     comp match {
-      case _: Eq[_] if !negate => Set(ConstraintMap.from_cons(update_map))
-      case _: Neq[_] if negate => Set(ConstraintMap.from_cons(update_map))
+      case _: Eq[_] | _: AmbiguousEq[_] if !negate =>
+        Set(ConstraintMap.from_cons(update_map))
+      case _: Neq[_] | _: AmbiguousNeq[_] if negate =>
+        Set(ConstraintMap.from_cons(update_map))
       case _ =>
         throw new IllegalArgumentException(
           s"The operator ${comp.toInlineString} is not supported for collections"
diff --git a/src/rewrite/vct/rewrite/rasi/StaticScanner.scala b/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
index cd63dc36a5..c10c759fc2 100644
--- a/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
+++ b/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
@@ -6,19 +6,21 @@ import vct.rewrite.cfg.{CFGEntry, CFGNode}
 import scala.collection.mutable
 
 class StaticScanner[G](initial_node: CFGNode[G], state: AbstractState[G]) {
-  private val explored_nodes: mutable.Set[CFGEntry[G]] = mutable.Set
+  private val var_change_explored_nodes: mutable.Set[CFGEntry[G]] = mutable.Set
+    .empty[CFGEntry[G]]
+  private val find_var_explored_nodes: mutable.Set[CFGEntry[G]] = mutable.Set
     .empty[CFGEntry[G]]
 
   def scan_can_change_variables(until: Option[CFGNode[G]]): Boolean = {
     if (until.nonEmpty)
-      explored_nodes.add(until.get)
+      var_change_explored_nodes.add(until.get)
     scan_for_var_changes_from_node(initial_node)
   }
 
   private def scan_for_var_changes_from_node(node: CFGNode[G]): Boolean = {
-    if (explored_nodes.contains(node))
+    if (var_change_explored_nodes.contains(node))
       return false
-    explored_nodes.add(node)
+    var_change_explored_nodes.add(node)
     node_changes_vars(node) || node.successors.map(e => e.target).collect {
       case n: CFGNode[G] => n
     }.exists(n => scan_for_var_changes_from_node(n))
@@ -90,5 +92,7 @@ class StaticScanner[G](initial_node: CFGNode[G], state: AbstractState[G]) {
       state.to_expression != potential_successor.successors.head.to_expression
   }
 
-  def scan_for_important_variables: Set[ConcreteVariable[G]] = ???
+  def scan_for_important_variables: Set[ConcreteVariable[G]] = {
+    ???
+  }
 }

From b2de43968b6f3f9810fb8ba08f5f3e45eb177dbf Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Thu, 30 May 2024 11:49:55 +0200
Subject: [PATCH 04/23] Created infrastructure for selecting new variables on
 the fly

---
 .../vct/rewrite/rasi/RASIGenerator.scala      | 119 ++++++++++++++----
 1 file changed, 93 insertions(+), 26 deletions(-)

diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index d9c36d4191..f351341614 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -79,19 +79,17 @@ class RASIGenerator[G] extends LazyLogging {
       parameter_invariant: InstancePredicate[G],
   ): Unit = {
     logger.info("Starting RASI generation")
-    val start_time: Long = System.nanoTime()
-    var last_measurement: Long = start_time
+    val global_start_time: Long = System.nanoTime()
 
-    val initial_state = AbstractState(
-      get_initial_values(vars),
-      HashMap((AbstractProcess[G](Null()(Origin(Seq()))), node)),
-      None,
-      get_parameter_constraints(parameter_invariant),
-    ).with_condition(parameter_invariant.body)
-
-    found_states += initial_state
-    current_branches += initial_state
+    var considered_variables: Set[ConcreteVariable[G]] = vars
 
+    var generation_start_time: Long = reset(
+      node,
+      considered_variables,
+      parameter_invariant,
+    )
+    var last_measurement_time: Long = generation_start_time
+    var initial_state: AbstractState[G] = current_branches.head
     var i = 0
 
     while (current_branches.nonEmpty) {
@@ -99,25 +97,56 @@ class RASIGenerator[G] extends LazyLogging {
       current_branches -= curr
 
       val successor: RASISuccessor[G] = curr.successors()
-      found_edges.addAll(successor.edges(curr))
-      successor.successors.foreach(s =>
-        if (!found_states.contains(s)) {
-          found_states += s; current_branches += s
+
+      val relevant_variables: Set[ConcreteVariable[G]] = successor
+        .deciding_variables.filter(v => is_relevant_variable(v))
+      if (relevant_variables.nonEmpty) {
+        val time: Long =
+          (System.nanoTime() - generation_start_time) / 1_000_000L
+        logger.info(
+          s"Found relevant new variables; abort generation [$i iterations in ${time}ms]"
+        )
+        val found_vars = relevant_variables.toSeq
+          .sortWith((v1, v2) => v1.compare(v2))
+          .map(v => v.to_expression.toInlineString)
+        logger.debug(s"Variables found: $found_vars")
+
+        considered_variables ++= relevant_variables
+
+        generation_start_time = reset(
+          node,
+          considered_variables,
+          parameter_invariant,
+        )
+        last_measurement_time = generation_start_time
+        initial_state = current_branches.head
+        i = 0
+      } else {
+        found_edges.addAll(successor.edges(curr))
+        successor.successors.foreach(s =>
+          if (!found_states.contains(s)) {
+            found_states += s;
+            current_branches += s
+          }
+        )
+        i = i + 1
+        if (System.nanoTime() - last_measurement_time > 1_000_000_000L) {
+          last_measurement_time = System.nanoTime()
+          val time =
+            (last_measurement_time - generation_start_time) / 1_000_000L
+          logger.debug(s"[Runtime ${time}ms] Iteration $i: ${found_states
+              .size} states found, ${current_branches.size} yet to explore")
         }
-      )
-      i = i + 1
-      if (System.nanoTime() - last_measurement > 5_000_000_000L) {
-        last_measurement = System.nanoTime()
-        val time = (last_measurement - start_time) / 1_000_000L
-        logger.debug(s"[Runtime ${time}ms] Iteration $i: ${found_states
-            .size} states found, ${current_branches.size} yet to explore")
       }
     }
 
-    val total_time: Long = (System.nanoTime() - start_time) / 1_000_000L
-    logger.info(s"RASI generation complete [$i iterations in ${total_time}ms]")
-
-    // TODO: Detect which variable overapproximations are detrimental to the state space and which are not
+    val current_time: Long = System.nanoTime()
+    val generation_time: Long =
+      (current_time - generation_start_time) / 1_000_000L
+    val total_time: Long = (System.nanoTime() - global_start_time) / 1_000_000L
+    logger
+      .info(s"RASI generation complete [$i iterations in ${generation_time}ms]")
+    logger.info(s"Total runtime: ${total_time}ms")
 
     // The initial state converts to simply "true", so it would make the RASI trivial
     found_states.filterInPlace(s => s.valuations != initial_state.valuations)
@@ -134,6 +163,28 @@ class RASIGenerator[G] extends LazyLogging {
     )
   }
 
+  private def reset(
+      node: CFGEntry[G],
+      vars: Set[ConcreteVariable[G]],
+      parameter_invariant: InstancePredicate[G],
+  ): Long = {
+    found_states.clear()
+    found_edges.clear()
+    current_branches.clear()
+
+    val initial_state = AbstractState(
+      get_initial_values(vars),
+      HashMap((AbstractProcess[G](Null()(Origin(Seq()))), node)),
+      None,
+      get_parameter_constraints(parameter_invariant),
+    ).with_condition(parameter_invariant.body)
+
+    found_states += initial_state
+    current_branches += initial_state
+
+    System.nanoTime()
+  }
+
   private def get_initial_values(
       vars: Set[ConcreteVariable[G]]
   ): Map[ConcreteVariable[G], UncertainValue] = {
@@ -152,6 +203,22 @@ class RASIGenerator[G] extends LazyLogging {
     )
   }
 
+  private def is_relevant_variable(variable: ConcreteVariable[G]): Boolean = {
+    // TODO: This is just a (horrendous) heuristic! This needs to be fixed ASAP!
+    // Basically, if the variable is a defined variable from the VeSUV transformation,
+    // it should be included when encountered
+    val name = variable.to_expression.toInlineString
+    val relevant_names: Set[String] = Set(
+      ".ProcessState_",
+      ".EventState_",
+      ".PrimitiveChannelUpdate_",
+      ".Written",
+      ".NumRead",
+      ".Buffer",
+    )
+    relevant_names.exists(s => name.contains(s))
+  }
+
   private def reduce_redundant_states()
       : (Seq[AbstractState[G]], Seq[(AbstractState[G], AbstractState[G])]) = {
     val state_groups: Map[Expr[G], mutable.ArrayBuffer[AbstractState[G]]] = Map

From cf10256057bd351b274ffa6109a7fbeeeeee23c5 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Thu, 30 May 2024 14:35:36 +0200
Subject: [PATCH 05/23] Improved handling of mutually dependent variable
 constraints

---
 .../vct/rewrite/rasi/AbstractState.scala      |   6 +-
 .../vct/rewrite/rasi/ConstraintMap.scala      |   8 +-
 .../vct/rewrite/rasi/ConstraintSolver.scala   | 123 +++++++++++++++---
 .../vct/rewrite/rasi/UncertainValue.scala     |   5 +
 .../vct/rewrite/rasi/VariableSelector.scala   |   5 +-
 5 files changed, 124 insertions(+), 23 deletions(-)

diff --git a/src/rewrite/vct/rewrite/rasi/AbstractState.scala b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
index 673aea322b..7af44316be 100644
--- a/src/rewrite/vct/rewrite/rasi/AbstractState.scala
+++ b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
@@ -106,7 +106,7 @@ case class AbstractState[G](
     cond match {
       case None => this
       case Some(expr) =>
-        val c =
+        val c: Map[ResolvableVariable[G], UncertainValue] =
           new ConstraintSolver(
             this,
             valuations.keySet
@@ -350,7 +350,7 @@ case class AbstractState[G](
       case AmbiguousDiv(left, right) =>
         resolve_integer_expression(left, is_old, is_contract) /
           resolve_integer_expression(right, is_old, is_contract)
-      case AmbiguousTruncDiv(left, right) =>    // TODO: Handle this?
+      case AmbiguousTruncDiv(left, right) => // TODO: Handle this?
         resolve_integer_expression(left, is_old, is_contract) /
           resolve_integer_expression(right, is_old, is_contract)
       case FloorDiv(left, right) =>
@@ -359,7 +359,7 @@ case class AbstractState[G](
       case AmbiguousMod(left, right) =>
         resolve_integer_expression(left, is_old, is_contract) %
           resolve_integer_expression(right, is_old, is_contract)
-      case AmbiguousTruncMod(left, right) =>    // TODO: Handle this?
+      case AmbiguousTruncMod(left, right) => // TODO: Handle this?
         resolve_integer_expression(left, is_old, is_contract) %
           resolve_integer_expression(right, is_old, is_contract)
       case Mod(left, right) =>
diff --git a/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala b/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala
index 1755f0289a..eedbd8a60c 100644
--- a/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala
+++ b/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala
@@ -44,7 +44,8 @@ case class ConstraintMap[G](
     *   A representation of this map in which each variable is mapped to one
     *   uncertain value
     */
-  def resolve: Map[ResolvableVariable[G], UncertainValue] = constraints
+  def resolve: Map[ResolvableVariable[G], UncertainValue] =
+    constraints.filter(t => !t._2.is_uncertain)
 
   /** Checks whether this map's valuation is impossible. A valuation is
     * impossible if any variable is mapped to an empty set of potential values.
@@ -53,7 +54,7 @@ case class ConstraintMap[G](
     *   <code>true</code> if any variable is mapped to an impossible value,
     *   <code>false</code> otherwise
     */
-  def is_impossible: Boolean = resolve.exists(t => t._2.is_impossible)
+  def is_impossible: Boolean = constraints.exists(t => t._2.is_impossible)
 
   /** Checks whether the constraint map is empty. An empty map represents the
     * constraint of all variables to the uncertain value of their respective
@@ -64,8 +65,7 @@ case class ConstraintMap[G](
     *   <code>true</code> if the map does not constrain any variable,
     *   <code>false</code> otherwise
     */
-  def is_empty: Boolean =
-    resolve.forall(t => t._2 == UncertainValue.uncertain_of(t._1.t))
+  def is_empty: Boolean = resolve.isEmpty
 }
 case object ConstraintMap {
   def from[G](
diff --git a/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala b/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala
index 4fafe4093e..c5c1dc163c 100644
--- a/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala
+++ b/src/rewrite/vct/rewrite/rasi/ConstraintSolver.scala
@@ -179,8 +179,10 @@ class ConstraintSolver[G](
   ): Set[ConstraintMap[G]] = {
     val pure_left = is_pure(comp.left)
     val pure_right = is_pure(comp.right)
-    if (pure_left == pure_right)
-      return Set(ConstraintMap.empty[G])
+    if (pure_left && pure_right) { return Set(ConstraintMap.empty[G]) }
+    if (!pure_left && !pure_right) {
+      return handle_double_impure_update(comp, negate)
+    }
     // Now, exactly one side is pure, and the other contains a concrete variable
     // Resolve the variable and the other side of the equation
     comp.left.t match {
@@ -190,6 +192,97 @@ class ConstraintSolver[G](
     }
   }
 
+  private def handle_double_impure_update(
+      comp: Comparison[G],
+      negate: Boolean,
+  ): Set[ConstraintMap[G]] =
+    comp.left.t match {
+      case _: IntType[_] | _: TBool[_] =>
+        val left_val: UncertainValue = state.resolve_expression(comp.left)
+        val right_val: UncertainValue = state.resolve_expression(comp.right)
+        if (left_val.is_uncertain && right_val.is_uncertain)
+          Set(ConstraintMap.empty[G])
+        else {
+          comp match {
+            case _: Eq[_] | _: AmbiguousEq[_] =>
+              val value: UncertainValue = left_val.intersection(right_val)
+              if (!negate)
+                Set(
+                  expr_equals(comp.left, value) &&
+                    expr_equals(comp.right, value)
+                )
+              else
+                Set(ConstraintMap.empty[G])
+            case _: Neq[_] | _: AmbiguousNeq[_] =>
+              val value: UncertainValue = left_val.intersection(right_val)
+              if (negate)
+                Set(
+                  expr_equals(comp.left, value) &&
+                    expr_equals(comp.right, value)
+                )
+              else
+                Set(ConstraintMap.empty[G])
+            case _: Greater[_] | _: AmbiguousGreater[_] =>
+              Set(
+                limit_variable(
+                  comp.left,
+                  right_val.asInstanceOf[UncertainIntegerValue],
+                  !negate,
+                  negate,
+                ) && limit_variable(
+                  comp.right,
+                  left_val.asInstanceOf[UncertainIntegerValue],
+                  negate,
+                  negate,
+                )
+              )
+            case _: GreaterEq[_] | _: AmbiguousGreaterEq[_] =>
+              Set(
+                limit_variable(
+                  comp.left,
+                  right_val.asInstanceOf[UncertainIntegerValue],
+                  !negate,
+                  !negate,
+                ) && limit_variable(
+                  comp.right,
+                  left_val.asInstanceOf[UncertainIntegerValue],
+                  negate,
+                  !negate,
+                )
+              )
+            case _: LessEq[_] | _: AmbiguousLessEq[_] =>
+              Set(
+                limit_variable(
+                  comp.left,
+                  right_val.asInstanceOf[UncertainIntegerValue],
+                  negate,
+                  !negate,
+                ) && limit_variable(
+                  comp.right,
+                  left_val.asInstanceOf[UncertainIntegerValue],
+                  !negate,
+                  !negate,
+                )
+              )
+            case _: Less[_] | _: AmbiguousLess[_] =>
+              Set(
+                limit_variable(
+                  comp.left,
+                  right_val.asInstanceOf[UncertainIntegerValue],
+                  negate,
+                  negate,
+                ) && limit_variable(
+                  comp.right,
+                  left_val.asInstanceOf[UncertainIntegerValue],
+                  !negate,
+                  negate,
+                )
+              )
+          }
+        }
+      case _ => Set(ConstraintMap.empty[G]) // TODO: Handle collection values
+    }
+
   private def is_pure(node: Node[G]): Boolean =
     node match {
       // The old value of a variable is always pure, since it cannot be updated
@@ -236,33 +329,33 @@ class ConstraintSolver[G](
             expr_equals(expr, value)
         )
       case AmbiguousGreater(_, _) | Greater(_, _) =>
-        limit_variable(
+        Set(limit_variable(
           expr,
           value.asInstanceOf[UncertainIntegerValue],
           pure_left == negate,
           negate,
-        )
+        ))
       case AmbiguousGreaterEq(_, _) | GreaterEq(_, _) =>
-        limit_variable(
+        Set(limit_variable(
           expr,
           value.asInstanceOf[UncertainIntegerValue],
           pure_left == negate,
           !negate,
-        )
+        ))
       case AmbiguousLessEq(_, _) | LessEq(_, _) =>
-        limit_variable(
+        Set(limit_variable(
           expr,
           value.asInstanceOf[UncertainIntegerValue],
           pure_left != negate,
           !negate,
-        )
+        ))
       case AmbiguousLess(_, _) | Less(_, _) =>
-        limit_variable(
+        Set(limit_variable(
           expr,
           value.asInstanceOf[UncertainIntegerValue],
           pure_left != negate,
           negate,
-        )
+        ))
     }
   }
 
@@ -271,17 +364,17 @@ class ConstraintSolver[G](
       b: UncertainIntegerValue,
       var_greater: Boolean,
       can_be_equal: Boolean,
-  ): Set[ConstraintMap[G]] = {
+  ): ConstraintMap[G] = {
     if (var_greater) {
       if (can_be_equal)
-        Set(expr_equals(expr, b.above_eq()))
+        expr_equals(expr, b.above_eq())
       else
-        Set(expr_equals(expr, b.above()))
+        expr_equals(expr, b.above())
     } else {
       if (can_be_equal)
-        Set(expr_equals(expr, b.below_eq()))
+        expr_equals(expr, b.below_eq())
       else
-        Set(expr_equals(expr, b.below()))
+        expr_equals(expr, b.below())
     }
   }
 
diff --git a/src/rewrite/vct/rewrite/rasi/UncertainValue.scala b/src/rewrite/vct/rewrite/rasi/UncertainValue.scala
index 273ff2afaf..3b2d0e1510 100644
--- a/src/rewrite/vct/rewrite/rasi/UncertainValue.scala
+++ b/src/rewrite/vct/rewrite/rasi/UncertainValue.scala
@@ -6,6 +6,7 @@ import vct.col.ast.{BooleanValue, Expr, IntType, Not, TBool, TInt, Type}
 trait UncertainValue {
   def can_be_equal(other: UncertainValue): Boolean
   def can_be_unequal(other: UncertainValue): Boolean
+  def is_uncertain: Boolean
   def is_impossible: Boolean
   def is_subset_of(other: UncertainValue): Boolean
   def complement(): UncertainValue
@@ -44,6 +45,8 @@ case class UncertainBooleanValue(can_be_true: Boolean, can_be_false: Boolean)
       case _ => true
     }
 
+  override def is_uncertain: Boolean = can_be_true && can_be_false
+
   override def is_impossible: Boolean = !can_be_true && !can_be_false
 
   override def is_subset_of(other: UncertainValue): Boolean =
@@ -173,6 +176,8 @@ case class UncertainIntegerValue(value: Interval) extends UncertainValue {
       case _ => true
     }
 
+  override def is_uncertain: Boolean = value == UnboundedInterval
+
   override def is_impossible: Boolean = value.empty()
 
   override def is_subset_of(other: UncertainValue): Boolean =
diff --git a/src/rewrite/vct/rewrite/rasi/VariableSelector.scala b/src/rewrite/vct/rewrite/rasi/VariableSelector.scala
index a523806750..7c9d04a93b 100644
--- a/src/rewrite/vct/rewrite/rasi/VariableSelector.scala
+++ b/src/rewrite/vct/rewrite/rasi/VariableSelector.scala
@@ -87,7 +87,10 @@ class VariableSelector[G](initial_state: AbstractState[G]) {
       case _: IntType[_] | _: TBool[_] | _: TResource[_] =>
         expr match {
           case d @ Deref(_, ref) =>
-            if (state.valuations.exists(t => t._1.is_contained_by(d, state)))
+            if (
+              (state.valuations ++ state.parameters)
+                .exists(t => t._1.is_contained_by(d, state))
+            )
               Set()
             else
               Set(FieldVariable(ref.decl))

From 4d117a344e6f6ef9e71c91659a78114c09b0cb1e Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Thu, 30 May 2024 15:06:25 +0200
Subject: [PATCH 06/23] Variable selection works in very limited manner

---
 src/rewrite/vct/rewrite/rasi/ConstraintMap.scala    | 5 ++---
 src/rewrite/vct/rewrite/rasi/RASIGenerator.scala    | 2 +-
 src/rewrite/vct/rewrite/rasi/VariableSelector.scala | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala b/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala
index eedbd8a60c..8a90fba22a 100644
--- a/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala
+++ b/src/rewrite/vct/rewrite/rasi/ConstraintMap.scala
@@ -44,8 +44,7 @@ case class ConstraintMap[G](
     *   A representation of this map in which each variable is mapped to one
     *   uncertain value
     */
-  def resolve: Map[ResolvableVariable[G], UncertainValue] =
-    constraints.filter(t => !t._2.is_uncertain)
+  def resolve: Map[ResolvableVariable[G], UncertainValue] = constraints
 
   /** Checks whether this map's valuation is impossible. A valuation is
     * impossible if any variable is mapped to an empty set of potential values.
@@ -65,7 +64,7 @@ case class ConstraintMap[G](
     *   <code>true</code> if the map does not constrain any variable,
     *   <code>false</code> otherwise
     */
-  def is_empty: Boolean = resolve.isEmpty
+  def is_empty: Boolean = resolve.forall(v => v._2.is_uncertain)
 }
 case object ConstraintMap {
   def from[G](
diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index f351341614..40c737d369 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -106,7 +106,7 @@ class RASIGenerator[G] extends LazyLogging {
         logger.info(
           s"Found relevant new variables; abort generation [$i iterations in ${time}ms]"
         )
-        val found_vars = relevant_variables.toSeq
+        val found_vars: Seq[String] = relevant_variables.toSeq
           .sortWith((v1, v2) => v1.compare(v2))
           .map(v => v.to_expression.toInlineString)
         logger.debug(s"Variables found: $found_vars")
diff --git a/src/rewrite/vct/rewrite/rasi/VariableSelector.scala b/src/rewrite/vct/rewrite/rasi/VariableSelector.scala
index 7c9d04a93b..a1925cce55 100644
--- a/src/rewrite/vct/rewrite/rasi/VariableSelector.scala
+++ b/src/rewrite/vct/rewrite/rasi/VariableSelector.scala
@@ -53,7 +53,6 @@ class VariableSelector[G](initial_state: AbstractState[G]) {
 
     val constraints: Seq[Set[ConstraintMap[G]]] = conditions.toSeq
       .map(e => satisfying_valuations(initial_state, e))
-      .filter(s => s.exists(m => !m.is_empty))
     if (constraints.isEmpty)
       Set.empty[ConcreteVariable[G]]
     else

From 104e27acd364fe2096a978b7ebb807ec5aaa1b46 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Thu, 30 May 2024 15:20:24 +0200
Subject: [PATCH 07/23] Enabled inferrence of min_advance as required variable

---
 src/rewrite/vct/rewrite/rasi/RASIGenerator.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index 40c737d369..e1431be446 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -204,7 +204,7 @@ class RASIGenerator[G] extends LazyLogging {
   }
 
   private def is_relevant_variable(variable: ConcreteVariable[G]): Boolean = {
-    // TODO: This is just a (horrendous) heuristic! This needs to be fixed ASAP!
+    // TODO: This is just a (horrible) heuristic! This needs to be fixed ASAP!
     // Basically, if the variable is a defined variable from the VeSUV transformation,
     // it should be included when encountered
     val name = variable.to_expression.toInlineString
@@ -215,6 +215,7 @@ class RASIGenerator[G] extends LazyLogging {
       ".Written",
       ".NumRead",
       ".Buffer",
+      "MinAdvance",
     )
     relevant_names.exists(s => name.contains(s))
   }

From aee677266781c3b8b1a0cf0f9298849be606a9f2 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Fri, 31 May 2024 11:38:40 +0200
Subject: [PATCH 08/23] Filter variables based on whether they locally split
 the state space

---
 .../vct/rewrite/rasi/RASIConnection.scala     |  3 ++-
 .../vct/rewrite/rasi/RASIGenerator.scala      | 27 +++----------------
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/rewrite/vct/rewrite/rasi/RASIConnection.scala b/src/rewrite/vct/rewrite/rasi/RASIConnection.scala
index fea92d4f64..b8b1ab9e3f 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIConnection.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIConnection.scala
@@ -10,7 +10,8 @@ case class RASISuccessor[G](
 case object RASISuccessor {
   def from[G](successors: Iterable[RASISuccessor[G]]): RASISuccessor[G] =
     RASISuccessor(
-      successors.flatMap(s => s.deciding_variables).toSet,
+      successors.filter(s => s.successors.size > 1)
+        .flatMap(s => s.deciding_variables).toSet,
       successors.flatMap(s => s.successors).toSet,
     )
 }
diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index e1431be446..5588387b35 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -98,20 +98,18 @@ class RASIGenerator[G] extends LazyLogging {
 
       val successor: RASISuccessor[G] = curr.successors()
 
-      val relevant_variables: Set[ConcreteVariable[G]] = successor
-        .deciding_variables.filter(v => is_relevant_variable(v))
-      if (relevant_variables.nonEmpty) {
+      if (successor.deciding_variables.nonEmpty) {
         val time: Long =
           (System.nanoTime() - generation_start_time) / 1_000_000L
         logger.info(
           s"Found relevant new variables; abort generation [$i iterations in ${time}ms]"
         )
-        val found_vars: Seq[String] = relevant_variables.toSeq
+        val found_vars: Seq[String] = successor.deciding_variables.toSeq
           .sortWith((v1, v2) => v1.compare(v2))
           .map(v => v.to_expression.toInlineString)
         logger.debug(s"Variables found: $found_vars")
 
-        considered_variables ++= relevant_variables
+        considered_variables ++= successor.deciding_variables
 
         generation_start_time = reset(
           node,
@@ -125,7 +123,7 @@ class RASIGenerator[G] extends LazyLogging {
         found_edges.addAll(successor.edges(curr))
         successor.successors.foreach(s =>
           if (!found_states.contains(s)) {
-            found_states += s;
+            found_states += s
             current_branches += s
           }
         )
@@ -203,23 +201,6 @@ class RASIGenerator[G] extends LazyLogging {
     )
   }
 
-  private def is_relevant_variable(variable: ConcreteVariable[G]): Boolean = {
-    // TODO: This is just a (horrible) heuristic! This needs to be fixed ASAP!
-    // Basically, if the variable is a defined variable from the VeSUV transformation,
-    // it should be included when encountered
-    val name = variable.to_expression.toInlineString
-    val relevant_names: Set[String] = Set(
-      ".ProcessState_",
-      ".EventState_",
-      ".PrimitiveChannelUpdate_",
-      ".Written",
-      ".NumRead",
-      ".Buffer",
-      "MinAdvance",
-    )
-    relevant_names.exists(s => name.contains(s))
-  }
-
   private def reduce_redundant_states()
       : (Seq[AbstractState[G]], Seq[(AbstractState[G], AbstractState[G])]) = {
     val state_groups: Map[Expr[G], mutable.ArrayBuffer[AbstractState[G]]] = Map

From 67ebc10505b470503dc3ea52b3a581859b97def8 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Wed, 5 Jun 2024 16:22:03 +0200
Subject: [PATCH 09/23] Fixed VeSUV output stage; fixed output for multiple
 files

---
 src/main/vct/main/stages/Output.scala | 34 ++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/src/main/vct/main/stages/Output.scala b/src/main/vct/main/stages/Output.scala
index 9b8e435b42..d6ede629b6 100644
--- a/src/main/vct/main/stages/Output.scala
+++ b/src/main/vct/main/stages/Output.scala
@@ -2,9 +2,15 @@ package vct.main.stages
 
 import com.typesafe.scalalogging.LazyLogging
 import hre.io.{LiteralReadable, Readable}
-import hre.stages.{Stage, Stages}
-import vct.col.ast.{Declaration, Node, Program, Verification}
-import vct.col.origin.DiagnosticOrigin
+import hre.stages.{FunctionStage, Stage, Stages}
+import vct.col.ast.{
+  Declaration,
+  Node,
+  Program,
+  Verification,
+  VerificationContext,
+}
+import vct.col.origin.{DiagnosticOrigin, Origin}
 import vct.col.print.{Ctx, Namer}
 import vct.col.rewrite.{Generation, InitialGeneration}
 import vct.options.Options
@@ -22,9 +28,19 @@ case object Output {
   def vesuvOfOptions[G <: Generation](
       options: Options
   ): Stages[ParseResult[G], Unit] = {
-//    FunctionStage((pr: ParseResult[_ <: Generation]) => Program(pr.decls)(DiagnosticOrigin)(DiagnosticOrigin))
-//      .thenRun(??? /* Output(options.vesuvOutput, Ctx.PVL) */)
-    ???
+    implicit val o: Origin = DiagnosticOrigin
+    FunctionStage((pr: ParseResult[_ <: Generation]) =>
+      Verification(
+        Seq(VerificationContext(Program(pr.decls)(DiagnosticOrigin))),
+        Seq(),
+      )
+    ).thenRun(Output(
+      Some(options.vesuvOutput),
+      Ctx.PVL,
+      Files.isDirectory(options.vesuvOutput),
+    )).thenRun(FunctionStage((_: Seq[LiteralReadable]) =>
+        ()
+      )) // TODO: Not the prettiest, but I have no time for this. I blame Bob.
   }
 
   def veymontOfOptions(
@@ -63,13 +79,13 @@ case class Output(out: Option[Path], syntax: Ctx.Syntax, splitDecls: Boolean)
 
     val txts: Seq[LiteralReadable] =
       if (splitDecls) {
-        in.asInstanceOf[Program[_]].declarations.zipWithIndex.map {
+        in.tasks.map(t => t.program).flatMap(p => p.declarations).zipWithIndex.map {
           case (decl, i) =>
-            val name = names.getOrElse(decl.asInstanceOf, s"unknown$i")
+            val name = names.getOrElse(decl.asInstanceOf[Declaration[Generation]], s"unknown$i")
             val fileName = s"${name}.${extension(syntax)}"
             val buf = new StringBuffer()
             decl.write(buf)(ctx)
-            LiteralReadable(buf.toString, fileName)
+            LiteralReadable(fileName, buf.toString)
         }
       } else {
         val buf = new StringBuffer()

From e435b185bf16896263002852d77c65e960ed2873 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Wed, 5 Jun 2024 17:14:56 +0200
Subject: [PATCH 10/23] Added vesuv_entry to VeSUV output

---
 .../systemctocol/colmodel/COLSystem.java      | 40 +++++++++++++++++++
 .../systemctocol/engine/MainTransformer.java  |  1 +
 .../systemctocol/engine/Transformer.java      |  6 +++
 3 files changed, 47 insertions(+)

diff --git a/src/parsers/vct/parsers/transform/systemctocol/colmodel/COLSystem.java b/src/parsers/vct/parsers/transform/systemctocol/colmodel/COLSystem.java
index e4a4394b66..61c5ff30ee 100644
--- a/src/parsers/vct/parsers/transform/systemctocol/colmodel/COLSystem.java
+++ b/src/parsers/vct/parsers/transform/systemctocol/colmodel/COLSystem.java
@@ -31,6 +31,7 @@
 import vct.parsers.transform.systemctocol.exceptions.UnsupportedException;
 import vct.parsers.transform.systemctocol.util.GeneratedBlame;
 import vct.parsers.transform.systemctocol.util.OriGen;
+import vct.parsers.transform.systemctocol.util.Seqs;
 
 import java.util.stream.Collectors;
 
@@ -299,6 +300,11 @@ else if (size_expr instanceof SCVariableExpression var_expr && is_parameter(var_
      */
     private Class<T> main;
 
+    /**
+     * The scheduler method in the Main class.
+     */
+    private InstanceMethod<T> main_method;
+
     /**
      * Global permission invariant.
      */
@@ -539,6 +545,31 @@ public ParseResult<T> to_parse_result() {
                 List.from(CollectionConverters.asScala(expected_errors)));
     }
 
+    public void create_vesuv_entry() {
+        java.util.List<Statement<T>> body = new java.util.ArrayList<>();
+
+        // Create variable of Main class
+        TClass<T> main_type = new TClass<>(new DirectRef<>(main, ClassTag$.MODULE$.apply(Class.class)), Seqs.empty(), OriGen.create());
+        Variable<T> var = new Variable<>(main_type, OriGen.create("design"));
+
+        // Constructor call
+        PVLNew<T> new_expr = new PVLNew<>(main_type, Seqs.empty(), Seqs.empty(), NO_GIVEN, NO_YIELDS, new GeneratedBlame<>(), OriGen.create());
+        Local<T> m_deref = new Local<>(new DirectRef<>(var, ClassTag$.MODULE$.apply(Variable.class)), OriGen.create());
+
+        // main method call
+        Ref<T, InstanceMethod<T>> scheduler_ref = new DirectRef<>(main_method, ClassTag$.MODULE$.apply(InstanceMethod.class));
+        InvokeMethod<T> call_main = new InvokeMethod<>(m_deref, scheduler_ref, NO_EXPRS, NO_EXPRS, NO_TYPES, NO_GIVEN,
+                NO_YIELDS, new GeneratedBlame<>(), OriGen.create());
+
+        body.add(new LocalDecl<>(var, OriGen.create()));
+        body.add(new Assign<>(m_deref, new_expr, new GeneratedBlame<>(), OriGen.create()));
+        body.add(call_main);
+
+        Block<T> block = new Block<>(List.from(CollectionConverters.asScala(body)), OriGen.create());
+
+        global_declarations.add(new VeSUVMainMethod<>(Option.apply(block), new GeneratedBlame<>(), OriGen.create()));
+    }
+
     // ===================================================== //
     // ================ GETTERS AND SETTERS ================ //
     // ===================================================== //
@@ -571,6 +602,15 @@ public Class<T> get_main() {
         return main;
     }
 
+    /**
+     * Registers the main scheduler method.
+     *
+     * @param main_method Scheduler method
+     */
+    public void set_main_method(InstanceMethod<T> main_method) {
+        this.main_method = main_method;
+    }
+
     /**
      * Registers the global permission invariant.
      *
diff --git a/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java b/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java
index b9ff6d8305..515a4295e9 100644
--- a/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java
+++ b/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java
@@ -1243,5 +1243,6 @@ private void assemble_main() {
         // Register Main class in COL system context
         col_system.add_global_declaration(main_class);
         col_system.set_main(main_class);
+        col_system.set_main_method(scheduler);
     }
 }
diff --git a/src/parsers/vct/parsers/transform/systemctocol/engine/Transformer.java b/src/parsers/vct/parsers/transform/systemctocol/engine/Transformer.java
index 1c4d9a4c75..4cfca17cae 100644
--- a/src/parsers/vct/parsers/transform/systemctocol/engine/Transformer.java
+++ b/src/parsers/vct/parsers/transform/systemctocol/engine/Transformer.java
@@ -73,6 +73,8 @@ public void create_col_model() {
 		transform_classes();
 		// Finish the Main class
 		create_main_class();
+		// Create program entry point
+		create_vesuv_entry();
 	}
 
 	/**
@@ -347,6 +349,10 @@ private void create_main_class() {
 		main_transformer.create_main_class();
 	}
 
+	private void create_vesuv_entry() {
+		col_system.create_vesuv_entry();
+	}
+
 	// ============================================================================================================== //
 	// ============================================= UTILITY FUNCTIONS ============================================== //
 	// ============================================================================================================== //

From e66bcb23886718c60d6f70ccde6f86a323ebb620 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Thu, 6 Jun 2024 16:49:04 +0200
Subject: [PATCH 11/23] Started infrastructure for finding objects for each
 field

---
 src/main/vct/main/stages/GenerateRASI.scala   | 23 +++++++--
 src/main/vct/options/Options.scala            |  7 ++-
 .../vct/rewrite/rasi/AbstractState.scala      | 11 +++--
 .../vct/rewrite/rasi/ConcreteVariable.scala   | 31 +++++++-----
 .../vct/rewrite/rasi/RASIGenerator.scala      | 47 +++++++++++++------
 .../vct/rewrite/rasi/StaticScanner.scala      | 14 +++---
 .../vct/rewrite/rasi/UncertainValue.scala     |  1 +
 src/rewrite/vct/rewrite/rasi/Utils.scala      |  6 +--
 8 files changed, 96 insertions(+), 44 deletions(-)

diff --git a/src/main/vct/main/stages/GenerateRASI.scala b/src/main/vct/main/stages/GenerateRASI.scala
index 060aaf609f..0765c657fc 100644
--- a/src/main/vct/main/stages/GenerateRASI.scala
+++ b/src/main/vct/main/stages/GenerateRASI.scala
@@ -1,7 +1,13 @@
 package vct.main.stages
 
 import hre.stages.Stage
-import vct.col.ast.{InstanceField, InstanceMethod, InstancePredicate, Node}
+import vct.col.ast.{
+  Expr,
+  InstanceField,
+  InstanceMethod,
+  InstancePredicate,
+  Node,
+}
 import vct.col.rewrite.Generation
 import vct.options.Options
 import vct.rewrite.rasi.{
@@ -16,11 +22,15 @@ import java.nio.file.Path
 
 case object GenerateRASI {
   def ofOptions(options: Options): Stage[Node[_ <: Generation], Unit] = {
-    GenerateRASI(options.vesuvRasiVariables, options.vesuvOutput)
+    GenerateRASI(
+      options.vesuvRasiVariables,
+      options.vesuvOutput,
+      test = options.vesuvRasiTest,
+    )
   }
 }
 
-case class GenerateRASI(vars: Option[Seq[String]], out: Path)
+case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
     extends Stage[Node[_ <: Generation], Unit] {
 
   override def friendlyName: String =
@@ -40,7 +50,12 @@ case class GenerateRASI(vars: Option[Seq[String]], out: Path)
       vars.getOrElse(Seq()).map(s => resolve_variable(in, s)).toSet
     val parameter_invariant: InstancePredicate[Generation] =
       get_parameter_invariant(in)
-    new RASIGenerator().test(main_method, variables, parameter_invariant, out)
+    if (test) {
+      new RASIGenerator().test(main_method, variables, parameter_invariant, out)
+    } else {
+      val rasi: Expr[Generation] = new RASIGenerator()
+        .execute(main_method, variables, parameter_invariant, in)
+    }
   }
 
   private def resolve_variable(
diff --git a/src/main/vct/options/Options.scala b/src/main/vct/options/Options.scala
index 79e522f5e8..a6e00786f9 100644
--- a/src/main/vct/options/Options.scala
+++ b/src/main/vct/options/Options.scala
@@ -326,11 +326,15 @@ case object Options {
           .action((_, c) => c.copy(vesuvGenerateRasi = true)).text(
             "Instead of transforming a SystemC design to PVL, generate a global invariant for a PVL program"
           ).children(
+            opt[Unit]("rasi-graph-output")
+              .action((_, c) => c.copy(vesuvRasiTest = true)).text(
+                "Output RASI graph to test the algorithm rather than outputting the invariant"
+              ),
             opt[Seq[String]]("rasi-vars").valueName("<var1>,...")
               .action((vars, c) => c.copy(vesuvRasiVariables = Some(vars)))
               .text(
                 "[WIP] Preliminary selection mechanism for RASI variables; might be replaced later"
-              )
+              ),
           ),
       ),
       note(""),
@@ -444,6 +448,7 @@ case class Options(
     // VeSUV options
     vesuvOutput: Path = null,
     vesuvGenerateRasi: Boolean = false,
+    vesuvRasiTest: Boolean = false,
     vesuvRasiVariables: Option[Seq[String]] = None,
 
     // Control flow graph options
diff --git a/src/rewrite/vct/rewrite/rasi/AbstractState.scala b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
index 7af44316be..d32e675144 100644
--- a/src/rewrite/vct/rewrite/rasi/AbstractState.scala
+++ b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
@@ -869,10 +869,15 @@ case class AbstractState[G](
     * @return
     *   An expression that encodes this state
     */
-  def to_expression: Expr[G] = {
+  def to_expression(
+      objs: Option[Map[ConcreteVariable[G], Expr[G]]]
+  ): Expr[G] = {
     val sorted_valuations = valuations.toSeq
       .sortWith((t1, t2) => t1._1.compare(t2._1))
-    sorted_valuations.map(v => v._2.to_expression(v._1.to_expression))
-      .reduce((e1, e2) => And(e1, e2)(e1.o))
+    sorted_valuations.map(v =>
+      v._2.to_expression(
+        v._1.to_expression(Option.when(objs.nonEmpty)(objs.get.apply(v._1)))
+      )
+    ).reduce((e1, e2) => And(e1, e2)(e1.o))
   }
 }
diff --git a/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala b/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala
index 67cd0540f1..ecd3814c9b 100644
--- a/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala
+++ b/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala
@@ -66,7 +66,7 @@ sealed trait ConcreteVariable[G] extends ResolvableVariable[G] {
     * @return
     *   A COL expression representing this variable
     */
-  def to_expression: Expr[G]
+  def to_expression(obj: Option[Expr[G]]): Expr[G]
 
   protected def field_equals(expr: Expr[G], field: InstanceField[G]): Boolean =
     expr match {
@@ -102,7 +102,8 @@ case class LocalVariable[G](variable: Variable[G]) extends ConcreteVariable[G] {
       expr: Expr[G],
       state: AbstractState[G],
   ): Boolean = is(expr, state)
-  override def to_expression: Expr[G] = Local[G](variable.ref)(variable.o)
+  override def to_expression(obj: Option[Expr[G]]): Expr[G] =
+    Local[G](variable.ref)(variable.o)
   override def t: Type[G] = variable.t
   override def compare(other: ConcreteVariable[G]): Boolean =
     other match {
@@ -121,8 +122,10 @@ case class FieldVariable[G](field: InstanceField[G])
       expr: Expr[G],
       state: AbstractState[G],
   ): Boolean = is(expr, state)
-  override def to_expression: Expr[G] =
-    Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o)
+  override def to_expression(obj: Option[Expr[G]]): Expr[G] =
+    Deref[G](obj.getOrElse(AmbiguousThis()(field.o)), field.ref)(field.o)(
+      field.o
+    )
   override def t: Type[G] = field.t
   override def compare(other: ConcreteVariable[G]): Boolean =
     other match {
@@ -148,10 +151,10 @@ case class SizeVariable[G](field: InstanceField[G])
       expr: Expr[G],
       state: AbstractState[G],
   ): Boolean = is(expr, state) || field_equals(expr, field)
-  override def to_expression: Expr[G] =
-    Size(Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o))(
+  override def to_expression(obj: Option[Expr[G]]): Expr[G] =
+    Size(Deref[G](obj.getOrElse(AmbiguousThis()(field.o)), field.ref)(field.o)(
       field.o
-    )
+    ))(field.o)
   override def t: Type[G] = TInt()(field.o)
   override def compare(other: ConcreteVariable[G]): Boolean =
     other match {
@@ -203,21 +206,27 @@ case class IndexedVariable[G](field: InstanceField[G], i: Int)
           .getOrElse(i - 1) >= i
       case _ => field_equals(expr, field) || is(expr, state)
     }
-  override def to_expression: Expr[G] =
+  override def to_expression(obj: Option[Expr[G]]): Expr[G] =
     field.t match {
       case TSeq(_) =>
         SeqSubscript(
-          Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o),
+          Deref[G](obj.getOrElse(AmbiguousThis()(field.o)), field.ref)(field.o)(
+            field.o
+          ),
           IntegerValue(i)(field.o),
         )(field.o)(field.o)
       case TArray(_) =>
         ArraySubscript(
-          Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o),
+          Deref[G](obj.getOrElse(AmbiguousThis()(field.o)), field.ref)(field.o)(
+            field.o
+          ),
           IntegerValue(i)(field.o),
         )(field.o)(field.o)
       case TPointer(_) =>
         PointerSubscript(
-          Deref[G](AmbiguousThis()(field.o), field.ref)(field.o)(field.o),
+          Deref[G](obj.getOrElse(AmbiguousThis()(field.o)), field.ref)(field.o)(
+            field.o
+          ),
           IntegerValue(i)(field.o),
         )(field.o)(field.o)
     }
diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index 5588387b35..6c3f4daac6 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -1,15 +1,7 @@
 package vct.rewrite.rasi
 
 import com.typesafe.scalalogging.LazyLogging
-import vct.col.ast.{
-  Deref,
-  Expr,
-  InstanceField,
-  InstanceMethod,
-  InstancePredicate,
-  Null,
-  Or,
-}
+import vct.col.ast.{AmbiguousThis, Deref, Expr, InstanceField, InstanceMethod, InstancePredicate, Node, Null, Or}
 import vct.col.origin.Origin
 import vct.rewrite.cfg.{CFGEntry, CFGGenerator}
 
@@ -29,11 +21,13 @@ class RASIGenerator[G] extends LazyLogging {
       entry_point: InstanceMethod[G],
       vars: Set[ConcreteVariable[G]],
       parameter_invariant: InstancePredicate[G],
+      program: Node[G],
   ): Expr[G] =
     generate_rasi(
       CFGGenerator().generate(entry_point),
       vars,
       parameter_invariant,
+      program,
     )
 
   def test(
@@ -53,11 +47,16 @@ class RASIGenerator[G] extends LazyLogging {
       node: CFGEntry[G],
       vars: Set[ConcreteVariable[G]],
       parameter_invariant: InstancePredicate[G],
+      program: Node[G],
   ): Expr[G] = {
     explore(node, vars, parameter_invariant)
     val distinct_states = found_states.distinctBy(s => s.valuations)
     logger.debug(s"${distinct_states.size} distinct states found")
-    distinct_states.map(s => s.to_expression)
+    val objs: Map[ConcreteVariable[G], Expr[G]] = find_fitting_objects(
+      program,
+      distinct_states.head.valuations.keySet,
+    )
+    distinct_states.map(s => s.to_expression(Some(objs)))
       .reduce((e1, e2) => Or(e1, e2)(e1.o))
   }
 
@@ -106,7 +105,7 @@ class RASIGenerator[G] extends LazyLogging {
         )
         val found_vars: Seq[String] = successor.deciding_variables.toSeq
           .sortWith((v1, v2) => v1.compare(v2))
-          .map(v => v.to_expression.toInlineString)
+          .map(v => v.to_expression(None).toInlineString)
         logger.debug(s"Variables found: $found_vars")
 
         considered_variables ++= successor.deciding_variables
@@ -204,12 +203,12 @@ class RASIGenerator[G] extends LazyLogging {
   private def reduce_redundant_states()
       : (Seq[AbstractState[G]], Seq[(AbstractState[G], AbstractState[G])]) = {
     val state_groups: Map[Expr[G], mutable.ArrayBuffer[AbstractState[G]]] = Map
-      .from(found_states.groupBy(s => s.to_expression))
+      .from(found_states.groupBy(s => s.to_expression(None)))
     val edge_groups: Seq[(AbstractState[G], AbstractState[G])] = Seq
       .from(found_edges.map(e =>
         (
-          state_groups(e.from.to_expression).head,
-          state_groups(e.to.to_expression).head,
+          state_groups(e.from.to_expression(None)).head,
+          state_groups(e.to.to_expression(None)).head,
         )
       ))
     (
@@ -217,4 +216,24 @@ class RASIGenerator[G] extends LazyLogging {
       edge_groups.distinct.filter(t => t._1 != t._2),
     )
   }
+
+  private def find_fitting_objects(
+      program: Node[G],
+      vars: Set[ConcreteVariable[G]],
+  ): Map[ConcreteVariable[G], Expr[G]] = {
+    var m: Map[ConcreteVariable[G], Expr[G]] = Map.empty[ConcreteVariable[G], Expr[G]]
+
+    for (v <- vars) {
+      v match {
+        case IndexedVariable(f, _) => m += (v -> find_field_object(program, f))
+        case FieldVariable(f) => m += (v -> find_field_object(program, f))
+        case SizeVariable(f) => m += (v -> find_field_object(program, f))
+        case LocalVariable(f) => m += (v -> AmbiguousThis()(f.o))
+      }
+    }
+
+    m
+  }
+
+  private def find_field_object(program: Node[G], field: InstanceField[G]): Expr[G] = ???
 }
diff --git a/src/rewrite/vct/rewrite/rasi/StaticScanner.scala b/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
index c10c759fc2..9f3f94d0fb 100644
--- a/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
+++ b/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
@@ -66,8 +66,8 @@ class StaticScanner[G](initial_node: CFGNode[G], state: AbstractState[G]) {
       // If it is a collection, an update might only change other indices than those tracked
       // Therefore: evaluate the assignment explicitly to see if it affects the tracked variables      TODO: Consider arrays
       case _: TSeq[_] =>
-        state.to_expression != state.with_updated_collection(target, value)
-          .to_expression
+        state.to_expression(None) !=
+          state.with_updated_collection(target, value).to_expression(None)
     }
   }
 
@@ -77,7 +77,8 @@ class StaticScanner[G](initial_node: CFGNode[G], state: AbstractState[G]) {
     if (potential_successor.successors.size != 1)
       true
     else
-      state.to_expression != potential_successor.successors.head.to_expression
+      state.to_expression(None) !=
+        potential_successor.successors.head.to_expression(None)
   }
 
   private def postcondition_changes_vars(
@@ -89,10 +90,7 @@ class StaticScanner[G](initial_node: CFGNode[G], state: AbstractState[G]) {
     if (potential_successor.successors.size != 1)
       true
     else
-      state.to_expression != potential_successor.successors.head.to_expression
-  }
-
-  def scan_for_important_variables: Set[ConcreteVariable[G]] = {
-    ???
+      state.to_expression(None) !=
+        potential_successor.successors.head.to_expression(None)
   }
 }
diff --git a/src/rewrite/vct/rewrite/rasi/UncertainValue.scala b/src/rewrite/vct/rewrite/rasi/UncertainValue.scala
index 3b2d0e1510..b0e79eee9e 100644
--- a/src/rewrite/vct/rewrite/rasi/UncertainValue.scala
+++ b/src/rewrite/vct/rewrite/rasi/UncertainValue.scala
@@ -309,6 +309,7 @@ case class UncertainSequence(
       )
     )
       return UncertainBooleanValue.from(false)
+
     val length: Option[Int] = len.try_to_resolve()
     val other_length: Option[Int] = other.len.try_to_resolve()
     if (
diff --git a/src/rewrite/vct/rewrite/rasi/Utils.scala b/src/rewrite/vct/rewrite/rasi/Utils.scala
index 23bb142896..d68e1ff806 100644
--- a/src/rewrite/vct/rewrite/rasi/Utils.scala
+++ b/src/rewrite/vct/rewrite/rasi/Utils.scala
@@ -201,7 +201,7 @@ case object Utils {
         node_names,
         edges,
         w,
-        states.head.to_expression.toInlineString.length > 100,
+        states.head.to_expression(None).toInlineString.length > 100,
       )
     )
   }
@@ -218,9 +218,9 @@ case object Utils {
         if (shorten_labels)
           t._2
         else
-          t._1.to_expression.toInlineString
+          t._1.to_expression(None).toInlineString
       ).append(s"${"\""}];${if (shorten_labels)
-          s" /* ${t._1.to_expression.toInlineString} */"
+          s" /* ${t._1.to_expression(None).toInlineString} */"
         else
           ""}\n")
     )

From 55b5407e8b14a7495b0fc9ef9a6f0d2f30a0cda9 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Fri, 7 Jun 2024 14:37:34 +0200
Subject: [PATCH 12/23] Added textual output option for RASI

---
 src/main/vct/main/stages/GenerateRASI.scala   | 22 +++-----
 src/main/vct/main/stages/Output.scala         |  2 +-
 .../vct/rewrite/rasi/RASIGenerator.scala      | 52 ++++++++++++++++---
 3 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/main/vct/main/stages/GenerateRASI.scala b/src/main/vct/main/stages/GenerateRASI.scala
index 0765c657fc..573dfe54d4 100644
--- a/src/main/vct/main/stages/GenerateRASI.scala
+++ b/src/main/vct/main/stages/GenerateRASI.scala
@@ -1,22 +1,12 @@
 package vct.main.stages
 
 import hre.stages.Stage
-import vct.col.ast.{
-  Expr,
-  InstanceField,
-  InstanceMethod,
-  InstancePredicate,
-  Node,
-}
+import vct.col.ast.{Expr, InstanceField, InstanceMethod, InstancePredicate, Node, Predicate, Program, Verification, VerificationContext}
+import vct.col.origin.{LabelContext, Origin, PreferredName}
+import vct.col.print.Ctx
 import vct.col.rewrite.Generation
 import vct.options.Options
-import vct.rewrite.rasi.{
-  ConcreteVariable,
-  FieldVariable,
-  IndexedVariable,
-  RASIGenerator,
-  SizeVariable,
-}
+import vct.rewrite.rasi.{ConcreteVariable, FieldVariable, IndexedVariable, RASIGenerator, SizeVariable}
 
 import java.nio.file.Path
 
@@ -55,6 +45,10 @@ case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
     } else {
       val rasi: Expr[Generation] = new RASIGenerator()
         .execute(main_method, variables, parameter_invariant, in)
+      implicit val o: Origin = Origin(Seq(LabelContext("rasi-generation"))).withContent(PreferredName(Seq("reachable_abstract_states_invariant")))
+      val predicate: Predicate[Generation] = new Predicate(Seq(), Some(rasi))
+      val verification: Verification[Generation] = Verification(Seq(VerificationContext(Program(Seq(predicate))(o))), Seq())
+      Output(Some(out), Ctx.PVL, false).run(verification)
     }
   }
 
diff --git a/src/main/vct/main/stages/Output.scala b/src/main/vct/main/stages/Output.scala
index d6ede629b6..e98cdc416c 100644
--- a/src/main/vct/main/stages/Output.scala
+++ b/src/main/vct/main/stages/Output.scala
@@ -91,7 +91,7 @@ case class Output(out: Option[Path], syntax: Ctx.Syntax, splitDecls: Boolean)
         val buf = new StringBuffer()
         in.write(buf)(ctx)
         val path = s"unknown.${extension(syntax)}"
-        Seq(LiteralReadable(buf.toString, path))
+        Seq(LiteralReadable(path, buf.toString))
       }
 
     (out, txts) match {
diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index 6c3f4daac6..7db65c9da9 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -1,7 +1,19 @@
 package vct.rewrite.rasi
 
 import com.typesafe.scalalogging.LazyLogging
-import vct.col.ast.{AmbiguousThis, Deref, Expr, InstanceField, InstanceMethod, InstancePredicate, Node, Null, Or}
+import vct.col.ast.{
+  AmbiguousThis,
+  Class,
+  Deref,
+  Expr,
+  InstanceField,
+  InstanceMethod,
+  InstancePredicate,
+  Node,
+  Null,
+  Or,
+  TClass,
+}
 import vct.col.origin.Origin
 import vct.rewrite.cfg.{CFGEntry, CFGGenerator}
 
@@ -221,13 +233,24 @@ class RASIGenerator[G] extends LazyLogging {
       program: Node[G],
       vars: Set[ConcreteVariable[G]],
   ): Map[ConcreteVariable[G], Expr[G]] = {
-    var m: Map[ConcreteVariable[G], Expr[G]] = Map.empty[ConcreteVariable[G], Expr[G]]
+    var m: Map[ConcreteVariable[G], Expr[G]] = Map
+      .empty[ConcreteVariable[G], Expr[G]]
+
+    val classes: Seq[Class[G]] = program.transSubnodes.collect[Class[G]] {
+      case c: Class[G] => c
+    }
+    // TODO: Find differently, e.g. with lock invariant?
+    val main_class: Class[G] =
+      classes.find(c => c.o.getPreferredName.get.camel.startsWith("main")).get
 
     for (v <- vars) {
       v match {
-        case IndexedVariable(f, _) => m += (v -> find_field_object(program, f))
-        case FieldVariable(f) => m += (v -> find_field_object(program, f))
-        case SizeVariable(f) => m += (v -> find_field_object(program, f))
+        case IndexedVariable(f, _) =>
+          m += (v -> find_field_object(classes, main_class, f))
+        case FieldVariable(f) =>
+          m += (v -> find_field_object(classes, main_class, f))
+        case SizeVariable(f) =>
+          m += (v -> find_field_object(classes, main_class, f))
         case LocalVariable(f) => m += (v -> AmbiguousThis()(f.o))
       }
     }
@@ -235,5 +258,22 @@ class RASIGenerator[G] extends LazyLogging {
     m
   }
 
-  private def find_field_object(program: Node[G], field: InstanceField[G]): Expr[G] = ???
+  private def find_field_object(
+      classes: Seq[Class[G]],
+      main: Class[G],
+      field: InstanceField[G],
+  ): Expr[G] = {
+    val type_class: Class[G] = classes.find(c => c.decls.contains(field)).get
+    if (type_class == main)
+      return AmbiguousThis()(field.o)
+
+    val obj: InstanceField[G] =
+      main.decls.collectFirst {
+        case f: InstanceField[G]
+          if f.t.isInstanceOf[TClass[G]] &&
+            f.t.asInstanceOf[TClass[G]].cls.decl == type_class =>
+          f
+      }.get
+    Deref[G](AmbiguousThis()(field.o), obj.ref)(field.o)(field.o)
+  }
 }

From 596f073aa27544cfe910a501e32a1dc45ea72b5f Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Fri, 7 Jun 2024 15:08:34 +0200
Subject: [PATCH 13/23] Fixed variable naming for RASI output

---
 src/main/vct/main/stages/GenerateRASI.scala | 59 ++++++++++++++++++---
 1 file changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/main/vct/main/stages/GenerateRASI.scala b/src/main/vct/main/stages/GenerateRASI.scala
index 573dfe54d4..fc5906467a 100644
--- a/src/main/vct/main/stages/GenerateRASI.scala
+++ b/src/main/vct/main/stages/GenerateRASI.scala
@@ -1,14 +1,35 @@
 package vct.main.stages
 
+import com.typesafe.scalalogging.LazyLogging
+import hre.io.LiteralReadable
 import hre.stages.Stage
-import vct.col.ast.{Expr, InstanceField, InstanceMethod, InstancePredicate, Node, Predicate, Program, Verification, VerificationContext}
+import vct.col.ast.{
+  Declaration,
+  Deref,
+  Expr,
+  InstanceField,
+  InstanceMethod,
+  InstancePredicate,
+  Node,
+  Predicate,
+  Program,
+  Verification,
+  VerificationContext,
+}
 import vct.col.origin.{LabelContext, Origin, PreferredName}
 import vct.col.print.Ctx
 import vct.col.rewrite.Generation
 import vct.options.Options
-import vct.rewrite.rasi.{ConcreteVariable, FieldVariable, IndexedVariable, RASIGenerator, SizeVariable}
+import vct.rewrite.rasi.{
+  ConcreteVariable,
+  FieldVariable,
+  IndexedVariable,
+  RASIGenerator,
+  SizeVariable,
+}
 
-import java.nio.file.Path
+import java.nio.charset.StandardCharsets
+import java.nio.file.{Files, Path}
 
 case object GenerateRASI {
   def ofOptions(options: Options): Stage[Node[_ <: Generation], Unit] = {
@@ -21,7 +42,7 @@ case object GenerateRASI {
 }
 
 case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
-    extends Stage[Node[_ <: Generation], Unit] {
+    extends Stage[Node[_ <: Generation], Unit] with LazyLogging {
 
   override def friendlyName: String =
     "Generate reachable abstract states invariant"
@@ -45,13 +66,37 @@ case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
     } else {
       val rasi: Expr[Generation] = new RASIGenerator()
         .execute(main_method, variables, parameter_invariant, in)
-      implicit val o: Origin = Origin(Seq(LabelContext("rasi-generation"))).withContent(PreferredName(Seq("reachable_abstract_states_invariant")))
+      implicit val o: Origin = Origin(Seq(LabelContext("rasi-generation")))
+        .withContent(PreferredName(Seq("reachable_abstract_states_invariant")))
       val predicate: Predicate[Generation] = new Predicate(Seq(), Some(rasi))
-      val verification: Verification[Generation] = Verification(Seq(VerificationContext(Program(Seq(predicate))(o))), Seq())
-      Output(Some(out), Ctx.PVL, false).run(verification)
+      val verification: Verification[Generation] = Verification(
+        Seq(VerificationContext(Program(Seq(predicate))(o))),
+        Seq(),
+      )
+
+      val name_map: Map[Declaration[_], String] = Map
+        .from(rasi.transSubnodes.collect { case Deref(_, ref) =>
+          ref.decl -> ref.decl.o.getPreferredName.get.snake
+        })
+      print(verification, name_map)
     }
   }
 
+  private def print(
+      in: Verification[_ <: Generation],
+      name_map: Map[Declaration[_], String],
+  ): Unit = {
+    val ctx = Ctx(syntax = Ctx.PVL, names = name_map)
+
+    val buf = new StringBuffer()
+    in.write(buf)(ctx)
+    val path = s"unknown.pvl"
+    val txt = LiteralReadable(path, buf.toString)
+
+    logger.info(s"Writing ${txt.fileName} to $out")
+    Files.write(out, txt.data.getBytes(StandardCharsets.UTF_8))
+  }
+
   private def resolve_variable(
       in: Node[Generation],
       name: String,

From d1da31d29f971af3f6ef7cec285abd2d35d2b782 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Mon, 10 Jun 2024 15:06:00 +0200
Subject: [PATCH 14/23] Replaced 'main' method by vesuv entry point; did some
 cleanup

---
 src/main/vct/main/modes/VeSUV.scala           |  4 ++-
 src/main/vct/main/stages/GenerateRASI.scala   | 34 +++++--------------
 src/main/vct/main/stages/PrintCFG.scala       |  7 ++--
 .../vct/rewrite/cfg/CFGGenerator.scala        |  2 +-
 src/rewrite/vct/rewrite/cfg/CFGPrinter.scala  |  4 +--
 src/rewrite/vct/rewrite/cfg/Index.scala       |  4 +--
 .../vct/rewrite/rasi/RASIGenerator.scala      | 18 ++--------
 .../vct/rewrite/rasi/StaticScanner.scala      |  2 --
 8 files changed, 23 insertions(+), 52 deletions(-)

diff --git a/src/main/vct/main/modes/VeSUV.scala b/src/main/vct/main/modes/VeSUV.scala
index f460b9281a..ae7e4ad3a0 100644
--- a/src/main/vct/main/modes/VeSUV.scala
+++ b/src/main/vct/main/modes/VeSUV.scala
@@ -14,7 +14,9 @@ case object VeSUV extends LazyLogging {
     val stages = Stages
       .vesuvOfOptions(options, ConstantBlameProvider(collector))
     stages.run(options.inputs) match {
-      case Left(_: UserError) => EXIT_CODE_ERROR
+      case Left(err: UserError) =>
+        logger.error(err.text)
+        EXIT_CODE_ERROR
       case Left(err: SystemError) => throw err
       case Right(()) =>
         logger.info("Transformation complete")
diff --git a/src/main/vct/main/stages/GenerateRASI.scala b/src/main/vct/main/stages/GenerateRASI.scala
index fc5906467a..7bf8538db9 100644
--- a/src/main/vct/main/stages/GenerateRASI.scala
+++ b/src/main/vct/main/stages/GenerateRASI.scala
@@ -3,30 +3,12 @@ package vct.main.stages
 import com.typesafe.scalalogging.LazyLogging
 import hre.io.LiteralReadable
 import hre.stages.Stage
-import vct.col.ast.{
-  Declaration,
-  Deref,
-  Expr,
-  InstanceField,
-  InstanceMethod,
-  InstancePredicate,
-  Node,
-  Predicate,
-  Program,
-  Verification,
-  VerificationContext,
-}
+import vct.col.ast.{Declaration, Deref, Expr, InstanceField, InstanceMethod, InstancePredicate, Node, Predicate, Procedure, Program, Verification, VerificationContext}
 import vct.col.origin.{LabelContext, Origin, PreferredName}
 import vct.col.print.Ctx
 import vct.col.rewrite.Generation
 import vct.options.Options
-import vct.rewrite.rasi.{
-  ConcreteVariable,
-  FieldVariable,
-  IndexedVariable,
-  RASIGenerator,
-  SizeVariable,
-}
+import vct.rewrite.rasi.{ConcreteVariable, FieldVariable, IndexedVariable, RASIGenerator, SizeVariable}
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Path}
@@ -53,8 +35,8 @@ case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
     val in = in1.asInstanceOf[Node[Generation]]
     val main_method =
       in.transSubnodes.collectFirst {
-        case m: InstanceMethod[_]
-            if m.o.getPreferredName.get.snake.equals("main") =>
+        case m: Procedure[_]
+            if m.vesuv_entry =>
           m
       }.get
     val variables: Set[ConcreteVariable[Generation]] =
@@ -75,8 +57,10 @@ case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
       )
 
       val name_map: Map[Declaration[_], String] = Map
-        .from(rasi.transSubnodes.collect { case Deref(_, ref) =>
-          ref.decl -> ref.decl.o.getPreferredName.get.snake
+        .from(rasi.transSubnodes.collect {
+          case Deref(_, ref) =>
+            ref.decl -> ref.decl.o.getPreferredName.get.snake
+          case p: Predicate[_] => p -> p.o.getPreferredName.get.snake
         })
       print(verification, name_map)
     }
@@ -90,7 +74,7 @@ case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
 
     val buf = new StringBuffer()
     in.write(buf)(ctx)
-    val path = s"unknown.pvl"
+    val path = s"invariant.pvl"
     val txt = LiteralReadable(path, buf.toString)
 
     logger.info(s"Writing ${txt.fileName} to $out")
diff --git a/src/main/vct/main/stages/PrintCFG.scala b/src/main/vct/main/stages/PrintCFG.scala
index 54bf7f7eeb..86b058f37f 100644
--- a/src/main/vct/main/stages/PrintCFG.scala
+++ b/src/main/vct/main/stages/PrintCFG.scala
@@ -1,7 +1,7 @@
 package vct.main.stages
 
 import hre.stages.Stage
-import vct.col.ast.{InstanceMethod, Node}
+import vct.col.ast.{Node, Procedure}
 import vct.col.rewrite.Generation
 import vct.options.Options
 import vct.rewrite.cfg.CFGPrinter
@@ -21,11 +21,10 @@ case class PrintCFG(out: Path) extends Stage[Node[_ <: Generation], Unit] {
   override def progressWeight: Int = 0
 
   override def run(in1: Node[_ <: Generation]): Unit = {
-    // TODO: Is there a better way to find a "main" method?
     val main_method =
       in1.transSubnodes.collectFirst {
-        case m: InstanceMethod[_]
-            if m.o.getPreferredName.get.snake.equals("main") =>
+        case m: Procedure[_]
+            if m.vesuv_entry =>
           m
       }.get
     CFGPrinter().print_ast_as_cfg(main_method, out)
diff --git a/src/rewrite/vct/rewrite/cfg/CFGGenerator.scala b/src/rewrite/vct/rewrite/cfg/CFGGenerator.scala
index dde1a2bdaa..057265a3d4 100644
--- a/src/rewrite/vct/rewrite/cfg/CFGGenerator.scala
+++ b/src/rewrite/vct/rewrite/cfg/CFGGenerator.scala
@@ -14,7 +14,7 @@ case class CFGGenerator[G]() extends LazyLogging {
   private val converted_nodes: mutable.Map[GlobalIndex[G], CFGNode[G]] = mutable
     .HashMap[GlobalIndex[G], CFGNode[G]]()
 
-  def generate(entry: InstanceMethod[G]): CFGNode[G] = {
+  def generate(entry: Procedure[G]): CFGNode[G] = {
     logger.info("Generating control flow graph")
     val res = convert(
       entry.body.get,
diff --git a/src/rewrite/vct/rewrite/cfg/CFGPrinter.scala b/src/rewrite/vct/rewrite/cfg/CFGPrinter.scala
index 27becbc769..112f18efd7 100644
--- a/src/rewrite/vct/rewrite/cfg/CFGPrinter.scala
+++ b/src/rewrite/vct/rewrite/cfg/CFGPrinter.scala
@@ -1,7 +1,7 @@
 package vct.rewrite.cfg
 
 import hre.io.RWFile
-import vct.col.ast.{BooleanValue, Expr, InstanceMethod}
+import vct.col.ast.{BooleanValue, Expr, Procedure}
 import vct.col.origin.Origin
 
 import java.io.Writer
@@ -33,7 +33,7 @@ case class CFGPrinter[G]() {
     writer.append("}")
   }
 
-  def print_ast_as_cfg(entry_point: InstanceMethod[G], path: Path): Unit = {
+  def print_ast_as_cfg(entry_point: Procedure[G], path: Path): Unit = {
     val cfg_root: CFGNode[G] = CFGGenerator().generate(entry_point)
     find_all_nodes(cfg_root)
     RWFile(path).write(w => print_cfg(w))
diff --git a/src/rewrite/vct/rewrite/cfg/Index.scala b/src/rewrite/vct/rewrite/cfg/Index.scala
index b002900d1a..e0181baba6 100644
--- a/src/rewrite/vct/rewrite/cfg/Index.scala
+++ b/src/rewrite/vct/rewrite/cfg/Index.scala
@@ -158,7 +158,7 @@ sealed trait Index[G] {
 object Index {
   def from[G](node: Node[G], index: Int): Index[G] =
     node match {
-      case instance_method: InstanceMethod[G] => InitialIndex(instance_method)
+      case procedure: Procedure[G] => InitialIndex(procedure)
       case run_method: RunMethod[G] => RunMethodIndex(run_method)
       case assign: Assign[G] => AssignmentIndex(assign, index)
       case pvl_branch: PVLBranch[G] => PVLBranchIndex(pvl_branch, index)
@@ -209,7 +209,7 @@ object Index {
 
 // TODO: Handle contract assertions for InitialIndex, RunMethodIndex, FramedProof, RangedForIndex, ???
 
-case class InitialIndex[G](instance_method: InstanceMethod[G])
+case class InitialIndex[G](instance_method: Procedure[G])
     extends Index[G] {
   override def make_step(): Set[(NextIndex[G], Option[Expr[G]])] =
     Set((Outgoing(), None))
diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index 7db65c9da9..b1a8e6e904 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -1,19 +1,7 @@
 package vct.rewrite.rasi
 
 import com.typesafe.scalalogging.LazyLogging
-import vct.col.ast.{
-  AmbiguousThis,
-  Class,
-  Deref,
-  Expr,
-  InstanceField,
-  InstanceMethod,
-  InstancePredicate,
-  Node,
-  Null,
-  Or,
-  TClass,
-}
+import vct.col.ast.{AmbiguousThis, Class, Deref, Expr, InstanceField, InstanceMethod, InstancePredicate, Node, Null, Or, Procedure, TClass}
 import vct.col.origin.Origin
 import vct.rewrite.cfg.{CFGEntry, CFGGenerator}
 
@@ -30,7 +18,7 @@ class RASIGenerator[G] extends LazyLogging {
     .ArrayBuffer()
 
   def execute(
-      entry_point: InstanceMethod[G],
+      entry_point: Procedure[G],
       vars: Set[ConcreteVariable[G]],
       parameter_invariant: InstancePredicate[G],
       program: Node[G],
@@ -43,7 +31,7 @@ class RASIGenerator[G] extends LazyLogging {
     )
 
   def test(
-      entry_point: InstanceMethod[G],
+      entry_point: Procedure[G],
       vars: Set[ConcreteVariable[G]],
       parameter_invariant: InstancePredicate[G],
       out_path: Path,
diff --git a/src/rewrite/vct/rewrite/rasi/StaticScanner.scala b/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
index 9f3f94d0fb..a52db0699b 100644
--- a/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
+++ b/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
@@ -8,8 +8,6 @@ import scala.collection.mutable
 class StaticScanner[G](initial_node: CFGNode[G], state: AbstractState[G]) {
   private val var_change_explored_nodes: mutable.Set[CFGEntry[G]] = mutable.Set
     .empty[CFGEntry[G]]
-  private val find_var_explored_nodes: mutable.Set[CFGEntry[G]] = mutable.Set
-    .empty[CFGEntry[G]]
 
   def scan_can_change_variables(until: Option[CFGNode[G]]): Boolean = {
     if (until.nonEmpty)

From 299da95c00780101fc4a63838c22fb91db21e23a Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Mon, 10 Jun 2024 16:11:31 +0200
Subject: [PATCH 15/23] Fixed treatment of min_advance; fixed error with
 changing process detection

---
 src/main/vct/main/stages/GenerateRASI.scala       |  2 +-
 .../systemctocol/engine/MainTransformer.java      |  4 ++--
 src/rewrite/vct/rewrite/rasi/AbstractState.scala  | 15 +++++++++++++++
 src/rewrite/vct/rewrite/rasi/StaticScanner.scala  |  4 ++--
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/vct/main/stages/GenerateRASI.scala b/src/main/vct/main/stages/GenerateRASI.scala
index 7bf8538db9..24d472c8a3 100644
--- a/src/main/vct/main/stages/GenerateRASI.scala
+++ b/src/main/vct/main/stages/GenerateRASI.scala
@@ -57,7 +57,7 @@ case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
       )
 
       val name_map: Map[Declaration[_], String] = Map
-        .from(rasi.transSubnodes.collect {
+        .from(predicate.transSubnodes.collect {
           case Deref(_, ref) =>
             ref.decl -> ref.decl.o.getPreferredName.get.snake
           case p: Predicate[_] => p -> p.o.getPreferredName.get.snake
diff --git a/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java b/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java
index 515a4295e9..95b9e4da66 100644
--- a/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java
+++ b/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java
@@ -1100,8 +1100,8 @@ private Statement<T> create_scheduler_loop_if_body() {
                 col_system.NO_EXPRS, col_system.NO_TYPES, col_system.NO_GIVEN, col_system.NO_YIELDS, new GeneratedBlame<>(), OriGen.create());
         Assign<T> assign_ma = new Assign<>(ma_local, fma_invoke, new GeneratedBlame<>(), OriGen.create());
 
-        // Set min_advance to zero if it is -1
-        Eq<T> cond = new Eq<>(ma_local, col_system.MINUS_ONE, OriGen.create());
+        // Set min_advance to zero if it is less than or equal to -1
+        LessEq<T> cond = new LessEq<>(ma_local, col_system.MINUS_ONE, OriGen.create());
         Assign<T> reset_ma = new Assign<>(ma_local, col_system.ZERO, new GeneratedBlame<>(), OriGen.create());
         java.util.List<Tuple2<Expr<T>, Statement<T>>> branches = java.util.List.of(new Tuple2<>(cond, reset_ma));
         Branch<T> cond_reset_ma = new Branch<>(List.from(CollectionConverters.asScala(branches)), OriGen.create());
diff --git a/src/rewrite/vct/rewrite/rasi/AbstractState.scala b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
index d32e675144..a464ce489a 100644
--- a/src/rewrite/vct/rewrite/rasi/AbstractState.scala
+++ b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
@@ -25,6 +25,21 @@ case class AbstractState[G](
     )
   }
 
+  /** Returns a state with the same tracked variables, but with no knowledge of
+    * their values.
+    *
+    * @return
+    *   A copy of this state with all variable values perfectly uncertain
+    */
+  def reset: AbstractState[G] = {
+    AbstractState(
+      valuations.map(v => v._1 -> UncertainValue.uncertain_of(v._1.t)),
+      processes,
+      lock,
+      parameters,
+    )
+  }
+
   /** Updates the state by changing the program counter for a process.
     *
     * @param process
diff --git a/src/rewrite/vct/rewrite/rasi/StaticScanner.scala b/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
index a52db0699b..9dbd608c17 100644
--- a/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
+++ b/src/rewrite/vct/rewrite/rasi/StaticScanner.scala
@@ -64,8 +64,8 @@ class StaticScanner[G](initial_node: CFGNode[G], state: AbstractState[G]) {
       // If it is a collection, an update might only change other indices than those tracked
       // Therefore: evaluate the assignment explicitly to see if it affects the tracked variables      TODO: Consider arrays
       case _: TSeq[_] =>
-        state.to_expression(None) !=
-          state.with_updated_collection(target, value).to_expression(None)
+        state.reset.to_expression(None) !=
+          state.reset.with_updated_collection(target, value).to_expression(None)
     }
   }
 

From 4c823fbfdfed19a6e58b08f273d90f4fb7d7c352 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Sun, 23 Jun 2024 15:04:08 +0200
Subject: [PATCH 16/23] Add option for splitting RASI

---
 src/main/vct/main/stages/GenerateRASI.scala | 33 ++++++++++++++++-----
 src/main/vct/options/Options.scala          |  6 ++++
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/main/vct/main/stages/GenerateRASI.scala b/src/main/vct/main/stages/GenerateRASI.scala
index 24d472c8a3..f38389e1d2 100644
--- a/src/main/vct/main/stages/GenerateRASI.scala
+++ b/src/main/vct/main/stages/GenerateRASI.scala
@@ -3,12 +3,31 @@ package vct.main.stages
 import com.typesafe.scalalogging.LazyLogging
 import hre.io.LiteralReadable
 import hre.stages.Stage
-import vct.col.ast.{Declaration, Deref, Expr, InstanceField, InstanceMethod, InstancePredicate, Node, Predicate, Procedure, Program, Verification, VerificationContext}
+import vct.col.ast.{
+  Declaration,
+  Deref,
+  Expr,
+  InstanceField,
+  InstanceMethod,
+  InstancePredicate,
+  Node,
+  Predicate,
+  Procedure,
+  Program,
+  Verification,
+  VerificationContext,
+}
 import vct.col.origin.{LabelContext, Origin, PreferredName}
 import vct.col.print.Ctx
 import vct.col.rewrite.Generation
 import vct.options.Options
-import vct.rewrite.rasi.{ConcreteVariable, FieldVariable, IndexedVariable, RASIGenerator, SizeVariable}
+import vct.rewrite.rasi.{
+  ConcreteVariable,
+  FieldVariable,
+  IndexedVariable,
+  RASIGenerator,
+  SizeVariable,
+}
 
 import java.nio.charset.StandardCharsets
 import java.nio.file.{Files, Path}
@@ -17,13 +36,14 @@ case object GenerateRASI {
   def ofOptions(options: Options): Stage[Node[_ <: Generation], Unit] = {
     GenerateRASI(
       options.vesuvRasiVariables,
+      options.vesuvRasiSplitVariables,
       options.vesuvOutput,
       test = options.vesuvRasiTest,
     )
   }
 }
 
-case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
+case class GenerateRASI(vars: Option[Seq[String]], split: Option[Seq[String]], out: Path, test: Boolean)
     extends Stage[Node[_ <: Generation], Unit] with LazyLogging {
 
   override def friendlyName: String =
@@ -35,9 +55,7 @@ case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
     val in = in1.asInstanceOf[Node[Generation]]
     val main_method =
       in.transSubnodes.collectFirst {
-        case m: Procedure[_]
-            if m.vesuv_entry =>
-          m
+        case m: Procedure[_] if m.vesuv_entry => m
       }.get
     val variables: Set[ConcreteVariable[Generation]] =
       vars.getOrElse(Seq()).map(s => resolve_variable(in, s)).toSet
@@ -50,7 +68,8 @@ case class GenerateRASI(vars: Option[Seq[String]], out: Path, test: Boolean)
         .execute(main_method, variables, parameter_invariant, in)
       implicit val o: Origin = Origin(Seq(LabelContext("rasi-generation")))
         .withContent(PreferredName(Seq("reachable_abstract_states_invariant")))
-      val predicate: Predicate[Generation] = new Predicate(Seq(), Some(rasi))
+      val predicate: Predicate[Generation] =
+        new Predicate(Seq(), Some(rasi), threadLocal = false, inline = true)
       val verification: Verification[Generation] = Verification(
         Seq(VerificationContext(Program(Seq(predicate))(o))),
         Seq(),
diff --git a/src/main/vct/options/Options.scala b/src/main/vct/options/Options.scala
index a6e00786f9..ff0c8edbe7 100644
--- a/src/main/vct/options/Options.scala
+++ b/src/main/vct/options/Options.scala
@@ -335,6 +335,11 @@ case object Options {
               .text(
                 "[WIP] Preliminary selection mechanism for RASI variables; might be replaced later"
               ),
+            opt[Seq[String]]("split-rasi").valueName("<var1>,...")
+              .action((vars, c) => c.copy(vesuvRasiSplitVariables = Some(vars)))
+              .text(
+                "[WIP] Preliminary selection mechanism for localizing the RASI based on certain variables; might be changed later"
+              ),
           ),
       ),
       note(""),
@@ -450,6 +455,7 @@ case class Options(
     vesuvGenerateRasi: Boolean = false,
     vesuvRasiTest: Boolean = false,
     vesuvRasiVariables: Option[Seq[String]] = None,
+    vesuvRasiSplitVariables: Option[Seq[String]] = None,
 
     // Control flow graph options
     cfgOutput: Path = null,

From c329300e010523cfec5ac82d9442f5a87ee57c90 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Sun, 23 Jun 2024 22:47:50 +0200
Subject: [PATCH 17/23] Enabled printing multiple RASIs

---
 src/main/vct/main/stages/GenerateRASI.scala   | 51 ++++++++----
 .../vct/rewrite/rasi/ConcreteVariable.scala   | 26 ++++++
 .../vct/rewrite/rasi/RASIGenerator.scala      | 79 +++++++++++++++++--
 3 files changed, 133 insertions(+), 23 deletions(-)

diff --git a/src/main/vct/main/stages/GenerateRASI.scala b/src/main/vct/main/stages/GenerateRASI.scala
index eb9063918a..ad2e8e91f7 100644
--- a/src/main/vct/main/stages/GenerateRASI.scala
+++ b/src/main/vct/main/stages/GenerateRASI.scala
@@ -43,8 +43,12 @@ case object GenerateRASI {
   }
 }
 
-case class GenerateRASI(vars: Option[Seq[String]], split: Option[Seq[String]], out: Path, test: Boolean)
-    extends Stage[Node[_ <: Generation], Unit] with LazyLogging {
+case class GenerateRASI(
+    vars: Option[Seq[String]],
+    split: Option[Seq[String]],
+    out: Path,
+    test: Boolean,
+) extends Stage[Node[_ <: Generation], Unit] with LazyLogging {
 
   override def friendlyName: String =
     "Generate reachable abstract states invariant"
@@ -54,37 +58,52 @@ case class GenerateRASI(vars: Option[Seq[String]], split: Option[Seq[String]], o
   override def run(in1: Node[_ <: Generation]): Unit = {
     val in = in1.asInstanceOf[Node[Generation]]
     val main_method =
-      in.collectFirst {
-        case m: Procedure[_] if m.vesuv_entry => m
-      }.get
+      in.collectFirst { case m: Procedure[_] if m.vesuv_entry => m }.get
     val variables: Set[ConcreteVariable[Generation]] =
       vars.getOrElse(Seq()).map(s => resolve_variable(in, s)).toSet
+    val split_on_variables: Option[Set[ConcreteVariable[Generation]]] = split
+      .map(seq => seq.map(s => resolve_variable(in, s)).toSet)
     val parameter_invariant: InstancePredicate[Generation] =
       get_parameter_invariant(in)
     if (test) {
       new RASIGenerator().test(main_method, variables, parameter_invariant, out)
     } else {
-      val rasi: Expr[Generation] = new RASIGenerator()
-        .execute(main_method, variables, parameter_invariant, in)
+      val rasis: Seq[(String, Expr[Generation])] = new RASIGenerator().execute(
+        main_method,
+        variables,
+        split_on_variables,
+        parameter_invariant,
+        in,
+      )
+      val predicates: Seq[Predicate[Generation]] = rasis
+        .map(t => rasi_predicate(t._1, t._2))
       implicit val o: Origin = Origin(Seq(LabelContext("rasi-generation")))
-        .withContent(PreferredName(Seq("reachable_abstract_states_invariant")))
-      val predicate: Predicate[Generation] =
-        new Predicate(Seq(), Some(rasi), threadLocal = false, inline = true)
       val verification: Verification[Generation] = Verification(
-        Seq(VerificationContext(Program(Seq(predicate))(o))),
+        Seq(VerificationContext(Program(predicates)(o))),
         Seq(),
       )
 
       val name_map: Map[Declaration[_], String] = Map
-        .from(predicate.collect {
-          case Deref(_, ref) =>
-            ref.decl -> ref.decl.o.getPreferredName.get.snake
-          case p: Predicate[_] => p -> p.o.getPreferredName.get.snake
-        })
+        .from(predicates.flatMap(p =>
+          p.collect {
+            case Deref(_, ref) =>
+              ref.decl -> ref.decl.o.getPreferredName.get.snake
+            case p: Predicate[_] => p -> p.o.getPreferredName.get.snake
+          }
+        ))
       print(verification, name_map)
     }
   }
 
+  private def rasi_predicate(
+      name: String,
+      rasi: Expr[Generation],
+  ): Predicate[Generation] = {
+    implicit val o: Origin = Origin(Seq(LabelContext("rasi-generation")))
+      .withContent(PreferredName(Seq(name)))
+    new Predicate(Seq(), Some(rasi), threadLocal = false, inline = true)
+  }
+
   private def print(
       in: Verification[_ <: Generation],
       name_map: Map[Declaration[_], String],
diff --git a/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala b/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala
index ecd3814c9b..41366e61a1 100644
--- a/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala
+++ b/src/rewrite/vct/rewrite/rasi/ConcreteVariable.scala
@@ -68,6 +68,8 @@ sealed trait ConcreteVariable[G] extends ResolvableVariable[G] {
     */
   def to_expression(obj: Option[Expr[G]]): Expr[G]
 
+  def get_declaration: Declaration[G]
+
   protected def field_equals(expr: Expr[G], field: InstanceField[G]): Boolean =
     expr match {
       // TODO: Support other types of expressions? Take object into account?
@@ -98,13 +100,19 @@ sealed trait ConcreteVariable[G] extends ResolvableVariable[G] {
 case class LocalVariable[G](variable: Variable[G]) extends ConcreteVariable[G] {
   override def is(expr: Expr[G], state: AbstractState[G]): Boolean =
     variable_equals(expr, variable)
+
   override def is_contained_by(
       expr: Expr[G],
       state: AbstractState[G],
   ): Boolean = is(expr, state)
+
   override def to_expression(obj: Option[Expr[G]]): Expr[G] =
     Local[G](variable.ref)(variable.o)
+
+  override def get_declaration: Declaration[G] = variable
+
   override def t: Type[G] = variable.t
+
   override def compare(other: ConcreteVariable[G]): Boolean =
     other match {
       case LocalVariable(v) => v.toInlineString > variable.toInlineString
@@ -118,15 +126,21 @@ case class FieldVariable[G](field: InstanceField[G])
     extends ConcreteVariable[G] {
   override def is(expr: Expr[G], state: AbstractState[G]): Boolean =
     field_equals(expr, field)
+
   override def is_contained_by(
       expr: Expr[G],
       state: AbstractState[G],
   ): Boolean = is(expr, state)
+
   override def to_expression(obj: Option[Expr[G]]): Expr[G] =
     Deref[G](obj.getOrElse(AmbiguousThis()(field.o)), field.ref)(field.o)(
       field.o
     )
+
+  override def get_declaration: Declaration[G] = field
+
   override def t: Type[G] = field.t
+
   override def compare(other: ConcreteVariable[G]): Boolean =
     other match {
       case LocalVariable(_) => true
@@ -147,15 +161,21 @@ case class SizeVariable[G](field: InstanceField[G])
       case Size(obj) => field_equals(obj, field)
       case _ => false
     }
+
   override def is_contained_by(
       expr: Expr[G],
       state: AbstractState[G],
   ): Boolean = is(expr, state) || field_equals(expr, field)
+
   override def to_expression(obj: Option[Expr[G]]): Expr[G] =
     Size(Deref[G](obj.getOrElse(AmbiguousThis()(field.o)), field.ref)(field.o)(
       field.o
     ))(field.o)
+
+  override def get_declaration: Declaration[G] = field
+
   override def t: Type[G] = TInt()(field.o)
+
   override def compare(other: ConcreteVariable[G]): Boolean =
     other match {
       case LocalVariable(_) => true
@@ -187,6 +207,7 @@ case class IndexedVariable[G](field: InstanceField[G], i: Int)
           .getOrElse(-1)
       case _ => false
     }
+
   override def is_contained_by(
       expr: Expr[G],
       state: AbstractState[G],
@@ -206,6 +227,7 @@ case class IndexedVariable[G](field: InstanceField[G], i: Int)
           .getOrElse(i - 1) >= i
       case _ => field_equals(expr, field) || is(expr, state)
     }
+
   override def to_expression(obj: Option[Expr[G]]): Expr[G] =
     field.t match {
       case TSeq(_) =>
@@ -230,12 +252,16 @@ case class IndexedVariable[G](field: InstanceField[G], i: Int)
           IntegerValue(i)(field.o),
         )(field.o)(field.o)
     }
+
+  override def get_declaration: Declaration[G] = field
+
   override def t: Type[G] =
     field.t match {
       case TSeq(element) => element
       case TArray(element) => element
       case TPointer(element) => element
     }
+
   override def compare(other: ConcreteVariable[G]): Boolean =
     other match {
       case LocalVariable(_) => true
diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index 35992a5d37..7263ab3fb5 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -3,7 +3,9 @@ package vct.rewrite.rasi
 import com.typesafe.scalalogging.LazyLogging
 import vct.col.ast.{
   AmbiguousThis,
+  BooleanValue,
   Class,
+  Declaration,
   Deref,
   Expr,
   InstanceField,
@@ -15,6 +17,7 @@ import vct.col.ast.{
   TClass,
 }
 import vct.col.origin.Origin
+import vct.col.print.Ctx
 import vct.rewrite.cfg.{CFGEntry, CFGGenerator}
 
 import java.nio.file.Path
@@ -32,12 +35,14 @@ class RASIGenerator[G] extends LazyLogging {
   def execute(
       entry_point: Procedure[G],
       vars: Set[ConcreteVariable[G]],
+      split_on: Option[Set[ConcreteVariable[G]]],
       parameter_invariant: InstancePredicate[G],
       program: Node[G],
-  ): Expr[G] =
+  ): Seq[(String, Expr[G])] =
     generate_rasi(
       CFGGenerator().generate(entry_point),
       vars,
+      split_on,
       parameter_invariant,
       program,
     )
@@ -58,20 +63,80 @@ class RASIGenerator[G] extends LazyLogging {
   private def generate_rasi(
       node: CFGEntry[G],
       vars: Set[ConcreteVariable[G]],
+      split_on: Option[Set[ConcreteVariable[G]]],
       parameter_invariant: InstancePredicate[G],
       program: Node[G],
-  ): Expr[G] = {
+  ): Seq[(String, Expr[G])] = {
     explore(node, vars, parameter_invariant)
-    val distinct_states = found_states.distinctBy(s => s.valuations)
-    logger.debug(s"${distinct_states.size} distinct states found")
+    val distinct: Int = found_states.distinctBy(s => s.valuations).size
+    logger.info(s"$distinct distinct states found")
+
+    if (split_on.isEmpty)
+      return Seq((
+        "reachable_abstract_states_invariant",
+        get_rasi_expression(_ => true, program),
+      ))
+
+    var res: Seq[(String, Expr[G])] = Seq(
+      ("interleaving_states", get_rasi_expression(s => s.lock.isEmpty, program))
+    )
+
+    get_var_value_pairs(split_on.get).foreach(t =>
+      res =
+        res :+
+          (
+            get_rasi_name(t._1, t._2),
+            get_rasi_expression(s => s.valuations(t._1) == t._2, program),
+          )
+    )
+
+    res
+  }
+
+  private def get_rasi_expression(
+      f: AbstractState[G] => Boolean,
+      program: Node[G],
+  ): Expr[G] = {
+    val rasi_states = found_states.filter(f).distinctBy(s => s.valuations)
+
+    if (rasi_states.isEmpty)
+      return BooleanValue(value = false)(program.o)
+
     val objs: Map[ConcreteVariable[G], Expr[G]] = find_fitting_objects(
       program,
-      distinct_states.head.valuations.keySet,
+      rasi_states.head.valuations.keySet,
     )
-    distinct_states.map(s => s.to_expression(Some(objs)))
+    rasi_states.map(s => s.to_expression(Some(objs)))
       .reduce((e1, e2) => Or(e1, e2)(e1.o))
   }
 
+  private def get_var_value_pairs(
+      split_on_vars: Set[ConcreteVariable[G]]
+  ): Set[(ConcreteVariable[G], UncertainValue)] =
+    split_on_vars.flatMap(v => found_states.map(s => v -> s.valuations(v)))
+
+  private def get_rasi_name(
+      variable: ConcreteVariable[G],
+      value: UncertainValue,
+  ): String = {
+    // Compute variable name
+    val name_map: Map[Declaration[_], String] = Map.from(Seq(
+      variable.get_declaration ->
+        variable.get_declaration.o.getPreferredName.get.snake
+    ))
+    implicit val context: Ctx = Ctx(syntax = Ctx.PVL, names = name_map)
+    val var_name: String = variable.to_expression(None).toStringWithContext
+      .replace("]", "").replace("[", "").replace("this.", "")
+
+    // Compute value string
+    val value_string: String = value match {
+      case i: UncertainIntegerValue => i.try_to_resolve().getOrElse(throw new IllegalStateException("Value must be defined")).toString
+      case b: UncertainBooleanValue => b.try_to_resolve().getOrElse(throw new IllegalStateException("Value must be defined")).toString
+    }
+
+    "rasi_" + var_name + "_" + value_string
+  }
+
   private def print_state_space(
       node: CFGEntry[G],
       vars: Set[ConcreteVariable[G]],
@@ -80,7 +145,7 @@ class RASIGenerator[G] extends LazyLogging {
   ): Unit = {
     explore(node, vars, parameter_invariant)
     val (ns, es) = reduce_redundant_states()
-    logger.debug(s"${ns.size} distinct states found")
+    logger.info(s"${ns.size} distinct states found")
     Utils.print(ns, es, out_path)
   }
 

From eca01901b7b0e2dec427a67afe26525e741133bb Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Mon, 24 Jun 2024 14:20:12 +0200
Subject: [PATCH 18/23] Modified scheduler event update mechanism

---
 .../systemctocol/engine/MainTransformer.java  | 85 ++++++++++++++++---
 1 file changed, 75 insertions(+), 10 deletions(-)

diff --git a/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java b/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java
index 95b9e4da66..136e1d95d6 100644
--- a/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java
+++ b/src/parsers/vct/parsers/transform/systemctocol/engine/MainTransformer.java
@@ -115,6 +115,11 @@ public class MainTransformer<T> {
      */
     private InstanceMethod<T> find_minimum_advance;
 
+    /**
+     * Scheduler helper method <code>update_events</code>
+     */
+    private InstanceMethod<T> update_events;
+
     /**
      * Scheduler helper method <code>wakeup_after_wait</code>.
      */
@@ -608,6 +613,7 @@ private void create_helper_methods() {
         immediate_wakeup = create_immediate_wakeup();
         reset_events_no_delta = create_reset_events_no_delta();
         find_minimum_advance = create_find_minimum_advance();
+        update_events = create_update_events();
         wakeup_after_wait = create_wakeup_after_wait();
         reset_all_events = create_reset_all_events();
     }
@@ -809,6 +815,69 @@ private InstanceMethod<T> create_find_minimum_advance() {
                 false, true, new GeneratedBlame<>(), OriGen.create("find_minimum_advance"));
     }
 
+    /**
+     * Creates the abstract helper method <code>update_events</code>. This method takes as a parameter the next time
+     * advance and updates all events based on
+     *
+     * @return An <code>InstanceMethod</code> object encoding the method <code>wakeup_after_wait</code>
+     */
+    private InstanceMethod<T> create_update_events() {
+        // Create parameter
+        Variable<T> param = new Variable<>(col_system.T_INT, OriGen.create("advance"));
+        Ref<T, Variable<T>> param_ref = new DirectRef<>(param, ClassTag$.MODULE$.apply(Variable.class));
+        Local<T> param_deref = new Local<>(param_ref, OriGen.create());
+        List<Variable<T>> params = List.from(CollectionConverters.asScala(java.util.List.of(param)));
+
+        // Create references to the event and process state variables
+        Ref<T, InstanceField<T>> event_state_ref = new DirectRef<>(col_system.get_event_state(), ClassTag$.MODULE$.apply(InstanceField.class));
+        Deref<T> event_state_deref = new Deref<>(col_system.THIS, event_state_ref, new GeneratedBlame<>(), OriGen.create());
+        Ref<T, InstanceField<T>> process_state_ref = new DirectRef<>(col_system.get_process_state(), ClassTag$.MODULE$.apply(InstanceField.class));
+        Deref<T> process_state_deref = new Deref<>(col_system.THIS, process_state_ref, new GeneratedBlame<>(), OriGen.create());
+        Ref<T, InstanceField<T>> prim_update_ref = new DirectRef<>(col_system.get_primitive_channel_update(), ClassTag$.MODULE$.apply(InstanceField.class));
+        Deref<T> prim_update_deref = new Deref<>(col_system.THIS, prim_update_ref, new GeneratedBlame<>(), OriGen.create());
+
+        // Create general permission context
+        Expr<T> context = create_helper_context();
+
+        // Create condition on event state and primitive update sequence
+        Old<T> old_process_state = new Old<>(process_state_deref, Option.empty(), new GeneratedBlame<>(), OriGen.create());
+        Eq<T> event_state_unchanged = new Eq<>(process_state_deref, old_process_state, OriGen.create());
+        Old<T> old_prim_update = new Old<>(prim_update_deref, Option.empty(), new GeneratedBlame<>(), OriGen.create());
+        Eq<T> prim_update_unchanged = new Eq<>(prim_update_deref, old_prim_update, OriGen.create());
+        And<T> unchanged = new And<>(event_state_unchanged, prim_update_unchanged, OriGen.create());
+
+        // Create conditions for the changing state
+        java.util.List<Expr<T>> ensures = new java.util.ArrayList<>();
+        ensures.add(context);
+        ensures.add(unchanged);
+        for(int i = 0; i < col_system.get_total_nr_events(); i++) {
+            // Prepare appropriate sequence accesses
+            SeqSubscript<T> ev_state_i = new SeqSubscript<>(event_state_deref, new IntegerValue<>(BigInt.apply(i), OriGen.create()),
+                    new GeneratedBlame<>(), OriGen.create());
+            Old<T> old_ev_state_i = new Old<>(ev_state_i, Option.empty(), new GeneratedBlame<>(), OriGen.create());
+
+            // Conditions
+            Less<T> event_negative = new Less<>(old_ev_state_i, col_system.MINUS_ONE, OriGen.create());
+            GreaterEq<T> event_positive = new GreaterEq<>(old_ev_state_i, col_system.MINUS_ONE, OriGen.create());
+
+            // Reset (if the event is -2 or -3 before, reset it to -3)
+            Eq<T> event_reset = new Eq<>(ev_state_i, col_system.MINUS_THREE, OriGen.create());
+
+            // Advance (if the event is scheduled before, subtract the given time from it)
+            Minus<T> reduced = new Minus<>(old_ev_state_i, param_deref, OriGen.create());
+            Eq<T> event_reduced = new Eq<>(ev_state_i, reduced, OriGen.create());
+
+            // Add to updates
+            ensures.add(new Implies<>(event_negative, event_reset, OriGen.create()));
+            ensures.add(new Implies<>(event_positive, event_reduced, OriGen.create()));
+        }
+
+        // Generate contract and method and return
+        ApplicableContract<T> contract = col_system.to_applicable_contract(context, col_system.fold_star(ensures));
+        return new InstanceMethod<>(col_system.T_VOID, params, col_system.NO_VARS, col_system.NO_VARS, Option.empty(), contract,
+                false, false, new GeneratedBlame<>(), OriGen.create("update_events"));
+    }
+
     /**
      * Creates the abstract helper method <code>wakeup_after_wait</code>. This method sets the <code>process_state</code>
      * of all processes that are waiting on an event with an <code>event_state</code> of 0 or -1 (i.e. waiting for zero
@@ -1106,15 +1175,10 @@ private Statement<T> create_scheduler_loop_if_body() {
         java.util.List<Tuple2<Expr<T>, Statement<T>>> branches = java.util.List.of(new Tuple2<>(cond, reset_ma));
         Branch<T> cond_reset_ma = new Branch<>(List.from(CollectionConverters.asScala(branches)), OriGen.create());
 
-        // Advance delays in event_state
-        java.util.List<Expr<T>> literal_values = new java.util.ArrayList<>();
-        for (Expr<T> ev_i : event_entries) {
-            Less<T> condition = new Less<>(ev_i, col_system.MINUS_ONE, OriGen.create());
-            Minus<T> minus = new Minus<>(ev_i, ma_local, OriGen.create());
-            literal_values.add(new Select<>(condition, col_system.MINUS_THREE, minus, OriGen.create()));
-        }
-        LiteralSeq<T> reset_literal = new LiteralSeq<>(col_system.T_INT, List.from(CollectionConverters.asScala(literal_values)), OriGen.create());
-        Assign<T> advance_delays = new Assign<>(event_state_deref, reset_literal, new GeneratedBlame<>(), OriGen.create());
+        // Call update_events
+        Ref<T, InstanceMethod<T>> ue_ref = new DirectRef<>(update_events, ClassTag$.MODULE$.apply(InstanceMethod.class));
+        InvokeMethod<T> call_ue = new InvokeMethod<>(col_system.THIS, ue_ref, List.from(CollectionConverters.asScala(java.util.List.of(ma_local))),
+                col_system.NO_EXPRS, col_system.NO_TYPES, col_system.NO_GIVEN, col_system.NO_YIELDS, new GeneratedBlame<>(), OriGen.create());
 
         // Call wakeup_after_wait
         Ref<T, InstanceMethod<T>> waw_ref = new DirectRef<>(wakeup_after_wait, ClassTag$.MODULE$.apply(InstanceMethod.class));
@@ -1127,7 +1191,7 @@ private Statement<T> create_scheduler_loop_if_body() {
                 col_system.NO_TYPES, col_system.NO_GIVEN, col_system.NO_YIELDS, new GeneratedBlame<>(), OriGen.create());
 
         // Put it all together and return
-        java.util.List<Statement<T>> statements = java.util.List.of(update_phase, declare_ma, assign_ma, cond_reset_ma, advance_delays, call_waw, call_rae);
+        java.util.List<Statement<T>> statements = java.util.List.of(update_phase, declare_ma, assign_ma, cond_reset_ma, call_ue, call_waw, call_rae);
         return new Block<>(List.from(CollectionConverters.asScala(statements)), OriGen.create());
     }
 
@@ -1228,6 +1292,7 @@ private void assemble_main() {
         declarations.add(immediate_wakeup);
         declarations.add(reset_events_no_delta);
         declarations.add(find_minimum_advance);
+        declarations.add(update_events);
         declarations.add(wakeup_after_wait);
         declarations.add(reset_all_events);
 

From 33e12d6222070a5d3cebd8c9d723f0a593767801 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Mon, 24 Jun 2024 14:24:59 +0200
Subject: [PATCH 19/23] Remove printing of trivial scales for predicate
 applications

---
 .../ast/expr/apply/InstancePredicateApplyImpl.scala    | 10 +++++++---
 .../vct/col/ast/expr/apply/PredicateApplyImpl.scala    |  8 ++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/col/vct/col/ast/expr/apply/InstancePredicateApplyImpl.scala b/src/col/vct/col/ast/expr/apply/InstancePredicateApplyImpl.scala
index 0af2b57712..06fd1dd640 100644
--- a/src/col/vct/col/ast/expr/apply/InstancePredicateApplyImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/InstancePredicateApplyImpl.scala
@@ -1,6 +1,6 @@
 package vct.col.ast.expr.apply
 
-import vct.col.ast.InstancePredicateApply
+import vct.col.ast.{InstancePredicateApply, WritePerm}
 import vct.col.print.{Ctx, Doc, Group, Precedence, Text}
 import vct.col.ast.ops.InstancePredicateApplyOps
 
@@ -9,7 +9,11 @@ trait InstancePredicateApplyImpl[G] extends InstancePredicateApplyOps[G] {
   override def precedence: Int = Precedence.PREFIX
   override def layout(implicit ctx: Ctx): Doc =
     Group(
-      Text("[") <> perm <> "]" <> obj.bind(Precedence.POSTFIX) <> "." <>
-        ctx.name(ref) <> "(" <> Doc.args(args) <> ")"
+      if (!perm.isInstanceOf[WritePerm[G]])
+        Text("[") <> perm <> "]" <> obj.bind(Precedence.POSTFIX) <> "." <>
+          ctx.name(ref) <> "(" <> Doc.args(args) <> ")"
+      else
+        Text("") <> obj.bind(Precedence.POSTFIX) <> "." <> ctx.name(ref) <>
+          "(" <> Doc.args(args) <> ")"
     )
 }
diff --git a/src/col/vct/col/ast/expr/apply/PredicateApplyImpl.scala b/src/col/vct/col/ast/expr/apply/PredicateApplyImpl.scala
index 52cd8b8c02..92dcb43a80 100644
--- a/src/col/vct/col/ast/expr/apply/PredicateApplyImpl.scala
+++ b/src/col/vct/col/ast/expr/apply/PredicateApplyImpl.scala
@@ -1,6 +1,6 @@
 package vct.col.ast.expr.apply
 
-import vct.col.ast.PredicateApply
+import vct.col.ast.{PredicateApply, WritePerm}
 import vct.col.print.{Ctx, Doc, DocUtil, Empty, Group, Precedence, Text}
 import vct.col.ast.ops.PredicateApplyOps
 
@@ -16,7 +16,11 @@ trait PredicateApplyImpl[G] extends PredicateApplyOps[G] {
 
   def layoutSpec(implicit ctx: Ctx): Doc =
     Group(
-      Text("[") <> perm <> "]" <> ctx.name(ref) <> "(" <> Doc.args(args) <> ")"
+      if (!perm.isInstanceOf[WritePerm[G]])
+        Text("[") <> perm <> "]" <> ctx.name(ref) <> "(" <> Doc.args(args) <>
+          ")"
+      else
+        Text(ctx.name(ref)) <> "(" <> Doc.args(args) <> ")"
     )
 
   override def layout(implicit ctx: Ctx): Doc =

From d7d8972944831309e7492c5189d27efb3893771b Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Tue, 25 Jun 2024 11:44:48 +0200
Subject: [PATCH 20/23] Add handling for member expression

---
 src/rewrite/vct/rewrite/rasi/AbstractState.scala | 1 +
 src/rewrite/vct/rewrite/rasi/RASIGenerator.scala | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/rewrite/vct/rewrite/rasi/AbstractState.scala b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
index a464ce489a..4e977c353b 100644
--- a/src/rewrite/vct/rewrite/rasi/AbstractState.scala
+++ b/src/rewrite/vct/rewrite/rasi/AbstractState.scala
@@ -648,6 +648,7 @@ case class AbstractState[G](
         UncertainBooleanValue.from(true) // TODO: How to handle quantifiers?!
       case Result(_) => UncertainBooleanValue.uncertain()
       case AmbiguousResult() => UncertainBooleanValue.uncertain()
+      case SeqMember(_, _) => UncertainBooleanValue.uncertain() // TODO: Implement something for this?
     }
 
   /** Evaluates a collection expression and returns an uncertain collection
diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index 7263ab3fb5..cee5492628 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -130,8 +130,10 @@ class RASIGenerator[G] extends LazyLogging {
 
     // Compute value string
     val value_string: String = value match {
-      case i: UncertainIntegerValue => i.try_to_resolve().getOrElse(throw new IllegalStateException("Value must be defined")).toString
-      case b: UncertainBooleanValue => b.try_to_resolve().getOrElse(throw new IllegalStateException("Value must be defined")).toString
+      case i: UncertainIntegerValue =>
+        i.try_to_resolve().getOrElse(throw new IllegalStateException("Value must be defined")).toString
+      case b: UncertainBooleanValue =>
+        b.try_to_resolve().getOrElse(throw new IllegalStateException("Value must be defined")).toString
     }
 
     "rasi_" + var_name + "_" + value_string

From a4211558fbc35b9f61a26df3834de79a09f44a61 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Tue, 25 Jun 2024 15:47:35 +0200
Subject: [PATCH 21/23] Added --dev-unsafe-optimization option to sacrifice
 usability for performance

---
 src/main/vct/main/stages/Backend.scala         |  1 +
 src/main/vct/main/stages/Transformation.scala  | 18 +++++++++++++-----
 src/main/vct/options/Options.scala             |  4 ++++
 .../viper/api/backend/silicon/Silicon.scala    |  6 ++++--
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/vct/main/stages/Backend.scala b/src/main/vct/main/stages/Backend.scala
index eccdc2cbdc..dcf00226f9 100644
--- a/src/main/vct/main/stages/Backend.scala
+++ b/src/main/vct/main/stages/Backend.scala
@@ -57,6 +57,7 @@ case object Backend {
               options.siliconPrintQuantifierStats.isDefined,
             reportOnNoProgress = options.devSiliconReportOnNoProgress,
             traceBranchConditions = options.devSiliconTraceBranchConditions,
+            optimizeUnsafe = options.devUnsafeOptimization,
             branchConditionReportInterval =
               options.devSiliconBranchConditionReportInterval,
             options = options.backendFlags,
diff --git a/src/main/vct/main/stages/Transformation.scala b/src/main/vct/main/stages/Transformation.scala
index a9d1230ccd..63272075ed 100644
--- a/src/main/vct/main/stages/Transformation.scala
+++ b/src/main/vct/main/stages/Transformation.scala
@@ -147,6 +147,7 @@ object Transformation extends LazyLogging {
           bipResults = bipResults,
           splitVerificationByProcedure =
             options.devSplitVerificationByProcedure,
+          optimizeUnsafe = options.devUnsafeOptimization,
           veymontGeneratePermissions = options.veymontGeneratePermissions,
         )
     }
@@ -188,10 +189,14 @@ object Transformation extends LazyLogging {
   *   Execute a handler before/after a pass is executed.
   * @param passes
   *   The list of rewrite passes to execute.
+  * @param optimizeUnsafe
+  *   Flag indicating to not do typechecking in-between passes to save
+  *   performance
   */
 class Transformation(
     val onPassEvent: Seq[PassEventHandler],
     val passes: Seq[RewriterBuilder],
+    val optimizeUnsafe: Boolean = false,
 ) extends Stage[Verification[_ <: Generation], Verification[_ <: Generation]]
     with LazyLogging {
   override def friendlyName: String = "Transformation"
@@ -235,11 +240,12 @@ class Transformation(
           action(passes, Transformation.after, pass.key, result)
         }
 
-        result.tasks.map(_.program)
-          .flatMap(program => program.check.map(program -> _)) match {
-          case Nil => // ok
-          case errors => throw TransformationCheckError(pass, errors)
-        }
+        if (!optimizeUnsafe)
+          result.tasks.map(_.program)
+            .flatMap(program => program.check.map(program -> _)) match {
+            case Nil => // ok
+            case errors => throw TransformationCheckError(pass, errors)
+          }
 
         result = PrettifyBlocks().dispatch(result)
       }
@@ -292,6 +298,7 @@ case class SilverTransformation(
     bipResults: BIP.VerificationResults,
     checkSat: Boolean = true,
     splitVerificationByProcedure: Boolean = false,
+    override val optimizeUnsafe: Boolean = false,
     veymontGeneratePermissions: Boolean = false,
 ) extends Transformation(
       onPassEvent,
@@ -431,6 +438,7 @@ case class SilverTransformation(
         PinSilverNodes,
         Explode.withArg(splitVerificationByProcedure),
       ),
+      optimizeUnsafe = optimizeUnsafe,
     )
 
 case class VeyMontImplementationGeneration(
diff --git a/src/main/vct/options/Options.scala b/src/main/vct/options/Options.scala
index ff0c8edbe7..7f4f5f08a1 100644
--- a/src/main/vct/options/Options.scala
+++ b/src/main/vct/options/Options.scala
@@ -244,6 +244,9 @@ case object Options {
         "Indicate, in seconds, the timeout value for the backend verification. If the verification gets stuck " +
           "for longer than this timeout, the verification will timeout."
       ),
+      opt[Unit]("dev-unsafe-optimization").maybeHidden()
+        .action((_, c) => c.copy(devUnsafeOptimization = true))
+        .text("Optimizes runtime at the cost of progress logging and readability of error messages"),
       opt[Path]("dev-silicon-z3-log-file").maybeHidden()
         .action((p, c) => c.copy(devSiliconZ3LogFile = Some(p)))
         .text("Path for z3 to write smt2 log file to"),
@@ -442,6 +445,7 @@ case class Options(
     devSiliconTraceBranchConditions: Boolean = false,
     devCarbonBoogieLogFile: Option[Path] = None,
     devViperProverLogFile: Option[Path] = None,
+    devUnsafeOptimization: Boolean = false,
 
     // VeyMont options
     veymontOutput: Option[Path] = None,
diff --git a/src/viper/viper/api/backend/silicon/Silicon.scala b/src/viper/viper/api/backend/silicon/Silicon.scala
index 0fd0ab0b6e..8235358e97 100644
--- a/src/viper/viper/api/backend/silicon/Silicon.scala
+++ b/src/viper/viper/api/backend/silicon/Silicon.scala
@@ -39,6 +39,7 @@ case class Silicon(
     printQuantifierStatistics: Boolean = false,
     reportOnNoProgress: Boolean = true,
     traceBranchConditions: Boolean = false,
+    optimizeUnsafe: Boolean = false,
     branchConditionReportInterval: Option[Int] = Some(1000),
     timeoutValue: Int = 30,
     totalTimeOut: Int = 0,
@@ -96,8 +97,9 @@ case class Silicon(
       z3Path.toString,
       "--z3ConfigArgs",
       z3Config,
-      "--ideModeAdvanced",
     )
+    if (optimizeUnsafe) siliconConfig ++= Seq("--parallelizeBranches")
+    else siliconConfig ++= Seq("--ideModeAdvanced")
 
     if (proverLogFile.isDefined) {
       // PB: note: enableTempDirectory works unexpectedly: it only enables the logging of smtlib provers and does
@@ -121,7 +123,7 @@ case class Silicon(
     siliconConfig :+= "-"
 
     silicon.parseCommandLine(siliconConfig)
-    silicon.symbExLog = SiliconLogListener(
+    if (!optimizeUnsafe) silicon.symbExLog = SiliconLogListener(
       reportOnNoProgress,
       traceBranchConditions,
       branchConditionReportInterval,

From 806a9f93835ce6742b4e55e546de6baa1fcc1217 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Thu, 27 Jun 2024 16:11:32 +0200
Subject: [PATCH 22/23] When splitting RASI, filter by what the process
 associated with a splitting variable can reach

---
 .../vct/rewrite/rasi/RASIGenerator.scala      | 52 ++++++++++++++-----
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
index cee5492628..5d22fb101c 100644
--- a/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
+++ b/src/rewrite/vct/rewrite/rasi/RASIGenerator.scala
@@ -74,30 +74,53 @@ class RASIGenerator[G] extends LazyLogging {
     if (split_on.isEmpty)
       return Seq((
         "reachable_abstract_states_invariant",
-        get_rasi_expression(_ => true, program),
+        get_rasi_expression(_ => true, None, program),
       ))
 
-    var res: Seq[(String, Expr[G])] = Seq(
-      ("interleaving_states", get_rasi_expression(s => s.lock.isEmpty, program))
-    )
+    val all_processes: Set[AbstractProcess[G]] = found_states.toSet
+      .flatMap((s: AbstractState[G]) => s.processes.keySet)
+
+    var res: Seq[(String, Expr[G])] = Seq((
+      "interleaving_states",
+      get_rasi_expression(s => s.lock.isEmpty, None, program),
+    ))
 
     get_var_value_pairs(split_on.get).foreach(t =>
       res =
         res :+
           (
             get_rasi_name(t._1, t._2),
-            get_rasi_expression(s => s.valuations(t._1) == t._2, program),
+            get_rasi_expression(
+              s => s.valuations(t._1) == t._2,
+              Some(get_associated_process(t._1, all_processes)),
+              program,
+            ),
           )
     )
 
     res
   }
 
+  private def get_associated_process(
+      of: ConcreteVariable[G],
+      from: Set[AbstractProcess[G]],
+  ): AbstractProcess[G] = {
+    from.filter(p => p.obj.t.isInstanceOf[TClass[G]]).collectFirst {
+      case p @ AbstractProcess(obj)
+          if obj.t.asInstanceOf[TClass[G]].cls.decl.decls
+            .contains(of.get_declaration) =>
+        p
+    }.get
+  }
+
   private def get_rasi_expression(
       f: AbstractState[G] => Boolean,
+      proc: Option[AbstractProcess[G]],
       program: Node[G],
   ): Expr[G] = {
-    val rasi_states = found_states.filter(f).distinctBy(s => s.valuations)
+    val rasi_states = found_states.filter(f)
+      .filter(s => proc.isEmpty || s.lock.isEmpty || s.lock.get == proc.get)
+      .distinctBy(s => s.valuations)
 
     if (rasi_states.isEmpty)
       return BooleanValue(value = false)(program.o)
@@ -129,12 +152,17 @@ class RASIGenerator[G] extends LazyLogging {
       .replace("]", "").replace("[", "").replace("this.", "")
 
     // Compute value string
-    val value_string: String = value match {
-      case i: UncertainIntegerValue =>
-        i.try_to_resolve().getOrElse(throw new IllegalStateException("Value must be defined")).toString
-      case b: UncertainBooleanValue =>
-        b.try_to_resolve().getOrElse(throw new IllegalStateException("Value must be defined")).toString
-    }
+    val value_string: String =
+      value match {
+        case i: UncertainIntegerValue =>
+          i.try_to_resolve()
+            .getOrElse(throw new IllegalStateException("Value must be defined"))
+            .toString
+        case b: UncertainBooleanValue =>
+          b.try_to_resolve()
+            .getOrElse(throw new IllegalStateException("Value must be defined"))
+            .toString
+      }
 
     "rasi_" + var_name + "_" + value_string
   }

From fb1b43270fdc7cbad9b0fe120ef96f586b6d98a5 Mon Sep 17 00:00:00 2001
From: Philip Tasche <p.b.h.tasche@utwente.nl>
Date: Tue, 9 Jul 2024 14:33:47 +0200
Subject: [PATCH 23/23] Fixed VeSUV transformation with unused methods in the
 SystemC code

---
 .../vct/parsers/transform/systemctocol/colmodel/COLSystem.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parsers/vct/parsers/transform/systemctocol/colmodel/COLSystem.java b/src/parsers/vct/parsers/transform/systemctocol/colmodel/COLSystem.java
index 61c5ff30ee..c540d2a585 100644
--- a/src/parsers/vct/parsers/transform/systemctocol/colmodel/COLSystem.java
+++ b/src/parsers/vct/parsers/transform/systemctocol/colmodel/COLSystem.java
@@ -913,7 +913,7 @@ public void add_function_usage(SCFunction function, ProcessClass proc) {
      * @return A list of process classes that use the given function
      */
     public java.util.List<ProcessClass> get_function_usages(SCFunction function) {
-        return this.function_usages.get(function);
+        return this.function_usages.getOrDefault(function, new java.util.ArrayList<>());
     }
 
     /**