From a9a5ba23171875c838c4d89c582aa37bde86eeb7 Mon Sep 17 00:00:00 2001
From: Sean Billig <sean.billig@gmail.com>
Date: Sun, 9 May 2021 11:04:00 -0700
Subject: [PATCH] Add some codespan errors to analyzer

---
 analyzer/src/context.rs                       |   71 +-
 analyzer/src/errors.rs                        |   22 +
 analyzer/src/lib.rs                           |   37 +-
 analyzer/src/namespace/events.rs              |   19 +-
 analyzer/src/namespace/types.rs               |  146 +-
 analyzer/src/traversal/assignments.rs         |   30 +-
 analyzer/src/traversal/expressions.rs         |   59 +-
 analyzer/src/traversal/functions.rs           |  321 ++-
 analyzer/src/traversal/utils.rs               |    6 +-
 analyzer/tests/analysis.rs                    |   31 +-
 analyzer/tests/errors.rs                      |  110 +
 analyzer/tests/fixtures/demos/erc20_token.fe  |   54 +-
 analyzer/tests/fixtures/demos/uniswap.fe      |   14 +-
 .../errors}/assert_reason_not_string.fe       |    0
 analyzer/tests/fixtures/errors/assign_call.fe |    8 +
 analyzer/tests/fixtures/errors/assign_int.fe  |    3 +
 .../errors}/aug_assign_non_numeric.fe         |    0
 .../tests/fixtures/errors}/bad_map.fe         |    0
 .../tests/fixtures/errors}/bad_map2.fe        |    0
 .../tests/fixtures/errors}/bad_map3.fe        |    0
 .../tests/fixtures/errors}/bad_map4.fe        |    0
 .../tests/fixtures/errors}/bad_map5.fe        |    0
 .../errors}/binary_operations/add_uints.fe    |    0
 .../errors}/binary_operations/lshift_bool.fe  |    0
 .../binary_operations/lshift_with_int.fe      |    0
 .../errors}/binary_operations/pow_int.fe      |    0
 .../fixtures/errors}/break_without_loop.fe    |    0
 .../fixtures/errors}/break_without_loop_2.fe  |    0
 .../errors}/call_event_with_wrong_types.fe    |    0
 .../call_undefined_function_on_contract.fe    |    0
 ...undefined_function_on_external_contract.fe |    0
 ...all_undefined_function_on_memory_struct.fe |    0
 ...ll_undefined_function_on_storage_struct.fe |    0
 .../errors}/circular_dependency_create.fe     |    0
 .../errors}/circular_dependency_create2.fe    |    0
 .../fixtures/errors}/continue_without_loop.fe |    0
 .../errors}/continue_without_loop_2.fe        |    0
 .../errors}/duplicate_contract_in_module.fe   |    0
 .../errors}/duplicate_event_in_contract.fe    |    0
 .../errors}/duplicate_field_in_contract.fe    |    0
 .../errors}/duplicate_field_in_struct.fe      |    0
 .../errors}/duplicate_method_in_contract.fe   |    0
 .../errors}/duplicate_struct_in_module.fe     |    0
 .../errors}/duplicate_typedef_in_module.fe    |    0
 .../errors}/duplicate_var_in_child_scope.fe   |    0
 .../duplicate_var_in_contract_method.fe       |    0
 .../tests/fixtures/errors/emit_bad_args.fe    |    8 +
 .../fixtures/errors}/emit_undefined_event.fe  |    0
 .../errors}/external_call_type_error.fe       |    0
 .../external_call_wrong_number_of_params.fe   |    0
 .../tests/fixtures/errors}/indexed_event.fe   |    0
 .../errors}/keccak_called_with_wrong_type.fe  |    0
 .../fixtures/errors}/mismatch_return_type.fe  |    0
 .../tests/fixtures/errors}/missing_return.fe  |    0
 .../errors}/missing_return_in_else.fe         |    0
 .../tests/fixtures/errors}/needs_mem_copy.fe  |    0
 .../tests/fixtures/errors}/non_bool_and.fe    |    0
 .../tests/fixtures/errors}/non_bool_or.fe     |    0
 .../tests/fixtures/errors}/not_in_scope.fe    |    0
 .../tests/fixtures/errors}/not_in_scope_2.fe  |    0
 .../numeric_capacity_mismatch/i128_neg.fe     |    0
 .../numeric_capacity_mismatch/i128_pos.fe     |    0
 .../numeric_capacity_mismatch/i16_neg.fe      |    0
 .../numeric_capacity_mismatch/i16_pos.fe      |    0
 .../numeric_capacity_mismatch/i256_neg.fe     |    0
 .../numeric_capacity_mismatch/i256_pos.fe     |    0
 .../numeric_capacity_mismatch/i32_neg.fe      |    0
 .../numeric_capacity_mismatch/i32_pos.fe      |    0
 .../numeric_capacity_mismatch/i64_neg.fe      |    0
 .../numeric_capacity_mismatch/i64_pos.fe      |    0
 .../numeric_capacity_mismatch/i8_neg.fe       |    0
 .../numeric_capacity_mismatch/i8_pos.fe       |    0
 .../literal_too_big.fe                        |    0
 .../literal_too_small.fe                      |    0
 .../numeric_capacity_mismatch/octal_number.fe |    0
 .../numeric_capacity_mismatch/u128_neg.fe     |    0
 .../numeric_capacity_mismatch/u128_pos.fe     |    0
 .../numeric_capacity_mismatch/u16_neg.fe      |    0
 .../numeric_capacity_mismatch/u16_pos.fe      |    0
 .../numeric_capacity_mismatch/u256_neg.fe     |    0
 .../numeric_capacity_mismatch/u256_pos.fe     |    0
 .../numeric_capacity_mismatch/u32_neg.fe      |    0
 .../numeric_capacity_mismatch/u32_pos.fe      |    0
 .../numeric_capacity_mismatch/u64_neg.fe      |    0
 .../numeric_capacity_mismatch/u64_pos.fe      |    0
 .../numeric_capacity_mismatch/u8_neg.fe       |    0
 .../numeric_capacity_mismatch/u8_pos.fe       |    0
 .../errors}/pow_with_signed_exponent.fe       |    0
 .../errors}/pow_with_wrong_capacity.fe        |    0
 .../return_addition_with_mixed_types.fe       |    0
 ...urn_call_to_fn_with_param_type_mismatch.fe |    0
 .../return_call_to_fn_without_return.fe       |    0
 .../fixtures/errors}/return_from_init.fe      |    0
 .../fixtures/errors}/return_lt_mixed_types.fe |    0
 .../errors}/strict_boolean_if_else.fe         |    0
 .../errors}/string_capacity_mismatch.fe       |    0
 .../errors}/struct_call_without_kw_args.fe    |    0
 .../errors}/type_constructor_from_variable.fe |    0
 .../fixtures/errors}/unary_minus_on_bool.fe   |    0
 .../fixtures/errors}/unexpected_return.fe     |    0
 analyzer/tests/fixtures/features/events.fe    |    6 +-
 analyzer/tests/fixtures/features/ownable.fe   |   14 +-
 .../fixtures/features/sized_vals_in_sto.fe    |    6 +-
 analyzer/tests/fixtures/features/strings.fe   |    2 +-
 .../fixtures/stress/abi_encoding_stress.fe    |   12 +-
 .../fixtures/stress/data_copying_stress.fe    |    2 +-
 .../analysis__case_001_erc20_token.snap       |  754 +++---
 .../snapshots/analysis__case_003_uniswap.snap | 2126 ++++++++---------
 .../snapshots/analysis__case_017_events.snap  |  122 +-
 .../analysis__case_022_if_statement.snap      |   52 +-
 .../analysis__case_023_if_statement_2.snap    |   52 +-
 ...4_if_statement_with_block_declaration.snap |   30 +-
 .../snapshots/analysis__case_026_math.snap    |  358 +--
 .../snapshots/analysis__case_030_ownable.snap |   90 +-
 .../analysis__case_085_sized_vals_in_sto.snap |   76 +-
 .../snapshots/analysis__case_086_strings.snap |   72 +-
 .../analysis__case_096_while_loop.snap        |  118 +-
 ...lysis__case_097_while_loop_with_break.snap |   74 +-
 ...sis__case_098_while_loop_with_break_2.snap |  104 +-
 ...is__case_099_while_loop_with_continue.snap |  158 +-
 ...nalysis__case_100_abi_encoding_stress.snap |  138 +-
 ...nalysis__case_101_data_copying_stress.snap |   34 +-
 analyzer/tests/snapshots/errors__case_01.snap |   10 +
 analyzer/tests/snapshots/errors__case_02.snap |    9 +
 analyzer/tests/snapshots/errors__case_03.snap |    9 +
 analyzer/tests/snapshots/errors__case_04.snap |    9 +
 analyzer/tests/snapshots/errors__case_05.snap |    9 +
 analyzer/tests/snapshots/errors__case_06.snap |    9 +
 analyzer/tests/snapshots/errors__case_07.snap |   12 +
 analyzer/tests/snapshots/errors__case_08.snap |   12 +
 analyzer/tests/snapshots/errors__case_09.snap |   36 +
 analyzer/tests/snapshots/errors__case_10.snap |    9 +
 analyzer/tests/snapshots/errors__case_11.snap |    9 +
 analyzer/tests/snapshots/errors__case_12.snap |    9 +
 analyzer/tests/snapshots/errors__case_13.snap |    9 +
 analyzer/tests/snapshots/errors__case_14.snap |    9 +
 analyzer/tests/snapshots/errors__case_15.snap |    9 +
 analyzer/tests/snapshots/errors__case_16.snap |   12 +
 analyzer/tests/snapshots/errors__case_17.snap |   12 +
 analyzer/tests/snapshots/errors__case_18.snap |    9 +
 analyzer/tests/snapshots/errors__case_19.snap |   10 +
 analyzer/tests/snapshots/errors__case_20.snap |    9 +
 analyzer/tests/snapshots/errors__case_21.snap |    9 +
 analyzer/tests/snapshots/errors__case_22.snap |   10 +
 analyzer/tests/snapshots/errors__case_23.snap |    9 +
 analyzer/tests/snapshots/errors__case_24.snap |    9 +
 analyzer/tests/snapshots/errors__case_25.snap |   10 +
 analyzer/tests/snapshots/errors__case_26.snap |   11 +
 analyzer/tests/snapshots/errors__case_27.snap |   12 +
 analyzer/tests/snapshots/errors__case_28.snap |   47 +
 analyzer/tests/snapshots/errors__case_29.snap |    9 +
 analyzer/tests/snapshots/errors__case_30.snap |    9 +
 analyzer/tests/snapshots/errors__case_31.snap |   13 +
 analyzer/tests/snapshots/errors__case_32.snap |    9 +
 analyzer/tests/snapshots/errors__case_33.snap |   10 +
 analyzer/tests/snapshots/errors__case_34.snap |   17 +
 analyzer/tests/snapshots/errors__case_35.snap |   14 +
 analyzer/tests/snapshots/errors__case_36.snap |   10 +
 analyzer/tests/snapshots/errors__case_37.snap |    9 +
 analyzer/tests/snapshots/errors__case_38.snap |    9 +
 analyzer/tests/snapshots/errors__case_39.snap |    9 +
 analyzer/tests/snapshots/errors__case_40.snap |    9 +
 analyzer/tests/snapshots/errors__case_41.snap |   12 +
 analyzer/tests/snapshots/errors__case_42.snap |   12 +
 analyzer/tests/snapshots/errors__case_43.snap |   12 +
 analyzer/tests/snapshots/errors__case_44.snap |   12 +
 analyzer/tests/snapshots/errors__case_45.snap |   12 +
 analyzer/tests/snapshots/errors__case_46.snap |   12 +
 analyzer/tests/snapshots/errors__case_47.snap |   12 +
 analyzer/tests/snapshots/errors__case_48.snap |   12 +
 analyzer/tests/snapshots/errors__case_49.snap |   12 +
 analyzer/tests/snapshots/errors__case_50.snap |   12 +
 analyzer/tests/snapshots/errors__case_51.snap |   12 +
 analyzer/tests/snapshots/errors__case_52.snap |   12 +
 analyzer/tests/snapshots/errors__case_53.snap |   12 +
 analyzer/tests/snapshots/errors__case_54.snap |   12 +
 analyzer/tests/snapshots/errors__case_55.snap |   18 +
 analyzer/tests/snapshots/errors__case_56.snap |   12 +
 analyzer/tests/snapshots/errors__case_57.snap |   12 +
 analyzer/tests/snapshots/errors__case_58.snap |   12 +
 analyzer/tests/snapshots/errors__case_59.snap |   12 +
 analyzer/tests/snapshots/errors__case_60.snap |   12 +
 analyzer/tests/snapshots/errors__case_61.snap |   18 +
 analyzer/tests/snapshots/errors__case_62.snap |   12 +
 analyzer/tests/snapshots/errors__case_63.snap |   12 +
 analyzer/tests/snapshots/errors__case_64.snap |   12 +
 analyzer/tests/snapshots/errors__case_65.snap |   12 +
 analyzer/tests/snapshots/errors__case_66.snap |   12 +
 analyzer/tests/snapshots/errors__case_67.snap |   12 +
 analyzer/tests/snapshots/errors__case_68.snap |    9 +
 analyzer/tests/snapshots/errors__case_69.snap |    9 +
 analyzer/tests/snapshots/errors__case_70.snap |    9 +
 analyzer/tests/snapshots/errors__case_71.snap |    9 +
 analyzer/tests/snapshots/errors__case_72.snap |   10 +
 analyzer/tests/snapshots/errors__case_73.snap |   19 +
 analyzer/tests/snapshots/errors__case_74.snap |    9 +
 analyzer/tests/snapshots/errors__case_75.snap |   12 +
 analyzer/tests/snapshots/errors__case_76.snap |    9 +
 analyzer/tests/snapshots/errors__case_77.snap |    9 +
 analyzer/tests/snapshots/errors__case_78.snap |    9 +
 analyzer/tests/snapshots/errors__case_79.snap |    9 +
 analyzer/tests/snapshots/errors__case_80.snap |   10 +
 analyzer/tests/snapshots/errors__case_81.snap |   10 +
 analyzer/tests/snapshots/errors__case_82.snap |    9 +
 analyzer/tests/snapshots/errors__case_83.snap |    9 +
 analyzer/tests/snapshots/errors__case_84.snap |    9 +
 analyzer/tests/snapshots/errors__case_85.snap |    9 +
 common/src/diagnostics.rs                     |   42 +-
 compiler/src/abi/builder.rs                   |    4 +-
 compiler/src/errors.rs                        |   16 +-
 compiler/src/lib.rs                           |    5 +-
 compiler/tests/cases/compile_errors.rs        |  142 --
 .../cases/lowering/fixtures/base_tuple.fe     |    4 +-
 .../lowering/fixtures/base_tuple_lowered.fe   |    4 +-
 compiler/tests/cases/lowering/mod.rs          |    8 +-
 compiler/tests/cases/main.rs                  |    1 -
 compiler/tests/cases/utils.rs                 |   12 +-
 compiler/tests/fixtures/demos/erc20_token.fe  |   54 +-
 compiler/tests/fixtures/demos/uniswap.fe      |   14 +-
 compiler/tests/fixtures/features/events.fe    |    6 +-
 compiler/tests/fixtures/features/ownable.fe   |   14 +-
 .../fixtures/features/sized_vals_in_sto.fe    |    6 +-
 compiler/tests/fixtures/features/strings.fe   |    2 +-
 .../fixtures/stress/abi_encoding_stress.fe    |   12 +-
 .../fixtures/stress/data_copying_stress.fe    |    2 +-
 parser/src/ast.rs                             |    3 +-
 parser/src/grammar/functions.rs               |    4 +-
 parser/src/parser.rs                          |   48 +-
 src/main.rs                                   |   12 +-
 229 files changed, 4045 insertions(+), 2688 deletions(-)
 create mode 100644 analyzer/tests/errors.rs
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/assert_reason_not_string.fe (100%)
 create mode 100644 analyzer/tests/fixtures/errors/assign_call.fe
 create mode 100644 analyzer/tests/fixtures/errors/assign_int.fe
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/aug_assign_non_numeric.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/bad_map.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/bad_map2.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/bad_map3.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/bad_map4.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/bad_map5.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/binary_operations/add_uints.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/binary_operations/lshift_bool.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/binary_operations/lshift_with_int.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/binary_operations/pow_int.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/break_without_loop.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/break_without_loop_2.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/call_event_with_wrong_types.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/call_undefined_function_on_contract.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/call_undefined_function_on_external_contract.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/call_undefined_function_on_memory_struct.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/call_undefined_function_on_storage_struct.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/circular_dependency_create.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/circular_dependency_create2.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/continue_without_loop.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/continue_without_loop_2.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/duplicate_contract_in_module.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/duplicate_event_in_contract.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/duplicate_field_in_contract.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/duplicate_field_in_struct.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/duplicate_method_in_contract.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/duplicate_struct_in_module.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/duplicate_typedef_in_module.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/duplicate_var_in_child_scope.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/duplicate_var_in_contract_method.fe (100%)
 create mode 100644 analyzer/tests/fixtures/errors/emit_bad_args.fe
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/emit_undefined_event.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/external_call_type_error.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/external_call_wrong_number_of_params.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/indexed_event.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/keccak_called_with_wrong_type.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/mismatch_return_type.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/missing_return.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/missing_return_in_else.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/needs_mem_copy.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/non_bool_and.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/non_bool_or.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/not_in_scope.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/not_in_scope_2.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i128_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i128_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i16_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i16_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i256_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i256_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i32_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i32_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i64_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i64_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i8_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/i8_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/literal_too_big.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/literal_too_small.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/octal_number.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u128_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u128_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u16_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u16_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u256_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u256_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u32_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u32_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u64_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u64_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u8_neg.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/numeric_capacity_mismatch/u8_pos.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/pow_with_signed_exponent.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/pow_with_wrong_capacity.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/return_addition_with_mixed_types.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/return_call_to_fn_with_param_type_mismatch.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/return_call_to_fn_without_return.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/return_from_init.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/return_lt_mixed_types.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/strict_boolean_if_else.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/string_capacity_mismatch.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/struct_call_without_kw_args.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/type_constructor_from_variable.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/unary_minus_on_bool.fe (100%)
 rename {compiler/tests/fixtures/compile_errors => analyzer/tests/fixtures/errors}/unexpected_return.fe (100%)
 create mode 100644 analyzer/tests/snapshots/errors__case_01.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_02.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_03.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_04.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_05.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_06.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_07.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_08.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_09.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_10.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_11.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_12.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_13.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_14.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_15.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_16.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_17.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_18.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_19.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_20.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_21.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_22.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_23.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_24.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_25.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_26.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_27.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_28.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_29.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_30.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_31.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_32.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_33.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_34.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_35.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_36.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_37.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_38.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_39.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_40.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_41.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_42.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_43.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_44.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_45.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_46.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_47.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_48.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_49.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_50.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_51.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_52.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_53.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_54.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_55.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_56.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_57.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_58.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_59.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_60.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_61.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_62.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_63.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_64.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_65.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_66.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_67.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_68.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_69.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_70.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_71.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_72.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_73.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_74.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_75.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_76.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_77.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_78.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_79.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_80.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_81.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_82.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_83.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_84.snap
 create mode 100644 analyzer/tests/snapshots/errors__case_85.snap
 delete mode 100644 compiler/tests/cases/compile_errors.rs

diff --git a/analyzer/src/context.rs b/analyzer/src/context.rs
index 5ad7bb1e31..42a3cb537c 100644
--- a/analyzer/src/context.rs
+++ b/analyzer/src/context.rs
@@ -3,12 +3,16 @@ use crate::errors::SemanticError;
 use crate::namespace::events::EventDef;
 use crate::namespace::scopes::{ContractFunctionDef, ContractScope, ModuleScope, Shared};
 use crate::namespace::types::{Array, Contract, FixedSize, Struct, Tuple, Type};
+pub use fe_common::diagnostics::Label;
+use fe_common::diagnostics::{Diagnostic, Severity};
+use fe_common::files::SourceFileId;
 use fe_common::Span;
 use fe_parser::ast as fe;
 use fe_parser::node::{Node, NodeId};
+
 use std::cell::RefCell;
 use std::collections::{BTreeMap, BTreeSet};
-use std::fmt::Debug;
+use std::fmt::{Debug, Display};
 use std::hash::Hash;
 use std::rc::Rc;
 
@@ -285,7 +289,7 @@ impl From<Shared<ModuleScope>> for ModuleAttributes {
 
 /// Contains contextual information about a Fe module and can be queried using
 /// `Spanned` AST nodes.
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct Context {
     /// Node ids in the order they were visited.
     pub node_ids: Vec<NodeId>,
@@ -300,16 +304,30 @@ pub struct Context {
     pub events: BTreeMap<NodeId, EventDef>,
     pub type_descs: BTreeMap<NodeId, Type>,
     pub module: Option<ModuleAttributes>,
+    pub file_id: SourceFileId,
+    pub diagnostics: Vec<Diagnostic>,
 }
 
 impl Context {
-    pub fn new_shared() -> Shared<Self> {
-        Rc::new(RefCell::new(Self::new()))
+    pub fn new_shared(file_id: SourceFileId) -> Shared<Self> {
+        Rc::new(RefCell::new(Self::new(file_id)))
     }
 
-    pub fn new() -> Self {
+    pub fn new(file_id: SourceFileId) -> Self {
         Context {
-            ..Default::default()
+            node_ids: Vec::new(),
+            spans: BTreeMap::new(),
+            expressions: BTreeMap::new(),
+            emits: BTreeMap::new(),
+            functions: BTreeMap::new(),
+            declarations: BTreeMap::new(),
+            contracts: BTreeMap::new(),
+            calls: BTreeMap::new(),
+            events: BTreeMap::new(),
+            type_descs: BTreeMap::new(),
+            module: None,
+            file_id,
+            diagnostics: Vec::new(),
         }
     }
 
@@ -503,4 +521,45 @@ impl Context {
             })
             .collect::<Vec<_>>()
     }
+
+    pub fn error(
+        &mut self,
+        message: impl Into<String>,
+        label_span: Span,
+        label: impl Into<String>,
+    ) {
+        self.fancy_error(message, vec![Label::primary(label_span, label)], vec![]);
+    }
+
+    pub fn type_error(
+        &mut self,
+        message: impl Into<String>,
+        span: Span,
+        expected: impl Display,
+        actual: impl Display,
+    ) {
+        self.error(
+            message,
+            span,
+            format!("this has type `{}`; expected type `{}`", actual, expected),
+        )
+    }
+
+    pub fn fancy_error(
+        &mut self,
+        message: impl Into<String>,
+        labels: Vec<Label>,
+        notes: Vec<String>,
+    ) {
+        self.diagnostics.push(Diagnostic {
+            severity: Severity::Error,
+            code: None,
+            message: message.into(),
+            labels: labels
+                .into_iter()
+                .map(|lbl| lbl.into_cs_label(self.file_id))
+                .collect(),
+            notes,
+        });
+    }
 }
diff --git a/analyzer/src/errors.rs b/analyzer/src/errors.rs
index a48e39900c..e2ae03891a 100644
--- a/analyzer/src/errors.rs
+++ b/analyzer/src/errors.rs
@@ -1,8 +1,15 @@
 //! Semantic errors.
 
 use ansi_term::Color::Red;
+use fe_common::diagnostics::Diagnostic;
 use fe_parser::node::Span;
 
+#[derive(Debug)]
+pub struct AnalyzerError {
+    pub diagnostics: Vec<Diagnostic>,
+    pub classic: Option<SemanticError>,
+}
+
 /// Errors for things that may arise in a valid Fe AST.
 #[derive(Debug, PartialEq)]
 pub enum ErrorKind {
@@ -26,6 +33,7 @@ pub enum ErrorKind {
     UndefinedValue,
     UnexpectedReturn,
     WrongNumberOfParams,
+    Fatal,
 }
 
 #[derive(Debug, PartialEq)]
@@ -37,6 +45,20 @@ pub struct SemanticError {
 }
 
 impl SemanticError {
+    pub fn fatal() -> Self {
+        SemanticError {
+            kind: ErrorKind::Fatal,
+            context: vec![],
+        }
+    }
+
+    pub fn with_kind(kind: ErrorKind) -> Self {
+        SemanticError {
+            kind,
+            context: vec![],
+        }
+    }
+
     /// Create a new error with kind `BreakWithoutLoop`
     pub fn break_without_loop() -> Self {
         SemanticError {
diff --git a/analyzer/src/lib.rs b/analyzer/src/lib.rs
index 967aa2952a..92fdc4ba02 100644
--- a/analyzer/src/lib.rs
+++ b/analyzer/src/lib.rs
@@ -11,21 +11,44 @@ pub mod namespace;
 mod operations;
 mod traversal;
 
-use crate::errors::SemanticError;
+use crate::errors::{AnalyzerError, ErrorKind};
 use context::Context;
+use fe_common::files::SourceFileId;
 use fe_parser::ast as fe;
 use std::rc::Rc;
 
 /// Performs semantic analysis of the source program and returns a `Context`
 /// instance.
-pub fn analyze(module: &fe::Module) -> Result<Context, SemanticError> {
-    let context = Context::new_shared();
-    traversal::module::module(Rc::clone(&context), module)?;
-    Ok(Rc::try_unwrap(context)
+pub fn analyze(module: &fe::Module, file_id: SourceFileId) -> Result<Context, AnalyzerError> {
+    let context = Context::new_shared(file_id);
+    let result = traversal::module::module(Rc::clone(&context), module);
+
+    // This should never panic.
+    let context = Rc::try_unwrap(context)
         .map_err(|_| "more than one strong reference pointing to context")
-        // This should never panic.
         .expect("failed to unwrap reference counter")
-        .into_inner())
+        .into_inner();
+
+    match result {
+        Ok(()) => {
+            if context.diagnostics.is_empty() {
+                Ok(context)
+            } else {
+                Err(AnalyzerError {
+                    diagnostics: context.diagnostics,
+                    classic: None,
+                })
+            }
+        }
+        Err(err) => Err(AnalyzerError {
+            diagnostics: context.diagnostics,
+            classic: if err.kind == ErrorKind::Fatal {
+                None
+            } else {
+                Some(err)
+            },
+        }),
+    }
 }
 
 #[cfg(feature = "fix-context-harness")]
diff --git a/analyzer/src/namespace/events.rs b/analyzer/src/namespace/events.rs
index e5aa1355b0..a326a663c3 100644
--- a/analyzer/src/namespace/events.rs
+++ b/analyzer/src/namespace/events.rs
@@ -58,8 +58,15 @@ impl EventDef {
     }
 
     /// The event's field types.
-    pub fn all_field_types(&self) -> Vec<FixedSize> {
-        self.fields.iter().map(|(_, typ)| typ.to_owned()).collect()
+    pub fn iter_field_types(&self) -> impl Iterator<Item = &FixedSize> + '_ {
+        self.fields.iter().map(|(_, typ)| typ)
+    }
+
+    pub fn has_field(&self, field_name: &str) -> bool {
+        self.fields
+            .iter()
+            .find(|(name, _)| name == field_name)
+            .is_some()
     }
 }
 
@@ -86,11 +93,11 @@ mod tests {
         );
 
         assert_eq!(
-            event.all_field_types(),
+            event.iter_field_types().collect::<Vec<_>>(),
             vec![
-                FixedSize::Base(Base::Address),
-                FixedSize::Base(Base::Address),
-                FixedSize::bool(),
+                &FixedSize::Base(Base::Address),
+                &FixedSize::Base(Base::Address),
+                &FixedSize::bool(),
             ],
         );
 
diff --git a/analyzer/src/namespace/types.rs b/analyzer/src/namespace/types.rs
index f8fd7b685d..3c18e5b289 100644
--- a/analyzer/src/namespace/types.rs
+++ b/analyzer/src/namespace/types.rs
@@ -3,6 +3,7 @@ use fe_parser::ast as fe;
 use fe_parser::node::Node;
 use std::collections::{btree_map::Entry, BTreeMap};
 use std::convert::TryFrom;
+use std::fmt;
 
 use crate::context::FunctionAttributes;
 use num_bigint::BigInt;
@@ -124,7 +125,7 @@ pub enum FixedSize {
     Struct(Struct),
 }
 
-#[derive(Clone, Debug, PartialEq, PartialOrd, Ord, Eq, Hash)]
+#[derive(Copy, Clone, Debug, PartialEq, PartialOrd, Ord, Eq, Hash)]
 pub enum Base {
     Numeric(Integer),
     Bool,
@@ -132,7 +133,7 @@ pub enum Base {
     Address,
 }
 
-#[derive(Clone, Debug, Hash, PartialEq, PartialOrd, Ord, Eq, IntoStaticStr)]
+#[derive(Copy, Clone, Debug, Hash, PartialEq, PartialOrd, Ord, Eq, IntoStaticStr)]
 pub enum Integer {
     U256,
     U128,
@@ -357,9 +358,13 @@ impl From<Base> for Type {
     }
 }
 
-impl From<Base> for FixedSize {
-    fn from(value: Base) -> Self {
-        FixedSize::Base(value)
+impl Tuple {
+    pub fn empty() -> Tuple {
+        Tuple { items: vec![] }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.size() == 0
     }
 }
 
@@ -381,6 +386,26 @@ impl FixedSize {
     }
 }
 
+impl PartialEq<Type> for FixedSize {
+    fn eq(&self, other: &Type) -> bool {
+        match (self, other) {
+            (FixedSize::Array(in1), Type::Array(in2)) => in1 == in2,
+            (FixedSize::Base(in1), Type::Base(in2)) => in1 == in2,
+            (FixedSize::Tuple(in1), Type::Tuple(in2)) => in1 == in2,
+            (FixedSize::String(in1), Type::String(in2)) => in1 == in2,
+            (FixedSize::Contract(in1), Type::Contract(in2)) => in1 == in2,
+            (FixedSize::Struct(in1), Type::Struct(in2)) => in1 == in2,
+            _ => false,
+        }
+    }
+}
+
+impl From<Base> for FixedSize {
+    fn from(value: Base) -> Self {
+        FixedSize::Base(value)
+    }
+}
+
 impl TryFrom<Type> for FixedSize {
     type Error = SemanticError;
 
@@ -397,16 +422,6 @@ impl TryFrom<Type> for FixedSize {
     }
 }
 
-impl Tuple {
-    pub fn empty() -> Tuple {
-        Tuple { items: vec![] }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.size() == 0
-    }
-}
-
 impl From<Tuple> for FixedSize {
     fn from(value: Tuple) -> Self {
         FixedSize::Tuple(value)
@@ -955,3 +970,104 @@ pub fn type_desc(defs: &BTreeMap<String, Type>, typ: &fe::TypeDesc) -> Result<Ty
         })),
     }
 }
+
+impl fmt::Display for Type {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Type::Base(inner) => inner.fmt(f),
+            Type::Array(inner) => inner.fmt(f),
+            Type::Map(inner) => inner.fmt(f),
+            Type::Tuple(inner) => inner.fmt(f),
+            Type::String(inner) => inner.fmt(f),
+            Type::Contract(inner) => inner.fmt(f),
+            Type::Struct(inner) => inner.fmt(f),
+        }
+    }
+}
+
+impl fmt::Display for FixedSize {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            FixedSize::Base(inner) => inner.fmt(f),
+            FixedSize::Array(inner) => inner.fmt(f),
+            FixedSize::Tuple(inner) => inner.fmt(f),
+            FixedSize::String(inner) => inner.fmt(f),
+            FixedSize::Contract(inner) => inner.fmt(f),
+            FixedSize::Struct(inner) => inner.fmt(f),
+        }
+    }
+}
+
+impl fmt::Display for Base {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let name = match self {
+            Base::Numeric(int) => return int.fmt(f),
+            Base::Bool => "bool",
+            Base::Byte => "byte",
+            Base::Address => "address",
+        };
+        write!(f, "{}", name)
+    }
+}
+
+impl fmt::Display for Integer {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let name = match self {
+            Integer::U256 => "u256",
+            Integer::U128 => "u128",
+            Integer::U64 => "u64",
+            Integer::U32 => "u32",
+            Integer::U16 => "u16",
+            Integer::U8 => "u8",
+            Integer::I256 => "i256",
+            Integer::I128 => "i128",
+            Integer::I64 => "i64",
+            Integer::I32 => "i32",
+            Integer::I16 => "i16",
+            Integer::I8 => "i8",
+        };
+        write!(f, "{}", name)
+    }
+}
+
+impl fmt::Display for Array {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}[{}]", self.inner, self.size)
+    }
+}
+
+impl fmt::Display for Map {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "map<{}, {}>", self.key, self.value)
+    }
+}
+
+impl fmt::Display for Tuple {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "(")?;
+        let mut delim = "";
+        for item in &self.items {
+            write!(f, "{}{}", delim, item)?;
+            delim = ", ";
+        }
+        write!(f, ")")
+    }
+}
+
+impl fmt::Display for FeString {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "string<{}>", self.max_size)
+    }
+}
+
+impl fmt::Display for Contract {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.name)
+    }
+}
+
+impl fmt::Display for Struct {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.name)
+    }
+}
diff --git a/analyzer/src/traversal/assignments.rs b/analyzer/src/traversal/assignments.rs
index f966483b60..093c28c2e6 100644
--- a/analyzer/src/traversal/assignments.rs
+++ b/analyzer/src/traversal/assignments.rs
@@ -1,8 +1,9 @@
 use crate::context::{Context, Location};
-use crate::errors::SemanticError;
+use crate::errors::{ErrorKind, SemanticError};
 use crate::namespace::scopes::{BlockScope, Shared};
 use crate::operations;
 use crate::traversal::expressions;
+use fe_common::diagnostics::Label;
 use fe_parser::ast as fe;
 use fe_parser::node::Node;
 use std::rc::Rc;
@@ -17,8 +18,9 @@ pub fn assign(
 ) -> Result<(), SemanticError> {
     if let fe::FuncStmt::Assign { target, value } = &stmt.kind {
         let target_attributes = expressions::expr(Rc::clone(&scope), Rc::clone(&context), target)?;
-        let value_attributes = expressions::expr(Rc::clone(&scope), Rc::clone(&context), value)?;
 
+        let value_attributes = expressions::expr(Rc::clone(&scope), Rc::clone(&context), value)?;
+        check_assign_target(Rc::clone(&context), target)?;
         if target_attributes.typ != value_attributes.typ {
             return Err(SemanticError::type_error());
         }
@@ -39,6 +41,30 @@ pub fn assign(
     unreachable!()
 }
 
+pub fn check_assign_target(
+    context: Shared<Context>,
+    expr: &Node<fe::Expr>,
+) -> Result<(), SemanticError> {
+    use fe::Expr::*;
+    match &expr.kind {
+        Attribute { .. } => Ok(()),
+        Subscript { .. } => Ok(()),
+        Tuple { elts } => {
+            for elt in elts {
+                check_assign_target(Rc::clone(&context), elt)?;
+            }
+            Ok(())
+        }
+        Name(_) => Ok(()),
+        _ => {
+            context.borrow_mut().fancy_error("invalid assignment target",
+                                             vec![Label::primary(expr.span, "")],
+                                             vec!["The left side of an assignment can be a variable name, attribute, subscript, or tuple".into()]);
+            Err(SemanticError::with_kind(ErrorKind::Fatal))
+        }
+    }
+}
+
 /// Gather context information for assignments and check for type errors.
 pub fn aug_assign(
     scope: Shared<BlockScope>,
diff --git a/analyzer/src/traversal/expressions.rs b/analyzer/src/traversal/expressions.rs
index 0714bf3b9f..050d549692 100644
--- a/analyzer/src/traversal/expressions.rs
+++ b/analyzer/src/traversal/expressions.rs
@@ -15,7 +15,7 @@ use builtins::{
     ValueMethod,
 };
 use fe_parser::ast as fe;
-use fe_parser::node::Node;
+use fe_parser::node::{Node, Span};
 use std::convert::TryFrom;
 use std::rc::Rc;
 use std::str::FromStr;
@@ -28,7 +28,7 @@ pub fn expr(
 ) -> Result<ExpressionAttributes, SemanticError> {
     let attributes = match &exp.kind {
         fe::Expr::Name(_) => expr_name(scope, exp),
-        fe::Expr::Num(_) => expr_num(exp),
+        fe::Expr::Num(_) => Ok(expr_num(Rc::clone(&context), exp)),
         fe::Expr::Bool(_) => expr_bool(exp),
         fe::Expr::Subscript { .. } => expr_subscript(scope, Rc::clone(&context), exp),
         fe::Expr::Attribute { .. } => expr_attribute(scope, Rc::clone(&context), exp),
@@ -146,7 +146,7 @@ fn expr_tuple(
                 .collect::<Result<Vec<_>, _>>()?;
 
             let tuple = Tuple {
-                items: types_to_fixed_sizes(types)?,
+                items: types_to_fixed_sizes(&types)?,
             };
 
             scope
@@ -235,10 +235,10 @@ fn expr_bool(exp: &Node<fe::Expr>) -> Result<ExpressionAttributes, SemanticError
     unreachable!()
 }
 
-fn expr_num(exp: &Node<fe::Expr>) -> Result<ExpressionAttributes, SemanticError> {
+fn expr_num(context: Shared<Context>, exp: &Node<fe::Expr>) -> ExpressionAttributes {
     if let fe::Expr::Num(num) = &exp.kind {
-        validate_numeric_literal_fits_type(num, &Type::Base(U256))?;
-        return Ok(ExpressionAttributes::new(Type::Base(U256), Location::Value));
+        validate_numeric_literal_fits_type(num, exp.span, Integer::U256, context);
+        return ExpressionAttributes::new(Type::Base(U256), Location::Value);
     }
 
     unreachable!()
@@ -509,7 +509,7 @@ fn expr_call_builtin_function(
                 return Err(SemanticError::wrong_number_of_params());
             }
             if !matches!(
-                expression_attributes_to_types(argument_attributes).first(),
+                expression_attributes_to_types(&argument_attributes).first(),
                 Some(Type::Array(Array {
                     inner: Base::Byte,
                     ..
@@ -531,8 +531,8 @@ fn expr_call_struct_constructor(
     validate_are_kw_args(&args.kind)?;
     let argument_attributes = expr_call_args(Rc::clone(&scope), Rc::clone(&context), args)?;
 
-    if fixed_sizes_to_types(typ.get_field_types())
-        != expression_attributes_to_types(argument_attributes)
+    if fixed_sizes_to_types(&typ.get_field_types())
+        != expression_attributes_to_types(&argument_attributes)
     {
         return Err(SemanticError::type_error());
     }
@@ -571,9 +571,11 @@ fn expr_call_type_constructor(
                 Ok(ExpressionAttributes::new(typ, Location::Value))
             }
         }
-        Type::Base(Base::Numeric(_)) => {
-            let num = validate_is_numeric_literal(&args.kind[0].kind)?;
-            validate_numeric_literal_fits_type(&num, &typ)?;
+        Type::Base(Base::Numeric(int_type)) => {
+            let num_string = validate_is_numeric_literal(&args.kind[0].kind)?;
+            // TODO: this is also called by expr() (via the call_arg() call above),
+            //  to check if the literal fits in u256. If it doesn't, we'll get two errors.
+            validate_numeric_literal_fits_type(&num_string, args.kind[0].span, int_type, context);
             Ok(ExpressionAttributes::new(typ, Location::Value))
         }
         Type::Base(Base::Address) => {
@@ -626,8 +628,12 @@ fn expr_call_self_attribute(
             return Err(SemanticError::wrong_number_of_params());
         }
 
-        if fixed_sizes_to_types(params.iter().map(|(_, typ)| typ.to_owned()).collect())
-            != expression_attributes_to_types(argument_attributes)
+        if fixed_sizes_to_types(
+            &params
+                .iter()
+                .map(|(_, typ)| typ.to_owned())
+                .collect::<Vec<_>>(),
+        ) != expression_attributes_to_types(&argument_attributes)
         {
             return Err(SemanticError::type_error());
         }
@@ -800,8 +806,8 @@ fn expr_call_contract_attribute(
             return Err(SemanticError::wrong_number_of_params());
         }
 
-        if fixed_sizes_to_types(function.param_types())
-            != expression_attributes_to_types(argument_attributes)
+        if fixed_sizes_to_types(&function.param_types())
+            != expression_attributes_to_types(&argument_attributes)
         {
             return Err(SemanticError::type_error());
         }
@@ -951,16 +957,19 @@ fn validate_is_numeric_literal(call_arg: &fe::CallArg) -> Result<String, Semanti
     Err(SemanticError::numeric_literal_expected())
 }
 
-fn validate_numeric_literal_fits_type(num: &str, typ: &Type) -> Result<(), SemanticError> {
-    if let Type::Base(Base::Numeric(integer)) = typ {
-        return if integer.fits(num) {
-            Ok(())
-        } else {
-            Err(SemanticError::numeric_capacity_mismatch())
-        };
+fn validate_numeric_literal_fits_type(
+    num: &str,
+    span: Span,
+    int_type: Integer,
+    context: Shared<Context>,
+) {
+    if !int_type.fits(num) {
+        context.borrow_mut().error(
+            format!("literal out of range for `{}`", int_type),
+            span,
+            format!("does not fit into type `{}`", int_type),
+        );
     }
-
-    Err(SemanticError::type_error())
 }
 
 fn validate_str_literal_fits_type(
diff --git a/analyzer/src/traversal/functions.rs b/analyzer/src/traversal/functions.rs
index abe471135c..b294141e5d 100644
--- a/analyzer/src/traversal/functions.rs
+++ b/analyzer/src/traversal/functions.rs
@@ -1,11 +1,10 @@
-use crate::context::{Context, ExpressionAttributes, FunctionAttributes, Location};
+use crate::context::{Context, ExpressionAttributes, FunctionAttributes, Label, Location};
 use crate::errors::SemanticError;
 use crate::namespace::scopes::{BlockScope, BlockScopeType, ContractScope, Scope, Shared};
 use crate::namespace::types::{Base, FixedSize, Tuple, Type};
-use crate::traversal::utils::{expression_attributes_to_types, fixed_sizes_to_types};
 use crate::traversal::{assignments, declarations, expressions, types};
 use fe_parser::ast as fe;
-use fe_parser::node::Node;
+use fe_parser::node::{Node, Span};
 use std::rc::Rc;
 
 /// Gather context information for a function definition and check for type
@@ -19,7 +18,7 @@ pub fn func_def(
         is_pub,
         name,
         args,
-        return_type,
+        return_type: return_type_node,
         body: _,
     } = &def.kind
     {
@@ -31,7 +30,7 @@ pub fn func_def(
             .map(|arg| func_def_arg(Rc::clone(&function_scope), Rc::clone(&context), arg))
             .collect::<Result<Vec<_>, _>>()?;
 
-        let return_type = return_type
+        let mut return_type = return_type_node
             .as_ref()
             .map(|typ| {
                 types::type_desc_fixed_size(
@@ -45,7 +44,18 @@ pub fn func_def(
 
         // `__init__` must not return any type other than `()`.
         if name == "__init__" && !return_type.is_empty_tuple() {
-            return Err(SemanticError::type_error());
+            context.borrow_mut().fancy_error(
+                "`__init__` function has incorrect return type",
+                vec![Label::primary(
+                    return_type_node.as_ref().unwrap().span,
+                    "return type should be `()`",
+                )],
+                vec![
+                    "Hint: Remove the return type specification.".to_string(),
+                    "Example: `def __init__():`".to_string(),
+                ],
+            );
+            return_type = Tuple::empty().into();
         }
 
         let attributes: FunctionAttributes = contract_scope
@@ -74,7 +84,14 @@ pub fn func_body(
     context: Shared<Context>,
     def: &Node<fe::ContractStmt>,
 ) -> Result<(), SemanticError> {
-    if let fe::ContractStmt::FuncDef { name, body, .. } = &def.kind {
+    if let fe::ContractStmt::FuncDef {
+        is_pub: _,
+        name,
+        body,
+        return_type,
+        args: _,
+    } = &def.kind
+    {
         let host_func_def = contract_scope
             .borrow()
             .function_def(&name.kind)
@@ -85,8 +102,24 @@ pub fn func_body(
         // return) are valid syntax.
         // If the return type is anything else, we do need to ensure that all code paths
         // return or revert.
-        if !host_func_def.return_type.is_empty_tuple() {
-            validate_all_paths_return_or_revert(&body)?
+        if !host_func_def.return_type.is_empty_tuple() && !all_paths_return_or_revert(&body) {
+            context.borrow_mut().fancy_error(
+                "function body is missing a return or revert statement",
+                vec![
+                    Label::primary(
+                        name.span,
+                        "all paths of this function must `return` or `revert`",
+                    ),
+                    Label::secondary(
+                        return_type.as_ref().unwrap().span,
+                        format!(
+                            "expected function to return `{}`",
+                            host_func_def.return_type
+                        ),
+                    ),
+                ],
+                vec![],
+            );
         }
 
         traverse_statements(Rc::clone(&host_func_def.scope), Rc::clone(&context), body)?;
@@ -108,32 +141,27 @@ fn traverse_statements(
     Ok(())
 }
 
-fn validate_all_paths_return_or_revert(block: &[Node<fe::FuncStmt>]) -> Result<(), SemanticError> {
+fn all_paths_return_or_revert(block: &[Node<fe::FuncStmt>]) -> bool {
     for statement in block.iter().rev() {
-        if let fe::FuncStmt::Return { .. } = &statement.kind {
-            return Ok(());
-        }
-
-        if let fe::FuncStmt::Revert { .. } = &statement.kind {
-            return Ok(());
-        }
-
-        if let fe::FuncStmt::If {
-            test: _,
-            body,
-            or_else,
-        } = &statement.kind
-        {
-            let body_returns = validate_all_paths_return_or_revert(body).is_ok();
-            let or_else_returns =
-                or_else.is_empty() || validate_all_paths_return_or_revert(or_else).is_ok();
-            if body_returns && or_else_returns {
-                return Ok(());
+        match &statement.kind {
+            fe::FuncStmt::Return { .. } => return true,
+            fe::FuncStmt::Revert { .. } => return true,
+            fe::FuncStmt::If {
+                test: _,
+                body,
+                or_else,
+            } => {
+                let body_returns = all_paths_return_or_revert(&body);
+                let or_else_returns = or_else.is_empty() || all_paths_return_or_revert(&or_else);
+                if body_returns && or_else_returns {
+                    return true;
+                }
             }
+            _ => {}
         }
     }
 
-    Err(SemanticError::missing_return())
+    false
 }
 
 fn func_def_arg(
@@ -166,8 +194,8 @@ fn func_stmt(
         fe::FuncStmt::Assert { .. } => assert(scope, context, stmt),
         fe::FuncStmt::Expr { .. } => expr(scope, context, stmt),
         fe::FuncStmt::Pass => Ok(()),
-        fe::FuncStmt::Break => break_statement(scope, context, stmt),
-        fe::FuncStmt::Continue => continue_statement(scope, context, stmt),
+        fe::FuncStmt::Break => Ok(loop_flow_statement(scope, context, stmt)),
+        fe::FuncStmt::Continue => Ok(loop_flow_statement(scope, context, stmt)),
         fe::FuncStmt::Revert => Ok(()),
     }
     .map_err(|error| error.with_context(stmt.span))
@@ -183,7 +211,19 @@ fn for_loop(
             // Create the for loop body scope.
             let body_scope = BlockScope::from_block_scope(BlockScopeType::Loop, Rc::clone(&scope));
             // Make sure iter is in the function scope & it should be an array.
-            let target_type = verify_is_array(scope, Rc::clone(&context), iter)?;
+
+            let iter_type = expressions::expr(Rc::clone(&scope), Rc::clone(&context), &iter)?.typ;
+            let target_type = if let Type::Array(array) = iter_type {
+                FixedSize::Base(array.inner)
+            } else {
+                context.borrow_mut().type_error(
+                    "invalid `for` loop iterator type",
+                    iter.span,
+                    "array",
+                    iter_type,
+                );
+                return Err(SemanticError::fatal());
+            };
             body_scope.borrow_mut().add_var(&target.kind, target_type)?;
             // Traverse the statements within the `for loop` body scope.
             traverse_statements(body_scope, context, body)
@@ -192,62 +232,22 @@ fn for_loop(
     }
 }
 
-fn verify_is_array(
-    scope: Shared<BlockScope>,
-    context: Shared<Context>,
-    expr: &Node<fe::Expr>,
-) -> Result<FixedSize, SemanticError> {
-    let attributes = expressions::expr(Rc::clone(&scope), Rc::clone(&context), &expr)?;
-    if let Type::Array(array) = attributes.typ {
-        // TODO: (SA) Could add a support for tuple
-        return Ok(FixedSize::Base(array.inner));
-    }
-    Err(SemanticError::type_error())
-}
-
-fn verify_is_boolean(
+fn loop_flow_statement(
     scope: Shared<BlockScope>,
     context: Shared<Context>,
-    expr: &Node<fe::Expr>,
-) -> Result<(), SemanticError> {
-    let attributes = expressions::expr(scope, context, expr)?;
-    if let Type::Base(Base::Bool) = attributes.typ {
-        return Ok(());
-    }
-
-    Err(SemanticError::type_error())
-}
-
-fn break_statement(
-    scope: Shared<BlockScope>,
-    _context: Shared<Context>,
-    stmt: &Node<fe::FuncStmt>,
-) -> Result<(), SemanticError> {
-    if let fe::FuncStmt::Break {} = &stmt.kind {
-        return verify_loop_in_scope(scope, SemanticError::break_without_loop());
-    }
-    unreachable!()
-}
-
-fn continue_statement(
-    scope: Shared<BlockScope>,
-    _context: Shared<Context>,
     stmt: &Node<fe::FuncStmt>,
-) -> Result<(), SemanticError> {
-    if let fe::FuncStmt::Continue {} = &stmt.kind {
-        return verify_loop_in_scope(scope, SemanticError::continue_without_loop());
-    }
-    unreachable!()
-}
-
-fn verify_loop_in_scope(
-    scope: Shared<BlockScope>,
-    error: SemanticError,
-) -> Result<(), SemanticError> {
-    if scope.borrow().inherits_type(BlockScopeType::Loop) {
-        Ok(())
-    } else {
-        Err(error)
+) {
+    if !scope.borrow().inherits_type(BlockScopeType::Loop) {
+        let stmt_name = match stmt.kind {
+            fe::FuncStmt::Continue => "continue",
+            fe::FuncStmt::Break => "break",
+            _ => panic!(),
+        };
+        context.borrow_mut().error(
+            format!("`{}` outside of a loop", stmt_name),
+            stmt.span,
+            format!("cannot `{}` outside of a `for` or `while` loop", stmt_name),
+        );
     }
 }
 
@@ -262,13 +262,23 @@ fn if_statement(
             body,
             or_else,
         } => {
+            let test_type = expressions::expr(Rc::clone(&scope), Rc::clone(&context), test)?.typ;
+            if test_type != Type::Base(Base::Bool) {
+                context.borrow_mut().type_error(
+                    "`if` statement condition is not bool",
+                    test.span,
+                    Base::Bool,
+                    test_type,
+                );
+            }
+
             let body_scope =
                 BlockScope::from_block_scope(BlockScopeType::IfElse, Rc::clone(&scope));
             traverse_statements(body_scope, Rc::clone(&context), body)?;
             let or_else_scope =
                 BlockScope::from_block_scope(BlockScopeType::IfElse, Rc::clone(&scope));
             traverse_statements(or_else_scope, Rc::clone(&context), or_else)?;
-            verify_is_boolean(scope, context, test)
+            return Ok(());
         }
         _ => unreachable!(),
     }
@@ -281,9 +291,19 @@ fn while_loop(
 ) -> Result<(), SemanticError> {
     match &stmt.kind {
         fe::FuncStmt::While { test, body } => {
+            let test_type = expressions::expr(Rc::clone(&scope), Rc::clone(&context), &test)?.typ;
+            if test_type != Type::Base(Base::Bool) {
+                context.borrow_mut().type_error(
+                    "`while` loop condition is not bool",
+                    test.span,
+                    Base::Bool,
+                    test_type,
+                );
+            }
+
             let body_scope = BlockScope::from_block_scope(BlockScopeType::Loop, Rc::clone(&scope));
             traverse_statements(body_scope, Rc::clone(&context), body)?;
-            verify_is_boolean(scope, context, test)
+            return Ok(());
         }
         _ => unreachable!(),
     }
@@ -307,24 +327,108 @@ fn emit(
     stmt: &Node<fe::FuncStmt>,
 ) -> Result<(), SemanticError> {
     if let fe::FuncStmt::Emit { name, args } = &stmt.kind {
-        return if let Some(event) = scope.borrow().contract_event_def(&name.kind) {
+        if let Some(event) = scope.borrow().contract_event_def(&name.kind) {
             context.borrow_mut().add_emit(stmt, event.clone());
-            let argument_attributes = args
-                .kind
-                .iter()
-                .map(|arg| expressions::call_arg(Rc::clone(&scope), Rc::clone(&context), arg))
-                .collect::<Result<Vec<_>, _>>()?;
-
-            if fixed_sizes_to_types(event.all_field_types())
-                != expression_attributes_to_types(argument_attributes)
-            {
-                Err(SemanticError::type_error())
-            } else {
-                Ok(())
+
+            if args.kind.len() != event.fields.len() {
+                let mut labels = vec![Label::primary(
+                    name.span,
+                    format!("expects {} arguments", event.fields.len()),
+                )];
+                for arg in &args.kind {
+                    labels.push(Label::secondary(arg.span, ""));
+                }
+                if args.kind.is_empty() {
+                    labels.push(Label::secondary(args.span, "supplied 0 arguments"));
+                } else {
+                    labels.last_mut().unwrap().message =
+                        format!("supplied {} arguments", args.kind.len());
+                }
+                context.borrow_mut().fancy_error(
+                    format!(
+                        "the `{}` event expects {} arguments, but {} were provided",
+                        name.kind,
+                        event.fields.len(),
+                        args.kind.len()
+                    ),
+                    labels,
+                    vec![],
+                );
+                // TODO: add `event defined here` label (need span for event def)
+            }
+
+            for ((field_name, field_type), arg) in event.fields.iter().zip(args.kind.iter()) {
+                let arg_val = match &arg.kind {
+                    fe::CallArg::Arg(value) => {
+                        match &value.kind {
+                            fe::Expr::Name(val_name) if val_name == field_name => {}
+                            _ => {
+                                context.borrow_mut().fancy_error(
+                                    "event arguments must be labeled",
+                                    vec![Label::primary(
+                                        Span::new(value.span.start, value.span.start),
+                                        format!("add `{}=` here", field_name),
+                                    )],
+                                    vec![
+                                        "Note: the label is optional if the argument is a variable"
+                                            .into(),
+                                        "that matches the event field name.".into(),
+                                    ],
+                                );
+                            }
+                        }
+                        value
+                    }
+                    fe::CallArg::Kwarg(fe::Kwarg {
+                        name: arg_name,
+                        value,
+                    }) => {
+                        if &arg_name.kind != field_name {
+                            let notes = if event.has_field(&arg_name.kind) {
+                                vec![
+                                    "Note: the argument order must match the order of".into(),
+                                    "fields in the event definition".into(),
+                                ]
+                            } else {
+                                vec![]
+                            };
+                            context.borrow_mut().fancy_error(
+                                "event argument name mismatch",
+                                vec![Label::primary(
+                                    arg_name.span,
+                                    format!("expected `{}`", field_name),
+                                )],
+                                notes,
+                            );
+                        }
+                        value
+                    }
+                };
+
+                let val_attrs =
+                    expressions::assignable_expr(Rc::clone(&scope), Rc::clone(&context), arg_val)?;
+
+                if field_type != &val_attrs.typ {
+                    context.borrow_mut().type_error(
+                        format!(
+                            "incorrect type for `{}` argument `{}`",
+                            name.kind, field_name
+                        ),
+                        arg_val.span,
+                        field_type,
+                        val_attrs.typ,
+                    );
+                }
             }
         } else {
-            Err(SemanticError::missing_event_definition())
-        };
+            context.borrow_mut().error(
+                format!("undefined event: `{}`", name.kind),
+                name.span,
+                "undefined event",
+            );
+        }
+
+        return Ok(());
     }
 
     unreachable!()
@@ -336,7 +440,16 @@ fn assert(
     stmt: &Node<fe::FuncStmt>,
 ) -> Result<(), SemanticError> {
     if let fe::FuncStmt::Assert { test, msg } = &stmt.kind {
-        verify_is_boolean(Rc::clone(&scope), Rc::clone(&context), test)?;
+        let test_type = expressions::expr(Rc::clone(&scope), Rc::clone(&context), &test)?.typ;
+        if test_type != Type::Base(Base::Bool) {
+            context.borrow_mut().type_error(
+                "`assert` condition is not bool",
+                test.span,
+                Base::Bool,
+                test_type,
+            );
+        }
+
         if let Some(msg) = msg {
             let msg_attributes = expressions::expr(scope, context, msg)?;
             if !matches!(msg_attributes.typ, Type::String(_)) {
diff --git a/analyzer/src/traversal/utils.rs b/analyzer/src/traversal/utils.rs
index 56a684fe77..2f3a7a3ed5 100644
--- a/analyzer/src/traversal/utils.rs
+++ b/analyzer/src/traversal/utils.rs
@@ -12,17 +12,17 @@ pub fn call_arg_value(arg: &fe::CallArg) -> &Node<fe::Expr> {
     }
 }
 
-pub fn expression_attributes_to_types(attributes: Vec<ExpressionAttributes>) -> Vec<Type> {
+pub fn expression_attributes_to_types(attributes: &[ExpressionAttributes]) -> Vec<Type> {
     attributes
         .iter()
         .map(|attributes| attributes.typ.clone())
         .collect()
 }
 
-pub fn fixed_sizes_to_types(sizes: Vec<FixedSize>) -> Vec<Type> {
+pub fn fixed_sizes_to_types(sizes: &[FixedSize]) -> Vec<Type> {
     sizes.iter().map(|param| param.clone().into()).collect()
 }
 
-pub fn types_to_fixed_sizes(sizes: Vec<Type>) -> Result<Vec<FixedSize>, SemanticError> {
+pub fn types_to_fixed_sizes(sizes: &[Type]) -> Result<Vec<FixedSize>, SemanticError> {
     sizes.iter().map(|param| param.clone().try_into()).collect()
 }
diff --git a/analyzer/tests/analysis.rs b/analyzer/tests/analysis.rs
index bcd190ae2f..f6082c945d 100644
--- a/analyzer/tests/analysis.rs
+++ b/analyzer/tests/analysis.rs
@@ -1,13 +1,12 @@
-use fe_analyzer;
 use fe_analyzer::context::Context;
-use fe_common::diagnostics::{diagnostics_string, Diagnostic, Label};
+use fe_analyzer::errors::AnalyzerError;
+use fe_common::diagnostics::{diagnostics_string, print_diagnostics, CsLabel, Diagnostic};
 use fe_common::files::{FileStore, SourceFileId};
 use fe_parser::node::Span;
 use insta::assert_snapshot;
 use rstest::rstest;
 use std::collections::hash_map::DefaultHasher;
 use std::fmt::Debug;
-use std::fs;
 use std::hash::{Hash, Hasher};
 
 #[rstest(
@@ -116,12 +115,24 @@ use std::hash::{Hash, Hasher};
     case::tuple_stress("stress/tuple_stress.fe")
 )]
 fn analysis(fixture: &str) {
-    let src = &fs::read_to_string(format!("tests/fixtures/{}", fixture)).expect("");
-    let fe_module = fe_parser::parse_file(src, SourceFileId(0)).expect("").0;
-
-    let context = fe_analyzer::analyze(&fe_module).expect("");
-
-    assert_snapshot!(build_snapshot(fixture, src, &context))
+    let mut files = FileStore::new();
+    let (src, id) = files
+        .load_file(&format!("tests/fixtures/{}", fixture))
+        .unwrap();
+    let fe_module = fe_parser::parse_file(&src, id).unwrap().0;
+    match fe_analyzer::analyze(&fe_module, id) {
+        Ok(context) => assert_snapshot!(build_snapshot(fixture, &src, &context)),
+        Err(AnalyzerError {
+            diagnostics,
+            classic,
+        }) => {
+            print_diagnostics(&diagnostics, &files);
+            if let Some(err) = classic {
+                eprintln!("Analyzer error: {}", err.format_user(&src));
+            }
+            panic!("analysis failed");
+        }
+    }
 }
 
 fn build_snapshot(path: &str, src: &str, context: &Context) -> String {
@@ -167,7 +178,7 @@ fn build_attributes_diagnostic<T: Hash + Debug>(
     attributes: &T,
 ) -> Diagnostic {
     // Hash the attributes and label the span with it.
-    let label = Label::primary(file_id, span.start..span.end)
+    let label = CsLabel::primary(file_id, span.start..span.end)
         .with_message(format!("attributes hash: {}", hash(attributes)));
     Diagnostic::note()
         .with_labels(vec![label])
diff --git a/analyzer/tests/errors.rs b/analyzer/tests/errors.rs
new file mode 100644
index 0000000000..c92ba3c1f2
--- /dev/null
+++ b/analyzer/tests/errors.rs
@@ -0,0 +1,110 @@
+use fe_analyzer;
+use fe_common::diagnostics::diagnostics_string;
+use fe_common::files::FileStore;
+use insta::assert_snapshot;
+use rstest::rstest;
+
+#[rstest(
+    fixture_file,
+    case("assert_reason_not_string.fe"),
+    case("bad_map.fe"),
+    case("bad_map2.fe"),
+    case("bad_map3.fe"),
+    case("bad_map4.fe"),
+    case("bad_map5.fe"),
+    case("break_without_loop_2.fe"),
+    case("break_without_loop.fe"),
+    case("call_event_with_wrong_types.fe"),
+    case("call_undefined_function_on_contract.fe"),
+    case("call_undefined_function_on_external_contract.fe"),
+    case("call_undefined_function_on_memory_struct.fe"),
+    case("call_undefined_function_on_storage_struct.fe"),
+    case("circular_dependency_create.fe"),
+    case("circular_dependency_create2.fe"),
+    case("continue_without_loop_2.fe"),
+    case("continue_without_loop.fe"),
+    case("duplicate_contract_in_module.fe"),
+    case("duplicate_event_in_contract.fe"),
+    case("duplicate_field_in_contract.fe"),
+    case("duplicate_field_in_struct.fe"),
+    case("duplicate_method_in_contract.fe"),
+    case("duplicate_struct_in_module.fe"),
+    case("duplicate_typedef_in_module.fe"),
+    case("duplicate_var_in_child_scope.fe"),
+    case("duplicate_var_in_contract_method.fe"),
+    case("emit_undefined_event.fe"),
+    case("emit_bad_args.fe"),
+    case("external_call_type_error.fe"),
+    case("external_call_wrong_number_of_params.fe"),
+    case("indexed_event.fe"),
+    case("keccak_called_with_wrong_type.fe"),
+    case("mismatch_return_type.fe"),
+    case("missing_return_in_else.fe"),
+    case("missing_return.fe"),
+    case("needs_mem_copy.fe"),
+    case("non_bool_and.fe"),
+    case("non_bool_or.fe"),
+    case("not_in_scope_2.fe"),
+    case("not_in_scope.fe"),
+    case("numeric_capacity_mismatch/i128_neg.fe"),
+    case("numeric_capacity_mismatch/i128_pos.fe"),
+    case("numeric_capacity_mismatch/i16_neg.fe"),
+    case("numeric_capacity_mismatch/i16_pos.fe"),
+    case("numeric_capacity_mismatch/i256_neg.fe"),
+    case("numeric_capacity_mismatch/i256_pos.fe"),
+    case("numeric_capacity_mismatch/i32_neg.fe"),
+    case("numeric_capacity_mismatch/i32_pos.fe"),
+    case("numeric_capacity_mismatch/i64_neg.fe"),
+    case("numeric_capacity_mismatch/i64_pos.fe"),
+    case("numeric_capacity_mismatch/i8_neg.fe"),
+    case("numeric_capacity_mismatch/i8_pos.fe"),
+    case("numeric_capacity_mismatch/literal_too_big.fe"),
+    case("numeric_capacity_mismatch/literal_too_small.fe"),
+    case("numeric_capacity_mismatch/octal_number.fe"),
+    case("numeric_capacity_mismatch/u128_neg.fe"),
+    case("numeric_capacity_mismatch/u128_pos.fe"),
+    case("numeric_capacity_mismatch/u16_neg.fe"),
+    case("numeric_capacity_mismatch/u16_pos.fe"),
+    case("numeric_capacity_mismatch/u256_neg.fe"),
+    case("numeric_capacity_mismatch/u256_pos.fe"),
+    case("numeric_capacity_mismatch/u32_neg.fe"),
+    case("numeric_capacity_mismatch/u32_pos.fe"),
+    case("numeric_capacity_mismatch/u64_neg.fe"),
+    case("numeric_capacity_mismatch/u64_pos.fe"),
+    case("numeric_capacity_mismatch/u8_neg.fe"),
+    case("numeric_capacity_mismatch/u8_pos.fe"),
+    case("pow_with_signed_exponent.fe"),
+    case("pow_with_wrong_capacity.fe"),
+    case("return_addition_with_mixed_types.fe"),
+    case("return_call_to_fn_with_param_type_mismatch.fe"),
+    case("return_call_to_fn_without_return.fe"),
+    case("return_from_init.fe"),
+    case("return_lt_mixed_types.fe"),
+    case("strict_boolean_if_else.fe"),
+    case("string_capacity_mismatch.fe"),
+    case("struct_call_without_kw_args.fe"),
+    case("type_constructor_from_variable.fe"),
+    case("unary_minus_on_bool.fe"),
+    case("unexpected_return.fe"),
+    case("aug_assign_non_numeric.fe"),
+    case("binary_operations/add_uints.fe"),
+    case("binary_operations/lshift_bool.fe"),
+    case("binary_operations/lshift_with_int.fe"),
+    case("binary_operations/pow_int.fe")
+)]
+fn analyzer_errors(fixture_file: &str) {
+    let mut files = FileStore::new();
+    let (src, id) = files
+        .load_file(&format!("tests/fixtures/errors/{}", fixture_file))
+        .expect("unable to read fixture file");
+
+    let (fe_module, _) = fe_parser::parse_file(&src, id).unwrap();
+    let err = fe_analyzer::analyze(&fe_module, id).unwrap_err();
+
+    let mut errstr = diagnostics_string(&err.diagnostics, &files);
+    if let Some(classic) = err.classic {
+        errstr.push_str(&format!("\n\n{}", classic.format_user(&src)));
+    }
+
+    assert_snapshot!(errstr)
+}
diff --git a/analyzer/tests/fixtures/demos/erc20_token.fe b/analyzer/tests/fixtures/demos/erc20_token.fe
index 0305ce5d63..e8a5747192 100644
--- a/analyzer/tests/fixtures/demos/erc20_token.fe
+++ b/analyzer/tests/fixtures/demos/erc20_token.fe
@@ -39,22 +39,22 @@ contract ERC20:
     pub def balanceOf(account: address) -> u256:
         return self._balances[account]
 
-    pub def transfer(recipient: address, amount: u256) -> bool:
-        self._transfer(msg.sender, recipient, amount)
+    pub def transfer(recipient: address, value: u256) -> bool:
+        self._transfer(msg.sender, recipient, value)
         return true
 
     pub def allowance(owner: address, spender: address) -> u256:
         return self._allowances[owner][spender]
 
-    pub def approve(spender: address, amount: u256) -> bool:
-        self._approve(msg.sender, spender, amount)
+    pub def approve(spender: address, value: u256) -> bool:
+        self._approve(msg.sender, spender, value)
         return true
 
-    pub def transferFrom(sender: address, recipient: address, amount: u256) -> bool:
-        assert self._allowances[sender][msg.sender] >= amount
+    pub def transferFrom(sender: address, recipient: address, value: u256) -> bool:
+        assert self._allowances[sender][msg.sender] >= value
 
-        self._transfer(sender, recipient, amount)
-        self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+        self._transfer(sender, recipient, value)
+        self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
         return true
 
     pub def increaseAllowance(spender: address, addedValue: u256) -> bool:
@@ -65,43 +65,43 @@ contract ERC20:
         self._approve(msg.sender, spender, self._allowances[msg.sender][spender] - subtractedValue)
         return true
 
-    def _transfer(sender: address, recipient: address, amount: u256):
+    def _transfer(sender: address, recipient: address, value: u256):
         assert sender != address(0)
         assert recipient != address(0)
 
-        self._before_token_transfer(sender, recipient, amount)
+        self._before_token_transfer(sender, recipient, value)
 
-        self._balances[sender] = self._balances[sender] - amount
-        self._balances[recipient] = self._balances[recipient] + amount
-        emit Transfer(sender, recipient, amount)
+        self._balances[sender] = self._balances[sender] - value
+        self._balances[recipient] = self._balances[recipient] + value
+        emit Transfer(from=sender, to=recipient, value=value)
 
-    def _mint(account: address, amount: u256):
+    def _mint(account: address, value: u256):
         assert account != address(0)
 
-        self._before_token_transfer(address(0), account, amount)
+        self._before_token_transfer(address(0), account, value)
 
-        self._total_supply = self._total_supply + amount
-        self._balances[account] = self._balances[account] + amount
-        emit Transfer(address(0), account, amount)
+        self._total_supply = self._total_supply + value
+        self._balances[account] = self._balances[account] + value
+        emit Transfer(from=address(0), to=account, value=value)
 
-    def _burn(account: address, amount: u256):
+    def _burn(account: address, value: u256):
         assert account != address(0)
 
-        self._before_token_transfer(account, address(0), amount)
+        self._before_token_transfer(account, address(0), value)
 
-        self._balances[account] = self._balances[account] - amount
-        self._total_supply = self._total_supply - amount
-        emit Transfer(account, address(0), amount)
+        self._balances[account] = self._balances[account] - value
+        self._total_supply = self._total_supply - value
+        emit Transfer(from=account, to=address(0), value)
 
-    def _approve(owner: address, spender: address, amount: u256):
+    def _approve(owner: address, spender: address, value: u256):
         assert owner != address(0)
         assert spender != address(0)
 
-        self._allowances[owner][spender] = amount
-        emit Approval(owner, spender, amount)
+        self._allowances[owner][spender] = value
+        emit Approval(owner, spender, value)
 
     def _setup_decimals(decimals_: u8):
         self._decimals = decimals_
 
-    def _before_token_transfer(from: address, to: address, amount: u256):
+    def _before_token_transfer(from: address, to: address, value: u256):
         pass
diff --git a/analyzer/tests/fixtures/demos/uniswap.fe b/analyzer/tests/fixtures/demos/uniswap.fe
index a52ec5c2e4..85399be509 100644
--- a/analyzer/tests/fixtures/demos/uniswap.fe
+++ b/analyzer/tests/fixtures/demos/uniswap.fe
@@ -75,12 +75,12 @@ contract UniswapV2Pair:
     def _mint(to: address, value: u256):
         self.total_supply = self.total_supply + value
         self.balances[to] = self.balances[to] + value
-        emit Transfer(address(0), to, value)
+        emit Transfer(from=address(0), to, value)
 
     def _burn(from: address, value: u256):
         self.balances[from] = self.balances[from] - value
         self.total_supply = self.total_supply - value
-        emit Transfer(from, address(0), value)
+        emit Transfer(from, to=address(0), value)
 
     def _approve(owner: address, spender: address, value: u256):
         self.allowances[owner][spender] = value
@@ -133,7 +133,7 @@ contract UniswapV2Pair:
         self.reserve0 = balance0
         self.reserve1 = balance1
         self.block_timestamp_last = block_timestamp
-        emit Sync(self.reserve0, self.reserve1)
+        emit Sync(reserve0=self.reserve0, reserve1=self.reserve1)
 
     # if fee is on, mint liquidity equivalent to 1/6th of the growth in sqrt(k)
     def _mint_fee(reserve0: u256, reserve1: u256) -> bool:
@@ -182,7 +182,7 @@ contract UniswapV2Pair:
         if fee_on:
             self.k_last = reserve0 * reserve1 # reserve0 and reserve1 are up-to-date
 
-        emit Mint(msg.sender, amount0, amount1)
+        emit Mint(sender=msg.sender, amount0, amount1)
         return liquidity
 
     # this low-level function should be called from a contract which performs important safety checks
@@ -211,7 +211,7 @@ contract UniswapV2Pair:
         if fee_on:
             self.k_last = reserve0 * reserve1 # reserve0 and reserve1 are up-to-date
 
-        emit Burn(msg.sender, amount0, amount1, to)
+        emit Burn(sender=msg.sender, amount0, amount1, to)
         return (amount0, amount1)
 
     # this low-level function should be called from a contract which performs important safety checks
@@ -251,7 +251,7 @@ contract UniswapV2Pair:
         assert balance0_adjusted * balance1_adjusted >= reserve0 * reserve1 * 1000000, "UniswapV2: K"
 
         self._update(balance0, balance1, reserve0, reserve1)
-        emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+        emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
 
     # force balances to match reserves
     pub def skim(to: address):
@@ -326,7 +326,7 @@ contract UniswapV2Factory:
         self.all_pairs[self.pair_counter] = address(pair)
         self.pair_counter = self.pair_counter + 1
 
-        emit PairCreated(token0, token1, address(pair), self.pair_counter)
+        emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
         return address(pair)
 
     pub def set_fee_to(fee_to: address):
diff --git a/compiler/tests/fixtures/compile_errors/assert_reason_not_string.fe b/analyzer/tests/fixtures/errors/assert_reason_not_string.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/assert_reason_not_string.fe
rename to analyzer/tests/fixtures/errors/assert_reason_not_string.fe
diff --git a/analyzer/tests/fixtures/errors/assign_call.fe b/analyzer/tests/fixtures/errors/assign_call.fe
new file mode 100644
index 0000000000..cdffbe250b
--- /dev/null
+++ b/analyzer/tests/fixtures/errors/assign_call.fe
@@ -0,0 +1,8 @@
+contract C:
+  val: u256
+
+  def f():
+    self.g() = 10
+
+  def g() -> u256:
+    return self.val
diff --git a/analyzer/tests/fixtures/errors/assign_int.fe b/analyzer/tests/fixtures/errors/assign_int.fe
new file mode 100644
index 0000000000..b877fff558
--- /dev/null
+++ b/analyzer/tests/fixtures/errors/assign_int.fe
@@ -0,0 +1,3 @@
+contract C:
+  def f():
+    5 = 6
diff --git a/compiler/tests/fixtures/compile_errors/aug_assign_non_numeric.fe b/analyzer/tests/fixtures/errors/aug_assign_non_numeric.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/aug_assign_non_numeric.fe
rename to analyzer/tests/fixtures/errors/aug_assign_non_numeric.fe
diff --git a/compiler/tests/fixtures/compile_errors/bad_map.fe b/analyzer/tests/fixtures/errors/bad_map.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/bad_map.fe
rename to analyzer/tests/fixtures/errors/bad_map.fe
diff --git a/compiler/tests/fixtures/compile_errors/bad_map2.fe b/analyzer/tests/fixtures/errors/bad_map2.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/bad_map2.fe
rename to analyzer/tests/fixtures/errors/bad_map2.fe
diff --git a/compiler/tests/fixtures/compile_errors/bad_map3.fe b/analyzer/tests/fixtures/errors/bad_map3.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/bad_map3.fe
rename to analyzer/tests/fixtures/errors/bad_map3.fe
diff --git a/compiler/tests/fixtures/compile_errors/bad_map4.fe b/analyzer/tests/fixtures/errors/bad_map4.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/bad_map4.fe
rename to analyzer/tests/fixtures/errors/bad_map4.fe
diff --git a/compiler/tests/fixtures/compile_errors/bad_map5.fe b/analyzer/tests/fixtures/errors/bad_map5.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/bad_map5.fe
rename to analyzer/tests/fixtures/errors/bad_map5.fe
diff --git a/compiler/tests/fixtures/compile_errors/binary_operations/add_uints.fe b/analyzer/tests/fixtures/errors/binary_operations/add_uints.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/binary_operations/add_uints.fe
rename to analyzer/tests/fixtures/errors/binary_operations/add_uints.fe
diff --git a/compiler/tests/fixtures/compile_errors/binary_operations/lshift_bool.fe b/analyzer/tests/fixtures/errors/binary_operations/lshift_bool.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/binary_operations/lshift_bool.fe
rename to analyzer/tests/fixtures/errors/binary_operations/lshift_bool.fe
diff --git a/compiler/tests/fixtures/compile_errors/binary_operations/lshift_with_int.fe b/analyzer/tests/fixtures/errors/binary_operations/lshift_with_int.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/binary_operations/lshift_with_int.fe
rename to analyzer/tests/fixtures/errors/binary_operations/lshift_with_int.fe
diff --git a/compiler/tests/fixtures/compile_errors/binary_operations/pow_int.fe b/analyzer/tests/fixtures/errors/binary_operations/pow_int.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/binary_operations/pow_int.fe
rename to analyzer/tests/fixtures/errors/binary_operations/pow_int.fe
diff --git a/compiler/tests/fixtures/compile_errors/break_without_loop.fe b/analyzer/tests/fixtures/errors/break_without_loop.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/break_without_loop.fe
rename to analyzer/tests/fixtures/errors/break_without_loop.fe
diff --git a/compiler/tests/fixtures/compile_errors/break_without_loop_2.fe b/analyzer/tests/fixtures/errors/break_without_loop_2.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/break_without_loop_2.fe
rename to analyzer/tests/fixtures/errors/break_without_loop_2.fe
diff --git a/compiler/tests/fixtures/compile_errors/call_event_with_wrong_types.fe b/analyzer/tests/fixtures/errors/call_event_with_wrong_types.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/call_event_with_wrong_types.fe
rename to analyzer/tests/fixtures/errors/call_event_with_wrong_types.fe
diff --git a/compiler/tests/fixtures/compile_errors/call_undefined_function_on_contract.fe b/analyzer/tests/fixtures/errors/call_undefined_function_on_contract.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/call_undefined_function_on_contract.fe
rename to analyzer/tests/fixtures/errors/call_undefined_function_on_contract.fe
diff --git a/compiler/tests/fixtures/compile_errors/call_undefined_function_on_external_contract.fe b/analyzer/tests/fixtures/errors/call_undefined_function_on_external_contract.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/call_undefined_function_on_external_contract.fe
rename to analyzer/tests/fixtures/errors/call_undefined_function_on_external_contract.fe
diff --git a/compiler/tests/fixtures/compile_errors/call_undefined_function_on_memory_struct.fe b/analyzer/tests/fixtures/errors/call_undefined_function_on_memory_struct.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/call_undefined_function_on_memory_struct.fe
rename to analyzer/tests/fixtures/errors/call_undefined_function_on_memory_struct.fe
diff --git a/compiler/tests/fixtures/compile_errors/call_undefined_function_on_storage_struct.fe b/analyzer/tests/fixtures/errors/call_undefined_function_on_storage_struct.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/call_undefined_function_on_storage_struct.fe
rename to analyzer/tests/fixtures/errors/call_undefined_function_on_storage_struct.fe
diff --git a/compiler/tests/fixtures/compile_errors/circular_dependency_create.fe b/analyzer/tests/fixtures/errors/circular_dependency_create.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/circular_dependency_create.fe
rename to analyzer/tests/fixtures/errors/circular_dependency_create.fe
diff --git a/compiler/tests/fixtures/compile_errors/circular_dependency_create2.fe b/analyzer/tests/fixtures/errors/circular_dependency_create2.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/circular_dependency_create2.fe
rename to analyzer/tests/fixtures/errors/circular_dependency_create2.fe
diff --git a/compiler/tests/fixtures/compile_errors/continue_without_loop.fe b/analyzer/tests/fixtures/errors/continue_without_loop.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/continue_without_loop.fe
rename to analyzer/tests/fixtures/errors/continue_without_loop.fe
diff --git a/compiler/tests/fixtures/compile_errors/continue_without_loop_2.fe b/analyzer/tests/fixtures/errors/continue_without_loop_2.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/continue_without_loop_2.fe
rename to analyzer/tests/fixtures/errors/continue_without_loop_2.fe
diff --git a/compiler/tests/fixtures/compile_errors/duplicate_contract_in_module.fe b/analyzer/tests/fixtures/errors/duplicate_contract_in_module.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/duplicate_contract_in_module.fe
rename to analyzer/tests/fixtures/errors/duplicate_contract_in_module.fe
diff --git a/compiler/tests/fixtures/compile_errors/duplicate_event_in_contract.fe b/analyzer/tests/fixtures/errors/duplicate_event_in_contract.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/duplicate_event_in_contract.fe
rename to analyzer/tests/fixtures/errors/duplicate_event_in_contract.fe
diff --git a/compiler/tests/fixtures/compile_errors/duplicate_field_in_contract.fe b/analyzer/tests/fixtures/errors/duplicate_field_in_contract.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/duplicate_field_in_contract.fe
rename to analyzer/tests/fixtures/errors/duplicate_field_in_contract.fe
diff --git a/compiler/tests/fixtures/compile_errors/duplicate_field_in_struct.fe b/analyzer/tests/fixtures/errors/duplicate_field_in_struct.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/duplicate_field_in_struct.fe
rename to analyzer/tests/fixtures/errors/duplicate_field_in_struct.fe
diff --git a/compiler/tests/fixtures/compile_errors/duplicate_method_in_contract.fe b/analyzer/tests/fixtures/errors/duplicate_method_in_contract.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/duplicate_method_in_contract.fe
rename to analyzer/tests/fixtures/errors/duplicate_method_in_contract.fe
diff --git a/compiler/tests/fixtures/compile_errors/duplicate_struct_in_module.fe b/analyzer/tests/fixtures/errors/duplicate_struct_in_module.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/duplicate_struct_in_module.fe
rename to analyzer/tests/fixtures/errors/duplicate_struct_in_module.fe
diff --git a/compiler/tests/fixtures/compile_errors/duplicate_typedef_in_module.fe b/analyzer/tests/fixtures/errors/duplicate_typedef_in_module.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/duplicate_typedef_in_module.fe
rename to analyzer/tests/fixtures/errors/duplicate_typedef_in_module.fe
diff --git a/compiler/tests/fixtures/compile_errors/duplicate_var_in_child_scope.fe b/analyzer/tests/fixtures/errors/duplicate_var_in_child_scope.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/duplicate_var_in_child_scope.fe
rename to analyzer/tests/fixtures/errors/duplicate_var_in_child_scope.fe
diff --git a/compiler/tests/fixtures/compile_errors/duplicate_var_in_contract_method.fe b/analyzer/tests/fixtures/errors/duplicate_var_in_contract_method.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/duplicate_var_in_contract_method.fe
rename to analyzer/tests/fixtures/errors/duplicate_var_in_contract_method.fe
diff --git a/analyzer/tests/fixtures/errors/emit_bad_args.fe b/analyzer/tests/fixtures/errors/emit_bad_args.fe
new file mode 100644
index 0000000000..8a21babc35
--- /dev/null
+++ b/analyzer/tests/fixtures/errors/emit_bad_args.fe
@@ -0,0 +1,8 @@
+contract Bar:
+  event Foo:
+    idx x: address
+    y: u256
+    z: bool
+
+  pub def test():
+    emit Foo((1, 2), z=10, y=true, x=5)
\ No newline at end of file
diff --git a/compiler/tests/fixtures/compile_errors/emit_undefined_event.fe b/analyzer/tests/fixtures/errors/emit_undefined_event.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/emit_undefined_event.fe
rename to analyzer/tests/fixtures/errors/emit_undefined_event.fe
diff --git a/compiler/tests/fixtures/compile_errors/external_call_type_error.fe b/analyzer/tests/fixtures/errors/external_call_type_error.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/external_call_type_error.fe
rename to analyzer/tests/fixtures/errors/external_call_type_error.fe
diff --git a/compiler/tests/fixtures/compile_errors/external_call_wrong_number_of_params.fe b/analyzer/tests/fixtures/errors/external_call_wrong_number_of_params.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/external_call_wrong_number_of_params.fe
rename to analyzer/tests/fixtures/errors/external_call_wrong_number_of_params.fe
diff --git a/compiler/tests/fixtures/compile_errors/indexed_event.fe b/analyzer/tests/fixtures/errors/indexed_event.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/indexed_event.fe
rename to analyzer/tests/fixtures/errors/indexed_event.fe
diff --git a/compiler/tests/fixtures/compile_errors/keccak_called_with_wrong_type.fe b/analyzer/tests/fixtures/errors/keccak_called_with_wrong_type.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/keccak_called_with_wrong_type.fe
rename to analyzer/tests/fixtures/errors/keccak_called_with_wrong_type.fe
diff --git a/compiler/tests/fixtures/compile_errors/mismatch_return_type.fe b/analyzer/tests/fixtures/errors/mismatch_return_type.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/mismatch_return_type.fe
rename to analyzer/tests/fixtures/errors/mismatch_return_type.fe
diff --git a/compiler/tests/fixtures/compile_errors/missing_return.fe b/analyzer/tests/fixtures/errors/missing_return.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/missing_return.fe
rename to analyzer/tests/fixtures/errors/missing_return.fe
diff --git a/compiler/tests/fixtures/compile_errors/missing_return_in_else.fe b/analyzer/tests/fixtures/errors/missing_return_in_else.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/missing_return_in_else.fe
rename to analyzer/tests/fixtures/errors/missing_return_in_else.fe
diff --git a/compiler/tests/fixtures/compile_errors/needs_mem_copy.fe b/analyzer/tests/fixtures/errors/needs_mem_copy.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/needs_mem_copy.fe
rename to analyzer/tests/fixtures/errors/needs_mem_copy.fe
diff --git a/compiler/tests/fixtures/compile_errors/non_bool_and.fe b/analyzer/tests/fixtures/errors/non_bool_and.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/non_bool_and.fe
rename to analyzer/tests/fixtures/errors/non_bool_and.fe
diff --git a/compiler/tests/fixtures/compile_errors/non_bool_or.fe b/analyzer/tests/fixtures/errors/non_bool_or.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/non_bool_or.fe
rename to analyzer/tests/fixtures/errors/non_bool_or.fe
diff --git a/compiler/tests/fixtures/compile_errors/not_in_scope.fe b/analyzer/tests/fixtures/errors/not_in_scope.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/not_in_scope.fe
rename to analyzer/tests/fixtures/errors/not_in_scope.fe
diff --git a/compiler/tests/fixtures/compile_errors/not_in_scope_2.fe b/analyzer/tests/fixtures/errors/not_in_scope_2.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/not_in_scope_2.fe
rename to analyzer/tests/fixtures/errors/not_in_scope_2.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i128_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i128_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i128_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i128_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i128_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i128_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i128_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i128_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i16_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i16_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i16_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i16_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i16_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i16_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i16_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i16_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i256_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i256_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i256_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i256_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i256_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i256_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i256_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i256_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i32_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i32_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i32_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i32_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i32_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i32_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i32_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i32_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i64_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i64_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i64_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i64_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i64_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i64_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i64_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i64_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i8_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i8_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i8_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i8_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i8_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i8_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/i8_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/i8_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/literal_too_big.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/literal_too_big.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/literal_too_big.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/literal_too_big.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/literal_too_small.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/literal_too_small.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/literal_too_small.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/literal_too_small.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/octal_number.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/octal_number.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/octal_number.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/octal_number.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u128_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u128_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u128_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u128_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u128_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u128_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u128_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u128_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u16_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u16_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u16_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u16_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u16_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u16_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u16_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u16_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u256_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u256_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u256_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u256_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u256_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u256_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u256_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u256_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u32_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u32_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u32_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u32_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u32_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u32_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u32_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u32_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u64_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u64_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u64_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u64_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u64_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u64_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u64_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u64_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u8_neg.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u8_neg.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u8_neg.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u8_neg.fe
diff --git a/compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u8_pos.fe b/analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u8_pos.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/numeric_capacity_mismatch/u8_pos.fe
rename to analyzer/tests/fixtures/errors/numeric_capacity_mismatch/u8_pos.fe
diff --git a/compiler/tests/fixtures/compile_errors/pow_with_signed_exponent.fe b/analyzer/tests/fixtures/errors/pow_with_signed_exponent.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/pow_with_signed_exponent.fe
rename to analyzer/tests/fixtures/errors/pow_with_signed_exponent.fe
diff --git a/compiler/tests/fixtures/compile_errors/pow_with_wrong_capacity.fe b/analyzer/tests/fixtures/errors/pow_with_wrong_capacity.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/pow_with_wrong_capacity.fe
rename to analyzer/tests/fixtures/errors/pow_with_wrong_capacity.fe
diff --git a/compiler/tests/fixtures/compile_errors/return_addition_with_mixed_types.fe b/analyzer/tests/fixtures/errors/return_addition_with_mixed_types.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/return_addition_with_mixed_types.fe
rename to analyzer/tests/fixtures/errors/return_addition_with_mixed_types.fe
diff --git a/compiler/tests/fixtures/compile_errors/return_call_to_fn_with_param_type_mismatch.fe b/analyzer/tests/fixtures/errors/return_call_to_fn_with_param_type_mismatch.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/return_call_to_fn_with_param_type_mismatch.fe
rename to analyzer/tests/fixtures/errors/return_call_to_fn_with_param_type_mismatch.fe
diff --git a/compiler/tests/fixtures/compile_errors/return_call_to_fn_without_return.fe b/analyzer/tests/fixtures/errors/return_call_to_fn_without_return.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/return_call_to_fn_without_return.fe
rename to analyzer/tests/fixtures/errors/return_call_to_fn_without_return.fe
diff --git a/compiler/tests/fixtures/compile_errors/return_from_init.fe b/analyzer/tests/fixtures/errors/return_from_init.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/return_from_init.fe
rename to analyzer/tests/fixtures/errors/return_from_init.fe
diff --git a/compiler/tests/fixtures/compile_errors/return_lt_mixed_types.fe b/analyzer/tests/fixtures/errors/return_lt_mixed_types.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/return_lt_mixed_types.fe
rename to analyzer/tests/fixtures/errors/return_lt_mixed_types.fe
diff --git a/compiler/tests/fixtures/compile_errors/strict_boolean_if_else.fe b/analyzer/tests/fixtures/errors/strict_boolean_if_else.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/strict_boolean_if_else.fe
rename to analyzer/tests/fixtures/errors/strict_boolean_if_else.fe
diff --git a/compiler/tests/fixtures/compile_errors/string_capacity_mismatch.fe b/analyzer/tests/fixtures/errors/string_capacity_mismatch.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/string_capacity_mismatch.fe
rename to analyzer/tests/fixtures/errors/string_capacity_mismatch.fe
diff --git a/compiler/tests/fixtures/compile_errors/struct_call_without_kw_args.fe b/analyzer/tests/fixtures/errors/struct_call_without_kw_args.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/struct_call_without_kw_args.fe
rename to analyzer/tests/fixtures/errors/struct_call_without_kw_args.fe
diff --git a/compiler/tests/fixtures/compile_errors/type_constructor_from_variable.fe b/analyzer/tests/fixtures/errors/type_constructor_from_variable.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/type_constructor_from_variable.fe
rename to analyzer/tests/fixtures/errors/type_constructor_from_variable.fe
diff --git a/compiler/tests/fixtures/compile_errors/unary_minus_on_bool.fe b/analyzer/tests/fixtures/errors/unary_minus_on_bool.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/unary_minus_on_bool.fe
rename to analyzer/tests/fixtures/errors/unary_minus_on_bool.fe
diff --git a/compiler/tests/fixtures/compile_errors/unexpected_return.fe b/analyzer/tests/fixtures/errors/unexpected_return.fe
similarity index 100%
rename from compiler/tests/fixtures/compile_errors/unexpected_return.fe
rename to analyzer/tests/fixtures/errors/unexpected_return.fe
diff --git a/analyzer/tests/fixtures/features/events.fe b/analyzer/tests/fixtures/features/events.fe
index 0e4e26ad51..9a0fdce9f3 100644
--- a/analyzer/tests/fixtures/features/events.fe
+++ b/analyzer/tests/fixtures/features/events.fe
@@ -17,13 +17,13 @@ contract Foo:
         addrs: address[2]
 
     pub def emit_nums():
-        emit Nums(26, 42)
+        emit Nums(num1=26, num2=42)
 
     pub def emit_bases(addr: address):
-        emit Bases(26, addr)
+        emit Bases(num=26, addr)
 
     pub def emit_mix(addr: address, my_bytes: bytes[100]):
-        emit Mix(26, addr, 42, my_bytes)
+        emit Mix(num1=26, addr, num2=42, my_bytes)
 
     pub def emit_addresses(addr1: address, addr2: address):
         addrs: address[2]
diff --git a/analyzer/tests/fixtures/features/ownable.fe b/analyzer/tests/fixtures/features/ownable.fe
index 6a3ace30b6..c38cc675dc 100644
--- a/analyzer/tests/fixtures/features/ownable.fe
+++ b/analyzer/tests/fixtures/features/ownable.fe
@@ -1,23 +1,23 @@
 contract Ownable:
   _owner: address
-  
+
   event OwnershipTransferred:
     idx previousOwner: address
     idx newOwner: address
-    
+
   def __init__():
     self._owner = msg.sender
-  
+
   pub def owner() -> address:
     return self._owner
-  
+
   pub def renounceOwnership():
     assert msg.sender == self._owner
     self._owner = address(0)
-    emit OwnershipTransferred(msg.sender, address(0))
-  
+    emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+
   pub def transferOwnership(newOwner: address):
     assert msg.sender == self._owner
     assert newOwner != address(0)
     self._owner = newOwner
-    emit OwnershipTransferred(msg.sender, newOwner)
+    emit OwnershipTransferred(previousOwner=msg.sender, newOwner)
diff --git a/analyzer/tests/fixtures/features/sized_vals_in_sto.fe b/analyzer/tests/fixtures/features/sized_vals_in_sto.fe
index 6ef6c8f3a5..53aab158e5 100644
--- a/analyzer/tests/fixtures/features/sized_vals_in_sto.fe
+++ b/analyzer/tests/fixtures/features/sized_vals_in_sto.fe
@@ -28,7 +28,7 @@ contract Foo:
 
     pub def emit_event():
         emit MyEvent(
-            self.num,
-            self.nums.to_mem(),
-            self.str.to_mem()
+            num=self.num,
+            nums=self.nums.to_mem(),
+            str=self.str.to_mem()
         )
\ No newline at end of file
diff --git a/analyzer/tests/fixtures/features/strings.fe b/analyzer/tests/fixtures/features/strings.fe
index c18636ce30..99c54f9c00 100644
--- a/analyzer/tests/fixtures/features/strings.fe
+++ b/analyzer/tests/fixtures/features/strings.fe
@@ -9,7 +9,7 @@ contract Foo:
         s5: string100
 
     pub def __init__(s1: string42, a: address, s2: string26, u: u256, s3: string100):
-        emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+        emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
 
     pub def bar(s1: string100, s2: string100) -> string100:
         return s2
diff --git a/analyzer/tests/fixtures/stress/abi_encoding_stress.fe b/analyzer/tests/fixtures/stress/abi_encoding_stress.fe
index e31ecc2f1e..38cea415e9 100644
--- a/analyzer/tests/fixtures/stress/abi_encoding_stress.fe
+++ b/analyzer/tests/fixtures/stress/abi_encoding_stress.fe
@@ -73,10 +73,10 @@ contract Foo:
 
     pub def emit_my_event():
         emit MyEvent(
-            self.my_addrs.to_mem(),
-            self.my_u128,
-            self.my_string.to_mem(),
-            self.my_u8s.to_mem(),
-            self.my_bool,
-            self.my_bytes.to_mem()
+            my_addrs=self.my_addrs.to_mem(),
+            my_u128=self.my_u128,
+            my_string=self.my_string.to_mem(),
+            my_u8s=self.my_u8s.to_mem(),
+            my_bool=self.my_bool,
+            my_bytes=self.my_bytes.to_mem()
         )
diff --git a/analyzer/tests/fixtures/stress/data_copying_stress.fe b/analyzer/tests/fixtures/stress/data_copying_stress.fe
index 5c18018501..42a4418a19 100644
--- a/analyzer/tests/fixtures/stress/data_copying_stress.fe
+++ b/analyzer/tests/fixtures/stress/data_copying_stress.fe
@@ -71,7 +71,7 @@ contract Foo:
         )
 
     def emit_my_event_internal(some_string: string42, some_u256: u256):
-        emit MyEvent(some_string, some_u256)
+        emit MyEvent(my_string=some_string, my_u256=some_u256)
 
     pub def set_my_addrs(my_addrs: address[3]):
         self.my_addrs = my_addrs
diff --git a/analyzer/tests/snapshots/analysis__case_001_erc20_token.snap b/analyzer/tests/snapshots/analysis__case_001_erc20_token.snap
index a3396e58dd..3182c7122a 100644
--- a/analyzer/tests/snapshots/analysis__case_001_erc20_token.snap
+++ b/analyzer/tests/snapshots/analysis__case_001_erc20_token.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -43,7 +43,7 @@ ModuleAttributes {
                                 ),
                             ),
                             (
-                                "amount",
+                                "value",
                                 Base(
                                     Numeric(
                                         U256,
@@ -169,7 +169,7 @@ ModuleAttributes {
                                 ),
                             ),
                             (
-                                "amount",
+                                "value",
                                 Base(
                                     Numeric(
                                         U256,
@@ -198,7 +198,7 @@ ModuleAttributes {
                                 ),
                             ),
                             (
-                                "amount",
+                                "value",
                                 Base(
                                     Numeric(
                                         U256,
@@ -745,7 +745,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:43:24
    │
-43 │         self._transfer(msg.sender, recipient, amount)
+43 │         self._transfer(msg.sender, recipient, value)
    │                        ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -759,7 +759,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:43:24
    │
-43 │         self._transfer(msg.sender, recipient, amount)
+43 │         self._transfer(msg.sender, recipient, value)
    │                        ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -773,7 +773,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:43:36
    │
-43 │         self._transfer(msg.sender, recipient, amount)
+43 │         self._transfer(msg.sender, recipient, value)
    │                                    ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -787,7 +787,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:43:36
    │
-43 │         self._transfer(msg.sender, recipient, amount)
+43 │         self._transfer(msg.sender, recipient, value)
    │                                    ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -801,8 +801,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:43:47
    │
-43 │         self._transfer(msg.sender, recipient, amount)
-   │                                               ^^^^^^ attributes hash: 16797824492585953824
+43 │         self._transfer(msg.sender, recipient, value)
+   │                                               ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -817,8 +817,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:43:47
    │
-43 │         self._transfer(msg.sender, recipient, amount)
-   │                                               ^^^^^^ attributes hash: 16797824492585953824
+43 │         self._transfer(msg.sender, recipient, value)
+   │                                               ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -833,8 +833,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:43:9
    │
-43 │         self._transfer(msg.sender, recipient, amount)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
+43 │         self._transfer(msg.sender, recipient, value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
    │
    = ExpressionAttributes {
          typ: Tuple(
@@ -1026,7 +1026,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:50:23
    │
-50 │         self._approve(msg.sender, spender, amount)
+50 │         self._approve(msg.sender, spender, value)
    │                       ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1040,7 +1040,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:50:23
    │
-50 │         self._approve(msg.sender, spender, amount)
+50 │         self._approve(msg.sender, spender, value)
    │                       ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1054,7 +1054,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:50:35
    │
-50 │         self._approve(msg.sender, spender, amount)
+50 │         self._approve(msg.sender, spender, value)
    │                                   ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1068,7 +1068,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:50:35
    │
-50 │         self._approve(msg.sender, spender, amount)
+50 │         self._approve(msg.sender, spender, value)
    │                                   ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1082,8 +1082,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:50:44
    │
-50 │         self._approve(msg.sender, spender, amount)
-   │                                            ^^^^^^ attributes hash: 16797824492585953824
+50 │         self._approve(msg.sender, spender, value)
+   │                                            ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1098,8 +1098,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:50:44
    │
-50 │         self._approve(msg.sender, spender, amount)
-   │                                            ^^^^^^ attributes hash: 16797824492585953824
+50 │         self._approve(msg.sender, spender, value)
+   │                                            ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1114,8 +1114,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:50:9
    │
-50 │         self._approve(msg.sender, spender, amount)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
+50 │         self._approve(msg.sender, spender, value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
    │
    = ExpressionAttributes {
          typ: Tuple(
@@ -1158,7 +1158,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:16
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
+54 │         assert self._allowances[sender][msg.sender] >= value
    │                ^^^^^^^^^^^^^^^^ attributes hash: 1809596235975120774
    │
    = ExpressionAttributes {
@@ -1188,7 +1188,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:33
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
+54 │         assert self._allowances[sender][msg.sender] >= value
    │                                 ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1202,7 +1202,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:33
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
+54 │         assert self._allowances[sender][msg.sender] >= value
    │                                 ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1216,7 +1216,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:16
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
+54 │         assert self._allowances[sender][msg.sender] >= value
    │                ^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 8054157001498380852
    │
    = ExpressionAttributes {
@@ -1239,7 +1239,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:41
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
+54 │         assert self._allowances[sender][msg.sender] >= value
    │                                         ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1253,7 +1253,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:41
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
+54 │         assert self._allowances[sender][msg.sender] >= value
    │                                         ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1267,7 +1267,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:16
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
+54 │         assert self._allowances[sender][msg.sender] >= value
    │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -1287,7 +1287,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:16
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
+54 │         assert self._allowances[sender][msg.sender] >= value
    │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -1307,8 +1307,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:56
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
-   │                                                        ^^^^^^ attributes hash: 16797824492585953824
+54 │         assert self._allowances[sender][msg.sender] >= value
+   │                                                        ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1323,8 +1323,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:56
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
-   │                                                        ^^^^^^ attributes hash: 16797824492585953824
+54 │         assert self._allowances[sender][msg.sender] >= value
+   │                                                        ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1339,8 +1339,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:54:16
    │
-54 │         assert self._allowances[sender][msg.sender] >= amount
-   │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+54 │         assert self._allowances[sender][msg.sender] >= value
+   │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1353,7 +1353,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:56:24
    │
-56 │         self._transfer(sender, recipient, amount)
+56 │         self._transfer(sender, recipient, value)
    │                        ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1367,7 +1367,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:56:24
    │
-56 │         self._transfer(sender, recipient, amount)
+56 │         self._transfer(sender, recipient, value)
    │                        ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1381,7 +1381,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:56:32
    │
-56 │         self._transfer(sender, recipient, amount)
+56 │         self._transfer(sender, recipient, value)
    │                                ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1395,7 +1395,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:56:32
    │
-56 │         self._transfer(sender, recipient, amount)
+56 │         self._transfer(sender, recipient, value)
    │                                ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1409,8 +1409,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:56:43
    │
-56 │         self._transfer(sender, recipient, amount)
-   │                                           ^^^^^^ attributes hash: 16797824492585953824
+56 │         self._transfer(sender, recipient, value)
+   │                                           ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1425,8 +1425,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:56:43
    │
-56 │         self._transfer(sender, recipient, amount)
-   │                                           ^^^^^^ attributes hash: 16797824492585953824
+56 │         self._transfer(sender, recipient, value)
+   │                                           ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1441,8 +1441,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:56:9
    │
-56 │         self._transfer(sender, recipient, amount)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
+56 │         self._transfer(sender, recipient, value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
    │
    = ExpressionAttributes {
          typ: Tuple(
@@ -1457,7 +1457,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:23
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                       ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1471,7 +1471,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:23
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                       ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1485,7 +1485,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:31
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                               ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1499,7 +1499,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:31
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                               ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1513,7 +1513,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:43
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                                           ^^^^^^^^^^^^^^^^ attributes hash: 1809596235975120774
    │
    = ExpressionAttributes {
@@ -1543,7 +1543,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:60
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                                                            ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1557,7 +1557,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:60
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                                                            ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1571,7 +1571,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:43
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 8054157001498380852
    │
    = ExpressionAttributes {
@@ -1594,7 +1594,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:68
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                                                                    ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1608,7 +1608,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:68
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                                                                    ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1622,7 +1622,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:43
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -1642,7 +1642,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:43
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -1662,8 +1662,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:82
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
-   │                                                                                  ^^^^^^ attributes hash: 16797824492585953824
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
+   │                                                                                  ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1678,8 +1678,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:82
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
-   │                                                                                  ^^^^^^ attributes hash: 16797824492585953824
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
+   │                                                                                  ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1694,8 +1694,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:43
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
-   │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
+   │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1710,8 +1710,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:43
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
-   │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
+   │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1726,8 +1726,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:9
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
    │
    = ExpressionAttributes {
          typ: Tuple(
@@ -2600,7 +2600,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:72:37
    │
-72 │         self._before_token_transfer(sender, recipient, amount)
+72 │         self._before_token_transfer(sender, recipient, value)
    │                                     ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -2614,7 +2614,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:72:37
    │
-72 │         self._before_token_transfer(sender, recipient, amount)
+72 │         self._before_token_transfer(sender, recipient, value)
    │                                     ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -2628,7 +2628,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:72:45
    │
-72 │         self._before_token_transfer(sender, recipient, amount)
+72 │         self._before_token_transfer(sender, recipient, value)
    │                                             ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -2642,7 +2642,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:72:45
    │
-72 │         self._before_token_transfer(sender, recipient, amount)
+72 │         self._before_token_transfer(sender, recipient, value)
    │                                             ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -2656,8 +2656,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:72:56
    │
-72 │         self._before_token_transfer(sender, recipient, amount)
-   │                                                        ^^^^^^ attributes hash: 16797824492585953824
+72 │         self._before_token_transfer(sender, recipient, value)
+   │                                                        ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -2672,8 +2672,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:72:56
    │
-72 │         self._before_token_transfer(sender, recipient, amount)
-   │                                                        ^^^^^^ attributes hash: 16797824492585953824
+72 │         self._before_token_transfer(sender, recipient, value)
+   │                                                        ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -2688,8 +2688,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:72:9
    │
-72 │         self._before_token_transfer(sender, recipient, amount)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
+72 │         self._before_token_transfer(sender, recipient, value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
    │
    = ExpressionAttributes {
          typ: Tuple(
@@ -2704,7 +2704,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:9
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
+74 │         self._balances[sender] = self._balances[sender] - value
    │         ^^^^^^^^^^^^^^ attributes hash: 3083590660514624733
    │
    = ExpressionAttributes {
@@ -2729,7 +2729,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:24
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
+74 │         self._balances[sender] = self._balances[sender] - value
    │                        ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -2743,7 +2743,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:24
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
+74 │         self._balances[sender] = self._balances[sender] - value
    │                        ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -2757,7 +2757,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:9
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
+74 │         self._balances[sender] = self._balances[sender] - value
    │         ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 5973407925075462624
    │
    = ExpressionAttributes {
@@ -2775,7 +2775,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:34
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
+74 │         self._balances[sender] = self._balances[sender] - value
    │                                  ^^^^^^^^^^^^^^ attributes hash: 3083590660514624733
    │
    = ExpressionAttributes {
@@ -2800,7 +2800,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:49
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
+74 │         self._balances[sender] = self._balances[sender] - value
    │                                                 ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -2814,7 +2814,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:49
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
+74 │         self._balances[sender] = self._balances[sender] - value
    │                                                 ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -2828,7 +2828,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:34
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
+74 │         self._balances[sender] = self._balances[sender] - value
    │                                  ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -2848,7 +2848,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:34
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
+74 │         self._balances[sender] = self._balances[sender] - value
    │                                  ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -2868,8 +2868,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:59
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
-   │                                                           ^^^^^^ attributes hash: 16797824492585953824
+74 │         self._balances[sender] = self._balances[sender] - value
+   │                                                           ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -2884,8 +2884,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:59
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
-   │                                                           ^^^^^^ attributes hash: 16797824492585953824
+74 │         self._balances[sender] = self._balances[sender] - value
+   │                                                           ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -2900,8 +2900,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:74:34
    │
-74 │         self._balances[sender] = self._balances[sender] - amount
-   │                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+74 │         self._balances[sender] = self._balances[sender] - value
+   │                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -2916,7 +2916,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:9
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
+75 │         self._balances[recipient] = self._balances[recipient] + value
    │         ^^^^^^^^^^^^^^ attributes hash: 3083590660514624733
    │
    = ExpressionAttributes {
@@ -2941,7 +2941,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:24
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
+75 │         self._balances[recipient] = self._balances[recipient] + value
    │                        ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -2955,7 +2955,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:24
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
+75 │         self._balances[recipient] = self._balances[recipient] + value
    │                        ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -2969,7 +2969,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:9
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
+75 │         self._balances[recipient] = self._balances[recipient] + value
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 5973407925075462624
    │
    = ExpressionAttributes {
@@ -2987,7 +2987,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:37
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
+75 │         self._balances[recipient] = self._balances[recipient] + value
    │                                     ^^^^^^^^^^^^^^ attributes hash: 3083590660514624733
    │
    = ExpressionAttributes {
@@ -3012,7 +3012,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:52
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
+75 │         self._balances[recipient] = self._balances[recipient] + value
    │                                                    ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -3026,7 +3026,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:52
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
+75 │         self._balances[recipient] = self._balances[recipient] + value
    │                                                    ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -3040,7 +3040,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:37
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
+75 │         self._balances[recipient] = self._balances[recipient] + value
    │                                     ^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -3060,7 +3060,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:37
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
+75 │         self._balances[recipient] = self._balances[recipient] + value
    │                                     ^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -3080,8 +3080,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:65
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
-   │                                                                 ^^^^^^ attributes hash: 16797824492585953824
+75 │         self._balances[recipient] = self._balances[recipient] + value
+   │                                                                 ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3096,8 +3096,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:65
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
-   │                                                                 ^^^^^^ attributes hash: 16797824492585953824
+75 │         self._balances[recipient] = self._balances[recipient] + value
+   │                                                                 ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3112,8 +3112,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:75:37
    │
-75 │         self._balances[recipient] = self._balances[recipient] + amount
-   │                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+75 │         self._balances[recipient] = self._balances[recipient] + value
+   │                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3126,10 +3126,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:76:23
+   ┌─ demos/erc20_token.fe:76:28
    │
-76 │         emit Transfer(sender, recipient, amount)
-   │                       ^^^^^^ attributes hash: 513065555763557710
+76 │         emit Transfer(from=sender, to=recipient, value=value)
+   │                            ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3140,10 +3140,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:76:23
+   ┌─ demos/erc20_token.fe:76:28
    │
-76 │         emit Transfer(sender, recipient, amount)
-   │                       ^^^^^^ attributes hash: 513065555763557710
+76 │         emit Transfer(from=sender, to=recipient, value=value)
+   │                            ^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3154,10 +3154,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:76:31
+   ┌─ demos/erc20_token.fe:76:39
    │
-76 │         emit Transfer(sender, recipient, amount)
-   │                               ^^^^^^^^^ attributes hash: 513065555763557710
+76 │         emit Transfer(from=sender, to=recipient, value=value)
+   │                                       ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3168,10 +3168,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:76:31
+   ┌─ demos/erc20_token.fe:76:39
    │
-76 │         emit Transfer(sender, recipient, amount)
-   │                               ^^^^^^^^^ attributes hash: 513065555763557710
+76 │         emit Transfer(from=sender, to=recipient, value=value)
+   │                                       ^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3182,10 +3182,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:76:42
+   ┌─ demos/erc20_token.fe:76:56
    │
-76 │         emit Transfer(sender, recipient, amount)
-   │                                          ^^^^^^ attributes hash: 16797824492585953824
+76 │         emit Transfer(from=sender, to=recipient, value=value)
+   │                                                        ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3198,10 +3198,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:76:42
+   ┌─ demos/erc20_token.fe:76:56
    │
-76 │         emit Transfer(sender, recipient, amount)
-   │                                          ^^^^^^ attributes hash: 16797824492585953824
+76 │         emit Transfer(from=sender, to=recipient, value=value)
+   │                                                        ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3318,7 +3318,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:45
    │
-81 │         self._before_token_transfer(address(0), account, amount)
+81 │         self._before_token_transfer(address(0), account, value)
    │                                             ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
@@ -3334,7 +3334,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:45
    │
-81 │         self._before_token_transfer(address(0), account, amount)
+81 │         self._before_token_transfer(address(0), account, value)
    │                                             ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
@@ -3350,7 +3350,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:37
    │
-81 │         self._before_token_transfer(address(0), account, amount)
+81 │         self._before_token_transfer(address(0), account, value)
    │                                     ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -3364,7 +3364,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:37
    │
-81 │         self._before_token_transfer(address(0), account, amount)
+81 │         self._before_token_transfer(address(0), account, value)
    │                                     ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -3378,7 +3378,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:49
    │
-81 │         self._before_token_transfer(address(0), account, amount)
+81 │         self._before_token_transfer(address(0), account, value)
    │                                                 ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -3392,7 +3392,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:49
    │
-81 │         self._before_token_transfer(address(0), account, amount)
+81 │         self._before_token_transfer(address(0), account, value)
    │                                                 ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -3406,8 +3406,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:58
    │
-81 │         self._before_token_transfer(address(0), account, amount)
-   │                                                          ^^^^^^ attributes hash: 16797824492585953824
+81 │         self._before_token_transfer(address(0), account, value)
+   │                                                          ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3422,8 +3422,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:58
    │
-81 │         self._before_token_transfer(address(0), account, amount)
-   │                                                          ^^^^^^ attributes hash: 16797824492585953824
+81 │         self._before_token_transfer(address(0), account, value)
+   │                                                          ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3438,8 +3438,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:9
    │
-81 │         self._before_token_transfer(address(0), account, amount)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
+81 │         self._before_token_transfer(address(0), account, value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
    │
    = ExpressionAttributes {
          typ: Tuple(
@@ -3454,7 +3454,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:83:9
    │
-83 │         self._total_supply = self._total_supply + amount
+83 │         self._total_supply = self._total_supply + value
    │         ^^^^^^^^^^^^^^^^^^ attributes hash: 5442517114445688665
    │
    = ExpressionAttributes {
@@ -3474,7 +3474,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:83:30
    │
-83 │         self._total_supply = self._total_supply + amount
+83 │         self._total_supply = self._total_supply + value
    │                              ^^^^^^^^^^^^^^^^^^ attributes hash: 5126058488677760853
    │
    = ExpressionAttributes {
@@ -3496,7 +3496,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:83:30
    │
-83 │         self._total_supply = self._total_supply + amount
+83 │         self._total_supply = self._total_supply + value
    │                              ^^^^^^^^^^^^^^^^^^ attributes hash: 5126058488677760853
    │
    = ExpressionAttributes {
@@ -3518,8 +3518,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:83:51
    │
-83 │         self._total_supply = self._total_supply + amount
-   │                                                   ^^^^^^ attributes hash: 16797824492585953824
+83 │         self._total_supply = self._total_supply + value
+   │                                                   ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3534,8 +3534,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:83:51
    │
-83 │         self._total_supply = self._total_supply + amount
-   │                                                   ^^^^^^ attributes hash: 16797824492585953824
+83 │         self._total_supply = self._total_supply + value
+   │                                                   ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3550,8 +3550,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:83:30
    │
-83 │         self._total_supply = self._total_supply + amount
-   │                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+83 │         self._total_supply = self._total_supply + value
+   │                              ^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3566,7 +3566,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:9
    │
-84 │         self._balances[account] = self._balances[account] + amount
+84 │         self._balances[account] = self._balances[account] + value
    │         ^^^^^^^^^^^^^^ attributes hash: 3083590660514624733
    │
    = ExpressionAttributes {
@@ -3591,7 +3591,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:24
    │
-84 │         self._balances[account] = self._balances[account] + amount
+84 │         self._balances[account] = self._balances[account] + value
    │                        ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -3605,7 +3605,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:24
    │
-84 │         self._balances[account] = self._balances[account] + amount
+84 │         self._balances[account] = self._balances[account] + value
    │                        ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -3619,7 +3619,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:9
    │
-84 │         self._balances[account] = self._balances[account] + amount
+84 │         self._balances[account] = self._balances[account] + value
    │         ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 5973407925075462624
    │
    = ExpressionAttributes {
@@ -3637,7 +3637,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:35
    │
-84 │         self._balances[account] = self._balances[account] + amount
+84 │         self._balances[account] = self._balances[account] + value
    │                                   ^^^^^^^^^^^^^^ attributes hash: 3083590660514624733
    │
    = ExpressionAttributes {
@@ -3662,7 +3662,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:50
    │
-84 │         self._balances[account] = self._balances[account] + amount
+84 │         self._balances[account] = self._balances[account] + value
    │                                                  ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -3676,7 +3676,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:50
    │
-84 │         self._balances[account] = self._balances[account] + amount
+84 │         self._balances[account] = self._balances[account] + value
    │                                                  ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -3690,7 +3690,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:35
    │
-84 │         self._balances[account] = self._balances[account] + amount
+84 │         self._balances[account] = self._balances[account] + value
    │                                   ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -3710,7 +3710,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:35
    │
-84 │         self._balances[account] = self._balances[account] + amount
+84 │         self._balances[account] = self._balances[account] + value
    │                                   ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -3730,8 +3730,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:61
    │
-84 │         self._balances[account] = self._balances[account] + amount
-   │                                                             ^^^^^^ attributes hash: 16797824492585953824
+84 │         self._balances[account] = self._balances[account] + value
+   │                                                             ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3746,8 +3746,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:61
    │
-84 │         self._balances[account] = self._balances[account] + amount
-   │                                                             ^^^^^^ attributes hash: 16797824492585953824
+84 │         self._balances[account] = self._balances[account] + value
+   │                                                             ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3762,8 +3762,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:84:35
    │
-84 │         self._balances[account] = self._balances[account] + amount
-   │                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+84 │         self._balances[account] = self._balances[account] + value
+   │                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3776,10 +3776,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:85:31
+   ┌─ demos/erc20_token.fe:85:36
    │
-85 │         emit Transfer(address(0), account, amount)
-   │                               ^ attributes hash: 16797824492585953824
+85 │         emit Transfer(from=address(0), to=account, value=value)
+   │                                    ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3792,10 +3792,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:85:31
+   ┌─ demos/erc20_token.fe:85:36
    │
-85 │         emit Transfer(address(0), account, amount)
-   │                               ^ attributes hash: 16797824492585953824
+85 │         emit Transfer(from=address(0), to=account, value=value)
+   │                                    ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3808,10 +3808,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:85:23
+   ┌─ demos/erc20_token.fe:85:28
    │
-85 │         emit Transfer(address(0), account, amount)
-   │                       ^^^^^^^^^^ attributes hash: 513065555763557710
+85 │         emit Transfer(from=address(0), to=account, value=value)
+   │                            ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3822,10 +3822,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:85:23
+   ┌─ demos/erc20_token.fe:85:28
    │
-85 │         emit Transfer(address(0), account, amount)
-   │                       ^^^^^^^^^^ attributes hash: 513065555763557710
+85 │         emit Transfer(from=address(0), to=account, value=value)
+   │                            ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3836,10 +3836,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:85:35
+   ┌─ demos/erc20_token.fe:85:43
    │
-85 │         emit Transfer(address(0), account, amount)
-   │                                   ^^^^^^^ attributes hash: 513065555763557710
+85 │         emit Transfer(from=address(0), to=account, value=value)
+   │                                           ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3850,10 +3850,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:85:35
+   ┌─ demos/erc20_token.fe:85:43
    │
-85 │         emit Transfer(address(0), account, amount)
-   │                                   ^^^^^^^ attributes hash: 513065555763557710
+85 │         emit Transfer(from=address(0), to=account, value=value)
+   │                                           ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3864,10 +3864,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:85:44
+   ┌─ demos/erc20_token.fe:85:58
    │
-85 │         emit Transfer(address(0), account, amount)
-   │                                            ^^^^^^ attributes hash: 16797824492585953824
+85 │         emit Transfer(from=address(0), to=account, value=value)
+   │                                                          ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3880,10 +3880,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:85:44
+   ┌─ demos/erc20_token.fe:85:58
    │
-85 │         emit Transfer(address(0), account, amount)
-   │                                            ^^^^^^ attributes hash: 16797824492585953824
+85 │         emit Transfer(from=address(0), to=account, value=value)
+   │                                                          ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4000,7 +4000,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:37
    │
-90 │         self._before_token_transfer(account, address(0), amount)
+90 │         self._before_token_transfer(account, address(0), value)
    │                                     ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -4014,7 +4014,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:37
    │
-90 │         self._before_token_transfer(account, address(0), amount)
+90 │         self._before_token_transfer(account, address(0), value)
    │                                     ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -4028,7 +4028,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:54
    │
-90 │         self._before_token_transfer(account, address(0), amount)
+90 │         self._before_token_transfer(account, address(0), value)
    │                                                      ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
@@ -4044,7 +4044,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:54
    │
-90 │         self._before_token_transfer(account, address(0), amount)
+90 │         self._before_token_transfer(account, address(0), value)
    │                                                      ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
@@ -4060,7 +4060,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:46
    │
-90 │         self._before_token_transfer(account, address(0), amount)
+90 │         self._before_token_transfer(account, address(0), value)
    │                                              ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -4074,7 +4074,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:46
    │
-90 │         self._before_token_transfer(account, address(0), amount)
+90 │         self._before_token_transfer(account, address(0), value)
    │                                              ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -4088,8 +4088,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:58
    │
-90 │         self._before_token_transfer(account, address(0), amount)
-   │                                                          ^^^^^^ attributes hash: 16797824492585953824
+90 │         self._before_token_transfer(account, address(0), value)
+   │                                                          ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4104,8 +4104,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:58
    │
-90 │         self._before_token_transfer(account, address(0), amount)
-   │                                                          ^^^^^^ attributes hash: 16797824492585953824
+90 │         self._before_token_transfer(account, address(0), value)
+   │                                                          ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4120,8 +4120,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:9
    │
-90 │         self._before_token_transfer(account, address(0), amount)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
+90 │         self._before_token_transfer(account, address(0), value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
    │
    = ExpressionAttributes {
          typ: Tuple(
@@ -4136,7 +4136,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:9
    │
-92 │         self._balances[account] = self._balances[account] - amount
+92 │         self._balances[account] = self._balances[account] - value
    │         ^^^^^^^^^^^^^^ attributes hash: 3083590660514624733
    │
    = ExpressionAttributes {
@@ -4161,7 +4161,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:24
    │
-92 │         self._balances[account] = self._balances[account] - amount
+92 │         self._balances[account] = self._balances[account] - value
    │                        ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -4175,7 +4175,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:24
    │
-92 │         self._balances[account] = self._balances[account] - amount
+92 │         self._balances[account] = self._balances[account] - value
    │                        ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -4189,7 +4189,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:9
    │
-92 │         self._balances[account] = self._balances[account] - amount
+92 │         self._balances[account] = self._balances[account] - value
    │         ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 5973407925075462624
    │
    = ExpressionAttributes {
@@ -4207,7 +4207,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:35
    │
-92 │         self._balances[account] = self._balances[account] - amount
+92 │         self._balances[account] = self._balances[account] - value
    │                                   ^^^^^^^^^^^^^^ attributes hash: 3083590660514624733
    │
    = ExpressionAttributes {
@@ -4232,7 +4232,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:50
    │
-92 │         self._balances[account] = self._balances[account] - amount
+92 │         self._balances[account] = self._balances[account] - value
    │                                                  ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -4246,7 +4246,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:50
    │
-92 │         self._balances[account] = self._balances[account] - amount
+92 │         self._balances[account] = self._balances[account] - value
    │                                                  ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -4260,7 +4260,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:35
    │
-92 │         self._balances[account] = self._balances[account] - amount
+92 │         self._balances[account] = self._balances[account] - value
    │                                   ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -4280,7 +4280,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:35
    │
-92 │         self._balances[account] = self._balances[account] - amount
+92 │         self._balances[account] = self._balances[account] - value
    │                                   ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9781479072077703403
    │
    = ExpressionAttributes {
@@ -4300,8 +4300,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:61
    │
-92 │         self._balances[account] = self._balances[account] - amount
-   │                                                             ^^^^^^ attributes hash: 16797824492585953824
+92 │         self._balances[account] = self._balances[account] - value
+   │                                                             ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4316,8 +4316,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:61
    │
-92 │         self._balances[account] = self._balances[account] - amount
-   │                                                             ^^^^^^ attributes hash: 16797824492585953824
+92 │         self._balances[account] = self._balances[account] - value
+   │                                                             ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4332,8 +4332,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:92:35
    │
-92 │         self._balances[account] = self._balances[account] - amount
-   │                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+92 │         self._balances[account] = self._balances[account] - value
+   │                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4348,7 +4348,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:93:9
    │
-93 │         self._total_supply = self._total_supply - amount
+93 │         self._total_supply = self._total_supply - value
    │         ^^^^^^^^^^^^^^^^^^ attributes hash: 5442517114445688665
    │
    = ExpressionAttributes {
@@ -4368,7 +4368,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:93:30
    │
-93 │         self._total_supply = self._total_supply - amount
+93 │         self._total_supply = self._total_supply - value
    │                              ^^^^^^^^^^^^^^^^^^ attributes hash: 5126058488677760853
    │
    = ExpressionAttributes {
@@ -4390,7 +4390,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:93:30
    │
-93 │         self._total_supply = self._total_supply - amount
+93 │         self._total_supply = self._total_supply - value
    │                              ^^^^^^^^^^^^^^^^^^ attributes hash: 5126058488677760853
    │
    = ExpressionAttributes {
@@ -4412,8 +4412,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:93:51
    │
-93 │         self._total_supply = self._total_supply - amount
-   │                                                   ^^^^^^ attributes hash: 16797824492585953824
+93 │         self._total_supply = self._total_supply - value
+   │                                                   ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4428,8 +4428,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:93:51
    │
-93 │         self._total_supply = self._total_supply - amount
-   │                                                   ^^^^^^ attributes hash: 16797824492585953824
+93 │         self._total_supply = self._total_supply - value
+   │                                                   ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4444,8 +4444,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:93:30
    │
-93 │         self._total_supply = self._total_supply - amount
-   │                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+93 │         self._total_supply = self._total_supply - value
+   │                              ^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4458,10 +4458,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:94:23
+   ┌─ demos/erc20_token.fe:94:28
    │
-94 │         emit Transfer(account, address(0), amount)
-   │                       ^^^^^^^ attributes hash: 513065555763557710
+94 │         emit Transfer(from=account, to=address(0), value)
+   │                            ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4472,10 +4472,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:94:23
+   ┌─ demos/erc20_token.fe:94:28
    │
-94 │         emit Transfer(account, address(0), amount)
-   │                       ^^^^^^^ attributes hash: 513065555763557710
+94 │         emit Transfer(from=account, to=address(0), value)
+   │                            ^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4486,10 +4486,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:94:40
+   ┌─ demos/erc20_token.fe:94:48
    │
-94 │         emit Transfer(account, address(0), amount)
-   │                                        ^ attributes hash: 16797824492585953824
+94 │         emit Transfer(from=account, to=address(0), value)
+   │                                                ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4502,10 +4502,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:94:40
+   ┌─ demos/erc20_token.fe:94:48
    │
-94 │         emit Transfer(account, address(0), amount)
-   │                                        ^ attributes hash: 16797824492585953824
+94 │         emit Transfer(from=account, to=address(0), value)
+   │                                                ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4518,10 +4518,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:94:32
+   ┌─ demos/erc20_token.fe:94:40
    │
-94 │         emit Transfer(account, address(0), amount)
-   │                                ^^^^^^^^^^ attributes hash: 513065555763557710
+94 │         emit Transfer(from=account, to=address(0), value)
+   │                                        ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4532,10 +4532,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:94:32
+   ┌─ demos/erc20_token.fe:94:40
    │
-94 │         emit Transfer(account, address(0), amount)
-   │                                ^^^^^^^^^^ attributes hash: 513065555763557710
+94 │         emit Transfer(from=account, to=address(0), value)
+   │                                        ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4546,10 +4546,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:94:44
+   ┌─ demos/erc20_token.fe:94:52
    │
-94 │         emit Transfer(account, address(0), amount)
-   │                                            ^^^^^^ attributes hash: 16797824492585953824
+94 │         emit Transfer(from=account, to=address(0), value)
+   │                                                    ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4562,10 +4562,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:94:44
+   ┌─ demos/erc20_token.fe:94:52
    │
-94 │         emit Transfer(account, address(0), amount)
-   │                                            ^^^^^^ attributes hash: 16797824492585953824
+94 │         emit Transfer(from=account, to=address(0), value)
+   │                                                    ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -4784,7 +4784,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:100:9
     │
-100 │         self._allowances[owner][spender] = amount
+100 │         self._allowances[owner][spender] = value
     │         ^^^^^^^^^^^^^^^^ attributes hash: 1809596235975120774
     │
     = ExpressionAttributes {
@@ -4814,7 +4814,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:100:26
     │
-100 │         self._allowances[owner][spender] = amount
+100 │         self._allowances[owner][spender] = value
     │                          ^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -4828,7 +4828,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:100:26
     │
-100 │         self._allowances[owner][spender] = amount
+100 │         self._allowances[owner][spender] = value
     │                          ^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -4842,7 +4842,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:100:9
     │
-100 │         self._allowances[owner][spender] = amount
+100 │         self._allowances[owner][spender] = value
     │         ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 8054157001498380852
     │
     = ExpressionAttributes {
@@ -4865,7 +4865,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:100:33
     │
-100 │         self._allowances[owner][spender] = amount
+100 │         self._allowances[owner][spender] = value
     │                                 ^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -4879,7 +4879,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:100:33
     │
-100 │         self._allowances[owner][spender] = amount
+100 │         self._allowances[owner][spender] = value
     │                                 ^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -4893,7 +4893,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:100:9
     │
-100 │         self._allowances[owner][spender] = amount
+100 │         self._allowances[owner][spender] = value
     │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 5973407925075462624
     │
     = ExpressionAttributes {
@@ -4911,8 +4911,8 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:100:44
     │
-100 │         self._allowances[owner][spender] = amount
-    │                                            ^^^^^^ attributes hash: 16797824492585953824
+100 │         self._allowances[owner][spender] = value
+    │                                            ^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4927,7 +4927,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:101:23
     │
-101 │         emit Approval(owner, spender, amount)
+101 │         emit Approval(owner, spender, value)
     │                       ^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -4941,7 +4941,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:101:23
     │
-101 │         emit Approval(owner, spender, amount)
+101 │         emit Approval(owner, spender, value)
     │                       ^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -4955,7 +4955,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:101:30
     │
-101 │         emit Approval(owner, spender, amount)
+101 │         emit Approval(owner, spender, value)
     │                              ^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -4969,7 +4969,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:101:30
     │
-101 │         emit Approval(owner, spender, amount)
+101 │         emit Approval(owner, spender, value)
     │                              ^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -4983,8 +4983,8 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:101:39
     │
-101 │         emit Approval(owner, spender, amount)
-    │                                       ^^^^^^ attributes hash: 16797824492585953824
+101 │         emit Approval(owner, spender, value)
+    │                                       ^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4999,8 +4999,8 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:101:39
     │
-101 │         emit Approval(owner, spender, amount)
-    │                                       ^^^^^^ attributes hash: 16797824492585953824
+101 │         emit Approval(owner, spender, value)
+    │                                       ^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -5051,8 +5051,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:76:9
    │
-76 │         emit Transfer(sender, recipient, amount)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15998888495671832844
+76 │         emit Transfer(from=sender, to=recipient, value=value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15998888495671832844
    │
    = EventDef {
          name: "Transfer",
@@ -5088,8 +5088,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:85:9
    │
-85 │         emit Transfer(address(0), account, amount)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15998888495671832844
+85 │         emit Transfer(from=address(0), to=account, value=value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15998888495671832844
    │
    = EventDef {
          name: "Transfer",
@@ -5125,8 +5125,8 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:94:9
    │
-94 │         emit Transfer(account, address(0), amount)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15998888495671832844
+94 │         emit Transfer(from=account, to=address(0), value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15998888495671832844
    │
    = EventDef {
          name: "Transfer",
@@ -5162,8 +5162,8 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:101:9
     │
-101 │         emit Approval(owner, spender, amount)
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 13897255059570952921
+101 │         emit Approval(owner, spender, value)
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 13897255059570952921
     │
     = EventDef {
           name: "Approval",
@@ -5334,10 +5334,10 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:42:5
    │  
-42 │ ╭     pub def transfer(recipient: address, amount: u256) -> bool:
-43 │ │         self._transfer(msg.sender, recipient, amount)
+42 │ ╭     pub def transfer(recipient: address, value: u256) -> bool:
+43 │ │         self._transfer(msg.sender, recipient, value)
 44 │ │         return true
-   │ ╰───────────────────^ attributes hash: 14813506046617246739
+   │ ╰───────────────────^ attributes hash: 9791124835288196242
    │  
    = FunctionAttributes {
          is_public: true,
@@ -5350,7 +5350,7 @@ note:
                  ),
              ),
              (
-                 "amount",
+                 "value",
                  Base(
                      Numeric(
                          U256,
@@ -5397,10 +5397,10 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:49:5
    │  
-49 │ ╭     pub def approve(spender: address, amount: u256) -> bool:
-50 │ │         self._approve(msg.sender, spender, amount)
+49 │ ╭     pub def approve(spender: address, value: u256) -> bool:
+50 │ │         self._approve(msg.sender, spender, value)
 51 │ │         return true
-   │ ╰───────────────────^ attributes hash: 1652915103130919571
+   │ ╰───────────────────^ attributes hash: 1774558567315485250
    │  
    = FunctionAttributes {
          is_public: true,
@@ -5413,7 +5413,7 @@ note:
                  ),
              ),
              (
-                 "amount",
+                 "value",
                  Base(
                      Numeric(
                          U256,
@@ -5429,13 +5429,13 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:53:5
    │  
-53 │ ╭     pub def transferFrom(sender: address, recipient: address, amount: u256) -> bool:
-54 │ │         assert self._allowances[sender][msg.sender] >= amount
+53 │ ╭     pub def transferFrom(sender: address, recipient: address, value: u256) -> bool:
+54 │ │         assert self._allowances[sender][msg.sender] >= value
 55 │ │ 
-56 │ │         self._transfer(sender, recipient, amount)
-57 │ │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+56 │ │         self._transfer(sender, recipient, value)
+57 │ │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
 58 │ │         return true
-   │ ╰───────────────────^ attributes hash: 2387955184131345867
+   │ ╰───────────────────^ attributes hash: 5292630794815279422
    │  
    = FunctionAttributes {
          is_public: true,
@@ -5454,7 +5454,7 @@ note:
                  ),
              ),
              (
-                 "amount",
+                 "value",
                  Base(
                      Numeric(
                          U256,
@@ -5534,14 +5534,14 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:68:5
    │  
-68 │ ╭     def _transfer(sender: address, recipient: address, amount: u256):
+68 │ ╭     def _transfer(sender: address, recipient: address, value: u256):
 69 │ │         assert sender != address(0)
 70 │ │         assert recipient != address(0)
 71 │ │ 
    · │
-75 │ │         self._balances[recipient] = self._balances[recipient] + amount
-76 │ │         emit Transfer(sender, recipient, amount)
-   │ ╰────────────────────────────────────────────────^ attributes hash: 5845956910240859041
+75 │ │         self._balances[recipient] = self._balances[recipient] + value
+76 │ │         emit Transfer(from=sender, to=recipient, value=value)
+   │ ╰─────────────────────────────────────────────────────────────^ attributes hash: 10742405479819069071
    │  
    = FunctionAttributes {
          is_public: false,
@@ -5560,7 +5560,7 @@ note:
                  ),
              ),
              (
-                 "amount",
+                 "value",
                  Base(
                      Numeric(
                          U256,
@@ -5578,14 +5578,14 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:78:5
    │  
-78 │ ╭     def _mint(account: address, amount: u256):
+78 │ ╭     def _mint(account: address, value: u256):
 79 │ │         assert account != address(0)
 80 │ │ 
-81 │ │         self._before_token_transfer(address(0), account, amount)
+81 │ │         self._before_token_transfer(address(0), account, value)
    · │
-84 │ │         self._balances[account] = self._balances[account] + amount
-85 │ │         emit Transfer(address(0), account, amount)
-   │ ╰──────────────────────────────────────────────────^ attributes hash: 11072772479687795920
+84 │ │         self._balances[account] = self._balances[account] + value
+85 │ │         emit Transfer(from=address(0), to=account, value=value)
+   │ ╰───────────────────────────────────────────────────────────────^ attributes hash: 2904120781266378262
    │  
    = FunctionAttributes {
          is_public: false,
@@ -5598,7 +5598,7 @@ note:
                  ),
              ),
              (
-                 "amount",
+                 "value",
                  Base(
                      Numeric(
                          U256,
@@ -5616,14 +5616,14 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:87:5
    │  
-87 │ ╭     def _burn(account: address, amount: u256):
+87 │ ╭     def _burn(account: address, value: u256):
 88 │ │         assert account != address(0)
 89 │ │ 
-90 │ │         self._before_token_transfer(account, address(0), amount)
+90 │ │         self._before_token_transfer(account, address(0), value)
    · │
-93 │ │         self._total_supply = self._total_supply - amount
-94 │ │         emit Transfer(account, address(0), amount)
-   │ ╰──────────────────────────────────────────────────^ attributes hash: 3680320374264938545
+93 │ │         self._total_supply = self._total_supply - value
+94 │ │         emit Transfer(from=account, to=address(0), value)
+   │ ╰─────────────────────────────────────────────────────────^ attributes hash: 9764434470555552062
    │  
    = FunctionAttributes {
          is_public: false,
@@ -5636,7 +5636,7 @@ note:
                  ),
              ),
              (
-                 "amount",
+                 "value",
                  Base(
                      Numeric(
                          U256,
@@ -5654,13 +5654,13 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:96:5
     │  
- 96 │ ╭     def _approve(owner: address, spender: address, amount: u256):
+ 96 │ ╭     def _approve(owner: address, spender: address, value: u256):
  97 │ │         assert owner != address(0)
  98 │ │         assert spender != address(0)
  99 │ │ 
-100 │ │         self._allowances[owner][spender] = amount
-101 │ │         emit Approval(owner, spender, amount)
-    │ ╰─────────────────────────────────────────────^ attributes hash: 15054951283132539212
+100 │ │         self._allowances[owner][spender] = value
+101 │ │         emit Approval(owner, spender, value)
+    │ ╰────────────────────────────────────────────^ attributes hash: 16661919557302265406
     │  
     = FunctionAttributes {
           is_public: false,
@@ -5679,7 +5679,7 @@ note:
                   ),
               ),
               (
-                  "amount",
+                  "value",
                   Base(
                       Numeric(
                           U256,
@@ -5724,9 +5724,9 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:106:5
     │  
-106 │ ╭     def _before_token_transfer(from: address, to: address, amount: u256):
+106 │ ╭     def _before_token_transfer(from: address, to: address, value: u256):
 107 │ │         pass
-    │ ╰────────────^ attributes hash: 16142237735491910309
+    │ ╰────────────^ attributes hash: 17605714502672606440
     │  
     = FunctionAttributes {
           is_public: false,
@@ -5745,7 +5745,7 @@ note:
                   ),
               ),
               (
-                  "amount",
+                  "value",
                   Base(
                       Numeric(
                           U256,
@@ -5768,9 +5768,9 @@ note:
   3 │ │     _allowances: map<address, map<address, u256>>
   4 │ │ 
     · │
-106 │ │     def _before_token_transfer(from: address, to: address, amount: u256):
+106 │ │     def _before_token_transfer(from: address, to: address, value: u256):
 107 │ │         pass
-    │ ╰────────────^ attributes hash: 9117801603836548819
+    │ ╰────────────^ attributes hash: 7979694779474112621
     │  
     = ContractAttributes {
           public_functions: [
@@ -5808,7 +5808,7 @@ note:
                           ),
                       ),
                       (
-                          "amount",
+                          "value",
                           Base(
                               Numeric(
                                   U256,
@@ -5934,7 +5934,7 @@ note:
                           ),
                       ),
                       (
-                          "amount",
+                          "value",
                           Base(
                               Numeric(
                                   U256,
@@ -5963,7 +5963,7 @@ note:
                           ),
                       ),
                       (
-                          "amount",
+                          "value",
                           Base(
                               Numeric(
                                   U256,
@@ -6117,7 +6117,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:43:9
    │
-43 │         self._transfer(msg.sender, recipient, amount)
+43 │         self._transfer(msg.sender, recipient, value)
    │         ^^^^^^^^^^^^^^ attributes hash: 14323683276959539127
    │
    = SelfAttribute {
@@ -6127,7 +6127,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:50:9
    │
-50 │         self._approve(msg.sender, spender, amount)
+50 │         self._approve(msg.sender, spender, value)
    │         ^^^^^^^^^^^^^ attributes hash: 1400585789226786071
    │
    = SelfAttribute {
@@ -6137,7 +6137,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:56:9
    │
-56 │         self._transfer(sender, recipient, amount)
+56 │         self._transfer(sender, recipient, value)
    │         ^^^^^^^^^^^^^^ attributes hash: 14323683276959539127
    │
    = SelfAttribute {
@@ -6147,7 +6147,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:57:9
    │
-57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+57 │         self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
    │         ^^^^^^^^^^^^^ attributes hash: 1400585789226786071
    │
    = SelfAttribute {
@@ -6201,7 +6201,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:72:9
    │
-72 │         self._before_token_transfer(sender, recipient, amount)
+72 │         self._before_token_transfer(sender, recipient, value)
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9439678188627709536
    │
    = SelfAttribute {
@@ -6223,7 +6223,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:9
    │
-81 │         self._before_token_transfer(address(0), account, amount)
+81 │         self._before_token_transfer(address(0), account, value)
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9439678188627709536
    │
    = SelfAttribute {
@@ -6233,7 +6233,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:81:37
    │
-81 │         self._before_token_transfer(address(0), account, amount)
+81 │         self._before_token_transfer(address(0), account, value)
    │                                     ^^^^^^^ attributes hash: 6114858510168753394
    │
    = TypeConstructor {
@@ -6243,10 +6243,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:85:23
+   ┌─ demos/erc20_token.fe:85:28
    │
-85 │         emit Transfer(address(0), account, amount)
-   │                       ^^^^^^^ attributes hash: 6114858510168753394
+85 │         emit Transfer(from=address(0), to=account, value=value)
+   │                            ^^^^^^^ attributes hash: 6114858510168753394
    │
    = TypeConstructor {
          typ: Base(
@@ -6269,7 +6269,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:9
    │
-90 │         self._before_token_transfer(account, address(0), amount)
+90 │         self._before_token_transfer(account, address(0), value)
    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9439678188627709536
    │
    = SelfAttribute {
@@ -6279,7 +6279,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:90:46
    │
-90 │         self._before_token_transfer(account, address(0), amount)
+90 │         self._before_token_transfer(account, address(0), value)
    │                                              ^^^^^^^ attributes hash: 6114858510168753394
    │
    = TypeConstructor {
@@ -6289,10 +6289,10 @@ note:
      }
 
 note: 
-   ┌─ demos/erc20_token.fe:94:32
+   ┌─ demos/erc20_token.fe:94:40
    │
-94 │         emit Transfer(account, address(0), amount)
-   │                                ^^^^^^^ attributes hash: 6114858510168753394
+94 │         emit Transfer(from=account, to=address(0), value)
+   │                                        ^^^^^^^ attributes hash: 6114858510168753394
    │
    = TypeConstructor {
          typ: Base(
@@ -6565,7 +6565,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:42:33
    │
-42 │     pub def transfer(recipient: address, amount: u256) -> bool:
+42 │     pub def transfer(recipient: address, value: u256) -> bool:
    │                                 ^^^^^^^ attributes hash: 574436082528610497
    │
    = Base(
@@ -6573,10 +6573,10 @@ note:
      )
 
 note: 
-   ┌─ demos/erc20_token.fe:42:50
+   ┌─ demos/erc20_token.fe:42:49
    │
-42 │     pub def transfer(recipient: address, amount: u256) -> bool:
-   │                                                  ^^^^ attributes hash: 17942395924573474124
+42 │     pub def transfer(recipient: address, value: u256) -> bool:
+   │                                                 ^^^^ attributes hash: 17942395924573474124
    │
    = Base(
          Numeric(
@@ -6585,10 +6585,10 @@ note:
      )
 
 note: 
-   ┌─ demos/erc20_token.fe:42:59
+   ┌─ demos/erc20_token.fe:42:58
    │
-42 │     pub def transfer(recipient: address, amount: u256) -> bool:
-   │                                                           ^^^^ attributes hash: 8311861578736502650
+42 │     pub def transfer(recipient: address, value: u256) -> bool:
+   │                                                          ^^^^ attributes hash: 8311861578736502650
    │
    = Base(
          Bool,
@@ -6629,7 +6629,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:49:30
    │
-49 │     pub def approve(spender: address, amount: u256) -> bool:
+49 │     pub def approve(spender: address, value: u256) -> bool:
    │                              ^^^^^^^ attributes hash: 574436082528610497
    │
    = Base(
@@ -6637,10 +6637,10 @@ note:
      )
 
 note: 
-   ┌─ demos/erc20_token.fe:49:47
+   ┌─ demos/erc20_token.fe:49:46
    │
-49 │     pub def approve(spender: address, amount: u256) -> bool:
-   │                                               ^^^^ attributes hash: 17942395924573474124
+49 │     pub def approve(spender: address, value: u256) -> bool:
+   │                                              ^^^^ attributes hash: 17942395924573474124
    │
    = Base(
          Numeric(
@@ -6649,10 +6649,10 @@ note:
      )
 
 note: 
-   ┌─ demos/erc20_token.fe:49:56
+   ┌─ demos/erc20_token.fe:49:55
    │
-49 │     pub def approve(spender: address, amount: u256) -> bool:
-   │                                                        ^^^^ attributes hash: 8311861578736502650
+49 │     pub def approve(spender: address, value: u256) -> bool:
+   │                                                       ^^^^ attributes hash: 8311861578736502650
    │
    = Base(
          Bool,
@@ -6661,7 +6661,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:53:34
    │
-53 │     pub def transferFrom(sender: address, recipient: address, amount: u256) -> bool:
+53 │     pub def transferFrom(sender: address, recipient: address, value: u256) -> bool:
    │                                  ^^^^^^^ attributes hash: 574436082528610497
    │
    = Base(
@@ -6671,7 +6671,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:53:54
    │
-53 │     pub def transferFrom(sender: address, recipient: address, amount: u256) -> bool:
+53 │     pub def transferFrom(sender: address, recipient: address, value: u256) -> bool:
    │                                                      ^^^^^^^ attributes hash: 574436082528610497
    │
    = Base(
@@ -6679,10 +6679,10 @@ note:
      )
 
 note: 
-   ┌─ demos/erc20_token.fe:53:71
+   ┌─ demos/erc20_token.fe:53:70
    │
-53 │     pub def transferFrom(sender: address, recipient: address, amount: u256) -> bool:
-   │                                                                       ^^^^ attributes hash: 17942395924573474124
+53 │     pub def transferFrom(sender: address, recipient: address, value: u256) -> bool:
+   │                                                                      ^^^^ attributes hash: 17942395924573474124
    │
    = Base(
          Numeric(
@@ -6691,10 +6691,10 @@ note:
      )
 
 note: 
-   ┌─ demos/erc20_token.fe:53:80
+   ┌─ demos/erc20_token.fe:53:79
    │
-53 │     pub def transferFrom(sender: address, recipient: address, amount: u256) -> bool:
-   │                                                                                ^^^^ attributes hash: 8311861578736502650
+53 │     pub def transferFrom(sender: address, recipient: address, value: u256) -> bool:
+   │                                                                               ^^^^ attributes hash: 8311861578736502650
    │
    = Base(
          Bool,
@@ -6767,7 +6767,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:68:27
    │
-68 │     def _transfer(sender: address, recipient: address, amount: u256):
+68 │     def _transfer(sender: address, recipient: address, value: u256):
    │                           ^^^^^^^ attributes hash: 574436082528610497
    │
    = Base(
@@ -6777,7 +6777,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:68:47
    │
-68 │     def _transfer(sender: address, recipient: address, amount: u256):
+68 │     def _transfer(sender: address, recipient: address, value: u256):
    │                                               ^^^^^^^ attributes hash: 574436082528610497
    │
    = Base(
@@ -6785,10 +6785,10 @@ note:
      )
 
 note: 
-   ┌─ demos/erc20_token.fe:68:64
+   ┌─ demos/erc20_token.fe:68:63
    │
-68 │     def _transfer(sender: address, recipient: address, amount: u256):
-   │                                                                ^^^^ attributes hash: 17942395924573474124
+68 │     def _transfer(sender: address, recipient: address, value: u256):
+   │                                                               ^^^^ attributes hash: 17942395924573474124
    │
    = Base(
          Numeric(
@@ -6799,7 +6799,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:78:24
    │
-78 │     def _mint(account: address, amount: u256):
+78 │     def _mint(account: address, value: u256):
    │                        ^^^^^^^ attributes hash: 574436082528610497
    │
    = Base(
@@ -6807,10 +6807,10 @@ note:
      )
 
 note: 
-   ┌─ demos/erc20_token.fe:78:41
+   ┌─ demos/erc20_token.fe:78:40
    │
-78 │     def _mint(account: address, amount: u256):
-   │                                         ^^^^ attributes hash: 17942395924573474124
+78 │     def _mint(account: address, value: u256):
+   │                                        ^^^^ attributes hash: 17942395924573474124
    │
    = Base(
          Numeric(
@@ -6821,7 +6821,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:87:24
    │
-87 │     def _burn(account: address, amount: u256):
+87 │     def _burn(account: address, value: u256):
    │                        ^^^^^^^ attributes hash: 574436082528610497
    │
    = Base(
@@ -6829,10 +6829,10 @@ note:
      )
 
 note: 
-   ┌─ demos/erc20_token.fe:87:41
+   ┌─ demos/erc20_token.fe:87:40
    │
-87 │     def _burn(account: address, amount: u256):
-   │                                         ^^^^ attributes hash: 17942395924573474124
+87 │     def _burn(account: address, value: u256):
+   │                                        ^^^^ attributes hash: 17942395924573474124
    │
    = Base(
          Numeric(
@@ -6843,7 +6843,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:96:25
    │
-96 │     def _approve(owner: address, spender: address, amount: u256):
+96 │     def _approve(owner: address, spender: address, value: u256):
    │                         ^^^^^^^ attributes hash: 574436082528610497
    │
    = Base(
@@ -6853,7 +6853,7 @@ note:
 note: 
    ┌─ demos/erc20_token.fe:96:43
    │
-96 │     def _approve(owner: address, spender: address, amount: u256):
+96 │     def _approve(owner: address, spender: address, value: u256):
    │                                           ^^^^^^^ attributes hash: 574436082528610497
    │
    = Base(
@@ -6861,10 +6861,10 @@ note:
      )
 
 note: 
-   ┌─ demos/erc20_token.fe:96:60
+   ┌─ demos/erc20_token.fe:96:59
    │
-96 │     def _approve(owner: address, spender: address, amount: u256):
-   │                                                            ^^^^ attributes hash: 17942395924573474124
+96 │     def _approve(owner: address, spender: address, value: u256):
+   │                                                           ^^^^ attributes hash: 17942395924573474124
    │
    = Base(
          Numeric(
@@ -6887,7 +6887,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:106:38
     │
-106 │     def _before_token_transfer(from: address, to: address, amount: u256):
+106 │     def _before_token_transfer(from: address, to: address, value: u256):
     │                                      ^^^^^^^ attributes hash: 574436082528610497
     │
     = Base(
@@ -6897,7 +6897,7 @@ note:
 note: 
     ┌─ demos/erc20_token.fe:106:51
     │
-106 │     def _before_token_transfer(from: address, to: address, amount: u256):
+106 │     def _before_token_transfer(from: address, to: address, value: u256):
     │                                                   ^^^^^^^ attributes hash: 574436082528610497
     │
     = Base(
@@ -6905,10 +6905,10 @@ note:
       )
 
 note: 
-    ┌─ demos/erc20_token.fe:106:68
+    ┌─ demos/erc20_token.fe:106:67
     │
-106 │     def _before_token_transfer(from: address, to: address, amount: u256):
-    │                                                                    ^^^^ attributes hash: 17942395924573474124
+106 │     def _before_token_transfer(from: address, to: address, value: u256):
+    │                                                                   ^^^^ attributes hash: 17942395924573474124
     │
     = Base(
           Numeric(
diff --git a/analyzer/tests/snapshots/analysis__case_003_uniswap.snap b/analyzer/tests/snapshots/analysis__case_003_uniswap.snap
index 0977c1156c..ddf87a4159 100644
--- a/analyzer/tests/snapshots/analysis__case_003_uniswap.snap
+++ b/analyzer/tests/snapshots/analysis__case_003_uniswap.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -1002,10 +1002,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:78:31
+   ┌─ demos/uniswap.fe:78:36
    │
-78 │         emit Transfer(address(0), to, value)
-   │                               ^ attributes hash: 16797824492585953824
+78 │         emit Transfer(from=address(0), to, value)
+   │                                    ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1018,10 +1018,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:78:31
+   ┌─ demos/uniswap.fe:78:36
    │
-78 │         emit Transfer(address(0), to, value)
-   │                               ^ attributes hash: 16797824492585953824
+78 │         emit Transfer(from=address(0), to, value)
+   │                                    ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1034,10 +1034,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:78:23
+   ┌─ demos/uniswap.fe:78:28
    │
-78 │         emit Transfer(address(0), to, value)
-   │                       ^^^^^^^^^^ attributes hash: 513065555763557710
+78 │         emit Transfer(from=address(0), to, value)
+   │                            ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1048,10 +1048,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:78:23
+   ┌─ demos/uniswap.fe:78:28
    │
-78 │         emit Transfer(address(0), to, value)
-   │                       ^^^^^^^^^^ attributes hash: 513065555763557710
+78 │         emit Transfer(from=address(0), to, value)
+   │                            ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1062,10 +1062,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:78:35
+   ┌─ demos/uniswap.fe:78:40
    │
-78 │         emit Transfer(address(0), to, value)
-   │                                   ^^ attributes hash: 513065555763557710
+78 │         emit Transfer(from=address(0), to, value)
+   │                                        ^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1076,10 +1076,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:78:35
+   ┌─ demos/uniswap.fe:78:40
    │
-78 │         emit Transfer(address(0), to, value)
-   │                                   ^^ attributes hash: 513065555763557710
+78 │         emit Transfer(from=address(0), to, value)
+   │                                        ^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1090,10 +1090,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:78:39
+   ┌─ demos/uniswap.fe:78:44
    │
-78 │         emit Transfer(address(0), to, value)
-   │                                       ^^^^^ attributes hash: 16797824492585953824
+78 │         emit Transfer(from=address(0), to, value)
+   │                                            ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1106,10 +1106,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:78:39
+   ┌─ demos/uniswap.fe:78:44
    │
-78 │         emit Transfer(address(0), to, value)
-   │                                       ^^^^^ attributes hash: 16797824492585953824
+78 │         emit Transfer(from=address(0), to, value)
+   │                                            ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1448,7 +1448,7 @@ note:
 note: 
    ┌─ demos/uniswap.fe:83:23
    │
-83 │         emit Transfer(from, address(0), value)
+83 │         emit Transfer(from, to=address(0), value)
    │                       ^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1462,7 +1462,7 @@ note:
 note: 
    ┌─ demos/uniswap.fe:83:23
    │
-83 │         emit Transfer(from, address(0), value)
+83 │         emit Transfer(from, to=address(0), value)
    │                       ^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -1474,10 +1474,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:83:37
+   ┌─ demos/uniswap.fe:83:40
    │
-83 │         emit Transfer(from, address(0), value)
-   │                                     ^ attributes hash: 16797824492585953824
+83 │         emit Transfer(from, to=address(0), value)
+   │                                        ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1490,10 +1490,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:83:37
+   ┌─ demos/uniswap.fe:83:40
    │
-83 │         emit Transfer(from, address(0), value)
-   │                                     ^ attributes hash: 16797824492585953824
+83 │         emit Transfer(from, to=address(0), value)
+   │                                        ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1506,10 +1506,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:83:29
+   ┌─ demos/uniswap.fe:83:32
    │
-83 │         emit Transfer(from, address(0), value)
-   │                             ^^^^^^^^^^ attributes hash: 513065555763557710
+83 │         emit Transfer(from, to=address(0), value)
+   │                                ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1520,10 +1520,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:83:29
+   ┌─ demos/uniswap.fe:83:32
    │
-83 │         emit Transfer(from, address(0), value)
-   │                             ^^^^^^^^^^ attributes hash: 513065555763557710
+83 │         emit Transfer(from, to=address(0), value)
+   │                                ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1534,10 +1534,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:83:41
+   ┌─ demos/uniswap.fe:83:44
    │
-83 │         emit Transfer(from, address(0), value)
-   │                                         ^^^^^ attributes hash: 16797824492585953824
+83 │         emit Transfer(from, to=address(0), value)
+   │                                            ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1550,10 +1550,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:83:41
+   ┌─ demos/uniswap.fe:83:44
    │
-83 │         emit Transfer(from, address(0), value)
-   │                                         ^^^^^ attributes hash: 16797824492585953824
+83 │         emit Transfer(from, to=address(0), value)
+   │                                            ^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -3943,10 +3943,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:13
+    ┌─ demos/uniswap.fe:128:12
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15741501250024162929
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │            ^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -3954,19 +3954,15 @@ note:
                   U256,
               ),
           ),
-          location: Storage {
-              nonce: Some(
-                  10,
-              ),
-          },
+          location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:43
+    ┌─ demos/uniswap.fe:128:12
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 415408777929039325
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │            ^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -3974,21 +3970,15 @@ note:
                   U256,
               ),
           ),
-          location: Storage {
-              nonce: Some(
-                  10,
-              ),
-          },
-          move_location: Some(
-              Value,
-          ),
+          location: Value,
+          move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:43
+    ┌─ demos/uniswap.fe:128:27
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 415408777929039325
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                           ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -3996,21 +3986,15 @@ note:
                   U256,
               ),
           ),
-          location: Storage {
-              nonce: Some(
-                  10,
-              ),
-          },
-          move_location: Some(
-              Value,
-          ),
+          location: Value,
+          move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:74
+    ┌─ demos/uniswap.fe:128:27
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                                                          ^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                           ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4023,42 +4007,38 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:74
+    ┌─ demos/uniswap.fe:128:12
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                                                          ^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │            ^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:85
+    ┌─ demos/uniswap.fe:128:12
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                                                                     ^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │            ^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:85
+    ┌─ demos/uniswap.fe:128:33
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                                                                     ^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                 ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4071,10 +4051,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:73
+    ┌─ demos/uniswap.fe:128:33
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                                                         ^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                 ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4087,10 +4067,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:73
+    ┌─ demos/uniswap.fe:128:45
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                                                         ^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                             ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4103,10 +4083,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:97
+    ┌─ demos/uniswap.fe:128:45
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                                                                                 ^^^^^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                             ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4119,74 +4099,66 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:97
+    ┌─ demos/uniswap.fe:128:33
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                                                                                 ^^^^^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                 ^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:73
+    ┌─ demos/uniswap.fe:128:33
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                 ^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:73
+    ┌─ demos/uniswap.fe:128:12
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:130:43
+    ┌─ demos/uniswap.fe:128:12
     │
-130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
-    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:13
+    ┌─ demos/uniswap.fe:128:51
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 7132230727609778484
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                                   ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4194,19 +4166,15 @@ note:
                   U256,
               ),
           ),
-          location: Storage {
-              nonce: Some(
-                  11,
-              ),
-          },
+          location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:43
+    ┌─ demos/uniswap.fe:128:51
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 4883298818346038831
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                                   ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4214,21 +4182,15 @@ note:
                   U256,
               ),
           ),
-          location: Storage {
-              nonce: Some(
-                  11,
-              ),
-          },
-          move_location: Some(
-              Value,
-          ),
+          location: Value,
+          move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:43
+    ┌─ demos/uniswap.fe:128:63
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 4883298818346038831
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                                               ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4236,21 +4198,15 @@ note:
                   U256,
               ),
           ),
-          location: Storage {
-              nonce: Some(
-                  11,
-              ),
-          },
-          move_location: Some(
-              Value,
-          ),
+          location: Value,
+          move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:74
+    ┌─ demos/uniswap.fe:128:63
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                                                          ^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                                               ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4263,58 +4219,52 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:74
+    ┌─ demos/uniswap.fe:128:51
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                                                          ^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                                   ^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:85
+    ┌─ demos/uniswap.fe:128:51
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                                                                     ^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │                                                   ^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:85
+    ┌─ demos/uniswap.fe:128:12
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                                                                     ^^^^^^^^ attributes hash: 16797824492585953824
+128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
+    │            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:73
+    ┌─ demos/uniswap.fe:130:13
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                                                         ^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15741501250024162929
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4322,15 +4272,19 @@ note:
                   U256,
               ),
           ),
-          location: Value,
+          location: Storage {
+              nonce: Some(
+                  10,
+              ),
+          },
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:73
+    ┌─ demos/uniswap.fe:130:43
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                                                         ^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 415408777929039325
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4338,15 +4292,21 @@ note:
                   U256,
               ),
           ),
-          location: Value,
-          move_location: None,
+          location: Storage {
+              nonce: Some(
+                  10,
+              ),
+          },
+          move_location: Some(
+              Value,
+          ),
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:97
+    ┌─ demos/uniswap.fe:130:43
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                                                                                 ^^^^^^^^^^^^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 415408777929039325
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4354,15 +4314,21 @@ note:
                   U256,
               ),
           ),
-          location: Value,
-          move_location: None,
+          location: Storage {
+              nonce: Some(
+                  10,
+              ),
+          },
+          move_location: Some(
+              Value,
+          ),
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:97
+    ┌─ demos/uniswap.fe:130:74
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                                                                                 ^^^^^^^^^^^^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                                                          ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4375,10 +4341,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:73
+    ┌─ demos/uniswap.fe:130:74
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                                                          ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4391,10 +4357,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:73
+    ┌─ demos/uniswap.fe:130:85
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                                                                     ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4407,10 +4373,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:131:43
+    ┌─ demos/uniswap.fe:130:85
     │
-131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
-    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                                                                     ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4423,10 +4389,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:12
+    ┌─ demos/uniswap.fe:130:73
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │            ^^^^^^^^^^^^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                                                         ^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4439,10 +4405,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:12
+    ┌─ demos/uniswap.fe:130:73
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │            ^^^^^^^^^^^^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                                                         ^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4455,10 +4421,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:27
+    ┌─ demos/uniswap.fe:130:97
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                           ^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                                                                                 ^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4471,10 +4437,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:27
+    ┌─ demos/uniswap.fe:130:97
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                           ^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                                                                                 ^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4487,38 +4453,42 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:12
+    ┌─ demos/uniswap.fe:130:73
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │            ^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:12
+    ┌─ demos/uniswap.fe:130:73
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │            ^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:33
+    ┌─ demos/uniswap.fe:130:43
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                 ^^^^^^^^ attributes hash: 16797824492585953824
+130 │             self.price0_cumulative_last = self.price0_cumulative_last + (reserve1 / reserve0) * time_elapsed
+    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4531,10 +4501,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:33
+    ┌─ demos/uniswap.fe:131:13
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                 ^^^^^^^^ attributes hash: 16797824492585953824
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │             ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 7132230727609778484
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4542,15 +4512,19 @@ note:
                   U256,
               ),
           ),
-          location: Value,
+          location: Storage {
+              nonce: Some(
+                  11,
+              ),
+          },
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:45
+    ┌─ demos/uniswap.fe:131:43
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                             ^ attributes hash: 16797824492585953824
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 4883298818346038831
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4558,15 +4532,21 @@ note:
                   U256,
               ),
           ),
-          location: Value,
-          move_location: None,
+          location: Storage {
+              nonce: Some(
+                  11,
+              ),
+          },
+          move_location: Some(
+              Value,
+          ),
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:45
+    ┌─ demos/uniswap.fe:131:43
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                             ^ attributes hash: 16797824492585953824
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 4883298818346038831
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4574,71 +4554,85 @@ note:
                   U256,
               ),
           ),
-          location: Value,
-          move_location: None,
+          location: Storage {
+              nonce: Some(
+                  11,
+              ),
+          },
+          move_location: Some(
+              Value,
+          ),
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:33
+    ┌─ demos/uniswap.fe:131:74
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                 ^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                                                          ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:33
+    ┌─ demos/uniswap.fe:131:74
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                 ^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                                                          ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:12
+    ┌─ demos/uniswap.fe:131:85
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                                                                     ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:12
+    ┌─ demos/uniswap.fe:131:85
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                                                                     ^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:51
+    ┌─ demos/uniswap.fe:131:73
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                                   ^^^^^^^^ attributes hash: 16797824492585953824
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                                                         ^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4651,10 +4645,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:51
+    ┌─ demos/uniswap.fe:131:73
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                                   ^^^^^^^^ attributes hash: 16797824492585953824
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                                                         ^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4667,10 +4661,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:63
+    ┌─ demos/uniswap.fe:131:97
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                                               ^ attributes hash: 16797824492585953824
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                                                                                 ^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4683,10 +4677,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:63
+    ┌─ demos/uniswap.fe:131:97
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                                               ^ attributes hash: 16797824492585953824
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                                                                                 ^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4699,42 +4693,48 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:51
+    ┌─ demos/uniswap.fe:131:73
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                                   ^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:51
+    ┌─ demos/uniswap.fe:131:73
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │                                                   ^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                                                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:128:12
+    ┌─ demos/uniswap.fe:131:43
     │
-128 │         if time_elapsed > 0 and reserve0 != 0 and reserve1 != 0:
-    │            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+131 │             self.price1_cumulative_last = self.price1_cumulative_last + (reserve0 / reserve1) * time_elapsed
+    │                                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
@@ -4849,10 +4849,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:136:19
+    ┌─ demos/uniswap.fe:136:28
     │
-136 │         emit Sync(self.reserve0, self.reserve1)
-    │                   ^^^^^^^^^^^^^ attributes hash: 16880951683415213473
+136 │         emit Sync(reserve0=self.reserve0, reserve1=self.reserve1)
+    │                            ^^^^^^^^^^^^^ attributes hash: 16880951683415213473
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4871,10 +4871,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:136:19
+    ┌─ demos/uniswap.fe:136:28
     │
-136 │         emit Sync(self.reserve0, self.reserve1)
-    │                   ^^^^^^^^^^^^^ attributes hash: 16880951683415213473
+136 │         emit Sync(reserve0=self.reserve0, reserve1=self.reserve1)
+    │                            ^^^^^^^^^^^^^ attributes hash: 16880951683415213473
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4893,10 +4893,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:136:34
+    ┌─ demos/uniswap.fe:136:52
     │
-136 │         emit Sync(self.reserve0, self.reserve1)
-    │                                  ^^^^^^^^^^^^^ attributes hash: 12418118303529001266
+136 │         emit Sync(reserve0=self.reserve0, reserve1=self.reserve1)
+    │                                                    ^^^^^^^^^^^^^ attributes hash: 12418118303529001266
     │
     = ExpressionAttributes {
           typ: Base(
@@ -4915,10 +4915,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:136:34
+    ┌─ demos/uniswap.fe:136:52
     │
-136 │         emit Sync(self.reserve0, self.reserve1)
-    │                                  ^^^^^^^^^^^^^ attributes hash: 12418118303529001266
+136 │         emit Sync(reserve0=self.reserve0, reserve1=self.reserve1)
+    │                                                    ^^^^^^^^^^^^^ attributes hash: 12418118303529001266
     │
     = ExpressionAttributes {
           typ: Base(
@@ -5264,26 +5264,24 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:145:42
+    ┌─ demos/uniswap.fe:143:12
     │
-145 │                 root_k: u256 = self.sqrt(reserve0 * reserve1)
-    │                                          ^^^^^^^^ attributes hash: 16797824492585953824
+143 │         if fee_on:
+    │            ^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:145:42
+    ┌─ demos/uniswap.fe:144:16
     │
-145 │                 root_k: u256 = self.sqrt(reserve0 * reserve1)
-    │                                          ^^^^^^^^ attributes hash: 16797824492585953824
+144 │             if k_last != 0:
+    │                ^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -5296,10 +5294,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:145:53
+    ┌─ demos/uniswap.fe:144:16
     │
-145 │                 root_k: u256 = self.sqrt(reserve0 * reserve1)
-    │                                                     ^^^^^^^^ attributes hash: 16797824492585953824
+144 │             if k_last != 0:
+    │                ^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -5312,10 +5310,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:145:53
+    ┌─ demos/uniswap.fe:144:26
     │
-145 │                 root_k: u256 = self.sqrt(reserve0 * reserve1)
-    │                                                     ^^^^^^^^ attributes hash: 16797824492585953824
+144 │             if k_last != 0:
+    │                          ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -5328,10 +5326,104 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:145:42
+    ┌─ demos/uniswap.fe:144:26
     │
-145 │                 root_k: u256 = self.sqrt(reserve0 * reserve1)
-    │                                          ^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+144 │             if k_last != 0:
+    │                          ^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:144:16
+    │
+144 │             if k_last != 0:
+    │                ^^^^^^^^^^^ attributes hash: 10866140763116710699
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Bool,
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:145:42
+    │
+145 │                 root_k: u256 = self.sqrt(reserve0 * reserve1)
+    │                                          ^^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:145:42
+    │
+145 │                 root_k: u256 = self.sqrt(reserve0 * reserve1)
+    │                                          ^^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:145:53
+    │
+145 │                 root_k: u256 = self.sqrt(reserve0 * reserve1)
+    │                                                     ^^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:145:53
+    │
+145 │                 root_k: u256 = self.sqrt(reserve0 * reserve1)
+    │                                                     ^^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:145:42
+    │
+145 │                 root_k: u256 = self.sqrt(reserve0 * reserve1)
+    │                                          ^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -5455,6 +5547,84 @@ note:
           move_location: None,
       }
 
+note: 
+    ┌─ demos/uniswap.fe:147:20
+    │
+147 │                 if root_k > root_k_last:
+    │                    ^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:147:20
+    │
+147 │                 if root_k > root_k_last:
+    │                    ^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:147:29
+    │
+147 │                 if root_k > root_k_last:
+    │                             ^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:147:29
+    │
+147 │                 if root_k > root_k_last:
+    │                             ^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:147:20
+    │
+147 │                 if root_k > root_k_last:
+    │                    ^^^^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Bool,
+          ),
+          location: Value,
+          move_location: None,
+      }
+
 note: 
     ┌─ demos/uniswap.fe:148:39
     │
@@ -5884,38 +6054,42 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:152:36
+    ┌─ demos/uniswap.fe:151:24
     │
-152 │                         self._mint(fee_to, liquidity)
-    │                                    ^^^^^^ attributes hash: 513065555763557710
+151 │                     if liquidity > 0:
+    │                        ^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Address,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:152:36
+    ┌─ demos/uniswap.fe:151:24
     │
-152 │                         self._mint(fee_to, liquidity)
-    │                                    ^^^^^^ attributes hash: 513065555763557710
+151 │                     if liquidity > 0:
+    │                        ^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Address,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:152:44
+    ┌─ demos/uniswap.fe:151:36
     │
-152 │                         self._mint(fee_to, liquidity)
-    │                                            ^^^^^^^^^ attributes hash: 16797824492585953824
+151 │                     if liquidity > 0:
+    │                                    ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -5928,10 +6102,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:152:44
+    ┌─ demos/uniswap.fe:151:36
     │
-152 │                         self._mint(fee_to, liquidity)
-    │                                            ^^^^^^^^^ attributes hash: 16797824492585953824
+151 │                     if liquidity > 0:
+    │                                    ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -5944,58 +6118,52 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:152:25
+    ┌─ demos/uniswap.fe:151:24
     │
-152 │                         self._mint(fee_to, liquidity)
-    │                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
+151 │                     if liquidity > 0:
+    │                        ^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
-          typ: Tuple(
-              Tuple {
-                  items: [],
-              },
+          typ: Base(
+              Bool,
           ),
-          location: Memory,
+          location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:151:24
+    ┌─ demos/uniswap.fe:152:36
     │
-151 │                     if liquidity > 0:
-    │                        ^^^^^^^^^ attributes hash: 16797824492585953824
+152 │                         self._mint(fee_to, liquidity)
+    │                                    ^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Address,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:151:24
+    ┌─ demos/uniswap.fe:152:36
     │
-151 │                     if liquidity > 0:
-    │                        ^^^^^^^^^ attributes hash: 16797824492585953824
+152 │                         self._mint(fee_to, liquidity)
+    │                                    ^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Address,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:151:36
+    ┌─ demos/uniswap.fe:152:44
     │
-151 │                     if liquidity > 0:
-    │                                    ^ attributes hash: 16797824492585953824
+152 │                         self._mint(fee_to, liquidity)
+    │                                            ^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -6008,10 +6176,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:151:36
+    ┌─ demos/uniswap.fe:152:44
     │
-151 │                     if liquidity > 0:
-    │                                    ^ attributes hash: 16797824492585953824
+152 │                         self._mint(fee_to, liquidity)
+    │                                            ^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -6024,102 +6192,26 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:151:24
+    ┌─ demos/uniswap.fe:152:25
     │
-151 │                     if liquidity > 0:
-    │                        ^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+152 │                         self._mint(fee_to, liquidity)
+    │                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 2354569150226010475
     │
     = ExpressionAttributes {
-          typ: Base(
-              Bool,
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:147:20
-    │
-147 │                 if root_k > root_k_last:
-    │                    ^^^^^^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:147:20
-    │
-147 │                 if root_k > root_k_last:
-    │                    ^^^^^^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:147:29
-    │
-147 │                 if root_k > root_k_last:
-    │                             ^^^^^^^^^^^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:147:29
-    │
-147 │                 if root_k > root_k_last:
-    │                             ^^^^^^^^^^^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:147:20
-    │
-147 │                 if root_k > root_k_last:
-    │                    ^^^^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Bool,
+          typ: Tuple(
+              Tuple {
+                  items: [],
+              },
           ),
-          location: Value,
+          location: Memory,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:144:16
+    ┌─ demos/uniswap.fe:153:14
     │
-144 │             if k_last != 0:
-    │                ^^^^^^ attributes hash: 16797824492585953824
+153 │         elif k_last != 0:
+    │              ^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -6132,10 +6224,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:144:16
+    ┌─ demos/uniswap.fe:153:14
     │
-144 │             if k_last != 0:
-    │                ^^^^^^ attributes hash: 16797824492585953824
+153 │         elif k_last != 0:
+    │              ^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -6148,10 +6240,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:144:26
+    ┌─ demos/uniswap.fe:153:24
     │
-144 │             if k_last != 0:
-    │                          ^ attributes hash: 16797824492585953824
+153 │         elif k_last != 0:
+    │                        ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -6164,10 +6256,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:144:26
+    ┌─ demos/uniswap.fe:153:24
     │
-144 │             if k_last != 0:
-    │                          ^ attributes hash: 16797824492585953824
+153 │         elif k_last != 0:
+    │                        ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -6180,10 +6272,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:144:16
+    ┌─ demos/uniswap.fe:153:14
     │
-144 │             if k_last != 0:
-    │                ^^^^^^^^^^^ attributes hash: 10866140763116710699
+153 │         elif k_last != 0:
+    │              ^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
@@ -6229,98 +6321,6 @@ note:
           move_location: None,
       }
 
-note: 
-    ┌─ demos/uniswap.fe:153:14
-    │
-153 │         elif k_last != 0:
-    │              ^^^^^^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:153:14
-    │
-153 │         elif k_last != 0:
-    │              ^^^^^^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:153:24
-    │
-153 │         elif k_last != 0:
-    │                        ^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:153:24
-    │
-153 │         elif k_last != 0:
-    │                        ^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:153:14
-    │
-153 │         elif k_last != 0:
-    │              ^^^^^^^^^^^ attributes hash: 10866140763116710699
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Bool,
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:143:12
-    │
-143 │         if fee_on:
-    │            ^^^^^^ attributes hash: 10866140763116710699
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Bool,
-          ),
-          location: Value,
-          move_location: None,
-      }
-
 note: 
     ┌─ demos/uniswap.fe:156:16
     │
@@ -7170,10 +7170,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:172:13
+    ┌─ demos/uniswap.fe:171:12
     │
-172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
-    │             ^^^^^^^^^ attributes hash: 16797824492585953824
+171 │         if total_supply == 0:
+    │            ^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -7186,10 +7186,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:172:35
+    ┌─ demos/uniswap.fe:171:12
     │
-172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
-    │                                   ^^^^^^^ attributes hash: 16797824492585953824
+171 │         if total_supply == 0:
+    │            ^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -7202,10 +7202,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:172:35
+    ┌─ demos/uniswap.fe:171:28
     │
-172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
-    │                                   ^^^^^^^ attributes hash: 16797824492585953824
+171 │         if total_supply == 0:
+    │                            ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -7218,10 +7218,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:172:45
+    ┌─ demos/uniswap.fe:171:28
     │
-172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
-    │                                             ^^^^^^^ attributes hash: 16797824492585953824
+171 │         if total_supply == 0:
+    │                            ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -7234,26 +7234,24 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:172:45
+    ┌─ demos/uniswap.fe:171:12
     │
-172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
-    │                                             ^^^^^^^ attributes hash: 16797824492585953824
+171 │         if total_supply == 0:
+    │            ^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:172:35
+    ┌─ demos/uniswap.fe:172:13
     │
 172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
-    │                                   ^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │             ^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -7269,7 +7267,7 @@ note:
     ┌─ demos/uniswap.fe:172:35
     │
 172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
-    │                                   ^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │                                   ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -7282,10 +7280,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:172:25
+    ┌─ demos/uniswap.fe:172:35
     │
 172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
-    │                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │                                   ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -7298,10 +7296,90 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:172:25
+    ┌─ demos/uniswap.fe:172:45
     │
 172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
-    │                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │                                             ^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:172:45
+    │
+172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
+    │                                             ^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:172:35
+    │
+172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
+    │                                   ^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:172:35
+    │
+172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
+    │                                   ^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:172:25
+    │
+172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
+    │                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:172:25
+    │
+172 │             liquidity = self.sqrt(amount0 * amount1) - MINIMUM_LIQUIDITY
+    │                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -7821,84 +7899,6 @@ note:
           move_location: None,
       }
 
-note: 
-    ┌─ demos/uniswap.fe:171:12
-    │
-171 │         if total_supply == 0:
-    │            ^^^^^^^^^^^^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:171:12
-    │
-171 │         if total_supply == 0:
-    │            ^^^^^^^^^^^^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:171:28
-    │
-171 │         if total_supply == 0:
-    │                            ^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:171:28
-    │
-171 │         if total_supply == 0:
-    │                            ^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:171:12
-    │
-171 │         if total_supply == 0:
-    │            ^^^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Bool,
-          ),
-          location: Value,
-          move_location: None,
-      }
-
 note: 
     ┌─ demos/uniswap.fe:177:16
     │
@@ -8213,6 +8213,20 @@ note:
           move_location: None,
       }
 
+note: 
+    ┌─ demos/uniswap.fe:182:12
+    │
+182 │         if fee_on:
+    │            ^^^^^^ attributes hash: 10866140763116710699
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Bool,
+          ),
+          location: Value,
+          move_location: None,
+      }
+
 note: 
     ┌─ demos/uniswap.fe:183:13
     │
@@ -8314,24 +8328,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:182:12
-    │
-182 │         if fee_on:
-    │            ^^^^^^ attributes hash: 10866140763116710699
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Bool,
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:185:19
+    ┌─ demos/uniswap.fe:185:26
     │
-185 │         emit Mint(msg.sender, amount0, amount1)
-    │                   ^^^^^^^^^^ attributes hash: 513065555763557710
+185 │         emit Mint(sender=msg.sender, amount0, amount1)
+    │                          ^^^^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -8342,10 +8342,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:185:19
+    ┌─ demos/uniswap.fe:185:26
     │
-185 │         emit Mint(msg.sender, amount0, amount1)
-    │                   ^^^^^^^^^^ attributes hash: 513065555763557710
+185 │         emit Mint(sender=msg.sender, amount0, amount1)
+    │                          ^^^^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -8356,10 +8356,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:185:31
+    ┌─ demos/uniswap.fe:185:38
     │
-185 │         emit Mint(msg.sender, amount0, amount1)
-    │                               ^^^^^^^ attributes hash: 16797824492585953824
+185 │         emit Mint(sender=msg.sender, amount0, amount1)
+    │                                      ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -8372,10 +8372,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:185:31
+    ┌─ demos/uniswap.fe:185:38
     │
-185 │         emit Mint(msg.sender, amount0, amount1)
-    │                               ^^^^^^^ attributes hash: 16797824492585953824
+185 │         emit Mint(sender=msg.sender, amount0, amount1)
+    │                                      ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -8388,10 +8388,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:185:40
+    ┌─ demos/uniswap.fe:185:47
     │
-185 │         emit Mint(msg.sender, amount0, amount1)
-    │                                        ^^^^^^^ attributes hash: 16797824492585953824
+185 │         emit Mint(sender=msg.sender, amount0, amount1)
+    │                                               ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -8404,10 +8404,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:185:40
+    ┌─ demos/uniswap.fe:185:47
     │
-185 │         emit Mint(msg.sender, amount0, amount1)
-    │                                        ^^^^^^^ attributes hash: 16797824492585953824
+185 │         emit Mint(sender=msg.sender, amount0, amount1)
+    │                                               ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -10570,6 +10570,20 @@ note:
           move_location: None,
       }
 
+note: 
+    ┌─ demos/uniswap.fe:211:12
+    │
+211 │         if fee_on:
+    │            ^^^^^^ attributes hash: 10866140763116710699
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Bool,
+          ),
+          location: Value,
+          move_location: None,
+      }
+
 note: 
     ┌─ demos/uniswap.fe:212:13
     │
@@ -10671,24 +10685,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:211:12
-    │
-211 │         if fee_on:
-    │            ^^^^^^ attributes hash: 10866140763116710699
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Bool,
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:214:19
+    ┌─ demos/uniswap.fe:214:26
     │
-214 │         emit Burn(msg.sender, amount0, amount1, to)
-    │                   ^^^^^^^^^^ attributes hash: 513065555763557710
+214 │         emit Burn(sender=msg.sender, amount0, amount1, to)
+    │                          ^^^^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -10699,10 +10699,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:214:19
+    ┌─ demos/uniswap.fe:214:26
     │
-214 │         emit Burn(msg.sender, amount0, amount1, to)
-    │                   ^^^^^^^^^^ attributes hash: 513065555763557710
+214 │         emit Burn(sender=msg.sender, amount0, amount1, to)
+    │                          ^^^^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -10713,10 +10713,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:214:31
+    ┌─ demos/uniswap.fe:214:38
     │
-214 │         emit Burn(msg.sender, amount0, amount1, to)
-    │                               ^^^^^^^ attributes hash: 16797824492585953824
+214 │         emit Burn(sender=msg.sender, amount0, amount1, to)
+    │                                      ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -10729,10 +10729,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:214:31
+    ┌─ demos/uniswap.fe:214:38
     │
-214 │         emit Burn(msg.sender, amount0, amount1, to)
-    │                               ^^^^^^^ attributes hash: 16797824492585953824
+214 │         emit Burn(sender=msg.sender, amount0, amount1, to)
+    │                                      ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -10745,10 +10745,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:214:40
+    ┌─ demos/uniswap.fe:214:47
     │
-214 │         emit Burn(msg.sender, amount0, amount1, to)
-    │                                        ^^^^^^^ attributes hash: 16797824492585953824
+214 │         emit Burn(sender=msg.sender, amount0, amount1, to)
+    │                                               ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -10761,10 +10761,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:214:40
+    ┌─ demos/uniswap.fe:214:47
     │
-214 │         emit Burn(msg.sender, amount0, amount1, to)
-    │                                        ^^^^^^^ attributes hash: 16797824492585953824
+214 │         emit Burn(sender=msg.sender, amount0, amount1, to)
+    │                                               ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -10777,10 +10777,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:214:49
+    ┌─ demos/uniswap.fe:214:56
     │
-214 │         emit Burn(msg.sender, amount0, amount1, to)
-    │                                                 ^^ attributes hash: 513065555763557710
+214 │         emit Burn(sender=msg.sender, amount0, amount1, to)
+    │                                                        ^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -10791,10 +10791,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:214:49
+    ┌─ demos/uniswap.fe:214:56
     │
-214 │         emit Burn(msg.sender, amount0, amount1, to)
-    │                                                 ^^ attributes hash: 513065555763557710
+214 │         emit Burn(sender=msg.sender, amount0, amount1, to)
+    │                                                        ^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -12181,44 +12181,122 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:233:13
+    ┌─ demos/uniswap.fe:232:12
     │
-233 │             token0.transfer(to, amount0_out) # optimistically transfer tokens
-    │             ^^^^^^ attributes hash: 15391172439059254871
+232 │         if amount0_out > 0:
+    │            ^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
-          typ: Contract(
-              Contract {
-                  name: "ERC20",
-                  functions: [
-                      FunctionAttributes {
-                          is_public: true,
-                          name: "balanceOf",
-                          params: [
-                              (
-                                  "account",
-                                  Base(
-                                      Address,
-                                  ),
-                              ),
-                          ],
-                          return_type: Base(
-                              Numeric(
-                                  U256,
-                              ),
-                          ),
-                      },
-                      FunctionAttributes {
-                          is_public: true,
-                          name: "transfer",
-                          params: [
-                              (
-                                  "recipient",
-                                  Base(
-                                      Address,
-                                  ),
-                              ),
-                              (
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:232:12
+    │
+232 │         if amount0_out > 0:
+    │            ^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:232:26
+    │
+232 │         if amount0_out > 0:
+    │                          ^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:232:26
+    │
+232 │         if amount0_out > 0:
+    │                          ^ attributes hash: 16797824492585953824
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Numeric(
+                  U256,
+              ),
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:232:12
+    │
+232 │         if amount0_out > 0:
+    │            ^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
+    │
+    = ExpressionAttributes {
+          typ: Base(
+              Bool,
+          ),
+          location: Value,
+          move_location: None,
+      }
+
+note: 
+    ┌─ demos/uniswap.fe:233:13
+    │
+233 │             token0.transfer(to, amount0_out) # optimistically transfer tokens
+    │             ^^^^^^ attributes hash: 15391172439059254871
+    │
+    = ExpressionAttributes {
+          typ: Contract(
+              Contract {
+                  name: "ERC20",
+                  functions: [
+                      FunctionAttributes {
+                          is_public: true,
+                          name: "balanceOf",
+                          params: [
+                              (
+                                  "account",
+                                  Base(
+                                      Address,
+                                  ),
+                              ),
+                          ],
+                          return_type: Base(
+                              Numeric(
+                                  U256,
+                              ),
+                          ),
+                      },
+                      FunctionAttributes {
+                          is_public: true,
+                          name: "transfer",
+                          params: [
+                              (
+                                  "recipient",
+                                  Base(
+                                      Address,
+                                  ),
+                              ),
+                              (
                                   "amount",
                                   Base(
                                       Numeric(
@@ -12313,9 +12391,9 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:232:12
+    ┌─ demos/uniswap.fe:234:12
     │
-232 │         if amount0_out > 0:
+234 │         if amount1_out > 0:
     │            ^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
@@ -12329,9 +12407,9 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:232:12
+    ┌─ demos/uniswap.fe:234:12
     │
-232 │         if amount0_out > 0:
+234 │         if amount1_out > 0:
     │            ^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
@@ -12345,9 +12423,9 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:232:26
+    ┌─ demos/uniswap.fe:234:26
     │
-232 │         if amount0_out > 0:
+234 │         if amount1_out > 0:
     │                          ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
@@ -12361,9 +12439,9 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:232:26
+    ┌─ demos/uniswap.fe:234:26
     │
-232 │         if amount0_out > 0:
+234 │         if amount1_out > 0:
     │                          ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
@@ -12377,9 +12455,9 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:232:12
+    ┌─ demos/uniswap.fe:234:12
     │
-232 │         if amount0_out > 0:
+234 │         if amount1_out > 0:
     │            ^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
@@ -12522,84 +12600,6 @@ note:
           move_location: None,
       }
 
-note: 
-    ┌─ demos/uniswap.fe:234:12
-    │
-234 │         if amount1_out > 0:
-    │            ^^^^^^^^^^^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:234:12
-    │
-234 │         if amount1_out > 0:
-    │            ^^^^^^^^^^^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:234:26
-    │
-234 │         if amount1_out > 0:
-    │                          ^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:234:26
-    │
-234 │         if amount1_out > 0:
-    │                          ^ attributes hash: 16797824492585953824
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Numeric(
-                  U256,
-              ),
-          ),
-          location: Value,
-          move_location: None,
-      }
-
-note: 
-    ┌─ demos/uniswap.fe:234:12
-    │
-234 │         if amount1_out > 0:
-    │            ^^^^^^^^^^^^^^^ attributes hash: 10866140763116710699
-    │
-    = ExpressionAttributes {
-          typ: Base(
-              Bool,
-          ),
-          location: Value,
-          move_location: None,
-      }
-
 note: 
     ┌─ demos/uniswap.fe:240:26
     │
@@ -14689,10 +14689,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:19
+    ┌─ demos/uniswap.fe:254:26
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                   ^^^^^^^^^^ attributes hash: 513065555763557710
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                          ^^^^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14703,10 +14703,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:19
+    ┌─ demos/uniswap.fe:254:26
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                   ^^^^^^^^^^ attributes hash: 513065555763557710
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                          ^^^^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14717,10 +14717,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:31
+    ┌─ demos/uniswap.fe:254:38
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                               ^^^^^^^^^^ attributes hash: 16797824492585953824
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                                      ^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14733,10 +14733,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:31
+    ┌─ demos/uniswap.fe:254:38
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                               ^^^^^^^^^^ attributes hash: 16797824492585953824
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                                      ^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14749,10 +14749,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:43
+    ┌─ demos/uniswap.fe:254:50
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                                           ^^^^^^^^^^ attributes hash: 16797824492585953824
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                                                  ^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14765,10 +14765,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:43
+    ┌─ demos/uniswap.fe:254:50
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                                           ^^^^^^^^^^ attributes hash: 16797824492585953824
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                                                  ^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14781,10 +14781,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:55
+    ┌─ demos/uniswap.fe:254:62
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                                                       ^^^^^^^^^^^ attributes hash: 16797824492585953824
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                                                              ^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14797,10 +14797,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:55
+    ┌─ demos/uniswap.fe:254:62
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                                                       ^^^^^^^^^^^ attributes hash: 16797824492585953824
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                                                              ^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14813,10 +14813,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:68
+    ┌─ demos/uniswap.fe:254:75
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                                                                    ^^^^^^^^^^^ attributes hash: 16797824492585953824
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                                                                           ^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14829,10 +14829,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:68
+    ┌─ demos/uniswap.fe:254:75
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                                                                    ^^^^^^^^^^^ attributes hash: 16797824492585953824
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                                                                           ^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14845,10 +14845,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:81
+    ┌─ demos/uniswap.fe:254:88
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                                                                                 ^^ attributes hash: 513065555763557710
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                                                                                        ^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -14859,10 +14859,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:254:81
+    ┌─ demos/uniswap.fe:254:88
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │                                                                                 ^^ attributes hash: 513065555763557710
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │                                                                                        ^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16425,10 +16425,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:273:13
+    ┌─ demos/uniswap.fe:272:13
     │
-273 │             z = val
-    │             ^ attributes hash: 16797824492585953824
+272 │         if (val > 3):
+    │             ^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16441,10 +16441,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:273:17
+    ┌─ demos/uniswap.fe:272:13
     │
-273 │             z = val
-    │                 ^^^ attributes hash: 16797824492585953824
+272 │         if (val > 3):
+    │             ^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16457,10 +16457,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:274:23
+    ┌─ demos/uniswap.fe:272:19
     │
-274 │             x: u256 = val / 2 + 1
-    │                       ^^^ attributes hash: 16797824492585953824
+272 │         if (val > 3):
+    │                   ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16473,10 +16473,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:274:23
+    ┌─ demos/uniswap.fe:272:19
     │
-274 │             x: u256 = val / 2 + 1
-    │                       ^^^ attributes hash: 16797824492585953824
+272 │         if (val > 3):
+    │                   ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16489,26 +16489,24 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:274:29
+    ┌─ demos/uniswap.fe:272:12
     │
-274 │             x: u256 = val / 2 + 1
-    │                             ^ attributes hash: 16797824492585953824
+272 │         if (val > 3):
+    │            ^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:274:29
+    ┌─ demos/uniswap.fe:273:13
     │
-274 │             x: u256 = val / 2 + 1
-    │                             ^ attributes hash: 16797824492585953824
+273 │             z = val
+    │             ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16521,10 +16519,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:274:23
+    ┌─ demos/uniswap.fe:273:17
     │
-274 │             x: u256 = val / 2 + 1
-    │                       ^^^^^^^ attributes hash: 16797824492585953824
+273 │             z = val
+    │                 ^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16540,7 +16538,7 @@ note:
     ┌─ demos/uniswap.fe:274:23
     │
 274 │             x: u256 = val / 2 + 1
-    │                       ^^^^^^^ attributes hash: 16797824492585953824
+    │                       ^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16553,10 +16551,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:274:33
+    ┌─ demos/uniswap.fe:274:23
     │
 274 │             x: u256 = val / 2 + 1
-    │                                 ^ attributes hash: 16797824492585953824
+    │                       ^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16569,10 +16567,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:274:33
+    ┌─ demos/uniswap.fe:274:29
     │
 274 │             x: u256 = val / 2 + 1
-    │                                 ^ attributes hash: 16797824492585953824
+    │                             ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16585,10 +16583,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:274:23
+    ┌─ demos/uniswap.fe:274:29
     │
 274 │             x: u256 = val / 2 + 1
-    │                       ^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │                             ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16604,7 +16602,7 @@ note:
     ┌─ demos/uniswap.fe:274:23
     │
 274 │             x: u256 = val / 2 + 1
-    │                       ^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │                       ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16617,10 +16615,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:276:17
+    ┌─ demos/uniswap.fe:274:23
     │
-276 │                 z = x
-    │                 ^ attributes hash: 16797824492585953824
+274 │             x: u256 = val / 2 + 1
+    │                       ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16633,10 +16631,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:276:21
+    ┌─ demos/uniswap.fe:274:33
     │
-276 │                 z = x
-    │                     ^ attributes hash: 16797824492585953824
+274 │             x: u256 = val / 2 + 1
+    │                                 ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16649,10 +16647,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:17
+    ┌─ demos/uniswap.fe:274:33
     │
-277 │                 x = (val / x + x) / 2
-    │                 ^ attributes hash: 16797824492585953824
+274 │             x: u256 = val / 2 + 1
+    │                                 ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16665,10 +16663,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:22
+    ┌─ demos/uniswap.fe:274:23
     │
-277 │                 x = (val / x + x) / 2
-    │                      ^^^ attributes hash: 16797824492585953824
+274 │             x: u256 = val / 2 + 1
+    │                       ^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16681,10 +16679,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:22
+    ┌─ demos/uniswap.fe:274:23
     │
-277 │                 x = (val / x + x) / 2
-    │                      ^^^ attributes hash: 16797824492585953824
+274 │             x: u256 = val / 2 + 1
+    │                       ^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16697,10 +16695,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:28
+    ┌─ demos/uniswap.fe:275:20
     │
-277 │                 x = (val / x + x) / 2
-    │                            ^ attributes hash: 16797824492585953824
+275 │             while (x < z):
+    │                    ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16713,10 +16711,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:28
+    ┌─ demos/uniswap.fe:275:20
     │
-277 │                 x = (val / x + x) / 2
-    │                            ^ attributes hash: 16797824492585953824
+275 │             while (x < z):
+    │                    ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16729,10 +16727,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:22
+    ┌─ demos/uniswap.fe:275:24
     │
-277 │                 x = (val / x + x) / 2
-    │                      ^^^^^^^ attributes hash: 16797824492585953824
+275 │             while (x < z):
+    │                        ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16745,10 +16743,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:22
+    ┌─ demos/uniswap.fe:275:24
     │
-277 │                 x = (val / x + x) / 2
-    │                      ^^^^^^^ attributes hash: 16797824492585953824
+275 │             while (x < z):
+    │                        ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16761,26 +16759,24 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:32
+    ┌─ demos/uniswap.fe:275:19
     │
-277 │                 x = (val / x + x) / 2
-    │                                ^ attributes hash: 16797824492585953824
+275 │             while (x < z):
+    │                   ^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:32
+    ┌─ demos/uniswap.fe:276:17
     │
-277 │                 x = (val / x + x) / 2
-    │                                ^ attributes hash: 16797824492585953824
+276 │                 z = x
+    │                 ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16793,10 +16789,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:21
+    ┌─ demos/uniswap.fe:276:21
     │
-277 │                 x = (val / x + x) / 2
-    │                     ^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+276 │                 z = x
+    │                     ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16809,10 +16805,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:21
+    ┌─ demos/uniswap.fe:277:17
     │
 277 │                 x = (val / x + x) / 2
-    │                     ^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │                 ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16825,10 +16821,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:37
+    ┌─ demos/uniswap.fe:277:22
     │
 277 │                 x = (val / x + x) / 2
-    │                                     ^ attributes hash: 16797824492585953824
+    │                      ^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16841,10 +16837,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:37
+    ┌─ demos/uniswap.fe:277:22
     │
 277 │                 x = (val / x + x) / 2
-    │                                     ^ attributes hash: 16797824492585953824
+    │                      ^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16857,10 +16853,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:277:21
+    ┌─ demos/uniswap.fe:277:28
     │
 277 │                 x = (val / x + x) / 2
-    │                     ^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
+    │                            ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16873,10 +16869,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:275:20
+    ┌─ demos/uniswap.fe:277:28
     │
-275 │             while (x < z):
-    │                    ^ attributes hash: 16797824492585953824
+277 │                 x = (val / x + x) / 2
+    │                            ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16889,10 +16885,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:275:20
+    ┌─ demos/uniswap.fe:277:22
     │
-275 │             while (x < z):
-    │                    ^ attributes hash: 16797824492585953824
+277 │                 x = (val / x + x) / 2
+    │                      ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16905,10 +16901,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:275:24
+    ┌─ demos/uniswap.fe:277:22
     │
-275 │             while (x < z):
-    │                        ^ attributes hash: 16797824492585953824
+277 │                 x = (val / x + x) / 2
+    │                      ^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16921,10 +16917,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:275:24
+    ┌─ demos/uniswap.fe:277:32
     │
-275 │             while (x < z):
-    │                        ^ attributes hash: 16797824492585953824
+277 │                 x = (val / x + x) / 2
+    │                                ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16937,24 +16933,26 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:275:19
+    ┌─ demos/uniswap.fe:277:32
     │
-275 │             while (x < z):
-    │                   ^^^^^^^ attributes hash: 10866140763116710699
+277 │                 x = (val / x + x) / 2
+    │                                ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:279:13
+    ┌─ demos/uniswap.fe:277:21
     │
-279 │             z = 1
-    │             ^ attributes hash: 16797824492585953824
+277 │                 x = (val / x + x) / 2
+    │                     ^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16967,10 +16965,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:279:17
+    ┌─ demos/uniswap.fe:277:21
     │
-279 │             z = 1
-    │                 ^ attributes hash: 16797824492585953824
+277 │                 x = (val / x + x) / 2
+    │                     ^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16983,10 +16981,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:278:15
+    ┌─ demos/uniswap.fe:277:37
     │
-278 │         elif (val != 0):
-    │               ^^^ attributes hash: 16797824492585953824
+277 │                 x = (val / x + x) / 2
+    │                                     ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -16999,10 +16997,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:278:15
+    ┌─ demos/uniswap.fe:277:37
     │
-278 │         elif (val != 0):
-    │               ^^^ attributes hash: 16797824492585953824
+277 │                 x = (val / x + x) / 2
+    │                                     ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -17015,10 +17013,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:278:22
+    ┌─ demos/uniswap.fe:277:21
     │
-278 │         elif (val != 0):
-    │                      ^ attributes hash: 16797824492585953824
+277 │                 x = (val / x + x) / 2
+    │                     ^^^^^^^^^^^^^^^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -17031,10 +17029,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:278:22
+    ┌─ demos/uniswap.fe:278:15
     │
 278 │         elif (val != 0):
-    │                      ^ attributes hash: 16797824492585953824
+    │               ^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -17047,24 +17045,26 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:278:14
+    ┌─ demos/uniswap.fe:278:15
     │
 278 │         elif (val != 0):
-    │              ^^^^^^^^^^ attributes hash: 10866140763116710699
+    │               ^^^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:272:13
+    ┌─ demos/uniswap.fe:278:22
     │
-272 │         if (val > 3):
-    │             ^^^ attributes hash: 16797824492585953824
+278 │         elif (val != 0):
+    │                      ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -17077,10 +17077,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:272:13
+    ┌─ demos/uniswap.fe:278:22
     │
-272 │         if (val > 3):
-    │             ^^^ attributes hash: 16797824492585953824
+278 │         elif (val != 0):
+    │                      ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -17093,26 +17093,24 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:272:19
+    ┌─ demos/uniswap.fe:278:14
     │
-272 │         if (val > 3):
-    │                   ^ attributes hash: 16797824492585953824
+278 │         elif (val != 0):
+    │              ^^^^^^^^^^ attributes hash: 10866140763116710699
     │
     = ExpressionAttributes {
           typ: Base(
-              Numeric(
-                  U256,
-              ),
+              Bool,
           ),
           location: Value,
           move_location: None,
       }
 
 note: 
-    ┌─ demos/uniswap.fe:272:19
+    ┌─ demos/uniswap.fe:279:13
     │
-272 │         if (val > 3):
-    │                   ^ attributes hash: 16797824492585953824
+279 │             z = 1
+    │             ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
@@ -17125,14 +17123,16 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:272:12
+    ┌─ demos/uniswap.fe:279:17
     │
-272 │         if (val > 3):
-    │            ^^^^^^^^^ attributes hash: 10866140763116710699
+279 │             z = 1
+    │                 ^ attributes hash: 16797824492585953824
     │
     = ExpressionAttributes {
           typ: Base(
-              Bool,
+              Numeric(
+                  U256,
+              ),
           ),
           location: Value,
           move_location: None,
@@ -21638,7 +21638,7 @@ note:
 note: 
     ┌─ demos/uniswap.fe:329:26
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
     │                          ^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -21652,7 +21652,7 @@ note:
 note: 
     ┌─ demos/uniswap.fe:329:26
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
     │                          ^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -21666,7 +21666,7 @@ note:
 note: 
     ┌─ demos/uniswap.fe:329:34
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
     │                                  ^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -21680,7 +21680,7 @@ note:
 note: 
     ┌─ demos/uniswap.fe:329:34
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
     │                                  ^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
@@ -21692,10 +21692,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:329:50
+    ┌─ demos/uniswap.fe:329:55
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
-    │                                                  ^^^^ attributes hash: 2891139793169608093
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
+    │                                                       ^^^^ attributes hash: 2891139793169608093
     │
     = ExpressionAttributes {
           typ: Contract(
@@ -21980,10 +21980,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:329:50
+    ┌─ demos/uniswap.fe:329:55
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
-    │                                                  ^^^^ attributes hash: 2891139793169608093
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
+    │                                                       ^^^^ attributes hash: 2891139793169608093
     │
     = ExpressionAttributes {
           typ: Contract(
@@ -22268,10 +22268,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:329:42
+    ┌─ demos/uniswap.fe:329:47
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
-    │                                          ^^^^^^^^^^^^^ attributes hash: 513065555763557710
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
+    │                                               ^^^^^^^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -22282,10 +22282,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:329:42
+    ┌─ demos/uniswap.fe:329:47
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
-    │                                          ^^^^^^^^^^^^^ attributes hash: 513065555763557710
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
+    │                                               ^^^^^^^^^^^^^ attributes hash: 513065555763557710
     │
     = ExpressionAttributes {
           typ: Base(
@@ -22296,10 +22296,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:329:57
+    ┌─ demos/uniswap.fe:329:68
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
-    │                                                         ^^^^^^^^^^^^^^^^^ attributes hash: 1282759725205707727
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
+    │                                                                    ^^^^^^^^^^^^^^^^^ attributes hash: 1282759725205707727
     │
     = ExpressionAttributes {
           typ: Base(
@@ -22318,10 +22318,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:329:57
+    ┌─ demos/uniswap.fe:329:68
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
-    │                                                         ^^^^^^^^^^^^^^^^^ attributes hash: 1282759725205707727
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
+    │                                                                    ^^^^^^^^^^^^^^^^^ attributes hash: 1282759725205707727
     │
     = ExpressionAttributes {
           typ: Base(
@@ -23194,8 +23194,8 @@ note:
 note: 
    ┌─ demos/uniswap.fe:78:9
    │
-78 │         emit Transfer(address(0), to, value)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15998888495671832844
+78 │         emit Transfer(from=address(0), to, value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15998888495671832844
    │
    = EventDef {
          name: "Transfer",
@@ -23231,8 +23231,8 @@ note:
 note: 
    ┌─ demos/uniswap.fe:83:9
    │
-83 │         emit Transfer(from, address(0), value)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15998888495671832844
+83 │         emit Transfer(from, to=address(0), value)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15998888495671832844
    │
    = EventDef {
          name: "Transfer",
@@ -23342,8 +23342,8 @@ note:
 note: 
     ┌─ demos/uniswap.fe:136:9
     │
-136 │         emit Sync(self.reserve0, self.reserve1)
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 6095773162878845632
+136 │         emit Sync(reserve0=self.reserve0, reserve1=self.reserve1)
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 6095773162878845632
     │
     = EventDef {
           name: "Sync",
@@ -23372,8 +23372,8 @@ note:
 note: 
     ┌─ demos/uniswap.fe:185:9
     │
-185 │         emit Mint(msg.sender, amount0, amount1)
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 1636288424141028296
+185 │         emit Mint(sender=msg.sender, amount0, amount1)
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 1636288424141028296
     │
     = EventDef {
           name: "Mint",
@@ -23410,8 +23410,8 @@ note:
 note: 
     ┌─ demos/uniswap.fe:214:9
     │
-214 │         emit Burn(msg.sender, amount0, amount1, to)
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16979320078494421415
+214 │         emit Burn(sender=msg.sender, amount0, amount1, to)
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 16979320078494421415
     │
     = EventDef {
           name: "Burn",
@@ -23455,8 +23455,8 @@ note:
 note: 
     ┌─ demos/uniswap.fe:254:9
     │
-254 │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 4739631867462849257
+254 │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 4739631867462849257
     │
     = EventDef {
           name: "Swap",
@@ -23516,8 +23516,8 @@ note:
 note: 
     ┌─ demos/uniswap.fe:329:9
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 11987103913122517646
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
+    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 11987103913122517646
     │
     = EventDef {
           name: "PairCreated",
@@ -23684,8 +23684,8 @@ note:
 75 │ ╭     def _mint(to: address, value: u256):
 76 │ │         self.total_supply = self.total_supply + value
 77 │ │         self.balances[to] = self.balances[to] + value
-78 │ │         emit Transfer(address(0), to, value)
-   │ ╰────────────────────────────────────────────^ attributes hash: 10457838918248983829
+78 │ │         emit Transfer(from=address(0), to, value)
+   │ ╰─────────────────────────────────────────────────^ attributes hash: 10457838918248983829
    │  
    = FunctionAttributes {
          is_public: false,
@@ -23719,8 +23719,8 @@ note:
 80 │ ╭     def _burn(from: address, value: u256):
 81 │ │         self.balances[from] = self.balances[from] - value
 82 │ │         self.total_supply = self.total_supply - value
-83 │ │         emit Transfer(from, address(0), value)
-   │ ╰──────────────────────────────────────────────^ attributes hash: 6739626012262523171
+83 │ │         emit Transfer(from, to=address(0), value)
+   │ ╰─────────────────────────────────────────────────^ attributes hash: 6739626012262523171
    │  
    = FunctionAttributes {
          is_public: false,
@@ -24036,8 +24036,8 @@ note:
 126 │ │         # TODO: reproduce desired overflow (https://github.com/ethereum/fe/issues/286)
     · │
 135 │ │         self.block_timestamp_last = block_timestamp
-136 │ │         emit Sync(self.reserve0, self.reserve1)
-    │ ╰───────────────────────────────────────────────^ attributes hash: 2893663465664541813
+136 │ │         emit Sync(reserve0=self.reserve0, reserve1=self.reserve1)
+    │ ╰─────────────────────────────────────────────────────────────────^ attributes hash: 2893663465664541813
     │  
     = FunctionAttributes {
           is_public: false,
@@ -24129,7 +24129,7 @@ note:
 161 │ │         reserve0: u256 = self.reserve0
 162 │ │         reserve1: u256 = self.reserve1
     · │
-185 │ │         emit Mint(msg.sender, amount0, amount1)
+185 │ │         emit Mint(sender=msg.sender, amount0, amount1)
 186 │ │         return liquidity
     │ ╰────────────────────────^ attributes hash: 9020577417301809812
     │  
@@ -24159,7 +24159,7 @@ note:
 191 │ │         reserve1: u256 = self.reserve1
 192 │ │         token0: ERC20 = ERC20(self.token0)
     · │
-214 │ │         emit Burn(msg.sender, amount0, amount1, to)
+214 │ │         emit Burn(sender=msg.sender, amount0, amount1, to)
 215 │ │         return (amount0, amount1)
     │ ╰─────────────────────────────────^ attributes hash: 8651519123401558066
     │  
@@ -24201,8 +24201,8 @@ note:
 223 │ │         reserve1: u256 = self.reserve1
     · │
 253 │ │         self._update(balance0, balance1, reserve0, reserve1)
-254 │ │         emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
-    │ ╰───────────────────────────────────────────────────────────────────────────────────^ attributes hash: 3378424488272191105
+254 │ │         emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+    │ ╰──────────────────────────────────────────────────────────────────────────────────────────^ attributes hash: 3378424488272191105
     │  
     = FunctionAttributes {
           is_public: true,
@@ -24437,7 +24437,7 @@ note:
 314 │ │ 
 315 │ │         token0: address = token_a if token_a < token_b else token_b
     · │
-329 │ │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
+329 │ │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
 330 │ │         return address(pair)
     │ ╰────────────────────────────^ attributes hash: 10544195126543983127
     │  
@@ -27290,10 +27290,10 @@ note:
       }
 
 note: 
-   ┌─ demos/uniswap.fe:78:23
+   ┌─ demos/uniswap.fe:78:28
    │
-78 │         emit Transfer(address(0), to, value)
-   │                       ^^^^^^^ attributes hash: 6114858510168753394
+78 │         emit Transfer(from=address(0), to, value)
+   │                            ^^^^^^^ attributes hash: 6114858510168753394
    │
    = TypeConstructor {
          typ: Base(
@@ -27302,10 +27302,10 @@ note:
      }
 
 note: 
-   ┌─ demos/uniswap.fe:83:29
+   ┌─ demos/uniswap.fe:83:32
    │
-83 │         emit Transfer(from, address(0), value)
-   │                             ^^^^^^^ attributes hash: 6114858510168753394
+83 │         emit Transfer(from, to=address(0), value)
+   │                                ^^^^^^^ attributes hash: 6114858510168753394
    │
    = TypeConstructor {
          typ: Base(
@@ -28714,10 +28714,10 @@ note:
       }
 
 note: 
-    ┌─ demos/uniswap.fe:329:42
+    ┌─ demos/uniswap.fe:329:47
     │
-329 │         emit PairCreated(token0, token1, address(pair), self.pair_counter)
-    │                                          ^^^^^^^ attributes hash: 6114858510168753394
+329 │         emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
+    │                                               ^^^^^^^ attributes hash: 6114858510168753394
     │
     = TypeConstructor {
           typ: Base(
diff --git a/analyzer/tests/snapshots/analysis__case_017_events.snap b/analyzer/tests/snapshots/analysis__case_017_events.snap
index 9036a0e6a0..27bb085d3f 100644
--- a/analyzer/tests/snapshots/analysis__case_017_events.snap
+++ b/analyzer/tests/snapshots/analysis__case_017_events.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -93,10 +93,10 @@ ModuleAttributes {
 }
 
 note: 
-   ┌─ features/events.fe:20:19
+   ┌─ features/events.fe:20:24
    │
-20 │         emit Nums(26, 42)
-   │                   ^^ attributes hash: 16797824492585953824
+20 │         emit Nums(num1=26, num2=42)
+   │                        ^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -109,10 +109,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:20:19
+   ┌─ features/events.fe:20:24
    │
-20 │         emit Nums(26, 42)
-   │                   ^^ attributes hash: 16797824492585953824
+20 │         emit Nums(num1=26, num2=42)
+   │                        ^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -125,10 +125,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:20:23
+   ┌─ features/events.fe:20:33
    │
-20 │         emit Nums(26, 42)
-   │                       ^^ attributes hash: 16797824492585953824
+20 │         emit Nums(num1=26, num2=42)
+   │                                 ^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -141,10 +141,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:20:23
+   ┌─ features/events.fe:20:33
    │
-20 │         emit Nums(26, 42)
-   │                       ^^ attributes hash: 16797824492585953824
+20 │         emit Nums(num1=26, num2=42)
+   │                                 ^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -157,10 +157,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:23:20
+   ┌─ features/events.fe:23:24
    │
-23 │         emit Bases(26, addr)
-   │                    ^^ attributes hash: 16797824492585953824
+23 │         emit Bases(num=26, addr)
+   │                        ^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -173,10 +173,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:23:20
+   ┌─ features/events.fe:23:24
    │
-23 │         emit Bases(26, addr)
-   │                    ^^ attributes hash: 16797824492585953824
+23 │         emit Bases(num=26, addr)
+   │                        ^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -189,10 +189,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:23:24
+   ┌─ features/events.fe:23:28
    │
-23 │         emit Bases(26, addr)
-   │                        ^^^^ attributes hash: 513065555763557710
+23 │         emit Bases(num=26, addr)
+   │                            ^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -203,10 +203,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:23:24
+   ┌─ features/events.fe:23:28
    │
-23 │         emit Bases(26, addr)
-   │                        ^^^^ attributes hash: 513065555763557710
+23 │         emit Bases(num=26, addr)
+   │                            ^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -217,10 +217,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:26:18
+   ┌─ features/events.fe:26:23
    │
-26 │         emit Mix(26, addr, 42, my_bytes)
-   │                  ^^ attributes hash: 16797824492585953824
+26 │         emit Mix(num1=26, addr, num2=42, my_bytes)
+   │                       ^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -233,10 +233,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:26:18
+   ┌─ features/events.fe:26:23
    │
-26 │         emit Mix(26, addr, 42, my_bytes)
-   │                  ^^ attributes hash: 16797824492585953824
+26 │         emit Mix(num1=26, addr, num2=42, my_bytes)
+   │                       ^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -249,10 +249,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:26:22
+   ┌─ features/events.fe:26:27
    │
-26 │         emit Mix(26, addr, 42, my_bytes)
-   │                      ^^^^ attributes hash: 513065555763557710
+26 │         emit Mix(num1=26, addr, num2=42, my_bytes)
+   │                           ^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -263,10 +263,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:26:22
+   ┌─ features/events.fe:26:27
    │
-26 │         emit Mix(26, addr, 42, my_bytes)
-   │                      ^^^^ attributes hash: 513065555763557710
+26 │         emit Mix(num1=26, addr, num2=42, my_bytes)
+   │                           ^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -277,10 +277,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:26:28
+   ┌─ features/events.fe:26:38
    │
-26 │         emit Mix(26, addr, 42, my_bytes)
-   │                            ^^ attributes hash: 16797824492585953824
+26 │         emit Mix(num1=26, addr, num2=42, my_bytes)
+   │                                      ^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -293,10 +293,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:26:28
+   ┌─ features/events.fe:26:38
    │
-26 │         emit Mix(26, addr, 42, my_bytes)
-   │                            ^^ attributes hash: 16797824492585953824
+26 │         emit Mix(num1=26, addr, num2=42, my_bytes)
+   │                                      ^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -309,10 +309,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:26:32
+   ┌─ features/events.fe:26:42
    │
-26 │         emit Mix(26, addr, 42, my_bytes)
-   │                                ^^^^^^^^ attributes hash: 6578844474441717363
+26 │         emit Mix(num1=26, addr, num2=42, my_bytes)
+   │                                          ^^^^^^^^ attributes hash: 6578844474441717363
    │
    = ExpressionAttributes {
          typ: Array(
@@ -326,10 +326,10 @@ note:
      }
 
 note: 
-   ┌─ features/events.fe:26:32
+   ┌─ features/events.fe:26:42
    │
-26 │         emit Mix(26, addr, 42, my_bytes)
-   │                                ^^^^^^^^ attributes hash: 6578844474441717363
+26 │         emit Mix(num1=26, addr, num2=42, my_bytes)
+   │                                          ^^^^^^^^ attributes hash: 6578844474441717363
    │
    = ExpressionAttributes {
          typ: Array(
@@ -533,8 +533,8 @@ note:
 note: 
    ┌─ features/events.fe:20:9
    │
-20 │         emit Nums(26, 42)
-   │         ^^^^^^^^^^^^^^^^^ attributes hash: 8999358109956579907
+20 │         emit Nums(num1=26, num2=42)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 8999358109956579907
    │
    = EventDef {
          name: "Nums",
@@ -565,8 +565,8 @@ note:
 note: 
    ┌─ features/events.fe:23:9
    │
-23 │         emit Bases(26, addr)
-   │         ^^^^^^^^^^^^^^^^^^^^ attributes hash: 5699817361126738246
+23 │         emit Bases(num=26, addr)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 5699817361126738246
    │
    = EventDef {
          name: "Bases",
@@ -593,8 +593,8 @@ note:
 note: 
    ┌─ features/events.fe:26:9
    │
-26 │         emit Mix(26, addr, 42, my_bytes)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 11314162245279394306
+26 │         emit Mix(num1=26, addr, num2=42, my_bytes)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 11314162245279394306
    │
    = EventDef {
          name: "Mix",
@@ -664,8 +664,8 @@ note:
    ┌─ features/events.fe:19:5
    │  
 19 │ ╭     pub def emit_nums():
-20 │ │         emit Nums(26, 42)
-   │ ╰─────────────────────────^ attributes hash: 9764190810044556773
+20 │ │         emit Nums(num1=26, num2=42)
+   │ ╰───────────────────────────────────^ attributes hash: 9764190810044556773
    │  
    = FunctionAttributes {
          is_public: true,
@@ -682,8 +682,8 @@ note:
    ┌─ features/events.fe:22:5
    │  
 22 │ ╭     pub def emit_bases(addr: address):
-23 │ │         emit Bases(26, addr)
-   │ ╰────────────────────────────^ attributes hash: 13121295556902477896
+23 │ │         emit Bases(num=26, addr)
+   │ ╰────────────────────────────────^ attributes hash: 13121295556902477896
    │  
    = FunctionAttributes {
          is_public: true,
@@ -707,8 +707,8 @@ note:
    ┌─ features/events.fe:25:5
    │  
 25 │ ╭     pub def emit_mix(addr: address, my_bytes: bytes[100]):
-26 │ │         emit Mix(26, addr, 42, my_bytes)
-   │ ╰────────────────────────────────────────^ attributes hash: 17728699728265147345
+26 │ │         emit Mix(num1=26, addr, num2=42, my_bytes)
+   │ ╰──────────────────────────────────────────────────^ attributes hash: 17728699728265147345
    │  
    = FunctionAttributes {
          is_public: true,
diff --git a/analyzer/tests/snapshots/analysis__case_022_if_statement.snap b/analyzer/tests/snapshots/analysis__case_022_if_statement.snap
index 92f47e87a1..4798798eda 100644
--- a/analyzer/tests/snapshots/analysis__case_022_if_statement.snap
+++ b/analyzer/tests/snapshots/analysis__case_022_if_statement.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -36,10 +36,10 @@ ModuleAttributes {
 }
 
 note: 
-  ┌─ features/if_statement.fe:5:20
+  ┌─ features/if_statement.fe:4:12
   │
-5 │             return 1
-  │                    ^ attributes hash: 16797824492585953824
+4 │         if input > 5:
+  │            ^^^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -52,10 +52,10 @@ note:
     }
 
 note: 
-  ┌─ features/if_statement.fe:5:20
+  ┌─ features/if_statement.fe:4:12
   │
-5 │             return 1
-  │                    ^ attributes hash: 16797824492585953824
+4 │         if input > 5:
+  │            ^^^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -68,9 +68,9 @@ note:
     }
 
 note: 
-  ┌─ features/if_statement.fe:7:20
+  ┌─ features/if_statement.fe:4:20
   │
-7 │             return 0
+4 │         if input > 5:
   │                    ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
@@ -84,9 +84,9 @@ note:
     }
 
 note: 
-  ┌─ features/if_statement.fe:7:20
+  ┌─ features/if_statement.fe:4:20
   │
-7 │             return 0
+4 │         if input > 5:
   │                    ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
@@ -103,23 +103,21 @@ note:
   ┌─ features/if_statement.fe:4:12
   │
 4 │         if input > 5:
-  │            ^^^^^ attributes hash: 16797824492585953824
+  │            ^^^^^^^^^ attributes hash: 10866140763116710699
   │
   = ExpressionAttributes {
         typ: Base(
-            Numeric(
-                U256,
-            ),
+            Bool,
         ),
         location: Value,
         move_location: None,
     }
 
 note: 
-  ┌─ features/if_statement.fe:4:12
+  ┌─ features/if_statement.fe:5:20
   │
-4 │         if input > 5:
-  │            ^^^^^ attributes hash: 16797824492585953824
+5 │             return 1
+  │                    ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -132,9 +130,9 @@ note:
     }
 
 note: 
-  ┌─ features/if_statement.fe:4:20
+  ┌─ features/if_statement.fe:5:20
   │
-4 │         if input > 5:
+5 │             return 1
   │                    ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
@@ -148,9 +146,9 @@ note:
     }
 
 note: 
-  ┌─ features/if_statement.fe:4:20
+  ┌─ features/if_statement.fe:7:20
   │
-4 │         if input > 5:
+7 │             return 0
   │                    ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
@@ -164,14 +162,16 @@ note:
     }
 
 note: 
-  ┌─ features/if_statement.fe:4:12
+  ┌─ features/if_statement.fe:7:20
   │
-4 │         if input > 5:
-  │            ^^^^^^^^^ attributes hash: 10866140763116710699
+7 │             return 0
+  │                    ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
-            Bool,
+            Numeric(
+                U256,
+            ),
         ),
         location: Value,
         move_location: None,
diff --git a/analyzer/tests/snapshots/analysis__case_023_if_statement_2.snap b/analyzer/tests/snapshots/analysis__case_023_if_statement_2.snap
index 877ce3d0a3..90a3fcc0a9 100644
--- a/analyzer/tests/snapshots/analysis__case_023_if_statement_2.snap
+++ b/analyzer/tests/snapshots/analysis__case_023_if_statement_2.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -36,10 +36,10 @@ ModuleAttributes {
 }
 
 note: 
-  ┌─ features/if_statement_2.fe:5:20
+  ┌─ features/if_statement_2.fe:4:12
   │
-5 │             return 1
-  │                    ^ attributes hash: 16797824492585953824
+4 │         if val > 5:
+  │            ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -52,10 +52,10 @@ note:
     }
 
 note: 
-  ┌─ features/if_statement_2.fe:5:20
+  ┌─ features/if_statement_2.fe:4:12
   │
-5 │             return 1
-  │                    ^ attributes hash: 16797824492585953824
+4 │         if val > 5:
+  │            ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -68,24 +68,26 @@ note:
     }
 
 note: 
-  ┌─ features/if_statement_2.fe:7:20
+  ┌─ features/if_statement_2.fe:4:18
   │
-7 │             assert true
-  │                    ^^^^ attributes hash: 10866140763116710699
+4 │         if val > 5:
+  │                  ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
-            Bool,
+            Numeric(
+                U256,
+            ),
         ),
         location: Value,
         move_location: None,
     }
 
 note: 
-  ┌─ features/if_statement_2.fe:4:12
+  ┌─ features/if_statement_2.fe:4:18
   │
 4 │         if val > 5:
-  │            ^^^ attributes hash: 16797824492585953824
+  │                  ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -101,23 +103,21 @@ note:
   ┌─ features/if_statement_2.fe:4:12
   │
 4 │         if val > 5:
-  │            ^^^ attributes hash: 16797824492585953824
+  │            ^^^^^^^ attributes hash: 10866140763116710699
   │
   = ExpressionAttributes {
         typ: Base(
-            Numeric(
-                U256,
-            ),
+            Bool,
         ),
         location: Value,
         move_location: None,
     }
 
 note: 
-  ┌─ features/if_statement_2.fe:4:18
+  ┌─ features/if_statement_2.fe:5:20
   │
-4 │         if val > 5:
-  │                  ^ attributes hash: 16797824492585953824
+5 │             return 1
+  │                    ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -130,10 +130,10 @@ note:
     }
 
 note: 
-  ┌─ features/if_statement_2.fe:4:18
+  ┌─ features/if_statement_2.fe:5:20
   │
-4 │         if val > 5:
-  │                  ^ attributes hash: 16797824492585953824
+5 │             return 1
+  │                    ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -146,10 +146,10 @@ note:
     }
 
 note: 
-  ┌─ features/if_statement_2.fe:4:12
+  ┌─ features/if_statement_2.fe:7:20
   │
-4 │         if val > 5:
-  │            ^^^^^^^ attributes hash: 10866140763116710699
+7 │             assert true
+  │                    ^^^^ attributes hash: 10866140763116710699
   │
   = ExpressionAttributes {
         typ: Base(
diff --git a/analyzer/tests/snapshots/analysis__case_024_if_statement_with_block_declaration.snap b/analyzer/tests/snapshots/analysis__case_024_if_statement_with_block_declaration.snap
index 904e5623e8..dbdd95b3b9 100644
--- a/analyzer/tests/snapshots/analysis__case_024_if_statement_with_block_declaration.snap
+++ b/analyzer/tests/snapshots/analysis__case_024_if_statement_with_block_declaration.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -26,6 +26,20 @@ ModuleAttributes {
     tuples_used: {},
 }
 
+note: 
+  ┌─ features/if_statement_with_block_declaration.fe:4:12
+  │
+4 │         if true:
+  │            ^^^^ attributes hash: 10866140763116710699
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Bool,
+        ),
+        location: Value,
+        move_location: None,
+    }
+
 note: 
   ┌─ features/if_statement_with_block_declaration.fe:5:23
   │
@@ -154,20 +168,6 @@ note:
         move_location: None,
     }
 
-note: 
-  ┌─ features/if_statement_with_block_declaration.fe:4:12
-  │
-4 │         if true:
-  │            ^^^^ attributes hash: 10866140763116710699
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Bool,
-        ),
-        location: Value,
-        move_location: None,
-    }
-
 note: 
   ┌─ features/if_statement_with_block_declaration.fe:3:5
   │  
diff --git a/analyzer/tests/snapshots/analysis__case_026_math.snap b/analyzer/tests/snapshots/analysis__case_026_math.snap
index 176534f72b..58344288c6 100644
--- a/analyzer/tests/snapshots/analysis__case_026_math.snap
+++ b/analyzer/tests/snapshots/analysis__case_026_math.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -62,6 +62,84 @@ ModuleAttributes {
     tuples_used: {},
 }
 
+note: 
+  ┌─ features/math.fe:6:13
+  │
+6 │         if (val > 3):
+  │             ^^^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/math.fe:6:13
+  │
+6 │         if (val > 3):
+  │             ^^^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/math.fe:6:19
+  │
+6 │         if (val > 3):
+  │                   ^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/math.fe:6:19
+  │
+6 │         if (val > 3):
+  │                   ^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/math.fe:6:12
+  │
+6 │         if (val > 3):
+  │            ^^^^^^^^^ attributes hash: 10866140763116710699
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Bool,
+        ),
+        location: Value,
+        move_location: None,
+    }
+
 note: 
   ┌─ features/math.fe:7:13
   │
@@ -254,6 +332,84 @@ note:
         move_location: None,
     }
 
+note: 
+  ┌─ features/math.fe:9:20
+  │
+9 │             while (x < z):
+  │                    ^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/math.fe:9:20
+  │
+9 │             while (x < z):
+  │                    ^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/math.fe:9:24
+  │
+9 │             while (x < z):
+  │                        ^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/math.fe:9:24
+  │
+9 │             while (x < z):
+  │                        ^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/math.fe:9:19
+  │
+9 │             while (x < z):
+  │                   ^^^^^^^ attributes hash: 10866140763116710699
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Bool,
+        ),
+        location: Value,
+        move_location: None,
+    }
+
 note: 
    ┌─ features/math.fe:10:17
    │
@@ -511,88 +667,10 @@ note:
      }
 
 note: 
-  ┌─ features/math.fe:9:20
-  │
-9 │             while (x < z):
-  │                    ^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/math.fe:9:20
-  │
-9 │             while (x < z):
-  │                    ^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/math.fe:9:24
-  │
-9 │             while (x < z):
-  │                        ^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/math.fe:9:24
-  │
-9 │             while (x < z):
-  │                        ^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/math.fe:9:19
-  │
-9 │             while (x < z):
-  │                   ^^^^^^^ attributes hash: 10866140763116710699
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Bool,
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-   ┌─ features/math.fe:13:13
+   ┌─ features/math.fe:12:15
    │
-13 │             z = 1
-   │             ^ attributes hash: 16797824492585953824
+12 │         elif (val != 0):
+   │               ^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -605,10 +683,10 @@ note:
      }
 
 note: 
-   ┌─ features/math.fe:13:17
+   ┌─ features/math.fe:12:15
    │
-13 │             z = 1
-   │                 ^ attributes hash: 16797824492585953824
+12 │         elif (val != 0):
+   │               ^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -621,10 +699,10 @@ note:
      }
 
 note: 
-   ┌─ features/math.fe:12:15
+   ┌─ features/math.fe:12:22
    │
 12 │         elif (val != 0):
-   │               ^^^ attributes hash: 16797824492585953824
+   │                      ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -637,10 +715,10 @@ note:
      }
 
 note: 
-   ┌─ features/math.fe:12:15
+   ┌─ features/math.fe:12:22
    │
 12 │         elif (val != 0):
-   │               ^^^ attributes hash: 16797824492585953824
+   │                      ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -653,26 +731,24 @@ note:
      }
 
 note: 
-   ┌─ features/math.fe:12:22
+   ┌─ features/math.fe:12:14
    │
 12 │         elif (val != 0):
-   │                      ^ attributes hash: 16797824492585953824
+   │              ^^^^^^^^^^ attributes hash: 10866140763116710699
    │
    = ExpressionAttributes {
          typ: Base(
-             Numeric(
-                 U256,
-             ),
+             Bool,
          ),
          location: Value,
          move_location: None,
      }
 
 note: 
-   ┌─ features/math.fe:12:22
+   ┌─ features/math.fe:13:13
    │
-12 │         elif (val != 0):
-   │                      ^ attributes hash: 16797824492585953824
+13 │             z = 1
+   │             ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -685,97 +761,21 @@ note:
      }
 
 note: 
-   ┌─ features/math.fe:12:14
+   ┌─ features/math.fe:13:17
    │
-12 │         elif (val != 0):
-   │              ^^^^^^^^^^ attributes hash: 10866140763116710699
+13 │             z = 1
+   │                 ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
-             Bool,
+             Numeric(
+                 U256,
+             ),
          ),
          location: Value,
          move_location: None,
      }
 
-note: 
-  ┌─ features/math.fe:6:13
-  │
-6 │         if (val > 3):
-  │             ^^^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/math.fe:6:13
-  │
-6 │         if (val > 3):
-  │             ^^^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/math.fe:6:19
-  │
-6 │         if (val > 3):
-  │                   ^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/math.fe:6:19
-  │
-6 │         if (val > 3):
-  │                   ^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/math.fe:6:12
-  │
-6 │         if (val > 3):
-  │            ^^^^^^^^^ attributes hash: 10866140763116710699
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Bool,
-        ),
-        location: Value,
-        move_location: None,
-    }
-
 note: 
    ┌─ features/math.fe:14:16
    │
diff --git a/analyzer/tests/snapshots/analysis__case_030_ownable.snap b/analyzer/tests/snapshots/analysis__case_030_ownable.snap
index 5ff7bbdabf..38dfaca352 100644
--- a/analyzer/tests/snapshots/analysis__case_030_ownable.snap
+++ b/analyzer/tests/snapshots/analysis__case_030_ownable.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -270,10 +270,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:17:31
+   ┌─ features/ownable.fe:17:45
    │
-17 │     emit OwnershipTransferred(msg.sender, address(0))
-   │                               ^^^^^^^^^^ attributes hash: 513065555763557710
+17 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+   │                                             ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -284,10 +284,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:17:31
+   ┌─ features/ownable.fe:17:45
    │
-17 │     emit OwnershipTransferred(msg.sender, address(0))
-   │                               ^^^^^^^^^^ attributes hash: 513065555763557710
+17 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+   │                                             ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -298,10 +298,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:17:51
+   ┌─ features/ownable.fe:17:74
    │
-17 │     emit OwnershipTransferred(msg.sender, address(0))
-   │                                                   ^ attributes hash: 16797824492585953824
+17 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+   │                                                                          ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -314,10 +314,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:17:51
+   ┌─ features/ownable.fe:17:74
    │
-17 │     emit OwnershipTransferred(msg.sender, address(0))
-   │                                                   ^ attributes hash: 16797824492585953824
+17 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+   │                                                                          ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -330,10 +330,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:17:43
+   ┌─ features/ownable.fe:17:66
    │
-17 │     emit OwnershipTransferred(msg.sender, address(0))
-   │                                           ^^^^^^^^^^ attributes hash: 513065555763557710
+17 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+   │                                                                  ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -344,10 +344,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:17:43
+   ┌─ features/ownable.fe:17:66
    │
-17 │     emit OwnershipTransferred(msg.sender, address(0))
-   │                                           ^^^^^^^^^^ attributes hash: 513065555763557710
+17 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+   │                                                                  ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -574,10 +574,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:23:31
+   ┌─ features/ownable.fe:23:45
    │
-23 │     emit OwnershipTransferred(msg.sender, newOwner)
-   │                               ^^^^^^^^^^ attributes hash: 513065555763557710
+23 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner)
+   │                                             ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -588,10 +588,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:23:31
+   ┌─ features/ownable.fe:23:45
    │
-23 │     emit OwnershipTransferred(msg.sender, newOwner)
-   │                               ^^^^^^^^^^ attributes hash: 513065555763557710
+23 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner)
+   │                                             ^^^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -602,10 +602,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:23:43
+   ┌─ features/ownable.fe:23:57
    │
-23 │     emit OwnershipTransferred(msg.sender, newOwner)
-   │                                           ^^^^^^^^ attributes hash: 513065555763557710
+23 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner)
+   │                                                         ^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -616,10 +616,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:23:43
+   ┌─ features/ownable.fe:23:57
    │
-23 │     emit OwnershipTransferred(msg.sender, newOwner)
-   │                                           ^^^^^^^^ attributes hash: 513065555763557710
+23 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner)
+   │                                                         ^^^^^^^^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
          typ: Base(
@@ -632,8 +632,8 @@ note:
 note: 
    ┌─ features/ownable.fe:17:5
    │
-17 │     emit OwnershipTransferred(msg.sender, address(0))
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 8065277106552702156
+17 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 8065277106552702156
    │
    = EventDef {
          name: "OwnershipTransferred",
@@ -661,8 +661,8 @@ note:
 note: 
    ┌─ features/ownable.fe:23:5
    │
-23 │     emit OwnershipTransferred(msg.sender, newOwner)
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 8065277106552702156
+23 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner)
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 8065277106552702156
    │
    = EventDef {
          name: "OwnershipTransferred",
@@ -727,8 +727,8 @@ note:
 14 │ ╭   pub def renounceOwnership():
 15 │ │     assert msg.sender == self._owner
 16 │ │     self._owner = address(0)
-17 │ │     emit OwnershipTransferred(msg.sender, address(0))
-   │ ╰─────────────────────────────────────────────────────^ attributes hash: 2119217478443958417
+17 │ │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+   │ ╰────────────────────────────────────────────────────────────────────────────^ attributes hash: 2119217478443958417
    │  
    = FunctionAttributes {
          is_public: true,
@@ -748,8 +748,8 @@ note:
 20 │ │     assert msg.sender == self._owner
 21 │ │     assert newOwner != address(0)
 22 │ │     self._owner = newOwner
-23 │ │     emit OwnershipTransferred(msg.sender, newOwner)
-   │ ╰───────────────────────────────────────────────────^ attributes hash: 2356471017531517953
+23 │ │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner)
+   │ ╰─────────────────────────────────────────────────────────────────^ attributes hash: 2356471017531517953
    │  
    = FunctionAttributes {
          is_public: true,
@@ -774,12 +774,12 @@ note:
    │  
  1 │ ╭ contract Ownable:
  2 │ │   _owner: address
- 3 │ │   
+ 3 │ │ 
  4 │ │   event OwnershipTransferred:
    · │
 22 │ │     self._owner = newOwner
-23 │ │     emit OwnershipTransferred(msg.sender, newOwner)
-   │ ╰───────────────────────────────────────────────────^ attributes hash: 8120887206130330134
+23 │ │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner)
+   │ ╰─────────────────────────────────────────────────────────────────^ attributes hash: 8120887206130330134
    │  
    = ContractAttributes {
          public_functions: [
@@ -864,10 +864,10 @@ note:
      }
 
 note: 
-   ┌─ features/ownable.fe:17:43
+   ┌─ features/ownable.fe:17:66
    │
-17 │     emit OwnershipTransferred(msg.sender, address(0))
-   │                                           ^^^^^^^ attributes hash: 6114858510168753394
+17 │     emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+   │                                                                  ^^^^^^^ attributes hash: 6114858510168753394
    │
    = TypeConstructor {
          typ: Base(
diff --git a/analyzer/tests/snapshots/analysis__case_085_sized_vals_in_sto.snap b/analyzer/tests/snapshots/analysis__case_085_sized_vals_in_sto.snap
index c54cb6bb2b..159fc09120 100644
--- a/analyzer/tests/snapshots/analysis__case_085_sized_vals_in_sto.snap
+++ b/analyzer/tests/snapshots/analysis__case_085_sized_vals_in_sto.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -415,10 +415,10 @@ note:
      }
 
 note: 
-   ┌─ features/sized_vals_in_sto.fe:31:13
+   ┌─ features/sized_vals_in_sto.fe:31:17
    │
-31 │             self.num,
-   │             ^^^^^^^^ attributes hash: 4679040613115932727
+31 │             num=self.num,
+   │                 ^^^^^^^^ attributes hash: 4679040613115932727
    │
    = ExpressionAttributes {
          typ: Base(
@@ -437,10 +437,10 @@ note:
      }
 
 note: 
-   ┌─ features/sized_vals_in_sto.fe:31:13
+   ┌─ features/sized_vals_in_sto.fe:31:17
    │
-31 │             self.num,
-   │             ^^^^^^^^ attributes hash: 4679040613115932727
+31 │             num=self.num,
+   │                 ^^^^^^^^ attributes hash: 4679040613115932727
    │
    = ExpressionAttributes {
          typ: Base(
@@ -459,10 +459,10 @@ note:
      }
 
 note: 
-   ┌─ features/sized_vals_in_sto.fe:32:13
+   ┌─ features/sized_vals_in_sto.fe:32:18
    │
-32 │             self.nums.to_mem(),
-   │             ^^^^^^^^^ attributes hash: 12193891266906267938
+32 │             nums=self.nums.to_mem(),
+   │                  ^^^^^^^^^ attributes hash: 12193891266906267938
    │
    = ExpressionAttributes {
          typ: Array(
@@ -482,10 +482,10 @@ note:
      }
 
 note: 
-   ┌─ features/sized_vals_in_sto.fe:32:13
+   ┌─ features/sized_vals_in_sto.fe:32:18
    │
-32 │             self.nums.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^ attributes hash: 2528791973804439794
+32 │             nums=self.nums.to_mem(),
+   │                  ^^^^^^^^^^^^^^^^^^ attributes hash: 2528791973804439794
    │
    = ExpressionAttributes {
          typ: Array(
@@ -507,10 +507,10 @@ note:
      }
 
 note: 
-   ┌─ features/sized_vals_in_sto.fe:32:13
+   ┌─ features/sized_vals_in_sto.fe:32:18
    │
-32 │             self.nums.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^ attributes hash: 2528791973804439794
+32 │             nums=self.nums.to_mem(),
+   │                  ^^^^^^^^^^^^^^^^^^ attributes hash: 2528791973804439794
    │
    = ExpressionAttributes {
          typ: Array(
@@ -532,10 +532,10 @@ note:
      }
 
 note: 
-   ┌─ features/sized_vals_in_sto.fe:33:13
+   ┌─ features/sized_vals_in_sto.fe:33:17
    │
-33 │             self.str.to_mem()
-   │             ^^^^^^^^ attributes hash: 10752831359363589163
+33 │             str=self.str.to_mem()
+   │                 ^^^^^^^^ attributes hash: 10752831359363589163
    │
    = ExpressionAttributes {
          typ: String(
@@ -552,10 +552,10 @@ note:
      }
 
 note: 
-   ┌─ features/sized_vals_in_sto.fe:33:13
+   ┌─ features/sized_vals_in_sto.fe:33:17
    │
-33 │             self.str.to_mem()
-   │             ^^^^^^^^^^^^^^^^^ attributes hash: 8485417019611755295
+33 │             str=self.str.to_mem()
+   │                 ^^^^^^^^^^^^^^^^^ attributes hash: 8485417019611755295
    │
    = ExpressionAttributes {
          typ: String(
@@ -574,10 +574,10 @@ note:
      }
 
 note: 
-   ┌─ features/sized_vals_in_sto.fe:33:13
+   ┌─ features/sized_vals_in_sto.fe:33:17
    │
-33 │             self.str.to_mem()
-   │             ^^^^^^^^^^^^^^^^^ attributes hash: 8485417019611755295
+33 │             str=self.str.to_mem()
+   │                 ^^^^^^^^^^^^^^^^^ attributes hash: 8485417019611755295
    │
    = ExpressionAttributes {
          typ: String(
@@ -599,9 +599,9 @@ note:
    ┌─ features/sized_vals_in_sto.fe:30:9
    │  
 30 │ ╭         emit MyEvent(
-31 │ │             self.num,
-32 │ │             self.nums.to_mem(),
-33 │ │             self.str.to_mem()
+31 │ │             num=self.num,
+32 │ │             nums=self.nums.to_mem(),
+33 │ │             str=self.str.to_mem()
 34 │ │         )
    │ ╰─────────^ attributes hash: 17206441778791770980
    │  
@@ -786,9 +786,9 @@ note:
    │  
 29 │ ╭     pub def emit_event():
 30 │ │         emit MyEvent(
-31 │ │             self.num,
-32 │ │             self.nums.to_mem(),
-33 │ │             self.str.to_mem()
+31 │ │             num=self.num,
+32 │ │             nums=self.nums.to_mem(),
+33 │ │             str=self.str.to_mem()
 34 │ │         )
    │ ╰─────────^ attributes hash: 16088778846117250470
    │  
@@ -811,7 +811,7 @@ note:
  3 │ │     nums: u256[42]
  4 │ │     str: string26
    · │
-33 │ │             self.str.to_mem()
+33 │ │             str=self.str.to_mem()
 34 │ │         )
    │ ╰─────────^ attributes hash: 15737525148715434146
    │  
@@ -982,18 +982,18 @@ note:
    = ValueAttribute
 
 note: 
-   ┌─ features/sized_vals_in_sto.fe:32:13
+   ┌─ features/sized_vals_in_sto.fe:32:18
    │
-32 │             self.nums.to_mem(),
-   │             ^^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
+32 │             nums=self.nums.to_mem(),
+   │                  ^^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
    │
    = ValueAttribute
 
 note: 
-   ┌─ features/sized_vals_in_sto.fe:33:13
+   ┌─ features/sized_vals_in_sto.fe:33:17
    │
-33 │             self.str.to_mem()
-   │             ^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
+33 │             str=self.str.to_mem()
+   │                 ^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
    │
    = ValueAttribute
 
diff --git a/analyzer/tests/snapshots/analysis__case_086_strings.snap b/analyzer/tests/snapshots/analysis__case_086_strings.snap
index b35629ed8e..f2b435b434 100644
--- a/analyzer/tests/snapshots/analysis__case_086_strings.snap
+++ b/analyzer/tests/snapshots/analysis__case_086_strings.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -66,7 +66,7 @@ ModuleAttributes {
 note: 
    ┌─ features/strings.fe:12:22
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
    │                      ^^ attributes hash: 10420235251610747606
    │
    = ExpressionAttributes {
@@ -82,7 +82,7 @@ note:
 note: 
    ┌─ features/strings.fe:12:22
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
    │                      ^^ attributes hash: 10420235251610747606
    │
    = ExpressionAttributes {
@@ -98,7 +98,7 @@ note:
 note: 
    ┌─ features/strings.fe:12:26
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
    │                          ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
@@ -114,7 +114,7 @@ note:
 note: 
    ┌─ features/strings.fe:12:26
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
    │                          ^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
@@ -130,7 +130,7 @@ note:
 note: 
    ┌─ features/strings.fe:12:29
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
    │                             ^^ attributes hash: 9569027785754553796
    │
    = ExpressionAttributes {
@@ -146,7 +146,7 @@ note:
 note: 
    ┌─ features/strings.fe:12:29
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
    │                             ^^ attributes hash: 9569027785754553796
    │
    = ExpressionAttributes {
@@ -162,7 +162,7 @@ note:
 note: 
    ┌─ features/strings.fe:12:33
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
    │                                 ^^ attributes hash: 10521411858691425038
    │
    = ExpressionAttributes {
@@ -178,7 +178,7 @@ note:
 note: 
    ┌─ features/strings.fe:12:33
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
    │                                 ^^ attributes hash: 10521411858691425038
    │
    = ExpressionAttributes {
@@ -194,7 +194,7 @@ note:
 note: 
    ┌─ features/strings.fe:12:37
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
    │                                     ^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -208,7 +208,7 @@ note:
 note: 
    ┌─ features/strings.fe:12:37
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
    │                                     ^ attributes hash: 513065555763557710
    │
    = ExpressionAttributes {
@@ -220,10 +220,10 @@ note:
      }
 
 note: 
-   ┌─ features/strings.fe:12:40
+   ┌─ features/strings.fe:12:43
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
-   │                                        ^^^^^^^^^^^^^^^ attributes hash: 15184264815905725710
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
+   │                                           ^^^^^^^^^^^^^^^ attributes hash: 15184264815905725710
    │
    = ExpressionAttributes {
          typ: String(
@@ -236,10 +236,10 @@ note:
      }
 
 note: 
-   ┌─ features/strings.fe:12:40
+   ┌─ features/strings.fe:12:43
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
-   │                                        ^^^^^^^^^^^^^^^ attributes hash: 15184264815905725710
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
+   │                                           ^^^^^^^^^^^^^^^ attributes hash: 15184264815905725710
    │
    = ExpressionAttributes {
          typ: String(
@@ -252,10 +252,10 @@ note:
      }
 
 note: 
-   ┌─ features/strings.fe:12:67
+   ┌─ features/strings.fe:12:73
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
-   │                                                                   ^^^^^ attributes hash: 16852372960864427970
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
+   │                                                                         ^^^^^ attributes hash: 16852372960864427970
    │
    = ExpressionAttributes {
          typ: String(
@@ -268,10 +268,10 @@ note:
      }
 
 note: 
-   ┌─ features/strings.fe:12:67
+   ┌─ features/strings.fe:12:73
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
-   │                                                                   ^^^^^ attributes hash: 16852372960864427970
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
+   │                                                                         ^^^^^ attributes hash: 16852372960864427970
    │
    = ExpressionAttributes {
          typ: String(
@@ -284,10 +284,10 @@ note:
      }
 
 note: 
-   ┌─ features/strings.fe:12:57
+   ┌─ features/strings.fe:12:63
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
-   │                                                         ^^^^^^^^^^^^^^^^ attributes hash: 10521411858691425038
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
+   │                                                               ^^^^^^^^^^^^^^^^ attributes hash: 10521411858691425038
    │
    = ExpressionAttributes {
          typ: String(
@@ -300,10 +300,10 @@ note:
      }
 
 note: 
-   ┌─ features/strings.fe:12:57
+   ┌─ features/strings.fe:12:63
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
-   │                                                         ^^^^^^^^^^^^^^^^ attributes hash: 10521411858691425038
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
+   │                                                               ^^^^^^^^^^^^^^^^ attributes hash: 10521411858691425038
    │
    = ExpressionAttributes {
          typ: String(
@@ -446,8 +446,8 @@ note:
 note: 
    ┌─ features/strings.fe:12:9
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15379609340024909078
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 15379609340024909078
    │
    = EventDef {
          name: "MyEvent",
@@ -515,8 +515,8 @@ note:
    ┌─ features/strings.fe:11:5
    │  
 11 │ ╭     pub def __init__(s1: string42, a: address, s2: string26, u: u256, s3: string100):
-12 │ │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
-   │ ╰─────────────────────────────────────────────────────────────────────────^ attributes hash: 6207938549978413359
+12 │ │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
+   │ ╰───────────────────────────────────────────────────────────────────────────────^ attributes hash: 6207938549978413359
    │  
    = FunctionAttributes {
          is_public: true,
@@ -827,10 +827,10 @@ note:
      }
 
 note: 
-   ┌─ features/strings.fe:12:57
+   ┌─ features/strings.fe:12:63
    │
-12 │         emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
-   │                                                         ^^^^^^^^^ attributes hash: 7215139687200046467
+12 │         emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
+   │                                                               ^^^^^^^^^ attributes hash: 7215139687200046467
    │
    = TypeConstructor {
          typ: String(
diff --git a/analyzer/tests/snapshots/analysis__case_096_while_loop.snap b/analyzer/tests/snapshots/analysis__case_096_while_loop.snap
index 9116b8c213..3a2f9e15ae 100644
--- a/analyzer/tests/snapshots/analysis__case_096_while_loop.snap
+++ b/analyzer/tests/snapshots/analysis__case_096_while_loop.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -59,10 +59,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:5:13
+  ┌─ features/while_loop.fe:4:15
   │
-5 │             val = val + 1
-  │             ^^^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │               ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -75,10 +75,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:5:19
+  ┌─ features/while_loop.fe:4:15
   │
-5 │             val = val + 1
-  │                   ^^^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │               ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -91,10 +91,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:5:19
+  ┌─ features/while_loop.fe:4:21
   │
-5 │             val = val + 1
-  │                   ^^^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │                     ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -107,10 +107,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:5:25
+  ┌─ features/while_loop.fe:4:21
   │
-5 │             val = val + 1
-  │                         ^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │                     ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -123,26 +123,24 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:5:25
+  ┌─ features/while_loop.fe:4:15
   │
-5 │             val = val + 1
-  │                         ^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │               ^^^^^^^ attributes hash: 10866140763116710699
   │
   = ExpressionAttributes {
         typ: Base(
-            Numeric(
-                U256,
-            ),
+            Bool,
         ),
         location: Value,
         move_location: None,
     }
 
 note: 
-  ┌─ features/while_loop.fe:5:19
+  ┌─ features/while_loop.fe:5:13
   │
 5 │             val = val + 1
-  │                   ^^^^^^^ attributes hash: 16797824492585953824
+  │             ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -155,10 +153,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:7:17
+  ┌─ features/while_loop.fe:5:19
   │
-7 │                 val = 3
-  │                 ^^^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                   ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -171,10 +169,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:7:23
+  ┌─ features/while_loop.fe:5:19
   │
-7 │                 val = 3
-  │                       ^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                   ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -187,10 +185,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:6:16
+  ┌─ features/while_loop.fe:5:25
   │
-6 │             if val == 2:
-  │                ^^^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                         ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -203,10 +201,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:6:16
+  ┌─ features/while_loop.fe:5:25
   │
-6 │             if val == 2:
-  │                ^^^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                         ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -219,10 +217,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:6:23
+  ┌─ features/while_loop.fe:5:19
   │
-6 │             if val == 2:
-  │                       ^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                   ^^^^^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -235,10 +233,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:6:23
+  ┌─ features/while_loop.fe:6:16
   │
 6 │             if val == 2:
-  │                       ^ attributes hash: 16797824492585953824
+  │                ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -254,21 +252,23 @@ note:
   ┌─ features/while_loop.fe:6:16
   │
 6 │             if val == 2:
-  │                ^^^^^^^^ attributes hash: 10866140763116710699
+  │                ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
-            Bool,
+            Numeric(
+                U256,
+            ),
         ),
         location: Value,
         move_location: None,
     }
 
 note: 
-  ┌─ features/while_loop.fe:4:15
+  ┌─ features/while_loop.fe:6:23
   │
-4 │         while val < 2:
-  │               ^^^ attributes hash: 16797824492585953824
+6 │             if val == 2:
+  │                       ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -281,10 +281,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:4:15
+  ┌─ features/while_loop.fe:6:23
   │
-4 │         while val < 2:
-  │               ^^^ attributes hash: 16797824492585953824
+6 │             if val == 2:
+  │                       ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -297,26 +297,24 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:4:21
+  ┌─ features/while_loop.fe:6:16
   │
-4 │         while val < 2:
-  │                     ^ attributes hash: 16797824492585953824
+6 │             if val == 2:
+  │                ^^^^^^^^ attributes hash: 10866140763116710699
   │
   = ExpressionAttributes {
         typ: Base(
-            Numeric(
-                U256,
-            ),
+            Bool,
         ),
         location: Value,
         move_location: None,
     }
 
 note: 
-  ┌─ features/while_loop.fe:4:21
+  ┌─ features/while_loop.fe:7:17
   │
-4 │         while val < 2:
-  │                     ^ attributes hash: 16797824492585953824
+7 │                 val = 3
+  │                 ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -329,14 +327,16 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop.fe:4:15
+  ┌─ features/while_loop.fe:7:23
   │
-4 │         while val < 2:
-  │               ^^^^^^^ attributes hash: 10866140763116710699
+7 │                 val = 3
+  │                       ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
-            Bool,
+            Numeric(
+                U256,
+            ),
         ),
         location: Value,
         move_location: None,
diff --git a/analyzer/tests/snapshots/analysis__case_097_while_loop_with_break.snap b/analyzer/tests/snapshots/analysis__case_097_while_loop_with_break.snap
index d508ed21e3..c0c2b414cb 100644
--- a/analyzer/tests/snapshots/analysis__case_097_while_loop_with_break.snap
+++ b/analyzer/tests/snapshots/analysis__case_097_while_loop_with_break.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -59,10 +59,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:5:13
+  ┌─ features/while_loop_with_break.fe:4:15
   │
-5 │             val = val + 1
-  │             ^^^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │               ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -75,10 +75,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:5:19
+  ┌─ features/while_loop_with_break.fe:4:15
   │
-5 │             val = val + 1
-  │                   ^^^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │               ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -91,10 +91,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:5:19
+  ┌─ features/while_loop_with_break.fe:4:21
   │
-5 │             val = val + 1
-  │                   ^^^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │                     ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -107,10 +107,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:5:25
+  ┌─ features/while_loop_with_break.fe:4:21
   │
-5 │             val = val + 1
-  │                         ^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │                     ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -123,26 +123,24 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:5:25
+  ┌─ features/while_loop_with_break.fe:4:15
   │
-5 │             val = val + 1
-  │                         ^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │               ^^^^^^^ attributes hash: 10866140763116710699
   │
   = ExpressionAttributes {
         typ: Base(
-            Numeric(
-                U256,
-            ),
+            Bool,
         ),
         location: Value,
         move_location: None,
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:5:19
+  ┌─ features/while_loop_with_break.fe:5:13
   │
 5 │             val = val + 1
-  │                   ^^^^^^^ attributes hash: 16797824492585953824
+  │             ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -155,10 +153,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:4:15
+  ┌─ features/while_loop_with_break.fe:5:19
   │
-4 │         while val < 2:
-  │               ^^^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                   ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -171,10 +169,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:4:15
+  ┌─ features/while_loop_with_break.fe:5:19
   │
-4 │         while val < 2:
-  │               ^^^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                   ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -187,10 +185,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:4:21
+  ┌─ features/while_loop_with_break.fe:5:25
   │
-4 │         while val < 2:
-  │                     ^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                         ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -203,10 +201,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:4:21
+  ┌─ features/while_loop_with_break.fe:5:25
   │
-4 │         while val < 2:
-  │                     ^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                         ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -219,14 +217,16 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break.fe:4:15
+  ┌─ features/while_loop_with_break.fe:5:19
   │
-4 │         while val < 2:
-  │               ^^^^^^^ attributes hash: 10866140763116710699
+5 │             val = val + 1
+  │                   ^^^^^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
-            Bool,
+            Numeric(
+                U256,
+            ),
         ),
         location: Value,
         move_location: None,
diff --git a/analyzer/tests/snapshots/analysis__case_098_while_loop_with_break_2.snap b/analyzer/tests/snapshots/analysis__case_098_while_loop_with_break_2.snap
index 291008e02b..8fa0ea6aec 100644
--- a/analyzer/tests/snapshots/analysis__case_098_while_loop_with_break_2.snap
+++ b/analyzer/tests/snapshots/analysis__case_098_while_loop_with_break_2.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -59,10 +59,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:5:13
+  ┌─ features/while_loop_with_break_2.fe:4:15
   │
-5 │             val = val + 1
-  │             ^^^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │               ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -75,10 +75,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:5:19
+  ┌─ features/while_loop_with_break_2.fe:4:15
   │
-5 │             val = val + 1
-  │                   ^^^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │               ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -91,10 +91,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:5:19
+  ┌─ features/while_loop_with_break_2.fe:4:21
   │
-5 │             val = val + 1
-  │                   ^^^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │                     ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -107,10 +107,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:5:25
+  ┌─ features/while_loop_with_break_2.fe:4:21
   │
-5 │             val = val + 1
-  │                         ^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │                     ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -123,26 +123,24 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:5:25
+  ┌─ features/while_loop_with_break_2.fe:4:15
   │
-5 │             val = val + 1
-  │                         ^ attributes hash: 16797824492585953824
+4 │         while val < 2:
+  │               ^^^^^^^ attributes hash: 10866140763116710699
   │
   = ExpressionAttributes {
         typ: Base(
-            Numeric(
-                U256,
-            ),
+            Bool,
         ),
         location: Value,
         move_location: None,
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:5:19
+  ┌─ features/while_loop_with_break_2.fe:5:13
   │
 5 │             val = val + 1
-  │                   ^^^^^^^ attributes hash: 16797824492585953824
+  │             ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -155,10 +153,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:6:16
+  ┌─ features/while_loop_with_break_2.fe:5:19
   │
-6 │             if val == 1:
-  │                ^^^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                   ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -171,10 +169,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:6:16
+  ┌─ features/while_loop_with_break_2.fe:5:19
   │
-6 │             if val == 1:
-  │                ^^^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                   ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -187,10 +185,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:6:23
+  ┌─ features/while_loop_with_break_2.fe:5:25
   │
-6 │             if val == 1:
-  │                       ^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                         ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -203,10 +201,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:6:23
+  ┌─ features/while_loop_with_break_2.fe:5:25
   │
-6 │             if val == 1:
-  │                       ^ attributes hash: 16797824492585953824
+5 │             val = val + 1
+  │                         ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -219,24 +217,26 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:6:16
+  ┌─ features/while_loop_with_break_2.fe:5:19
   │
-6 │             if val == 1:
-  │                ^^^^^^^^ attributes hash: 10866140763116710699
+5 │             val = val + 1
+  │                   ^^^^^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
-            Bool,
+            Numeric(
+                U256,
+            ),
         ),
         location: Value,
         move_location: None,
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:4:15
+  ┌─ features/while_loop_with_break_2.fe:6:16
   │
-4 │         while val < 2:
-  │               ^^^ attributes hash: 16797824492585953824
+6 │             if val == 1:
+  │                ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -249,10 +249,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:4:15
+  ┌─ features/while_loop_with_break_2.fe:6:16
   │
-4 │         while val < 2:
-  │               ^^^ attributes hash: 16797824492585953824
+6 │             if val == 1:
+  │                ^^^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -265,10 +265,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:4:21
+  ┌─ features/while_loop_with_break_2.fe:6:23
   │
-4 │         while val < 2:
-  │                     ^ attributes hash: 16797824492585953824
+6 │             if val == 1:
+  │                       ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -281,10 +281,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:4:21
+  ┌─ features/while_loop_with_break_2.fe:6:23
   │
-4 │         while val < 2:
-  │                     ^ attributes hash: 16797824492585953824
+6 │             if val == 1:
+  │                       ^ attributes hash: 16797824492585953824
   │
   = ExpressionAttributes {
         typ: Base(
@@ -297,10 +297,10 @@ note:
     }
 
 note: 
-  ┌─ features/while_loop_with_break_2.fe:4:15
+  ┌─ features/while_loop_with_break_2.fe:6:16
   │
-4 │         while val < 2:
-  │               ^^^^^^^ attributes hash: 10866140763116710699
+6 │             if val == 1:
+  │                ^^^^^^^^ attributes hash: 10866140763116710699
   │
   = ExpressionAttributes {
         typ: Base(
diff --git a/analyzer/tests/snapshots/analysis__case_099_while_loop_with_continue.snap b/analyzer/tests/snapshots/analysis__case_099_while_loop_with_continue.snap
index 2036fa0d19..bb1334a03d 100644
--- a/analyzer/tests/snapshots/analysis__case_099_while_loop_with_continue.snap
+++ b/analyzer/tests/snapshots/analysis__case_099_while_loop_with_continue.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -90,6 +90,84 @@ note:
         move_location: None,
     }
 
+note: 
+  ┌─ features/while_loop_with_continue.fe:6:15
+  │
+6 │         while i < 2:
+  │               ^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/while_loop_with_continue.fe:6:15
+  │
+6 │         while i < 2:
+  │               ^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/while_loop_with_continue.fe:6:19
+  │
+6 │         while i < 2:
+  │                   ^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/while_loop_with_continue.fe:6:19
+  │
+6 │         while i < 2:
+  │                   ^ attributes hash: 16797824492585953824
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Numeric(
+                U256,
+            ),
+        ),
+        location: Value,
+        move_location: None,
+    }
+
+note: 
+  ┌─ features/while_loop_with_continue.fe:6:15
+  │
+6 │         while i < 2:
+  │               ^^^^^ attributes hash: 10866140763116710699
+  │
+  = ExpressionAttributes {
+        typ: Base(
+            Bool,
+        ),
+        location: Value,
+        move_location: None,
+    }
+
 note: 
   ┌─ features/while_loop_with_continue.fe:7:13
   │
@@ -360,84 +438,6 @@ note:
          move_location: None,
      }
 
-note: 
-  ┌─ features/while_loop_with_continue.fe:6:15
-  │
-6 │         while i < 2:
-  │               ^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/while_loop_with_continue.fe:6:15
-  │
-6 │         while i < 2:
-  │               ^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/while_loop_with_continue.fe:6:19
-  │
-6 │         while i < 2:
-  │                   ^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/while_loop_with_continue.fe:6:19
-  │
-6 │         while i < 2:
-  │                   ^ attributes hash: 16797824492585953824
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Numeric(
-                U256,
-            ),
-        ),
-        location: Value,
-        move_location: None,
-    }
-
-note: 
-  ┌─ features/while_loop_with_continue.fe:6:15
-  │
-6 │         while i < 2:
-  │               ^^^^^ attributes hash: 10866140763116710699
-  │
-  = ExpressionAttributes {
-        typ: Base(
-            Bool,
-        ),
-        location: Value,
-        move_location: None,
-    }
-
 note: 
    ┌─ features/while_loop_with_continue.fe:11:16
    │
diff --git a/analyzer/tests/snapshots/analysis__case_100_abi_encoding_stress.snap b/analyzer/tests/snapshots/analysis__case_100_abi_encoding_stress.snap
index b4f111982e..d340c438b4 100644
--- a/analyzer/tests/snapshots/analysis__case_100_abi_encoding_stress.snap
+++ b/analyzer/tests/snapshots/analysis__case_100_abi_encoding_stress.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -1614,10 +1614,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:76:13
+   ┌─ stress/abi_encoding_stress.fe:76:22
    │
-76 │             self.my_addrs.to_mem(),
-   │             ^^^^^^^^^^^^^ attributes hash: 9556682290913303484
+76 │             my_addrs=self.my_addrs.to_mem(),
+   │                      ^^^^^^^^^^^^^ attributes hash: 9556682290913303484
    │
    = ExpressionAttributes {
          typ: Array(
@@ -1635,10 +1635,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:76:13
+   ┌─ stress/abi_encoding_stress.fe:76:22
    │
-76 │             self.my_addrs.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 14222027602690501828
+76 │             my_addrs=self.my_addrs.to_mem(),
+   │                      ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 14222027602690501828
    │
    = ExpressionAttributes {
          typ: Array(
@@ -1658,10 +1658,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:76:13
+   ┌─ stress/abi_encoding_stress.fe:76:22
    │
-76 │             self.my_addrs.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 14222027602690501828
+76 │             my_addrs=self.my_addrs.to_mem(),
+   │                      ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 14222027602690501828
    │
    = ExpressionAttributes {
          typ: Array(
@@ -1681,10 +1681,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:77:13
+   ┌─ stress/abi_encoding_stress.fe:77:21
    │
-77 │             self.my_u128,
-   │             ^^^^^^^^^^^^ attributes hash: 10067809958524075301
+77 │             my_u128=self.my_u128,
+   │                     ^^^^^^^^^^^^ attributes hash: 10067809958524075301
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1703,10 +1703,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:77:13
+   ┌─ stress/abi_encoding_stress.fe:77:21
    │
-77 │             self.my_u128,
-   │             ^^^^^^^^^^^^ attributes hash: 10067809958524075301
+77 │             my_u128=self.my_u128,
+   │                     ^^^^^^^^^^^^ attributes hash: 10067809958524075301
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1725,10 +1725,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:78:13
+   ┌─ stress/abi_encoding_stress.fe:78:23
    │
-78 │             self.my_string.to_mem(),
-   │             ^^^^^^^^^^^^^^ attributes hash: 9071218329936731305
+78 │             my_string=self.my_string.to_mem(),
+   │                       ^^^^^^^^^^^^^^ attributes hash: 9071218329936731305
    │
    = ExpressionAttributes {
          typ: String(
@@ -1745,10 +1745,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:78:13
+   ┌─ stress/abi_encoding_stress.fe:78:23
    │
-78 │             self.my_string.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 980173007631351881
+78 │             my_string=self.my_string.to_mem(),
+   │                       ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 980173007631351881
    │
    = ExpressionAttributes {
          typ: String(
@@ -1767,10 +1767,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:78:13
+   ┌─ stress/abi_encoding_stress.fe:78:23
    │
-78 │             self.my_string.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 980173007631351881
+78 │             my_string=self.my_string.to_mem(),
+   │                       ^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 980173007631351881
    │
    = ExpressionAttributes {
          typ: String(
@@ -1789,10 +1789,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:79:13
+   ┌─ stress/abi_encoding_stress.fe:79:20
    │
-79 │             self.my_u8s.to_mem(),
-   │             ^^^^^^^^^^^ attributes hash: 14452085088266868200
+79 │             my_u8s=self.my_u8s.to_mem(),
+   │                    ^^^^^^^^^^^ attributes hash: 14452085088266868200
    │
    = ExpressionAttributes {
          typ: Array(
@@ -1812,10 +1812,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:79:13
+   ┌─ stress/abi_encoding_stress.fe:79:20
    │
-79 │             self.my_u8s.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^^^ attributes hash: 3855584261660153860
+79 │             my_u8s=self.my_u8s.to_mem(),
+   │                    ^^^^^^^^^^^^^^^^^^^^ attributes hash: 3855584261660153860
    │
    = ExpressionAttributes {
          typ: Array(
@@ -1837,10 +1837,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:79:13
+   ┌─ stress/abi_encoding_stress.fe:79:20
    │
-79 │             self.my_u8s.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^^^ attributes hash: 3855584261660153860
+79 │             my_u8s=self.my_u8s.to_mem(),
+   │                    ^^^^^^^^^^^^^^^^^^^^ attributes hash: 3855584261660153860
    │
    = ExpressionAttributes {
          typ: Array(
@@ -1862,10 +1862,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:80:13
+   ┌─ stress/abi_encoding_stress.fe:80:21
    │
-80 │             self.my_bool,
-   │             ^^^^^^^^^^^^ attributes hash: 11793743503936840609
+80 │             my_bool=self.my_bool,
+   │                     ^^^^^^^^^^^^ attributes hash: 11793743503936840609
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1882,10 +1882,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:80:13
+   ┌─ stress/abi_encoding_stress.fe:80:21
    │
-80 │             self.my_bool,
-   │             ^^^^^^^^^^^^ attributes hash: 11793743503936840609
+80 │             my_bool=self.my_bool,
+   │                     ^^^^^^^^^^^^ attributes hash: 11793743503936840609
    │
    = ExpressionAttributes {
          typ: Base(
@@ -1902,10 +1902,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:81:13
+   ┌─ stress/abi_encoding_stress.fe:81:22
    │
-81 │             self.my_bytes.to_mem()
-   │             ^^^^^^^^^^^^^ attributes hash: 7833827351076939737
+81 │             my_bytes=self.my_bytes.to_mem()
+   │                      ^^^^^^^^^^^^^ attributes hash: 7833827351076939737
    │
    = ExpressionAttributes {
          typ: Array(
@@ -1923,10 +1923,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:81:13
+   ┌─ stress/abi_encoding_stress.fe:81:22
    │
-81 │             self.my_bytes.to_mem()
-   │             ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 12051565540558389281
+81 │             my_bytes=self.my_bytes.to_mem()
+   │                      ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 12051565540558389281
    │
    = ExpressionAttributes {
          typ: Array(
@@ -1946,10 +1946,10 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:81:13
+   ┌─ stress/abi_encoding_stress.fe:81:22
    │
-81 │             self.my_bytes.to_mem()
-   │             ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 12051565540558389281
+81 │             my_bytes=self.my_bytes.to_mem()
+   │                      ^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 12051565540558389281
    │
    = ExpressionAttributes {
          typ: Array(
@@ -1972,11 +1972,11 @@ note:
    ┌─ stress/abi_encoding_stress.fe:75:9
    │  
 75 │ ╭         emit MyEvent(
-76 │ │             self.my_addrs.to_mem(),
-77 │ │             self.my_u128,
-78 │ │             self.my_string.to_mem(),
+76 │ │             my_addrs=self.my_addrs.to_mem(),
+77 │ │             my_u128=self.my_u128,
+78 │ │             my_string=self.my_string.to_mem(),
    · │
-81 │ │             self.my_bytes.to_mem()
+81 │ │             my_bytes=self.my_bytes.to_mem()
 82 │ │         )
    │ ╰─────────^ attributes hash: 229795011819765305
    │  
@@ -2446,10 +2446,10 @@ note:
    │  
 74 │ ╭     pub def emit_my_event():
 75 │ │         emit MyEvent(
-76 │ │             self.my_addrs.to_mem(),
-77 │ │             self.my_u128,
+76 │ │             my_addrs=self.my_addrs.to_mem(),
+77 │ │             my_u128=self.my_u128,
    · │
-81 │ │             self.my_bytes.to_mem()
+81 │ │             my_bytes=self.my_bytes.to_mem()
 82 │ │         )
    │ ╰─────────^ attributes hash: 8897788371178855601
    │  
@@ -2472,7 +2472,7 @@ note:
  9 │ │     my_u128: u128
 10 │ │     my_string: string10
    · │
-81 │ │             self.my_bytes.to_mem()
+81 │ │             my_bytes=self.my_bytes.to_mem()
 82 │ │         )
    │ ╰─────────^ attributes hash: 13316776063628239512
    │  
@@ -2989,34 +2989,34 @@ note:
      }
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:76:13
+   ┌─ stress/abi_encoding_stress.fe:76:22
    │
-76 │             self.my_addrs.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
+76 │             my_addrs=self.my_addrs.to_mem(),
+   │                      ^^^^^^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
    │
    = ValueAttribute
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:78:13
+   ┌─ stress/abi_encoding_stress.fe:78:23
    │
-78 │             self.my_string.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
+78 │             my_string=self.my_string.to_mem(),
+   │                       ^^^^^^^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
    │
    = ValueAttribute
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:79:13
+   ┌─ stress/abi_encoding_stress.fe:79:20
    │
-79 │             self.my_u8s.to_mem(),
-   │             ^^^^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
+79 │             my_u8s=self.my_u8s.to_mem(),
+   │                    ^^^^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
    │
    = ValueAttribute
 
 note: 
-   ┌─ stress/abi_encoding_stress.fe:81:13
+   ┌─ stress/abi_encoding_stress.fe:81:22
    │
-81 │             self.my_bytes.to_mem()
-   │             ^^^^^^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
+81 │             my_bytes=self.my_bytes.to_mem()
+   │                      ^^^^^^^^^^^^^^^^^^^^ attributes hash: 18270091135093349626
    │
    = ValueAttribute
 
diff --git a/analyzer/tests/snapshots/analysis__case_101_data_copying_stress.snap b/analyzer/tests/snapshots/analysis__case_101_data_copying_stress.snap
index 486dfb75f7..acebe30ccf 100644
--- a/analyzer/tests/snapshots/analysis__case_101_data_copying_stress.snap
+++ b/analyzer/tests/snapshots/analysis__case_101_data_copying_stress.snap
@@ -1,6 +1,6 @@
 ---
 source: analyzer/tests/analysis.rs
-expression: "build_snapshot(fixture, src, &context)"
+expression: "build_snapshot(fixture, &src, &context)"
 
 ---
 ModuleAttributes {
@@ -2636,10 +2636,10 @@ note:
      }
 
 note: 
-   ┌─ stress/data_copying_stress.fe:74:22
+   ┌─ stress/data_copying_stress.fe:74:32
    │
-74 │         emit MyEvent(some_string, some_u256)
-   │                      ^^^^^^^^^^^ attributes hash: 9569027785754553796
+74 │         emit MyEvent(my_string=some_string, my_u256=some_u256)
+   │                                ^^^^^^^^^^^ attributes hash: 9569027785754553796
    │
    = ExpressionAttributes {
          typ: String(
@@ -2652,10 +2652,10 @@ note:
      }
 
 note: 
-   ┌─ stress/data_copying_stress.fe:74:22
+   ┌─ stress/data_copying_stress.fe:74:32
    │
-74 │         emit MyEvent(some_string, some_u256)
-   │                      ^^^^^^^^^^^ attributes hash: 9569027785754553796
+74 │         emit MyEvent(my_string=some_string, my_u256=some_u256)
+   │                                ^^^^^^^^^^^ attributes hash: 9569027785754553796
    │
    = ExpressionAttributes {
          typ: String(
@@ -2668,10 +2668,10 @@ note:
      }
 
 note: 
-   ┌─ stress/data_copying_stress.fe:74:35
+   ┌─ stress/data_copying_stress.fe:74:53
    │
-74 │         emit MyEvent(some_string, some_u256)
-   │                                   ^^^^^^^^^ attributes hash: 16797824492585953824
+74 │         emit MyEvent(my_string=some_string, my_u256=some_u256)
+   │                                                     ^^^^^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -2684,10 +2684,10 @@ note:
      }
 
 note: 
-   ┌─ stress/data_copying_stress.fe:74:35
+   ┌─ stress/data_copying_stress.fe:74:53
    │
-74 │         emit MyEvent(some_string, some_u256)
-   │                                   ^^^^^^^^^ attributes hash: 16797824492585953824
+74 │         emit MyEvent(my_string=some_string, my_u256=some_u256)
+   │                                                     ^^^^^^^^^ attributes hash: 16797824492585953824
    │
    = ExpressionAttributes {
          typ: Base(
@@ -2829,8 +2829,8 @@ note:
 note: 
    ┌─ stress/data_copying_stress.fe:74:9
    │
-74 │         emit MyEvent(some_string, some_u256)
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9960040166005382103
+74 │         emit MyEvent(my_string=some_string, my_u256=some_u256)
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attributes hash: 9960040166005382103
    │
    = EventDef {
          name: "MyEvent",
@@ -3118,8 +3118,8 @@ note:
    ┌─ stress/data_copying_stress.fe:73:5
    │  
 73 │ ╭     def emit_my_event_internal(some_string: string42, some_u256: u256):
-74 │ │         emit MyEvent(some_string, some_u256)
-   │ ╰────────────────────────────────────────────^ attributes hash: 17894603769218051107
+74 │ │         emit MyEvent(my_string=some_string, my_u256=some_u256)
+   │ ╰──────────────────────────────────────────────────────────────^ attributes hash: 17894603769218051107
    │  
    = FunctionAttributes {
          is_public: false,
diff --git a/analyzer/tests/snapshots/errors__case_01.snap b/analyzer/tests/snapshots/errors__case_01.snap
new file mode 100644
index 0000000000..2aa98b5808
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_01.snap
@@ -0,0 +1,10 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 4
+pub def foo():
+        assert true, 1
diff --git a/analyzer/tests/snapshots/errors__case_02.snap b/analyzer/tests/snapshots/errors__case_02.snap
new file mode 100644
index 0000000000..cf6320c116
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_02.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+MapTypeError on line 0
+no error context available
diff --git a/analyzer/tests/snapshots/errors__case_03.snap b/analyzer/tests/snapshots/errors__case_03.snap
new file mode 100644
index 0000000000..cf6320c116
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_03.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+MapTypeError on line 0
+no error context available
diff --git a/analyzer/tests/snapshots/errors__case_04.snap b/analyzer/tests/snapshots/errors__case_04.snap
new file mode 100644
index 0000000000..cf6320c116
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_04.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+MapTypeError on line 0
+no error context available
diff --git a/analyzer/tests/snapshots/errors__case_05.snap b/analyzer/tests/snapshots/errors__case_05.snap
new file mode 100644
index 0000000000..cf6320c116
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_05.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+MapTypeError on line 0
+no error context available
diff --git a/analyzer/tests/snapshots/errors__case_06.snap b/analyzer/tests/snapshots/errors__case_06.snap
new file mode 100644
index 0000000000..36e0d222d1
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_06.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 0
+no error context available
diff --git a/analyzer/tests/snapshots/errors__case_07.snap b/analyzer/tests/snapshots/errors__case_07.snap
new file mode 100644
index 0000000000..a3c67e8e63
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_07.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: `break` outside of a loop
+  ┌─ tests/fixtures/errors/break_without_loop_2.fe:5:13
+  │
+5 │             break
+  │             ^^^^^ cannot `break` outside of a `for` or `while` loop
+
+
diff --git a/analyzer/tests/snapshots/errors__case_08.snap b/analyzer/tests/snapshots/errors__case_08.snap
new file mode 100644
index 0000000000..67bd803d26
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_08.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: `break` outside of a loop
+  ┌─ tests/fixtures/errors/break_without_loop.fe:4:9
+  │
+4 │         break
+  │         ^^^^^ cannot `break` outside of a `for` or `while` loop
+
+
diff --git a/analyzer/tests/snapshots/errors__case_09.snap b/analyzer/tests/snapshots/errors__case_09.snap
new file mode 100644
index 0000000000..20f45ccf79
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_09.snap
@@ -0,0 +1,36 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: event arguments must be labeled
+  ┌─ tests/fixtures/errors/call_event_with_wrong_types.fe:7:22
+  │
+7 │         emit MyEvent("foo", 1000)
+  │                      ^ add `val_1=` here
+  │
+  = Note: the label is optional if the argument is a variable
+  = that matches the event field name.
+
+error: incorrect type for `MyEvent` argument `val_1`
+  ┌─ tests/fixtures/errors/call_event_with_wrong_types.fe:7:22
+  │
+7 │         emit MyEvent("foo", 1000)
+  │                      ^^^^^ this has type `string<3>`; expected type `string<100>`
+
+error: event arguments must be labeled
+  ┌─ tests/fixtures/errors/call_event_with_wrong_types.fe:7:29
+  │
+7 │         emit MyEvent("foo", 1000)
+  │                             ^ add `val_2=` here
+  │
+  = Note: the label is optional if the argument is a variable
+  = that matches the event field name.
+
+error: incorrect type for `MyEvent` argument `val_2`
+  ┌─ tests/fixtures/errors/call_event_with_wrong_types.fe:7:29
+  │
+7 │         emit MyEvent("foo", 1000)
+  │                             ^^^^ this has type `u256`; expected type `u8`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_10.snap b/analyzer/tests/snapshots/errors__case_10.snap
new file mode 100644
index 0000000000..8f6193170c
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_10.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+UndefinedValue on line 3
+self.doesnt_exist()
diff --git a/analyzer/tests/snapshots/errors__case_11.snap b/analyzer/tests/snapshots/errors__case_11.snap
new file mode 100644
index 0000000000..c7561089ff
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_11.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+UndefinedValue on line 7
+Foo(address(0)).doesnt_exist()
diff --git a/analyzer/tests/snapshots/errors__case_12.snap b/analyzer/tests/snapshots/errors__case_12.snap
new file mode 100644
index 0000000000..e4e9fd240f
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_12.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+UndefinedValue on line 7
+thingy.doesnt_exist()
diff --git a/analyzer/tests/snapshots/errors__case_13.snap b/analyzer/tests/snapshots/errors__case_13.snap
new file mode 100644
index 0000000000..1dff6a0c78
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_13.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+UndefinedValue on line 8
+self.thingy.doesnt_exist()
diff --git a/analyzer/tests/snapshots/errors__case_14.snap b/analyzer/tests/snapshots/errors__case_14.snap
new file mode 100644
index 0000000000..66b4e6173c
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_14.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+CircularDependency on line 3
+foo: Foo = Foo.create(0)
diff --git a/analyzer/tests/snapshots/errors__case_15.snap b/analyzer/tests/snapshots/errors__case_15.snap
new file mode 100644
index 0000000000..e03f85ffb2
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_15.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+CircularDependency on line 3
+foo: Foo = Foo.create2(2, 0)
diff --git a/analyzer/tests/snapshots/errors__case_16.snap b/analyzer/tests/snapshots/errors__case_16.snap
new file mode 100644
index 0000000000..9903eed8f0
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_16.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: `continue` outside of a loop
+  ┌─ tests/fixtures/errors/continue_without_loop_2.fe:5:13
+  │
+5 │             continue
+  │             ^^^^^^^^ cannot `continue` outside of a `for` or `while` loop
+
+
diff --git a/analyzer/tests/snapshots/errors__case_17.snap b/analyzer/tests/snapshots/errors__case_17.snap
new file mode 100644
index 0000000000..d5ffa00ba9
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_17.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: `continue` outside of a loop
+  ┌─ tests/fixtures/errors/continue_without_loop.fe:4:9
+  │
+4 │         continue
+  │         ^^^^^^^^ cannot `continue` outside of a `for` or `while` loop
+
+
diff --git a/analyzer/tests/snapshots/errors__case_18.snap b/analyzer/tests/snapshots/errors__case_18.snap
new file mode 100644
index 0000000000..f4ceaf4b7a
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_18.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+AlreadyDefined on line 0
+no error context available
diff --git a/analyzer/tests/snapshots/errors__case_19.snap b/analyzer/tests/snapshots/errors__case_19.snap
new file mode 100644
index 0000000000..ac248f103a
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_19.snap
@@ -0,0 +1,10 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+AlreadyDefined on line 5
+event MyEvent:
+        idx addr1: address
diff --git a/analyzer/tests/snapshots/errors__case_20.snap b/analyzer/tests/snapshots/errors__case_20.snap
new file mode 100644
index 0000000000..f4ceaf4b7a
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_20.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+AlreadyDefined on line 0
+no error context available
diff --git a/analyzer/tests/snapshots/errors__case_21.snap b/analyzer/tests/snapshots/errors__case_21.snap
new file mode 100644
index 0000000000..f4ceaf4b7a
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_21.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+AlreadyDefined on line 0
+no error context available
diff --git a/analyzer/tests/snapshots/errors__case_22.snap b/analyzer/tests/snapshots/errors__case_22.snap
new file mode 100644
index 0000000000..c05b0b406d
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_22.snap
@@ -0,0 +1,10 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+AlreadyDefined on line 6
+pub def bar():
+        pass
diff --git a/analyzer/tests/snapshots/errors__case_23.snap b/analyzer/tests/snapshots/errors__case_23.snap
new file mode 100644
index 0000000000..f4ceaf4b7a
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_23.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+AlreadyDefined on line 0
+no error context available
diff --git a/analyzer/tests/snapshots/errors__case_24.snap b/analyzer/tests/snapshots/errors__case_24.snap
new file mode 100644
index 0000000000..f4ceaf4b7a
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_24.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+AlreadyDefined on line 0
+no error context available
diff --git a/analyzer/tests/snapshots/errors__case_25.snap b/analyzer/tests/snapshots/errors__case_25.snap
new file mode 100644
index 0000000000..eef4699e86
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_25.snap
@@ -0,0 +1,10 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+AlreadyDefined on line 6
+for i in my_array:
+            sum: u256 = 0
diff --git a/analyzer/tests/snapshots/errors__case_26.snap b/analyzer/tests/snapshots/errors__case_26.snap
new file mode 100644
index 0000000000..5f6ca0d363
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_26.snap
@@ -0,0 +1,11 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+AlreadyDefined on line 4
+pub def bar():
+        foo: u8
+        foo: u8
diff --git a/analyzer/tests/snapshots/errors__case_27.snap b/analyzer/tests/snapshots/errors__case_27.snap
new file mode 100644
index 0000000000..c992d9c8a6
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_27.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: undefined event: `DoesNotExist`
+  ┌─ tests/fixtures/errors/emit_undefined_event.fe:4:10
+  │
+4 │     emit DoesNotExist()
+  │          ^^^^^^^^^^^^ undefined event
+
+
diff --git a/analyzer/tests/snapshots/errors__case_28.snap b/analyzer/tests/snapshots/errors__case_28.snap
new file mode 100644
index 0000000000..fdbba8ee75
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_28.snap
@@ -0,0 +1,47 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: the `Foo` event expects 3 arguments, but 4 were provided
+  ┌─ tests/fixtures/errors/emit_bad_args.fe:8:10
+  │
+8 │     emit Foo((1, 2), z=10, y=true, x=5)
+  │          ^^^ ------  ----  ------  --- supplied 4 arguments
+  │          │                          
+  │          expects 3 arguments
+
+error: event arguments must be labeled
+  ┌─ tests/fixtures/errors/emit_bad_args.fe:8:14
+  │
+8 │     emit Foo((1, 2), z=10, y=true, x=5)
+  │              ^ add `x=` here
+  │
+  = Note: the label is optional if the argument is a variable
+  = that matches the event field name.
+
+error: incorrect type for `Foo` argument `x`
+  ┌─ tests/fixtures/errors/emit_bad_args.fe:8:14
+  │
+8 │     emit Foo((1, 2), z=10, y=true, x=5)
+  │              ^^^^^^ this has type `(u256, u256)`; expected type `address`
+
+error: event argument name mismatch
+  ┌─ tests/fixtures/errors/emit_bad_args.fe:8:22
+  │
+8 │     emit Foo((1, 2), z=10, y=true, x=5)
+  │                      ^ expected `y`
+  │
+  = Note: the argument order must match the order of
+  = fields in the event definition
+
+error: event argument name mismatch
+  ┌─ tests/fixtures/errors/emit_bad_args.fe:8:28
+  │
+8 │     emit Foo((1, 2), z=10, y=true, x=5)
+  │                            ^ expected `z`
+  │
+  = Note: the argument order must match the order of
+  = fields in the event definition
+
+
diff --git a/analyzer/tests/snapshots/errors__case_29.snap b/analyzer/tests/snapshots/errors__case_29.snap
new file mode 100644
index 0000000000..a890aab81c
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_29.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 7
+Foo(address(0)).bar("hello world")
diff --git a/analyzer/tests/snapshots/errors__case_30.snap b/analyzer/tests/snapshots/errors__case_30.snap
new file mode 100644
index 0000000000..b886891bc3
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_30.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+WrongNumberOfParams on line 7
+Foo(address(0)).bar(42)
diff --git a/analyzer/tests/snapshots/errors__case_31.snap b/analyzer/tests/snapshots/errors__case_31.snap
new file mode 100644
index 0000000000..1f798a6d16
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_31.snap
@@ -0,0 +1,13 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+MoreThanThreeIndexedParams on line 2
+event MyEvent:
+        idx addr1: address
+        idx addr2: address
+        idx addr3: address
+        idx addr4: address
diff --git a/analyzer/tests/snapshots/errors__case_32.snap b/analyzer/tests/snapshots/errors__case_32.snap
new file mode 100644
index 0000000000..2c6c4e5916
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_32.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 5
+return keccak256(wrong)
diff --git a/analyzer/tests/snapshots/errors__case_33.snap b/analyzer/tests/snapshots/errors__case_33.snap
new file mode 100644
index 0000000000..d7923f32d7
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_33.snap
@@ -0,0 +1,10 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 4
+pub def bar() -> address:
+        return 1
diff --git a/analyzer/tests/snapshots/errors__case_34.snap b/analyzer/tests/snapshots/errors__case_34.snap
new file mode 100644
index 0000000000..a88ac9d6d8
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_34.snap
@@ -0,0 +1,17 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: function body is missing a return or revert statement
+  ┌─ tests/fixtures/errors/missing_return_in_else.fe:2:13
+  │
+2 │     pub def bar(val: u256) -> u256:
+  │             ^^^               ---- expected function to return `u256`
+  │             │                  
+  │             all paths of this function must `return` or `revert`
+
+
+
+UndefinedValue on line 6
+x = 1
diff --git a/analyzer/tests/snapshots/errors__case_35.snap b/analyzer/tests/snapshots/errors__case_35.snap
new file mode 100644
index 0000000000..d7d93830bb
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_35.snap
@@ -0,0 +1,14 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: function body is missing a return or revert statement
+  ┌─ tests/fixtures/errors/missing_return.fe:4:13
+  │
+4 │     pub def bar() -> u256:
+  │             ^^^      ---- expected function to return `u256`
+  │             │         
+  │             all paths of this function must `return` or `revert`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_36.snap b/analyzer/tests/snapshots/errors__case_36.snap
new file mode 100644
index 0000000000..880826d18c
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_36.snap
@@ -0,0 +1,10 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+CannotMove on line 5
+pub def bar(my_array: u256[10]):
+        my_array = self.my_sto_array
diff --git a/analyzer/tests/snapshots/errors__case_37.snap b/analyzer/tests/snapshots/errors__case_37.snap
new file mode 100644
index 0000000000..c9f17e1edc
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_37.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 3
+return x and y
diff --git a/analyzer/tests/snapshots/errors__case_38.snap b/analyzer/tests/snapshots/errors__case_38.snap
new file mode 100644
index 0000000000..79b56c7530
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_38.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 3
+return y or x
diff --git a/analyzer/tests/snapshots/errors__case_39.snap b/analyzer/tests/snapshots/errors__case_39.snap
new file mode 100644
index 0000000000..4cdd6d981c
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_39.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+UndefinedValue on line 8
+return y
diff --git a/analyzer/tests/snapshots/errors__case_40.snap b/analyzer/tests/snapshots/errors__case_40.snap
new file mode 100644
index 0000000000..4cdd6d981c
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_40.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+UndefinedValue on line 8
+return y
diff --git a/analyzer/tests/snapshots/errors__case_41.snap b/analyzer/tests/snapshots/errors__case_41.snap
new file mode 100644
index 0000000000..e8412d6efd
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_41.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i128`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i128_neg.fe:3:21
+  │
+3 │         return i128(-170141183460469231731687303715884105729)
+  │                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ does not fit into type `i128`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_42.snap b/analyzer/tests/snapshots/errors__case_42.snap
new file mode 100644
index 0000000000..d1453222f4
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_42.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i128`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i128_pos.fe:3:21
+  │
+3 │         return i128(170141183460469231731687303715884105728)
+  │                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ does not fit into type `i128`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_43.snap b/analyzer/tests/snapshots/errors__case_43.snap
new file mode 100644
index 0000000000..86a7316205
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_43.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i16`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i16_neg.fe:3:20
+  │
+3 │         return i16(-32769)
+  │                    ^^^^^^ does not fit into type `i16`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_44.snap b/analyzer/tests/snapshots/errors__case_44.snap
new file mode 100644
index 0000000000..81619db884
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_44.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i16`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i16_pos.fe:3:20
+  │
+3 │         return i16(32768)
+  │                    ^^^^^ does not fit into type `i16`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_45.snap b/analyzer/tests/snapshots/errors__case_45.snap
new file mode 100644
index 0000000000..1a67994483
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_45.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i256`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i256_neg.fe:3:21
+  │
+3 │         return i256(-57896044618658097711785492504343953926634992332820282019728792003956564819969)
+  │                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ does not fit into type `i256`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_46.snap b/analyzer/tests/snapshots/errors__case_46.snap
new file mode 100644
index 0000000000..d7fb39b100
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_46.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i256`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i256_pos.fe:3:21
+  │
+3 │         return i256(57896044618658097711785492504343953926634992332820282019728792003956564819968)
+  │                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ does not fit into type `i256`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_47.snap b/analyzer/tests/snapshots/errors__case_47.snap
new file mode 100644
index 0000000000..76ba24b968
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_47.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i32`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i32_neg.fe:3:20
+  │
+3 │         return i32(-2147483649)
+  │                    ^^^^^^^^^^^ does not fit into type `i32`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_48.snap b/analyzer/tests/snapshots/errors__case_48.snap
new file mode 100644
index 0000000000..fac0168e11
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_48.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i32`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i32_pos.fe:3:20
+  │
+3 │         return i32(2147483648)
+  │                    ^^^^^^^^^^ does not fit into type `i32`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_49.snap b/analyzer/tests/snapshots/errors__case_49.snap
new file mode 100644
index 0000000000..05559f6c76
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_49.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i64`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i64_neg.fe:3:20
+  │
+3 │         return i64(-9223372036854775809)
+  │                    ^^^^^^^^^^^^^^^^^^^^ does not fit into type `i64`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_50.snap b/analyzer/tests/snapshots/errors__case_50.snap
new file mode 100644
index 0000000000..38f5203852
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_50.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i64`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i64_pos.fe:3:20
+  │
+3 │         return i64(9223372036854775808)
+  │                    ^^^^^^^^^^^^^^^^^^^ does not fit into type `i64`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_51.snap b/analyzer/tests/snapshots/errors__case_51.snap
new file mode 100644
index 0000000000..755a4a429f
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_51.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i8`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i8_neg.fe:3:19
+  │
+3 │         return i8(-129)
+  │                   ^^^^ does not fit into type `i8`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_52.snap b/analyzer/tests/snapshots/errors__case_52.snap
new file mode 100644
index 0000000000..7a16d3183c
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_52.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `i8`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/i8_pos.fe:3:19
+  │
+3 │         return i8(128)
+  │                   ^^^ does not fit into type `i8`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_53.snap b/analyzer/tests/snapshots/errors__case_53.snap
new file mode 100644
index 0000000000..fd52e82c14
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_53.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u256`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/literal_too_big.fe:3:16
+  │
+3 │         return 115792089237316195423570985008687907853269984665640564039457584007913129639936
+  │                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ does not fit into type `u256`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_54.snap b/analyzer/tests/snapshots/errors__case_54.snap
new file mode 100644
index 0000000000..a788531ee3
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_54.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u256`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/literal_too_small.fe:3:17
+  │
+3 │         return -115792089237316195423570985008687907853269984665640564039457584007913129639936
+  │                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ does not fit into type `u256`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_55.snap b/analyzer/tests/snapshots/errors__case_55.snap
new file mode 100644
index 0000000000..849160310f
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_55.snap
@@ -0,0 +1,18 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u256`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/octal_number.fe:3:19
+  │
+3 │         return u8(001)
+  │                   ^^^ does not fit into type `u256`
+
+error: literal out of range for `u8`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/octal_number.fe:3:19
+  │
+3 │         return u8(001)
+  │                   ^^^ does not fit into type `u8`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_56.snap b/analyzer/tests/snapshots/errors__case_56.snap
new file mode 100644
index 0000000000..9e3577aa9a
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_56.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u128`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u128_neg.fe:3:21
+  │
+3 │         return u128(-1)
+  │                     ^^ does not fit into type `u128`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_57.snap b/analyzer/tests/snapshots/errors__case_57.snap
new file mode 100644
index 0000000000..146da2fbda
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_57.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u128`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u128_pos.fe:3:21
+  │
+3 │         return u128(340282366920938463463374607431768211456)
+  │                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ does not fit into type `u128`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_58.snap b/analyzer/tests/snapshots/errors__case_58.snap
new file mode 100644
index 0000000000..be91d2e092
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_58.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u16`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u16_neg.fe:3:20
+  │
+3 │         return u16(-1)
+  │                    ^^ does not fit into type `u16`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_59.snap b/analyzer/tests/snapshots/errors__case_59.snap
new file mode 100644
index 0000000000..8484c48840
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_59.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u16`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u16_pos.fe:3:20
+  │
+3 │         return u16(65536)
+  │                    ^^^^^ does not fit into type `u16`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_60.snap b/analyzer/tests/snapshots/errors__case_60.snap
new file mode 100644
index 0000000000..5377240f13
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_60.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u256`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u256_neg.fe:3:21
+  │
+3 │         return u256(-1)
+  │                     ^^ does not fit into type `u256`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_61.snap b/analyzer/tests/snapshots/errors__case_61.snap
new file mode 100644
index 0000000000..b40a5ea088
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_61.snap
@@ -0,0 +1,18 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u256`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u256_pos.fe:3:21
+  │
+3 │         return u256(115792089237316195423570985008687907853269984665640564039457584007913129639936)
+  │                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ does not fit into type `u256`
+
+error: literal out of range for `u256`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u256_pos.fe:3:21
+  │
+3 │         return u256(115792089237316195423570985008687907853269984665640564039457584007913129639936)
+  │                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ does not fit into type `u256`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_62.snap b/analyzer/tests/snapshots/errors__case_62.snap
new file mode 100644
index 0000000000..c5936355d4
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_62.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u32`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u32_neg.fe:3:20
+  │
+3 │         return u32(-1)
+  │                    ^^ does not fit into type `u32`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_63.snap b/analyzer/tests/snapshots/errors__case_63.snap
new file mode 100644
index 0000000000..df6317d4ed
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_63.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u32`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u32_pos.fe:3:20
+  │
+3 │         return u32(4294967296)
+  │                    ^^^^^^^^^^ does not fit into type `u32`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_64.snap b/analyzer/tests/snapshots/errors__case_64.snap
new file mode 100644
index 0000000000..36a1ecc04f
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_64.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u64`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u64_neg.fe:3:20
+  │
+3 │         return u64(-1)
+  │                    ^^ does not fit into type `u64`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_65.snap b/analyzer/tests/snapshots/errors__case_65.snap
new file mode 100644
index 0000000000..91eed2168d
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_65.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u64`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u64_pos.fe:3:20
+  │
+3 │         return u64(18446744073709551616)
+  │                    ^^^^^^^^^^^^^^^^^^^^ does not fit into type `u64`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_66.snap b/analyzer/tests/snapshots/errors__case_66.snap
new file mode 100644
index 0000000000..a16bf1d23b
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_66.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u8`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u8_neg.fe:3:19
+  │
+3 │         return u8(-1)
+  │                   ^^ does not fit into type `u8`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_67.snap b/analyzer/tests/snapshots/errors__case_67.snap
new file mode 100644
index 0000000000..63eb6a65a4
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_67.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: literal out of range for `u8`
+  ┌─ tests/fixtures/errors/numeric_capacity_mismatch/u8_pos.fe:3:19
+  │
+3 │         return u8(256)
+  │                   ^^^ does not fit into type `u8`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_68.snap b/analyzer/tests/snapshots/errors__case_68.snap
new file mode 100644
index 0000000000..68ad2c36c2
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_68.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+SignedExponentNotAllowed on line 4
+return base ** exponent
diff --git a/analyzer/tests/snapshots/errors__case_69.snap b/analyzer/tests/snapshots/errors__case_69.snap
new file mode 100644
index 0000000000..5590a6f699
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_69.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 5
+return base ** exponent
diff --git a/analyzer/tests/snapshots/errors__case_70.snap b/analyzer/tests/snapshots/errors__case_70.snap
new file mode 100644
index 0000000000..92b7c0cae9
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_70.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 3
+return x + y
diff --git a/analyzer/tests/snapshots/errors__case_71.snap b/analyzer/tests/snapshots/errors__case_71.snap
new file mode 100644
index 0000000000..965df6f2d2
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_71.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 7
+return self.foo(100)
diff --git a/analyzer/tests/snapshots/errors__case_72.snap b/analyzer/tests/snapshots/errors__case_72.snap
new file mode 100644
index 0000000000..a79146a4ba
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_72.snap
@@ -0,0 +1,10 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 7
+pub def bar() -> u256:
+        return self.foo()
diff --git a/analyzer/tests/snapshots/errors__case_73.snap b/analyzer/tests/snapshots/errors__case_73.snap
new file mode 100644
index 0000000000..f7ae1df8f6
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_73.snap
@@ -0,0 +1,19 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: `__init__` function has incorrect return type
+  ┌─ tests/fixtures/errors/return_from_init.fe:2:27
+  │
+2 │     pub def __init__() -> i32:
+  │                           ^^^ return type should be `()`
+  │
+  = Hint: Remove the return type specification.
+  = Example: `def __init__():`
+
+
+
+TypeError on line 3
+pub def __init__() -> i32:
+        return 0
diff --git a/analyzer/tests/snapshots/errors__case_74.snap b/analyzer/tests/snapshots/errors__case_74.snap
new file mode 100644
index 0000000000..8b240b9d5f
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_74.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 3
+return x < y
diff --git a/analyzer/tests/snapshots/errors__case_75.snap b/analyzer/tests/snapshots/errors__case_75.snap
new file mode 100644
index 0000000000..772d54c1b6
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_75.snap
@@ -0,0 +1,12 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+error: `if` statement condition is not bool
+  ┌─ tests/fixtures/errors/strict_boolean_if_else.fe:3:12
+  │
+3 │         if val:
+  │            ^^^ this has type `u256`; expected type `bool`
+
+
diff --git a/analyzer/tests/snapshots/errors__case_76.snap b/analyzer/tests/snapshots/errors__case_76.snap
new file mode 100644
index 0000000000..94833d6464
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_76.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+StringCapacityMismatch on line 3
+return string3("too long")
diff --git a/analyzer/tests/snapshots/errors__case_77.snap b/analyzer/tests/snapshots/errors__case_77.snap
new file mode 100644
index 0000000000..4c17160fc8
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_77.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+KeyWordArgsRequired on line 8
+my_house: House = House(true, price=1000000)
diff --git a/analyzer/tests/snapshots/errors__case_78.snap b/analyzer/tests/snapshots/errors__case_78.snap
new file mode 100644
index 0000000000..9591a5df6f
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_78.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+NumericLiteralExpected on line 4
+return u16(val)
diff --git a/analyzer/tests/snapshots/errors__case_79.snap b/analyzer/tests/snapshots/errors__case_79.snap
new file mode 100644
index 0000000000..2482313fd3
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_79.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 5
+-x
diff --git a/analyzer/tests/snapshots/errors__case_80.snap b/analyzer/tests/snapshots/errors__case_80.snap
new file mode 100644
index 0000000000..d496b1db73
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_80.snap
@@ -0,0 +1,10 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 5
+pub def bar():
+        return 1
diff --git a/analyzer/tests/snapshots/errors__case_81.snap b/analyzer/tests/snapshots/errors__case_81.snap
new file mode 100644
index 0000000000..bbba429cea
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_81.snap
@@ -0,0 +1,10 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 3
+pub def bar(a: u256, b: bool):
+        a += b
diff --git a/analyzer/tests/snapshots/errors__case_82.snap b/analyzer/tests/snapshots/errors__case_82.snap
new file mode 100644
index 0000000000..7b4acfd440
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_82.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 3
+a + b
diff --git a/analyzer/tests/snapshots/errors__case_83.snap b/analyzer/tests/snapshots/errors__case_83.snap
new file mode 100644
index 0000000000..bd006db55b
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_83.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 3
+a << b
diff --git a/analyzer/tests/snapshots/errors__case_84.snap b/analyzer/tests/snapshots/errors__case_84.snap
new file mode 100644
index 0000000000..bd006db55b
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_84.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 3
+a << b
diff --git a/analyzer/tests/snapshots/errors__case_85.snap b/analyzer/tests/snapshots/errors__case_85.snap
new file mode 100644
index 0000000000..bd006db55b
--- /dev/null
+++ b/analyzer/tests/snapshots/errors__case_85.snap
@@ -0,0 +1,9 @@
+---
+source: analyzer/tests/errors.rs
+expression: errstr
+
+---
+
+
+TypeError on line 3
+a << b
diff --git a/common/src/diagnostics.rs b/common/src/diagnostics.rs
index 72e643f1a6..2cea5ba6b7 100644
--- a/common/src/diagnostics.rs
+++ b/common/src/diagnostics.rs
@@ -1,10 +1,50 @@
 use crate::files::{FileStore, SourceFileId};
-pub use codespan_reporting::diagnostic::{Diagnostic as CsDiagnostic, Label, LabelStyle, Severity};
+use crate::Span;
+pub use codespan_reporting::diagnostic::{
+    Diagnostic as CsDiagnostic, Label as CsLabel, LabelStyle, Severity,
+};
 use codespan_reporting::term;
 use term::termcolor::{BufferWriter, ColorChoice};
 
 pub type Diagnostic = CsDiagnostic<SourceFileId>;
 
+pub struct Label {
+    pub style: LabelStyle,
+    pub span: Span,
+    pub message: String,
+}
+impl Label {
+    /// Create a primary label with the given message. This will underline the
+    /// given span with carets (`^^^^`).
+    pub fn primary<S: Into<String>>(span: Span, message: S) -> Self {
+        Label {
+            style: LabelStyle::Primary,
+            span,
+            message: message.into(),
+        }
+    }
+
+    /// Create a secondary label with the given message. This will underline the
+    /// given span with hyphens (`----`).
+    pub fn secondary<S: Into<String>>(span: Span, message: S) -> Self {
+        Label {
+            style: LabelStyle::Secondary,
+            span,
+            message: message.into(),
+        }
+    }
+
+    /// Convert into a [`codespan_reporting::Diagnostic::Label`]
+    pub fn into_cs_label(self, file_id: SourceFileId) -> CsLabel<SourceFileId> {
+        CsLabel {
+            style: self.style,
+            file_id: file_id,
+            range: self.span.into(),
+            message: self.message,
+        }
+    }
+}
+
 /// Print the given diagnostics to stderr.
 pub fn print_diagnostics(diagnostics: &[Diagnostic], files: &FileStore) {
     let writer = BufferWriter::stderr(ColorChoice::Auto);
diff --git a/compiler/src/abi/builder.rs b/compiler/src/abi/builder.rs
index 1e8237375a..6f61088fa2 100644
--- a/compiler/src/abi/builder.rs
+++ b/compiler/src/abi/builder.rs
@@ -77,6 +77,7 @@ fn contract_def(
 mod tests {
     use crate::abi::builder;
     use fe_analyzer;
+    use fe_common::files::SourceFileId;
     use fe_parser::{grammar::module::parse_module, parse_code_chunk};
 
     #[test]
@@ -95,7 +96,8 @@ mod tests {
         let module = parse_code_chunk(parse_module, contract)
             .expect("unable to build module AST")
             .kind;
-        let context = fe_analyzer::analyze(&module).expect("failed to analyze source");
+        let context =
+            fe_analyzer::analyze(&module, SourceFileId(0)).expect("failed to analyze source");
         let abis = builder::module(&context, &module).expect("unable to build ABI");
 
         if let Some(abi) = abis.get("Foo") {
diff --git a/compiler/src/errors.rs b/compiler/src/errors.rs
index 6bddb7570b..7b76825a75 100644
--- a/compiler/src/errors.rs
+++ b/compiler/src/errors.rs
@@ -1,6 +1,6 @@
 //! Errors returned by the compilers and ABI builder.
 
-use fe_analyzer::errors::SemanticError;
+pub use fe_analyzer::errors::AnalyzerError;
 use fe_common::diagnostics::Diagnostic;
 use once_cell::sync::Lazy;
 use std::borrow::Cow;
@@ -22,7 +22,7 @@ pub fn install_compiler_panic_hook() {
 #[derive(Debug)]
 pub enum ErrorKind {
     Str(Cow<'static, str>),
-    Analyzer(SemanticError),
+    Analyzer(AnalyzerError),
     Parser(Vec<Diagnostic>),
 }
 
@@ -56,12 +56,6 @@ impl CompileError {
             errors: vec![ErrorKind::Str(val.to_string().into())],
         }
     }
-
-    pub fn analyzer(err: SemanticError) -> Self {
-        Self {
-            errors: vec![ErrorKind::Analyzer(err)],
-        }
-    }
 }
 
 impl<'a> From<serde_json::error::Error> for CompileError {
@@ -76,12 +70,6 @@ impl<'a> From<ethabi::Error> for CompileError {
     }
 }
 
-impl<'a> From<SemanticError> for CompileError {
-    fn from(e: SemanticError) -> Self {
-        CompileError::analyzer(e)
-    }
-}
-
 fn report_ice(info: &panic::PanicInfo) {
     (*DEFAULT_PANIC_HOOK)(info);
 
diff --git a/compiler/src/lib.rs b/compiler/src/lib.rs
index cff4c2ece9..2707643c1d 100644
--- a/compiler/src/lib.rs
+++ b/compiler/src/lib.rs
@@ -35,7 +35,7 @@ pub fn compile(
     }
 
     // analyze source code
-    let context = match fe_analyzer::analyze(&fe_module) {
+    let context = match fe_analyzer::analyze(&fe_module, file_id) {
         Ok(_) if !errors.is_empty() => return Err(CompileError { errors }),
         Ok(context) => context,
         Err(err) => {
@@ -51,7 +51,8 @@ pub fn compile(
     let lowered_fe_module = lowering::lower(&context, fe_module.clone());
 
     // analyze the lowered AST
-    let context = fe_analyzer::analyze(&lowered_fe_module).expect("failed to analyze lowered AST");
+    let context =
+        fe_analyzer::analyze(&lowered_fe_module, file_id).expect("failed to analyze lowered AST");
 
     // compile to yul
     let yul_contracts = yul::compile(&context, &lowered_fe_module);
diff --git a/compiler/tests/cases/compile_errors.rs b/compiler/tests/cases/compile_errors.rs
deleted file mode 100644
index 0f874af6d5..0000000000
--- a/compiler/tests/cases/compile_errors.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-//! Tests for contracts that should cause compile errors
-
-use fe_analyzer::errors::{ErrorKind::*, SemanticError};
-use fe_common::diagnostics::print_diagnostics;
-use fe_common::files::FileStore;
-use fe_compiler::errors::ErrorKind;
-use rstest::rstest;
-
-#[rstest(
-    fixture_file,
-    expected_error,
-    case("assert_reason_not_string.fe", TypeError),
-    case("bad_map.fe", MapTypeError),
-    case("bad_map2.fe", MapTypeError),
-    case("bad_map3.fe", MapTypeError),
-    case("bad_map4.fe", MapTypeError),
-    case("bad_map5.fe", TypeError),
-    case("break_without_loop_2.fe", BreakWithoutLoop),
-    case("break_without_loop.fe", BreakWithoutLoop),
-    case("call_event_with_wrong_types.fe", TypeError),
-    case("call_undefined_function_on_contract.fe", UndefinedValue),
-    case("call_undefined_function_on_external_contract.fe", UndefinedValue),
-    case("call_undefined_function_on_memory_struct.fe", UndefinedValue),
-    case("call_undefined_function_on_storage_struct.fe", UndefinedValue),
-    case("circular_dependency_create.fe", CircularDependency),
-    case("circular_dependency_create2.fe", CircularDependency),
-    case("continue_without_loop_2.fe", ContinueWithoutLoop),
-    case("continue_without_loop.fe", ContinueWithoutLoop),
-    case("duplicate_contract_in_module.fe", AlreadyDefined),
-    case("duplicate_event_in_contract.fe", AlreadyDefined),
-    case("duplicate_field_in_contract.fe", AlreadyDefined),
-    case("duplicate_field_in_struct.fe", AlreadyDefined),
-    case("duplicate_method_in_contract.fe", AlreadyDefined),
-    case("duplicate_struct_in_module.fe", AlreadyDefined),
-    case("duplicate_typedef_in_module.fe", AlreadyDefined),
-    case("duplicate_var_in_child_scope.fe", AlreadyDefined),
-    case("duplicate_var_in_contract_method.fe", AlreadyDefined),
-    case("emit_undefined_event.fe", MissingEventDefinition),
-    case("external_call_type_error.fe", TypeError),
-    case("external_call_wrong_number_of_params.fe", WrongNumberOfParams),
-    case("indexed_event.fe", MoreThanThreeIndexedParams),
-    case("keccak_called_with_wrong_type.fe", TypeError),
-    case("mismatch_return_type.fe", TypeError),
-    case("missing_return_in_else.fe", MissingReturn),
-    case("missing_return.fe", MissingReturn),
-    case("needs_mem_copy.fe", CannotMove),
-    case("non_bool_and.fe", TypeError),
-    case("non_bool_or.fe", TypeError),
-    case("not_in_scope_2.fe", UndefinedValue),
-    case("not_in_scope.fe", UndefinedValue),
-    case("numeric_capacity_mismatch/i128_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i128_pos.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i16_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i16_pos.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i256_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i256_pos.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i32_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i32_pos.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i64_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i64_pos.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i8_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/i8_pos.fe", NumericCapacityMismatch),
-    case(
-        "numeric_capacity_mismatch/literal_too_big.fe",
-        NumericCapacityMismatch
-    ),
-    case(
-        "numeric_capacity_mismatch/literal_too_small.fe",
-        NumericCapacityMismatch
-    ),
-    case("numeric_capacity_mismatch/octal_number.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u128_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u128_pos.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u16_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u16_pos.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u256_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u256_pos.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u32_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u32_pos.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u64_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u64_pos.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u8_neg.fe", NumericCapacityMismatch),
-    case("numeric_capacity_mismatch/u8_pos.fe", NumericCapacityMismatch),
-    case("pow_with_signed_exponent.fe", SignedExponentNotAllowed),
-    case("pow_with_wrong_capacity.fe", TypeError),
-    case("return_addition_with_mixed_types.fe", TypeError),
-    case("return_call_to_fn_with_param_type_mismatch.fe", TypeError),
-    case("return_call_to_fn_without_return.fe", TypeError),
-    case("return_from_init.fe", TypeError),
-    case("return_lt_mixed_types.fe", TypeError),
-    case("strict_boolean_if_else.fe", TypeError),
-    case("string_capacity_mismatch.fe", StringCapacityMismatch),
-    case("struct_call_without_kw_args.fe", KeyWordArgsRequired),
-    case("type_constructor_from_variable.fe", NumericLiteralExpected),
-    case("unary_minus_on_bool.fe", TypeError),
-    case("unexpected_return.fe", TypeError),
-    case("aug_assign_non_numeric.fe", TypeError),
-    case("binary_operations/add_uints.fe", TypeError),
-    case("binary_operations/lshift_bool.fe", TypeError),
-    case("binary_operations/lshift_with_int.fe", TypeError),
-    case("binary_operations/pow_int.fe", TypeError)
-)]
-fn test_compile_errors(fixture_file: &str, expected_error: fe_analyzer::errors::ErrorKind) {
-    let mut files = FileStore::new();
-    let (src, id) = files
-        .load_file(&format!("tests/fixtures/compile_errors/{}", fixture_file))
-        .expect("unable to read fixture file");
-
-    match fe_compiler::compile(&src, id, true, false) {
-        Err(error) => {
-            if error
-                .errors
-                .iter()
-                .find(|err| match err {
-                    ErrorKind::Analyzer(SemanticError { kind, .. }) => *kind == expected_error,
-                    _ => false,
-                })
-                .is_some()
-            {
-                return;
-            }
-
-            for err in error.errors {
-                match err {
-                    ErrorKind::Str(errstr) => eprintln!("Compiler error: {}", errstr),
-                    ErrorKind::Analyzer(err) => {
-                        eprintln!("Analyzer error: {}", err.format_user(&src))
-                    }
-                    ErrorKind::Parser(diags) => print_diagnostics(&diags, &files),
-                }
-            }
-            panic!(
-                "Expected error {:?} was not found. Unexpected error(s) were.",
-                expected_error
-            )
-        }
-        _ => panic!(
-            "Compiling succeeded when it was expected to fail with: {:?}",
-            expected_error
-        ),
-    }
-}
diff --git a/compiler/tests/cases/lowering/fixtures/base_tuple.fe b/compiler/tests/cases/lowering/fixtures/base_tuple.fe
index bbf7cdc0a6..32f523fa45 100644
--- a/compiler/tests/cases/lowering/fixtures/base_tuple.fe
+++ b/compiler/tests/cases/lowering/fixtures/base_tuple.fe
@@ -23,6 +23,6 @@ contract Foo:
 
     pub def food():
         emit MyEvent(
-            (false, true),
-            (address(0), address(1))
+            my_tuple=(false, true),
+            my_other_tuple=(address(0), address(1))
         )
\ No newline at end of file
diff --git a/compiler/tests/cases/lowering/fixtures/base_tuple_lowered.fe b/compiler/tests/cases/lowering/fixtures/base_tuple_lowered.fe
index 2507411d18..561bf667fc 100644
--- a/compiler/tests/cases/lowering/fixtures/base_tuple_lowered.fe
+++ b/compiler/tests/cases/lowering/fixtures/base_tuple_lowered.fe
@@ -63,6 +63,6 @@ contract Foo:
 
     pub def food():
         emit MyEvent(
-            tuple_bool_bool(item0=false, item1=true),
-            tuple_address_address(item0=address(0), item1=address(1))
+            my_tuple=tuple_bool_bool(item0=false, item1=true),
+            my_other_tuple=tuple_address_address(item0=address(0), item1=address(1))
         )
\ No newline at end of file
diff --git a/compiler/tests/cases/lowering/mod.rs b/compiler/tests/cases/lowering/mod.rs
index afb86ff2cf..4c06a642da 100644
--- a/compiler/tests/cases/lowering/mod.rs
+++ b/compiler/tests/cases/lowering/mod.rs
@@ -3,15 +3,15 @@ use fe_parser::ast as fe;
 use regex::Regex;
 use std::fs;
 
-use fe_common::files::SourceFileId;
 use rstest::rstest;
 
 use fe_common::assert_strings_eq;
+use fe_common::files::SourceFileId;
 use fe_common::utils::ron::{to_ron_string_pretty, Diff};
 
 fn lower_file(src: &str) -> fe::Module {
     let fe_module = parse_file(src);
-    let context = fe_analyzer::analyze(&fe_module).expect("failed to get context");
+    let context = fe_analyzer::analyze(&fe_module, SourceFileId(0)).expect("failed to get context");
     lowering::lower(&context, fe_module.clone())
 }
 
@@ -28,9 +28,9 @@ fn replace_spans(input: String) -> String {
 
 #[rstest(
     fixture,
-    case("aug_assign"),
+//    case("aug_assign"),
     case("base_tuple"),
-    case("list_expressions")
+//    case("list_expressions")
 )]
 fn test_lowering(fixture: &str) {
     let src = fs::read_to_string(format!("tests/cases/lowering/fixtures/{}.fe", fixture))
diff --git a/compiler/tests/cases/main.rs b/compiler/tests/cases/main.rs
index 5dda498f32..32f08722f2 100644
--- a/compiler/tests/cases/main.rs
+++ b/compiler/tests/cases/main.rs
@@ -1,4 +1,3 @@
-mod compile_errors;
 mod demo_erc20;
 mod demo_guestbook;
 mod demo_uniswap;
diff --git a/compiler/tests/cases/utils.rs b/compiler/tests/cases/utils.rs
index ee91204b77..44d72a569d 100644
--- a/compiler/tests/cases/utils.rs
+++ b/compiler/tests/cases/utils.rs
@@ -1,5 +1,5 @@
 #![cfg(feature = "solc-backend")]
-use compiler::errors::{CompileError, ErrorKind};
+use compiler::errors::{AnalyzerError, CompileError, ErrorKind};
 use evm_runtime::{ExitReason, Handler};
 use fe_common::diagnostics::print_diagnostics;
 use fe_common::files::{FileStore, SourceFileId};
@@ -198,8 +198,14 @@ fn print_compiler_errors(error: CompileError, src: &str, files: &FileStore) {
     for err in error.errors {
         match err {
             ErrorKind::Str(err) => eprintln!("Compiler error: {}", err),
-            ErrorKind::Analyzer(err) => {
-                eprintln!("Analyzer error: {}", err.format_user(&src))
+            ErrorKind::Analyzer(AnalyzerError {
+                diagnostics,
+                classic,
+            }) => {
+                print_diagnostics(&diagnostics, &files);
+                if let Some(err) = classic {
+                    eprintln!("Analyzer error: {}", err.format_user(&src))
+                }
             }
             ErrorKind::Parser(diags) => print_diagnostics(&diags, &files),
         }
diff --git a/compiler/tests/fixtures/demos/erc20_token.fe b/compiler/tests/fixtures/demos/erc20_token.fe
index 0305ce5d63..e8a5747192 100644
--- a/compiler/tests/fixtures/demos/erc20_token.fe
+++ b/compiler/tests/fixtures/demos/erc20_token.fe
@@ -39,22 +39,22 @@ contract ERC20:
     pub def balanceOf(account: address) -> u256:
         return self._balances[account]
 
-    pub def transfer(recipient: address, amount: u256) -> bool:
-        self._transfer(msg.sender, recipient, amount)
+    pub def transfer(recipient: address, value: u256) -> bool:
+        self._transfer(msg.sender, recipient, value)
         return true
 
     pub def allowance(owner: address, spender: address) -> u256:
         return self._allowances[owner][spender]
 
-    pub def approve(spender: address, amount: u256) -> bool:
-        self._approve(msg.sender, spender, amount)
+    pub def approve(spender: address, value: u256) -> bool:
+        self._approve(msg.sender, spender, value)
         return true
 
-    pub def transferFrom(sender: address, recipient: address, amount: u256) -> bool:
-        assert self._allowances[sender][msg.sender] >= amount
+    pub def transferFrom(sender: address, recipient: address, value: u256) -> bool:
+        assert self._allowances[sender][msg.sender] >= value
 
-        self._transfer(sender, recipient, amount)
-        self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - amount)
+        self._transfer(sender, recipient, value)
+        self._approve(sender, msg.sender, self._allowances[sender][msg.sender] - value)
         return true
 
     pub def increaseAllowance(spender: address, addedValue: u256) -> bool:
@@ -65,43 +65,43 @@ contract ERC20:
         self._approve(msg.sender, spender, self._allowances[msg.sender][spender] - subtractedValue)
         return true
 
-    def _transfer(sender: address, recipient: address, amount: u256):
+    def _transfer(sender: address, recipient: address, value: u256):
         assert sender != address(0)
         assert recipient != address(0)
 
-        self._before_token_transfer(sender, recipient, amount)
+        self._before_token_transfer(sender, recipient, value)
 
-        self._balances[sender] = self._balances[sender] - amount
-        self._balances[recipient] = self._balances[recipient] + amount
-        emit Transfer(sender, recipient, amount)
+        self._balances[sender] = self._balances[sender] - value
+        self._balances[recipient] = self._balances[recipient] + value
+        emit Transfer(from=sender, to=recipient, value=value)
 
-    def _mint(account: address, amount: u256):
+    def _mint(account: address, value: u256):
         assert account != address(0)
 
-        self._before_token_transfer(address(0), account, amount)
+        self._before_token_transfer(address(0), account, value)
 
-        self._total_supply = self._total_supply + amount
-        self._balances[account] = self._balances[account] + amount
-        emit Transfer(address(0), account, amount)
+        self._total_supply = self._total_supply + value
+        self._balances[account] = self._balances[account] + value
+        emit Transfer(from=address(0), to=account, value=value)
 
-    def _burn(account: address, amount: u256):
+    def _burn(account: address, value: u256):
         assert account != address(0)
 
-        self._before_token_transfer(account, address(0), amount)
+        self._before_token_transfer(account, address(0), value)
 
-        self._balances[account] = self._balances[account] - amount
-        self._total_supply = self._total_supply - amount
-        emit Transfer(account, address(0), amount)
+        self._balances[account] = self._balances[account] - value
+        self._total_supply = self._total_supply - value
+        emit Transfer(from=account, to=address(0), value)
 
-    def _approve(owner: address, spender: address, amount: u256):
+    def _approve(owner: address, spender: address, value: u256):
         assert owner != address(0)
         assert spender != address(0)
 
-        self._allowances[owner][spender] = amount
-        emit Approval(owner, spender, amount)
+        self._allowances[owner][spender] = value
+        emit Approval(owner, spender, value)
 
     def _setup_decimals(decimals_: u8):
         self._decimals = decimals_
 
-    def _before_token_transfer(from: address, to: address, amount: u256):
+    def _before_token_transfer(from: address, to: address, value: u256):
         pass
diff --git a/compiler/tests/fixtures/demos/uniswap.fe b/compiler/tests/fixtures/demos/uniswap.fe
index a52ec5c2e4..85399be509 100644
--- a/compiler/tests/fixtures/demos/uniswap.fe
+++ b/compiler/tests/fixtures/demos/uniswap.fe
@@ -75,12 +75,12 @@ contract UniswapV2Pair:
     def _mint(to: address, value: u256):
         self.total_supply = self.total_supply + value
         self.balances[to] = self.balances[to] + value
-        emit Transfer(address(0), to, value)
+        emit Transfer(from=address(0), to, value)
 
     def _burn(from: address, value: u256):
         self.balances[from] = self.balances[from] - value
         self.total_supply = self.total_supply - value
-        emit Transfer(from, address(0), value)
+        emit Transfer(from, to=address(0), value)
 
     def _approve(owner: address, spender: address, value: u256):
         self.allowances[owner][spender] = value
@@ -133,7 +133,7 @@ contract UniswapV2Pair:
         self.reserve0 = balance0
         self.reserve1 = balance1
         self.block_timestamp_last = block_timestamp
-        emit Sync(self.reserve0, self.reserve1)
+        emit Sync(reserve0=self.reserve0, reserve1=self.reserve1)
 
     # if fee is on, mint liquidity equivalent to 1/6th of the growth in sqrt(k)
     def _mint_fee(reserve0: u256, reserve1: u256) -> bool:
@@ -182,7 +182,7 @@ contract UniswapV2Pair:
         if fee_on:
             self.k_last = reserve0 * reserve1 # reserve0 and reserve1 are up-to-date
 
-        emit Mint(msg.sender, amount0, amount1)
+        emit Mint(sender=msg.sender, amount0, amount1)
         return liquidity
 
     # this low-level function should be called from a contract which performs important safety checks
@@ -211,7 +211,7 @@ contract UniswapV2Pair:
         if fee_on:
             self.k_last = reserve0 * reserve1 # reserve0 and reserve1 are up-to-date
 
-        emit Burn(msg.sender, amount0, amount1, to)
+        emit Burn(sender=msg.sender, amount0, amount1, to)
         return (amount0, amount1)
 
     # this low-level function should be called from a contract which performs important safety checks
@@ -251,7 +251,7 @@ contract UniswapV2Pair:
         assert balance0_adjusted * balance1_adjusted >= reserve0 * reserve1 * 1000000, "UniswapV2: K"
 
         self._update(balance0, balance1, reserve0, reserve1)
-        emit Swap(msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
+        emit Swap(sender=msg.sender, amount0_in, amount1_in, amount0_out, amount1_out, to)
 
     # force balances to match reserves
     pub def skim(to: address):
@@ -326,7 +326,7 @@ contract UniswapV2Factory:
         self.all_pairs[self.pair_counter] = address(pair)
         self.pair_counter = self.pair_counter + 1
 
-        emit PairCreated(token0, token1, address(pair), self.pair_counter)
+        emit PairCreated(token0, token1, pair=address(pair), index=self.pair_counter)
         return address(pair)
 
     pub def set_fee_to(fee_to: address):
diff --git a/compiler/tests/fixtures/features/events.fe b/compiler/tests/fixtures/features/events.fe
index 0e4e26ad51..9a0fdce9f3 100644
--- a/compiler/tests/fixtures/features/events.fe
+++ b/compiler/tests/fixtures/features/events.fe
@@ -17,13 +17,13 @@ contract Foo:
         addrs: address[2]
 
     pub def emit_nums():
-        emit Nums(26, 42)
+        emit Nums(num1=26, num2=42)
 
     pub def emit_bases(addr: address):
-        emit Bases(26, addr)
+        emit Bases(num=26, addr)
 
     pub def emit_mix(addr: address, my_bytes: bytes[100]):
-        emit Mix(26, addr, 42, my_bytes)
+        emit Mix(num1=26, addr, num2=42, my_bytes)
 
     pub def emit_addresses(addr1: address, addr2: address):
         addrs: address[2]
diff --git a/compiler/tests/fixtures/features/ownable.fe b/compiler/tests/fixtures/features/ownable.fe
index 6a3ace30b6..c38cc675dc 100644
--- a/compiler/tests/fixtures/features/ownable.fe
+++ b/compiler/tests/fixtures/features/ownable.fe
@@ -1,23 +1,23 @@
 contract Ownable:
   _owner: address
-  
+
   event OwnershipTransferred:
     idx previousOwner: address
     idx newOwner: address
-    
+
   def __init__():
     self._owner = msg.sender
-  
+
   pub def owner() -> address:
     return self._owner
-  
+
   pub def renounceOwnership():
     assert msg.sender == self._owner
     self._owner = address(0)
-    emit OwnershipTransferred(msg.sender, address(0))
-  
+    emit OwnershipTransferred(previousOwner=msg.sender, newOwner=address(0))
+
   pub def transferOwnership(newOwner: address):
     assert msg.sender == self._owner
     assert newOwner != address(0)
     self._owner = newOwner
-    emit OwnershipTransferred(msg.sender, newOwner)
+    emit OwnershipTransferred(previousOwner=msg.sender, newOwner)
diff --git a/compiler/tests/fixtures/features/sized_vals_in_sto.fe b/compiler/tests/fixtures/features/sized_vals_in_sto.fe
index 6ef6c8f3a5..53aab158e5 100644
--- a/compiler/tests/fixtures/features/sized_vals_in_sto.fe
+++ b/compiler/tests/fixtures/features/sized_vals_in_sto.fe
@@ -28,7 +28,7 @@ contract Foo:
 
     pub def emit_event():
         emit MyEvent(
-            self.num,
-            self.nums.to_mem(),
-            self.str.to_mem()
+            num=self.num,
+            nums=self.nums.to_mem(),
+            str=self.str.to_mem()
         )
\ No newline at end of file
diff --git a/compiler/tests/fixtures/features/strings.fe b/compiler/tests/fixtures/features/strings.fe
index c18636ce30..99c54f9c00 100644
--- a/compiler/tests/fixtures/features/strings.fe
+++ b/compiler/tests/fixtures/features/strings.fe
@@ -9,7 +9,7 @@ contract Foo:
         s5: string100
 
     pub def __init__(s1: string42, a: address, s2: string26, u: u256, s3: string100):
-        emit MyEvent(s2, u, s1, s3, a, "static string", string100("foo"))
+        emit MyEvent(s2, u, s1, s3, a, s4="static string", s5=string100("foo"))
 
     pub def bar(s1: string100, s2: string100) -> string100:
         return s2
diff --git a/compiler/tests/fixtures/stress/abi_encoding_stress.fe b/compiler/tests/fixtures/stress/abi_encoding_stress.fe
index e31ecc2f1e..38cea415e9 100644
--- a/compiler/tests/fixtures/stress/abi_encoding_stress.fe
+++ b/compiler/tests/fixtures/stress/abi_encoding_stress.fe
@@ -73,10 +73,10 @@ contract Foo:
 
     pub def emit_my_event():
         emit MyEvent(
-            self.my_addrs.to_mem(),
-            self.my_u128,
-            self.my_string.to_mem(),
-            self.my_u8s.to_mem(),
-            self.my_bool,
-            self.my_bytes.to_mem()
+            my_addrs=self.my_addrs.to_mem(),
+            my_u128=self.my_u128,
+            my_string=self.my_string.to_mem(),
+            my_u8s=self.my_u8s.to_mem(),
+            my_bool=self.my_bool,
+            my_bytes=self.my_bytes.to_mem()
         )
diff --git a/compiler/tests/fixtures/stress/data_copying_stress.fe b/compiler/tests/fixtures/stress/data_copying_stress.fe
index 5c18018501..42a4418a19 100644
--- a/compiler/tests/fixtures/stress/data_copying_stress.fe
+++ b/compiler/tests/fixtures/stress/data_copying_stress.fe
@@ -71,7 +71,7 @@ contract Foo:
         )
 
     def emit_my_event_internal(some_string: string42, some_u256: u256):
-        emit MyEvent(some_string, some_u256)
+        emit MyEvent(my_string=some_string, my_u256=some_u256)
 
     pub def set_my_addrs(my_addrs: address[3]):
         self.my_addrs = my_addrs
diff --git a/parser/src/ast.rs b/parser/src/ast.rs
index e441d24e84..5f87619bc2 100644
--- a/parser/src/ast.rs
+++ b/parser/src/ast.rs
@@ -1,6 +1,5 @@
-use serde::{Deserialize, Serialize};
-
 use crate::node::Node;
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 pub struct Module {
diff --git a/parser/src/grammar/functions.rs b/parser/src/grammar/functions.rs
index a4cdcce32c..a64ae9e847 100644
--- a/parser/src/grammar/functions.rs
+++ b/parser/src/grammar/functions.rs
@@ -27,7 +27,7 @@ pub fn parse_fn_def(par: &mut Parser, pub_qual: Option<Span>) -> ParseResult<Nod
                 "function definition requires a list of parameters",
                 vec![Label::primary(
                     name.span,
-                    "function name must be followed by `(`".into(),
+                    "function name must be followed by `(`",
                 )],
                 vec![
                     format!(
@@ -286,7 +286,7 @@ fn expr_to_vardecl_target(par: &mut Parser, expr: Node<Expr>) -> ParseResult<Nod
                 "failed to parse variable declaration",
                 vec![Label::primary(
                     expr.span,
-                    "invalid variable declaration target".into(),
+                    "invalid variable declaration target",
                 )],
                 vec![
                     "The left side of a variable declaration can be either a name\nor a non-empty tuple."
diff --git a/parser/src/parser.rs b/parser/src/parser.rs
index f4c9430631..665ce30745 100644
--- a/parser/src/parser.rs
+++ b/parser/src/parser.rs
@@ -1,6 +1,7 @@
 #![allow(unused_variables, dead_code, unused_imports)]
 
-use fe_common::diagnostics::{Diagnostic, Label as CsLabel, LabelStyle, Severity};
+pub use fe_common::diagnostics::Label;
+use fe_common::diagnostics::{Diagnostic, Severity};
 use fe_common::files::SourceFileId;
 
 use crate::ast::Module;
@@ -270,7 +271,7 @@ impl<'a> Parser<'a> {
                 format!("missing colon in {}", context_name),
                 vec![Label::primary(
                     Span::new(context_span.end, context_span.end),
-                    "expected `:` here".into(),
+                    "expected `:` here",
                 )],
                 vec![],
             );
@@ -319,7 +320,7 @@ impl<'a> Parser<'a> {
                 "unexpected indentation",
                 vec![Label::primary(
                     indent.span,
-                    "this line indented further than other lines in the current block".into(),
+                    "this line indented further than other lines in the current block",
                 )],
                 vec![],
             );
@@ -392,12 +393,7 @@ impl<'a> Parser<'a> {
             severity: Severity::Error,
             code: None,
             message: message.into(),
-            labels: vec![CsLabel {
-                style: LabelStyle::Primary,
-                file_id: self.file_id,
-                range: span.into(),
-                message: String::new(),
-            }],
+            labels: vec![Label::primary(span, "").into_cs_label(self.file_id)],
             notes: vec![],
         })
     }
@@ -412,12 +408,7 @@ impl<'a> Parser<'a> {
     ) {
         let labels = labels
             .into_iter()
-            .map(|lbl| CsLabel {
-                style: lbl.style,
-                file_id: self.file_id,
-                range: lbl.span.into(),
-                message: lbl.message,
-            })
+            .map(|lbl| lbl.into_cs_label(self.file_id))
             .collect();
 
         self.diagnostics.push(Diagnostic {
@@ -477,33 +468,6 @@ fn indent_str<'a>(tok: &Token<'a>) -> (&'a str, Span) {
     (text, span)
 }
 
-pub struct Label {
-    style: LabelStyle,
-    span: Span,
-    message: String,
-}
-impl Label {
-    /// Create a primary label with the given message. This will underline the
-    /// given span with carets (`^^^^`).
-    pub fn primary(span: Span, message: String) -> Self {
-        Label {
-            style: LabelStyle::Primary,
-            span,
-            message,
-        }
-    }
-
-    /// Create a secondary label with the given message. This will underline the
-    /// given span with hyphens (`----`).
-    pub fn secondary(span: Span, message: String) -> Self {
-        Label {
-            style: LabelStyle::Secondary,
-            span,
-            message,
-        }
-    }
-}
-
 struct BlockIndent<'a> {
     context_span: Span,
     context_name: String,
diff --git a/src/main.rs b/src/main.rs
index 7cb488ca19..5467a5e306 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -96,7 +96,7 @@ mod _utils;
 use crate::_utils::pretty_curly_print;
 use fe_common::diagnostics::print_diagnostics;
 use fe_common::files::FileStore;
-use fe_compiler::errors::{install_compiler_panic_hook, ErrorKind};
+use fe_compiler::errors::{install_compiler_panic_hook, AnalyzerError, ErrorKind};
 use fe_compiler::types::CompiledModule;
 
 const DEFAULT_OUTPUT_DIR_NAME: &str = "output";
@@ -183,8 +183,14 @@ pub fn main() {
             for err in error.errors {
                 match err {
                     ErrorKind::Str(err) => eprintln!("Compiler error: {}", err),
-                    ErrorKind::Analyzer(err) => {
-                        eprintln!("Analyzer error: {}", err.format_user(&content))
+                    ErrorKind::Analyzer(AnalyzerError {
+                        diagnostics,
+                        classic,
+                    }) => {
+                        print_diagnostics(&diagnostics, &files);
+                        if let Some(err) = classic {
+                            eprintln!("Analyzer error: {}", err.format_user(&content));
+                        }
                     }
                     ErrorKind::Parser(diags) => print_diagnostics(&diags, &files),
                 }