From 0783ad900078f837fc0e8e331eab56b9229a4541 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Fri, 1 Apr 2022 22:45:12 -0500
Subject: [PATCH] [test] Update tests to include location string.

---
 .../constructor_recovers.sol                  |   4 +-
 .../errorRecoveryTests/contract_recovery.sol  |   4 +-
 .../do_not_delete_at_error.sol                |   2 +-
 .../errorRecoveryTests/error_to_eos.sol       |   8 +-
 .../errorRecoveryTests/missing_rhs.sol        |   4 +-
 .../errorRecoveryTests/multiple_errors.sol    |  12 +-
 .../wrong_compiler_recovers_1.sol             |   2 +-
 .../wrong_compiler_recovers_2.sol             |   4 +-
 .../wrong_compiler_recovers_3.sol             |   4 +-
 .../wrong_compiler_recovers_4.sol             |   4 +-
 .../smtCheckerTests/abi/abi_decode_array.sol  |  18 +-
 .../smtCheckerTests/abi/abi_decode_simple.sol |  22 +-
 .../abi/abi_encode_array_slice.sol            |   2 +-
 .../abi/abi_encode_array_slice_2.sol          |   8 +-
 .../abi/abi_encode_call_simple.sol            |  18 +-
 .../abi/abi_encode_function.sol               |   2 +-
 .../abi/abi_encode_no_arguments.sol           |   8 +-
 .../abi/abi_encode_packed_array_slice.sol     |   8 +-
 .../abi/abi_encode_packed_array_slice_2.sol   |   4 +-
 .../abi/abi_encode_packed_simple.sol          |  24 +-
 .../abi/abi_encode_packed_string_literal.sol  |  30 +-
 ...code_packed_string_literal_no_unproved.sol |  20 +-
 .../smtCheckerTests/abi/abi_encode_simple.sol |  18 +-
 .../abi/abi_encode_string_literal.sol         |  24 +-
 .../abi_encode_with_selector_array_slice.sol  |  26 +-
 ...abi_encode_with_selector_array_slice_2.sol |  26 +-
 .../abi/abi_encode_with_selector_simple.sol   |  14 +-
 ...bi_encode_with_selector_string_literal.sol |  30 +-
 .../abi/abi_encode_with_selector_vs_sig.sol   |   4 +-
 .../abi/abi_encode_with_sig_array_slice.sol   |  26 +-
 .../abi/abi_encode_with_sig_array_slice_2.sol |  26 +-
 .../abi/abi_encode_with_sig_simple.sol        |  14 +-
 .../abi_encode_with_sig_string_literal.sol    |  30 +-
 .../array_members/array_pop_length_1.sol      |   2 +-
 .../array_members/array_pop_length_2.sol      |   2 +-
 .../array_members/array_pop_length_3.sol      |   4 +-
 .../array_members/array_pop_length_4.sol      |   2 +-
 .../array_members/array_pop_length_5.sol      |   2 +-
 .../array_members/array_pop_length_6.sol      |   2 +-
 .../array_members/array_pop_length_8.sol      |   2 +-
 .../array_members/length_basic.sol            |   2 +-
 .../length_same_after_assignment_2_fail.sol   |   6 +-
 .../array_members/pop_1_unsafe.sol            |   2 +-
 .../array_members/pop_2d_unsafe.sol           |   2 +-
 .../array_members/pop_constructor_unsafe.sol  |   2 +-
 .../array_members/pop_loop_unsafe.sol         |   2 +-
 .../array_members/push_2d_arg_1_unsafe.sol    |   2 +-
 .../push_as_lhs_and_rhs_2d_1.sol              |   2 +-
 .../push_as_lhs_compound_assignment.sol       |   2 +-
 .../push_function_return_value.sol            |   4 +-
 .../push_push_no_args_1_fail.sol              |   2 +-
 .../push_storage_ref_safe_aliasing.sol        |   6 +-
 .../push_storage_ref_unsafe_length.sol        |  20 +-
 .../array_members/push_zero_unsafe.sol        |   2 +-
 .../array_members/storage_pointer_push_1.sol  |   4 +-
 .../blockchain_state/balance_receive_2.sol    |   2 +-
 .../balance_receive_ext_calls_2.sol           |   2 +-
 .../blockchain_state/balance_spend.sol        |   2 +-
 .../blockchain_state/balance_spend_2.sol      |   2 +-
 .../blockchain_state/balance_zero_3.sol       |   8 +-
 .../blockchain_state/balance_zero_4.sol       |   8 +-
 .../blockchain_state/free_function_2.sol      |   4 +-
 .../blockchain_state/library_internal_2.sol   |   4 +-
 .../blockchain_state/library_public_1.sol     |   6 +-
 .../blockchain_state/library_public_2.sol     |   8 +-
 .../blockchain_state/library_public_3.sol     |  10 +-
 .../blockchain_state/library_public_4.sol     |  10 +-
 .../smtCheckerTests/bmc_coverage/assert.sol   |   8 +-
 .../branches_in_modifiers.sol                 |   2 +-
 .../branches_in_modifiers_2.sol               |   6 +-
 .../constructor_state_variable_init.sol       |   8 +-
 ...or_state_variable_init_chain_alternate.sol |   2 +-
 ...onstructor_state_variable_init_diamond.sol |  16 +-
 .../branches_with_return/constructors.sol     |   8 +-
 .../branches_with_return/nested_if.sol        |   4 +-
 .../return_in_both_branches.sol               |   2 +-
 .../branches_with_return/simple_if2.sol       |   2 +-
 .../branches_with_return/simple_if_array.sol  |   2 +-
 .../simple_if_state_var.sol                   |   2 +-
 .../branches_with_return/simple_if_struct.sol |   2 +-
 .../simple_if_struct_2.sol                    |   2 +-
 .../branches_with_return/simple_if_tuple.sol  |   4 +-
 .../bmc_coverage/call_balance.sol             |   4 +-
 .../bmc_coverage/call_state_var.sol           |   4 +-
 .../smtCheckerTests/bmc_coverage/funds.sol    |   2 +-
 ...plicit_constructor_with_function_calls.sol |   2 +-
 .../smtCheckerTests/bmc_coverage/math.sol     |   8 +-
 .../bmc_coverage/math_constructor.sol         |   2 +-
 .../bmc_coverage/msg_value_4.sol              |   2 +-
 .../bmc_coverage/staticcall_balance.sol       |   2 +-
 .../bmc_coverage/staticcall_state_var.sol     |   2 +-
 .../try_multiple_catch_clauses_2.sol          |   2 +-
 ...ry_multiple_returned_values_with_tuple.sol |   2 +-
 .../unary_add_minus_overflow_detected.sol     |   4 +-
 ...ked_function_call_with_unchecked_block.sol |   2 +-
 .../complex/slither/const_state_variables.sol |   4 +-
 .../complex/slither/external_function.sol     |  10 +-
 .../branches_inside_modifiers_1.sol           |   2 +-
 .../branches_inside_modifiers_2.sol           |   2 +-
 .../branches_inside_modifiers_3.sol           |   2 +-
 .../branches_inside_modifiers_4.sol           |   2 +-
 .../branches_in_modifiers.sol                 |   2 +-
 .../constructor_state_variable_init.sol       |   8 +-
 ...or_state_variable_init_chain_alternate.sol |   2 +-
 ...onstructor_state_variable_init_diamond.sol |  16 +-
 .../branches_with_return/constructors.sol     |   8 +-
 .../branches_with_return/nested_if.sol        |   4 +-
 .../return_in_both_branches.sol               |   2 +-
 .../branches_with_return/simple_if2.sol       |   2 +-
 .../branches_with_return/simple_if_array.sol  |   2 +-
 .../simple_if_state_var.sol                   |   2 +-
 .../branches_with_return/simple_if_struct.sol |   2 +-
 .../simple_if_struct_2.sol                    |   2 +-
 .../branches_with_return/simple_if_tuple.sol  |   4 +-
 .../smtCheckerTests/control_flow/require.sol  |   4 +-
 .../control_flow/return_1_fail.sol            |   8 +-
 .../control_flow/return_2_fail.sol            |  16 +-
 .../smtCheckerTests/control_flow/revert.sol   |   8 +-
 .../control_flow/revert_complex_flow.sol      |   4 +-
 .../control_flow/short_circuit_and_fail.sol   |   2 +-
 .../short_circuit_and_inside_branch.sol       |   4 +-
 .../short_circuit_and_need_both_fail.sol      |   2 +-
 .../short_circuit_and_touched.sol             |  10 +-
 .../short_circuit_and_touched_function.sol    |  10 +-
 .../control_flow/short_circuit_or_fail.sol    |   2 +-
 .../short_circuit_or_inside_branch.sol        |   2 +-
 .../short_circuit_or_need_both_fail.sol       |   2 +-
 .../control_flow/short_circuit_or_touched.sol |  10 +-
 .../short_circuit_or_touched_function.sol     |  10 +-
 .../control_flow/try_catch_1.sol              |   2 +-
 .../virtual_function_call_inside_branch_2.sol |   2 +-
 .../ways_to_merge_variables_1.sol             |   2 +-
 .../ways_to_merge_variables_2.sol             |   2 +-
 .../ways_to_merge_variables_3.sol             |   2 +-
 .../crypto_functions_compare_hashes.sol       |  18 +-
 .../crypto/crypto_functions_fail.sol          |  18 +-
 .../crypto/crypto_functions_not_same.sol      |   6 +-
 ...ions_same_input_over_state_same_output.sol |  24 +-
 ...same_input_over_state_same_output_fail.sol |  24 +-
 .../external_calls/call_constructor_1.sol     |   2 +-
 .../external_calls/call_constructor_2.sol     |   2 +-
 .../external_calls/call_mutex.sol             |   2 +-
 .../external_calls/call_mutex_unsafe.sol      |   4 +-
 .../external_calls/call_reentrancy_1.sol      |   8 +-
 .../external_calls/call_return_1.sol          |   6 +-
 .../external_calls/call_return_2.sol          |   4 +-
 .../external_calls/call_safe.sol              |   4 +-
 .../external_calls/call_with_value_2.sol      |   2 +-
 .../external_calls/call_with_value_3.sol      |   2 +-
 .../external_calls/external.sol               |   2 +-
 .../external_call_from_constructor_1.sol      |   4 +-
 .../external_call_from_constructor_2.sol      |   2 +-
 .../external_call_from_constructor_3.sol      |   4 +-
 ...nal_call_from_constructor_reentrancy_1.sol |   2 +-
 .../external_calls/external_hash.sol          |   2 +-
 .../external_hash_known_code_pure.sol         |   2 +-
 ...ernal_hash_known_code_state_reentrancy.sol |   4 +-
 .../external_hash_known_code_state_unsafe.sol |   2 +-
 .../external_calls/external_inc.sol           |   6 +-
 .../external_calls/external_reentrancy_1.sol  |   6 +-
 .../external_calls/external_reentrancy_2.sol  |   6 +-
 .../external_reentrancy_crypto.sol            |  12 +-
 .../external_calls/external_single_inc.sol    |   2 +-
 .../internal_library_external_call_1.sol      |   2 +-
 .../internal_library_external_call_2.sol      |   2 +-
 .../internal_library_external_call_3.sol      |   2 +-
 .../external_calls/mutex_f_no_guard.sol       |   2 +-
 .../external_calls/staticcall_mutex.sol       |   2 +-
 .../external_calls/staticcall_mutex_2.sol     |   2 +-
 .../staticcall_reentrancy_view.sol            |   6 +-
 .../abi_function_different_source_2.sol       |   2 +-
 .../file_level/constant_different_source.sol  |   2 +-
 .../file_level/constant_easy.sol              |   2 +-
 .../constant_string_at_file_level.sol         |   2 +-
 .../constants_at_file_level_referencing.sol   |   8 +-
 .../smtCheckerTests/file_level/easy.sol       |   2 +-
 .../smtCheckerTests/file_level/enum.sol       |   2 +-
 .../file_level/file_level_call_via_module.sol |   4 +-
 .../file_level/free_constant_1.sol            |   2 +-
 .../file_level/free_function_1.sol            |   4 +-
 .../file_level/free_function_4.sol            |   2 +-
 .../file_level/free_function_5.sol            |   2 +-
 .../free_function_and_constant_1.sol          |   6 +-
 .../free_namesake_contract_function.sol       |   2 +-
 .../file_level/free_runtimecode.sol           |   4 +-
 .../smtCheckerTests/file_level/import.sol     |   4 +-
 .../file_level/libraries_from_free.sol        |   6 +-
 .../file_level/module_constants_1.sol         |   4 +-
 .../module_constants_functions_1.sol          |   8 +-
 .../file_level/new_operator.sol               |   4 +-
 .../smtCheckerTests/file_level/overloads.sol  |   2 +-
 .../smtCheckerTests/file_level/struct.sol     |   4 +-
 .../function_selector/function_types_sig.sol  |   6 +-
 .../functions/constructor_hierarchy.sol       |   2 +-
 .../functions/constructor_hierarchy_2.sol     |   2 +-
 .../functions/constructor_hierarchy_3.sol     |   4 +-
 .../functions/constructor_hierarchy_4.sol     |   4 +-
 .../constructor_hierarchy_diamond.sol         |   4 +-
 .../constructor_hierarchy_diamond_2.sol       |   4 +-
 .../constructor_hierarchy_diamond_3.sol       |   6 +-
 ...tructor_hierarchy_diamond_empty_middle.sol |   4 +-
 .../constructor_hierarchy_empty_chain.sol     |   4 +-
 .../constructor_hierarchy_empty_middle.sol    |   4 +-
 ...r_hierarchy_empty_middle_no_invocation.sol |   4 +-
 .../constructor_hierarchy_mixed_chain.sol     |   4 +-
 ...uctor_hierarchy_mixed_chain_local_vars.sol |   4 +-
 ...ctor_hierarchy_mixed_chain_with_params.sol |   4 +-
 ...or_hierarchy_mixed_chain_with_params_2.sol |   2 +-
 .../constructor_hierarchy_modifier.sol        |   2 +-
 .../constructor_hierarchy_same_var.sol        |   4 +-
 .../functions/constructor_simple.sol          |   2 +-
 .../functions/constructor_state_value.sol     |   2 +-
 .../constructor_state_value_inherited.sol     |   2 +-
 .../constructor_state_value_parameter.sol     |   4 +-
 .../functions/constructor_this.sol            |   4 +-
 ...unction_call_does_not_clear_local_vars.sol |   2 +-
 .../function_call_state_var_init.sol          |   2 +-
 ...tion_external_call_should_not_inline_1.sol |   2 +-
 ...unction_inside_branch_modify_state_var.sol |   2 +-
 ...ction_inside_branch_modify_state_var_3.sol |   4 +-
 .../functions/functions_bound_1_fail.sol      |   2 +-
 .../functions/functions_external_4.sol        |   2 +-
 .../functions_identifier_nested_tuple_3.sol   |   2 +-
 .../functions/functions_identity_1_fail.sol   |   2 +-
 .../functions/functions_identity_2_fail.sol   |   2 +-
 .../functions_identity_as_tuple_fail.sol      |   2 +-
 .../functions/functions_library_1_fail.sol    |   2 +-
 .../functions_storage_var_1_fail.sol          |   2 +-
 .../functions_storage_var_2_fail.sol          |   2 +-
 .../functions_trivial_condition_for.sol       |   2 +-
 .../functions_trivial_condition_if.sol        |   2 +-
 .../functions_trivial_condition_require.sol   |   2 +-
 .../functions_trivial_condition_while.sol     |   2 +-
 .../functions/getters/address.sol             |   4 +-
 .../functions/getters/array_1.sol             |   2 +-
 .../functions/getters/array_2.sol             |   2 +-
 .../functions/getters/array_of_structs_2.sol  |   2 +-
 .../functions/getters/array_of_structs_3.sol  |   2 +-
 .../functions/getters/double_access.sol       |   2 +-
 .../functions/getters/fixed_bytes.sol         |   4 +-
 .../functions/getters/function.sol            |   4 +-
 .../functions/getters/mapping_1.sol           |   2 +-
 .../functions/getters/mapping_2.sol           |   2 +-
 .../functions/getters/mapping_with_cast.sol   |   2 +-
 .../getters/nested_arrays_mappings_1.sol      |   2 +-
 .../getters/nested_arrays_mappings_10.sol     |   2 +-
 .../getters/nested_arrays_mappings_2.sol      |   2 +-
 .../getters/nested_arrays_mappings_4.sol      |   2 +-
 .../getters/nested_arrays_mappings_5.sol      |   2 +-
 .../getters/nested_arrays_mappings_7.sol      |   2 +-
 .../getters/nested_arrays_mappings_8.sol      |   2 +-
 .../getters/nested_arrays_mappings_9.sol      |   2 +-
 .../functions/getters/static_array.sol        |   2 +-
 .../functions/getters/struct_1.sol            |   2 +-
 .../functions/getters/struct_2.sol            |   2 +-
 .../functions/getters/struct_3.sol            |  18 +-
 .../getters/struct_with_reassignment.sol      |   4 +-
 .../functions/getters/uint.sol                |   2 +-
 .../functions/internal_call_inheritance.sol   |   2 +-
 .../internal_call_state_var_init_2.sol        |   2 +-
 .../internal_call_with_assertion_1_fail.sol   |  12 +-
 ...call_with_assertion_inheritance_1_fail.sol |   6 +-
 ...ternal_multiple_calls_with_assertion_1.sol |   2 +-
 ...l_multiple_calls_with_assertion_1_fail.sol |   8 +-
 .../functions/library_constant.sol            |   4 +-
 .../smtCheckerTests/functions/payable_2.sol   |   2 +-
 .../functions/recursive_multi_return_2.sol    |   4 +-
 .../functions/super_function_assert.sol       |   4 +-
 .../functions/this_external_call_2.sol        |   2 +-
 .../functions/this_external_call_sender.sol   |   4 +-
 .../functions/virtual_function_assert.sol     |   2 +-
 .../smtCheckerTests/imports/ExtCall.sol       |   4 +-
 .../imports/duplicated_errors_1.sol           |   8 +-
 .../imports/import_as_module_1.sol            |   2 +-
 .../imports/import_as_module_2.sol            |   4 +-
 .../smtCheckerTests/imports/import_base.sol   |   2 +-
 .../imports/import_free_functions.sol         |   2 +-
 .../imports/import_library.sol                |   2 +-
 .../imports/import_library_2.sol              |   2 +-
 .../imports/imported_fail_1.sol               |   4 +-
 .../imports/imported_fail_2.sol               |   4 +-
 .../imports/imported_fail_3.sol               |   4 +-
 .../base_contract_assertion_fail_1.sol        |   2 +-
 .../base_contract_assertion_fail_2.sol        |   2 +-
 .../base_contract_assertion_fail_3.sol        |   2 +-
 .../base_contract_assertion_fail_4.sol        |   2 +-
 .../base_contract_assertion_fail_5.sol        |   2 +-
 .../base_contract_assertion_fail_6.sol        |   2 +-
 .../base_contract_assertion_fail_7.sol        |   2 +-
 .../base_contract_assertion_fail_8.sol        |   2 +-
 .../base_contract_assertion_fail_9.sol        |   4 +-
 ...chy_base_calls_inheritance_specifier_1.sol |   4 +-
 ...chy_base_calls_inheritance_specifier_2.sol |   6 +-
 ...erarchy_base_calls_with_side_effects_1.sol |   4 +-
 ...erarchy_base_calls_with_side_effects_2.sol |   2 +-
 ...erarchy_base_calls_with_side_effects_3.sol |   4 +-
 ...erarchy_base_calls_with_side_effects_4.sol |   4 +-
 ...erarchy_base_calls_with_side_effects_5.sol |   4 +-
 ...erarchy_base_calls_with_side_effects_6.sol |   2 +-
 ...erarchy_base_calls_with_side_effects_7.sol |   2 +-
 ...erarchy_base_calls_with_side_effects_8.sol |   4 +-
 ...erarchy_base_calls_with_side_effects_9.sol |   6 +-
 ...ctor_hierarchy_mixed_chain_with_params.sol |   4 +-
 .../constructor_state_variable_init.sol       |   2 +-
 ...onstructor_state_variable_init_asserts.sol |   8 +-
 .../constructor_state_variable_init_base.sol  |   2 +-
 .../constructor_state_variable_init_chain.sol |   2 +-
 ...or_state_variable_init_chain_alternate.sol |   2 +-
 ...ctor_state_variable_init_chain_run_all.sol |   6 +-
 ...or_state_variable_init_chain_run_all_2.sol |   6 +-
 ...tructor_state_variable_init_chain_tree.sol |   4 +-
 ...onstructor_state_variable_init_diamond.sol |   2 +-
 ...tor_state_variable_init_diamond_middle.sol |   4 +-
 .../inheritance/diamond_super_1.sol           |   2 +-
 .../inheritance/diamond_super_2.sol           |   4 +-
 .../inheritance/diamond_super_3.sol           |   2 +-
 .../smtCheckerTests/inheritance/fallback.sol  |   6 +-
 .../inheritance/fallback_receive.sol          |   6 +-
 .../inheritance/functions_1.sol               |   6 +-
 .../inheritance/functions_2.sol               |   6 +-
 .../inheritance/functions_3.sol               |  12 +-
 .../overriden_function_static_call_parent.sol |   4 +-
 .../smtCheckerTests/inheritance/receive.sol   |   6 +-
 .../inheritance/receive_fallback.sol          |   6 +-
 .../inline_assembly/assembly_1.sol            |   6 +-
 .../inline_assembly/assembly_2.sol            |   4 +-
 .../inline_assembly/assembly_3.sol            |   4 +-
 .../inline_assembly/assembly_4.sol            |   2 +-
 .../inline_assembly/assembly_5.sol            |   2 +-
 ...y_local_storage_access_inside_function.sol |   4 +-
 .../assembly_local_storage_pointer.sol        |   4 +-
 .../inline_assembly/assembly_memory_write.sol |   6 +-
 .../smtCheckerTests/inline_assembly/empty.sol |   2 +-
 .../inline_assembly/local_var.sol             |   2 +-
 .../invariants/aon_blog_post.sol              |   4 +-
 .../smtCheckerTests/loops/do_while_1_fail.sol |   2 +-
 .../smtCheckerTests/loops/do_while_break.sol  |   4 +-
 .../loops/do_while_break_2.sol                |   4 +-
 .../loops/do_while_break_2_fail.sol           |   6 +-
 .../loops/do_while_break_fail.sol             |   6 +-
 .../loops/do_while_continue.sol               |   2 +-
 .../loops/for_1_break_fail.sol                |   2 +-
 .../loops/for_1_continue_fail.sol             |   4 +-
 .../smtCheckerTests/loops/for_1_fail.sol      |   6 +-
 .../loops/for_1_false_positive.sol            |   4 +-
 .../loops/for_break_direct.sol                |   2 +-
 .../smtCheckerTests/loops/for_loop_4.sol      |   2 +-
 .../smtCheckerTests/loops/for_loop_5.sol      |   2 +-
 ...or_loop_array_assignment_memory_memory.sol |   2 +-
 .../loops/for_loop_trivial_condition_1.sol    |   2 +-
 .../loops/for_loop_trivial_condition_2.sol    |   2 +-
 .../loops/for_loop_trivial_condition_3.sol    |   2 +-
 .../loops/for_loop_unreachable_1.sol          |   2 +-
 .../loops/while_1_break_fail.sol              |   2 +-
 .../loops/while_1_continue_fail.sol           |   4 +-
 .../smtCheckerTests/loops/while_1_fail.sol    |   2 +-
 .../smtCheckerTests/loops/while_2_break.sol   |   2 +-
 .../loops/while_2_break_fail.sol              |   4 +-
 .../loops/while_break_direct.sol              |   2 +-
 ...le_loop_array_assignment_memory_memory.sol |   4 +-
 ...e_loop_array_assignment_memory_storage.sol |   2 +-
 ..._loop_array_assignment_storage_storage.sol |   8 +-
 .../loops/while_loop_simple_1.sol             |   2 +-
 .../loops/while_loop_simple_3.sol             |   2 +-
 .../loops/while_loop_simple_5.sol             |   2 +-
 .../loops/while_nested_break_fail.sol         |   4 +-
 .../loops/while_nested_continue_fail.sol      |   8 +-
 .../smtCheckerTests/math/addmod_1.sol         |   6 +-
 .../math/addmod_mulmod_zero.sol               |  10 +-
 .../smtCheckerTests/math/mulmod_1.sol         |   6 +-
 .../modifier_code_after_placeholder.sol       |   2 +-
 .../modifiers/modifier_control_flow.sol       |   2 +-
 .../modifier_inside_branch_assignment.sol     |   2 +-
 ...difier_inside_branch_assignment_branch.sol |   2 +-
 ...nside_branch_assignment_multi_branches.sol |   2 +-
 .../modifiers/modifier_multi.sol              |   2 +-
 .../modifiers/modifier_multi_functions.sol    |   2 +-
 .../modifier_multi_functions_recursive.sol    |   2 +-
 .../modifiers/modifier_multi_parameters.sol   |   2 +-
 .../modifiers/modifier_overriding_1.sol       |   2 +-
 .../modifiers/modifier_overriding_2.sol       |   2 +-
 .../modifiers/modifier_overriding_3.sol       |   2 +-
 .../modifiers/modifier_overriding_4.sol       |   6 +-
 .../modifiers/modifier_parameter_copy.sol     |   2 +-
 .../modifier_same_local_variables.sol         |   2 +-
 .../modifiers/modifier_two_invocations_2.sol  |   2 +-
 .../modifiers/modifier_two_placeholders.sol   |   2 +-
 .../modifier_virtual_static_call_2.sol        |   2 +-
 .../natspec/abstract_function_nondet_1.sol    |   2 +-
 .../natspec/safe_assert_false_positive.sol    |   4 +-
 .../safe_assert_false_positive_pure.sol       |   2 +-
 .../natspec/unsafe_assert_remains_unsafe.sol  |   4 +-
 .../assignment_contract_member_variable.sol   |   2 +-
 ...ignment_contract_member_variable_array.sol |   2 +-
 ...nment_contract_member_variable_array_3.sol |   8 +-
 .../operators/bitwise_and_int.sol             |   2 +-
 .../operators/bitwise_and_rational.sol        |   2 +-
 .../operators/bitwise_and_uint.sol            |   6 +-
 .../operators/bitwise_not_fixed_bytes.sol     |   2 +-
 .../operators/bitwise_not_int.sol             |   8 +-
 .../operators/bitwise_not_uint.sol            |   4 +-
 .../operators/bitwise_or_fixed_bytes.sol      |   2 +-
 .../operators/bitwise_or_int.sol              |   4 +-
 .../operators/bitwise_or_uint.sol             |   4 +-
 .../operators/bitwise_rational_2.sol          |   2 +-
 .../operators/bitwise_xor_fixed_bytes.sol     |   2 +-
 .../operators/bitwise_xor_int.sol             |   4 +-
 .../operators/bitwise_xor_uint.sol            |   4 +-
 .../smtCheckerTests/operators/bytes_new.sol   |   4 +-
 .../operators/compound_add.sol                |   2 +-
 .../compound_assignment_division_1.sol        |   2 +-
 .../compound_assignment_division_2.sol        |   2 +-
 .../compound_bitwise_and_fixed_bytes.sol      |   4 +-
 .../operators/compound_bitwise_and_int.sol    |   2 +-
 .../operators/compound_bitwise_and_uint.sol   |   6 +-
 .../compound_bitwise_or_fixed_bytes.sol       |   4 +-
 .../operators/compound_bitwise_or_int.sol     |   2 +-
 .../operators/compound_bitwise_or_uint.sol    |   6 +-
 .../operators/compound_bitwise_or_uint_1.sol  |   8 +-
 .../operators/compound_bitwise_or_uint_3.sol  |   4 +-
 .../compound_bitwise_string_literal.sol       |   2 +-
 .../compound_bitwise_string_literal_2.sol     |   2 +-
 .../compound_bitwise_xor_fixed_bytes.sol      |   4 +-
 .../operators/compound_bitwise_xor_int.sol    |   2 +-
 .../operators/compound_bitwise_xor_uint.sol   |   6 +-
 .../operators/compound_mul.sol                |   2 +-
 .../operators/compound_mul_array_index.sol    |   2 +-
 .../operators/compound_mul_mapping.sol        |   2 +-
 .../operators/compound_shr_1.sol              |   2 +-
 .../operators/compound_sub.sol                |   2 +-
 .../operators/compound_sub_array_index.sol    |   2 +-
 .../operators/compound_sub_mapping.sol        |   2 +-
 .../operators/conditional_assignment_1.sol    |   2 +-
 .../operators/conditional_assignment_2.sol    |   2 +-
 .../operators/conditional_assignment_3.sol    |   2 +-
 .../operators/conditional_assignment_4.sol    |   2 +-
 .../operators/conditional_assignment_5.sol    |   4 +-
 .../conditional_assignment_always_false.sol   |   2 +-
 .../conditional_assignment_always_true.sol    |   4 +-
 .../conditional_assignment_function_1.sol     |   2 +-
 .../conditional_assignment_function_2.sol     |   2 +-
 ...ditional_assignment_nested_always_true.sol |   2 +-
 .../conditional_assignment_nested_unsafe.sol  |   2 +-
 .../conditional_assignment_statevar_1.sol     |   8 +-
 .../smtCheckerTests/operators/const_exp_1.sol |   2 +-
 .../operators/constant_propagation_1.sol      |   2 +-
 .../operators/delete_array.sol                |   2 +-
 .../operators/delete_array_index.sol          |   2 +-
 .../operators/delete_array_index_2d.sol       |   4 +-
 .../operators/delete_function.sol             |   2 +-
 .../smtCheckerTests/operators/div_zero.sol    |   2 +-
 .../smtCheckerTests/operators/division_1.sol  |   2 +-
 .../smtCheckerTests/operators/division_3.sol  |   2 +-
 .../smtCheckerTests/operators/division_5.sol  |   2 +-
 .../smtCheckerTests/operators/division_6.sol  |   4 +-
 .../smtCheckerTests/operators/exp.sol         |   4 +-
 .../operators/fixed_point_add.sol             |   2 +-
 .../function_call_named_arguments.sol         |   2 +-
 .../operators/index_access_for_bytes.sol      |   2 +-
 .../operators/index_access_for_bytesNN.sol    |   2 +-
 .../operators/index_access_side_effect.sol    |   4 +-
 .../smtCheckerTests/operators/integer_new.sol |   4 +-
 .../smtCheckerTests/operators/mod_signed.sol  |   2 +-
 .../operators/shifts/shift_cleanup.sol        |   2 +-
 .../operators/shifts/shift_left.sol           |   4 +-
 .../shifts/shift_left_larger_type.sol         |   2 +-
 .../operators/shifts/shift_left_uint32.sol    |   4 +-
 .../operators/shifts/shift_left_uint8.sol     |   4 +-
 .../operators/shifts/shift_overflow.sol       |  10 +-
 .../operators/shifts/shift_right.sol          |   6 +-
 .../shifts/shift_right_negative_literal.sol   |  12 +-
 .../shifts/shift_right_negative_lvalue.sol    |  12 +-
 .../shift_right_negative_lvalue_int16.sol     |  12 +-
 .../shift_right_negative_lvalue_int32.sol     |  12 +-
 .../shift_right_negative_lvalue_int8.sol      |  12 +-
 .../operators/shifts/shift_right_uint32.sol   |   8 +-
 .../operators/shifts/shift_right_uint8.sol    |   4 +-
 .../shift_underflow_negative_rvalue.sol       |   4 +-
 .../operators/slice_default_end.sol           |   4 +-
 .../operators/slice_default_start.sol         |   8 +-
 .../smtCheckerTests/operators/unary_add.sol   |   2 +-
 .../operators/unary_add_array.sol             |   2 +-
 .../operators/unary_add_array_push_1.sol      |   2 +-
 .../operators/unary_add_mapping.sol           |   2 +-
 .../unary_add_minus_overflow_detected.sol     |   6 +-
 .../unary_add_overflows_correctly.sol         |   2 +-
 .../unary_add_overflows_correctly_struct.sol  |   2 +-
 .../operators/unary_operators_tuple_3.sol     |   2 +-
 .../smtCheckerTests/operators/unary_sub.sol   |   2 +-
 .../operators/unary_sub_array.sol             |   2 +-
 .../operators/unary_sub_mapping.sol           |   2 +-
 .../smtCheckerTests/options/pragma.sol        |   4 +-
 .../out_of_bounds/array_2d_2.sol              |   2 +-
 .../out_of_bounds/array_2d_4.sol              |  24 +-
 .../smtCheckerTests/out_of_bounds/array_3.sol |   2 +-
 .../out_of_bounds/fixed_bytes_2.sol           |   2 +-
 .../out_of_bounds/fixed_bytes_4.sol           |   2 +-
 .../overflow/overflow_constant_bound.sol      |   4 +-
 .../smtCheckerTests/overflow/overflow_mul.sol |   2 +-
 .../overflow/overflow_mul_cex_with_array.sol  |   4 +-
 .../overflow/overflow_mul_signed.sol          |   2 +-
 .../smtCheckerTests/overflow/overflow_sum.sol |   2 +-
 .../overflow/signed_div_overflow.sol          |   4 +-
 .../overflow/signed_guard_sum_overflow.sol    |   4 +-
 .../overflow/signed_mod_overflow.sol          |   2 +-
 .../overflow/signed_mul_overflow.sol          |   4 +-
 .../overflow/signed_sub_overflow.sol          |   4 +-
 .../overflow/signed_sum_overflow.sol          |   4 +-
 .../overflow/simple_overflow.sol              |   2 +-
 .../overflow/unsigned_div_overflow.sol        |   2 +-
 .../overflow/unsigned_guard_sum_overflow.sol  |   2 +-
 .../overflow/unsigned_mod_overflow.sol        |   2 +-
 .../overflow/unsigned_mul_overflow.sol        |   2 +-
 .../overflow/unsigned_sub_overflow.sol        |   2 +-
 .../overflow/unsigned_sum_overflow.sol        |   2 +-
 .../abi_decode_memory_v2_value_types.sol      |   4 +-
 .../special/abi_decode_simple.sol             |  10 +-
 .../special/block_vars_bmc_internal.sol       |   8 +-
 .../special/block_vars_chc_internal.sol       |   2 +-
 .../smtCheckerTests/special/blockhash.sol     |   4 +-
 .../smtCheckerTests/special/ether_units.sol   |   2 +-
 .../smtCheckerTests/special/event.sol         |   6 +-
 .../smtCheckerTests/special/gasleft.sol       |   4 +-
 .../smtCheckerTests/special/many.sol          |  10 +-
 .../smtCheckerTests/special/many_internal.sol |  10 +-
 .../smtCheckerTests/special/msg_data.sol      |   4 +-
 .../special/msg_sender_fail_1.sol             |   2 +-
 .../smtCheckerTests/special/msg_sig.sol       |   6 +-
 .../smtCheckerTests/special/msg_value_1.sol   |   4 +-
 .../smtCheckerTests/special/msg_value_2.sol   |   2 +-
 .../smtCheckerTests/special/msg_value_4.sol   |   2 +-
 .../special/msg_value_inheritance_1.sol       |   2 +-
 .../special/msg_value_inheritance_2.sol       |   4 +-
 .../special/msg_value_inheritance_3.sol       |   2 +-
 .../special/msg_vars_bmc_internal.sol         |   6 +-
 .../special/msg_vars_chc_internal.sol         |   2 +-
 .../smtCheckerTests/special/shadowing_1.sol   |   8 +-
 .../smtCheckerTests/special/this.sol          |   2 +-
 .../smtCheckerTests/special/time_units.sol    |  10 +-
 .../smtCheckerTests/special/timestamp_2.sol   |   2 +-
 .../special/tx_data_gasleft_changes.sol       |   4 +-
 .../special/tx_data_immutable_fail.sol        |  40 +-
 .../special/tx_vars_bmc_internal.sol          |   4 +-
 .../smtCheckerTests/try_catch/try_1.sol       |   4 +-
 .../smtCheckerTests/try_catch/try_2.sol       |   2 +-
 .../smtCheckerTests/try_catch/try_3.sol       |   4 +-
 .../smtCheckerTests/try_catch/try_4.sol       |   2 +-
 .../smtCheckerTests/try_catch/try_5.sol       |   2 +-
 .../try_catch/try_call_in_catch_1.sol         |   2 +-
 .../try_catch/try_call_in_catch_2.sol         |   6 +-
 .../try_catch/try_inside_if.sol               |   2 +-
 .../try_catch/try_inside_while.sol            |   4 +-
 .../try_catch/try_multiple_catch_clauses.sol  |   2 +-
 .../try_multiple_catch_clauses_2.sol          |   2 +-
 .../try_multiple_returned_values.sol          |   8 +-
 ...ry_multiple_returned_values_with_tuple.sol |   2 +-
 .../try_catch/try_nested_1.sol                |   2 +-
 .../try_catch/try_nested_2.sol                |   2 +-
 .../try_catch/try_nested_3.sol                |   2 +-
 .../smtCheckerTests/try_catch/try_new.sol     |   4 +-
 .../try_catch/try_public_var.sol              |   2 +-
 .../typecast/address_literal.sol              |   2 +-
 .../typecast/bytes_to_fixed_bytes_1.sol       |   2 +-
 .../typecast/cast_larger_2_fail.sol           |   2 +-
 .../typecast/cast_larger_3.sol                |   2 +-
 ...unction_type_to_function_type_external.sol |   2 +-
 ...unction_type_to_function_type_internal.sol |  16 +-
 .../implicit_cast_string_literal_byte.sol     |   2 +-
 ...g_literal_to_fixed_bytes_function_call.sol |   4 +-
 ...string_literal_to_fixed_bytes_modifier.sol |   2 +-
 .../string_literal_to_fixed_bytes_return.sol  |   2 +-
 ...ng_literal_to_fixed_bytes_return_multi.sol |   2 +-
 .../typecast/string_to_bytes_push_1.sol       |   2 +-
 .../typecast/string_to_bytes_push_2.sol       |   2 +-
 .../smtCheckerTests/types/abi_type_type_1.sol |   2 +-
 .../smtCheckerTests/types/abi_type_type_2.sol |   2 +-
 .../smtCheckerTests/types/address_balance.sol |   6 +-
 .../types/address_delegatecall.sol            |  12 +-
 .../types/address_staticcall.sol              |   4 +-
 .../types/address_transfer.sol                |   4 +-
 .../types/address_transfer_2.sol              |   6 +-
 .../types/address_transfer_insufficient.sol   |   6 +-
 .../types/array_aliasing_memory_1.sol         |  26 +-
 .../types/array_aliasing_memory_2.sol         |   8 +-
 .../types/array_aliasing_storage_2.sol        |   8 +-
 .../types/array_aliasing_storage_3.sol        |  18 +-
 .../types/array_aliasing_storage_5.sol        |   2 +-
 .../smtCheckerTests/types/array_branch_1d.sol |   2 +-
 .../smtCheckerTests/types/array_branch_3d.sol |  14 +-
 .../types/array_branches_3d.sol               |  12 +-
 .../types/array_branches_3d_show_unproved.sol |  12 +-
 .../types/array_dynamic_1_fail.sol            |   2 +-
 .../smtCheckerTests/types/array_dynamic_2.sol |   4 +-
 .../types/array_dynamic_2_fail.sol            |   2 +-
 .../types/array_dynamic_3_fail.sol            |   2 +-
 .../types/array_dynamic_parameter_1_fail.sol  |   2 +-
 .../smtCheckerTests/types/array_literal_2.sol |   2 +-
 .../smtCheckerTests/types/array_literal_3.sol |   2 +-
 .../smtCheckerTests/types/array_literal_5.sol |   2 +-
 .../smtCheckerTests/types/array_literal_6.sol |   4 +-
 .../smtCheckerTests/types/array_literal_7.sol |   4 +-
 .../types/array_mapping_aliasing_1.sol        |   4 +-
 .../types/array_mapping_aliasing_2.sol        |  16 +-
 .../types/array_static_1_fail.sol             |   2 +-
 .../types/array_static_2_fail.sol             |   2 +-
 .../types/array_static_3_fail.sol             |   2 +-
 .../types/array_static_aliasing_memory_5.sol  |   2 +-
 .../types/array_static_mapping_aliasing_1.sol |   2 +-
 .../types/array_static_mapping_aliasing_2.sol |   6 +-
 .../types/array_struct_array_branches_2d.sol  |   4 +-
 .../smtCheckerTests/types/bool_simple_1.sol   |   2 +-
 .../smtCheckerTests/types/bool_simple_2.sol   |   2 +-
 .../smtCheckerTests/types/bytes_1.sol         |   2 +-
 .../smtCheckerTests/types/bytes_2.sol         |   2 +-
 .../smtCheckerTests/types/bytes_2_fail.sol    |   2 +-
 .../smtCheckerTests/types/contract.sol        |   2 +-
 .../smtCheckerTests/types/contract_2.sol      |   2 +-
 .../types/contract_address_conversion.sol     |   2 +-
 .../types/enum_explicit_values_2.sol          |   2 +-
 .../types/enum_in_library_2.sol               |   2 +-
 .../smtCheckerTests/types/enum_storage_eq.sol |   2 +-
 .../smtCheckerTests/types/fixed_bytes_1.sol   |   4 +-
 .../smtCheckerTests/types/fixed_bytes_2.sol   |   2 +-
 .../types/fixed_bytes_access_2.sol            |   2 +-
 .../types/fixed_bytes_access_4.sol            |   2 +-
 .../types/fixed_bytes_access_5.sol            |   6 +-
 .../types/fixed_bytes_access_7.sol            |   4 +-
 .../types/function_in_tuple_1.sol             |   2 +-
 .../types/function_in_tuple_2.sol             |   2 +-
 .../types/function_type_call.sol              |   2 +-
 .../types/function_type_external_address.sol  |   2 +-
 .../types/function_type_members.sol           |   2 +-
 .../types/function_type_nested.sol            |  10 +-
 .../types/function_type_nested_return.sol     |  12 +-
 .../smtCheckerTests/types/mapping_1_fail.sol  |   2 +-
 .../smtCheckerTests/types/mapping_2.sol       |   2 +-
 .../types/mapping_2d_1_fail.sol               |   2 +-
 .../types/mapping_3d_1_fail.sol               |   2 +-
 .../smtCheckerTests/types/mapping_5.sol       |   2 +-
 .../types/mapping_aliasing_1.sol              |   2 +-
 .../types/mapping_aliasing_2.sol              |   4 +-
 .../types/mapping_as_parameter_1.sol          |   2 +-
 .../types/mapping_equal_keys_2.sol            |   2 +-
 .../types/mapping_struct_assignment.sol       |   2 +-
 .../types/no_effect_statements.sol            |  16 +-
 .../types/rational_large_1.sol                |   4 +-
 .../types/static_array_length_1.sol           |   4 +-
 .../types/static_array_length_2.sol           |   4 +-
 .../types/static_array_length_3.sol           |   4 +-
 .../types/static_array_length_4.sol           |   8 +-
 .../types/static_array_length_5.sol           |   4 +-
 .../types/storage_value_vars_2.sol            |   2 +-
 .../types/storage_value_vars_4.sol            |   2 +-
 .../smtCheckerTests/types/string_2.sol        |   2 +-
 .../types/string_literal_assignment_1.sol     |   2 +-
 .../types/string_literal_assignment_2.sol     |   2 +-
 .../types/string_literal_assignment_3.sol     |   2 +-
 .../types/string_literal_assignment_4.sol     |   2 +-
 .../types/string_literal_assignment_5.sol     |   2 +-
 .../types/string_literal_comparison_1.sol     |   2 +-
 .../types/string_literal_comparison_2.sol     |   4 +-
 ...rray_struct_array_struct_memory_unsafe.sol |   2 +-
 .../types/struct/struct_aliasing_memory.sol   |   4 +-
 .../struct_aliasing_parameter_memory_1.sol    |   2 +-
 .../struct_aliasing_parameter_memory_2.sol    |   2 +-
 .../struct_aliasing_parameter_memory_3.sol    |   2 +-
 .../struct_aliasing_parameter_storage_1.sol   |   2 +-
 .../struct_aliasing_parameter_storage_3.sol   |   2 +-
 .../struct_aliasing_parameter_storage_4.sol   |   2 +-
 ...uct_array_struct_array_memory_unsafe_1.sol |  10 +-
 ...ct_array_struct_array_storage_unsafe_1.sol |  10 +-
 ..._constructor_fixed_bytes_from_string_1.sol |   4 +-
 .../struct/struct_constructor_named_args.sol  |   2 +-
 .../struct/struct_constructor_recursive_1.sol |   2 +-
 .../struct/struct_constructor_recursive_2.sol |   8 +-
 .../types/struct/struct_delete_memory.sol     |   2 +-
 .../types/struct/struct_delete_storage.sol    |   2 +-
 .../struct/struct_nested_constructor.sol      |   2 +-
 .../types/struct/struct_recursive_1.sol       |  22 +-
 .../types/struct/struct_recursive_2.sol       |  96 ++--
 .../types/struct/struct_recursive_3.sol       | 208 +++----
 .../types/struct/struct_recursive_4.sol       |  68 +--
 .../types/struct/struct_recursive_5.sol       |  20 +-
 .../types/struct/struct_recursive_6.sol       |  76 +--
 .../struct/struct_recursive_indirect_1.sol    |  22 +-
 .../struct/struct_recursive_indirect_2.sol    |  80 +--
 .../types/struct/struct_return.sol            |   2 +-
 .../types/struct/struct_state_var.sol         |   2 +-
 .../struct/struct_state_var_array_pop_1.sol   |   4 +-
 .../struct/struct_state_var_array_pop_2.sol   |   4 +-
 .../types/struct/struct_unary_add.sol         |   2 +-
 .../types/struct/struct_unary_sub.sol         |   2 +-
 .../types/struct_array_branches_2d.sol        |   4 +-
 .../types/struct_array_branches_3d.sol        |   2 +-
 .../smtCheckerTests/types/tuple_1_chain_1.sol |   2 +-
 .../smtCheckerTests/types/tuple_1_chain_2.sol |   2 +-
 .../smtCheckerTests/types/tuple_1_chain_n.sol |   2 +-
 .../types/tuple_array_pop_1.sol               |   2 +-
 .../types/tuple_array_pop_2.sol               |   2 +-
 .../types/tuple_assignment_array_empty.sol    |   2 +-
 .../types/tuple_assignment_compound.sol       |   2 +-
 .../types/tuple_assignment_empty.sol          |   2 +-
 .../tuple_declarations_function_empty.sol     |   2 +-
 .../tuple_different_count_assignment_1.sol    |   4 +-
 .../tuple_different_count_assignment_2.sol    |   4 +-
 .../types/tuple_extra_parens_1.sol            |   2 +-
 .../types/tuple_extra_parens_2.sol            |   2 +-
 .../types/tuple_extra_parens_3.sol            |   2 +-
 .../types/tuple_extra_parens_4.sol            |   2 +-
 .../types/tuple_extra_parens_5.sol            |   2 +-
 .../smtCheckerTests/types/tuple_function.sol  |   4 +-
 .../types/tuple_function_2.sol                |   2 +-
 .../types/tuple_function_3.sol                |   4 +-
 .../types/tuple_single_element_1.sol          |   2 +-
 .../types/tuple_single_element_2.sol          |   2 +-
 .../types/tuple_single_non_tuple_element.sol  |   2 +-
 .../types/type_expression_array_2d.sol        |   6 +-
 .../types/type_expression_array_3d.sol        |   8 +-
 .../types/type_expression_tuple_array_2d.sol  |   6 +-
 .../types/type_expression_tuple_array_3d.sol  |   8 +-
 .../types/type_meta_unsupported.sol           |   6 +-
 .../smtCheckerTests/types/type_minmax.sol     |   2 +-
 .../unchecked/check_var_init.sol              |   4 +-
 .../unchecked/checked_called_by_unchecked.sol |   2 +-
 .../checked_modifier_called_by_unchecked.sol  |   2 +-
 .../unchecked/flipping_sign_tests.sol         |   2 +-
 .../smtCheckerTests/unchecked/signed_mod.sol  |   4 +-
 .../unchecked/unchecked_called_by_checked.sol |   2 +-
 .../unchecked/unchecked_div_by_zero.sol       |   4 +-
 ...ked_function_call_with_unchecked_block.sol |   2 +-
 .../smtCheckerTests/userTypes/constant.sol    |   2 +-
 .../userTypes/in_parenthesis.sol              |   4 +-
 .../userTypes/in_parenthesis_2.sol            |   8 +-
 .../smtCheckerTests/userTypes/mapping_1.sol   |   2 +-
 .../smtCheckerTests/userTypes/modifier_1.sol  |   2 +-
 .../smtCheckerTests/userTypes/simple.sol      |   4 +-
 .../smtCheckerTests/userTypes/user_abi_1.sol  |   2 +-
 .../wrap_unwrap_via_contract_name.sol         |   2 +-
 .../constant_condition_1.sol                  |   2 +-
 .../constant_condition_2.sol                  |   2 +-
 .../verification_target/simple_assert.sol     |   2 +-
 .../abi_encode_conversions_address.sol        |   2 +-
 ...i_encode_conversions_function_pointers.sol |   4 +-
 .../abiEncoder/conflicting_settings.sol       |   2 +-
 .../conflicting_settings_reverse.sol          |   2 +-
 ...ernal_types_nested_struct_with_mapping.sol |   2 +-
 ..._types_struct_array_with_function_type.sol |   2 +-
 ...es_struct_with_array_of_function_types.sol |   2 +-
 ...ternal_types_struct_with_function_type.sol |   2 +-
 ...ing_internal_types_struct_with_mapping.sol |   2 +-
 .../abiEncoder/invalid_pragma_value.sol       |   2 +-
 .../abiEncoder/same_setting_twice.sol         |   2 +-
 .../syntaxTests/abiEncoder/selected_twice.sol |   2 +-
 ...all_to_v2_constructor_accepting_struct.sol |   2 +-
 ...on_accepting_struct_via_named_argument.sol |   2 +-
 ...ract_function_pointer_accepting_struct.sol |   2 +-
 ...unction_returning_dynamic_string_array.sol |   2 +-
 ..._v2_contract_function_returning_struct.sol |   2 +-
 ...on_returning_struct_with_dynamic_array.sol |   2 +-
 .../v1_call_to_v2_event_accepting_struct.sol  |   2 +-
 ...ibrary_bound_function_returning_struct.sol |   2 +-
 ...o_v2_library_function_returning_struct.sol |   2 +-
 ..._defining_v2_function_accepting_struct.sol |   2 +-
 ..._defining_v2_function_returning_struct.sol |   2 +-
 ..._dynamic_array_with_returndata_support.sol |   4 +-
 .../abiEncoder/v2_v1_v1_modifier_sandwich.sol |   2 +-
 .../abiEncoder/v2_v1_v2_modifier_sandwich.sol |   2 +-
 ...abstract_contract_because_of_interface.sol |   2 +-
 .../abstract_contract_instantiation.sol       |   2 +-
 .../abstract/abstract_without_contract.sol    |   2 +-
 .../syntaxTests/abstract/interface.sol        |   2 +-
 .../syntaxTests/abstract/library.sol          |   2 +-
 .../unimplemented_functions_inherited.sol     |   2 +-
 .../syntaxTests/array/array_pop_arg.sol       |   2 +-
 .../syntaxTests/array/calldata_assign.sol     |   2 +-
 .../array/calldata_multi_dynamic_V1.sol       |   4 +-
 .../syntaxTests/array/calldata_resize.sol     |   2 +-
 .../concat/bytes_concat_empty_invalid.sol     |   2 +-
 .../concat/bytes_concat_on_type_info.sol      |   2 +-
 .../array/concat/bytes_concat_on_variable.sol |   2 +-
 ...es_concat_wrong_type_bytes_and_strings.sol |   6 +-
 ..._concat_wrong_type_empty_array_literal.sol |   2 +-
 .../concat/bytes_concat_wrong_type_misc.sol   |  26 +-
 ...ong_type_misc_literals_and_expressions.sol |  32 +-
 .../bytes_concat_wrong_type_zero_literal.sol  |  22 +-
 .../array/contract_index_access.sol           |   2 +-
 .../copy_storage_arrays_of_function_type.sol  |   2 +-
 .../array/dynamic_memory_array_pop.sol        |   2 +-
 .../syntaxTests/array/function_mapping.sol    |   2 +-
 .../array/invalid/bytes_to_fixed_bytes.sol    |   8 +-
 .../array/invalid/library_array.sol           |   2 +-
 .../array/invalid/library_index_access.sol    |   2 +-
 .../calldata_to_memory_different_base.sol     |   2 +-
 .../storage_to_memory_different_base.sol      |   2 +-
 .../storage_to_storage_different_base.sol     |   2 +-
 .../storage_to_storage_different_base_2.sol   |   2 +-
 .../storage_to_storage_different_sign.sol     |   4 +-
 .../storage_to_storage_dynamic_to_static.sol  |   2 +-
 ...ge_to_storage_static_longer_to_shorter.sol |   2 +-
 .../length/abi_decode_length_too_large.sol    |   2 +-
 ..._cannot_be_constant_function_parameter.sol |   6 +-
 .../array/length/bytes32_too_large.sol        |   2 +-
 .../length/bytes32_too_large_multidim.sol     |   2 +-
 .../array/length/cannot_be_assigned.sol       |   2 +-
 .../length/cannot_be_assigned_mapping.sol     |   2 +-
 .../length/cannot_be_assigned_struct.sol      |   2 +-
 .../array/length/cannot_be_function.sol       |   2 +-
 .../array/length/cannot_be_function_call.sol  |   2 +-
 .../array/length/complex_cyclic_constant.sol  |   2 +-
 .../length/const_cannot_be_fractional.sol     |   2 +-
 .../array/length/cyclic_constant.sol          |   2 +-
 .../fixed_size_multidim_zero_length.sol       |  12 +-
 .../array/length/fixed_size_zero_length.sol   |  12 +-
 .../syntaxTests/array/length/inline_array.sol |   2 +-
 .../array/length/invalid_expression_1.sol     |   2 +-
 .../array/length/invalid_expression_2.sol     |   2 +-
 .../array/length/invalid_expression_3.sol     |   2 +-
 .../array/length/invalid_expression_4.sol     |   2 +-
 .../array/length/invalid_expression_5.sol     |   2 +-
 .../array/length/local_memory_too_large.sol   |   6 +-
 .../array/length/non_integer_constant_var.sol |   2 +-
 .../length/not_convertible_to_integer.sol     |   2 +-
 .../length/parameter_too_large_multidim.sol   |   6 +-
 .../parameter_too_large_multidim_ABIv2.sol    |   2 +-
 .../array/length/pure_functions.sol           |   2 +-
 .../syntaxTests/array/length/too_large.sol    |   2 +-
 .../syntaxTests/array/length/tuples.sol       |   2 +-
 .../array/length/uint_too_large_multidim.sol  |   2 +-
 .../syntaxTests/array/library_array.sol       |   2 +-
 .../syntaxTests/array/new_no_parentheses.sol  |   2 +-
 .../syntaxTests/array/no_array_pop.sol        |   2 +-
 .../syntaxTests/array/pop/calldata_pop.sol    |   2 +-
 .../syntaxTests/array/pop/memory_pop.sol      |   2 +-
 .../syntaxTests/array/push/calldata_push.sol  |   2 +-
 .../syntaxTests/array/push/memory_push.sol    |   2 +-
 .../array/push/storage_with_mapping_push.sol  |   2 +-
 .../syntaxTests/array/slice/bytes_memory.sol  |   2 +-
 .../syntaxTests/array/slice/bytes_storage.sol |   2 +-
 .../array/slice/calldata_static.sol           |   2 +-
 .../syntaxTests/array/slice/member_access.sol |   2 +-
 .../array/slice/memory_dynamic.sol            |   2 +-
 .../syntaxTests/array/slice/memory_static.sol |   2 +-
 .../syntaxTests/array/slice/slice_literal.sol |   2 +-
 .../array/slice/slice_memory_bytes.sol        |   2 +-
 .../array/slice/slice_memory_string.sol       |   2 +-
 .../syntaxTests/array/slice/slice_string.sol  |   2 +-
 .../array/slice/storage_dynamic.sol           |   2 +-
 .../array/slice/storage_static.sol            |   2 +-
 .../array/static_storage_array_pop.sol        |   2 +-
 .../syntaxTests/array/string_pop.sol          |   2 +-
 .../array/uninitialized_storage_var.sol       |   4 +-
 .../syntaxTests/bound/bound_calldata.sol      |   2 +-
 .../syntaxTests/bound/bound_to_struct.sol     |   2 +-
 .../syntaxTests/bound/interface_using_for.sol |   2 +-
 .../syntaxTests/bound/using_for_library.sol   |   6 +-
 .../circular_reference_complex1.sol           |   4 +-
 .../circular_reference_free_function.sol      |   2 +-
 .../circular_reference_mention_only.sol       |   4 +-
 .../circular_reference_new_in_ctor.sol        |   2 +-
 ...rcular_reference_report_first_in_cycle.sol |  12 +-
 .../circular_reference_type_mention_only.sol  |   4 +-
 .../bytecodeReferences/library_called.sol     |   2 +-
 .../library_function_circular_reference.sol   |   4 +-
 .../bytecodeReferences/library_non_called.sol |   2 +-
 .../library_public_without_contract.sol       |   2 +-
 ...multiline_unicode_direction_override_1.sol |   2 +-
 ...multiline_unicode_direction_override_2.sol |   2 +-
 ...multiline_unicode_direction_override_3.sol |   2 +-
 ...multiline_unicode_direction_override_4.sol |   2 +-
 ...multiline_unicode_direction_override_6.sol |   2 +-
 ...ingleline_unicode_direction_override_1.sol |   2 +-
 ...ingleline_unicode_direction_override_2.sol |   2 +-
 ...ingleline_unicode_direction_override_3.sol |   2 +-
 ...ingleline_unicode_direction_override_4.sol |   2 +-
 ...ingleline_unicode_direction_override_6.sol |   2 +-
 .../unicode_direction_in_source_1.sol         |   2 +-
 .../unicode_direction_in_source_2.sol         |   2 +-
 .../comments/unicode_direction_override_1.sol |   2 +-
 .../constantEvaluator/overflow.sol            |   2 +-
 .../constantEvaluator/type_reference.sol      |   4 +-
 .../type_reference_in_contract.sol            |   4 +-
 .../constantEvaluator/underflow.sol           |   2 +-
 .../constantEvaluator/underflow_unary.sol     |   2 +-
 .../constants/addmod_mulmod_rational.sol      |   4 +-
 .../syntaxTests/constants/addmod_zero.sol     |   6 +-
 .../assign_constant_function_value.sol        |   2 +-
 .../constants/constant_natspec_user.sol       |   2 +-
 .../constants/constant_override.sol           |   2 +-
 .../constants/constant_unassigned.sol         |   2 +-
 .../constants/constant_virtual.sol            |   2 +-
 .../constants/constant_with_visibility.sol    |   2 +-
 .../constant_with_visibility_inverted.sol     |   2 +-
 .../constants/cross_file_cyclic.sol           |   8 +-
 .../constants/cross_file_cyclic_modules.sol   |   8 +-
 .../constants/cyclic_dependency_1.sol         |   2 +-
 .../constants/cyclic_dependency_2.sol         |   4 +-
 .../constants/cyclic_dependency_3.sol         |   8 +-
 .../constants/cyclic_dependency_5.sol         |   2 +-
 .../constants/division_by_zero.sol            |   4 +-
 .../constants/file_level_memory.sol           |   2 +-
 .../constants/file_level_memory_inverted.sol  |   2 +-
 .../constants/immutable_at_file_level.sol     |   4 +-
 .../syntaxTests/constants/mod_zero.sol        |   4 +-
 .../syntaxTests/constants/mulmod_zero.sol     |   6 +-
 .../constants/name_clash_via_import.sol       |   2 +-
 .../syntaxTests/constants/non_constant.sol    |   2 +-
 .../constants/pure_non_rational.sol           |   2 +-
 .../constants/redefinition_cross_file.sol     |   2 +-
 .../redefinition_public_constant.sol          |   2 +-
 .../syntaxTests/constants/struct_constant.sol |   2 +-
 .../abstract_creation_forward_reference.sol   |   2 +-
 .../constructor/calldata_constructor_args.sol |   2 +-
 .../constructible_internal_constructor.sol    |   2 +-
 ...nction_parameter_disallowed_conversion.sol |  14 +-
 .../constructor_internal_function.sol         |   2 +-
 .../constructor_mapping_memory.sol            |   2 +-
 .../constructor_mapping_memory_abstract.sol   |   2 +-
 .../constructor/constructor_old.sol           |   4 +-
 .../constructor/constructor_override.sol      |   2 +-
 .../constructor_state_mutability.sol          |   4 +-
 .../constructor/constructor_storage.sol       |   2 +-
 .../constructor/constructor_virtual.sol       |   2 +-
 .../constructor/constructor_visibility.sol    |   2 +-
 .../constructor_without_implementation.sol    |   2 +-
 .../constructor/external_constructor.sol      |   2 +-
 .../function_named_constructor.sol            |   2 +-
 .../inconstructible_abstract_contract.sol     |   2 +-
 ...nstructible_abstract_contract_inverted.sol |   2 +-
 .../inconstructible_internal_constructor.sol  |   2 +-
 ...ructible_internal_constructor_inverted.sol |   2 +-
 .../constructor/interface_constructor.sol     |   4 +-
 .../internal_constructor_non_abstract.sol     |   2 +-
 .../constructor/library_constructor.sol       |   4 +-
 .../constructor/msg_value_non_payable.sol     |   2 +-
 .../syntaxTests/constructor/nonabiv2_type.sol |   2 +-
 .../constructor/nonpayable_new.sol            |   8 +-
 .../constructor/not_a_contract.sol            |   2 +-
 .../constructor/overriding_constructor.sol    |   2 +-
 .../public_constructor_abstract.sol           |   2 +-
 .../public_constructor_non_abstract.sol       |   2 +-
 .../constructor/returns_in_constructor.sol    |   2 +-
 .../constructor/two_constructors.sol          |   2 +-
 .../syntaxTests/constructor_this.sol          |   4 +-
 .../calldata_return_dynamic_array.sol         |   2 +-
 .../calldata_return_static_array.sol          |   2 +-
 .../calldataReturn/calldata_return_struct.sol |   2 +-
 .../controlFlow/free_function_crash.sol       |   6 +-
 .../controlFlow/leave_outside_function.sol    |   2 +-
 .../if_declaration_err.sol                    |   2 +-
 .../assembly/for_declaration_err.sol          |   8 +-
 .../assembly/if_declaration_err.sol           |   2 +-
 .../reverting_function_declaration.sol        |   2 +-
 .../assembly/switch_declaration_err.sol       |   4 +-
 .../dowhile_declaration_err.sol               |  18 +-
 .../dowhile_declaration_fine.sol              |   2 +-
 .../for_declaration_err.sol                   |   4 +-
 .../if_declaration_err.sol                    |   4 +-
 .../short_circuit_declaration_err.sol         |   6 +-
 .../ternary_assignment_err.sol                |   2 +-
 .../ternary_declaration_err.sol               |   4 +-
 .../try_declaration_err.sol                   |   8 +-
 .../while_declaration_err.sol                 |   2 +-
 .../controlFlow/mappingReturn/named_err.sol   |   2 +-
 .../controlFlow/mappingReturn/unnamed_err.sol |   2 +-
 .../implemented_without_placeholder.sol       |   2 +-
 .../modifier_different_functions.sol          |   2 +-
 .../modifiers/modifier_override.sol           |   4 +-
 .../storageReturn/assembly/for_err.sol        |   8 +-
 .../storageReturn/assembly/if_err.sol         |   2 +-
 .../assembly/reverting_function.sol           |   2 +-
 .../storageReturn/assembly/switch_err.sol     |   4 +-
 .../storageReturn/assembly_err.sol            |   2 +-
 .../storageReturn/default_location.sol        |   2 +-
 .../controlFlow/storageReturn/dowhile_err.sol |  18 +-
 .../storageReturn/dowhile_fine.sol            |   2 +-
 .../controlFlow/storageReturn/for_err.sol     |   4 +-
 .../controlFlow/storageReturn/if_err.sol      |   4 +-
 .../storageReturn/modifier_err.sol            |   4 +-
 .../storageReturn/short_circuit_err.sol       |   6 +-
 .../controlFlow/storageReturn/ternary_err.sol |   4 +-
 .../controlFlow/storageReturn/try_err.sol     |   8 +-
 .../controlFlow/storageReturn/while_err.sol   |   2 +-
 .../uninitializedAccess/always_revert.sol     |   2 +-
 .../uninitializedAccess/assembly.sol          |   2 +-
 .../uninitializedAccess/bug10821-for.sol      |   2 +-
 .../uninitializedAccess/bug10821-if.sol       |   2 +-
 .../uninitializedAccess/bug10821-modifier.sol |   2 +-
 .../uninitializedAccess/bug10821-require.sol  |   2 +-
 .../uninitializedAccess/bug10821-while.sol    |   2 +-
 .../modifier_order_fail.sol                   |   2 +-
 .../modifier_post_access.sol                  |   2 +-
 .../modifier_pre_access.sol                   |   2 +-
 .../reverting_call_library.sol                |   2 +-
 .../reverting_call_virtual.sol                |   4 +-
 .../reverting_call_virtual2.sol               |   2 +-
 .../reverting_call_virtual3.sol               |   4 +-
 .../reverting_call_virtual4.sol               |   6 +-
 .../controlFlow/uninitializedAccess/smoke.sol |   2 +-
 .../uninitializedAccess/struct.sol            |   2 +-
 .../uninitializedAccess/unreachable.sol       |   2 +-
 .../assembly/double_revert.sol                |   4 +-
 .../unreachableCode/assembly/for_break.sol    |   4 +-
 .../unreachableCode/assembly/for_continue.sol |   2 +-
 .../unreachableCode/assembly/return.sol       |   4 +-
 .../unreachableCode/assembly/revert.sol       |   4 +-
 .../unreachableCode/do_while_continue.sol     |   2 +-
 .../unreachableCode/double_return.sol         |   2 +-
 .../unreachableCode/double_revert.sol         |   2 +-
 .../controlFlow/unreachableCode/for_break.sol |   4 +-
 .../unreachableCode/if_both_return.sol        |   2 +-
 .../controlFlow/unreachableCode/revert.sol    |   2 +-
 .../unreachableCode/while_break.sol           |   2 +-
 .../unreachableCode/while_continue.sol        |   2 +-
 .../conversion/convert_to_super_empty.sol     |   2 +-
 .../conversion/convert_to_super_nonempty.sol  |   2 +-
 ...explicit_conversion_address_to_payable.sol |   2 +-
 ...icit_conversion_from_storage_array_ref.sol |   4 +-
 .../explicit_conversion_sender_to_payable.sol |   4 +-
 .../explicit_conversion_this_to_payable.sol   |   2 +-
 .../function_type_array_to_memory.sol         |  12 +-
 ..._of_string_literals_to_calldata_string.sol |   2 +-
 ...from_string_literal_to_calldata_string.sol |   6 +-
 ..._calldata_string_in_function_parameter.sol |   6 +-
 ...icit_conversion_of_super_in_comparison.sol |  12 +-
 ...licit_conversion_of_super_in_operators.sol |  48 +-
 .../not_allowed_conversion_from_super.sol     |   2 +-
 .../data_location_in_function_type_fail.sol   |   2 +-
 ...ion_return_parameters_no_data_location.sol |   2 +-
 ...cation_specifier_test_external_storage.sol |   2 +-
 ...tion_specifier_test_non_reference_type.sol |   2 +-
 ...urn_parameters_with_data_location_fine.sol |   4 +-
 ...l_function_parameters_no_data_location.sol |   2 +-
 ...ion_return_parameters_no_data_location.sol |   2 +-
 ...ernal_function_params_no_data_location.sol |   8 +-
 ...ernal_function_return_no_data_location.sol |   8 +-
 ...brary_function_with_data_location_fine.sol |  12 +-
 ...ary_internal_function_no_data_location.sol |  16 +-
 ...rary_private_function_no_data_location.sol |  16 +-
 ...brary_public_function_no_data_location.sol |  16 +-
 .../memory_storage_data_location.sol          |   4 +-
 ...e_function_parameters_no_data_location.sol |   2 +-
 ...ion_return_parameters_no_data_location.sol |   2 +-
 ...location_specifier_test_public_storage.sol |   2 +-
 ...c_function_parameters_no_data_location.sol |   2 +-
 ...ion_return_parameters_no_data_location.sol |   2 +-
 .../dataLocations/unspecified_constructor.sol |   2 +-
 ...tion_specifier_test_non_reference_type.sol |   8 +-
 .../combining_hex_and_denomination.sol        |   2 +-
 .../denominations/deprecated_year.sol         |   2 +-
 .../denominations/finney_invalid.sol          |   2 +-
 .../denominations/fixed_point_division.sol    |   2 +-
 .../denominations/gwei_as_identifier.sol      |   2 +-
 .../denominations/szabo_invalid.sol           |   2 +-
 .../syntaxTests/deprecated_functions.sol      |   4 +-
 .../double_stateVariable_declaration.sol      |   2 +-
 .../double_variable_declaration.sol           |   2 +-
 .../fallback_function_twice.sol               |   2 +-
 .../illegal_names_exception.sol               |   4 +-
 .../illegal_names_functions.sol               |   4 +-
 .../receive_function_thrice.sol               |   4 +-
 .../syntaxTests/duplicate_contract.sol        |   2 +-
 .../syntaxTests/emit/emit_empty.sol           |   2 +-
 .../syntaxTests/emit/emit_non_event.sol       |   2 +-
 test/libsolidity/syntaxTests/empty_struct.sol |   2 +-
 .../enums/global_enum_contract_name_clash.sol |   2 +-
 .../enums/global_enum_name_clash.sol          |   2 +-
 .../enums/global_enum_shadowing.sol           |   2 +-
 .../syntaxTests/enums/illegal_names.sol       |  16 +-
 .../enums/literal_conversion_error.sol        |  10 +-
 .../syntaxTests/errors/abi_decode_error.sol   |   4 +-
 .../syntaxTests/errors/abi_encode_error.sol   |   2 +-
 .../errors/abi_encode_error_instance.sol      |   2 +-
 .../syntaxTests/errors/all_ones_signature.sol |   6 +-
 .../syntaxTests/errors/anonymous.sol          |   2 +-
 .../errors/assert_with_cond_and_error.sol     |   2 +-
 .../syntaxTests/errors/assert_with_error.sol  |   2 +-
 .../errors/clash_function_error.sol           |   2 +-
 .../clash_function_error_inheritance.sol      |   2 +-
 .../clash_function_error_inheritance_2.sol    |   2 +-
 .../errors/error_as_function_param.sol        |   2 +-
 .../errors/error_location_memory.sol          |   2 +-
 .../errors/error_location_specifier.sol       |   2 +-
 ...wed_by_builtin_type_used_as_param_name.sol |   2 +-
 .../errors/error_reserved_name.sol            |   2 +-
 .../syntaxTests/errors/hash_collision.sol     |   2 +-
 .../errors/hash_collision_external.sol        |   2 +-
 .../syntaxTests/errors/indexed_error.sol      |   2 +-
 .../syntaxTests/errors/internal_type.sol      |   4 +-
 .../syntaxTests/errors/no_mappings.sol        |   2 +-
 .../syntaxTests/errors/no_overloading.sol     |   2 +-
 .../errors/no_overloading_inheritance.sol     |   2 +-
 .../errors/no_structs_in_abiv1.sol            |   2 +-
 .../errors/panic_reserved_name.sol            |   2 +-
 .../syntaxTests/errors/require_custom.sol     |   2 +-
 .../syntaxTests/errors/revert_parentheses.sol |   2 +-
 .../errors/selector_on_instance.sol           |   2 +-
 .../syntaxTests/errors/unreachable.sol        |   2 +-
 test/libsolidity/syntaxTests/errors/using.sol |   2 +-
 .../syntaxTests/errors/using_2.sol            |   2 +-
 .../libsolidity/syntaxTests/errors/weird1.sol |   2 +-
 .../libsolidity/syntaxTests/errors/weird3.sol |   2 +-
 .../libsolidity/syntaxTests/errors/weird4.sol |   2 +-
 .../events/double_event_declaration.sol       |   2 +-
 ...le_event_declaration_ignores_anonymous.sol |   2 +-
 ...uble_event_declaration_ignores_indexed.sol |   2 +-
 .../event_function_inheritance_clash.sol      |   2 +-
 .../events/event_library_function.sol         |   6 +-
 .../syntaxTests/events/event_nested_array.sol |   2 +-
 .../events/event_nested_array_in_struct.sol   |   2 +-
 ...ent_overload_named_arguments_ambiguous.sol |   2 +-
 ...rguments_ambiguous_implicit_conversion.sol |   2 +-
 ...t_overload_named_arguments_wrong_types.sol |   2 +-
 .../event_param_type_outside_storage.sol      |   2 +-
 .../syntaxTests/events/event_struct.sol       |   2 +-
 .../events/event_struct_indexed.sol           |   2 +-
 .../events/event_without_emit_deprecated.sol  |   2 +-
 .../events/illegal_names_exception.sol        |   4 +-
 .../events/inheritance_adds_anonymous.sol     |   2 +-
 .../events/inheritance_adds_indexed.sol       |   2 +-
 .../events/inheritance_event_repeated.sol     |   2 +-
 .../events/inheritance_multi_parent.sol       |   2 +-
 .../events/inheritance_removes_indexed.sol    |   2 +-
 .../syntaxTests/events/internal_type.sol      |   4 +-
 .../events/multiple_event_without_emit.sol    |   2 +-
 .../fallback/default_visibility.sol           |   4 +-
 .../fallback/fallback_as_function_name.sol    |   2 +-
 .../fallback/fallback_duplicate_returns.sol   |   2 +-
 ...fallback_duplicate_returns_inheritance.sol |   2 +-
 .../fallback/fallback_wrong_data_location.sol |   6 +-
 .../fallback/no_input_no_output.sol           |   2 +-
 .../syntaxTests/fallback/old_syntax.sol       |   2 +-
 .../fallback/return_value_number.sol          |   2 +-
 .../fallback/return_value_type.sol            |   2 +-
 .../fallback/return_value_unsupported.sol     |   2 +-
 .../circular_reference1functions_first.sol    |   4 +-
 .../circular_referencecontracts_first.sol     |   4 +-
 .../free_call_via_contract_type.sol           |   2 +-
 .../freeFunctions/free_constructor.sol        |   2 +-
 .../freeFunctions/free_fallback.sol           |   2 +-
 .../freeFunctions/free_function_modifier.sol  |   2 +-
 ...ion_namesake_different_parameter_types.sol |   2 +-
 .../freeFunctions/free_function_shadowing.sol |   2 +-
 .../free_function_visibility.sol              |   4 +-
 .../free_function_without_body.sol            |   2 +-
 .../freeFunctions/free_mutability.sol         |   2 +-
 .../freeFunctions/free_overload.sol           |   2 +-
 .../freeFunctions/free_override.sol           |   2 +-
 .../freeFunctions/free_payable.sol            |   2 +-
 .../freeFunctions/free_receive.sol            |   2 +-
 .../freeFunctions/free_virtual.sol            |   2 +-
 .../function_same_name_as_contract.sol        |   2 +-
 .../function_using_struct_after_contract.sol  |   2 +-
 .../syntaxTests/freeFunctions/gas_value.sol   |   2 +-
 .../freeFunctions/illegal_names.sol           |  10 +-
 .../freeFunctions/qualified_struct_access.sol |   4 +-
 .../freeFunctions/super_in_free_function.sol  |   2 +-
 .../freeFunctions/this_in_free_function.sol   |   2 +-
 ...y_parameters_but_restricted_first_type.sol |   8 +-
 .../call_unimplemented_base_via_super.sol     |   4 +-
 ...rgument_with_internal_data_type_inside.sol |   2 +-
 ...rgument_with_internal_data_type_inside.sol |   2 +-
 ...a_type_inside_as_constructor_parameter.sol |   2 +-
 .../functionCalls/calloptions_duplicated.sol  |   6 +-
 .../calloptions_on_internal_function.sol      |   2 +-
 .../functionCalls/calloptions_repeated.sol    |   4 +-
 .../functionCalls/int_not_callable.sol        |   2 +-
 .../invalid_expressions_with_calloptions1.sol |   2 +-
 .../invalid_expressions_with_calloptions2.sol |   2 +-
 .../invalid_named_arguments_conditional.sol   |   8 +-
 .../functionCalls/msg_value_non_payable.sol   |   2 +-
 .../named_arguments_duplicate_parameter.sol   |   6 +-
 .../functionCalls/named_arguments_empty.sol   |   6 +-
 .../named_arguments_overload_failing1.sol     |   2 +-
 .../named_arguments_overload_failing2.sol     |   2 +-
 .../named_arguments_overload_failing3.sol     |   2 +-
 ...d_arguments_overload_failing_ambiguous.sol |   2 +-
 ..._failing_ambiguous_implicit_conversion.sol |   2 +-
 ...erload_failing_right_names_wrong_order.sol |   2 +-
 ...arguments_overload_failing_wrong_names.sol |   2 +-
 .../named_arguments_wrong_count.sol           |   6 +-
 .../syntaxTests/functionCalls/new_library.sol |   2 +-
 .../new_with_invalid_calloptions.sol          |  18 +-
 .../functionCalls/this_not_callable.sol       |   2 +-
 .../call_value_on_non_constructor.sol         |   2 +-
 ...all_value_on_non_payable_function_type.sol |   2 +-
 ...e_options_on_non_payable_function_type.sol |   2 +-
 .../comparison_of_function_types_gt_1.sol     |   2 +-
 .../comparison_of_function_types_gt_2.sol     |   2 +-
 .../comparison_of_function_types_lt_1.sol     |   2 +-
 .../comparison_of_function_types_lt_2.sol     |   2 +-
 .../functionTypes/conversion_to_address.sol   |   2 +-
 .../delete_external_function_type_invalid.sol |   2 +-
 .../delete_function_type_invalid.sol          |   2 +-
 .../error_deprecate_gas_function.sol          |   2 +-
 .../error_deprecate_value_constructor.sol     |   2 +-
 ...deprecate_value_constructor_nonpayable.sol |   2 +-
 .../error_deprecate_value_function.sol        |   2 +-
 ...ernal_function_type_returning_internal.sol |   2 +-
 ...external_function_type_taking_internal.sol |   2 +-
 ...ernal_function_type_to_address_payable.sol |   2 +-
 .../external_function_type_to_uint.sol        |   2 +-
 ...ns_with_variable_number_of_stack_slots.sol |   2 +-
 ...ary_function_to_external_function_type.sol |   2 +-
 .../function_type_constructor.sol             |   4 +-
 .../function_type_constructor_local.sol       |   2 +-
 .../function_type_named_call.sol              |   4 +-
 ...tion_type_return_parameters_with_names.sol |   2 +-
 .../function_type_struct_undefined_member.sol |   2 +-
 ...nction_type_variable_external_internal.sol |   2 +-
 ...nction_types_internal_visibility_error.sol |   2 +-
 .../inline_array_with_bound_function.sol      |   2 +-
 ...inline_array_with_bound_function_mixed.sol |   2 +-
 .../inline_array_with_payable_function.sol    |   2 +-
 ...external_parameter_in_library_external.sol |   2 +-
 .../internal_function_type_to_address.sol     |   2 +-
 .../syntaxTests/functionTypes/selectors.sol   |  10 +-
 .../ternary_with_bound_functions.sol          |   4 +-
 ...rn_function_type_parameters_with_names.sol |   2 +-
 .../syntaxTests/getter/nested_structs.sol     |   2 +-
 .../syntaxTests/getter/recursive_struct.sol   |   2 +-
 .../call_with_wrong_arg_count.sol             |   6 +-
 .../callcode_with_wrong_arg_count.sol         |   4 +-
 .../delegatecall_with_wrong_arg_count.sol     |   4 +-
 .../keccak256_with_wrong_arg_count.sol        |   6 +-
 .../globalFunctions/log_deprecate.sol         |  10 +-
 .../globalFunctions/now_deprecate.sol         |   2 +-
 .../globalFunctions/now_override.sol          |   2 +-
 .../ripemd160_with_wrong_arg_count.sol        |   6 +-
 .../sha256_with_wrong_arg_count.sol           |   6 +-
 .../globalFunctions/sha3_no_call.sol          |   2 +-
 .../syntaxTests/globalFunctions/sha3_var.sol  |   2 +-
 .../globalFunctions/suicide_no_call.sol       |   2 +-
 .../globalFunctions/suicide_var.sol           |   2 +-
 ...n_via_local_variable_with_invalid_type.sol |   2 +-
 ...nction_via_parameter_with_invalid_type.sol |   2 +-
 .../declaration_bitnot_tuple.sol              |   2 +-
 .../declaration_dec_tuple.sol                 |   2 +-
 .../declaration_delete_tuple.sol              |   4 +-
 .../declaration_inc_tuple.sol                 |   2 +-
 .../declaration_unary_tuple.sol               |  18 +-
 .../identifier_collision_return_declare.sol   |   2 +-
 .../large_array_in_memory_struct.sol          |   2 +-
 .../large_array_in_memory_struct_2.sol        |   2 +-
 .../iceRegressionTests/large_struct_array.sol |   2 +-
 .../iceRegressionTests/oversized_var.sol      |  12 +-
 .../recursive_struct_memory.sol               |   2 +-
 .../immutable/as_function_param.sol           |   2 +-
 .../syntaxTests/immutable/assembly.sol        |   2 +-
 .../syntaxTests/immutable/complex.sol         |   2 +-
 .../conditional_return_uninitialized.sol      |   2 +-
 .../immutable/conditionally_initialized.sol   |   2 +-
 .../ctor_indirect_initialization.sol          |   2 +-
 .../ctor_initialization_indirect_reading.sol  |   2 +-
 .../immutable/ctor_initialization_reading.sol |   2 +-
 .../immutable/ctor_modifier_args.sol          |   2 +-
 .../ctor_modifier_initialization.sol          |   2 +-
 .../immutable/ctor_modifier_reading.sol       |   2 +-
 .../syntaxTests/immutable/decrement.sol       |   2 +-
 .../syntaxTests/immutable/delete.sol          |   2 +-
 .../immutable/delete_and_initialize.sol       |   2 +-
 .../immutable/double_specifier.sol            |   4 +-
 .../immutable/external_function_pointer.sol   |   2 +-
 .../function_initialization_reading.sol       |   2 +-
 .../function_pointer_initializing.sol         |   4 +-
 .../immutable/function_pointer_reading.sol    |   2 +-
 .../syntaxTests/immutable/illegal_names.sol   |  10 +-
 .../syntaxTests/immutable/increment.sol       |   2 +-
 .../immutable/increment_decrement.sol         |   4 +-
 .../indirect_reading_during_statevar_init.sol |   2 +-
 .../immutable/inheritance_ctor_argument.sol   |   2 +-
 ...e_ctor_inherit_specifier_argument_init.sol |   2 +-
 ...tor_inherit_specifier_argument_reading.sol |   2 +-
 .../inheritance_virtual_functions.sol         |   2 +-
 .../inheritance_virtual_modifiers.sol         |   2 +-
 .../immutable/inheritance_wrong_ctor.sol      |   2 +-
 .../immutable/init_in_ctor_param.sol          |   2 +-
 .../init_in_inheritance_specifier_param.sol   |   2 +-
 .../immutable/init_in_modifier_param.sol      |   2 +-
 .../immutable/loop_initialized.sol            |   2 +-
 ...multiple_inheritance_virtual_functions.sol |   2 +-
 ...heritance_virtual_functions_with_super.sol |   2 +-
 .../immutable/multiple_initializations.sol    |   2 +-
 .../syntaxTests/immutable/non-value_type.sol  |   2 +-
 .../immutable/private_state_var.sol           |   2 +-
 .../read_in_function_before_init.sol          |   2 +-
 .../read_in_function_before_init2.sol         |   2 +-
 .../reading_after_initialization_function.sol |   2 +-
 .../reading_during_statevar_init.sol          |   2 +-
 .../immutable/return_uninitialized.sol        |   2 +-
 .../syntaxTests/immutable/runtimeCode.sol     |   2 +-
 .../immutable/runtimeCodeInheritance.sol      |   2 +-
 .../syntaxTests/immutable/selector.sol        |   4 +-
 .../immutable/selector_function_name.sol      |   4 +-
 .../syntaxTests/immutable/unary.sol           |   2 +-
 .../variable_declaration_already.sol          |   4 +-
 .../immutable/variable_declaration_value.sol  |   2 +-
 .../writing_after_initialization.sol          |   2 +-
 .../writing_after_initialization_modifier.sol |   2 +-
 .../imports/declaration_not_found.sol         |   2 +-
 .../imports/filename_with_period.sol          |   2 +-
 .../imports/import_access_struct.sol          |   4 +-
 .../import_does_not_clutter_importee.sol      |   2 +-
 .../inheritance_abi_encoder_mismatch_1.sol    |   2 +-
 .../inheritance_abi_encoder_mismatch_2.sol    |   2 +-
 .../imports/library_name_clash.sol            |   2 +-
 .../imports/name_clash_in_import_1.sol        |   2 +-
 .../imports/name_clash_in_import_2.sol        |   2 +-
 .../imports/name_clash_in_import_3.sol        |   2 +-
 .../imports/name_clash_in_import_4.sol        |   2 +-
 ...name_clash_in_import_contract_struct_1.sol |   2 +-
 ...name_clash_in_import_contract_struct_2.sol |   2 +-
 ...name_clash_in_import_contract_struct_3.sol |   2 +-
 ...name_clash_in_import_contract_struct_4.sol |   2 +-
 .../imports/name_clash_in_import_enum.sol     |   2 +-
 .../name_clash_in_import_enum_contract.sol    |   2 +-
 .../name_clash_in_import_enum_struct.sol      |   2 +-
 .../imports/name_clash_in_import_struct_1.sol |   2 +-
 .../imports/name_clash_in_import_struct_2.sol |   2 +-
 .../imports/name_clash_in_import_struct_3.sol |   2 +-
 .../imports/name_clash_in_import_struct_4.sol |   2 +-
 ...name_clash_in_import_struct_contract_1.sol |   2 +-
 ...name_clash_in_import_struct_contract_2.sol |   2 +-
 ...name_clash_in_import_struct_contract_3.sol |   2 +-
 ...name_clash_in_import_struct_contract_4.sol |   2 +-
 .../imports/shadowing_builtins_with_alias.sol |   2 +-
 .../shadowing_builtins_with_imports.sol       |   2 +-
 ...adowing_builtins_with_multiple_imports.sol |   8 +-
 .../imports/shadowing_via_import.sol          |   2 +-
 .../indexing/array_multidim_rational.sol      |   8 +-
 .../indexing/array_multim_overflow_index.sol  |   8 +-
 .../indexing/array_negative_index.sol         |   2 +-
 .../indexing/array_out_of_bounds_index.sol    |   2 +-
 .../indexing/array_without_index.sol          |   2 +-
 .../indexing/fixedbytes_negative_index.sol    |   4 +-
 .../fixedbytes_out_of_bounds_index.sol        |   2 +-
 .../indexing/fixedbytes_without_index.sol     |   2 +-
 .../syntaxTests/indexing/function_type.sol    |   2 +-
 .../indexing/function_type_without_index.sol  |   2 +-
 .../indexing/index_range_access_assert.sol    |   2 +-
 .../base_arguments_empty_parentheses.sol      |   2 +-
 .../base_arguments_multiple_inheritance.sol   |   2 +-
 .../inheritance/base_not_contract.sol         |   2 +-
 ...low_modifier_style_without_parentheses.sol |   2 +-
 .../duplicated_constructor_call/ancestor.sol  |   2 +-
 .../duplicated_constructor_call/base.sol      |   2 +-
 .../base_multi.sol                            |   4 +-
 .../base_multi_no_constructor.sol             |   2 +-
 ...se_multi_no_constructor_modifier_style.sol |   2 +-
 .../fallback_overrides_receive.sol            |   2 +-
 .../fallback_without_override.sol             |   2 +-
 ...fallback_without_override_intermediate.sol |   2 +-
 .../receive_overrides_fallback.sol            |   2 +-
 .../fallback_receive/receive_parameter.sol    |  10 +-
 .../receive_return_parameter.sol              |   2 +-
 .../receive_unimplemented.sol                 |   2 +-
 .../receive_without_override.sol              |   2 +-
 .../receive_without_override_intermediate.sol |   2 +-
 .../inheritance/interface/contract_base.sol   |   2 +-
 .../interface/overrides_multiple.sol          |   6 +-
 .../inheritance/interface_virtual_warning.sol |   2 +-
 ...biguous_base_and_unique_implementation.sol |   4 +-
 .../ambiguous_base_and_unique_mention.sol     |   2 +-
 .../common_base_and_unique_implementation.sol |   4 +-
 .../override/detect_double_override.sol       |   4 +-
 ...ate_public_state_variable_and_function.sol |   2 +-
 ...ate_public_state_variable_and_function.sol |   2 +-
 ...tate_variable_and_function_implemented.sol |   2 +-
 ...iate_implemented_public_state_variable.sol |   2 +-
 ...ted_intermediate_public_state_variable.sol |   2 +-
 .../inheritance/override/function_pointer.sol |   2 +-
 .../interface_and_base_override_err.sol       |   4 +-
 .../interface_exception/abstract_needed.sol   |   2 +-
 .../interface_exception/diamond_needed.sol    |   6 +-
 .../internal_external_inheritance.sol         |   2 +-
 .../override/modifier_ambiguous_fail.sol      |   2 +-
 ...modifier_inherited_different_signature.sol |   2 +-
 ..._common_base_and_unique_implementation.sol |   4 +-
 ...ase_and_unique_implementation_modifier.sol |   2 +-
 .../override/override_empty_list.sol          |   2 +-
 ...ted_with_implemented_call_via_contract.sol |   2 +-
 .../inheritance/override/override_library.sol |   2 +-
 .../override_modifier_no_override.sol         |   2 +-
 .../override/override_multi_layered_error.sol |   6 +-
 .../override/override_multiple_duplicated.sol |   8 +-
 .../override/override_multiple_fail1.sol      |   2 +-
 .../override/override_multiple_fail2.sol      |   2 +-
 .../override/override_multiple_fail3.sol      |   2 +-
 .../override/override_multiple_fail4.sol      |   2 +-
 .../override/override_multiple_missing.sol    |   4 +-
 .../override/override_multiple_no_virtual.sol |   2 +-
 .../override_multiple_no_virtual2.sol         |   2 +-
 .../override/override_multiple_unresolved.sol |   2 +-
 .../override/override_public_vars.sol         |   4 +-
 .../override/override_type_mismatch.sol       |   4 +-
 .../override/override_type_mismatch2.sol      |   2 +-
 .../override/private_state_variable.sol       |   2 +-
 ...blic_var_implements_parallel_interface.sol |   4 +-
 .../override/public_var_missing_override.sol  |   2 +-
 .../public_var_no_override_but_function.sol   |   4 +-
 .../public_var_overrides_public_var.sol       |   4 +-
 .../override/public_var_overrides_pure.sol    |   2 +-
 .../override/public_var_parallel_funciton.sol |   2 +-
 .../override/public_var_surplus_override.sol  |   2 +-
 .../override/public_vars_multiple.sol         |   2 +-
 .../override/public_vars_multiple1.sol        |   6 +-
 .../override/public_vars_multiple3.sol        |   2 +-
 .../override/public_vars_multiple5.sol        |   2 +-
 .../override/public_vars_multiple_diamond.sol |   2 +-
 .../public_vars_multiple_diamond1.sol         |   6 +-
 .../public_vars_multiple_diamond2.sol         |   8 +-
 .../override/public_vars_wrong_override.sol   |   2 +-
 .../inheritance/override/remove_view.sol      |   4 +-
 .../override/state_variable_function.sol      |   2 +-
 .../inheritance/override/triangle_impl.sol    |   2 +-
 .../inheritance/reference_non_base_ctor.sol   |   2 +-
 .../inheritance/shadowing_base_state_vars.sol |   2 +-
 .../inheritance/super_on_external.sol         |   2 +-
 .../inheritance/too_few_base_arguments.sol    |   4 +-
 .../unimplemented_without_virtual.sol         |   2 +-
 .../inheritance/virtual/duplicate.sol         |   4 +-
 .../virtual/modifier_virtual_err.sol          |   2 +-
 .../inheritance/wrong_type_base_arguments.sol |   2 +-
 .../assembly_dialect_leading_space.sol        |   2 +-
 .../assembly_empty_option_list.sol            |   2 +-
 .../assembly_empty_option_list_dialect.sol    |   2 +-
 .../assembly_flags_delimiter.sol              |   2 +-
 .../assembly_invalid_options.sol              |   8 +-
 .../assignment_from_contract.sol              |   2 +-
 .../assignment_from_functiontype.sol          |   2 +-
 .../assignment_from_functiontype2.sol         |   2 +-
 .../assignment_from_functiontype3.sol         |   2 +-
 .../assignment_from_opcode_like.sol           |   2 +-
 .../inlineAssembly/assignment_from_super.sol  |   2 +-
 .../inlineAssembly/assignment_location.sol    |   2 +-
 .../assignment_to_opcode_like.sol             |   2 +-
 .../inlineAssembly/assignment_to_special.sol  |  12 +-
 .../basefee_reserved_london.sol               |   2 +-
 .../circular_constant_access_err.sol          |   2 +-
 .../circular_constant_access_module_err.sol   |   2 +-
 .../circular_module_access_err.sol            |   2 +-
 .../inlineAssembly/const_from_non_const.sol   |   4 +-
 .../inlineAssembly/const_from_this.sol        |   6 +-
 .../constant_access_non_initialized.sol       |   4 +-
 .../inlineAssembly/constant_array.sol         |   2 +-
 .../inlineAssembly/constant_bytes_ref.sol     |   2 +-
 .../external_identifier_access_shadowing.sol  |   2 +-
 .../function_call_invalid_argument_count.sol  |   4 +-
 .../function_call_not_found.sol               |   2 +-
 .../function_call_to_variable.sol             |   2 +-
 .../function_definition_whitespace.sol        |   2 +-
 .../inlineAssembly/function_without_call.sol  |   2 +-
 .../syntaxTests/inlineAssembly/immutables.sol |   4 +-
 .../invalid/assign_to_instruction.sol         |   2 +-
 .../invalid/assignment_to_function.sol        |   2 +-
 .../invalid/bare_instructions_disallowed.sol  |   2 +-
 .../inlineAssembly/invalid/calldata_array.sol |   2 +-
 .../inlineAssembly/invalid/calldata_slot.sol  |   2 +-
 .../invalid/calldata_variables.sol            |   2 +-
 .../invalid/const_forward_reference.sol       |   4 +-
 .../invalid/constant_assignment.sol           |   2 +-
 .../invalid/constant_length_access.sol        |   2 +-
 .../invalid/constant_variable_via_offset.sol  |   2 +-
 .../invalid/dot_in_fun_param.sol              |   8 +-
 .../inlineAssembly/invalid/dot_in_fundecl.sol |   4 +-
 .../invalid/dot_in_multi_vardecl.sol          |   4 +-
 .../inlineAssembly/invalid/dot_in_vardecl.sol |   8 +-
 .../inlineAssembly/invalid/dup_disallowed.sol |  36 +-
 .../invalid/empty_fun_arg_beginning.sol       |   2 +-
 .../invalid/empty_fun_arg_end.sol             |   2 +-
 .../invalid/empty_fun_arg_middle.sol          |   2 +-
 .../invalid/empty_function_name.sol           |   2 +-
 .../external_function_pointer_offset.sol      |   2 +-
 .../invalid/identifier_starting_with_dot.sol  |   2 +-
 .../inlineAssembly/invalid/illegal_names.sol  |  28 +-
 .../internal_function_pointer_address.sol     |   4 +-
 .../internal_function_pointer_selector.sol    |   4 +-
 .../inlineAssembly/invalid/invalid_number.sol |   2 +-
 .../invalid/jump_disallowed.sol               |   2 +-
 .../invalid/jumpdest_disallowed.sol           |   2 +-
 .../invalid/jumpi_disallowed.sol              |   2 +-
 .../invalid/label_disallowed.sol              |   2 +-
 .../invalid/leave_items_on_stack.sol          |   2 +-
 .../invalid/literals_on_stack_disallowed.sol  |   2 +-
 ...local_variable_access_out_of_functions.sol |   2 +-
 ...le_access_out_of_functions_storage_ptr.sol |   2 +-
 .../invalid/missing_variable.sol              |   2 +-
 .../invalid/missing_variable_in_assign.sol    |   2 +-
 .../multiple_assign_to_instruction.sol        |   2 +-
 .../invalid/nested_function_local_access.sol  |   2 +-
 .../inlineAssembly/invalid/pc_disallowed.sol  |   2 +-
 .../invalid/push_disallowed.sol               |  66 +--
 .../invalid/storage_assignment.sol            |   2 +-
 .../storage_assignment_in_modifier.sol        |   2 +-
 .../invalid/storage_nonslot.sol               |   4 +-
 .../invalid/swap_disallowed.sol               |  36 +-
 .../invalid/unbalanced_negative_stack.sol     |   2 +-
 .../invalid/unbalanced_positive_stack.sol     |   2 +-
 .../invalid/unbalanced_two_stack_load.sol     |   2 +-
 .../variable_declaration_suffix_offset.sol    |   4 +-
 .../invalid/whitespace_in_assignment.sol      |   2 +-
 .../whitespace_in_multiple_assignment.sol     |   2 +-
 .../inlineAssembly/invalid_natspec.sol        |   6 +-
 .../inlineAssembly/leave_invalid.sol          |   2 +-
 .../inlineAssembly/linkersymbol_builtin.sol   |   2 +-
 .../inlineAssembly/linkersymbol_function.sol  |   2 +-
 .../inlineAssembly/natspec_multi.sol          |  18 +-
 .../natspec_multi_swallowed.sol               |  10 +-
 .../inlineAssembly/overloaded_reference.sol   |   2 +-
 .../inlineAssembly/reserved_identifiers.sol   |   6 +-
 .../reserved_identifiers_constantinople.sol   |   2 +-
 ...urndatasize_as_variable_post_byzantium.sol |   2 +-
 ...ze_as_variable_read_post_byzantium.sol.sol |   2 +-
 .../inlineAssembly/shadowing/argument.sol     |   2 +-
 .../inlineAssembly/shadowing/constant.sol     |   2 +-
 .../inlineAssembly/shadowing/contract.sol     |   2 +-
 .../inlineAssembly/shadowing/function.sol     |   2 +-
 .../shadowing/local_variable.sol              |   2 +-
 .../shadowing/name_clash_in_import.sol        |   4 +-
 .../shadowing/qualified_names.sol             |   4 +-
 .../shadowing/variable_by_opcode.sol          |   4 +-
 .../inlineAssembly/storage_reference.sol      |   2 +-
 .../storage_reference_assignment.sol          |   2 +-
 .../storage_reference_assignment_statevar.sol |   4 +-
 .../storage_reference_empty_offset.sol        |   2 +-
 .../storage_reference_empty_slot.sol          |   2 +-
 .../inlineAssembly/storage_reference_old.sol  |   4 +-
 .../storage_reference_on_function.sol         |   2 +-
 .../storage_reference_on_memory.sol           |   4 +-
 .../inlineAssembly/storage_slot_assign.sol    |   2 +-
 .../inlineAssembly/two_stack_slot_access.sol  |   2 +-
 .../inlineAssembly/two_stack_slots.sol        |   2 +-
 .../inlineAssembly/verbatim_disallowed.sol    |   4 +-
 .../inline_arrays/dynamic_inline_array.sol    |   2 +-
 .../inline_array_fixed_types.sol              |   2 +-
 .../inline_array_of_mapping_type.sol          |   2 +-
 .../inline_arrays/inline_array_rationals.sol  |   2 +-
 .../invalid_types_in_inline_array.sol         |   2 +-
 .../inline_arrays/lvalues_as_inline_array.sol |   2 +-
 .../unnamed_types_in_inline_array_1.sol       |   2 +-
 .../unnamed_types_in_inline_array_2.sol       |   2 +-
 .../large_storage_array_mapping.sol           |   2 +-
 .../largeTypes/large_storage_array_simple.sol |   2 +-
 .../large_storage_arrays_struct.sol           |   2 +-
 .../largeTypes/large_storage_structs.sol      |  34 +-
 .../largeTypes/oversized_array.sol            |   2 +-
 .../largeTypes/oversized_struct.sol           |   2 +-
 .../largeTypes/storage_parameter.sol          |   4 +-
 .../literalOperations/division_by_zero.sol    |   2 +-
 .../division_by_zero_complex.sol              |   2 +-
 .../literalOperations/exponent.sol            |   4 +-
 .../literalOperations/mod_zero.sol            |   2 +-
 .../literalOperations/mod_zero_complex.sol    |   2 +-
 .../hex_string_duplicate_underscore.sol       |   2 +-
 .../hex_string_duplicate_underscore_yul.sol   |   2 +-
 .../hex_string_invalid_characters_yul.sol     |   2 +-
 .../hex_string_leading_underscore.sol         |   2 +-
 .../hex_string_misaligned_underscore.sol      |   2 +-
 .../hex_string_trailing_underscore.sol        |   2 +-
 .../unicode_string_direction_override_1.sol   |   2 +-
 .../unicode_string_direction_override_2.sol   |   2 +-
 .../unicode_string_direction_override_3.sol   |   2 +-
 .../unicode_string_direction_override_4.sol   |   2 +-
 .../unicode_string_direction_override_6.sol   |   2 +-
 .../lvalues/calldata_index_access.sol         |   2 +-
 .../lvalues/calldata_member_access.sol        |   2 +-
 .../syntaxTests/lvalues/functions.sol         |   4 +-
 .../syntaxTests/lvalues/library_mapping.sol   |   2 +-
 .../syntaxTests/lvalues/lvalue_not_set.sol    |   6 +-
 ...onstructor_as_potential_library_member.sol |   4 +-
 .../contract_not_payable_send.sol             |   2 +-
 .../contract_not_payable_transfer.sol         |   2 +-
 .../memberLookup/failed_function_lookup.sol   |   2 +-
 .../failed_function_lookup_in_library.sol     |   2 +-
 .../memberLookup/member_not_unique.sol        |   2 +-
 .../memberLookup/member_value_not_unique.sol  |   2 +-
 ...tructs_with_mapping_array_struct_array.sol |   2 +-
 .../memory_structs_with_mappings.sol          |   2 +-
 .../msg_sender_non_payable_send.sol           |   2 +-
 .../msg_sender_non_payable_transfer.sol       |   2 +-
 .../memberLookup/msg_value_modifier_pure.sol  |   2 +-
 .../memberLookup/msg_value_modifier_view.sol  |   2 +-
 .../memberLookup/push_on_memory_types.sol     |   2 +-
 .../tx_origin_non_payable_send.sol            |   2 +-
 .../tx_origin_non_payable_transfer.sol        |   2 +-
 .../unused_module_member_reference.sol        |   2 +-
 .../metaTypes/codeAccessAbstractCreation.sol  |   2 +-
 .../metaTypes/codeAccessAbstractRuntime.sol   |   2 +-
 .../syntaxTests/metaTypes/codeAccessBase.sol  |   4 +-
 .../metaTypes/codeAccessCyclic.sol            |   4 +-
 .../metaTypes/codeAccess_super.sol            |   2 +-
 .../syntaxTests/metaTypes/codeIsNoLValue.sol  |   4 +-
 .../syntaxTests/metaTypes/contract_min.sol    |   2 +-
 .../syntaxTests/metaTypes/int_name.sol        |   2 +-
 .../syntaxTests/metaTypes/integer_err.sol     |   6 +-
 .../metaTypes/interfaceid_super.sol           |   2 +-
 .../syntaxTests/metaTypes/noArgForType.sol    |   2 +-
 .../metaTypes/runtimeCodeWarningAssembly.sol  |   4 +-
 .../syntaxTests/metaTypes/super_name.sol      |   2 +-
 .../metaTypes/tooManyArgsForType.sol          |   2 +-
 .../typeNotRegularIdentifierContractName.sol  |   2 +-
 .../typeNotRegularIdentifierFunction.sol      |   2 +-
 .../typeNotRegularIdentifierParameter.sol     |   2 +-
 .../typeNotRegularIdentifierStateVariable.sol |   2 +-
 .../typeNotRegularIdentifierVariable.sol      |   2 +-
 .../syntaxTests/metaTypes/typeOfContract.sol  |   4 +-
 .../syntaxTests/metaTypes/typeRecursive.sol   |   2 +-
 .../metaTypes/unsupportedArgForType.sol       |   2 +-
 .../missing_functions_duplicate_bug.sol       |   2 +-
 .../syntaxTests/missing_state_variable.sol    |   2 +-
 .../modifiers/access_in_library.sol           |   2 +-
 .../base_constructor_double_invocation.sol    |   4 +-
 .../modifiers/constructor_as_modifier.sol     |   2 +-
 .../constructor_call_invalid_arg_count.sol    |   2 +-
 .../modifiers/cross_contract_access.sol       |   2 +-
 .../modifiers/cross_contract_super.sol        |   2 +-
 .../modifiers/cross_contract_unrelated.sol    |   2 +-
 .../definition_in_contract_unimplemented.sol  |   2 +-
 .../modifiers/definition_in_interface.sol     |  10 +-
 .../modifiers/definition_in_library.sol       |   2 +-
 .../definition_in_library_unimplemented.sol   |   4 +-
 .../modifiers/empty_modifier_err.sol          |   6 +-
 ...on_modifier_invocation_local_variables.sol |   2 +-
 .../modifiers/function_overrides_modifier.sol |   4 +-
 .../modifiers/illegal_modifier_override.sol   |   6 +-
 .../syntaxTests/modifiers/illegal_name.sol    |  10 +-
 .../invalid_function_modifier_type.sol        |   2 +-
 .../modifiers/library_via_using.sol           |   2 +-
 .../modifiers/modifier_abstract_override.sol  |   2 +-
 .../modifiers/modifier_overrides_function.sol |   4 +-
 .../modifiers/modifier_overrides_variable.sol |   4 +-
 .../modifiers/modifier_returns_value.sol      |   2 +-
 .../modifiers/modifier_without_underscore.sol |   2 +-
 .../non-virtual_modifier_override.sol         |   2 +-
 .../modifiers/use_in_invalid_context.sol      |   2 +-
 .../modifiers/use_on_interface_function.sol   |   2 +-
 .../modifiers/use_unimplemented_static.sol    |   2 +-
 .../more_than_256_declarationerrors.sol       | 512 +++++++++---------
 .../more_than_256_importerrors.sol            | 512 +++++++++---------
 .../more_than_256_syntaxerrors.sol            | 512 +++++++++---------
 .../multiSource/error_in_first.sol            |   2 +-
 .../free_function_control_flow_analysis.sol   |   2 +-
 .../multiSource/import_alias_mismatch.sol     |   2 +-
 .../import_contract_function_error.sol        |   2 +-
 .../multiSource/import_not_found.sol          |   2 +-
 .../libraries_control_flow_analysis.sol       |   4 +-
 .../syntaxTests/multiSource/no_import.sol     |   2 +-
 .../syntaxTests/multiSource/one_source.sol    |   2 +-
 ...ntract_hierarchy_control_flow_analysis.sol |   2 +-
 ...ierarchy_control_flow_analysis_complex.sol |   2 +-
 .../differentNumberOfComponents.sol           |  10 +-
 .../differentNumberOfComponentsFromReturn.sol |   8 +-
 .../disallowWildcards.sol                     |  18 +-
 .../disallowWildcardsFromReturn.sol           |  20 +-
 .../multiSingleVariableDeclaration.sol        |   2 +-
 .../multiVariableDeclarationComplex.sol       |   8 +-
 .../multiVariableDeclarationEmpty.sol         |   6 +-
 .../multiVariableDeclarationScoping.sol       |   2 +-
 .../multiVariableDeclarationScoping2.sol      |   6 +-
 .../multiVariableDeclarationSimple.sol        |   4 +-
 ...ltiVariableDeclarationThatIsExpression.sol |   2 +-
 .../oneElementTuple.sol                       |   2 +-
 .../001_name_references.sol                   |   4 +-
 .../002_undeclared_name.sol                   |   2 +-
 .../003_undeclared_name_is_not_fatal.sol      |   4 +-
 .../010_type_conversion_for_comparison.sol    |   2 +-
 ...type_conversion_for_comparison_invalid.sol |   2 +-
 .../013_large_string_literal.sol              |   2 +-
 .../nameAndTypeResolution/014_balance.sol     |   2 +-
 .../015_balance_invalid.sol                   |   2 +-
 .../017_assignment_to_struct.sol              |   2 +-
 .../018_forward_function_reference.sol        |   2 +-
 .../025_comparison_of_mapping_types.sol       |   2 +-
 ...045_returning_multi_dimensional_arrays.sol |   2 +-
 ...urning_multi_dimensional_static_arrays.sol |   2 +-
 ...048_returning_arrays_in_structs_arrays.sol |   2 +-
 ...n_external_call_not_allowed_conversion.sol |   2 +-
 ...nction_internal_not_allowed_conversion.sol |   2 +-
 .../056_cyclic_inheritance.sol                |   2 +-
 .../059_illegal_override_visibility.sol       |   4 +-
 .../060_complex_inheritance.sol               |   2 +-
 ...061_missing_base_constructor_arguments.sol |   2 +-
 ...62_base_constructor_arguments_override.sol |   2 +-
 ...63_implicit_derived_to_base_conversion.sol |   2 +-
 ...64_implicit_base_to_derived_conversion.sol |   2 +-
 .../065_super_excludes_current_contract.sol   |   2 +-
 ...ion_clash_with_state_variable_accessor.sol |   2 +-
 .../070_struct_accessor_one_array_only.sol    |   2 +-
 ..._state_variable_member_of_wrong_class1.sol |   2 +-
 ..._state_variable_member_of_wrong_class2.sol |   2 +-
 .../076_fallback_function_in_library.sol      |   2 +-
 .../076_receive_function_in_library.sol       |   4 +-
 ...llback_function_with_return_parameters.sol |   2 +-
 .../097_access_to_internal_function.sol       |   2 +-
 ...s_to_default_state_variable_visibility.sol |   2 +-
 .../105_constant_input_parameter.sol          |   4 +-
 ...y_name_return_parameter_with_named_one.sol |   2 +-
 .../112_exp_operator_exponent_too_big.sol     |   2 +-
 .../127_enum_invalid_direct_member_access.sol |   2 +-
 ...um_implicit_conversion_is_not_okay_256.sol |   2 +-
 ...num_implicit_conversion_is_not_okay_64.sol |   2 +-
 ...32_enum_to_enum_conversion_is_not_okay.sol |   2 +-
 .../133_enum_duplicate_values.sol             |   2 +-
 .../135_private_visibility.sol                |   2 +-
 ...te_visibility_via_explicit_base_access.sol |   2 +-
 .../137_external_visibility.sol               |   2 +-
 .../138_similar_name_suggestions_expected.sol |   2 +-
 .../139_no_name_suggestion.sol                |   2 +-
 .../140_multiple_similar_suggestions.sol      |   2 +-
 .../141_multiple_scopes_suggestions.sol       |   2 +-
 .../142_inheritence_suggestions.sol           |   2 +-
 ...s_identifier_suggestions_with_submatch.sol |   2 +-
 ...144_no_spurious_identifier_suggestions.sol |   2 +-
 .../145_external_base_visibility.sol          |   2 +-
 .../150_array_with_nonconstant_length.sol     |   4 +-
 .../151_array_with_negative_length.sol        |   4 +-
 .../152_array_copy_with_different_types1.sol  |   2 +-
 .../153_array_copy_with_different_types2.sol  |   2 +-
 ...py_with_different_types_dynamic_static.sol |   2 +-
 .../157_array_of_undeclared_type.sol          |   2 +-
 ...initialization_with_incorrect_type_int.sol |   2 +-
 ...tialization_with_incorrect_type_string.sol |   2 +-
 .../160_test_byte_is_alias_of_byte1.sol       |   2 +-
 .../164_assigning_value_to_const_variable.sol |   2 +-
 .../165_assigning_state_to_const_variable.sol |   2 +-
 ...nt_string_literal_disallows_assignment.sol |   2 +-
 .../175_uninitialized_const_variable.sol      |   2 +-
 ...176_overloaded_function_cannot_resolve.sol |   2 +-
 .../177_ambiguous_overloaded_function.sol     |   2 +-
 .../179_assignment_of_overloaded_function.sol |   2 +-
 .../180_external_types_clash.sol              |   2 +-
 .../188_string_index.sol                      |   2 +-
 .../189_string_length.sol                     |   2 +-
 ...gative_integers_to_signed_out_of_bound.sol |   2 +-
 ...sitive_integers_to_signed_out_of_bound.sol |   2 +-
 .../194_negative_integers_to_unsigned.sol     |   2 +-
 ...tive_integers_to_unsigned_out_of_bound.sol |   2 +-
 .../196_integer_boolean_or.sol                |   2 +-
 .../197_integer_boolean_and.sol               |   2 +-
 .../198_integer_boolean_not.sol               |   2 +-
 .../199_integer_unsigned_exp_signed.sol       |   2 +-
 .../201_integer_signed_exp_signed.sol         |   8 +-
 .../202_bytes_reference_compare_operators.sol |   2 +-
 ...203_struct_reference_compare_operators.sol |   2 +-
 ...05_overwrite_storage_location_external.sol |   2 +-
 .../207_no_mappings_in_memory_array.sol       |   2 +-
 ...signment_mem_to_local_storage_variable.sol |   2 +-
 ...age_assign_to_different_local_variable.sol |   2 +-
 .../210_uninitialized_mapping_variable.sol    |   2 +-
 ...1_uninitialized_mapping_array_variable.sol |   2 +-
 .../213_no_delete_on_storage_pointers.sol     |   2 +-
 .../215_function_argument_mem_to_storage.sol  |   2 +-
 ...mem_array_assignment_changes_base_type.sol |   2 +-
 .../219_memory_arrays_not_resizeable.sol      |   2 +-
 .../220_struct_constructor.sol                |   2 +-
 .../221_struct_constructor_nested.sol         |   2 +-
 .../222_struct_named_constructor.sol          |   2 +-
 .../225_inheriting_from_library.sol           |   2 +-
 .../226_inheriting_library.sol                |   2 +-
 .../227_library_having_variables.sol          |   2 +-
 ..._creating_contract_within_the_contract.sol |   2 +-
 .../231_array_out_of_bound_access.sol         |   2 +-
 .../232_literal_string_to_storage_pointer.sol |   2 +-
 .../233_non_initialized_references.sol        |   2 +-
 ...abi_encode_with_large_integer_constant.sol |   2 +-
 .../236_cyclic_binary_dependency.sol          |   6 +-
 ...clic_binary_dependency_via_inheritance.sol |   2 +-
 .../245_tuples_empty_components.sol           |   2 +-
 .../252_using_for_not_library.sol             |   2 +-
 .../258_using_for_mismatch.sol                |   2 +-
 .../259_using_for_not_used.sol                |   2 +-
 .../261_using_for_arbitrary_mismatch.sol      |   2 +-
 .../262_bound_function_in_var.sol             |   2 +-
 .../264_mapping_in_memory_array.sol           |   2 +-
 .../265_new_for_non_array.sol                 |   2 +-
 .../275_inline_struct_declaration_arrays.sol  |   2 +-
 .../279_break_not_in_loop.sol                 |   2 +-
 .../280_continue_not_in_loop.sol              |   2 +-
 .../281_continue_not_in_loop_2.sol            |   2 +-
 ...erent_types_for_conditional_expression.sol |   2 +-
 ...nditional_expression_not_supported_yet.sol |   4 +-
 ...ional_expression_with_different_struct.sol |   2 +-
 ...xpression_with_different_function_type.sol |   2 +-
 ...itional_expression_with_different_enum.sol |   2 +-
 ...onal_expression_with_different_mapping.sol |   2 +-
 .../288_conditional_with_all_types.sol        |   2 +-
 .../290_varM_disqualified_as_keyword_1.sol    |   2 +-
 .../290_varM_disqualified_as_keyword_2.sol    |   2 +-
 .../290_varM_disqualified_as_keyword_3.sol    |   2 +-
 .../291_modifier_is_not_a_valid_typename.sol  |   2 +-
 ...r_is_not_a_valid_typename_is_not_fatal.sol |   2 +-
 .../293_function_is_not_a_valid_typename.sol  |   2 +-
 .../294_long_uint_variable_fails.sol          |   2 +-
 .../295_bytes10abc_is_identifier.sol          |   2 +-
 ...97_library_functions_do_not_have_value.sol |   2 +-
 .../298_invalid_fixed_types_0x7_mxn.sol       |   2 +-
 .../300_invalid_fixed_types_7x8_mxn.sol       |   2 +-
 .../301_library_instances_cannot_be_used.sol  |   2 +-
 ...lid_int_implicit_conversion_from_fixed.sol |   2 +-
 .../308_rational_unary_plus_operation.sol     |   4 +-
 ..._type_invalid_implicit_conversion_size.sol |   2 +-
 ..._invalid_implicit_conversion_lost_data.sol |   2 +-
 ...nvalid_array_declaration_with_rational.sol |   4 +-
 ...ray_declaration_with_signed_fixed_type.sol |   4 +-
 ...y_declaration_with_unsigned_fixed_type.sol |   4 +-
 ..._rational_to_bytes_implicit_conversion.sol |   2 +-
 ...322_fixed_to_bytes_implicit_conversion.sol |   2 +-
 .../327_rational_index_access.sol             |   2 +-
 ...8_rational_to_fixed_literal_expression.sol |   2 +-
 .../329_rational_as_exponent_value_signed.sol |   2 +-
 ...30_rational_as_exponent_value_unsigned.sol |   2 +-
 .../331_rational_as_exponent_half.sol         |   2 +-
 ...rational_as_exponent_value_neg_quarter.sol |   2 +-
 .../333_fixed_point_casting_exponents_15.sol  |   2 +-
 .../334_fixed_point_casting_exponents_neg.sol |   2 +-
 .../338_rational_bitnot_unary_operation.sol   |   2 +-
 .../339_rational_bitor_binary_operation.sol   |   2 +-
 .../340_rational_bitxor_binary_operation.sol  |   2 +-
 .../341_rational_bitand_binary_operation.sol  |   2 +-
 .../343_integer_and_fixed_interaction.sol     |   2 +-
 ...ne_divided_by_three_integer_conversion.sol |   2 +-
 .../346_unused_return_value_send.sol          |   2 +-
 .../347_unused_return_value_call.sol          |   2 +-
 .../351_callcode_deprecated.sol               |   2 +-
 .../354_payable_in_library.sol                |   2 +-
 .../356_payable_internal.sol                  |   2 +-
 .../357_payable_private.sol                   |   2 +-
 .../358_illegal_override_payable.sol          |   4 +-
 ...59_illegal_override_payable_nonpayable.sol |   4 +-
 .../362_calling_nonpayable.sol                |   2 +-
 .../363_non_payable_constructor.sol           |   2 +-
 .../366_invalid_array_as_statement.sol        |   2 +-
 ...7_using_directive_for_missing_selftype.sol |   2 +-
 ...68_shift_constant_left_negative_rvalue.sol |   2 +-
 ...9_shift_constant_right_negative_rvalue.sol |   2 +-
 ...0_shift_constant_left_excessive_rvalue.sol |   2 +-
 ..._shift_constant_right_excessive_rvalue.sol |   2 +-
 .../372_shift_constant_right_fractional.sol   |   2 +-
 ...g_value_in_non_payable_public_function.sol |   2 +-
 .../402_assignment_to_constant.sol            |   2 +-
 .../412_early_exit_on_fatal_errors.sol        |   4 +-
 .../420_interface_variables.sol               |   2 +-
 .../426_throw_is_deprecated.sol               |   2 +-
 .../nameAndTypeResolution/428_bare_revert.sol |   2 +-
 .../430_bare_selfdestruct.sol                 |   2 +-
 .../nameAndTypeResolution/431_bare_assert.sol |   2 +-
 .../432_bare_require.sol                      |   2 +-
 .../433_pure_statement_in_for_loop.sol        |   2 +-
 .../462_callable_crash.sol                    |   2 +-
 .../471_unspecified_storage_fail.sol          |   4 +-
 ...ocation_non_array_or_struct_disallowed.sol |   2 +-
 ...rray_or_struct_disallowed_is_not_fatal.sol |   2 +-
 .../475_implicit_conversion_disallowed.sol    |   2 +-
 ...too_large_arrays_for_calldata_external.sol |   2 +-
 ...too_large_arrays_for_calldata_internal.sol |   2 +-
 ...8_too_large_arrays_for_calldata_public.sol |   2 +-
 ...t_literal_to_storage_string_assignment.sol |   2 +-
 ...teral_to_unspecified_string_assignment.sol |   2 +-
 ...explicit_literal_to_unspecified_string.sol |   2 +-
 .../484_function_types_selector_1.sol         |   2 +-
 .../485_function_types_selector_2.sol         |   2 +-
 .../486_function_types_selector_3.sol         |   2 +-
 .../491_using_this_in_constructor.sol         |   2 +-
 .../492_do_not_crash_on_not_lvalue.sol        |   2 +-
 .../493_builtin_keccak256_reject_gas.sol      |   2 +-
 .../494_builtin_sha256_reject_gas.sol         |   2 +-
 .../495_builtin_ripemd160_reject_gas.sol      |   2 +-
 .../496_builtin_ecrecover_reject_gas.sol      |   2 +-
 .../498_msg_gas_deprecated.sol                |   2 +-
 .../501_gasleft_shadowing_2.sol               |   2 +-
 .../502_builtin_keccak256_reject_value.sol    |   2 +-
 .../503_builtin_sha256_reject_value.sol       |   2 +-
 .../504_builtin_ripemd160_reject_value.sol    |   2 +-
 .../505_builtin_ecrecover_reject_value.sol    |   2 +-
 ...function_without_implementation_public.sol |   2 +-
 ...nction_without_implementation_internal.sol |   2 +-
 ...unction_without_implementation_private.sol |   2 +-
 .../514_using_for_with_non_library.sol        |   2 +-
 .../523_reject_interface_creation.sol         |   2 +-
 .../525_reject_interface_constructors.sol     |   2 +-
 .../527_fallback_marked_internal.sol          |   2 +-
 .../528_fallback_marked_private.sol           |   2 +-
 .../529_fallback_marked_public.sol            |   2 +-
 ...ple_invalid_literal_too_large_for_uint.sol |   2 +-
 ...e_invalid_literal_too_large_unassigned.sol |   2 +-
 ...valid_literal_too_large_for_uint_multi.sol |   2 +-
 ...33_tuple_invalid_literal_too_large_exp.sol |   2 +-
 ...e_invalid_literal_too_large_expression.sol |   2 +-
 ...ength_invalid_expression_negative_bool.sol |   2 +-
 ...th_invalid_expression_int_divides_bool.sol |   2 +-
 ...th_invalid_expression_bool_divides_int.sol |   2 +-
 ..._invalid_expression_scientific_literal.sol |   2 +-
 ...th_invalid_expression_division_by_zero.sol |   2 +-
 ...ut_address_members_on_contract_balance.sol |   2 +-
 ...t_address_members_on_contract_transfer.sol |   2 +-
 ...about_address_members_on_contract_send.sol |   2 +-
 ...about_address_members_on_contract_call.sol |   2 +-
 ...t_address_members_on_contract_callcode.sol |   2 +-
 ...dress_members_on_contract_delegatecall.sol |   2 +-
 ...s_members_on_non_this_contract_balance.sol |   2 +-
 ..._members_on_non_this_contract_transfer.sol |   2 +-
 ...ress_members_on_non_this_contract_send.sol |   2 +-
 ...ress_members_on_non_this_contract_call.sol |   2 +-
 ..._members_on_non_this_contract_callcode.sol |   2 +-
 ...bers_on_non_this_contract_delegatecall.sol |   2 +-
 .../569_block_blockhash_deprecated.sol        |   2 +-
 .../570_function_type_undeclared_type.sol     |   2 +-
 ...function_type_undeclared_type_external.sol |   2 +-
 ...tion_type_undeclared_type_multi_nested.sol |   2 +-
 ...member_getter_call_without_parentheses.sol |   2 +-
 ...member_getter_call_without_parentheses.sol |   2 +-
 ...l_without_parentheses_missing_function.sol |   2 +-
 ...member_getter_call_without_parentheses.sol |   2 +-
 ...l_without_parentheses_private_function.sol |   2 +-
 ...ve_name_suggestion_one_and_two_letters.sol |   6 +-
 ..._improve_name_suggestion_three_letters.sol |   4 +-
 ...2_improve_name_suggestion_four_letters.sol |  12 +-
 ...e_packed_with_rational_number_constant.sol |   2 +-
 ..._decode_with_tuple_of_other_than_types.sol |   2 +-
 .../585_abi_decode_with_unsupported_types.sol |   2 +-
 .../array_length_fractional_computed.sol      |   2 +-
 .../call_option_value_on_library_function.sol |   2 +-
 .../compoundAssignment/incomp_types.sol       |   2 +-
 .../compoundAssignment/tuple.sol              |   2 +-
 .../tuple_invalid_inline_array_type.sol       |   2 +-
 .../constant_forward_reference_struct.sol     |   2 +-
 .../constant_mapping.sol                      |   2 +-
 .../constant_nested_mapping.sol               |   2 +-
 .../free_and_constant.sol                     |   2 +-
 .../invalidArgs/creating_memory_array.sol     |   2 +-
 .../invalidArgs/creating_struct.sol           |   2 +-
 .../creating_struct_members_skipped.sol       |   2 +-
 .../invalidArgs/explicit_conversions.sol      |   4 +-
 .../invalidTypes/conditional_expression.sol   |  12 +-
 .../invalidTypes/constructor_call.sol         |   2 +-
 .../no_effect_statements.sol                  |  12 +-
 .../shadowsBuiltin/events.sol                 |   2 +-
 .../shadowsBuiltin/global_scope.sol           |   2 +-
 .../illegal_names_assembly_functions.sol      |   6 +-
 .../illegal_names_assembly_identifier.sol     |  10 +-
 .../illegal_names_function_parameters.sol     |  20 +-
 .../illegal_names_using_for.sol               |  10 +-
 .../shadowsBuiltin/parameters.sol             |   2 +-
 .../shadowsBuiltin/return_parameters.sol      |   2 +-
 .../shadowsBuiltin/storage_variables.sol      |   2 +-
 .../shadowsBuiltin/this_super.sol             |   8 +-
 .../shadowsBuiltin/variables.sol              |   2 +-
 .../typeChecking/library_instances.sol        |   6 +-
 .../return_tuple_not_convertible.sol          |   2 +-
 .../typeChecking/return_wrong_number.sol      |   2 +-
 .../typeChecking/return_wrong_type.sol        |   2 +-
 .../warnUnused/local.sol                      |   2 +-
 .../warnUnused/local_assignment.sol           |   2 +-
 .../natspec/docstring_author_function.sol     |   2 +-
 .../natspec/docstring_empty_description.sol   |   2 +-
 .../natspec/docstring_empty_tag.sol           |   2 +-
 ..._non_public_state_variable_with_return.sol |   2 +-
 .../docstring_inherit_modifier_no_return.sol  |   2 +-
 .../docstring_inherit_modifier_no_return2.sol |   4 +-
 .../natspec/invalid/docstring_inheritdoc.sol  |   2 +-
 .../natspec/invalid/docstring_inheritdoc2.sol |   2 +-
 .../natspec/invalid/docstring_inheritdoc3.sol |   2 +-
 .../invalid/docstring_inheritdoc_emptys.sol   |   8 +-
 .../docstring_inheritdoc_wrong_type.sol       |   2 +-
 .../docstring_return_size_mismatch.sol        |   2 +-
 .../natspec/invalid/inherit_doc_events.sol    |   2 +-
 .../natspec/invalid/invalid_tag.sol           |  10 +-
 test/libsolidity/syntaxTests/negation.sol     |   2 +-
 .../parsing/address_constant_payable.sol      |   2 +-
 .../address_invalid_state_mutability.sol      |  20 +-
 .../parsing/address_payable_conversion.sol    |   2 +-
 .../address_payable_type_expression.sol       |   2 +-
 .../parsing/address_public_payable_error.sol  |   2 +-
 .../parsing/array_range_conversion.sol        |  10 +-
 .../parsing/array_range_nested_invalid.sol    |   8 +-
 .../syntaxTests/parsing/array_type_range.sol  |   8 +-
 .../parsing/arrays_in_expressions.sol         |   2 +-
 .../parsing/assembly_invalid_type.sol         |   2 +-
 .../parsing/conditional_multiple.sol          |   2 +-
 .../conditional_true_false_literal.sol        |   4 +-
 .../parsing/conditional_with_constants.sol    |   4 +-
 .../parsing/conditional_with_variables.sol    |   4 +-
 .../parsing/constant_is_keyword.sol           |   2 +-
 .../parsing/constant_state_modifier.sol       |   2 +-
 .../parsing/constructor_internal_internal.sol |   2 +-
 .../parsing/constructor_internal_public.sol   |   2 +-
 .../parsing/constructor_payable_payable.sol   |   2 +-
 .../parsing/constructor_public_internal.sol   |   2 +-
 .../parsing/constructor_public_public.sol     |   2 +-
 .../declaring_fixed_and_ufixed_variables.sol  |   8 +-
 .../declaring_fixed_literal_variables.sol     |   2 +-
 ...ary_non_address_payable_state_variable.sol |  26 +-
 ...lementary_non_address_payable_argument.sol |  26 +-
 .../elementary_non_address_payable_local.sol  |  26 +-
 .../elementary_non_address_payable_return.sol |  26 +-
 .../parsing/emit_without_event.sol            |   2 +-
 .../syntaxTests/parsing/empty_enum.sol        |   2 +-
 .../parsing/event_with_no_argument_list.sol   |   2 +-
 .../syntaxTests/parsing/exp_expression.sol    |   2 +-
 .../syntaxTests/parsing/external_variable.sol |   2 +-
 .../fixed_literal_with_double_radix.sol       |   2 +-
 .../parsing/for_loop_simple_initexpr.sol      |   8 +-
 .../parsing/for_loop_simple_noexpr.sol        |   6 +-
 .../parsing/for_loop_single_stmt_body.sol     |   2 +-
 .../parsing/for_loop_vardef_initexpr.sol      |   8 +-
 ...ype_as_storage_variable_with_modifiers.sol |   2 +-
 .../parsing/function_type_in_struct.sol       |   4 +-
 .../function_type_multiple_mutability.sol     |   2 +-
 .../function_type_multiple_visibility.sol     |   2 +-
 .../syntaxTests/parsing/if_statement.sol      |   4 +-
 .../parsing/import_complex_invalid_from.sol   |   2 +-
 .../parsing/import_complex_without_from.sol   |   2 +-
 .../syntaxTests/parsing/import_empty.sol      |   2 +-
 .../parsing/import_invalid_token.sol          |   2 +-
 .../syntaxTests/parsing/import_simple.sol     |   2 +-
 .../inline_array_empty_cells_check_lvalue.sol |   2 +-
 ...array_empty_cells_check_without_lvalue.sol |   2 +-
 ..._fixed_conversion_leading_zeroes_check.sol |   2 +-
 ..._numbers_with_underscores_decimal_fail.sol |   8 +-
 ...er_numbers_with_underscores_fixed_fail.sol |  12 +-
 ...exer_numbers_with_underscores_hex_fail.sol |   2 +-
 .../parsing/local_const_variable.sol          |   2 +-
 .../location_specifiers_for_locals_multi.sol  |   6 +-
 .../location_specifiers_for_params.sol        |   4 +-
 .../location_specifiers_for_params_multi.sol  |   4 +-
 ...ocation_specifiers_for_state_variables.sol |   2 +-
 ...n_specifiers_for_state_variables_multi.sol |   2 +-
 .../parsing/location_specifiers_with_var.sol  |   2 +-
 .../parsing/malformed_enum_declaration.sol    |   2 +-
 .../parsing/mapping_from_address_payable.sol  |   2 +-
 .../parsing/mapping_nonelementary_key_1.sol   |   2 +-
 .../parsing/mapping_nonelementary_key_2.sol   |   2 +-
 .../parsing/mapping_nonelementary_key_3.sol   |   2 +-
 .../parsing/mapping_nonelementary_key_4.sol   |   2 +-
 .../parsing/max_depth_reached_1.sol           |   2 +-
 .../parsing/max_depth_reached_2.sol           |   2 +-
 .../parsing/max_depth_reached_3.sol           |   2 +-
 .../parsing/max_depth_reached_4.sol           |   2 +-
 .../missing_argument_in_named_args.sol        |   2 +-
 .../missing_parameter_name_in_named_args.sol  |   2 +-
 .../missing_variable_name_in_declaration.sol  |   2 +-
 .../parsing/modifier_without_semicolon.sol    |   2 +-
 .../multiple_event_arg_trailing_comma.sol     |   2 +-
 ...multiple_function_param_trailing_comma.sol |   2 +-
 .../multiple_modifier_arg_trailing_comma.sol  |   2 +-
 .../parsing/multiple_modifier_overrides.sol   |   2 +-
 .../multiple_return_param_trailing_comma.sol  |   2 +-
 .../multiple_statemutability_specifiers.sol   |  14 +-
 .../multiple_visibility_specifiers.sol        |   4 +-
 .../parsing/new_invalid_type_name.sol         |   2 +-
 .../syntaxTests/parsing/payable_accessor.sol  |   2 +-
 .../parsing/payable_without_arguments.sol     |   2 +-
 .../placeholder_in_function_context.sol       |   2 +-
 .../syntaxTests/parsing/pragma_illegal.sol    |   4 +-
 .../single_event_arg_trailing_comma.sol       |   2 +-
 .../single_function_param_trailing_comma.sol  |   2 +-
 .../single_modifier_arg_trailing_comma.sol    |   2 +-
 .../single_return_param_trailing_comma.sol    |   2 +-
 .../parsing/trailing_comma_in_named_args.sol  |   2 +-
 .../syntaxTests/parsing/trailing_dot1.sol     |   2 +-
 .../syntaxTests/parsing/trailing_dot2.sol     |   2 +-
 .../parsing/tuples_decl_without_rhs.sol       |   2 +-
 .../parsing/tuples_without_commas.sol         |   2 +-
 .../parsing/unary_plus_expression.sol         |   4 +-
 .../parsing/user_defined_value_type_err.sol   |   2 +-
 ...ser_defined_value_type_in_function_err.sol |   2 +-
 .../syntaxTests/parsing/var_array.sol         |   2 +-
 .../syntaxTests/parsing/var_storage_var.sol   |   2 +-
 .../variable_definition_in_mapping.sol        |   2 +-
 .../parsing/visibility_specifiers.sol         |   2 +-
 .../syntaxTests/parsing/while_loop.sol        |   2 +-
 .../syntaxTests/parsing/wrong_compiler_1.sol  |   2 +-
 .../syntaxTests/parsing/wrong_compiler_2.sol  |   2 +-
 .../syntaxTests/parsing/wrong_compiler_3.sol  |   2 +-
 .../syntaxTests/parsing/wrong_compiler_4.sol  |   2 +-
 .../syntaxTests/pragma/broken_version_1.sol   |   2 +-
 .../syntaxTests/pragma/broken_version_2.sol   |   2 +-
 .../syntaxTests/pragma/broken_version_3.sol   |   4 +-
 .../syntaxTests/pragma/broken_version_4.sol   |   2 +-
 .../syntaxTests/pragma/broken_version_5.sol   |   2 +-
 .../syntaxTests/pragma/broken_version_6.sol   |   2 +-
 .../syntaxTests/pragma/broken_version_7.sol   |   2 +-
 .../syntaxTests/pragma/empty_version.sol      |   2 +-
 .../experimental_empty_string_literal.sol     |   2 +-
 .../pragma/experimental_pragma_duplicate.sol  |   4 +-
 .../pragma/experimental_pragma_empty.sol      |   2 +-
 .../pragma/experimental_test_warning.sol      |   2 +-
 .../experimental_unknown_number_literal.sol   |   2 +-
 .../syntaxTests/pragma/invalid_pragma.sol     |   2 +-
 .../syntaxTests/pragma/unknown_pragma.sol     |   2 +-
 .../syntaxTests/receiveEther/arguments.sol    |   2 +-
 .../receiveEther/default_visibility.sol       |   6 +-
 .../receiveEther/msg_data_in_receive.sol      |   2 +-
 .../syntaxTests/receiveEther/old_syntax.sol   |   2 +-
 .../receiveEther/receive_as_function_name.sol |   2 +-
 .../syntaxTests/receiveEther/return_value.sol |   2 +-
 .../single_return_mismatching_number.sol      |   4 +-
 ...single_return_mismatching_number_named.sol |   4 +-
 .../single_return_mismatching_type.sol        |   2 +-
 .../tuple_return_mismatching_number.sol       |   6 +-
 .../tuple_return_mismatching_number_named.sol |   6 +-
 .../revertStatement/at_file_level.sol         |   2 +-
 .../revertStatement/error_used_elsewhere.sol  |   2 +-
 .../revertStatement/non_called.sol            |   2 +-
 .../syntaxTests/revertStatement/non_error.sol |   2 +-
 .../revertStatement/revert_event.sol          |   2 +-
 .../revertStatement/revert_revert.sol         |   2 +-
 .../revertStatement/using_function.sol        |   2 +-
 .../revertStatement/using_struct.sol          |   2 +-
 .../access_in_assignment_dynamic_array.sol    |   2 +-
 .../scoping/access_in_assignment_struct.sol   |   2 +-
 .../scoping/double_function_declaration.sol   |   2 +-
 ...le_variable_declaration_disjoint_scope.sol |   4 +-
 ..._declaration_disjoint_scope_activation.sol |   6 +-
 ...le_declaration_same_and_disjoint_scope.sol |   4 +-
 ...double_variable_declaration_same_scope.sol |   2 +-
 .../function_state_variable_conflict.sol      |   2 +-
 .../syntaxTests/scoping/library_inherited.sol |   2 +-
 .../scoping/name_pseudo_shadowing.sol         |   2 +-
 .../scoping/name_pseudo_shadowing2.sol        |   2 +-
 ...ng_function_parameter_name_vs_contract.sol |   6 +-
 ...ing_function_parameter_vs_its_function.sol |   2 +-
 ...wing_function_parameter_vs_struct_enum.sol |  12 +-
 ...on_parameters_parameter_vs_struct_enum.sol |  16 +-
 ...nction_return_parameter_vs_struct_enum.sol |  12 +-
 ...name_shadowing_function_type_parameter.sol |  16 +-
 ...adowing_function_type_return_parameter.sol |  16 +-
 ...dowing_local_variable_vs_free_function.sol |   2 +-
 ..._shadowing_local_variable_vs_functions.sol |   6 +-
 ...owing_local_variable_vs_state_variable.sol |   2 +-
 .../poly_variable_declaration_same_scope.sol  |  10 +-
 .../syntaxTests/scoping/scoping.sol           |   2 +-
 .../scoping/scoping_activation.sol            |   2 +-
 .../scoping/scoping_activation_old.sol        |   2 +-
 .../syntaxTests/scoping/scoping_for3.sol      |   2 +-
 .../scoping/scoping_for_decl_in_body.sol      |   2 +-
 .../syntaxTests/scoping/scoping_old.sol       |   2 +-
 .../syntaxTests/scoping/scoping_self_use.sol  |   2 +-
 .../state_variable_function_conflict.sol      |   2 +-
 ...ariable_function_conflict_former_crash.sol |   2 +-
 .../shifts/shift_singed_rvalue.sol            |   4 +-
 .../syntaxTests/signed_rational_modulus.sol   |   2 +-
 .../abi_encodePacked_nested_dynamic_array.sol |   2 +-
 ...i_encodePacked_nested_dynamic_array_v2.sol |   2 +-
 .../abi_encodePacked_structs_v2.sol           |   4 +-
 .../abi_encode_nested_dynamic_array.sol       |   2 +-
 .../specialFunctions/abi_encode_structs.sol   |   8 +-
 .../abi_encode_structs_abiv2.sol              |   6 +-
 .../abi_functions_member_access.sol           |  10 +-
 .../abidecode/abi_decode_calldata.sol         |   2 +-
 .../abidecode/abi_decode_empty.sol            |   2 +-
 .../abi_decode_invalid_arg_count.sol          |   8 +-
 .../abidecode/abi_decode_invalid_arg_type.sol |   4 +-
 .../abidecode/abi_decode_memory.sol           |   2 +-
 .../abi_decode_nested_dynamic_array.sol       |   2 +-
 .../abi_decode_nested_dynamic_array_v2.sol    |   2 +-
 .../abidecode/abi_decode_nontuple.sol         |   6 +-
 .../abidecode/abi_decode_storage.sol          |   2 +-
 .../abidecode/abi_decode_struct.sol           |   2 +-
 .../abidecode/abi_decode_struct_v2.sol        |   2 +-
 .../specialFunctions/encodeCall_fail_args.sol |  12 +-
 .../encodeCall_fail_funType.sol               |  24 +-
 .../encodeCall_nested_tuple.sol               |   4 +-
 .../encodeCall_tuple_incomplete.sol           |   2 +-
 .../encodePacked_array_of_structs.sol         |   2 +-
 .../encodePacked_dynamic_string_array_v2.sol  |   4 +-
 .../functionCallOptions_err.sol               |   6 +-
 .../specialFunctions/single_non_bytes_arg.sol |   6 +-
 ...nspecified_encoding_internal_functions.sol |   8 +-
 ...ith_unspecified_encoding_special_types.sol |  10 +-
 ...ypes_with_unspecified_encoding_structs.sol |   4 +-
 .../types_with_unspecified_encoding_types.sol |  10 +-
 .../concat/string_concat_empty_invalid.sol    |   2 +-
 ...tring_concat_with_different_parameters.sol |   6 +-
 ...ng_concat_wrong_type_bytes_and_strings.sol |   8 +-
 ..._concat_wrong_type_empty_array_literal.sol |   2 +-
 .../concat/string_concat_wrong_type_misc.sol  |  26 +-
 ...ong_type_misc_literals_and_expressions.sol |  32 +-
 .../string_concat_wrong_type_zero_literal.sol |  22 +-
 .../syntaxTests/string/hex_as_identifier.sol  |   2 +-
 .../string/invalid_legacy_escape.sol          |   2 +-
 .../string/invalid_utf8_explicit_string.sol   |   2 +-
 .../string/invalid_utf8_hex_string.sol        |   2 +-
 .../string/invalid_utf8_implicit_string.sol   |   2 +-
 .../string/invalid_utf8_sequence.sol          |   4 +-
 .../string_multipart_hex_valid_parts.sol      |   2 +-
 ...g_multipart_newline_without_hex_prefix.sol |   2 +-
 .../string/string_multipart_only_hex.sol      |   2 +-
 .../string/string_multipart_only_regular.sol  |   2 +-
 .../string/string_multipart_unicode_mixed.sol |   2 +-
 .../syntaxTests/string/string_new_line.sol    |   2 +-
 .../string/string_terminated_by_backslash.sol |   2 +-
 .../string/string_unicode_without_prefix.sol  |   2 +-
 .../string/string_unterminated.sol            |   2 +-
 .../string_unterminated_no_new_line.sol       |   2 +-
 ...code_escape_literals_invalid_codepoint.sol |   2 +-
 ...unicode_escape_literals_invalid_format.sol |   2 +-
 .../structs/address_member_access.sol         |   2 +-
 .../structs/address_member_declaration.sol    |   2 +-
 .../structs/calldata_array_assign.sol         |   2 +-
 .../syntaxTests/structs/calldata_assign.sol   |   2 +-
 .../calldata_struct_mapping_function.sol      |   2 +-
 .../contract_global_struct_name_clash.sol     |   2 +-
 .../global_struct_contract_name_clash.sol     |   2 +-
 .../structs/global_struct_shadowing.sol       |   2 +-
 .../structs/global_structs_name_clash.sol     |   2 +-
 .../syntaxTests/structs/illegal_names.sol     |  10 +-
 .../structs/member_type_eq_name.sol           |   2 +-
 .../structs/member_type_eq_name_3.sol         |  10 +-
 .../syntaxTests/structs/member_type_func.sol  |   2 +-
 .../structs/memory_to_calldata.sol            |   4 +-
 ..._struct_as_contract_function_parameter.sol |   2 +-
 ...t_as_memory_library_function_parameter.sol |   2 +-
 .../recursive_struct_forward_reference.sol    |   2 +-
 ...recursive_struct_nested_mapping_memory.sol |   2 +-
 ...function_as_library_function_parameter.sol |   2 +-
 .../recursion/return_recursive_structs.sol    |   2 +-
 .../recursion/return_recursive_structs2.sol   |   2 +-
 .../recursion/return_recursive_structs3.sol   |   2 +-
 .../syntaxTests/super/super_in_function.sol   |   2 +-
 .../syntaxTests/super/super_in_library.sol    |   2 +-
 .../syntaxTests/tight_packing_literals.sol    |   2 +-
 .../tryCatch/almost_call_options.sol          |   6 +-
 .../syntaxTests/tryCatch/catch_error.sol      |   4 +-
 .../tryCatch/catch_error_named.sol            |   4 +-
 .../syntaxTests/tryCatch/catch_low_level.sol  |   4 +-
 .../tryCatch/data_location_error_message.sol  |   2 +-
 .../syntaxTests/tryCatch/double_panic.sol     |   2 +-
 .../tryCatch/double_panic_correct.sol         |   2 +-
 .../syntaxTests/tryCatch/empty_catch.sol      |   2 +-
 .../syntaxTests/tryCatch/empty_returns.sol    |   2 +-
 .../tryCatch/error_with_wrong_type.sol        |   2 +-
 .../tryCatch/invalid_error_name.sol           |   4 +-
 .../syntaxTests/tryCatch/invalid_returns.sol  |   4 +-
 .../tryCatch/low_level_with_wrong_type.sol    |   2 +-
 .../syntaxTests/tryCatch/no_catch.sol         |   2 +-
 .../syntaxTests/tryCatch/no_external_call.sol |   2 +-
 .../syntaxTests/tryCatch/no_returns.sol       |   4 +-
 .../syntaxTests/tryCatch/no_special.sol       |   6 +-
 .../syntaxTests/tryCatch/returns.sol          |   4 +-
 .../syntaxTests/tryCatch/returns_memory.sol   |   4 +-
 .../tryCatch/returns_memory_anonymous.sol     |   4 +-
 .../tryCatch/two_catch_clauses.sol            |   4 +-
 .../syntaxTests/tryCatch/wrong_panic.sol      |   2 +-
 .../tupleAssignments/double_storage_crash.sol |   2 +-
 .../tupleAssignments/empty_tuples_lhs.sol     |  18 +-
 .../tupleAssignments/err_fill_assignment.sol  |   4 +-
 .../tupleAssignments/error_fill.sol           |   4 +-
 .../large_component_count.sol                 |   6 +-
 .../tupleAssignments/tuple_in_tuple_long.sol  |  10 +-
 .../warn_multiple_storage_storage_copies.sol  |   2 +-
 .../address/address_binary_operators.sol      |   8 +-
 .../address/address_constant_assignment.sol   |   4 +-
 .../types/address/address_in_struct_fail.sol  |   2 +-
 .../address/address_members_in_contract.sol   |   2 +-
 .../address_nonpayable_selfdestruct.sol       |   2 +-
 ...ress_payable_internal_overload_payable.sol |   2 +-
 ...ddress_payable_memory_array_conversion.sol |   4 +-
 ...dress_payable_storage_array_conversion.sol |   2 +-
 ..._payable_storage_array_conversion_fail.sol |   2 +-
 .../address_to_contract_implicitly.sol        |   2 +-
 .../address/address_to_payable_address.sol    |   4 +-
 .../address_to_payable_address_double.sol     |   2 +-
 .../types/address/address_tuple_fail.sol      |   2 +-
 .../address/address_zero_to_payable_err.sol   |   2 +-
 .../address/bytes_long_to_payable_address.sol |   4 +-
 .../bytes_short_to_payable_address.sol        |   4 +-
 ...fallback_to_payable_address_implicitly.sol |   2 +-
 ..._receive_to_payable_address_implicitly.sol |   2 +-
 .../contract_to_address_implicitly.sol        |   2 +-
 .../address/contract_type_to_address.sol      |  10 +-
 .../types/address/conversion_error.sol        |   6 +-
 .../literal_to_payable_address_err.sol        |   2 +-
 ...e_address_to_contract_payable_fallback.sol |   2 +-
 ...nonpayable_address_to_contract_receive.sol |   2 +-
 .../types/address/payable_conversion_err.sol  |   4 +-
 .../address/payable_conversion_strict_err.sol |  10 +-
 .../types/address/super_to_address.sol        |   2 +-
 .../types/address/type_type_to_address.sol    |  32 +-
 .../syntaxTests/types/bool_ops.sol            |  38 +-
 test/libsolidity/syntaxTests/types/byte.sol   |   2 +-
 test/libsolidity/syntaxTests/types/bytes0.sol |   2 +-
 .../syntaxTests/types/bytes1_to_uint256.sol   |   2 +-
 .../syntaxTests/types/bytes256.sol            |   2 +-
 .../syntaxTests/types/bytes32_to_uint32.sol   |   2 +-
 .../libsolidity/syntaxTests/types/bytes33.sol |   2 +-
 .../types/bytesNN_index_assign.sol            |   2 +-
 .../syntaxTests/types/bytesNN_to_contract.sol |   2 +-
 .../bytesNN_with_oversized_hex_string.sol     |   2 +-
 .../constant_of_invalid_function_type.sol     |   2 +-
 .../assign_function_via_base_name_to_var.sol  |   4 +-
 ...sign_function_via_contract_name_to_var.sol |   4 +-
 .../members/base_contract_invalid.sol         |   4 +-
 .../call_function_via_contract_name.sol       |   6 +-
 .../members/call_unimplemented_base.sol       |   2 +-
 .../function_via_contract_name_internal.sol   |   2 +-
 .../function_via_contract_name_overloaded.sol |   2 +-
 .../function_via_contract_name_private.sol    |   2 +-
 .../contractTypeType/members/modifier.sol     |   2 +-
 .../members/modifier_base.sol                 |   2 +-
 .../syntaxTests/types/contract_to_derived.sol |   2 +-
 .../types/contract_to_unrelated_contract.sol  |   2 +-
 ...c_dependency_check_on_consts_exhausted.sol |   2 +-
 ...c_dependency_check_on_struct_exhausted.sol |   2 +-
 .../decimal_literal_to_bytesNN_explicit.sol   |  18 +-
 .../decimal_literal_to_bytesNN_implicit.sol   |  18 +-
 .../syntaxTests/types/empty_tuple_event.sol   |   2 +-
 .../types/empty_tuple_function.sol            |   4 +-
 .../syntaxTests/types/empty_tuple_lvalue.sol  |   6 +-
 .../types/empty_tuple_lvalue_array.sol        |   2 +-
 .../syntaxTests/types/encoding_fractional.sol |   2 +-
 .../encoding_fractional_abiencoderv2.sol      |   2 +-
 .../types/encoding_packed_fractional.sol      |   4 +-
 ...ncoding_packed_fractional_abiencoderv2.sol |   4 +-
 .../syntaxTests/types/function_call_fail.sol  |   2 +-
 .../syntaxTests/types/function_call_fail2.sol |   2 +-
 .../function_definition_expression.sol        |   2 +-
 .../function_state_mutability_fail.sol        |  22 +-
 .../local_variable_selector_not_pure.sol      |   2 +-
 .../state_variable_selector_contract_name.sol |   2 +-
 .../state_variable_selector_not_pure.sol      |   6 +-
 .../state_variable_selector_super.sol         |   2 +-
 .../types/global_struct_recursive.sol         |   2 +-
 .../syntaxTests/types/hex_literal_bitnot.sol  |   2 +-
 ...ral_to_bytesNN_different_size_explicit.sol |  26 +-
 ...ral_to_bytesNN_different_size_implicit.sol |  26 +-
 ...ing_to_bytesNN_different_size_explicit.sol |   8 +-
 .../types/integer_implicit_err.sol            |   4 +-
 .../library_function_selector_internal.sol    |   2 +-
 ...brary_function_selector_private_inside.sol |   2 +-
 ...rary_function_selector_private_outside.sol |   2 +-
 .../types/library_to_address_payable.sol      |   2 +-
 .../types/mapping/access_index_omitted.sol    |   2 +-
 .../types/mapping/argument_external.sol       |   2 +-
 .../types/mapping/argument_public.sol         |   2 +-
 .../types/mapping/array_argument_external.sol |   2 +-
 .../types/mapping/array_argument_public.sol   |   2 +-
 .../types/mapping/assignment_local_err.sol    |   2 +-
 .../types/mapping/assignment_map.sol          |  10 +-
 .../mapping/assignment_state_variable.sol     |   8 +-
 .../types/mapping/assignment_struct.sol       |   8 +-
 .../mapping/contract_mapping_invalid.sol      |   6 +-
 ...ontract_storage_parameter_with_mapping.sol |   2 +-
 .../types/mapping/enum_mapping_invalid.sol    |   4 +-
 .../types/mapping/error_parameter.sol         |   2 +-
 .../types/mapping/event_parameter.sol         |   2 +-
 .../function_type_argument_external.sol       |   2 +-
 .../mapping/function_type_return_external.sol |   2 +-
 .../syntaxTests/types/mapping/int_mapping.sol |   2 +-
 .../types/mapping/library_mapping.sol         |   4 +-
 .../types/mapping/library_nested_mapping.sol  |   2 +-
 ..._data_location_function_param_external.sol |   2 +-
 .../mapping/mapping_array_return_external.sol |   2 +-
 .../mapping/mapping_array_return_public.sol   |   2 +-
 .../mapping_data_location_calldata.sol        |   2 +-
 .../mapping/mapping_data_location_default.sol |   2 +-
 ..._data_location_function_param_external.sol |   2 +-
 ..._data_location_function_param_internal.sol |   2 +-
 ...ng_data_location_function_param_public.sol |   2 +-
 .../mapping/mapping_data_location_memory.sol  |   2 +-
 .../mapping/mapping_function_calldata.sol     |   2 +-
 .../types/mapping/mapping_return_external.sol |   2 +-
 .../types/mapping/mapping_return_public.sol   |   2 +-
 .../mapping/mapping_return_public_memory.sol  |   2 +-
 .../mapping_struct_data_location_memory.sol   |   2 +-
 ..._struct_recusrive_data_location_memory.sol |   2 +-
 .../types/mapping/memory_struct_recursive.sol |   2 +-
 .../mapping/memory_structs_with_mappings.sol  |   2 +-
 .../user_defined_types_mapping_memory.sol     |   2 +-
 .../syntaxTests/types/no_singleton_tuple.sol  |   2 +-
 .../rational_number_array_index_limit.sol     |   2 +-
 .../types/rational_number_bitshift_limit.sol  |   8 +-
 .../types/rational_number_div_limit.sol       |   4 +-
 .../types/rational_number_exp_limit_fail.sol  |  44 +-
 .../types/rational_number_literal_limit_1.sol |   2 +-
 .../types/rational_number_mul_limit.sol       |   4 +-
 .../rational_number_signed_to_unsigned.sol    |   4 +-
 .../types/rational_number_too_large.sol       |   6 +-
 .../syntaxTests/types/strict_explicit.sol     |   2 +-
 .../syntaxTests/types/strict_explicit_err.sol |  28 +-
 .../types/struct_mapping_recursion.sol        |   2 +-
 .../types/too_small_negative_numbers.sol      |   2 +-
 .../syntaxTests/types/uint256_to_bytes1.sol   |   2 +-
 .../syntaxTests/types/uint32_to_bytes32.sol   |   2 +-
 .../syntaxTests/types/unnamed_tuple_decl.sol  |   2 +-
 .../types/var_decl_val_mismatch.sol           |   4 +-
 .../syntaxTests/types/var_empty_decl_1.sol    |   2 +-
 .../syntaxTests/types/var_empty_decl_2.sol    |   2 +-
 .../syntaxTests/types/var_empty_decl_3.sol    |   2 +-
 .../unchecked/unchecked_for_header.sol        |   2 +-
 .../unchecked/unchecked_function_body.sol     |   2 +-
 .../unchecked/unchecked_modifier.sol          |   2 +-
 .../unchecked/unchecked_post_for.sol          |   2 +-
 .../unchecked/unchecked_vardecl.sol           |   2 +-
 .../unchecked/unchecked_while_body.sol        |   2 +-
 .../syntaxTests/underscore/in_function.sol    |   6 +-
 .../syntaxTests/underscore/in_modifier.sol    |   2 +-
 test/libsolidity/syntaxTests/unexpected.sol   |   2 +-
 .../unimplemented_super_function.sol          |   2 +-
 .../unimplemented_super_function_derived.sol  |   2 +-
 .../unterminatedBlocks/one_dot_x.sol          |   2 +-
 .../unterminatedBlocks/zero_dot_x.sol         |   2 +-
 .../syntaxTests/unusedVariables/try_catch.sol |   8 +-
 .../userDefinedValueType/constant.sol         |   2 +-
 .../userDefinedValueType/conversion_err.sol   |   2 +-
 .../explicit_conversions_err.sol              |  16 +-
 .../explicit_conversions_wrap.sol             |   4 +-
 .../explicit_literal_conversion_wrap.sol      |   6 +-
 .../forward_reference_err.sol                 |   2 +-
 .../implicit_conversion_err.sol               |  12 +-
 .../userDefinedValueType/multisource1.sol     |   2 +-
 .../userDefinedValueType/multisource2.sol     |   2 +-
 .../userDefinedValueType/multisource4.sol     |   2 +-
 .../name_conflict_contract_warning.sol        |   2 +-
 .../name_conflict_err.sol                     |   4 +-
 .../non_value_type_bytes.sol                  |   2 +-
 .../non_value_type_contract_err.sol           |   2 +-
 .../non_value_type_function_err.sol           |   2 +-
 .../non_value_type_mapping_err.sol            |   2 +-
 .../non_value_type_string_err.sol             |   2 +-
 .../non_value_type_struct_err.sol             |   2 +-
 .../userDefinedValueType/recursive_err.sol    |   2 +-
 .../userDefinedValueType/repetition_err.sol   |   4 +-
 .../self_reference_err.sol                    |   2 +-
 .../wrap_unwrap_calls_err.sol                 |  10 +-
 ...rap_unwrap_via_contract_name_different.sol |   2 +-
 .../syntaxTests/using/double_asterisk.sol     |   2 +-
 .../file_level_inactive_after_import.sol      |   2 +-
 ...free_functions_implicit_conversion_err.sol |   2 +-
 .../using/free_functions_non_unique_err.sol   |   2 +-
 .../syntaxTests/using/free_overloads.sol      |   2 +-
 .../using/free_overloads_array.sol            |   2 +-
 .../syntaxTests/using/global_for_asterisk.sol |   4 +-
 .../using/global_for_non_user_defined.sol     |   2 +-
 .../global_for_type_defined_elsewhere.sol     |   2 +-
 .../using/global_for_type_from_other_file.sol |   4 +-
 .../using/global_inside_contract.sol          |   4 +-
 .../syntaxTests/using/global_local_clash.sol  |   2 +-
 .../syntaxTests/using/global_nonglobal.sol    |   2 +-
 ...library_non_free_external_function_err.sol |   2 +-
 .../syntaxTests/using/module_1.sol            |   2 +-
 .../using/module_identifier_not_found.sol     |   2 +-
 .../syntaxTests/using/using_contract_err.sol  |   2 +-
 .../using/using_empty_list_err.sol            |   2 +-
 .../using/using_empty_list_file_level.sol     |   2 +-
 .../using/using_for_ast_file_level.sol        |   2 +-
 .../using/using_free_no_parameters_err.sol    |   2 +-
 .../using/using_functions_with_ast.sol        |   2 +-
 .../syntaxTests/using/using_lhs_asterisk.sol  |   2 +-
 .../using/using_lhs_asterisk_contract.sol     |   2 +-
 .../using/using_library_ast_file_level.sol    |   2 +-
 .../using/using_non_free_function_err.sol     |   4 +-
 .../syntaxTests/using/using_non_function.sol  |   2 +-
 .../variableDeclaration/do_while.sol          |   2 +-
 .../syntaxTests/variableDeclaration/else.sol  |   2 +-
 .../syntaxTests/variableDeclaration/for.sol   |   2 +-
 .../syntaxTests/variableDeclaration/if.sol    |   2 +-
 .../variableDeclaration/illegal_names.sol     |  32 +-
 .../syntaxTests/variableDeclaration/while.sol |   2 +-
 .../access_to_base_member_function.sol        |   2 +-
 .../access_to_base_member_struct.sol          |   8 +-
 .../access_to_base_members.sol                |   4 +-
 .../array/access_to_array_push_view.sol       |   2 +-
 .../array/access_to_base_member_array.sol     |   8 +-
 .../assembly_chainid_not_pure.sol             |   4 +-
 .../viewPureChecker/basefee_not_pure.sol      |   4 +-
 .../builtin_functions_view_fail.sol           |  10 +-
 .../call_internal_functions_fail.sol          |   4 +-
 .../call_internal_functions_success.sol       |  12 +-
 .../viewPureChecker/creation_view_fail.sol    |   2 +-
 .../viewPureChecker/function_types_fail.sol   |   6 +-
 .../gas_with_call_nonpayable.sol              |   4 +-
 .../local_storage_variables_fail.sol          |   4 +-
 .../viewPureChecker/modifiers_fail.sol        |   4 +-
 .../viewPureChecker/msg_value_modifier.sol    |   2 +-
 .../msg_value_modifier_view.sol               |   2 +-
 .../viewPureChecker/overriding_fail.sol       |   4 +-
 .../read_storage_pure_fail.sol                |   2 +-
 .../returning_structs_fail.sol                |   4 +-
 .../viewPureChecker/selector_complex.sol      |   2 +-
 .../value_with_call_nonpayable.sol            |   4 +-
 .../viewPureChecker/write_storage_fail.sol    |   2 +-
 .../visibility/function_no_visibility.sol     |   2 +-
 .../visibility/interface/function_default.sol |   4 +-
 .../interface/function_internal.sol           |   2 +-
 .../visibility/interface/function_private.sol |   2 +-
 .../visibility/interface/function_public.sol  |   2 +-
 .../interface_contract_function_default.sol   |   6 +-
 .../visibility/library_self_delegatecall.sol  |   2 +-
 .../libyul/yulSyntaxTests/are_we_perl_yet.yul |  12 +-
 .../yulSyntaxTests/assign_from_stack.yul      |   2 +-
 .../assignment_duplicate_vars.yul             |   4 +-
 .../libyul/yulSyntaxTests/assignment_fail.yul |   4 +-
 .../yulSyntaxTests/assignment_of_function.yul |   2 +-
 .../break_outside_of_for_loop.yul             |   2 +-
 .../builtin_function_literal.yul              |   6 +-
 .../yulSyntaxTests/builtin_identifier_1.yul   |   2 +-
 .../yulSyntaxTests/builtin_identifier_2.yul   |   2 +-
 .../yulSyntaxTests/builtin_identifier_3.yul   |   2 +-
 .../yulSyntaxTests/builtin_identifier_4.yul   |   2 +-
 .../yulSyntaxTests/builtin_identifier_5.yul   |   2 +-
 .../yulSyntaxTests/builtin_identifier_6.yul   |   2 +-
 .../yulSyntaxTests/builtin_identifier_7.yul   |   2 +-
 test/libyul/yulSyntaxTests/call_literal.yul   |   2 +-
 .../continue_outside_of_for_loop.yul          |   2 +-
 .../yulSyntaxTests/datacopy_shadowing.yul     |   2 +-
 .../yulSyntaxTests/dataoffset_shadowing.yul   |   2 +-
 .../yulSyntaxTests/datasize_shadowing.yul     |   2 +-
 .../declaration_duplicate_vars.yul            |   2 +-
 .../dot_consecutive_function.yul              |   2 +-
 .../dot_consecutive_function_arg.yul          |   2 +-
 .../dot_consecutive_function_ret.yul          |   2 +-
 .../dot_consecutive_variabledeclaration.yul   |   2 +-
 .../yulSyntaxTests/dot_ellipse_function.yul   |   2 +-
 .../dot_ellipse_function_arg.yul              |   2 +-
 .../dot_ellipse_function_ret.yul              |   2 +-
 .../dot_ellipse_variabledeclaration.yul       |   2 +-
 .../yulSyntaxTests/dot_leading_function.yul   |   2 +-
 .../dot_leading_function_arg.yul              |   2 +-
 .../dot_leading_function_ret.yul              |   2 +-
 .../dot_leading_variabledeclaration.yul       |   2 +-
 .../yulSyntaxTests/dot_trailing_function.yul  |   2 +-
 .../dot_trailing_function_arg.yul             |   2 +-
 .../dot_trailing_function_ret.yul             |   2 +-
 .../dot_trailing_variabledeclaration.yul      |   2 +-
 test/libyul/yulSyntaxTests/empty_call.yul     |   2 +-
 .../yulSyntaxTests/for_expr_invalid_1.yul     |   2 +-
 .../yulSyntaxTests/for_expr_invalid_2.yul     |   2 +-
 .../yulSyntaxTests/for_expr_invalid_3.yul     |   2 +-
 .../yulSyntaxTests/for_expr_invalid_4.yul     |   2 +-
 .../yulSyntaxTests/for_expr_invalid_5.yul     |   2 +-
 .../yulSyntaxTests/for_expr_invalid_6.yul     |   2 +-
 .../for_loop_condition_fail.yul               |   2 +-
 .../for_loop_condition_fail_ewasm.yul         |   2 +-
 .../for_statement_break_init.yul              |   2 +-
 .../for_statement_break_post.yul              |   2 +-
 .../for_statement_continue_fail_init.yul      |   2 +-
 .../for_statement_continue_fail_post.yul      |   2 +-
 ...statement_continue_nested_init_in_body.yul |   2 +-
 .../for_statement_nested_break.yul            |   2 +-
 .../for_statement_nested_continue.yul         |   2 +-
 .../yulSyntaxTests/for_visibility_2.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_3.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_4.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_5.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_6.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_7.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_8.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_9.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_A.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_B.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_C.yul       |   2 +-
 .../yulSyntaxTests/for_visibility_D.yul       |   2 +-
 .../function_defined_in_init_block_3.yul      |   2 +-
 .../function_defined_in_init_nested_2.yul     |   2 +-
 .../function_defined_in_init_nested_3.yul     |   2 +-
 .../function_definition_whitespace.yul        |   2 +-
 .../yulSyntaxTests/function_literal.yul       |   2 +-
 .../function_shadowing_outside_vars_2.yul     |   2 +-
 .../yulSyntaxTests/functional_partial.yul     |   2 +-
 .../yulSyntaxTests/hex_string_literal_odd.yul |   2 +-
 .../yulSyntaxTests/if_statement_fail_1.yul    |   2 +-
 .../yulSyntaxTests/if_statement_fail_2.yul    |   2 +-
 .../yulSyntaxTests/if_statement_fail_3.yul    |   2 +-
 .../yulSyntaxTests/if_statement_invalid_1.yul |   2 +-
 .../yulSyntaxTests/if_statement_invalid_2.yul |   2 +-
 .../yulSyntaxTests/if_statement_invalid_3.yul |   2 +-
 .../yulSyntaxTests/if_statement_invalid_4.yul |   2 +-
 .../yulSyntaxTests/if_statement_scope_2.yul   |   2 +-
 test/libyul/yulSyntaxTests/instructions.yul   |   2 +-
 .../instructions_too_few_args_1.yul           |   2 +-
 .../instructions_too_few_args_2.yul           |   2 +-
 .../instructions_too_many_args.yul            |   2 +-
 .../yulSyntaxTests/invalid/dup_disallowed.yul |  36 +-
 .../invalid/invalid_octal_number.yul          |   2 +-
 .../invalid/jump_disallowed.yul               |   2 +-
 .../invalid/jumpdest_disallowed.yul           |   2 +-
 .../invalid/jumpi_disallowed.yul              |   2 +-
 .../invalid/label_disallowed.yul              |   2 +-
 .../invalid/leave_items_on_stack.yul          |   2 +-
 .../leave_items_on_stack_with_debug_info.yul  |   2 +-
 .../invalid/literals_on_stack_disallowed.yul  |   2 +-
 ...ls_on_stack_disallowed_with_debug_info.yul |   4 +-
 .../yulSyntaxTests/invalid/pc_disallowed.yul  |   2 +-
 .../invalid/push_disallowed.yul               |  66 +--
 .../invalid/swap_disallowed.yul               |  36 +-
 .../unicode_comment_direction_override.sol    |   2 +-
 .../unicode_string_direction_override.sol     |   2 +-
 .../invalid/verbatim_empty_string.yul         |   2 +-
 .../invalid/verbatim_leading_zero.yul         |   2 +-
 .../invalid/verbatim_reserved.yul             |   2 +-
 .../invalid/verbatim_reserved2.yul            |   6 +-
 .../invalid_tuple_assignment.yul              |   2 +-
 ...valid_tuple_assignment_with_debug_info.yul |   2 +-
 test/libyul/yulSyntaxTests/invalid_type.yul   |   2 +-
 test/libyul/yulSyntaxTests/invalid_type2.yul  |   4 +-
 test/libyul/yulSyntaxTests/invalid_type3.yul  |   4 +-
 test/libyul/yulSyntaxTests/invalid_type4.yul  |   4 +-
 .../linkersymbol_bad_literal.yul              |   6 +-
 .../yulSyntaxTests/linkersymbol_evmtyped.yul  |   2 +-
 .../yulSyntaxTests/linkersymbol_ewasm.yul     |   2 +-
 .../linkersymbol_non_literal_args.yul         |   2 +-
 .../yulSyntaxTests/linkersymbol_shadowing.yul |   2 +-
 .../yulSyntaxTests/literal_invalid_type.yul   |   6 +-
 .../loadimmutable_bad_literal.yul             |   6 +-
 .../loadimmutable_shadowing.yul               |   2 +-
 .../libyul/yulSyntaxTests/metadata_access.yul |  16 +-
 .../yulSyntaxTests/metadata_access_2.yul      |   2 +-
 .../metadata_access_subobject.yul             |   2 +-
 .../yulSyntaxTests/multiple_assignment_1.yul  |   2 +-
 .../yulSyntaxTests/multiple_assignment_2.yul  |   2 +-
 .../name_clash_function_var_subscope.yul      |   2 +-
 ...me_clash_function_var_subscope_reverse.yul |   2 +-
 .../yulSyntaxTests/name_clash_sub_scope.yul   |   2 +-
 .../name_clash_sub_scope_reverse.yul          |   2 +-
 .../name_clash_sub_scope_with_debug_info.yul  |   2 +-
 test/libyul/yulSyntaxTests/name_clashes.yul   |   2 +-
 .../yulSyntaxTests/number_literal_2.yul       |   2 +-
 .../yulSyntaxTests/number_literal_3.yul       |   2 +-
 .../yulSyntaxTests/number_literal_4.yul       |   2 +-
 .../yulSyntaxTests/number_literals_2.yul      |   2 +-
 .../yulSyntaxTests/number_literals_3.yul      |   2 +-
 .../yulSyntaxTests/number_literals_4.yul      |   2 +-
 test/libyul/yulSyntaxTests/objects/code.yul   |   2 +-
 .../objects/code_without_object.yul           |   2 +-
 .../objects/conflict_data_data.yul            |   2 +-
 .../objects/conflict_data_parent.yul          |   2 +-
 .../objects/conflict_object_data.yul          |   2 +-
 .../objects/conflict_object_object.yul        |   2 +-
 .../objects/conflict_object_parent.yul        |   2 +-
 .../yulSyntaxTests/objects/data_first.yul     |   2 +-
 .../yulSyntaxTests/objects/data_hex_name.yul  |   2 +-
 .../objects/data_invalid_hex1.yul             |   2 +-
 .../objects/data_invalid_hex2.yul             |   2 +-
 .../objects/dataoffset_nonliteral.yul         |   2 +-
 .../objects/dataoffset_nonstring.yul          |   2 +-
 .../objects/dataoffset_notfound.yul           |   2 +-
 .../objects/datasize_nonliteral.yul           |   2 +-
 .../objects/datasize_nonstring.yul            |   2 +-
 .../objects/datasize_notfound.yul             |   2 +-
 .../yulSyntaxTests/objects/empty_data.yul     |   2 +-
 .../yulSyntaxTests/objects/empty_object.yul   |   2 +-
 .../objects/empty_object_name.yul             |   4 +-
 .../yulSyntaxTests/objects/incomplete1.yul    |   2 +-
 .../yulSyntaxTests/objects/incomplete2.yul    |   2 +-
 .../yulSyntaxTests/objects/multiple_code.yul  |   2 +-
 .../objects/multiple_root_object.yul          |   2 +-
 .../objects/object_hex_name.yul               |   2 +-
 .../objects/subobject_first.yul               |   2 +-
 .../objects/subobject_hex_name.yul            |   2 +-
 .../opcode_for_function_args_1.yul            |   2 +-
 .../opcode_for_function_args_2.yul            |   2 +-
 .../yulSyntaxTests/opcode_for_functions.yul   |   2 +-
 ...literal_argument_into_literal_argument.yul |   2 +-
 .../period_in_identifier_spaced_1.yul         |   2 +-
 .../period_in_identifier_spaced_2.yul         |   2 +-
 .../period_in_identifier_spaced_3.yul         |   2 +-
 .../period_not_as_identifier_start.yul        |   2 +-
 test/libyul/yulSyntaxTests/push.yul           |   2 +-
 .../libyul/yulSyntaxTests/recursion_depth.yul |   2 +-
 .../setimmutable_bad_literal.yul              |   6 +-
 .../yulSyntaxTests/setimmutable_shadowing.yul |   2 +-
 test/libyul/yulSyntaxTests/surplus_input.yul  |   2 +-
 .../switch_default_before_case.yul            |   2 +-
 .../yulSyntaxTests/switch_duplicate_case.yul  |   2 +-
 ...witch_duplicate_case_different_literal.yul |   2 +-
 .../switch_duplicate_default.yul              |   2 +-
 .../yulSyntaxTests/switch_invalid_body.yul    |   2 +-
 .../yulSyntaxTests/switch_invalid_case.yul    |   2 +-
 .../yulSyntaxTests/switch_invalid_expr_1.yul  |   2 +-
 .../yulSyntaxTests/switch_invalid_expr_2.yul  |   2 +-
 .../yulSyntaxTests/switch_invalid_expr_3.yul  |   2 +-
 .../yulSyntaxTests/switch_statement_1.yul     |   2 +-
 .../switch_statement_duplicate_case.yul       |   2 +-
 .../switch_statement_no_access.yul            |   2 +-
 .../yulSyntaxTests/type_check_cases_fail.yul  |   4 +-
 .../type_check_cases_fail_evmtyped.yul        |   4 +-
 .../type_check_if_condition_fail.yul          |   2 +-
 .../user_defined_functions_fail.yul           |   4 +-
 .../yulSyntaxTests/vardecl_multi_conflict.yul |   2 +-
 .../yulSyntaxTests/vardecl_name_clashes.yul   |   2 +-
 .../variable_access_cross_funcs.yul           |   2 +-
 .../variable_use_before_decl_1.yul            |   2 +-
 .../variable_use_before_decl_2.yul            |   2 +-
 .../yulSyntaxTests/verbatim_leading_zero.yul  |   2 +-
 2684 files changed, 5877 insertions(+), 5877 deletions(-)

diff --git a/test/libsolidity/errorRecoveryTests/constructor_recovers.sol b/test/libsolidity/errorRecoveryTests/constructor_recovers.sol
index cc03f1e89..cb358eb9b 100644
--- a/test/libsolidity/errorRecoveryTests/constructor_recovers.sol
+++ b/test/libsolidity/errorRecoveryTests/constructor_recovers.sol
@@ -16,5 +16,5 @@ contract Error1 {
   }
 }
 // ----
-// ParserError 6933: (88-89): Expected primary expression.
-// Warning 3347: (88-89): Recovered in Statement at ';'.
+// ParserError 6933: (88-89=';'): Expected primary expression.
+// Warning 3347: (88-89=';'): Recovered in Statement at ';'.
diff --git a/test/libsolidity/errorRecoveryTests/contract_recovery.sol b/test/libsolidity/errorRecoveryTests/contract_recovery.sol
index 980c2beab..c789a09cb 100644
--- a/test/libsolidity/errorRecoveryTests/contract_recovery.sol
+++ b/test/libsolidity/errorRecoveryTests/contract_recovery.sol
@@ -3,5 +3,5 @@ contract Errort6 {
 }
 
 // ----
-// ParserError 3546: (36-37): Expected type name
-// Warning 3796: (59-60): Recovered in ContractDefinition at '}'.
+// ParserError 3546: (36-37=';'): Expected type name
+// Warning 3796: (59-60='}'): Recovered in ContractDefinition at '}'.
diff --git a/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol b/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol
index cc3c1561a..427ae74cf 100644
--- a/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol
+++ b/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol
@@ -10,4 +10,4 @@ contract Error2 {
 	mapping (address => uint balances; // missing ) before "balances"
 }
 // ----
-// ParserError 6635: (417-425): Expected ')' but got identifier
+// ParserError 6635: (417-425='balances'): Expected ')' but got identifier
diff --git a/test/libsolidity/errorRecoveryTests/error_to_eos.sol b/test/libsolidity/errorRecoveryTests/error_to_eos.sol
index 17d51a62d..bf2242512 100644
--- a/test/libsolidity/errorRecoveryTests/error_to_eos.sol
+++ b/test/libsolidity/errorRecoveryTests/error_to_eos.sol
@@ -17,7 +17,7 @@ contract SendCoin {
 }
 
 // ----
-// ParserError 6635: (212-220): Expected ')' but got identifier
-// ParserError 6635: (220-221): Expected ';' but got ')'
-// ParserError 9182: (220-221): Function, variable, struct or modifier declaration expected.
-// Warning 3796: (235-236): Recovered in ContractDefinition at '}'.
+// ParserError 6635: (212-220='balances'): Expected ')' but got identifier
+// ParserError 6635: (220-221=')'): Expected ';' but got ')'
+// ParserError 9182: (220-221=')'): Function, variable, struct or modifier declaration expected.
+// Warning 3796: (235-236='}'): Recovered in ContractDefinition at '}'.
diff --git a/test/libsolidity/errorRecoveryTests/missing_rhs.sol b/test/libsolidity/errorRecoveryTests/missing_rhs.sol
index aaf7a7509..ebd523331 100644
--- a/test/libsolidity/errorRecoveryTests/missing_rhs.sol
+++ b/test/libsolidity/errorRecoveryTests/missing_rhs.sol
@@ -7,5 +7,5 @@ contract Error3 {
 
 }
 // ----
-// ParserError 6933: (88-89): Expected primary expression.
-// Warning 3347: (88-89): Recovered in Statement at ';'.
+// ParserError 6933: (88-89=';'): Expected primary expression.
+// Warning 3347: (88-89=';'): Recovered in Statement at ';'.
diff --git a/test/libsolidity/errorRecoveryTests/multiple_errors.sol b/test/libsolidity/errorRecoveryTests/multiple_errors.sol
index c0a0bd32c..aea9f86cd 100644
--- a/test/libsolidity/errorRecoveryTests/multiple_errors.sol
+++ b/test/libsolidity/errorRecoveryTests/multiple_errors.sol
@@ -21,9 +21,9 @@ contract Error4 {
 
 }
 // ----
-// ParserError 6635: (242-243): Expected ';' but got 'Number'
-// ParserError 6635: (464-472): Expected ';' but got identifier
-// ParserError 6635: (522-526): Expected ';' but got 'emit'
-// ParserError 6635: (570-576): Expected ',' but got 'return'
-// ParserError 6933: (570-576): Expected primary expression.
-// Warning 3796: (581-582): Recovered in Statement at ';'.
+// ParserError 6635: (242-243='2'): Expected ';' but got 'Number'
+// ParserError 6635: (464-472='balances'): Expected ';' but got identifier
+// ParserError 6635: (522-526='emit'): Expected ';' but got 'emit'
+// ParserError 6635: (570-576='return'): Expected ',' but got 'return'
+// ParserError 6933: (570-576='return'): Expected primary expression.
+// Warning 3796: (581-582=';'): Recovered in Statement at ';'.
diff --git a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_1.sol b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_1.sol
index 9baa5638e..ec9633c48 100644
--- a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_1.sol
+++ b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_1.sol
@@ -1,3 +1,3 @@
 pragma solidity ^99.99.0;
 // ----
-// SyntaxError 3997: (0-25): Source file requires different compiler version (current compiler is ....
+// SyntaxError 3997: (0-25='pragma solidity ^99.99.0;'): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_2.sol b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_2.sol
index 1dcc4bc79..6229cbd88 100644
--- a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_2.sol
+++ b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_2.sol
@@ -1,6 +1,6 @@
 pragma solidity ^99.99.0;
 this is surely invalid
 // ----
-// ParserError 6635: (31-33): Expected identifier but got 'is'
-// ParserError 6635: (34-40): Expected ';' but got identifier
+// ParserError 6635: (31-33='is'): Expected identifier but got 'is'
+// ParserError 6635: (34-40='surely'): Expected ';' but got identifier
 // ParserError 6635: (49-49): Expected ';' but got end of source
diff --git a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_3.sol b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_3.sol
index 40fae8116..fd84992e2 100644
--- a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_3.sol
+++ b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_3.sol
@@ -3,5 +3,5 @@ contract C {
     uint ;
 }
 // ----
-// ParserError 6635: (48-49): Expected identifier but got ';'
-// ParserError 6635: (50-51): Expected ';' but got '}'
+// ParserError 6635: (48-49=';'): Expected identifier but got ';'
+// ParserError 6635: (50-51='}'): Expected ';' but got '}'
diff --git a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_4.sol b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_4.sol
index fadf021c7..cd7c0bedd 100644
--- a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_4.sol
+++ b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_4.sol
@@ -3,5 +3,5 @@ contract C {
     function f() {}
 }
 // ----
-// SyntaxError 3997: (0-25): Source file requires different compiler version (current compiler is ....
-// SyntaxError 4937: (43-58): No visibility specified. Did you intend to add "public"?
+// SyntaxError 3997: (0-25='pragma solidity ^99.99.0;'): Source file requires different compiler version (current compiler is ....
+// SyntaxError 4937: (43-58='function f() {}'): No visibility specified. Did you intend to add "public"?
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol b/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
index e2c089493..19600f671 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
@@ -32,13 +32,13 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (182-210): CHC: Assertion violation happens here.
-// Warning 6328: (335-363): CHC: Assertion violation happens here.
-// Warning 6328: (414-442): CHC: Assertion violation happens here.
-// Warning 6328: (560-588): CHC: Assertion violation happens here.
-// Warning 6328: (607-635): CHC: Assertion violation happens here.
-// Warning 6328: (654-682): CHC: Assertion violation happens here.
+// Warning 6328: (182-210='assert(a.length == b.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (335-363='assert(a.length == d.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (414-442='assert(b.length == c.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (560-588='assert(e.length == a.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (607-635='assert(f.length == b.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (654-682='assert(e.length == g.length)'): CHC: Assertion violation happens here.
 // Warning 6328: (879-916): CHC: Assertion violation happens here.
-// Warning 6328: (1009-1037): CHC: Assertion violation happens here.
-// Warning 6328: (1056-1084): CHC: Assertion violation happens here.
-// Warning 6328: (1103-1131): CHC: Assertion violation happens here.
+// Warning 6328: (1009-1037='assert(k.length == a.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (1056-1084='assert(k.length == l.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (1103-1131='assert(l.length == b.length)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
index 585020d0a..9c7d24613 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
@@ -21,14 +21,14 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (505-519): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (538-552): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (209-223): CHC: Assertion violation happens here.
-// Warning 6328: (260-274): CHC: Assertion violation happens here.
-// Warning 6328: (359-373): CHC: Assertion violation happens here.
-// Warning 6328: (392-406): CHC: Assertion violation happens here.
-// Warning 6328: (425-434): CHC: Assertion violation happens here.
-// Warning 6328: (505-519): CHC: Assertion violation might happen here.
-// Warning 6328: (538-552): CHC: Assertion violation might happen here.
-// Warning 4661: (505-519): BMC: Assertion violation happens here.
-// Warning 4661: (538-552): BMC: Assertion violation happens here.
+// Warning 1218: (505-519='assert(k == x)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (538-552='assert(l == y)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (209-223='assert(x == y)'): CHC: Assertion violation happens here.
+// Warning 6328: (260-274='assert(z == w)'): CHC: Assertion violation happens here.
+// Warning 6328: (359-373='assert(a == x)'): CHC: Assertion violation happens here.
+// Warning 6328: (392-406='assert(b == y)'): CHC: Assertion violation happens here.
+// Warning 6328: (425-434='assert(c)'): CHC: Assertion violation happens here.
+// Warning 6328: (505-519='assert(k == x)'): CHC: Assertion violation might happen here.
+// Warning 6328: (538-552='assert(l == y)'): CHC: Assertion violation might happen here.
+// Warning 4661: (505-519='assert(k == x)'): BMC: Assertion violation happens here.
+// Warning 4661: (538-552='assert(l == y)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice.sol
index 9b1440f89..c878c09c0 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice.sol
@@ -26,4 +26,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (279-309): CHC: Assertion violation happens here.
+// Warning 6328: (279-309='assert(b1.length == b2.length)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice_2.sol
index 4c8e32697..8d3132462 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_array_slice_2.sol
@@ -26,7 +26,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (332-347): Unused local variable.
-// Warning 2072: (618-633): Unused local variable.
-// Warning 2072: (791-806): Unused local variable.
-// Warning 6328: (280-310): CHC: Assertion violation happens here.
+// Warning 2072: (332-347='bytes memory b3'): Unused local variable.
+// Warning 2072: (618-633='bytes memory b4'): Unused local variable.
+// Warning 2072: (791-806='bytes memory b5'): Unused local variable.
+// Warning 6328: (280-310='assert(b1.length == b2.length)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol
index 72fd4290c..ecbd5dd53 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol
@@ -15,12 +15,12 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6031: (233-249): Internal error: Expression undefined for SMT solver.
-// Warning 6031: (298-314): Internal error: Expression undefined for SMT solver.
-// Warning 6031: (398-414): Internal error: Expression undefined for SMT solver.
-// Warning 1218: (330-360): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (430-460): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (330-360): CHC: Assertion violation might happen here.
-// Warning 6328: (430-460): CHC: Assertion violation might happen here.
-// Warning 4661: (330-360): BMC: Assertion violation happens here.
-// Warning 4661: (430-460): BMC: Assertion violation happens here.
+// Warning 6031: (233-249='this.callMeMaybe'): Internal error: Expression undefined for SMT solver.
+// Warning 6031: (298-314='this.callMeMaybe'): Internal error: Expression undefined for SMT solver.
+// Warning 6031: (398-414='this.callMeMaybe'): Internal error: Expression undefined for SMT solver.
+// Warning 1218: (330-360='assert(b1.length == b2.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (430-460='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (330-360='assert(b1.length == b2.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (430-460='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (330-360='assert(b1.length == b2.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (430-460='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol
index 1a3c71982..1e115a1f7 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6031: (54-60): Internal error: Expression undefined for SMT solver.
+// Warning 6031: (54-60='this.f'): Internal error: Expression undefined for SMT solver.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol
index 336696d39..1c9134427 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol
@@ -16,7 +16,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (120-142): CHC: Assertion violation happens here.
-// Warning 6328: (231-253): CHC: Assertion violation happens here.
-// Warning 6328: (307-330): CHC: Assertion violation happens here.
-// Warning 6328: (423-446): CHC: Assertion violation happens here.
+// Warning 6328: (120-142='assert(res.length > 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (231-253='assert(res.length > 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (307-330='assert(res.length == 4)'): CHC: Assertion violation happens here.
+// Warning 6328: (423-446='assert(res.length == 4)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice.sol
index 91bcfe5ea..6e25a8852 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice.sol
@@ -30,7 +30,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (127-142): Unused local variable.
-// Warning 2072: (691-706): Unused local variable.
-// Warning 2072: (1099-1114): Unused local variable.
-// Warning 6328: (1047-1077): CHC: Assertion violation happens here.
+// Warning 2072: (127-142='bytes memory b2'): Unused local variable.
+// Warning 2072: (691-706='bytes memory b4'): Unused local variable.
+// Warning 2072: (1099-1114='bytes memory b6'): Unused local variable.
+// Warning 6328: (1047-1077='assert(b1.length == b5.length)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice_2.sol
index fc34ff1c7..b48983fa5 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_array_slice_2.sol
@@ -30,5 +30,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (643-658): Unused local variable.
-// Warning 6328: (298-328): CHC: Assertion violation happens here.
+// Warning 2072: (643-658='bytes memory b4'): Unused local variable.
+// Warning 6328: (298-328='assert(b1.length == b2.length)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
index 8257afd1e..43eab507a 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
@@ -23,15 +23,15 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (322-352): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (419-449): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (528-558): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (577-607): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (322-352): CHC: Assertion violation might happen here.
-// Warning 6328: (419-449): CHC: Assertion violation might happen here.
-// Warning 6328: (528-558): CHC: Assertion violation might happen here.
-// Warning 6328: (577-607): CHC: Assertion violation might happen here.
-// Warning 4661: (322-352): BMC: Assertion violation happens here.
-// Warning 4661: (419-449): BMC: Assertion violation happens here.
-// Warning 4661: (528-558): BMC: Assertion violation happens here.
-// Warning 4661: (577-607): BMC: Assertion violation happens here.
+// Warning 1218: (322-352='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (419-449='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (528-558='assert(b1.length != b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (577-607='assert(b1.length == b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (322-352='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (419-449='assert(b1.length == b4.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (528-558='assert(b1.length != b5.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (577-607='assert(b1.length == b5.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (322-352='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (419-449='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (528-558='assert(b1.length != b5.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (577-607='assert(b1.length == b5.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
index 31b9f59ce..dd6850e77 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
@@ -22,18 +22,18 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (226-256): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (310-340): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (483-513): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (568-598): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (654-684): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (226-256): CHC: Assertion violation might happen here.
-// Warning 6328: (310-340): CHC: Assertion violation might happen here.
-// Warning 6328: (483-513): CHC: Assertion violation might happen here.
-// Warning 6328: (568-598): CHC: Assertion violation might happen here.
-// Warning 6328: (654-684): CHC: Assertion violation might happen here.
-// Warning 4661: (226-256): BMC: Assertion violation happens here.
-// Warning 4661: (310-340): BMC: Assertion violation happens here.
-// Warning 4661: (483-513): BMC: Assertion violation happens here.
-// Warning 4661: (568-598): BMC: Assertion violation happens here.
-// Warning 4661: (654-684): BMC: Assertion violation happens here.
+// Warning 1218: (226-256='assert(b1.length == b2.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (310-340='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (483-513='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (568-598='assert(b1.length == b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (654-684='assert(b1.length == b6.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (226-256='assert(b1.length == b2.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (310-340='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (483-513='assert(b1.length == b4.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (568-598='assert(b1.length == b5.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (654-684='assert(b1.length == b6.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (226-256='assert(b1.length == b2.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (310-340='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (483-513='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (568-598='assert(b1.length == b5.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (654-684='assert(b1.length == b6.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
index 23501603c..22c906900 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
@@ -23,14 +23,14 @@ contract C {
 // SMTEngine: all
 // SMTShowUnproved: no
 // ----
-// Warning 1218: (226-256): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (310-340): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (483-513): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (568-598): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (654-684): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (226-256='assert(b1.length == b2.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (310-340='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (483-513='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (568-598='assert(b1.length == b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (654-684='assert(b1.length == b6.length)'): CHC: Error trying to invoke SMT solver.
 // Warning 5840: CHC: 5 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-// Warning 4661: (226-256): BMC: Assertion violation happens here.
-// Warning 4661: (310-340): BMC: Assertion violation happens here.
-// Warning 4661: (483-513): BMC: Assertion violation happens here.
-// Warning 4661: (568-598): BMC: Assertion violation happens here.
-// Warning 4661: (654-684): BMC: Assertion violation happens here.
+// Warning 4661: (226-256='assert(b1.length == b2.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (310-340='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (483-513='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (568-598='assert(b1.length == b5.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (654-684='assert(b1.length == b6.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
index 3bff0d448..e29cb4e9d 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
@@ -20,12 +20,12 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (298-328): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (389-419): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (492-522): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (298-328): CHC: Assertion violation might happen here.
-// Warning 6328: (389-419): CHC: Assertion violation might happen here.
-// Warning 6328: (492-522): CHC: Assertion violation might happen here.
-// Warning 4661: (298-328): BMC: Assertion violation happens here.
-// Warning 4661: (389-419): BMC: Assertion violation happens here.
-// Warning 4661: (492-522): BMC: Assertion violation happens here.
+// Warning 1218: (298-328='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (389-419='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (492-522='assert(b1.length != b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (298-328='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (389-419='assert(b1.length == b4.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (492-522='assert(b1.length != b5.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (298-328='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (389-419='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (492-522='assert(b1.length != b5.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
index 9cdf6f248..52b15e75c 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
@@ -19,15 +19,15 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (208-238): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (286-316): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (453-483): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (532-562): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (208-238): CHC: Assertion violation might happen here.
-// Warning 6328: (286-316): CHC: Assertion violation might happen here.
-// Warning 6328: (453-483): CHC: Assertion violation might happen here.
-// Warning 6328: (532-562): CHC: Assertion violation might happen here.
-// Warning 4661: (208-238): BMC: Assertion violation happens here.
-// Warning 4661: (286-316): BMC: Assertion violation happens here.
-// Warning 4661: (453-483): BMC: Assertion violation happens here.
-// Warning 4661: (532-562): BMC: Assertion violation happens here.
+// Warning 1218: (208-238='assert(b1.length == b2.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (286-316='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (453-483='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (532-562='assert(b1.length == b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (208-238='assert(b1.length == b2.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (286-316='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (453-483='assert(b1.length == b4.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (532-562='assert(b1.length == b5.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (208-238='assert(b1.length == b2.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (286-316='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (453-483='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (532-562='assert(b1.length == b5.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
index 4043617cb..f51e9c643 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
@@ -26,16 +26,16 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (578-608): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (691-721): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (959-989): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (1079-1109): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (325-355): CHC: Assertion violation happens here.
-// Warning 6328: (578-608): CHC: Assertion violation might happen here.
-// Warning 6328: (691-721): CHC: Assertion violation might happen here.
-// Warning 6328: (959-989): CHC: Assertion violation might happen here.
-// Warning 6328: (1079-1109): CHC: Assertion violation might happen here.
-// Warning 4661: (578-608): BMC: Assertion violation happens here.
-// Warning 4661: (691-721): BMC: Assertion violation happens here.
-// Warning 4661: (959-989): BMC: Assertion violation happens here.
-// Warning 4661: (1079-1109): BMC: Assertion violation happens here.
+// Warning 1218: (578-608='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (691-721='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (959-989='assert(b1.length == b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (1079-1109='assert(b4.length == b6.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (325-355='assert(b1.length == b2.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (578-608='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (691-721='assert(b1.length == b4.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (959-989='assert(b1.length == b5.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (1079-1109='assert(b4.length == b6.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (578-608='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (691-721='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (959-989='assert(b1.length == b5.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (1079-1109='assert(b4.length == b6.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
index c019af2ee..e4b364bd2 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
@@ -25,16 +25,16 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (579-609): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (692-722): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (960-990): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (1080-1110): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (326-356): CHC: Assertion violation happens here.
-// Warning 6328: (579-609): CHC: Assertion violation might happen here.
-// Warning 6328: (692-722): CHC: Assertion violation might happen here.
-// Warning 6328: (960-990): CHC: Assertion violation might happen here.
-// Warning 6328: (1080-1110): CHC: Assertion violation might happen here.
-// Warning 4661: (579-609): BMC: Assertion violation happens here.
-// Warning 4661: (692-722): BMC: Assertion violation happens here.
-// Warning 4661: (960-990): BMC: Assertion violation happens here.
-// Warning 4661: (1080-1110): BMC: Assertion violation happens here.
+// Warning 1218: (579-609='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (692-722='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (960-990='assert(b1.length == b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (1080-1110='assert(b4.length == b6.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (326-356='assert(b1.length == b2.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (579-609='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (692-722='assert(b1.length == b4.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (960-990='assert(b1.length == b5.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (1080-1110='assert(b4.length == b6.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (579-609='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (692-722='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (960-990='assert(b1.length == b5.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (1080-1110='assert(b4.length == b6.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol
index 95ec1cf37..a0ebce023 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol
@@ -25,10 +25,10 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 5667: (100-115): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 1218: (855-885): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (571-601): CHC: Assertion violation happens here.
-// Warning 6328: (691-721): CHC: Assertion violation happens here.
-// Warning 6328: (740-770): CHC: Assertion violation happens here.
-// Warning 6328: (855-885): CHC: Assertion violation might happen here.
-// Warning 4661: (855-885): BMC: Assertion violation happens here.
+// Warning 5667: (100-115='uint[] memory b'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 1218: (855-885='assert(b1.length == b6.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (571-601='assert(b1.length == b4.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (691-721='assert(b1.length != b5.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (740-770='assert(b1.length == b5.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (855-885='assert(b1.length == b6.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (855-885='assert(b1.length == b6.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
index cbcc65734..512387609 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
@@ -22,18 +22,18 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (252-282): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (347-377): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (531-561): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (627-657): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (746-776): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (252-282): CHC: Assertion violation might happen here.
-// Warning 6328: (347-377): CHC: Assertion violation might happen here.
-// Warning 6328: (531-561): CHC: Assertion violation might happen here.
-// Warning 6328: (627-657): CHC: Assertion violation might happen here.
-// Warning 6328: (746-776): CHC: Assertion violation might happen here.
-// Warning 4661: (252-282): BMC: Assertion violation happens here.
-// Warning 4661: (347-377): BMC: Assertion violation happens here.
-// Warning 4661: (531-561): BMC: Assertion violation happens here.
-// Warning 4661: (627-657): BMC: Assertion violation happens here.
-// Warning 4661: (746-776): BMC: Assertion violation happens here.
+// Warning 1218: (252-282='assert(b1.length == b2.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (347-377='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (531-561='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (627-657='assert(b1.length == b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (746-776='assert(b4.length == b6.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (252-282='assert(b1.length == b2.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (347-377='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (531-561='assert(b1.length == b4.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (627-657='assert(b1.length == b5.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (746-776='assert(b4.length == b6.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (252-282='assert(b1.length == b2.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (347-377='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (531-561='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (627-657='assert(b1.length == b5.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (746-776='assert(b4.length == b6.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
index b5346b049..caf73850c 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
@@ -9,5 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (294-324): CHC: Assertion violation might happen here.
-// Warning 7812: (294-324): BMC: Assertion violation might happen here.
+// Warning 6328: (294-324='assert(b1.length == b2.length)'): CHC: Assertion violation might happen here.
+// Warning 7812: (294-324='assert(b1.length == b2.length)'): BMC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
index 70c06dab2..c22b2f994 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
@@ -25,16 +25,16 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (588-618): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (702-732): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (971-1001): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (1086-1116): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (334-364): CHC: Assertion violation happens here.
-// Warning 6328: (588-618): CHC: Assertion violation might happen here.
-// Warning 6328: (702-732): CHC: Assertion violation might happen here.
-// Warning 6328: (971-1001): CHC: Assertion violation might happen here.
-// Warning 6328: (1086-1116): CHC: Assertion violation might happen here.
-// Warning 4661: (588-618): BMC: Assertion violation happens here.
-// Warning 4661: (702-732): BMC: Assertion violation happens here.
-// Warning 4661: (971-1001): BMC: Assertion violation happens here.
-// Warning 4661: (1086-1116): BMC: Assertion violation happens here.
+// Warning 1218: (588-618='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (702-732='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (971-1001='assert(b1.length == b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (1086-1116='assert(b4.length == b6.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (334-364='assert(b1.length == b2.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (588-618='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (702-732='assert(b1.length == b4.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (971-1001='assert(b1.length == b5.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (1086-1116='assert(b4.length == b6.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (588-618='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (702-732='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (971-1001='assert(b1.length == b5.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (1086-1116='assert(b4.length == b6.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
index 4ac60267f..aeab4e578 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
@@ -25,16 +25,16 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (589-619): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (703-733): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (972-1002): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (1087-1117): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (335-365): CHC: Assertion violation happens here.
-// Warning 6328: (589-619): CHC: Assertion violation might happen here.
-// Warning 6328: (703-733): CHC: Assertion violation might happen here.
-// Warning 6328: (972-1002): CHC: Assertion violation might happen here.
-// Warning 6328: (1087-1117): CHC: Assertion violation might happen here.
-// Warning 4661: (589-619): BMC: Assertion violation happens here.
-// Warning 4661: (703-733): BMC: Assertion violation happens here.
-// Warning 4661: (972-1002): BMC: Assertion violation happens here.
-// Warning 4661: (1087-1117): BMC: Assertion violation happens here.
+// Warning 1218: (589-619='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (703-733='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (972-1002='assert(b1.length == b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (1087-1117='assert(b4.length == b6.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (335-365='assert(b1.length == b2.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (589-619='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (703-733='assert(b1.length == b4.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (972-1002='assert(b1.length == b5.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (1087-1117='assert(b4.length == b6.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (589-619='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (703-733='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (972-1002='assert(b1.length == b5.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (1087-1117='assert(b4.length == b6.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
index 96f3e48d9..fc01db8f8 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
@@ -23,10 +23,10 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (107-122): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 1218: (824-854): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (543-573): CHC: Assertion violation happens here.
-// Warning 6328: (664-694): CHC: Assertion violation happens here.
-// Warning 6328: (713-743): CHC: Assertion violation happens here.
-// Warning 6328: (824-854): CHC: Assertion violation might happen here.
-// Warning 4661: (824-854): BMC: Assertion violation happens here.
+// Warning 5667: (107-122='uint[] memory b'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 1218: (824-854='assert(b1.length == b6.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (543-573='assert(b1.length == b4.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (664-694='assert(b1.length != b5.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (713-743='assert(b1.length == b5.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (824-854='assert(b1.length == b6.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (824-854='assert(b1.length == b6.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
index d58b3f5b4..8444a1209 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
@@ -22,18 +22,18 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (261-291): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (357-387): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (542-572): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (639-669): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (753-783): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (261-291): CHC: Assertion violation might happen here.
-// Warning 6328: (357-387): CHC: Assertion violation might happen here.
-// Warning 6328: (542-572): CHC: Assertion violation might happen here.
-// Warning 6328: (639-669): CHC: Assertion violation might happen here.
-// Warning 6328: (753-783): CHC: Assertion violation might happen here.
-// Warning 4661: (261-291): BMC: Assertion violation happens here.
-// Warning 4661: (357-387): BMC: Assertion violation happens here.
-// Warning 4661: (542-572): BMC: Assertion violation happens here.
-// Warning 4661: (639-669): BMC: Assertion violation happens here.
-// Warning 4661: (753-783): BMC: Assertion violation happens here.
+// Warning 1218: (261-291='assert(b1.length == b2.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (357-387='assert(b1.length == b3.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (542-572='assert(b1.length == b4.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (639-669='assert(b1.length == b5.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (753-783='assert(b4.length == b6.length)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (261-291='assert(b1.length == b2.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (357-387='assert(b1.length == b3.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (542-572='assert(b1.length == b4.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (639-669='assert(b1.length == b5.length)'): CHC: Assertion violation might happen here.
+// Warning 6328: (753-783='assert(b4.length == b6.length)'): CHC: Assertion violation might happen here.
+// Warning 4661: (261-291='assert(b1.length == b2.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (357-387='assert(b1.length == b3.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (542-572='assert(b1.length == b4.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (639-669='assert(b1.length == b5.length)'): BMC: Assertion violation happens here.
+// Warning 4661: (753-783='assert(b4.length == b6.length)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_1.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_1.sol
index 43aa6c31f..d4d94e210 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_1.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (49-56='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_2.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_2.sol
index 011d7b321..a71fd49d4 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_2.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_2.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (49-56='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_3.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_3.sol
index b74321006..236ae5ece 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_3.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_3.sol
@@ -8,5 +8,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
-// Warning 2529: (60-67): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (49-56='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (60-67='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_4.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_4.sol
index 206ada96e..d2f68ad91 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_4.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_4.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (61-68): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (61-68='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_5.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_5.sol
index 8811944c8..de6744c4c 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_5.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_5.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (89-96): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (89-96='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_6.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_6.sol
index f47a89375..a0d8fc839 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_6.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_6.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (94-101): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (94-101='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol
index 6de94c8ec..1092f4271 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol
@@ -13,4 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (49-56='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_basic.sol b/test/libsolidity/smtCheckerTests/array_members/length_basic.sol
index 205c7746d..60aad458c 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_basic.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_basic.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (120-143): CHC: Assertion violation happens here.\nCounterexample:\narr = []\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: arr = []\nC.f()
+// Warning 6328: (120-143='assert(arr.length != y)'): CHC: Assertion violation happens here.\nCounterexample:\narr = []\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: arr = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
index 0023906fe..278b2dc4e 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
@@ -24,7 +24,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (291-317): CHC: Assertion violation happens here.
-// Warning 6328: (321-347): CHC: Assertion violation happens here.
-// Warning 6328: (351-374): CHC: Assertion violation happens here.
+// Warning 6328: (291-317='assert(arr[2].length != x)'): CHC: Assertion violation happens here.
+// Warning 6328: (321-347='assert(arr[3].length != y)'): CHC: Assertion violation happens here.
+// Warning 6328: (351-374='assert(arr.length != z)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 2)\n!(arr.length <= 3)\n!(arr[2].length <= 3)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol
index 270fa28fb..8fdcc77ec 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (49-56='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol
index f74381ce9..c38d5476f 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (90-100): CHC: Empty array "pop" happens here.\nCounterexample:\na = [[0], []]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (90-100='a[1].pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = [[0], []]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol
index 1cb1ed013..753e95f79 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (43-50): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()
+// Warning 2529: (43-50='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol
index 0b0ba37e3..fa933db93 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (117-124): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\nl = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f(0)
+// Warning 2529: (117-124='a.pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\nl = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol
index 235c585bd..069b356cf 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol
@@ -11,5 +11,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (129-144): CHC: Underflow (resulting value less than 0) happens here.
+// Warning 3944: (129-144='a[0].length - 1'): CHC: Underflow (resulting value less than 0) happens here.
 // Warning 6328: (117-151): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol
index b79bc3e3b..c38d87997 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol
@@ -16,4 +16,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (284-310): CHC: Assertion violation happens here.\nCounterexample:\nb = [[0], [0]]\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.f()
+// Warning 6328: (284-310='assert(b[0][0] != b[1][0])'): CHC: Assertion violation happens here.\nCounterexample:\nb = [[0], [0]]\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol
index f13c4f452..ea84ab1cb 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol
@@ -12,4 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (128-145): CHC: Assertion violation happens here.\nCounterexample:\nu = [(- 1)]\n\nTransaction trace:\nC.constructor()\nState: u = []\nC.t()
+// Warning 6328: (128-145='assert(u[0] >= 0)'): CHC: Assertion violation happens here.\nCounterexample:\nu = [(- 1)]\n\nTransaction trace:\nC.constructor()\nState: u = []\nC.t()
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_function_return_value.sol b/test/libsolidity/smtCheckerTests/array_members/push_function_return_value.sol
index ae897ce13..c410bcc2a 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_function_return_value.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_function_return_value.sol
@@ -16,5 +16,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (168-189): CHC: Assertion violation happens here.
-// Warning 6328: (259-280): CHC: Assertion violation happens here.
+// Warning 6328: (168-189='assert(x.length == 1)'): CHC: Assertion violation happens here.
+// Warning 6328: (259-280='assert(x.length == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol
index 9e998a1f0..a723c144e 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol
@@ -9,5 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (81-107): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[0]]\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
+// Warning 6328: (81-107='assert(array2d.length > 2)'): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[0]]\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
 // Warning 6328: (111-157): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[0]]\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol
index 7a120f428..46db9d583 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol
@@ -13,7 +13,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6368: (179-183): CHC: Out of bounds access happens here.
-// Warning 6368: (184-188): CHC: Out of bounds access happens here.
-// Warning 3944: (184-199): CHC: Underflow (resulting value less than 0) happens here.
+// Warning 6368: (179-183='a[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (184-188='a[0]'): CHC: Out of bounds access happens here.
+// Warning 3944: (184-199='a[0].length - 1'): CHC: Underflow (resulting value less than 0) happens here.
 // Warning 6328: (172-206): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
index ea55e3055..d36450f1d 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
@@ -26,13 +26,13 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (238-242): CHC: Out of bounds access happens here.
-// Warning 6368: (238-245): CHC: Out of bounds access might happen here.
-// Warning 6368: (238-248): CHC: Out of bounds access might happen here.
-// Warning 6368: (311-315): CHC: Out of bounds access happens here.
-// Warning 6368: (343-347): CHC: Out of bounds access happens here.
-// Warning 6328: (336-360): CHC: Assertion violation happens here.
-// Warning 6368: (513-517): CHC: Out of bounds access happens here.
-// Warning 6368: (513-520): CHC: Out of bounds access happens here.
-// Warning 6368: (513-523): CHC: Out of bounds access happens here.
-// Warning 6328: (506-530): CHC: Assertion violation happens here.
+// Warning 6368: (238-242='c[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (238-245='c[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (238-248='c[0][0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (311-315='d[1]'): CHC: Out of bounds access happens here.
+// Warning 6368: (343-347='a[0]'): CHC: Out of bounds access happens here.
+// Warning 6328: (336-360='assert(a[0].length == 0)'): CHC: Assertion violation happens here.
+// Warning 6368: (513-517='c[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (513-520='c[0][0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (513-523='c[0][0][0]'): CHC: Out of bounds access happens here.
+// Warning 6328: (506-530='assert(c[0][0][0] == 12)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
index 6647e8d41..f57315dd7 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (61-91): CHC: Assertion violation happens here.\nCounterexample:\na = [0]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 6328: (61-91='assert(a[a.length - 1] == 100)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol b/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol
index bbbc3a68f..730a2e72e 100644
--- a/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol
@@ -17,5 +17,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6368: (159-169): CHC: Out of bounds access happens here.
-// Warning 6328: (152-181): CHC: Assertion violation happens here.
+// Warning 6368: (159-169='array2d[2]'): CHC: Out of bounds access happens here.
+// Warning 6328: (152-181='assert(array2d[2].length > 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
index b611bc95f..6b9a03af0 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
@@ -16,6 +16,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (266-272): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (266-272='x + 10'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (235-273): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\nonce\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
index a1eb278bc..237733225 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
@@ -11,5 +11,5 @@ contract C {
 // SMTIgnoreCex: yes
 // SMTIgnoreInv: yes
 // ----
-// Warning 9302: (82-93): Return value of low-level calls not used.
+// Warning 9302: (82-93='_a.call("")'): Return value of low-level calls not used.
 // Warning 6328: (97-131): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
index bd30b77d1..2b531c2c0 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
@@ -20,4 +20,4 @@ contract C {
 // ----
 // Warning 6328: (280-314): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n((!(c <= 1) || !((:var 1).balances[address(this)] <= 90)) && !((:var 1).balances[address(this)] <= 81) && (!(c <= 0) || !((:var 1).balances[address(this)] <= 100)))\n
-// Warning 1236: (175-190): BMC: Insufficient funds happens here.
+// Warning 1236: (175-190='_a.transfer(_v)'): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
index 5df0b9995..1fd27c290 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
@@ -19,5 +19,5 @@ contract C {
 // Warning 6328: (193-226): CHC: Assertion violation might happen here.
 // Warning 6328: (245-279): CHC: Assertion violation happens here.
 // Warning 6328: (298-332): CHC: Assertion violation happens here.
-// Warning 1236: (141-156): BMC: Insufficient funds happens here.
+// Warning 1236: (141-156='_a.transfer(_v)'): BMC: Insufficient funds happens here.
 // Warning 4661: (193-226): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_3.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_3.sol
index 39c7000c3..4c2a6be86 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_3.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_3.sol
@@ -12,7 +12,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (65-79): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (150-163): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (213-227): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 1\nC.f()
-// Warning 6328: (298-311): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (65-79='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (150-163='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (213-227='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 1\nC.f()
+// Warning 6328: (298-311='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_4.sol
index 81bf41892..7edb430c6 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_4.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_zero_4.sol
@@ -15,7 +15,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (212-225): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (275-289): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 1\nC.f()
-// Warning 6328: (360-373): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (127-141='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (212-225='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (275-289='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 1\nC.f()
+// Warning 6328: (360-373='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
index 50081bc5a..31730f679 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
@@ -19,6 +19,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (258-274): CHC: Assertion violation happens here.
+// Warning 6328: (258-274='assert(b1 == b2)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
-// Warning 1236: (33-46): BMC: Insufficient funds happens here.
+// Warning 1236: (33-46='a.transfer(1)'): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
index f32652da9..afe6bacf0 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
@@ -22,6 +22,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (315-331): CHC: Assertion violation happens here.
+// Warning 6328: (315-331='assert(b1 == b2)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
-// Warning 1236: (87-100): BMC: Insufficient funds happens here.
+// Warning 1236: (87-100='a.transfer(1)'): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_1.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_1.sol
index 98e0e664f..94528b9f3 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_1.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_1.sol
@@ -18,6 +18,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4588: (219-224): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (263-279): CHC: Assertion violation happens here.
-// Warning 6328: (359-373): CHC: Assertion violation happens here.
+// Warning 4588: (219-224='a.l()'): Assertion checker does not yet implement this type of function call.
+// Warning 6328: (263-279='assert(b1 == b2)'): CHC: Assertion violation happens here.
+// Warning 6328: (359-373='assert(x == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_2.sol
index 4b500581d..283f394d7 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_2.sol
@@ -20,7 +20,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4588: (238-243): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (282-298): CHC: Assertion violation happens here.
-// Warning 6328: (317-331): CHC: Assertion violation happens here.
-// Warning 1236: (54-67): BMC: Insufficient funds happens here.
+// Warning 4588: (238-243='a.l()'): Assertion checker does not yet implement this type of function call.
+// Warning 6328: (282-298='assert(b1 == b2)'): CHC: Assertion violation happens here.
+// Warning 6328: (317-331='assert(x == 0)'): CHC: Assertion violation happens here.
+// Warning 1236: (54-67='a.transfer(1)'): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_3.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_3.sol
index 26975e359..41e478651 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_3.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_3.sol
@@ -21,8 +21,8 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 5667: (24-41): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 4588: (265-270): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (309-325): CHC: Assertion violation happens here.
-// Warning 6328: (405-419): CHC: Assertion violation happens here.
-// Warning 6328: (464-486): CHC: Assertion violation happens here.
+// Warning 5667: (24-41='address payable a'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 4588: (265-270='a.l()'): Assertion checker does not yet implement this type of function call.
+// Warning 6328: (309-325='assert(b1 == b2)'): CHC: Assertion violation happens here.
+// Warning 6328: (405-419='assert(x == 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (464-486='assert(v == msg.value)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_4.sol
index 57fdbf9ad..c956dfdd6 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_public_4.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_public_4.sol
@@ -21,9 +21,9 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 5667: (24-41): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (24-41='address payable a'): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Warning 2018: (13-93): Function state mutability can be restricted to view
-// Warning 4588: (272-277): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (316-332): CHC: Assertion violation happens here.
-// Warning 6328: (412-426): CHC: Assertion violation happens here.
-// Warning 6328: (471-494): CHC: Assertion violation happens here.
+// Warning 4588: (272-277='a.l()'): Assertion checker does not yet implement this type of function call.
+// Warning 6328: (316-332='assert(b1 == b2)'): CHC: Assertion violation happens here.
+// Warning 6328: (412-426='assert(x == 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (471-494='assert(v == msg.sender)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/assert.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/assert.sol
index 819839f7e..5e2648d25 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/assert.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/assert.sol
@@ -19,7 +19,7 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (49-62): BMC: Assertion violation happens here.
-// Warning 6838: (111-117): BMC: Condition is always true.
-// Warning 6838: (186-192): BMC: Condition is always false.
-// Warning 2512: (254-260): BMC: Condition unreachable.
+// Warning 4661: (49-62='assert(x > 0)'): BMC: Assertion violation happens here.
+// Warning 6838: (111-117='x >= 0'): BMC: Condition is always true.
+// Warning 6838: (186-192='x != 2'): BMC: Condition is always false.
+// Warning 2512: (254-260='x != 2'): BMC: Condition unreachable.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol
index 297d732ee..8adab3a1f 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol
@@ -23,4 +23,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (70-84): BMC: Assertion violation happens here.
+// Warning 4661: (70-84='assert(x == 1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol
index f37f05684..399e40fcb 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol
@@ -38,6 +38,6 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (351-365): BMC: Assertion violation happens here.
-// Warning 4661: (602-619): BMC: Assertion violation happens here.
-// Warning 4661: (748-762): BMC: Assertion violation happens here.
+// Warning 4661: (351-365='assert(x == 1)'): BMC: Assertion violation happens here.
+// Warning 4661: (602-619='assert(oldx == x)'): BMC: Assertion violation happens here.
+// Warning 4661: (748-762='assert(x == 0)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol
index eb2f58105..cd4de5e7f 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol
@@ -35,7 +35,7 @@ contract C is B {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (297-311): BMC: Assertion violation happens here.
-// Warning 4661: (389-412): BMC: Assertion violation happens here.
-// Warning 4661: (489-513): BMC: Assertion violation happens here.
-// Warning 4661: (533-546): BMC: Assertion violation happens here.
+// Warning 4661: (297-311='assert(y == 4)'): BMC: Assertion violation happens here.
+// Warning 4661: (389-412='assert(x < 0 && y == 4)'): BMC: Assertion violation happens here.
+// Warning 4661: (489-513='assert(x >= 0 && y == 2)'): BMC: Assertion violation happens here.
+// Warning 4661: (533-546='assert(x > 0)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol
index 6364eb167..88297e730 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol
@@ -25,4 +25,4 @@ contract D is C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (286-300): BMC: Assertion violation happens here.
+// Warning 4661: (286-300='assert(x == 1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol
index b72555b69..e75fa83b3 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol
@@ -60,11 +60,11 @@ contract D4 is B, C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (337-351): BMC: Assertion violation happens here.
-// Warning 4661: (370-385): BMC: Assertion violation happens here.
-// Warning 4661: (460-474): BMC: Assertion violation happens here.
-// Warning 4661: (493-507): BMC: Assertion violation happens here.
-// Warning 4661: (670-684): BMC: Assertion violation happens here.
-// Warning 4661: (736-751): BMC: Assertion violation happens here.
-// Warning 4661: (827-841): BMC: Assertion violation happens here.
-// Warning 4661: (860-874): BMC: Assertion violation happens here.
+// Warning 4661: (337-351='assert(x == 1)'): BMC: Assertion violation happens here.
+// Warning 4661: (370-385='assert(x == -1)'): BMC: Assertion violation happens here.
+// Warning 4661: (460-474='assert(x == 0)'): BMC: Assertion violation happens here.
+// Warning 4661: (493-507='assert(x == 1)'): BMC: Assertion violation happens here.
+// Warning 4661: (670-684='assert(x == 0)'): BMC: Assertion violation happens here.
+// Warning 4661: (736-751='assert(x == -1)'): BMC: Assertion violation happens here.
+// Warning 4661: (827-841='assert(x == 0)'): BMC: Assertion violation happens here.
+// Warning 4661: (860-874='assert(x == 1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol
index afc48b4fe..5e101e092 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol
@@ -25,7 +25,7 @@ contract C is B {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 5740: (119-124): Unreachable code.
-// Warning 4661: (277-291): BMC: Assertion violation happens here.
-// Warning 4661: (310-324): BMC: Assertion violation happens here.
-// Warning 4661: (343-357): BMC: Assertion violation happens here.
+// Warning 5740: (119-124='x = 3'): Unreachable code.
+// Warning 4661: (277-291='assert(x == 3)'): BMC: Assertion violation happens here.
+// Warning 4661: (310-324='assert(x == 2)'): BMC: Assertion violation happens here.
+// Warning 4661: (343-357='assert(x == 1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol
index 378c9dc92..5665b2930 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (114-141): BMC: Assertion violation happens here.
-// Warning 6838: (299-315): BMC: Condition is always false.
+// Warning 4661: (114-141='assert(nested_if(a,b) == 1)'): BMC: Assertion violation happens here.
+// Warning 6838: (299-315='a == 2 && b == 2'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol
index 992d0ee1d..8b1630348 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol
@@ -18,4 +18,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 5740: (232-240): Unreachable code.
+// Warning 5740: (232-240='return 1'): Unreachable code.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if2.sol
index 4860bd885..5ae931f2d 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if2.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if2.sol
@@ -14,4 +14,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (56-81): BMC: Assertion violation happens here.
+// Warning 4661: (56-81='assert(simple_if(a) == 1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol
index 76e416905..b4f14c176 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol
@@ -25,4 +25,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (172-189): BMC: Assertion violation happens here.
+// Warning 4661: (172-189='assert(a[1] == 1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol
index 20dd68eaa..73cadffef 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol
@@ -19,4 +19,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (99-113): BMC: Assertion violation happens here.
+// Warning 4661: (99-113='assert(x == 1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol
index 3976333cd..1ec684b94 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol
@@ -22,4 +22,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (123-139): BMC: Assertion violation happens here.
+// Warning 4661: (123-139='assert(s.x == 1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol
index aad44b7ea..8fe35ce6a 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol
@@ -22,4 +22,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (123-139): BMC: Assertion violation happens here.
+// Warning 4661: (123-139='assert(s.x == 1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol
index 5c5bb1297..a27987f4b 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol
@@ -23,5 +23,5 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (127-141): BMC: Assertion violation happens here.
-// Warning 4661: (161-175): BMC: Assertion violation happens here.
+// Warning 4661: (127-141='assert(x == 0)'): BMC: Assertion violation happens here.
+// Warning 4661: (161-175='assert(x == 1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/call_balance.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/call_balance.sol
index b0f383a14..0a866fbeb 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/call_balance.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/call_balance.sol
@@ -9,5 +9,5 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 9302: (83-94): Return value of low-level calls not used.
-// Warning 4661: (133-149): BMC: Assertion violation happens here.
+// Warning 9302: (83-94='_a.call("")'): Return value of low-level calls not used.
+// Warning 4661: (133-149='assert(b1 == b2)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/call_state_var.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/call_state_var.sol
index 3e58eea11..0b33e7e37 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/call_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/call_state_var.sol
@@ -9,5 +9,5 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 9302: (66-77): Return value of low-level calls not used.
-// Warning 4661: (81-95): BMC: Assertion violation happens here.
+// Warning 9302: (66-77='_a.call("")'): Return value of low-level calls not used.
+// Warning 4661: (81-95='assert(x == 2)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/funds.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/funds.sol
index 737443e64..93fbf14e6 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/funds.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/funds.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 1236: (55-70): BMC: Insufficient funds happens here.
+// Warning 1236: (55-70='a.transfer(200)'): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol
index 56c7eca75..4be0fa0d7 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol
@@ -14,4 +14,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (172-187): BMC: Assertion violation happens here.
+// Warning 4661: (172-187='assert(x == 42)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/math.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/math.sol
index 92dad6bd4..cc519f884 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/math.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/math.sol
@@ -15,7 +15,7 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 2661: (79-84): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4144: (155-160): BMC: Underflow (resulting value less than 0) happens here.
-// Warning 2661: (231-236): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 3046: (307-312): BMC: Division by zero happens here.
+// Warning 2661: (79-84='x + y'): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4144: (155-160='x - y'): BMC: Underflow (resulting value less than 0) happens here.
+// Warning 2661: (231-236='x * y'): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 3046: (307-312='x / y'): BMC: Division by zero happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/math_constructor.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/math_constructor.sol
index 6d027c58e..419d0188e 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/math_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/math_constructor.sol
@@ -5,4 +5,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4144: (36-41): BMC: Underflow (resulting value less than 0) happens here.
+// Warning 4144: (36-41='z - 3'): BMC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol
index 8ac34fad5..b0b684be9 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol
@@ -13,4 +13,4 @@ contract B {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (154-176): BMC: Assertion violation happens here.
+// Warning 4661: (154-176='assert(msg.value == 0)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol
index 167cea38c..626d16d5c 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 9302: (88-105): Return value of low-level calls not used.
+// Warning 9302: (88-105='_a.staticcall("")'): Return value of low-level calls not used.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol
index 50f959997..6e5df0fe2 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 9302: (66-83): Return value of low-level calls not used.
+// Warning 9302: (66-83='_a.staticcall("")'): Return value of low-level calls not used.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol
index ce81f2666..408f7a275 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (306-320): BMC: Assertion violation happens here.
+// Warning 4661: (306-320='assert(x == 0)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol
index f79d82c12..fd6ac8d59 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol
@@ -24,4 +24,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (336-351): BMC: Assertion violation happens here.
+// Warning 4661: (336-351='assert(success)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/unary_add_minus_overflow_detected.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/unary_add_minus_overflow_detected.sol
index 085be4618..9855ae846 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/unary_add_minus_overflow_detected.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/unary_add_minus_overflow_detected.sol
@@ -23,5 +23,5 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 2661: (55-58): BMC: Overflow (resulting value larger than 255) happens here.
-// Warning 4144: (95-98): BMC: Underflow (resulting value less than 0) happens here.
+// Warning 2661: (55-58='++x'): BMC: Overflow (resulting value larger than 255) happens here.
+// Warning 4144: (95-98='--x'): BMC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/unchecked_function_call_with_unchecked_block.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/unchecked_function_call_with_unchecked_block.sol
index 3fb817489..7f4db0612 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/unchecked_function_call_with_unchecked_block.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/unchecked_function_call_with_unchecked_block.sol
@@ -12,4 +12,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (85-98): BMC: Assertion violation happens here.
+// Warning 4661: (85-98='assert(y < x)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/complex/slither/const_state_variables.sol b/test/libsolidity/smtCheckerTests/complex/slither/const_state_variables.sol
index 2415ac5eb..2df4130af 100644
--- a/test/libsolidity/smtCheckerTests/complex/slither/const_state_variables.sol
+++ b/test/libsolidity/smtCheckerTests/complex/slither/const_state_variables.sol
@@ -52,6 +52,6 @@ contract MyConc{
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2519: (740-759): This declaration shadows an existing declaration.
+// Warning 2519: (740-759='uint constant A = 1'): This declaration shadows an existing declaration.
 // Warning 2018: (976-1053): Function state mutability can be restricted to view
-// Warning 4984: (952-969): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (952-969='10 + block.number'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol b/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol
index 3f5096a3b..f22770eac 100644
--- a/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol
+++ b/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol
@@ -74,9 +74,9 @@ contract InternalCall {
 // SMTEngine: all
 // ----
 // Warning 9302: (727-782): Return value of low-level calls not used.
-// Warning 2072: (84-93): Unused local variable.
-// Warning 2072: (227-236): Unused local variable.
-// Warning 2072: (634-643): Unused local variable.
+// Warning 2072: (84-93='uint256 i'): Unused local variable.
+// Warning 2072: (227-236='uint256 i'): Unused local variable.
+// Warning 2072: (634-643='uint256 i'): Unused local variable.
 // Warning 2018: (42-104): Function state mutability can be restricted to pure
 // Warning 2018: (185-247): Function state mutability can be restricted to pure
 // Warning 2018: (437-506): Function state mutability can be restricted to pure
@@ -84,5 +84,5 @@ contract InternalCall {
 // Warning 2018: (1179-1241): Function state mutability can be restricted to pure
 // Warning 2018: (1247-1309): Function state mutability can be restricted to pure
 // Warning 4588: (681-716): Assertion checker does not yet implement this type of function call.
-// Warning 4588: (854-886): Assertion checker does not yet implement this type of function call.
-// Warning 5729: (1370-1375): BMC does not yet implement this type of function call.
+// Warning 4588: (854-886='new ContractWithFunctionCalled()'): Assertion checker does not yet implement this type of function call.
+// Warning 5729: (1370-1375='ptr()'): BMC does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
index 21f1f5c7f..b94cf5060 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (327-341): CHC: Assertion violation happens here.\nCounterexample:\nx = 7\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
+// Warning 6328: (327-341='assert(x == 6)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 7\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
 // Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 7))\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
index bf1da4275..83a922fd9 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (333-347): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
+// Warning 6328: (333-347='assert(x == 6)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
 // Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 3))\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
index ace158bb9..be59166b3 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (326-340): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
+// Warning 6328: (326-340='assert(x == 6)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
 // Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 3))\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
index 44910fa62..731f21570 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
@@ -23,5 +23,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (333-347): CHC: Assertion violation happens here.
+// Warning 6328: (333-347='assert(x == 6)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 7))\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
index 32d647762..6a4a9bbd6 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
@@ -23,5 +23,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (70-84): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.test()
+// Warning 6328: (70-84='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.test()
 // Info 1180: Contract invariant(s) for :C:\n(x = 0)\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol
index 3f660be66..0f04f1297 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol
@@ -35,7 +35,7 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (297-311): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (389-412): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (489-513): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
-// Warning 6328: (533-546): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (297-311='assert(y == 4)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
+// Warning 6328: (389-412='assert(x < 0 && y == 4)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
+// Warning 6328: (489-513='assert(x >= 0 && y == 2)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (533-546='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
index 805a75bbb..b7436a754 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
@@ -26,4 +26,4 @@ contract D is C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (286-300): CHC: Assertion violation happens here.
+// Warning 6328: (286-300='assert(x == 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol
index 7eb23a120..8d5319316 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol
@@ -60,11 +60,11 @@ contract D4 is B, C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (337-351): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 1, x = 0\n\nTransaction trace:\nD1.constructor()
-// Warning 6328: (370-385): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 1, x = 0\n\nTransaction trace:\nD1.constructor()
-// Warning 6328: (460-474): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 1, x = (- 1)\n\nTransaction trace:\nD2.constructor()
-// Warning 6328: (493-507): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 1, x = (- 1)\n\nTransaction trace:\nD2.constructor()
-// Warning 6328: (670-684): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 2, x = 1\n\nTransaction trace:\nD3.constructor()
-// Warning 6328: (736-751): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 2, x = 1\n\nTransaction trace:\nD3.constructor()
-// Warning 6328: (827-841): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 2, x = (- 1)\n\nTransaction trace:\nD4.constructor()
-// Warning 6328: (860-874): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 2, x = (- 1)\n\nTransaction trace:\nD4.constructor()
+// Warning 6328: (337-351='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 1, x = 0\n\nTransaction trace:\nD1.constructor()
+// Warning 6328: (370-385='assert(x == -1)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 1, x = 0\n\nTransaction trace:\nD1.constructor()
+// Warning 6328: (460-474='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 1, x = (- 1)\n\nTransaction trace:\nD2.constructor()
+// Warning 6328: (493-507='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 1, x = (- 1)\n\nTransaction trace:\nD2.constructor()
+// Warning 6328: (670-684='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 2, x = 1\n\nTransaction trace:\nD3.constructor()
+// Warning 6328: (736-751='assert(x == -1)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 2, x = 1\n\nTransaction trace:\nD3.constructor()
+// Warning 6328: (827-841='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 2, x = (- 1)\n\nTransaction trace:\nD4.constructor()
+// Warning 6328: (860-874='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 2, x = (- 1)\n\nTransaction trace:\nD4.constructor()
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol
index d17a3f421..a6a50f214 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol
@@ -25,7 +25,7 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5740: (119-124): Unreachable code.
-// Warning 6328: (277-291): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (310-324): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (343-357): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\na = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 5740: (119-124='x = 3'): Unreachable code.
+// Warning 6328: (277-291='assert(x == 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\na = 1\n\nTransaction trace:\nC.constructor(1)
+// Warning 6328: (310-324='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\na = 1\n\nTransaction trace:\nC.constructor(1)
+// Warning 6328: (343-357='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\na = 0\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol
index 43a4aea30..51b34886c 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (114-141): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 2\n\nTransaction trace:\nC.constructor()\nC.test(0, 2)\n    C.nested_if(0, 2) -- internal call\n    C.nested_if(0, 2) -- internal call
-// Warning 6838: (299-315): BMC: Condition is always false.
+// Warning 6328: (114-141='assert(nested_if(a,b) == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 2\n\nTransaction trace:\nC.constructor()\nC.test(0, 2)\n    C.nested_if(0, 2) -- internal call\n    C.nested_if(0, 2) -- internal call
+// Warning 6838: (299-315='a == 2 && b == 2'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol
index 803b01857..f730b55e8 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol
@@ -18,4 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5740: (232-240): Unreachable code.
+// Warning 5740: (232-240='return 1'): Unreachable code.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if2.sol
index ea4459597..ea7976b98 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if2.sol
@@ -14,4 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (56-81): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\n\nTransaction trace:\nC.constructor()\nC.test(0)\n    C.simple_if(0) -- internal call
+// Warning 6328: (56-81='assert(simple_if(a) == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\n\nTransaction trace:\nC.constructor()\nC.test(0)\n    C.simple_if(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol
index bf48eb32e..838f2eb03 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol
@@ -25,4 +25,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (172-189): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.check()\n    C.conditional_store() -- internal call
+// Warning 6328: (172-189='assert(a[1] == 1)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.check()\n    C.conditional_store() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol
index d3e74c01a..d8b284b60 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol
@@ -19,4 +19,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (99-113): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.check()\n    C.conditional_increment() -- internal call
+// Warning 6328: (99-113='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.check()\n    C.conditional_increment() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol
index e04cd91d7..720aac300 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol
@@ -22,4 +22,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (123-139): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0}\nC.check()\n    C.conditional_increment() -- internal call
+// Warning 6328: (123-139='assert(s.x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0}\nC.check()\n    C.conditional_increment() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol
index d9fcb93bd..44d9d9ae3 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol
@@ -22,4 +22,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (123-139): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0}\nC.check()\n    C.conditional_increment() -- internal call
+// Warning 6328: (123-139='assert(s.x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0}\nC.check()\n    C.conditional_increment() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol
index a9008ae25..73b03d013 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol
@@ -23,5 +23,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, y = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.check()\n    C.conditional_increment() -- internal call
-// Warning 6328: (161-175): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, y = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.check()\n    C.conditional_increment() -- internal call
+// Warning 6328: (127-141='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, y = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.check()\n    C.conditional_increment() -- internal call
+// Warning 6328: (161-175='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, y = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.check()\n    C.conditional_increment() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/require.sol b/test/libsolidity/smtCheckerTests/control_flow/require.sol
index c59777d7c..50bf5133c 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/require.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/require.sol
@@ -30,5 +30,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (396-409): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (415-432): CHC: Assertion violation happens here.\nCounterexample:\nx = true\n\nTransaction trace:\nC.constructor()\nState: x = false\nC.i()\n    C.m() -- internal call
+// Warning 6321: (396-409='string memory'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6328: (415-432='assert(x != true)'): CHC: Assertion violation happens here.\nCounterexample:\nx = true\n\nTransaction trace:\nC.constructor()\nState: x = false\nC.i()\n    C.m() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol
index 59de4bc0f..4097f3053 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol
@@ -20,7 +20,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (211-237): CHC: Assertion violation happens here.
-// Warning 6328: (241-267): CHC: Assertion violation happens here.
-// Warning 6328: (271-297): CHC: Assertion violation happens here.
-// Warning 6328: (301-329): CHC: Assertion violation happens here.
+// Warning 6328: (211-237='assert(add(100, 0) != 100)'): CHC: Assertion violation happens here.
+// Warning 6328: (241-267='assert(add(100, 1) != 101)'): CHC: Assertion violation happens here.
+// Warning 6328: (271-297='assert(add(100, 2) != 102)'): CHC: Assertion violation happens here.
+// Warning 6328: (301-329='assert(add(100, 100) != 200)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol
index 7fcce53a1..ccd96f3fc 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol
@@ -29,11 +29,11 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (270-296): CHC: Assertion violation happens here.
-// Warning 6328: (300-317): CHC: Assertion violation happens here.
-// Warning 6328: (321-347): CHC: Assertion violation happens here.
-// Warning 6328: (351-370): CHC: Assertion violation happens here.
-// Warning 6328: (374-400): CHC: Assertion violation happens here.
-// Warning 6328: (404-425): CHC: Assertion violation happens here.
-// Warning 6328: (429-457): CHC: Assertion violation happens here.
-// Warning 6328: (461-484): CHC: Assertion violation happens here.
+// Warning 6328: (270-296='assert(add(100, 0) != 100)'): CHC: Assertion violation happens here.
+// Warning 6328: (300-317='assert(c != 0xff)'): CHC: Assertion violation happens here.
+// Warning 6328: (321-347='assert(add(100, 1) != 101)'): CHC: Assertion violation happens here.
+// Warning 6328: (351-370='assert(c != 0xffff)'): CHC: Assertion violation happens here.
+// Warning 6328: (374-400='assert(add(100, 2) != 102)'): CHC: Assertion violation happens here.
+// Warning 6328: (404-425='assert(c != 0xffffff)'): CHC: Assertion violation happens here.
+// Warning 6328: (429-457='assert(add(100, 100) != 200)'): CHC: Assertion violation happens here.
+// Warning 6328: (461-484='assert(c != 0xffffffff)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/revert.sol b/test/libsolidity/smtCheckerTests/control_flow/revert.sol
index 14f6e988d..d3740aceb 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/revert.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/revert.sol
@@ -30,7 +30,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5740: (83-96): Unreachable code.
-// Warning 5740: (188-201): Unreachable code.
-// Warning 6321: (375-388): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (394-411): CHC: Assertion violation happens here.\nCounterexample:\nx = true\n\nTransaction trace:\nC.constructor()\nState: x = false\nC.i()\n    C.m() -- internal call
+// Warning 5740: (83-96='assert(false)'): Unreachable code.
+// Warning 5740: (188-201='assert(false)'): Unreachable code.
+// Warning 6321: (375-388='string memory'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6328: (394-411='assert(x != true)'): CHC: Assertion violation happens here.\nCounterexample:\nx = true\n\nTransaction trace:\nC.constructor()\nState: x = false\nC.i()\n    C.m() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol b/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol
index 5af670bda..c941a3367 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol
@@ -14,5 +14,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (150-164): CHC: Assertion violation happens here.\nCounterexample:\n\nb = false\na = 0\nc = 2\n\nTransaction trace:\nC.constructor()\nC.f(false, 0)
-// Warning 6838: (122-123): BMC: Condition is always false.
+// Warning 6328: (150-164='assert(c == a)'): CHC: Assertion violation happens here.\nCounterexample:\n\nb = false\na = 0\nc = 2\n\nTransaction trace:\nC.constructor()\nC.f(false, 0)
+// Warning 6838: (122-123='b'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
index 198d4dc3e..51bd08629 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
@@ -15,4 +15,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (194-203): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n = false\nb = false\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
+// Warning 6328: (194-203='assert(b)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n = false\nb = false\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol
index 25ab73a19..9e45aef0c 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol
@@ -17,5 +17,5 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (169-185): CHC: Assertion violation happens here.\nCounterexample:\nx = 101\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call
-// Warning 6328: (209-219): CHC: Assertion violation happens here.\nCounterexample:\nx = 101\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call
+// Warning 6328: (169-185='assert(x == 102)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 101\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call
+// Warning 6328: (209-219='assert(!b)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 101\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
index 29bb06147..057007c55 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
@@ -15,4 +15,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
+// Warning 6328: (192-202='assert(!b)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched.sol
index 9ded64131..c12631363 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched.sol
@@ -12,8 +12,8 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (51-77): BMC: Condition is always false.
-// Warning 6838: (88-114): BMC: Condition is always true.
-// Warning 6838: (125-150): BMC: Condition is always false.
-// Warning 6838: (161-188): BMC: Condition is always false.
-// Warning 6838: (199-214): BMC: Condition is always true.
+// Warning 6838: (51-77='(b = false) && (b == true)'): BMC: Condition is always false.
+// Warning 6838: (88-114='(b == false) && (b = true)'): BMC: Condition is always true.
+// Warning 6838: (125-150='(b = false) && (b = true)'): BMC: Condition is always false.
+// Warning 6838: (161-188='(b == false) && (b == true)'): BMC: Condition is always false.
+// Warning 6838: (199-214='(b = true) && b'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched_function.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched_function.sol
index 548ac4775..9baa7bd2b 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched_function.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_touched_function.sol
@@ -16,8 +16,8 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (123-146): BMC: Condition is always false.
-// Warning 6838: (157-180): BMC: Condition is always true.
-// Warning 6838: (191-210): BMC: Condition is always false.
-// Warning 6838: (221-244): BMC: Condition is always false.
-// Warning 6838: (255-267): BMC: Condition is always true.
+// Warning 6838: (123-146='g(false) && (b == true)'): BMC: Condition is always false.
+// Warning 6838: (157-180='(b == false) && g(true)'): BMC: Condition is always true.
+// Warning 6838: (191-210='g(false) && g(true)'): BMC: Condition is always false.
+// Warning 6838: (221-244='g(false) && (b == true)'): BMC: Condition is always false.
+// Warning 6838: (255-267='g(true) && b'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
index 8b0766e0a..f420b3519 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
@@ -15,4 +15,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
+// Warning 6328: (192-202='assert(!b)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol
index 9bec38227..f647649ab 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol
@@ -24,4 +24,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (327-337): CHC: Assertion violation happens here.\nCounterexample:\nx = 102\na = false\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g(false)\n    c.f() -- internal call\n    c.f() -- internal call
+// Warning 6328: (327-337='assert(!b)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 102\na = false\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g(false)\n    c.f() -- internal call\n    c.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
index 8b623c9aa..9fb3e2059 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
@@ -15,4 +15,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
+// Warning 6328: (192-202='assert(!b)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched.sol
index 50c6aeabb..cd1c47eec 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched.sol
@@ -12,8 +12,8 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (51-77): BMC: Condition is always true.
-// Warning 6838: (88-114): BMC: Condition is always true.
-// Warning 6838: (125-150): BMC: Condition is always true.
-// Warning 6838: (161-188): BMC: Condition is always true.
-// Warning 6838: (199-215): BMC: Condition is always false.
+// Warning 6838: (51-77='(b = true) || (b == false)'): BMC: Condition is always true.
+// Warning 6838: (88-114='(b == true) || (b = false)'): BMC: Condition is always true.
+// Warning 6838: (125-150='(b = true) || (b = false)'): BMC: Condition is always true.
+// Warning 6838: (161-188='(b == true) || (b == false)'): BMC: Condition is always true.
+// Warning 6838: (199-215='(b = false) || b'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched_function.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched_function.sol
index b541b284d..326ceb805 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched_function.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_touched_function.sol
@@ -16,8 +16,8 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (123-146): BMC: Condition is always true.
-// Warning 6838: (157-180): BMC: Condition is always true.
-// Warning 6838: (191-210): BMC: Condition is always true.
-// Warning 6838: (221-244): BMC: Condition is always true.
-// Warning 6838: (255-268): BMC: Condition is always false.
+// Warning 6838: (123-146='g(true) || (b == false)'): BMC: Condition is always true.
+// Warning 6838: (157-180='(b == true) || g(false)'): BMC: Condition is always true.
+// Warning 6838: (191-210='g(true) || g(false)'): BMC: Condition is always true.
+// Warning 6838: (221-244='g(true) || (b == false)'): BMC: Condition is always true.
+// Warning 6838: (255-268='g(false) || b'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/try_catch_1.sol b/test/libsolidity/smtCheckerTests/control_flow/try_catch_1.sol
index 72f52d6d4..5fcb03f94 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/try_catch_1.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/try_catch_1.sol
@@ -8,4 +8,4 @@ contract C {
 // EVMVersion: >=byzantium
 // SMTEngine: all
 // ----
-// Warning 6321: (43-47): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (43-47='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/virtual_function_call_inside_branch_2.sol b/test/libsolidity/smtCheckerTests/control_flow/virtual_function_call_inside_branch_2.sol
index 219980be6..740b755d0 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/virtual_function_call_inside_branch_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/virtual_function_call_inside_branch_2.sol
@@ -21,4 +21,4 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (271-275): BMC: Condition is always false.
+// Warning 6838: (271-275='0==1'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol
index 5166afabb..aebea1857 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 11\na = 4\n\nTransaction trace:\nC.constructor()\nC.f(11)
+// Warning 6328: (127-141='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 11\na = 4\n\nTransaction trace:\nC.constructor()\nC.f(11)
diff --git a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol
index 92be3c3ee..3eb749129 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 11\na = 4\n\nTransaction trace:\nC.constructor()\nC.f(11)
+// Warning 6328: (127-141='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 11\na = 4\n\nTransaction trace:\nC.constructor()\nC.f(11)
diff --git a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_3.sol b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_3.sol
index 93d926769..36ec1832b 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_3.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_3.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (129-143): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 11\na = 5\n\nTransaction trace:\nC.constructor()\nC.f(11)
+// Warning 6328: (129-143='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 11\na = 5\n\nTransaction trace:\nC.constructor()\nC.f(11)
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
index 79b30a123..b685f1a39 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
@@ -12,12 +12,12 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (150-164): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (168-182): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (186-200): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (150-164): CHC: Assertion violation might happen here.
-// Warning 6328: (168-182): CHC: Assertion violation might happen here.
-// Warning 6328: (186-200): CHC: Assertion violation might happen here.
-// Warning 4661: (150-164): BMC: Assertion violation happens here.
-// Warning 4661: (168-182): BMC: Assertion violation happens here.
-// Warning 4661: (186-200): BMC: Assertion violation happens here.
+// Warning 1218: (150-164='assert(k == s)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (168-182='assert(s == r)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (186-200='assert(r == k)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (150-164='assert(k == s)'): CHC: Assertion violation might happen here.
+// Warning 6328: (168-182='assert(s == r)'): CHC: Assertion violation might happen here.
+// Warning 6328: (186-200='assert(r == k)'): CHC: Assertion violation might happen here.
+// Warning 4661: (150-164='assert(k == s)'): BMC: Assertion violation happens here.
+// Warning 4661: (168-182='assert(s == r)'): BMC: Assertion violation happens here.
+// Warning 4661: (186-200='assert(r == k)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol
index 2791d3d64..152bffd4b 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol
@@ -27,12 +27,12 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (218-228): Unused local variable.
-// Warning 2072: (245-255): Unused local variable.
-// Warning 2072: (405-415): Unused local variable.
-// Warning 2072: (435-445): Unused local variable.
-// Warning 2072: (656-666): Unused local variable.
-// Warning 2072: (698-708): Unused local variable.
-// Warning 1218: (135-151): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (135-151): CHC: Assertion violation might happen here.
-// Warning 4661: (135-151): BMC: Assertion violation happens here.
+// Warning 2072: (218-228='bytes32 s0'): Unused local variable.
+// Warning 2072: (245-255='bytes32 s1'): Unused local variable.
+// Warning 2072: (405-415='bytes32 r0'): Unused local variable.
+// Warning 2072: (435-445='bytes32 r1'): Unused local variable.
+// Warning 2072: (656-666='address a0'): Unused local variable.
+// Warning 2072: (698-708='address a1'): Unused local variable.
+// Warning 1218: (135-151='assert(k0 == k1)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (135-151='assert(k0 == k1)'): CHC: Assertion violation might happen here.
+// Warning 4661: (135-151='assert(k0 == k1)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
index 59a011f24..30bf5862b 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
@@ -12,6 +12,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (196-210): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (196-210): CHC: Assertion violation might happen here.
-// Warning 4661: (196-210): BMC: Assertion violation happens here.
+// Warning 1218: (196-210='assert(h == k)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (196-210='assert(h == k)'): CHC: Assertion violation might happen here.
+// Warning 4661: (196-210='assert(h == k)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
index 94eedd599..6f1b0b582 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
@@ -37,15 +37,15 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (544-563): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (567-586): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (590-609): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (613-632): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (544-563): CHC: Assertion violation might happen here.
-// Warning 6328: (567-586): CHC: Assertion violation might happen here.
-// Warning 6328: (590-609): CHC: Assertion violation might happen here.
-// Warning 6328: (613-632): CHC: Assertion violation might happen here.
-// Warning 4661: (544-563): BMC: Assertion violation happens here.
-// Warning 4661: (567-586): BMC: Assertion violation happens here.
-// Warning 4661: (590-609): BMC: Assertion violation happens here.
-// Warning 4661: (613-632): BMC: Assertion violation happens here.
+// Warning 1218: (544-563='assert(_kec == kec)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (567-586='assert(_sha == sha)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (590-609='assert(_rip == rip)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (613-632='assert(_erc == erc)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (544-563='assert(_kec == kec)'): CHC: Assertion violation might happen here.
+// Warning 6328: (567-586='assert(_sha == sha)'): CHC: Assertion violation might happen here.
+// Warning 6328: (590-609='assert(_rip == rip)'): CHC: Assertion violation might happen here.
+// Warning 6328: (613-632='assert(_erc == erc)'): CHC: Assertion violation might happen here.
+// Warning 4661: (544-563='assert(_kec == kec)'): BMC: Assertion violation happens here.
+// Warning 4661: (567-586='assert(_sha == sha)'): BMC: Assertion violation happens here.
+// Warning 4661: (590-609='assert(_rip == rip)'): BMC: Assertion violation happens here.
+// Warning 4661: (613-632='assert(_erc == erc)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
index fd3b55a8c..615e55e2e 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
@@ -45,15 +45,15 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (693-712): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (716-735): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (739-758): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (762-781): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (693-712): CHC: Assertion violation might happen here.
-// Warning 6328: (716-735): CHC: Assertion violation might happen here.
-// Warning 6328: (739-758): CHC: Assertion violation might happen here.
-// Warning 6328: (762-781): CHC: Assertion violation might happen here.
-// Warning 4661: (693-712): BMC: Assertion violation happens here.
-// Warning 4661: (716-735): BMC: Assertion violation happens here.
-// Warning 4661: (739-758): BMC: Assertion violation happens here.
-// Warning 4661: (762-781): BMC: Assertion violation happens here.
+// Warning 1218: (693-712='assert(_kec == kec)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (716-735='assert(_sha == sha)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (739-758='assert(_rip == rip)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (762-781='assert(_erc == erc)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (693-712='assert(_kec == kec)'): CHC: Assertion violation might happen here.
+// Warning 6328: (716-735='assert(_sha == sha)'): CHC: Assertion violation might happen here.
+// Warning 6328: (739-758='assert(_rip == rip)'): CHC: Assertion violation might happen here.
+// Warning 6328: (762-781='assert(_erc == erc)'): CHC: Assertion violation might happen here.
+// Warning 4661: (693-712='assert(_kec == kec)'): BMC: Assertion violation happens here.
+// Warning 4661: (716-735='assert(_sha == sha)'): BMC: Assertion violation happens here.
+// Warning 4661: (739-758='assert(_rip == rip)'): BMC: Assertion violation happens here.
+// Warning 4661: (762-781='assert(_erc == erc)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol
index a4dd5f531..1777e39c0 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 9302: (51-66): Return value of low-level calls not used.
+// Warning 9302: (51-66='_a.call("aaaa")'): Return value of low-level calls not used.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol
index 2d2f32acf..f4be88648 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 9302: (94-109): Return value of low-level calls not used.
+// Warning 9302: (94-109='_a.call("aaaa")'): Return value of low-level calls not used.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
index e85eb00aa..f7856782e 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 9302: (218-234): Return value of low-level calls not used.
+// Warning 9302: (218-234='_a.call("aaaaa")'): Return value of low-level calls not used.
 // Info 1180: Reentrancy property(ies) for :C:\n((lock' || !lock) && (<errorCode> <= 0) && (!lock || ((x' + ((- 1) * x)) = 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
index 64494971a..73f32af76 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
@@ -23,5 +23,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 9302: (212-228): Return value of low-level calls not used.
-// Warning 6328: (232-246): CHC: Assertion violation happens here.
+// Warning 9302: (212-228='_a.call("aaaaa")'): Return value of low-level calls not used.
+// Warning 6328: (232-246='assert(y == x)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_1.sol
index f33f8ada3..44fb5e14d 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_1.sol
@@ -12,7 +12,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2519: (100-106): This declaration shadows an existing declaration.
-// Warning 2072: (100-106): Unused local variable.
-// Warning 2072: (108-125): Unused local variable.
-// Warning 6328: (143-157): CHC: Assertion violation happens here.
+// Warning 2519: (100-106='bool s'): This declaration shadows an existing declaration.
+// Warning 2072: (100-106='bool s'): Unused local variable.
+// Warning 2072: (108-125='bytes memory data'): Unused local variable.
+// Warning 6328: (143-157='assert(x == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_return_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_return_1.sol
index 127d9f242..ee6018aae 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_return_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_return_1.sol
@@ -10,6 +10,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (65-82): Unused local variable.
-// Warning 6328: (100-109): CHC: Assertion violation happens here.
-// Warning 6328: (128-138): CHC: Assertion violation happens here.
+// Warning 2072: (65-82='bytes memory data'): Unused local variable.
+// Warning 6328: (100-109='assert(s)'): CHC: Assertion violation happens here.
+// Warning 6328: (128-138='assert(!s)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_return_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_return_2.sol
index a9ae1d473..402a23121 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_return_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_return_2.sol
@@ -9,5 +9,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (57-63): Unused local variable.
-// Warning 6328: (100-124): CHC: Assertion violation happens here.
+// Warning 2072: (57-63='bool s'): Unused local variable.
+// Warning 6328: (100-124='assert(data.length > 10)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
index e4e3abc24..341e622a7 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
@@ -9,5 +9,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreInv: yes
 // ----
-// Warning 2072: (57-63): Unused local variable.
-// Warning 2072: (65-82): Unused local variable.
+// Warning 2072: (57-63='bool s'): Unused local variable.
+// Warning 2072: (65-82='bytes memory data'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
index c38658080..b7e7f27a5 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
@@ -9,7 +9,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 9302: (96-116): Return value of low-level calls not used.
+// Warning 9302: (96-116='i.call{value: 0}("")'): Return value of low-level calls not used.
 // Warning 6328: (120-156): CHC: Assertion violation might happen here.
 // Warning 6328: (175-210): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0x0\n\nTransaction trace:\nC.constructor()\nC.g(0x0)\n    i.call{value: 0}("") -- untrusted external call
 // Warning 4661: (120-156): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol
index 6cbe24136..acf94555b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_3.sol
@@ -10,6 +10,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 9302: (95-116): Return value of low-level calls not used.
+// Warning 9302: (95-116='i.call{value: 20}("")'): Return value of low-level calls not used.
 // Warning 6328: (120-153): CHC: Assertion violation might happen here.
 // Warning 4661: (120-153): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external.sol b/test/libsolidity/smtCheckerTests/external_calls/external.sol
index 659329e0b..3b1fa971e 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external.sol
@@ -17,5 +17,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (167-181): CHC: Assertion violation happens here.
+// Warning 6328: (167-181='assert(x < 10)'): CHC: Assertion violation happens here.
 // Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Overflow at ++x\n<errorCode> = 3 -> Assertion failed at assert(x < 10)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1.sol
index e02533bc1..502def682 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1.sol
@@ -16,5 +16,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (69-85): CHC: Assertion violation happens here.
-// Warning 6328: (177-191): CHC: Assertion violation happens here.
+// Warning 6328: (69-85='assert(_x < 100)'): CHC: Assertion violation happens here.
+// Warning 6328: (177-191='assert(z == 2)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
index 3fbdd8511..3486f5b09 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
@@ -13,5 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (87-101): CHC: Assertion violation happens here.\nCounterexample:\nz = 2\n_x = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: z = 2\nC.g(0)
+// Warning 6328: (87-101='assert(_x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 2\n_x = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: z = 2\nC.g(0)
 // Info 1180: Contract invariant(s) for :C:\n(!(z >= 3) && !(z <= 1))\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
index eb5cd97dd..57abd872c 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
@@ -19,5 +19,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (69-85): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
-// Warning 6328: (203-217): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 3\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 3\nC.f()
+// Warning 6328: (69-85='assert(_x < 100)'): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
+// Warning 6328: (203-217='assert(z == 2)'): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 3\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 3\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol
index 5dbdaae27..1912562a5 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol
@@ -14,4 +14,4 @@ contract C {
 // ====
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (253-267): CHC: Assertion violation happens here.
+// Warning 6328: (253-267='assert(a == 2)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
index 8f5b162a0..2354404c9 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
@@ -27,5 +27,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (390-412): CHC: Assertion violation happens here.
+// Warning 6328: (390-412='assert(sig_1 == sig_2)'): CHC: Assertion violation happens here.
 // Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(sig_1 == sig_2)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
index 2e837478d..81c6a4796 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
@@ -29,5 +29,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (398-420): CHC: Assertion violation happens here.
+// Warning 6328: (398-420='assert(sig_1 == sig_2)'): CHC: Assertion violation happens here.
 // Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(sig_1 == sig_2)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy.sol
index 29d184895..8a77a3ad3 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy.sol
@@ -31,5 +31,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (219-236): Unused local variable.
-// Warning 6328: (266-280): CHC: Assertion violation happens here.
+// Warning 2072: (219-236='address prevOwner'): Unused local variable.
+// Warning 6328: (266-280='assert(z == y)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe.sol
index 68990bebc..acf53453f 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe.sol
@@ -39,5 +39,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (402-428): CHC: Assertion violation happens here.
+// Warning 6328: (402-428='assert(prevOwner == owner)'): CHC: Assertion violation happens here.
 // Warning 6328: (561-598): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_inc.sol b/test/libsolidity/smtCheckerTests/external_calls/external_inc.sol
index 22a4551c8..1c14d3599 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_inc.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_inc.sol
@@ -19,6 +19,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (113-116): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (156-170): CHC: Assertion violation happens here.
-// Warning 2661: (113-116): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (113-116='++x'): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 6328: (156-170='assert(x < 10)'): CHC: Assertion violation happens here.
+// Warning 2661: (113-116='++x'): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
index 5683a5248..578e3eaff 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
@@ -16,6 +16,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (206-220): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (206-220): CHC: Assertion violation might happen here.
-// Warning 4661: (206-220): BMC: Assertion violation happens here.
+// Warning 1218: (206-220='assert(locked)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (206-220='assert(locked)'): CHC: Assertion violation might happen here.
+// Warning 4661: (206-220='assert(locked)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
index 1e8ce8816..27afd0de2 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
@@ -13,6 +13,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (117-131): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (117-131): CHC: Assertion violation might happen here.
-// Warning 4661: (117-131): BMC: Assertion violation happens here.
+// Warning 1218: (117-131='assert(locked)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (117-131='assert(locked)'): CHC: Assertion violation might happen here.
+// Warning 4661: (117-131='assert(locked)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
index 46e8ac148..00cf7a1b5 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
@@ -27,9 +27,9 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreInv: yes
 // ----
-// Warning 1218: (264-283): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (302-333): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (264-283): CHC: Assertion violation might happen here.
-// Warning 6328: (302-333): CHC: Assertion violation might happen here.
-// Warning 4661: (264-283): BMC: Assertion violation happens here.
-// Warning 4661: (302-333): BMC: Assertion violation happens here.
+// Warning 1218: (264-283='assert(_kec == kec)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (302-333='assert(kec == keccak256(_data))'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (264-283='assert(_kec == kec)'): CHC: Assertion violation might happen here.
+// Warning 6328: (302-333='assert(kec == keccak256(_data))'): CHC: Assertion violation might happen here.
+// Warning 4661: (264-283='assert(_kec == kec)'): BMC: Assertion violation happens here.
+// Warning 4661: (302-333='assert(kec == keccak256(_data))'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol b/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
index 7b73311a0..9eaab18ad 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
@@ -24,4 +24,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (223-240): CHC: Assertion violation happens here.
+// Warning 6328: (223-240='assert(oldX == x)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_1.sol b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_1.sol
index 37af9be9c..330b2746a 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_1.sol
@@ -23,4 +23,4 @@ contract C {
     }
 }
 // ----
-// Warning 6328: (296-310): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, inG = true\n_i = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, inG = false\nC.g(0)\n    L.f(0) -- internal call\n        _i.i() -- untrusted external call, synthesized as:\n            C.s() -- reentrant call
+// Warning 6328: (296-310='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, inG = true\n_i = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, inG = false\nC.g(0)\n    L.f(0) -- internal call\n        _i.i() -- untrusted external call, synthesized as:\n            C.s() -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol
index eb4513d7f..2e35e6bef 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol
@@ -26,4 +26,4 @@ contract C {
     }
 }
 // ----
-// Warning 6328: (337-351): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, inG = true\n_i = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, inG = false\nC.g(0)\n    L.g(0) -- internal call\n        L.f(0) -- internal call\n            _i.i() -- untrusted external call, synthesized as:\n                C.s() -- reentrant call
+// Warning 6328: (337-351='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, inG = true\n_i = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, inG = false\nC.g(0)\n    L.g(0) -- internal call\n        L.f(0) -- internal call\n            _i.i() -- untrusted external call, synthesized as:\n                C.s() -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol
index 495c9dcc9..2f8e00577 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol
@@ -29,4 +29,4 @@ contract C {
     }
 }
 // ----
-// Warning 6328: (354-368): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, inG = true\n_i = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, inG = false\nC.g(0)\n    L.g(0) -- internal call\n        M.f(0) -- internal call\n            _i.i() -- untrusted external call, synthesized as:\n                C.s() -- reentrant call
+// Warning 6328: (354-368='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, inG = true\n_i = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, inG = false\nC.g(0)\n    L.g(0) -- internal call\n        M.f(0) -- internal call\n            _i.i() -- untrusted external call, synthesized as:\n                C.s() -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/mutex_f_no_guard.sol b/test/libsolidity/smtCheckerTests/external_calls/mutex_f_no_guard.sol
index 76568adf6..592ad4378 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/mutex_f_no_guard.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/mutex_f_no_guard.sol
@@ -29,4 +29,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (251-257): Unused local variable.
+// Warning 2072: (251-257='uint y'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
index b7fa57197..c9c16bfa5 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 9302: (218-240): Return value of low-level calls not used.
+// Warning 9302: (218-240='_a.staticcall("aaaaa")'): Return value of low-level calls not used.
 // Info 1180: Reentrancy property(ies) for :C:\n((!lock || (<errorCode> <= 0)) && (lock' || !lock))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
index f87cf5f74..3c401ff1d 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
@@ -22,6 +22,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 9302: (212-234): Return value of low-level calls not used.
+// Warning 9302: (212-234='_a.staticcall("aaaaa")'): Return value of low-level calls not used.
 // Warning 2018: (164-271): Function state mutability can be restricted to view
 // Info 1180: Reentrancy property(ies) for :C:\n(<errorCode> <= 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
index ee9e57189..6e1236922 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
@@ -11,8 +11,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2519: (106-112): This declaration shadows an existing declaration.
-// Warning 2072: (106-112): Unused local variable.
-// Warning 2072: (114-131): Unused local variable.
+// Warning 2519: (106-112='bool s'): This declaration shadows an existing declaration.
+// Warning 2072: (106-112='bool s'): Unused local variable.
+// Warning 2072: (114-131='bytes memory data'): Unused local variable.
 // Warning 2018: (72-188): Function state mutability can be restricted to view
 // Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/file_level/abi_function_different_source_2.sol b/test/libsolidity/smtCheckerTests/file_level/abi_function_different_source_2.sol
index f403b5c6e..7a01fd3d9 100644
--- a/test/libsolidity/smtCheckerTests/file_level/abi_function_different_source_2.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/abi_function_different_source_2.sol
@@ -5,5 +5,5 @@ function f() {
 ==== Source: s2.sol ====
 contract C {}
 // ----
-// Warning 6133: (s1.sol:16-40): Statement has no effect.
+// Warning 6133: (s1.sol:16-40='ecrecover("", 1, "", "")'): Statement has no effect.
 // Warning 2018: (s1.sol:0-43): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/smtCheckerTests/file_level/constant_different_source.sol b/test/libsolidity/smtCheckerTests/file_level/constant_different_source.sol
index ff8d72b30..ee6655f2f 100644
--- a/test/libsolidity/smtCheckerTests/file_level/constant_different_source.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/constant_different_source.sol
@@ -8,5 +8,5 @@ library L {
 ==== Source: s1.sol ====
 library L {}
 // ----
-// Warning 6133: (l.sol:62-65): Statement has no effect.
+// Warning 6133: (l.sol:62-65='one'): Statement has no effect.
 // Warning 2018: (l.sol:36-69): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/smtCheckerTests/file_level/constant_easy.sol b/test/libsolidity/smtCheckerTests/file_level/constant_easy.sol
index 73dc2a861..d77aacd70 100644
--- a/test/libsolidity/smtCheckerTests/file_level/constant_easy.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/constant_easy.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (80-95): CHC: Assertion violation happens here.\nCounterexample:\n\nz = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (80-95='assert(z == 41)'): CHC: Assertion violation happens here.\nCounterexample:\n\nz = 42\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol b/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol
index fe2ebfdde..29c283ca7 100644
--- a/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol
@@ -38,4 +38,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (968-983): CHC: Assertion violation happens here.\nCounterexample:\n\nw = 56\nz = 1\nt = 0x61626300ff5f5f00000000000000000000000000000000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n    C.g() -- internal call\n    C.h() -- internal call\n    C.i() -- internal call
+// Warning 6328: (968-983='assert(w == 59)'): CHC: Assertion violation happens here.\nCounterexample:\n\nw = 56\nz = 1\nt = 0x61626300ff5f5f00000000000000000000000000000000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n    C.g() -- internal call\n    C.h() -- internal call\n    C.i() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol b/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol
index ad86ff26d..45ae560e5 100644
--- a/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol
@@ -59,7 +59,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (s2.sol:518-539): CHC: Assertion violation happens here.
-// Warning 6328: (s2.sol:704-725): CHC: Assertion violation happens here.
-// Warning 6328: (s2.sol:890-911): CHC: Assertion violation happens here.
-// Warning 6328: (s2.sol:980-994): CHC: Assertion violation happens here.
+// Warning 6328: (s2.sol:518-539='assert(r1[2] == 0x04)'): CHC: Assertion violation happens here.
+// Warning 6328: (s2.sol:704-725='assert(r2[2] == 0x04)'): CHC: Assertion violation happens here.
+// Warning 6328: (s2.sol:890-911='assert(r3[2] == 0x04)'): CHC: Assertion violation happens here.
+// Warning 6328: (s2.sol:980-994='assert(z == 7)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/file_level/easy.sol b/test/libsolidity/smtCheckerTests/file_level/easy.sol
index 43ddb076c..9e11d3ac9 100644
--- a/test/libsolidity/smtCheckerTests/file_level/easy.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/easy.sol
@@ -14,4 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (222-239): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f(7) -- internal call\n        add(7, 2) -- internal call\n    C.f(8) -- internal call\n        add(8, 2) -- internal call
+// Warning 6328: (222-239='assert(f(8) == 9)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f(7) -- internal call\n        add(7, 2) -- internal call\n    C.f(8) -- internal call\n        add(8, 2) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/file_level/enum.sol b/test/libsolidity/smtCheckerTests/file_level/enum.sol
index 81525b029..4d6024a03 100644
--- a/test/libsolidity/smtCheckerTests/file_level/enum.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/enum.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (247-267): CHC: Assertion violation happens here.\nCounterexample:\n\ne1 = 0\ne2 = 1\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(true) -- internal call\n    allocate(false) -- internal call
+// Warning 6328: (247-267='assert(e2 == E.READ)'): CHC: Assertion violation happens here.\nCounterexample:\n\ne1 = 0\ne2 = 1\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(true) -- internal call\n    allocate(false) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol b/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol
index 0297428c6..933614825 100644
--- a/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol
@@ -18,5 +18,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (b.sol:208-222): CHC: Assertion violation happens here.\nCounterexample:\n\na = 7\nb = 3\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        a.sol:f(2) -- internal call\n        a.sol:f([0x61, 0x62, 0x63]) -- internal call
-// Warning 6328: (b.sol:274-288): CHC: Assertion violation happens here.\nCounterexample:\n\na = 7\nb = 3\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        a.sol:f(2) -- internal call\n        a.sol:f([0x61, 0x62, 0x63]) -- internal call
+// Warning 6328: (b.sol:208-222='assert(a == 9)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 7\nb = 3\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        a.sol:f(2) -- internal call\n        a.sol:f([0x61, 0x62, 0x63]) -- internal call
+// Warning 6328: (b.sol:274-288='assert(b == 5)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 7\nb = 3\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        a.sol:f(2) -- internal call\n        a.sol:f([0x61, 0x62, 0x63]) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_constant_1.sol b/test/libsolidity/smtCheckerTests/file_level/free_constant_1.sol
index ccf6700ef..77712e9c9 100644
--- a/test/libsolidity/smtCheckerTests/file_level/free_constant_1.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/free_constant_1.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (93-98): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639894\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(115792089237316195423570985008687907853269984665640564039457584007913129639894)
+// Warning 4984: (93-98='x + A'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639894\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(115792089237316195423570985008687907853269984665640564039457584007913129639894)
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_function_1.sol b/test/libsolidity/smtCheckerTests/file_level/free_function_1.sol
index 5dd951521..e6bb559d3 100644
--- a/test/libsolidity/smtCheckerTests/file_level/free_function_1.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/free_function_1.sol
@@ -12,5 +12,5 @@ function fun(uint[] calldata _x, uint[] storage _y) view  returns (uint, uint[]
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (168-180): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6368: (289-294): CHC: Out of bounds access happens here.
+// Warning 4984: (168-180='b.length + x'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6368: (289-294='_y[0]'): CHC: Out of bounds access happens here.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_function_4.sol b/test/libsolidity/smtCheckerTests/file_level/free_function_4.sol
index 3fab520df..fdd8c6f12 100644
--- a/test/libsolidity/smtCheckerTests/file_level/free_function_4.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/free_function_4.sol
@@ -4,4 +4,4 @@ function f()pure {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2072: (20-28): Unused local variable.
+// Warning 2072: (20-28='ufixed a'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_function_5.sol b/test/libsolidity/smtCheckerTests/file_level/free_function_5.sol
index fbfe61fd8..9d958f6f3 100644
--- a/test/libsolidity/smtCheckerTests/file_level/free_function_5.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/free_function_5.sol
@@ -5,4 +5,4 @@ function f() pure {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (35-51): Statement has no effect.
+// Warning 6133: (35-51='(abi.encode, "")'): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_function_and_constant_1.sol b/test/libsolidity/smtCheckerTests/file_level/free_function_and_constant_1.sol
index 4bb7e3960..e9672b9f3 100644
--- a/test/libsolidity/smtCheckerTests/file_level/free_function_and_constant_1.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/free_function_and_constant_1.sol
@@ -13,6 +13,6 @@ function fun(uint[] calldata _x, uint[] storage _y) view  returns (uint, uint[]
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (190-202): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (190-206): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6368: (315-320): CHC: Out of bounds access happens here.
+// Warning 4984: (190-202='b.length + x'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (190-206='b.length + x + A'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6368: (315-320='_y[0]'): CHC: Out of bounds access happens here.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol b/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol
index 32b7e1716..ca2d1fec9 100644
--- a/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol
@@ -11,4 +11,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 2519: (170-226): This declaration shadows an existing declaration.
-// Warning 6328: (130-149): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call\n    C.f() -- internal call
+// Warning 6328: (130-149='assert(f() == 1337)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_runtimecode.sol b/test/libsolidity/smtCheckerTests/file_level/free_runtimecode.sol
index 939d32e22..b681fb3bc 100644
--- a/test/libsolidity/smtCheckerTests/file_level/free_runtimecode.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/free_runtimecode.sol
@@ -14,5 +14,5 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 7507: (82-101): Assertion checker does not yet support this expression.
-// Warning 6328: (161-175): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()\n    test() -- internal call
+// Warning 7507: (82-101='type(C).runtimeCode'): Assertion checker does not yet support this expression.
+// Warning 6328: (161-175='assert(test())'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()\n    test() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/file_level/import.sol b/test/libsolidity/smtCheckerTests/file_level/import.sol
index 7bc2a5445..8d28ab6ee 100644
--- a/test/libsolidity/smtCheckerTests/file_level/import.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/import.sol
@@ -23,5 +23,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (B:238-252): CHC: Assertion violation happens here.
-// Warning 6328: (B:308-322): CHC: Assertion violation happens here.
+// Warning 6328: (B:238-252='assert(x == 7)'): CHC: Assertion violation happens here.
+// Warning 6328: (B:308-322='assert(y == 8)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/file_level/libraries_from_free.sol b/test/libsolidity/smtCheckerTests/file_level/libraries_from_free.sol
index 881c1388e..d624c9f6c 100644
--- a/test/libsolidity/smtCheckerTests/file_level/libraries_from_free.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/libraries_from_free.sol
@@ -22,6 +22,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4588: (190-197): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (284-298): CHC: Assertion violation happens here.
-// Warning 6328: (363-377): CHC: Assertion violation happens here.
+// Warning 4588: (190-197='L.pub()'): Assertion checker does not yet implement this type of function call.
+// Warning 6328: (284-298='assert(x == 7)'): CHC: Assertion violation happens here.
+// Warning 6328: (363-377='assert(y == 9)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol b/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol
index 5993f5e94..f77a618e4 100644
--- a/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: chc
 // ----
-// Warning 6328: (s3.sol:223-238): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 89\ny = 88\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call
-// Warning 6328: (s3.sol:291-306): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 89\ny = 88\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call
+// Warning 6328: (s3.sol:223-238='assert(x == 88)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 89\ny = 88\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call
+// Warning 6328: (s3.sol:291-306='assert(y == 89)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 89\ny = 88\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol b/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol
index d3b0e4c6b..ad1c64fb3 100644
--- a/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol
@@ -40,7 +40,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (s3.sol:327-342): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
-// Warning 6328: (s3.sol:396-411): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
-// Warning 6328: (s3.sol:465-480): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
-// Warning 6328: (s3.sol:534-549): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
+// Warning 6328: (s3.sol:327-342='assert(x == 89)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
+// Warning 6328: (s3.sol:396-411='assert(y == 42)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
+// Warning 6328: (s3.sol:465-480='assert(z == 89)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
+// Warning 6328: (s3.sol:534-549='assert(t == 13)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/file_level/new_operator.sol b/test/libsolidity/smtCheckerTests/file_level/new_operator.sol
index 8a0f118ae..469ec6a6e 100644
--- a/test/libsolidity/smtCheckerTests/file_level/new_operator.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/new_operator.sol
@@ -14,5 +14,5 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4588: (78-85): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (133-152): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()\n    test() -- internal call\n        (new C()).x() -- untrusted external call
+// Warning 4588: (78-85='new C()'): Assertion checker does not yet implement this type of function call.
+// Warning 6328: (133-152='assert(test() == 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()\n    test() -- internal call\n        (new C()).x() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/file_level/overloads.sol b/test/libsolidity/smtCheckerTests/file_level/overloads.sol
index 7224464b4..5dd7f74f6 100644
--- a/test/libsolidity/smtCheckerTests/file_level/overloads.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/overloads.sol
@@ -15,4 +15,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (229-243): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    f(2) -- internal call\n    f([0x61, 0x62, 0x63]) -- internal call
+// Warning 6328: (229-243='assert(y == 4)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    f(2) -- internal call\n    f([0x61, 0x62, 0x63]) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/file_level/struct.sol b/test/libsolidity/smtCheckerTests/file_level/struct.sol
index b9b811e68..a1853729d 100644
--- a/test/libsolidity/smtCheckerTests/file_level/struct.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/struct.sol
@@ -23,5 +23,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (317-333): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 2, a: [1]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(2, 1) -- internal call
-// Warning 6328: (352-371): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 2, a: [1]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(2, 1) -- internal call
+// Warning 6328: (317-333='assert(s.x == 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 2, a: [1]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(2, 1) -- internal call
+// Warning 6328: (352-371='assert(s.a[0] == 4)'): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 2, a: [1]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(2, 1) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol b/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol
index 54199e89c..702f7d286 100644
--- a/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol
+++ b/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol
@@ -24,6 +24,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 7650: (251-263): Assertion checker does not yet support this expression.
-// Warning 6328: (437-462): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.check()\n    C.f() -- internal call\n    C.g() -- internal call
-// Warning 6328: (507-532): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.check()\n    C.f() -- internal call\n    C.g() -- internal call\n    C.i() -- internal call\n    C.i() -- internal call
+// Warning 7650: (251-263='fun.selector'): Assertion checker does not yet support this expression.
+// Warning 6328: (437-462='assert(g() == 0x26121ff0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.check()\n    C.f() -- internal call\n    C.g() -- internal call
+// Warning 6328: (507-532='assert(i() == 0x26121ff0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.check()\n    C.f() -- internal call\n    C.g() -- internal call\n    C.i() -- internal call\n    C.i() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol
index 5e1917761..7eb7502a0 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol
@@ -14,4 +14,4 @@ contract A is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (120-134): CHC: Assertion violation happens here.\nCounterexample:\na = 2\n\nTransaction trace:\nA.constructor()
+// Warning 6328: (120-134='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\na = 2\n\nTransaction trace:\nA.constructor()
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol
index c10ec05bf..36ac9cf65 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol
@@ -5,4 +5,4 @@ contract J is C { constructor() C(3) { assert(a == 4); } }
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (211-225): CHC: Assertion violation happens here.\nCounterexample:\na = 3\n\nTransaction trace:\nJ.constructor()
+// Warning 6328: (211-225='assert(a == 4)'): CHC: Assertion violation happens here.\nCounterexample:\na = 3\n\nTransaction trace:\nJ.constructor()
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol
index 84fdaf87d..f06b17e95 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol
@@ -21,5 +21,5 @@ contract A is B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (171-176): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (200-218): CHC: Assertion violation happens here.
+// Warning 4984: (171-176='x + 2'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (200-218='assert(a == x + 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol
index b7cacc0f6..81f3af1c7 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol
@@ -19,5 +19,5 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (166-171): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\na = 0\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639934\n\nTransaction trace:\nA.constructor(115792089237316195423570985008687907853269984665640564039457584007913129639934)
-// Warning 4984: (175-180): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\na = 0\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nA.constructor(115792089237316195423570985008687907853269984665640564039457584007913129639935)
+// Warning 4984: (166-171='x + 2'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\na = 0\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639934\n\nTransaction trace:\nA.constructor(115792089237316195423570985008687907853269984665640564039457584007913129639934)
+// Warning 4984: (175-180='x + 1'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\na = 0\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nA.constructor(115792089237316195423570985008687907853269984665640564039457584007913129639935)
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol
index 55b17509e..f143205f7 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol
@@ -27,5 +27,5 @@ contract A is B2, B1 {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (168-173): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (270-288): CHC: Assertion violation happens here.
+// Warning 4984: (168-173='x + 2'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (270-288='assert(a == x + 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol
index 878612d04..fc11e212e 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol
@@ -27,5 +27,5 @@ contract A is B2, B1 {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (168-173): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (270-288): CHC: Assertion violation happens here.
+// Warning 4984: (168-173='x + 2'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (270-288='assert(a == x + 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol
index 6a2b07919..735fa47e5 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol
@@ -29,6 +29,6 @@ contract A is B2, B1 {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (193-198): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (209-214): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (302-318): CHC: Assertion violation happens here.
+// Warning 4984: (193-198='x + 2'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (209-214='x + a'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (302-318='assert(b1 != b2)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol
index ef24859ee..3bee63885 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol
@@ -20,5 +20,5 @@ contract A is B, B2 {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (132-138): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (162-176): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
+// Warning 5667: (132-138='uint x'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (162-176='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol
index cd5308ded..5bc7e5b6c 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol
@@ -19,5 +19,5 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (162-168): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (192-206): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
+// Warning 5667: (162-168='uint x'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (192-206='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol
index 00a74d505..7a3e9107a 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol
@@ -17,5 +17,5 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (106-112): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (140-154): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
+// Warning 5667: (106-112='uint x'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (140-154='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle_no_invocation.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle_no_invocation.sol
index f2f6297b2..96e0a1050 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle_no_invocation.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle_no_invocation.sol
@@ -16,5 +16,5 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (106-112): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (118-132): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
+// Warning 5667: (106-112='uint x'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (118-132='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol
index c2b6c1a27..336d9078e 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol
@@ -27,5 +27,5 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (222-228): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (252-266): CHC: Assertion violation happens here.\nCounterexample:\na = 4\nx = 0\n\nTransaction trace:\nA.constructor(0)
+// Warning 5667: (222-228='uint x'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (252-266='assert(a == 5)'): CHC: Assertion violation happens here.\nCounterexample:\na = 4\nx = 0\n\nTransaction trace:\nA.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol
index 50a91a7e0..13a32d20a 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol
@@ -32,5 +32,5 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (264-270): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (325-340): CHC: Assertion violation happens here.\nCounterexample:\na = 4\nx = 0\na1 = 4\na2 = 5\n\nTransaction trace:\nA.constructor(0)
+// Warning 5667: (264-270='uint x'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (325-340='assert(a == a2)'): CHC: Assertion violation happens here.\nCounterexample:\na = 4\nx = 0\na1 = 4\na2 = 5\n\nTransaction trace:\nA.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol
index 15cc66a0d..e261450f7 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol
@@ -27,5 +27,5 @@ contract A is B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (215-220): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (296-310): CHC: Assertion violation happens here.
+// Warning 4984: (215-220='x + 1'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (296-310='assert(a == 4)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol
index 933762ac8..d315b3c82 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol
@@ -24,4 +24,4 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (234-248): CHC: Assertion violation happens here.\nCounterexample:\na = 3\n\nTransaction trace:\nB.constructor()
+// Warning 6328: (234-248='assert(a == 2)'): CHC: Assertion violation happens here.\nCounterexample:\na = 3\n\nTransaction trace:\nB.constructor()
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_modifier.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_modifier.sol
index 951d006ec..fac5a2c09 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_modifier.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_modifier.sol
@@ -15,4 +15,4 @@ contract A is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (156-170): CHC: Assertion violation happens here.\nCounterexample:\na = 7\n\nTransaction trace:\nA.constructor()
+// Warning 6328: (156-170='assert(a == 4)'): CHC: Assertion violation happens here.\nCounterexample:\na = 7\n\nTransaction trace:\nA.constructor()
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_same_var.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_same_var.sol
index 051b89252..767487cd5 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_same_var.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_same_var.sol
@@ -14,5 +14,5 @@ contract A is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (102-116): CHC: Assertion violation happens here.\nCounterexample:\na = 2\n\nTransaction trace:\nA.constructor()
-// Warning 6328: (120-136): CHC: Assertion violation happens here.\nCounterexample:\na = 2\n\nTransaction trace:\nA.constructor()
+// Warning 6328: (102-116='assert(a == 0)'): CHC: Assertion violation happens here.\nCounterexample:\na = 2\n\nTransaction trace:\nA.constructor()
+// Warning 6328: (120-136='assert(C.a == 0)'): CHC: Assertion violation happens here.\nCounterexample:\na = 2\n\nTransaction trace:\nA.constructor()
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol b/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol
index 2db9622ea..60965e844 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol
@@ -14,4 +14,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (108-122): CHC: Assertion violation happens here.
+// Warning 6328: (108-122='assert(y == x)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol b/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol
index 48819f839..141a90b0d 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol
@@ -14,4 +14,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (112-126): CHC: Assertion violation happens here.
+// Warning 6328: (112-126='assert(y == x)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol b/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol
index 165dc6ae6..79a25eee2 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol
@@ -16,4 +16,4 @@ contract C is B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (132-146): CHC: Assertion violation happens here.
+// Warning 6328: (132-146='assert(y == x)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol b/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol
index 8fd9bf9a2..a75c3be1f 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol
@@ -14,5 +14,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (82-87): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (129-143): CHC: Assertion violation happens here.
+// Warning 4984: (82-87='a + b'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (129-143='assert(y == x)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_this.sol b/test/libsolidity/smtCheckerTests/functions/constructor_this.sol
index 28a343b0d..90f46dfb6 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_this.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_this.sol
@@ -10,5 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5805: (165-169): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
-// Warning 5805: (184-188): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
+// Warning 5805: (165-169='this'): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
+// Warning 5805: (184-188='this'): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol b/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol
index 7fd4fcff1..562d06ec6 100644
--- a/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol
+++ b/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5740: (122-136): Unreachable code.
+// Warning 5740: (122-136='assert(a == 3)'): Unreachable code.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_call_state_var_init.sol b/test/libsolidity/smtCheckerTests/functions/function_call_state_var_init.sol
index 6ca122aef..28d61fbd0 100644
--- a/test/libsolidity/smtCheckerTests/functions/function_call_state_var_init.sol
+++ b/test/libsolidity/smtCheckerTests/functions/function_call_state_var_init.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (83-99): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (83-99='assert(y > 1000)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/functions/function_external_call_should_not_inline_1.sol b/test/libsolidity/smtCheckerTests/functions/function_external_call_should_not_inline_1.sol
index 4bb98c7a3..895f42f5a 100644
--- a/test/libsolidity/smtCheckerTests/functions/function_external_call_should_not_inline_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/function_external_call_should_not_inline_1.sol
@@ -14,4 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (53-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (53-57='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol
index 55d908467..c6f60e378 100644
--- a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol
@@ -16,4 +16,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (176-190): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nb = true\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(true)\n    C.f() -- internal call
+// Warning 6328: (176-190='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nb = true\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(true)\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol
index 7b7118b93..dc16347bc 100644
--- a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol
@@ -24,5 +24,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (176-190): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nb = true\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(true)\n    C.f() -- internal call
-// Warning 6328: (288-302): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nb = false\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(false)\n    C.f() -- internal call
+// Warning 6328: (176-190='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nb = true\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(true)\n    C.f() -- internal call
+// Warning 6328: (288-302='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nb = false\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(false)\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_bound_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_bound_1_fail.sol
index 8b6bb58f0..42b7f142c 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_bound_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_bound_1_fail.sol
@@ -18,4 +18,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (228-244): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 1000\n\nTransaction trace:\nC.constructor()\nC.f(1)\n    L.add(1, 999) -- internal call
+// Warning 6328: (228-244='assert(y < 1000)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 1000\n\nTransaction trace:\nC.constructor()\nC.f(1)\n    L.add(1, 999) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_4.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_4.sol
index f5fd59c2f..06e569e6b 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_4.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_4.sol
@@ -17,4 +17,4 @@ contract D
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (158-173): CHC: Assertion violation happens here.
+// Warning 6328: (158-173='assert(z == _y)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_3.sol b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_3.sol
index 20f0ddcfe..243652b30 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_3.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (63-75): CHC: Empty array "pop" happens here.\nCounterexample:\ndata = []\n\nTransaction trace:\nC.constructor()\nState: data = []\nC.f()
+// Warning 2529: (63-75='(data.pop)()'): CHC: Empty array "pop" happens here.\nCounterexample:\ndata = []\n\nTransaction trace:\nC.constructor()\nState: data = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
index c77359fd4..ee595b8f0 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
@@ -13,4 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (129-142): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call
+// Warning 6328: (129-142='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
index 33f37ffcc..782f4016a 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
@@ -17,4 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (197-210): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call\n        C.k(0) -- internal call
+// Warning 6328: (197-210='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call\n        C.k(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol
index 9da6fd551..a28bc4893 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol
@@ -13,4 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (131-144): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call
+// Warning 6328: (131-144='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol
index f69d47baf..5234dd728 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol
@@ -17,4 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (212-228): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 1000\n\nTransaction trace:\nC.constructor()\nC.f(1)\n    L.add(1, 999) -- internal call
+// Warning 6328: (212-228='assert(y < 1000)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 1000\n\nTransaction trace:\nC.constructor()\nC.f(1)\n    L.add(1, 999) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
index a7f0c879f..941bf7022 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
@@ -14,4 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (112-125): CHC: Assertion violation happens here.\nCounterexample:\na = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0\nC.g()\n    C.f(0) -- internal call
+// Warning 6328: (112-125='assert(a > 0)'): CHC: Assertion violation happens here.\nCounterexample:\na = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0\nC.g()\n    C.f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol
index 29fd5aefb..47a387dc6 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol
@@ -15,4 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (120-133): CHC: Assertion violation happens here.\nCounterexample:\na = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0\nC.g()\n    C.f(1) -- internal call\n    C.f(0) -- internal call
+// Warning 6328: (120-133='assert(a > 0)'): CHC: Assertion violation happens here.\nCounterexample:\na = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0\nC.g()\n    C.f(1) -- internal call\n    C.f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for.sol
index 681d42aef..5be099f56 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for.sol
@@ -5,4 +5,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (65-66): BMC: Condition is always true.
+// Warning 6838: (65-66='x'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_if.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_if.sol
index da5240aad..37648deed 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_if.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_if.sol
@@ -5,4 +5,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (63-64): BMC: Condition is always true.
+// Warning 6838: (63-64='x'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_require.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_require.sol
index 84fd5c62b..5c0328c1c 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_require.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_require.sol
@@ -5,4 +5,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (65-66): BMC: Condition is always true.
+// Warning 6838: (65-66='x'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while.sol
index 91bfd981c..14894e6c4 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while.sol
@@ -5,4 +5,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (66-67): BMC: Condition is always true.
+// Warning 6838: (66-67='x'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/address.sol b/test/libsolidity/smtCheckerTests/functions/getters/address.sol
index 92bb2761d..fd876826f 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/address.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/address.sol
@@ -14,5 +14,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (171-197): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
-// Warning 6328: (249-275): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
+// Warning 6328: (171-197='assert(a == address(this))'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
+// Warning 6328: (249-275='assert(y == address(this))'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
index 421c4fd4f..b3aebe2a4 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
@@ -15,5 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (187-201): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0, 0, 0]\ny = 0\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0, 0, 0]\nC.f()
+// Warning 6328: (187-201='assert(y == 1)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0, 0, 0]\ny = 0\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0, 0, 0]\nC.f()
 // Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
index ebc7877f0..5b0844fff 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
@@ -19,5 +19,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (242-256): CHC: Assertion violation happens here.
+// Warning 6328: (242-256='assert(y == 1)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n!(a[2].length <= 3)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
index 6c7b0a1b3..290442d3e 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
@@ -19,4 +19,4 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (267-281): CHC: Assertion violation happens here.\nCounterexample:\nitems = [{x: 42, y: 43}]\na = 42\nb = 43\n\nTransaction trace:\nD.constructor()\nState: items = []\nD.test()
+// Warning 6328: (267-281='assert(b == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nitems = [{x: 42, y: 43}]\na = 42\nb = 43\n\nTransaction trace:\nD.constructor()\nState: items = []\nD.test()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol
index d089d2eda..b6f6a99eb 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol
@@ -21,4 +21,4 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (322-336): CHC: Assertion violation happens here.\nCounterexample:\nitems = [{x: 42, y: 43, arr: [0]}]\ntmp = [0]\na = 42\nb = 43\n\nTransaction trace:\nD.constructor()\nState: items = []\nD.test()
+// Warning 6328: (322-336='assert(b == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nitems = [{x: 42, y: 43, arr: [0]}]\ntmp = [0]\na = 42\nb = 43\n\nTransaction trace:\nD.constructor()\nState: items = []\nD.test()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol b/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol
index e90cc2cfd..a6e7b586a 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol
@@ -16,4 +16,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (193-207): CHC: Assertion violation happens here.\nCounterexample:\ns = {u: 0}\nu = 0\nv = 0\n\nTransaction trace:\nC.constructor()\nState: s = {u: 0}\nC.f()
+// Warning 6328: (193-207='assert(u == 1)'): CHC: Assertion violation happens here.\nCounterexample:\ns = {u: 0}\nu = 0\nv = 0\n\nTransaction trace:\nC.constructor()\nState: s = {u: 0}\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol b/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol
index ac47ded03..c5e0690b6 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol
@@ -14,5 +14,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (159-175): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
-// Warning 6328: (227-245): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
+// Warning 6328: (159-175='assert(a == 'a')'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
+// Warning 6328: (227-245='assert(y == "abc")'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/function.sol b/test/libsolidity/smtCheckerTests/functions/getters/function.sol
index 95680f13d..e8a17eeeb 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/function.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/function.sol
@@ -15,5 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (152-170): CHC: Assertion violation happens here.\nCounterexample:\ng = 0\ne = 0\n\nTransaction trace:\nC.constructor()\nState: g = 0\nC.f()\n    e() -- untrusted external call\n    g() -- untrusted external call
-// Warning 6328: (262-278): CHC: Assertion violation happens here.\nCounterexample:\ng = 0\ne = 0\n\nTransaction trace:\nC.constructor()\nState: g = 0\nC.f()\n    e() -- untrusted external call\n    g() -- untrusted external call\n    e() -- untrusted external call
+// Warning 6328: (152-170='assert(e() == g())'): CHC: Assertion violation happens here.\nCounterexample:\ng = 0\ne = 0\n\nTransaction trace:\nC.constructor()\nState: g = 0\nC.f()\n    e() -- untrusted external call\n    g() -- untrusted external call
+// Warning 6328: (262-278='assert(e() == 1)'): CHC: Assertion violation happens here.\nCounterexample:\ng = 0\ne = 0\n\nTransaction trace:\nC.constructor()\nState: g = 0\nC.f()\n    e() -- untrusted external call\n    g() -- untrusted external call\n    e() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
index 6e133feda..7dcc9c552 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (142-156): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (142-156='assert(y == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
index 814a0a2ad..2b787372d 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (166-180): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (166-180='assert(y == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol
index a64a52c34..617083b71 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (147-161): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (147-161='assert(y == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
index 30907bd67..20137ec1b 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
@@ -16,5 +16,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (210-224): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (210-224='assert(y == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
index 56032d9d5..d422f3747 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
@@ -19,5 +19,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (256-270): CHC: Assertion violation happens here.
+// Warning 6328: (256-270='assert(y == 1)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n!(m[0][1].length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
index c3a3d660d..01b470a9c 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
@@ -20,5 +20,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (274-288): CHC: Assertion violation happens here.
+// Warning 6328: (274-288='assert(y == 1)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n!(m[0][1].length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
index 43047758e..183602b85 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
@@ -18,5 +18,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (260-274): CHC: Assertion violation happens here.
+// Warning 6328: (260-274='assert(y == 1)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n!(m[0][1].length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
index 2e8abe5dc..4082f1d25 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
@@ -22,5 +22,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (354-368): CHC: Assertion violation happens here.
+// Warning 6328: (354-368='assert(y == 1)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n!(m[0][1].length <= 2)\n!(m[0][1][2].length <= 3)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
index fc4c9efcf..7cc749d58 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
@@ -15,5 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-206): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (192-206='assert(y == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
index 0b2b6fadf..e717d820f 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
@@ -17,5 +17,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (232-246): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (232-246='assert(y == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n!(m[0].length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
index be6bc2383..06acd7a03 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
@@ -15,5 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (218-232): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (218-232='assert(y == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol b/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
index d66545e43..8abdfc94b 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
@@ -12,5 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (162-184): CHC: Assertion violation happens here.\nCounterexample:\nx = [42, 1]\n\nTransaction trace:\nC.constructor()\nState: x = [42, 1]\nC.f()
+// Warning 6328: (162-184='assert(this.x(0) == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = [42, 1]\n\nTransaction trace:\nC.constructor()\nState: x = [42, 1]\nC.f()
 // Info 1180: Contract invariant(s) for :C:\n!(x.length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
index 73e6f3316..38e89d9c3 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
@@ -27,4 +27,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (338-355): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0, t: {t: 0}, b: false, a: []}\ny = 0\nc = false\nt = {t: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0, t: {t: 0}, b: false, a: []}\nC.f()
+// Warning 6328: (338-355='assert(c == true)'): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0, t: {t: 0}, b: false, a: []}\ny = 0\nc = false\nt = {t: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0, t: {t: 0}, b: false, a: []}\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
index 4fa8b0e3f..e80999983 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
@@ -17,4 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (175-189): CHC: Assertion violation happens here.\nCounterexample:\ns = {a: [0, 0], u: 0}\nu = 0\n\nTransaction trace:\nC.constructor()\nState: s = {a: [0, 0], u: 0}\nC.f()
+// Warning 6328: (175-189='assert(u == 1)'): CHC: Assertion violation happens here.\nCounterexample:\ns = {a: [0, 0], u: 0}\nu = 0\n\nTransaction trace:\nC.constructor()\nState: s = {a: [0, 0], u: 0}\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
index b5cdcc32d..4067fe408 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
@@ -21,12 +21,12 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (273-277): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (281-287): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (314-318): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (307-326): CHC: Error trying to invoke SMT solver.
-// Warning 6368: (273-277): CHC: Out of bounds access might happen here.
-// Warning 6368: (281-287): CHC: Out of bounds access might happen here.
-// Warning 6368: (314-318): CHC: Out of bounds access might happen here.
-// Warning 6328: (307-326): CHC: Assertion violation might happen here.
-// Warning 4661: (307-326): BMC: Assertion violation happens here.
+// Warning 1218: (273-277='b[0]'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (281-287='m.b[0]'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (314-318='b[0]'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (307-326='assert(b[0] == "t")'): CHC: Error trying to invoke SMT solver.
+// Warning 6368: (273-277='b[0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (281-287='m.b[0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (314-318='b[0]'): CHC: Out of bounds access might happen here.
+// Warning 6328: (307-326='assert(b[0] == "t")'): CHC: Assertion violation might happen here.
+// Warning 4661: (307-326='assert(b[0] == "t")'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
index c2d0d4426..93be7298c 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
@@ -28,5 +28,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (255-272): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 1, b: false}\nx = 1\nb = false\ny = 0\nc = false\n\nTransaction trace:\nC.constructor()\nState: s = {x: 1, b: false}\nC.f()
-// Warning 6328: (377-391): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 42, b: false}\nx = 1\nb = false\ny = 42\nc = false\n\nTransaction trace:\nC.constructor()\nState: s = {x: 1, b: false}\nC.f()
+// Warning 6328: (255-272='assert(b == true)'): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 1, b: false}\nx = 1\nb = false\ny = 0\nc = false\n\nTransaction trace:\nC.constructor()\nState: s = {x: 1, b: false}\nC.f()
+// Warning 6328: (377-391='assert(y == x)'): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 42, b: false}\nx = 1\nb = false\ny = 42\nc = false\n\nTransaction trace:\nC.constructor()\nState: s = {x: 1, b: false}\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/uint.sol b/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
index b85d47284..6cae5dc38 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (114-128): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (114-128='assert(y == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_inheritance.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_inheritance.sol
index 2907a7e22..430462af3 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_inheritance.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_inheritance.sol
@@ -17,4 +17,4 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (221-235): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.a()\n    B.b() -- internal call\n        C.c() -- internal call
+// Warning 6328: (221-235='assert(x < 40)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.a()\n    B.b() -- internal call\n        C.c() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol
index 8094870be..0965e9915 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol
@@ -8,4 +8,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (54-58): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (54-58='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
index d067795ac..928abeaff 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
@@ -20,10 +20,10 @@ contract C{
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (49-63): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor(0)
-// Warning 6328: (105-119): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
-// Warning 6328: (187-201): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
-// Warning 6328: (212-226): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
+// Warning 5667: (37-43='uint y'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (49-63='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (105-119='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()
+// Warning 6328: (137-151='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
+// Warning 6328: (187-201='assert(x == 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
+// Warning 6328: (212-226='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
 // Info 1180: Contract invariant(s) for :C:\n!(x >= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol
index 6b997ada3..223a9229e 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol
@@ -17,6 +17,6 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (49-63): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (115-129): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (147-161): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (49-63='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (115-129='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (147-161='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
index 4bca2544e..d63bb7ab7 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
@@ -20,5 +20,5 @@ contract C{
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (37-43='uint y'): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Info 1180: Contract invariant(s) for :C:\n!(x <= 0)\n!(x >= 2)\n(!(x <= 0) && !(x >= 2))\n
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
index c0f524e10..51a04884b 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
@@ -20,8 +20,8 @@ contract C{
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (49-63): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor(0)
-// Warning 6328: (105-119): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()
-// Warning 6328: (151-165): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call\n    C.g() -- internal call
+// Warning 5667: (37-43='uint y'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (49-63='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (105-119='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()
+// Warning 6328: (151-165='assert(x == 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call\n    C.g() -- internal call
 // Info 1180: Contract invariant(s) for :C:\n!(x <= 0)\n!(x >= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/library_constant.sol b/test/libsolidity/smtCheckerTests/functions/library_constant.sol
index ddb900851..d04f1e5fd 100644
--- a/test/libsolidity/smtCheckerTests/functions/library_constant.sol
+++ b/test/libsolidity/smtCheckerTests/functions/library_constant.sol
@@ -19,5 +19,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (103-122): CHC: Assertion violation happens here.\nCounterexample:\nTON = 1000\n\nTransaction trace:\nl1.constructor()\nState: TON = 1000\nl1.f1()
-// Warning 4984: (196-201): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nC.constructor()\nC.f(115792089237316195423570985008687907853269984665640564039457584007913129639935)\n    l1.f2(115792089237316195423570985008687907853269984665640564039457584007913129639935, 1) -- internal call
+// Warning 6328: (103-122='assert(TON == 2000)'): CHC: Assertion violation happens here.\nCounterexample:\nTON = 1000\n\nTransaction trace:\nl1.constructor()\nState: TON = 1000\nl1.f1()
+// Warning 4984: (196-201='x + y'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nC.constructor()\nC.f(115792089237316195423570985008687907853269984665640564039457584007913129639935)\n    l1.f2(115792089237316195423570985008687907853269984665640564039457584007913129639935, 1) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/payable_2.sol b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
index 98717b133..bb55045e6 100644
--- a/test/libsolidity/smtCheckerTests/functions/payable_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
@@ -24,4 +24,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (261-283): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g2(){ msg.value: 35 }\n    C.i() -- internal call
+// Warning 6328: (261-283='assert(msg.value == 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g2(){ msg.value: 35 }\n    C.i() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/recursive_multi_return_2.sol b/test/libsolidity/smtCheckerTests/functions/recursive_multi_return_2.sol
index 98b239761..bc302943f 100644
--- a/test/libsolidity/smtCheckerTests/functions/recursive_multi_return_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/recursive_multi_return_2.sol
@@ -23,5 +23,5 @@ a;
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (39-57): Statement has no effect.
-// Warning 6133: (63-74): Statement has no effect.
+// Warning 6133: (39-57='22237625-86535-0+1'): Statement has no effect.
+// Warning 6133: (63-74='555565-3*51'): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol b/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
index 85e97661c..7e5f6197f 100644
--- a/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
+++ b/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
@@ -29,6 +29,6 @@ contract D is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (205-219): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.proxy()\n    C.f() -- internal call\n        A.f() -- internal call
-// Warning 6328: (328-342): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()\nState: x = 0\nA.proxy()\n    D.f() -- internal call\n        C.f() -- internal call\n            A.f() -- internal call
+// Warning 6328: (205-219='assert(x == 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.proxy()\n    C.f() -- internal call\n        A.f() -- internal call
+// Warning 6328: (328-342='assert(x == 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()\nState: x = 0\nA.proxy()\n    D.f() -- internal call\n        C.f() -- internal call\n            A.f() -- internal call
 // Info 1180: Contract invariant(s) for :A:\n((x = 0) || (x = 2))\nContract invariant(s) for :D:\n((x = 0) || (x = 2))\n
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol
index ed7110d53..0d3756b2b 100644
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol
@@ -13,4 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (108-123): CHC: Assertion violation happens here.\nCounterexample:\na = 42\nx = 42\n\nTransaction trace:\nC.constructor()\nState: a = 0\nC.f(42)\n    C.g(42) -- trusted external call
+// Warning 6328: (108-123='assert(a != 42)'): CHC: Assertion violation happens here.\nCounterexample:\na = 42\nx = 42\n\nTransaction trace:\nC.constructor()\nState: a = 0\nC.f(42)\n    C.g(42) -- trusted external call
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol
index 5a425ca78..8e170659b 100644
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol
+++ b/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol
@@ -25,5 +25,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (314-346): CHC: Assertion violation happens here.
-// Warning 6328: (356-388): CHC: Assertion violation happens here.
+// Warning 6328: (314-346='assert(lastCaller == msg.sender)'): CHC: Assertion violation happens here.
+// Warning 6328: (356-388='assert(lastCaller == address(0))'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol b/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
index 4c5e38131..5b8eddf37 100644
--- a/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
+++ b/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
@@ -19,5 +19,5 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (227-241): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.proxy()\n    C.f() -- internal call
+// Warning 6328: (227-241='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.proxy()\n    C.f() -- internal call
 // Info 1180: Contract invariant(s) for :A:\n((x >= 0) && (x <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/imports/ExtCall.sol b/test/libsolidity/smtCheckerTests/imports/ExtCall.sol
index 047148a90..8c0482bac 100644
--- a/test/libsolidity/smtCheckerTests/imports/ExtCall.sol
+++ b/test/libsolidity/smtCheckerTests/imports/ExtCall.sol
@@ -38,5 +38,5 @@ contract ExtCallTest {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (ExtCall.sol:362-381): CHC: Assertion violation happens here.
-// Warning 4588: (ExtCall.t.sol:110-123): Assertion checker does not yet implement this type of function call.
+// Warning 6328: (ExtCall.sol:362-381='assert(x_prev == x)'): CHC: Assertion violation happens here.
+// Warning 4588: (ExtCall.t.sol:110-123='new ExtCall()'): Assertion checker does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol b/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
index c8285a0bc..4e2976f03 100644
--- a/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
+++ b/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
@@ -16,9 +16,9 @@ contract C is B {
 // SMTEngine: all
 // SMTSolvers: smtlib2
 // ----
-// Warning 6328: (b.sol:62-75): CHC: Assertion violation might happen here.
+// Warning 6328: (b.sol:62-75='assert(x > x)'): CHC: Assertion violation might happen here.
 // Warning 3996: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
-// Warning 7812: (b.sol:62-75): BMC: Assertion violation might happen here.
+// Warning 7812: (b.sol:62-75='assert(x > x)'): BMC: Assertion violation might happen here.
 // Warning 8084: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
-// Warning 6328: (c.sol:68-81): CHC: Assertion violation might happen here.
-// Warning 7812: (c.sol:68-81): BMC: Assertion violation might happen here.
+// Warning 6328: (c.sol:68-81='assert(x < x)'): CHC: Assertion violation might happen here.
+// Warning 7812: (c.sol:68-81='assert(x < x)'): BMC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol b/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol
index 7796d3a9a..d2c7af38b 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol
@@ -17,4 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (A:117-132): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_y = 0\n\nTransaction trace:\nD.constructor()\nState: x = 0\nD.f(0)\n    C.g(0) -- internal call
+// Warning 6328: (A:117-132='assert(x > 100)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_y = 0\n\nTransaction trace:\nD.constructor()\nState: x = 0\nD.f(0)\n    C.g(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol b/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
index 8ddef2da9..06defac64 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
@@ -18,5 +18,5 @@ function f(uint _x) pure {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (A:50-64): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call\n    A:f(10) -- internal call\n    A:f(0) -- internal call
-// Warning 6328: (s1.sol:28-44): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call
+// Warning 6328: (A:50-64='assert(_x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call\n    A:f(10) -- internal call\n    A:f(0) -- internal call
+// Warning 6328: (s1.sol:28-44='assert(_x > 100)'): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/import_base.sol b/test/libsolidity/smtCheckerTests/imports/import_base.sol
index 4ad653357..07eca14f8 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_base.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_base.sol
@@ -20,4 +20,4 @@ contract Der is Base {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (der:173-186): CHC: Assertion violation happens here.\nCounterexample:\nx = 3, a = 0x0\ny = 0\n\nTransaction trace:\nDer.constructor()\nState: x = 0, a = 0x0\nDer.g(0)\n    Base.f() -- internal call
+// Warning 6328: (der:173-186='assert(y > x)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 3, a = 0x0\ny = 0\n\nTransaction trace:\nDer.constructor()\nState: x = 0, a = 0x0\nDer.g(0)\n    Base.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/import_free_functions.sol b/test/libsolidity/smtCheckerTests/imports/import_free_functions.sol
index 6e9621b30..675991dfd 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_free_functions.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_free_functions.sol
@@ -20,4 +20,4 @@ contract ERC20 {
 // ====
 // SMTEngine: all
 // ----
-// Warning 3944: (ERC20.sol:121-126): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\namount = 1\n\nTransaction trace:\nERC20.constructor()\nERC20.transferFrom(1){ msg.sender: 0x52f6 }\n    ERC20.sol:sub(0, 1) -- internal call
+// Warning 3944: (ERC20.sol:121-126='a - b'): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\namount = 1\n\nTransaction trace:\nERC20.constructor()\nERC20.transferFrom(1){ msg.sender: 0x52f6 }\n    ERC20.sol:sub(0, 1) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/import_library.sol b/test/libsolidity/smtCheckerTests/imports/import_library.sol
index 7c3a32e10..d15fa6dd2 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_library.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_library.sol
@@ -16,4 +16,4 @@ library L {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (c:81-94): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 1\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    L.f() -- internal call
+// Warning 6328: (c:81-94='assert(x > y)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 1\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    L.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/import_library_2.sol b/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
index 4d33d4002..113d6c420 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
@@ -25,4 +25,4 @@ contract ERC20 {
 // ====
 // SMTEngine: all
 // ----
-// Warning 3944: (ERC20.sol:157-162): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\namount = 1\n\nTransaction trace:\nERC20.constructor()\nERC20.transferFrom(1){ msg.sender: 0x52f6 }\n    SafeMath.sub(0, 1) -- internal call
+// Warning 3944: (ERC20.sol:157-162='a - b'): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\namount = 1\n\nTransaction trace:\nERC20.constructor()\nERC20.transferFrom(1){ msg.sender: 0x52f6 }\n    SafeMath.sub(0, 1) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/imported_fail_1.sol b/test/libsolidity/smtCheckerTests/imports/imported_fail_1.sol
index cd9e2e27e..25bfbb5bf 100644
--- a/test/libsolidity/smtCheckerTests/imports/imported_fail_1.sol
+++ b/test/libsolidity/smtCheckerTests/imports/imported_fail_1.sol
@@ -22,5 +22,5 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (B.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.g(0)
-// Warning 6328: (C.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(0)
+// Warning 6328: (B.sol:71-85='assert(_x > x)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.g(0)
+// Warning 6328: (C.sol:71-85='assert(_x < x)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(0)
diff --git a/test/libsolidity/smtCheckerTests/imports/imported_fail_2.sol b/test/libsolidity/smtCheckerTests/imports/imported_fail_2.sol
index cd9e2e27e..25bfbb5bf 100644
--- a/test/libsolidity/smtCheckerTests/imports/imported_fail_2.sol
+++ b/test/libsolidity/smtCheckerTests/imports/imported_fail_2.sol
@@ -22,5 +22,5 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (B.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.g(0)
-// Warning 6328: (C.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(0)
+// Warning 6328: (B.sol:71-85='assert(_x > x)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.g(0)
+// Warning 6328: (C.sol:71-85='assert(_x < x)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(0)
diff --git a/test/libsolidity/smtCheckerTests/imports/imported_fail_3.sol b/test/libsolidity/smtCheckerTests/imports/imported_fail_3.sol
index afe8b1bb3..8d2f49341 100644
--- a/test/libsolidity/smtCheckerTests/imports/imported_fail_3.sol
+++ b/test/libsolidity/smtCheckerTests/imports/imported_fail_3.sol
@@ -22,5 +22,5 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (B.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.g(0)
-// Warning 6328: (C.sol:71-85): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(0)
+// Warning 6328: (B.sol:71-85='assert(_x > x)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.g(0)
+// Warning 6328: (C.sol:71-85='assert(_x < x)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(0)
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
index 0fd508602..863d9e716 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
@@ -15,5 +15,5 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (52-66): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, x = 0\nC.g()\n    B.f() -- internal call
+// Warning 6328: (52-66='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, x = 0\nC.g()\n    B.f() -- internal call
 // Info 1180: Contract invariant(s) for :B:\n(x <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
index 039388704..19d9e656b 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
@@ -22,4 +22,4 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (54-68): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, z = 0, w = 0, a = 0, b = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, z = 0, w = 0, a = 0, b = 0, x = 0\nC.g()\n    A.f() -- internal call
+// Warning 6328: (54-68='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, z = 0, w = 0, a = 0, b = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, z = 0, w = 0, a = 0, b = 0, x = 0\nC.g()\n    A.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
index 4d9067e07..8ea6cc47c 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
@@ -28,4 +28,4 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    B.f() -- internal call\n        A.f() -- internal call\n            C.v() -- internal call
+// Warning 6328: (64-78='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    B.f() -- internal call\n        A.f() -- internal call\n            C.v() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
index 4bf6520fb..51a1cf684 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
@@ -35,4 +35,4 @@ contract C is B, A1 {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call\n        A1.f() -- internal call\n            B.f() -- internal call\n                A.f() -- internal call\n                    C.v() -- internal call
+// Warning 6328: (64-78='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call\n        A1.f() -- internal call\n            B.f() -- internal call\n                A.f() -- internal call\n                    C.v() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
index 507b10824..52e243ced 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
@@ -29,4 +29,4 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (97-111): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    B.f() -- internal call\n        A.f() -- internal call\n            C.v() -- internal call\n                A.v() -- internal call
+// Warning 6328: (97-111='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    B.f() -- internal call\n        A.f() -- internal call\n            C.v() -- internal call\n                A.v() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
index 21d8a3dcc..73ceebc83 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
@@ -31,4 +31,4 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (183-197): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()\n    A.v() -- internal call
+// Warning 6328: (183-197='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()\n    A.v() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
index db63f27c7..212887af0 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
@@ -22,4 +22,4 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (56-70): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    A.f() -- internal call\n        C.v() -- internal call
+// Warning 6328: (56-70='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    A.f() -- internal call\n        C.v() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol
index a326ccf3b..8bf8481a2 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol
@@ -15,4 +15,4 @@ contract C is  A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (61-75): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.f()
+// Warning 6328: (61-75='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.f()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
index a87a8eeb6..fc84de434 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
@@ -28,6 +28,6 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (62-76): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nB.f()\n    A.f() -- internal call\n        C.v() -- internal call
-// Warning 6328: (131-145): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()\n    A.v() -- internal call
+// Warning 6328: (62-76='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nB.f()\n    A.f() -- internal call\n        C.v() -- internal call
+// Warning 6328: (131-145='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()\n    A.v() -- internal call
 // Info 1180: Contract invariant(s) for :A:\n(x = 0)\n
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol
index a67223b5a..f6c7268af 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol
@@ -32,5 +32,5 @@ contract C is Z(5) {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (292-299): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\nx = 1\nz = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nZ.constructor(115792089237316195423570985008687907853269984665640564039457584007913129639935)
-// Warning 6328: (367-380): CHC: Assertion violation happens here.\nCounterexample:\nx = 6\n\nTransaction trace:\nC.constructor()
+// Warning 4984: (292-299='z + f()'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\nx = 1\nz = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nZ.constructor(115792089237316195423570985008687907853269984665640564039457584007913129639935)
+// Warning 6328: (367-380='assert(x > 9)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 6\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol
index 497fa6076..4cb169772 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol
@@ -34,6 +34,6 @@ contract C is Z(5) {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (110-116): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (300-307): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (376-390): CHC: Assertion violation happens here.
+// Warning 4984: (110-116='x += b'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (300-307='z + f()'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (376-390='assert(x > 90)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol
index 6ca597ed1..b8b4ab733 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol
@@ -31,5 +31,5 @@ contract C is Z, B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (351-365): CHC: Assertion violation happens here.
+// Warning 4984: (105-112='b + f()'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (351-365='assert(x == k)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol
index 130da425e..2f9ac57fe 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol
@@ -30,4 +30,4 @@ contract C is Z, B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (349-363): CHC: Assertion violation happens here.\nCounterexample:\nk = 2, x = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (349-363='assert(x == k)'): CHC: Assertion violation happens here.\nCounterexample:\nk = 2, x = 1\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol
index a1a9b9b6e..160ce3946 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol
@@ -31,5 +31,5 @@ contract C is Z, B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (361-375): CHC: Assertion violation happens here.
+// Warning 4984: (105-112='b + f()'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (361-375='assert(x == k)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol
index c670aff15..18b3ce040 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol
@@ -31,5 +31,5 @@ contract C is Z, B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (361-375): CHC: Assertion violation happens here.
+// Warning 4984: (105-112='b + f()'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (361-375='assert(x == k)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol
index e97b990ee..2752b2c06 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol
@@ -36,5 +36,5 @@ contract C is Z, B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (423-437): CHC: Assertion violation happens here.
+// Warning 4984: (105-112='b + f()'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (423-437='assert(x == k)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol
index 3d92a3626..6948a1c0b 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol
@@ -35,4 +35,4 @@ contract C is Z, B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (416-430): CHC: Assertion violation happens here.\nCounterexample:\nk = 42, x = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (416-430='assert(x == k)'): CHC: Assertion violation happens here.\nCounterexample:\nk = 42, x = 1\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol
index b63c3c79d..9fe5c9a29 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol
@@ -32,4 +32,4 @@ contract C is Z {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (354-367): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (354-367='assert(x > 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol
index 0164cf437..78fa259ac 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol
@@ -18,5 +18,5 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (185-199): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (218-234): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (185-199='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (218-234='assert(x > 2000)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol
index fed5ebf34..9c3a0462e 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol
@@ -19,6 +19,6 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (191-205): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (224-238): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (257-273): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (191-205='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (224-238='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (257-273='assert(x > 2000)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol
index 15cc66a0d..e261450f7 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol
@@ -27,5 +27,5 @@ contract A is B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (215-220): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (296-310): CHC: Assertion violation happens here.
+// Warning 4984: (215-220='x + 1'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (296-310='assert(a == 4)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol
index be9545837..a9f0f128d 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (64-78='assert(x == 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
index e9bf3f65c..9575545b5 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
@@ -33,7 +33,7 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (247-261): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (339-362): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (439-463): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
-// Warning 6328: (483-496): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (247-261='assert(y == 4)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
+// Warning 6328: (339-362='assert(x < 0 && y == 4)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
+// Warning 6328: (439-463='assert(x >= 0 && y == 2)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (483-496='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol
index 7435a54f5..2259af27c 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol
@@ -11,4 +11,4 @@ contract D is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (84-98): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (84-98='assert(x == 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol
index bba7b3e13..ce242fbe8 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol
@@ -19,4 +19,4 @@ contract D is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (178-192): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (178-192='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nD.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol
index c9a9f970f..a6dd91d33 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol
@@ -18,4 +18,4 @@ contract D is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (152-166): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (152-166='assert(x == 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol
index f02e416a4..9cd4bf8c9 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol
@@ -23,6 +23,6 @@ contract A is B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (125-130): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (184-189): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (243-261): CHC: Assertion violation happens here.
+// Warning 4984: (125-130='a + x'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (184-189='x + 2'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (243-261='assert(a == x + 5)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol
index e223ad5f7..f708e2f3c 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol
@@ -23,6 +23,6 @@ contract A is B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (125-131): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4984: (185-190): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (241-259): CHC: Assertion violation happens here.
+// Warning 4984: (125-131='x + 10'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (185-190='x + 2'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (241-259='assert(b == x + 5)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol
index 71e9071f1..34b1a7b86 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol
@@ -39,5 +39,5 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (403-417): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, x = 1\nc = (- 1)\n\nTransaction trace:\nC.constructor((- 1))
-// Warning 6328: (450-463): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, x = 0\nc = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (403-417='assert(c >= 0)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, x = 1\nc = (- 1)\n\nTransaction trace:\nC.constructor((- 1))
+// Warning 6328: (450-463='assert(c < 0)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, x = 0\nc = 0\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol
index a31d5894c..b15a68e6a 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol
@@ -17,4 +17,4 @@ contract D is B, C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (129-143): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (129-143='assert(x == 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol
index c7c63f00f..e73971600 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol
@@ -25,5 +25,5 @@ contract D is B, C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (134-148): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
-// Warning 6328: (223-237): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (134-148='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (223-237='assert(x == 4)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nD.constructor()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
index 580597f4f..3cda9ece3 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
@@ -29,4 +29,4 @@ contract D is B, C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (437-452): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 15\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
+// Warning 6328: (437-452='assert(r == 13)'): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 15\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
index c8d3c9c0e..235ff4622 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
@@ -30,5 +30,5 @@ contract D is B, C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (443-458): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 22\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
-// Warning 6328: (477-492): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 22\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
+// Warning 6328: (443-458='assert(r == 20)'): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 22\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
+// Warning 6328: (477-492='assert(r == 18)'): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 22\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
index b8487e321..112cd7776 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
@@ -32,5 +32,5 @@ contract E is C,D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (379-394): CHC: Assertion violation happens here.\nCounterexample:\nx = 111\n\nTransaction trace:\nE.constructor()\nState: x = 0\nE.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
+// Warning 6328: (379-394='assert(x == 13)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 111\n\nTransaction trace:\nE.constructor()\nState: x = 0\nE.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
 // Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 111))\nContract invariant(s) for :D:\n((x = 0) || (x = 101))\nContract invariant(s) for :E:\n((x = 0) || (x = 111))\nContract invariant(s) for :B:\n((x = 0) || (x = 101))\n
diff --git a/test/libsolidity/smtCheckerTests/inheritance/fallback.sol b/test/libsolidity/smtCheckerTests/inheritance/fallback.sol
index e1ae216c4..fd70777f3 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/fallback.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/fallback.sol
@@ -21,6 +21,6 @@ contract B is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (89-103): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.fallback()
-// Warning 6328: (138-152): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
-// Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.fallback()
+// Warning 6328: (89-103='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.fallback()
+// Warning 6328: (138-152='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
+// Warning 6328: (255-269='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.fallback()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/fallback_receive.sol b/test/libsolidity/smtCheckerTests/inheritance/fallback_receive.sol
index 203484265..5f71f37e3 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/fallback_receive.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/fallback_receive.sol
@@ -22,6 +22,6 @@ contract B is A {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.
-// Warning 6328: (130-144): CHC: Assertion violation happens here.
-// Warning 6328: (256-270): CHC: Assertion violation happens here.
+// Warning 6328: (81-95='assert(x == 1)'): CHC: Assertion violation happens here.
+// Warning 6328: (130-144='assert(x == 1)'): CHC: Assertion violation happens here.
+// Warning 6328: (256-270='assert(x == 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/functions_1.sol b/test/libsolidity/smtCheckerTests/inheritance/functions_1.sol
index bcdcc389a..0f13fb596 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/functions_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/functions_1.sol
@@ -19,6 +19,6 @@ contract B is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
-// Warning 6328: (243-257): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.f()
+// Warning 6328: (88-102='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()
+// Warning 6328: (137-151='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
+// Warning 6328: (243-257='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nB.constructor()\nState: x = 0\nB.f()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/functions_2.sol b/test/libsolidity/smtCheckerTests/inheritance/functions_2.sol
index ca1a874b8..e8090ec7b 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/functions_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/functions_2.sol
@@ -21,6 +21,6 @@ contract B is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
-// Warning 6328: (253-267): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.f()
+// Warning 6328: (88-102='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()
+// Warning 6328: (137-151='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
+// Warning 6328: (253-267='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.f()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/functions_3.sol b/test/libsolidity/smtCheckerTests/inheritance/functions_3.sol
index d262b2abc..7dd5b061b 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/functions_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/functions_3.sol
@@ -36,9 +36,9 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
-// Warning 6328: (263-277): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.f()
-// Warning 6328: (312-326): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.h()
-// Warning 6328: (435-449): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, y = 0, x = 0\n\nTransaction trace:\nC.constructor()\nState: z = 0, y = 0, x = 0\nC.f()
-// Warning 6328: (484-498): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, y = 0, x = 0\n\nTransaction trace:\nC.constructor()\nState: z = 0, y = 0, x = 0\nC.i()
+// Warning 6328: (88-102='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()
+// Warning 6328: (137-151='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
+// Warning 6328: (263-277='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.f()
+// Warning 6328: (312-326='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.h()
+// Warning 6328: (435-449='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, y = 0, x = 0\n\nTransaction trace:\nC.constructor()\nState: z = 0, y = 0, x = 0\nC.f()
+// Warning 6328: (484-498='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, y = 0, x = 0\n\nTransaction trace:\nC.constructor()\nState: z = 0, y = 0, x = 0\nC.i()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol b/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol
index 89a48f17c..2c2646f04 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol
@@ -19,5 +19,5 @@ contract Child is Base {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 5667: (52-58): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (282-296): CHC: Assertion violation happens here.
+// Warning 5667: (52-58='uint b'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (282-296='assert(x == d)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/receive.sol b/test/libsolidity/smtCheckerTests/inheritance/receive.sol
index f55b9efd6..a94ad52f6 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/receive.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/receive.sol
@@ -22,6 +22,6 @@ contract B is A {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (95-109): CHC: Assertion violation happens here.
-// Warning 6328: (144-158): CHC: Assertion violation happens here.
-// Warning 6328: (267-281): CHC: Assertion violation happens here.
+// Warning 6328: (95-109='assert(x == 1)'): CHC: Assertion violation happens here.
+// Warning 6328: (144-158='assert(x == 1)'): CHC: Assertion violation happens here.
+// Warning 6328: (267-281='assert(x == 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol b/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol
index 95ae12019..69ca279b8 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol
@@ -21,6 +21,6 @@ contract B is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (87-101): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.receive(){ msg.value: 2 }
-// Warning 6328: (136-150): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
-// Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.fallback()
+// Warning 6328: (87-101='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.receive(){ msg.value: 2 }
+// Warning 6328: (136-150='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
+// Warning 6328: (255-269='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.fallback()
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_1.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_1.sol
index ad531cc24..9db0672b7 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_1.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_1.sol
@@ -14,6 +14,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 7737: (70-89): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (239-250): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
-// Warning 6328: (282-294): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call\n    C.f() -- internal call
+// Warning 7737: (70-89='assembly { b := 1 }'): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Warning 6328: (239-250='assert(f())'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (282-294='assert(!f())'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol
index 68ac2ee39..7ba5dfb5c 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol
@@ -11,5 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 7737: (82-101): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (138-147): CHC: Assertion violation happens here.\nCounterexample:\n\n = false\nb = false\nx = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 7737: (82-101='assembly { b := 1 }'): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Warning 6328: (138-147='assert(b)'): CHC: Assertion violation happens here.\nCounterexample:\n\n = false\nb = false\nx = 42\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol
index 838b69e5d..7e8f8046b 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol
@@ -11,5 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 7737: (106-125): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (203-212): CHC: Assertion violation happens here.\nCounterexample:\n\n = false\nb = false\nc = true\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 7737: (106-125='assembly { b := c }'): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Warning 6328: (203-212='assert(b)'): CHC: Assertion violation happens here.\nCounterexample:\n\n = false\nb = false\nc = true\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol
index 1915ca821..0874ea3b7 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol
@@ -12,4 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 7737: (82-101): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Warning 7737: (82-101='assembly { b := 1 }'): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol
index dc91a6822..a81c5bcef 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol
@@ -22,4 +22,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 7737: (156-187): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Warning 7737: (156-187='assembly { 			mstore(sm, i) 		}'): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol
index 9d4402581..7e002a816 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol
@@ -20,5 +20,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 7737: (83-149): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (152-167): CHC: Assertion violation happens here.
-// Warning 6328: (186-200): CHC: Assertion violation happens here.
+// Warning 6328: (152-167='assert(z == 42)'): CHC: Assertion violation happens here.
+// Warning 6328: (186-200='assert(z == 7)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol
index 13232a650..4072e3701 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol
@@ -19,5 +19,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 7737: (170-205): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (208-229): CHC: Assertion violation happens here.
-// Warning 6328: (248-269): CHC: Assertion violation happens here.
+// Warning 6328: (208-229='assert(x.length == 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (248-269='assert(x.length == 7)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol
index e8c8896ab..dfe517ebf 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol
@@ -23,6 +23,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 7737: (156-187): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (190-208): CHC: Assertion violation happens here.
-// Warning 6328: (227-244): CHC: Assertion violation happens here.
+// Warning 7737: (156-187='assembly { 			mstore(sm, i) 		}'): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Warning 6328: (190-208='assert(sm.x == 42)'): CHC: Assertion violation happens here.
+// Warning 6328: (227-244='assert(sm.x == 7)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/empty.sol b/test/libsolidity/smtCheckerTests/inline_assembly/empty.sol
index ed0905392..33997a6d7 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/empty.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/empty.sol
@@ -8,4 +8,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 7737: (43-57): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Warning 7737: (43-57='assembly { 		}'): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/local_var.sol b/test/libsolidity/smtCheckerTests/inline_assembly/local_var.sol
index f7ac997f0..378bad8cc 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/local_var.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/local_var.sol
@@ -10,4 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 7737: (64-88): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Warning 7737: (64-88='assembly { 			x := 2 		}'): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
diff --git a/test/libsolidity/smtCheckerTests/invariants/aon_blog_post.sol b/test/libsolidity/smtCheckerTests/invariants/aon_blog_post.sol
index 56e0eb350..cbae64464 100644
--- a/test/libsolidity/smtCheckerTests/invariants/aon_blog_post.sol
+++ b/test/libsolidity/smtCheckerTests/invariants/aon_blog_post.sol
@@ -45,5 +45,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (657-667): CHC: Assertion violation might happen here.
-// Warning 4661: (657-667): BMC: Assertion violation happens here.
+// Warning 6328: (657-667='assert(!f)'): CHC: Assertion violation might happen here.
+// Warning 4661: (657-667='assert(!f)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol b/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol
index 96fbf7557..df90c48f2 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol
@@ -12,4 +12,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (110-124): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 14\n\nTransaction trace:\nC.constructor()\nC.f(13)
+// Warning 6328: (110-124='assert(x < 14)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 14\n\nTransaction trace:\nC.constructor()\nC.f(13)
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_break.sol b/test/libsolidity/smtCheckerTests/loops/do_while_break.sol
index 6e1b7eafe..5abf6032b 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_break.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_break.sol
@@ -12,5 +12,5 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 5740: (71-76): Unreachable code.
-// Warning 5740: (89-95): Unreachable code.
+// Warning 5740: (71-76='x = 1'): Unreachable code.
+// Warning 5740: (89-95='x == 0'): Unreachable code.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol
index 3f1d6af00..bafdc8df5 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol
@@ -16,5 +16,5 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 5740: (95-100): Unreachable code.
-// Warning 5740: (114-118): Unreachable code.
+// Warning 5740: (95-100='a = 2'): Unreachable code.
+// Warning 5740: (114-118='true'): Unreachable code.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_break_2_fail.sol b/test/libsolidity/smtCheckerTests/loops/do_while_break_2_fail.sol
index 3544e04d4..1910d1817 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_break_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_break_2_fail.sol
@@ -16,6 +16,6 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 5740: (95-100): Unreachable code.
-// Warning 5740: (114-118): Unreachable code.
-// Warning 6328: (147-161): CHC: Assertion violation happens here.\nCounterexample:\n\na = 1\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 5740: (95-100='a = 2'): Unreachable code.
+// Warning 5740: (114-118='true'): Unreachable code.
+// Warning 6328: (147-161='assert(a == 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 1\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/do_while_break_fail.sol
index cea834c69..50454f6b5 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_break_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_break_fail.sol
@@ -12,6 +12,6 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 5740: (71-76): Unreachable code.
-// Warning 5740: (89-95): Unreachable code.
-// Warning 6328: (100-114): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 5740: (71-76='x = 1'): Unreachable code.
+// Warning 5740: (89-95='x == 0'): Unreachable code.
+// Warning 6328: (100-114='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol b/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol
index ce989722e..b93bd4b52 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol
@@ -12,4 +12,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 5740: (74-79): Unreachable code.
+// Warning 5740: (74-79='x = 1'): Unreachable code.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol
index fa7a489e4..22e9a4f0f 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol
@@ -16,4 +16,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (168-183): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(0, false)
+// Warning 6328: (168-183='assert(x >= 10)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(0, false)
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol b/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol
index 2e4d5a0f7..7a0a5c958 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol
@@ -12,5 +12,5 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 5667: (33-39): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (109-123): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 10\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(9, false)
+// Warning 5667: (33-39='bool b'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (109-123='assert(x > 15)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 10\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(9, false)
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol b/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol
index 84d36aa66..912b8c337 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol
@@ -13,6 +13,6 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 4984: (143-148): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (156-170): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 14\n\nTransaction trace:\nC.constructor()\nC.f(4)
-// Warning 2661: (143-148): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (143-148='x + 1'): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 6328: (156-170='assert(x < 14)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 14\n\nTransaction trace:\nC.constructor()\nC.f(4)
+// Warning 2661: (143-148='x + 1'): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol b/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
index 3b6842b41..20adba832 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
@@ -12,5 +12,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (106-111): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 2661: (106-111): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (106-111='x + 1'): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 2661: (106-111='x + 1'): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol b/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol
index baedb4a97..3d07add22 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol
@@ -10,4 +10,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 5740: (69-72): Unreachable code.
+// Warning 5740: (69-72='++x'): Unreachable code.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_4.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_4.sol
index 0c7941b0d..c363c39df 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_4.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_4.sol
@@ -9,4 +9,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (104-118): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 3\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (104-118='assert(y == 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 3\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_5.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_5.sol
index 6c496e7af..451d132b1 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_5.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_5.sol
@@ -11,4 +11,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (135-149): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 10\ny = 2\n\nTransaction trace:\nC.constructor()\nC.f(10)
+// Warning 6328: (135-149='assert(y == 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 10\ny = 2\n\nTransaction trace:\nC.constructor()\nC.f(10)
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol
index c51e7ca0c..ff1f3502d 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol
@@ -23,4 +23,4 @@ contract LoopFor2 {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (202-217): Unused local variable.
+// Warning 2072: (202-217='uint[] memory a'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
index 781463d5a..d4249fef3 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
@@ -9,4 +9,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6838: (90-96): BMC: Condition is always true.
+// Warning 6838: (90-96='x == 2'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
index ede2e4335..65a7fbf61 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
@@ -12,4 +12,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6838: (106-112): BMC: Condition is always true.
+// Warning 6838: (106-112='x == 2'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol
index 0beae52d7..31653626c 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol
@@ -16,4 +16,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 2072: (83-89): Unused local variable.
+// Warning 2072: (83-89='uint y'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol
index c040ecb98..2457b48f2 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol
@@ -9,4 +9,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6838: (90-95): BMC: Condition is always false.
+// Warning 6838: (90-95='x > 2'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol
index ac4071e7f..456f2cf95 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol
@@ -17,4 +17,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (185-200): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(0, false)
+// Warning 6328: (185-200='assert(x >= 10)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(0, false)
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_continue_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_1_continue_fail.sol
index 39ee24ac5..c9f2a23af 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_1_continue_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_1_continue_fail.sol
@@ -19,5 +19,5 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 5740: (136-143): Unreachable code.
-// Warning 6328: (194-209): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 10\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(10, false)
+// Warning 5740: (136-143='x = 200'): Unreachable code.
+// Warning 6328: (194-209='assert(x >= 17)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 10\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(10, false)
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol
index f679e3e59..21e397789 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol
@@ -12,4 +12,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (106-120): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 14\n\nTransaction trace:\nC.constructor()\nC.f(14)
+// Warning 6328: (106-120='assert(x < 14)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 14\n\nTransaction trace:\nC.constructor()\nC.f(14)
diff --git a/test/libsolidity/smtCheckerTests/loops/while_2_break.sol b/test/libsolidity/smtCheckerTests/loops/while_2_break.sol
index d844ba676..91cc70888 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_2_break.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_2_break.sol
@@ -14,4 +14,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 5740: (95-98): Unreachable code.
+// Warning 5740: (95-98='++x'): Unreachable code.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol
index 49b82c0e9..081a1dee5 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol
@@ -14,5 +14,5 @@ contract C
 // SMTIgnoreCex: yes
 // SMTSolvers: z3
 // ----
-// Warning 5740: (87-90): Unreachable code.
-// Warning 6328: (98-112): CHC: Assertion violation happens here.
+// Warning 5740: (87-90='++x'): Unreachable code.
+// Warning 6328: (98-112='assert(x == 2)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol b/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
index 47515ecad..adf3e9a1f 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
@@ -11,4 +11,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6838: (65-71): BMC: Condition is always true.
+// Warning 6838: (65-71='x < 10'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol
index 6ee19dfa4..09b5acab8 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol
@@ -28,5 +28,5 @@ contract LoopFor2 {
 // SMTIgnoreCex: yes
 // SMTSolvers: z3
 // ----
-// Warning 2072: (202-217): Unused local variable.
-// Warning 2072: (225-231): Unused local variable.
+// Warning 2072: (202-217='uint[] memory a'): Unused local variable.
+// Warning 2072: (225-231='uint i'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol
index 788c36e37..e666a423e 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol
@@ -33,4 +33,4 @@ contract LoopFor2 {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 2072: (280-286): Unused local variable.
+// Warning 2072: (280-286='uint i'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol
index f6f1f3210..7742a9404 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol
@@ -25,7 +25,7 @@ contract LoopFor2 {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (288-292): CHC: Out of bounds access might happen here.
-// Warning 6368: (459-463): CHC: Out of bounds access happens here.\nCounterexample:\nb = [1, 0], c = [0, 0]\nn = 1\na = []\ni = 1\n\nTransaction trace:\nLoopFor2.constructor()\nState: b = [], c = []\nLoopFor2.p()\nState: b = [0], c = [0]\nLoopFor2.p()\nState: b = [0, 0], c = [0, 0]\nLoopFor2.testUnboundedForLoop(1)
-// Warning 6328: (452-471): CHC: Assertion violation happens here.\nCounterexample:\nb = [1, 0], c = [0, 0]\nn = 1\ni = 1\n\nTransaction trace:\nLoopFor2.constructor()\nState: b = [], c = []\nLoopFor2.p()\nState: b = [0], c = [0]\nLoopFor2.p()\nState: b = [0, 0], c = [0, 0]\nLoopFor2.testUnboundedForLoop(1)
-// Warning 6328: (475-494): CHC: Assertion violation happens here.\nCounterexample:\nb = [1, 0], c = [0, 0]\nn = 1\ni = 1\n\nTransaction trace:\nLoopFor2.constructor()\nState: b = [], c = []\nLoopFor2.p()\nState: b = [0], c = [0]\nLoopFor2.p()\nState: b = [0, 0], c = [0, 0]\nLoopFor2.testUnboundedForLoop(1)
+// Warning 6368: (288-292='b[i]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (459-463='a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\nb = [1, 0], c = [0, 0]\nn = 1\na = []\ni = 1\n\nTransaction trace:\nLoopFor2.constructor()\nState: b = [], c = []\nLoopFor2.p()\nState: b = [0], c = [0]\nLoopFor2.p()\nState: b = [0, 0], c = [0, 0]\nLoopFor2.testUnboundedForLoop(1)
+// Warning 6328: (452-471='assert(a[0] == 900)'): CHC: Assertion violation happens here.\nCounterexample:\nb = [1, 0], c = [0, 0]\nn = 1\ni = 1\n\nTransaction trace:\nLoopFor2.constructor()\nState: b = [], c = []\nLoopFor2.p()\nState: b = [0], c = [0]\nLoopFor2.p()\nState: b = [0, 0], c = [0, 0]\nLoopFor2.testUnboundedForLoop(1)
+// Warning 6328: (475-494='assert(b[0] == 900)'): CHC: Assertion violation happens here.\nCounterexample:\nb = [1, 0], c = [0, 0]\nn = 1\ni = 1\n\nTransaction trace:\nLoopFor2.constructor()\nState: b = [], c = []\nLoopFor2.p()\nState: b = [0], c = [0]\nLoopFor2.p()\nState: b = [0, 0], c = [0, 0]\nLoopFor2.testUnboundedForLoop(1)
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol
index 59edfb55b..f5384c882 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol
@@ -12,4 +12,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (162-176): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (162-176='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_3.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_3.sol
index 684adaadb..b6e54c1bc 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_3.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_3.sol
@@ -11,4 +11,4 @@ contract C {
 // SMTIgnoreCex: yes
 // SMTSolvers: z3
 // ----
-// Warning 6328: (155-169): CHC: Assertion violation happens here.
+// Warning 6328: (155-169='assert(x == 2)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol
index bbcd6cd31..d0236ab89 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol
@@ -12,4 +12,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (192-206): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 6328: (192-206='assert(x == 7)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol
index 5a1bc9395..49f18751f 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol
@@ -29,5 +29,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (296-311): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 10\nb = false\nc = true\n\nTransaction trace:\nC.constructor()\nC.f(0, 9, false, true)
-// Warning 6328: (347-362): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 15\ny = 0\nb = true\nc = false\n\nTransaction trace:\nC.constructor()\nC.f(9, 0, true, false)
+// Warning 6328: (296-311='assert(y >= 15)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 10\nb = false\nc = true\n\nTransaction trace:\nC.constructor()\nC.f(0, 9, false, true)
+// Warning 6328: (347-362='assert(x >= 20)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 15\ny = 0\nb = true\nc = false\n\nTransaction trace:\nC.constructor()\nC.f(9, 0, true, false)
diff --git a/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol
index fe43db0de..cf75f7e72 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol
@@ -27,7 +27,7 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (290-305): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (290-305): CHC: Assertion violation might happen here.
-// Warning 6328: (329-344): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 15\ny = 0\nb = true\nc = false\n\nTransaction trace:\nC.constructor()\nC.f(0, 0, true, false)
-// Warning 4661: (290-305): BMC: Assertion violation happens here.
+// Warning 1218: (290-305='assert(y >= 20)'): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (290-305='assert(y >= 20)'): CHC: Assertion violation might happen here.
+// Warning 6328: (329-344='assert(x >= 20)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 15\ny = 0\nb = true\nc = false\n\nTransaction trace:\nC.constructor()\nC.f(0, 0, true, false)
+// Warning 4661: (290-305='assert(y >= 20)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/math/addmod_1.sol b/test/libsolidity/smtCheckerTests/math/addmod_1.sol
index 62272c595..0b60878f6 100644
--- a/test/libsolidity/smtCheckerTests/math/addmod_1.sol
+++ b/test/libsolidity/smtCheckerTests/math/addmod_1.sol
@@ -12,6 +12,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (108-133): CHC: Division by zero happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 4281: (230-245): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\nk = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.g(0, 0, 0)
+// Warning 4281: (108-133='addmod(2**256 - 1, 10, y)'): CHC: Division by zero happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (137-151='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 4281: (230-245='addmod(x, y, k)'): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\nk = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.g(0, 0, 0)
diff --git a/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol b/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol
index 4d36da6b5..f8d47669c 100644
--- a/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol
+++ b/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol
@@ -21,8 +21,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (220-227): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 4281: (61-76): CHC: Division by zero happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
-// Warning 6328: (80-93): CHC: Assertion violation happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
-// Warning 4281: (147-162): CHC: Division by zero happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)
-// Warning 6328: (166-179): CHC: Assertion violation happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)
+// Warning 6321: (220-227='uint256'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 4281: (61-76='addmod(1, 2, d)'): CHC: Division by zero happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (80-93='assert(x < d)'): CHC: Assertion violation happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 4281: (147-162='mulmod(1, 2, d)'): CHC: Division by zero happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)
+// Warning 6328: (166-179='assert(x < d)'): CHC: Assertion violation happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)
diff --git a/test/libsolidity/smtCheckerTests/math/mulmod_1.sol b/test/libsolidity/smtCheckerTests/math/mulmod_1.sol
index 2a3648f3f..17488a866 100644
--- a/test/libsolidity/smtCheckerTests/math/mulmod_1.sol
+++ b/test/libsolidity/smtCheckerTests/math/mulmod_1.sol
@@ -12,6 +12,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (108-133): CHC: Division by zero happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 4281: (230-245): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\nk = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.g(0, 0, 0)
+// Warning 4281: (108-133='mulmod(2**256 - 1, 10, y)'): CHC: Division by zero happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (137-151='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 4281: (230-245='mulmod(x, y, k)'): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\nk = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.g(0, 0, 0)
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol
index 3634cecb6..d42b4e1fd 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol
@@ -21,4 +21,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (103-116): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(115792089237316195423570985008687907853269984665640564039457584007913129639935)\nState: x = 115792089237316195423570985008687907853269984665640564039457584007913129639935\nC.f()
+// Warning 6328: (103-116='assert(x > 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(115792089237316195423570985008687907853269984665640564039457584007913129639935)\nState: x = 115792089237316195423570985008687907853269984665640564039457584007913129639935\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol
index 1d466b537..905863cc4 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol
@@ -15,4 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (111-124): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (111-124='assert(x > 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
index f8091f9df..ccccd5f66 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (254-267): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, owner = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, owner = 0x0\nC.g(1)\n    C.f() -- internal call
+// Warning 6328: (254-267='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, owner = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, owner = 0x0\nC.g(1)\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol
index 08a0c9f4c..085681468 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol
@@ -24,4 +24,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (233-238): BMC: Condition is always true.
+// Warning 6838: (233-238='x > 0'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
index d3467d0b8..9050ba7ce 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
@@ -34,5 +34,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (540-554): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, owner = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, owner = 0x0\nC.g(1){ msg.sender: 0x0 }
+// Warning 6328: (540-554='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, owner = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, owner = 0x0\nC.g(1){ msg.sender: 0x0 }
 // Info 1180: Contract invariant(s) for :C:\n(owner <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol
index d3a4bd92f..232ff4467 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol
@@ -26,4 +26,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (137-150): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(1)\nState: x = 1\nC.f()
+// Warning 6328: (137-150='assert(x > 8)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(1)\nState: x = 1\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol
index f1804abe8..c1decb62b 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol
@@ -22,4 +22,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (278-291): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\na = 1\nb = 0\n\nTransaction trace:\nC.constructor()\nC.f(1)\n    C.g(1, 0) -- internal call
+// Warning 6328: (278-291='assert(x > 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\na = 1\nb = 0\n\nTransaction trace:\nC.constructor()\nC.f(1)\n    C.g(1, 0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol
index 4281dcdd5..205c1727f 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol
@@ -17,5 +17,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 5740: (137-157): Unreachable code.
+// Warning 5740: (137-157='{ 		return a > b; 	}'): Unreachable code.
 // Warning 5740: (199-237): Unreachable code.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol
index 2f6a820a5..06048c276 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol
@@ -13,4 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (131-144): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\na = 1\nb = 0\n\nTransaction trace:\nC.constructor()\nC.f(1)
+// Warning 6328: (131-144='assert(x > 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\na = 1\nb = 0\n\nTransaction trace:\nC.constructor()\nC.f(1)
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol
index bed6b448e..a1344eae6 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol
@@ -20,4 +20,4 @@ contract B is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (209-223): CHC: Assertion violation happens here.\nCounterexample:\ns = 42\nx = 42\n\nTransaction trace:\nB.constructor()\nState: s = 0\nB.set(42)\nState: s = 42\nA.f()
+// Warning 6328: (209-223='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\ns = 42\nx = 42\n\nTransaction trace:\nB.constructor()\nState: s = 0\nB.set(42)\nState: s = 42\nA.f()
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_2.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_2.sol
index fd9dc9008..cc7dae4ab 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_2.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_2.sol
@@ -23,4 +23,4 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (66-75): CHC: Assertion violation happens here.\nCounterexample:\ns = false\n\nTransaction trace:\nB.constructor()\nState: s = false\nA.f()
+// Warning 6328: (66-75='assert(s)'): CHC: Assertion violation happens here.\nCounterexample:\ns = false\n\nTransaction trace:\nB.constructor()\nState: s = false\nA.f()
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol
index 4e408059c..2db15a685 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol
@@ -18,4 +18,4 @@ contract B is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (94-104): CHC: Assertion violation happens here.\nCounterexample:\ns = true\nx = true\n\nTransaction trace:\nB.constructor()\nState: s = false\nA.f()
+// Warning 6328: (94-104='assert(!s)'): CHC: Assertion violation happens here.\nCounterexample:\ns = true\nx = true\n\nTransaction trace:\nB.constructor()\nState: s = false\nA.f()
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
index 39be35cb6..e4040f693 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
@@ -36,7 +36,7 @@ contract D is B,C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (160-174): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nB.constructor()\nState: x = 0\nA.f()
-// Warning 6328: (193-207): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.f()
-// Warning 6328: (226-240): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nD.constructor()\nState: x = 0\nA.f()
+// Warning 6328: (160-174='assert(x != 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nB.constructor()\nState: x = 0\nA.f()
+// Warning 6328: (193-207='assert(x != 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.f()
+// Warning 6328: (226-240='assert(x != 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nD.constructor()\nState: x = 0\nA.f()
 // Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 2))\nContract invariant(s) for :D:\n((x = 0) || (x = 3))\nContract invariant(s) for :B:\n((x = 0) || (x = 1))\n
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol
index b88c0a4ee..0990f084f 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol
@@ -12,4 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (95-109): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\nx = 3\n\nTransaction trace:\nC.constructor()\nC.f(3)
+// Warning 6328: (95-109='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\nx = 3\n\nTransaction trace:\nC.constructor()\nC.f(3)
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_same_local_variables.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_same_local_variables.sol
index 1d86c0fea..da2212725 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_same_local_variables.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_same_local_variables.sol
@@ -12,4 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nx = 2\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (88-102='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nx = 2\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
index 5641e2812..d2ebc7c42 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
@@ -16,5 +16,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (76-90): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (76-90='assert(x <= 2)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
 // Info 1180: Contract invariant(s) for :C:\n(x = 3)\n
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol
index 940445d63..0fe4523ec 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol
@@ -23,4 +23,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (123-137): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(1)\nState: x = 1\nC.f()
+// Warning 6328: (123-137='assert(x > 10)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(1)\nState: x = 1\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
index 43d41f755..b93487cf1 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
@@ -20,5 +20,5 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (83-98): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (83-98='assert(x == 42)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
 // Info 1180: Contract invariant(s) for :C:\n((x >= 0) && (x <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_1.sol b/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_1.sol
index 57f0707a7..8863e0062 100644
--- a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_1.sol
+++ b/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_1.sol
@@ -14,4 +14,4 @@ contract C {
 // SMTEngine: chc
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (297-311): CHC: Assertion violation happens here.
+// Warning 6328: (297-311='assert(z == y)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive.sol b/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive.sol
index 62cd8e56b..c9f28067f 100644
--- a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive.sol
+++ b/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive.sol
@@ -28,5 +28,5 @@ contract C {
 // ====
 // SMTEngine: chc
 // ----
-// Warning 6328: (400-414): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call
-// Warning 6328: (429-443): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, y = 1\n_x = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(1)\n    C.f1(1) -- internal call\n    C.f2(1) -- internal call
+// Warning 6328: (400-414='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call
+// Warning 6328: (429-443='assert(y == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, y = 1\n_x = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(1)\n    C.f1(1) -- internal call\n    C.f2(1) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol b/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
index ed160d95c..0a5b63203 100644
--- a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
+++ b/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
@@ -27,5 +27,5 @@ contract C {
 // ----
 // Warning 2018: (33-335): Function state mutability can be restricted to view
 // Warning 2018: (457-524): Function state mutability can be restricted to pure
-// Warning 6328: (135-150): CHC: Assertion violation happens here.
+// Warning 6328: (135-150='assert(z == _x)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n(y <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol b/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol
index 6202478a6..91fd20360 100644
--- a/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol
@@ -23,5 +23,5 @@ contract C {
 // ====
 // SMTEngine: chc
 // ----
-// Warning 6328: (74-87): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call
-// Warning 6328: (117-130): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call\n    C.f2(0) -- internal call
+// Warning 6328: (74-87='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call
+// Warning 6328: (117-130='assert(y > 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call\n    C.f2(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
index efa29edc1..6368fbc0f 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
@@ -29,4 +29,4 @@ contract A {
 // SMTIgnoreCex: yes
 // SMTIgnoreInv: yes
 // ----
-// Warning 6328: (392-408): CHC: Assertion violation happens here.
+// Warning 6328: (392-408='assert(A.y == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
index 292eab85d..b0182cb90 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
@@ -12,5 +12,5 @@ contract A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (124-146): CHC: Assertion violation happens here.\nCounterexample:\na = []\n\nTransaction trace:\nA.constructor()\nState: a = []\nA.f()
+// Warning 6328: (124-146='assert(A.a.length > 0)'): CHC: Assertion violation happens here.\nCounterexample:\na = []\n\nTransaction trace:\nA.constructor()\nState: a = []\nA.f()
 // Info 1180: Contract invariant(s) for :A:\n(a.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
index 7a925d134..9feec5acf 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
@@ -26,8 +26,8 @@ contract A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (318-322): CHC: Out of bounds access happens here.\nCounterexample:\na = [0, 0]\nu = []\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
-// Warning 6328: (311-328): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
-// Warning 6368: (422-426): CHC: Out of bounds access happens here.\nCounterexample:\na = [0, 0]\nu = []\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
-// Warning 6328: (415-432): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
+// Warning 6368: (318-322='u[0]'): CHC: Out of bounds access happens here.\nCounterexample:\na = [0, 0]\nu = []\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
+// Warning 6328: (311-328='assert(u[0] == 1)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
+// Warning 6368: (422-426='u[0]'): CHC: Out of bounds access happens here.\nCounterexample:\na = [0, 0]\nu = []\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
+// Warning 6328: (415-432='assert(u[0] == 1)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
 // Info 1180: Contract invariant(s) for :A:\n!(a.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
index 611fd9598..62de7ec86 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
@@ -15,4 +15,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (71-89): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (71-89='assert(x & y != 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol
index 1f4c6c3d1..8c2344a19 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (43-61): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (43-61='assert(1 & 0 != 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol
index 47f0dcba2..aa5bd3faf 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol
@@ -13,6 +13,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (74-92): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (147-170): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (174-197): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (74-92='assert(x & y != 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (147-170='assert(x & y == 0xffff)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (174-197='assert(x & y == 0x0000)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol
index 6a9d4e90a..ee83d47cb 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (100-123): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0xffff\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (100-123='assert(x == 0xffff0000)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0xffff\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol
index e254d5b40..1a722ef40 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol
@@ -15,7 +15,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (58-73): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (89-104): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (120-138): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 15\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (152-167): CHC: Assertion violation happens here.\nCounterexample:\n\nx = (- 1)\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (58-73='assert(~x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (89-104='assert(~x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (120-138='assert(~x == 0xf0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 15\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (152-167='assert(~x != 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = (- 1)\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol
index 8cf205e9c..12c642b67 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol
@@ -11,5 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (126-146): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (150-170): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (126-146='assert(~y == 0xffff)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (150-170='assert(~y == 0x0000)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol
index acbe3fa6d..f6d1838c3 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (150-175): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\nb = 0xff\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (150-175='assert(b == bytes1(0x00))'): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\nb = 0xff\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol
index cc96e9b1e..32020b93a 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol
@@ -17,5 +17,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (111-129): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (234-253): CHC: Assertion violation happens here.\nCounterexample:\n\nx = (- 1)\ny = 200\nz = 255\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (111-129='assert(x | y != 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (234-253='assert(x | z != -1)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = (- 1)\ny = 200\nz = 255\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol
index d6ebdf498..22af41317 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol
@@ -13,5 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (122-143): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (174-197): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (122-143='assert(x | y == 0xff)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (174-197='assert(x | y == 0x0000)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol
index 3d3f373a0..9ed41f8c7 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol
@@ -12,4 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (148-161): CHC: Assertion violation happens here.\nCounterexample:\n\nx = (- 2)\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (148-161='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = (- 2)\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol
index 62cf620d6..54ac71b90 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol
@@ -10,4 +10,4 @@ contract Simp {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (140-171): CHC: Assertion violation happens here.
+// Warning 6328: (140-171='assert(y[1] ^ "e" != bytes1(0))'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol
index 1075480cb..4bf81e961 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol
@@ -15,5 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (156-173): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\nz = (- 1)\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (214-231): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 7\ny = 3\nz = (- 1)\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (156-173='assert(y ^ z > 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\nz = (- 1)\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (214-231='assert(x ^ y > 5)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 7\ny = 3\nz = (- 1)\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol
index 6d28cdbcf..a703e75b0 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol
@@ -13,5 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (122-143): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (174-197): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (122-143='assert(x ^ y == 0xff)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (174-197='assert(x ^ y == 0x0000)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/bytes_new.sol b/test/libsolidity/smtCheckerTests/operators/bytes_new.sol
index b961c53d5..9dbbf407b 100644
--- a/test/libsolidity/smtCheckerTests/operators/bytes_new.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bytes_new.sol
@@ -34,5 +34,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (468-472): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [0x12, 0x34, 0x0]\n\nTransaction trace:\nC.constructor()\nC.h()
-// Warning 6368: (490-494): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [0x12, 0x34, 0x0]\n\nTransaction trace:\nC.constructor()\nC.h()
+// Warning 6368: (468-472='x[5]'): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [0x12, 0x34, 0x0]\n\nTransaction trace:\nC.constructor()\nC.h()
+// Warning 6368: (490-494='x[5]'): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [0x12, 0x34, 0x0]\n\nTransaction trace:\nC.constructor()\nC.h()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add.sol b/test/libsolidity/smtCheckerTests/operators/compound_add.sol
index 804f7c3cb..594f5d5ea 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_add.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_add.sol
@@ -11,4 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (118-133): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 200\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (118-133='assert(y < 110)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 200\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol
index 6e6a106e2..dce1d1495 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (115-129): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 2\n\nTransaction trace:\nC.constructor()\nC.f(2)
+// Warning 6328: (115-129='assert(y == 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 2\n\nTransaction trace:\nC.constructor()\nC.f(2)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol
index bd81c17a4..66cc6f097 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol
@@ -18,4 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (259-280): CHC: Assertion violation happens here.\nCounterexample:\narray = [2, 0]\nx = 2\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0]\nC.f(2, 0)
+// Warning 6328: (259-280='assert(array[p] == 0)'): CHC: Assertion violation happens here.\nCounterexample:\narray = [2, 0]\nx = 2\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0]\nC.f(2, 0)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol
index b634e8468..4c5680c96 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol
@@ -12,5 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (177-191): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\na = 0x0\nb = 0xf0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6321: (51-57='bytes1'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6328: (177-191='assert(a != 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\na = 0x0\nb = 0xf0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol
index d634a1922..ef3177664 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol
@@ -18,4 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (81-95='assert(x != 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol
index 2e86c4b3a..1a414d898 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol
@@ -28,6 +28,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (144-158): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 3\nc = 0\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (347-366): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 3\nc = 0\nx = 255\ny = 255\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (473-490): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 3\nc = 0\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (144-158='assert(v != 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 3\nc = 0\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (347-366='assert(y == 0xffff)'): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 3\nc = 0\nx = 255\ny = 255\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (473-490='assert(y == 0xff)'): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 3\nc = 0\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol
index edcf3230b..e14496e87 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol
@@ -12,5 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (177-191): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\na = 0xff\nb = 0xff\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6321: (51-57='bytes1'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6328: (177-191='assert(a == 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\na = 0xff\nb = 0xff\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol
index 5d92940b7..ec2a6b3b5 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol
@@ -18,4 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (81-95='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol
index e36d166a5..62c5db05e 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol
@@ -24,6 +24,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 7\nc = 0\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (265-282): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 7\nc = 7\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (391-410): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 7\nc = 7\nx = 65280\ny = 61951\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (88-102='assert(v != 7)'): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 7\nc = 0\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (265-282='assert(y == 0xff)'): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 7\nc = 7\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (391-410='assert(y == 0xffff)'): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 7\nc = 7\nx = 65280\ny = 61951\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol
index 802dd27ff..5b19c2924 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol
@@ -10,7 +10,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (76-80): CHC: Out of bounds access might happen here.
-// Warning 6368: (115-119): CHC: Out of bounds access might happen here.
-// Warning 6368: (141-145): CHC: Out of bounds access might happen here.
-// Warning 6328: (134-151): CHC: Assertion violation might happen here.
+// Warning 6368: (76-80='c[0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (115-119='c[0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (141-145='c[0]'): CHC: Out of bounds access might happen here.
+// Warning 6328: (134-151='assert(c[0] <= 1)'): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_3.sol
index 2650b0897..3f1204e1e 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_3.sol
@@ -11,5 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (125-140): CHC: Assertion violation might happen here.
-// Warning 7812: (125-140): BMC: Assertion violation might happen here.
+// Warning 6328: (125-140='assert(s.x > 0)'): CHC: Assertion violation might happen here.
+// Warning 7812: (125-140='assert(s.x > 0)'): BMC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol
index a682f4692..007a4a064 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol
@@ -16,4 +16,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (123-142): CHC: Assertion violation happens here.
+// Warning 6328: (123-142='assert(y[0] == "d")'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol
index 59bd6c7b9..5411d8f92 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol
@@ -14,4 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (147-165): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x646567\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (147-165='assert(y == "def")'): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x646567\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol
index 6856f72e0..5ece61dd1 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol
@@ -12,5 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (178-195): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\na = 0xff\nb = 0xf0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6321: (51-57='bytes1'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6328: (178-195='assert(a != 0xff)'): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\na = 0xff\nb = 0xf0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol
index 30ee76277..427fc26ed 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol
@@ -15,4 +15,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (81-95='assert(x != 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol
index 1e88cc52e..b9f99a7f0 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol
@@ -24,6 +24,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 4\nc = 0\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (265-282): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 4\nc = 4\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (389-408): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 4\nc = 4\nx = 65280\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (88-102='assert(v != 4)'): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 4\nc = 0\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (265-282='assert(y == 0xff)'): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 4\nc = 4\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (389-408='assert(y == 0xffff)'): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 4\nc = 4\nx = 65280\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul.sol
index 4262cdd7c..8d53ed072 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_mul.sol
@@ -11,4 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (117-131): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 100\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (117-131='assert(y < 50)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 100\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
index 8fcd46b94..1cdf5f54a 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
@@ -14,4 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (226-247): CHC: Assertion violation happens here.\nCounterexample:\narray = [100]\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.q()\nState: array = [0]\nC.f(0, 0)
+// Warning 6328: (226-247='assert(array[p] < 50)'): CHC: Assertion violation happens here.\nCounterexample:\narray = [100]\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.q()\nState: array = [0]\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
index 42775cc9b..11f5f1e8d 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
@@ -12,4 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (164-183): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 6328: (164-183='assert(map[p] < 50)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_shr_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_shr_1.sol
index 99469dc40..9496baef5 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_shr_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_shr_1.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (84-97): CHC: Assertion violation happens here.
+// Warning 6328: (84-97='assert(v > 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_sub.sol b/test/libsolidity/smtCheckerTests/operators/compound_sub.sol
index 0c4394bb7..1ada63fce 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_sub.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_sub.sol
@@ -11,4 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (117-131): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 90\ny = 90\n\nTransaction trace:\nC.constructor()\nC.f(90)
+// Warning 6328: (117-131='assert(y < 90)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 90\ny = 90\n\nTransaction trace:\nC.constructor()\nC.f(90)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol
index 5c9b1181f..e6ffb7227 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol
@@ -15,4 +15,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (226-247): CHC: Assertion violation happens here.
+// Warning 6328: (226-247='assert(array[p] < 90)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol b/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol
index 9c8b27359..9f39a7056 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol
@@ -13,4 +13,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (164-183): CHC: Assertion violation happens here.
+// Warning 6328: (164-183='assert(map[p] < 90)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_1.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_1.sol
index d0ce284e4..525ee54c0 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_1.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (71-84): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\na = 2\n\nTransaction trace:\nC.constructor()\nC.f(true)
+// Warning 6328: (71-84='assert(a > 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\na = 2\n\nTransaction trace:\nC.constructor()\nC.f(true)
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol
index c33c12c29..6cf3a1c66 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol
@@ -9,4 +9,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (99-113): CHC: Assertion violation happens here.
+// Warning 6328: (99-113='assert(c == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol
index 4dd9e8eff..a89f97490 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol
@@ -11,4 +11,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (128-141): CHC: Assertion violation happens here.
+// Warning 6328: (128-141='assert(c > a)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol
index 7ddf07706..d25c63bca 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol
@@ -22,4 +22,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2072: (240-246): Unused local variable.
+// Warning 2072: (240-246='uint y'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
index 24be3cd8e..9b2e82c1b 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
@@ -24,5 +24,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (249-255): Unused local variable.
-// Warning 6328: (271-295): CHC: Assertion violation happens here.
+// Warning 2072: (249-255='uint y'): Unused local variable.
+// Warning 6328: (271-295='assert(x == 2 || x == 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_false.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_false.sol
index 714a87c1b..48056ca29 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_false.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_false.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (115-120): BMC: Condition is always false.
+// Warning 6838: (115-120='c > 5'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_true.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_true.sol
index a13f5f9f5..a7e40487a 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_true.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_always_true.sol
@@ -8,5 +8,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (85-98): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\nc = 5\n\nTransaction trace:\nC.constructor()\nC.f(true)
-// Warning 6838: (72-73): BMC: Condition is always true.
+// Warning 6328: (85-98='assert(c < 5)'): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\nc = 5\n\nTransaction trace:\nC.constructor()\nC.f(true)
+// Warning 6838: (72-73='b'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_1.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_1.sol
index dde02e24f..89e008760 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_1.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (170-183): CHC: Assertion violation happens here.\nCounterexample:\n\na = 6\nc = 3\n\nTransaction trace:\nC.constructor()\nC.g(6)\n    C.f(6) -- internal call
+// Warning 6328: (170-183='assert(c > 5)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 6\nc = 3\n\nTransaction trace:\nC.constructor()\nC.g(6)\n    C.f(6) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol
index a448bf1cb..572083b84 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol
@@ -17,4 +17,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (345-359): CHC: Assertion violation happens here.
+// Warning 6328: (345-359='assert(c < 20)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol
index 484d175b0..579a1a1f7 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (114-116): BMC: Condition is always true.
+// Warning 6838: (114-116='b2'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_unsafe.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_unsafe.sol
index 71eaa8d6c..eefbe8338 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_unsafe.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (108-121): CHC: Assertion violation happens here.\nCounterexample:\n\nb1 = false\nb2 = false\nc = 1\n\nTransaction trace:\nC.constructor()\nC.f(false, false)
+// Warning 6328: (108-121='assert(c > 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\nb1 = false\nb2 = false\nc = 1\n\nTransaction trace:\nC.constructor()\nC.f(false, false)
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
index a7664cc78..12c0cbfcd 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
@@ -14,7 +14,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (134-140): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 4984: (143-146): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 2661: (134-140): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 2661: (143-146): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (134-140='a + 10'): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 4984: (143-146='++a'): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 2661: (134-140='a + 10'): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 2661: (143-146='++a'): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol b/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol
index d33defde9..1f756dbaf 100644
--- a/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol
@@ -12,4 +12,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 2018: (65-173): Function state mutability can be restricted to pure
-// Warning 6328: (139-154): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, y = 1024\n\nTransaction trace:\nC.constructor()\nState: x = 2, y = 1024\nC.f()
+// Warning 6328: (139-154='assert(y == 14)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, y = 1024\n\nTransaction trace:\nC.constructor()\nState: x = 2, y = 1024\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol b/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol
index 74502ed2a..0d54314be 100644
--- a/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (251-281): CHC: Assertion violation happens here.\nCounterexample:\nDEPOSIT_CONTRACT_TREE_DEPTH = 32, MAX_DEPOSIT_COUNT = 4294967295\n\nTransaction trace:\nC.constructor()\nState: DEPOSIT_CONTRACT_TREE_DEPTH = 32, MAX_DEPOSIT_COUNT = 4294967295\nC.f()
+// Warning 6328: (251-281='assert(MAX_DEPOSIT_COUNT == 2)'): CHC: Assertion violation happens here.\nCounterexample:\nDEPOSIT_CONTRACT_TREE_DEPTH = 32, MAX_DEPOSIT_COUNT = 4294967295\n\nTransaction trace:\nC.constructor()\nState: DEPOSIT_CONTRACT_TREE_DEPTH = 32, MAX_DEPOSIT_COUNT = 4294967295\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array.sol b/test/libsolidity/smtCheckerTests/operators/delete_array.sol
index fb71fc03b..2a19d2303 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array.sol
@@ -17,4 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (121-122): BMC: Condition is always true.
+// Warning 6838: (121-122='b'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
index 4f9001115..cdfe8af74 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
@@ -21,4 +21,4 @@ contract C
 // SMTEngine: all
 // ----
 // Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n
-// Warning 6838: (154-155): BMC: Condition is always false.
+// Warning 6838: (154-155='b'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
index 80a692429..52a95a5ae 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
@@ -26,6 +26,6 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (315-335): CHC: Assertion violation might happen here.
+// Warning 6328: (315-335='assert(a[0][0] == 0)'): CHC: Assertion violation might happen here.
 // Info 1180: Contract invariant(s) for :C:\n!(a.length <= 1)\n
-// Warning 4661: (315-335): BMC: Assertion violation happens here.
+// Warning 4661: (315-335='assert(a[0][0] == 0)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function.sol b/test/libsolidity/smtCheckerTests/operators/delete_function.sol
index 63dad1ab0..b02e77719 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_function.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_function.sol
@@ -29,4 +29,4 @@ contract C
 // SMTEngine: all
 // ----
 // Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n
-// Warning 6838: (262-263): BMC: Condition is always true.
+// Warning 6838: (262-263='b'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/div_zero.sol b/test/libsolidity/smtCheckerTests/operators/div_zero.sol
index d1841abd3..0da43ef96 100644
--- a/test/libsolidity/smtCheckerTests/operators/div_zero.sol
+++ b/test/libsolidity/smtCheckerTests/operators/div_zero.sol
@@ -5,4 +5,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (36-41): CHC: Division by zero happens here.\nCounterexample:\nz = 0, x = 0\n\nTransaction trace:\nC.constructor()
+// Warning 4281: (36-41='2 / z'): CHC: Division by zero happens here.\nCounterexample:\nz = 0, x = 0\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/operators/division_1.sol b/test/libsolidity/smtCheckerTests/operators/division_1.sol
index d37420b0f..6ba8e5e41 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_1.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (79-84): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 4281: (79-84='x / y'): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/operators/division_3.sol b/test/libsolidity/smtCheckerTests/operators/division_3.sol
index 67c144063..636d3aba2 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_3.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (95-100): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.\nCounterexample:\n\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\ny = (- 1)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f((- 57896044618658097711785492504343953926634992332820282019728792003956564819968), (- 1))
+// Warning 4984: (95-100='x / y'): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.\nCounterexample:\n\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\ny = (- 1)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f((- 57896044618658097711785492504343953926634992332820282019728792003956564819968), (- 1))
diff --git a/test/libsolidity/smtCheckerTests/operators/division_5.sol b/test/libsolidity/smtCheckerTests/operators/division_5.sol
index 5b5c368c0..c72f96869 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_5.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_5.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (129-139): BMC: Condition is always true.
+// Warning 6838: (129-139='c / a == b'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_6.sol b/test/libsolidity/smtCheckerTests/operators/division_6.sol
index 741bfa0b5..502c1bf3e 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_6.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_6.sol
@@ -11,5 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (120-125): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\n\na = 128\nb = 2\n = 0\nc = 0\n\nTransaction trace:\nC.constructor()\nC.mul(128, 2)
-// Warning 6838: (137-147): BMC: Condition is always true.
+// Warning 4984: (120-125='a * b'): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\n\na = 128\nb = 2\n = 0\nc = 0\n\nTransaction trace:\nC.constructor()\nC.mul(128, 2)
+// Warning 6838: (137-147='c / a == b'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/exp.sol b/test/libsolidity/smtCheckerTests/operators/exp.sol
index 278300f42..0371f2a45 100644
--- a/test/libsolidity/smtCheckerTests/operators/exp.sol
+++ b/test/libsolidity/smtCheckerTests/operators/exp.sol
@@ -6,5 +6,5 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5188: (56-60): Assertion checker does not yet implement this operator.
-// Warning 6328: (49-66): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nD.constructor()\nD.f(0)
+// Warning 5188: (56-60='x**2'): Assertion checker does not yet implement this operator.
+// Warning 6328: (49-66='assert(x**2 == 4)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nD.constructor()\nD.f(0)
diff --git a/test/libsolidity/smtCheckerTests/operators/fixed_point_add.sol b/test/libsolidity/smtCheckerTests/operators/fixed_point_add.sol
index 96d8c523d..2cd9b9a41 100644
--- a/test/libsolidity/smtCheckerTests/operators/fixed_point_add.sol
+++ b/test/libsolidity/smtCheckerTests/operators/fixed_point_add.sol
@@ -6,4 +6,4 @@ contract test {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2072: (48-56): Unused local variable.
+// Warning 2072: (48-56='ufixed a'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol b/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol
index 33011472b..c959678ac 100644
--- a/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol
+++ b/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol
@@ -30,4 +30,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (475-489): CHC: Assertion violation happens here.\nCounterexample:\n\na = 2\nb = 2\n\nTransaction trace:\nC.constructor()\nC.call()\n    L.l(2, 3) -- internal call\n    L.l(3, 3) -- internal call\n    C.f(1, 2, true) -- internal call\n    C.f(1, 2, false) -- internal call
+// Warning 6328: (475-489='assert(b == 6)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 2\nb = 2\n\nTransaction trace:\nC.constructor()\nC.call()\n    L.l(2, 3) -- internal call\n    L.l(3, 3) -- internal call\n    C.f(1, 2, true) -- internal call\n    C.f(1, 2, false) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol
index 4cb34c49e..666fb0179 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (152-173): CHC: Assertion violation happens here.\nCounterexample:\n\nx = [0x0, 0x11, 0x22, 0x33]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (152-173='assert(x.length == 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = [0x0, 0x11, 0x22, 0x33]\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
index 2fee40f40..29586aac0 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (76-90): CHC: Out of bounds access might happen here.
+// Warning 6368: (76-90='b[uint8(x[2])]'): CHC: Out of bounds access might happen here.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
index ae526775f..93ba66ecf 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
@@ -22,6 +22,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (335-354): CHC: Assertion violation might happen here.
+// Warning 6328: (335-354='assert(h()[2] == 3)'): CHC: Assertion violation might happen here.
 // Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n!(a.length <= 3)\n
-// Warning 4661: (335-354): BMC: Assertion violation happens here.
+// Warning 4661: (335-354='assert(h()[2] == 3)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/integer_new.sol b/test/libsolidity/smtCheckerTests/operators/integer_new.sol
index bd52a4eb4..332f23d64 100644
--- a/test/libsolidity/smtCheckerTests/operators/integer_new.sol
+++ b/test/libsolidity/smtCheckerTests/operators/integer_new.sol
@@ -34,5 +34,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (474-478): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [18, 52, 0]\n\nTransaction trace:\nC.constructor()\nC.h()
-// Warning 6368: (496-500): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [18, 52, 0]\n\nTransaction trace:\nC.constructor()\nC.h()
+// Warning 6368: (474-478='x[5]'): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [18, 52, 0]\n\nTransaction trace:\nC.constructor()\nC.h()
+// Warning 6368: (496-500='x[5]'): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [18, 52, 0]\n\nTransaction trace:\nC.constructor()\nC.h()
diff --git a/test/libsolidity/smtCheckerTests/operators/mod_signed.sol b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
index 8dc9355ce..abce3c768 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (131-148): CHC: Assertion violation might happen here.
+// Warning 6328: (131-148='assert(z1 == -z2)'): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol
index 86f4be1bd..eccd0d01b 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol
@@ -15,4 +15,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (182-197): CHC: Assertion violation happens here.
+// Warning 6328: (182-197='assert(x == 10)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol
index 2dd96ac75..1dea20d98 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol
@@ -23,7 +23,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (217-249): CHC: Assertion violation happens here.
+// Warning 6328: (217-249='assert(f(0x4266, 0x0) == 0x4268)'): CHC: Assertion violation happens here.
 // Warning 6328: (330-364): CHC: Assertion violation happens here.
 // Warning 6328: (504-597): CHC: Assertion violation happens here.
-// Warning 6328: (674-704): CHC: Assertion violation happens here.
+// Warning 6328: (674-704='assert(f(0x4266, 0x4266) == 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol
index 3b0557c42..3d044905e 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (138-158): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\nx = 254\ny = 1\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (138-158='assert(y << x == 10)'): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\nx = 254\ny = 1\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol
index c900c66ed..311d14fe6 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol
@@ -23,7 +23,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (213-243): CHC: Assertion violation happens here.
+// Warning 6328: (213-243='assert(f(0x4266, 0) == 0x4267)'): CHC: Assertion violation happens here.
 // Warning 6328: (327-365): CHC: Assertion violation happens here.
 // Warning 6328: (449-485): CHC: Assertion violation happens here.
-// Warning 6328: (560-588): CHC: Assertion violation happens here.
+// Warning 6328: (560-588='assert(f(0x4266, 0x20) == 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol
index 9210c12e6..5eeaca312 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol
@@ -15,5 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (209-238): CHC: Assertion violation happens here.
-// Warning 6328: (310-335): CHC: Assertion violation happens here.
+// Warning 6328: (209-238='assert(f(0x66, 0x0) == 0x660)'): CHC: Assertion violation happens here.
+// Warning 6328: (310-335='assert(f(0x66, 0x8) == 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol
index fcf699f22..c726fea86 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol
@@ -32,8 +32,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (307-333): CHC: Assertion violation happens here.
-// Warning 6328: (408-436): CHC: Assertion violation happens here.
-// Warning 6328: (511-537): CHC: Assertion violation happens here.
-// Warning 6328: (611-637): CHC: Assertion violation happens here.
-// Warning 6328: (709-735): CHC: Assertion violation happens here.
+// Warning 6328: (307-333='assert(leftU(255, 8) == 1)'): CHC: Assertion violation happens here.
+// Warning 6328: (408-436='assert(leftU(255, 1) == 255)'): CHC: Assertion violation happens here.
+// Warning 6328: (511-537='assert(leftU(255, 0) == 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (611-637='assert(leftS(1, 7) == 127)'): CHC: Assertion violation happens here.
+// Warning 6328: (709-735='assert(leftS(1, 6) == -64)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol
index f14f1c927..c00c079d0 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol
@@ -23,7 +23,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (215-244): CHC: Assertion violation happens here.
-// Warning 6328: (321-352): CHC: Assertion violation happens here.
-// Warning 6328: (427-455): CHC: Assertion violation happens here.
+// Warning 6328: (215-244='assert(f(0x4266, 0) == 0x426)'): CHC: Assertion violation happens here.
+// Warning 6328: (321-352='assert(f(0x4266, 0x8) == 0x420)'): CHC: Assertion violation happens here.
+// Warning 6328: (427-455='assert(f(0x4266, 0x11) == 1)'): CHC: Assertion violation happens here.
 // Warning 6328: (673-769): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol
index 5cc26ee78..fe64e770f 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol
@@ -32,9 +32,9 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (208-233): CHC: Assertion violation happens here.
-// Warning 6328: (306-332): CHC: Assertion violation happens here.
-// Warning 6328: (404-430): CHC: Assertion violation happens here.
-// Warning 6328: (501-524): CHC: Assertion violation happens here.
-// Warning 6328: (595-619): CHC: Assertion violation happens here.
-// Warning 6328: (690-714): CHC: Assertion violation happens here.
+// Warning 6328: (208-233='assert(f(-4266, 0, -426))'): CHC: Assertion violation happens here.
+// Warning 6328: (306-332='assert(f(-4266, 1, -2134))'): CHC: Assertion violation happens here.
+// Warning 6328: (404-430='assert(f(-4266, 4, -2670))'): CHC: Assertion violation happens here.
+// Warning 6328: (501-524='assert(f(-4266, 8, -1))'): CHC: Assertion violation happens here.
+// Warning 6328: (595-619='assert(f(-4266, 16, -0))'): CHC: Assertion violation happens here.
+// Warning 6328: (690-714='assert(f(-4266, 17, -0))'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol
index 2e0411f7b..38c0c4ba8 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol
@@ -32,9 +32,9 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (211-238): CHC: Assertion violation happens here.
-// Warning 6328: (313-342): CHC: Assertion violation happens here.
-// Warning 6328: (416-443): CHC: Assertion violation happens here.
-// Warning 6328: (516-541): CHC: Assertion violation happens here.
-// Warning 6328: (614-639): CHC: Assertion violation happens here.
-// Warning 6328: (712-737): CHC: Assertion violation happens here.
+// Warning 6328: (211-238='assert(f(-4266, 0) == -426)'): CHC: Assertion violation happens here.
+// Warning 6328: (313-342='assert(f(-4266, 1) == -21330)'): CHC: Assertion violation happens here.
+// Warning 6328: (416-443='assert(f(-4266, 4) == -255)'): CHC: Assertion violation happens here.
+// Warning 6328: (516-541='assert(f(-4266, 8) == -1)'): CHC: Assertion violation happens here.
+// Warning 6328: (614-639='assert(f(-4266, 16) == 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (712-737='assert(f(-4266, 17) == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol
index 3c145a1ad..6f6709f3d 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol
@@ -31,9 +31,9 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (209-236): CHC: Assertion violation happens here.
-// Warning 6328: (311-340): CHC: Assertion violation happens here.
-// Warning 6328: (414-441): CHC: Assertion violation happens here.
-// Warning 6328: (514-539): CHC: Assertion violation happens here.
-// Warning 6328: (612-637): CHC: Assertion violation happens here.
-// Warning 6328: (710-735): CHC: Assertion violation happens here.
+// Warning 6328: (209-236='assert(f(-4266, 0) == -426)'): CHC: Assertion violation happens here.
+// Warning 6328: (311-340='assert(f(-4266, 1) == -21330)'): CHC: Assertion violation happens here.
+// Warning 6328: (414-441='assert(f(-4266, 4) == -255)'): CHC: Assertion violation happens here.
+// Warning 6328: (514-539='assert(f(-4266, 8) == -1)'): CHC: Assertion violation happens here.
+// Warning 6328: (612-637='assert(f(-4266, 16) == 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (710-735='assert(f(-4266, 17) == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol
index a64734d7d..bf5013ad2 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol
@@ -31,9 +31,9 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (209-236): CHC: Assertion violation happens here.
-// Warning 6328: (311-340): CHC: Assertion violation happens here.
-// Warning 6328: (414-441): CHC: Assertion violation happens here.
-// Warning 6328: (514-539): CHC: Assertion violation happens here.
-// Warning 6328: (612-637): CHC: Assertion violation happens here.
-// Warning 6328: (710-735): CHC: Assertion violation happens here.
+// Warning 6328: (209-236='assert(f(-4266, 0) == -426)'): CHC: Assertion violation happens here.
+// Warning 6328: (311-340='assert(f(-4266, 1) == -21330)'): CHC: Assertion violation happens here.
+// Warning 6328: (414-441='assert(f(-4266, 4) == -255)'): CHC: Assertion violation happens here.
+// Warning 6328: (514-539='assert(f(-4266, 8) == -1)'): CHC: Assertion violation happens here.
+// Warning 6328: (612-637='assert(f(-4266, 16) == 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (710-735='assert(f(-4266, 17) == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol
index eaab703db..994d5171a 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol
@@ -31,9 +31,9 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (203-226): CHC: Assertion violation happens here.
-// Warning 6328: (297-320): CHC: Assertion violation happens here.
-// Warning 6328: (390-413): CHC: Assertion violation happens here.
-// Warning 6328: (483-506): CHC: Assertion violation happens here.
-// Warning 6328: (577-600): CHC: Assertion violation happens here.
-// Warning 6328: (671-694): CHC: Assertion violation happens here.
+// Warning 6328: (203-226='assert(f(-66, 0) == -6)'): CHC: Assertion violation happens here.
+// Warning 6328: (297-320='assert(f(-66, 1) == -3)'): CHC: Assertion violation happens here.
+// Warning 6328: (390-413='assert(f(-66, 4) == -2)'): CHC: Assertion violation happens here.
+// Warning 6328: (483-506='assert(f(-66, 8) == -2)'): CHC: Assertion violation happens here.
+// Warning 6328: (577-600='assert(f(-66, 16) == 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (671-694='assert(f(-66, 17) == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol
index cfe4cc8d0..52521d509 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol
@@ -23,7 +23,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (213-242): CHC: Assertion violation happens here.
-// Warning 6328: (317-346): CHC: Assertion violation happens here.
-// Warning 6328: (421-451): CHC: Assertion violation happens here.
-// Warning 6328: (526-556): CHC: Assertion violation happens here.
+// Warning 6328: (213-242='assert(f(0x4266, 0) == 0x426)'): CHC: Assertion violation happens here.
+// Warning 6328: (317-346='assert(f(0x4266, 8) == 0x420)'): CHC: Assertion violation happens here.
+// Warning 6328: (421-451='assert(f(0x4266, 0x10) == 255)'): CHC: Assertion violation happens here.
+// Warning 6328: (526-556='assert(f(0x4266, 0x11) == 255)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol
index 7738e30fe..72ba77e1f 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol
@@ -15,5 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (207-232): CHC: Assertion violation happens here.
-// Warning 6328: (302-325): CHC: Assertion violation happens here.
+// Warning 6328: (207-232='assert(f(0x66, 0) == 0x6)'): CHC: Assertion violation happens here.
+// Warning 6328: (302-325='assert(f(0x66, 8) == 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol
index 9d8c3e796..9936f6628 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol
@@ -20,5 +20,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (312-341): CHC: Assertion violation happens here.
-// Warning 6328: (417-446): CHC: Assertion violation happens here.
+// Warning 6328: (312-341='assert(f(1, 2**256 - 1) == 1)'): CHC: Assertion violation happens here.
+// Warning 6328: (417-446='assert(g(1, 2**256 - 1) == 1)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol b/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
index 9c0db9007..9448dac9f 100644
--- a/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
+++ b/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
@@ -12,5 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (188-220): CHC: Assertion violation might happen here.
-// Warning 4661: (188-220): BMC: Assertion violation happens here.
+// Warning 6328: (188-220='assert(bytes(b[10:])[0] == 0xff)'): CHC: Assertion violation might happen here.
+// Warning 4661: (188-220='assert(bytes(b[10:])[0] == 0xff)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol b/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
index 2dcb63519..15b8b844b 100644
--- a/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
+++ b/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
@@ -10,7 +10,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (150-182): CHC: Assertion violation might happen here.
-// Warning 6328: (186-218): CHC: Assertion violation might happen here.
-// Warning 4661: (150-182): BMC: Assertion violation happens here.
-// Warning 4661: (186-218): BMC: Assertion violation happens here.
+// Warning 6328: (150-182='assert(bytes(b[:20])[0] == 0xff)'): CHC: Assertion violation might happen here.
+// Warning 6328: (186-218='assert(bytes(b[:20])[5] == 0xff)'): CHC: Assertion violation might happen here.
+// Warning 4661: (150-182='assert(bytes(b[:20])[0] == 0xff)'): BMC: Assertion violation happens here.
+// Warning 4661: (186-218='assert(bytes(b[:20])[5] == 0xff)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add.sol b/test/libsolidity/smtCheckerTests/operators/unary_add.sol
index 1b304dd4b..438538682 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add.sol
@@ -14,4 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (161-174): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 4\na = 3\nb = 3\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (161-174='assert(b < 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 4\na = 3\nb = 3\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol
index 8c3296e09..0d3c35989 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol
@@ -20,4 +20,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (278-291): CHC: Assertion violation happens here.
+// Warning 6328: (278-291='assert(b < 3)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol
index 03dedaae9..6b2927583 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (150-168): CHC: Assertion violation happens here.\nCounterexample:\nx = [1]\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.f()
+// Warning 6328: (150-168='assert(x[0] == 42)'): CHC: Assertion violation happens here.\nCounterexample:\nx = [1]\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol
index e52f3f3e3..ac4d6232f 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol
@@ -16,4 +16,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (211-224): CHC: Assertion violation happens here.
+// Warning 6328: (211-224='assert(b < 3)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_minus_overflow_detected.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_minus_overflow_detected.sol
index 3ab970900..3d214d0fa 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_minus_overflow_detected.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_minus_overflow_detected.sol
@@ -22,6 +22,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (55-58): CHC: Overflow (resulting value larger than 255) might happen here.
-// Warning 3944: (95-98): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.dec_pre()
-// Warning 2661: (55-58): BMC: Overflow (resulting value larger than 255) happens here.
+// Warning 4984: (55-58='++x'): CHC: Overflow (resulting value larger than 255) might happen here.
+// Warning 3944: (95-98='--x'): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.dec_pre()
+// Warning 2661: (55-58='++x'): BMC: Overflow (resulting value larger than 255) happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol
index 459d5adb7..ac289ba0f 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol
@@ -13,4 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (61-64): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\nx = 255\n\nTransaction trace:\nC.constructor()\nState: x = 254\nC.inc_pre()\nState: x = 255\nC.inc_pre()
+// Warning 4984: (61-64='++x'): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\nx = 255\n\nTransaction trace:\nC.constructor()\nState: x = 254\nC.inc_pre()\nState: x = 255\nC.inc_pre()
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol
index ebc23359f..e3db7f92e 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol
@@ -21,4 +21,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (112-117): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\ns = {x: 255}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 254}\nC.inc_pre()\nState: s = {x: 255}\nC.inc_pre()
+// Warning 4984: (112-117='++s.x'): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\ns = {x: 255}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 254}\nC.inc_pre()\nState: s = {x: 255}\nC.inc_pre()
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol
index 90b8a02bd..f273d21c1 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (108-118): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f(true)
+// Warning 6328: (108-118='assert(!b)'): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f(true)
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_sub.sol b/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
index ada46b98f..a1cd270b1 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
@@ -14,4 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (161-174): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\na = 4\nb = 4\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (161-174='assert(b > 4)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\na = 4\nb = 4\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol b/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol
index 657cece75..88118d194 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol
@@ -18,4 +18,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (275-288): CHC: Assertion violation happens here.
+// Warning 6328: (275-288='assert(b > 4)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol b/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol
index 49ece2592..d794c3e92 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol
@@ -16,4 +16,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (211-224): CHC: Assertion violation happens here.
+// Warning 6328: (211-224='assert(b > 4)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/options/pragma.sol b/test/libsolidity/smtCheckerTests/options/pragma.sol
index b3e35ee02..f3152eff6 100644
--- a/test/libsolidity/smtCheckerTests/options/pragma.sol
+++ b/test/libsolidity/smtCheckerTests/options/pragma.sol
@@ -5,5 +5,5 @@ contract C {
     }
 }
 // ----
-// Warning 5523: (0-31): The SMTChecker pragma has been deprecated and will be removed in the future. Please use the "model checker engine" compiler setting to activate the SMTChecker instead. If the pragma is enabled, all engines will be used.
-// Warning 6328: (90-103): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 5523: (0-31='pragma experimental SMTChecker;'): The SMTChecker pragma has been deprecated and will be removed in the future. Please use the "model checker engine" compiler setting to activate the SMTChecker instead. If the pragma is enabled, all engines will be used.
+// Warning 6328: (90-103='assert(x > 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol
index 0eb84c274..82e5f22fd 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol
@@ -13,4 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (224-231): CHC: Out of bounds access happens here.\nCounterexample:\na = [[]]\ni = 0\nj = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.p()\nState: a = [[]]\nC.r(0, 0)
+// Warning 6368: (224-231='a[i][j]'): CHC: Out of bounds access happens here.\nCounterexample:\na = [[]]\ni = 0\nj = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.p()\nState: a = [[]]\nC.r(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
index ee3cdfd24..1377680d3 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
@@ -14,15 +14,15 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (228-232): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (255-259): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (255-262): CHC: Error trying to invoke SMT solver.
-// Warning 4984: (184-197): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 4984: (199-202): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6368: (228-232): CHC: Out of bounds access might happen here.
-// Warning 4984: (228-244): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 4984: (246-249): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6368: (255-259): CHC: Out of bounds access might happen here.
-// Warning 6368: (255-262): CHC: Out of bounds access might happen here.
-// Warning 2661: (184-197): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 2661: (228-244): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 1218: (228-232='a[i]'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (255-259='a[i]'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (255-262='a[i][j]'): CHC: Error trying to invoke SMT solver.
+// Warning 4984: (184-197='a.length + 10'): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 4984: (199-202='++i'): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 6368: (228-232='a[i]'): CHC: Out of bounds access might happen here.
+// Warning 4984: (228-244='a[i].length + 20'): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 4984: (246-249='++j'): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 6368: (255-259='a[i]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (255-262='a[i][j]'): CHC: Out of bounds access might happen here.
+// Warning 2661: (184-197='a.length + 10'): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 2661: (228-244='a[i].length + 20'): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_3.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_3.sol
index bd70673c3..5d863e2f3 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_3.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_3.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (82-86): CHC: Out of bounds access happens here.\nCounterexample:\na = []\ni = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.r(0)
+// Warning 6368: (82-86='a[i]'): CHC: Out of bounds access happens here.\nCounterexample:\na = []\ni = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.r(0)
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol
index f4e90ddb7..a2da443c9 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (83-87): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = 0x0\ny = 4\n = 0x0\n\nTransaction trace:\nC.constructor()\nC.r(0x0, 4)
+// Warning 6368: (83-87='x[y]'): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = 0x0\ny = 4\n = 0x0\n\nTransaction trace:\nC.constructor()\nC.r(0x0, 4)
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol
index 83e68b480..c9df91432 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (36-42): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (36-42='uint y'): Unused function parameter. Remove or comment out the variable name to silence this warning.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol
index 816f96810..5f13f2fb5 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol
@@ -13,5 +13,5 @@ contract DepositContract {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (256-277): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 2661: (256-277): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (256-277='deposit_count_2 += 10'): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 2661: (256-277='deposit_count_2 += 10'): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol
index efb0135e9..ced2018d1 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol
@@ -13,4 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (87-92): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\n\nx = 100\n = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 4984: (87-92='x * 3'): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\n\nx = 100\n = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol
index c90c32bee..487812359 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol
@@ -9,5 +9,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (111-114): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6368: (106-115): CHC: Out of bounds access happens here.
+// Warning 4984: (111-114='5*y'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6368: (106-115='x[8][5*y]'): CHC: Out of bounds access happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol
index d0cadffac..2560abc04 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol
@@ -13,4 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (136-143): CHC: Overflow (resulting value larger than 127) happens here.\nCounterexample:\n\nx = 100\n = 0\ny = (- 56)\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 4984: (136-143='x * 100'): CHC: Overflow (resulting value larger than 127) happens here.\nCounterexample:\n\nx = 100\n = 0\ny = (- 56)\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol
index 6d4275dbf..fe9b710e5 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol
@@ -15,4 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (185-192): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\n\nx = 255\n = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 4984: (185-192='x + 255'): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\n\nx = 255\n = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol
index d7a309405..eec495f7a 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
-// Warning 4281: (77-82): CHC: Division by zero happens here.
+// Warning 4984: (77-82='x / y'): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
+// Warning 4281: (77-82='x / y'): CHC: Division by zero happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
index 4635ef966..a75dc3d84 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
@@ -8,5 +8,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (78-83): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
-// Warning 4984: (78-83): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
+// Warning 3944: (78-83='x + y'): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
+// Warning 4984: (78-83='x + y'): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_mod_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_mod_overflow.sol
index 7106bbbb8..92afdd0f4 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_mod_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_mod_overflow.sol
@@ -6,4 +6,4 @@ contract C  {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (77-82): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 4281: (77-82='x % y'): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
index 225d00689..883eaa6ac 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
+// Warning 3944: (77-82='x * y'): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
+// Warning 4984: (77-82='x * y'): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
index 81de2d5fe..645bbe424 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
+// Warning 3944: (77-82='x - y'): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
+// Warning 4984: (77-82='x - y'): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
index 7bb6588e3..4b64fba7a 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
+// Warning 3944: (77-82='x + y'): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
+// Warning 4984: (77-82='x + y'): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
index e8cf49a83..859599d8b 100644
--- a/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
@@ -4,4 +4,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\na = 1\nb = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(1, 115792089237316195423570985008687907853269984665640564039457584007913129639935)
+// Warning 4984: (80-85='a + b'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\na = 1\nb = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(1, 115792089237316195423570985008687907853269984665640564039457584007913129639935)
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_div_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_div_overflow.sol
index 76ab3402e..3ec57b47f 100644
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_div_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/unsigned_div_overflow.sol
@@ -6,4 +6,4 @@ contract C  {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (80-85): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 4281: (80-85='x / y'): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sum_overflow.sol
index 904cb52c4..9d1786a30 100644
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sum_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sum_overflow.sol
@@ -7,4 +7,4 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (80-85='x + y'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_mod_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_mod_overflow.sol
index 7c42d43a2..2647cd6ad 100644
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_mod_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/unsigned_mod_overflow.sol
@@ -6,4 +6,4 @@ contract C  {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (80-85): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 4281: (80-85='x % y'): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
index 0a6d85a7e..b0ec0fd82 100644
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
@@ -6,4 +6,4 @@ contract C  {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 57896044618658097711785492504343953926634992332820282019728792003956564819968\ny = 2\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(57896044618658097711785492504343953926634992332820282019728792003956564819968, 2)
+// Warning 4984: (80-85='x * y'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 57896044618658097711785492504343953926634992332820282019728792003956564819968\ny = 2\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(57896044618658097711785492504343953926634992332820282019728792003956564819968, 2)
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_sub_overflow.sol
index 1c6df4b2c..1d75929b0 100644
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_sub_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/unsigned_sub_overflow.sol
@@ -6,4 +6,4 @@ contract C  {
 // ====
 // SMTEngine: all
 // ----
-// Warning 3944: (80-85): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\nx = 0\ny = 1\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 1)
+// Warning 3944: (80-85='x - y'): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\nx = 0\ny = 1\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 1)
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_sum_overflow.sol
index 904cb52c4..9d1786a30 100644
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_sum_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/unsigned_sum_overflow.sol
@@ -7,4 +7,4 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (80-85='x + y'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol b/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol
index 46ff93166..d923e0b96 100644
--- a/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol
+++ b/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol
@@ -10,5 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2072: (91-98): Unused local variable.
-// Warning 2072: (146-153): Unused local variable.
+// Warning 2072: (91-98='bool b1'): Unused local variable.
+// Warning 2072: (146-153='bool b2'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol b/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
index a015aba72..02996d98e 100644
--- a/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
@@ -9,8 +9,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2072: (70-80): Unused local variable.
-// Warning 2072: (82-86): Unused local variable.
-// Warning 2072: (140-150): Unused local variable.
-// Warning 2072: (152-156): Unused local variable.
-// Warning 6328: (220-236): CHC: Assertion violation happens here.
+// Warning 2072: (70-80='bytes32 b1'): Unused local variable.
+// Warning 2072: (82-86='C c1'): Unused local variable.
+// Warning 2072: (140-150='bytes32 b2'): Unused local variable.
+// Warning 2072: (152-156='C c2'): Unused local variable.
+// Warning 6328: (220-236='assert(a1 != a2)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol b/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
index 51a330d8e..090dd912f 100644
--- a/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
@@ -30,8 +30,8 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (473-503): BMC: Assertion violation happens here.
-// Warning 4661: (531-562): BMC: Assertion violation happens here.
-// Warning 4661: (590-619): BMC: Assertion violation happens here.
-// Warning 4661: (647-677): BMC: Assertion violation happens here.
+// Warning 4661: (473-503='assert(coin == block.coinbase)'): BMC: Assertion violation happens here.
+// Warning 4661: (531-562='assert(dif == block.difficulty)'): BMC: Assertion violation happens here.
+// Warning 4661: (590-619='assert(gas == block.gaslimit)'): BMC: Assertion violation happens here.
+// Warning 4661: (647-677='assert(number == block.number)'): BMC: Assertion violation happens here.
 // Warning 4661: (705-741): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
index 2ebf4d326..67673c86e 100644
--- a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
@@ -32,4 +32,4 @@ contract C {
 // ====
 // SMTEngine: chc
 // ----
-// Warning 6328: (770-799): CHC: Assertion violation happens here.\nCounterexample:\ncoin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\n\nTransaction trace:\nC.constructor()\nState: coin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\nC.f(){ block.coinbase: 0x0, block.difficulty: 0, block.gaslimit: 0, block.number: 0, block.timestamp: 0 }\n    C.g() -- internal call
+// Warning 6328: (770-799='assert(coin == address(this))'): CHC: Assertion violation happens here.\nCounterexample:\ncoin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\n\nTransaction trace:\nC.constructor()\nState: coin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\nC.f(){ block.coinbase: 0x0, block.difficulty: 0, block.gaslimit: 0, block.number: 0, block.timestamp: 0 }\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/special/blockhash.sol b/test/libsolidity/smtCheckerTests/special/blockhash.sol
index 2a7cc39fa..dda89e015 100644
--- a/test/libsolidity/smtCheckerTests/special/blockhash.sol
+++ b/test/libsolidity/smtCheckerTests/special/blockhash.sol
@@ -11,5 +11,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (52-76): CHC: Assertion violation happens here.
-// Warning 6328: (80-104): CHC: Assertion violation happens here.
+// Warning 6328: (52-76='assert(blockhash(x) > 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (80-104='assert(blockhash(2) > 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/ether_units.sol b/test/libsolidity/smtCheckerTests/special/ether_units.sol
index 40242e50d..83c16e348 100644
--- a/test/libsolidity/smtCheckerTests/special/ether_units.sol
+++ b/test/libsolidity/smtCheckerTests/special/ether_units.sol
@@ -12,5 +12,5 @@ contract D {
 // SMTEngine: all
 // ----
 // Warning 6328: (89-130): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (170-201): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
+// Warning 6328: (170-201='assert(100000000 wei == 1 gwei)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
 // Warning 6328: (243-276): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
diff --git a/test/libsolidity/smtCheckerTests/special/event.sol b/test/libsolidity/smtCheckerTests/special/event.sol
index 2788eeecd..13e45d1a8 100644
--- a/test/libsolidity/smtCheckerTests/special/event.sol
+++ b/test/libsolidity/smtCheckerTests/special/event.sol
@@ -25,6 +25,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (247-251): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (397-401): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (407-416): CHC: Assertion violation happens here.\nCounterexample:\nx = false\n\nTransaction trace:\nC.constructor()\nState: x = true\nC.h()\n    C.h_data() -- internal call\n    C.h_data() -- internal call
+// Warning 6321: (247-251='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (397-401='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6328: (407-416='assert(x)'): CHC: Assertion violation happens here.\nCounterexample:\nx = false\n\nTransaction trace:\nC.constructor()\nState: x = true\nC.h()\n    C.h_data() -- internal call\n    C.h_data() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/special/gasleft.sol b/test/libsolidity/smtCheckerTests/special/gasleft.sol
index 416c2668e..f591d76f0 100644
--- a/test/libsolidity/smtCheckerTests/special/gasleft.sol
+++ b/test/libsolidity/smtCheckerTests/special/gasleft.sol
@@ -10,5 +10,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (43-64): CHC: Assertion violation happens here.\nCounterexample:\n\ng = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (90-111): CHC: Assertion violation happens here.\nCounterexample:\n\ng = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (43-64='assert(gasleft() > 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\ng = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (90-111='assert(g < gasleft())'): CHC: Assertion violation happens here.\nCounterexample:\n\ng = 0\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/special/many.sol b/test/libsolidity/smtCheckerTests/special/many.sol
index e9c100014..b06a420be 100644
--- a/test/libsolidity/smtCheckerTests/special/many.sol
+++ b/test/libsolidity/smtCheckerTests/special/many.sol
@@ -20,8 +20,8 @@ contract C
 // Warning 6328: (46-82): CHC: Assertion violation happens here.
 // Warning 6328: (86-128): CHC: Assertion violation happens here.
 // Warning 6328: (132-171): CHC: Assertion violation happens here.
-// Warning 6328: (175-207): CHC: Assertion violation happens here.
-// Warning 6328: (211-242): CHC: Assertion violation happens here.
-// Warning 6328: (295-319): CHC: Assertion violation happens here.
-// Warning 6328: (323-351): CHC: Assertion violation happens here.
-// Warning 6328: (355-378): CHC: Assertion violation happens here.
+// Warning 6328: (175-207='assert(tx.gasprice == msg.value)'): CHC: Assertion violation happens here.
+// Warning 6328: (211-242='assert(tx.origin == msg.sender)'): CHC: Assertion violation happens here.
+// Warning 6328: (295-319='assert(x > block.number)'): CHC: Assertion violation happens here.
+// Warning 6328: (323-351='assert(block.timestamp > 10)'): CHC: Assertion violation happens here.
+// Warning 6328: (355-378='assert(gasleft() > 100)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/many_internal.sol b/test/libsolidity/smtCheckerTests/special/many_internal.sol
index eb68fd9ac..78590b52a 100644
--- a/test/libsolidity/smtCheckerTests/special/many_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/many_internal.sol
@@ -23,8 +23,8 @@ contract C
 // Warning 6328: (81-117): CHC: Assertion violation happens here.
 // Warning 6328: (121-163): CHC: Assertion violation happens here.
 // Warning 6328: (167-206): CHC: Assertion violation happens here.
-// Warning 6328: (210-242): CHC: Assertion violation happens here.
-// Warning 6328: (246-277): CHC: Assertion violation happens here.
-// Warning 6328: (330-354): CHC: Assertion violation happens here.
-// Warning 6328: (358-386): CHC: Assertion violation happens here.
-// Warning 6328: (390-413): CHC: Assertion violation happens here.
+// Warning 6328: (210-242='assert(tx.gasprice == msg.value)'): CHC: Assertion violation happens here.
+// Warning 6328: (246-277='assert(tx.origin == msg.sender)'): CHC: Assertion violation happens here.
+// Warning 6328: (330-354='assert(x > block.number)'): CHC: Assertion violation happens here.
+// Warning 6328: (358-386='assert(block.timestamp > 10)'): CHC: Assertion violation happens here.
+// Warning 6328: (390-413='assert(gasleft() > 100)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_data.sol b/test/libsolidity/smtCheckerTests/special/msg_data.sol
index 90022508f..d0692b713 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_data.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_data.sol
@@ -23,5 +23,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (120-147): CHC: Assertion violation happens here.
-// Warning 6328: (467-494): CHC: Assertion violation happens here.
+// Warning 6328: (120-147='assert(msg.data.length > 4)'): CHC: Assertion violation happens here.
+// Warning 6328: (467-494='assert(msg.data[3] == 0x8f)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol
index ecfc53e98..94b88b249 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol
@@ -11,4 +11,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (122-145): CHC: Assertion violation happens here.
+// Warning 6328: (122-145='assert(c == msg.sender)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sig.sol b/test/libsolidity/smtCheckerTests/special/msg_sig.sol
index cf701f6d0..7babd3895 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_sig.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_sig.sol
@@ -25,6 +25,6 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (43-72): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.sig: 0x26121ff0 }
-// Warning 6328: (370-399): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.sig: 0x26121ff0 }\n    C.fi() -- internal call\n    C.gi() -- internal call
-// Warning 6328: (510-539): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h(){ msg.sig: 0xb8c9d365 }
+// Warning 6328: (43-72='assert(msg.sig == 0x00000000)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.sig: 0x26121ff0 }
+// Warning 6328: (370-399='assert(msg.sig == 0xe2179b8e)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.sig: 0x26121ff0 }\n    C.fi() -- internal call\n    C.gi() -- internal call
+// Warning 6328: (510-539='assert(msg.sig == 0xe2179b8e)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h(){ msg.sig: 0xb8c9d365 }
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_1.sol b/test/libsolidity/smtCheckerTests/special/msg_value_1.sol
index 51e696f56..d625d2b04 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_1.sol
@@ -6,5 +6,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (55-68): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.value: 115792089237316195423570985008687907853269984665640564039457584007913129639931 }
-// Warning 4984: (55-80): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.value: 57896044618658097711785492504343953926634992332820282019728792003956564819966 }
+// Warning 4984: (55-68='5 + msg.value'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.value: 115792089237316195423570985008687907853269984665640564039457584007913129639931 }
+// Warning 4984: (55-80='5 + msg.value + msg.value'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.value: 57896044618658097711785492504343953926634992332820282019728792003956564819966 }
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_2.sol b/test/libsolidity/smtCheckerTests/special/msg_value_2.sol
index acf1b9e5d..8594c639a 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_2.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_2.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (46-67): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.value: 0 }
+// Warning 6328: (46-67='assert(msg.value > 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.value: 0 }
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_4.sol b/test/libsolidity/smtCheckerTests/special/msg_value_4.sol
index 82edb4a39..6280ffb40 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_4.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_4.sol
@@ -13,4 +13,4 @@ contract B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (154-176): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nB.constructor(){ msg.value: 39 }
+// Warning 6328: (154-176='assert(msg.value == 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nB.constructor(){ msg.value: 39 }
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol
index 8b69352c2..22684c99e 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol
@@ -14,4 +14,4 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (68-82): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nA.constructor(){ msg.value: 1 }
+// Warning 6328: (68-82='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nA.constructor(){ msg.value: 1 }
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol
index 10b8ef0c2..e163846d3 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol
@@ -14,5 +14,5 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (60-74): CHC: Assertion violation happens here.\nCounterexample:\nv = 0, x = 1\n\nTransaction trace:\nC.constructor(){ msg.value: 1 }
-// Warning 6328: (240-254): CHC: Assertion violation happens here.\nCounterexample:\nv = 1, x = 1\n\nTransaction trace:\nC.constructor(){ msg.value: 1 }
+// Warning 6328: (60-74='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nv = 0, x = 1\n\nTransaction trace:\nC.constructor(){ msg.value: 1 }
+// Warning 6328: (240-254='assert(v == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nv = 1, x = 1\n\nTransaction trace:\nC.constructor(){ msg.value: 1 }
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
index 4e1d2a99f..32fcd6bc8 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
@@ -19,4 +19,4 @@ contract C is A, B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (60-74): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(){ msg.value: 1 }
+// Warning 6328: (60-74='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(){ msg.value: 1 }
diff --git a/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol b/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol
index 100284dd7..3ee2882dc 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol
@@ -27,6 +27,6 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (394-432): BMC: Assertion violation happens here.
-// Warning 4661: (460-488): BMC: Assertion violation happens here.
-// Warning 4661: (516-538): BMC: Assertion violation happens here.
-// Warning 4661: (566-592): BMC: Assertion violation happens here.
+// Warning 4661: (460-488='assert(sender == msg.sender)'): BMC: Assertion violation happens here.
+// Warning 4661: (516-538='assert(sig == msg.sig)'): BMC: Assertion violation happens here.
+// Warning 4661: (566-592='assert(value == msg.value)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
index 475cc2291..ade38597a 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
@@ -29,4 +29,4 @@ contract C {
 // ====
 // SMTEngine: chc
 // ----
-// Warning 6328: (645-668): CHC: Assertion violation happens here.\nCounterexample:\ndata = [0x26, 0x12, 0x1f, 0xf0], sender = 0x0, sig = 0x26121ff0, value = 42\n\nTransaction trace:\nC.constructor()\nState: data = [], sender = 0x0, sig = 0x0, value = 0\nC.f(){ msg.data: [0x26, 0x12, 0x1f, 0xf0], msg.sender: 0x0, msg.sig: 0x26121ff0, msg.value: 42 }\n    C.g() -- internal call
+// Warning 6328: (645-668='assert(msg.value == 10)'): CHC: Assertion violation happens here.\nCounterexample:\ndata = [0x26, 0x12, 0x1f, 0xf0], sender = 0x0, sig = 0x26121ff0, value = 42\n\nTransaction trace:\nC.constructor()\nState: data = [], sender = 0x0, sig = 0x0, value = 0\nC.f(){ msg.data: [0x26, 0x12, 0x1f, 0xf0], msg.sender: 0x0, msg.sig: 0x26121ff0, msg.value: 42 }\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/special/shadowing_1.sol b/test/libsolidity/smtCheckerTests/special/shadowing_1.sol
index d54548314..f29dc5d45 100644
--- a/test/libsolidity/smtCheckerTests/special/shadowing_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/shadowing_1.sol
@@ -18,7 +18,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2319: (108-120): This declaration shadows a builtin symbol.
-// Warning 2319: (149-160): This declaration shadows a builtin symbol.
-// Warning 2319: (189-203): This declaration shadows a builtin symbol.
-// Warning 6328: (274-297): CHC: Assertion violation happens here.
+// Warning 2319: (108-120='S memory msg'): This declaration shadows a builtin symbol.
+// Warning 2319: (149-160='S memory tx'): This declaration shadows a builtin symbol.
+// Warning 2319: (189-203='S memory block'): This declaration shadows a builtin symbol.
+// Warning 6328: (274-297='assert(msg.value == 41)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/this.sol b/test/libsolidity/smtCheckerTests/special/this.sol
index efd0f52c1..e67a37236 100644
--- a/test/libsolidity/smtCheckerTests/special/this.sol
+++ b/test/libsolidity/smtCheckerTests/special/this.sol
@@ -8,4 +8,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (52-78): CHC: Assertion violation happens here.
+// Warning 6328: (52-78='assert(a == address(this))'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/time_units.sol b/test/libsolidity/smtCheckerTests/special/time_units.sol
index 2462f9312..8c52ff851 100644
--- a/test/libsolidity/smtCheckerTests/special/time_units.sol
+++ b/test/libsolidity/smtCheckerTests/special/time_units.sol
@@ -15,8 +15,8 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (69-91): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (131-163): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (201-231): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (265-291): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (325-352): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
+// Warning 6328: (69-91='assert(2 == 1 seconds)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
+// Warning 6328: (131-163='assert(3 minutes == 120 seconds)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
+// Warning 6328: (201-231='assert(3 hours == 120 minutes)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
+// Warning 6328: (265-291='assert(4 days == 48 hours)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
+// Warning 6328: (325-352='assert(25 weeks == 14 days)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
diff --git a/test/libsolidity/smtCheckerTests/special/timestamp_2.sol b/test/libsolidity/smtCheckerTests/special/timestamp_2.sol
index 7173185da..042197e0b 100644
--- a/test/libsolidity/smtCheckerTests/special/timestamp_2.sol
+++ b/test/libsolidity/smtCheckerTests/special/timestamp_2.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (107-126): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nC.constructor(){ block.timestamp: 115792089237316195423570985008687907853269984665640564039457584007913129639935 }
+// Warning 4984: (107-126='block.timestamp + 1'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nC.constructor(){ block.timestamp: 115792089237316195423570985008687907853269984665640564039457584007913129639935 }
diff --git a/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol b/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol
index 3f8c4c162..8e264034a 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol
@@ -18,5 +18,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (91-117): CHC: Assertion violation happens here.
-// Warning 6328: (186-212): CHC: Assertion violation happens here.
+// Warning 6328: (91-117='assert(gleft == gasleft())'): CHC: Assertion violation happens here.
+// Warning 6328: (186-212='assert(gleft == gasleft())'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol b/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol
index 82d3529e0..d1f1325f6 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol
@@ -61,27 +61,27 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (512-543): CHC: Assertion violation happens here.
-// Warning 6328: (547-577): CHC: Assertion violation happens here.
-// Warning 6328: (581-612): CHC: Assertion violation happens here.
-// Warning 6328: (616-648): CHC: Assertion violation happens here.
-// Warning 6328: (652-682): CHC: Assertion violation happens here.
+// Warning 6328: (512-543='assert(bhash == blockhash(122))'): CHC: Assertion violation happens here.
+// Warning 6328: (547-577='assert(coin != block.coinbase)'): CHC: Assertion violation happens here.
+// Warning 6328: (581-612='assert(dif != block.difficulty)'): CHC: Assertion violation happens here.
+// Warning 6328: (616-648='assert(glimit != block.gaslimit)'): CHC: Assertion violation happens here.
+// Warning 6328: (652-682='assert(number != block.number)'): CHC: Assertion violation happens here.
 // Warning 6328: (686-719): CHC: Assertion violation happens here.
 // Warning 6328: (723-762): CHC: Assertion violation happens here.
-// Warning 6328: (766-794): CHC: Assertion violation happens here.
-// Warning 6328: (798-820): CHC: Assertion violation happens here.
-// Warning 6328: (824-850): CHC: Assertion violation happens here.
-// Warning 6328: (854-883): CHC: Assertion violation happens here.
-// Warning 6328: (887-914): CHC: Assertion violation happens here.
-// Warning 6328: (953-984): CHC: Assertion violation happens here.
-// Warning 6328: (988-1018): CHC: Assertion violation happens here.
-// Warning 6328: (1022-1053): CHC: Assertion violation happens here.
-// Warning 6328: (1057-1089): CHC: Assertion violation happens here.
-// Warning 6328: (1093-1123): CHC: Assertion violation happens here.
+// Warning 6328: (766-794='assert(sender != msg.sender)'): CHC: Assertion violation happens here.
+// Warning 6328: (798-820='assert(sig != msg.sig)'): CHC: Assertion violation happens here.
+// Warning 6328: (824-850='assert(value != msg.value)'): CHC: Assertion violation happens here.
+// Warning 6328: (854-883='assert(gprice != tx.gasprice)'): CHC: Assertion violation happens here.
+// Warning 6328: (887-914='assert(origin != tx.origin)'): CHC: Assertion violation happens here.
+// Warning 6328: (953-984='assert(bhash == blockhash(122))'): CHC: Assertion violation happens here.
+// Warning 6328: (988-1018='assert(coin != block.coinbase)'): CHC: Assertion violation happens here.
+// Warning 6328: (1022-1053='assert(dif != block.difficulty)'): CHC: Assertion violation happens here.
+// Warning 6328: (1057-1089='assert(glimit != block.gaslimit)'): CHC: Assertion violation happens here.
+// Warning 6328: (1093-1123='assert(number != block.number)'): CHC: Assertion violation happens here.
 // Warning 6328: (1127-1160): CHC: Assertion violation happens here.
 // Warning 6328: (1164-1203): CHC: Assertion violation happens here.
-// Warning 6328: (1207-1235): CHC: Assertion violation happens here.
-// Warning 6328: (1239-1261): CHC: Assertion violation happens here.
-// Warning 6328: (1265-1291): CHC: Assertion violation happens here.
-// Warning 6328: (1295-1324): CHC: Assertion violation happens here.
-// Warning 6328: (1328-1355): CHC: Assertion violation happens here.
+// Warning 6328: (1207-1235='assert(sender != msg.sender)'): CHC: Assertion violation happens here.
+// Warning 6328: (1239-1261='assert(sig != msg.sig)'): CHC: Assertion violation happens here.
+// Warning 6328: (1265-1291='assert(value != msg.value)'): CHC: Assertion violation happens here.
+// Warning 6328: (1295-1324='assert(gprice != tx.gasprice)'): CHC: Assertion violation happens here.
+// Warning 6328: (1328-1355='assert(origin != tx.origin)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol
index 137864a33..ef93362e5 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol
@@ -18,5 +18,5 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (233-259): BMC: Assertion violation happens here.
-// Warning 4661: (287-314): BMC: Assertion violation happens here.
+// Warning 4661: (233-259='assert(gas == tx.gasprice)'): BMC: Assertion violation happens here.
+// Warning 4661: (287-314='assert(origin == tx.origin)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_1.sol b/test/libsolidity/smtCheckerTests/try_catch/try_1.sol
index 02a1273e4..151c492e4 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_1.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_1.sol
@@ -19,5 +19,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (163-177): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (221-236): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\nsuccess = false\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 5667: (163-177='bytes memory s'): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (221-236='assert(success)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\nsuccess = false\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_2.sol
index f2ea2e555..77324bdca 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_2.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_2.sol
@@ -17,4 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (155-169): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (155-169='bytes memory s'): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_3.sol b/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
index 4244f5096..9471751ee 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (259-273): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (280-294): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\ns = []\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()\n    C.postinc() -- internal call
+// Warning 5667: (259-273='bytes memory s'): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
+// Warning 6328: (280-294='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\ns = []\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()\n    C.postinc() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_4.sol b/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
index 289f3943d..4d89c6afc 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
@@ -25,5 +25,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (320-334): CHC: Assertion violation happens here.
+// Warning 6328: (320-334='assert(x == 1)'): CHC: Assertion violation happens here.
 // Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n<errorCode> = 2 -> Assertion failed at assert(x == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_5.sol b/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
index 236a26f1b..2612329a0 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
@@ -25,5 +25,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (315-329): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()
+// Warning 6328: (315-329='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()
 // Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 2)\n((!(x' >= 100) || ((x' + ((- 1) * x)) = 0)) && !(<errorCode> = 1))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x < 100)\n<errorCode> = 2 -> Assertion failed at assert(x == 0)\n<errorCode> = 3 -> Assertion failed at assert(x == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_1.sol b/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_1.sol
index b90a9fca9..ccb4213fb 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_1.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (46-50='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_2.sol
index 0c438943b..ade499b04 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_2.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_call_in_catch_2.sol
@@ -12,6 +12,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 2072: (167-175): Unused local variable.
+// Warning 6321: (46-50='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (52-56='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 2072: (167-175='int test'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol b/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol
index 4c82cebd9..e1523cb09 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol
@@ -12,4 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (109-113): BMC: Condition is always false.
+// Warning 6838: (109-113='0==1'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol b/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol
index 8d54f103f..941e8c03a 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol
@@ -10,5 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (43-47): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6838: (59-63): BMC: Condition is always true.
+// Warning 6321: (43-47='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6838: (59-63='1==1'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol
index 769a61873..73dd49ecf 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol
@@ -23,4 +23,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (415-430): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nsuccess = false\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (415-430='assert(success)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nsuccess = false\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol
index d11d3a8a6..e5cd967b7 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol
@@ -21,4 +21,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (306-320): CHC: Assertion violation happens here.
+// Warning 6328: (306-320='assert(x == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
index abef4c76a..c401475d2 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
@@ -21,8 +21,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2519: (164-170): This declaration shadows an existing declaration.
-// Warning 6328: (185-199): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\nx = 1\nc = false\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()\n    d.d() -- untrusted external call
-// Warning 6328: (273-283): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\nx = 1\nc = true\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()\n    d.d() -- untrusted external call
-// Warning 6328: (393-407): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()
+// Warning 2519: (164-170='uint x'): This declaration shadows an existing declaration.
+// Warning 6328: (185-199='assert(x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\nx = 1\nc = false\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()\n    d.d() -- untrusted external call
+// Warning 6328: (273-283='assert(!c)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\nx = 1\nc = true\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()\n    d.d() -- untrusted external call
+// Warning 6328: (393-407='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()
 // Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 3)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n<errorCode> = 2 -> Assertion failed at assert(!c)\n<errorCode> = 3 -> Assertion failed at assert(x == 0)\n<errorCode> = 4 -> Assertion failed at assert(x == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol
index d6b62ea99..8d0c20474 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol
@@ -24,4 +24,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (321-336): CHC: Assertion violation happens here.\nCounterexample:\n\nsuccess = false\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (321-336='assert(success)'): CHC: Assertion violation happens here.\nCounterexample:\n\nsuccess = false\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol b/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol
index dfbfb978a..ba8574b4b 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol
@@ -20,4 +20,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (280-295): CHC: Assertion violation happens here.
+// Warning 6328: (280-295='assert(y == 42)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
index 98a19731b..1cc017d6c 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (342-362): CHC: Assertion violation happens here.\nCounterexample:\n\nchoice = 3\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (342-362='assert(choice == 42)'): CHC: Assertion violation happens here.\nCounterexample:\n\nchoice = 3\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol b/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol
index bbb65a236..353449e5c 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (323-343): CHC: Assertion violation happens here.\nCounterexample:\n\nchoice = 1\n\nTransaction trace:\nC.constructor()\nC.f()\n    C.g() -- trusted external call
+// Warning 6328: (323-343='assert(choice == 42)'): CHC: Assertion violation happens here.\nCounterexample:\n\nchoice = 1\n\nTransaction trace:\nC.constructor()\nC.f()\n    C.g() -- trusted external call
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_new.sol b/test/libsolidity/smtCheckerTests/try_catch/try_new.sol
index e7075e076..18f6a4fd9 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_new.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_new.sol
@@ -28,5 +28,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4588: (231-245): Assertion checker does not yet implement this type of function call.
-// Warning 4588: (492-507): Assertion checker does not yet implement this type of function call.
+// Warning 4588: (231-245='new Reverts(i)'): Assertion checker does not yet implement this type of function call.
+// Warning 4588: (492-507='new Succeeds(i)'): Assertion checker does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol b/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol
index 281a74839..909970acb 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol
@@ -12,4 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (139-152): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (139-152='assert(false)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/typecast/address_literal.sol b/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
index 40540bb51..d4624e383 100644
--- a/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (454-468): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0\na = 0x0\nb = 0x01\nc = 0x0\nd = 0x0\ne = 0x12345678\n\nTransaction trace:\nC.constructor()\nState: x = 0x0\nC.g()
+// Warning 6328: (454-468='assert(a == b)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0\na = 0x0\nb = 0x01\nc = 0x0\nd = 0x0\ne = 0x12345678\n\nTransaction trace:\nC.constructor()\nState: x = 0x0\nC.g()
 // Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
index 91166baa8..3264dd11d 100644
--- a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
@@ -16,7 +16,7 @@ contract C {
 	}
 }
 // ----
-// Warning 6328: (225-256): CHC: Assertion violation happens here.\nCounterexample:\n\nc = 0x01020304050607\nd = 0x0\ne = 0x0\ng = 0x0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (225-256='assert(c == 0x0001020304050608)'): CHC: Assertion violation happens here.\nCounterexample:\n\nc = 0x01020304050607\nd = 0x0\ne = 0x0\ng = 0x0\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (352-399): CHC: Assertion violation happens here.\nCounterexample:\n\nc = 0x01020304050607\nd = 0x010203040506070809000102030405\ne = 0x0\ng = 0x0\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (526-589): CHC: Assertion violation happens here.\nCounterexample:\n\nc = 0x01020304050607\nd = 0x010203040506070809000102030405\ne = 0x0102030405060708090001020304050607080900010203\ng = 0x0\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (732-811): CHC: Assertion violation happens here.\nCounterexample:\n\nc = 0x01020304050607\nd = 0x010203040506070809000102030405\ne = 0x0102030405060708090001020304050607080900010203\ng = 0x01020304050607080900010203040506070809000102030405060708090001\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_larger_2_fail.sol b/test/libsolidity/smtCheckerTests/typecast/cast_larger_2_fail.sol
index 15b4257d5..d194675f9 100644
--- a/test/libsolidity/smtCheckerTests/typecast/cast_larger_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/cast_larger_2_fail.sol
@@ -9,4 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (116-130): CHC: Assertion violation happens here.\nCounterexample:\n\na = 4660\nb = 4660\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (116-130='assert(a != b)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 4660\nb = 4660\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol b/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol
index 3a14cbb24..3ab4c066a 100644
--- a/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol
@@ -12,4 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (240-254): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x1234\nb = 0x12340000\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (240-254='assert(a == b)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x1234\nb = 0x12340000\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_external.sol b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_external.sol
index 1a70c0783..24048813c 100644
--- a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_external.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_external.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (123-143): CHC: Assertion violation happens here.\nCounterexample:\n\ng = 0\nh = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)\n    g(2) -- untrusted external call\n    h(2) -- untrusted external call
+// Warning 6328: (123-143='assert(g(2) == h(2))'): CHC: Assertion violation happens here.\nCounterexample:\n\ng = 0\nh = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)\n    g(2) -- untrusted external call\n    h(2) -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
index 6596c6f59..1f266e8f8 100644
--- a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
@@ -12,11 +12,11 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2519: (96-127): This declaration shadows an existing declaration.
-// Warning 6031: (182-186): Internal error: Expression undefined for SMT solver.
-// Warning 6031: (190-194): Internal error: Expression undefined for SMT solver.
-// Warning 7229: (206-212): Assertion checker does not yet implement the type function (uint256) returns (uint256) for comparisons
-// Warning 6328: (175-195): CHC: Assertion violation happens here.\nCounterexample:\na = 0, b = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0, b = 0\nC.g()\n    C.f(0, 0) -- internal call
-// Warning 6328: (199-213): CHC: Assertion violation happens here.\nCounterexample:\na = 0, b = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0, b = 0\nC.g()\n    C.f(0, 0) -- internal call
-// Warning 5729: (182-186): BMC does not yet implement this type of function call.
-// Warning 5729: (190-194): BMC does not yet implement this type of function call.
+// Warning 2519: (96-127='function(uint) returns (uint) g'): This declaration shadows an existing declaration.
+// Warning 6031: (182-186='g(2)'): Internal error: Expression undefined for SMT solver.
+// Warning 6031: (190-194='h(2)'): Internal error: Expression undefined for SMT solver.
+// Warning 7229: (206-212='g == h'): Assertion checker does not yet implement the type function (uint256) returns (uint256) for comparisons
+// Warning 6328: (175-195='assert(g(2) == h(2))'): CHC: Assertion violation happens here.\nCounterexample:\na = 0, b = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0, b = 0\nC.g()\n    C.f(0, 0) -- internal call
+// Warning 6328: (199-213='assert(g == h)'): CHC: Assertion violation happens here.\nCounterexample:\na = 0, b = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0, b = 0\nC.g()\n    C.f(0, 0) -- internal call
+// Warning 5729: (182-186='g(2)'): BMC does not yet implement this type of function call.
+// Warning 5729: (190-194='h(2)'): BMC does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol b/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol
index 093a20d7f..f0109828c 100644
--- a/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol
@@ -13,4 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (153-174): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\nb = 0x0\n\nTransaction trace:\nC.constructor()\nC.f()\n    C.g(0x0) -- internal call
+// Warning 6328: (153-174='assert(x == map["x"])'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\nb = 0x0\n\nTransaction trace:\nC.constructor()\nC.f()\n    C.g(0x0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_function_call.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_function_call.sol
index 7ce444357..71215c3a5 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_function_call.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_function_call.sol
@@ -11,5 +11,5 @@ contract B {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (104-126): CHC: Assertion violation happens here.
-// Warning 6328: (130-152): CHC: Assertion violation happens here.
+// Warning 6328: (104-126='assert(a == "0123456")'): CHC: Assertion violation happens here.
+// Warning 6328: (130-152='assert(a == "1234567")'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol
index c3fda61b8..78d5a5846 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol
@@ -9,4 +9,4 @@ contract B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (120-142): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x30313233343536\n\nTransaction trace:\nB.constructor()\nB.f()
+// Warning 6328: (120-142='assert(a == "1234567")'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x30313233343536\n\nTransaction trace:\nB.constructor()\nB.f()
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol
index 56ef16374..78097144c 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (206-227): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.a()\n    C.f1() -- internal call\n        C.g() -- internal call\n    C.f1() -- internal call\n        C.g() -- internal call
+// Warning 6328: (206-227='assert(f1() == "cde")'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.a()\n    C.f1() -- internal call\n        C.g() -- internal call\n    C.f1() -- internal call\n        C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol
index e443beb43..6f9ca2a8f 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol
@@ -13,4 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (410-429): CHC: Assertion violation happens here.\nCounterexample:\n\nv1 = 0x6162630000000000000000000000000000000000000000000000000000000000\nv2 = 0x646566\n\nTransaction trace:\nC.constructor()\nC.a()\n    C.f2() -- internal call\n        C.h() -- internal call
+// Warning 6328: (410-429='assert(v2 == "cde")'): CHC: Assertion violation happens here.\nCounterexample:\n\nv1 = 0x6162630000000000000000000000000000000000000000000000000000000000\nv2 = 0x646566\n\nTransaction trace:\nC.constructor()\nC.a()\n    C.f2() -- internal call\n        C.h() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
index 4910c417e..0d73e5b06 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (132-160): CHC: Assertion violation happens here.\nCounterexample:\nx = [0x61, 0x62, 0x63, 0x61]\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.s()
+// Warning 6328: (132-160='assert(bytes(x).length == 3)'): CHC: Assertion violation happens here.\nCounterexample:\nx = [0x61, 0x62, 0x63, 0x61]\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.s()
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol
index b3092f04c..0f463c18d 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol
@@ -12,4 +12,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (140-168): CHC: Assertion violation happens here.
+// Warning 6328: (140-168='assert(bytes(x).length == 3)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol b/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
index 3effe1c05..6553fbe0c 100644
--- a/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (107-128): CHC: Assertion violation happens here.
+// Warning 6328: (107-128='assert(a == (x == 2))'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/abi_type_type_2.sol b/test/libsolidity/smtCheckerTests/types/abi_type_type_2.sol
index e1730fedd..091f184a5 100644
--- a/test/libsolidity/smtCheckerTests/types/abi_type_type_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/abi_type_type_2.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (57-86): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(d)
+// Warning 6328: (57-86='assert(abi.decode(d, (bool)))'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(d)
diff --git a/test/libsolidity/smtCheckerTests/types/address_balance.sol b/test/libsolidity/smtCheckerTests/types/address_balance.sol
index a24fa32b1..5f31583f6 100644
--- a/test/libsolidity/smtCheckerTests/types/address_balance.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_balance.sol
@@ -9,6 +9,6 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (63-69): Unused local variable.
-// Warning 4984: (72-94): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 6328: (98-127): CHC: Assertion violation happens here.
+// Warning 2072: (63-69='uint x'): Unused local variable.
+// Warning 4984: (72-94='b.balance + 1000 ether'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (98-127='assert(a.balance > b.balance)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_delegatecall.sol b/test/libsolidity/smtCheckerTests/types/address_delegatecall.sol
index b4d707cf3..160c99ee8 100644
--- a/test/libsolidity/smtCheckerTests/types/address_delegatecall.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_delegatecall.sol
@@ -18,9 +18,9 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (191-207): Unused local variable.
-// Warning 4588: (211-231): Assertion checker does not yet implement this type of function call.
-// Warning 6328: (235-250): CHC: Assertion violation happens here.
-// Warning 6328: (254-268): CHC: Assertion violation happens here.
-// Warning 6328: (272-291): CHC: Assertion violation happens here.
-// Warning 6328: (295-319): CHC: Assertion violation happens here.
+// Warning 2072: (191-207='bytes memory ret'): Unused local variable.
+// Warning 4588: (211-231='a.delegatecall(data)'): Assertion checker does not yet implement this type of function call.
+// Warning 6328: (235-250='assert(success)'): CHC: Assertion violation happens here.
+// Warning 6328: (254-268='assert(x == 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (272-291='assert(map[0] == 0)'): CHC: Assertion violation happens here.
+// Warning 6328: (295-319='assert(localMap[0] == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_staticcall.sol b/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
index 9d00904ad..454ee0525 100644
--- a/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
@@ -20,6 +20,6 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 2072: (127-166): Unused local variable.
-// Warning 2072: (191-207): Unused local variable.
-// Warning 6328: (233-248): CHC: Assertion violation happens here.
+// Warning 2072: (191-207='bytes memory ret'): Unused local variable.
+// Warning 6328: (233-248='assert(success)'): CHC: Assertion violation happens here.
 // Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> >= 2)\n!(<errorCode> >= 3)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(success)\n<errorCode> = 2 -> Assertion failed at assert(x == 0)\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer.sol b/test/libsolidity/smtCheckerTests/types/address_transfer.sol
index 654c24969..0cc54e150 100644
--- a/test/libsolidity/smtCheckerTests/types/address_transfer.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_transfer.sol
@@ -11,5 +11,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (162-186): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x0\nx = 100\n\nTransaction trace:\nC.constructor()\nC.f(0x0)
-// Warning 1236: (98-113): BMC: Insufficient funds happens here.
+// Warning 6328: (162-186='assert(a.balance == 700)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x0\nx = 100\n\nTransaction trace:\nC.constructor()\nC.f(0x0)
+// Warning 1236: (98-113='a.transfer(600)'): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer_2.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_2.sol
index 0a2c08d0c..a3c8e9722 100644
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_transfer_2.sol
@@ -15,6 +15,6 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (262-291): CHC: Assertion violation happens here.
-// Warning 1236: (184-199): BMC: Insufficient funds happens here.
-// Warning 1236: (203-218): BMC: Insufficient funds happens here.
+// Warning 6328: (262-291='assert(a.balance > b.balance)'): CHC: Assertion violation happens here.
+// Warning 1236: (184-199='a.transfer(600)'): BMC: Insufficient funds happens here.
+// Warning 1236: (203-218='b.transfer(100)'): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
index 59568cb5b..52b5517c0 100644
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
@@ -12,6 +12,6 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (180-204): CHC: Assertion violation happens here.
-// Warning 1236: (101-116): BMC: Insufficient funds happens here.
-// Warning 1236: (120-136): BMC: Insufficient funds happens here.
+// Warning 6328: (180-204='assert(a.balance == 600)'): CHC: Assertion violation happens here.
+// Warning 1236: (101-116='a.transfer(600)'): BMC: Insufficient funds happens here.
+// Warning 1236: (120-136='b.transfer(1000)'): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol
index 4e315f6ef..fc90ce952 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol
@@ -37,17 +37,17 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (523-528): CHC: Out of bounds access happens here.
-// Warning 6368: (523-531): CHC: Out of bounds access happens here.
-// Warning 6368: (557-563): CHC: Out of bounds access happens here.
-// Warning 6368: (557-566): CHC: Out of bounds access happens here.
-// Warning 6368: (557-569): CHC: Out of bounds access happens here.
-// Warning 6368: (578-582): CHC: Out of bounds access happens here.
-// Warning 6368: (699-703): CHC: Out of bounds access happens here.
-// Warning 6368: (712-717): CHC: Out of bounds access happens here.
-// Warning 6368: (712-720): CHC: Out of bounds access happens here.
-// Warning 6368: (730-736): CHC: Out of bounds access happens here.
-// Warning 6368: (730-739): CHC: Out of bounds access happens here.
-// Warning 6368: (730-742): CHC: Out of bounds access happens here.
+// Warning 6368: (523-528='cc[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (523-531='cc[0][0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (557-563='eee[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (557-566='eee[0][0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (557-569='eee[0][0][0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (578-582='b[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (699-703='a[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (712-717='cc[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (712-720='cc[0][0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (730-736='eee[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (730-739='eee[0][0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (730-742='eee[0][0][0]'): CHC: Out of bounds access happens here.
 // Warning 6328: (692-749): CHC: Assertion violation happens here.
-// Warning 6368: (850-854): CHC: Out of bounds access happens here.
+// Warning 6368: (850-854='b[0]'): CHC: Out of bounds access happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol
index 7eccaf68f..637869b1c 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol
@@ -27,7 +27,7 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6368: (327-331): CHC: Out of bounds access happens here.
-// Warning 6368: (584-588): CHC: Out of bounds access happens here.
-// Warning 6328: (577-594): CHC: Assertion violation happens here.
-// Warning 6368: (605-609): CHC: Out of bounds access happens here.
+// Warning 6368: (327-331='b[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (584-588='a[0]'): CHC: Out of bounds access happens here.
+// Warning 6328: (577-594='assert(a[0] == 2)'): CHC: Assertion violation happens here.
+// Warning 6368: (605-609='b[0]'): CHC: Out of bounds access happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol
index 48d1f8130..646455873 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol
@@ -31,7 +31,7 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6368: (474-478): CHC: Out of bounds access happens here.
-// Warning 6368: (659-663): CHC: Out of bounds access happens here.
-// Warning 6328: (652-669): CHC: Assertion violation happens here.
-// Warning 6368: (741-745): CHC: Out of bounds access happens here.
+// Warning 6368: (474-478='b[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (659-663='a[0]'): CHC: Out of bounds access happens here.
+// Warning 6328: (652-669='assert(a[0] == 2)'): CHC: Assertion violation happens here.
+// Warning 6368: (741-745='b[0]'): CHC: Out of bounds access happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
index 830d756b7..74ea2440a 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
@@ -34,12 +34,12 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2072: (384-399): Unused local variable.
-// Warning 1218: (955-959): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (948-965): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (976-980): CHC: Error trying to invoke SMT solver.
-// Warning 6368: (489-493): CHC: Out of bounds access happens here.
-// Warning 6368: (955-959): CHC: Out of bounds access might happen here.
-// Warning 6328: (948-965): CHC: Assertion violation might happen here.
-// Warning 6368: (976-980): CHC: Out of bounds access might happen here.
-// Warning 4661: (948-965): BMC: Assertion violation happens here.
+// Warning 2072: (384-399='uint[] memory d'): Unused local variable.
+// Warning 1218: (955-959='a[0]'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (948-965='assert(a[0] == 2)'): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (976-980='b[0]'): CHC: Error trying to invoke SMT solver.
+// Warning 6368: (489-493='b[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (955-959='a[0]'): CHC: Out of bounds access might happen here.
+// Warning 6328: (948-965='assert(a[0] == 2)'): CHC: Assertion violation might happen here.
+// Warning 6368: (976-980='b[0]'): CHC: Out of bounds access might happen here.
+// Warning 4661: (948-965='assert(a[0] == 2)'): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_5.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_5.sol
index ca692a0e8..d4e6f5e0b 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_5.sol
@@ -34,5 +34,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 5667: (125-140): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (125-140='uint[] memory c'): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Warning 2018: (106-254): Function state mutability can be restricted to view
diff --git a/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
index b04c632e9..a025dcdc2 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
@@ -12,4 +12,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (143-159): CHC: Assertion violation happens here.
+// Warning 6328: (143-159='assert(c[0] > 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
index fad9d2bba..02956256c 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
@@ -16,11 +16,11 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (124-131): CHC: Out of bounds access might happen here.
-// Warning 6368: (124-134): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-159): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-162): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-184): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-187): CHC: Out of bounds access might happen here.
-// Warning 6328: (170-192): CHC: Assertion violation happens here.\nCounterexample:\nc = [[[0]]]\nb = false\n\nTransaction trace:\nC.constructor()\nState: c = [[[0]]]\nC.f(false)
+// Warning 6368: (124-131='c[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (124-134='c[0][0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (152-159='c[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (152-162='c[0][0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (177-184='c[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (177-187='c[0][0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6328: (170-192='assert(c[0][0][0] > 0)'): CHC: Assertion violation happens here.\nCounterexample:\nc = [[[0]]]\nb = false\n\nTransaction trace:\nC.constructor()\nState: c = [[[0]]]\nC.f(false)
 // Info 1180: Contract invariant(s) for :C:\n!(c.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
index b2fd91327..6fe5e07a2 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
@@ -16,10 +16,10 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (124-131): CHC: Out of bounds access might happen here.
-// Warning 6368: (124-134): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-159): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-162): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-184): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-187): CHC: Out of bounds access might happen here.
+// Warning 6368: (124-131='c[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (124-134='c[0][0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (152-159='c[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (152-162='c[0][0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (177-184='c[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (177-187='c[0][0][0]'): CHC: Out of bounds access might happen here.
 // Info 1180: Contract invariant(s) for :C:\n!(c.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
index 689fc045d..de0b31508 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
@@ -17,10 +17,10 @@ contract C
 // SMTEngine: all
 // SMTShowUnproved: yes
 // ----
-// Warning 6368: (124-131): CHC: Out of bounds access might happen here.
-// Warning 6368: (124-134): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-159): CHC: Out of bounds access might happen here.
-// Warning 6368: (152-162): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-184): CHC: Out of bounds access might happen here.
-// Warning 6368: (177-187): CHC: Out of bounds access might happen here.
+// Warning 6368: (124-131='c[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (124-134='c[0][0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (152-159='c[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (152-162='c[0][0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (177-184='c[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (177-187='c[0][0][0]'): CHC: Out of bounds access might happen here.
 // Info 1180: Contract invariant(s) for :C:\n!(c.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol
index 8c243d4ae..b7c67c4bd 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol
@@ -12,4 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (172-194): CHC: Assertion violation happens here.\nCounterexample:\narray = [200]\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.p()\nState: array = [0]\nC.f(0, 0)
+// Warning 6328: (172-194='assert(array[y] > 300)'): CHC: Assertion violation happens here.\nCounterexample:\narray = [200]\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.p()\nState: array = [0]\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol
index de8cc2066..8dc647c79 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol
@@ -10,5 +10,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (98-106): CHC: Out of bounds access happens here.\nCounterexample:\narray = []\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.f(0, 0, 0, 0)
-// Warning 6368: (98-109): CHC: Out of bounds access happens here.\nCounterexample:\narray = []\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.f(0, 0, 0, 0)
+// Warning 6368: (98-106='array[x]'): CHC: Out of bounds access happens here.\nCounterexample:\narray = []\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.f(0, 0, 0, 0)
+// Warning 6368: (98-109='array[x][y]'): CHC: Out of bounds access happens here.\nCounterexample:\narray = []\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.f(0, 0, 0, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
index 8de55bc9b..34ece3d38 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
@@ -15,4 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (245-270): CHC: Assertion violation happens here.\nCounterexample:\narray = [[200]]\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.a()\nState: array = [[0]]\nC.f(0, 0, 0, 0)
+// Warning 6328: (245-270='assert(array[z][t] > 300)'): CHC: Assertion violation happens here.\nCounterexample:\narray = [[200]]\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.a()\nState: array = [[0]]\nC.f(0, 0, 0, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
index 53ac92a7c..03c898582 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
@@ -16,4 +16,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (318-346): CHC: Assertion violation happens here.\nCounterexample:\narray = [[[200]]]\nx = 0\ny = 0\nz = 0\nt = 0\nw = 0\nv = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.p()\nState: array = [[[0]]]\nC.f(0, 0, 0, 0, 0, 0)
+// Warning 6328: (318-346='assert(array[t][w][v] > 300)'): CHC: Assertion violation happens here.\nCounterexample:\narray = [[[200]]]\nx = 0\ny = 0\nz = 0\nt = 0\nw = 0\nv = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.p()\nState: array = [[[0]]]\nC.f(0, 0, 0, 0, 0, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol
index 6ca6fc67a..26ad435fb 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol
@@ -11,4 +11,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (144-166): CHC: Assertion violation happens here.
+// Warning 6328: (144-166='assert(array[y] > 300)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_2.sol b/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
index 0062594d8..62f7b0e87 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
@@ -11,4 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (167-187): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (167-187='assert(a[2] == b[2])'): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4]\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_3.sol b/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
index 3152f0e1e..eb03a6587 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
@@ -10,4 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (168-188): CHC: Assertion violation happens here.
+// Warning 6328: (168-188='assert(a[2] == b[2])'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_5.sol b/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
index f152e2cb1..7d65739dc 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
@@ -13,4 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (176-196): CHC: Assertion violation happens here.\nCounterexample:\ns = [1, 2, 3]\na = [1, 2, 3]\n\nTransaction trace:\nC.constructor()\nState: s = []\nC.f()
+// Warning 6328: (176-196='assert(s[2] != a[2])'): CHC: Assertion violation happens here.\nCounterexample:\ns = [1, 2, 3]\na = [1, 2, 3]\n\nTransaction trace:\nC.constructor()\nState: s = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_6.sol b/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
index 0ce378e42..3d103c03c 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
@@ -14,5 +14,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (146-174): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4, 3]\nc = [1, 2, 4, 3]\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (235-255): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4, 3]\nc = [1, 2, 4, 3]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (146-174='assert(a.length == c.length)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4, 3]\nc = [1, 2, 4, 3]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (235-255='assert(a[2] == c[2])'): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4, 3]\nc = [1, 2, 4, 3]\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_7.sol b/test/libsolidity/smtCheckerTests/types/array_literal_7.sol
index 6a0c13e92..aa6085667 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_7.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_7.sol
@@ -20,5 +20,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (226-254): CHC: Assertion violation happens here.
-// Warning 6328: (315-335): CHC: Assertion violation happens here.
+// Warning 6328: (226-254='assert(s.length == c.length)'): CHC: Assertion violation happens here.
+// Warning 6328: (315-335='assert(s[2] == c[2])'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol
index 65f629cb2..0a0f1cc55 100644
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol
@@ -36,5 +36,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6368: (706-720): CHC: Out of bounds access happens here.
-// Warning 6328: (699-730): CHC: Assertion violation happens here.
+// Warning 6368: (706-720='severalMaps[0]'): CHC: Out of bounds access happens here.
+// Warning 6328: (699-730='assert(severalMaps[0][0] == 42)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
index dd0d8e004..866a07fe3 100644
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
@@ -35,12 +35,12 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6368: (439-453): CHC: Out of bounds access happens here.
-// Warning 6368: (492-508): CHC: Out of bounds access happens here.
-// Warning 6368: (492-511): CHC: Out of bounds access happens here.
-// Warning 6368: (622-636): CHC: Out of bounds access happens here.
-// Warning 6368: (850-866): CHC: Out of bounds access happens here.
-// Warning 6368: (850-869): CHC: Out of bounds access happens here.
-// Warning 6328: (936-956): CHC: Assertion violation happens here.
-// Warning 6368: (1029-1043): CHC: Out of bounds access might happen here.
+// Warning 6368: (439-453='severalMaps[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (492-508='severalMaps3d[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (492-511='severalMaps3d[0][0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (622-636='severalMaps[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (850-866='severalMaps3d[0]'): CHC: Out of bounds access happens here.
+// Warning 6368: (850-869='severalMaps3d[0][0]'): CHC: Out of bounds access happens here.
+// Warning 6328: (936-956='assert(map[0] == 42)'): CHC: Assertion violation happens here.
+// Warning 6368: (1029-1043='severalMaps[x]'): CHC: Out of bounds access might happen here.
 // Info 1180: Contract invariant(s) for :C:\n!(severalMaps8.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol b/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol
index 616c19c21..0ab64862a 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol
@@ -11,4 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (135-157): CHC: Assertion violation happens here.\nCounterexample:\narray = [200, 0, 0, 0, 0, 0, 0, 0, 0, 0]\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]\nC.f(0, 0)
+// Warning 6328: (135-157='assert(array[y] > 300)'): CHC: Assertion violation happens here.\nCounterexample:\narray = [200, 0, 0, 0, 0, 0, 0, 0, 0, 0]\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol b/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol
index c48f45e11..6b958e3b8 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol
@@ -12,4 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (214-239): CHC: Assertion violation happens here.\nCounterexample:\narray = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]\nC.f(0, 0, 0, 0)
+// Warning 6328: (214-239='assert(array[z][t] > 300)'): CHC: Assertion violation happens here.\nCounterexample:\narray = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]\nC.f(0, 0, 0, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol b/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol
index c7773a9b4..cd668a6f5 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol
@@ -13,4 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (268-296): CHC: Assertion violation happens here.\nCounterexample:\narray = [[[200, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]]\nx = 0\ny = 0\nz = 0\nt = 0\nw = 0\nv = 0\n\nTransaction trace:\nC.constructor()\nState: array = [[[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]]\nC.f(0, 0, 0, 0, 0, 0)
+// Warning 6328: (268-296='assert(array[t][w][v] > 300)'): CHC: Assertion violation happens here.\nCounterexample:\narray = [[[200, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]]\nx = 0\ny = 0\nz = 0\nt = 0\nw = 0\nv = 0\n\nTransaction trace:\nC.constructor()\nState: array = [[[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]]\nC.f(0, 0, 0, 0, 0, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol b/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
index eb7ae6a35..00a9d6c79 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
@@ -16,4 +16,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (385-402): CHC: Assertion violation happens here.
+// Warning 6328: (385-402='assert(a[0] == 2)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
index f415cfd95..2c7afe25d 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
@@ -27,5 +27,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (456-487): CHC: Assertion violation happens here.
+// Warning 6328: (456-487='assert(severalMaps[0][0] == 42)'): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n!(severalMaps3d.length <= 1)\n!(severalMaps8.length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
index f9aa3a650..812f3c23f 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
@@ -30,7 +30,7 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (860-880): CHC: Assertion violation happens here.
-// Warning 6368: (936-952): CHC: Out of bounds access might happen here.
-// Warning 6368: (936-955): CHC: Out of bounds access might happen here.
+// Warning 6328: (860-880='assert(map[0] == 42)'): CHC: Assertion violation happens here.
+// Warning 6368: (936-952='severalMaps3d[x]'): CHC: Out of bounds access might happen here.
+// Warning 6368: (936-955='severalMaps3d[x][0]'): CHC: Out of bounds access might happen here.
 // Info 1180: Contract invariant(s) for :C:\n!(severalMaps8.length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_struct_array_branches_2d.sol b/test/libsolidity/smtCheckerTests/types/array_struct_array_branches_2d.sol
index cc82aa924..362232a4b 100644
--- a/test/libsolidity/smtCheckerTests/types/array_struct_array_branches_2d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_struct_array_branches_2d.sol
@@ -19,5 +19,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (51-57): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2072: (75-87): Unused local variable.
+// Warning 5667: (51-57='bool b'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 2072: (75-87='S[] memory c'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol
index 52b05f3bd..fb3ecd355 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (58-67): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\n\nTransaction trace:\nC.constructor()\nC.f(false)
+// Warning 6328: (58-67='assert(x)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\n\nTransaction trace:\nC.constructor()\nC.f(false)
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
index ce35a6505..2f3f185d5 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (66-80): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\ny = true\n\nTransaction trace:\nC.constructor()\nC.f(false, true)
+// Warning 6328: (66-80='assert(x == y)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\ny = true\n\nTransaction trace:\nC.constructor()\nC.f(false, true)
diff --git a/test/libsolidity/smtCheckerTests/types/bytes_1.sol b/test/libsolidity/smtCheckerTests/types/bytes_1.sol
index 9dadcca14..358faaa5b 100644
--- a/test/libsolidity/smtCheckerTests/types/bytes_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/bytes_1.sol
@@ -8,4 +8,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 2072: (80-94): Unused local variable.
+// Warning 2072: (80-94='bytes memory c'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/types/bytes_2.sol b/test/libsolidity/smtCheckerTests/types/bytes_2.sol
index a0ab43bbf..6e4b1b4af 100644
--- a/test/libsolidity/smtCheckerTests/types/bytes_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/bytes_2.sol
@@ -12,4 +12,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (237-259): CHC: Assertion violation happens here.
+// Warning 6328: (237-259='assert(b1[1] == b2[1])'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol b/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol
index 6acec4bef..78ead71a4 100644
--- a/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol
@@ -10,4 +10,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (129-151): CHC: Assertion violation happens here.
+// Warning 6328: (129-151='assert(b1[1] == b2[2])'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/contract.sol b/test/libsolidity/smtCheckerTests/types/contract.sol
index 0ddc3e650..dbd7d4bec 100644
--- a/test/libsolidity/smtCheckerTests/types/contract.sol
+++ b/test/libsolidity/smtCheckerTests/types/contract.sol
@@ -8,4 +8,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (51-65): CHC: Assertion violation happens here.
+// Warning 6328: (51-65='assert(c == d)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/contract_2.sol b/test/libsolidity/smtCheckerTests/types/contract_2.sol
index 2357852d5..4ed7fc5a5 100644
--- a/test/libsolidity/smtCheckerTests/types/contract_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/contract_2.sol
@@ -13,4 +13,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (76-90): CHC: Assertion violation happens here.
+// Warning 6328: (76-90='assert(c == d)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/contract_address_conversion.sol b/test/libsolidity/smtCheckerTests/types/contract_address_conversion.sol
index a0148e876..af519dc89 100644
--- a/test/libsolidity/smtCheckerTests/types/contract_address_conversion.sol
+++ b/test/libsolidity/smtCheckerTests/types/contract_address_conversion.sol
@@ -8,4 +8,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (57-80): CHC: Assertion violation happens here.
+// Warning 6328: (57-80='assert(address(c) == a)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/enum_explicit_values_2.sol b/test/libsolidity/smtCheckerTests/types/enum_explicit_values_2.sol
index 23a9d20d1..e2528862d 100644
--- a/test/libsolidity/smtCheckerTests/types/enum_explicit_values_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/enum_explicit_values_2.sol
@@ -11,4 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (111-126): CHC: Assertion violation happens here.\nCounterexample:\nd = 0\n_a = 0\n\nTransaction trace:\nC.constructor()\nState: d = 0\nC.f(0)
+// Warning 6328: (111-126='assert(d != _a)'): CHC: Assertion violation happens here.\nCounterexample:\nd = 0\n_a = 0\n\nTransaction trace:\nC.constructor()\nState: d = 0\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/types/enum_in_library_2.sol b/test/libsolidity/smtCheckerTests/types/enum_in_library_2.sol
index ef3f42091..9c94edece 100644
--- a/test/libsolidity/smtCheckerTests/types/enum_in_library_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/enum_in_library_2.sol
@@ -14,4 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (126-146): CHC: Assertion violation happens here.\nCounterexample:\n\n_d = 1\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (126-146='assert(_d == E.Left)'): CHC: Assertion violation happens here.\nCounterexample:\n\n_d = 1\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/types/enum_storage_eq.sol b/test/libsolidity/smtCheckerTests/types/enum_storage_eq.sol
index 9a1ab6d32..f4b8ec5af 100644
--- a/test/libsolidity/smtCheckerTests/types/enum_storage_eq.sol
+++ b/test/libsolidity/smtCheckerTests/types/enum_storage_eq.sol
@@ -10,4 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (82-97): CHC: Assertion violation happens here.\nCounterexample:\nd = 0\n_d = 0\n\nTransaction trace:\nC.constructor()\nState: d = 0\nC.f(0)
+// Warning 6328: (82-97='assert(d != _d)'): CHC: Assertion violation happens here.\nCounterexample:\nd = 0\n_d = 0\n\nTransaction trace:\nC.constructor()\nState: d = 0\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_1.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_1.sol
index 3fc25a3c3..f6d1c90fe 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_1.sol
@@ -13,5 +13,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (63-77): CHC: Assertion violation happens here.
-// Warning 6328: (81-97): CHC: Assertion violation happens here.
+// Warning 6328: (63-77='assert(x != y)'): CHC: Assertion violation happens here.
+// Warning 6328: (81-97='assert(x != g())'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol
index 187689b88..9a207802a 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol
@@ -12,4 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (83-97): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0\ny = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0\nC.f(0x0)\n    C.g() -- internal call
+// Warning 6328: (83-97='assert(x != y)'): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0\ny = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0\nC.f(0x0)\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol
index 689db06c7..f91ed4c63 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol
@@ -10,4 +10,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 5667: (43-49): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (43-49='uint y'): Unused function parameter. Remove or comment out the variable name to silence this warning.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol
index ae3bbf9ce..5f3b5dc22 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol
@@ -12,4 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (231-252): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff\nz = 0x0\no = 0xff\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (231-252='assert(x[0] == x[23])'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff\nz = 0x0\no = 0xff\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol
index cb3cd1e0f..7f31eadc6 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol
@@ -11,6 +11,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (87-104): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0x01020304\nb = 0x02\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (138-155): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0x01020304\nb = 0x02\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (168-185): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0x01020304\nb = 0x02\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (87-104='assert(x[0] == b)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0x01020304\nb = 0x02\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (138-155='assert(x[2] == b)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0x01020304\nb = 0x02\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (168-185='assert(x[3] == b)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0x01020304\nb = 0x02\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_7.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_7.sol
index b97ffbe24..5a6cb2ded 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_7.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_7.sol
@@ -8,5 +8,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (99-103): CHC: Out of bounds access happens here.\nCounterexample:\n\ni = 4\nx = 0x01020304\n\nTransaction trace:\nC.constructor()\nC.f(4)
-// Warning 6328: (92-112): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 4\nx = 0x01020304\n\nTransaction trace:\nC.constructor()\nC.f(4)
+// Warning 6368: (99-103='x[i]'): CHC: Out of bounds access happens here.\nCounterexample:\n\ni = 4\nx = 0x01020304\n\nTransaction trace:\nC.constructor()\nC.f(4)
+// Warning 6328: (92-112='assert(x[i] == 0x00)'): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 4\nx = 0x01020304\n\nTransaction trace:\nC.constructor()\nC.f(4)
diff --git a/test/libsolidity/smtCheckerTests/types/function_in_tuple_1.sol b/test/libsolidity/smtCheckerTests/types/function_in_tuple_1.sol
index 053ac9c6a..27c2ff15b 100644
--- a/test/libsolidity/smtCheckerTests/types/function_in_tuple_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/function_in_tuple_1.sol
@@ -6,4 +6,4 @@ contract K {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (43-58): Statement has no effect.
+// Warning 6133: (43-58='(abi.encode, 2)'): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/types/function_in_tuple_2.sol b/test/libsolidity/smtCheckerTests/types/function_in_tuple_2.sol
index df15f1e5d..f505dfc81 100644
--- a/test/libsolidity/smtCheckerTests/types/function_in_tuple_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/function_in_tuple_2.sol
@@ -6,4 +6,4 @@ contract K {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (43-59): Statement has no effect.
+// Warning 6133: (43-59='(abi.encode, "")'): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_call.sol b/test/libsolidity/smtCheckerTests/types/function_type_call.sol
index 2d0bd0757..e935a05b3 100644
--- a/test/libsolidity/smtCheckerTests/types/function_type_call.sol
+++ b/test/libsolidity/smtCheckerTests/types/function_type_call.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5729: (89-93): BMC does not yet implement this type of function call.
+// Warning 5729: (89-93='g(2)'): BMC does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_external_address.sol b/test/libsolidity/smtCheckerTests/types/function_type_external_address.sol
index b48e53826..8b43ee81a 100644
--- a/test/libsolidity/smtCheckerTests/types/function_type_external_address.sol
+++ b/test/libsolidity/smtCheckerTests/types/function_type_external_address.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 7650: (96-105): Assertion checker does not yet support this expression.
+// Warning 7650: (96-105='g.address'): Assertion checker does not yet support this expression.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_members.sol b/test/libsolidity/smtCheckerTests/types/function_type_members.sol
index 16a57b852..4da76952e 100644
--- a/test/libsolidity/smtCheckerTests/types/function_type_members.sol
+++ b/test/libsolidity/smtCheckerTests/types/function_type_members.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 7650: (76-86): Assertion checker does not yet support this expression.
+// Warning 7650: (76-86='g.selector'): Assertion checker does not yet support this expression.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_nested.sol b/test/libsolidity/smtCheckerTests/types/function_type_nested.sol
index 00eaf74f7..4c62bf1c2 100644
--- a/test/libsolidity/smtCheckerTests/types/function_type_nested.sol
+++ b/test/libsolidity/smtCheckerTests/types/function_type_nested.sol
@@ -14,8 +14,8 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 8115: (120-165): Assertion checker does not yet support the type of this variable.
-// Warning 8364: (180-182): Assertion checker does not yet implement type function (function (uint256))
-// Warning 6031: (223-225): Internal error: Expression undefined for SMT solver.
-// Warning 8364: (223-225): Assertion checker does not yet implement type function (function (uint256))
-// Warning 5729: (91-96): BMC does not yet implement this type of function call.
-// Warning 5729: (180-187): BMC does not yet implement this type of function call.
+// Warning 8364: (180-182='g2'): Assertion checker does not yet implement type function (function (uint256))
+// Warning 6031: (223-225='f1'): Internal error: Expression undefined for SMT solver.
+// Warning 8364: (223-225='f1'): Assertion checker does not yet implement type function (function (uint256))
+// Warning 5729: (91-96='g1(2)'): BMC does not yet implement this type of function call.
+// Warning 5729: (180-187='g2(m_g)'): BMC does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_nested_return.sol b/test/libsolidity/smtCheckerTests/types/function_type_nested_return.sol
index 66564e618..54dca9be1 100644
--- a/test/libsolidity/smtCheckerTests/types/function_type_nested_return.sol
+++ b/test/libsolidity/smtCheckerTests/types/function_type_nested_return.sol
@@ -17,9 +17,9 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 8115: (192-237): Assertion checker does not yet support the type of this variable.
-// Warning 8364: (252-254): Assertion checker does not yet implement type function (function (uint256))
-// Warning 1695: (255-256): Assertion checker does not yet support this global variable.
-// Warning 6031: (295-297): Internal error: Expression undefined for SMT solver.
-// Warning 8364: (295-297): Assertion checker does not yet implement type function (function (uint256))
-// Warning 5729: (163-168): BMC does not yet implement this type of function call.
-// Warning 5729: (252-259): BMC does not yet implement this type of function call.
+// Warning 8364: (252-254='g2'): Assertion checker does not yet implement type function (function (uint256))
+// Warning 1695: (255-256='r'): Assertion checker does not yet support this global variable.
+// Warning 6031: (295-297='f1'): Internal error: Expression undefined for SMT solver.
+// Warning 8364: (295-297='f1'): Assertion checker does not yet implement type function (function (uint256))
+// Warning 5729: (163-168='g1(2)'): BMC does not yet implement this type of function call.
+// Warning 5729: (252-259='g2(r())'): BMC does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol b/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol
index d72f62be9..3ae7c75d3 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol
@@ -10,4 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (101-120): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\n\nTransaction trace:\nC.constructor()\nC.f(3)
+// Warning 6328: (101-120='assert(x != map[2])'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\n\nTransaction trace:\nC.constructor()\nC.f(3)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_2.sol b/test/libsolidity/smtCheckerTests/types/mapping_2.sol
index 81a36e550..df63e0d8b 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_2.sol
@@ -8,4 +8,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (78-97): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\n\nTransaction trace:\nC.constructor()\nC.f(false)
+// Warning 6328: (78-97='assert(x != map[2])'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\n\nTransaction trace:\nC.constructor()\nC.f(false)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_2d_1_fail.sol b/test/libsolidity/smtCheckerTests/types/mapping_2d_1_fail.sol
index 57178c417..512587a48 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_2d_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_2d_1_fail.sol
@@ -10,4 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (121-145): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 41\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (121-145='assert(x == map[13][14])'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 41\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_3d_1_fail.sol b/test/libsolidity/smtCheckerTests/types/mapping_3d_1_fail.sol
index 9bcbc133b..435eebedf 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_3d_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_3d_1_fail.sol
@@ -10,4 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (143-171): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 41\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (143-171='assert(x == map[13][14][15])'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 41\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_5.sol b/test/libsolidity/smtCheckerTests/types/mapping_5.sol
index 632191a67..067aaa64d 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_5.sol
@@ -8,4 +8,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (92-111): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0x0, 0)
+// Warning 6328: (92-111='assert(x != map[a])'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0x0, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol
index 36c6f843e..5052d9d80 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol
@@ -17,4 +17,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (233-253): CHC: Assertion violation happens here.
+// Warning 6328: (233-253='assert(a[1] == b[1])'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol
index 79c03a7d5..dc837ebc6 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol
@@ -32,5 +32,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (364-384): CHC: Assertion violation happens here.
-// Warning 6328: (430-448): CHC: Assertion violation happens here.
+// Warning 6328: (364-384='assert(map1[0] == 2)'): CHC: Assertion violation happens here.
+// Warning 6328: (430-448='assert(a[0] == 42)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_as_parameter_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_as_parameter_1.sol
index 670b08354..96f52395e 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_as_parameter_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_as_parameter_1.sol
@@ -13,4 +13,4 @@ contract c {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (256-273): CHC: Assertion violation happens here.
+// Warning 6328: (256-273='assert(x[a] == b)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
index 3b8a8846e..53fe23462 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
@@ -10,4 +10,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (86-100): CHC: Assertion violation happens here.
+// Warning 6328: (86-100='assert(x == y)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_struct_assignment.sol b/test/libsolidity/smtCheckerTests/types/mapping_struct_assignment.sol
index 88c07f183..80e8afb74 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_struct_assignment.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_struct_assignment.sol
@@ -12,4 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (108-112): BMC: Condition is always false.
+// Warning 6838: (108-112='0==1'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/types/no_effect_statements.sol b/test/libsolidity/smtCheckerTests/types/no_effect_statements.sol
index 56864e315..3d8702116 100644
--- a/test/libsolidity/smtCheckerTests/types/no_effect_statements.sol
+++ b/test/libsolidity/smtCheckerTests/types/no_effect_statements.sol
@@ -11,11 +11,11 @@ contract test {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (86-92): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6133: (98-99): Statement has no effect.
-// Warning 6133: (103-109): Statement has no effect.
-// Warning 6133: (113-117): Statement has no effect.
-// Warning 6133: (121-125): Statement has no effect.
-// Warning 6133: (129-136): Statement has no effect.
-// Warning 8364: (113-117): Assertion checker does not yet implement type type(struct test.s memory[7] memory)
-// Warning 8364: (129-136): Assertion checker does not yet implement type type(uint256[7] memory)
+// Warning 6321: (86-92='bytes1'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6133: (98-99='s'): Statement has no effect.
+// Warning 6133: (103-109='s(1,2)'): Statement has no effect.
+// Warning 6133: (113-117='s[7]'): Statement has no effect.
+// Warning 6133: (121-125='uint'): Statement has no effect.
+// Warning 6133: (129-136='uint[7]'): Statement has no effect.
+// Warning 8364: (113-117='s[7]'): Assertion checker does not yet implement type type(struct test.s memory[7] memory)
+// Warning 8364: (129-136='uint[7]'): Assertion checker does not yet implement type type(uint256[7] memory)
diff --git a/test/libsolidity/smtCheckerTests/types/rational_large_1.sol b/test/libsolidity/smtCheckerTests/types/rational_large_1.sol
index a7d969185..94998250a 100644
--- a/test/libsolidity/smtCheckerTests/types/rational_large_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/rational_large_1.sol
@@ -8,5 +8,5 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (48-52): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (96-110): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\nx = 8\n\nTransaction trace:\nc.constructor()\nc.f()
+// Warning 6321: (48-52='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6328: (96-110='assert(x != 8)'): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\nx = 8\n\nTransaction trace:\nc.constructor()\nc.f()
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
index 61d18c417..8dc22d4be 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
@@ -9,5 +9,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (102-122): CHC: Assertion violation happens here.
-// Warning 6328: (141-161): CHC: Assertion violation happens here.
+// Warning 6328: (102-122='assert(a.length < 2)'): CHC: Assertion violation happens here.
+// Warning 6328: (141-161='assert(a.length > 2)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol
index f1128583b..986f973b7 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol
@@ -8,5 +8,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (113-133): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (152-172): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (113-133='assert(a.length < 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (152-172='assert(a.length > 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol
index 691c25843..084b3e7d3 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol
@@ -9,5 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (106-126): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (145-165): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (106-126='assert(a.length < 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (145-165='assert(a.length > 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol
index 13efd8bb9..91eef993e 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol
@@ -17,7 +17,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (132-152): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 2\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (171-191): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 2\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (298-318): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 0\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (337-357): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (132-152='assert(a.length < 2)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 2\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (171-191='assert(a.length > 2)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 2\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (298-318='assert(a.length < 2)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (337-357='assert(a.length > 2)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 0\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
index e3ab2189c..ed4765d66 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
@@ -9,6 +9,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (95-115): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.f()
-// Warning 6328: (134-154): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.f()
+// Warning 6328: (95-115='assert(a.length < 2)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.f()
+// Warning 6328: (134-154='assert(a.length > 2)'): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.f()
 // Info 1180: Contract invariant(s) for :C:\n(!(a.length <= 1) && !(a.length >= 3))\n
diff --git a/test/libsolidity/smtCheckerTests/types/storage_value_vars_2.sol b/test/libsolidity/smtCheckerTests/types/storage_value_vars_2.sol
index 6bda2d66b..638a4d4f1 100644
--- a/test/libsolidity/smtCheckerTests/types/storage_value_vars_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/storage_value_vars_2.sol
@@ -10,4 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (91-104): CHC: Assertion violation happens here.\nCounterexample:\na = 0x0, b = false, c = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0x0, b = false, c = 0\nC.f()
+// Warning 6328: (91-104='assert(c > 0)'): CHC: Assertion violation happens here.\nCounterexample:\na = 0x0, b = false, c = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0x0, b = false, c = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/storage_value_vars_4.sol b/test/libsolidity/smtCheckerTests/types/storage_value_vars_4.sol
index 2f3c977b4..f7f9e12cd 100644
--- a/test/libsolidity/smtCheckerTests/types/storage_value_vars_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/storage_value_vars_4.sol
@@ -8,4 +8,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (52-65): CHC: Assertion violation happens here.\nCounterexample:\nc = 0\n\nTransaction trace:\nC.constructor()\nState: c = 0\nC.f()
+// Warning 6328: (52-65='assert(c > 0)'): CHC: Assertion violation happens here.\nCounterexample:\nc = 0\n\nTransaction trace:\nC.constructor()\nState: c = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/string_2.sol b/test/libsolidity/smtCheckerTests/types/string_2.sol
index 633a0bcf0..c1d5114ea 100644
--- a/test/libsolidity/smtCheckerTests/types/string_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_2.sol
@@ -7,4 +7,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 2072: (43-58): Unused local variable.
+// Warning 2072: (43-58='string memory s'): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol
index c568b2267..00e65e644 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (142-157): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
+// Warning 6328: (142-157='assert(_x == z)'): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol
index fc68b7958..95c31300d 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (143-158): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
+// Warning 6328: (143-158='assert(_x == z)'): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol
index 7219e15bd..74562aee4 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (153-168): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
+// Warning 6328: (153-168='assert(_x == z)'): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol
index 954aee7f4..dedf3d4d3 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol
@@ -15,4 +15,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (228-243): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)\n    C.g() -- internal call
+// Warning 6328: (228-243='assert(_x == z)'): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol
index 71e331122..800995780 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol
@@ -13,4 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (218-233): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)\n    C.g() -- internal call
+// Warning 6328: (218-233='assert(_x == z)'): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol b/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol
index 3c5742e65..30a771769 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (137-157): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x7465737400000000000000000000000000000000000000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
+// Warning 6328: (137-157='assert(y == "testx")'): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x7465737400000000000000000000000000000000000000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_comparison_2.sol b/test/libsolidity/smtCheckerTests/types/string_literal_comparison_2.sol
index 81f513bd5..d5e0d7f75 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_comparison_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_comparison_2.sol
@@ -11,5 +11,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (114-133): CHC: Assertion violation happens here.
-// Warning 6328: (137-157): CHC: Assertion violation happens here.
+// Warning 6328: (114-133='assert(z == "test")'): CHC: Assertion violation happens here.
+// Warning 6328: (137-157='assert(y != "testx")'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol
index a6ec06ba1..68d648452 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol
@@ -34,4 +34,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (151-162): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (151-162='S memory s2'): Unused function parameter. Remove or comment out the variable name to silence this warning.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol
index c596fcdf0..c0c73bbb3 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol
@@ -20,6 +20,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (176-196): CHC: Assertion violation happens here.
-// Warning 6328: (200-220): CHC: Assertion violation happens here.
+// Warning 6328: (176-196='assert(s3.x == s1.x)'): CHC: Assertion violation happens here.
+// Warning 6328: (200-220='assert(s3.x == s2.x)'): CHC: Assertion violation happens here.
 // Warning 6328: (370-406): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol
index edb1e1b40..558ea2a90 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol
@@ -18,4 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (201-224): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\ns = {sum: 0, a: []}\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (201-224='assert(s.a.length == 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\ns = {sum: 0, a: []}\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol
index 28da83700..86c3c51ca 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol
@@ -23,4 +23,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (236-261): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\nt = {s: {sum: 0, a: []}, x: 0}\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (236-261='assert(t.s.a.length == 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\nt = {s: {sum: 0, a: []}, x: 0}\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol
index 36890f03e..6fbc9cf11 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol
@@ -23,4 +23,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (238-263): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\nt = {s: {sum: 0, a: []}, x: 0}\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (238-263='assert(t.s.a.length == 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\nt = {s: {sum: 0, a: []}, x: 0}\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
index 3fd0c0d87..837a92882 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
@@ -21,4 +21,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (270-288): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 21239}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 21239}\nC.g()
+// Warning 6328: (270-288='assert(s.sum == 0)'): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 21239}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 21239}\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
index fcf30555e..136991972 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
@@ -26,4 +26,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (307-327): CHC: Assertion violation happens here.\nCounterexample:\nt = {x: 11, s: {innerM, sum: 21239}}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: t = {x: 11, s: {innerM, sum: 21239}}\nC.g()
+// Warning 6328: (307-327='assert(t.s.sum == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nt = {x: 11, s: {innerM, sum: 21239}}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: t = {x: 11, s: {innerM, sum: 21239}}\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
index 618b1172d..16680f201 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
@@ -27,4 +27,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (305-325): CHC: Assertion violation happens here.
+// Warning 6328: (305-325='assert(t.s.sum == 0)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol
index 6721630a5..9a0e42dd5 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol
@@ -31,8 +31,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (196-213): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 0, a: []}, a: [], ts: []}\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (231-250): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [], ts: []}\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (293-313): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [0, 0, 4], ts: []}\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (357-380): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [0, 0, 4], ts: [{y: 0, a: []}, {y: 0, a: []}, {y: 0, a: []}, {y: 5, a: []}, {y: 0, a: []}, {y: 0, a: []}]}\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (435-461): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [0, 0, 4], ts: [{y: 0, a: []}, {y: 0, a: []}, {y: 0, a: []}, {y: 5, a: []}, {y: 0, a: [0, 0, 0, 0, 0, 6]}, {y: 0, a: []}]}\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (196-213='assert(s1.x != 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 0, a: []}, a: [], ts: []}\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (231-250='assert(s1.t.y != 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [], ts: []}\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (293-313='assert(s1.a[2] != 4)'): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [0, 0, 4], ts: []}\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (357-380='assert(s1.ts[3].y != 5)'): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [0, 0, 4], ts: [{y: 0, a: []}, {y: 0, a: []}, {y: 0, a: []}, {y: 5, a: []}, {y: 0, a: []}, {y: 0, a: []}]}\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (435-461='assert(s1.ts[4].a[5] != 6)'): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [0, 0, 4], ts: [{y: 0, a: []}, {y: 0, a: []}, {y: 0, a: []}, {y: 5, a: []}, {y: 0, a: [0, 0, 0, 0, 0, 6]}, {y: 0, a: []}]}\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol
index 662b4f1d2..2b95ca27d 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol
@@ -42,8 +42,8 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (148-165): CHC: Assertion violation happens here.
-// Warning 6328: (183-202): CHC: Assertion violation happens here.
-// Warning 6328: (266-286): CHC: Assertion violation happens here.
-// Warning 6328: (404-427): CHC: Assertion violation happens here.
-// Warning 6328: (578-604): CHC: Assertion violation happens here.
+// Warning 6328: (148-165='assert(s1.x != 2)'): CHC: Assertion violation happens here.
+// Warning 6328: (183-202='assert(s1.t.y != 3)'): CHC: Assertion violation happens here.
+// Warning 6328: (266-286='assert(s1.a[2] != 4)'): CHC: Assertion violation happens here.
+// Warning 6328: (404-427='assert(s1.ts[3].y != 5)'): CHC: Assertion violation happens here.
+// Warning 6328: (578-604='assert(s1.ts[4].a[5] != 6)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol
index ec895cdd9..dd87a45f9 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol
@@ -10,5 +10,5 @@ contract C {
   }
 }
 // ----
-// Warning 5523: (0-31): The SMTChecker pragma has been deprecated and will be removed in the future. Please use the "model checker engine" compiler setting to activate the SMTChecker instead. If the pragma is enabled, all engines will be used.
-// Warning 6328: (178-207): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 5523: (0-31='pragma experimental SMTChecker;'): The SMTChecker pragma has been deprecated and will be removed in the future. Please use the "model checker engine" compiler setting to activate the SMTChecker instead. If the pragma is enabled, all engines will be used.
+// Warning 6328: (178-207='assert(S({a:2, b:""}).a == 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
index 91bd56fc9..b3d79f5ea 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (232-255): CHC: Assertion violation happens here.\nCounterexample:\n\ninner = {x: 43}\nouter = {s: {x: 43}, y: 512}\n\nTransaction trace:\nC.constructor()\nC.test()
+// Warning 6328: (232-255='assert(outer.s.x == 42)'): CHC: Assertion violation happens here.\nCounterexample:\n\ninner = {x: 43}\nouter = {s: {x: 43}, y: 512}\n\nTransaction trace:\nC.constructor()\nC.test()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_1.sol
index 71e29bd9e..bcddaf6f8 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_1.sol
@@ -9,5 +9,5 @@ contract Test {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2072: (104-133): Unused local variable.
+// Warning 2072: (104-133='RecursiveStruct[1] memory val'): Unused local variable.
 // Warning 8364: (138-180): Assertion checker does not yet implement type struct Test.RecursiveStruct memory
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_2.sol
index 1b6dc3236..c81ff2ecc 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_recursive_2.sol
@@ -11,8 +11,8 @@ contract Test {
 // ====
 // SMTEngine: all
 // ----
-// Warning 8115: (114-140): Assertion checker does not yet support the type of this variable.
+// Warning 8115: (114-140='RecursiveStruct memory val'): Assertion checker does not yet support the type of this variable.
 // Warning 8364: (143-188): Assertion checker does not yet implement type struct Test.RecursiveStruct memory
-// Warning 7650: (199-204): Assertion checker does not yet support this expression.
-// Warning 8364: (199-202): Assertion checker does not yet implement type struct Test.RecursiveStruct memory
-// Warning 6328: (192-210): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTest.constructor()\nTest.func()
+// Warning 7650: (199-204='val.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (199-202='val'): Assertion checker does not yet implement type struct Test.RecursiveStruct memory
+// Warning 6328: (192-210='assert(val.x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTest.constructor()\nTest.func()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol
index b19721725..ab6bf0306 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol
@@ -16,5 +16,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (152-172): CHC: Assertion violation happens here.
+// Warning 6328: (152-172='assert(s1.x == s2.x)'): CHC: Assertion violation happens here.
 // Warning 6328: (176-210): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol
index 5c00b306c..2a2a4eb59 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol
@@ -21,5 +21,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (208-228): CHC: Assertion violation happens here.
+// Warning 6328: (208-228='assert(s1.x == s2.x)'): CHC: Assertion violation happens here.
 // Warning 6328: (232-266): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol
index c3bb77400..8adfac501 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (219-242): CHC: Assertion violation happens here.\nCounterexample:\n\ninner = {x: 43}\nouter = {s: {x: 43}, y: 512}\n\nTransaction trace:\nC.constructor()\nC.test()
+// Warning 6328: (219-242='assert(outer.s.x == 42)'): CHC: Assertion violation happens here.\nCounterexample:\n\ninner = {x: 43}\nouter = {s: {x: 43}, y: 512}\n\nTransaction trace:\nC.constructor()\nC.test()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_1.sol
index 171eba091..55c153736 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_1.sol
@@ -13,15 +13,15 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 8115: (48-52): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (55-59): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (98-102): Assertion checker does not yet support this expression.
-// Warning 8364: (98-100): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (106-110): Assertion checker does not yet support this expression.
-// Warning 8364: (106-108): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (122-126): Assertion checker does not yet support this expression.
-// Warning 8364: (122-124): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (137-141): Assertion checker does not yet support this expression.
-// Warning 8364: (137-139): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 6328: (91-111): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 8115: (48-52='S s1'): Assertion checker does not yet support the type of this variable.
+// Warning 8115: (55-59='S s2'): Assertion checker does not yet support the type of this variable.
+// Warning 7650: (98-102='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (98-100='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (106-110='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (106-108='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (122-126='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (122-124='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (137-141='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (137-139='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 6328: (91-111='assert(s1.x == s2.x)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (115-149): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_2.sol
index f0d436c23..3168b8899 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_2.sol
@@ -22,52 +22,52 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 8115: (48-52): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (55-59): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (98-102): Assertion checker does not yet support this expression.
-// Warning 8364: (98-100): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (106-110): Assertion checker does not yet support this expression.
-// Warning 8364: (106-108): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (122-126): Assertion checker does not yet support this expression.
-// Warning 8364: (122-124): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (137-141): Assertion checker does not yet support this expression.
-// Warning 8364: (137-139): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (160-169): Assertion checker does not yet support this expression.
-// Warning 7650: (160-164): Assertion checker does not yet support this expression.
-// Warning 8364: (160-162): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (160-167): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (173-182): Assertion checker does not yet support this expression.
-// Warning 7650: (173-177): Assertion checker does not yet support this expression.
-// Warning 8364: (173-175): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (173-180): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (213-217): Assertion checker does not yet support this expression.
-// Warning 8364: (213-215): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (213-217): Assertion checker does not support recursive structs.
-// Warning 7650: (226-230): Assertion checker does not yet support this expression.
-// Warning 8364: (226-228): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (226-230): Assertion checker does not support recursive structs.
-// Warning 7650: (239-243): Assertion checker does not yet support this expression.
-// Warning 8364: (239-241): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (239-250): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (239-243): Assertion checker does not support recursive structs.
-// Warning 7650: (254-258): Assertion checker does not yet support this expression.
-// Warning 8364: (254-256): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (254-265): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (254-258): Assertion checker does not support recursive structs.
-// Warning 7650: (269-278): Assertion checker does not yet support this expression.
-// Warning 7650: (269-273): Assertion checker does not yet support this expression.
-// Warning 8364: (269-271): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (269-276): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (269-278): Assertion checker does not support recursive structs.
-// Warning 7650: (287-296): Assertion checker does not yet support this expression.
-// Warning 7650: (287-291): Assertion checker does not yet support this expression.
-// Warning 8364: (287-289): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (287-294): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (287-296): Assertion checker does not support recursive structs.
-// Warning 6328: (91-111): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 8115: (48-52='S s1'): Assertion checker does not yet support the type of this variable.
+// Warning 8115: (55-59='S s2'): Assertion checker does not yet support the type of this variable.
+// Warning 7650: (98-102='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (98-100='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (106-110='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (106-108='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (122-126='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (122-124='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (137-141='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (137-139='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (160-169='s1.a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (160-164='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (160-162='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (160-167='s1.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (173-182='s2.a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (173-177='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (173-175='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (173-180='s2.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (213-217='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (213-215='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (213-217='s1.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (226-230='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (226-228='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (226-230='s2.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (239-243='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (239-241='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (239-250='s1.a.push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (239-243='s1.a'): Assertion checker does not support recursive structs.
+// Warning 7650: (254-258='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (254-256='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (254-265='s2.a.push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (254-258='s2.a'): Assertion checker does not support recursive structs.
+// Warning 7650: (269-278='s1.a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (269-273='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (269-271='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (269-276='s1.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (269-278='s1.a[0].x'): Assertion checker does not support recursive structs.
+// Warning 7650: (287-296='s2.a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (287-291='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (287-289='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (287-294='s2.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (287-296='s2.a[0].x'): Assertion checker does not support recursive structs.
+// Warning 6328: (91-111='assert(s1.x == s2.x)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (115-149): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (160-167): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (173-180): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (153-183): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (269-276): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (287-294): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6368: (160-167='s1.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (173-180='s2.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (153-183='assert(s1.a[0].x == s2.a[0].x)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (269-276='s1.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6368: (287-294='s2.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_3.sol
index 64396abcb..a23073055 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_3.sol
@@ -35,109 +35,109 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 8115: (48-52): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (55-59): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (98-102): Assertion checker does not yet support this expression.
-// Warning 8364: (98-100): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (106-110): Assertion checker does not yet support this expression.
-// Warning 8364: (106-108): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (122-126): Assertion checker does not yet support this expression.
-// Warning 8364: (122-124): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (137-141): Assertion checker does not yet support this expression.
-// Warning 8364: (137-139): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (161-165): Assertion checker does not yet support this expression.
-// Warning 8364: (161-163): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (189-193): Assertion checker does not yet support this expression.
-// Warning 8364: (189-191): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (216-225): Assertion checker does not yet support this expression.
-// Warning 7650: (216-220): Assertion checker does not yet support this expression.
-// Warning 8364: (216-218): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (216-223): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (229-238): Assertion checker does not yet support this expression.
-// Warning 7650: (229-233): Assertion checker does not yet support this expression.
-// Warning 8364: (229-231): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (229-236): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (251-260): Assertion checker does not yet support this expression.
-// Warning 7650: (251-255): Assertion checker does not yet support this expression.
-// Warning 8364: (251-253): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (251-258): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (284-293): Assertion checker does not yet support this expression.
-// Warning 7650: (284-288): Assertion checker does not yet support this expression.
-// Warning 8364: (284-286): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (284-291): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (316-325): Assertion checker does not yet support this expression.
-// Warning 7650: (316-320): Assertion checker does not yet support this expression.
-// Warning 8364: (316-318): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (316-323): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (336-345): Assertion checker does not yet support this expression.
-// Warning 7650: (336-340): Assertion checker does not yet support this expression.
-// Warning 8364: (336-338): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (336-343): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (549-553): Assertion checker does not yet support this expression.
-// Warning 8364: (549-551): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (549-553): Assertion checker does not support recursive structs.
-// Warning 7650: (562-566): Assertion checker does not yet support this expression.
-// Warning 8364: (562-564): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (562-566): Assertion checker does not support recursive structs.
-// Warning 7650: (575-579): Assertion checker does not yet support this expression.
-// Warning 8364: (575-577): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (575-586): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (575-579): Assertion checker does not support recursive structs.
-// Warning 7650: (590-594): Assertion checker does not yet support this expression.
-// Warning 8364: (590-592): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (590-601): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (590-594): Assertion checker does not support recursive structs.
-// Warning 7650: (605-614): Assertion checker does not yet support this expression.
-// Warning 7650: (605-609): Assertion checker does not yet support this expression.
-// Warning 8364: (605-607): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (605-612): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (605-614): Assertion checker does not support recursive structs.
-// Warning 7650: (623-632): Assertion checker does not yet support this expression.
-// Warning 7650: (623-627): Assertion checker does not yet support this expression.
-// Warning 8364: (623-625): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (623-630): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (623-632): Assertion checker does not support recursive structs.
-// Warning 7650: (641-650): Assertion checker does not yet support this expression.
-// Warning 7650: (641-645): Assertion checker does not yet support this expression.
-// Warning 8364: (641-643): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (641-648): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (641-657): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (641-650): Assertion checker does not support recursive structs.
-// Warning 7650: (661-670): Assertion checker does not yet support this expression.
-// Warning 7650: (661-665): Assertion checker does not yet support this expression.
-// Warning 8364: (661-663): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (661-668): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (661-677): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (661-670): Assertion checker does not support recursive structs.
-// Warning 7650: (681-695): Assertion checker does not yet support this expression.
-// Warning 7650: (681-690): Assertion checker does not yet support this expression.
-// Warning 7650: (681-685): Assertion checker does not yet support this expression.
-// Warning 8364: (681-683): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (681-688): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (681-693): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (681-695): Assertion checker does not support recursive structs.
-// Warning 7650: (704-718): Assertion checker does not yet support this expression.
-// Warning 7650: (704-713): Assertion checker does not yet support this expression.
-// Warning 7650: (704-708): Assertion checker does not yet support this expression.
-// Warning 8364: (704-706): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (704-711): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (704-716): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (704-718): Assertion checker does not support recursive structs.
-// Warning 6328: (91-111): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 8115: (48-52='S s1'): Assertion checker does not yet support the type of this variable.
+// Warning 8115: (55-59='S s2'): Assertion checker does not yet support the type of this variable.
+// Warning 7650: (98-102='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (98-100='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (106-110='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (106-108='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (122-126='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (122-124='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (137-141='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (137-139='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (161-165='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (161-163='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (189-193='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (189-191='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (216-225='s1.a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (216-220='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (216-218='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (216-223='s1.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (229-238='s2.a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (229-233='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (229-231='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (229-236='s2.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (251-260='s1.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (251-255='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (251-253='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (251-258='s1.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (284-293='s2.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (284-288='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (284-286='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (284-291='s2.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (316-325='s1.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (316-320='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (316-318='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (316-323='s1.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (336-345='s2.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (336-340='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (336-338='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (336-343='s2.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (549-553='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (549-551='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (549-553='s1.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (562-566='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (562-564='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (562-566='s2.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (575-579='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (575-577='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (575-586='s1.a.push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (575-579='s1.a'): Assertion checker does not support recursive structs.
+// Warning 7650: (590-594='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (590-592='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (590-601='s2.a.push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (590-594='s2.a'): Assertion checker does not support recursive structs.
+// Warning 7650: (605-614='s1.a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (605-609='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (605-607='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (605-612='s1.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (605-614='s1.a[0].x'): Assertion checker does not support recursive structs.
+// Warning 7650: (623-632='s2.a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (623-627='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (623-625='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (623-630='s2.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (623-632='s2.a[0].x'): Assertion checker does not support recursive structs.
+// Warning 7650: (641-650='s1.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (641-645='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (641-643='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (641-648='s1.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (641-657='s1.a[0].a.push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (641-650='s1.a[0].a'): Assertion checker does not support recursive structs.
+// Warning 7650: (661-670='s2.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (661-665='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (661-663='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (661-668='s2.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (661-677='s2.a[0].a.push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (661-670='s2.a[0].a'): Assertion checker does not support recursive structs.
+// Warning 7650: (681-695='s1.a[0].a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (681-690='s1.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (681-685='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (681-683='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (681-688='s1.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (681-693='s1.a[0].a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (681-695='s1.a[0].a[0].x'): Assertion checker does not support recursive structs.
+// Warning 7650: (704-718='s2.a[0].a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (704-713='s2.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (704-708='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (704-706='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (704-711='s2.a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (704-716='s2.a[0].a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (704-718='s2.a[0].a[0].x'): Assertion checker does not support recursive structs.
+// Warning 6328: (91-111='assert(s1.x == s2.x)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (115-149): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (216-223): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (229-236): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (209-239): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (251-258): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (284-291): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (316-323): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (336-343): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (216-223='s1.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (229-236='s2.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (209-239='assert(s1.a[0].x == s2.a[0].x)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (251-258='s1.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (284-291='s2.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (316-323='s1.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (336-343='s2.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (309-353): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (605-612): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (623-630): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (641-648): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (661-668): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (681-688): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (681-693): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (704-711): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6368: (704-716): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6368: (605-612='s1.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6368: (623-630='s2.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6368: (641-648='s1.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6368: (661-668='s2.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6368: (681-688='s1.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6368: (681-693='s1.a[0].a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6368: (704-711='s2.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6368: (704-716='s2.a[0].a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_4.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_4.sol
index ef60d1ba2..fc00bd866 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_4.sol
@@ -19,39 +19,39 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 8115: (48-52): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (55-59): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (102-114): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (133-145): Assertion checker does not yet support the type of this variable.
-// Warning 8364: (122-124): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (127-129): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (117-129): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 8364: (153-155): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (158-160): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (148-160): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 7650: (171-175): Assertion checker does not yet support this expression.
-// Warning 8364: (171-173): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 7650: (179-183): Assertion checker does not yet support this expression.
-// Warning 8364: (179-181): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (187-191): Assertion checker does not yet support this expression.
-// Warning 8364: (187-189): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 7650: (195-199): Assertion checker does not yet support this expression.
-// Warning 8364: (195-197): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (211-215): Assertion checker does not yet support this expression.
-// Warning 8364: (211-213): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 7650: (219-223): Assertion checker does not yet support this expression.
-// Warning 8364: (219-221): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (227-231): Assertion checker does not yet support this expression.
-// Warning 8364: (227-229): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 7650: (235-239): Assertion checker does not yet support this expression.
-// Warning 8364: (235-237): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (244-248): Assertion checker does not yet support this expression.
-// Warning 8364: (244-246): Assertion checker does not yet implement type struct C.S storage pointer
-// Warning 4375: (244-248): Assertion checker does not support recursive structs.
-// Warning 7650: (333-337): Assertion checker does not yet support this expression.
-// Warning 8364: (333-335): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (347-351): Assertion checker does not yet support this expression.
-// Warning 8364: (347-349): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8115: (48-52='S s1'): Assertion checker does not yet support the type of this variable.
+// Warning 8115: (55-59='S s2'): Assertion checker does not yet support the type of this variable.
+// Warning 8115: (102-114='S storage s3'): Assertion checker does not yet support the type of this variable.
+// Warning 8115: (133-145='S storage s4'): Assertion checker does not yet support the type of this variable.
+// Warning 8364: (122-124='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (127-129='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (117-129='b1 ? s1 : s2'): Assertion checker does not yet implement type struct C.S storage pointer
+// Warning 8364: (153-155='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (158-160='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (148-160='b2 ? s1 : s2'): Assertion checker does not yet implement type struct C.S storage pointer
+// Warning 7650: (171-175='s3.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (171-173='s3'): Assertion checker does not yet implement type struct C.S storage pointer
+// Warning 7650: (179-183='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (179-181='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (187-191='s3.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (187-189='s3'): Assertion checker does not yet implement type struct C.S storage pointer
+// Warning 7650: (195-199='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (195-197='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (211-215='s4.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (211-213='s4'): Assertion checker does not yet implement type struct C.S storage pointer
+// Warning 7650: (219-223='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (219-221='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (227-231='s4.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (227-229='s4'): Assertion checker does not yet implement type struct C.S storage pointer
+// Warning 7650: (235-239='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (235-237='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (244-248='s3.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (244-246='s3'): Assertion checker does not yet implement type struct C.S storage pointer
+// Warning 4375: (244-248='s3.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (333-337='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (333-335='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (347-351='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (347-349='s2'): Assertion checker does not yet implement type struct C.S storage ref
 // Warning 6328: (164-200): CHC: Assertion violation happens here.
 // Warning 6328: (204-240): CHC: Assertion violation happens here.
-// Warning 6328: (326-358): CHC: Assertion violation happens here.
+// Warning 6328: (326-358='assert(s1.x == 44 || s2.x == 44)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol
index 2d438e6d0..b0de33c75 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol
@@ -16,14 +16,14 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 8364: (93-102): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (120-133): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (137-148): Assertion checker does not yet support this expression.
-// Warning 8364: (137-146): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (137-155): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (137-148): Assertion checker does not support recursive structs.
-// Warning 7650: (166-177): Assertion checker does not yet support this expression.
-// Warning 8364: (166-175): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (188-195): Assertion checker does not yet support this expression.
-// Warning 8364: (188-193): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (93-102='sa.push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (120-133='sa2[0].push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (137-148='sa2[0][0].a'): Assertion checker does not yet support this expression.
+// Warning 8364: (137-146='sa2[0][0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (137-155='sa2[0][0].a.push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (137-148='sa2[0][0].a'): Assertion checker does not support recursive structs.
+// Warning 7650: (166-177='sa2[0][0].a'): Assertion checker does not yet support this expression.
+// Warning 8364: (166-175='sa2[0][0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (188-195='sa[0].a'): Assertion checker does not yet support this expression.
+// Warning 8364: (188-193='sa[0]'): Assertion checker does not yet implement type struct C.S storage ref
 // Warning 6328: (159-203): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_6.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_6.sol
index d6ae281aa..c4197da3f 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_6.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_6.sol
@@ -21,42 +21,42 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 8115: (48-52): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (55-59): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (86-90): Assertion checker does not yet support this expression.
-// Warning 8364: (86-88): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (86-90): Assertion checker does not support recursive structs.
-// Warning 7650: (101-105): Assertion checker does not yet support this expression.
-// Warning 8364: (101-103): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (101-105): Assertion checker does not support recursive structs.
-// Warning 7650: (109-113): Assertion checker does not yet support this expression.
-// Warning 8364: (109-111): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (109-113): Assertion checker does not support recursive structs.
-// Warning 7650: (119-123): Assertion checker does not yet support this expression.
-// Warning 8364: (119-121): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (119-123): Assertion checker does not support recursive structs.
-// Warning 7650: (134-138): Assertion checker does not yet support this expression.
-// Warning 8364: (134-136): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (134-138): Assertion checker does not support recursive structs.
-// Warning 7650: (142-146): Assertion checker does not yet support this expression.
-// Warning 8364: (142-144): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (142-146): Assertion checker does not support recursive structs.
-// Warning 7650: (159-163): Assertion checker does not yet support this expression.
-// Warning 8364: (159-161): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (167-171): Assertion checker does not yet support this expression.
-// Warning 8364: (167-169): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (187-191): Assertion checker does not yet support this expression.
-// Warning 8364: (187-189): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (202-206): Assertion checker does not yet support this expression.
-// Warning 8364: (202-204): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (225-227): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (238-242): Assertion checker does not yet support this expression.
-// Warning 8364: (238-240): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4984: (99-105): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 4984: (109-115): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 3944: (132-138): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 3944: (142-148): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 4984: (167-175): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (152-176): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 8115: (48-52='S s1'): Assertion checker does not yet support the type of this variable.
+// Warning 8115: (55-59='S s2'): Assertion checker does not yet support the type of this variable.
+// Warning 7650: (86-90='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (86-88='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (86-90='s1.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (101-105='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (101-103='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (101-105='s1.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (109-113='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (109-111='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (109-113='s1.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (119-123='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (119-121='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (119-123='s2.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (134-138='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (134-136='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (134-138='s2.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (142-146='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (142-144='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (142-146='s2.x'): Assertion checker does not support recursive structs.
+// Warning 7650: (159-163='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (159-161='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (167-171='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (167-169='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (187-191='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (187-189='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (202-206='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (202-204='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (225-227='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (238-242='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (238-240='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4984: (99-105='++s1.x'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 4984: (109-115='s1.x++'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 3944: (132-138='--s2.x'): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 3944: (142-148='s2.x--'): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 4984: (167-175='s2.x + 6'): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (152-176='assert(s1.x == s2.x + 6)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (180-214): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (231-248): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (231-248='assert(s1.x == 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_1.sol
index 8305c25f7..c3ed5166b 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_1.sol
@@ -17,15 +17,15 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 8115: (82-86): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (89-93): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (132-136): Assertion checker does not yet support this expression.
-// Warning 8364: (132-134): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (140-144): Assertion checker does not yet support this expression.
-// Warning 8364: (140-142): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (156-160): Assertion checker does not yet support this expression.
-// Warning 8364: (156-158): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (171-175): Assertion checker does not yet support this expression.
-// Warning 8364: (171-173): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 6328: (125-145): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 8115: (82-86='S s1'): Assertion checker does not yet support the type of this variable.
+// Warning 8115: (89-93='S s2'): Assertion checker does not yet support the type of this variable.
+// Warning 7650: (132-136='s1.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (132-134='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (140-144='s2.x'): Assertion checker does not yet support this expression.
+// Warning 8364: (140-142='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (156-160='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (156-158='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (171-175='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (171-173='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 6328: (125-145='assert(s1.x == s2.x)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (149-183): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_2.sol
index 9753466ac..987a5ef5a 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_indirect_2.sol
@@ -20,44 +20,44 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 8115: (82-86): Assertion checker does not yet support the type of this variable.
-// Warning 8115: (89-93): Assertion checker does not yet support the type of this variable.
-// Warning 7650: (120-124): Assertion checker does not yet support this expression.
-// Warning 8364: (120-122): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (120-131): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 4375: (120-124): Assertion checker does not support recursive structs.
-// Warning 7650: (135-139): Assertion checker does not yet support this expression.
-// Warning 8364: (135-137): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (135-146): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 4375: (135-139): Assertion checker does not support recursive structs.
-// Warning 7650: (150-159): Assertion checker does not yet support this expression.
-// Warning 7650: (150-154): Assertion checker does not yet support this expression.
-// Warning 8364: (150-152): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (150-157): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 8364: (150-166): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (150-159): Assertion checker does not support recursive structs.
-// Warning 7650: (170-179): Assertion checker does not yet support this expression.
-// Warning 7650: (170-174): Assertion checker does not yet support this expression.
-// Warning 8364: (170-172): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (170-177): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 8364: (170-186): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 4375: (170-179): Assertion checker does not support recursive structs.
-// Warning 7650: (197-211): Assertion checker does not yet support this expression.
-// Warning 7650: (197-206): Assertion checker does not yet support this expression.
-// Warning 7650: (197-201): Assertion checker does not yet support this expression.
-// Warning 8364: (197-199): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (197-204): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 8364: (197-209): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 7650: (215-229): Assertion checker does not yet support this expression.
-// Warning 7650: (215-224): Assertion checker does not yet support this expression.
-// Warning 7650: (215-219): Assertion checker does not yet support this expression.
-// Warning 8364: (215-217): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 8364: (215-222): Assertion checker does not yet implement type struct C.T storage ref
-// Warning 8364: (215-227): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 6368: (150-157): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (170-177): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (197-204): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (197-209): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (215-222): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6368: (215-227): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 8115: (82-86='S s1'): Assertion checker does not yet support the type of this variable.
+// Warning 8115: (89-93='S s2'): Assertion checker does not yet support the type of this variable.
+// Warning 7650: (120-124='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (120-122='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (120-131='s1.a.push()'): Assertion checker does not yet implement type struct C.T storage ref
+// Warning 4375: (120-124='s1.a'): Assertion checker does not support recursive structs.
+// Warning 7650: (135-139='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (135-137='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (135-146='s2.a.push()'): Assertion checker does not yet implement type struct C.T storage ref
+// Warning 4375: (135-139='s2.a'): Assertion checker does not support recursive structs.
+// Warning 7650: (150-159='s1.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (150-154='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (150-152='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (150-157='s1.a[0]'): Assertion checker does not yet implement type struct C.T storage ref
+// Warning 8364: (150-166='s1.a[0].a.push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (150-159='s1.a[0].a'): Assertion checker does not support recursive structs.
+// Warning 7650: (170-179='s2.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (170-174='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (170-172='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (170-177='s2.a[0]'): Assertion checker does not yet implement type struct C.T storage ref
+// Warning 8364: (170-186='s2.a[0].a.push()'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 4375: (170-179='s2.a[0].a'): Assertion checker does not support recursive structs.
+// Warning 7650: (197-211='s1.a[0].a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (197-206='s1.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (197-201='s1.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (197-199='s1'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (197-204='s1.a[0]'): Assertion checker does not yet implement type struct C.T storage ref
+// Warning 8364: (197-209='s1.a[0].a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 7650: (215-229='s2.a[0].a[0].x'): Assertion checker does not yet support this expression.
+// Warning 7650: (215-224='s2.a[0].a'): Assertion checker does not yet support this expression.
+// Warning 7650: (215-219='s2.a'): Assertion checker does not yet support this expression.
+// Warning 8364: (215-217='s2'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 8364: (215-222='s2.a[0]'): Assertion checker does not yet implement type struct C.T storage ref
+// Warning 8364: (215-227='s2.a[0].a[0]'): Assertion checker does not yet implement type struct C.S storage ref
+// Warning 6368: (150-157='s1.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (170-177='s2.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (197-204='s1.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (197-209='s1.a[0].a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (215-222='s2.a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6368: (215-227='s2.a[0].a[0]'): CHC: Out of bounds access happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (190-230): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol
index a96f0323f..ceb7a03a2 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol
@@ -18,4 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (256-277): CHC: Assertion violation happens here.\nCounterexample:\n\ns2 = {x: 42, a: [0, 0, 43, 0, 0]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    C.s() -- internal call
+// Warning 6328: (256-277='assert(s2.a[3] == 43)'): CHC: Assertion violation happens here.\nCounterexample:\n\ns2 = {x: 42, a: [0, 0, 43, 0, 0]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    C.s() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol
index ed3aa001d..5d4949c3c 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol
@@ -16,4 +16,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (180-204): CHC: Assertion violation happens here.
+// Warning 6328: (180-204='assert(s.a[1] == s.a[0])'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol
index e3dcb0184..127ddc38e 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol
@@ -22,5 +22,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2529: (88-97): CHC: Empty array "pop" happens here.
-// Warning 6328: (197-221): CHC: Assertion violation happens here.
+// Warning 2529: (88-97='s.a.pop()'): CHC: Empty array "pop" happens here.
+// Warning 6328: (197-221='assert(s.a[1] == s.a[0])'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol
index 748159516..269fb1bc8 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol
@@ -19,5 +19,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 2529: (100-109): CHC: Empty array "pop" happens here.
-// Warning 6328: (156-180): CHC: Assertion violation happens here.
+// Warning 2529: (100-109='s.a.pop()'): CHC: Empty array "pop" happens here.
+// Warning 6328: (156-180='assert(s.a[1] == s.a[0])'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol
index 8bd6de794..80f82fd86 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol
@@ -17,4 +17,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (193-213): CHC: Assertion violation happens here.
+// Warning 6328: (193-213='assert(s1.x == s2.x)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol
index 7ce618a0e..1d70080ff 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol
@@ -18,4 +18,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (208-228): CHC: Assertion violation happens here.
+// Warning 6328: (208-228='assert(s1.x == s2.x)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
index 0da530799..a1a382ffa 100644
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
@@ -16,5 +16,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (216-225): CHC: Out of bounds access might happen here.
-// Warning 6328: (209-230): CHC: Assertion violation might happen here.
+// Warning 6368: (216-225='c.a[0][0]'): CHC: Out of bounds access might happen here.
+// Warning 6328: (209-230='assert(c.a[0][0] > 0)'): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol
index dbd498327..e84a4dc54 100644
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol
@@ -23,4 +23,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 5667: (53-59): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (53-59='bool b'): Unused function parameter. Remove or comment out the variable name to silence this warning.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol
index 72fd765f4..914d9df9c 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (64-68): BMC: Condition is always true.
+// Warning 6838: (64-68='0==0'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol
index 084c637b9..ab73f802b 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (64-68): BMC: Condition is always true.
+// Warning 6838: (64-68='0==0'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol
index 1f8151920..050d83f68 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (64-68): BMC: Condition is always true.
+// Warning 6838: (64-68='0==0'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_array_pop_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_array_pop_1.sol
index 45a26a31a..1f0b9d057 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_array_pop_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_array_pop_1.sol
@@ -5,4 +5,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (46-55): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (46-55='(a).pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_array_pop_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_array_pop_2.sol
index a1946258e..b205a088a 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_array_pop_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_array_pop_2.sol
@@ -5,4 +5,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (46-63): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (46-63='(((((a))))).pop()'): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol
index e5f062b57..95666fbd5 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol
@@ -17,4 +17,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (198-215): CHC: Assertion violation happens here.
+// Warning 6328: (198-215='assert(a[x] == 2)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol
index 03a5a22db..7568603a5 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol
@@ -10,4 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (89-103): CHC: Assertion violation happens here.\nCounterexample:\n\na = 4\nb = 3\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (89-103='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 4\nb = 3\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol
index 7e7795ea1..ee1871dbd 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol
@@ -11,4 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (99-113): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 0\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6328: (99-113='assert(y == 4)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 0\n\nTransaction trace:\nC.constructor()\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_empty.sol b/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_empty.sol
index 1772aa995..ab6b16956 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_empty.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_empty.sol
@@ -14,4 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (191-201): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (191-201='assert(!b)'): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol
index f3f5121a2..4b9ee9cff 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol
@@ -9,5 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (47-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (125-139): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\na = 2\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6321: (47-50='int'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6328: (125-139='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\na = 2\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol
index 51b40dda1..ebd028187 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol
@@ -9,5 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (47-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (127-141): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\na = 2\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6321: (47-50='int'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6328: (127-141='assert(a == 3)'): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\na = 2\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_1.sol
index b358a2032..a683b285e 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_1.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (48-51): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (48-51='int'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_2.sol
index cf34d34a8..94acc5b0f 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_2.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (48-51): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (48-51='int'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_3.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_3.sol
index 051c582de..6c4e9c2a8 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_3.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (48-51): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (48-51='int'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_4.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_4.sol
index 7f7185b11..5353600ac 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_4.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (48-51): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (48-51='int'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_5.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_5.sol
index d757bebde..8dfb3c442 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_5.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6321: (48-51): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (48-51='int'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function.sol b/test/libsolidity/smtCheckerTests/types/tuple_function.sol
index ef3ad0102..59fef64d8 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_function.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_function.sol
@@ -14,5 +14,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (149-163): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
-// Warning 6328: (167-181): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (149-163='assert(x == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (167-181='assert(y == 4)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
index bbd92a90a..85a875d62 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
@@ -14,4 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (166-180): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (166-180='assert(y == 4)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol b/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
index 92181fe36..49dc3512a 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
@@ -16,5 +16,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (172-186): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
-// Warning 6328: (190-204): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (172-186='assert(x == 2)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (190-204='assert(y == 4)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_single_element_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_single_element_1.sol
index 5501f7527..e6cb8891b 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_single_element_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_single_element_1.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (43-52): Statement has no effect.
+// Warning 6133: (43-52='(("", 2))'): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_single_element_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_single_element_2.sol
index a856d53d1..b9651d185 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_single_element_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_single_element_2.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (43-53): Statement has no effect.
+// Warning 6133: (43-53='(("", ""))'): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_single_non_tuple_element.sol b/test/libsolidity/smtCheckerTests/types/tuple_single_non_tuple_element.sol
index c02e0f786..c6fe079cb 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_single_non_tuple_element.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_single_non_tuple_element.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (43-46): Statement has no effect.
+// Warning 6133: (43-46='(2)'): Statement has no effect.
diff --git a/test/libsolidity/smtCheckerTests/types/type_expression_array_2d.sol b/test/libsolidity/smtCheckerTests/types/type_expression_array_2d.sol
index 081be39a4..e26ab5ca7 100644
--- a/test/libsolidity/smtCheckerTests/types/type_expression_array_2d.sol
+++ b/test/libsolidity/smtCheckerTests/types/type_expression_array_2d.sol
@@ -6,6 +6,6 @@ function f() public pure { int[][]; }
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (41-48): Statement has no effect.
-// Warning 8364: (41-46): Assertion checker does not yet implement type type(int256[] memory)
-// Warning 8364: (41-48): Assertion checker does not yet implement type type(int256[] memory[] memory)
+// Warning 6133: (41-48='int[][]'): Statement has no effect.
+// Warning 8364: (41-46='int[]'): Assertion checker does not yet implement type type(int256[] memory)
+// Warning 8364: (41-48='int[][]'): Assertion checker does not yet implement type type(int256[] memory[] memory)
diff --git a/test/libsolidity/smtCheckerTests/types/type_expression_array_3d.sol b/test/libsolidity/smtCheckerTests/types/type_expression_array_3d.sol
index 1be4a781b..447562e07 100644
--- a/test/libsolidity/smtCheckerTests/types/type_expression_array_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/type_expression_array_3d.sol
@@ -6,7 +6,7 @@ function f() public pure { int[][][]; }
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (41-50): Statement has no effect.
-// Warning 8364: (41-46): Assertion checker does not yet implement type type(int256[] memory)
-// Warning 8364: (41-48): Assertion checker does not yet implement type type(int256[] memory[] memory)
-// Warning 8364: (41-50): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory)
+// Warning 6133: (41-50='int[][][]'): Statement has no effect.
+// Warning 8364: (41-46='int[]'): Assertion checker does not yet implement type type(int256[] memory)
+// Warning 8364: (41-48='int[][]'): Assertion checker does not yet implement type type(int256[] memory[] memory)
+// Warning 8364: (41-50='int[][][]'): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory)
diff --git a/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_2d.sol b/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_2d.sol
index 0d525f50a..bb3ae1019 100644
--- a/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_2d.sol
+++ b/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_2d.sol
@@ -6,6 +6,6 @@ function f() public pure { (int[][]); }
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (41-50): Statement has no effect.
-// Warning 8364: (42-47): Assertion checker does not yet implement type type(int256[] memory)
-// Warning 8364: (42-49): Assertion checker does not yet implement type type(int256[] memory[] memory)
+// Warning 6133: (41-50='(int[][])'): Statement has no effect.
+// Warning 8364: (42-47='int[]'): Assertion checker does not yet implement type type(int256[] memory)
+// Warning 8364: (42-49='int[][]'): Assertion checker does not yet implement type type(int256[] memory[] memory)
diff --git a/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_3d.sol b/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_3d.sol
index 37540b982..f5cc96cdb 100644
--- a/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/type_expression_tuple_array_3d.sol
@@ -6,7 +6,7 @@ function f() public pure { (int[][][]); }
 // ====
 // SMTEngine: all
 // ----
-// Warning 6133: (41-52): Statement has no effect.
-// Warning 8364: (42-47): Assertion checker does not yet implement type type(int256[] memory)
-// Warning 8364: (42-49): Assertion checker does not yet implement type type(int256[] memory[] memory)
-// Warning 8364: (42-51): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory)
+// Warning 6133: (41-52='(int[][][])'): Statement has no effect.
+// Warning 8364: (42-47='int[]'): Assertion checker does not yet implement type type(int256[] memory)
+// Warning 8364: (42-49='int[][]'): Assertion checker does not yet implement type type(int256[] memory[] memory)
+// Warning 8364: (42-51='int[][][]'): Assertion checker does not yet implement type type(int256[] memory[] memory[] memory)
diff --git a/test/libsolidity/smtCheckerTests/types/type_meta_unsupported.sol b/test/libsolidity/smtCheckerTests/types/type_meta_unsupported.sol
index bd42eb72d..ea542316f 100644
--- a/test/libsolidity/smtCheckerTests/types/type_meta_unsupported.sol
+++ b/test/libsolidity/smtCheckerTests/types/type_meta_unsupported.sol
@@ -11,9 +11,9 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 7507: (72-84): Assertion checker does not yet support this expression.
-// Warning 7507: (109-129): Assertion checker does not yet support this expression.
-// Warning 7507: (153-172): Assertion checker does not yet support this expression.
+// Warning 7507: (72-84='type(C).name'): Assertion checker does not yet support this expression.
+// Warning 7507: (109-129='type(A).creationCode'): Assertion checker does not yet support this expression.
+// Warning 7507: (153-172='type(A).runtimeCode'): Assertion checker does not yet support this expression.
 // Warning 6328: (59-98): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (102-142): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (146-185): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/types/type_minmax.sol b/test/libsolidity/smtCheckerTests/types/type_minmax.sol
index cc9e3c319..9321e20c1 100644
--- a/test/libsolidity/smtCheckerTests/types/type_minmax.sol
+++ b/test/libsolidity/smtCheckerTests/types/type_minmax.sol
@@ -81,4 +81,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (178-207): CHC: Assertion violation happens here.\nCounterexample:\n\na = 4294967296\n\nTransaction trace:\nC.constructor()\nC.f(4294967296)
+// Warning 6328: (178-207='assert(a <= type(uint32).max)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 4294967296\n\nTransaction trace:\nC.constructor()\nC.f(4294967296)
diff --git a/test/libsolidity/smtCheckerTests/unchecked/check_var_init.sol b/test/libsolidity/smtCheckerTests/unchecked/check_var_init.sol
index b7d19c0bd..d72abf25e 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/check_var_init.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/check_var_init.sol
@@ -16,5 +16,5 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 3944: (33-47): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor(){ msg.value: 0 }
-// Warning 3944: (160-174): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()\n    D.h() -- internal call
+// Warning 3944: (33-47='msg.value - 10'): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor(){ msg.value: 0 }
+// Warning 3944: (160-174='msg.value - 10'): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()\n    D.h() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol b/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
index cb795f9c0..470d5947e 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 1\nb = 65535\n = 0\n\nTransaction trace:\nC.constructor()\nC.add(1, 65535)
+// Warning 4984: (96-101='a + b'): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 1\nb = 65535\n = 0\n\nTransaction trace:\nC.constructor()\nC.add(1, 65535)
diff --git a/test/libsolidity/smtCheckerTests/unchecked/checked_modifier_called_by_unchecked.sol b/test/libsolidity/smtCheckerTests/unchecked/checked_modifier_called_by_unchecked.sol
index d60c50e97..84a62b69b 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/checked_modifier_called_by_unchecked.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/checked_modifier_called_by_unchecked.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (225-230): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 65535\nb = 1\nc = 65535\n = 0\na = 65535\nb = 1\n\nTransaction trace:\nC.constructor()\nC.f(65535, 1, 65535)
+// Warning 4984: (225-230='b + c'): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 65535\nb = 1\nc = 65535\n = 0\na = 65535\nb = 1\n\nTransaction trace:\nC.constructor()\nC.f(65535, 1, 65535)
diff --git a/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
index 8a7405c54..d3fae9613 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
@@ -9,4 +9,4 @@ contract test {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (110-125): CHC: Assertion violation happens here.\nCounterexample:\n\n = false\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n\nTransaction trace:\ntest.constructor()\ntest.f()
+// Warning 6328: (110-125='assert(-x == x)'): CHC: Assertion violation happens here.\nCounterexample:\n\n = false\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n\nTransaction trace:\ntest.constructor()\ntest.f()
diff --git a/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol b/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
index 736b506e1..470225c5e 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
@@ -14,5 +14,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (85-90): CHC: Division by zero happens here.\nCounterexample:\n\na = 0\nb = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
-// Warning 4984: (242-248): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.\nCounterexample:\n\n_check = true\n = 0\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n\nTransaction trace:\nC.constructor()\nC.g(true)
+// Warning 4281: (85-90='a % b'): CHC: Division by zero happens here.\nCounterexample:\n\na = 0\nb = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 4984: (242-248='x / -1'): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.\nCounterexample:\n\n_check = true\n = 0\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n\nTransaction trace:\nC.constructor()\nC.g(true)
diff --git a/test/libsolidity/smtCheckerTests/unchecked/unchecked_called_by_checked.sol b/test/libsolidity/smtCheckerTests/unchecked/unchecked_called_by_checked.sol
index 12081e639..a8410b4cd 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/unchecked_called_by_checked.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/unchecked_called_by_checked.sol
@@ -12,4 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (240-261): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 65024\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(65024)\n    C.add(65024, 256) -- internal call
+// Warning 4984: (240-261='add(a, 0x100) + 0x100'): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 65024\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(65024)\n    C.add(65024, 256) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/unchecked/unchecked_div_by_zero.sol b/test/libsolidity/smtCheckerTests/unchecked/unchecked_div_by_zero.sol
index cabf58251..722e59931 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/unchecked_div_by_zero.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/unchecked_div_by_zero.sol
@@ -16,5 +16,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (169-174): CHC: Division by zero happens here.\nCounterexample:\n\na = 0\nb = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.div(0, 0)
-// Warning 4281: (349-354): CHC: Division by zero happens here.\nCounterexample:\n\na = 0\nb = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.mod(0, 0)
+// Warning 4281: (169-174='a / b'): CHC: Division by zero happens here.\nCounterexample:\n\na = 0\nb = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.div(0, 0)
+// Warning 4281: (349-354='a % b'): CHC: Division by zero happens here.\nCounterexample:\n\na = 0\nb = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.mod(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/unchecked/unchecked_function_call_with_unchecked_block.sol b/test/libsolidity/smtCheckerTests/unchecked/unchecked_function_call_with_unchecked_block.sol
index ebb6912cf..cdc70d021 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/unchecked_function_call_with_unchecked_block.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/unchecked_function_call_with_unchecked_block.sol
@@ -12,4 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (85-98): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    C.f(0) -- internal call
+// Warning 6328: (85-98='assert(y < x)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    C.f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/userTypes/constant.sol b/test/libsolidity/smtCheckerTests/userTypes/constant.sol
index 9730d4b1c..85c68f56e 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/constant.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/constant.sol
@@ -15,4 +15,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (531-555): CHC: Assertion violation happens here.\nCounterexample:\nu = 165521356710917456517261742455526507355687727119203895813322792776\n\nTransaction trace:\nC.constructor()\nState: u = 165521356710917456517261742455526507355687727119203895813322792776\nC.f()
+// Warning 6328: (531-555='assert(T.unwrap(s) == 0)'): CHC: Assertion violation happens here.\nCounterexample:\nu = 165521356710917456517261742455526507355687727119203895813322792776\n\nTransaction trace:\nC.constructor()\nState: u = 165521356710917456517261742455526507355687727119203895813322792776\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol b/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol
index 478b87dfe..a8a6199df 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol
@@ -15,5 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (133-161): CHC: Assertion violation happens here.\nCounterexample:\n\na = 5\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (261-289): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (133-161='assert(MyInt.unwrap(a) == 6)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 5\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (261-289='assert(MyInt.unwrap(x) == 6)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol b/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol
index e8da1dd56..8479e7de4 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol
@@ -20,7 +20,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6133: (87-99): Statement has no effect.
-// Warning 6133: (126-140): Statement has no effect.
-// Warning 6328: (274-302): CHC: Assertion violation happens here.
-// Warning 6328: (340-355): CHC: Assertion violation happens here.
+// Warning 6133: (87-99='(MyInt).wrap'): Statement has no effect.
+// Warning 6133: (126-140='(MyInt).unwrap'): Statement has no effect.
+// Warning 6328: (274-302='assert(MyInt.unwrap(x) == 6)'): CHC: Assertion violation happens here.
+// Warning 6328: (340-355='assert(y == 11)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol b/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
index 120348a04..6d269a4df 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
@@ -10,4 +10,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreInv: yes
 // ----
-// Warning 6328: (134-151): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (134-151='assert(m[a] != 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol b/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol
index 3dbcc3126..8bfc31ed0 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol
@@ -15,4 +15,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (212-226): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 6328: (212-226='assert(x != y)'): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/userTypes/simple.sol b/test/libsolidity/smtCheckerTests/userTypes/simple.sol
index edfde6594..61c7e51f1 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/simple.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/simple.sol
@@ -19,5 +19,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (255-285): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()\n    C.f() -- internal call\n    C.f() -- internal call
-// Warning 6328: (364-392): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()\n    C.f() -- internal call\n    C.f() -- internal call\n    C.g() -- internal call
+// Warning 6328: (255-285='assert(MyInt.unwrap(f()) == 1)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()\n    C.f() -- internal call\n    C.f() -- internal call
+// Warning 6328: (364-392='assert(MyInt.unwrap(x) == 0)'): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()\n    C.f() -- internal call\n    C.f() -- internal call\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
index e4a68df6b..668129110 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (188-212): CHC: Assertion violation happens here.
+// Warning 6328: (188-212='assert(T.unwrap(x) != y)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol b/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol
index 065dae17a..3617f3d0e 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol
@@ -32,5 +32,5 @@ contract D {
 // ----
 // Warning 6328: (403-436): CHC: Assertion violation happens here.
 // Warning 6328: (494-529): CHC: Assertion violation happens here.
-// Warning 6328: (575-598): CHC: Assertion violation happens here.
+// Warning 6328: (575-598='assert(h(0x42) == 0x43)'): CHC: Assertion violation happens here.
 // Warning 6328: (666-711): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/verification_target/constant_condition_1.sol b/test/libsolidity/smtCheckerTests/verification_target/constant_condition_1.sol
index 9511566b0..b06a65fcf 100644
--- a/test/libsolidity/smtCheckerTests/verification_target/constant_condition_1.sol
+++ b/test/libsolidity/smtCheckerTests/verification_target/constant_condition_1.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (62-68): BMC: Condition is always true.
+// Warning 6838: (62-68='x >= 0'): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/verification_target/constant_condition_2.sol b/test/libsolidity/smtCheckerTests/verification_target/constant_condition_2.sol
index f3e14f241..0e8d0c93b 100644
--- a/test/libsolidity/smtCheckerTests/verification_target/constant_condition_2.sol
+++ b/test/libsolidity/smtCheckerTests/verification_target/constant_condition_2.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6838: (77-83): BMC: Condition is always false.
+// Warning 6838: (77-83='x < 10'): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/verification_target/simple_assert.sol b/test/libsolidity/smtCheckerTests/verification_target/simple_assert.sol
index 1d9476869..942f67a68 100644
--- a/test/libsolidity/smtCheckerTests/verification_target/simple_assert.sol
+++ b/test/libsolidity/smtCheckerTests/verification_target/simple_assert.sol
@@ -5,4 +5,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (50-64): CHC: Assertion violation happens here.
+// Warning 6328: (50-64='assert(a == 2)'): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol
index b5d53142c..c5fe05f39 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol
@@ -8,4 +8,4 @@ contract testContract {
     }
 }
 // ----
-// TypeError 5407: (171-183): Cannot implicitly convert component at position 0 from "address" to "address payable".
+// TypeError 5407: (171-183='(address(0))'): Cannot implicitly convert component at position 0 from "address" to "address payable".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol
index 242eb61c7..49b807d0a 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol
@@ -12,5 +12,5 @@ contract testContract {
     }
 }
 // ----
-// TypeError 5407: (278-286): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
-// TypeError 5407: (329-337): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
+// TypeError 5407: (278-286='(this.g)'): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
+// TypeError 5407: (329-337='(this.h)'): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings.sol b/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings.sol
index da81a3bc6..1c8c44258 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings.sol
@@ -1,4 +1,4 @@
 pragma abicoder               v2;
 pragma abicoder v1;
 // ----
-// SyntaxError 3845: (34-53): ABI coder has already been selected for this source unit.
+// SyntaxError 3845: (34-53='pragma abicoder v1;'): ABI coder has already been selected for this source unit.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse.sol b/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse.sol
index f06b2458c..7e82ab43b 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/conflicting_settings_reverse.sol
@@ -1,4 +1,4 @@
 pragma abicoder v1;
 pragma abicoder v2;
 // ----
-// SyntaxError 3845: (20-39): ABI coder has already been selected for this source unit.
+// SyntaxError 3845: (20-39='pragma abicoder v2;'): ABI coder has already been selected for this source unit.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol
index 9c82812e9..4e3805c60 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol
@@ -6,4 +6,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// TypeError 4103: (132-140): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (132-140='S memory'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_array_with_function_type.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_array_with_function_type.sol
index ad46b4abe..3a3a285ab 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_array_with_function_type.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_array_with_function_type.sol
@@ -5,4 +5,4 @@ contract C {
     function f(S[2] memory) public {}
 }
 // ----
-// TypeError 4103: (89-100): Internal type is not allowed for public or external functions.
+// TypeError 4103: (89-100='S[2] memory'): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_array_of_function_types.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_array_of_function_types.sol
index ca0610e69..1c88668cd 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_array_of_function_types.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_array_of_function_types.sol
@@ -5,4 +5,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// TypeError 4103: (92-100): Internal type is not allowed for public or external functions.
+// TypeError 4103: (92-100='S memory'): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_function_type.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_function_type.sol
index 6dff9d8b2..efa10cac8 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_function_type.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_function_type.sol
@@ -5,4 +5,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// TypeError 4103: (103-111): Internal type is not allowed for public or external functions.
+// TypeError 4103: (103-111='S memory'): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol
index 144962c2a..b4ec86754 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol
@@ -5,4 +5,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// TypeError 4103: (105-113): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (105-113='S memory'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/invalid_pragma_value.sol b/test/libsolidity/syntaxTests/abiEncoder/invalid_pragma_value.sol
index cbfa03b3f..9bae77d1d 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/invalid_pragma_value.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/invalid_pragma_value.sol
@@ -1,3 +1,3 @@
 pragma abicoder something;
 // ----
-// SyntaxError 2745: (0-26): Expected either "pragma abicoder v1" or "pragma abicoder v2".
+// SyntaxError 2745: (0-26='pragma abicoder something;'): Expected either "pragma abicoder v1" or "pragma abicoder v2".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/same_setting_twice.sol b/test/libsolidity/syntaxTests/abiEncoder/same_setting_twice.sol
index 0303bcb14..4d27f29c7 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/same_setting_twice.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/same_setting_twice.sol
@@ -1,4 +1,4 @@
 pragma experimental ABIEncoderV2;
 pragma abicoder v2;
 // ----
-// SyntaxError 3845: (34-53): ABI coder has already been selected for this source unit.
+// SyntaxError 3845: (34-53='pragma abicoder v2;'): ABI coder has already been selected for this source unit.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/selected_twice.sol b/test/libsolidity/syntaxTests/abiEncoder/selected_twice.sol
index 424c2c7f2..e84a1ed13 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/selected_twice.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/selected_twice.sol
@@ -1,4 +1,4 @@
 pragma abicoder v1;
 pragma abicoder v1;
 // ----
-// SyntaxError 3845: (20-39): ABI coder has already been selected for this source unit.
+// SyntaxError 3845: (20-39='pragma abicoder v1;'): ABI coder has already been selected for this source unit.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
index 8ba00da1a..06aadb476 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:91-100): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:91-100='C.Item(5)'): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
index 417f5682f..30b6e409e 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:119-129): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:119-129='C.Item(50)'): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
index 1b08439cc..12bb4a54b 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
@@ -20,4 +20,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:166-175): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:166-175='C.Item(5)'): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
index baadf362e..1f99d0468 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
@@ -14,4 +14,4 @@ contract D {
     }
 }
 // ----
-// TypeError 2428: (B:85-105): The type of return parameter 1, string[], is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:85-105='C(address(0x00)).f()'): The type of return parameter 1, string[], is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
index f84a13d49..368bc47bf 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-112='C(address(0x00)).get()'): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
index a67394e0e..c1655a120 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-112='C(address(0x00)).get()'): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
index 1269a29ee..5a76ab184 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
@@ -17,4 +17,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:94-104): The type of this parameter, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:94-104='L.Item(42)'): The type of this parameter, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
index 149aefa96..057880d0d 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
@@ -20,4 +20,4 @@ contract D {
     }
 }
 // ----
-// TypeError 2428: (B:106-117): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:106-117='uint(1).f()'): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
index b3d649e2c..e5ff897d9 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:90-97): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-97='L.get()'): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol
index c37bad41c..482a3bcba 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_accepting_struct.sol
@@ -14,4 +14,4 @@ import "A";
 
 contract D is C {}
 // ----
-// TypeError 6594: (B:33-51): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
+// TypeError 6594: (B:33-51='contract D is C {}'): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol
index f25754246..cf31ecf03 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_inheritance_from_contract_defining_v2_function_returning_struct.sol
@@ -14,4 +14,4 @@ import "A";
 
 contract D is C {}
 // ----
-// TypeError 6594: (B:33-51): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
+// TypeError 6594: (B:33-51='contract D is C {}'): Contract "D" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_with_returndata_support.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_with_returndata_support.sol
index bafff148d..66b705a92 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_with_returndata_support.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_with_returndata_support.sol
@@ -10,5 +10,5 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// Warning 6321: (150-154): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 2072: (166-183): Unused local variable.
+// Warning 6321: (150-154='bool'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 2072: (166-183='uint[][] memory x'): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
index d7373ef7b..b7df04787 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
@@ -29,4 +29,4 @@ contract C is B {
     {}
 }
 // ----
-// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:80-102='A(address(0x00)).get()'): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
index c3bf2c430..c208cee60 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
@@ -30,4 +30,4 @@ contract C is B {
     {}
 }
 // ----
-// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:80-102='A(address(0x00)).get()'): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abstract/abstract_contract_because_of_interface.sol b/test/libsolidity/syntaxTests/abstract/abstract_contract_because_of_interface.sol
index 4851172a2..bdaf08aa8 100644
--- a/test/libsolidity/syntaxTests/abstract/abstract_contract_because_of_interface.sol
+++ b/test/libsolidity/syntaxTests/abstract/abstract_contract_because_of_interface.sol
@@ -4,4 +4,4 @@ interface A {
 contract B is A {
 }
 // ----
-// TypeError 3656: (69-88): Contract "B" should be marked as abstract.
+// TypeError 3656: (69-88='contract B is A { }'): Contract "B" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/abstract/abstract_contract_instantiation.sol b/test/libsolidity/syntaxTests/abstract/abstract_contract_instantiation.sol
index 560f47373..f277d55b5 100644
--- a/test/libsolidity/syntaxTests/abstract/abstract_contract_instantiation.sol
+++ b/test/libsolidity/syntaxTests/abstract/abstract_contract_instantiation.sol
@@ -9,4 +9,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 4614: (208-228): Cannot instantiate an abstract contract.
+// TypeError 4614: (208-228='new AbstractContract'): Cannot instantiate an abstract contract.
diff --git a/test/libsolidity/syntaxTests/abstract/abstract_without_contract.sol b/test/libsolidity/syntaxTests/abstract/abstract_without_contract.sol
index b432b3ab1..7a11b15dd 100644
--- a/test/libsolidity/syntaxTests/abstract/abstract_without_contract.sol
+++ b/test/libsolidity/syntaxTests/abstract/abstract_without_contract.sol
@@ -1,3 +1,3 @@
 abstract A { }
 // ----
-// ParserError 3515: (9-10): Expected keyword "contract", "interface" or "library".
+// ParserError 3515: (9-10='A'): Expected keyword "contract", "interface" or "library".
diff --git a/test/libsolidity/syntaxTests/abstract/interface.sol b/test/libsolidity/syntaxTests/abstract/interface.sol
index 74c22227a..ddbc84afe 100644
--- a/test/libsolidity/syntaxTests/abstract/interface.sol
+++ b/test/libsolidity/syntaxTests/abstract/interface.sol
@@ -1,4 +1,4 @@
 interface B { }
 abstract interface A { }
 // ----
-// TypeError 9348: (16-40): Interfaces do not need the "abstract" keyword, they are abstract implicitly.
+// TypeError 9348: (16-40='abstract interface A { }'): Interfaces do not need the "abstract" keyword, they are abstract implicitly.
diff --git a/test/libsolidity/syntaxTests/abstract/library.sol b/test/libsolidity/syntaxTests/abstract/library.sol
index 67fd4ec03..fec7005c9 100644
--- a/test/libsolidity/syntaxTests/abstract/library.sol
+++ b/test/libsolidity/syntaxTests/abstract/library.sol
@@ -1,3 +1,3 @@
 abstract library A { }
 // ----
-// TypeError 9571: (0-22): Libraries cannot be abstract.
+// TypeError 9571: (0-22='abstract library A { }'): Libraries cannot be abstract.
diff --git a/test/libsolidity/syntaxTests/abstract/unimplemented_functions_inherited.sol b/test/libsolidity/syntaxTests/abstract/unimplemented_functions_inherited.sol
index d71c7feee..1315113fd 100644
--- a/test/libsolidity/syntaxTests/abstract/unimplemented_functions_inherited.sol
+++ b/test/libsolidity/syntaxTests/abstract/unimplemented_functions_inherited.sol
@@ -4,4 +4,4 @@ abstract contract A {
 contract B is A {
 }
 // ----
-// TypeError 3656: (57-76): Contract "B" should be marked as abstract.
+// TypeError 3656: (57-76='contract B is A { }'): Contract "B" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/array/array_pop_arg.sol b/test/libsolidity/syntaxTests/array/array_pop_arg.sol
index 5d383d867..49c08429a 100644
--- a/test/libsolidity/syntaxTests/array/array_pop_arg.sol
+++ b/test/libsolidity/syntaxTests/array/array_pop_arg.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6160: (65-76): Wrong argument count for function call: 1 arguments given but expected 0.
+// TypeError 6160: (65-76='data.pop(5)'): Wrong argument count for function call: 1 arguments given but expected 0.
diff --git a/test/libsolidity/syntaxTests/array/calldata_assign.sol b/test/libsolidity/syntaxTests/array/calldata_assign.sol
index 05a8f682d..92f23e2d6 100644
--- a/test/libsolidity/syntaxTests/array/calldata_assign.sol
+++ b/test/libsolidity/syntaxTests/array/calldata_assign.sol
@@ -3,4 +3,4 @@ contract Test {
     function f(uint256[] calldata s) external { s[0] = 4; }
 }
 // ----
-// TypeError 6182: (98-102): Calldata arrays are read-only.
+// TypeError 6182: (98-102='s[0]'): Calldata arrays are read-only.
diff --git a/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol b/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol
index 754270ecf..3acdbdf3a 100644
--- a/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol
+++ b/test/libsolidity/syntaxTests/array/calldata_multi_dynamic_V1.sol
@@ -4,5 +4,5 @@ contract Test {
     function g(uint[][1] calldata) external { }
 }
 // ----
-// TypeError 4957: (51-68): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
-// TypeError 4957: (98-116): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (51-68='uint[][] calldata'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (98-116='uint[][1] calldata'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/array/calldata_resize.sol b/test/libsolidity/syntaxTests/array/calldata_resize.sol
index 36de4e724..a4cef6eda 100644
--- a/test/libsolidity/syntaxTests/array/calldata_resize.sol
+++ b/test/libsolidity/syntaxTests/array/calldata_resize.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7567: (75-83): Member "length" is read-only and cannot be used to resize arrays.
+// TypeError 7567: (75-83='x.length'): Member "length" is read-only and cannot be used to resize arrays.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_empty_invalid.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_empty_invalid.sol
index d956c4663..5010fe488 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_empty_invalid.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_empty_invalid.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6359: (82-94): Return argument type function () pure returns (bytes memory) is not implicitly convertible to expected type (type of first return variable) bytes memory.
+// TypeError 6359: (82-94='bytes.concat'): Return argument type function () pure returns (bytes memory) is not implicitly convertible to expected type (type of first return variable) bytes memory.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol
index 741667e7c..5039267d5 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4259: (93-98): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(bytes) provided.
+// TypeError 4259: (93-98='bytes'): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(bytes) provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_variable.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_variable.sol
index 325c776e2..7b4341a50 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_variable.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_variable.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (88-96): Member "concat" not found or not visible after argument-dependent lookup in bytes memory.
+// TypeError 9582: (88-96='a.concat'): Member "concat" not found or not visible after argument-dependent lookup in bytes memory.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol
index 753bc291c..a284e067c 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol
@@ -9,6 +9,6 @@ contract C {
     }
 }
 // ----
-// TypeError 8015: (233-236): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[] provided.
-// TypeError 8015: (248-249): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes1[] provided.
-// TypeError 8015: (251-253): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but string provided.
+// TypeError 8015: (233-236='num'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[] provided.
+// TypeError 8015: (248-249='m'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes1[] provided.
+// TypeError 8015: (251-253='c1'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but string provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_array_literal.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_array_literal.sol
index 86ee748ed..be6064f3a 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_array_literal.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_empty_array_literal.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6378: (60-62): Unable to deduce common type for array elements.
+// TypeError 6378: (60-62='[]'): Unable to deduce common type for array elements.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol
index 32ef03472..1d1d1caf2 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol
@@ -25,16 +25,16 @@ contract C {
     }
 }
 // ----
-// TypeError 8015: (425-426): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bool provided.
-// TypeError 8015: (428-429): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256 provided.
-// TypeError 8015: (431-433): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
-// TypeError 8015: (435-436): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address provided.
-// TypeError 8015: (438-440): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address payable provided.
-// TypeError 8015: (442-446): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () external provided.
-// TypeError 8015: (448-452): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
-// TypeError 8015: (454-462): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[] provided.
-// TypeError 8015: (464-471): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[2] provided.
-// TypeError 8015: (473-474): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
-// TypeError 8015: (476-477): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S provided.
-// TypeError 8015: (479-480): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
-// TypeError 8015: (482-483): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but mapping(uint256 => enum C.E) provided.
+// TypeError 8015: (425-426='b'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bool provided.
+// TypeError 8015: (428-429='u'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256 provided.
+// TypeError 8015: (431-433='u8'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
+// TypeError 8015: (435-436='a'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address provided.
+// TypeError 8015: (438-440='ap'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address payable provided.
+// TypeError 8015: (442-446='fext'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () external provided.
+// TypeError 8015: (448-452='fint'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
+// TypeError 8015: (454-462='uDynamic'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[] provided.
+// TypeError 8015: (464-471='uStatic'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[2] provided.
+// TypeError 8015: (473-474='c'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
+// TypeError 8015: (476-477='s'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S provided.
+// TypeError 8015: (479-480='e'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
+// TypeError 8015: (482-483='m'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but mapping(uint256 => enum C.E) provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol
index bdc451966..e2a277f3a 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol
@@ -34,25 +34,25 @@ contract C {
 // ----
 // TypeError 9640: (697-779): Explicit type conversion not allowed from "bytes32" to "bytes memory".
 // TypeError 1227: (697-782): Index range access is only supported for dynamic calldata arrays.
-// TypeError 1227: (864-870): Index range access is only supported for dynamic calldata arrays.
-// TypeError 8015: (133-138): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bool provided.
-// TypeError 8015: (152-153): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 1 provided.
-// TypeError 8015: (167-171): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 10000000000 provided.
-// TypeError 8015: (185-190): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but rational_const 1 / 10000000000 provided.
-// TypeError 8015: (204-207): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but rational_const 1 / 10 provided.
-// TypeError 8015: (221-230): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 19088743 provided.
+// TypeError 1227: (864-870='[0][:]'): Index range access is only supported for dynamic calldata arrays.
+// TypeError 8015: (133-138='false'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bool provided.
+// TypeError 8015: (152-153='1'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 1 provided.
+// TypeError 8015: (167-171='1e10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 10000000000 provided.
+// TypeError 8015: (185-190='1e-10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but rational_const 1 / 10000000000 provided.
+// TypeError 8015: (204-207='0.1'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but rational_const 1 / 10 provided.
+// TypeError 8015: (221-230='0x1234567'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 19088743 provided.
 // TypeError 8015: (244-284): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 3806...(37 digits omitted)...1680 provided.
 // TypeError 8015: (335-377): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address provided.
 // TypeError 8015: (404-448): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 2494...(42 digits omitted)...0497 provided.
 // TypeError 8015: (495-561): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 3027...(66 digits omitted)...5855 provided.
 // TypeError 8015: (596-663): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const -1 provided.
 // TypeError 8015: (697-782): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes slice provided.
-// TypeError 8015: (796-797): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
-// TypeError 8015: (811-813): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple() provided.
-// TypeError 8015: (827-833): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple(int_const 0,int_const 0) provided.
-// TypeError 8015: (847-850): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] provided.
-// TypeError 8015: (864-870): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] slice provided.
-// TypeError 8015: (884-890): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
-// TypeError 8015: (904-911): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
-// TypeError 8015: (925-929): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S provided.
-// TypeError 8015: (943-946): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
+// TypeError 8015: (796-797='f'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
+// TypeError 8015: (811-813='()'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple() provided.
+// TypeError 8015: (827-833='(0, 0)'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple(int_const 0,int_const 0) provided.
+// TypeError 8015: (847-850='[0]'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] provided.
+// TypeError 8015: (864-870='[0][:]'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] slice provided.
+// TypeError 8015: (884-890='[0][0]'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
+// TypeError 8015: (904-911='new C()'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
+// TypeError 8015: (925-929='S(0)'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S provided.
+// TypeError 8015: (943-946='E.A'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_zero_literal.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_zero_literal.sol
index e62d13add..5b0b72fa5 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_zero_literal.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_zero_literal.sol
@@ -18,16 +18,16 @@ contract C {
     }
 }
 // ----
-// TypeError 8015: (78-79): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (93-95): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (109-112): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (126-130): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (144-148): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (162-167): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (181-186): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (200-206): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (220-223): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (237-241): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
-// TypeError 8015: (255-260): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (78-79='0'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (93-95='-0'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (109-112='0.0'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (126-130='-0.0'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (144-148='0e10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (162-167='-0e10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (181-186='0e-10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (200-206='-0e-10'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (220-223='(0)'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (237-241='0x00'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
+// TypeError 8015: (255-260='-0x00'): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
 // TypeError 8015: (274-340): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
 // TypeError 8015: (374-441): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 0 provided.
diff --git a/test/libsolidity/syntaxTests/array/contract_index_access.sol b/test/libsolidity/syntaxTests/array/contract_index_access.sol
index 50fbfd41b..bcf0697ea 100644
--- a/test/libsolidity/syntaxTests/array/contract_index_access.sol
+++ b/test/libsolidity/syntaxTests/array/contract_index_access.sol
@@ -4,5 +4,5 @@ contract C {
     }
 }
 // ----
-// Warning 6133: (52-56): Statement has no effect.
+// Warning 6133: (52-56='C[0]'): Statement has no effect.
 // Warning 2018: (17-63): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol b/test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol
index 44011bea4..2ef947092 100644
--- a/test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol
+++ b/test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (148-150): Type function () external[] storage ref is not implicitly convertible to expected type function () view external[] storage ref.
+// TypeError 7407: (148-150='s0'): Type function () external[] storage ref is not implicitly convertible to expected type function () view external[] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/dynamic_memory_array_pop.sol b/test/libsolidity/syntaxTests/array/dynamic_memory_array_pop.sol
index c8e925257..416c67601 100644
--- a/test/libsolidity/syntaxTests/array/dynamic_memory_array_pop.sol
+++ b/test/libsolidity/syntaxTests/array/dynamic_memory_array_pop.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4994: (74-82): Member "pop" is not available in uint256[] memory outside of storage.
+// TypeError 4994: (74-82='data.pop'): Member "pop" is not available in uint256[] memory outside of storage.
diff --git a/test/libsolidity/syntaxTests/array/function_mapping.sol b/test/libsolidity/syntaxTests/array/function_mapping.sol
index 3f64c081c..e8d546445 100644
--- a/test/libsolidity/syntaxTests/array/function_mapping.sol
+++ b/test/libsolidity/syntaxTests/array/function_mapping.sol
@@ -4,4 +4,4 @@ contract Test {
     function f(mapping(uint => uint)[] memory x) public pure {}
 }
 // ----
-// TypeError 4103: (66-98): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (66-98='mapping(uint => uint)[] memory x'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/array/invalid/bytes_to_fixed_bytes.sol b/test/libsolidity/syntaxTests/array/invalid/bytes_to_fixed_bytes.sol
index ca38231be..263744948 100644
--- a/test/libsolidity/syntaxTests/array/invalid/bytes_to_fixed_bytes.sol
+++ b/test/libsolidity/syntaxTests/array/invalid/bytes_to_fixed_bytes.sol
@@ -9,7 +9,7 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (183-184): Type bytes storage ref is not implicitly convertible to expected type bytes16.
-// TypeError 7407: (199-205): Type bytes calldata slice is not implicitly convertible to expected type bytes3.
-// TypeError 9640: (220-230): Explicit type conversion not allowed from "string memory" to "bytes32".
-// TypeError 7407: (245-246): Type string memory is not implicitly convertible to expected type bytes32.
+// TypeError 7407: (183-184='s'): Type bytes storage ref is not implicitly convertible to expected type bytes16.
+// TypeError 7407: (199-205='c[0:3]'): Type bytes calldata slice is not implicitly convertible to expected type bytes3.
+// TypeError 9640: (220-230='bytes32(m)'): Explicit type conversion not allowed from "string memory" to "bytes32".
+// TypeError 7407: (245-246='m'): Type string memory is not implicitly convertible to expected type bytes32.
diff --git a/test/libsolidity/syntaxTests/array/invalid/library_array.sol b/test/libsolidity/syntaxTests/array/invalid/library_array.sol
index 020ea92d1..8a02b79b2 100644
--- a/test/libsolidity/syntaxTests/array/invalid/library_array.sol
+++ b/test/libsolidity/syntaxTests/array/invalid/library_array.sol
@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 1130: (51-52): Invalid use of a library name.
+// TypeError 1130: (51-52='L'): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/array/invalid/library_index_access.sol b/test/libsolidity/syntaxTests/array/invalid/library_index_access.sol
index 885a114b0..f2679a2c3 100644
--- a/test/libsolidity/syntaxTests/array/invalid/library_index_access.sol
+++ b/test/libsolidity/syntaxTests/array/invalid/library_index_access.sol
@@ -4,4 +4,4 @@ library C {
     }
 }
 // ----
-// TypeError 2876: (51-55): Index access for library types and arrays of libraries are not possible.
+// TypeError 2876: (51-55='C[0]'): Index access for library types and arrays of libraries are not possible.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/calldata_to_memory_different_base.sol b/test/libsolidity/syntaxTests/array/invalidCopy/calldata_to_memory_different_base.sol
index b08fd0df5..a2750b2a7 100644
--- a/test/libsolidity/syntaxTests/array/invalidCopy/calldata_to_memory_different_base.sol
+++ b/test/libsolidity/syntaxTests/array/invalidCopy/calldata_to_memory_different_base.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (134-156): Type bytes8[] calldata is not implicitly convertible to expected type bytes10[] memory.
+// TypeError 9574: (134-156='bytes10[] memory m = c'): Type bytes8[] calldata is not implicitly convertible to expected type bytes10[] memory.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_memory_different_base.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_memory_different_base.sol
index af4a593cc..17dd75ad3 100644
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_memory_different_base.sol
+++ b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_memory_different_base.sol
@@ -11,4 +11,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (203-225): Type bytes8[] storage ref is not implicitly convertible to expected type bytes10[] memory.
+// TypeError 9574: (203-225='bytes10[] memory m = s'): Type bytes8[] storage ref is not implicitly convertible to expected type bytes10[] memory.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base.sol
index d45a77182..96ce601bf 100644
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base.sol
+++ b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (101-106): Type bytes2[10] storage ref is not implicitly convertible to expected type bytes1[32] storage ref.
+// TypeError 7407: (101-106='data2'): Type bytes2[10] storage ref is not implicitly convertible to expected type bytes1[32] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base_2.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base_2.sol
index dabeb18e0..2d17f111a 100644
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base_2.sol
+++ b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_base_2.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (102-107): Type uint256[10] storage ref is not implicitly convertible to expected type uint64[32] storage ref.
+// TypeError 7407: (102-107='data2'): Type uint256[10] storage ref is not implicitly convertible to expected type uint64[32] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_sign.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_sign.sol
index d91cdd95e..592915d9c 100644
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_sign.sol
+++ b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_different_sign.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (102-107): Type uint256[10] storage ref is not implicitly convertible to expected type int256[32] storage ref.
-// TypeError 7407: (159-164): Type int256[32] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
+// TypeError 7407: (102-107='data2'): Type uint256[10] storage ref is not implicitly convertible to expected type int256[32] storage ref.
+// TypeError 7407: (159-164='data1'): Type int256[32] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_dynamic_to_static.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_dynamic_to_static.sol
index 1b3733a0b..cc101e998 100644
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_dynamic_to_static.sol
+++ b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_dynamic_to_static.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (101-106): Type uint256[] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
+// TypeError 7407: (101-106='data2'): Type uint256[] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_static_longer_to_shorter.sol b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_static_longer_to_shorter.sol
index 95185d317..c6020fa41 100644
--- a/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_static_longer_to_shorter.sol
+++ b/test/libsolidity/syntaxTests/array/invalidCopy/storage_to_storage_static_longer_to_shorter.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (103-108): Type uint256[18] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
+// TypeError 7407: (103-108='data2'): Type uint256[18] storage ref is not implicitly convertible to expected type uint256[10] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/length/abi_decode_length_too_large.sol b/test/libsolidity/syntaxTests/array/length/abi_decode_length_too_large.sol
index 06caa0f22..45dba31a4 100644
--- a/test/libsolidity/syntaxTests/array/length/abi_decode_length_too_large.sol
+++ b/test/libsolidity/syntaxTests/array/length/abi_decode_length_too_large.sol
@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 6118: (75-92): Type too large for memory.
+// TypeError 6118: (75-92='bytes1[999999999]'): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol b/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol
index cc979668c..7b8a5dfac 100644
--- a/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol
+++ b/test/libsolidity/syntaxTests/array/length/array_length_cannot_be_constant_function_parameter.sol
@@ -4,6 +4,6 @@ contract C {
     }
 }
 // ----
-// DeclarationError 1788: (28-45): The "constant" keyword can only be used for state variables or variables at file level.
-// TypeError 5462: (69-72): Invalid array length, expected integer literal or constant expression.
-// TypeError 6651: (64-75): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
+// DeclarationError 1788: (28-45='uint constant LEN'): The "constant" keyword can only be used for state variables or variables at file level.
+// TypeError 5462: (69-72='LEN'): Invalid array length, expected integer literal or constant expression.
+// TypeError 6651: (64-75='uint[LEN] a'): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol b/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol
index 37f194899..8edde4ae4 100644
--- a/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol
+++ b/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol
@@ -2,4 +2,4 @@ contract C {
     bytes32[8**90] ids;
 }
 // ----
-// TypeError 5462: (25-30): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (25-30='8**90'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol b/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol
index 1a4e7f64c..92ff6ba0c 100644
--- a/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol
+++ b/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol
@@ -2,4 +2,4 @@ contract C {
     bytes32[8**90][500] ids;
 }
 // ----
-// TypeError 5462: (25-30): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (25-30='8**90'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned.sol b/test/libsolidity/syntaxTests/array/length/cannot_be_assigned.sol
index 0c8f08e86..6f9bdc1ac 100644
--- a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned.sol
+++ b/test/libsolidity/syntaxTests/array/length/cannot_be_assigned.sol
@@ -5,4 +5,4 @@ contract c {
     }
 }
 // ----
-// TypeError 7567: (72-91): Member "length" is read-only and cannot be used to resize arrays.
+// TypeError 7567: (72-91='storageArray.length'): Member "length" is read-only and cannot be used to resize arrays.
diff --git a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_mapping.sol b/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_mapping.sol
index c4a9e81bd..27791ca79 100644
--- a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_mapping.sol
+++ b/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_mapping.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7567: (80-93): Member "length" is read-only and cannot be used to resize arrays.
+// TypeError 7567: (80-93='map[0].length'): Member "length" is read-only and cannot be used to resize arrays.
diff --git a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_struct.sol b/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_struct.sol
index 179d7cf28..dae46088a 100644
--- a/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_struct.sol
+++ b/test/libsolidity/syntaxTests/array/length/cannot_be_assigned_struct.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7567: (95-105): Member "length" is read-only and cannot be used to resize arrays.
+// TypeError 7567: (95-105='s.a.length'): Member "length" is read-only and cannot be used to resize arrays.
diff --git a/test/libsolidity/syntaxTests/array/length/cannot_be_function.sol b/test/libsolidity/syntaxTests/array/length/cannot_be_function.sol
index 61521192f..e1c4c771d 100644
--- a/test/libsolidity/syntaxTests/array/length/cannot_be_function.sol
+++ b/test/libsolidity/syntaxTests/array/length/cannot_be_function.sol
@@ -3,4 +3,4 @@ contract C {
     uint[f] ids;
 }
 // ----
-// TypeError 5462: (49-50): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (49-50='f'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/cannot_be_function_call.sol b/test/libsolidity/syntaxTests/array/length/cannot_be_function_call.sol
index c0decec57..b7517578d 100644
--- a/test/libsolidity/syntaxTests/array/length/cannot_be_function_call.sol
+++ b/test/libsolidity/syntaxTests/array/length/cannot_be_function_call.sol
@@ -4,4 +4,4 @@ contract C {
     uint[LEN] ids;
 }
 // ----
-// TypeError 5462: (84-87): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (84-87='LEN'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/complex_cyclic_constant.sol b/test/libsolidity/syntaxTests/array/length/complex_cyclic_constant.sol
index 0710124a1..e78f48f2d 100644
--- a/test/libsolidity/syntaxTests/array/length/complex_cyclic_constant.sol
+++ b/test/libsolidity/syntaxTests/array/length/complex_cyclic_constant.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5210: (17-44): Cyclic constant definition (or maximum recursion depth exhausted).
+// TypeError 5210: (17-44='uint constant L2 = LEN - 10'): Cyclic constant definition (or maximum recursion depth exhausted).
diff --git a/test/libsolidity/syntaxTests/array/length/const_cannot_be_fractional.sol b/test/libsolidity/syntaxTests/array/length/const_cannot_be_fractional.sol
index 2145d7025..e26e1123e 100644
--- a/test/libsolidity/syntaxTests/array/length/const_cannot_be_fractional.sol
+++ b/test/libsolidity/syntaxTests/array/length/const_cannot_be_fractional.sol
@@ -3,4 +3,4 @@ contract C {
     uint[L] ids;
 }
 // ----
-// TypeError 5462: (51-52): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (51-52='L'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/cyclic_constant.sol b/test/libsolidity/syntaxTests/array/length/cyclic_constant.sol
index dd089e4d0..61b0cb432 100644
--- a/test/libsolidity/syntaxTests/array/length/cyclic_constant.sol
+++ b/test/libsolidity/syntaxTests/array/length/cyclic_constant.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5210: (17-40): Cyclic constant definition (or maximum recursion depth exhausted).
+// TypeError 5210: (17-40='uint constant LEN = LEN'): Cyclic constant definition (or maximum recursion depth exhausted).
diff --git a/test/libsolidity/syntaxTests/array/length/fixed_size_multidim_zero_length.sol b/test/libsolidity/syntaxTests/array/length/fixed_size_multidim_zero_length.sol
index 6a913d1e3..dc85b27f4 100644
--- a/test/libsolidity/syntaxTests/array/length/fixed_size_multidim_zero_length.sol
+++ b/test/libsolidity/syntaxTests/array/length/fixed_size_multidim_zero_length.sol
@@ -7,9 +7,9 @@ contract C {
   function e() public pure returns(string[0][500] memory) {}
 }
 // ----
-// TypeError 1406: (52-53): Array with zero length specified.
-// TypeError 1406: (111-112): Array with zero length specified.
-// TypeError 1406: (172-173): Array with zero length specified.
-// TypeError 1406: (234-235): Array with zero length specified.
-// TypeError 1406: (294-295): Array with zero length specified.
-// TypeError 1406: (355-356): Array with zero length specified.
+// TypeError 1406: (52-53='0'): Array with zero length specified.
+// TypeError 1406: (111-112='0'): Array with zero length specified.
+// TypeError 1406: (172-173='0'): Array with zero length specified.
+// TypeError 1406: (234-235='0'): Array with zero length specified.
+// TypeError 1406: (294-295='0'): Array with zero length specified.
+// TypeError 1406: (355-356='0'): Array with zero length specified.
diff --git a/test/libsolidity/syntaxTests/array/length/fixed_size_zero_length.sol b/test/libsolidity/syntaxTests/array/length/fixed_size_zero_length.sol
index d268d75dd..e5c7aad6e 100644
--- a/test/libsolidity/syntaxTests/array/length/fixed_size_zero_length.sol
+++ b/test/libsolidity/syntaxTests/array/length/fixed_size_zero_length.sol
@@ -7,9 +7,9 @@ contract C {
   string[0] f;
 }
 // ----
-// TypeError 1406: (19-20): Array with zero length specified.
-// TypeError 1406: (32-33): Array with zero length specified.
-// TypeError 1406: (47-48): Array with zero length specified.
-// TypeError 1406: (63-64): Array with zero length specified.
-// TypeError 1406: (77-78): Array with zero length specified.
-// TypeError 1406: (92-93): Array with zero length specified.
+// TypeError 1406: (19-20='0'): Array with zero length specified.
+// TypeError 1406: (32-33='0'): Array with zero length specified.
+// TypeError 1406: (47-48='0'): Array with zero length specified.
+// TypeError 1406: (63-64='0'): Array with zero length specified.
+// TypeError 1406: (77-78='0'): Array with zero length specified.
+// TypeError 1406: (92-93='0'): Array with zero length specified.
diff --git a/test/libsolidity/syntaxTests/array/length/inline_array.sol b/test/libsolidity/syntaxTests/array/length/inline_array.sol
index 71e738804..374395563 100644
--- a/test/libsolidity/syntaxTests/array/length/inline_array.sol
+++ b/test/libsolidity/syntaxTests/array/length/inline_array.sol
@@ -2,4 +2,4 @@ contract C {
     uint[[2]] a15;
 }
 // ----
-// TypeError 5462: (22-25): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-25='[2]'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/invalid_expression_1.sol b/test/libsolidity/syntaxTests/array/length/invalid_expression_1.sol
index 14fc21ac1..ec89eb818 100644
--- a/test/libsolidity/syntaxTests/array/length/invalid_expression_1.sol
+++ b/test/libsolidity/syntaxTests/array/length/invalid_expression_1.sol
@@ -2,4 +2,4 @@ contract C {
     uint[-true] ids;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-27='-true'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/invalid_expression_2.sol b/test/libsolidity/syntaxTests/array/length/invalid_expression_2.sol
index 5cb91b942..53322f2a9 100644
--- a/test/libsolidity/syntaxTests/array/length/invalid_expression_2.sol
+++ b/test/libsolidity/syntaxTests/array/length/invalid_expression_2.sol
@@ -2,4 +2,4 @@ contract C {
     uint[true/1] ids;
 }
 // ----
-// TypeError 5462: (22-28): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-28='true/1'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/invalid_expression_3.sol b/test/libsolidity/syntaxTests/array/length/invalid_expression_3.sol
index dbedaaa3b..2a672a3a2 100644
--- a/test/libsolidity/syntaxTests/array/length/invalid_expression_3.sol
+++ b/test/libsolidity/syntaxTests/array/length/invalid_expression_3.sol
@@ -2,4 +2,4 @@ contract C {
     uint[1/true] ids;
 }
 // ----
-// TypeError 5462: (22-28): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-28='1/true'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/invalid_expression_4.sol b/test/libsolidity/syntaxTests/array/length/invalid_expression_4.sol
index dc588eb4b..2bed106ab 100644
--- a/test/libsolidity/syntaxTests/array/length/invalid_expression_4.sol
+++ b/test/libsolidity/syntaxTests/array/length/invalid_expression_4.sol
@@ -2,4 +2,4 @@ contract C {
     uint[1.111111E1111111111111] ids;
 }
 // ----
-// TypeError 5462: (22-44): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-44='1.111111E1111111111111'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/invalid_expression_5.sol b/test/libsolidity/syntaxTests/array/length/invalid_expression_5.sol
index 4e8b76d71..d0c7a7775 100644
--- a/test/libsolidity/syntaxTests/array/length/invalid_expression_5.sol
+++ b/test/libsolidity/syntaxTests/array/length/invalid_expression_5.sol
@@ -2,4 +2,4 @@ contract C {
     uint[3/0] ids;
 }
 // ----
-// TypeError 6020: (22-25): Operator / not compatible with types int_const 3 and int_const 0
+// TypeError 6020: (22-25='3/0'): Operator / not compatible with types int_const 3 and int_const 0
diff --git a/test/libsolidity/syntaxTests/array/length/local_memory_too_large.sol b/test/libsolidity/syntaxTests/array/length/local_memory_too_large.sol
index c9ab030a4..60064cade 100644
--- a/test/libsolidity/syntaxTests/array/length/local_memory_too_large.sol
+++ b/test/libsolidity/syntaxTests/array/length/local_memory_too_large.sol
@@ -9,6 +9,6 @@ contract C {
 }
 // ----
 // TypeError 1534: (48-90): Type too large for memory.
-// TypeError 1534: (96-118): Type too large for memory.
-// TypeError 1534: (124-153): Type too large for memory.
-// TypeError 1534: (159-188): Type too large for memory.
+// TypeError 1534: (96-118='uint[2**30][] memory y'): Type too large for memory.
+// TypeError 1534: (124-153='uint[2**30][2**30][] memory z'): Type too large for memory.
+// TypeError 1534: (159-188='uint[2**16][2**16][] memory w'): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/array/length/non_integer_constant_var.sol b/test/libsolidity/syntaxTests/array/length/non_integer_constant_var.sol
index 0a9e82443..7e2c22252 100644
--- a/test/libsolidity/syntaxTests/array/length/non_integer_constant_var.sol
+++ b/test/libsolidity/syntaxTests/array/length/non_integer_constant_var.sol
@@ -3,4 +3,4 @@ contract C {
     uint[LEN] ids;
 }
 // ----
-// TypeError 5462: (52-55): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (52-55='LEN'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/not_convertible_to_integer.sol b/test/libsolidity/syntaxTests/array/length/not_convertible_to_integer.sol
index b32e6232a..c51ef5240 100644
--- a/test/libsolidity/syntaxTests/array/length/not_convertible_to_integer.sol
+++ b/test/libsolidity/syntaxTests/array/length/not_convertible_to_integer.sol
@@ -2,4 +2,4 @@ contract C {
     uint[true] ids;
 }
 // ----
-// TypeError 5462: (22-26): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-26='true'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim.sol b/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim.sol
index 00a302252..7ce5d9a3c 100644
--- a/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim.sol
+++ b/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim.sol
@@ -6,6 +6,6 @@ contract C {
 }
 // ----
 // TypeError 1534: (26-66): Type too large for memory.
-// TypeError 1534: (96-116): Type too large for memory.
-// TypeError 1534: (146-173): Type too large for memory.
-// TypeError 1534: (203-230): Type too large for memory.
+// TypeError 1534: (96-116='uint[2**30][] memory'): Type too large for memory.
+// TypeError 1534: (146-173='uint[2**30][2**30][] memory'): Type too large for memory.
+// TypeError 1534: (203-230='uint[2**16][2**16][] memory'): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim_ABIv2.sol b/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim_ABIv2.sol
index 7fd7b531b..09cff0bec 100644
--- a/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim_ABIv2.sol
+++ b/test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim_ABIv2.sol
@@ -6,4 +6,4 @@ contract C {
 }
 // ----
 // TypeError 1534: (61-101): Type too large for memory.
-// TypeError 1534: (131-160): Type too large for memory.
+// TypeError 1534: (131-160='uint[2**30][2**30][][] memory'): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/array/length/pure_functions.sol b/test/libsolidity/syntaxTests/array/length/pure_functions.sol
index dc9b4a872..cc13f3060 100644
--- a/test/libsolidity/syntaxTests/array/length/pure_functions.sol
+++ b/test/libsolidity/syntaxTests/array/length/pure_functions.sol
@@ -3,4 +3,4 @@ contract C {
     uint[LEN] ids;
 }
 // ----
-// TypeError 5462: (72-75): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (72-75='LEN'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/too_large.sol b/test/libsolidity/syntaxTests/array/length/too_large.sol
index 687e80303..4fb78e2cf 100644
--- a/test/libsolidity/syntaxTests/array/length/too_large.sol
+++ b/test/libsolidity/syntaxTests/array/length/too_large.sol
@@ -2,4 +2,4 @@ contract C {
     uint[8**90] ids;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-27='8**90'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/tuples.sol b/test/libsolidity/syntaxTests/array/length/tuples.sol
index 9d9079850..e53be99a3 100644
--- a/test/libsolidity/syntaxTests/array/length/tuples.sol
+++ b/test/libsolidity/syntaxTests/array/length/tuples.sol
@@ -2,4 +2,4 @@ contract C {
     uint[(1,2)] a15;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-27='(1,2)'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol b/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol
index 6ea3eda50..470f880b0 100644
--- a/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol
+++ b/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol
@@ -2,4 +2,4 @@ contract C {
     uint[8**90][500] ids;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-27='8**90'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/library_array.sol b/test/libsolidity/syntaxTests/array/library_array.sol
index fec5762f8..9c06244a7 100644
--- a/test/libsolidity/syntaxTests/array/library_array.sol
+++ b/test/libsolidity/syntaxTests/array/library_array.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError 1130: (63-64): Invalid use of a library name.
+// TypeError 1130: (63-64='L'): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/array/new_no_parentheses.sol b/test/libsolidity/syntaxTests/array/new_no_parentheses.sol
index 99287f8fc..8be7fbeeb 100644
--- a/test/libsolidity/syntaxTests/array/new_no_parentheses.sol
+++ b/test/libsolidity/syntaxTests/array/new_no_parentheses.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3904: (60-67): Length has to be placed in parentheses after the array type for new expression.
+// TypeError 3904: (60-67='uint[1]'): Length has to be placed in parentheses after the array type for new expression.
diff --git a/test/libsolidity/syntaxTests/array/no_array_pop.sol b/test/libsolidity/syntaxTests/array/no_array_pop.sol
index a53a19599..d51af4df2 100644
--- a/test/libsolidity/syntaxTests/array/no_array_pop.sol
+++ b/test/libsolidity/syntaxTests/array/no_array_pop.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (63-71): Member "pop" not found or not visible after argument-dependent lookup in uint256.
+// TypeError 9582: (63-71='data.pop'): Member "pop" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/array/pop/calldata_pop.sol b/test/libsolidity/syntaxTests/array/pop/calldata_pop.sol
index 03f038eed..8d9c14f92 100644
--- a/test/libsolidity/syntaxTests/array/pop/calldata_pop.sol
+++ b/test/libsolidity/syntaxTests/array/pop/calldata_pop.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4994: (66-71): Member "pop" is not available in uint256[] calldata outside of storage.
+// TypeError 4994: (66-71='x.pop'): Member "pop" is not available in uint256[] calldata outside of storage.
diff --git a/test/libsolidity/syntaxTests/array/pop/memory_pop.sol b/test/libsolidity/syntaxTests/array/pop/memory_pop.sol
index 96235dcb0..5f81c6ba7 100644
--- a/test/libsolidity/syntaxTests/array/pop/memory_pop.sol
+++ b/test/libsolidity/syntaxTests/array/pop/memory_pop.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4994: (72-77): Member "pop" is not available in uint256[] memory outside of storage.
+// TypeError 4994: (72-77='x.pop'): Member "pop" is not available in uint256[] memory outside of storage.
diff --git a/test/libsolidity/syntaxTests/array/push/calldata_push.sol b/test/libsolidity/syntaxTests/array/push/calldata_push.sol
index 30f344555..66c68c1aa 100644
--- a/test/libsolidity/syntaxTests/array/push/calldata_push.sol
+++ b/test/libsolidity/syntaxTests/array/push/calldata_push.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4994: (66-72): Member "push" is not available in uint256[] calldata outside of storage.
+// TypeError 4994: (66-72='x.push'): Member "push" is not available in uint256[] calldata outside of storage.
diff --git a/test/libsolidity/syntaxTests/array/push/memory_push.sol b/test/libsolidity/syntaxTests/array/push/memory_push.sol
index 446d7576f..0e4ddba41 100644
--- a/test/libsolidity/syntaxTests/array/push/memory_push.sol
+++ b/test/libsolidity/syntaxTests/array/push/memory_push.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4994: (72-78): Member "push" is not available in uint256[] memory outside of storage.
+// TypeError 4994: (72-78='x.push'): Member "push" is not available in uint256[] memory outside of storage.
diff --git a/test/libsolidity/syntaxTests/array/push/storage_with_mapping_push.sol b/test/libsolidity/syntaxTests/array/push/storage_with_mapping_push.sol
index 6032b0c2a..c482ca14b 100644
--- a/test/libsolidity/syntaxTests/array/push/storage_with_mapping_push.sol
+++ b/test/libsolidity/syntaxTests/array/push/storage_with_mapping_push.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 8871: (131-141): Storage arrays with nested mappings do not support .push(<arg>).
+// TypeError 8871: (131-141='array.push'): Storage arrays with nested mappings do not support .push(<arg>).
diff --git a/test/libsolidity/syntaxTests/array/slice/bytes_memory.sol b/test/libsolidity/syntaxTests/array/slice/bytes_memory.sol
index c75f27c63..a5bf98ef8 100644
--- a/test/libsolidity/syntaxTests/array/slice/bytes_memory.sol
+++ b/test/libsolidity/syntaxTests/array/slice/bytes_memory.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (66-72): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (66-72='x[1:2]'): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/bytes_storage.sol b/test/libsolidity/syntaxTests/array/slice/bytes_storage.sol
index a42193d61..4752ce952 100644
--- a/test/libsolidity/syntaxTests/array/slice/bytes_storage.sol
+++ b/test/libsolidity/syntaxTests/array/slice/bytes_storage.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (65-71): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (65-71='x[1:2]'): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/calldata_static.sol b/test/libsolidity/syntaxTests/array/slice/calldata_static.sol
index c78e2a12e..59087ae18 100644
--- a/test/libsolidity/syntaxTests/array/slice/calldata_static.sol
+++ b/test/libsolidity/syntaxTests/array/slice/calldata_static.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (76-82): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (76-82='x[1:2]'): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/member_access.sol b/test/libsolidity/syntaxTests/array/slice/member_access.sol
index 1abcf4b45..94b0758f8 100644
--- a/test/libsolidity/syntaxTests/array/slice/member_access.sol
+++ b/test/libsolidity/syntaxTests/array/slice/member_access.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (92-100): Member "a" not found or not visible after argument-dependent lookup in uint256[] calldata slice.
+// TypeError 9582: (92-100='x[1:2].a'): Member "a" not found or not visible after argument-dependent lookup in uint256[] calldata slice.
diff --git a/test/libsolidity/syntaxTests/array/slice/memory_dynamic.sol b/test/libsolidity/syntaxTests/array/slice/memory_dynamic.sol
index 0a881ef62..b41842c7f 100644
--- a/test/libsolidity/syntaxTests/array/slice/memory_dynamic.sol
+++ b/test/libsolidity/syntaxTests/array/slice/memory_dynamic.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (70-76): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (70-76='x[1:2]'): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/memory_static.sol b/test/libsolidity/syntaxTests/array/slice/memory_static.sol
index 89f49ed96..9645b611d 100644
--- a/test/libsolidity/syntaxTests/array/slice/memory_static.sol
+++ b/test/libsolidity/syntaxTests/array/slice/memory_static.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (72-78): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (72-78='x[1:2]'): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/slice_literal.sol b/test/libsolidity/syntaxTests/array/slice/slice_literal.sol
index 50fc27bbb..2e689ff8a 100644
--- a/test/libsolidity/syntaxTests/array/slice/slice_literal.sol
+++ b/test/libsolidity/syntaxTests/array/slice/slice_literal.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4781: (52-57): Index range access is only possible for arrays and array slices.
+// TypeError 4781: (52-57='1[1:]'): Index range access is only possible for arrays and array slices.
diff --git a/test/libsolidity/syntaxTests/array/slice/slice_memory_bytes.sol b/test/libsolidity/syntaxTests/array/slice/slice_memory_bytes.sol
index 6b93721fc..e07a29427 100644
--- a/test/libsolidity/syntaxTests/array/slice/slice_memory_bytes.sol
+++ b/test/libsolidity/syntaxTests/array/slice/slice_memory_bytes.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (76-82): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (76-82='y[1:2]'): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/slice_memory_string.sol b/test/libsolidity/syntaxTests/array/slice/slice_memory_string.sol
index cfb1da8b5..d986d8783 100644
--- a/test/libsolidity/syntaxTests/array/slice/slice_memory_string.sol
+++ b/test/libsolidity/syntaxTests/array/slice/slice_memory_string.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (77-83): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (77-83='y[1:2]'): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/slice_string.sol b/test/libsolidity/syntaxTests/array/slice/slice_string.sol
index 40b4c13cc..ac5a783aa 100644
--- a/test/libsolidity/syntaxTests/array/slice/slice_string.sol
+++ b/test/libsolidity/syntaxTests/array/slice/slice_string.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4781: (52-58): Index range access is only possible for arrays and array slices.
+// TypeError 4781: (52-58='""[1:]'): Index range access is only possible for arrays and array slices.
diff --git a/test/libsolidity/syntaxTests/array/slice/storage_dynamic.sol b/test/libsolidity/syntaxTests/array/slice/storage_dynamic.sol
index 270209550..bfd563d72 100644
--- a/test/libsolidity/syntaxTests/array/slice/storage_dynamic.sol
+++ b/test/libsolidity/syntaxTests/array/slice/storage_dynamic.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (69-75): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (69-75='x[1:2]'): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/slice/storage_static.sol b/test/libsolidity/syntaxTests/array/slice/storage_static.sol
index 415276c18..7e6809714 100644
--- a/test/libsolidity/syntaxTests/array/slice/storage_static.sol
+++ b/test/libsolidity/syntaxTests/array/slice/storage_static.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1227: (71-77): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (71-77='x[1:2]'): Index range access is only supported for dynamic calldata arrays.
diff --git a/test/libsolidity/syntaxTests/array/static_storage_array_pop.sol b/test/libsolidity/syntaxTests/array/static_storage_array_pop.sol
index 178a22e15..e422c95f8 100644
--- a/test/libsolidity/syntaxTests/array/static_storage_array_pop.sol
+++ b/test/libsolidity/syntaxTests/array/static_storage_array_pop.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (66-74): Member "pop" not found or not visible after argument-dependent lookup in uint256[3] storage ref.
+// TypeError 9582: (66-74='data.pop'): Member "pop" not found or not visible after argument-dependent lookup in uint256[3] storage ref.
diff --git a/test/libsolidity/syntaxTests/array/string_pop.sol b/test/libsolidity/syntaxTests/array/string_pop.sol
index d4a5f725a..7866bd7bd 100644
--- a/test/libsolidity/syntaxTests/array/string_pop.sol
+++ b/test/libsolidity/syntaxTests/array/string_pop.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (65-73): Member "pop" not found or not visible after argument-dependent lookup in string storage ref.
+// TypeError 9582: (65-73='data.pop'): Member "pop" not found or not visible after argument-dependent lookup in string storage ref.
diff --git a/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol b/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol
index 76b49050b..dd1050776 100644
--- a/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol
+++ b/test/libsolidity/syntaxTests/array/uninitialized_storage_var.sol
@@ -7,5 +7,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 3464: (80-81): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (85-86): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (80-81='x'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (85-86='y'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/bound/bound_calldata.sol b/test/libsolidity/syntaxTests/bound/bound_calldata.sol
index ea03a3bd6..6a3860dbd 100644
--- a/test/libsolidity/syntaxTests/bound/bound_calldata.sol
+++ b/test/libsolidity/syntaxTests/bound/bound_calldata.sol
@@ -6,4 +6,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 9582: (136-140): Member "f" not found or not visible after argument-dependent lookup in bytes memory.
+// TypeError 9582: (136-140='_x.f'): Member "f" not found or not visible after argument-dependent lookup in bytes memory.
diff --git a/test/libsolidity/syntaxTests/bound/bound_to_struct.sol b/test/libsolidity/syntaxTests/bound/bound_to_struct.sol
index 59c8e2aa7..aac70bab6 100644
--- a/test/libsolidity/syntaxTests/bound/bound_to_struct.sol
+++ b/test/libsolidity/syntaxTests/bound/bound_to_struct.sol
@@ -7,4 +7,4 @@ contract C {
     using S for S;
 }
 // ----
-// TypeError 4357: (113-114): Library name expected. If you want to attach a function, use '{...}'.
+// TypeError 4357: (113-114='S'): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/bound/interface_using_for.sol b/test/libsolidity/syntaxTests/bound/interface_using_for.sol
index 415971017..7f22dd451 100644
--- a/test/libsolidity/syntaxTests/bound/interface_using_for.sol
+++ b/test/libsolidity/syntaxTests/bound/interface_using_for.sol
@@ -7,4 +7,4 @@ interface I {
     function g() external;
 }
 // ----
-// SyntaxError 9088: (60-76): The "using for" directive is not allowed inside interfaces.
+// SyntaxError 9088: (60-76='using L for int;'): The "using for" directive is not allowed inside interfaces.
diff --git a/test/libsolidity/syntaxTests/bound/using_for_library.sol b/test/libsolidity/syntaxTests/bound/using_for_library.sol
index 8166e9c76..0b0a52bc6 100644
--- a/test/libsolidity/syntaxTests/bound/using_for_library.sol
+++ b/test/libsolidity/syntaxTests/bound/using_for_library.sol
@@ -6,6 +6,6 @@ contract C {
     using L for L;
 }
 // ----
-// TypeError 1130: (55-56): Invalid use of a library name.
-// TypeError 1130: (74-75): Invalid use of a library name.
-// TypeError 1130: (93-94): Invalid use of a library name.
+// TypeError 1130: (55-56='M'): Invalid use of a library name.
+// TypeError 1130: (74-75='L'): Invalid use of a library name.
+// TypeError 1130: (93-94='L'): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_complex1.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_complex1.sol
index 548b9186d..209157e7e 100644
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_complex1.sol
+++ b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_complex1.sol
@@ -2,5 +2,5 @@ contract A { function foo() public { new D(); } }
 contract C { function foo() public { new A(); } }
 contract D is C {}
 // ----
-// TypeError 7813: (37-42): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (87-92): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (37-42='new D'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (87-92='new A'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_free_function.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_free_function.sol
index 13d998d0b..1f836c785 100644
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_free_function.sol
+++ b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_free_function.sol
@@ -8,4 +8,4 @@ contract D
 	receive() external payable { f; }
 }
 // ----
-// TypeError 7813: (16-21): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (16-21='new D'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_mention_only.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_mention_only.sol
index 9fc697727..2ca0f59cb 100644
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_mention_only.sol
+++ b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_mention_only.sol
@@ -5,5 +5,5 @@ contract D {
 	function foo() public pure { C; }
 }
 // ----
-// Warning 6133: (43-44): Statement has no effect.
-// Warning 6133: (93-94): Statement has no effect.
+// Warning 6133: (43-44='D'): Statement has no effect.
+// Warning 6133: (93-94='C'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_new_in_ctor.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_new_in_ctor.sol
index c99a7b104..e7be19861 100644
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_new_in_ctor.sol
+++ b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_new_in_ctor.sol
@@ -2,4 +2,4 @@ contract C {
 	constructor() { new C(); }
 }
 // ----
-// TypeError 7813: (30-35): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (30-35='new C'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_report_first_in_cycle.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_report_first_in_cycle.sol
index a204c4448..0f35c3a04 100644
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_report_first_in_cycle.sol
+++ b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_report_first_in_cycle.sol
@@ -5,9 +5,9 @@ contract D { E x = new E(); }
 contract E { F x = new F(); }
 contract F { E x = new E(); }
 // ----
-// TypeError 7813: (19-24): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (49-54): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (79-84): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (109-114): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (139-144): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (169-174): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (19-24='new B'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (49-54='new C'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (79-84='new D'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (109-114='new E'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (139-144='new F'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (169-174='new E'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_type_mention_only.sol b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_type_mention_only.sol
index ce6b101f5..9c58ff540 100644
--- a/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_type_mention_only.sol
+++ b/test/libsolidity/syntaxTests/bytecodeReferences/circular_reference_type_mention_only.sol
@@ -5,5 +5,5 @@ contract D {
 	function foo() public pure { type(C); }
 }
 // ----
-// Warning 6133: (43-50): Statement has no effect.
-// Warning 6133: (99-106): Statement has no effect.
+// Warning 6133: (43-50='type(D)'): Statement has no effect.
+// Warning 6133: (99-106='type(C)'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/library_called.sol b/test/libsolidity/syntaxTests/bytecodeReferences/library_called.sol
index a0b7e4e7a..11401380e 100644
--- a/test/libsolidity/syntaxTests/bytecodeReferences/library_called.sol
+++ b/test/libsolidity/syntaxTests/bytecodeReferences/library_called.sol
@@ -8,4 +8,4 @@ contract A {
     function f() public pure { L2.foo(); }
 }
 // ----
-// TypeError 7813: (43-48): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (43-48='new A'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/library_function_circular_reference.sol b/test/libsolidity/syntaxTests/bytecodeReferences/library_function_circular_reference.sol
index 53ecc0755..b87b01921 100644
--- a/test/libsolidity/syntaxTests/bytecodeReferences/library_function_circular_reference.sol
+++ b/test/libsolidity/syntaxTests/bytecodeReferences/library_function_circular_reference.sol
@@ -14,5 +14,5 @@ contract C {
 }
 
 // ----
-// TypeError 7813: (48-53): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (161-166): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (48-53='new C'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (161-166='new D'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/library_non_called.sol b/test/libsolidity/syntaxTests/bytecodeReferences/library_non_called.sol
index b7392ff3e..f0c5f6bfd 100644
--- a/test/libsolidity/syntaxTests/bytecodeReferences/library_non_called.sol
+++ b/test/libsolidity/syntaxTests/bytecodeReferences/library_non_called.sol
@@ -8,4 +8,4 @@ contract A {
     function f() public pure { type(L2).creationCode; }
 }
 // ----
-// Warning 6133: (157-178): Statement has no effect.
+// Warning 6133: (157-178='type(L2).creationCode'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/bytecodeReferences/library_public_without_contract.sol b/test/libsolidity/syntaxTests/bytecodeReferences/library_public_without_contract.sol
index 955ea24d9..9840f5c43 100644
--- a/test/libsolidity/syntaxTests/bytecodeReferences/library_public_without_contract.sol
+++ b/test/libsolidity/syntaxTests/bytecodeReferences/library_public_without_contract.sol
@@ -6,4 +6,4 @@ library L2 {
     function foo() internal { type(L1).creationCode; }
 }
 // ----
-// TypeError 7813: (99-120): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (99-120='type(L1).creationCode'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_1.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_1.sol
index 2a731411a..a68eb0d8b 100644
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_1.sol
+++ b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_1.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (71-83): Unicode direction override underflow in comment or string literal.
+// ParserError 8936: (71-83='/*underflow'): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_2.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_2.sol
index a8576fb06..058810593 100644
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_2.sol
+++ b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_2.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (75-87): Unicode direction override underflow in comment or string literal.
+// ParserError 8936: (75-87='/*underflow'): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_3.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_3.sol
index b01970226..2ac05fd01 100644
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_3.sol
+++ b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_3.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (71-86): Mismatching directional override markers in comment or string literal.
+// ParserError 8936: (71-86='/*overflow ‮*'): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_4.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_4.sol
index 45f14cd01..8c4fe2d0e 100644
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_4.sol
+++ b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_4.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (75-93): Mismatching directional override markers in comment or string literal.
+// ParserError 8936: (75-93='/*overflow ‮‮*'): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_6.sol b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_6.sol
index 5ad89117c..b0bdf0787 100644
--- a/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_6.sol
+++ b/test/libsolidity/syntaxTests/comments/multiline_unicode_direction_override_6.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (75-86): Unicode direction override underflow in comment or string literal.
+// ParserError 8936: (75-86='/*overflow'): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_1.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_1.sol
index 16eaaeddb..0f8fc7b5f 100644
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_1.sol
+++ b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_1.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (71-84): Unicode direction override underflow in comment or string literal.
+// ParserError 8936: (71-84='// underflow'): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_2.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_2.sol
index 91f544fb6..d8ca906fd 100644
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_2.sol
+++ b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_2.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (75-88): Unicode direction override underflow in comment or string literal.
+// ParserError 8936: (75-88='// underflow'): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_3.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_3.sol
index bc9b0cff5..56a1dcee8 100644
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_3.sol
+++ b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_3.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (71-86): Mismatching directional override markers in comment or string literal.
+// ParserError 8936: (71-86='// overflow ‮'): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_4.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_4.sol
index 907f213bd..288b2d36f 100644
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_4.sol
+++ b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_4.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (75-93): Mismatching directional override markers in comment or string literal.
+// ParserError 8936: (75-93='// overflow ‮‮'): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_6.sol b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_6.sol
index 2040d6fb2..bab09ec84 100644
--- a/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_6.sol
+++ b/test/libsolidity/syntaxTests/comments/singleline_unicode_direction_override_6.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (75-88): Unicode direction override underflow in comment or string literal.
+// ParserError 8936: (75-88='// underflow'): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_1.sol b/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_1.sol
index f8abd48bf..7fa0a328e 100644
--- a/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_1.sol
+++ b/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_1.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (65-66): Expected '(' but got 'ILLEGAL'
+// ParserError 2314: (65-66='â'): Expected '(' but got 'ILLEGAL'
diff --git a/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_2.sol b/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_2.sol
index 464b62729..83cbdbcc8 100644
--- a/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_2.sol
+++ b/test/libsolidity/syntaxTests/comments/unicode_direction_in_source_2.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (75-76): Invalid token.
+// ParserError 8936: (75-76='â'): Invalid token.
diff --git a/test/libsolidity/syntaxTests/comments/unicode_direction_override_1.sol b/test/libsolidity/syntaxTests/comments/unicode_direction_override_1.sol
index ec3f1052d..58ea919fe 100644
--- a/test/libsolidity/syntaxTests/comments/unicode_direction_override_1.sol
+++ b/test/libsolidity/syntaxTests/comments/unicode_direction_override_1.sol
@@ -7,4 +7,4 @@ contract TimelockUpgrade {
 }
 
 // ----
-// ParserError 8936: (124-135): Mismatching directional override markers in comment or string literal.
+// ParserError 8936: (124-135='/*month‮*'): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/overflow.sol b/test/libsolidity/syntaxTests/constantEvaluator/overflow.sol
index 55bd27901..57b146641 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/overflow.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/overflow.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2643: (65-70): Arithmetic error when computing constant value.
+// TypeError 2643: (65-70='a + 2'): Arithmetic error when computing constant value.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol b/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
index 086d89151..9c0be6a22 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
@@ -1,4 +1,4 @@
 int[L] constant L = 6;
 // ----
-// TypeError 5462: (4-5): Invalid array length, expected integer literal or constant expression.
-// TypeError 9259: (0-21): Only constants of value type and byte array type are implemented.
+// TypeError 5462: (4-5='L'): Invalid array length, expected integer literal or constant expression.
+// TypeError 9259: (0-21='int[L] constant L = 6'): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol b/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
index dfb81378b..b879f43be 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
@@ -2,5 +2,5 @@ contract C {
     int[L] constant L = 6;
 }
 // ----
-// TypeError 5462: (21-22): Invalid array length, expected integer literal or constant expression.
-// TypeError 9259: (17-38): Only constants of value type and byte array type are implemented.
+// TypeError 5462: (21-22='L'): Invalid array length, expected integer literal or constant expression.
+// TypeError 9259: (17-38='int[L] constant L = 6'): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/underflow.sol b/test/libsolidity/syntaxTests/constantEvaluator/underflow.sol
index 6ca25911a..eef731503 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/underflow.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/underflow.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2643: (83-88): Arithmetic error when computing constant value.
+// TypeError 2643: (83-88='a - 1'): Arithmetic error when computing constant value.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/underflow_unary.sol b/test/libsolidity/syntaxTests/constantEvaluator/underflow_unary.sol
index 5887ab19d..464407259 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/underflow_unary.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/underflow_unary.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3667: (85-87): Arithmetic error when computing constant value.
+// TypeError 3667: (85-87='-a'): Arithmetic error when computing constant value.
diff --git a/test/libsolidity/syntaxTests/constants/addmod_mulmod_rational.sol b/test/libsolidity/syntaxTests/constants/addmod_mulmod_rational.sol
index 741cd56ee..4a26d6282 100644
--- a/test/libsolidity/syntaxTests/constants/addmod_mulmod_rational.sol
+++ b/test/libsolidity/syntaxTests/constants/addmod_mulmod_rational.sol
@@ -3,5 +3,5 @@ contract C {
     uint constant b = mulmod(3, 4, 0.1);
 }
 // ----
-// TypeError 9553: (48-51): Invalid type for argument in function call. Invalid implicit conversion from rational_const 1 / 10 to uint256 requested.
-// TypeError 9553: (89-92): Invalid type for argument in function call. Invalid implicit conversion from rational_const 1 / 10 to uint256 requested.
+// TypeError 9553: (48-51='0.1'): Invalid type for argument in function call. Invalid implicit conversion from rational_const 1 / 10 to uint256 requested.
+// TypeError 9553: (89-92='0.1'): Invalid type for argument in function call. Invalid implicit conversion from rational_const 1 / 10 to uint256 requested.
diff --git a/test/libsolidity/syntaxTests/constants/addmod_zero.sol b/test/libsolidity/syntaxTests/constants/addmod_zero.sol
index 2c5a0de49..f20e727d6 100644
--- a/test/libsolidity/syntaxTests/constants/addmod_zero.sol
+++ b/test/libsolidity/syntaxTests/constants/addmod_zero.sol
@@ -6,6 +6,6 @@ contract c {
     uint constant b3 = addmod(3, 4, a2 - 1);
 }
 // ----
-// TypeError 4195: (88-103): Arithmetic modulo zero.
-// TypeError 4195: (128-144): Arithmetic modulo zero.
-// TypeError 4195: (169-189): Arithmetic modulo zero.
+// TypeError 4195: (88-103='addmod(3, 4, 0)'): Arithmetic modulo zero.
+// TypeError 4195: (128-144='addmod(3, 4, a1)'): Arithmetic modulo zero.
+// TypeError 4195: (169-189='addmod(3, 4, a2 - 1)'): Arithmetic modulo zero.
diff --git a/test/libsolidity/syntaxTests/constants/assign_constant_function_value.sol b/test/libsolidity/syntaxTests/constants/assign_constant_function_value.sol
index 5f5624084..1cf345959 100644
--- a/test/libsolidity/syntaxTests/constants/assign_constant_function_value.sol
+++ b/test/libsolidity/syntaxTests/constants/assign_constant_function_value.sol
@@ -3,4 +3,4 @@ contract C {
     uint constant y = x();
 }
 // ----
-// TypeError 8349: (74-77): Initial value for constant variable has to be compile-time constant.
+// TypeError 8349: (74-77='x()'): Initial value for constant variable has to be compile-time constant.
diff --git a/test/libsolidity/syntaxTests/constants/constant_natspec_user.sol b/test/libsolidity/syntaxTests/constants/constant_natspec_user.sol
index feb952860..c166889af 100644
--- a/test/libsolidity/syntaxTests/constants/constant_natspec_user.sol
+++ b/test/libsolidity/syntaxTests/constants/constant_natspec_user.sol
@@ -1,4 +1,4 @@
 /// Documentation
 uint constant x = 8;
 // ----
-// DocstringParsingError 6546: (0-18): Documentation tag @notice not valid for file-level variables.
+// DocstringParsingError 6546: (0-18='/// Documentation'): Documentation tag @notice not valid for file-level variables.
diff --git a/test/libsolidity/syntaxTests/constants/constant_override.sol b/test/libsolidity/syntaxTests/constants/constant_override.sol
index 3aa974012..c4bdf6ec6 100644
--- a/test/libsolidity/syntaxTests/constants/constant_override.sol
+++ b/test/libsolidity/syntaxTests/constants/constant_override.sol
@@ -1,3 +1,3 @@
 uint constant override x = 2;
 // ----
-// ParserError 2314: (14-22): Expected identifier but got 'override'
+// ParserError 2314: (14-22='override'): Expected identifier but got 'override'
diff --git a/test/libsolidity/syntaxTests/constants/constant_unassigned.sol b/test/libsolidity/syntaxTests/constants/constant_unassigned.sol
index 8ee727ed7..7b2df7c26 100644
--- a/test/libsolidity/syntaxTests/constants/constant_unassigned.sol
+++ b/test/libsolidity/syntaxTests/constants/constant_unassigned.sol
@@ -1,3 +1,3 @@
 uint constant x;
 // ----
-// TypeError 4266: (0-15): Uninitialized "constant" variable.
+// TypeError 4266: (0-15='uint constant x'): Uninitialized "constant" variable.
diff --git a/test/libsolidity/syntaxTests/constants/constant_virtual.sol b/test/libsolidity/syntaxTests/constants/constant_virtual.sol
index e6f885cdf..a6489f89f 100644
--- a/test/libsolidity/syntaxTests/constants/constant_virtual.sol
+++ b/test/libsolidity/syntaxTests/constants/constant_virtual.sol
@@ -1,3 +1,3 @@
 uint constant virtual x;
 // ----
-// ParserError 2314: (14-21): Expected identifier but got 'virtual'
+// ParserError 2314: (14-21='virtual'): Expected identifier but got 'virtual'
diff --git a/test/libsolidity/syntaxTests/constants/constant_with_visibility.sol b/test/libsolidity/syntaxTests/constants/constant_with_visibility.sol
index 5b7fbf81c..def84f75b 100644
--- a/test/libsolidity/syntaxTests/constants/constant_with_visibility.sol
+++ b/test/libsolidity/syntaxTests/constants/constant_with_visibility.sol
@@ -1,3 +1,3 @@
 uint public constant x = 7;
 // ----
-// ParserError 2314: (5-11): Expected identifier but got 'public'
+// ParserError 2314: (5-11='public'): Expected identifier but got 'public'
diff --git a/test/libsolidity/syntaxTests/constants/constant_with_visibility_inverted.sol b/test/libsolidity/syntaxTests/constants/constant_with_visibility_inverted.sol
index 6ac50ca92..c2a723a0c 100644
--- a/test/libsolidity/syntaxTests/constants/constant_with_visibility_inverted.sol
+++ b/test/libsolidity/syntaxTests/constants/constant_with_visibility_inverted.sol
@@ -1,3 +1,3 @@
 uint constant public y = 7;
 // ----
-// ParserError 2314: (14-20): Expected identifier but got 'public'
+// ParserError 2314: (14-20='public'): Expected identifier but got 'public'
diff --git a/test/libsolidity/syntaxTests/constants/cross_file_cyclic.sol b/test/libsolidity/syntaxTests/constants/cross_file_cyclic.sol
index 1843204bd..558ad16fb 100644
--- a/test/libsolidity/syntaxTests/constants/cross_file_cyclic.sol
+++ b/test/libsolidity/syntaxTests/constants/cross_file_cyclic.sol
@@ -9,7 +9,7 @@ contract C {
     uint constant a = b;
 }
 // ----
-// TypeError 6161: (b:12-31): The value of the constant b has a cyclic dependency via c.
-// TypeError 6161: (b:33-52): The value of the constant d has a cyclic dependency via b.
-// TypeError 6161: (b:71-90): The value of the constant a has a cyclic dependency via b.
-// TypeError 6161: (a:12-31): The value of the constant c has a cyclic dependency via d.
+// TypeError 6161: (b:12-31='uint constant b = c'): The value of the constant b has a cyclic dependency via c.
+// TypeError 6161: (b:33-52='uint constant d = b'): The value of the constant d has a cyclic dependency via b.
+// TypeError 6161: (b:71-90='uint constant a = b'): The value of the constant a has a cyclic dependency via b.
+// TypeError 6161: (a:12-31='uint constant c = d'): The value of the constant c has a cyclic dependency via d.
diff --git a/test/libsolidity/syntaxTests/constants/cross_file_cyclic_modules.sol b/test/libsolidity/syntaxTests/constants/cross_file_cyclic_modules.sol
index 07dd156b8..4b0a0eda9 100644
--- a/test/libsolidity/syntaxTests/constants/cross_file_cyclic_modules.sol
+++ b/test/libsolidity/syntaxTests/constants/cross_file_cyclic_modules.sol
@@ -9,7 +9,7 @@ contract C {
     uint constant a = b;
 }
 // ----
-// TypeError 6161: (b:17-38): The value of the constant b has a cyclic dependency via c.
-// TypeError 6161: (b:40-59): The value of the constant d has a cyclic dependency via b.
-// TypeError 6161: (b:78-97): The value of the constant a has a cyclic dependency via b.
-// TypeError 6161: (a:12-31): The value of the constant c has a cyclic dependency via d.
+// TypeError 6161: (b:17-38='uint constant b = M.c'): The value of the constant b has a cyclic dependency via c.
+// TypeError 6161: (b:40-59='uint constant d = b'): The value of the constant d has a cyclic dependency via b.
+// TypeError 6161: (b:78-97='uint constant a = b'): The value of the constant a has a cyclic dependency via b.
+// TypeError 6161: (a:12-31='uint constant c = d'): The value of the constant c has a cyclic dependency via d.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_1.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_1.sol
index ebd81d4a2..a6d965196 100644
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_1.sol
+++ b/test/libsolidity/syntaxTests/constants/cyclic_dependency_1.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant a = a;
 }
 // ----
-// TypeError 6161: (17-36): The value of the constant a has a cyclic dependency via a.
+// TypeError 6161: (17-36='uint constant a = a'): The value of the constant a has a cyclic dependency via a.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_2.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_2.sol
index 676f534cc..9efa06c0e 100644
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_2.sol
+++ b/test/libsolidity/syntaxTests/constants/cyclic_dependency_2.sol
@@ -5,6 +5,6 @@ contract C {
     uint constant d = 2 + a;
 }
 // ----
-// TypeError 6161: (17-40): The value of the constant a has a cyclic dependency via c.
+// TypeError 6161: (17-40='uint constant a = b * c'): The value of the constant a has a cyclic dependency via c.
 // TypeError 6161: (71-129): The value of the constant c has a cyclic dependency via d.
-// TypeError 6161: (135-158): The value of the constant d has a cyclic dependency via a.
+// TypeError 6161: (135-158='uint constant d = 2 + a'): The value of the constant d has a cyclic dependency via a.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_3.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_3.sol
index e280f4a97..97441172e 100644
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_3.sol
+++ b/test/libsolidity/syntaxTests/constants/cyclic_dependency_3.sol
@@ -5,7 +5,7 @@ contract C {
     uint constant c = b;
 }
 // ----
-// TypeError 6161: (17-36): The value of the constant x has a cyclic dependency via a.
-// TypeError 6161: (42-65): The value of the constant a has a cyclic dependency via b.
-// TypeError 6161: (71-90): The value of the constant b has a cyclic dependency via c.
-// TypeError 6161: (96-115): The value of the constant c has a cyclic dependency via b.
+// TypeError 6161: (17-36='uint constant x = a'): The value of the constant x has a cyclic dependency via a.
+// TypeError 6161: (42-65='uint constant a = b * c'): The value of the constant a has a cyclic dependency via b.
+// TypeError 6161: (71-90='uint constant b = c'): The value of the constant b has a cyclic dependency via c.
+// TypeError 6161: (96-115='uint constant c = b'): The value of the constant c has a cyclic dependency via b.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_5.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_5.sol
index b8a5b49ae..fb54586e0 100644
--- a/test/libsolidity/syntaxTests/constants/cyclic_dependency_5.sol
+++ b/test/libsolidity/syntaxTests/constants/cyclic_dependency_5.sol
@@ -5,4 +5,4 @@ contract C {
 }
 // ----
 // TypeError 6161: (15-63): The value of the constant a has a cyclic dependency via d.
-// TypeError 6161: (110-129): The value of the constant d has a cyclic dependency via a.
+// TypeError 6161: (110-129='uint constant d = a'): The value of the constant d has a cyclic dependency via a.
diff --git a/test/libsolidity/syntaxTests/constants/division_by_zero.sol b/test/libsolidity/syntaxTests/constants/division_by_zero.sol
index f734ba40c..6f54b7e52 100644
--- a/test/libsolidity/syntaxTests/constants/division_by_zero.sol
+++ b/test/libsolidity/syntaxTests/constants/division_by_zero.sol
@@ -5,5 +5,5 @@ contract c {
     uint constant b2 = 7 / (a2 - 1);
 }
 // ----
-// TypeError 1211: (88-94): Division by zero.
-// TypeError 1211: (119-131): Division by zero.
+// TypeError 1211: (88-94='7 / a1'): Division by zero.
+// TypeError 1211: (119-131='7 / (a2 - 1)'): Division by zero.
diff --git a/test/libsolidity/syntaxTests/constants/file_level_memory.sol b/test/libsolidity/syntaxTests/constants/file_level_memory.sol
index ebaf6a410..2a29ab028 100644
--- a/test/libsolidity/syntaxTests/constants/file_level_memory.sol
+++ b/test/libsolidity/syntaxTests/constants/file_level_memory.sol
@@ -1,3 +1,3 @@
 uint[] memory constant x = 2;
 // ----
-// ParserError 2314: (7-13): Expected identifier but got 'memory'
+// ParserError 2314: (7-13='memory'): Expected identifier but got 'memory'
diff --git a/test/libsolidity/syntaxTests/constants/file_level_memory_inverted.sol b/test/libsolidity/syntaxTests/constants/file_level_memory_inverted.sol
index 95b48d60f..ec9ba2a43 100644
--- a/test/libsolidity/syntaxTests/constants/file_level_memory_inverted.sol
+++ b/test/libsolidity/syntaxTests/constants/file_level_memory_inverted.sol
@@ -1,3 +1,3 @@
 uint[] constant memory x = 2;
 // ----
-// ParserError 2314: (16-22): Expected identifier but got 'memory'
+// ParserError 2314: (16-22='memory'): Expected identifier but got 'memory'
diff --git a/test/libsolidity/syntaxTests/constants/immutable_at_file_level.sol b/test/libsolidity/syntaxTests/constants/immutable_at_file_level.sol
index 01b8ef7c8..14724f1b0 100644
--- a/test/libsolidity/syntaxTests/constants/immutable_at_file_level.sol
+++ b/test/libsolidity/syntaxTests/constants/immutable_at_file_level.sol
@@ -1,4 +1,4 @@
 uint immutable x = 7;
 // ----
-// DeclarationError 8342: (0-20): Only constant variables are allowed at file level.
-// DeclarationError 8297: (0-20): The "immutable" keyword can only be used for state variables.
+// DeclarationError 8342: (0-20='uint immutable x = 7'): Only constant variables are allowed at file level.
+// DeclarationError 8297: (0-20='uint immutable x = 7'): The "immutable" keyword can only be used for state variables.
diff --git a/test/libsolidity/syntaxTests/constants/mod_zero.sol b/test/libsolidity/syntaxTests/constants/mod_zero.sol
index 0fe34b62a..506cef49f 100644
--- a/test/libsolidity/syntaxTests/constants/mod_zero.sol
+++ b/test/libsolidity/syntaxTests/constants/mod_zero.sol
@@ -5,5 +5,5 @@ contract c {
     uint constant b2 = 3 % (a2 - 1);
 }
 // ----
-// TypeError 1211: (88-94): Modulo zero.
-// TypeError 1211: (119-131): Modulo zero.
+// TypeError 1211: (88-94='3 % a1'): Modulo zero.
+// TypeError 1211: (119-131='3 % (a2 - 1)'): Modulo zero.
diff --git a/test/libsolidity/syntaxTests/constants/mulmod_zero.sol b/test/libsolidity/syntaxTests/constants/mulmod_zero.sol
index 5b4e69a04..890488a1e 100644
--- a/test/libsolidity/syntaxTests/constants/mulmod_zero.sol
+++ b/test/libsolidity/syntaxTests/constants/mulmod_zero.sol
@@ -6,6 +6,6 @@ contract c {
     uint constant b3 = mulmod(3, 4, a2 - 1);
 }
 // ----
-// TypeError 4195: (88-103): Arithmetic modulo zero.
-// TypeError 4195: (128-144): Arithmetic modulo zero.
-// TypeError 4195: (169-189): Arithmetic modulo zero.
+// TypeError 4195: (88-103='mulmod(3, 4, 0)'): Arithmetic modulo zero.
+// TypeError 4195: (128-144='mulmod(3, 4, a1)'): Arithmetic modulo zero.
+// TypeError 4195: (169-189='mulmod(3, 4, a2 - 1)'): Arithmetic modulo zero.
diff --git a/test/libsolidity/syntaxTests/constants/name_clash_via_import.sol b/test/libsolidity/syntaxTests/constants/name_clash_via_import.sol
index 847c4d52f..0f0b3dfc3 100644
--- a/test/libsolidity/syntaxTests/constants/name_clash_via_import.sol
+++ b/test/libsolidity/syntaxTests/constants/name_clash_via_import.sol
@@ -4,4 +4,4 @@ uint constant c = 7;
 import {c as d} from "a";
 uint constant d = 7;
 // ----
-// DeclarationError 2333: (b:26-45): Identifier already declared.
+// DeclarationError 2333: (b:26-45='uint constant d = 7'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/constants/non_constant.sol b/test/libsolidity/syntaxTests/constants/non_constant.sol
index 2851d1e10..8cfa0ea9b 100644
--- a/test/libsolidity/syntaxTests/constants/non_constant.sol
+++ b/test/libsolidity/syntaxTests/constants/non_constant.sol
@@ -1,3 +1,3 @@
 uint x = 7;
 // ----
-// DeclarationError 8342: (0-10): Only constant variables are allowed at file level.
+// DeclarationError 8342: (0-10='uint x = 7'): Only constant variables are allowed at file level.
diff --git a/test/libsolidity/syntaxTests/constants/pure_non_rational.sol b/test/libsolidity/syntaxTests/constants/pure_non_rational.sol
index 642ac39f7..5b663c7d0 100644
--- a/test/libsolidity/syntaxTests/constants/pure_non_rational.sol
+++ b/test/libsolidity/syntaxTests/constants/pure_non_rational.sol
@@ -8,4 +8,4 @@ contract C {
 	uint[c] mem;
 }
 // ----
-// TypeError 5462: (392-393): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (392-393='c'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/constants/redefinition_cross_file.sol b/test/libsolidity/syntaxTests/constants/redefinition_cross_file.sol
index 5ce740377..1a632b0a6 100644
--- a/test/libsolidity/syntaxTests/constants/redefinition_cross_file.sol
+++ b/test/libsolidity/syntaxTests/constants/redefinition_cross_file.sol
@@ -5,4 +5,4 @@ uint constant c = 7;
 import "a";
 uint constant c = 7;
 // ----
-// DeclarationError 2333: (b:12-31): Identifier already declared.
+// DeclarationError 2333: (b:12-31='uint constant c = 7'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/constants/redefinition_public_constant.sol b/test/libsolidity/syntaxTests/constants/redefinition_public_constant.sol
index bbb71b5ac..c6b463eac 100644
--- a/test/libsolidity/syntaxTests/constants/redefinition_public_constant.sol
+++ b/test/libsolidity/syntaxTests/constants/redefinition_public_constant.sol
@@ -1,4 +1,4 @@
 uint constant c = 7;
 uint constant c = 8;
 // ----
-// DeclarationError 2333: (21-40): Identifier already declared.
+// DeclarationError 2333: (21-40='uint constant c = 8'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/constants/struct_constant.sol b/test/libsolidity/syntaxTests/constants/struct_constant.sol
index 9195dac0c..d690aae17 100644
--- a/test/libsolidity/syntaxTests/constants/struct_constant.sol
+++ b/test/libsolidity/syntaxTests/constants/struct_constant.sol
@@ -1,4 +1,4 @@
 struct S { uint x; }
 S constant s;
 // ----
-// TypeError 9259: (21-33): Only constants of value type and byte array type are implemented.
+// TypeError 9259: (21-33='S constant s'): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol b/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol
index 491c688cc..aa8717199 100644
--- a/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol
+++ b/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol
@@ -12,4 +12,4 @@ contract Parent {
 contract Child is Parent {
 }
 // ----
-// TypeError 3656: (226-254): Contract "Child" should be marked as abstract.
+// TypeError 3656: (226-254='contract Child is Parent { }'): Contract "Child" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/constructor/calldata_constructor_args.sol b/test/libsolidity/syntaxTests/constructor/calldata_constructor_args.sol
index 616fbe5a8..eb64c18a3 100644
--- a/test/libsolidity/syntaxTests/constructor/calldata_constructor_args.sol
+++ b/test/libsolidity/syntaxTests/constructor/calldata_constructor_args.sol
@@ -2,4 +2,4 @@ contract C {
     constructor(uint[] calldata) public {}
 }
 // ----
-// TypeError 6651: (29-44): Data location must be "storage" or "memory" for constructor parameter, but "calldata" was given.
+// TypeError 6651: (29-44='uint[] calldata'): Data location must be "storage" or "memory" for constructor parameter, but "calldata" was given.
diff --git a/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor.sol b/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor.sol
index c2735f467..5fe554db0 100644
--- a/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor.sol
@@ -5,4 +5,4 @@ contract D is C {
 	constructor() { }
 }
 // ----
-// Warning 2462: (23-48): Visibility for constructor is ignored. If you want the contract to be non-deployable, making it "abstract" is sufficient.
+// Warning 2462: (23-48='constructor() internal {}'): Visibility for constructor is ignored. If you want the contract to be non-deployable, making it "abstract" is sufficient.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol b/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol
index c32dc60b5..8049b3eda 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol
@@ -50,10 +50,10 @@ contract C {
     }
 }
 // ----
-// TypeError 9553: (415-428): Invalid type for argument in function call. Invalid implicit conversion from function () view external returns (uint256) to function () pure external returns (uint256) requested.
-// TypeError 9553: (465-481): Invalid type for argument in function call. Invalid implicit conversion from function () external returns (uint256) to function () pure external returns (uint256) requested.
-// TypeError 9553: (518-545): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) pure external returns (uint256) to function () pure external returns (uint256) requested.
-// TypeError 9553: (582-589): Invalid type for argument in function call. Invalid implicit conversion from function () view returns (uint256) to function () pure external returns (uint256) requested. Special functions can not be converted to function types.
-// TypeError 9553: (626-629): Invalid type for argument in function call. Invalid implicit conversion from function () pure returns (uint256) to function () pure external returns (uint256) requested. Special functions can not be converted to function types.
-// TypeError 9553: (666-686): Invalid type for argument in function call. Invalid implicit conversion from function () pure returns (uint256) to function () pure external returns (uint256) requested. Special functions can not be converted to function types.
-// TypeError 9582: (723-748): Member "testInternalFunction" not found or not visible after argument-dependent lookup in contract C.
+// TypeError 9553: (415-428='this.testView'): Invalid type for argument in function call. Invalid implicit conversion from function () view external returns (uint256) to function () pure external returns (uint256) requested.
+// TypeError 9553: (465-481='this.testDefault'): Invalid type for argument in function call. Invalid implicit conversion from function () external returns (uint256) to function () pure external returns (uint256) requested.
+// TypeError 9553: (518-545='this.testDifferentSignature'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) pure external returns (uint256) to function () pure external returns (uint256) requested.
+// TypeError 9553: (582-589='gasleft'): Invalid type for argument in function call. Invalid implicit conversion from function () view returns (uint256) to function () pure external returns (uint256) requested. Special functions can not be converted to function types.
+// TypeError 9553: (626-629='L.f'): Invalid type for argument in function call. Invalid implicit conversion from function () pure returns (uint256) to function () pure external returns (uint256) requested. Special functions can not be converted to function types.
+// TypeError 9553: (666-686='testInternalFunction'): Invalid type for argument in function call. Invalid implicit conversion from function () pure returns (uint256) to function () pure external returns (uint256) requested. Special functions can not be converted to function types.
+// TypeError 9582: (723-748='this.testInternalFunction'): Member "testInternalFunction" not found or not visible after argument-dependent lookup in contract C.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_internal_function.sol b/test/libsolidity/syntaxTests/constructor/constructor_internal_function.sol
index bc57055e8..bf5cdde95 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_internal_function.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_internal_function.sol
@@ -2,4 +2,4 @@ contract A {
     constructor(function() internal) {}
 }
 // ----
-// TypeError 4103: (29-49): Internal type is not allowed for public or external functions. You can make the contract abstract to avoid this problem.
+// TypeError 4103: (29-49='function() internal)'): Internal type is not allowed for public or external functions. You can make the contract abstract to avoid this problem.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol b/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol
index b9e0ed801..6a5f67a57 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol
@@ -2,4 +2,4 @@ contract A {
     constructor(mapping(uint => uint) memory a) {}
 }
 // ----
-// TypeError 4103: (29-59): Types containing (nested) mappings can only be parameters or return variables of internal or library functions. You can make the contract abstract to avoid this problem.
+// TypeError 4103: (29-59='mapping(uint => uint) memory a'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions. You can make the contract abstract to avoid this problem.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory_abstract.sol b/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory_abstract.sol
index 416287895..d9aa56c18 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory_abstract.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory_abstract.sol
@@ -2,4 +2,4 @@ abstract contract A {
     constructor(mapping(uint => uint) memory a) {}
 }
 // ----
-// TypeError 4061: (38-68): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (38-68='mapping(uint => uint) memory a'): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_old.sol b/test/libsolidity/syntaxTests/constructor/constructor_old.sol
index f89a96412..3982208fc 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_old.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_old.sol
@@ -1,4 +1,4 @@
 contract A { function A() public {} }
 // ----
-// SyntaxError 5796: (13-35): Functions are not allowed to have the same name as the contract. If you intend this to be a constructor, use "constructor(...) { ... }" to define it.
-// Warning 2519: (13-35): This declaration shadows an existing declaration.
+// SyntaxError 5796: (13-35='function A() public {}'): Functions are not allowed to have the same name as the contract. If you intend this to be a constructor, use "constructor(...) { ... }" to define it.
+// Warning 2519: (13-35='function A() public {}'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_override.sol b/test/libsolidity/syntaxTests/constructor/constructor_override.sol
index c0e363f35..43fffedda 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_override.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_override.sol
@@ -2,4 +2,4 @@ contract C {
     constructor() override {}
 }
 // ----
-// TypeError 1209: (17-42): Constructors cannot override.
+// TypeError 1209: (17-42='constructor() override {}'): Constructors cannot override.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_state_mutability.sol b/test/libsolidity/syntaxTests/constructor/constructor_state_mutability.sol
index 487009d07..541198345 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_state_mutability.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_state_mutability.sol
@@ -5,5 +5,5 @@ contract test2 {
   constructor() pure {}
 }
 // ----
-// TypeError 1558: (19-40): Constructor must be payable or non-payable, but is "view".
-// TypeError 1558: (62-83): Constructor must be payable or non-payable, but is "pure".
+// TypeError 1558: (19-40='constructor() view {}'): Constructor must be payable or non-payable, but is "view".
+// TypeError 1558: (62-83='constructor() pure {}'): Constructor must be payable or non-payable, but is "pure".
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_storage.sol b/test/libsolidity/syntaxTests/constructor/constructor_storage.sol
index 9388da132..d7ae2b654 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_storage.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_storage.sol
@@ -2,4 +2,4 @@ contract A {
     constructor(uint[] storage a) {}
 }
 // ----
-// TypeError 3644: (29-45): This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.
+// TypeError 3644: (29-45='uint[] storage a'): This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_virtual.sol b/test/libsolidity/syntaxTests/constructor/constructor_virtual.sol
index 61955b6ef..ead3800c1 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_virtual.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_virtual.sol
@@ -2,4 +2,4 @@ contract C {
     constructor() virtual {}
 }
 // ----
-// TypeError 7001: (17-41): Constructors cannot be virtual.
+// TypeError 7001: (17-41='constructor() virtual {}'): Constructors cannot be virtual.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol b/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol
index 0175e22f7..d21af99ca 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol
@@ -10,4 +10,4 @@ contract B is A {
 }
 // ----
 // TypeError 3656: (124-303): Contract "B" should be marked as abstract.
-// TypeError 9640: (252-256): Explicit type conversion not allowed from "string memory" to "contract A".
+// TypeError 9640: (252-256='A(y)'): Explicit type conversion not allowed from "string memory" to "contract A".
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_without_implementation.sol b/test/libsolidity/syntaxTests/constructor/constructor_without_implementation.sol
index 869cc18ad..b3b476eef 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_without_implementation.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_without_implementation.sol
@@ -2,4 +2,4 @@ contract C {
 	constructor();
 }
 // ----
-// TypeError 5700: (14-28): Constructor must be implemented if declared.
+// TypeError 5700: (14-28='constructor();'): Constructor must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/constructor/external_constructor.sol b/test/libsolidity/syntaxTests/constructor/external_constructor.sol
index 54ce01b28..1077c5bd1 100644
--- a/test/libsolidity/syntaxTests/constructor/external_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/external_constructor.sol
@@ -2,4 +2,4 @@ contract test {
 	constructor() external {}
 }
 // ----
-// TypeError 9239: (17-42): Constructor cannot have visibility.
+// TypeError 9239: (17-42='constructor() external {}'): Constructor cannot have visibility.
diff --git a/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol b/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol
index ae0815ec6..a57aedefe 100644
--- a/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol
@@ -2,4 +2,4 @@ contract C {
     function constructor();
 }
 // ----
-// ParserError 3323: (26-37): This function is named "constructor" but is not the constructor of the contract. If you intend this to be a constructor, use "constructor(...) { ... }" without the "function" keyword to define it.
+// ParserError 3323: (26-37='constructor'): This function is named "constructor" but is not the constructor of the contract. If you intend this to be a constructor, use "constructor(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract.sol
index 461857ff1..c87445da2 100644
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract.sol
+++ b/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract.sol
@@ -5,4 +5,4 @@ contract D {
 	function f() public { C c = new C(); c; }
 }
 // ----
-// TypeError 4614: (84-89): Cannot instantiate an abstract contract.
+// TypeError 4614: (84-89='new C'): Cannot instantiate an abstract contract.
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract_inverted.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract_inverted.sol
index f947ed675..9bbce185b 100644
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract_inverted.sol
+++ b/test/libsolidity/syntaxTests/constructor/inconstructible_abstract_contract_inverted.sol
@@ -10,4 +10,4 @@ abstract contract A {
 	constructor(address) {}
 }
 // ----
-// TypeError 4614: (134-139): Cannot instantiate an abstract contract.
+// TypeError 4614: (134-139='new A'): Cannot instantiate an abstract contract.
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor.sol
index fa2b494c0..f9412b116 100644
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor.sol
@@ -5,4 +5,4 @@ contract D {
 	function f() public { C c = new C(); c; }
 }
 // ----
-// DeclarationError 1845: (14-39): Non-abstract contracts cannot have internal constructors. Remove the "internal" keyword and make the contract abstract to fix this.
+// DeclarationError 1845: (14-39='constructor() internal {}'): Non-abstract contracts cannot have internal constructors. Remove the "internal" keyword and make the contract abstract to fix this.
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted.sol
index a20e9e2e3..1bfdeaa0d 100644
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted.sol
+++ b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted.sol
@@ -10,4 +10,4 @@ contract A {
 	constructor(address) internal {}
 }
 // ----
-// DeclarationError 1845: (175-207): Non-abstract contracts cannot have internal constructors. Remove the "internal" keyword and make the contract abstract to fix this.
+// DeclarationError 1845: (175-207='constructor(address) internal {}'): Non-abstract contracts cannot have internal constructors. Remove the "internal" keyword and make the contract abstract to fix this.
diff --git a/test/libsolidity/syntaxTests/constructor/interface_constructor.sol b/test/libsolidity/syntaxTests/constructor/interface_constructor.sol
index bbdab25a6..db48e77c8 100644
--- a/test/libsolidity/syntaxTests/constructor/interface_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/interface_constructor.sol
@@ -2,5 +2,5 @@ interface I {
 	constructor();
 }
 // ----
-// TypeError 6482: (15-29): Constructor cannot be defined in interfaces.
-// TypeError 5700: (15-29): Constructor must be implemented if declared.
+// TypeError 6482: (15-29='constructor();'): Constructor cannot be defined in interfaces.
+// TypeError 5700: (15-29='constructor();'): Constructor must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/constructor/internal_constructor_non_abstract.sol b/test/libsolidity/syntaxTests/constructor/internal_constructor_non_abstract.sol
index 66f663605..1315a1ab3 100644
--- a/test/libsolidity/syntaxTests/constructor/internal_constructor_non_abstract.sol
+++ b/test/libsolidity/syntaxTests/constructor/internal_constructor_non_abstract.sol
@@ -2,4 +2,4 @@ contract C {
 	constructor() internal {}
 }
 // ----
-// DeclarationError 1845: (14-39): Non-abstract contracts cannot have internal constructors. Remove the "internal" keyword and make the contract abstract to fix this.
+// DeclarationError 1845: (14-39='constructor() internal {}'): Non-abstract contracts cannot have internal constructors. Remove the "internal" keyword and make the contract abstract to fix this.
diff --git a/test/libsolidity/syntaxTests/constructor/library_constructor.sol b/test/libsolidity/syntaxTests/constructor/library_constructor.sol
index bd1fa9550..4f7abb87e 100644
--- a/test/libsolidity/syntaxTests/constructor/library_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/library_constructor.sol
@@ -2,5 +2,5 @@ library Lib {
 	constructor();
 }
 // ----
-// TypeError 7634: (15-29): Constructor cannot be defined in libraries.
-// TypeError 5700: (15-29): Constructor must be implemented if declared.
+// TypeError 7634: (15-29='constructor();'): Constructor cannot be defined in libraries.
+// TypeError 5700: (15-29='constructor();'): Constructor must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/constructor/msg_value_non_payable.sol b/test/libsolidity/syntaxTests/constructor/msg_value_non_payable.sol
index 8392cdf63..6de961a61 100644
--- a/test/libsolidity/syntaxTests/constructor/msg_value_non_payable.sol
+++ b/test/libsolidity/syntaxTests/constructor/msg_value_non_payable.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5887: (68-77): "msg.value" and "callvalue()" can only be used in payable constructors. Make the constructor "payable" to avoid this error.
+// TypeError 5887: (68-77='msg.value'): "msg.value" and "callvalue()" can only be used in payable constructors. Make the constructor "payable" to avoid this error.
diff --git a/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol b/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol
index 8e0c323b8..fc6e44446 100644
--- a/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol
+++ b/test/libsolidity/syntaxTests/constructor/nonabiv2_type.sol
@@ -3,4 +3,4 @@ contract C {
 	constructor(uint[][][] memory t) {}
 }
 // ----
-// TypeError 4957: (46-65): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature. Alternatively, make the contract abstract and supply the constructor arguments from a derived contract.
+// TypeError 4957: (46-65='uint[][][] memory t'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature. Alternatively, make the contract abstract and supply the constructor arguments from a derived contract.
diff --git a/test/libsolidity/syntaxTests/constructor/nonpayable_new.sol b/test/libsolidity/syntaxTests/constructor/nonpayable_new.sol
index cb1923c1f..85ff49795 100644
--- a/test/libsolidity/syntaxTests/constructor/nonpayable_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/nonpayable_new.sol
@@ -17,7 +17,7 @@ contract C {
 	}
 }
 // ----
-// TypeError 7006: (214-231): Cannot set option "value", since the constructor of contract B1 is not payable.
-// TypeError 7006: (237-254): Cannot set option "value", since the constructor of contract B2 is not payable.
-// TypeError 7006: (260-277): Cannot set option "value", since the constructor of contract B3 is not payable.
-// TypeError 7006: (283-300): Cannot set option "value", since the constructor of contract B4 is not payable.
+// TypeError 7006: (214-231='new B1{value: 10}'): Cannot set option "value", since the constructor of contract B1 is not payable.
+// TypeError 7006: (237-254='new B2{value: 10}'): Cannot set option "value", since the constructor of contract B2 is not payable.
+// TypeError 7006: (260-277='new B3{value: 10}'): Cannot set option "value", since the constructor of contract B3 is not payable.
+// TypeError 7006: (283-300='new B4{value: 10}'): Cannot set option "value", since the constructor of contract B4 is not payable.
diff --git a/test/libsolidity/syntaxTests/constructor/not_a_contract.sol b/test/libsolidity/syntaxTests/constructor/not_a_contract.sol
index a9a121fe0..772b4642a 100644
--- a/test/libsolidity/syntaxTests/constructor/not_a_contract.sol
+++ b/test/libsolidity/syntaxTests/constructor/not_a_contract.sol
@@ -6,4 +6,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 5540: (147-152): Identifier is not a contract.
+// TypeError 5540: (147-152='new S'): Identifier is not a contract.
diff --git a/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol b/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol
index d33d92860..3a805668e 100644
--- a/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol
@@ -7,4 +7,4 @@ contract B is A {
 }
 // ----
 // Warning 2519: (58-101): This declaration shadows an existing declaration.
-// TypeError 9582: (130-133): Member "f" not found or not visible after argument-dependent lookup in function () pure returns (uint8).
+// TypeError 9582: (130-133='A.f'): Member "f" not found or not visible after argument-dependent lookup in function () pure returns (uint8).
diff --git a/test/libsolidity/syntaxTests/constructor/public_constructor_abstract.sol b/test/libsolidity/syntaxTests/constructor/public_constructor_abstract.sol
index 0134fd243..2dd05ce00 100644
--- a/test/libsolidity/syntaxTests/constructor/public_constructor_abstract.sol
+++ b/test/libsolidity/syntaxTests/constructor/public_constructor_abstract.sol
@@ -2,4 +2,4 @@ abstract contract C {
 	constructor() public {}
 }
 // ----
-// DeclarationError 8295: (23-46): Abstract contracts cannot have public constructors. Remove the "public" keyword to fix this.
+// DeclarationError 8295: (23-46='constructor() public {}'): Abstract contracts cannot have public constructors. Remove the "public" keyword to fix this.
diff --git a/test/libsolidity/syntaxTests/constructor/public_constructor_non_abstract.sol b/test/libsolidity/syntaxTests/constructor/public_constructor_non_abstract.sol
index 8f6ca5e54..5abdfdd50 100644
--- a/test/libsolidity/syntaxTests/constructor/public_constructor_non_abstract.sol
+++ b/test/libsolidity/syntaxTests/constructor/public_constructor_non_abstract.sol
@@ -2,4 +2,4 @@ contract C {
 	constructor() public {}
 }
 // ----
-// Warning 2462: (14-37): Visibility for constructor is ignored. If you want the contract to be non-deployable, making it "abstract" is sufficient.
+// Warning 2462: (14-37='constructor() public {}'): Visibility for constructor is ignored. If you want the contract to be non-deployable, making it "abstract" is sufficient.
diff --git a/test/libsolidity/syntaxTests/constructor/returns_in_constructor.sol b/test/libsolidity/syntaxTests/constructor/returns_in_constructor.sol
index c3eea9ea8..067dbf228 100644
--- a/test/libsolidity/syntaxTests/constructor/returns_in_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/returns_in_constructor.sol
@@ -2,4 +2,4 @@ contract test {
 	constructor() returns (uint a) { }
 }
 // ----
-// TypeError 9712: (39-47): Non-empty "returns" directive for constructor.
+// TypeError 9712: (39-47='(uint a)'): Non-empty "returns" directive for constructor.
diff --git a/test/libsolidity/syntaxTests/constructor/two_constructors.sol b/test/libsolidity/syntaxTests/constructor/two_constructors.sol
index 6cd7abf73..f8d310d63 100644
--- a/test/libsolidity/syntaxTests/constructor/two_constructors.sol
+++ b/test/libsolidity/syntaxTests/constructor/two_constructors.sol
@@ -3,4 +3,4 @@ contract test {
 	constructor() {}
 }
 // ----
-// DeclarationError 7997: (40-56): More than one constructor defined.
+// DeclarationError 7997: (40-56='constructor() {}'): More than one constructor defined.
diff --git a/test/libsolidity/syntaxTests/constructor_this.sol b/test/libsolidity/syntaxTests/constructor_this.sol
index 3740cf867..d827543cb 100644
--- a/test/libsolidity/syntaxTests/constructor_this.sol
+++ b/test/libsolidity/syntaxTests/constructor_this.sol
@@ -8,5 +8,5 @@ contract C {
     }
 }
 // ----
-// Warning 5805: (165-169): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
-// Warning 5805: (184-188): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
+// Warning 5805: (165-169='this'): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
+// Warning 5805: (184-188='this'): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
diff --git a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_dynamic_array.sol b/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_dynamic_array.sol
index 2baadc8d0..7909e6aa3 100644
--- a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_dynamic_array.sol
@@ -2,4 +2,4 @@ contract C {
     function f() internal returns (uint256[] calldata) {}
 }
 // ----
-// TypeError 3464: (48-66): This variable is of calldata pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (48-66='uint256[] calldata'): This variable is of calldata pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_static_array.sol b/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_static_array.sol
index 0adfc86fe..26f71b73c 100644
--- a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_static_array.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_static_array.sol
@@ -2,4 +2,4 @@ contract C {
     function f() internal returns (uint256[1] calldata) {}
 }
 // ----
-// TypeError 3464: (48-67): This variable is of calldata pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (48-67='uint256[1] calldata'): This variable is of calldata pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_struct.sol b/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_struct.sol
index fd682b090..1eb8af6e2 100644
--- a/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_struct.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/calldataReturn/calldata_return_struct.sol
@@ -3,4 +3,4 @@ contract C {
     function f() internal returns (S calldata) {}
 }
 // ----
-// TypeError 3464: (76-86): This variable is of calldata pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (76-86='S calldata'): This variable is of calldata pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/free_function_crash.sol b/test/libsolidity/syntaxTests/controlFlow/free_function_crash.sol
index a0f17f7ae..a3555b75b 100644
--- a/test/libsolidity/syntaxTests/controlFlow/free_function_crash.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/free_function_crash.sol
@@ -9,6 +9,6 @@ contract C {
 }
 contract C2 is C0 {}
 // ----
-// Warning 2519: (16-40): This declaration shadows an existing declaration.
-// Warning 2519: (43-70): This declaration shadows an existing declaration.
-// Warning 2519: (132-156): This declaration shadows an existing declaration.
+// Warning 2519: (16-40='function f() external {}'): This declaration shadows an existing declaration.
+// Warning 2519: (43-70='function f(int) external {}'): This declaration shadows an existing declaration.
+// Warning 2519: (132-156='function f() external {}'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/controlFlow/leave_outside_function.sol b/test/libsolidity/syntaxTests/controlFlow/leave_outside_function.sol
index 81727b80b..3eed0641a 100644
--- a/test/libsolidity/syntaxTests/controlFlow/leave_outside_function.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/leave_outside_function.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// SyntaxError 8149: (178-183): Keyword "leave" can only be used inside a function.
+// SyntaxError 8149: (178-183='leave'): Keyword "leave" can only be used inside a function.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/if_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/if_declaration_err.sol
index 9b155fd2d..75738cc76 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/if_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localCalldataVariables/if_declaration_err.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (141-142): This variable is of calldata pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (141-142='c'): This variable is of calldata pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/for_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/for_declaration_err.sol
index 61c382282..e39c5279c 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/for_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/for_declaration_err.sol
@@ -31,7 +31,7 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (189-190): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (340-341): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (491-492): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (642-643): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (189-190='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (340-341='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (491-492='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (642-643='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/if_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/if_declaration_err.sol
index 120199c14..3cb07aca4 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/if_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/if_declaration_err.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (188-189): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (188-189='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/reverting_function_declaration.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/reverting_function_declaration.sol
index 5b5738523..24e0d6856 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/reverting_function_declaration.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/reverting_function_declaration.sol
@@ -12,4 +12,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (287-288): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (287-288='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/switch_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/switch_declaration_err.sol
index da2f2fe61..6c4039bc0 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/switch_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/assembly/switch_declaration_err.sol
@@ -29,5 +29,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (208-209): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (421-422): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (208-209='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (421-422='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_err.sol
index e939dbed2..c3bf7c725 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_err.sol
@@ -55,12 +55,12 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (184-185): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (145-150): Unreachable code.
-// Warning 5740: (168-173): Unreachable code.
-// TypeError 3464: (411-412): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (325-330): Unreachable code.
-// TypeError 3464: (635-636): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (862-863): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (1011-1012): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (972-977): Unreachable code.
+// TypeError 3464: (184-185='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// Warning 5740: (145-150='c = s'): Unreachable code.
+// Warning 5740: (168-173='false'): Unreachable code.
+// TypeError 3464: (411-412='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// Warning 5740: (325-330='c = s'): Unreachable code.
+// TypeError 3464: (635-636='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (862-863='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (1011-1012='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// Warning 5740: (972-977='c = s'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_fine.sol
index e46cfbf95..67efd464a 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_fine.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/dowhile_declaration_fine.sol
@@ -41,4 +41,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (606-611): Unreachable code.
+// Warning 5740: (606-611='false'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/for_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/for_declaration_err.sol
index 50585d384..ee073533e 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/for_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/for_declaration_err.sol
@@ -16,5 +16,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (143-144): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (261-262): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (143-144='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (261-262='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/if_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/if_declaration_err.sol
index 2787f3efb..389b860ee 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/if_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/if_declaration_err.sol
@@ -18,5 +18,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (138-139): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (330-331): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (138-139='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (330-331='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/short_circuit_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/short_circuit_declaration_err.sol
index 28665925a..5c005bad4 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/short_circuit_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/short_circuit_declaration_err.sol
@@ -19,6 +19,6 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (137-138): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (235-236): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (398-399): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (137-138='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (235-236='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (398-399='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_err.sol
index b5f79de12..35c85ff21 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_err.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (145-146): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (145-146='x'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_declaration_err.sol
index f9ee41a0a..3d4832fd2 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_declaration_err.sol
@@ -13,5 +13,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (152-153): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (266-267): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (152-153='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (266-267='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/try_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/try_declaration_err.sol
index 6e6ec3722..e1e95851a 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/try_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/try_declaration_err.sol
@@ -36,7 +36,7 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// TypeError 3464: (206-207): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (343-344): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (526-527): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (653-654): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (206-207='r'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (343-344='r'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (526-527='r'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (653-654='r'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/while_declaration_err.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/while_declaration_err.sol
index b120554cc..5bc1c3a0d 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/while_declaration_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/while_declaration_err.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (161-162): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (161-162='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_err.sol b/test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_err.sol
index 050c422bf..570962405 100644
--- a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/mappingReturn/named_err.sol
@@ -2,4 +2,4 @@ contract C {
     function f() internal pure returns (mapping(uint=>uint) storage r) { }
 }
 // ----
-// TypeError 3464: (53-82): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (53-82='mapping(uint=>uint) storage r'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_err.sol b/test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_err.sol
index f8bb7d12e..39cc92ec1 100644
--- a/test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/mappingReturn/unnamed_err.sol
@@ -2,4 +2,4 @@ contract C {
     function f() internal pure returns (mapping(uint=>uint) storage) {}
 }
 // ----
-// TypeError 3464: (53-80): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (53-80='mapping(uint=>uint) storage'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/modifiers/implemented_without_placeholder.sol b/test/libsolidity/syntaxTests/controlFlow/modifiers/implemented_without_placeholder.sol
index 08b4ef12e..518e8c1b5 100644
--- a/test/libsolidity/syntaxTests/controlFlow/modifiers/implemented_without_placeholder.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/modifiers/implemented_without_placeholder.sol
@@ -5,4 +5,4 @@ abstract contract A {
     modifier mod() virtual { }
 }
 // ----
-// SyntaxError 2883: (129-132): Modifier body does not contain '_'.
+// SyntaxError 2883: (129-132='{ }'): Modifier body does not contain '_'.
diff --git a/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol b/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol
index 63d915369..5cfd2adf8 100644
--- a/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol
@@ -9,4 +9,4 @@ contract A {
 	}
 }
 // ----
-// TypeError 3464: (118-132): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (118-132='uint[] storage'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol b/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol
index 3c5eb80ee..63b971226 100644
--- a/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol
@@ -13,5 +13,5 @@ contract B is A {
 	}
 }
 // ----
-// Warning 5740: (65-69): Unreachable code.
-// TypeError 3464: (49-63): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// Warning 5740: (65-69='{ 	}'): Unreachable code.
+// TypeError 3464: (49-63='uint[] storage'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/for_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/for_err.sol
index 5195d0379..ef11aca43 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/for_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/for_err.sol
@@ -23,7 +23,7 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (228-239): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (369-380): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (510-521): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (87-98='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (228-239='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (369-380='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (510-521='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/if_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/if_err.sol
index 7e3ceeb20..dc77018ea 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/if_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/if_err.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (96-107): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (96-107='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/reverting_function.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/reverting_function.sol
index 11d8edfb8..0ac233195 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/reverting_function.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/reverting_function.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (87-98='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_err.sol
index 414078fb1..139fa1476 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly/switch_err.sol
@@ -23,5 +23,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (96-107): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (256-267): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (96-107='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (256-267='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly_err.sol
index 0cb7fa70d..83133b996 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/assembly_err.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (87-96): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (87-96='S storage'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/default_location.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/default_location.sol
index 5a4173ab6..bbec08579 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/default_location.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/default_location.sol
@@ -17,4 +17,4 @@ contract C {
     }
 }
 // ----
-// Warning 6321: (399-407): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (399-407='S memory'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_err.sol
index 97df2c590..fcb951f98 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_err.sol
@@ -45,12 +45,12 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (146-151): Unreachable code.
-// Warning 5740: (169-174): Unreachable code.
-// TypeError 3464: (223-234): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (316-321): Unreachable code.
-// TypeError 3464: (440-451): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (654-665): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (871-882): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// Warning 5740: (933-938): Unreachable code.
+// TypeError 3464: (87-98='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// Warning 5740: (146-151='c = s'): Unreachable code.
+// Warning 5740: (169-174='false'): Unreachable code.
+// TypeError 3464: (223-234='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// Warning 5740: (316-321='c = s'): Unreachable code.
+// TypeError 3464: (440-451='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (654-665='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (871-882='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// Warning 5740: (933-938='c = s'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_fine.sol
index 412974b6d..6f3c1c729 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_fine.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/dowhile_fine.sol
@@ -29,4 +29,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (567-572): Unreachable code.
+// Warning 5740: (567-572='false'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/for_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/for_err.sol
index a5c741a91..ceb6559dd 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/for_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/for_err.sol
@@ -12,5 +12,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (182-193): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (87-98='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (182-193='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/if_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/if_err.sol
index a2649a2e3..e66012bc7 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/if_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/if_err.sol
@@ -14,5 +14,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (96-107): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (186-197): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (96-107='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (186-197='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol
index 5dee487d1..261fa55de 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol
@@ -18,5 +18,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (246-255): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (361-370): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (246-255='S storage'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (361-370='S storage'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_err.sol
index abad1da77..a3762ed37 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/short_circuit_err.sol
@@ -13,6 +13,6 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (176-187): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (264-275): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (87-98='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (176-187='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (264-275='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_err.sol
index afa7881b9..918eed507 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/ternary_err.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (96-107): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (200-211): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (96-107='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (200-211='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/try_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/try_err.sol
index 6c06d70fd..2f40f1c7e 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/try_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/try_err.sol
@@ -28,7 +28,7 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// TypeError 3464: (113-124): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (240-251): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (367-378): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (631-632): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (113-124='S storage r'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (240-251='S storage r'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (367-378='S storage r'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (631-632='r'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/while_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/while_err.sol
index f558436fc..56675155a 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/while_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/while_err.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (87-98): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (87-98='S storage c'): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/always_revert.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/always_revert.sol
index 688f994c1..94d6d36ae 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/always_revert.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/always_revert.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (125-126): Unreachable code.
+// Warning 5740: (125-126='b'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/assembly.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/assembly.sol
index 4b3f17219..d8a24ef27 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/assembly.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/assembly.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (107-113): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (107-113='s.slot'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-for.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-for.sol
index fce705723..372abc5f0 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-for.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-for.sol
@@ -6,4 +6,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError 3464: (83-84): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (83-84='b'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-if.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-if.sol
index 91643dba1..12e18dc16 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-if.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-if.sol
@@ -10,4 +10,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 3464: (155-156): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (155-156='t'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-modifier.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-modifier.sol
index 88b4fb410..9793f5e85 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-modifier.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-modifier.sol
@@ -13,4 +13,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 3464: (237-238): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (237-238='t'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-require.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-require.sol
index 9e8567f2e..7510b9ae8 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-require.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-require.sol
@@ -6,4 +6,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError 3464: (86-87): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (86-87='b'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-while.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-while.sol
index 58beac607..095e90174 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-while.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/bug10821-while.sol
@@ -6,4 +6,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError 3464: (87-88): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (87-88='b'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fail.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fail.sol
index cb0838e4c..fee45aac2 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fail.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_order_fail.sol
@@ -5,4 +5,4 @@ contract C {
     function f() m1(b) m2(b = s) internal view returns (uint[] storage b) {}
 }
 // ----
-// TypeError 3464: (129-130): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (129-130='b'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_post_access.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_post_access.sol
index b109b4c91..50420e8b1 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_post_access.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_post_access.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (120-121): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (120-121='a'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_pre_access.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_pre_access.sol
index 41ce9384f..3f89b6adf 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_pre_access.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/modifier_pre_access.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (120-121): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (120-121='a'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_library.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_library.sol
index 8ec293018..388c7331a 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_library.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_library.sol
@@ -14,4 +14,4 @@ contract C
 }
 
 // ----
-// Warning 6321: (128-135): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (128-135='uint256'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual.sol
index 01e3ec953..edb789c38 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual.sol
@@ -23,5 +23,5 @@ contract C is B
 }
 
 // ----
-// Warning 6321: (146-153): Unnamed return variable can remain unassigned when the function is called when "C" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (381-388): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (146-153='uint256'): Unnamed return variable can remain unassigned when the function is called when "C" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (381-388='uint256'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual2.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual2.sol
index b63bc9a99..fdb6f722f 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual2.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual2.sol
@@ -16,4 +16,4 @@ contract C is B
 }
 
 // ----
-// Warning 6321: (135-142): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (135-142='uint256'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual3.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual3.sol
index a25332d30..83a46b1df 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual3.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual3.sol
@@ -7,5 +7,5 @@ contract B is A {
   function g() internal override {}
 }
 // ----
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned when the function is called when "B" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (173-177): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (52-56='uint'): Unnamed return variable can remain unassigned when the function is called when "B" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (173-177='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual4.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual4.sol
index f0e1ac622..c8990985c 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual4.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/reverting_call_virtual4.sol
@@ -11,6 +11,6 @@ contract C is B {
   function g() internal virtual override { }
 }
 // ----
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned when the function is called when "C" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (181-185): Unnamed return variable can remain unassigned when the function is called when "C" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (318-322): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (52-56='uint'): Unnamed return variable can remain unassigned when the function is called when "C" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (181-185='uint'): Unnamed return variable can remain unassigned when the function is called when "C" is the most derived contract. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (318-322='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/smoke.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/smoke.sol
index f6062b9a1..dba13f2b7 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/smoke.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/smoke.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (94-95): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (94-95='a'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/struct.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/struct.sol
index b11a0e961..56ab12fc3 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/struct.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/struct.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (109-110): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (109-110='r'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/unreachable.sol b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/unreachable.sol
index 7dbb24034..19c1eca2a 100644
--- a/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/unreachable.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/uninitializedAccess/unreachable.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (112-135): Unreachable code.
+// Warning 5740: (112-135='a[0] = 0;         a = s'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/double_revert.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/double_revert.sol
index 1fc581964..b3f667f5a 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/double_revert.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/double_revert.sol
@@ -13,5 +13,5 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (100-112): Unreachable code.
-// Warning 5740: (222-230): Unreachable code.
+// Warning 5740: (100-112='revert(0, 0)'): Unreachable code.
+// Warning 5740: (222-230='revert()'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_break.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_break.sol
index 14c75893c..bca88c173 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_break.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_break.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (103-117): Unreachable code.
-// Warning 5740: (160-171): Unreachable code.
+// Warning 5740: (103-117='a := add(a, 1)'): Unreachable code.
+// Warning 5740: (160-171='let b := 42'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_continue.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_continue.sol
index daf5f4818..4273624a8 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_continue.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/for_continue.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (163-174): Unreachable code.
+// Warning 5740: (163-174='let b := 42'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/return.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/return.sol
index 364191bb0..ceeea61cb 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/return.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/return.sol
@@ -13,5 +13,5 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (129-135): Unreachable code.
-// Warning 5740: (274-279): Unreachable code.
+// Warning 5740: (129-135='x := y'): Unreachable code.
+// Warning 5740: (274-279='x = y'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/revert.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/revert.sol
index c7013ae35..96ed36db1 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/revert.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/assembly/revert.sol
@@ -13,5 +13,5 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (129-135): Unreachable code.
-// Warning 5740: (274-279): Unreachable code.
+// Warning 5740: (129-135='x := y'): Unreachable code.
+// Warning 5740: (274-279='x = y'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/do_while_continue.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/do_while_continue.sol
index bffcd43c6..783f207e0 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/do_while_continue.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/do_while_continue.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (119-126): Unreachable code.
+// Warning 5740: (119-126='return;'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_return.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_return.sol
index c2a7d6685..3ffc678b3 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_return.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_return.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (85-93): Unreachable code.
+// Warning 5740: (85-93='return 0'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_revert.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_revert.sol
index 19bbb97cc..7e1a4f71f 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_revert.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/double_revert.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (70-78): Unreachable code.
+// Warning 5740: (70-78='revert()'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/for_break.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/for_break.sol
index 6f6a1714c..df6c948b7 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/for_break.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/for_break.sol
@@ -8,5 +8,5 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (76-79): Unreachable code.
-// Warning 5740: (114-128): Unreachable code.
+// Warning 5740: (76-79='a++'): Unreachable code.
+// Warning 5740: (114-128='uint b = 42; b'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/if_both_return.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/if_both_return.sol
index 2fe918436..a07832bc7 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/if_both_return.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/if_both_return.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (142-149): Unreachable code.
+// Warning 5740: (142-149='return;'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/revert.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/revert.sol
index ad7207777..88303e123 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/revert.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/revert.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (70-83): Unreachable code.
+// Warning 5740: (70-83='uint a = 0; a'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_break.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_break.sol
index b950e2ab9..68ced53e9 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_break.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_break.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (138-141): Unreachable code.
+// Warning 5740: (138-141='a--'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_continue.sol b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_continue.sol
index 7090bfbf2..6ed81bc37 100644
--- a/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_continue.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/unreachableCode/while_continue.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (100-107): Unreachable code.
+// Warning 5740: (100-107='return;'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/conversion/convert_to_super_empty.sol b/test/libsolidity/syntaxTests/conversion/convert_to_super_empty.sol
index a36882c7e..dff5b653c 100644
--- a/test/libsolidity/syntaxTests/conversion/convert_to_super_empty.sol
+++ b/test/libsolidity/syntaxTests/conversion/convert_to_super_empty.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1744: (52-59): Cannot convert to the super type.
+// TypeError 1744: (52-59='super()'): Cannot convert to the super type.
diff --git a/test/libsolidity/syntaxTests/conversion/convert_to_super_nonempty.sol b/test/libsolidity/syntaxTests/conversion/convert_to_super_nonempty.sol
index 0cbfe6fcb..3940eaf4e 100644
--- a/test/libsolidity/syntaxTests/conversion/convert_to_super_nonempty.sol
+++ b/test/libsolidity/syntaxTests/conversion/convert_to_super_nonempty.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1744: (52-63): Cannot convert to the super type.
+// TypeError 1744: (52-63='super(this)'): Cannot convert to the super type.
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_address_to_payable.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_address_to_payable.sol
index 103cb8f9d..9b2b01338 100644
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_address_to_payable.sol
+++ b/test/libsolidity/syntaxTests/conversion/explicit_conversion_address_to_payable.sol
@@ -8,4 +8,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 9553: (169-171): Invalid type for argument in function call. Invalid implicit conversion from address to address payable requested.
+// TypeError 9553: (169-171='_a'): Invalid type for argument in function call. Invalid implicit conversion from address to address payable requested.
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_storage_array_ref.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_storage_array_ref.sol
index 819b8d916..09809b376 100644
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_storage_array_ref.sol
+++ b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_storage_array_ref.sol
@@ -6,5 +6,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 9640: (55-63): Explicit type conversion not allowed from "int256[10] storage ref" to "int256[] storage pointer".
-// TypeError 9640: (67-73): Explicit type conversion not allowed from "int256[10] storage ref" to "int256".
+// TypeError 9640: (55-63='int[](x)'): Explicit type conversion not allowed from "int256[10] storage ref" to "int256[] storage pointer".
+// TypeError 9640: (67-73='int(x)'): Explicit type conversion not allowed from "int256[10] storage ref" to "int256".
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_sender_to_payable.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_sender_to_payable.sol
index 68a639750..ce83a7de2 100644
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_sender_to_payable.sol
+++ b/test/libsolidity/syntaxTests/conversion/explicit_conversion_sender_to_payable.sol
@@ -5,5 +5,5 @@ contract C {
 	}
 }
 // ----
-// Warning 2072: (43-60): Unused local variable.
-// Warning 2072: (86-103): Unused local variable.
+// Warning 2072: (43-60='address payable p'): Unused local variable.
+// Warning 2072: (86-103='address payable q'): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_this_to_payable.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_this_to_payable.sol
index ae98b7fab..1e0a24bd2 100644
--- a/test/libsolidity/syntaxTests/conversion/explicit_conversion_this_to_payable.sol
+++ b/test/libsolidity/syntaxTests/conversion/explicit_conversion_this_to_payable.sol
@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 9640: (63-76): Explicit type conversion not allowed from "contract C" to "address payable".
+// TypeError 9640: (63-76='payable(this)'): Explicit type conversion not allowed from "contract C" to "address payable".
diff --git a/test/libsolidity/syntaxTests/conversion/function_type_array_to_memory.sol b/test/libsolidity/syntaxTests/conversion/function_type_array_to_memory.sol
index 179eafdc9..b797ee839 100644
--- a/test/libsolidity/syntaxTests/conversion/function_type_array_to_memory.sol
+++ b/test/libsolidity/syntaxTests/conversion/function_type_array_to_memory.sol
@@ -41,9 +41,9 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (760-779): Type function () view external returns (uint256)[1] memory is not implicitly convertible to expected type function () external returns (uint256)[1] memory.
-// TypeError 7407: (812-826): Type function () view returns (uint256)[1] memory is not implicitly convertible to expected type function () returns (uint256)[1] memory.
-// TypeError 7407: (1230-1249): Type function () pure external returns (uint256)[1] memory is not implicitly convertible to expected type function () external returns (uint256)[1] memory.
-// TypeError 7407: (1282-1296): Type function () pure returns (uint256)[1] memory is not implicitly convertible to expected type function () returns (uint256)[1] memory.
-// TypeError 7407: (1688-1707): Type function () pure external returns (uint256)[1] memory is not implicitly convertible to expected type function () external returns (uint256)[1] memory.
-// TypeError 7407: (1737-1751): Type function () pure returns (uint256)[1] memory is not implicitly convertible to expected type function () returns (uint256)[1] memory.
+// TypeError 7407: (760-779='[this.externalView]'): Type function () view external returns (uint256)[1] memory is not implicitly convertible to expected type function () external returns (uint256)[1] memory.
+// TypeError 7407: (812-826='[internalView]'): Type function () view returns (uint256)[1] memory is not implicitly convertible to expected type function () returns (uint256)[1] memory.
+// TypeError 7407: (1230-1249='[this.externalPure]'): Type function () pure external returns (uint256)[1] memory is not implicitly convertible to expected type function () external returns (uint256)[1] memory.
+// TypeError 7407: (1282-1296='[internalPure]'): Type function () pure returns (uint256)[1] memory is not implicitly convertible to expected type function () returns (uint256)[1] memory.
+// TypeError 7407: (1688-1707='[this.externalPure]'): Type function () pure external returns (uint256)[1] memory is not implicitly convertible to expected type function () external returns (uint256)[1] memory.
+// TypeError 7407: (1737-1751='[internalPure]'): Type function () pure returns (uint256)[1] memory is not implicitly convertible to expected type function () returns (uint256)[1] memory.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol
index b9f95df66..b0c580e6f 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6359: (122-147): Return argument type string memory[5] memory is not implicitly convertible to expected type (type of first return variable) string calldata[5] calldata.
+// TypeError 6359: (122-147='["h", "e", "l", "l", "o"]'): Return argument type string memory[5] memory is not implicitly convertible to expected type (type of first return variable) string calldata[5] calldata.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string.sol
index 166ebffb0..0ce18c61c 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string.sol
@@ -12,6 +12,6 @@ contract C {
     }
 }
 // ----
-// TypeError 6359: (85-92): Return argument type literal_string "hello" is not implicitly convertible to expected type (type of first return variable) string calldata.
-// TypeError 6359: (173-187): Return argument type literal_string "hello" is not implicitly convertible to expected type (type of first return variable) string calldata.
-// TypeError 6359: (267-282): Return argument type literal_string "hello" is not implicitly convertible to expected type (type of first return variable) bytes calldata.
+// TypeError 6359: (85-92='"hello"'): Return argument type literal_string "hello" is not implicitly convertible to expected type (type of first return variable) string calldata.
+// TypeError 6359: (173-187='unicode"hello"'): Return argument type literal_string "hello" is not implicitly convertible to expected type (type of first return variable) string calldata.
+// TypeError 6359: (267-282='hex"68656c6c6f"'): Return argument type literal_string "hello" is not implicitly convertible to expected type (type of first return variable) bytes calldata.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string_in_function_parameter.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string_in_function_parameter.sol
index bf58cba42..7241d6fe9 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string_in_function_parameter.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_string_literal_to_calldata_string_in_function_parameter.sol
@@ -9,6 +9,6 @@ contract C {
     }
 }
 // ----
-// TypeError 9553: (139-146): Invalid type for argument in function call. Invalid implicit conversion from literal_string "hello" to string calldata requested.
-// TypeError 9553: (159-173): Invalid type for argument in function call. Invalid implicit conversion from literal_string "hello" to string calldata requested.
-// TypeError 9553: (186-201): Invalid type for argument in function call. Invalid implicit conversion from literal_string "hello" to bytes calldata requested.
+// TypeError 9553: (139-146='"hello"'): Invalid type for argument in function call. Invalid implicit conversion from literal_string "hello" to string calldata requested.
+// TypeError 9553: (159-173='unicode"hello"'): Invalid type for argument in function call. Invalid implicit conversion from literal_string "hello" to string calldata requested.
+// TypeError 9553: (186-201='hex"68656c6c6f"'): Invalid type for argument in function call. Invalid implicit conversion from literal_string "hello" to bytes calldata requested.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
index d07594b09..223e3521c 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
@@ -19,9 +19,9 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (144-157): Operator != not compatible with types type(contract super C) and contract C
-// TypeError 2271: (167-180): Operator != not compatible with types contract C and type(contract super C)
-// TypeError 2271: (254-264): Operator != not compatible with types type(contract super C) and contract C
-// TypeError 2271: (274-284): Operator != not compatible with types contract C and type(contract super C)
-// TypeError 2271: (349-359): Operator != not compatible with types type(contract super C) and contract D
-// TypeError 2271: (369-379): Operator != not compatible with types contract D and type(contract super C)
+// TypeError 2271: (144-157='super != this'): Operator != not compatible with types type(contract super C) and contract C
+// TypeError 2271: (167-180='this != super'): Operator != not compatible with types contract C and type(contract super C)
+// TypeError 2271: (254-264='super != c'): Operator != not compatible with types type(contract super C) and contract C
+// TypeError 2271: (274-284='c != super'): Operator != not compatible with types contract C and type(contract super C)
+// TypeError 2271: (349-359='super != d'): Operator != not compatible with types type(contract super C) and contract D
+// TypeError 2271: (369-379='d != super'): Operator != not compatible with types contract D and type(contract super C)
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
index 8a803a233..c385e9099 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
@@ -30,27 +30,27 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (49-62): Operator << not compatible with types type(contract super C) and contract C
-// TypeError 2271: (72-85): Operator >> not compatible with types type(contract super C) and contract C
-// TypeError 2271: (95-107): Operator ^ not compatible with types type(contract super C) and contract C
-// TypeError 2271: (117-129): Operator | not compatible with types type(contract super C) and contract C
-// TypeError 2271: (139-151): Operator & not compatible with types type(contract super C) and contract C
-// TypeError 2271: (162-174): Operator * not compatible with types type(contract super C) and contract C
-// TypeError 2271: (184-196): Operator / not compatible with types type(contract super C) and contract C
-// TypeError 2271: (206-218): Operator % not compatible with types type(contract super C) and contract C
-// TypeError 2271: (228-240): Operator - not compatible with types type(contract super C) and contract C
-// TypeError 2271: (250-262): Operator + not compatible with types type(contract super C) and contract C
-// TypeError 2271: (272-285): Operator ** not compatible with types type(contract super C) and contract C
-// TypeError 2271: (296-309): Operator == not compatible with types type(contract super C) and contract C
-// TypeError 2271: (319-332): Operator != not compatible with types type(contract super C) and contract C
-// TypeError 2271: (342-355): Operator >= not compatible with types type(contract super C) and contract C
-// TypeError 2271: (365-378): Operator <= not compatible with types type(contract super C) and contract C
-// TypeError 2271: (388-400): Operator < not compatible with types type(contract super C) and contract C
-// TypeError 2271: (410-422): Operator > not compatible with types type(contract super C) and contract C
-// TypeError 2271: (433-446): Operator || not compatible with types type(contract super C) and contract C
-// TypeError 2271: (456-469): Operator && not compatible with types type(contract super C) and contract C
-// TypeError 4247: (480-485): Expression has to be an lvalue.
-// TypeError 7366: (480-493): Operator -= not compatible with types type(contract super C) and contract C
-// TypeError 4247: (503-508): Expression has to be an lvalue.
-// TypeError 7366: (503-516): Operator += not compatible with types type(contract super C) and contract C
-// TypeError 1080: (527-546): True expression's type type(contract super C) does not match false expression's type contract C.
+// TypeError 2271: (49-62='super << this'): Operator << not compatible with types type(contract super C) and contract C
+// TypeError 2271: (72-85='super >> this'): Operator >> not compatible with types type(contract super C) and contract C
+// TypeError 2271: (95-107='super ^ this'): Operator ^ not compatible with types type(contract super C) and contract C
+// TypeError 2271: (117-129='super | this'): Operator | not compatible with types type(contract super C) and contract C
+// TypeError 2271: (139-151='super & this'): Operator & not compatible with types type(contract super C) and contract C
+// TypeError 2271: (162-174='super * this'): Operator * not compatible with types type(contract super C) and contract C
+// TypeError 2271: (184-196='super / this'): Operator / not compatible with types type(contract super C) and contract C
+// TypeError 2271: (206-218='super % this'): Operator % not compatible with types type(contract super C) and contract C
+// TypeError 2271: (228-240='super - this'): Operator - not compatible with types type(contract super C) and contract C
+// TypeError 2271: (250-262='super + this'): Operator + not compatible with types type(contract super C) and contract C
+// TypeError 2271: (272-285='super ** this'): Operator ** not compatible with types type(contract super C) and contract C
+// TypeError 2271: (296-309='super == this'): Operator == not compatible with types type(contract super C) and contract C
+// TypeError 2271: (319-332='super != this'): Operator != not compatible with types type(contract super C) and contract C
+// TypeError 2271: (342-355='super >= this'): Operator >= not compatible with types type(contract super C) and contract C
+// TypeError 2271: (365-378='super <= this'): Operator <= not compatible with types type(contract super C) and contract C
+// TypeError 2271: (388-400='super < this'): Operator < not compatible with types type(contract super C) and contract C
+// TypeError 2271: (410-422='super > this'): Operator > not compatible with types type(contract super C) and contract C
+// TypeError 2271: (433-446='super || this'): Operator || not compatible with types type(contract super C) and contract C
+// TypeError 2271: (456-469='super && this'): Operator && not compatible with types type(contract super C) and contract C
+// TypeError 4247: (480-485='super'): Expression has to be an lvalue.
+// TypeError 7366: (480-493='super -= this'): Operator -= not compatible with types type(contract super C) and contract C
+// TypeError 4247: (503-508='super'): Expression has to be an lvalue.
+// TypeError 7366: (503-516='super += this'): Operator += not compatible with types type(contract super C) and contract C
+// TypeError 1080: (527-546='true ? super : this'): True expression's type type(contract super C) does not match false expression's type contract C.
diff --git a/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_from_super.sol b/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_from_super.sol
index 749a9b0d9..acc730936 100644
--- a/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_from_super.sol
+++ b/test/libsolidity/syntaxTests/conversion/not_allowed_conversion_from_super.sol
@@ -12,4 +12,4 @@ contract B is S
 	}
 }
 // ----
-// TypeError 9640: (129-137): Explicit type conversion not allowed from "type(contract super B)" to "contract S".
+// TypeError 9640: (129-137='S(super)'): Explicit type conversion not allowed from "type(contract super B)" to "contract S".
diff --git a/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol b/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol
index 4e5091e8c..0718f975e 100644
--- a/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/data_location_in_function_type_fail.sol
@@ -5,4 +5,4 @@ library L {
 }
 
 // ----
-// TypeError 6651: (159-173): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
+// TypeError 6651: (159-173='Nested storage'): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol
index 1a90a2bb6..42eefaf47 100644
--- a/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/externalFunction/external_function_return_parameters_no_data_location.sol
@@ -2,4 +2,4 @@ contract C {
     function i() external pure returns(uint[]) {}
 }
 // ----
-// TypeError 6651: (52-58): Data location must be "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (52-58='uint[]'): Data location must be "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol
index 3fbf7563a..cb0bea935 100644
--- a/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/externalFunction/function_argument_location_specifier_test_external_storage.sol
@@ -2,4 +2,4 @@ contract test {
     function f(bytes storage) external;
 }
 // ----
-// TypeError 6651: (31-44): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
+// TypeError 6651: (31-44='bytes storage'): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/function_argument_location_specifier_test_non_reference_type.sol b/test/libsolidity/syntaxTests/dataLocations/function_argument_location_specifier_test_non_reference_type.sol
index c4fffd12e..9cce87655 100644
--- a/test/libsolidity/syntaxTests/dataLocations/function_argument_location_specifier_test_non_reference_type.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/function_argument_location_specifier_test_non_reference_type.sol
@@ -2,4 +2,4 @@ contract test {
     function f(bytes4 memory) public;
 }
 // ----
-// TypeError 6651: (31-44): Data location can only be specified for array, struct or mapping types, but "memory" was given.
+// TypeError 6651: (31-44='bytes4 memory'): Data location can only be specified for array, struct or mapping types, but "memory" was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/function_return_parameters_with_data_location_fine.sol b/test/libsolidity/syntaxTests/dataLocations/function_return_parameters_with_data_location_fine.sol
index 6972c7a27..9db12a29f 100644
--- a/test/libsolidity/syntaxTests/dataLocations/function_return_parameters_with_data_location_fine.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/function_return_parameters_with_data_location_fine.sol
@@ -5,5 +5,5 @@ contract C {
     function i() external pure returns(uint[] memory) {}
 }
 // ----
-// Warning 6321: (51-64): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (134-147): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (51-64='uint[] memory'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (134-147='uint[] memory'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol
index 64df444d6..0444236ef 100644
--- a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_parameters_no_data_location.sol
@@ -2,4 +2,4 @@ contract C {
     function g(uint[]) internal pure {}
 }
 // ----
-// TypeError 6651: (28-34): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (28-34='uint[]'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol
index d8d6ab2a5..560afdf89 100644
--- a/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/internalFunction/internal_function_return_parameters_no_data_location.sol
@@ -2,4 +2,4 @@ contract C {
     function g() internal pure returns(uint[]) {}
 }
 // ----
-// TypeError 6651: (52-58): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (52-58='uint[]'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol
index 557347d2c..ba555c4f0 100644
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_params_no_data_location.sol
@@ -6,7 +6,7 @@ library L {
     function j(mapping(uint => uint)) external pure {}
 }
 // ----
-// TypeError 6651: (52-59): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
-// TypeError 6651: (93-99): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
-// TypeError 6651: (133-134): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
-// TypeError 6651: (168-189): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
+// TypeError 6651: (52-59='uint[2]'): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
+// TypeError 6651: (93-99='uint[]'): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
+// TypeError 6651: (133-134='S'): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
+// TypeError 6651: (168-189='mapping(uint => uint)'): Data location must be "storage", "memory" or "calldata" for parameter in external function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol
index 3bb0a5a06..5479849d9 100644
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_external_function_return_no_data_location.sol
@@ -6,7 +6,7 @@ library L {
     function j() external pure returns (mapping(uint => uint)) {}
 }
 // ----
-// TypeError 6651: (77-84): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (129-135): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (180-181): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (226-247): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (77-84='uint[2]'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (129-135='uint[]'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (180-181='S'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (226-247='mapping(uint => uint)'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_fine.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_fine.sol
index dfacbe936..c3b5b4601 100644
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_fine.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_function_with_data_location_fine.sol
@@ -8,9 +8,9 @@ library L {
     function i(uint[] calldata, uint[] storage) external pure returns (S storage x) {return x; }
 }
 // ----
-// TypeError 3464: (197-198): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (203-204): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (359-360): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (365-366): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (460-461): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (557-558): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (197-198='a'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (203-204='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (359-360='a'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (365-366='c'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (460-461='x'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (557-558='x'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol
index 97c246203..13a32f7d5 100644
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_internal_function_no_data_location.sol
@@ -10,11 +10,11 @@ library L {
     function jp(mapping(uint => uint)) internal pure {}
 }
 // ----
-// TypeError 6651: (77-84): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (129-135): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (180-181): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (226-247): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (268-275): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (310-316): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (351-352): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (387-408): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (77-84='uint[2]'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (129-135='uint[]'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (180-181='S'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (226-247='mapping(uint => uint)'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (268-275='uint[2]'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (310-316='uint[]'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (351-352='S'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (387-408='mapping(uint => uint)'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol
index 277eafd5b..c9412d124 100644
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_private_function_no_data_location.sol
@@ -10,11 +10,11 @@ library L {
     function jp(mapping(uint => uint)) private pure {}
 }
 // ----
-// TypeError 6651: (76-83): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (127-133): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (177-178): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (222-243): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (264-271): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (305-311): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (345-346): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (380-401): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (76-83='uint[2]'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (127-133='uint[]'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (177-178='S'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (222-243='mapping(uint => uint)'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (264-271='uint[2]'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (305-311='uint[]'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (345-346='S'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (380-401='mapping(uint => uint)'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol
index 9f01d2cab..0816d4bed 100644
--- a/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/libraries/library_public_function_no_data_location.sol
@@ -9,11 +9,11 @@ library L {
     function ip(S) private pure {}
     function jp(mapping(uint => uint)) private pure {}}
 // ----
-// TypeError 6651: (76-83): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (127-133): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (177-178): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (222-243): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
-// TypeError 6651: (264-271): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (305-311): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (345-346): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
-// TypeError 6651: (380-401): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (76-83='uint[2]'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (127-133='uint[]'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (177-178='S'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (222-243='mapping(uint => uint)'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (264-271='uint[2]'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (305-311='uint[]'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (345-346='S'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (380-401='mapping(uint => uint)'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol
index e431350ed..a7f4184a2 100644
--- a/test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/memory_storage_data_location.sol
@@ -8,5 +8,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 7407: (93-94): Type int256[] memory is not implicitly convertible to expected type int256[] storage pointer.
-// TypeError 7407: (102-110): Type int256[] memory is not implicitly convertible to expected type int256[] storage pointer.
+// TypeError 7407: (93-94='b'): Type int256[] memory is not implicitly convertible to expected type int256[] storage pointer.
+// TypeError 7407: (102-110='int[](b)'): Type int256[] memory is not implicitly convertible to expected type int256[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol
index 5af253dfc..fda68eac1 100644
--- a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_parameters_no_data_location.sol
@@ -2,4 +2,4 @@ contract C {
     function f(uint[]) private pure {}
 }
 // ----
-// TypeError 6651: (28-34): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (28-34='uint[]'): Data location must be "storage", "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol
index 5026360eb..5af542de1 100644
--- a/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/privateFunction/private_function_return_parameters_no_data_location.sol
@@ -2,4 +2,4 @@ contract C {
     function f() private pure returns(uint[]) {}
 }
 // ----
-// TypeError 6651: (51-57): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (51-57='uint[]'): Data location must be "storage", "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol
index 1fb8e09f2..68a81ffd1 100644
--- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/publicFunction/function_argument_location_specifier_test_public_storage.sol
@@ -2,4 +2,4 @@ contract test {
     function f(bytes storage) public;
 }
 // ----
-// TypeError 6651: (31-44): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
+// TypeError 6651: (31-44='bytes storage'): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol
index e39a85fe1..54c388da4 100644
--- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_parameters_no_data_location.sol
@@ -2,4 +2,4 @@ contract C {
     function h(uint[]) public pure {}
 }
 // ----
-// TypeError 6651: (28-34): Data location must be "memory" or "calldata" for parameter in function, but none was given.
+// TypeError 6651: (28-34='uint[]'): Data location must be "memory" or "calldata" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol
index c34c786cf..9759b57ae 100644
--- a/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/publicFunction/public_function_return_parameters_no_data_location.sol
@@ -2,4 +2,4 @@ contract C {
     function h() public pure returns(uint[]) {}
 }
 // ----
-// TypeError 6651: (50-56): Data location must be "memory" or "calldata" for return parameter in function, but none was given.
+// TypeError 6651: (50-56='uint[]'): Data location must be "memory" or "calldata" for return parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/unspecified_constructor.sol b/test/libsolidity/syntaxTests/dataLocations/unspecified_constructor.sol
index 040fe5266..1a483822c 100644
--- a/test/libsolidity/syntaxTests/dataLocations/unspecified_constructor.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/unspecified_constructor.sol
@@ -3,4 +3,4 @@ contract C {
   constructor(S) {}
 }
 // ----
-// TypeError 6651: (48-49): Data location must be "storage" or "memory" for constructor parameter, but none was given.
+// TypeError 6651: (48-49='S'): Data location must be "storage" or "memory" for constructor parameter, but none was given.
diff --git a/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_non_reference_type.sol b/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_non_reference_type.sol
index 8c7a2ecb9..047c77c76 100644
--- a/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_non_reference_type.sol
+++ b/test/libsolidity/syntaxTests/dataLocations/variable_declaration_location_specifier_test_non_reference_type.sol
@@ -7,7 +7,7 @@ contract test {
     }
 }
 // ----
-// TypeError 6651: (48-63): Data location can only be specified for array, struct or mapping types, but "storage" was given.
-// TypeError 6651: (71-89): Data location can only be specified for array, struct or mapping types, but "storage" was given.
-// TypeError 6651: (97-111): Data location can only be specified for array, struct or mapping types, but "memory" was given.
-// TypeError 6651: (119-136): Data location can only be specified for array, struct or mapping types, but "memory" was given.
+// TypeError 6651: (48-63='uint storage a1'): Data location can only be specified for array, struct or mapping types, but "storage" was given.
+// TypeError 6651: (71-89='bytes16 storage b1'): Data location can only be specified for array, struct or mapping types, but "storage" was given.
+// TypeError 6651: (97-111='uint memory a2'): Data location can only be specified for array, struct or mapping types, but "memory" was given.
+// TypeError 6651: (119-136='bytes16 memory b2'): Data location can only be specified for array, struct or mapping types, but "memory" was given.
diff --git a/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol b/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol
index 994c0568a..ef18c468f 100644
--- a/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol
+++ b/test/libsolidity/syntaxTests/denominations/combining_hex_and_denomination.sol
@@ -2,4 +2,4 @@ contract C {
 	uint constant x = 0x01 wei;
 }
 // ----
-// TypeError 5145: (32-40): Hexadecimal numbers cannot be used with unit denominations. You can use an expression of the form "0x1234 * 1 day" instead.
+// TypeError 5145: (32-40='0x01 wei'): Hexadecimal numbers cannot be used with unit denominations. You can use an expression of the form "0x1234 * 1 day" instead.
diff --git a/test/libsolidity/syntaxTests/denominations/deprecated_year.sol b/test/libsolidity/syntaxTests/denominations/deprecated_year.sol
index 61c519a7b..7bc48cf39 100644
--- a/test/libsolidity/syntaxTests/denominations/deprecated_year.sol
+++ b/test/libsolidity/syntaxTests/denominations/deprecated_year.sol
@@ -2,4 +2,4 @@ contract C {
 	uint constant a = 3 years;
 }
 // ----
-// TypeError 4820: (32-39): Using "years" as a unit denomination is deprecated.
+// TypeError 4820: (32-39='3 years'): Using "years" as a unit denomination is deprecated.
diff --git a/test/libsolidity/syntaxTests/denominations/finney_invalid.sol b/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
index b7bae7fa7..eecd97289 100644
--- a/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
+++ b/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// ParserError 2314: (45-51): Expected ';' but got identifier
+// ParserError 2314: (45-51='finney'): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/denominations/fixed_point_division.sol b/test/libsolidity/syntaxTests/denominations/fixed_point_division.sol
index 4098de0e2..21bc7932b 100644
--- a/test/libsolidity/syntaxTests/denominations/fixed_point_division.sol
+++ b/test/libsolidity/syntaxTests/denominations/fixed_point_division.sol
@@ -3,4 +3,4 @@ contract C {
 	ufixed constant b = ufixed(4 ether / 3 hours);
 }
 // ----
-// TypeError 2326: (32-49): Type rational_const 10000000000000000 / 27 is not implicitly convertible to expected type uint256. Try converting to type ufixed256x62 or use an explicit conversion.
+// TypeError 2326: (32-49='4 ether / 3 hours'): Type rational_const 10000000000000000 / 27 is not implicitly convertible to expected type uint256. Try converting to type ufixed256x62 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/denominations/gwei_as_identifier.sol b/test/libsolidity/syntaxTests/denominations/gwei_as_identifier.sol
index 43fde5ed7..e6e82d4a9 100644
--- a/test/libsolidity/syntaxTests/denominations/gwei_as_identifier.sol
+++ b/test/libsolidity/syntaxTests/denominations/gwei_as_identifier.sol
@@ -2,4 +2,4 @@ contract C {
 	uint constant gwei = 1;
 }
 // ----
-// ParserError 2314: (28-32): Expected identifier but got 'gwei'
+// ParserError 2314: (28-32='gwei'): Expected identifier but got 'gwei'
diff --git a/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol b/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
index d206830d5..25eb2c1e7 100644
--- a/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
+++ b/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// ParserError 2314: (45-50): Expected ';' but got identifier
+// ParserError 2314: (45-50='szabo'): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/deprecated_functions.sol b/test/libsolidity/syntaxTests/deprecated_functions.sol
index 239d22ab5..04fb5c4ab 100644
--- a/test/libsolidity/syntaxTests/deprecated_functions.sol
+++ b/test/libsolidity/syntaxTests/deprecated_functions.sol
@@ -8,5 +8,5 @@ contract test {
 	}
 }
 // ----
-// TypeError 3557: (58-62): "sha3" has been deprecated in favour of "keccak256".
-// TypeError 8050: (101-108): "suicide" has been deprecated in favour of "selfdestruct".
+// TypeError 3557: (58-62='sha3'): "sha3" has been deprecated in favour of "keccak256".
+// TypeError 8050: (101-108='suicide'): "suicide" has been deprecated in favour of "selfdestruct".
diff --git a/test/libsolidity/syntaxTests/double_stateVariable_declaration.sol b/test/libsolidity/syntaxTests/double_stateVariable_declaration.sol
index 97650d4ca..d505ad2fb 100644
--- a/test/libsolidity/syntaxTests/double_stateVariable_declaration.sol
+++ b/test/libsolidity/syntaxTests/double_stateVariable_declaration.sol
@@ -3,4 +3,4 @@ contract test {
 	uint128 variable;
 }
 // ----
-// DeclarationError 2333: (36-52): Identifier already declared.
+// DeclarationError 2333: (36-52='uint128 variable'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/double_variable_declaration.sol b/test/libsolidity/syntaxTests/double_variable_declaration.sol
index 9deff2f52..96643ed21 100644
--- a/test/libsolidity/syntaxTests/double_variable_declaration.sol
+++ b/test/libsolidity/syntaxTests/double_variable_declaration.sol
@@ -6,4 +6,4 @@ contract test {
 	}
 }
 // ----
-// Warning 2519: (80-89): This declaration shadows an existing declaration.
+// Warning 2519: (80-89='uint256 x'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/duplicateFunctions/fallback_function_twice.sol b/test/libsolidity/syntaxTests/duplicateFunctions/fallback_function_twice.sol
index 3dbf9b0bc..c2c50b204 100644
--- a/test/libsolidity/syntaxTests/duplicateFunctions/fallback_function_twice.sol
+++ b/test/libsolidity/syntaxTests/duplicateFunctions/fallback_function_twice.sol
@@ -4,4 +4,4 @@ contract C {
     fallback() external { x = 3; }
 }
 // ----
-// DeclarationError 7301: (64-94): Only one fallback function is allowed.
+// DeclarationError 7301: (64-94='fallback() external { x = 3; }'): Only one fallback function is allowed.
diff --git a/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_exception.sol b/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_exception.sol
index e7541fe23..19aee785c 100644
--- a/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_exception.sol
+++ b/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_exception.sol
@@ -8,5 +8,5 @@ contract C {
 	}
 }
 // ----
-// Warning 2319: (61-88): This declaration shadows a builtin symbol.
-// Warning 2319: (90-118): This declaration shadows a builtin symbol.
+// Warning 2319: (61-88='function this() public { 	}'): This declaration shadows a builtin symbol.
+// Warning 2319: (90-118='function super() public { 	}'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_functions.sol b/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_functions.sol
index e6c713485..609927da3 100644
--- a/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_functions.sol
+++ b/test/libsolidity/syntaxTests/duplicateFunctions/illegal_names_functions.sol
@@ -12,6 +12,6 @@ contract C {
 // ----
 // DeclarationError 3726: (17-78): The name "_" is reserved.
 // DeclarationError 3726: (84-117): The name "super" is reserved.
-// DeclarationError 3726: (123-155): The name "this" is reserved.
+// DeclarationError 3726: (123-155='function this() internal {     }'): The name "this" is reserved.
 // Warning 2319: (84-117): This declaration shadows a builtin symbol.
-// Warning 2319: (123-155): This declaration shadows a builtin symbol.
+// Warning 2319: (123-155='function this() internal {     }'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/duplicateFunctions/receive_function_thrice.sol b/test/libsolidity/syntaxTests/duplicateFunctions/receive_function_thrice.sol
index 2160dc055..f637fbfe1 100644
--- a/test/libsolidity/syntaxTests/duplicateFunctions/receive_function_thrice.sol
+++ b/test/libsolidity/syntaxTests/duplicateFunctions/receive_function_thrice.sol
@@ -4,5 +4,5 @@ contract C {
     receive() external payable { }
 }
 // ----
-// DeclarationError 4046: (52-82): Only one receive function is allowed.
-// DeclarationError 4046: (87-117): Only one receive function is allowed.
+// DeclarationError 4046: (52-82='receive() external payable { }'): Only one receive function is allowed.
+// DeclarationError 4046: (87-117='receive() external payable { }'): Only one receive function is allowed.
diff --git a/test/libsolidity/syntaxTests/duplicate_contract.sol b/test/libsolidity/syntaxTests/duplicate_contract.sol
index 39e527307..619f5324c 100644
--- a/test/libsolidity/syntaxTests/duplicate_contract.sol
+++ b/test/libsolidity/syntaxTests/duplicate_contract.sol
@@ -1,4 +1,4 @@
 contract X {}
 contract X {}
 // ----
-// DeclarationError 2333: (14-27): Identifier already declared.
+// DeclarationError 2333: (14-27='contract X {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/emit/emit_empty.sol b/test/libsolidity/syntaxTests/emit/emit_empty.sol
index 065de916a..996ce46d2 100644
--- a/test/libsolidity/syntaxTests/emit/emit_empty.sol
+++ b/test/libsolidity/syntaxTests/emit/emit_empty.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// ParserError 5620: (45-46): Expected event name or path.
+// ParserError 5620: (45-46=';'): Expected event name or path.
diff --git a/test/libsolidity/syntaxTests/emit/emit_non_event.sol b/test/libsolidity/syntaxTests/emit/emit_non_event.sol
index 64021bb29..11bc68687 100644
--- a/test/libsolidity/syntaxTests/emit/emit_non_event.sol
+++ b/test/libsolidity/syntaxTests/emit/emit_non_event.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// TypeError 9292: (66-70): Expression has to be an event invocation.
+// TypeError 9292: (66-70='Test'): Expression has to be an event invocation.
diff --git a/test/libsolidity/syntaxTests/empty_struct.sol b/test/libsolidity/syntaxTests/empty_struct.sol
index 3473612ca..0a0d2bd41 100644
--- a/test/libsolidity/syntaxTests/empty_struct.sol
+++ b/test/libsolidity/syntaxTests/empty_struct.sol
@@ -2,4 +2,4 @@ contract test {
 	struct A {}
 }
 // ----
-// SyntaxError 5306: (17-28): Defining empty structs is disallowed.
+// SyntaxError 5306: (17-28='struct A {}'): Defining empty structs is disallowed.
diff --git a/test/libsolidity/syntaxTests/enums/global_enum_contract_name_clash.sol b/test/libsolidity/syntaxTests/enums/global_enum_contract_name_clash.sol
index e2226993f..dd8dd43bd 100644
--- a/test/libsolidity/syntaxTests/enums/global_enum_contract_name_clash.sol
+++ b/test/libsolidity/syntaxTests/enums/global_enum_contract_name_clash.sol
@@ -1,4 +1,4 @@
 enum E { A }
 contract E {}
 // ----
-// DeclarationError 2333: (13-26): Identifier already declared.
+// DeclarationError 2333: (13-26='contract E {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/enums/global_enum_name_clash.sol b/test/libsolidity/syntaxTests/enums/global_enum_name_clash.sol
index 507f92fff..6b991a948 100644
--- a/test/libsolidity/syntaxTests/enums/global_enum_name_clash.sol
+++ b/test/libsolidity/syntaxTests/enums/global_enum_name_clash.sol
@@ -1,4 +1,4 @@
 enum E { A }
 enum E { A }
 // ----
-// DeclarationError 2333: (13-25): Identifier already declared.
+// DeclarationError 2333: (13-25='enum E { A }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/enums/global_enum_shadowing.sol b/test/libsolidity/syntaxTests/enums/global_enum_shadowing.sol
index 1b9bce95e..f3dbc0632 100644
--- a/test/libsolidity/syntaxTests/enums/global_enum_shadowing.sol
+++ b/test/libsolidity/syntaxTests/enums/global_enum_shadowing.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// Warning 2519: (30-42): This declaration shadows an existing declaration.
+// Warning 2519: (30-42='enum E { A }'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/enums/illegal_names.sol b/test/libsolidity/syntaxTests/enums/illegal_names.sol
index 399d91ed1..a92735fae 100644
--- a/test/libsolidity/syntaxTests/enums/illegal_names.sol
+++ b/test/libsolidity/syntaxTests/enums/illegal_names.sol
@@ -21,11 +21,11 @@ contract C {
     E e;
 }
 // ----
-// DeclarationError 3726: (0-19): The name "this" is reserved.
-// DeclarationError 3726: (20-40): The name "super" is reserved.
-// DeclarationError 3726: (41-57): The name "_" is reserved.
-// DeclarationError 3726: (72-76): The name "this" is reserved.
-// DeclarationError 3726: (82-87): The name "super" is reserved.
-// DeclarationError 3726: (93-94): The name "_" is reserved.
-// Warning 2319: (0-19): This declaration shadows a builtin symbol.
-// Warning 2319: (20-40): This declaration shadows a builtin symbol.
+// DeclarationError 3726: (0-19='enum this {     a }'): The name "this" is reserved.
+// DeclarationError 3726: (20-40='enum super {     b }'): The name "super" is reserved.
+// DeclarationError 3726: (41-57='enum _ {     c }'): The name "_" is reserved.
+// DeclarationError 3726: (72-76='this'): The name "this" is reserved.
+// DeclarationError 3726: (82-87='super'): The name "super" is reserved.
+// DeclarationError 3726: (93-94='_'): The name "_" is reserved.
+// Warning 2319: (0-19='enum this {     a }'): This declaration shadows a builtin symbol.
+// Warning 2319: (20-40='enum super {     b }'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/enums/literal_conversion_error.sol b/test/libsolidity/syntaxTests/enums/literal_conversion_error.sol
index c6d220f61..fd3489818 100644
--- a/test/libsolidity/syntaxTests/enums/literal_conversion_error.sol
+++ b/test/libsolidity/syntaxTests/enums/literal_conversion_error.sol
@@ -9,8 +9,8 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (74-82): Explicit type conversion not allowed from "int_const -1" to "enum C.Test".
-// TypeError 9640: (92-99): Explicit type conversion not allowed from "int_const 2" to "enum C.Test".
-// TypeError 9640: (109-117): Explicit type conversion not allowed from "int_const 13" to "enum C.Test".
-// TypeError 9640: (127-136): Explicit type conversion not allowed from "rational_const 5 / 3" to "enum C.Test".
-// TypeError 9640: (146-155): Explicit type conversion not allowed from "rational_const 1 / 2" to "enum C.Test".
+// TypeError 9640: (74-82='Test(-1)'): Explicit type conversion not allowed from "int_const -1" to "enum C.Test".
+// TypeError 9640: (92-99='Test(2)'): Explicit type conversion not allowed from "int_const 2" to "enum C.Test".
+// TypeError 9640: (109-117='Test(13)'): Explicit type conversion not allowed from "int_const 13" to "enum C.Test".
+// TypeError 9640: (127-136='Test(5/3)'): Explicit type conversion not allowed from "rational_const 5 / 3" to "enum C.Test".
+// TypeError 9640: (146-155='Test(0.5)'): Explicit type conversion not allowed from "rational_const 1 / 2" to "enum C.Test".
diff --git a/test/libsolidity/syntaxTests/errors/abi_decode_error.sol b/test/libsolidity/syntaxTests/errors/abi_decode_error.sol
index 72b661b6f..5d5976b87 100644
--- a/test/libsolidity/syntaxTests/errors/abi_decode_error.sol
+++ b/test/libsolidity/syntaxTests/errors/abi_decode_error.sol
@@ -5,5 +5,5 @@ contract C {
     }
 }
 // ----
-// TypeError 1039: (119-120): Argument has to be a type name.
-// TypeError 5132: (90-122): Different number of arguments in return statement than in returns declaration.
+// TypeError 1039: (119-120='E'): Argument has to be a type name.
+// TypeError 5132: (90-122='return abi.decode(msg.data, (E))'): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/errors/abi_encode_error.sol b/test/libsolidity/syntaxTests/errors/abi_encode_error.sol
index 55b4d73df..fff97691f 100644
--- a/test/libsolidity/syntaxTests/errors/abi_encode_error.sol
+++ b/test/libsolidity/syntaxTests/errors/abi_encode_error.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2056: (108-109): This type cannot be encoded.
+// TypeError 2056: (108-109='E'): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/errors/abi_encode_error_instance.sol b/test/libsolidity/syntaxTests/errors/abi_encode_error_instance.sol
index fbc8b97f1..d9c9ccad0 100644
--- a/test/libsolidity/syntaxTests/errors/abi_encode_error_instance.sol
+++ b/test/libsolidity/syntaxTests/errors/abi_encode_error_instance.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2056: (108-112): This type cannot be encoded.
+// TypeError 2056: (108-112='E(2)'): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/errors/all_ones_signature.sol b/test/libsolidity/syntaxTests/errors/all_ones_signature.sol
index 4cadf624d..60a34c353 100644
--- a/test/libsolidity/syntaxTests/errors/all_ones_signature.sol
+++ b/test/libsolidity/syntaxTests/errors/all_ones_signature.sol
@@ -3,6 +3,6 @@ contract C {
     error test266151307();
 }
 // ----
-// Warning 2519: (40-62): This declaration shadows an existing declaration.
-// SyntaxError 2855: (0-22): The selector 0xffffffff is reserved. Please rename the error to avoid the collision.
-// SyntaxError 2855: (40-62): The selector 0xffffffff is reserved. Please rename the error to avoid the collision.
+// Warning 2519: (40-62='error test266151307();'): This declaration shadows an existing declaration.
+// SyntaxError 2855: (0-22='error test266151307();'): The selector 0xffffffff is reserved. Please rename the error to avoid the collision.
+// SyntaxError 2855: (40-62='error test266151307();'): The selector 0xffffffff is reserved. Please rename the error to avoid the collision.
diff --git a/test/libsolidity/syntaxTests/errors/anonymous.sol b/test/libsolidity/syntaxTests/errors/anonymous.sol
index 5cbf95f2d..151a779f9 100644
--- a/test/libsolidity/syntaxTests/errors/anonymous.sol
+++ b/test/libsolidity/syntaxTests/errors/anonymous.sol
@@ -1,3 +1,3 @@
 error E() anonymous;
 // ----
-// ParserError 2314: (10-19): Expected ';' but got 'anonymous'
+// ParserError 2314: (10-19='anonymous'): Expected ';' but got 'anonymous'
diff --git a/test/libsolidity/syntaxTests/errors/assert_with_cond_and_error.sol b/test/libsolidity/syntaxTests/errors/assert_with_cond_and_error.sol
index 45ac6bfa1..5c7b2c7f4 100644
--- a/test/libsolidity/syntaxTests/errors/assert_with_cond_and_error.sol
+++ b/test/libsolidity/syntaxTests/errors/assert_with_cond_and_error.sol
@@ -3,4 +3,4 @@ function f(bool x) pure {
     assert(x, E());
 }
 // ----
-// TypeError 6160: (41-55): Wrong argument count for function call: 2 arguments given but expected 1.
+// TypeError 6160: (41-55='assert(x, E())'): Wrong argument count for function call: 2 arguments given but expected 1.
diff --git a/test/libsolidity/syntaxTests/errors/assert_with_error.sol b/test/libsolidity/syntaxTests/errors/assert_with_error.sol
index 90f79b40e..7e63ffd9c 100644
--- a/test/libsolidity/syntaxTests/errors/assert_with_error.sol
+++ b/test/libsolidity/syntaxTests/errors/assert_with_error.sol
@@ -3,4 +3,4 @@ function f() pure {
     assert(E());
 }
 // ----
-// TypeError 9553: (42-45): Invalid type for argument in function call. Invalid implicit conversion from tuple() to bool requested.
+// TypeError 9553: (42-45='E()'): Invalid type for argument in function call. Invalid implicit conversion from tuple() to bool requested.
diff --git a/test/libsolidity/syntaxTests/errors/clash_function_error.sol b/test/libsolidity/syntaxTests/errors/clash_function_error.sol
index 0e3a97f7f..bccb9dc3b 100644
--- a/test/libsolidity/syntaxTests/errors/clash_function_error.sol
+++ b/test/libsolidity/syntaxTests/errors/clash_function_error.sol
@@ -1,4 +1,4 @@
 function Err() pure {}
 error Err();
 // ----
-// DeclarationError 2333: (23-35): Identifier already declared.
+// DeclarationError 2333: (23-35='error Err();'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance.sol b/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance.sol
index 3b71fb4d6..908b01713 100644
--- a/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance.sol
+++ b/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance.sol
@@ -1,4 +1,4 @@
 contract A { function Err() public pure {} }
 contract B is A { error Err(); }
 // ----
-// DeclarationError 9097: (63-75): Identifier already declared.
+// DeclarationError 9097: (63-75='error Err();'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance_2.sol b/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance_2.sol
index bfe4e823f..897fd2d94 100644
--- a/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance_2.sol
+++ b/test/libsolidity/syntaxTests/errors/clash_function_error_inheritance_2.sol
@@ -2,4 +2,4 @@ contract A { function Err() public pure {} }
 contract B { error Err(); }
 contract C is A, B {}
 // ----
-// DeclarationError 9097: (58-70): Identifier already declared.
+// DeclarationError 9097: (58-70='error Err();'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/errors/error_as_function_param.sol b/test/libsolidity/syntaxTests/errors/error_as_function_param.sol
index 3741687f6..7ee5b5986 100644
--- a/test/libsolidity/syntaxTests/errors/error_as_function_param.sol
+++ b/test/libsolidity/syntaxTests/errors/error_as_function_param.sol
@@ -1,4 +1,4 @@
 error E(uint);
 function f(E x) pure returns (uint) {}
 // ----
-// TypeError 5172: (26-27): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (26-27='E'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/errors/error_location_memory.sol b/test/libsolidity/syntaxTests/errors/error_location_memory.sol
index c40d8dfc2..d0c7b24f8 100644
--- a/test/libsolidity/syntaxTests/errors/error_location_memory.sol
+++ b/test/libsolidity/syntaxTests/errors/error_location_memory.sol
@@ -1,3 +1,3 @@
 error E(uint[] memory);
 // ----
-// ParserError 2314: (15-21): Expected ',' but got 'memory'
+// ParserError 2314: (15-21='memory'): Expected ',' but got 'memory'
diff --git a/test/libsolidity/syntaxTests/errors/error_location_specifier.sol b/test/libsolidity/syntaxTests/errors/error_location_specifier.sol
index 5f5bdc2bb..a5341fedf 100644
--- a/test/libsolidity/syntaxTests/errors/error_location_specifier.sol
+++ b/test/libsolidity/syntaxTests/errors/error_location_specifier.sol
@@ -1,3 +1,3 @@
 error E(uint[] calldata);
 // ----
-// ParserError 2314: (15-23): Expected ',' but got 'calldata'
+// ParserError 2314: (15-23='calldata'): Expected ',' but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_builtin_type_used_as_param_name.sol b/test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_builtin_type_used_as_param_name.sol
index c8f9ca65b..51b335971 100644
--- a/test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_builtin_type_used_as_param_name.sol
+++ b/test/libsolidity/syntaxTests/errors/error_param_type_shadowed_by_builtin_type_used_as_param_name.sol
@@ -2,4 +2,4 @@ contract C {
     error E(int bytes, bytes x);
 }
 // ----
-// ParserError 2314: (29-34): Expected ',' but got 'bytes'
+// ParserError 2314: (29-34='bytes'): Expected ',' but got 'bytes'
diff --git a/test/libsolidity/syntaxTests/errors/error_reserved_name.sol b/test/libsolidity/syntaxTests/errors/error_reserved_name.sol
index fc89efc18..b7f17c10b 100644
--- a/test/libsolidity/syntaxTests/errors/error_reserved_name.sol
+++ b/test/libsolidity/syntaxTests/errors/error_reserved_name.sol
@@ -1,3 +1,3 @@
 error Error(uint);
 // ----
-// SyntaxError 1855: (0-18): The built-in errors "Error" and "Panic" cannot be re-defined.
+// SyntaxError 1855: (0-18='error Error(uint);'): The built-in errors "Error" and "Panic" cannot be re-defined.
diff --git a/test/libsolidity/syntaxTests/errors/hash_collision.sol b/test/libsolidity/syntaxTests/errors/hash_collision.sol
index d5ff09af9..3fe86ce0a 100644
--- a/test/libsolidity/syntaxTests/errors/hash_collision.sol
+++ b/test/libsolidity/syntaxTests/errors/hash_collision.sol
@@ -3,4 +3,4 @@ contract test {
     error tgeo();
 }
 // ----
-// TypeError 4883: (43-47): Error signature hash collision for tgeo()
+// TypeError 4883: (43-47='tgeo'): Error signature hash collision for tgeo()
diff --git a/test/libsolidity/syntaxTests/errors/hash_collision_external.sol b/test/libsolidity/syntaxTests/errors/hash_collision_external.sol
index 8102a85a1..4c2c9bcd7 100644
--- a/test/libsolidity/syntaxTests/errors/hash_collision_external.sol
+++ b/test/libsolidity/syntaxTests/errors/hash_collision_external.sol
@@ -11,4 +11,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4883: (57-61): Error signature hash collision for tgeo()
+// TypeError 4883: (57-61='tgeo'): Error signature hash collision for tgeo()
diff --git a/test/libsolidity/syntaxTests/errors/indexed_error.sol b/test/libsolidity/syntaxTests/errors/indexed_error.sol
index 2efa3d70d..f2e60e34d 100644
--- a/test/libsolidity/syntaxTests/errors/indexed_error.sol
+++ b/test/libsolidity/syntaxTests/errors/indexed_error.sol
@@ -1,3 +1,3 @@
 error E(uint indexed);
 // ----
-// ParserError 2314: (13-20): Expected ',' but got 'indexed'
+// ParserError 2314: (13-20='indexed'): Expected ',' but got 'indexed'
diff --git a/test/libsolidity/syntaxTests/errors/internal_type.sol b/test/libsolidity/syntaxTests/errors/internal_type.sol
index b88a27435..357a3902b 100644
--- a/test/libsolidity/syntaxTests/errors/internal_type.sol
+++ b/test/libsolidity/syntaxTests/errors/internal_type.sol
@@ -5,5 +5,5 @@ struct S {
     S[] ss;
 }
 // ----
-// TypeError 3417: (9-29): Internal or recursive type is not allowed as error parameter type.
-// TypeError 3417: (40-41): Internal or recursive type is not allowed as error parameter type.
+// TypeError 3417: (9-29='function() internal)'): Internal or recursive type is not allowed as error parameter type.
+// TypeError 3417: (40-41='S'): Internal or recursive type is not allowed as error parameter type.
diff --git a/test/libsolidity/syntaxTests/errors/no_mappings.sol b/test/libsolidity/syntaxTests/errors/no_mappings.sol
index 1de0e2374..adbf69e96 100644
--- a/test/libsolidity/syntaxTests/errors/no_mappings.sol
+++ b/test/libsolidity/syntaxTests/errors/no_mappings.sol
@@ -3,4 +3,4 @@ contract C {
     error MyError2(mapping(uint => uint));
 }
 // ----
-// TypeError 3448: (14-35): Type containing a (nested) mapping is not allowed as error parameter type.
+// TypeError 3448: (14-35='mapping(uint => uint)'): Type containing a (nested) mapping is not allowed as error parameter type.
diff --git a/test/libsolidity/syntaxTests/errors/no_overloading.sol b/test/libsolidity/syntaxTests/errors/no_overloading.sol
index 53ba01743..2f66bb35b 100644
--- a/test/libsolidity/syntaxTests/errors/no_overloading.sol
+++ b/test/libsolidity/syntaxTests/errors/no_overloading.sol
@@ -1,4 +1,4 @@
 error Err(uint);
 error Err(bytes32);
 // ----
-// DeclarationError 2333: (17-36): Identifier already declared.
+// DeclarationError 2333: (17-36='error Err(bytes32);'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/errors/no_overloading_inheritance.sol b/test/libsolidity/syntaxTests/errors/no_overloading_inheritance.sol
index fac0da4bc..d879b9862 100644
--- a/test/libsolidity/syntaxTests/errors/no_overloading_inheritance.sol
+++ b/test/libsolidity/syntaxTests/errors/no_overloading_inheritance.sol
@@ -5,4 +5,4 @@ contract B is A {
     error Err(bytes32);
 }
 // ----
-// DeclarationError 9097: (58-77): Identifier already declared.
+// DeclarationError 9097: (58-77='error Err(bytes32);'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/errors/no_structs_in_abiv1.sol b/test/libsolidity/syntaxTests/errors/no_structs_in_abiv1.sol
index 8727a2852..0a1ac4242 100644
--- a/test/libsolidity/syntaxTests/errors/no_structs_in_abiv1.sol
+++ b/test/libsolidity/syntaxTests/errors/no_structs_in_abiv1.sol
@@ -4,4 +4,4 @@ contract C {
     error MyError(S);
 }
 // ----
-// TypeError 3061: (70-71): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 3061: (70-71='S'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/errors/panic_reserved_name.sol b/test/libsolidity/syntaxTests/errors/panic_reserved_name.sol
index c6f3dd1af..71849cd66 100644
--- a/test/libsolidity/syntaxTests/errors/panic_reserved_name.sol
+++ b/test/libsolidity/syntaxTests/errors/panic_reserved_name.sol
@@ -1,3 +1,3 @@
 error Panic(bytes2);
 // ----
-// SyntaxError 1855: (0-20): The built-in errors "Error" and "Panic" cannot be re-defined.
+// SyntaxError 1855: (0-20='error Panic(bytes2);'): The built-in errors "Error" and "Panic" cannot be re-defined.
diff --git a/test/libsolidity/syntaxTests/errors/require_custom.sol b/test/libsolidity/syntaxTests/errors/require_custom.sol
index f139a4fe5..fdce3c396 100644
--- a/test/libsolidity/syntaxTests/errors/require_custom.sol
+++ b/test/libsolidity/syntaxTests/errors/require_custom.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9322: (83-90): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (83-90='require'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/errors/revert_parentheses.sol b/test/libsolidity/syntaxTests/errors/revert_parentheses.sol
index 27c7044e5..25ca9c055 100644
--- a/test/libsolidity/syntaxTests/errors/revert_parentheses.sol
+++ b/test/libsolidity/syntaxTests/errors/revert_parentheses.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9322: (77-83): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (77-83='revert'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/errors/selector_on_instance.sol b/test/libsolidity/syntaxTests/errors/selector_on_instance.sol
index 3eac5984f..a324fc377 100644
--- a/test/libsolidity/syntaxTests/errors/selector_on_instance.sol
+++ b/test/libsolidity/syntaxTests/errors/selector_on_instance.sol
@@ -4,4 +4,4 @@ contract C {
     bytes4 t = E().selector;
 }
 // ----
-// TypeError 9582: (40-52): Member "selector" not found or not visible after argument-dependent lookup in tuple().
+// TypeError 9582: (40-52='E().selector'): Member "selector" not found or not visible after argument-dependent lookup in tuple().
diff --git a/test/libsolidity/syntaxTests/errors/unreachable.sol b/test/libsolidity/syntaxTests/errors/unreachable.sol
index c3ee54d17..73aa63380 100644
--- a/test/libsolidity/syntaxTests/errors/unreachable.sol
+++ b/test/libsolidity/syntaxTests/errors/unreachable.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// Warning 5740: (98-103): Unreachable code.
+// Warning 5740: (98-103='x = 4'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/errors/using.sol b/test/libsolidity/syntaxTests/errors/using.sol
index 388fa52ab..80876b9df 100644
--- a/test/libsolidity/syntaxTests/errors/using.sol
+++ b/test/libsolidity/syntaxTests/errors/using.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (133-136): Member "f" not found or not visible after argument-dependent lookup in function (uint256) pure.
+// TypeError 9582: (133-136='E.f'): Member "f" not found or not visible after argument-dependent lookup in function (uint256) pure.
diff --git a/test/libsolidity/syntaxTests/errors/using_2.sol b/test/libsolidity/syntaxTests/errors/using_2.sol
index 2f60f3d04..432aa9bb1 100644
--- a/test/libsolidity/syntaxTests/errors/using_2.sol
+++ b/test/libsolidity/syntaxTests/errors/using_2.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5172: (91-92): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (91-92='E'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/errors/weird1.sol b/test/libsolidity/syntaxTests/errors/weird1.sol
index b57f34c22..e94c81ecd 100644
--- a/test/libsolidity/syntaxTests/errors/weird1.sol
+++ b/test/libsolidity/syntaxTests/errors/weird1.sol
@@ -4,4 +4,4 @@ contract C {
     function() internal pure x = E;
 }
 // ----
-// TypeError 7407: (58-59): Type function () pure is not implicitly convertible to expected type function () pure. Special functions can not be converted to function types.
+// TypeError 7407: (58-59='E'): Type function () pure is not implicitly convertible to expected type function () pure. Special functions can not be converted to function types.
diff --git a/test/libsolidity/syntaxTests/errors/weird3.sol b/test/libsolidity/syntaxTests/errors/weird3.sol
index c81266969..e423257ee 100644
--- a/test/libsolidity/syntaxTests/errors/weird3.sol
+++ b/test/libsolidity/syntaxTests/errors/weird3.sol
@@ -4,4 +4,4 @@ contract C {
     E x;
 }
 // ----
-// TypeError 5172: (29-30): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (29-30='E'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/errors/weird4.sol b/test/libsolidity/syntaxTests/errors/weird4.sol
index be1ef90b6..d11d27442 100644
--- a/test/libsolidity/syntaxTests/errors/weird4.sol
+++ b/test/libsolidity/syntaxTests/errors/weird4.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5172: (64-65): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (64-65='E'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/events/double_event_declaration.sol b/test/libsolidity/syntaxTests/events/double_event_declaration.sol
index fd48e247e..e02b720ad 100644
--- a/test/libsolidity/syntaxTests/events/double_event_declaration.sol
+++ b/test/libsolidity/syntaxTests/events/double_event_declaration.sol
@@ -3,4 +3,4 @@ contract test {
     event A(uint i);
 }
 // ----
-// DeclarationError 5883: (20-36): Event with same name and parameter types defined twice.
+// DeclarationError 5883: (20-36='event A(uint i);'): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_anonymous.sol b/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_anonymous.sol
index 0b3518105..85ece968a 100644
--- a/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_anonymous.sol
+++ b/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_anonymous.sol
@@ -3,4 +3,4 @@ contract test {
     event A(uint i) anonymous;
 }
 // ----
-// DeclarationError 5883: (20-36): Event with same name and parameter types defined twice.
+// DeclarationError 5883: (20-36='event A(uint i);'): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_indexed.sol b/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_indexed.sol
index fb45ebe10..a926a260c 100644
--- a/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_indexed.sol
+++ b/test/libsolidity/syntaxTests/events/double_event_declaration_ignores_indexed.sol
@@ -3,4 +3,4 @@ contract test {
     event A(uint indexed i);
 }
 // ----
-// DeclarationError 5883: (20-36): Event with same name and parameter types defined twice.
+// DeclarationError 5883: (20-36='event A(uint i);'): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/event_function_inheritance_clash.sol b/test/libsolidity/syntaxTests/events/event_function_inheritance_clash.sol
index 858e93d2d..269356b4c 100644
--- a/test/libsolidity/syntaxTests/events/event_function_inheritance_clash.sol
+++ b/test/libsolidity/syntaxTests/events/event_function_inheritance_clash.sol
@@ -9,4 +9,4 @@ contract B {
 contract C is A, B {
 }
 // ----
-// DeclarationError 9097: (99-111): Identifier already declared.
+// DeclarationError 9097: (99-111='event dup();'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/events/event_library_function.sol b/test/libsolidity/syntaxTests/events/event_library_function.sol
index 382786faa..edb2f8ed1 100644
--- a/test/libsolidity/syntaxTests/events/event_library_function.sol
+++ b/test/libsolidity/syntaxTests/events/event_library_function.sol
@@ -30,6 +30,6 @@ contract E {
 	}
 }
 // ----
-// TypeError 9553: (140-143): Invalid type for argument in function call. Invalid implicit conversion from function () to function () external requested. Special functions can not be converted to function types.
-// TypeError 9553: (230-233): Invalid type for argument in function call. Invalid implicit conversion from function () to function () external requested. Special functions can not be converted to function types.
-// TypeError 9553: (345-348): Invalid type for argument in function call. Invalid implicit conversion from function D.f() to function () external requested. Special functions can not be converted to function types.
+// TypeError 9553: (140-143='L.f'): Invalid type for argument in function call. Invalid implicit conversion from function () to function () external requested. Special functions can not be converted to function types.
+// TypeError 9553: (230-233='L.f'): Invalid type for argument in function call. Invalid implicit conversion from function () to function () external requested. Special functions can not be converted to function types.
+// TypeError 9553: (345-348='D.f'): Invalid type for argument in function call. Invalid implicit conversion from function D.f() to function () external requested. Special functions can not be converted to function types.
diff --git a/test/libsolidity/syntaxTests/events/event_nested_array.sol b/test/libsolidity/syntaxTests/events/event_nested_array.sol
index 2491dae6e..6bf96163b 100644
--- a/test/libsolidity/syntaxTests/events/event_nested_array.sol
+++ b/test/libsolidity/syntaxTests/events/event_nested_array.sol
@@ -3,4 +3,4 @@ contract c {
     event E(uint[][]);
 }
 // ----
-// TypeError 3061: (45-53): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 3061: (45-53='uint[][]'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol b/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol
index ee868a715..c050a4578 100644
--- a/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol
+++ b/test/libsolidity/syntaxTests/events/event_nested_array_in_struct.sol
@@ -4,4 +4,4 @@ contract c {
     event E(S);
 }
 // ----
-// TypeError 3061: (81-82): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 3061: (81-82='S'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous.sol b/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous.sol
index 28ee39e15..44945492d 100644
--- a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous.sol
+++ b/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4487: (118-119): No unique declaration found after argument-dependent lookup.
+// TypeError 4487: (118-119='e'): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous_implicit_conversion.sol b/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous_implicit_conversion.sol
index 2c7884a9d..1b4457888 100644
--- a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous_implicit_conversion.sol
+++ b/test/libsolidity/syntaxTests/events/event_overload_named_arguments_ambiguous_implicit_conversion.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4487: (116-117): No unique declaration found after argument-dependent lookup.
+// TypeError 4487: (116-117='e'): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_wrong_types.sol b/test/libsolidity/syntaxTests/events/event_overload_named_arguments_wrong_types.sol
index abee5dff1..029c9c2bf 100644
--- a/test/libsolidity/syntaxTests/events/event_overload_named_arguments_wrong_types.sol
+++ b/test/libsolidity/syntaxTests/events/event_overload_named_arguments_wrong_types.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9322: (118-119): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (118-119='e'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/events/event_param_type_outside_storage.sol b/test/libsolidity/syntaxTests/events/event_param_type_outside_storage.sol
index 3adc1bb7a..6ba4efbf8 100644
--- a/test/libsolidity/syntaxTests/events/event_param_type_outside_storage.sol
+++ b/test/libsolidity/syntaxTests/events/event_param_type_outside_storage.sol
@@ -2,4 +2,4 @@ contract c {
     event e(uint indexed a, mapping(uint => uint) indexed b, bool indexed c, uint indexed d, uint indexed e) anonymous;
 }
 // ----
-// TypeError 3448: (41-72): Type containing a (nested) mapping is not allowed as event parameter type.
+// TypeError 3448: (41-72='mapping(uint => uint) indexed b'): Type containing a (nested) mapping is not allowed as event parameter type.
diff --git a/test/libsolidity/syntaxTests/events/event_struct.sol b/test/libsolidity/syntaxTests/events/event_struct.sol
index ac6355fe0..d3863f6d6 100644
--- a/test/libsolidity/syntaxTests/events/event_struct.sol
+++ b/test/libsolidity/syntaxTests/events/event_struct.sol
@@ -4,4 +4,4 @@ contract c {
     event E(S);
 }
 // ----
-// TypeError 3061: (71-72): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 3061: (71-72='S'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_struct_indexed.sol b/test/libsolidity/syntaxTests/events/event_struct_indexed.sol
index 7e3393400..8778a3017 100644
--- a/test/libsolidity/syntaxTests/events/event_struct_indexed.sol
+++ b/test/libsolidity/syntaxTests/events/event_struct_indexed.sol
@@ -4,4 +4,4 @@ contract c {
     event E(S indexed);
 }
 // ----
-// TypeError 3061: (71-80): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 3061: (71-80='S indexed'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/events/event_without_emit_deprecated.sol b/test/libsolidity/syntaxTests/events/event_without_emit_deprecated.sol
index 6b79c77d2..0bf9406da 100644
--- a/test/libsolidity/syntaxTests/events/event_without_emit_deprecated.sol
+++ b/test/libsolidity/syntaxTests/events/event_without_emit_deprecated.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3132: (62-65): Event invocations have to be prefixed by "emit".
+// TypeError 3132: (62-65='e()'): Event invocations have to be prefixed by "emit".
diff --git a/test/libsolidity/syntaxTests/events/illegal_names_exception.sol b/test/libsolidity/syntaxTests/events/illegal_names_exception.sol
index c45db8d7d..8463642af 100644
--- a/test/libsolidity/syntaxTests/events/illegal_names_exception.sol
+++ b/test/libsolidity/syntaxTests/events/illegal_names_exception.sol
@@ -5,5 +5,5 @@ contract C {
 	event _();
 }
 // ----
-// Warning 2319: (80-93): This declaration shadows a builtin symbol.
-// Warning 2319: (95-109): This declaration shadows a builtin symbol.
+// Warning 2319: (80-93='event this();'): This declaration shadows a builtin symbol.
+// Warning 2319: (95-109='event super();'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/events/inheritance_adds_anonymous.sol b/test/libsolidity/syntaxTests/events/inheritance_adds_anonymous.sol
index 0e92a88b9..01251752a 100644
--- a/test/libsolidity/syntaxTests/events/inheritance_adds_anonymous.sol
+++ b/test/libsolidity/syntaxTests/events/inheritance_adds_anonymous.sol
@@ -5,4 +5,4 @@ contract B is A {
     event X() anonymous;
 }
 // ----
-// DeclarationError 5883: (52-72): Event with same name and parameter types defined twice.
+// DeclarationError 5883: (52-72='event X() anonymous;'): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/inheritance_adds_indexed.sol b/test/libsolidity/syntaxTests/events/inheritance_adds_indexed.sol
index f68a96ea9..7fa94686c 100644
--- a/test/libsolidity/syntaxTests/events/inheritance_adds_indexed.sol
+++ b/test/libsolidity/syntaxTests/events/inheritance_adds_indexed.sol
@@ -5,4 +5,4 @@ contract B is A {
     event X(uint indexed);
 }
 // ----
-// DeclarationError 5883: (56-78): Event with same name and parameter types defined twice.
+// DeclarationError 5883: (56-78='event X(uint indexed);'): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/inheritance_event_repeated.sol b/test/libsolidity/syntaxTests/events/inheritance_event_repeated.sol
index 9c19ebb33..21f60a3bf 100644
--- a/test/libsolidity/syntaxTests/events/inheritance_event_repeated.sol
+++ b/test/libsolidity/syntaxTests/events/inheritance_event_repeated.sol
@@ -5,4 +5,4 @@ contract B is A {
     event X(uint);
 }
 // ----
-// DeclarationError 5883: (56-70): Event with same name and parameter types defined twice.
+// DeclarationError 5883: (56-70='event X(uint);'): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/inheritance_multi_parent.sol b/test/libsolidity/syntaxTests/events/inheritance_multi_parent.sol
index 3724fc10c..632e37c8e 100644
--- a/test/libsolidity/syntaxTests/events/inheritance_multi_parent.sol
+++ b/test/libsolidity/syntaxTests/events/inheritance_multi_parent.sol
@@ -7,4 +7,4 @@ contract B {
 contract C is A, B {
 }
 // ----
-// DeclarationError 5883: (65-85): Event with same name and parameter types defined twice.
+// DeclarationError 5883: (65-85='event X(uint, uint);'): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/inheritance_removes_indexed.sol b/test/libsolidity/syntaxTests/events/inheritance_removes_indexed.sol
index 6379618b1..534f6ac85 100644
--- a/test/libsolidity/syntaxTests/events/inheritance_removes_indexed.sol
+++ b/test/libsolidity/syntaxTests/events/inheritance_removes_indexed.sol
@@ -5,4 +5,4 @@ contract B is A {
     event X(uint, uint);
 }
 // ----
-// DeclarationError 5883: (70-90): Event with same name and parameter types defined twice.
+// DeclarationError 5883: (70-90='event X(uint, uint);'): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/internal_type.sol b/test/libsolidity/syntaxTests/events/internal_type.sol
index 1e584a8eb..171bb95db 100644
--- a/test/libsolidity/syntaxTests/events/internal_type.sol
+++ b/test/libsolidity/syntaxTests/events/internal_type.sol
@@ -7,5 +7,5 @@ contract C {
     event E2(S);
 }
 // ----
-// TypeError 3417: (52-72): Internal or recursive type is not allowed as event parameter type.
-// TypeError 3417: (87-88): Internal or recursive type is not allowed as event parameter type.
+// TypeError 3417: (52-72='function() internal)'): Internal or recursive type is not allowed as event parameter type.
+// TypeError 3417: (87-88='S'): Internal or recursive type is not allowed as event parameter type.
diff --git a/test/libsolidity/syntaxTests/events/multiple_event_without_emit.sol b/test/libsolidity/syntaxTests/events/multiple_event_without_emit.sol
index 3fa5bc5a2..38bb21ea7 100644
--- a/test/libsolidity/syntaxTests/events/multiple_event_without_emit.sol
+++ b/test/libsolidity/syntaxTests/events/multiple_event_without_emit.sol
@@ -13,4 +13,4 @@ contract test {
     }
 }
 // ----
-// TypeError 3132: (421-436): Event invocations have to be prefixed by "emit".
+// TypeError 3132: (421-436='SetFirstElem(1)'): Event invocations have to be prefixed by "emit".
diff --git a/test/libsolidity/syntaxTests/fallback/default_visibility.sol b/test/libsolidity/syntaxTests/fallback/default_visibility.sol
index ee3fa6f6f..f82bb9436 100644
--- a/test/libsolidity/syntaxTests/fallback/default_visibility.sol
+++ b/test/libsolidity/syntaxTests/fallback/default_visibility.sol
@@ -3,5 +3,5 @@ contract C {
     fallback() {}
 }
 // ----
-// SyntaxError 4937: (90-103): No visibility specified. Did you intend to add "external"?
-// TypeError 1159: (90-103): Fallback function must be defined as "external".
+// SyntaxError 4937: (90-103='fallback() {}'): No visibility specified. Did you intend to add "external"?
+// TypeError 1159: (90-103='fallback() {}'): Fallback function must be defined as "external".
diff --git a/test/libsolidity/syntaxTests/fallback/fallback_as_function_name.sol b/test/libsolidity/syntaxTests/fallback/fallback_as_function_name.sol
index cb31d46d7..44efdb66f 100644
--- a/test/libsolidity/syntaxTests/fallback/fallback_as_function_name.sol
+++ b/test/libsolidity/syntaxTests/fallback/fallback_as_function_name.sol
@@ -2,4 +2,4 @@ contract C {
     function fallback() external pure {}
 }
 // ----
-// Warning 3445: (26-34): This function is named "fallback" but is not the fallback function of the contract. If you intend this to be a fallback function, use "fallback(...) { ... }" without the "function" keyword to define it.
+// Warning 3445: (26-34='fallback'): This function is named "fallback" but is not the fallback function of the contract. If you intend this to be a fallback function, use "fallback(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns.sol b/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns.sol
index 625c17f98..7063b0379 100644
--- a/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns.sol
+++ b/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns.sol
@@ -3,4 +3,4 @@ contract C {
     fallback() external {}
 }
 // ----
-// DeclarationError 7301: (96-118): Only one fallback function is allowed.
+// DeclarationError 7301: (96-118='fallback() external {}'): Only one fallback function is allowed.
diff --git a/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns_inheritance.sol b/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns_inheritance.sol
index 818006a11..46449640b 100644
--- a/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns_inheritance.sol
+++ b/test/libsolidity/syntaxTests/fallback/fallback_duplicate_returns_inheritance.sol
@@ -5,5 +5,5 @@ contract D is C {
     fallback() external {}
 }
 // ----
-// TypeError 9456: (116-138): Overriding function is missing "override" specifier.
+// TypeError 9456: (116-138='fallback() external {}'): Overriding function is missing "override" specifier.
 // TypeError 4334: (17-91): Trying to override non-virtual function. Did you forget to add "virtual"?
diff --git a/test/libsolidity/syntaxTests/fallback/fallback_wrong_data_location.sol b/test/libsolidity/syntaxTests/fallback/fallback_wrong_data_location.sol
index 5ddefdf3d..ff01ef0a5 100644
--- a/test/libsolidity/syntaxTests/fallback/fallback_wrong_data_location.sol
+++ b/test/libsolidity/syntaxTests/fallback/fallback_wrong_data_location.sol
@@ -8,6 +8,6 @@ contract F {
     fallback(bytes calldata) external returns (bytes calldata) {}
 }
 // ----
-// TypeError 5570: (57-71): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
-// TypeError 5570: (134-150): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
-// TypeError 5570: (215-231): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
+// TypeError 5570: (57-71='(bytes memory)'): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
+// TypeError 5570: (134-150='(bytes calldata)'): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
+// TypeError 5570: (215-231='(bytes calldata)'): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/fallback/no_input_no_output.sol b/test/libsolidity/syntaxTests/fallback/no_input_no_output.sol
index 868671d2a..c37b9a673 100644
--- a/test/libsolidity/syntaxTests/fallback/no_input_no_output.sol
+++ b/test/libsolidity/syntaxTests/fallback/no_input_no_output.sol
@@ -5,5 +5,5 @@ contract D {
     fallback(bytes calldata _input) external {}
 }
 // ----
-// TypeError 5570: (45-67): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
+// TypeError 5570: (45-67='(bytes memory _output)'): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
 // TypeError 5570: (131-131): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/fallback/old_syntax.sol b/test/libsolidity/syntaxTests/fallback/old_syntax.sol
index 31bbf0043..256bcc7a3 100644
--- a/test/libsolidity/syntaxTests/fallback/old_syntax.sol
+++ b/test/libsolidity/syntaxTests/fallback/old_syntax.sol
@@ -2,4 +2,4 @@ contract C {
     function() external {}
 }
 // ----
-// ParserError 2915: (37-38): Expected a state variable declaration. If you intended this as a fallback function or a function to handle plain ether transactions, use the "fallback" keyword or the "receive" keyword instead.
+// ParserError 2915: (37-38='{'): Expected a state variable declaration. If you intended this as a fallback function or a function to handle plain ether transactions, use the "fallback" keyword or the "receive" keyword instead.
diff --git a/test/libsolidity/syntaxTests/fallback/return_value_number.sol b/test/libsolidity/syntaxTests/fallback/return_value_number.sol
index e5d358c73..969045af6 100644
--- a/test/libsolidity/syntaxTests/fallback/return_value_number.sol
+++ b/test/libsolidity/syntaxTests/fallback/return_value_number.sol
@@ -2,4 +2,4 @@ contract C {
     fallback() external returns (bytes memory, bytes memory) {}
 }
 // ----
-// TypeError 5570: (45-73): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
+// TypeError 5570: (45-73='(bytes memory, bytes memory)'): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/fallback/return_value_type.sol b/test/libsolidity/syntaxTests/fallback/return_value_type.sol
index 01363ebe4..30c31df5a 100644
--- a/test/libsolidity/syntaxTests/fallback/return_value_type.sol
+++ b/test/libsolidity/syntaxTests/fallback/return_value_type.sol
@@ -2,4 +2,4 @@ contract C {
     fallback() external returns (uint256) {}
 }
 // ----
-// TypeError 5570: (45-54): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
+// TypeError 5570: (45-54='(uint256)'): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/fallback/return_value_unsupported.sol b/test/libsolidity/syntaxTests/fallback/return_value_unsupported.sol
index 88f181f3f..f84e91f2c 100644
--- a/test/libsolidity/syntaxTests/fallback/return_value_unsupported.sol
+++ b/test/libsolidity/syntaxTests/fallback/return_value_unsupported.sol
@@ -2,4 +2,4 @@ contract C {
     fallback() external returns (bytes memory) {}
 }
 // ----
-// TypeError 5570: (45-59): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
+// TypeError 5570: (45-59='(bytes memory)'): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/freeFunctions/circular_reference1functions_first.sol b/test/libsolidity/syntaxTests/freeFunctions/circular_reference1functions_first.sol
index a76cbf28f..bf4a2ebb2 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/circular_reference1functions_first.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/circular_reference1functions_first.sol
@@ -14,5 +14,5 @@ contract C {
 	constructor() { new D(); }
 }
 // ----
-// TypeError 7813: (98-103): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (187-192): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (98-103='new C'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (187-192='new D'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/freeFunctions/circular_referencecontracts_first.sol b/test/libsolidity/syntaxTests/freeFunctions/circular_referencecontracts_first.sol
index 62879fe02..6eb4072ae 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/circular_referencecontracts_first.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/circular_referencecontracts_first.sol
@@ -14,5 +14,5 @@ function s() {
     new C();
 }
 // ----
-// TypeError 7813: (207-212): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (149-154): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (207-212='new C'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (149-154='new D'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_call_via_contract_type.sol b/test/libsolidity/syntaxTests/freeFunctions/free_call_via_contract_type.sol
index 749a98d48..9fb3d9786 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_call_via_contract_type.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_call_via_contract_type.sol
@@ -5,4 +5,4 @@ function fun() {
     C.f();
 }
 // ----
-// TypeError 3419: (68-73): Cannot call function via contract type name.
+// TypeError 3419: (68-73='C.f()'): Cannot call function via contract type name.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol b/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol
index e44356dc3..9c760e05d 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol
@@ -1,3 +1,3 @@
 constructor() {}
 // ----
-// ParserError 7858: (0-11): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
+// ParserError 7858: (0-11='constructor'): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol b/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol
index e813e58ee..adb269b90 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol
@@ -1,3 +1,3 @@
 fallback(){}
 // ----
-// ParserError 7858: (0-8): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
+// ParserError 7858: (0-8='fallback'): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_modifier.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_modifier.sol
index cfe5c3ffc..c04f5fecd 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_modifier.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_function_modifier.sol
@@ -1,4 +1,4 @@
 function fun() someModifier {
 }
 // ----
-// DeclarationError 7920: (15-27): Identifier not found or not unique.
+// DeclarationError 7920: (15-27='someModifier'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_namesake_different_parameter_types.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_namesake_different_parameter_types.sol
index bde560ccb..00bb91bf1 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_namesake_different_parameter_types.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_function_namesake_different_parameter_types.sol
@@ -8,4 +8,4 @@ contract C {
 }
 // ----
 // DeclarationError 1686: (0-46): Function with same name and parameter types defined twice.
-// TypeError 9574: (168-189): Type uint256 is not implicitly convertible to expected type string memory.
+// TypeError 9574: (168-189='string memory s = g()'): Type uint256 is not implicitly convertible to expected type string memory.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_shadowing.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_shadowing.sol
index bd1b2bd87..e6194e5d8 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_shadowing.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_function_shadowing.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// Warning 2519: (31-53): This declaration shadows an existing declaration.
+// Warning 2519: (31-53='function f() public {}'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_visibility.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_visibility.sol
index 36a0e0e0c..437135902 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_visibility.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_function_visibility.sol
@@ -1,5 +1,5 @@
 function fun1() public { }
 function fun2() internal { }
 // ----
-// SyntaxError 4126: (0-26): Free functions cannot have visibility.
-// SyntaxError 4126: (27-55): Free functions cannot have visibility.
+// SyntaxError 4126: (0-26='function fun1() public { }'): Free functions cannot have visibility.
+// SyntaxError 4126: (27-55='function fun2() internal { }'): Free functions cannot have visibility.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_function_without_body.sol b/test/libsolidity/syntaxTests/freeFunctions/free_function_without_body.sol
index 2fec9db1d..eaed5ffc6 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_function_without_body.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_function_without_body.sol
@@ -1,3 +1,3 @@
 function f();
 // ----
-// TypeError 4668: (0-13): Free functions must be implemented.
+// TypeError 4668: (0-13='function f();'): Free functions must be implemented.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol b/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol
index 9279ff1eb..b72d56c1f 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol
@@ -5,4 +5,4 @@ function f() {
 function g(uint[] storage x) pure { x[0] = 1; }
 // ----
 // Warning 2018: (0-39): Function state mutability can be restricted to pure
-// TypeError 8961: (76-80): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (76-80='x[0]'): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_overload.sol b/test/libsolidity/syntaxTests/freeFunctions/free_overload.sol
index 440b9449f..3e3856d4d 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_overload.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_overload.sol
@@ -6,4 +6,4 @@ function t() {
     g(2);
 }
 // ----
-// TypeError 4487: (176-177): No unique declaration found after argument-dependent lookup.
+// TypeError 4487: (176-177='g'): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_override.sol b/test/libsolidity/syntaxTests/freeFunctions/free_override.sol
index da54a2fa6..e167b4d5a 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_override.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_override.sol
@@ -1,4 +1,4 @@
 function fun() override {
 }
 // ----
-// SyntaxError 1750: (0-27): Free functions cannot override.
+// SyntaxError 1750: (0-27='function fun() override { }'): Free functions cannot override.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_payable.sol b/test/libsolidity/syntaxTests/freeFunctions/free_payable.sol
index 563c118f0..4cd2ea759 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_payable.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_payable.sol
@@ -1,4 +1,4 @@
 function fun() payable {
 }
 // ----
-// TypeError 9559: (0-26): Free functions cannot be payable.
+// TypeError 9559: (0-26='function fun() payable { }'): Free functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol b/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol
index d1e790d7c..284fc75a5 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol
@@ -1,3 +1,3 @@
 receive() {}
 // ----
-// ParserError 7858: (0-7): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
+// ParserError 7858: (0-7='receive'): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_virtual.sol b/test/libsolidity/syntaxTests/freeFunctions/free_virtual.sol
index a4261be1f..211dfb32a 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_virtual.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_virtual.sol
@@ -1,4 +1,4 @@
 function fun() virtual {
 }
 // ----
-// SyntaxError 4493: (0-26): Free functions cannot be virtual.
+// SyntaxError 4493: (0-26='function fun() virtual { }'): Free functions cannot be virtual.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/function_same_name_as_contract.sol b/test/libsolidity/syntaxTests/freeFunctions/function_same_name_as_contract.sol
index 3b16749ae..c3a6a176c 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/function_same_name_as_contract.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/function_same_name_as_contract.sol
@@ -1,4 +1,4 @@
 contract C {}
 function C() {}
 // ----
-// DeclarationError 2333: (14-29): Identifier already declared.
+// DeclarationError 2333: (14-29='function C() {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/function_using_struct_after_contract.sol b/test/libsolidity/syntaxTests/freeFunctions/function_using_struct_after_contract.sol
index b029c0d90..db0c49e60 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/function_using_struct_after_contract.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/function_using_struct_after_contract.sol
@@ -3,4 +3,4 @@ contract C {
 }
 function f() returns (uint) { S storage t; }
 // ----
-// DeclarationError 7920: (70-71): Identifier not found or not unique.
+// DeclarationError 7920: (70-71='S'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/gas_value.sol b/test/libsolidity/syntaxTests/freeFunctions/gas_value.sol
index 7e2dafe8a..25bac3f35 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/gas_value.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/gas_value.sol
@@ -3,4 +3,4 @@ function fun() {
     fun{value: 1}();
 }
 // ----
-// TypeError 2193: (21-32): Function call options can only be set on external function calls or contract creations.
+// TypeError 2193: (21-32='fun{gas: 1}'): Function call options can only be set on external function calls or contract creations.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/illegal_names.sol b/test/libsolidity/syntaxTests/freeFunctions/illegal_names.sol
index aed22b225..1f35d8f63 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/illegal_names.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/illegal_names.sol
@@ -10,8 +10,8 @@ contract C {
 	}
 }
 // ----
-// DeclarationError 3726: (0-18): The name "this" is reserved.
-// DeclarationError 3726: (19-38): The name "super" is reserved.
-// DeclarationError 3726: (39-54): The name "_" is reserved.
-// Warning 2319: (0-18): This declaration shadows a builtin symbol.
-// Warning 2319: (19-38): This declaration shadows a builtin symbol.
+// DeclarationError 3726: (0-18='function this() {}'): The name "this" is reserved.
+// DeclarationError 3726: (19-38='function super() {}'): The name "super" is reserved.
+// DeclarationError 3726: (39-54='function _() {}'): The name "_" is reserved.
+// Warning 2319: (0-18='function this() {}'): This declaration shadows a builtin symbol.
+// Warning 2319: (19-38='function super() {}'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/qualified_struct_access.sol b/test/libsolidity/syntaxTests/freeFunctions/qualified_struct_access.sol
index 2d9a3011b..15d9d79f4 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/qualified_struct_access.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/qualified_struct_access.sol
@@ -4,5 +4,5 @@ contract C {
     struct S { uint x; }
 }
 // ----
-// Warning 6321: (22-26): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// TypeError 3464: (45-46): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// Warning 6321: (22-26='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// TypeError 3464: (45-46='t'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/super_in_free_function.sol b/test/libsolidity/syntaxTests/freeFunctions/super_in_free_function.sol
index ff6061c65..da012402b 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/super_in_free_function.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/super_in_free_function.sol
@@ -3,4 +3,4 @@ function f() {
     super;
 }
 // ----
-// DeclarationError 7576: (33-38): Undeclared identifier. "super" is not (or not yet) visible at this point.
+// DeclarationError 7576: (33-38='super'): Undeclared identifier. "super" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/this_in_free_function.sol b/test/libsolidity/syntaxTests/freeFunctions/this_in_free_function.sol
index cdea708d4..678fd9827 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/this_in_free_function.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/this_in_free_function.sol
@@ -3,4 +3,4 @@ function f() {
     this;
 }
 // ----
-// DeclarationError 7576: (33-37): Undeclared identifier. "this" is not (or not yet) visible at this point.
+// DeclarationError 7576: (33-37='this'): Undeclared identifier. "this" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/functionCalls/arbitrary_parameters_but_restricted_first_type.sol b/test/libsolidity/syntaxTests/functionCalls/arbitrary_parameters_but_restricted_first_type.sol
index 5d900e04e..2aad6fa55 100644
--- a/test/libsolidity/syntaxTests/functionCalls/arbitrary_parameters_but_restricted_first_type.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/arbitrary_parameters_but_restricted_first_type.sol
@@ -7,7 +7,7 @@ contract C {
     }
 }
 // ----
-// TypeError 9308: (52-76): Need at least 1 arguments for function call, but provided only 0.
-// TypeError 9308: (86-111): Need at least 1 arguments for function call, but provided only 0.
-// TypeError 9553: (144-151): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes4 requested.
-// TypeError 9553: (189-196): Invalid type for argument in function call. Invalid implicit conversion from uint256 to string memory requested.
+// TypeError 9308: (52-76='abi.encodeWithSelector()'): Need at least 1 arguments for function call, but provided only 0.
+// TypeError 9308: (86-111='abi.encodeWithSignature()'): Need at least 1 arguments for function call, but provided only 0.
+// TypeError 9553: (144-151='uint(2)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes4 requested.
+// TypeError 9553: (189-196='uint(2)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to string memory requested.
diff --git a/test/libsolidity/syntaxTests/functionCalls/call_unimplemented_base_via_super.sol b/test/libsolidity/syntaxTests/functionCalls/call_unimplemented_base_via_super.sol
index 4b7d45624..85138aa66 100644
--- a/test/libsolidity/syntaxTests/functionCalls/call_unimplemented_base_via_super.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/call_unimplemented_base_via_super.sol
@@ -14,5 +14,5 @@ abstract contract D is I {
     }
 }
 // ----
-// TypeError 7501: (172-177): Cannot call unimplemented base function.
-// TypeError 9582: (278-285): Member "a" not found or not visible after argument-dependent lookup in type(contract super D).
+// TypeError 7501: (172-177='I.a()'): Cannot call unimplemented base function.
+// TypeError 9582: (278-285='super.a'): Member "a" not found or not visible after argument-dependent lookup in type(contract super D).
diff --git a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol
index 729dba778..0503993cd 100644
--- a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol
@@ -5,4 +5,4 @@ contract C {
 	function f(S calldata) public {}
 }
 // ----
-// TypeError 4103: (56-66): Internal type is not allowed for public or external functions.
\ No newline at end of file
+// TypeError 4103: (56-66='S calldata'): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol
index f618934e3..b47df51e8 100644
--- a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol
@@ -5,4 +5,4 @@ contract C {
 	function f(S[2] calldata) public {}
 }
 // ----
-// TypeError 4103: (56-69): Internal type is not allowed for public or external functions.
+// TypeError 4103: (56-69='S[2] calldata'): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol
index 796b0fc58..79648227a 100644
--- a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol
@@ -5,4 +5,4 @@ contract C {
 	constructor (S[2] storage) public {}
 }
 // ----
-// TypeError 3644: (58-70): This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.
+// TypeError 3644: (58-70='S[2] storage'): This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_duplicated.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_duplicated.sol
index 3b162a7f2..7a9a315d7 100644
--- a/test/libsolidity/syntaxTests/functionCalls/calloptions_duplicated.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/calloptions_duplicated.sol
@@ -10,8 +10,8 @@ contract C {
 // ====
 // EVMVersion: >=constantinople
 // ----
-// TypeError 9886: (78-101): Duplicate option "gas".
-// TypeError 9886: (111-138): Duplicate option "value".
+// TypeError 9886: (78-101='this.foo{gas:2, gas: 5}'): Duplicate option "gas".
+// TypeError 9886: (111-138='this.foo{value:2, value: 5}'): Duplicate option "value".
 // TypeError 9886: (148-189): Duplicate option "gas".
 // TypeError 9886: (148-189): Duplicate option "value".
-// TypeError 9886: (199-228): Duplicate option "salt".
+// TypeError 9886: (199-228='new D{salt:"abc", salt:"efg"}'): Duplicate option "salt".
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_on_internal_function.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_on_internal_function.sol
index af5706de3..a864722a1 100644
--- a/test/libsolidity/syntaxTests/functionCalls/calloptions_on_internal_function.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/calloptions_on_internal_function.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2193: (75-86): Function call options can only be set on external function calls or contract creations.
+// TypeError 2193: (75-86='foo{gas: 5}'): Function call options can only be set on external function calls or contract creations.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol b/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
index 4356efcf9..f623884ce 100644
--- a/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/calloptions_repeated.sol
@@ -11,8 +11,8 @@ contract C {
 // ====
 // EVMVersion: >=constantinople
 // ----
-// TypeError 1645: (78-110): Function call options have already been set, you have to combine them into a single {...}-option.
+// TypeError 1645: (78-110='this.foo{value:2, gas: 5}{gas:2}'): Function call options have already been set, you have to combine them into a single {...}-option.
 // TypeError 1645: (120-154): Function call options have already been set, you have to combine them into a single {...}-option.
 // TypeError 1645: (164-198): Function call options have already been set, you have to combine them into a single {...}-option.
 // TypeError 1645: (208-249): Function call options have already been set, you have to combine them into a single {...}-option.
-// TypeError 1645: (259-286): Function call options have already been set, you have to combine them into a single {...}-option.
+// TypeError 1645: (259-286='new D{salt:"abc"}{salt:"a"}'): Function call options have already been set, you have to combine them into a single {...}-option.
diff --git a/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
index 5c7260f36..d292e06f1 100644
--- a/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
@@ -5,4 +5,4 @@ contract C
     }
 }
 // ----
-// TypeError 5704: (53-60): Type is not callable
+// TypeError 5704: (53-60='1 ( 3 )'): Type is not callable
diff --git a/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions1.sol b/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions1.sol
index 1219bcc89..b6dc30c54 100644
--- a/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions1.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions1.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2622: (71-79): Expected callable expression before call options.
+// TypeError 2622: (71-79='a{val:5}'): Expected callable expression before call options.
diff --git a/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions2.sol b/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions2.sol
index a4786f9d4..9d736a258 100644
--- a/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions2.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/invalid_expressions_with_calloptions2.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9318: (73-93): Unknown call option "random". Valid options are "salt", "value" and "gas".
+// TypeError 9318: (73-93='this.foo{random:5+5}'): Unknown call option "random". Valid options are "salt", "value" and "gas".
diff --git a/test/libsolidity/syntaxTests/functionCalls/invalid_named_arguments_conditional.sol b/test/libsolidity/syntaxTests/functionCalls/invalid_named_arguments_conditional.sol
index 0893c0ea6..1c4c6e5a4 100644
--- a/test/libsolidity/syntaxTests/functionCalls/invalid_named_arguments_conditional.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/invalid_named_arguments_conditional.sol
@@ -8,7 +8,7 @@ contract C {
     }
 }
 // ----
-// TypeError 4974: (199-229): Named argument "x" does not match function declaration.
-// TypeError 4974: (199-229): Named argument "y" does not match function declaration.
-// TypeError 4974: (239-264): Named argument "x" does not match function declaration.
-// TypeError 4974: (239-264): Named argument "y" does not match function declaration.
+// TypeError 4974: (199-229='(true ? g : h)({x : 1, y : 2})'): Named argument "x" does not match function declaration.
+// TypeError 4974: (199-229='(true ? g : h)({x : 1, y : 2})'): Named argument "y" does not match function declaration.
+// TypeError 4974: (239-264='[g, h][1]({x : 1, y : 2})'): Named argument "x" does not match function declaration.
+// TypeError 4974: (239-264='[g, h][1]({x : 1, y : 2})'): Named argument "y" does not match function declaration.
diff --git a/test/libsolidity/syntaxTests/functionCalls/msg_value_non_payable.sol b/test/libsolidity/syntaxTests/functionCalls/msg_value_non_payable.sol
index 281e74882..fe3d4851a 100644
--- a/test/libsolidity/syntaxTests/functionCalls/msg_value_non_payable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/msg_value_non_payable.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5887: (78-87): "msg.value" and "callvalue()" can only be used in payable public functions. Make the function "payable" or use an internal function to avoid this error.
+// TypeError 5887: (78-87='msg.value'): "msg.value" and "callvalue()" can only be used in payable public functions. Make the function "payable" or use an internal function to avoid this error.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_duplicate_parameter.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_duplicate_parameter.sol
index 17ee8dc45..9c5fee8db 100644
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_duplicate_parameter.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/named_arguments_duplicate_parameter.sol
@@ -7,6 +7,6 @@ contract test {
     }
 }
 // ----
-// Warning 2519: (31-37): This declaration shadows an existing declaration.
-// Warning 2519: (39-45): This declaration shadows an existing declaration.
-// TypeError 6995: (159-160): Duplicate named argument "a".
+// Warning 2519: (31-37='uint a'): This declaration shadows an existing declaration.
+// Warning 2519: (39-45='uint b'): This declaration shadows an existing declaration.
+// TypeError 6995: (159-160='1'): Duplicate named argument "a".
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_empty.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_empty.sol
index 0c4da5c73..1924e5a8e 100644
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_empty.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/named_arguments_empty.sol
@@ -7,6 +7,6 @@ contract test {
     }
 }
 // ----
-// Warning 2519: (31-37): This declaration shadows an existing declaration.
-// Warning 2519: (39-45): This declaration shadows an existing declaration.
-// TypeError 6160: (153-158): Wrong argument count for function call: 0 arguments given but expected 2.
+// Warning 2519: (31-37='uint a'): This declaration shadows an existing declaration.
+// Warning 2519: (39-45='uint b'): This declaration shadows an existing declaration.
+// TypeError 6160: (153-158='a({})'): Wrong argument count for function call: 0 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing1.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing1.sol
index c858e7720..6390b2ba6 100644
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing1.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing1.sol
@@ -11,4 +11,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9322: (241-242): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (241-242='f'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing2.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing2.sol
index aa49def1f..5db52c6e0 100644
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing2.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing2.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9322: (209-210): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (209-210='f'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing3.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing3.sol
index fd9069eae..d85b7eaa0 100644
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing3.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing3.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9322: (214-215): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (214-215='f'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous.sol
index 85acad306..996dd53e7 100644
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4487: (233-234): No unique declaration found after argument-dependent lookup.
+// TypeError 4487: (233-234='f'): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous_implicit_conversion.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous_implicit_conversion.sol
index 4e44c54e1..975984af3 100644
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous_implicit_conversion.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_ambiguous_implicit_conversion.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4487: (155-156): No unique declaration found after argument-dependent lookup.
+// TypeError 4487: (155-156='f'): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_right_names_wrong_order.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_right_names_wrong_order.sol
index fc2b413ab..a8f003066 100644
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_right_names_wrong_order.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_right_names_wrong_order.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9322: (164-165): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (164-165='f'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_wrong_names.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_wrong_names.sol
index 951de8678..de6c0cd8b 100644
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_wrong_names.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/named_arguments_overload_failing_wrong_names.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9322: (164-165): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (164-165='f'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/functionCalls/named_arguments_wrong_count.sol b/test/libsolidity/syntaxTests/functionCalls/named_arguments_wrong_count.sol
index 5acc2b444..3a05fc54c 100644
--- a/test/libsolidity/syntaxTests/functionCalls/named_arguments_wrong_count.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/named_arguments_wrong_count.sol
@@ -7,6 +7,6 @@ contract test {
     }
 }
 // ----
-// Warning 2519: (31-37): This declaration shadows an existing declaration.
-// Warning 2519: (39-45): This declaration shadows an existing declaration.
-// TypeError 6160: (153-162): Wrong argument count for function call: 1 arguments given but expected 2.
+// Warning 2519: (31-37='uint a'): This declaration shadows an existing declaration.
+// Warning 2519: (39-45='uint b'): This declaration shadows an existing declaration.
+// TypeError 6160: (153-162='a({a: 1})'): Wrong argument count for function call: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/functionCalls/new_library.sol b/test/libsolidity/syntaxTests/functionCalls/new_library.sol
index da410f73b..647735c6b 100644
--- a/test/libsolidity/syntaxTests/functionCalls/new_library.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/new_library.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError 1130: (63-64): Invalid use of a library name.
+// TypeError 1130: (63-64='L'): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol b/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol
index 0455d4d77..8ecd607cc 100644
--- a/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/new_with_invalid_calloptions.sol
@@ -16,12 +16,12 @@ contract C {
 // ----
 // TypeError 7006: (64-98): Cannot set option "value", since the constructor of contract D is not payable.
 // TypeError 9903: (64-98): Function call option "gas" cannot be used with "new".
-// TypeError 9318: (102-123): Unknown call option "slt". Valid options are "salt", "value" and "gas".
-// TypeError 7006: (102-123): Cannot set option "value", since the constructor of contract D is not payable.
-// TypeError 9318: (127-139): Unknown call option "val". Valid options are "salt", "value" and "gas".
-// TypeError 9886: (143-172): Duplicate option "salt".
-// TypeError 7006: (176-199): Cannot set option "value", since the constructor of contract D is not payable.
-// TypeError 7006: (176-199): Cannot set option "value", since the constructor of contract D is not payable.
-// TypeError 9318: (203-220): Unknown call option "random". Valid options are "salt", "value" and "gas".
-// TypeError 9318: (224-242): Unknown call option "what". Valid options are "salt", "value" and "gas".
-// TypeError 9903: (246-259): Function call option "gas" cannot be used with "new".
+// TypeError 9318: (102-123='new D{slt:5, value:3}'): Unknown call option "slt". Valid options are "salt", "value" and "gas".
+// TypeError 7006: (102-123='new D{slt:5, value:3}'): Cannot set option "value", since the constructor of contract D is not payable.
+// TypeError 9318: (127-139='new D{val:5}'): Unknown call option "val". Valid options are "salt", "value" and "gas".
+// TypeError 9886: (143-172='new D{salt:"xyz", salt:"aaf"}'): Duplicate option "salt".
+// TypeError 7006: (176-199='new D{value:3, value:4}'): Cannot set option "value", since the constructor of contract D is not payable.
+// TypeError 7006: (176-199='new D{value:3, value:4}'): Cannot set option "value", since the constructor of contract D is not payable.
+// TypeError 9318: (203-220='new D{random:5+5}'): Unknown call option "random". Valid options are "salt", "value" and "gas".
+// TypeError 9318: (224-242='new D{what:2130+5}'): Unknown call option "what". Valid options are "salt", "value" and "gas".
+// TypeError 9903: (246-259='new D{gas: 2}'): Function call option "gas" cannot be used with "new".
diff --git a/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
index 52e6986bb..a8e7fb8cc 100644
--- a/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (72-78): Type is not callable
+// TypeError 5704: (72-78='this()'): Type is not callable
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_constructor.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_constructor.sol
index 13a5e8ee7..bd01cfedb 100644
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_constructor.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_constructor.sol
@@ -4,4 +4,4 @@ contract C {
   function g() public { this.f.value(); }
 }
 // ----
-// TypeError 8820: (155-167): Member "value" is only available for payable functions.
+// TypeError 8820: (155-167='this.f.value'): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
index ea88bac31..a3c2ec3bf 100644
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/call_value_on_non_payable_function_type.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7006: (94-105): Cannot set option "value" on a non-payable function type.
+// TypeError 7006: (94-105='x{value: 2}'): Cannot set option "value" on a non-payable function type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol
index 6e32f5f22..fc17af96a 100644
--- a/test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/call_value_options_on_non_payable_function_type.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7006: (94-105): Cannot set option "value" on a non-payable function type.
+// TypeError 7006: (94-105='x{value: 2}'): Cannot set option "value" on a non-payable function type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
index 32fed1f6a..3c1abed4f 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-88): Operator > not compatible with types function () external returns (bool) and function () external returns (bool)
+// TypeError 2271: (73-88='this.f > this.f'): Operator > not compatible with types function () external returns (bool) and function () external returns (bool)
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
index 70a391ed9..909efa143 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-78): Operator > not compatible with types function () returns (bool) and function () returns (bool)
+// TypeError 2271: (73-78='f > f'): Operator > not compatible with types function () returns (bool) and function () returns (bool)
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
index 8eeaf3697..a77736541 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-88): Operator < not compatible with types function () external returns (bool) and function () external returns (bool)
+// TypeError 2271: (73-88='this.f < this.f'): Operator < not compatible with types function () external returns (bool) and function () external returns (bool)
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
index 6fa1c281a..a331d68d3 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-78): Operator < not compatible with types function () returns (bool) and function () returns (bool)
+// TypeError 2271: (73-78='f < f'): Operator < not compatible with types function () returns (bool) and function () returns (bool)
diff --git a/test/libsolidity/syntaxTests/functionTypes/conversion_to_address.sol b/test/libsolidity/syntaxTests/functionTypes/conversion_to_address.sol
index 369ff7d01..a5b4e867e 100644
--- a/test/libsolidity/syntaxTests/functionTypes/conversion_to_address.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/conversion_to_address.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5030: (77-92): Explicit type conversion not allowed from "function () view external returns (address)" to "address". To obtain the address of the contract of the function, you can use the .address member of the function.
+// TypeError 5030: (77-92='address(this.f)'): Explicit type conversion not allowed from "function () view external returns (address)" to "address". To obtain the address of the contract of the function, you can use the .address member of the function.
diff --git a/test/libsolidity/syntaxTests/functionTypes/delete_external_function_type_invalid.sol b/test/libsolidity/syntaxTests/functionTypes/delete_external_function_type_invalid.sol
index 55abe8267..27592612a 100644
--- a/test/libsolidity/syntaxTests/functionTypes/delete_external_function_type_invalid.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/delete_external_function_type_invalid.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4247: (54-60): Expression has to be an lvalue.
+// TypeError 4247: (54-60='this.f'): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/functionTypes/delete_function_type_invalid.sol b/test/libsolidity/syntaxTests/functionTypes/delete_function_type_invalid.sol
index 546a0acd5..efa23fe35 100644
--- a/test/libsolidity/syntaxTests/functionTypes/delete_function_type_invalid.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/delete_function_type_invalid.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4247: (54-55): Expression has to be an lvalue.
+// TypeError 4247: (54-55='f'): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol
index 1141d532d..2609532cb 100644
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_gas_function.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1621: (102-107): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
+// TypeError 1621: (102-107='x.gas'): Using ".gas(...)" is deprecated. Use "{gas: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol
index a5e6df343..400900941 100644
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor.sol
@@ -8,4 +8,4 @@ contract D {
     }
 }
 // ----
-// TypeError 1621: (115-128): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
+// TypeError 1621: (115-128='(new C).value'): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor_nonpayable.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor_nonpayable.sol
index 4cc674570..312159e23 100644
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_constructor_nonpayable.sol
@@ -8,4 +8,4 @@ contract D {
     }
 }
 // ----
-// TypeError 8827: (107-120): Constructor for contract C must be payable for member "value" to be available.
+// TypeError 8827: (107-120='(new C).value'): Constructor for contract C must be payable for member "value" to be available.
diff --git a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol
index 44c4fd905..a2d672362 100644
--- a/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/error_deprecate_value_function.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1621: (102-109): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
+// TypeError 1621: (102-109='x.value'): Using ".value(...)" is deprecated. Use "{value: ...}" instead.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_type_returning_internal.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_type_returning_internal.sol
index 5a4d44613..b7714fd20 100644
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_type_returning_internal.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/external_function_type_returning_internal.sol
@@ -2,4 +2,4 @@ contract C {
     function() external returns (function () internal) x;
 }
 // ----
-// TypeError 2582: (46-67): Internal type cannot be used for external function type.
+// TypeError 2582: (46-67='function () internal)'): Internal type cannot be used for external function type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_type_taking_internal.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_type_taking_internal.sol
index 33248a62c..e4cb6c21b 100644
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_type_taking_internal.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/external_function_type_taking_internal.sol
@@ -2,4 +2,4 @@ contract C {
     function(function () internal) external x;
 }
 // ----
-// TypeError 2582: (26-47): Internal type cannot be used for external function type.
+// TypeError 2582: (26-47='function () internal)'): Internal type cannot be used for external function type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address_payable.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address_payable.sol
index 2fa634fce..edad868f5 100644
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address_payable.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_address_payable.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6359: (85-99): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
+// TypeError 6359: (85-99='this.f.address'): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_uint.sol b/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_uint.sol
index 083388e6a..b6ffe4c0a 100644
--- a/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_uint.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/external_function_type_to_uint.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (69-81): Explicit type conversion not allowed from "function () external returns (uint256)" to "uint256".
+// TypeError 9640: (69-81='uint(this.f)'): Explicit type conversion not allowed from "function () external returns (uint256)" to "uint256".
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol
index 8593bdbf4..b0edd4cc6 100644
--- a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol
@@ -4,5 +4,5 @@ contract C {
     }
 }
 // ----
-// Warning 6321: (56-60): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (56-60='bool'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
 // Warning 2018: (17-102): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol
index 0d7030606..96614841e 100644
--- a/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol
@@ -10,5 +10,5 @@ contract C {
     }
 }
 // ----
-// TypeError 9553: (230-233): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) external returns (uint256) requested. Special functions can not be converted to function types.
+// TypeError 9553: (230-233='L.f'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) external returns (uint256) requested. Special functions can not be converted to function types.
 // TypeError 9574: (244-305): Type function (uint256) returns (uint256) is not implicitly convertible to expected type function (uint256) external returns (uint256). Special functions can not be converted to function types.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_constructor.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_constructor.sol
index 270ff69f9..fc17ac364 100644
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_constructor.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/function_type_constructor.sol
@@ -3,5 +3,5 @@ contract C {
     constructor() x;
 }
 // ----
-// SyntaxError 2668: (83-99): Functions without implementation cannot have modifiers.
-// DeclarationError 7920: (97-98): Identifier not found or not unique.
+// SyntaxError 2668: (83-99='constructor() x;'): Functions without implementation cannot have modifiers.
+// DeclarationError 7920: (97-98='x'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol
index e438a871d..0988396fa 100644
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6933: (104-115): Expected primary expression.
+// ParserError 6933: (104-115='constructor'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_named_call.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_named_call.sol
index ca337904a..6d2a6d34c 100644
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_named_call.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/function_type_named_call.sol
@@ -5,5 +5,5 @@ contract C {
     }
 }
 // ----
-// Warning 6162: (61-67): Naming function type parameters is deprecated.
-// TypeError 4974: (95-103): Named argument "a" does not match function declaration.
+// Warning 6162: (61-67='uint a'): Naming function type parameters is deprecated.
+// TypeError 4974: (95-103='x({a:2})'): Named argument "a" does not match function declaration.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_return_parameters_with_names.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_return_parameters_with_names.sol
index c96cbfff9..fc37c5788 100644
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_return_parameters_with_names.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/function_type_return_parameters_with_names.sol
@@ -2,4 +2,4 @@ contract C {
     function(uint) returns (bool ret) f;
 }
 // ----
-// SyntaxError 7304: (41-49): Return parameters in function types may not be named.
+// SyntaxError 7304: (41-49='bool ret'): Return parameters in function types may not be named.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_struct_undefined_member.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_struct_undefined_member.sol
index c12a42d63..b2a98db2f 100644
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_struct_undefined_member.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/function_type_struct_undefined_member.sol
@@ -7,4 +7,4 @@ library L
 	function f(function(Nested memory) external) external pure {}
 }
 // ----
-// DeclarationError 7920: (32-35): Identifier not found or not unique.
+// DeclarationError 7920: (32-35='Non'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol
index 08b1b26e3..72b281d05 100644
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol
@@ -3,4 +3,4 @@ contract test {
     function(bytes memory) external internal a = fa;
 }
 // ----
-// TypeError 7407: (106-108): Type function (bytes memory) is not implicitly convertible to expected type function (bytes memory) external. Special functions can not be converted to function types.
+// TypeError 7407: (106-108='fa'): Type function (bytes memory) is not implicitly convertible to expected type function (bytes memory) external. Special functions can not be converted to function types.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_types_internal_visibility_error.sol b/test/libsolidity/syntaxTests/functionTypes/function_types_internal_visibility_error.sol
index 8c2ca4c89..7fd976bd4 100644
--- a/test/libsolidity/syntaxTests/functionTypes/function_types_internal_visibility_error.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/function_types_internal_visibility_error.sol
@@ -4,4 +4,4 @@ contract C {
     function(bytes memory) public a;
 }
 // ----
-// TypeError 6012: (139-170): Invalid visibility, can only be "external" or "internal".
+// TypeError 6012: (139-170='function(bytes memory) public a'): Invalid visibility, can only be "external" or "internal".
diff --git a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function.sol b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function.sol
index 4e5ae7613..2d9e24ba6 100644
--- a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9563: (186-189): Invalid mobile type.
+// TypeError 9563: (186-189='t.f'): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function_mixed.sol b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function_mixed.sol
index be98f2be5..5622604f7 100644
--- a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function_mixed.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function_mixed.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9563: (169-172): Invalid mobile type.
+// TypeError 9563: (169-172='t.f'): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_payable_function.sol b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_payable_function.sol
index 195287d55..e936a29c3 100644
--- a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_payable_function.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_payable_function.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9563: (155-168): Invalid mobile type.
+// TypeError 9563: (155-168='d.f{value: 1}'): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_function_struct_as_external_parameter_in_library_external.sol b/test/libsolidity/syntaxTests/functionTypes/internal_function_struct_as_external_parameter_in_library_external.sol
index a384c8a66..b95b00d3b 100644
--- a/test/libsolidity/syntaxTests/functionTypes/internal_function_struct_as_external_parameter_in_library_external.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/internal_function_struct_as_external_parameter_in_library_external.sol
@@ -6,4 +6,4 @@ library L {
     function f(S storage s) public { }
 }
 // ----
-// TypeError 4103: (104-115): Internal type is not allowed for public or external functions.
+// TypeError 4103: (104-115='S storage s'): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_function_type_to_address.sol b/test/libsolidity/syntaxTests/functionTypes/internal_function_type_to_address.sol
index 18b9a7ea9..c534fcb61 100644
--- a/test/libsolidity/syntaxTests/functionTypes/internal_function_type_to_address.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/internal_function_type_to_address.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (72-82): Explicit type conversion not allowed from "function () returns (address)" to "address".
+// TypeError 9640: (72-82='address(f)'): Explicit type conversion not allowed from "function () returns (address)" to "address".
diff --git a/test/libsolidity/syntaxTests/functionTypes/selectors.sol b/test/libsolidity/syntaxTests/functionTypes/selectors.sol
index 21a88fe8e..096bc124b 100644
--- a/test/libsolidity/syntaxTests/functionTypes/selectors.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/selectors.sol
@@ -19,8 +19,8 @@ contract D {
     }
 }
 // ----
-// Warning 6133: (136-150): Statement has no effect.
-// Warning 6133: (160-174): Statement has no effect.
-// Warning 6133: (184-201): Statement has no effect.
-// Warning 6133: (289-303): Statement has no effect.
-// Warning 6133: (313-327): Statement has no effect.
+// Warning 6133: (136-150='B.ext.selector'): Statement has no effect.
+// Warning 6133: (160-174='B.pub.selector'): Statement has no effect.
+// Warning 6133: (184-201='this.ext.selector'): Statement has no effect.
+// Warning 6133: (289-303='B.ext.selector'): Statement has no effect.
+// Warning 6133: (313-327='B.pub.selector'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/functionTypes/ternary_with_bound_functions.sol b/test/libsolidity/syntaxTests/functionTypes/ternary_with_bound_functions.sol
index 2e12e4d2a..2116e999d 100644
--- a/test/libsolidity/syntaxTests/functionTypes/ternary_with_bound_functions.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/ternary_with_bound_functions.sol
@@ -10,5 +10,5 @@ contract C {
     }
 }
 // ----
-// TypeError 9717: (196-199): Invalid mobile type in true expression.
-// TypeError 3703: (202-205): Invalid mobile type in false expression.
+// TypeError 9717: (196-199='t.f'): Invalid mobile type in true expression.
+// TypeError 3703: (202-205='t.g'): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/warn_function_type_parameters_with_names.sol b/test/libsolidity/syntaxTests/functionTypes/warn_function_type_parameters_with_names.sol
index 6964146f1..b46e1f0b8 100644
--- a/test/libsolidity/syntaxTests/functionTypes/warn_function_type_parameters_with_names.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/warn_function_type_parameters_with_names.sol
@@ -2,4 +2,4 @@ contract C {
     function(uint a) f;
 }
 // ----
-// Warning 6162: (26-32): Naming function type parameters is deprecated.
+// Warning 6162: (26-32='uint a'): Naming function type parameters is deprecated.
diff --git a/test/libsolidity/syntaxTests/getter/nested_structs.sol b/test/libsolidity/syntaxTests/getter/nested_structs.sol
index 36886bacf..6d9ca84bc 100644
--- a/test/libsolidity/syntaxTests/getter/nested_structs.sol
+++ b/test/libsolidity/syntaxTests/getter/nested_structs.sol
@@ -9,4 +9,4 @@ contract C {
     mapping(uint256 => X) public m;
 }
 // ----
-// TypeError 2763: (108-138): The following types are only supported for getters in ABI coder v2: struct C.Y memory. Either remove "public" or use "pragma abicoder v2;" to enable the feature.
+// TypeError 2763: (108-138='mapping(uint256 => X) public m'): The following types are only supported for getters in ABI coder v2: struct C.Y memory. Either remove "public" or use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/getter/recursive_struct.sol b/test/libsolidity/syntaxTests/getter/recursive_struct.sol
index 4723a162c..e8fbcaf6c 100644
--- a/test/libsolidity/syntaxTests/getter/recursive_struct.sol
+++ b/test/libsolidity/syntaxTests/getter/recursive_struct.sol
@@ -5,4 +5,4 @@ contract C {
     mapping(uint256 => Y) public m;
 }
 // ----
-// TypeError 6744: (53-83): Internal or recursive type is not allowed for public state variables.
+// TypeError 6744: (53-83='mapping(uint256 => Y) public m'): Internal or recursive type is not allowed for public state variables.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/call_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/call_with_wrong_arg_count.sol
index 33a864429..da6d59e20 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/call_with_wrong_arg_count.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/call_with_wrong_arg_count.sol
@@ -11,7 +11,7 @@ contract C {
     }
 }
 // ----
-// TypeError 6138: (65-85): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
-// TypeError 8051: (153-171): Invalid type for argument in function call. Invalid implicit conversion from bytes4 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
-// TypeError 8051: (240-247): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
+// TypeError 6138: (65-85='address(this).call()'): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
+// TypeError 8051: (153-171='bytes4(0x12345678)'): Invalid type for argument in function call. Invalid implicit conversion from bytes4 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
+// TypeError 8051: (240-247='uint(1)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
 // TypeError 8922: (297-333): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/callcode_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/callcode_with_wrong_arg_count.sol
index 8b9426405..e51a2bc82 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/callcode_with_wrong_arg_count.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/callcode_with_wrong_arg_count.sol
@@ -9,6 +9,6 @@ contract C {
     }
 }
 // ----
-// TypeError 6138: (65-89): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
-// TypeError 8051: (161-168): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
+// TypeError 6138: (65-89='address(this).callcode()'): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
+// TypeError 8051: (161-168='uint(1)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
 // TypeError 8922: (218-258): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/delegatecall_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/delegatecall_with_wrong_arg_count.sol
index 1e2b067a6..bc8b158a3 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/delegatecall_with_wrong_arg_count.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/delegatecall_with_wrong_arg_count.sol
@@ -9,6 +9,6 @@ contract C {
     }
 }
 // ----
-// TypeError 6138: (65-93): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
-// TypeError 8051: (169-176): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
+// TypeError 6138: (65-93='address(this).delegatecall()'): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use "" as argument to provide empty calldata.
+// TypeError 8051: (169-176='uint(1)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
 // TypeError 8922: (226-270): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. If all your arguments are value types, you can use abi.encode(...) to properly generate it.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/keccak256_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/keccak256_with_wrong_arg_count.sol
index 8867cf78b..dd5968f57 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/keccak256_with_wrong_arg_count.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/keccak256_with_wrong_arg_count.sol
@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ----
-// TypeError 4323: (55-66): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 7556: (100-107): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 4323: (132-159): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 4323: (55-66='keccak256()'): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 7556: (100-107='uint(1)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 4323: (132-159='keccak256(uint(1), uint(2))'): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/log_deprecate.sol b/test/libsolidity/syntaxTests/globalFunctions/log_deprecate.sol
index 4418c6198..90b42a832 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/log_deprecate.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/log_deprecate.sol
@@ -8,8 +8,8 @@ contract C {
 	}
 }
 // ----
-// DeclarationError 7576: (38-42): Undeclared identifier.
-// DeclarationError 7576: (46-50): Undeclared identifier.
-// DeclarationError 7576: (54-58): Undeclared identifier.
-// DeclarationError 7576: (62-66): Undeclared identifier.
-// DeclarationError 7576: (70-74): Undeclared identifier.
+// DeclarationError 7576: (38-42='log0'): Undeclared identifier.
+// DeclarationError 7576: (46-50='log1'): Undeclared identifier.
+// DeclarationError 7576: (54-58='log2'): Undeclared identifier.
+// DeclarationError 7576: (62-66='log3'): Undeclared identifier.
+// DeclarationError 7576: (70-74='log4'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol b/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol
index d6d9b8e9f..9ffdf266b 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/now_deprecate.sol
@@ -4,4 +4,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 7359: (38-41): "now" has been deprecated. Use "block.timestamp" instead.
+// TypeError 7359: (38-41='now'): "now" has been deprecated. Use "block.timestamp" instead.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/now_override.sol b/test/libsolidity/syntaxTests/globalFunctions/now_override.sol
index 08d648f78..85c42051d 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/now_override.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/now_override.sol
@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// Warning 2319: (43-51): This declaration shadows a builtin symbol.
+// Warning 2319: (43-51='uint now'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/ripemd160_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/ripemd160_with_wrong_arg_count.sol
index 62df6c4ef..3057e5130 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/ripemd160_with_wrong_arg_count.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/ripemd160_with_wrong_arg_count.sol
@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ----
-// TypeError 4323: (55-66): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 7556: (100-107): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 4323: (132-159): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 4323: (55-66='ripemd160()'): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 7556: (100-107='uint(1)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 4323: (132-159='ripemd160(uint(1), uint(2))'): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/sha256_with_wrong_arg_count.sol b/test/libsolidity/syntaxTests/globalFunctions/sha256_with_wrong_arg_count.sol
index 47dff279a..45ad6f4a1 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/sha256_with_wrong_arg_count.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/sha256_with_wrong_arg_count.sol
@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ----
-// TypeError 4323: (55-63): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 7556: (94-101): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 4323: (126-150): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 4323: (55-63='sha256()'): Wrong argument count for function call: 0 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 7556: (94-101='uint(1)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 4323: (126-150='sha256(uint(1), uint(2))'): Wrong argument count for function call: 2 arguments given but expected 1. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/sha3_no_call.sol b/test/libsolidity/syntaxTests/globalFunctions/sha3_no_call.sol
index 23d64f133..55906fb5c 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/sha3_no_call.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/sha3_no_call.sol
@@ -5,4 +5,4 @@ contract C
 	}
 }
 // ----
-// TypeError 3557: (60-64): "sha3" has been deprecated in favour of "keccak256".
+// TypeError 3557: (60-64='sha3'): "sha3" has been deprecated in favour of "keccak256".
diff --git a/test/libsolidity/syntaxTests/globalFunctions/sha3_var.sol b/test/libsolidity/syntaxTests/globalFunctions/sha3_var.sol
index 2313a6e18..be35bb8f5 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/sha3_var.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/sha3_var.sol
@@ -6,4 +6,4 @@ contract C
 	}
 }
 // ----
-// Warning 2319: (58-67): This declaration shadows a builtin symbol.
+// Warning 2319: (58-67='bool sha3'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/suicide_no_call.sol b/test/libsolidity/syntaxTests/globalFunctions/suicide_no_call.sol
index 379c7dd7a..fd08553b9 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/suicide_no_call.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/suicide_no_call.sol
@@ -5,4 +5,4 @@ contract C
 	}
 }
 // ----
-// TypeError 8050: (60-67): "suicide" has been deprecated in favour of "selfdestruct".
+// TypeError 8050: (60-67='suicide'): "suicide" has been deprecated in favour of "selfdestruct".
diff --git a/test/libsolidity/syntaxTests/globalFunctions/suicide_var.sol b/test/libsolidity/syntaxTests/globalFunctions/suicide_var.sol
index c51810009..eca2e14c9 100644
--- a/test/libsolidity/syntaxTests/globalFunctions/suicide_var.sol
+++ b/test/libsolidity/syntaxTests/globalFunctions/suicide_var.sol
@@ -6,4 +6,4 @@ contract C
 	}
 }
 // ----
-// Warning 2319: (58-70): This declaration shadows a builtin symbol.
+// Warning 2319: (58-70='bool suicide'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_local_variable_with_invalid_type.sol b/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_local_variable_with_invalid_type.sol
index 7257ef0f7..3934ad2a5 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_local_variable_with_invalid_type.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_local_variable_with_invalid_type.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2582: (76-96): Internal type cannot be used for external function type.
+// TypeError 2582: (76-96='function() internal)'): Internal type cannot be used for external function type.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_parameter_with_invalid_type.sol b/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_parameter_with_invalid_type.sol
index 9bb40242e..661b6e3a2 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_parameter_with_invalid_type.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/calling_external_function_via_parameter_with_invalid_type.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2582: (66-86): Internal type cannot be used for external function type.
+// TypeError 2582: (66-86='function() internal)'): Internal type cannot be used for external function type.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_bitnot_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_bitnot_tuple.sol
index 608481c76..3daa14bd9 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_bitnot_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_bitnot_tuple.sol
@@ -6,4 +6,4 @@ contract C
     }
 }
 // ----
-// TypeError 8381: (60-64): Tuple component cannot be empty.
+// TypeError 8381: (60-64='(0,)'): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
index 568fe27ff..b751f047b 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
@@ -6,4 +6,4 @@ contract C
     }
 }
 // ----
-// TypeError 9767: (59-64): Unary operator -- cannot be applied to type tuple(,)
+// TypeError 9767: (59-64='--(,)'): Unary operator -- cannot be applied to type tuple(,)
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
index 9727e53a5..cb108564f 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
@@ -6,5 +6,5 @@ contract C
     }
 }
 // ----
-// TypeError 4247: (68-69): Expression has to be an lvalue.
-// TypeError 9767: (59-70): Unary operator delete cannot be applied to type tuple(,int_const 0)
+// TypeError 4247: (68-69='0'): Expression has to be an lvalue.
+// TypeError 9767: (59-70='delete (,0)'): Unary operator delete cannot be applied to type tuple(,int_const 0)
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
index 487c224be..4b9fc35a5 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
@@ -6,4 +6,4 @@ contract C
     }
 }
 // ----
-// TypeError 9767: (61-66): Unary operator ++ cannot be applied to type tuple(,)
+// TypeError 9767: (61-66='++(,)'): Unary operator ++ cannot be applied to type tuple(,)
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
index 2c568a4e7..d7d96c28a 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
@@ -9,12 +9,12 @@ contract C
     }
 }
 // ----
-// SyntaxError 9636: (59-66): Use of unary + is disallowed.
-// TypeError 4907: (59-66): Unary operator + cannot be applied to type tuple(int_const 0,int_const 0)
-// TypeError 7364: (51-66): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (84-91): Unary operator - cannot be applied to type tuple(int_const 0,int_const 0)
-// TypeError 7364: (76-91): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (111-118): Unary operator ~ cannot be applied to type tuple(int_const 0,int_const 0)
-// TypeError 7364: (101-118): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (138-145): Unary operator ! cannot be applied to type tuple(int_const 0,int_const 0)
-// TypeError 7364: (128-145): Different number of components on the left hand side (1) than on the right hand side (2).
+// SyntaxError 9636: (59-66='+(0, 0)'): Use of unary + is disallowed.
+// TypeError 4907: (59-66='+(0, 0)'): Unary operator + cannot be applied to type tuple(int_const 0,int_const 0)
+// TypeError 7364: (51-66='int x = +(0, 0)'): Different number of components on the left hand side (1) than on the right hand side (2).
+// TypeError 4907: (84-91='-(0, 0)'): Unary operator - cannot be applied to type tuple(int_const 0,int_const 0)
+// TypeError 7364: (76-91='int y = -(0, 0)'): Different number of components on the left hand side (1) than on the right hand side (2).
+// TypeError 4907: (111-118='~(0, 0)'): Unary operator ~ cannot be applied to type tuple(int_const 0,int_const 0)
+// TypeError 7364: (101-118='(int z) = ~(0, 0)'): Different number of components on the left hand side (1) than on the right hand side (2).
+// TypeError 4907: (138-145='!(0, 0)'): Unary operator ! cannot be applied to type tuple(int_const 0,int_const 0)
+// TypeError 7364: (128-145='(int t) = !(0, 0)'): Different number of components on the left hand side (1) than on the right hand side (2).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol b/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol
index b2d10d205..522e1ffc1 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol
@@ -2,4 +2,4 @@ contract C {
         function ( uint ) external returns ( a [ ] calldata ) public a = ( 1 / 2 ) ;
 }
 // ----
-// TypeError 5172: (58-59): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (58-59='a'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct.sol b/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct.sol
index 84be465fa..2d556808a 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct.sol
@@ -13,4 +13,4 @@ contract C {
         }
 }
 // ----
-// TypeError 1534: (474-484): Type too large for memory.
+// TypeError 1534: (474-484='S memory s'): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct_2.sol b/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct_2.sol
index 5d724cd02..746315c17 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct_2.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/large_array_in_memory_struct_2.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1534: (169-181): Type too large for memory.
+// TypeError 1534: (169-181='C.S memory y'): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/large_struct_array.sol b/test/libsolidity/syntaxTests/iceRegressionTests/large_struct_array.sol
index 411518710..eb3391798 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/large_struct_array.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/large_struct_array.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1534: (226-234): Type too large for memory.
+// TypeError 1534: (226-234='S memory'): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/oversized_var.sol b/test/libsolidity/syntaxTests/iceRegressionTests/oversized_var.sol
index 761e60a1a..ea7ca5ff5 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/oversized_var.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/oversized_var.sol
@@ -12,9 +12,9 @@ contract b {
     }
 }
 // ----
-// Warning 7325: (66-67): Type struct b.c covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (66-67): Type uint256[14474011154664524427946373126085988481658748083205070504932198000989141204992] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (111-112): Type struct b.c covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (111-112): Type uint256[14474011154664524427946373126085988481658748083205070504932198000989141204992] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (152-169): Type function ()[984770902183611232881] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 2072: (152-180): Unused local variable.
+// Warning 7325: (66-67='c'): Type struct b.c covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (66-67='c'): Type uint256[14474011154664524427946373126085988481658748083205070504932198000989141204992] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (111-112='c'): Type struct b.c covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (111-112='c'): Type uint256[14474011154664524427946373126085988481658748083205070504932198000989141204992] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (152-169='function()[3**44]'): Type function ()[984770902183611232881] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 2072: (152-180='function()[3**44] storage fs'): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol b/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol
index 892cfdd8d..77c5a18b4 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol
@@ -11,4 +11,4 @@ contract Test {
 }
 // ----
 // DeclarationError 2333: (157-198): Identifier already declared.
-// TypeError 4061: (268-300): Type struct Test.RecursiveStruct[1] is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (268-300='RecursiveStruct [ 1 ] memory val'): Type struct Test.RecursiveStruct[1] is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/immutable/as_function_param.sol b/test/libsolidity/syntaxTests/immutable/as_function_param.sol
index dd9ca0bc8..89c3e8e99 100644
--- a/test/libsolidity/syntaxTests/immutable/as_function_param.sol
+++ b/test/libsolidity/syntaxTests/immutable/as_function_param.sol
@@ -2,4 +2,4 @@ contract C {
     function f(uint immutable) public pure {}
 }
 // ----
-// DeclarationError 8297: (28-42): The "immutable" keyword can only be used for state variables.
+// DeclarationError 8297: (28-42='uint immutable'): The "immutable" keyword can only be used for state variables.
diff --git a/test/libsolidity/syntaxTests/immutable/assembly.sol b/test/libsolidity/syntaxTests/immutable/assembly.sol
index a81611120..c980d322e 100644
--- a/test/libsolidity/syntaxTests/immutable/assembly.sol
+++ b/test/libsolidity/syntaxTests/immutable/assembly.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3773: (118-119): Assembly access to immutable variables is not supported.
+// TypeError 3773: (118-119='x'): Assembly access to immutable variables is not supported.
diff --git a/test/libsolidity/syntaxTests/immutable/complex.sol b/test/libsolidity/syntaxTests/immutable/complex.sol
index b624430ea..e3434bd55 100644
--- a/test/libsolidity/syntaxTests/immutable/complex.sol
+++ b/test/libsolidity/syntaxTests/immutable/complex.sol
@@ -5,4 +5,4 @@ contract A {
 }
 
 // ----
-// TypeError 1581: (83-84): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (83-84='a'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol b/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol
index 77e73c51f..bd6c2939b 100644
--- a/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2658: (86-93): Construction control flow ends without initializing all immutable state variables.
+// TypeError 2658: (86-93='return;'): Construction control flow ends without initializing all immutable state variables.
diff --git a/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol b/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol
index 052a1b597..dd0b07869 100644
--- a/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4599: (86-87): Cannot write to immutable here: Immutable variables cannot be initialized inside an if statement.
+// TypeError 4599: (86-87='x'): Cannot write to immutable here: Immutable variables cannot be initialized inside an if statement.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_indirect_initialization.sol b/test/libsolidity/syntaxTests/immutable/ctor_indirect_initialization.sol
index e95bf5740..cce7ea5b0 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_indirect_initialization.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_indirect_initialization.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1581: (119-120): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (119-120='x'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol b/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
index 0ee583b56..c8239bb27 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
@@ -7,4 +7,4 @@ contract C {
     function f() public pure returns (uint) { return 3 + x; }
 }
 // ----
-// TypeError 7733: (136-137): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (136-137='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol b/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol
index 38ff92945..62cf5f124 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7733: (71-72): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (71-72='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol b/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol
index 0a966f7c3..80b7cc6a2 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol
@@ -9,4 +9,4 @@ contract C {
     function f(uint a) internal pure {}
 }
 // ----
-// TypeError 1581: (59-60): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (59-60='x'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_modifier_initialization.sol b/test/libsolidity/syntaxTests/immutable/ctor_modifier_initialization.sol
index 5970ab247..62c2e0788 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_modifier_initialization.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_modifier_initialization.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1581: (102-103): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (102-103='x'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol b/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol
index 5e3442e55..3463e3b4c 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol
@@ -11,4 +11,4 @@ contract C {
     function f(uint a) internal pure {}
 }
 // ----
-// TypeError 7733: (119-120): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (119-120='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/decrement.sol b/test/libsolidity/syntaxTests/immutable/decrement.sol
index dd081438a..9d853341a 100644
--- a/test/libsolidity/syntaxTests/immutable/decrement.sol
+++ b/test/libsolidity/syntaxTests/immutable/decrement.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3969: (63-64): Immutable variables must be initialized using an assignment.
+// TypeError 3969: (63-64='x'): Immutable variables must be initialized using an assignment.
diff --git a/test/libsolidity/syntaxTests/immutable/delete.sol b/test/libsolidity/syntaxTests/immutable/delete.sol
index bbb418c17..be8aa004e 100644
--- a/test/libsolidity/syntaxTests/immutable/delete.sol
+++ b/test/libsolidity/syntaxTests/immutable/delete.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3969: (70-71): Immutable variables must be initialized using an assignment.
+// TypeError 3969: (70-71='x'): Immutable variables must be initialized using an assignment.
diff --git a/test/libsolidity/syntaxTests/immutable/delete_and_initialize.sol b/test/libsolidity/syntaxTests/immutable/delete_and_initialize.sol
index 1e55d90ce..8be0a5332 100644
--- a/test/libsolidity/syntaxTests/immutable/delete_and_initialize.sol
+++ b/test/libsolidity/syntaxTests/immutable/delete_and_initialize.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2718: (74-75): Immutable variables cannot be modified after initialization.
+// TypeError 2718: (74-75='x'): Immutable variables cannot be modified after initialization.
diff --git a/test/libsolidity/syntaxTests/immutable/double_specifier.sol b/test/libsolidity/syntaxTests/immutable/double_specifier.sol
index a292ee115..8d470d333 100644
--- a/test/libsolidity/syntaxTests/immutable/double_specifier.sol
+++ b/test/libsolidity/syntaxTests/immutable/double_specifier.sol
@@ -3,5 +3,5 @@ contract C {
     uint immutable constant x;
 }
 // ----
-// ParserError 3109: (32-41): Mutability already set to "immutable"
-// ParserError 3109: (64-72): Mutability already set to "immutable"
+// ParserError 3109: (32-41='immutable'): Mutability already set to "immutable"
+// ParserError 3109: (64-72='constant'): Mutability already set to "immutable"
diff --git a/test/libsolidity/syntaxTests/immutable/external_function_pointer.sol b/test/libsolidity/syntaxTests/immutable/external_function_pointer.sol
index bf73cc1de..8858c8580 100644
--- a/test/libsolidity/syntaxTests/immutable/external_function_pointer.sol
+++ b/test/libsolidity/syntaxTests/immutable/external_function_pointer.sol
@@ -2,4 +2,4 @@ contract C {
     function() external immutable f;
 }
 // ----
-// TypeError 3366: (17-48): Immutable variables of external function type are not yet supported.
+// TypeError 3366: (17-48='function() external immutable f'): Immutable variables of external function type are not yet supported.
diff --git a/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol b/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
index 7933f8e7f..966e38213 100644
--- a/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
@@ -4,4 +4,4 @@ contract C {
     function f() public pure returns (uint) { return 3 + x; }
 }
 // ----
-// TypeError 7733: (99-100): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (99-100='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol b/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol
index 0d9dabf90..f432ad108 100644
--- a/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol
+++ b/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol
@@ -10,5 +10,5 @@ contract C is B(C.f) {
     function f() internal returns(uint) { return x = 2; }
 }
 // ----
-// TypeError 1581: (200-201): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
-// TypeError 1574: (109-110): Immutable state variable already initialized.
+// TypeError 1581: (200-201='x'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1574: (109-110='x'): Immutable state variable already initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol b/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
index e94fd155c..c778b8911 100644
--- a/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
@@ -10,4 +10,4 @@ contract C is B(C.f) {
     function f() internal returns(uint) { return x + 2; }
 }
 // ----
-// TypeError 7733: (200-201): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (200-201='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/illegal_names.sol b/test/libsolidity/syntaxTests/immutable/illegal_names.sol
index a80083ed8..c008c0e61 100644
--- a/test/libsolidity/syntaxTests/immutable/illegal_names.sol
+++ b/test/libsolidity/syntaxTests/immutable/illegal_names.sol
@@ -4,8 +4,8 @@ contract C {
     uint immutable this;
 }
 // ----
-// DeclarationError 3726: (17-37): The name "super" is reserved.
-// DeclarationError 3726: (43-59): The name "_" is reserved.
-// DeclarationError 3726: (65-84): The name "this" is reserved.
-// Warning 2319: (17-37): This declaration shadows a builtin symbol.
-// Warning 2319: (65-84): This declaration shadows a builtin symbol.
+// DeclarationError 3726: (17-37='uint immutable super'): The name "super" is reserved.
+// DeclarationError 3726: (43-59='uint immutable _'): The name "_" is reserved.
+// DeclarationError 3726: (65-84='uint immutable this'): The name "this" is reserved.
+// Warning 2319: (17-37='uint immutable super'): This declaration shadows a builtin symbol.
+// Warning 2319: (65-84='uint immutable this'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/immutable/increment.sol b/test/libsolidity/syntaxTests/immutable/increment.sol
index 020620159..3b1172951 100644
--- a/test/libsolidity/syntaxTests/immutable/increment.sol
+++ b/test/libsolidity/syntaxTests/immutable/increment.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3969: (63-64): Immutable variables must be initialized using an assignment.
+// TypeError 3969: (63-64='x'): Immutable variables must be initialized using an assignment.
diff --git a/test/libsolidity/syntaxTests/immutable/increment_decrement.sol b/test/libsolidity/syntaxTests/immutable/increment_decrement.sol
index 7b8092e1e..17a34e1cc 100644
--- a/test/libsolidity/syntaxTests/immutable/increment_decrement.sol
+++ b/test/libsolidity/syntaxTests/immutable/increment_decrement.sol
@@ -7,5 +7,5 @@ contract C {
   }
 }
 // ----
-// TypeError 3969: (77-78): Immutable variables must be initialized using an assignment.
-// TypeError 3969: (86-87): Immutable variables must be initialized using an assignment.
+// TypeError 3969: (77-78='x'): Immutable variables must be initialized using an assignment.
+// TypeError 3969: (86-87='y'): Immutable variables must be initialized using an assignment.
diff --git a/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol b/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
index eaa2186f1..15540c6af 100644
--- a/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
+++ b/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
@@ -5,4 +5,4 @@ contract C {
     function f() internal returns(uint) { return x; }
 }
 // ----
-// TypeError 7733: (107-108): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (107-108='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol
index bc084400e..aaf00dfd9 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol
@@ -11,4 +11,4 @@ contract C is B {
     constructor() B(y = 3) { }
 }
 // ----
-// TypeError 1581: (148-149): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (148-149='y'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol
index 503f182d6..3aaa66dbf 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol
@@ -10,4 +10,4 @@ contract C is B(C.y = 3) {
     uint immutable y;
 }
 // ----
-// TypeError 1581: (104-107): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (104-107='C.y'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol
index 2c670df6c..fe9e487ce 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol
@@ -13,4 +13,4 @@ contract C is B(C.y) {
     }
 }
 // ----
-// TypeError 7733: (104-107): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (104-107='C.y'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
index dc11b8a61..ddf7a4740 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
@@ -16,4 +16,4 @@ contract C is B {
     }
 }
 // ----
-// TypeError 7733: (253-254): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (253-254='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol
index 95ea3e686..79bdb2cb5 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol
@@ -18,4 +18,4 @@ contract C is B {
     }
 }
 // ----
-// TypeError 7733: (245-246): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (245-246='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol b/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol
index 748d9da55..d25e4c145 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol
@@ -8,4 +8,4 @@ contract C is B {
     }
 }
 // ----
-// TypeError 7484: (88-89): Cannot write to immutable here: Immutable variables must be initialized in the constructor of the contract they are defined in.
+// TypeError 7484: (88-89='x'): Cannot write to immutable here: Immutable variables must be initialized in the constructor of the contract they are defined in.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol
index b67d149b2..ee1978530 100644
--- a/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol
+++ b/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol
@@ -4,4 +4,4 @@ contract D is C {
   constructor() C(t=2) {}
 }
 // ----
-// TypeError 1581: (92-93): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (92-93='t'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
index 63662e1b7..097c88060 100644
--- a/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
+++ b/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
@@ -3,4 +3,4 @@ contract D is C(D.t = 2) {
   uint immutable t;
 }
 // ----
-// TypeError 1581: (52-55): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (52-55='D.t'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_modifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_modifier_param.sol
index 3e354b4e9..0d788d294 100644
--- a/test/libsolidity/syntaxTests/immutable/init_in_modifier_param.sol
+++ b/test/libsolidity/syntaxTests/immutable/init_in_modifier_param.sol
@@ -4,4 +4,4 @@ contract D {
   constructor() m(t=2) {}
 }
 // ----
-// TypeError 1581: (77-78): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (77-78='t'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/loop_initialized.sol b/test/libsolidity/syntaxTests/immutable/loop_initialized.sol
index d8c8ca47f..5808413e4 100644
--- a/test/libsolidity/syntaxTests/immutable/loop_initialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/loop_initialized.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6672: (88-89): Cannot write to immutable here: Immutable variables cannot be initialized inside a loop.
+// TypeError 6672: (88-89='x'): Cannot write to immutable here: Immutable variables cannot be initialized inside a loop.
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
index 33749c8cd..ad51c86ff 100644
--- a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
+++ b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
@@ -26,4 +26,4 @@ contract C is A, B {
     }
 }
 // ----
-// TypeError 7733: (489-490): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (489-490='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
index 11da864db..77dc1cbb4 100644
--- a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
+++ b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
@@ -26,4 +26,4 @@ contract C is A, B {
     }
 }
 // ----
-// TypeError 7733: (493-494): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (493-494='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol b/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol
index 93e01db30..5516d43ce 100644
--- a/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol
+++ b/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1574: (78-79): Immutable state variable already initialized.
+// TypeError 1574: (78-79='x'): Immutable state variable already initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/non-value_type.sol b/test/libsolidity/syntaxTests/immutable/non-value_type.sol
index db3355bc3..b9ce13abc 100644
--- a/test/libsolidity/syntaxTests/immutable/non-value_type.sol
+++ b/test/libsolidity/syntaxTests/immutable/non-value_type.sol
@@ -2,4 +2,4 @@ contract C {
     uint[] immutable x;
 }
 // ----
-// TypeError 6377: (17-35): Immutable variables cannot have a non-value type.
+// TypeError 6377: (17-35='uint[] immutable x'): Immutable variables cannot have a non-value type.
diff --git a/test/libsolidity/syntaxTests/immutable/private_state_var.sol b/test/libsolidity/syntaxTests/immutable/private_state_var.sol
index 50af6ace8..79facda7b 100644
--- a/test/libsolidity/syntaxTests/immutable/private_state_var.sol
+++ b/test/libsolidity/syntaxTests/immutable/private_state_var.sol
@@ -17,4 +17,4 @@ contract C is B {
 
 }
 // ----
-// TypeError 7733: (202-203): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (202-203='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
index 3ca0df270..5943e573a 100644
--- a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
+++ b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
@@ -9,4 +9,4 @@ contract B is A {
 	function f() override view internal returns (uint) { return x; }
 }
 // ----
-// TypeError 7733: (223-224): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (223-224='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol
index 6e939b0b2..3383bce09 100644
--- a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol
+++ b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol
@@ -4,4 +4,4 @@ contract C {
   function f() internal pure returns (uint) { return t; }
 }
 // ----
-// TypeError 7733: (106-107): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (106-107='t'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol b/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
index 70d4ac4c8..438b7c050 100644
--- a/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
+++ b/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
@@ -13,4 +13,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 7733: (145-146): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (145-146='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol b/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol
index ae73679ea..35f77c939 100644
--- a/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol
+++ b/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol
@@ -3,4 +3,4 @@ contract C {
     uint y = x;
 }
 // ----
-// TypeError 7733: (52-53): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (52-53='x'): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol b/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol
index 852b5d350..d5e929c66 100644
--- a/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2658: (63-70): Construction control flow ends without initializing all immutable state variables.
+// TypeError 2658: (63-70='return;'): Construction control flow ends without initializing all immutable state variables.
diff --git a/test/libsolidity/syntaxTests/immutable/runtimeCode.sol b/test/libsolidity/syntaxTests/immutable/runtimeCode.sol
index 16965317c..3422fada9 100644
--- a/test/libsolidity/syntaxTests/immutable/runtimeCode.sol
+++ b/test/libsolidity/syntaxTests/immutable/runtimeCode.sol
@@ -8,4 +8,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 9274: (153-172): "runtimeCode" is not available for contracts containing immutable variables.
+// TypeError 9274: (153-172='type(A).runtimeCode'): "runtimeCode" is not available for contracts containing immutable variables.
diff --git a/test/libsolidity/syntaxTests/immutable/runtimeCodeInheritance.sol b/test/libsolidity/syntaxTests/immutable/runtimeCodeInheritance.sol
index f7cf83775..e97d78244 100644
--- a/test/libsolidity/syntaxTests/immutable/runtimeCodeInheritance.sol
+++ b/test/libsolidity/syntaxTests/immutable/runtimeCodeInheritance.sol
@@ -10,4 +10,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 9274: (185-210): "runtimeCode" is not available for contracts containing immutable variables.
+// TypeError 9274: (185-210='type(Derived).runtimeCode'): "runtimeCode" is not available for contracts containing immutable variables.
diff --git a/test/libsolidity/syntaxTests/immutable/selector.sol b/test/libsolidity/syntaxTests/immutable/selector.sol
index 01bf91e23..c5223e783 100644
--- a/test/libsolidity/syntaxTests/immutable/selector.sol
+++ b/test/libsolidity/syntaxTests/immutable/selector.sol
@@ -8,5 +8,5 @@ contract C {
     function readX() external view returns(uint) { return x; }
 }
 // ----
-// Warning 6133: (78-97): Statement has no effect.
-// Warning 5805: (78-82): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
+// Warning 6133: (78-97='this.readX.selector'): Statement has no effect.
+// Warning 5805: (78-82='this'): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
diff --git a/test/libsolidity/syntaxTests/immutable/selector_function_name.sol b/test/libsolidity/syntaxTests/immutable/selector_function_name.sol
index 19e45d06e..14eefe108 100644
--- a/test/libsolidity/syntaxTests/immutable/selector_function_name.sol
+++ b/test/libsolidity/syntaxTests/immutable/selector_function_name.sol
@@ -9,5 +9,5 @@ contract C {
     function selector() external view returns(uint) { return x; }
 }
 // ----
-// Warning 6133: (78-97): Statement has no effect.
-// Warning 6133: (107-117): Statement has no effect.
+// Warning 6133: (78-97='C.selector.selector'): Statement has no effect.
+// Warning 6133: (107-117='C.selector'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/immutable/unary.sol b/test/libsolidity/syntaxTests/immutable/unary.sol
index f3c75c09b..a7dce29fa 100644
--- a/test/libsolidity/syntaxTests/immutable/unary.sol
+++ b/test/libsolidity/syntaxTests/immutable/unary.sol
@@ -5,4 +5,4 @@ contract A {
 }
 
 // ----
-// TypeError 1581: (85-86): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (85-86='a'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol b/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol
index 06d2bfa79..3a044f7de 100644
--- a/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol
+++ b/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol
@@ -4,5 +4,5 @@ contract C {
     uint immutable y = 5;
 }
 // ----
-// TypeError 1581: (66-67): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
-// TypeError 1581: (62-63): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (66-67='y'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (62-63='z'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol b/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol
index 2c98ffd79..f7303327a 100644
--- a/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol
+++ b/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol
@@ -2,4 +2,4 @@ contract C {
     int immutable x = x = 5;
 }
 // ----
-// TypeError 1581: (35-36): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (35-36='x'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/writing_after_initialization.sol b/test/libsolidity/syntaxTests/immutable/writing_after_initialization.sol
index 4b2b91a15..f306c0edd 100644
--- a/test/libsolidity/syntaxTests/immutable/writing_after_initialization.sol
+++ b/test/libsolidity/syntaxTests/immutable/writing_after_initialization.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1581: (76-77): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (76-77='x'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/writing_after_initialization_modifier.sol b/test/libsolidity/syntaxTests/immutable/writing_after_initialization_modifier.sol
index d450a37d2..29e250659 100644
--- a/test/libsolidity/syntaxTests/immutable/writing_after_initialization_modifier.sol
+++ b/test/libsolidity/syntaxTests/immutable/writing_after_initialization_modifier.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1581: (111-112): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
+// TypeError 1581: (111-112='x'): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/imports/declaration_not_found.sol b/test/libsolidity/syntaxTests/imports/declaration_not_found.sol
index b02868e54..7287e37b8 100644
--- a/test/libsolidity/syntaxTests/imports/declaration_not_found.sol
+++ b/test/libsolidity/syntaxTests/imports/declaration_not_found.sol
@@ -4,4 +4,4 @@ contract A { }
 import {C} from "a";
 contract B { }
 // ----
-// DeclarationError 2904: (b:0-20): Declaration "C" not found in "a" (referenced as "a").
+// DeclarationError 2904: (b:0-20='import {C} from "a";'): Declaration "C" not found in "a" (referenced as "a").
diff --git a/test/libsolidity/syntaxTests/imports/filename_with_period.sol b/test/libsolidity/syntaxTests/imports/filename_with_period.sol
index 6b27ca032..db4ec0693 100644
--- a/test/libsolidity/syntaxTests/imports/filename_with_period.sol
+++ b/test/libsolidity/syntaxTests/imports/filename_with_period.sol
@@ -3,4 +3,4 @@ contract B {}
 ==== Source: a/a.sol ====
 import ".b.sol"; contract A is B {}
 // ----
-// ParserError 6275: (a/a.sol:0-16): Source ".b.sol" not found: File not supplied initially.
+// ParserError 6275: (a/a.sol:0-16='import ".b.sol";'): Source ".b.sol" not found: File not supplied initially.
diff --git a/test/libsolidity/syntaxTests/imports/import_access_struct.sol b/test/libsolidity/syntaxTests/imports/import_access_struct.sol
index 03dac4926..975b3593a 100644
--- a/test/libsolidity/syntaxTests/imports/import_access_struct.sol
+++ b/test/libsolidity/syntaxTests/imports/import_access_struct.sol
@@ -10,5 +10,5 @@ contract C {
     }
 }
 // ----
-// Warning 6133: (b:90-91): Statement has no effect.
-// Warning 6133: (b:101-104): Statement has no effect.
+// Warning 6133: (b:90-91='T'): Statement has no effect.
+// Warning 6133: (b:101-104='A.S'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/imports/import_does_not_clutter_importee.sol b/test/libsolidity/syntaxTests/imports/import_does_not_clutter_importee.sol
index f1aaf75df..02797e554 100644
--- a/test/libsolidity/syntaxTests/imports/import_does_not_clutter_importee.sol
+++ b/test/libsolidity/syntaxTests/imports/import_does_not_clutter_importee.sol
@@ -3,4 +3,4 @@ contract C { D d; }
 ==== Source: b ====
 import "a"; contract D is C {}
 // ----
-// DeclarationError 7920: (a:13-14): Identifier not found or not unique.
+// DeclarationError 7920: (a:13-14='D'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol
index 891f57e8d..8c009c933 100644
--- a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol
+++ b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_1.sol
@@ -17,4 +17,4 @@ pragma abicoder v1;
 import "./B.sol";
 contract C is B { }
 // ----
-// TypeError 6594: (C.sol:38-57): Contract "C" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
+// TypeError 6594: (C.sol:38-57='contract C is B { }'): Contract "C" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol
index c92221f3a..427f5b391 100644
--- a/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol
+++ b/test/libsolidity/syntaxTests/imports/inheritance_abi_encoder_mismatch_2.sol
@@ -16,4 +16,4 @@ pragma abicoder v1;
 import "./B.sol";
 contract C is B { }
 // ----
-// TypeError 6594: (B.sol:38-57): Contract "B" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
+// TypeError 6594: (B.sol:38-57='contract B is A { }'): Contract "B" does not use ABI coder v2 but wants to inherit from a contract which uses types that require it. Use "pragma abicoder v2;" for the inheriting contract as well to enable the feature.
diff --git a/test/libsolidity/syntaxTests/imports/library_name_clash.sol b/test/libsolidity/syntaxTests/imports/library_name_clash.sol
index 00a9c1550..54303a2b2 100644
--- a/test/libsolidity/syntaxTests/imports/library_name_clash.sol
+++ b/test/libsolidity/syntaxTests/imports/library_name_clash.sol
@@ -5,4 +5,4 @@ library A {}
 ==== Source: c ====
 import {A} from "./a"; import {A} from "./b";
 // ----
-// DeclarationError 2333: (c:31-32): Identifier already declared.
+// DeclarationError 2333: (c:31-32='A'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_1.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_1.sol
index 60a46eb19..d2ed44f03 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_1.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_1.sol
@@ -3,4 +3,4 @@ contract A {}
 ==== Source: b ====
 import "a"; contract A {}
 // ----
-// DeclarationError 2333: (b:12-25): Identifier already declared.
+// DeclarationError 2333: (b:12-25='contract A {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_2.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_2.sol
index 1043ae074..02d0db886 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_2.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_2.sol
@@ -3,4 +3,4 @@ contract A {}
 ==== Source: b ====
 import "a" as A; contract A {}
 // ----
-// DeclarationError 2333: (b:17-30): Identifier already declared.
+// DeclarationError 2333: (b:17-30='contract A {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_3.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_3.sol
index 23c27b327..1c23a5282 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_3.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_3.sol
@@ -3,4 +3,4 @@ contract A {}
 ==== Source: b ====
 import {A as b} from "a"; contract b {}
 // ----
-// DeclarationError 2333: (b:26-39): Identifier already declared.
+// DeclarationError 2333: (b:26-39='contract b {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_4.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_4.sol
index 70dba3c64..885e2b2e3 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_4.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_4.sol
@@ -3,4 +3,4 @@ contract A {}
 ==== Source: b ====
 import {A} from "a"; contract A {}
 // ----
-// DeclarationError 2333: (b:21-34): Identifier already declared.
+// DeclarationError 2333: (b:21-34='contract A {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_1.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_1.sol
index 40e858377..1e8556bb7 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_1.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_1.sol
@@ -4,4 +4,4 @@ contract A {}
 import "a";
 struct A { uint256 a; }
 // ----
-// DeclarationError 2333: (b:12-35): Identifier already declared.
+// DeclarationError 2333: (b:12-35='struct A { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_2.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_2.sol
index 081261f9a..bcc2da81b 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_2.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_2.sol
@@ -4,4 +4,4 @@ contract A {}
 import "a" as A;
 struct A { uint256 a; }
 // ----
-// DeclarationError 2333: (b:17-40): Identifier already declared.
+// DeclarationError 2333: (b:17-40='struct A { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_3.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_3.sol
index 242cf4f71..9ccd72a65 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_3.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_3.sol
@@ -4,4 +4,4 @@ contract A {}
 import {A as b} from "a";
 struct b { uint256 a; }
 // ----
-// DeclarationError 2333: (b:26-49): Identifier already declared.
+// DeclarationError 2333: (b:26-49='struct b { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_4.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_4.sol
index f85d9e93d..b1a5e2928 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_4.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_contract_struct_4.sol
@@ -4,4 +4,4 @@ contract A {}
 import {A} from "a";
 struct A { uint256 a; }
 // ----
-// DeclarationError 2333: (b:21-44): Identifier already declared.
+// DeclarationError 2333: (b:21-44='struct A { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum.sol
index d0d994a99..0c360b2ff 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum.sol
@@ -4,4 +4,4 @@ enum E { A }
 import "a";
 enum E { A }
 // ----
-// DeclarationError 2333: (b:12-24): Identifier already declared.
+// DeclarationError 2333: (b:12-24='enum E { A }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_contract.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_contract.sol
index 4133b322a..c6514693a 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_contract.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_contract.sol
@@ -4,4 +4,4 @@ enum E { A }
 import "a";
 contract E { }
 // ----
-// DeclarationError 2333: (b:12-26): Identifier already declared.
+// DeclarationError 2333: (b:12-26='contract E { }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_struct.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_struct.sol
index 3da456b82..600d3ac79 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_struct.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_enum_struct.sol
@@ -4,4 +4,4 @@ enum E { A }
 import "a";
 struct E { uint256 a; }
 // ----
-// DeclarationError 2333: (b:12-35): Identifier already declared.
+// DeclarationError 2333: (b:12-35='struct E { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_1.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_1.sol
index 1257bd609..bc9d50039 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_1.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_1.sol
@@ -4,4 +4,4 @@ struct A { uint256 a; }
 import "a";
 struct A { uint256 a; }
 // ----
-// DeclarationError 2333: (b:12-35): Identifier already declared.
+// DeclarationError 2333: (b:12-35='struct A { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_2.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_2.sol
index 316c80ee7..80f3019c0 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_2.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_2.sol
@@ -4,4 +4,4 @@ struct A { uint256 a; }
 import "a" as A;
 struct A { uint256 a; }
 // ----
-// DeclarationError 2333: (b:17-40): Identifier already declared.
+// DeclarationError 2333: (b:17-40='struct A { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_3.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_3.sol
index dc3acc096..3efecc3c6 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_3.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_3.sol
@@ -4,4 +4,4 @@ struct A { uint256 a; }
 import {A as b} from "a";
 struct b { uint256 a; }
 // ----
-// DeclarationError 2333: (b:26-49): Identifier already declared.
+// DeclarationError 2333: (b:26-49='struct b { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_4.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_4.sol
index 632aa1ed4..adc6db43e 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_4.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_4.sol
@@ -4,4 +4,4 @@ struct A { uint256 a; }
 import {A} from "a";
 struct A { uint256 a; }
 // ----
-// DeclarationError 2333: (b:21-44): Identifier already declared.
+// DeclarationError 2333: (b:21-44='struct A { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_1.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_1.sol
index 5b9089fa5..d0156dcec 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_1.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_1.sol
@@ -4,4 +4,4 @@ struct A { uint256 a; }
 import "a";
 contract A {}
 // ----
-// DeclarationError 2333: (b:12-25): Identifier already declared.
+// DeclarationError 2333: (b:12-25='contract A {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_2.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_2.sol
index d92579d47..649779db2 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_2.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_2.sol
@@ -4,4 +4,4 @@ struct A { uint256 a; }
 import "a" as A;
 contract A {}
 // ----
-// DeclarationError 2333: (b:17-30): Identifier already declared.
+// DeclarationError 2333: (b:17-30='contract A {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_3.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_3.sol
index c34cd3b9e..7acb17ddc 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_3.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_3.sol
@@ -4,4 +4,4 @@ struct A { uint256 a; }
 import {A as b} from "a";
 contract b {}
 // ----
-// DeclarationError 2333: (b:26-39): Identifier already declared.
+// DeclarationError 2333: (b:26-39='contract b {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_4.sol b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_4.sol
index 145eb2196..7792de22f 100644
--- a/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_4.sol
+++ b/test/libsolidity/syntaxTests/imports/name_clash_in_import_struct_contract_4.sol
@@ -4,4 +4,4 @@ struct A { uint256 a; }
 import {A} from "a";
 contract A {}
 // ----
-// DeclarationError 2333: (b:21-34): Identifier already declared.
+// DeclarationError 2333: (b:21-34='contract A {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_alias.sol b/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_alias.sol
index 8608e2c9a..32448164f 100644
--- a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_alias.sol
+++ b/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_alias.sol
@@ -3,4 +3,4 @@ contract C {}
 ==== Source: b ====
 import {C as msg} from "B.sol";
 // ----
-// Warning 2319: (b:13-16): This declaration shadows a builtin symbol.
+// Warning 2319: (b:13-16='msg'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_imports.sol b/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_imports.sol
index 178f1144c..1c11ade20 100644
--- a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_imports.sol
+++ b/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_imports.sol
@@ -5,4 +5,4 @@ import * as msg from "B.sol";
 contract C {
 }
 // ----
-// Warning 2319: (b:0-29): This declaration shadows a builtin symbol.
+// Warning 2319: (b:0-29='import * as msg from "B.sol";'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_multiple_imports.sol b/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_multiple_imports.sol
index 30d94338f..4d663c1d5 100644
--- a/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_multiple_imports.sol
+++ b/test/libsolidity/syntaxTests/imports/shadowing_builtins_with_multiple_imports.sol
@@ -5,7 +5,7 @@ import {msg, block} from "B.sol";
 contract C {
 }
 // ----
-// Warning 2319: (B.sol:0-15): This declaration shadows a builtin symbol.
-// Warning 2319: (B.sol:16-32): This declaration shadows a builtin symbol.
-// Warning 2319: (b:8-11): This declaration shadows a builtin symbol.
-// Warning 2319: (b:13-18): This declaration shadows a builtin symbol.
+// Warning 2319: (B.sol:0-15='contract msg {}'): This declaration shadows a builtin symbol.
+// Warning 2319: (B.sol:16-32='contract block{}'): This declaration shadows a builtin symbol.
+// Warning 2319: (b:8-11='msg'): This declaration shadows a builtin symbol.
+// Warning 2319: (b:13-18='block'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/imports/shadowing_via_import.sol b/test/libsolidity/syntaxTests/imports/shadowing_via_import.sol
index 00a9c1550..54303a2b2 100644
--- a/test/libsolidity/syntaxTests/imports/shadowing_via_import.sol
+++ b/test/libsolidity/syntaxTests/imports/shadowing_via_import.sol
@@ -5,4 +5,4 @@ library A {}
 ==== Source: c ====
 import {A} from "./a"; import {A} from "./b";
 // ----
-// DeclarationError 2333: (c:31-32): Identifier already declared.
+// DeclarationError 2333: (c:31-32='A'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/indexing/array_multidim_rational.sol b/test/libsolidity/syntaxTests/indexing/array_multidim_rational.sol
index b0d4dbb10..54443e1c7 100644
--- a/test/libsolidity/syntaxTests/indexing/array_multidim_rational.sol
+++ b/test/libsolidity/syntaxTests/indexing/array_multidim_rational.sol
@@ -5,7 +5,7 @@ contract C {
   }
 }
 // ----
-// TypeError 7407: (67-72): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
-// TypeError 7407: (74-79): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
-// TypeError 7407: (81-90): Type rational_const 9485...(73 digits omitted)...5712 / 5 is not implicitly convertible to expected type uint256.
-// TypeError 6318: (65-91): Index expression cannot be represented as an unsigned integer.
+// TypeError 7407: (67-72='8**90'): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
+// TypeError 7407: (74-79='8**90'): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
+// TypeError 7407: (81-90='8**90*0.1'): Type rational_const 9485...(73 digits omitted)...5712 / 5 is not implicitly convertible to expected type uint256.
+// TypeError 6318: (65-91='a[8**90][8**90][8**90*0.1]'): Index expression cannot be represented as an unsigned integer.
diff --git a/test/libsolidity/syntaxTests/indexing/array_multim_overflow_index.sol b/test/libsolidity/syntaxTests/indexing/array_multim_overflow_index.sol
index 0f18ec4d2..745a4756d 100644
--- a/test/libsolidity/syntaxTests/indexing/array_multim_overflow_index.sol
+++ b/test/libsolidity/syntaxTests/indexing/array_multim_overflow_index.sol
@@ -5,7 +5,7 @@ contract C {
   }
 }
 // ----
-// TypeError 7407: (67-72): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
-// TypeError 7407: (74-79): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
-// TypeError 7407: (81-90): Type int_const -189...(75 digits omitted)...1423 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
-// TypeError 6318: (65-91): Index expression cannot be represented as an unsigned integer.
+// TypeError 7407: (67-72='8**90'): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
+// TypeError 7407: (74-79='8**90'): Type int_const 1897...(74 digits omitted)...1424 is not implicitly convertible to expected type uint256. Literal is too large to fit in uint256.
+// TypeError 7407: (81-90='1 - 8**90'): Type int_const -189...(75 digits omitted)...1423 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
+// TypeError 6318: (65-91='a[8**90][8**90][1 - 8**90]'): Index expression cannot be represented as an unsigned integer.
diff --git a/test/libsolidity/syntaxTests/indexing/array_negative_index.sol b/test/libsolidity/syntaxTests/indexing/array_negative_index.sol
index 810ad3b73..7a72879da 100644
--- a/test/libsolidity/syntaxTests/indexing/array_negative_index.sol
+++ b/test/libsolidity/syntaxTests/indexing/array_negative_index.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError 7407: (67-69): Type int_const -1 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
+// TypeError 7407: (67-69='-1'): Type int_const -1 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
diff --git a/test/libsolidity/syntaxTests/indexing/array_out_of_bounds_index.sol b/test/libsolidity/syntaxTests/indexing/array_out_of_bounds_index.sol
index 17190ee38..3c2b8e036 100644
--- a/test/libsolidity/syntaxTests/indexing/array_out_of_bounds_index.sol
+++ b/test/libsolidity/syntaxTests/indexing/array_out_of_bounds_index.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError 3383: (65-70): Out of bounds array access.
+// TypeError 3383: (65-70='a[64]'): Out of bounds array access.
diff --git a/test/libsolidity/syntaxTests/indexing/array_without_index.sol b/test/libsolidity/syntaxTests/indexing/array_without_index.sol
index 485746ecd..228b779c9 100644
--- a/test/libsolidity/syntaxTests/indexing/array_without_index.sol
+++ b/test/libsolidity/syntaxTests/indexing/array_without_index.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError 9689: (61-64): Index expression cannot be omitted.
+// TypeError 9689: (61-64='a[]'): Index expression cannot be omitted.
diff --git a/test/libsolidity/syntaxTests/indexing/fixedbytes_negative_index.sol b/test/libsolidity/syntaxTests/indexing/fixedbytes_negative_index.sol
index 4d6e8545e..6545a06bc 100644
--- a/test/libsolidity/syntaxTests/indexing/fixedbytes_negative_index.sol
+++ b/test/libsolidity/syntaxTests/indexing/fixedbytes_negative_index.sol
@@ -5,5 +5,5 @@ contract C {
   }
 }
 // ----
-// TypeError 7407: (58-60): Type int_const -1 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
-// TypeError 6318: (56-61): Index expression cannot be represented as an unsigned integer.
+// TypeError 7407: (58-60='-1'): Type int_const -1 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
+// TypeError 6318: (56-61='b[-1]'): Index expression cannot be represented as an unsigned integer.
diff --git a/test/libsolidity/syntaxTests/indexing/fixedbytes_out_of_bounds_index.sol b/test/libsolidity/syntaxTests/indexing/fixedbytes_out_of_bounds_index.sol
index fb06db9fb..d9dc0145b 100644
--- a/test/libsolidity/syntaxTests/indexing/fixedbytes_out_of_bounds_index.sol
+++ b/test/libsolidity/syntaxTests/indexing/fixedbytes_out_of_bounds_index.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError 1859: (56-61): Out of bounds array access.
+// TypeError 1859: (56-61='b[64]'): Out of bounds array access.
diff --git a/test/libsolidity/syntaxTests/indexing/fixedbytes_without_index.sol b/test/libsolidity/syntaxTests/indexing/fixedbytes_without_index.sol
index 948333cbe..26b6552c8 100644
--- a/test/libsolidity/syntaxTests/indexing/fixedbytes_without_index.sol
+++ b/test/libsolidity/syntaxTests/indexing/fixedbytes_without_index.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError 8830: (56-59): Index expression cannot be omitted.
+// TypeError 8830: (56-59='b[]'): Index expression cannot be omitted.
diff --git a/test/libsolidity/syntaxTests/indexing/function_type.sol b/test/libsolidity/syntaxTests/indexing/function_type.sol
index 10edb7d96..0ffaf05a2 100644
--- a/test/libsolidity/syntaxTests/indexing/function_type.sol
+++ b/test/libsolidity/syntaxTests/indexing/function_type.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// TypeError 2614: (41-42): Indexed expression has to be a type, mapping or array (is function ())
+// TypeError 2614: (41-42='f'): Indexed expression has to be a type, mapping or array (is function ())
diff --git a/test/libsolidity/syntaxTests/indexing/function_type_without_index.sol b/test/libsolidity/syntaxTests/indexing/function_type_without_index.sol
index 9bcb9e1e6..7ddc23b98 100644
--- a/test/libsolidity/syntaxTests/indexing/function_type_without_index.sol
+++ b/test/libsolidity/syntaxTests/indexing/function_type_without_index.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// TypeError 2614: (41-42): Indexed expression has to be a type, mapping or array (is function ())
+// TypeError 2614: (41-42='f'): Indexed expression has to be a type, mapping or array (is function ())
diff --git a/test/libsolidity/syntaxTests/indexing/index_range_access_assert.sol b/test/libsolidity/syntaxTests/indexing/index_range_access_assert.sol
index acce33091..00d8b6ee8 100644
--- a/test/libsolidity/syntaxTests/indexing/index_range_access_assert.sol
+++ b/test/libsolidity/syntaxTests/indexing/index_range_access_assert.sol
@@ -2,4 +2,4 @@
 contract s{}
 function f() {s[:][];}
 // ----
-// TypeError 1760: (53-57): Types cannot be sliced.
+// TypeError 1760: (53-57='s[:]'): Types cannot be sliced.
diff --git a/test/libsolidity/syntaxTests/inheritance/base_arguments_empty_parentheses.sol b/test/libsolidity/syntaxTests/inheritance/base_arguments_empty_parentheses.sol
index 422ee9080..180b93c82 100644
--- a/test/libsolidity/syntaxTests/inheritance/base_arguments_empty_parentheses.sol
+++ b/test/libsolidity/syntaxTests/inheritance/base_arguments_empty_parentheses.sol
@@ -4,4 +4,4 @@ contract Base {
 contract Derived is Base(2) { }
 contract Derived2 is Base(), Derived() { }
 // ----
-// TypeError 7927: (94-100): Wrong argument count for constructor call: 0 arguments given but expected 1. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (94-100='Base()'): Wrong argument count for constructor call: 0 arguments given but expected 1. Remove parentheses if you do not want to provide arguments here.
diff --git a/test/libsolidity/syntaxTests/inheritance/base_arguments_multiple_inheritance.sol b/test/libsolidity/syntaxTests/inheritance/base_arguments_multiple_inheritance.sol
index 3824b74b9..de2c215ec 100644
--- a/test/libsolidity/syntaxTests/inheritance/base_arguments_multiple_inheritance.sol
+++ b/test/libsolidity/syntaxTests/inheritance/base_arguments_multiple_inheritance.sol
@@ -6,4 +6,4 @@ contract Derived is Base, Base1 {
     constructor(uint i) Base(i) {}
 }
 // ----
-// DeclarationError 3364: (131-138): Base constructor arguments given twice.
+// DeclarationError 3364: (131-138='Base(i)'): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/base_not_contract.sol b/test/libsolidity/syntaxTests/inheritance/base_not_contract.sol
index 8d12b6e07..e06f79771 100644
--- a/test/libsolidity/syntaxTests/inheritance/base_not_contract.sol
+++ b/test/libsolidity/syntaxTests/inheritance/base_not_contract.sol
@@ -2,4 +2,4 @@ function fun() {}
 
 contract C is fun {}
 // ----
-// TypeError 8758: (33-36): Contract expected.
+// TypeError 8758: (33-36='fun'): Contract expected.
diff --git a/test/libsolidity/syntaxTests/inheritance/disallow_modifier_style_without_parentheses.sol b/test/libsolidity/syntaxTests/inheritance/disallow_modifier_style_without_parentheses.sol
index 2f2801e5f..b544a11dc 100644
--- a/test/libsolidity/syntaxTests/inheritance/disallow_modifier_style_without_parentheses.sol
+++ b/test/libsolidity/syntaxTests/inheritance/disallow_modifier_style_without_parentheses.sol
@@ -1,4 +1,4 @@
 contract A { constructor() { } }
 contract B is A { constructor() A {  } }
 // ----
-// DeclarationError 1563: (65-66): Modifier-style base constructor call without arguments.
+// DeclarationError 1563: (65-66='A'): Modifier-style base constructor call without arguments.
diff --git a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/ancestor.sol b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/ancestor.sol
index 0cab1a1eb..ad7d7ecfd 100644
--- a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/ancestor.sol
+++ b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/ancestor.sol
@@ -2,4 +2,4 @@ contract A { constructor(uint) { } }
 contract B is A(2) { constructor() {  } }
 contract C is B { constructor() A(3) {  } }
 // ----
-// DeclarationError 3364: (111-115): Base constructor arguments given twice.
+// DeclarationError 3364: (111-115='A(3)'): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base.sol b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base.sol
index ca1e839b5..bec167330 100644
--- a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base.sol
+++ b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base.sol
@@ -1,4 +1,4 @@
 contract A { constructor(uint) { } }
 contract B is A(2) { constructor() A(3) {  } }
 // ----
-// DeclarationError 3364: (72-76): Base constructor arguments given twice.
+// DeclarationError 3364: (72-76='A(3)'): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi.sol b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi.sol
index f7a655b9f..4b2abc03f 100644
--- a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi.sol
+++ b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi.sol
@@ -3,5 +3,5 @@ contract A is C(2) {}
 contract B is C(2) {}
 contract D is A, B { constructor() C(3) {} }
 // ----
-// DeclarationError 3364: (115-119): Base constructor arguments given twice.
-// DeclarationError 3364: (115-119): Base constructor arguments given twice.
+// DeclarationError 3364: (115-119='C(3)'): Base constructor arguments given twice.
+// DeclarationError 3364: (115-119='C(3)'): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor.sol b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor.sol
index 09a1593f7..6c623d62c 100644
--- a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor.sol
+++ b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor.sol
@@ -3,4 +3,4 @@ contract A is C(2) {}
 contract B is C(2) {}
 contract D is A, B {}
 // ----
-// DeclarationError 3364: (80-101): Base constructor arguments given twice.
+// DeclarationError 3364: (80-101='contract D is A, B {}'): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor_modifier_style.sol b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor_modifier_style.sol
index 0b29661d0..e20a616ff 100644
--- a/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor_modifier_style.sol
+++ b/test/libsolidity/syntaxTests/inheritance/duplicated_constructor_call/base_multi_no_constructor_modifier_style.sol
@@ -3,4 +3,4 @@ contract A is C { constructor() C(2) {} }
 contract B is C { constructor() C(2) {} }
 contract D is A, B { }
 // ----
-// DeclarationError 3364: (120-142): Base constructor arguments given twice.
+// DeclarationError 3364: (120-142='contract D is A, B { }'): Base constructor arguments given twice.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_overrides_receive.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_overrides_receive.sol
index 161c23c3f..e5fcf64f4 100644
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_overrides_receive.sol
+++ b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_overrides_receive.sol
@@ -5,4 +5,4 @@ contract D is C {
 	fallback() override external {}
 }
 // ----
-// TypeError 7792: (76-84): Function has override specified but does not override anything.
+// TypeError 7792: (76-84='override'): Function has override specified but does not override anything.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override.sol
index 5bf71099a..f804d9d02 100644
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override.sol
+++ b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override.sol
@@ -5,4 +5,4 @@ contract D is C {
 	fallback() external {}
 }
 // ----
-// TypeError 9456: (66-88): Overriding function is missing "override" specifier.
+// TypeError 9456: (66-88='fallback() external {}'): Overriding function is missing "override" specifier.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override_intermediate.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override_intermediate.sol
index 8c03b57e0..32d2abbcb 100644
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override_intermediate.sol
+++ b/test/libsolidity/syntaxTests/inheritance/fallback_receive/fallback_without_override_intermediate.sol
@@ -7,4 +7,4 @@ contract E is D {
 	fallback() external {}
 }
 // ----
-// TypeError 9456: (86-108): Overriding function is missing "override" specifier.
+// TypeError 9456: (86-108='fallback() external {}'): Overriding function is missing "override" specifier.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_overrides_fallback.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_overrides_fallback.sol
index c7a525371..dd322ffbb 100644
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_overrides_fallback.sol
+++ b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_overrides_fallback.sol
@@ -5,4 +5,4 @@ contract D is C {
 	receive() override external payable {}
 }
 // ----
-// TypeError 7792: (68-76): Function has override specified but does not override anything.
+// TypeError 7792: (68-76='override'): Function has override specified but does not override anything.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_parameter.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_parameter.sol
index 1798316a7..af57ab3bc 100644
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_parameter.sol
+++ b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_parameter.sol
@@ -5,8 +5,8 @@ contract D is C {
     receive() {}
 }
 // ----
-// SyntaxError 4937: (17-35): No visibility specified. Did you intend to add "external"?
-// SyntaxError 4937: (60-72): No visibility specified. Did you intend to add "external"?
-// DeclarationError 7793: (17-35): Receive ether function must be payable, but is "nonpayable".
-// DeclarationError 4095: (17-35): Receive ether function must be defined as "external".
-// DeclarationError 6857: (24-32): Receive ether function cannot take parameters.
+// SyntaxError 4937: (17-35='receive(bytes2) {}'): No visibility specified. Did you intend to add "external"?
+// SyntaxError 4937: (60-72='receive() {}'): No visibility specified. Did you intend to add "external"?
+// DeclarationError 7793: (17-35='receive(bytes2) {}'): Receive ether function must be payable, but is "nonpayable".
+// DeclarationError 4095: (17-35='receive(bytes2) {}'): Receive ether function must be defined as "external".
+// DeclarationError 6857: (24-32='(bytes2)'): Receive ether function cannot take parameters.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_return_parameter.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_return_parameter.sol
index ca01cc572..7285a9943 100644
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_return_parameter.sol
+++ b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_return_parameter.sol
@@ -5,4 +5,4 @@ contract D is C {
     receive() external payable override {}
 }
 // ----
-// DeclarationError 6899: (59-65): Receive ether function cannot return values.
+// DeclarationError 6899: (59-65='(uint)'): Receive ether function cannot return values.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_unimplemented.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_unimplemented.sol
index 99760771c..52bafd2fd 100644
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_unimplemented.sol
+++ b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_unimplemented.sol
@@ -10,4 +10,4 @@ contract C is J {
     receive() external payable override {}
 }
 // ----
-// DeclarationError 6857: (25-33): Receive ether function cannot take parameters.
+// DeclarationError 6857: (25-33='(bytes2)'): Receive ether function cannot take parameters.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override.sol
index c6809ae42..ddef0473b 100644
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override.sol
+++ b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override.sol
@@ -5,4 +5,4 @@ contract D is C {
 	receive() external payable {}
 }
 // ----
-// TypeError 9456: (73-102): Overriding function is missing "override" specifier.
+// TypeError 9456: (73-102='receive() external payable {}'): Overriding function is missing "override" specifier.
diff --git a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override_intermediate.sol b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override_intermediate.sol
index c4f0e27c8..be5d0052c 100644
--- a/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override_intermediate.sol
+++ b/test/libsolidity/syntaxTests/inheritance/fallback_receive/receive_without_override_intermediate.sol
@@ -7,4 +7,4 @@ contract E is D {
 	receive() external payable {}
 }
 // ----
-// TypeError 9456: (93-122): Overriding function is missing "override" specifier.
+// TypeError 9456: (93-122='receive() external payable {}'): Overriding function is missing "override" specifier.
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/contract_base.sol b/test/libsolidity/syntaxTests/inheritance/interface/contract_base.sol
index f7f084d13..c59bf6fc1 100644
--- a/test/libsolidity/syntaxTests/inheritance/interface/contract_base.sol
+++ b/test/libsolidity/syntaxTests/inheritance/interface/contract_base.sol
@@ -2,4 +2,4 @@ contract C {}
 interface I is C {}
 
 // ----
-// TypeError 6536: (29-30): Interfaces can only inherit from other interfaces.
+// TypeError 6536: (29-30='C'): Interfaces can only inherit from other interfaces.
diff --git a/test/libsolidity/syntaxTests/inheritance/interface/overrides_multiple.sol b/test/libsolidity/syntaxTests/inheritance/interface/overrides_multiple.sol
index 9c2f39bd9..94be271c8 100644
--- a/test/libsolidity/syntaxTests/inheritance/interface/overrides_multiple.sol
+++ b/test/libsolidity/syntaxTests/inheritance/interface/overrides_multiple.sol
@@ -24,6 +24,6 @@ interface Sub is SuperA, SuperB {
 
 // ----
 // TypeError 4327: (572-616): Function needs to specify overridden contracts "SuperA" and "SuperB".
-// TypeError 4327: (647-655): Function needs to specify overridden contracts "SuperA" and "SuperB".
-// TypeError 4327: (705-721): Function needs to specify overridden contract "SuperB".
-// TypeError 4327: (771-787): Function needs to specify overridden contract "SuperA".
+// TypeError 4327: (647-655='override'): Function needs to specify overridden contracts "SuperA" and "SuperB".
+// TypeError 4327: (705-721='override(SuperA)'): Function needs to specify overridden contract "SuperB".
+// TypeError 4327: (771-787='override(SuperB)'): Function needs to specify overridden contract "SuperA".
diff --git a/test/libsolidity/syntaxTests/inheritance/interface_virtual_warning.sol b/test/libsolidity/syntaxTests/inheritance/interface_virtual_warning.sol
index 703c47859..b1bc31313 100644
--- a/test/libsolidity/syntaxTests/inheritance/interface_virtual_warning.sol
+++ b/test/libsolidity/syntaxTests/inheritance/interface_virtual_warning.sol
@@ -2,4 +2,4 @@ interface I {
 	function foo() virtual external;
 }
 // ----
-// Warning 5815: (15-47): Interface functions are implicitly "virtual"
+// Warning 5815: (15-47='function foo() virtual external;'): Interface functions are implicitly "virtual"
diff --git a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_implementation.sol b/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_implementation.sol
index 3179a9789..f3aed5cee 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_implementation.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_implementation.sol
@@ -16,5 +16,5 @@ abstract contract B is I {
 contract C is A, B {
 }
 // ----
-// TypeError 6480: (342-364): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
-// TypeError 6480: (342-364): Derived contract must override function "g". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (342-364='contract C is A, B { }'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (342-364='contract C is A, B { }'): Derived contract must override function "g". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_mention.sol b/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_mention.sol
index 04db16623..4673d4beb 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_mention.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/ambiguous_base_and_unique_mention.sol
@@ -14,4 +14,4 @@ abstract contract B is I {
 contract C is A, B {
 }
 // ----
-// TypeError 6480: (254-276): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (254-276='contract C is A, B { }'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/common_base_and_unique_implementation.sol b/test/libsolidity/syntaxTests/inheritance/override/common_base_and_unique_implementation.sol
index cc065bbee..c08f70428 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/common_base_and_unique_implementation.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/common_base_and_unique_implementation.sol
@@ -13,5 +13,5 @@ abstract contract B is I {
 contract C is A, B {
 }
 // ----
-// TypeError 6480: (256-278): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
-// TypeError 6480: (256-278): Derived contract must override function "g". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (256-278='contract C is A, B { }'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (256-278='contract C is A, B { }'): Derived contract must override function "g". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/detect_double_override.sol b/test/libsolidity/syntaxTests/inheritance/override/detect_double_override.sol
index 9907090c6..6d08d07e5 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/detect_double_override.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/detect_double_override.sol
@@ -3,5 +3,5 @@ contract X {
 	function test() internal override override returns (uint256);
 }
 // ----
-// ParserError 9125: (34-42): Override already specified.
-// ParserError 1827: (87-95): Override already specified.
+// ParserError 9125: (34-42='override'): Override already specified.
+// ParserError 1827: (87-95='override'): Override already specified.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_empty_intermediate_public_state_variable_and_function.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_empty_intermediate_public_state_variable_and_function.sol
index ef48ab5fe..283df6624 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_empty_intermediate_public_state_variable_and_function.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_empty_intermediate_public_state_variable_and_function.sol
@@ -10,4 +10,4 @@ abstract contract B is I
 }
 abstract contract C is A, B {}
 // ----
-// TypeError 6480: (128-158): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
+// TypeError 6480: (128-158='abstract contract C is A, B {}'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function.sol
index 4ea1ab4c0..190b7a2f8 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function.sol
@@ -11,4 +11,4 @@ abstract contract B is I
 }
 abstract contract C is A, B {}
 // ----
-// TypeError 6480: (167-197): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
+// TypeError 6480: (167-197='abstract contract C is A, B {}'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function_implemented.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function_implemented.sol
index 90efce554..4c50eb4c9 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function_implemented.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/diamond_interface_intermediate_public_state_variable_and_function_implemented.sol
@@ -11,4 +11,4 @@ abstract contract B is I
 }
 abstract contract C is A, B {}
 // ----
-// TypeError 6480: (180-210): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
+// TypeError 6480: (180-210='abstract contract C is A, B {}'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol
index 392b6640b..d012c6595 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_implemented_public_state_variable.sol
@@ -11,4 +11,4 @@ contract B is I
 }
 contract C is A, B {}
 // ----
-// TypeError 6480: (219-240): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
+// TypeError 6480: (219-240='contract C is A, B {}'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol
index 5e7052a62..f3304fde0 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/diamond_top_implemented_intermediate_public_state_variable.sol
@@ -10,4 +10,4 @@ contract B is I
 }
 contract C is A, B {}
 // ----
-// TypeError 6480: (145-166): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
+// TypeError 6480: (145-166='contract C is A, B {}'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/function_pointer.sol b/test/libsolidity/syntaxTests/inheritance/override/function_pointer.sol
index bae30a862..1c710008b 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/function_pointer.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/function_pointer.sol
@@ -4,4 +4,4 @@ contract C {
 	function() external override virtual fp3;
 }
 // ----
-// ParserError 2314: (34-41): Expected identifier but got 'virtual'
+// ParserError 2314: (34-41='virtual'): Expected identifier but got 'virtual'
diff --git a/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol b/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol
index e3f491770..56abd9134 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol
@@ -14,5 +14,5 @@ contract Impl is Ext {
     function foo() public view {}
 }
 // ----
-// TypeError 9456: (211-240): Overriding function is missing "override" specifier.
-// TypeError 4327: (211-240): Function needs to specify overridden contracts "Base" and "IBase".
+// TypeError 9456: (211-240='function foo() public view {}'): Overriding function is missing "override" specifier.
+// TypeError 4327: (211-240='function foo() public view {}'): Function needs to specify overridden contracts "Base" and "IBase".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/interface_exception/abstract_needed.sol b/test/libsolidity/syntaxTests/inheritance/override/interface_exception/abstract_needed.sol
index 97290af9c..d4fb6d41e 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/interface_exception/abstract_needed.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/interface_exception/abstract_needed.sol
@@ -5,4 +5,4 @@ contract C is I {
 	function f() external {}
 }
 // ----
-// TypeError 9456: (75-99): Overriding function is missing "override" specifier.
+// TypeError 9456: (75-99='function f() external {}'): Overriding function is missing "override" specifier.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/interface_exception/diamond_needed.sol b/test/libsolidity/syntaxTests/inheritance/override/interface_exception/diamond_needed.sol
index 6c46e0a8b..e206051bb 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/interface_exception/diamond_needed.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/interface_exception/diamond_needed.sol
@@ -14,6 +14,6 @@ contract C is I, J {
 	function h() external override(I) {}
 }
 // ----
-// TypeError 4327: (198-222): Function needs to specify overridden contracts "I" and "J".
-// TypeError 4327: (246-254): Function needs to specify overridden contracts "I" and "J".
-// TypeError 4327: (281-292): Function needs to specify overridden contract "J".
+// TypeError 4327: (198-222='function f() external {}'): Function needs to specify overridden contracts "I" and "J".
+// TypeError 4327: (246-254='override'): Function needs to specify overridden contracts "I" and "J".
+// TypeError 4327: (281-292='override(I)'): Function needs to specify overridden contract "J".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/internal_external_inheritance.sol b/test/libsolidity/syntaxTests/inheritance/override/internal_external_inheritance.sol
index 8a84fb548..ecfa968da 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/internal_external_inheritance.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/internal_external_inheritance.sol
@@ -6,4 +6,4 @@ contract B {
 }
 contract C is A, B {}
 // ----
-// TypeError 6480: (126-147): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (126-147='contract C is A, B {}'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/modifier_ambiguous_fail.sol b/test/libsolidity/syntaxTests/inheritance/override/modifier_ambiguous_fail.sol
index 7332f0817..2a5df483e 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/modifier_ambiguous_fail.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/modifier_ambiguous_fail.sol
@@ -7,4 +7,4 @@ contract B {
 contract C is A, B {
 }
 // ----
-// TypeError 6480: (94-116): Derived contract must override modifier "f". Two or more base classes define modifier with same name.
+// TypeError 6480: (94-116='contract C is A, B { }'): Derived contract must override modifier "f". Two or more base classes define modifier with same name.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/modifier_inherited_different_signature.sol b/test/libsolidity/syntaxTests/inheritance/override/modifier_inherited_different_signature.sol
index 428f38e62..c5dff2834 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/modifier_inherited_different_signature.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/modifier_inherited_different_signature.sol
@@ -7,4 +7,4 @@ contract B {
 contract C is A, B {
 }
 // ----
-// TypeError 6480: (100-122): Derived contract must override modifier "f". Two or more base classes define modifier with same name.
+// TypeError 6480: (100-122='contract C is A, B { }'): Derived contract must override modifier "f". Two or more base classes define modifier with same name.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/no_common_base_and_unique_implementation.sol b/test/libsolidity/syntaxTests/inheritance/override/no_common_base_and_unique_implementation.sol
index 4da82307f..aa7c9815e 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/no_common_base_and_unique_implementation.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/no_common_base_and_unique_implementation.sol
@@ -9,5 +9,5 @@ abstract contract B {
 contract C is A, B {
 }
 // ----
-// TypeError 6480: (176-198): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
-// TypeError 6480: (176-198): Derived contract must override function "g". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (176-198='contract C is A, B { }'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (176-198='contract C is A, B { }'): Derived contract must override function "g". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation_modifier.sol b/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation_modifier.sol
index deda228fa..0f8f8b970 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation_modifier.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/nonintermediate_common_base_and_unique_implementation_modifier.sol
@@ -16,4 +16,4 @@ contract B is IJ
 }
 contract C is A, B {}
 // ----
-// TypeError 6480: (229-250): Derived contract must override modifier "f". Two or more base classes define modifier with same name.
+// TypeError 6480: (229-250='contract C is A, B {}'): Derived contract must override modifier "f". Two or more base classes define modifier with same name.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_empty_list.sol b/test/libsolidity/syntaxTests/inheritance/override/override_empty_list.sol
index 59e489c22..278e645f5 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_empty_list.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_empty_list.sol
@@ -7,4 +7,4 @@ contract X is A {
 	function test() internal override() returns (uint256);
 }
 // ----
-// ParserError 2314: (164-165): Expected identifier but got ')'
+// ParserError 2314: (164-165=')'): Expected identifier but got ')'
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_call_via_contract.sol b/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_call_via_contract.sol
index 72e0eaa1b..65f74489b 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_call_via_contract.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_implemented_and_unimplemented_with_implemented_call_via_contract.sol
@@ -10,4 +10,4 @@ contract C is A, B {
     }
 }
 // ----
-// TypeError 7501: (185-190): Cannot call unimplemented base function.
+// TypeError 7501: (185-190='B.f()'): Cannot call unimplemented base function.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_library.sol b/test/libsolidity/syntaxTests/inheritance/override/override_library.sol
index 1a8828fb2..e15e12c62 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_library.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_library.sol
@@ -3,4 +3,4 @@ contract C {
 	function f() public override (L) {}
 }
 // ----
-// TypeError 1130: (57-58): Invalid use of a library name.
+// TypeError 1130: (57-58='L'): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_modifier_no_override.sol b/test/libsolidity/syntaxTests/inheritance/override/override_modifier_no_override.sol
index 9badb5428..9fd5149db 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_modifier_no_override.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_modifier_no_override.sol
@@ -4,4 +4,4 @@ abstract contract X is A {
 	modifier f() override { _; }
 }
 // ----
-// TypeError 7792: (65-73): Modifier has override specified but does not override anything.
+// TypeError 7792: (65-73='override'): Modifier has override specified but does not override anything.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol
index 309d905d1..557f52d20 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol
@@ -17,6 +17,6 @@ contract Impl is Ext1, Ext2 {
     function foo() public view {}
 }
 // ----
-// TypeError 9456: (424-453): Overriding function is missing "override" specifier.
-// TypeError 9456: (424-453): Overriding function is missing "override" specifier.
-// TypeError 4327: (424-453): Function needs to specify overridden contracts "Base1", "Base2" and "IBase".
+// TypeError 9456: (424-453='function foo() public view {}'): Overriding function is missing "override" specifier.
+// TypeError 9456: (424-453='function foo() public view {}'): Overriding function is missing "override" specifier.
+// TypeError 4327: (424-453='function foo() public view {}'): Function needs to specify overridden contracts "Base1", "Base2" and "IBase".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_duplicated.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_duplicated.sol
index eb3148a06..399198a7c 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_duplicated.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_duplicated.sol
@@ -18,7 +18,7 @@ abstract contract X is A, B, C, D {
 	function foo() internal override(A, C, B, B, B, D ,D) virtual returns (uint256);
 }
 // ----
-// TypeError 4520: (548-549): Duplicate contract "D" found in override list of "test".
-// TypeError 4520: (621-622): Duplicate contract "B" found in override list of "foo".
-// TypeError 4520: (624-625): Duplicate contract "B" found in override list of "foo".
-// TypeError 4520: (630-631): Duplicate contract "D" found in override list of "foo".
+// TypeError 4520: (548-549='D'): Duplicate contract "D" found in override list of "test".
+// TypeError 4520: (621-622='B'): Duplicate contract "B" found in override list of "foo".
+// TypeError 4520: (624-625='B'): Duplicate contract "B" found in override list of "foo".
+// TypeError 4520: (630-631='D'): Duplicate contract "D" found in override list of "foo".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail1.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail1.sol
index d95c2c9f4..918357188 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail1.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail1.sol
@@ -5,4 +5,4 @@ contract X {
 	int public override(A,) testvar;
 }
 // ----
-// ParserError 2314: (95-96): Expected identifier but got ')'
+// ParserError 2314: (95-96=')'): Expected identifier but got ')'
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail2.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail2.sol
index f2d370df6..26bc97f68 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail2.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail2.sol
@@ -5,4 +5,4 @@ contract X {
 	function test() internal override(,) returns (uint256);
 }
 // ----
-// ParserError 2314: (107-108): Expected identifier but got ','
+// ParserError 2314: (107-108=','): Expected identifier but got ','
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail3.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail3.sol
index ee510868a..7914a0c9f 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail3.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail3.sol
@@ -5,4 +5,4 @@ contract X {
 	function foo() internal override(X, address) returns (uint256);
 }
 // ----
-// ParserError 2314: (109-116): Expected identifier but got 'address'
+// ParserError 2314: (109-116='address'): Expected identifier but got 'address'
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail4.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail4.sol
index b63ead808..7938eaa33 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail4.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_fail4.sol
@@ -5,4 +5,4 @@ contract X {
 	int public override() testvar;
 }
 // ----
-// ParserError 2314: (93-94): Expected identifier but got ')'
+// ParserError 2314: (93-94=')'): Expected identifier but got ')'
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_missing.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_missing.sol
index eb28808e5..f994241bd 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_missing.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_missing.sol
@@ -18,5 +18,5 @@ abstract contract X is A, B, C, D {
 	function foo() internal override(A, C) virtual returns (uint256);
 }
 // ----
-// TypeError 2353: (533-550): Invalid contract specified in override list: "C".
-// TypeError 4327: (603-617): Function needs to specify overridden contracts "B" and "D".
+// TypeError 2353: (533-550='override(B, D, C)'): Invalid contract specified in override list: "C".
+// TypeError 4327: (603-617='override(A, C)'): Function needs to specify overridden contracts "B" and "D".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual.sol
index 4ad64b81e..df9f5bfa2 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual.sol
@@ -11,4 +11,4 @@ contract C is A, B
 	function foo() internal override(A, B) {}
 }
 // ----
-// TypeError 4334: (65-91): Trying to override non-virtual function. Did you forget to add "virtual"?
+// TypeError 4334: (65-91='function foo() internal {}'): Trying to override non-virtual function. Did you forget to add "virtual"?
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual2.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual2.sol
index f2aa79c19..828c9f17a 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual2.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_no_virtual2.sol
@@ -10,4 +10,4 @@ contract C is A, B
 {
 }
 // ----
-// TypeError 6480: (94-116): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (94-116='contract C is A, B { }'): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_unresolved.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_unresolved.sol
index 98d0c0443..3796b7076 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_multiple_unresolved.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multiple_unresolved.sol
@@ -3,4 +3,4 @@ contract A {
 	function foo() internal override(N, Z) returns (uint256);
 }
 // ----
-// DeclarationError 7920: (68-69): Identifier not found or not unique.
+// DeclarationError 7920: (68-69='N'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_public_vars.sol b/test/libsolidity/syntaxTests/inheritance/override/override_public_vars.sol
index f330f20c2..cef16b063 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_public_vars.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_public_vars.sol
@@ -5,5 +5,5 @@ abstract contract X is A {
 	int public override testvar;
 }
 // ----
-// DeclarationError 9097: (73-100): Identifier already declared.
-// TypeError 1452: (23-41): Cannot override public state variable.
+// DeclarationError 9097: (73-100='int public override testvar'): Identifier already declared.
+// TypeError 1452: (23-41='int public testvar'): Cannot override public state variable.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch.sol b/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch.sol
index 2eacdf754..4b21e88ab 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch.sol
@@ -20,5 +20,5 @@ abstract contract X is A, B, C, D {
 	function foo() internal override(MyStruct, ENUM, A, B, C, D) virtual returns (uint256);
 }
 // ----
-// TypeError 9301: (602-610): Expected contract but got struct X.MyStruct.
-// TypeError 9301: (612-616): Expected contract but got enum X.ENUM.
+// TypeError 9301: (602-610='MyStruct'): Expected contract but got struct X.MyStruct.
+// TypeError 9301: (612-616='ENUM'): Expected contract but got enum X.ENUM.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch2.sol b/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch2.sol
index 519e7b5d6..02cba57ac 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch2.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_type_mismatch2.sol
@@ -9,4 +9,4 @@ contract C is A,B {
 }
 
 // ----
-// TypeError 9301: (140-141): Expected contract but got function ().
+// TypeError 9301: (140-141='g'): Expected contract but got function ().
diff --git a/test/libsolidity/syntaxTests/inheritance/override/private_state_variable.sol b/test/libsolidity/syntaxTests/inheritance/override/private_state_variable.sol
index 74bc4a850..df8ad1abe 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/private_state_variable.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/private_state_variable.sol
@@ -6,4 +6,4 @@ contract C is C1 {
    int override f;
 }
 // ----
-// TypeError 8022: (96-110): Override can only be used with public state variables.
+// TypeError 8022: (96-110='int override f'): Override can only be used with public state variables.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_implements_parallel_interface.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_implements_parallel_interface.sol
index eeb2574d5..1145a40bb 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_implements_parallel_interface.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_var_implements_parallel_interface.sol
@@ -17,5 +17,5 @@ abstract contract T is A {
 contract Y is X, T {
 }
 // ----
-// TypeError 6480: (466-488): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
-// TypeError 6480: (466-488): Derived contract must override function "goo". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (466-488='contract Y is X, T { }'): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
+// TypeError 6480: (466-488='contract Y is X, T { }'): Derived contract must override function "goo". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_missing_override.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_missing_override.sol
index a8e299339..d8d48f430 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_missing_override.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_var_missing_override.sol
@@ -8,4 +8,4 @@ contract X is A, B {
 	uint public override(A) foo;
 }
 // ----
-// TypeError 4327: (154-165): Public state variable needs to specify overridden contract "B".
+// TypeError 4327: (154-165='override(A)'): Public state variable needs to specify overridden contract "B".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol
index 15b6e7b5d..941877df9 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_var_no_override_but_function.sol
@@ -5,5 +5,5 @@ contract X is A {
 	uint public foo;
 }
 // ----
-// TypeError 9456: (100-115): Overriding public state variable is missing "override" specifier.
-// TypeError 5225: (100-115): Public state variables can only override functions with external visibility.
+// TypeError 9456: (100-115='uint public foo'): Overriding public state variable is missing "override" specifier.
+// TypeError 5225: (100-115='uint public foo'): Public state variables can only override functions with external visibility.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_public_var.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_public_var.sol
index 6e78bd722..1f7e75cc2 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_public_var.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_public_var.sol
@@ -5,5 +5,5 @@ contract X is A {
 	uint public override foo;
 }
 // ----
-// DeclarationError 9097: (55-79): Identifier already declared.
-// TypeError 1452: (17-32): Cannot override public state variable.
+// DeclarationError 9097: (55-79='uint public override foo'): Identifier already declared.
+// TypeError 1452: (17-32='uint public foo'): Cannot override public state variable.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_pure.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_pure.sol
index 835351b3d..b2640b652 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_pure.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_var_overrides_pure.sol
@@ -5,4 +5,4 @@ contract X is C {
 	uint public override foo;
 }
 // ----
-// TypeError 6959: (100-124): Overriding public state variable changes state mutability from "pure" to "view".
+// TypeError 6959: (100-124='uint public override foo'): Overriding public state variable changes state mutability from "pure" to "view".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_parallel_funciton.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_parallel_funciton.sol
index 3fdb7a0e3..8725e9ea4 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_parallel_funciton.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_var_parallel_funciton.sol
@@ -7,4 +7,4 @@ contract B {
 contract X is A, B {
 }
 // ----
-// TypeError 6480: (96-118): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
+// TypeError 6480: (96-118='contract X is A, B { }'): Derived contract must override function "foo". Two or more base classes define function with same name and parameter types. Since one of the bases defines a public state variable which cannot be overridden, you have to change the inheritance layout or the names of the functions.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_var_surplus_override.sol b/test/libsolidity/syntaxTests/inheritance/override/public_var_surplus_override.sol
index 0e2e7cb46..ce029a9d7 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_var_surplus_override.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_var_surplus_override.sol
@@ -6,4 +6,4 @@ contract X is A {
 	uint public override(A, B) foo;
 }
 // ----
-// TypeError 2353: (106-120): Invalid contract specified in override list: "B".
+// TypeError 2353: (106-120='override(A, B)'): Invalid contract specified in override list: "B".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol
index 0222db63b..371c8ea45 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple.sol
@@ -8,4 +8,4 @@ contract X is A, B {
 	uint public override foo;
 }
 // ----
-// TypeError 4327: (196-204): Public state variable needs to specify overridden contracts "A" and "B".
+// TypeError 4327: (196-204='override'): Public state variable needs to specify overridden contracts "A" and "B".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol
index 7cba6cf0a..764e3c25f 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple1.sol
@@ -8,6 +8,6 @@ contract X is A, B {
 	uint public override foo;
 }
 // ----
-// DeclarationError 9097: (136-160): Identifier already declared.
-// TypeError 1452: (14-29): Cannot override public state variable.
-// TypeError 4327: (148-156): Public state variable needs to specify overridden contracts "A" and "B".
+// DeclarationError 9097: (136-160='uint public override foo'): Identifier already declared.
+// TypeError 1452: (14-29='uint public foo'): Cannot override public state variable.
+// TypeError 4327: (148-156='override'): Public state variable needs to specify overridden contracts "A" and "B".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol
index 35e3e78ac..0999b6733 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple3.sol
@@ -7,4 +7,4 @@ contract X is A {
 	uint public override foo;
 }
 // ----
-// TypeError 4822: (225-249): Overriding public state variable return types differ.
+// TypeError 4822: (225-249='uint public override foo'): Overriding public state variable return types differ.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple5.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple5.sol
index 16d5f1d52..2c33cc862 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple5.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple5.sol
@@ -7,4 +7,4 @@ contract C is ERC20 {
   mapping(address => uint) public override balanceOf;
 }
 // ----
-// TypeError 7792: (281-289): Public state variable has override specified but does not override anything.
+// TypeError 7792: (281-289='override'): Public state variable has override specified but does not override anything.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol
index 67e95e129..b64615ec0 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond.sol
@@ -11,4 +11,4 @@ contract X is B, C {
 	uint public override foo;
 }
 // ----
-// TypeError 4327: (305-313): Public state variable needs to specify overridden contracts "B" and "C".
+// TypeError 4327: (305-313='override'): Public state variable needs to specify overridden contracts "B" and "C".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol
index 9830bfce7..9e878eeb2 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond1.sol
@@ -11,6 +11,6 @@ contract X is B, C {
 	uint public override foo;
 }
 // ----
-// DeclarationError 9097: (245-269): Identifier already declared.
-// TypeError 1452: (100-124): Cannot override public state variable.
-// TypeError 4327: (257-265): Public state variable needs to specify overridden contracts "B" and "C".
+// DeclarationError 9097: (245-269='uint public override foo'): Identifier already declared.
+// TypeError 1452: (100-124='uint public override foo'): Cannot override public state variable.
+// TypeError 4327: (257-265='override'): Public state variable needs to specify overridden contracts "B" and "C".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol
index 0ce74dc6b..6126909da 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_multiple_diamond2.sol
@@ -11,7 +11,7 @@ contract X is B, C {
 	uint public override(A, C) foo;
 }
 // ----
-// DeclarationError 9097: (245-275): Identifier already declared.
-// TypeError 1452: (100-124): Cannot override public state variable.
-// TypeError 4327: (257-271): Public state variable needs to specify overridden contract "B".
-// TypeError 2353: (257-271): Invalid contract specified in override list: "A".
+// DeclarationError 9097: (245-275='uint public override(A, C) foo'): Identifier already declared.
+// TypeError 1452: (100-124='uint public override foo'): Cannot override public state variable.
+// TypeError 4327: (257-271='override(A, C)'): Public state variable needs to specify overridden contract "B".
+// TypeError 2353: (257-271='override(A, C)'): Invalid contract specified in override list: "A".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/public_vars_wrong_override.sol b/test/libsolidity/syntaxTests/inheritance/override/public_vars_wrong_override.sol
index d87c4bc46..1e98f04e6 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/public_vars_wrong_override.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/public_vars_wrong_override.sol
@@ -2,4 +2,4 @@ contract X {
 	uint public override foo;
 }
 // ----
-// TypeError 7792: (26-34): Public state variable has override specified but does not override anything.
+// TypeError 7792: (26-34='override'): Public state variable has override specified but does not override anything.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/remove_view.sol b/test/libsolidity/syntaxTests/inheritance/override/remove_view.sol
index 5d67854b1..95c625216 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/remove_view.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/remove_view.sol
@@ -1,5 +1,5 @@
 contract B { function f() virtual public view {} }
 contract C is B { function f() public {} }
 // ----
-// TypeError 9456: (69-91): Overriding function is missing "override" specifier.
-// TypeError 6959: (69-91): Overriding function changes state mutability from "view" to "nonpayable".
+// TypeError 9456: (69-91='function f() public {}'): Overriding function is missing "override" specifier.
+// TypeError 6959: (69-91='function f() public {}'): Overriding function changes state mutability from "view" to "nonpayable".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/state_variable_function.sol b/test/libsolidity/syntaxTests/inheritance/override/state_variable_function.sol
index ee89571a6..97448691e 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/state_variable_function.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/state_variable_function.sol
@@ -7,4 +7,4 @@ contract C is A {
 // ----
 // DeclarationError 9097: (50-87): Identifier already declared.
 // TypeError 9456: (50-87): Overriding function is missing "override" specifier.
-// TypeError 1452: (14-27): Cannot override public state variable.
+// TypeError 1452: (14-27='uint public x'): Cannot override public state variable.
diff --git a/test/libsolidity/syntaxTests/inheritance/override/triangle_impl.sol b/test/libsolidity/syntaxTests/inheritance/override/triangle_impl.sol
index c8d4f0588..28c4fb814 100644
--- a/test/libsolidity/syntaxTests/inheritance/override/triangle_impl.sol
+++ b/test/libsolidity/syntaxTests/inheritance/override/triangle_impl.sol
@@ -3,4 +3,4 @@ contract B is A { function f() public pure virtual override {} }
 contract C is A, B { }
 contract D is A, B { function f() public pure override(A, B) {} }
 // ----
-// TypeError 6480: (116-138): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
+// TypeError 6480: (116-138='contract C is A, B { }'): Derived contract must override function "f". Two or more base classes define function with same name and parameter types.
diff --git a/test/libsolidity/syntaxTests/inheritance/reference_non_base_ctor.sol b/test/libsolidity/syntaxTests/inheritance/reference_non_base_ctor.sol
index a871d3ce0..e047acb38 100644
--- a/test/libsolidity/syntaxTests/inheritance/reference_non_base_ctor.sol
+++ b/test/libsolidity/syntaxTests/inheritance/reference_non_base_ctor.sol
@@ -3,4 +3,4 @@ contract D {
     constructor() X(5) {}
 }
 // ----
-// TypeError 4659: (45-49): Referenced declaration is neither modifier nor base class.
+// TypeError 4659: (45-49='X(5)'): Referenced declaration is neither modifier nor base class.
diff --git a/test/libsolidity/syntaxTests/inheritance/shadowing_base_state_vars.sol b/test/libsolidity/syntaxTests/inheritance/shadowing_base_state_vars.sol
index 141ecee08..032bd6dc7 100644
--- a/test/libsolidity/syntaxTests/inheritance/shadowing_base_state_vars.sol
+++ b/test/libsolidity/syntaxTests/inheritance/shadowing_base_state_vars.sol
@@ -5,4 +5,4 @@ contract B is A {
 	uint i;
 }
 // ----
-// DeclarationError 9097: (43-49): Identifier already declared.
+// DeclarationError 9097: (43-49='uint i'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/inheritance/super_on_external.sol b/test/libsolidity/syntaxTests/inheritance/super_on_external.sol
index 1fd7483c2..b641835b5 100644
--- a/test/libsolidity/syntaxTests/inheritance/super_on_external.sol
+++ b/test/libsolidity/syntaxTests/inheritance/super_on_external.sol
@@ -7,4 +7,4 @@ contract B is A {
     }
 }
 // ----
-// TypeError 9582: (123-130): Member "f" not found or not visible after argument-dependent lookup in type(contract super B).
+// TypeError 9582: (123-130='super.f'): Member "f" not found or not visible after argument-dependent lookup in type(contract super B).
diff --git a/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol b/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol
index d3f33f6d6..33d9127b3 100644
--- a/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol
+++ b/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol
@@ -6,5 +6,5 @@ contract Derived2 is Base {
   constructor() Base(2) { }
 }
 // ----
-// TypeError 7927: (67-74): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 2973: (123-130): Wrong argument count for modifier invocation: 1 arguments given but expected 2.
+// TypeError 7927: (67-74='Base(2)'): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 2973: (123-130='Base(2)'): Wrong argument count for modifier invocation: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/inheritance/unimplemented_without_virtual.sol b/test/libsolidity/syntaxTests/inheritance/unimplemented_without_virtual.sol
index 92c2a81c7..89fbb2d05 100644
--- a/test/libsolidity/syntaxTests/inheritance/unimplemented_without_virtual.sol
+++ b/test/libsolidity/syntaxTests/inheritance/unimplemented_without_virtual.sol
@@ -2,4 +2,4 @@ abstract contract C {
 	function f() external;
 }
 // ----
-// TypeError 5424: (23-45): Functions without implementation must be marked virtual.
+// TypeError 5424: (23-45='function f() external;'): Functions without implementation must be marked virtual.
diff --git a/test/libsolidity/syntaxTests/inheritance/virtual/duplicate.sol b/test/libsolidity/syntaxTests/inheritance/virtual/duplicate.sol
index 63da78464..500159cdb 100644
--- a/test/libsolidity/syntaxTests/inheritance/virtual/duplicate.sol
+++ b/test/libsolidity/syntaxTests/inheritance/virtual/duplicate.sol
@@ -4,5 +4,5 @@ contract C
 	modifier modi() virtual virtual {_;}
 }
 // ----
-// ParserError 6879: (44-51): Virtual already specified.
-// ParserError 2662: (80-87): Virtual already specified.
+// ParserError 6879: (44-51='virtual'): Virtual already specified.
+// ParserError 2662: (80-87='virtual'): Virtual already specified.
diff --git a/test/libsolidity/syntaxTests/inheritance/virtual/modifier_virtual_err.sol b/test/libsolidity/syntaxTests/inheritance/virtual/modifier_virtual_err.sol
index 85824c86b..f68aa255a 100644
--- a/test/libsolidity/syntaxTests/inheritance/virtual/modifier_virtual_err.sol
+++ b/test/libsolidity/syntaxTests/inheritance/virtual/modifier_virtual_err.sol
@@ -4,4 +4,4 @@ library test {
     }
 }
 // ----
-// TypeError 3275: (19-38): Modifiers in a library cannot be virtual.
+// TypeError 3275: (19-38='modifier m virtual;'): Modifiers in a library cannot be virtual.
diff --git a/test/libsolidity/syntaxTests/inheritance/wrong_type_base_arguments.sol b/test/libsolidity/syntaxTests/inheritance/wrong_type_base_arguments.sol
index 6f85c2c0a..5f9cca2e8 100644
--- a/test/libsolidity/syntaxTests/inheritance/wrong_type_base_arguments.sol
+++ b/test/libsolidity/syntaxTests/inheritance/wrong_type_base_arguments.sol
@@ -6,4 +6,4 @@ contract Derived2 is Base {
   constructor() Base(2) { }
 }
 // ----
-// TypeError 9827: (67-70): Invalid type for argument in constructor call. Invalid implicit conversion from int_const 300 to uint8 requested. Literal is too large to fit in uint8.
+// TypeError 9827: (67-70='300'): Invalid type for argument in constructor call. Invalid implicit conversion from int_const 300 to uint8 requested. Literal is too large to fit in uint8.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol
index 1cf1e7fb9..bd564b1ad 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol
@@ -2,4 +2,4 @@ function f() pure {
     assembly " evmasm" {}
 }
 // ----
-// ParserError 4531: (33-42): Only "evmasm" supported.
+// ParserError 4531: (33-42='" evmasm"'): Only "evmasm" supported.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol
index cae17320b..9cbb78c28 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol
@@ -2,4 +2,4 @@ function f() pure {
     assembly () {}
 }
 // ----
-// ParserError 2314: (34-35): Expected 'StringLiteral' but got ')'
+// ParserError 2314: (34-35=')'): Expected 'StringLiteral' but got ')'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol
index 222e59b93..c04f687bd 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol
@@ -2,4 +2,4 @@ function f() pure {
     assembly "evmasm" () {}
 }
 // ----
-// ParserError 2314: (43-44): Expected 'StringLiteral' but got ')'
+// ParserError 2314: (43-44=')'): Expected 'StringLiteral' but got ')'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol
index cd82f8aaa..c3da241f3 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol
@@ -2,4 +2,4 @@ function f() pure {
 	assembly ("a" "b") {}
 }
 // ----
-// ParserError 2314: (35-38): Expected ')' but got 'StringLiteral'
+// ParserError 2314: (35-38='"b"'): Expected ')' but got 'StringLiteral'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol
index 3364d793e..577969a16 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol
@@ -2,7 +2,7 @@ function f() pure {
     assembly ("a", "b", "c", "c") {}
 }
 // ----
-// Warning 4430: (24-56): Unknown inline assembly flag: "a"
-// Warning 4430: (24-56): Unknown inline assembly flag: "b"
-// Warning 4430: (24-56): Unknown inline assembly flag: "c"
-// Warning 4430: (24-56): Unknown inline assembly flag: "c"
+// Warning 4430: (24-56='assembly ("a", "b", "c", "c") {}'): Unknown inline assembly flag: "a"
+// Warning 4430: (24-56='assembly ("a", "b", "c", "c") {}'): Unknown inline assembly flag: "b"
+// Warning 4430: (24-56='assembly ("a", "b", "c", "c") {}'): Unknown inline assembly flag: "c"
+// Warning 4430: (24-56='assembly ("a", "b", "c", "c") {}'): Unknown inline assembly flag: "c"
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_contract.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_contract.sol
index dd2eac18a..27b5242ff 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_contract.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_contract.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// TypeError 4977: (72-73): Expected a library.
+// TypeError 4977: (72-73='C'): Expected a library.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype.sol
index da597ef4c..e955e76b2 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// DeclarationError 2025: (72-73): Access to functions is not allowed in inline assembly.
+// DeclarationError 2025: (72-73='f'): Access to functions is not allowed in inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype2.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype2.sol
index aedf53ea8..61e44d66b 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype2.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype2.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 2025: (105-106): Access to functions is not allowed in inline assembly.
+// DeclarationError 2025: (105-106='f'): Access to functions is not allowed in inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol
index 014a4dd45..e117867f4 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_functiontype3.sol
@@ -8,4 +8,4 @@ contract C {
   }
 }
 // ----
-// DeclarationError 2025: (90-92): Access to functions is not allowed in inline assembly.
+// DeclarationError 2025: (90-92='ff'): Access to functions is not allowed in inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
index cb675ab29..05100dda9 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_opcode_like.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// ParserError 7104: (104-109): Builtin function "mload" must be called.
+// ParserError 7104: (104-109='mload'): Builtin function "mload" must be called.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_super.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_super.sol
index c5a5750b5..04cb71149 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_super.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_from_super.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// DeclarationError 8198: (72-77): Identifier "super" not found.
+// DeclarationError 8198: (72-77='super'): Identifier "super" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_location.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_location.sol
index 46e56ffcb..4fd12adab 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_location.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_location.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 8678: (87-96): Variable count for assignment to "x, y" does not match number of values (2 vs. 1)
+// DeclarationError 8678: (87-96='x, y := 7'): Variable count for assignment to "x, y" does not match number of values (2 vs. 1)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
index 51028e50c..71ce631d5 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_opcode_like.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6272: (101-103): Cannot assign to builtin function "mload".
+// ParserError 6272: (101-103=':='): Cannot assign to builtin function "mload".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_special.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_special.sol
index c037764de..9dd94e02e 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_special.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_special.sol
@@ -11,9 +11,9 @@ contract C {
   }
 }
 // ----
-// DeclarationError 4634: (58-63): Variable not found or variable not lvalue.
-// DeclarationError 4634: (75-79): Variable not found or variable not lvalue.
-// DeclarationError 4634: (91-94): Variable not found or variable not lvalue.
-// DeclarationError 4634: (106-111): Variable not found or variable not lvalue.
-// TypeError 1990: (123-124): Only local variables can be assigned to in inline assembly.
-// TypeError 1990: (136-137): Only local variables can be assigned to in inline assembly.
+// DeclarationError 4634: (58-63='super'): Variable not found or variable not lvalue.
+// DeclarationError 4634: (75-79='this'): Variable not found or variable not lvalue.
+// DeclarationError 4634: (91-94='msg'): Variable not found or variable not lvalue.
+// DeclarationError 4634: (106-111='block'): Variable not found or variable not lvalue.
+// TypeError 1990: (123-124='f'): Only local variables can be assigned to in inline assembly.
+// TypeError 1990: (136-137='C'): Only local variables can be assigned to in inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/basefee_reserved_london.sol b/test/libsolidity/syntaxTests/inlineAssembly/basefee_reserved_london.sol
index 00ecaf01a..e726eddbb 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/basefee_reserved_london.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/basefee_reserved_london.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // EVMVersion: =london
 // ----
-// ParserError 5568: (98-105): Cannot use builtin function name "basefee" as identifier name.
+// ParserError 5568: (98-105='basefee'): Cannot use builtin function name "basefee" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_err.sol b/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_err.sol
index a87473239..6bbba5eae 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_err.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_err.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3558: (171-172): Constant variable is circular.
+// TypeError 3558: (171-172='x'): Constant variable is circular.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_module_err.sol b/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_module_err.sol
index 75f1ba667..7ce4e5f86 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_module_err.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/circular_constant_access_module_err.sol
@@ -14,4 +14,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3558: (b:178-179): Constant variable is circular.
+// TypeError 3558: (b:178-179='a'): Constant variable is circular.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/circular_module_access_err.sol b/test/libsolidity/syntaxTests/inlineAssembly/circular_module_access_err.sol
index 8d79f6e69..eb94249c7 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/circular_module_access_err.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/circular_module_access_err.sol
@@ -11,4 +11,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3558: (b:155-156): Constant variable is circular.
+// TypeError 3558: (b:155-156='x'): Constant variable is circular.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/const_from_non_const.sol b/test/libsolidity/syntaxTests/inlineAssembly/const_from_non_const.sol
index 709922dd3..d25158e4e 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/const_from_non_const.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/const_from_non_const.sol
@@ -8,5 +8,5 @@ contract C {
   }
 }
 // ----
-// TypeError 8349: (52-54): Initial value for constant variable has to be compile-time constant.
-// TypeError 7615: (112-113): Only direct number constants and references to such constants are supported by inline assembly.
+// TypeError 8349: (52-54='nc'): Initial value for constant variable has to be compile-time constant.
+// TypeError 7615: (112-113='c'): Only direct number constants and references to such constants are supported by inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/const_from_this.sol b/test/libsolidity/syntaxTests/inlineAssembly/const_from_this.sol
index 76a05592e..67c5bb063 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/const_from_this.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/const_from_this.sol
@@ -7,6 +7,6 @@ contract C {
   }
 }
 // ----
-// TypeError 7407: (33-37): Type contract C is not implicitly convertible to expected type bool.
-// TypeError 8349: (33-37): Initial value for constant variable has to be compile-time constant.
-// TypeError 7615: (95-96): Only direct number constants and references to such constants are supported by inline assembly.
+// TypeError 7407: (33-37='this'): Type contract C is not implicitly convertible to expected type bool.
+// TypeError 8349: (33-37='this'): Initial value for constant variable has to be compile-time constant.
+// TypeError 7615: (95-96='c'): Only direct number constants and references to such constants are supported by inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/constant_access_non_initialized.sol b/test/libsolidity/syntaxTests/inlineAssembly/constant_access_non_initialized.sol
index cc439cf04..ab7495422 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/constant_access_non_initialized.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/constant_access_non_initialized.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// TypeError 4266: (17-32): Uninitialized "constant" variable.
-// TypeError 3224: (106-107): Constant has no value.
+// TypeError 4266: (17-32='uint constant x'): Uninitialized "constant" variable.
+// TypeError 3224: (106-107='x'): Constant has no value.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/constant_array.sol b/test/libsolidity/syntaxTests/inlineAssembly/constant_array.sol
index 0787a6795..56455c566 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/constant_array.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/constant_array.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7615: (115-116): Only direct number constants and references to such constants are supported by inline assembly.
+// TypeError 7615: (115-116='x'): Only direct number constants and references to such constants are supported by inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/constant_bytes_ref.sol b/test/libsolidity/syntaxTests/inlineAssembly/constant_bytes_ref.sol
index 23974658c..5b9ddec84 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/constant_bytes_ref.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/constant_bytes_ref.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7615: (168-169): Only direct number constants and references to such constants are supported by inline assembly.
+// TypeError 7615: (168-169='y'): Only direct number constants and references to such constants are supported by inline assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/external_identifier_access_shadowing.sol b/test/libsolidity/syntaxTests/inlineAssembly/external_identifier_access_shadowing.sol
index fb073bd38..d45bce102 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/external_identifier_access_shadowing.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/external_identifier_access_shadowing.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 6578: (123-124): Cannot access local Solidity variables from inside an inline assembly function.
+// DeclarationError 6578: (123-124='x'): Cannot access local Solidity variables from inside an inline assembly function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_call_invalid_argument_count.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_call_invalid_argument_count.sol
index f3b35f8a3..0168ecdd1 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_call_invalid_argument_count.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/function_call_invalid_argument_count.sol
@@ -10,5 +10,5 @@ contract C {
   }
 }
 // ----
-// TypeError 7000: (87-88): Function "f" expects 1 arguments but got 0.
-// TypeError 7000: (108-109): Function "f" expects 1 arguments but got 2.
+// TypeError 7000: (87-88='f'): Function "f" expects 1 arguments but got 0.
+// TypeError 7000: (108-109='f'): Function "f" expects 1 arguments but got 2.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_call_not_found.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_call_not_found.sol
index cc74edfce..c7efc9519 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_call_not_found.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/function_call_not_found.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// DeclarationError 4619: (63-64): Function "k" not found.
+// DeclarationError 4619: (63-64='k'): Function "k" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_call_to_variable.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_call_to_variable.sol
index f6f3573f6..a2e25205a 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_call_to_variable.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/function_call_to_variable.sol
@@ -8,4 +8,4 @@ contract C {
   }
 }
 // ----
-// TypeError 4202: (81-82): Attempt to call variable instead of function.
+// TypeError 4202: (81-82='x'): Attempt to call variable instead of function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_definition_whitespace.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_definition_whitespace.sol
index d3c56f3e2..9d412da70 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_definition_whitespace.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/function_definition_whitespace.sol
@@ -7,4 +7,4 @@ contract C {
   }
 }
 // ----
-// ParserError 2314: (87-88): Expected '{' but got '-'
+// ParserError 2314: (87-88='-'): Expected '{' but got '-'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/function_without_call.sol b/test/libsolidity/syntaxTests/inlineAssembly/function_without_call.sol
index 86d0a9605..f86af8fc1 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/function_without_call.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/function_without_call.sol
@@ -8,4 +8,4 @@ contract C {
   }
 }
 // ----
-// ParserError 6913: (92-93): Call or assignment expected.
+// ParserError 6913: (92-93='}'): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/immutables.sol b/test/libsolidity/syntaxTests/inlineAssembly/immutables.sol
index f4e20f8b9..14b2c1b91 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/immutables.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/immutables.sol
@@ -7,5 +7,5 @@ contract C {
   }
 }
 // ----
-// DeclarationError 4619: (63-75): Function "setimmutable" not found.
-// DeclarationError 4619: (92-105): Function "loadimmutable" not found.
+// DeclarationError 4619: (63-75='setimmutable'): Function "setimmutable" not found.
+// DeclarationError 4619: (92-105='loadimmutable'): Function "loadimmutable" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/assign_to_instruction.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/assign_to_instruction.sol
index b4603f54c..b8a2eb0bd 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/assign_to_instruction.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/assign_to_instruction.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// ParserError 5568: (67-70): Cannot use builtin function name "mod" as identifier name.
+// ParserError 5568: (67-70='mod'): Cannot use builtin function name "mod" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/assignment_to_function.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/assignment_to_function.sol
index 9ce487295..8adb51b37 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/assignment_to_function.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/assignment_to_function.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2657: (103-104): Assignment requires variable.
+// TypeError 2657: (103-104='f'): Assignment requires variable.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol
index 87884efee..6716a5b10 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/bare_instructions_disallowed.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6913: (95-98): Call or assignment expected.
+// ParserError 6913: (95-98='pop'): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_array.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_array.sol
index 5262b68ec..dbf311b33 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_array.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_array.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1397: (112-127): Call data elements cannot be accessed directly. Use ".offset" and ".length" to access the calldata offset and length of this array and then use "calldatacopy".
+// TypeError 1397: (112-127='bytesAsCalldata'): Call data elements cannot be accessed directly. Use ".offset" and ".length" to access the calldata offset and length of this array and then use "calldatacopy".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_slot.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_slot.sol
index 4af7fa91e..223cfa11a 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_slot.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_slot.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1536: (111-131): Calldata variables only support ".offset" and ".length".
+// TypeError 1536: (111-131='bytesAsCalldata.slot'): Calldata variables only support ".offset" and ".length".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_variables.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_variables.sol
index 07562ad27..949fbbb21 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_variables.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/calldata_variables.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1397: (111-126): Call data elements cannot be accessed directly. Use ".offset" and ".length" to access the calldata offset and length of this array and then use "calldatacopy".
+// TypeError 1397: (111-126='bytesAsCalldata'): Call data elements cannot be accessed directly. Use ".offset" and ".length" to access the calldata offset and length of this array and then use "calldatacopy".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/const_forward_reference.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/const_forward_reference.sol
index 295bc927d..3317d44bd 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/const_forward_reference.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/const_forward_reference.sol
@@ -8,5 +8,5 @@ contract C {
 }
 // ----
 // SyntaxError 4937: (15-83): No visibility specified. Did you intend to add "public"?
-// TypeError 2249: (71-72): Constant variables with non-literal values cannot be forward referenced from inline assembly.
-// TypeError 6252: (51-52): Constant variables cannot be assigned to.
+// TypeError 2249: (71-72='c'): Constant variables with non-literal values cannot be forward referenced from inline assembly.
+// TypeError 6252: (51-52='c'): Constant variables cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_assignment.sol
index 9df1f4d3c..d37a026e3 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_assignment.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_assignment.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 6252: (98-99): Constant variables cannot be assigned to.
+// TypeError 6252: (98-99='x'): Constant variables cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_length_access.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_length_access.sol
index eda71f955..39a01e94a 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_length_access.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_length_access.sol
@@ -7,4 +7,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError 3622: (91-99): The suffix ".length" is not supported by this variable or type.
+// TypeError 3622: (91-99='x.length'): The suffix ".length" is not supported by this variable or type.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol
index eab2d2b4e..59401b8de 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/constant_variable_via_offset.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 6617: (112-120): The suffixes .offset and .slot can only be used on non-constant storage variables.
+// TypeError 6617: (112-120='x.offset'): The suffixes .offset and .slot can only be used on non-constant storage variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fun_param.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fun_param.sol
index e6644e9da..78a68a93c 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fun_param.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fun_param.sol
@@ -6,7 +6,7 @@ contract C {
   }
 }
 // ----
-// DeclarationError 3927: (74-76): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (78-81): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (86-89): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (91-94): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (74-76='a.'): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (78-81='x.b'): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (86-89='t.b'): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (91-94='b..'): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fundecl.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fundecl.sol
index 2e8118b78..505ed169a 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fundecl.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_fundecl.sol
@@ -7,5 +7,5 @@ contract C {
   }
 }
 // ----
-// DeclarationError 3927: (63-79): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (86-103): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (63-79='function f.() {}'): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (86-103='function g.f() {}'): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_multi_vardecl.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_multi_vardecl.sol
index 58efb2de6..df8adb1bc 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_multi_vardecl.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_multi_vardecl.sol
@@ -7,5 +7,5 @@ contract C {
   }
 }
 // ----
-// DeclarationError 3927: (100-102): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (104-108): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (100-102='a.'): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (104-108='aa.b'): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_vardecl.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_vardecl.sol
index 0537afb74..ad76eb9da 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_vardecl.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dot_in_vardecl.sol
@@ -9,7 +9,7 @@ contract C {
   }
 }
 // ----
-// DeclarationError 3927: (67-69): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (85-88): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (104-107): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (123-127): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (67-69='a.'): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (85-88='a..'): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (104-107='a.b'): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (123-127='a..b'): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dup_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dup_disallowed.sol
index 63e89a242..f439f5281 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/dup_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/dup_disallowed.sol
@@ -23,21 +23,21 @@ contract C {
     }
 }
 // ----
-// DeclarationError 4619: (75-79): Function "dup0" not found.
-// DeclarationError 4619: (94-98): Function "dup1" not found.
-// DeclarationError 4619: (113-117): Function "dup2" not found.
-// DeclarationError 4619: (132-136): Function "dup3" not found.
-// DeclarationError 4619: (151-155): Function "dup4" not found.
-// DeclarationError 4619: (170-174): Function "dup5" not found.
-// DeclarationError 4619: (189-193): Function "dup6" not found.
-// DeclarationError 4619: (208-212): Function "dup7" not found.
-// DeclarationError 4619: (227-231): Function "dup8" not found.
-// DeclarationError 4619: (246-250): Function "dup9" not found.
-// DeclarationError 4619: (265-270): Function "dup10" not found.
-// DeclarationError 4619: (285-290): Function "dup11" not found.
-// DeclarationError 4619: (305-310): Function "dup12" not found.
-// DeclarationError 4619: (325-330): Function "dup13" not found.
-// DeclarationError 4619: (345-350): Function "dup14" not found.
-// DeclarationError 4619: (365-370): Function "dup15" not found.
-// DeclarationError 4619: (385-390): Function "dup16" not found.
-// DeclarationError 4619: (405-410): Function "dup32" not found.
+// DeclarationError 4619: (75-79='dup0'): Function "dup0" not found.
+// DeclarationError 4619: (94-98='dup1'): Function "dup1" not found.
+// DeclarationError 4619: (113-117='dup2'): Function "dup2" not found.
+// DeclarationError 4619: (132-136='dup3'): Function "dup3" not found.
+// DeclarationError 4619: (151-155='dup4'): Function "dup4" not found.
+// DeclarationError 4619: (170-174='dup5'): Function "dup5" not found.
+// DeclarationError 4619: (189-193='dup6'): Function "dup6" not found.
+// DeclarationError 4619: (208-212='dup7'): Function "dup7" not found.
+// DeclarationError 4619: (227-231='dup8'): Function "dup8" not found.
+// DeclarationError 4619: (246-250='dup9'): Function "dup9" not found.
+// DeclarationError 4619: (265-270='dup10'): Function "dup10" not found.
+// DeclarationError 4619: (285-290='dup11'): Function "dup11" not found.
+// DeclarationError 4619: (305-310='dup12'): Function "dup12" not found.
+// DeclarationError 4619: (325-330='dup13'): Function "dup13" not found.
+// DeclarationError 4619: (345-350='dup14'): Function "dup14" not found.
+// DeclarationError 4619: (365-370='dup15'): Function "dup15" not found.
+// DeclarationError 4619: (385-390='dup16'): Function "dup16" not found.
+// DeclarationError 4619: (405-410='dup32'): Function "dup32" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_beginning.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_beginning.sol
index a2e938698..4ba880ba5 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_beginning.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_beginning.sol
@@ -8,4 +8,4 @@ contract C {
   }
 }
 // ----
-// ParserError 1856: (101-102): Literal or identifier expected.
+// ParserError 1856: (101-102=','): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_end.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_end.sol
index be95849c3..5efc1dd18 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_end.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_end.sol
@@ -8,4 +8,4 @@ contract C {
   }
 }
 // ----
-// ParserError 1856: (103-104): Literal or identifier expected.
+// ParserError 1856: (103-104=')'): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_middle.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_middle.sol
index 00bdac65e..af489827a 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_middle.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_fun_arg_middle.sol
@@ -7,4 +7,4 @@ contract C {
   }
 }
 // ----
-// ParserError 1856: (96-97): Literal or identifier expected.
+// ParserError 1856: (96-97=','): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_function_name.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_function_name.sol
index a6dba71ef..7d359772a 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_function_name.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/empty_function_name.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// ParserError 2314: (72-73): Expected identifier but got '('
+// ParserError 2314: (72-73='('): Expected identifier but got '('
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/external_function_pointer_offset.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/external_function_pointer_offset.sol
index f6abe2976..d6352a16e 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/external_function_pointer_offset.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/external_function_pointer_offset.sol
@@ -12,4 +12,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 9272: (173-182): Variables of type function pointer only support ".selector" and ".address".
+// TypeError 9272: (173-182='fp.offset'): Variables of type function pointer only support ".selector" and ".address".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/identifier_starting_with_dot.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/identifier_starting_with_dot.sol
index 0122dc4db..a76343931 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/identifier_starting_with_dot.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/identifier_starting_with_dot.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// ParserError 2314: (70-71): Expected identifier but got '.'
+// ParserError 2314: (70-71='.'): Expected identifier but got '.'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/illegal_names.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/illegal_names.sol
index 6c41b2296..31368615e 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/illegal_names.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/illegal_names.sol
@@ -39,17 +39,17 @@ contract C {
     }
 }
 // ----
-// DeclarationError 4113: (105-136): The identifier name "this" is reserved.
-// DeclarationError 4113: (149-181): The identifier name "super" is reserved.
-// DeclarationError 4113: (194-222): The identifier name "_" is reserved.
-// DeclarationError 4113: (323-327): The identifier name "this" is reserved.
-// DeclarationError 4113: (368-373): The identifier name "super" is reserved.
-// DeclarationError 4113: (414-415): The identifier name "_" is reserved.
-// DeclarationError 4113: (546-550): The identifier name "this" is reserved.
-// DeclarationError 4113: (595-600): The identifier name "super" is reserved.
-// DeclarationError 4113: (645-646): The identifier name "_" is reserved.
-// DeclarationError 4113: (759-763): The identifier name "this" is reserved.
-// DeclarationError 3859: (759-763): This declaration shadows a declaration outside the inline assembly block.
-// DeclarationError 4113: (785-790): The identifier name "super" is reserved.
-// DeclarationError 3859: (785-790): This declaration shadows a declaration outside the inline assembly block.
-// DeclarationError 4113: (812-813): The identifier name "_" is reserved.
+// DeclarationError 4113: (105-136='function this() {             }'): The identifier name "this" is reserved.
+// DeclarationError 4113: (149-181='function super() {             }'): The identifier name "super" is reserved.
+// DeclarationError 4113: (194-222='function _() {             }'): The identifier name "_" is reserved.
+// DeclarationError 4113: (323-327='this'): The identifier name "this" is reserved.
+// DeclarationError 4113: (368-373='super'): The identifier name "super" is reserved.
+// DeclarationError 4113: (414-415='_'): The identifier name "_" is reserved.
+// DeclarationError 4113: (546-550='this'): The identifier name "this" is reserved.
+// DeclarationError 4113: (595-600='super'): The identifier name "super" is reserved.
+// DeclarationError 4113: (645-646='_'): The identifier name "_" is reserved.
+// DeclarationError 4113: (759-763='this'): The identifier name "this" is reserved.
+// DeclarationError 3859: (759-763='this'): This declaration shadows a declaration outside the inline assembly block.
+// DeclarationError 4113: (785-790='super'): The identifier name "super" is reserved.
+// DeclarationError 3859: (785-790='super'): This declaration shadows a declaration outside the inline assembly block.
+// DeclarationError 4113: (812-813='_'): The identifier name "_" is reserved.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_address.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_address.sol
index c252657ca..20b76682f 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_address.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_address.sol
@@ -14,5 +14,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 8533: (193-203): Only Variables of type external function pointer support ".selector" and ".address".
-// TypeError 9582: (267-287): Member "address" not found or not visible after argument-dependent lookup in function ().
+// TypeError 8533: (193-203='fp.address'): Only Variables of type external function pointer support ".selector" and ".address".
+// TypeError 9582: (267-287='testFunction.address'): Member "address" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_selector.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_selector.sol
index 4913bf5d6..36a659934 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_selector.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/internal_function_pointer_selector.sol
@@ -16,5 +16,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 8533: (198-209): Only Variables of type external function pointer support ".selector" and ".address".
-// TypeError 9582: (329-350): Member "selector" not found or not visible after argument-dependent lookup in function ().
+// TypeError 8533: (198-209='fp.selector'): Only Variables of type external function pointer support ".selector" and ".address".
+// TypeError 9582: (329-350='testFunction.selector'): Member "selector" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/invalid_number.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/invalid_number.sol
index 1ba49bc39..dba46ceca 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/invalid_number.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/invalid_number.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// ParserError 1465: (72-73): Illegal token: Octal numbers not allowed.
+// ParserError 1465: (72-73='0'): Illegal token: Octal numbers not allowed.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jump_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/jump_disallowed.sol
index 9d79776d8..bfa72a4df 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jump_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/jump_disallowed.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 4619: (75-79): Function "jump" not found.
+// DeclarationError 4619: (75-79='jump'): Function "jump" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpdest_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpdest_disallowed.sol
index 364d981bd..527dc6ed3 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpdest_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpdest_disallowed.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 4619: (75-83): Function "jumpdest" not found.
+// DeclarationError 4619: (75-83='jumpdest'): Function "jumpdest" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpi_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpi_disallowed.sol
index 4271842e0..a54bdfd13 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpi_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/jumpi_disallowed.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 4619: (75-80): Function "jumpi" not found.
+// DeclarationError 4619: (75-80='jumpi'): Function "jumpi" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/label_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/label_disallowed.sol
index cfe0d1c3d..9190dca68 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/label_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/label_disallowed.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6913: (80-81): Call or assignment expected.
+// ParserError 6913: (80-81=':'): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/leave_items_on_stack.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/leave_items_on_stack.sol
index dec7911c6..5010b0d26 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/leave_items_on_stack.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/leave_items_on_stack.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3083: (75-83): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
+// TypeError 3083: (75-83='mload(0)'): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/literals_on_stack_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/literals_on_stack_disallowed.sol
index 91348e801..09635ecca 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/literals_on_stack_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/literals_on_stack_disallowed.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6913: (85-86): Call or assignment expected.
+// ParserError 6913: (85-86='}'): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions.sol
index b7b07fb16..d5b1c5cc1 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 6578: (114-115): Cannot access local Solidity variables from inside an inline assembly function.
+// DeclarationError 6578: (114-115='a'): Cannot access local Solidity variables from inside an inline assembly function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions_storage_ptr.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions_storage_ptr.sol
index 24cc283b1..31dfbc011 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions_storage_ptr.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/local_variable_access_out_of_functions_storage_ptr.sol
@@ -8,4 +8,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 6578: (142-150): Cannot access local Solidity variables from inside an inline assembly function.
+// DeclarationError 6578: (142-150='a.offset'): Cannot access local Solidity variables from inside an inline assembly function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable.sol
index e3d822539..d096b71ee 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// DeclarationError 4634: (63-64): Variable not found or variable not lvalue.
+// DeclarationError 4634: (63-64='x'): Variable not found or variable not lvalue.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable_in_assign.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable_in_assign.sol
index 901df4ad5..09aeb1c5e 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable_in_assign.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/missing_variable_in_assign.sol
@@ -7,4 +7,4 @@ contract C {
   }
 }
 // ----
-// ParserError 1856: (87-89): Literal or identifier expected.
+// ParserError 1856: (87-89=':='): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/multiple_assign_to_instruction.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/multiple_assign_to_instruction.sol
index cb5e5c560..215ddc0b6 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/multiple_assign_to_instruction.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/multiple_assign_to_instruction.sol
@@ -7,4 +7,4 @@ contract C {
   }
 }
 // ----
-// ParserError 5568: (102-105): Cannot use builtin function name "sub" as identifier name.
+// ParserError 5568: (102-105='sub'): Cannot use builtin function name "sub" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/nested_function_local_access.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/nested_function_local_access.sol
index 6a2f91422..7f8e25333 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/nested_function_local_access.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/nested_function_local_access.sol
@@ -9,4 +9,4 @@ contract C {
   }
 }
 // ----
-// DeclarationError 6578: (130-131): Cannot access local Solidity variables from inside an inline assembly function.
+// DeclarationError 6578: (130-131='x'): Cannot access local Solidity variables from inside an inline assembly function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/pc_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/pc_disallowed.sol
index 816bb1c0d..1d581ee88 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/pc_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/pc_disallowed.sol
@@ -6,4 +6,4 @@ contract C {
 	}
 }
 // ----
-// SyntaxError 2450: (61-63): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
+// SyntaxError 2450: (61-63='pc'): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/push_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/push_disallowed.sol
index 0e73c1184..c54fbee97 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/push_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/push_disallowed.sol
@@ -38,36 +38,36 @@ contract C {
     }
 }
 // ----
-// DeclarationError 4619: (75-80): Function "push0" not found.
-// DeclarationError 4619: (95-100): Function "push1" not found.
-// DeclarationError 4619: (115-120): Function "push2" not found.
-// DeclarationError 4619: (135-140): Function "push3" not found.
-// DeclarationError 4619: (155-160): Function "push4" not found.
-// DeclarationError 4619: (175-180): Function "push5" not found.
-// DeclarationError 4619: (195-200): Function "push6" not found.
-// DeclarationError 4619: (215-220): Function "push7" not found.
-// DeclarationError 4619: (235-240): Function "push8" not found.
-// DeclarationError 4619: (255-260): Function "push9" not found.
-// DeclarationError 4619: (275-281): Function "push10" not found.
-// DeclarationError 4619: (296-302): Function "push11" not found.
-// DeclarationError 4619: (317-323): Function "push12" not found.
-// DeclarationError 4619: (338-344): Function "push13" not found.
-// DeclarationError 4619: (359-365): Function "push14" not found.
-// DeclarationError 4619: (380-386): Function "push15" not found.
-// DeclarationError 4619: (401-407): Function "push16" not found.
-// DeclarationError 4619: (422-428): Function "push17" not found.
-// DeclarationError 4619: (443-449): Function "push18" not found.
-// DeclarationError 4619: (464-470): Function "push19" not found.
-// DeclarationError 4619: (485-491): Function "push20" not found.
-// DeclarationError 4619: (506-512): Function "push21" not found.
-// DeclarationError 4619: (527-533): Function "push22" not found.
-// DeclarationError 4619: (548-554): Function "push23" not found.
-// DeclarationError 4619: (569-575): Function "push24" not found.
-// DeclarationError 4619: (590-596): Function "push25" not found.
-// DeclarationError 4619: (611-617): Function "push26" not found.
-// DeclarationError 4619: (632-638): Function "push27" not found.
-// DeclarationError 4619: (653-659): Function "push28" not found.
-// DeclarationError 4619: (674-680): Function "push29" not found.
-// DeclarationError 4619: (695-701): Function "push30" not found.
-// DeclarationError 4619: (716-722): Function "push31" not found.
-// DeclarationError 4619: (737-743): Function "push32" not found.
+// DeclarationError 4619: (75-80='push0'): Function "push0" not found.
+// DeclarationError 4619: (95-100='push1'): Function "push1" not found.
+// DeclarationError 4619: (115-120='push2'): Function "push2" not found.
+// DeclarationError 4619: (135-140='push3'): Function "push3" not found.
+// DeclarationError 4619: (155-160='push4'): Function "push4" not found.
+// DeclarationError 4619: (175-180='push5'): Function "push5" not found.
+// DeclarationError 4619: (195-200='push6'): Function "push6" not found.
+// DeclarationError 4619: (215-220='push7'): Function "push7" not found.
+// DeclarationError 4619: (235-240='push8'): Function "push8" not found.
+// DeclarationError 4619: (255-260='push9'): Function "push9" not found.
+// DeclarationError 4619: (275-281='push10'): Function "push10" not found.
+// DeclarationError 4619: (296-302='push11'): Function "push11" not found.
+// DeclarationError 4619: (317-323='push12'): Function "push12" not found.
+// DeclarationError 4619: (338-344='push13'): Function "push13" not found.
+// DeclarationError 4619: (359-365='push14'): Function "push14" not found.
+// DeclarationError 4619: (380-386='push15'): Function "push15" not found.
+// DeclarationError 4619: (401-407='push16'): Function "push16" not found.
+// DeclarationError 4619: (422-428='push17'): Function "push17" not found.
+// DeclarationError 4619: (443-449='push18'): Function "push18" not found.
+// DeclarationError 4619: (464-470='push19'): Function "push19" not found.
+// DeclarationError 4619: (485-491='push20'): Function "push20" not found.
+// DeclarationError 4619: (506-512='push21'): Function "push21" not found.
+// DeclarationError 4619: (527-533='push22'): Function "push22" not found.
+// DeclarationError 4619: (548-554='push23'): Function "push23" not found.
+// DeclarationError 4619: (569-575='push24'): Function "push24" not found.
+// DeclarationError 4619: (590-596='push25'): Function "push25" not found.
+// DeclarationError 4619: (611-617='push26'): Function "push26" not found.
+// DeclarationError 4619: (632-638='push27'): Function "push27" not found.
+// DeclarationError 4619: (653-659='push28'): Function "push28" not found.
+// DeclarationError 4619: (674-680='push29'): Function "push29" not found.
+// DeclarationError 4619: (695-701='push30'): Function "push30" not found.
+// DeclarationError 4619: (716-722='push31'): Function "push31" not found.
+// DeclarationError 4619: (737-743='push32'): Function "push32" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol
index b01f1ee21..afcdb4bd8 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 1408: (89-90): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
+// TypeError 1408: (89-90='x'): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol
index 64cfc8623..96886212b 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_assignment_in_modifier.sol
@@ -10,4 +10,4 @@ contract test {
     }
 }
 // ----
-// TypeError 1408: (80-81): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
+// TypeError 1408: (80-81='x'): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_nonslot.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_nonslot.sol
index ba0ef195c..fdbd966ef 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_nonslot.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/storage_nonslot.sol
@@ -8,5 +8,5 @@ contract test {
     }
 }
 // ----
-// TypeError 4656: (98-106): State variables only support ".slot" and ".offset".
-// TypeError 4656: (119-127): State variables only support ".slot" and ".offset".
+// TypeError 4656: (98-106='x.length'): State variables only support ".slot" and ".offset".
+// TypeError 4656: (119-127='x.length'): State variables only support ".slot" and ".offset".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/swap_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/swap_disallowed.sol
index de37f4120..9b3b7f0a5 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/swap_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/swap_disallowed.sol
@@ -23,21 +23,21 @@ contract C {
     }
 }
 // ----
-// DeclarationError 4619: (75-80): Function "swap0" not found.
-// DeclarationError 4619: (95-100): Function "swap1" not found.
-// DeclarationError 4619: (115-120): Function "swap2" not found.
-// DeclarationError 4619: (135-140): Function "swap3" not found.
-// DeclarationError 4619: (155-160): Function "swap4" not found.
-// DeclarationError 4619: (175-180): Function "swap5" not found.
-// DeclarationError 4619: (195-200): Function "swap6" not found.
-// DeclarationError 4619: (215-220): Function "swap7" not found.
-// DeclarationError 4619: (235-240): Function "swap8" not found.
-// DeclarationError 4619: (255-260): Function "swap9" not found.
-// DeclarationError 4619: (275-281): Function "swap10" not found.
-// DeclarationError 4619: (296-302): Function "swap11" not found.
-// DeclarationError 4619: (317-323): Function "swap12" not found.
-// DeclarationError 4619: (338-344): Function "swap13" not found.
-// DeclarationError 4619: (359-365): Function "swap14" not found.
-// DeclarationError 4619: (380-386): Function "swap15" not found.
-// DeclarationError 4619: (401-407): Function "swap16" not found.
-// DeclarationError 4619: (422-428): Function "swap32" not found.
+// DeclarationError 4619: (75-80='swap0'): Function "swap0" not found.
+// DeclarationError 4619: (95-100='swap1'): Function "swap1" not found.
+// DeclarationError 4619: (115-120='swap2'): Function "swap2" not found.
+// DeclarationError 4619: (135-140='swap3'): Function "swap3" not found.
+// DeclarationError 4619: (155-160='swap4'): Function "swap4" not found.
+// DeclarationError 4619: (175-180='swap5'): Function "swap5" not found.
+// DeclarationError 4619: (195-200='swap6'): Function "swap6" not found.
+// DeclarationError 4619: (215-220='swap7'): Function "swap7" not found.
+// DeclarationError 4619: (235-240='swap8'): Function "swap8" not found.
+// DeclarationError 4619: (255-260='swap9'): Function "swap9" not found.
+// DeclarationError 4619: (275-281='swap10'): Function "swap10" not found.
+// DeclarationError 4619: (296-302='swap11'): Function "swap11" not found.
+// DeclarationError 4619: (317-323='swap12'): Function "swap12" not found.
+// DeclarationError 4619: (338-344='swap13'): Function "swap13" not found.
+// DeclarationError 4619: (359-365='swap14'): Function "swap14" not found.
+// DeclarationError 4619: (380-386='swap15'): Function "swap15" not found.
+// DeclarationError 4619: (401-407='swap16'): Function "swap16" not found.
+// DeclarationError 4619: (422-428='swap32'): Function "swap32" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol
index 80dd3a587..d4867e9db 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_negative_stack.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// ParserError 6913: (85-86): Call or assignment expected.
+// ParserError 6913: (85-86='}'): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_positive_stack.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_positive_stack.sol
index 6942afe6b..68c8691be 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_positive_stack.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_positive_stack.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// ParserError 6913: (83-84): Call or assignment expected.
+// ParserError 6913: (83-84='}'): Call or assignment expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol
index b1f8ba435..a8766cddf 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/unbalanced_two_stack_load.sol
@@ -5,4 +5,4 @@ contract c {
     }
 }
 // ----
-// TypeError 1408: (75-76): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
+// TypeError 1408: (75-76='x'): Only local variables are supported. To access storage variables, use the ".slot" and ".offset" suffixes.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/variable_declaration_suffix_offset.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/variable_declaration_suffix_offset.sol
index dd69058f3..69bec2200 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/variable_declaration_suffix_offset.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/variable_declaration_suffix_offset.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3927: (79-87): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (109-115): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (79-87='x.offset'): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (109-115='x.slot'): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_assignment.sol
index 9eba8e7b3..ad1914f4f 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_assignment.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_assignment.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// ParserError 2314: (71-72): Expected identifier but got '='
+// ParserError 2314: (71-72='='): Expected identifier but got '='
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_multiple_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_multiple_assignment.sol
index ca9f34fca..1348ed513 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_multiple_assignment.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid/whitespace_in_multiple_assignment.sol
@@ -7,4 +7,4 @@ contract C {
   }
 }
 // ----
-// ParserError 2314: (109-110): Expected identifier but got '='
+// ParserError 2314: (109-110='='): Expected identifier but got '='
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
index d23eceeed..864fbec56 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
@@ -9,6 +9,6 @@ contract C {
 	}
 }
 // ----
-// Warning 6269: (60-71): Unexpected NatSpec tag "test" with value "test" in inline assembly.
-// Warning 8787: (95-106): Unexpected value for @solidity tag in inline assembly: test
-// Warning 7828: (122-133): Inline assembly has invalid NatSpec documentation.
+// Warning 6269: (60-71='assembly {}'): Unexpected NatSpec tag "test" with value "test" in inline assembly.
+// Warning 8787: (95-106='assembly {}'): Unexpected value for @solidity tag in inline assembly: test
+// Warning 7828: (122-133='assembly {}'): Inline assembly has invalid NatSpec documentation.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/leave_invalid.sol b/test/libsolidity/syntaxTests/inlineAssembly/leave_invalid.sol
index 1b7c75105..fb9b7078a 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/leave_invalid.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/leave_invalid.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// SyntaxError 8149: (63-68): Keyword "leave" can only be used inside a function.
+// SyntaxError 8149: (63-68='leave'): Keyword "leave" can only be used inside a function.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_builtin.sol b/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_builtin.sol
index 8679a97a2..825e70ba4 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_builtin.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_builtin.sol
@@ -6,5 +6,5 @@ contract C {
   }
 }
 // ----
-// DeclarationError 4619: (67-79): Function "linkersymbol" not found.
+// DeclarationError 4619: (67-79='linkersymbol'): Function "linkersymbol" not found.
 // TypeError 3950: (67-105): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_function.sol b/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_function.sol
index 7434ddfd5..edb69d281 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_function.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/linkersymbol_function.sol
@@ -8,4 +8,4 @@ contract C {
   }
 }
 // ----
-// DeclarationError 5017: (63-90): The identifier "linkersymbol" is reserved and can not be used.
+// DeclarationError 5017: (63-90='function linkersymbol(a) {}'): The identifier "linkersymbol" is reserved and can not be used.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol b/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol
index 945d62b06..278131549 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol
@@ -12,12 +12,12 @@ function f() pure {
     assembly {}
 }
 // ----
-// Warning 6269: (189-200): Unexpected NatSpec tag "after" with value "bogus-value" in inline assembly.
-// Warning 6269: (189-200): Unexpected NatSpec tag "before" with value "bogus-value" in inline assembly.
-// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: a
-// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: b
-// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: c
-// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: d
-// Warning 8787: (289-300): Unexpected value for @solidity tag in inline assembly: a
-// Warning 4377: (289-300): Value for @solidity tag in inline assembly specified multiple times: a
-// Warning 4377: (289-300): Value for @solidity tag in inline assembly specified multiple times: memory-safe-assembly
+// Warning 6269: (189-200='assembly {}'): Unexpected NatSpec tag "after" with value "bogus-value" in inline assembly.
+// Warning 6269: (189-200='assembly {}'): Unexpected NatSpec tag "before" with value "bogus-value" in inline assembly.
+// Warning 8787: (189-200='assembly {}'): Unexpected value for @solidity tag in inline assembly: a
+// Warning 8787: (189-200='assembly {}'): Unexpected value for @solidity tag in inline assembly: b
+// Warning 8787: (189-200='assembly {}'): Unexpected value for @solidity tag in inline assembly: c
+// Warning 8787: (189-200='assembly {}'): Unexpected value for @solidity tag in inline assembly: d
+// Warning 8787: (289-300='assembly {}'): Unexpected value for @solidity tag in inline assembly: a
+// Warning 4377: (289-300='assembly {}'): Value for @solidity tag in inline assembly specified multiple times: a
+// Warning 4377: (289-300='assembly {}'): Value for @solidity tag in inline assembly specified multiple times: memory-safe-assembly
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol
index 74be1232d..b877f3eb3 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol
@@ -12,8 +12,8 @@ function f() pure {
     assembly {}
 }
 // ----
-// Warning 6269: (177-188): Unexpected NatSpec tag "after" with value "bogus-value" in inline assembly.
-// Warning 6269: (177-188): Unexpected NatSpec tag "before" with value "@solidity a   memory-safe-assembly b    c           d" in inline assembly.
-// Warning 8787: (277-288): Unexpected value for @solidity tag in inline assembly: a
-// Warning 4377: (277-288): Value for @solidity tag in inline assembly specified multiple times: a
-// Warning 4377: (277-288): Value for @solidity tag in inline assembly specified multiple times: memory-safe-assembly
+// Warning 6269: (177-188='assembly {}'): Unexpected NatSpec tag "after" with value "bogus-value" in inline assembly.
+// Warning 6269: (177-188='assembly {}'): Unexpected NatSpec tag "before" with value "@solidity a   memory-safe-assembly b    c           d" in inline assembly.
+// Warning 8787: (277-288='assembly {}'): Unexpected value for @solidity tag in inline assembly: a
+// Warning 4377: (277-288='assembly {}'): Value for @solidity tag in inline assembly specified multiple times: a
+// Warning 4377: (277-288='assembly {}'): Value for @solidity tag in inline assembly specified multiple times: memory-safe-assembly
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/overloaded_reference.sol b/test/libsolidity/syntaxTests/inlineAssembly/overloaded_reference.sol
index 64411c6df..f787f9d00 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/overloaded_reference.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/overloaded_reference.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 4718: (155-156): Multiple matching identifiers. Resolving overloaded identifiers is not supported.
+// DeclarationError 4718: (155-156='f'): Multiple matching identifiers. Resolving overloaded identifiers is not supported.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers.sol b/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers.sol
index 6660887d0..7234e274c 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers.sol
@@ -8,6 +8,6 @@ contract C {
   }
 }
 // ----
-// DeclarationError 5017: (67-79): The identifier "linkersymbol" is reserved and can not be used.
-// DeclarationError 5017: (95-103): The identifier "datacopy" is reserved and can not be used.
-// DeclarationError 5017: (119-125): The identifier "swap16" is reserved and can not be used.
+// DeclarationError 5017: (67-79='linkersymbol'): The identifier "linkersymbol" is reserved and can not be used.
+// DeclarationError 5017: (95-103='datacopy'): The identifier "datacopy" is reserved and can not be used.
+// DeclarationError 5017: (119-125='swap16'): The identifier "swap16" is reserved and can not be used.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers_constantinople.sol b/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers_constantinople.sol
index cea698fd1..0bf34807d 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers_constantinople.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/reserved_identifiers_constantinople.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // EVMVersion: >=constantinople
 // ----
-// ParserError 5568: (67-70): Cannot use builtin function name "shl" as identifier name.
+// ParserError 5568: (67-70='shl'): Cannot use builtin function name "shl" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
index 44a12aa06..80e64931a 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// ParserError 6272: (143-145): Cannot assign to builtin function "returndatasize".
+// ParserError 6272: (143-145=':='): Cannot assign to builtin function "returndatasize".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_read_post_byzantium.sol.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_read_post_byzantium.sol.sol
index bd5ad50c3..6cf254de8 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_read_post_byzantium.sol.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_read_post_byzantium.sol.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// ParserError 7104: (137-151): Builtin function "returndatasize" must be called.
+// ParserError 7104: (137-151='returndatasize'): Builtin function "returndatasize" must be called.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/argument.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/argument.sol
index ce2ad9d33..8e96f9301 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/argument.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/argument.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3859: (85-86): This declaration shadows a declaration outside the inline assembly block.
+// DeclarationError 3859: (85-86='a'): This declaration shadows a declaration outside the inline assembly block.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/constant.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/constant.sol
index 06a033727..48ec7d7a8 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/constant.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/constant.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3859: (100-101): This declaration shadows a declaration outside the inline assembly block.
+// DeclarationError 3859: (100-101='a'): This declaration shadows a declaration outside the inline assembly block.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/contract.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/contract.sol
index e32e9ea9d..a94a5ae41 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/contract.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/contract.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3859: (79-80): This declaration shadows a declaration outside the inline assembly block.
+// DeclarationError 3859: (79-80='C'): This declaration shadows a declaration outside the inline assembly block.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/function.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/function.sol
index cd93d9896..c4d83b328 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/function.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/function.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3859: (79-80): This declaration shadows a declaration outside the inline assembly block.
+// DeclarationError 3859: (79-80='f'): This declaration shadows a declaration outside the inline assembly block.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_variable.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_variable.sol
index 9f666add7..8cee10d0e 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_variable.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/local_variable.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3859: (95-96): This declaration shadows a declaration outside the inline assembly block.
+// DeclarationError 3859: (95-96='a'): This declaration shadows a declaration outside the inline assembly block.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/name_clash_in_import.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/name_clash_in_import.sol
index c5cc1a578..2642662b6 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/name_clash_in_import.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/name_clash_in_import.sol
@@ -14,5 +14,5 @@ contract B {
     }
 }
 // ----
-// DeclarationError 3859: (b:105-106): This declaration shadows a declaration outside the inline assembly block.
-// DeclarationError 3927: (b:128-131): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3859: (b:105-106='b'): This declaration shadows a declaration outside the inline assembly block.
+// DeclarationError 3927: (b:128-131='b.a'): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/qualified_names.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/qualified_names.sol
index ea410943e..4e5c8be2e 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/qualified_names.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/qualified_names.sol
@@ -10,5 +10,5 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3927: (115-118): User-defined identifiers in inline assembly cannot contain '.'.
-// DeclarationError 3927: (140-143): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (115-118='D.a'): User-defined identifiers in inline assembly cannot contain '.'.
+// DeclarationError 3927: (140-143='D.b'): User-defined identifiers in inline assembly cannot contain '.'.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol
index 6c27750c8..4e7aa5e57 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/shadowing/variable_by_opcode.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// Warning 2072: (52-62): Unused local variable.
-// Warning 2072: (109-119): Unused local variable.
+// Warning 2072: (52-62='uint mload'): Unused local variable.
+// Warning 2072: (109-119='uint mload'): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference.sol
index 47f898019..f884141aa 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9068: (118-119): You have to use the ".slot" or ".offset" suffix to access storage reference variables.
+// TypeError 9068: (118-119='y'): You have to use the ".slot" or ".offset" suffix to access storage reference variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment.sol
index 4f8e36068..77b9efbbc 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9739: (138-146): Only .slot can be assigned to.
+// TypeError 9739: (138-146='y.offset'): Only .slot can be assigned to.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol
index f4ed7c378..d26e470b9 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_assignment_statevar.sol
@@ -8,5 +8,5 @@ contract C {
     }
 }
 // ----
-// TypeError 4713: (84-90): State variables cannot be assigned to - you have to use "sstore()".
-// TypeError 4713: (108-116): State variables cannot be assigned to - you have to use "sstore()".
+// TypeError 4713: (84-90='x.slot'): State variables cannot be assigned to - you have to use "sstore()".
+// TypeError 4713: (108-116='x.offset'): State variables cannot be assigned to - you have to use "sstore()".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_offset.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_offset.sol
index ab13d1dd6..4d97b0022 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_offset.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_offset.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 1856: (84-85): Literal or identifier expected.
+// ParserError 1856: (84-85='.'): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_slot.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_slot.sol
index 43d5ab8e2..f5702333f 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_slot.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_slot.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 1856: (84-85): Literal or identifier expected.
+// ParserError 1856: (84-85='.'): Literal or identifier expected.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol
index d2ca4d7cb..096f4d7bb 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_old.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// DeclarationError 9467: (118-124): Identifier not found. Use ".slot" and ".offset" to access storage variables.
-// DeclarationError 9467: (142-150): Identifier not found. Use ".slot" and ".offset" to access storage variables.
+// DeclarationError 9467: (118-124='y_slot'): Identifier not found. Use ".slot" and ".offset" to access storage variables.
+// DeclarationError 9467: (142-150='y_offset'): Identifier not found. Use ".slot" and ".offset" to access storage variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_function.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_function.sol
index 66bf81e6f..198898baf 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_function.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_function.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7944: (84-90): The suffixes ".offset", ".slot" and ".length" can only be used with variables.
+// TypeError 7944: (84-90='f.slot'): The suffixes ".offset", ".slot" and ".length" can only be used with variables.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_memory.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_memory.sol
index a319c597c..77b5cc4a9 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_memory.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_reference_on_memory.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3622: (117-123): The suffix ".slot" is not supported by this variable or type.
-// TypeError 3622: (141-149): The suffix ".offset" is not supported by this variable or type.
+// TypeError 3622: (117-123='y.slot'): The suffix ".slot" is not supported by this variable or type.
+// TypeError 3622: (141-149='y.offset'): The suffix ".offset" is not supported by this variable or type.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/storage_slot_assign.sol b/test/libsolidity/syntaxTests/inlineAssembly/storage_slot_assign.sol
index 4f8e36068..77b9efbbc 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/storage_slot_assign.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/storage_slot_assign.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9739: (138-146): Only .slot can be assigned to.
+// TypeError 9739: (138-146='y.offset'): Only .slot can be assigned to.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slot_access.sol b/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slot_access.sol
index 5b71b61f9..14dc078f5 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slot_access.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slot_access.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9857: (132-147): Only types that use one stack slot are supported.
+// TypeError 9857: (132-147='two_stack_slots'): Only types that use one stack slot are supported.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slots.sol b/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slots.sol
index 5b71b61f9..14dc078f5 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slots.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/two_stack_slots.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9857: (132-147): Only types that use one stack slot are supported.
+// TypeError 9857: (132-147='two_stack_slots'): Only types that use one stack slot are supported.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/verbatim_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/verbatim_disallowed.sol
index bdafa407a..d6c5a84b4 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/verbatim_disallowed.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/verbatim_disallowed.sol
@@ -8,5 +8,5 @@ contract C {
 // ====
 // optimize-yul: true
 // ----
-// DeclarationError 4619: (84-95): Function "verbatim_1o" not found.
-// DeclarationError 3812: (75-106): Variable count mismatch for declaration of "x": 1 variables and 0 values.
+// DeclarationError 4619: (84-95='verbatim_1o'): Function "verbatim_1o" not found.
+// DeclarationError 3812: (75-106='let x := verbatim_1o(hex"6001")'): Variable count mismatch for declaration of "x": 1 variables and 0 values.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/dynamic_inline_array.sol b/test/libsolidity/syntaxTests/inline_arrays/dynamic_inline_array.sol
index 311f8430b..ea4639a9b 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/dynamic_inline_array.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/dynamic_inline_array.sol
@@ -4,5 +4,5 @@ contract C {
     }
 }
 // ----
-// Warning 2072: (47-69): Unused local variable.
+// Warning 2072: (47-69='uint8[4][4] memory dyn'): Unused local variable.
 // Warning 2018: (17-135): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol
index 56a4d0e20..e1d92c355 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/inline_array_fixed_types.sol
@@ -5,5 +5,5 @@ contract test {
 }
 // ----
 // UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2072: (50-67): Unused local variable.
+// Warning 2072: (50-67='fixed[3] memory a'): Unused local variable.
 // Warning 2018: (20-119): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_of_mapping_type.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_of_mapping_type.sol
index e0b1c6f6c..8112f01a5 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_of_mapping_type.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/inline_array_of_mapping_type.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError 1545: (66-69): Type mapping(int256 => int256) is only valid in storage.
+// TypeError 1545: (66-69='[a]'): Type mapping(int256 => int256) is only valid in storage.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol b/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol
index 78aa35de7..efb3493d8 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/inline_array_rationals.sol
@@ -5,5 +5,5 @@ contract test {
 }
 // ----
 // UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2072: (50-73): Unused local variable.
+// Warning 2072: (50-73='ufixed128x3[4] memory a'): Unused local variable.
 // Warning 2018: (20-118): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/inline_arrays/invalid_types_in_inline_array.sol b/test/libsolidity/syntaxTests/inline_arrays/invalid_types_in_inline_array.sol
index 1ba1fdb1d..b13f7af37 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/invalid_types_in_inline_array.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/invalid_types_in_inline_array.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6378: (66-83): Unable to deduce common type for array elements.
+// TypeError 6378: (66-83='[45, 'foo', true]'): Unable to deduce common type for array elements.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/lvalues_as_inline_array.sol b/test/libsolidity/syntaxTests/inline_arrays/lvalues_as_inline_array.sol
index 748134a9e..187258599 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/lvalues_as_inline_array.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/lvalues_as_inline_array.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3025: (47-56): Inline array type cannot be declared as LValue.
+// TypeError 3025: (47-56='[1, 2, 3]'): Inline array type cannot be declared as LValue.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol
index d00f818a7..07eb4a377 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9656: (47-52): Unable to deduce nameable type for array elements. Try adding explicit type conversion for the first element.
+// TypeError 9656: (47-52='[msg]'): Unable to deduce nameable type for array elements. Try adding explicit type conversion for the first element.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol
index 0abd5ca25..f4df5cc48 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9656: (47-56): Unable to deduce nameable type for array elements. Try adding explicit type conversion for the first element.
+// TypeError 9656: (47-56='[type(C)]'): Unable to deduce nameable type for array elements. Try adding explicit type conversion for the first element.
diff --git a/test/libsolidity/syntaxTests/largeTypes/large_storage_array_mapping.sol b/test/libsolidity/syntaxTests/largeTypes/large_storage_array_mapping.sol
index 08f8a46b3..11dc9e73f 100644
--- a/test/libsolidity/syntaxTests/largeTypes/large_storage_array_mapping.sol
+++ b/test/libsolidity/syntaxTests/largeTypes/large_storage_array_mapping.sol
@@ -2,4 +2,4 @@ contract C {
     mapping(uint => uint[2**100]) x;
 }
 // ----
-// Warning 7325: (17-46): Type uint256[1267650600228229401496703205376] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (17-46='mapping(uint => uint[2**100])'): Type uint256[1267650600228229401496703205376] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/largeTypes/large_storage_array_simple.sol b/test/libsolidity/syntaxTests/largeTypes/large_storage_array_simple.sol
index 3fc91da4d..e05d4cd79 100644
--- a/test/libsolidity/syntaxTests/largeTypes/large_storage_array_simple.sol
+++ b/test/libsolidity/syntaxTests/largeTypes/large_storage_array_simple.sol
@@ -2,4 +2,4 @@ contract C {
     uint[2**64] x;
 }
 // ----
-// Warning 7325: (17-28): Type uint256[18446744073709551616] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (17-28='uint[2**64]'): Type uint256[18446744073709551616] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/largeTypes/large_storage_arrays_struct.sol b/test/libsolidity/syntaxTests/largeTypes/large_storage_arrays_struct.sol
index e2488adc0..74bfb0dfb 100644
--- a/test/libsolidity/syntaxTests/largeTypes/large_storage_arrays_struct.sol
+++ b/test/libsolidity/syntaxTests/largeTypes/large_storage_arrays_struct.sol
@@ -3,4 +3,4 @@ contract C {
     S[2**20] x;
 }
 // ----
-// Warning 7325: (64-72): Type struct C.S[1048576] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (64-72='S[2**20]'): Type struct C.S[1048576] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/largeTypes/large_storage_structs.sol b/test/libsolidity/syntaxTests/largeTypes/large_storage_structs.sol
index cbc912a35..9ee30db87 100644
--- a/test/libsolidity/syntaxTests/largeTypes/large_storage_structs.sol
+++ b/test/libsolidity/syntaxTests/largeTypes/large_storage_structs.sol
@@ -55,20 +55,20 @@ contract C {
     Q4 q4;
 }
 // ----
-// Warning 7325: (106-108): Type struct C.S0 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (106-108): Type struct C.P[101] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (171-173): Type struct C.S1 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (171-173): Type struct C.P[102] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (341-343): Type struct C.P[103] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (341-343): Type struct C.P[104] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (505-507): Type struct C.Q0 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (505-507): Type uint256[1][][100000000000000000001] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (505-507): Type uint256[][100000000000000000003] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (505-507): Type uint256[100000000000000000004] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (505-507): Type uint256[100000000000000000002] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (576-578): Type struct C.Q1 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (576-578): Type uint256[1][][100000000000000000005] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (647-649): Type uint256[100000000000000000006] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (715-717): Type struct C.Q3 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (715-717): Type uint256[][100000000000000000007] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (783-785): Type uint256[100000000000000000008] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (106-108='S0'): Type struct C.S0 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (106-108='S0'): Type struct C.P[101] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (171-173='S1'): Type struct C.S1 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (171-173='S1'): Type struct C.P[102] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (341-343='S2'): Type struct C.P[103] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (341-343='S2'): Type struct C.P[104] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (505-507='Q0'): Type struct C.Q0 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (505-507='Q0'): Type uint256[1][][100000000000000000001] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (505-507='Q0'): Type uint256[][100000000000000000003] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (505-507='Q0'): Type uint256[100000000000000000004] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (505-507='Q0'): Type uint256[100000000000000000002] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (576-578='Q1'): Type struct C.Q1 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (576-578='Q1'): Type uint256[1][][100000000000000000005] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (647-649='Q2'): Type uint256[100000000000000000006] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (715-717='Q3'): Type struct C.Q3 covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (715-717='Q3'): Type uint256[][100000000000000000007] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (783-785='Q4'): Type uint256[100000000000000000008] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/largeTypes/oversized_array.sol b/test/libsolidity/syntaxTests/largeTypes/oversized_array.sol
index 4bf6c86be..473276905 100644
--- a/test/libsolidity/syntaxTests/largeTypes/oversized_array.sol
+++ b/test/libsolidity/syntaxTests/largeTypes/oversized_array.sol
@@ -5,4 +5,4 @@ contract C {
 }
 // ----
 // TypeError 7676: (60-97): Contract requires too much storage.
-// TypeError 1534: (77-94): Type too large for storage.
+// TypeError 1534: (77-94='uint[2**255][2] a'): Type too large for storage.
diff --git a/test/libsolidity/syntaxTests/largeTypes/oversized_struct.sol b/test/libsolidity/syntaxTests/largeTypes/oversized_struct.sol
index d1c818756..adf503e59 100644
--- a/test/libsolidity/syntaxTests/largeTypes/oversized_struct.sol
+++ b/test/libsolidity/syntaxTests/largeTypes/oversized_struct.sol
@@ -9,4 +9,4 @@ contract C {
 }
 // ----
 // TypeError 7676: (60-152): Contract requires too much storage.
-// TypeError 1534: (146-149): Type too large for storage.
+// TypeError 1534: (146-149='S s'): Type too large for storage.
diff --git a/test/libsolidity/syntaxTests/largeTypes/storage_parameter.sol b/test/libsolidity/syntaxTests/largeTypes/storage_parameter.sol
index 836a49b03..ca5360cf4 100644
--- a/test/libsolidity/syntaxTests/largeTypes/storage_parameter.sol
+++ b/test/libsolidity/syntaxTests/largeTypes/storage_parameter.sol
@@ -3,5 +3,5 @@ contract C {
     function f(S storage) internal {}
 }
 // ----
-// Warning 7325: (64-65): Type struct C.S covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
-// Warning 7325: (64-65): Type uint256[57896044618658097711785492504343953926634992332820282019728792003956564819968] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (64-65='S'): Type struct C.S covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (64-65='S'): Type uint256[57896044618658097711785492504343953926634992332820282019728792003956564819968] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
index 2b20cec4b..aea553976 100644
--- a/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant a = 1 / 0;
 }
 // ----
-// TypeError 2271: (35-40): Operator / not compatible with types int_const 1 and int_const 0
+// TypeError 2271: (35-40='1 / 0'): Operator / not compatible with types int_const 1 and int_const 0
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
index f6b494d3d..d123df075 100644
--- a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant a = 1 / ((1+3)-4);
 }
 // ----
-// TypeError 2271: (35-48): Operator / not compatible with types int_const 1 and int_const 0
+// TypeError 2271: (35-48='1 / ((1+3)-4)'): Operator / not compatible with types int_const 1 and int_const 0
diff --git a/test/libsolidity/syntaxTests/literalOperations/exponent.sol b/test/libsolidity/syntaxTests/literalOperations/exponent.sol
index c3469054c..8d159a2cc 100644
--- a/test/libsolidity/syntaxTests/literalOperations/exponent.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/exponent.sol
@@ -6,5 +6,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (67-78): Operator ** not compatible with types int256 and int_const 1000...(1226 digits omitted)...0000. Exponent too large.
-// TypeError 2271: (88-98): Operator ** not compatible with types int256 and rational_const 1 / 2. Exponent is fractional.
+// TypeError 2271: (67-78='a ** 1E1233'): Operator ** not compatible with types int256 and int_const 1000...(1226 digits omitted)...0000. Exponent too large.
+// TypeError 2271: (88-98='a ** (1/2)'): Operator ** not compatible with types int256 and rational_const 1 / 2. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
index a7d470b24..2671c769e 100644
--- a/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant b3 = 1 % 0;
 }
 // ----
-// TypeError 2271: (36-41): Operator % not compatible with types int_const 1 and int_const 0
+// TypeError 2271: (36-41='1 % 0'): Operator % not compatible with types int_const 1 and int_const 0
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
index 9aba4dd75..8a650af14 100644
--- a/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant b3 = 1 % (-4+((2)*2));
 }
 // ----
-// TypeError 2271: (36-52): Operator % not compatible with types int_const 1 and int_const 0
+// TypeError 2271: (36-52='1 % (-4+((2)*2))'): Operator % not compatible with types int_const 1 and int_const 0
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore.sol b/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore.sol
index 4dc19ae1b..97238c79f 100644
--- a/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore.sol
+++ b/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (52-60): Invalid use of number separator '_'.
+// ParserError 8936: (52-60='hex"12__'): Invalid use of number separator '_'.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore_yul.sol b/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore_yul.sol
index 0ed89d729..335660314 100644
--- a/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore_yul.sol
+++ b/test/libsolidity/syntaxTests/literals/hex_string_duplicate_underscore_yul.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 1465: (84-92): Illegal token: Invalid use of number separator '_'.
+// ParserError 1465: (84-92='hex"12__'): Illegal token: Invalid use of number separator '_'.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_invalid_characters_yul.sol b/test/libsolidity/syntaxTests/literals/hex_string_invalid_characters_yul.sol
index 9e623854b..912fede75 100644
--- a/test/libsolidity/syntaxTests/literals/hex_string_invalid_characters_yul.sol
+++ b/test/libsolidity/syntaxTests/literals/hex_string_invalid_characters_yul.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 1465: (84-90): Illegal token: Expected even number of hex-nibbles.
+// ParserError 1465: (84-90='hex"ab'): Illegal token: Expected even number of hex-nibbles.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_leading_underscore.sol b/test/libsolidity/syntaxTests/literals/hex_string_leading_underscore.sol
index d6d3d43ee..5bae3a4b1 100644
--- a/test/libsolidity/syntaxTests/literals/hex_string_leading_underscore.sol
+++ b/test/libsolidity/syntaxTests/literals/hex_string_leading_underscore.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (52-57): Invalid use of number separator '_'.
+// ParserError 8936: (52-57='hex"_'): Invalid use of number separator '_'.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_misaligned_underscore.sol b/test/libsolidity/syntaxTests/literals/hex_string_misaligned_underscore.sol
index 6e64ae2db..ed7f1b8d7 100644
--- a/test/libsolidity/syntaxTests/literals/hex_string_misaligned_underscore.sol
+++ b/test/libsolidity/syntaxTests/literals/hex_string_misaligned_underscore.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (52-56): Expected even number of hex-nibbles.
+// ParserError 8936: (52-56='hex"'): Expected even number of hex-nibbles.
diff --git a/test/libsolidity/syntaxTests/literals/hex_string_trailing_underscore.sol b/test/libsolidity/syntaxTests/literals/hex_string_trailing_underscore.sol
index a015846e2..8f9052d3c 100644
--- a/test/libsolidity/syntaxTests/literals/hex_string_trailing_underscore.sol
+++ b/test/libsolidity/syntaxTests/literals/hex_string_trailing_underscore.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (52-61): Invalid use of number separator '_'.
+// ParserError 8936: (52-61='hex"1234_'): Invalid use of number separator '_'.
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_1.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_1.sol
index 5feb89256..4a88df225 100644
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_1.sol
+++ b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_1.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (88-106): Unicode direction override underflow in comment or string literal.
+// ParserError 8936: (88-106='unicode"underflow'): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_2.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_2.sol
index 409bc4795..409c869bf 100644
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_2.sol
+++ b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_2.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (92-110): Unicode direction override underflow in comment or string literal.
+// ParserError 8936: (92-110='unicode"underflow'): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_3.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_3.sol
index 6641ca3fc..92980a45a 100644
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_3.sol
+++ b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_3.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (88-108): Mismatching directional override markers in comment or string literal.
+// ParserError 8936: (88-108='unicode"overflow ‮'): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_4.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_4.sol
index a6d6e664c..d0876989c 100644
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_4.sol
+++ b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_4.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (92-115): Mismatching directional override markers in comment or string literal.
+// ParserError 8936: (92-115='unicode"overflow ‮‮'): Mismatching directional override markers in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_6.sol b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_6.sol
index 70e7b8043..d0ec9bc4a 100644
--- a/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_6.sol
+++ b/test/libsolidity/syntaxTests/literals/unicode_string_direction_override_6.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 8936: (92-111): Unicode direction override underflow in comment or string literal.
+// ParserError 8936: (92-111='unicode" underflow'): Unicode direction override underflow in comment or string literal.
diff --git a/test/libsolidity/syntaxTests/lvalues/calldata_index_access.sol b/test/libsolidity/syntaxTests/lvalues/calldata_index_access.sol
index 480f94948..0b4dd8270 100644
--- a/test/libsolidity/syntaxTests/lvalues/calldata_index_access.sol
+++ b/test/libsolidity/syntaxTests/lvalues/calldata_index_access.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6182: (74-78): Calldata arrays are read-only.
+// TypeError 6182: (74-78='x[0]'): Calldata arrays are read-only.
diff --git a/test/libsolidity/syntaxTests/lvalues/calldata_member_access.sol b/test/libsolidity/syntaxTests/lvalues/calldata_member_access.sol
index dc6e9290a..71b859744 100644
--- a/test/libsolidity/syntaxTests/lvalues/calldata_member_access.sol
+++ b/test/libsolidity/syntaxTests/lvalues/calldata_member_access.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4156: (128-131): Calldata structs are read-only.
+// TypeError 4156: (128-131='s.x'): Calldata structs are read-only.
diff --git a/test/libsolidity/syntaxTests/lvalues/functions.sol b/test/libsolidity/syntaxTests/lvalues/functions.sol
index 4a7e919ac..f4ef31906 100644
--- a/test/libsolidity/syntaxTests/lvalues/functions.sol
+++ b/test/libsolidity/syntaxTests/lvalues/functions.sol
@@ -11,5 +11,5 @@ contract C {
     }
 }
 // ----
-// TypeError 4247: (83-84): Expression has to be an lvalue.
-// TypeError 4247: (166-172): Expression has to be an lvalue.
+// TypeError 4247: (83-84='g'): Expression has to be an lvalue.
+// TypeError 4247: (166-172='this.i'): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/lvalues/library_mapping.sol b/test/libsolidity/syntaxTests/lvalues/library_mapping.sol
index 2c774f55c..68aac5d7e 100644
--- a/test/libsolidity/syntaxTests/lvalues/library_mapping.sol
+++ b/test/libsolidity/syntaxTests/lvalues/library_mapping.sol
@@ -4,4 +4,4 @@ library L {
     }
 }
 // ----
-// TypeError 9214: (108-109): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (108-109='x'): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/lvalues/lvalue_not_set.sol b/test/libsolidity/syntaxTests/lvalues/lvalue_not_set.sol
index ab514ebc5..acf13bb9e 100644
--- a/test/libsolidity/syntaxTests/lvalues/lvalue_not_set.sol
+++ b/test/libsolidity/syntaxTests/lvalues/lvalue_not_set.sol
@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ----
-// TypeError 4247: (100-110): Expression has to be an lvalue.
-// TypeError 7407: (113-114): Type uint256 is not implicitly convertible to expected type function (uint256) pure returns (uint256[] memory).
-// TypeError 9574: (91-114): Type function (uint256) pure returns (uint256[] memory) is not implicitly convertible to expected type uint256.
+// TypeError 4247: (100-110='new uint[]'): Expression has to be an lvalue.
+// TypeError 7407: (113-114='x'): Type uint256 is not implicitly convertible to expected type function (uint256) pure returns (uint256[] memory).
+// TypeError 9574: (91-114='uint p = new uint[] = x'): Type function (uint256) pure returns (uint256[] memory) is not implicitly convertible to expected type uint256.
diff --git a/test/libsolidity/syntaxTests/memberLookup/constructor_as_potential_library_member.sol b/test/libsolidity/syntaxTests/memberLookup/constructor_as_potential_library_member.sol
index 71b63faa5..cd3c362cf 100644
--- a/test/libsolidity/syntaxTests/memberLookup/constructor_as_potential_library_member.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/constructor_as_potential_library_member.sol
@@ -1,4 +1,4 @@
 library L{ constructor() { L.x; } }
 // ----
-// TypeError 7634: (11-33): Constructor cannot be defined in libraries.
-// TypeError 9582: (27-30): Member "x" not found or not visible after argument-dependent lookup in type(library L).
+// TypeError 7634: (11-33='constructor() { L.x; }'): Constructor cannot be defined in libraries.
+// TypeError 9582: (27-30='L.x'): Member "x" not found or not visible after argument-dependent lookup in type(library L).
diff --git a/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_send.sol b/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_send.sol
index 809309d1d..5b6886060 100644
--- a/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_send.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_send.sol
@@ -5,4 +5,4 @@ contract C {
 }
 
 // ----
-// TypeError 9862: (47-65): "send" and "transfer" are only available for objects of type "address payable", not "address".
+// TypeError 9862: (47-65='address(this).send'): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_transfer.sol b/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_transfer.sol
index 54b7a12eb..b7fbc30fb 100644
--- a/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_transfer.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/contract_not_payable_transfer.sol
@@ -5,4 +5,4 @@ contract C {
 }
 
 // ----
-// TypeError 9862: (47-69): "send" and "transfer" are only available for objects of type "address payable", not "address".
+// TypeError 9862: (47-69='address(this).transfer'): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup.sol b/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup.sol
index 041c7878f..b5e7fb4d9 100644
--- a/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup.sol
@@ -4,4 +4,4 @@ contract C {
   function g() public { f(1, 2, 3); }
 }
 // ----
-// TypeError 9322: (101-102): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (101-102='f'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup_in_library.sol b/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup_in_library.sol
index 2feb329a2..8c52abddf 100644
--- a/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup_in_library.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/failed_function_lookup_in_library.sol
@@ -6,4 +6,4 @@ contract C {
   function g() public { L.f(1, 2, 3); }
 }
 // ----
-// TypeError 9582: (115-118): Member "f" not found or not visible after argument-dependent lookup in type(library L).
+// TypeError 9582: (115-118='L.f'): Member "f" not found or not visible after argument-dependent lookup in type(library L).
diff --git a/test/libsolidity/syntaxTests/memberLookup/member_not_unique.sol b/test/libsolidity/syntaxTests/memberLookup/member_not_unique.sol
index 1bffefb21..454f5ba69 100644
--- a/test/libsolidity/syntaxTests/memberLookup/member_not_unique.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/member_not_unique.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6675: (282-287): Member "a" not unique after argument-dependent lookup in contract C.
+// TypeError 6675: (282-287='f().a'): Member "a" not unique after argument-dependent lookup in contract C.
diff --git a/test/libsolidity/syntaxTests/memberLookup/member_value_not_unique.sol b/test/libsolidity/syntaxTests/memberLookup/member_value_not_unique.sol
index 0fe2e3281..82b9ca899 100644
--- a/test/libsolidity/syntaxTests/memberLookup/member_value_not_unique.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/member_value_not_unique.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6675: (290-299): Member "value" not unique after argument-dependent lookup in contract C - did you forget the "payable" modifier?
+// TypeError 6675: (290-299='f().value'): Member "value" not unique after argument-dependent lookup in contract C - did you forget the "payable" modifier?
diff --git a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol b/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol
index 164d32ff0..640bb4761 100644
--- a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol
@@ -9,4 +9,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 4061: (161-172): Type struct Test.S2 is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (161-172='S2 memory x'): Type struct Test.S2 is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol b/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol
index fd510ed17..14a9abd7e 100644
--- a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol
@@ -6,4 +6,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError 4061: (104-114): Type struct Test.S is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (104-114='S memory x'): Type struct Test.S is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_send.sol b/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_send.sol
index 661544ad7..156213e44 100644
--- a/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_send.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_send.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9862: (47-64): "send" and "transfer" are only available for objects of type "address payable", not "address".
+// TypeError 9862: (47-64='(msg.sender).send'): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_transfer.sol b/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_transfer.sol
index f44e0489f..bbc937dab 100644
--- a/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_transfer.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/msg_sender_non_payable_transfer.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9862: (47-68): "send" and "transfer" are only available for objects of type "address payable", not "address".
+// TypeError 9862: (47-68='(msg.sender).transfer'): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_pure.sol b/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_pure.sol
index bdd188981..d3693f67e 100644
--- a/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_pure.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_pure.sol
@@ -3,4 +3,4 @@ contract C {
     function f() costs(1 ether) public pure {}
 }
 // ----
-// TypeError 2527: (101-115): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (101-115='costs(1 ether)'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_view.sol b/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_view.sol
index 29e47138c..346964948 100644
--- a/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_view.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/msg_value_modifier_view.sol
@@ -3,4 +3,4 @@ contract C {
     function f() costs(1 ether) public view {}
 }
 // ----
-// TypeError 4006: (101-115): This modifier uses "msg.value" or "callvalue()" and thus the function has to be payable or internal.
+// TypeError 4006: (101-115='costs(1 ether)'): This modifier uses "msg.value" or "callvalue()" and thus the function has to be payable or internal.
diff --git a/test/libsolidity/syntaxTests/memberLookup/push_on_memory_types.sol b/test/libsolidity/syntaxTests/memberLookup/push_on_memory_types.sol
index f10fc44d0..66c5fe396 100644
--- a/test/libsolidity/syntaxTests/memberLookup/push_on_memory_types.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/push_on_memory_types.sol
@@ -5,4 +5,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError 4994: (77-83): Member "push" is not available in uint256[] memory outside of storage.
+// TypeError 4994: (77-83='x.push'): Member "push" is not available in uint256[] memory outside of storage.
diff --git a/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_send.sol b/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_send.sol
index b96568395..d7d983a37 100644
--- a/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_send.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_send.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9862: (47-63): "send" and "transfer" are only available for objects of type "address payable", not "address".
+// TypeError 9862: (47-63='(tx.origin).send'): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_transfer.sol b/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_transfer.sol
index 34f60ebae..7b2dc877f 100644
--- a/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_transfer.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/tx_origin_non_payable_transfer.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9862: (47-67): "send" and "transfer" are only available for objects of type "address payable", not "address".
+// TypeError 9862: (47-67='(tx.origin).transfer'): "send" and "transfer" are only available for objects of type "address payable", not "address".
diff --git a/test/libsolidity/syntaxTests/memberLookup/unused_module_member_reference.sol b/test/libsolidity/syntaxTests/memberLookup/unused_module_member_reference.sol
index 5fb2e5645..e6ba5b575 100644
--- a/test/libsolidity/syntaxTests/memberLookup/unused_module_member_reference.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/unused_module_member_reference.sol
@@ -12,4 +12,4 @@ contract C
     }
 }
 // ----
-// Warning 6133: (s1.sol:127-130): Statement has no effect.
+// Warning 6133: (s1.sol:127-130='A.L'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractCreation.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractCreation.sol
index 2f5c356c0..26d66af7c 100644
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractCreation.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractCreation.sol
@@ -7,4 +7,4 @@ abstract contract Other {
     function f(uint) public returns (uint);
 }
 // ----
-// TypeError 9582: (97-121): Member "creationCode" not found or not visible after argument-dependent lookup in type(contract Other).
+// TypeError 9582: (97-121='type(Other).creationCode'): Member "creationCode" not found or not visible after argument-dependent lookup in type(contract Other).
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractRuntime.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractRuntime.sol
index 538a26e78..bce4daafd 100644
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractRuntime.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/codeAccessAbstractRuntime.sol
@@ -7,4 +7,4 @@ abstract contract Other {
     function f(uint) public returns (uint);
 }
 // ----
-// TypeError 9582: (91-114): Member "runtimeCode" not found or not visible after argument-dependent lookup in type(contract Other).
+// TypeError 9582: (91-114='type(Other).runtimeCode'): Member "runtimeCode" not found or not visible after argument-dependent lookup in type(contract Other).
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccessBase.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccessBase.sol
index c202046cc..51530484b 100644
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccessBase.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/codeAccessBase.sol
@@ -22,5 +22,5 @@ contract Test4 is Base {
     }
 }
 // ----
-// TypeError 7813: (166-190): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (300-323): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (166-190='type(Test1).creationCode'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (300-323='type(Test2).runtimeCode'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccessCyclic.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccessCyclic.sol
index 57e3263e3..4b6182fa0 100644
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccessCyclic.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/codeAccessCyclic.sol
@@ -9,5 +9,5 @@ contract B {
     }
 }
 // ----
-// TypeError 7813: (52-71): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (133-152): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (52-71='type(B).runtimeCode'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (133-152='type(A).runtimeCode'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeAccess_super.sol b/test/libsolidity/syntaxTests/metaTypes/codeAccess_super.sol
index 7d057e132..b426fc1ae 100644
--- a/test/libsolidity/syntaxTests/metaTypes/codeAccess_super.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/codeAccess_super.sol
@@ -10,4 +10,4 @@ contract SuperTest is Other {
 	}
 }
 // ----
-// TypeError 4259: (177-182): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super SuperTest) provided.
+// TypeError 4259: (177-182='super'): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super SuperTest) provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/codeIsNoLValue.sol b/test/libsolidity/syntaxTests/metaTypes/codeIsNoLValue.sol
index c9cade179..e2fead2c0 100644
--- a/test/libsolidity/syntaxTests/metaTypes/codeIsNoLValue.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/codeIsNoLValue.sol
@@ -6,5 +6,5 @@ contract Test {
 }
 contract C {}
 // ----
-// TypeError 4247: (55-75): Expression has to be an lvalue.
-// TypeError 4247: (100-119): Expression has to be an lvalue.
+// TypeError 4247: (55-75='type(C).creationCode'): Expression has to be an lvalue.
+// TypeError 4247: (100-119='type(C).runtimeCode'): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/metaTypes/contract_min.sol b/test/libsolidity/syntaxTests/metaTypes/contract_min.sol
index d6c0789c1..5d9c4a7df 100644
--- a/test/libsolidity/syntaxTests/metaTypes/contract_min.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/contract_min.sol
@@ -4,4 +4,4 @@ contract Min {
 	}
 }
 // ----
-// TypeError 9582: (50-63): Member "min" not found or not visible after argument-dependent lookup in type(contract Min).
+// TypeError 9582: (50-63='type(Min).min'): Member "min" not found or not visible after argument-dependent lookup in type(contract Min).
diff --git a/test/libsolidity/syntaxTests/metaTypes/int_name.sol b/test/libsolidity/syntaxTests/metaTypes/int_name.sol
index d8f3acd03..6022b7cce 100644
--- a/test/libsolidity/syntaxTests/metaTypes/int_name.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/int_name.sol
@@ -4,4 +4,4 @@ contract test {
 	}
 }
 // ----
-// TypeError 9582: (47-61): Member "name" not found or not visible after argument-dependent lookup in type(int256).
+// TypeError 9582: (47-61='type(int).name'): Member "name" not found or not visible after argument-dependent lookup in type(int256).
diff --git a/test/libsolidity/syntaxTests/metaTypes/integer_err.sol b/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
index 0b1fab2e5..3f232958e 100644
--- a/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
@@ -10,6 +10,6 @@ contract Test {
     }
 }
 // ----
-// TypeError 9574: (59-89): Type int256 is not implicitly convertible to expected type uint8.
-// TypeError 9574: (99-127): Type int256 is not implicitly convertible to expected type uint256.
-// TypeError 2271: (142-169): Operator == not compatible with types int256 and int_const 1157...(70 digits omitted)...9935
+// TypeError 9574: (59-89='uint8 uint8Min = type(int).min'): Type int256 is not implicitly convertible to expected type uint8.
+// TypeError 9574: (99-127='uint uintMin = type(int).min'): Type int256 is not implicitly convertible to expected type uint256.
+// TypeError 2271: (142-169='type(int).min == 2**256 - 1'): Operator == not compatible with types int256 and int_const 1157...(70 digits omitted)...9935
diff --git a/test/libsolidity/syntaxTests/metaTypes/interfaceid_super.sol b/test/libsolidity/syntaxTests/metaTypes/interfaceid_super.sol
index 0740b31cf..7463ee81b 100644
--- a/test/libsolidity/syntaxTests/metaTypes/interfaceid_super.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/interfaceid_super.sol
@@ -14,4 +14,4 @@ abstract contract Test is ERC165 {
     }
 }
 // ----
-// TypeError 4259: (592-597): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super Test) provided.
+// TypeError 4259: (592-597='super'): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super Test) provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/noArgForType.sol b/test/libsolidity/syntaxTests/metaTypes/noArgForType.sol
index 3e2d577d5..0789bcd89 100644
--- a/test/libsolidity/syntaxTests/metaTypes/noArgForType.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/noArgForType.sol
@@ -4,4 +4,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 8885: (85-91): This function takes one argument, but 0 were provided.
+// TypeError 8885: (85-91='type()'): This function takes one argument, but 0 were provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/runtimeCodeWarningAssembly.sol b/test/libsolidity/syntaxTests/metaTypes/runtimeCodeWarningAssembly.sol
index 40eaee040..3f8187a1c 100644
--- a/test/libsolidity/syntaxTests/metaTypes/runtimeCodeWarningAssembly.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/runtimeCodeWarningAssembly.sol
@@ -13,5 +13,5 @@ contract D is C {
     constructor() {}
 }
 // ----
-// Warning 6417: (77-96): The constructor of the contract (or its base) uses inline assembly. Because of that, it might be that the deployed bytecode is different from type(...).runtimeCode.
-// Warning 6417: (118-137): The constructor of the contract (or its base) uses inline assembly. Because of that, it might be that the deployed bytecode is different from type(...).runtimeCode.
+// Warning 6417: (77-96='type(C).runtimeCode'): The constructor of the contract (or its base) uses inline assembly. Because of that, it might be that the deployed bytecode is different from type(...).runtimeCode.
+// Warning 6417: (118-137='type(D).runtimeCode'): The constructor of the contract (or its base) uses inline assembly. Because of that, it might be that the deployed bytecode is different from type(...).runtimeCode.
diff --git a/test/libsolidity/syntaxTests/metaTypes/super_name.sol b/test/libsolidity/syntaxTests/metaTypes/super_name.sol
index 5795b8190..cfb9778f9 100644
--- a/test/libsolidity/syntaxTests/metaTypes/super_name.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/super_name.sol
@@ -50,4 +50,4 @@ contract D is B, C {
     }
 }
 // ----
-// TypeError 4259: (426-431): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super B) provided.
+// TypeError 4259: (426-431='super'): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract super B) provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/tooManyArgsForType.sol b/test/libsolidity/syntaxTests/metaTypes/tooManyArgsForType.sol
index 38d4e9a58..0817c22de 100644
--- a/test/libsolidity/syntaxTests/metaTypes/tooManyArgsForType.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/tooManyArgsForType.sol
@@ -4,4 +4,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 8885: (85-95): This function takes one argument, but 2 were provided.
+// TypeError 8885: (85-95='type(1, 2)'): This function takes one argument, but 2 were provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierContractName.sol b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierContractName.sol
index b8f44134e..701f7e2ea 100644
--- a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierContractName.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierContractName.sol
@@ -1,3 +1,3 @@
 contract type { }
 // ----
-// ParserError 2314: (9-13): Expected identifier but got 'type'
+// ParserError 2314: (9-13='type'): Expected identifier but got 'type'
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierFunction.sol b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierFunction.sol
index a22b45efb..1a1a77347 100644
--- a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierFunction.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierFunction.sol
@@ -3,4 +3,4 @@ contract Test {
     }
 }
 // ----
-// ParserError 2314: (29-33): Expected identifier but got 'type'
+// ParserError 2314: (29-33='type'): Expected identifier but got 'type'
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierParameter.sol b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierParameter.sol
index b1ba7e542..7934771dc 100644
--- a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierParameter.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierParameter.sol
@@ -3,4 +3,4 @@ contract Test {
     }
 }
 // ----
-// ParserError 2314: (36-40): Expected ',' but got 'type'
+// ParserError 2314: (36-40='type'): Expected ',' but got 'type'
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierStateVariable.sol b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierStateVariable.sol
index 213eef18c..8ee9565f5 100644
--- a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierStateVariable.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierStateVariable.sol
@@ -2,4 +2,4 @@ contract Test {
     uint type;
 }
 // ----
-// ParserError 2314: (25-29): Expected identifier but got 'type'
+// ParserError 2314: (25-29='type'): Expected identifier but got 'type'
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierVariable.sol b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierVariable.sol
index 256b4b582..76b479c38 100644
--- a/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierVariable.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/typeNotRegularIdentifierVariable.sol
@@ -4,4 +4,4 @@ contract Test {
     }
 }
 // ----
-// ParserError 2314: (60-64): Expected ';' but got 'type'
+// ParserError 2314: (60-64='type'): Expected ';' but got 'type'
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeOfContract.sol b/test/libsolidity/syntaxTests/metaTypes/typeOfContract.sol
index 53b2d819e..ccac15521 100644
--- a/test/libsolidity/syntaxTests/metaTypes/typeOfContract.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/typeOfContract.sol
@@ -4,5 +4,5 @@ contract Test {
     }
 }
 // ----
-// Warning 6321: (54-66): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6133: (78-88): Statement has no effect.
+// Warning 6321: (54-66='bytes memory'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6133: (78-88='type(Test)'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/metaTypes/typeRecursive.sol b/test/libsolidity/syntaxTests/metaTypes/typeRecursive.sol
index 427caf4d0..cf4965b5c 100644
--- a/test/libsolidity/syntaxTests/metaTypes/typeRecursive.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/typeRecursive.sol
@@ -4,4 +4,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 4259: (65-75): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract Test) provided.
+// TypeError 4259: (65-75='type(Test)'): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(contract Test) provided.
diff --git a/test/libsolidity/syntaxTests/metaTypes/unsupportedArgForType.sol b/test/libsolidity/syntaxTests/metaTypes/unsupportedArgForType.sol
index 9ed26dc6f..53c273b51 100644
--- a/test/libsolidity/syntaxTests/metaTypes/unsupportedArgForType.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/unsupportedArgForType.sol
@@ -6,4 +6,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 4259: (154-155): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(struct Test.S) provided.
+// TypeError 4259: (154-155='S'): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(struct Test.S) provided.
diff --git a/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol b/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol
index 32ae4045b..6c0ad6773 100644
--- a/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol
+++ b/test/libsolidity/syntaxTests/missing_functions_duplicate_bug.sol
@@ -23,4 +23,4 @@ contract Voting is Ownable {
     }
 }
 // ----
-// Warning 5667: (299-315): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (299-315='uint phaseLength'): Unused function parameter. Remove or comment out the variable name to silence this warning.
diff --git a/test/libsolidity/syntaxTests/missing_state_variable.sol b/test/libsolidity/syntaxTests/missing_state_variable.sol
index 5ba3429f3..a775e42c0 100644
--- a/test/libsolidity/syntaxTests/missing_state_variable.sol
+++ b/test/libsolidity/syntaxTests/missing_state_variable.sol
@@ -4,4 +4,4 @@ contract Scope {
     }
 }
 // ----
-// TypeError 9582: (101-115): Member "stateVar" not found or not visible after argument-dependent lookup in type(contract Scope).
+// TypeError 9582: (101-115='Scope.stateVar'): Member "stateVar" not found or not visible after argument-dependent lookup in type(contract Scope).
diff --git a/test/libsolidity/syntaxTests/modifiers/access_in_library.sol b/test/libsolidity/syntaxTests/modifiers/access_in_library.sol
index 052c60bde..cb353dd0b 100644
--- a/test/libsolidity/syntaxTests/modifiers/access_in_library.sol
+++ b/test/libsolidity/syntaxTests/modifiers/access_in_library.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9428: (68-71): Can only use modifiers defined in the current contract or in base contracts.
+// TypeError 9428: (68-71='L.m'): Can only use modifiers defined in the current contract or in base contracts.
diff --git a/test/libsolidity/syntaxTests/modifiers/base_constructor_double_invocation.sol b/test/libsolidity/syntaxTests/modifiers/base_constructor_double_invocation.sol
index d0a376fa5..e81d95636 100644
--- a/test/libsolidity/syntaxTests/modifiers/base_constructor_double_invocation.sol
+++ b/test/libsolidity/syntaxTests/modifiers/base_constructor_double_invocation.sol
@@ -3,5 +3,5 @@ contract B is C {
     constructor() C(2) C(2) {}
 }
 // ----
-// DeclarationError 3364: (74-78): Base constructor arguments given twice.
-// DeclarationError 1697: (79-83): Base constructor already provided.
+// DeclarationError 3364: (74-78='C(2)'): Base constructor arguments given twice.
+// DeclarationError 1697: (79-83='C(2)'): Base constructor already provided.
diff --git a/test/libsolidity/syntaxTests/modifiers/constructor_as_modifier.sol b/test/libsolidity/syntaxTests/modifiers/constructor_as_modifier.sol
index 8a1071a6c..8fbcc7d4e 100644
--- a/test/libsolidity/syntaxTests/modifiers/constructor_as_modifier.sol
+++ b/test/libsolidity/syntaxTests/modifiers/constructor_as_modifier.sol
@@ -2,4 +2,4 @@ contract C {
     constructor() C() {}
 }
 // ----
-// TypeError 4659: (31-34): Referenced declaration is neither modifier nor base class.
+// TypeError 4659: (31-34='C()'): Referenced declaration is neither modifier nor base class.
diff --git a/test/libsolidity/syntaxTests/modifiers/constructor_call_invalid_arg_count.sol b/test/libsolidity/syntaxTests/modifiers/constructor_call_invalid_arg_count.sol
index 007a1bc13..582870159 100644
--- a/test/libsolidity/syntaxTests/modifiers/constructor_call_invalid_arg_count.sol
+++ b/test/libsolidity/syntaxTests/modifiers/constructor_call_invalid_arg_count.sol
@@ -6,4 +6,4 @@ contract D is C {
     constructor() C(5) {}
 }
 // ----
-// TypeError 2973: (120-124): Wrong argument count for modifier invocation: 1 arguments given but expected 0.
+// TypeError 2973: (120-124='C(5)'): Wrong argument count for modifier invocation: 1 arguments given but expected 0.
diff --git a/test/libsolidity/syntaxTests/modifiers/cross_contract_access.sol b/test/libsolidity/syntaxTests/modifiers/cross_contract_access.sol
index 430b8afe1..e7c7570bc 100644
--- a/test/libsolidity/syntaxTests/modifiers/cross_contract_access.sol
+++ b/test/libsolidity/syntaxTests/modifiers/cross_contract_access.sol
@@ -6,4 +6,4 @@ contract D {
     }
 }
 // ----
-// TypeError 9428: (69-72): Can only use modifiers defined in the current contract or in base contracts.
+// TypeError 9428: (69-72='C.m'): Can only use modifiers defined in the current contract or in base contracts.
diff --git a/test/libsolidity/syntaxTests/modifiers/cross_contract_super.sol b/test/libsolidity/syntaxTests/modifiers/cross_contract_super.sol
index b70ba3092..b665f095a 100644
--- a/test/libsolidity/syntaxTests/modifiers/cross_contract_super.sol
+++ b/test/libsolidity/syntaxTests/modifiers/cross_contract_super.sol
@@ -6,4 +6,4 @@ contract D is C {
     }
 }
 // ----
-// DeclarationError 7920: (74-81): Identifier not found or not unique.
+// DeclarationError 7920: (74-81='super.m'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/modifiers/cross_contract_unrelated.sol b/test/libsolidity/syntaxTests/modifiers/cross_contract_unrelated.sol
index 7ca8b9ca2..0f152c6df 100644
--- a/test/libsolidity/syntaxTests/modifiers/cross_contract_unrelated.sol
+++ b/test/libsolidity/syntaxTests/modifiers/cross_contract_unrelated.sol
@@ -8,4 +8,4 @@ contract D is A {
 }
 contract T is D, C {}
 // ----
-// TypeError 9428: (93-96): Can only use modifiers defined in the current contract or in base contracts.
+// TypeError 9428: (93-96='C.m'): Can only use modifiers defined in the current contract or in base contracts.
diff --git a/test/libsolidity/syntaxTests/modifiers/definition_in_contract_unimplemented.sol b/test/libsolidity/syntaxTests/modifiers/definition_in_contract_unimplemented.sol
index 2018ae4ea..bb25f37d9 100644
--- a/test/libsolidity/syntaxTests/modifiers/definition_in_contract_unimplemented.sol
+++ b/test/libsolidity/syntaxTests/modifiers/definition_in_contract_unimplemented.sol
@@ -4,4 +4,4 @@ contract C {
 }
 // ----
 // TypeError 3656: (0-57): Contract "C" should be marked as abstract.
-// TypeError 8063: (17-29): Modifiers without implementation must be marked virtual.
+// TypeError 8063: (17-29='modifier mu;'): Modifiers without implementation must be marked virtual.
diff --git a/test/libsolidity/syntaxTests/modifiers/definition_in_interface.sol b/test/libsolidity/syntaxTests/modifiers/definition_in_interface.sol
index 2f8281bde..c50aed2a8 100644
--- a/test/libsolidity/syntaxTests/modifiers/definition_in_interface.sol
+++ b/test/libsolidity/syntaxTests/modifiers/definition_in_interface.sol
@@ -5,8 +5,8 @@ interface I {
     modifier muv virtual;
 }
 // ----
-// TypeError 6408: (18-35): Modifiers cannot be defined or declared in interfaces.
-// TypeError 6408: (40-52): Modifiers cannot be defined or declared in interfaces.
-// TypeError 8063: (40-52): Modifiers without implementation must be marked virtual.
-// TypeError 6408: (57-83): Modifiers cannot be defined or declared in interfaces.
-// TypeError 6408: (88-109): Modifiers cannot be defined or declared in interfaces.
+// TypeError 6408: (18-35='modifier m { _; }'): Modifiers cannot be defined or declared in interfaces.
+// TypeError 6408: (40-52='modifier mu;'): Modifiers cannot be defined or declared in interfaces.
+// TypeError 8063: (40-52='modifier mu;'): Modifiers without implementation must be marked virtual.
+// TypeError 6408: (57-83='modifier mv virtual { _; }'): Modifiers cannot be defined or declared in interfaces.
+// TypeError 6408: (88-109='modifier muv virtual;'): Modifiers cannot be defined or declared in interfaces.
diff --git a/test/libsolidity/syntaxTests/modifiers/definition_in_library.sol b/test/libsolidity/syntaxTests/modifiers/definition_in_library.sol
index 6acbf3a0f..03bc55b86 100644
--- a/test/libsolidity/syntaxTests/modifiers/definition_in_library.sol
+++ b/test/libsolidity/syntaxTests/modifiers/definition_in_library.sol
@@ -2,4 +2,4 @@ library L {
     modifier mv virtual { _; }
 }
 // ----
-// TypeError 3275: (16-42): Modifiers in a library cannot be virtual.
+// TypeError 3275: (16-42='modifier mv virtual { _; }'): Modifiers in a library cannot be virtual.
diff --git a/test/libsolidity/syntaxTests/modifiers/definition_in_library_unimplemented.sol b/test/libsolidity/syntaxTests/modifiers/definition_in_library_unimplemented.sol
index 5fbc35682..9e56355a7 100644
--- a/test/libsolidity/syntaxTests/modifiers/definition_in_library_unimplemented.sol
+++ b/test/libsolidity/syntaxTests/modifiers/definition_in_library_unimplemented.sol
@@ -3,5 +3,5 @@ library L {
     modifier muv virtual;
 }
 // ----
-// TypeError 8063: (16-28): Modifiers without implementation must be marked virtual.
-// TypeError 3275: (33-54): Modifiers in a library cannot be virtual.
+// TypeError 8063: (16-28='modifier mu;'): Modifiers without implementation must be marked virtual.
+// TypeError 3275: (33-54='modifier muv virtual;'): Modifiers in a library cannot be virtual.
diff --git a/test/libsolidity/syntaxTests/modifiers/empty_modifier_err.sol b/test/libsolidity/syntaxTests/modifiers/empty_modifier_err.sol
index e9e03f304..3d07458ad 100644
--- a/test/libsolidity/syntaxTests/modifiers/empty_modifier_err.sol
+++ b/test/libsolidity/syntaxTests/modifiers/empty_modifier_err.sol
@@ -5,6 +5,6 @@ contract C is B { }
 
 abstract contract D {modifier m;}
 // ----
-// TypeError 3656: (0-32): Contract "A" should be marked as abstract.
-// TypeError 3656: (76-95): Contract "C" should be marked as abstract.
-// TypeError 8063: (118-129): Modifiers without implementation must be marked virtual.
+// TypeError 3656: (0-32='contract A {modifier m virtual;}'): Contract "A" should be marked as abstract.
+// TypeError 3656: (76-95='contract C is B { }'): Contract "C" should be marked as abstract.
+// TypeError 8063: (118-129='modifier m;'): Modifiers without implementation must be marked virtual.
diff --git a/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation_local_variables.sol b/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation_local_variables.sol
index 2616ab9f8..d0f448a41 100644
--- a/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation_local_variables.sol
+++ b/test/libsolidity/syntaxTests/modifiers/function_modifier_invocation_local_variables.sol
@@ -3,4 +3,4 @@ contract B {
     modifier mod(uint a) { if (a > 0) _; }
 }
 // ----
-// DeclarationError 7576: (34-35): Undeclared identifier.
+// DeclarationError 7576: (34-35='x'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/modifiers/function_overrides_modifier.sol b/test/libsolidity/syntaxTests/modifiers/function_overrides_modifier.sol
index 4be6bc898..22725eded 100644
--- a/test/libsolidity/syntaxTests/modifiers/function_overrides_modifier.sol
+++ b/test/libsolidity/syntaxTests/modifiers/function_overrides_modifier.sol
@@ -1,5 +1,5 @@
 contract A { function mod(uint a) public { } }
 contract B is A { modifier mod(uint a) { _; } }
 // ----
-// DeclarationError 9097: (65-92): Identifier already declared.
-// TypeError 5631: (65-92): Override changes function or public state variable to modifier.
+// DeclarationError 9097: (65-92='modifier mod(uint a) { _; }'): Identifier already declared.
+// TypeError 5631: (65-92='modifier mod(uint a) { _; }'): Override changes function or public state variable to modifier.
diff --git a/test/libsolidity/syntaxTests/modifiers/illegal_modifier_override.sol b/test/libsolidity/syntaxTests/modifiers/illegal_modifier_override.sol
index 81a2fe29b..da7faf442 100644
--- a/test/libsolidity/syntaxTests/modifiers/illegal_modifier_override.sol
+++ b/test/libsolidity/syntaxTests/modifiers/illegal_modifier_override.sol
@@ -1,6 +1,6 @@
 contract A { modifier mod(uint a) { _; } }
 contract B is A { modifier mod(uint8 a) { _; } }
 // ----
-// TypeError 1078: (61-89): Override changes modifier signature.
-// TypeError 9456: (61-89): Overriding modifier is missing "override" specifier.
-// TypeError 4334: (13-40): Trying to override non-virtual modifier. Did you forget to add "virtual"?
+// TypeError 1078: (61-89='modifier mod(uint8 a) { _; }'): Override changes modifier signature.
+// TypeError 9456: (61-89='modifier mod(uint8 a) { _; }'): Overriding modifier is missing "override" specifier.
+// TypeError 4334: (13-40='modifier mod(uint a) { _; }'): Trying to override non-virtual modifier. Did you forget to add "virtual"?
diff --git a/test/libsolidity/syntaxTests/modifiers/illegal_name.sol b/test/libsolidity/syntaxTests/modifiers/illegal_name.sol
index e29122b74..062ee7b9f 100644
--- a/test/libsolidity/syntaxTests/modifiers/illegal_name.sol
+++ b/test/libsolidity/syntaxTests/modifiers/illegal_name.sol
@@ -4,8 +4,8 @@ contract C {
 	modifier _ { _; }
 }
 // ----
-// DeclarationError 3726: (14-34): The name "this" is reserved.
-// DeclarationError 3726: (36-57): The name "super" is reserved.
-// DeclarationError 3726: (59-76): The name "_" is reserved.
-// Warning 2319: (14-34): This declaration shadows a builtin symbol.
-// Warning 2319: (36-57): This declaration shadows a builtin symbol.
+// DeclarationError 3726: (14-34='modifier this { _; }'): The name "this" is reserved.
+// DeclarationError 3726: (36-57='modifier super { _; }'): The name "super" is reserved.
+// DeclarationError 3726: (59-76='modifier _ { _; }'): The name "_" is reserved.
+// Warning 2319: (14-34='modifier this { _; }'): This declaration shadows a builtin symbol.
+// Warning 2319: (36-57='modifier super { _; }'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/modifiers/invalid_function_modifier_type.sol b/test/libsolidity/syntaxTests/modifiers/invalid_function_modifier_type.sol
index 37cc50beb..e868e58ce 100644
--- a/test/libsolidity/syntaxTests/modifiers/invalid_function_modifier_type.sol
+++ b/test/libsolidity/syntaxTests/modifiers/invalid_function_modifier_type.sol
@@ -3,4 +3,4 @@ contract B {
     modifier mod1(uint a) { if (a > 0) _; }
 }
 // ----
-// TypeError 4649: (35-39): Invalid type for argument in modifier invocation. Invalid implicit conversion from bool to uint256 requested.
+// TypeError 4649: (35-39='true'): Invalid type for argument in modifier invocation. Invalid implicit conversion from bool to uint256 requested.
diff --git a/test/libsolidity/syntaxTests/modifiers/library_via_using.sol b/test/libsolidity/syntaxTests/modifiers/library_via_using.sol
index bac0b33da..79664683c 100644
--- a/test/libsolidity/syntaxTests/modifiers/library_via_using.sol
+++ b/test/libsolidity/syntaxTests/modifiers/library_via_using.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9428: (87-90): Can only use modifiers defined in the current contract or in base contracts.
+// TypeError 9428: (87-90='L.m'): Can only use modifiers defined in the current contract or in base contracts.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifier_abstract_override.sol b/test/libsolidity/syntaxTests/modifiers/modifier_abstract_override.sol
index dd3ef4499..dab9738a0 100644
--- a/test/libsolidity/syntaxTests/modifiers/modifier_abstract_override.sol
+++ b/test/libsolidity/syntaxTests/modifiers/modifier_abstract_override.sol
@@ -8,4 +8,4 @@ contract C is B {
     function f() m public {}
 }
 // ----
-// TypeError 4593: (78-108): Overriding an implemented modifier with an unimplemented modifier is not allowed.
+// TypeError 4593: (78-108='modifier m() virtual override;'): Overriding an implemented modifier with an unimplemented modifier is not allowed.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifier_overrides_function.sol b/test/libsolidity/syntaxTests/modifiers/modifier_overrides_function.sol
index a22344cab..7d4f71a85 100644
--- a/test/libsolidity/syntaxTests/modifiers/modifier_overrides_function.sol
+++ b/test/libsolidity/syntaxTests/modifiers/modifier_overrides_function.sol
@@ -1,5 +1,5 @@
 contract A { modifier mod(uint a) { _; } }
 contract B is A { function mod(uint a) public { } }
 // ----
-// DeclarationError 9097: (61-92): Identifier already declared.
-// TypeError 1469: (61-92): Override changes modifier to function.
+// DeclarationError 9097: (61-92='function mod(uint a) public { }'): Identifier already declared.
+// TypeError 1469: (61-92='function mod(uint a) public { }'): Override changes modifier to function.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifier_overrides_variable.sol b/test/libsolidity/syntaxTests/modifiers/modifier_overrides_variable.sol
index 1f170601f..2763da0e1 100644
--- a/test/libsolidity/syntaxTests/modifiers/modifier_overrides_variable.sol
+++ b/test/libsolidity/syntaxTests/modifiers/modifier_overrides_variable.sol
@@ -1,5 +1,5 @@
 contract A { modifier mod(uint a) { _; } }
 contract B is A { uint public mod; }
 // ----
-// DeclarationError 9097: (61-76): Identifier already declared.
-// TypeError 1456: (61-76): Override changes modifier to public state variable.
+// DeclarationError 9097: (61-76='uint public mod'): Identifier already declared.
+// TypeError 1456: (61-76='uint public mod'): Override changes modifier to public state variable.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifier_returns_value.sol b/test/libsolidity/syntaxTests/modifiers/modifier_returns_value.sol
index fc658e625..6ae8ae502 100644
--- a/test/libsolidity/syntaxTests/modifiers/modifier_returns_value.sol
+++ b/test/libsolidity/syntaxTests/modifiers/modifier_returns_value.sol
@@ -3,4 +3,4 @@ contract A {
     modifier mod(uint a) { _; return 7; }
 }
 // ----
-// TypeError 7552: (101-109): Return arguments not allowed.
+// TypeError 7552: (101-109='return 7'): Return arguments not allowed.
diff --git a/test/libsolidity/syntaxTests/modifiers/modifier_without_underscore.sol b/test/libsolidity/syntaxTests/modifiers/modifier_without_underscore.sol
index c1689c44d..68bb34692 100644
--- a/test/libsolidity/syntaxTests/modifiers/modifier_without_underscore.sol
+++ b/test/libsolidity/syntaxTests/modifiers/modifier_without_underscore.sol
@@ -2,4 +2,4 @@ contract test {
     modifier m() {}
 }
 // ----
-// SyntaxError 2883: (33-35): Modifier body does not contain '_'.
+// SyntaxError 2883: (33-35='{}'): Modifier body does not contain '_'.
diff --git a/test/libsolidity/syntaxTests/modifiers/non-virtual_modifier_override.sol b/test/libsolidity/syntaxTests/modifiers/non-virtual_modifier_override.sol
index 1dcd26ad7..cc1fef024 100644
--- a/test/libsolidity/syntaxTests/modifiers/non-virtual_modifier_override.sol
+++ b/test/libsolidity/syntaxTests/modifiers/non-virtual_modifier_override.sol
@@ -1,4 +1,4 @@
 contract A { modifier mod(uint a) { _; } }
 contract B is A { modifier mod(uint a) override { _; } }
 // ----
-// TypeError 4334: (13-40): Trying to override non-virtual modifier. Did you forget to add "virtual"?
+// TypeError 4334: (13-40='modifier mod(uint a) { _; }'): Trying to override non-virtual modifier. Did you forget to add "virtual"?
diff --git a/test/libsolidity/syntaxTests/modifiers/use_in_invalid_context.sol b/test/libsolidity/syntaxTests/modifiers/use_in_invalid_context.sol
index 897a23874..631cea87f 100644
--- a/test/libsolidity/syntaxTests/modifiers/use_in_invalid_context.sol
+++ b/test/libsolidity/syntaxTests/modifiers/use_in_invalid_context.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// TypeError 3112: (77-80): Modifier can only be referenced in function headers.
+// TypeError 3112: (77-80='mod'): Modifier can only be referenced in function headers.
diff --git a/test/libsolidity/syntaxTests/modifiers/use_on_interface_function.sol b/test/libsolidity/syntaxTests/modifiers/use_on_interface_function.sol
index febdd9615..6b2b23682 100644
--- a/test/libsolidity/syntaxTests/modifiers/use_on_interface_function.sol
+++ b/test/libsolidity/syntaxTests/modifiers/use_on_interface_function.sol
@@ -4,4 +4,4 @@ interface I {
 }
 // ----
 // SyntaxError 5842: (16-60): Functions in interfaces cannot have modifiers.
-// TypeError 6408: (63-82): Modifiers cannot be defined or declared in interfaces.
+// TypeError 6408: (63-82='modifier m() { _; }'): Modifiers cannot be defined or declared in interfaces.
diff --git a/test/libsolidity/syntaxTests/modifiers/use_unimplemented_static.sol b/test/libsolidity/syntaxTests/modifiers/use_unimplemented_static.sol
index a6fcd7eaf..153ffa2ce 100644
--- a/test/libsolidity/syntaxTests/modifiers/use_unimplemented_static.sol
+++ b/test/libsolidity/syntaxTests/modifiers/use_unimplemented_static.sol
@@ -9,4 +9,4 @@ contract C is A, B {
     function f() B.m public {}
 }
 // ----
-// TypeError 1835: (174-177): Cannot call unimplemented modifier. The modifier has no implementation in the referenced contract. Refer to it by its unqualified name if you want to call the implementation from the most derived contract.
+// TypeError 1835: (174-177='B.m'): Cannot call unimplemented modifier. The modifier has no implementation in the referenced contract. Refer to it by its unqualified name if you want to call the implementation from the most derived contract.
diff --git a/test/libsolidity/syntaxTests/more_than_256_declarationerrors.sol b/test/libsolidity/syntaxTests/more_than_256_declarationerrors.sol
index ff1697e1e..6468530a7 100644
--- a/test/libsolidity/syntaxTests/more_than_256_declarationerrors.sol
+++ b/test/libsolidity/syntaxTests/more_than_256_declarationerrors.sol
@@ -265,260 +265,260 @@ contract C {
   }
 }
 // ----
-// DeclarationError 7576: (41-42): Undeclared identifier.
-// DeclarationError 7576: (52-53): Undeclared identifier.
-// DeclarationError 7576: (63-64): Undeclared identifier.
-// DeclarationError 7576: (74-75): Undeclared identifier.
-// DeclarationError 7576: (85-86): Undeclared identifier.
-// DeclarationError 7576: (96-97): Undeclared identifier.
-// DeclarationError 7576: (107-108): Undeclared identifier.
-// DeclarationError 7576: (118-119): Undeclared identifier.
-// DeclarationError 7576: (129-130): Undeclared identifier.
-// DeclarationError 7576: (140-141): Undeclared identifier.
-// DeclarationError 7576: (151-152): Undeclared identifier.
-// DeclarationError 7576: (162-163): Undeclared identifier.
-// DeclarationError 7576: (173-174): Undeclared identifier.
-// DeclarationError 7576: (184-185): Undeclared identifier.
-// DeclarationError 7576: (195-196): Undeclared identifier.
-// DeclarationError 7576: (206-207): Undeclared identifier.
-// DeclarationError 7576: (217-218): Undeclared identifier.
-// DeclarationError 7576: (228-229): Undeclared identifier.
-// DeclarationError 7576: (239-240): Undeclared identifier.
-// DeclarationError 7576: (250-251): Undeclared identifier.
-// DeclarationError 7576: (261-262): Undeclared identifier.
-// DeclarationError 7576: (272-273): Undeclared identifier.
-// DeclarationError 7576: (283-284): Undeclared identifier.
-// DeclarationError 7576: (294-295): Undeclared identifier.
-// DeclarationError 7576: (305-306): Undeclared identifier.
-// DeclarationError 7576: (316-317): Undeclared identifier.
-// DeclarationError 7576: (327-328): Undeclared identifier.
-// DeclarationError 7576: (338-339): Undeclared identifier.
-// DeclarationError 7576: (349-350): Undeclared identifier.
-// DeclarationError 7576: (360-361): Undeclared identifier.
-// DeclarationError 7576: (371-372): Undeclared identifier.
-// DeclarationError 7576: (382-383): Undeclared identifier.
-// DeclarationError 7576: (393-394): Undeclared identifier.
-// DeclarationError 7576: (404-405): Undeclared identifier.
-// DeclarationError 7576: (415-416): Undeclared identifier.
-// DeclarationError 7576: (426-427): Undeclared identifier.
-// DeclarationError 7576: (437-438): Undeclared identifier.
-// DeclarationError 7576: (448-449): Undeclared identifier.
-// DeclarationError 7576: (459-460): Undeclared identifier.
-// DeclarationError 7576: (470-471): Undeclared identifier.
-// DeclarationError 7576: (481-482): Undeclared identifier.
-// DeclarationError 7576: (492-493): Undeclared identifier.
-// DeclarationError 7576: (503-504): Undeclared identifier.
-// DeclarationError 7576: (514-515): Undeclared identifier.
-// DeclarationError 7576: (525-526): Undeclared identifier.
-// DeclarationError 7576: (536-537): Undeclared identifier.
-// DeclarationError 7576: (547-548): Undeclared identifier.
-// DeclarationError 7576: (558-559): Undeclared identifier.
-// DeclarationError 7576: (569-570): Undeclared identifier.
-// DeclarationError 7576: (580-581): Undeclared identifier.
-// DeclarationError 7576: (591-592): Undeclared identifier.
-// DeclarationError 7576: (602-603): Undeclared identifier.
-// DeclarationError 7576: (613-614): Undeclared identifier.
-// DeclarationError 7576: (624-625): Undeclared identifier.
-// DeclarationError 7576: (635-636): Undeclared identifier.
-// DeclarationError 7576: (646-647): Undeclared identifier.
-// DeclarationError 7576: (657-658): Undeclared identifier.
-// DeclarationError 7576: (668-669): Undeclared identifier.
-// DeclarationError 7576: (679-680): Undeclared identifier.
-// DeclarationError 7576: (690-691): Undeclared identifier.
-// DeclarationError 7576: (701-702): Undeclared identifier.
-// DeclarationError 7576: (712-713): Undeclared identifier.
-// DeclarationError 7576: (723-724): Undeclared identifier.
-// DeclarationError 7576: (734-735): Undeclared identifier.
-// DeclarationError 7576: (745-746): Undeclared identifier.
-// DeclarationError 7576: (756-757): Undeclared identifier.
-// DeclarationError 7576: (767-768): Undeclared identifier.
-// DeclarationError 7576: (778-779): Undeclared identifier.
-// DeclarationError 7576: (789-790): Undeclared identifier.
-// DeclarationError 7576: (800-801): Undeclared identifier.
-// DeclarationError 7576: (811-812): Undeclared identifier.
-// DeclarationError 7576: (822-823): Undeclared identifier.
-// DeclarationError 7576: (833-834): Undeclared identifier.
-// DeclarationError 7576: (844-845): Undeclared identifier.
-// DeclarationError 7576: (855-856): Undeclared identifier.
-// DeclarationError 7576: (866-867): Undeclared identifier.
-// DeclarationError 7576: (877-878): Undeclared identifier.
-// DeclarationError 7576: (888-889): Undeclared identifier.
-// DeclarationError 7576: (899-900): Undeclared identifier.
-// DeclarationError 7576: (910-911): Undeclared identifier.
-// DeclarationError 7576: (921-922): Undeclared identifier.
-// DeclarationError 7576: (932-933): Undeclared identifier.
-// DeclarationError 7576: (943-944): Undeclared identifier.
-// DeclarationError 7576: (954-955): Undeclared identifier.
-// DeclarationError 7576: (965-966): Undeclared identifier.
-// DeclarationError 7576: (976-977): Undeclared identifier.
-// DeclarationError 7576: (987-988): Undeclared identifier.
-// DeclarationError 7576: (998-999): Undeclared identifier.
-// DeclarationError 7576: (1009-1010): Undeclared identifier.
-// DeclarationError 7576: (1020-1021): Undeclared identifier.
-// DeclarationError 7576: (1031-1032): Undeclared identifier.
-// DeclarationError 7576: (1042-1043): Undeclared identifier.
-// DeclarationError 7576: (1053-1054): Undeclared identifier.
-// DeclarationError 7576: (1064-1065): Undeclared identifier.
-// DeclarationError 7576: (1075-1076): Undeclared identifier.
-// DeclarationError 7576: (1086-1087): Undeclared identifier.
-// DeclarationError 7576: (1097-1098): Undeclared identifier.
-// DeclarationError 7576: (1108-1109): Undeclared identifier.
-// DeclarationError 7576: (1119-1120): Undeclared identifier.
-// DeclarationError 7576: (1130-1131): Undeclared identifier.
-// DeclarationError 7576: (1141-1142): Undeclared identifier.
-// DeclarationError 7576: (1152-1153): Undeclared identifier.
-// DeclarationError 7576: (1163-1164): Undeclared identifier.
-// DeclarationError 7576: (1174-1175): Undeclared identifier.
-// DeclarationError 7576: (1185-1186): Undeclared identifier.
-// DeclarationError 7576: (1196-1197): Undeclared identifier.
-// DeclarationError 7576: (1207-1208): Undeclared identifier.
-// DeclarationError 7576: (1218-1219): Undeclared identifier.
-// DeclarationError 7576: (1229-1230): Undeclared identifier.
-// DeclarationError 7576: (1240-1241): Undeclared identifier.
-// DeclarationError 7576: (1251-1252): Undeclared identifier.
-// DeclarationError 7576: (1262-1263): Undeclared identifier.
-// DeclarationError 7576: (1273-1274): Undeclared identifier.
-// DeclarationError 7576: (1284-1285): Undeclared identifier.
-// DeclarationError 7576: (1295-1296): Undeclared identifier.
-// DeclarationError 7576: (1306-1307): Undeclared identifier.
-// DeclarationError 7576: (1317-1318): Undeclared identifier.
-// DeclarationError 7576: (1328-1329): Undeclared identifier.
-// DeclarationError 7576: (1339-1340): Undeclared identifier.
-// DeclarationError 7576: (1350-1351): Undeclared identifier.
-// DeclarationError 7576: (1361-1362): Undeclared identifier.
-// DeclarationError 7576: (1372-1373): Undeclared identifier.
-// DeclarationError 7576: (1383-1384): Undeclared identifier.
-// DeclarationError 7576: (1394-1395): Undeclared identifier.
-// DeclarationError 7576: (1405-1406): Undeclared identifier.
-// DeclarationError 7576: (1416-1417): Undeclared identifier.
-// DeclarationError 7576: (1427-1428): Undeclared identifier.
-// DeclarationError 7576: (1438-1439): Undeclared identifier.
-// DeclarationError 7576: (1449-1450): Undeclared identifier.
-// DeclarationError 7576: (1460-1461): Undeclared identifier.
-// DeclarationError 7576: (1471-1472): Undeclared identifier.
-// DeclarationError 7576: (1482-1483): Undeclared identifier.
-// DeclarationError 7576: (1493-1494): Undeclared identifier.
-// DeclarationError 7576: (1504-1505): Undeclared identifier.
-// DeclarationError 7576: (1515-1516): Undeclared identifier.
-// DeclarationError 7576: (1526-1527): Undeclared identifier.
-// DeclarationError 7576: (1537-1538): Undeclared identifier.
-// DeclarationError 7576: (1548-1549): Undeclared identifier.
-// DeclarationError 7576: (1559-1560): Undeclared identifier.
-// DeclarationError 7576: (1570-1571): Undeclared identifier.
-// DeclarationError 7576: (1581-1582): Undeclared identifier.
-// DeclarationError 7576: (1592-1593): Undeclared identifier.
-// DeclarationError 7576: (1603-1604): Undeclared identifier.
-// DeclarationError 7576: (1614-1615): Undeclared identifier.
-// DeclarationError 7576: (1625-1626): Undeclared identifier.
-// DeclarationError 7576: (1636-1637): Undeclared identifier.
-// DeclarationError 7576: (1647-1648): Undeclared identifier.
-// DeclarationError 7576: (1658-1659): Undeclared identifier.
-// DeclarationError 7576: (1669-1670): Undeclared identifier.
-// DeclarationError 7576: (1680-1681): Undeclared identifier.
-// DeclarationError 7576: (1691-1692): Undeclared identifier.
-// DeclarationError 7576: (1702-1703): Undeclared identifier.
-// DeclarationError 7576: (1713-1714): Undeclared identifier.
-// DeclarationError 7576: (1724-1725): Undeclared identifier.
-// DeclarationError 7576: (1735-1736): Undeclared identifier.
-// DeclarationError 7576: (1746-1747): Undeclared identifier.
-// DeclarationError 7576: (1757-1758): Undeclared identifier.
-// DeclarationError 7576: (1768-1769): Undeclared identifier.
-// DeclarationError 7576: (1779-1780): Undeclared identifier.
-// DeclarationError 7576: (1790-1791): Undeclared identifier.
-// DeclarationError 7576: (1801-1802): Undeclared identifier.
-// DeclarationError 7576: (1812-1813): Undeclared identifier.
-// DeclarationError 7576: (1823-1824): Undeclared identifier.
-// DeclarationError 7576: (1834-1835): Undeclared identifier.
-// DeclarationError 7576: (1845-1846): Undeclared identifier.
-// DeclarationError 7576: (1856-1857): Undeclared identifier.
-// DeclarationError 7576: (1867-1868): Undeclared identifier.
-// DeclarationError 7576: (1878-1879): Undeclared identifier.
-// DeclarationError 7576: (1889-1890): Undeclared identifier.
-// DeclarationError 7576: (1900-1901): Undeclared identifier.
-// DeclarationError 7576: (1911-1912): Undeclared identifier.
-// DeclarationError 7576: (1922-1923): Undeclared identifier.
-// DeclarationError 7576: (1933-1934): Undeclared identifier.
-// DeclarationError 7576: (1944-1945): Undeclared identifier.
-// DeclarationError 7576: (1955-1956): Undeclared identifier.
-// DeclarationError 7576: (1966-1967): Undeclared identifier.
-// DeclarationError 7576: (1977-1978): Undeclared identifier.
-// DeclarationError 7576: (1988-1989): Undeclared identifier.
-// DeclarationError 7576: (1999-2000): Undeclared identifier.
-// DeclarationError 7576: (2010-2011): Undeclared identifier.
-// DeclarationError 7576: (2021-2022): Undeclared identifier.
-// DeclarationError 7576: (2032-2033): Undeclared identifier.
-// DeclarationError 7576: (2043-2044): Undeclared identifier.
-// DeclarationError 7576: (2054-2055): Undeclared identifier.
-// DeclarationError 7576: (2065-2066): Undeclared identifier.
-// DeclarationError 7576: (2076-2077): Undeclared identifier.
-// DeclarationError 7576: (2087-2088): Undeclared identifier.
-// DeclarationError 7576: (2098-2099): Undeclared identifier.
-// DeclarationError 7576: (2109-2110): Undeclared identifier.
-// DeclarationError 7576: (2120-2121): Undeclared identifier.
-// DeclarationError 7576: (2131-2132): Undeclared identifier.
-// DeclarationError 7576: (2142-2143): Undeclared identifier.
-// DeclarationError 7576: (2153-2154): Undeclared identifier.
-// DeclarationError 7576: (2164-2165): Undeclared identifier.
-// DeclarationError 7576: (2175-2176): Undeclared identifier.
-// DeclarationError 7576: (2186-2187): Undeclared identifier.
-// DeclarationError 7576: (2197-2198): Undeclared identifier.
-// DeclarationError 7576: (2208-2209): Undeclared identifier.
-// DeclarationError 7576: (2219-2220): Undeclared identifier.
-// DeclarationError 7576: (2230-2231): Undeclared identifier.
-// DeclarationError 7576: (2241-2242): Undeclared identifier.
-// DeclarationError 7576: (2252-2253): Undeclared identifier.
-// DeclarationError 7576: (2263-2264): Undeclared identifier.
-// DeclarationError 7576: (2274-2275): Undeclared identifier.
-// DeclarationError 7576: (2285-2286): Undeclared identifier.
-// DeclarationError 7576: (2296-2297): Undeclared identifier.
-// DeclarationError 7576: (2307-2308): Undeclared identifier.
-// DeclarationError 7576: (2318-2319): Undeclared identifier.
-// DeclarationError 7576: (2329-2330): Undeclared identifier.
-// DeclarationError 7576: (2340-2341): Undeclared identifier.
-// DeclarationError 7576: (2351-2352): Undeclared identifier.
-// DeclarationError 7576: (2362-2363): Undeclared identifier.
-// DeclarationError 7576: (2373-2374): Undeclared identifier.
-// DeclarationError 7576: (2384-2385): Undeclared identifier.
-// DeclarationError 7576: (2395-2396): Undeclared identifier.
-// DeclarationError 7576: (2406-2407): Undeclared identifier.
-// DeclarationError 7576: (2417-2418): Undeclared identifier.
-// DeclarationError 7576: (2428-2429): Undeclared identifier.
-// DeclarationError 7576: (2439-2440): Undeclared identifier.
-// DeclarationError 7576: (2450-2451): Undeclared identifier.
-// DeclarationError 7576: (2461-2462): Undeclared identifier.
-// DeclarationError 7576: (2472-2473): Undeclared identifier.
-// DeclarationError 7576: (2483-2484): Undeclared identifier.
-// DeclarationError 7576: (2494-2495): Undeclared identifier.
-// DeclarationError 7576: (2505-2506): Undeclared identifier.
-// DeclarationError 7576: (2516-2517): Undeclared identifier.
-// DeclarationError 7576: (2527-2528): Undeclared identifier.
-// DeclarationError 7576: (2538-2539): Undeclared identifier.
-// DeclarationError 7576: (2549-2550): Undeclared identifier.
-// DeclarationError 7576: (2560-2561): Undeclared identifier.
-// DeclarationError 7576: (2571-2572): Undeclared identifier.
-// DeclarationError 7576: (2582-2583): Undeclared identifier.
-// DeclarationError 7576: (2593-2594): Undeclared identifier.
-// DeclarationError 7576: (2604-2605): Undeclared identifier.
-// DeclarationError 7576: (2615-2616): Undeclared identifier.
-// DeclarationError 7576: (2626-2627): Undeclared identifier.
-// DeclarationError 7576: (2637-2638): Undeclared identifier.
-// DeclarationError 7576: (2648-2649): Undeclared identifier.
-// DeclarationError 7576: (2659-2660): Undeclared identifier.
-// DeclarationError 7576: (2670-2671): Undeclared identifier.
-// DeclarationError 7576: (2681-2682): Undeclared identifier.
-// DeclarationError 7576: (2692-2693): Undeclared identifier.
-// DeclarationError 7576: (2703-2704): Undeclared identifier.
-// DeclarationError 7576: (2714-2715): Undeclared identifier.
-// DeclarationError 7576: (2725-2726): Undeclared identifier.
-// DeclarationError 7576: (2736-2737): Undeclared identifier.
-// DeclarationError 7576: (2747-2748): Undeclared identifier.
-// DeclarationError 7576: (2758-2759): Undeclared identifier.
-// DeclarationError 7576: (2769-2770): Undeclared identifier.
-// DeclarationError 7576: (2780-2781): Undeclared identifier.
-// DeclarationError 7576: (2791-2792): Undeclared identifier.
-// DeclarationError 7576: (2802-2803): Undeclared identifier.
-// DeclarationError 7576: (2813-2814): Undeclared identifier.
-// DeclarationError 7576: (2824-2825): Undeclared identifier.
-// DeclarationError 7576: (2835-2836): Undeclared identifier.
-// DeclarationError 7576: (2846-2847): Undeclared identifier.
+// DeclarationError 7576: (41-42='b'): Undeclared identifier.
+// DeclarationError 7576: (52-53='b'): Undeclared identifier.
+// DeclarationError 7576: (63-64='b'): Undeclared identifier.
+// DeclarationError 7576: (74-75='b'): Undeclared identifier.
+// DeclarationError 7576: (85-86='b'): Undeclared identifier.
+// DeclarationError 7576: (96-97='b'): Undeclared identifier.
+// DeclarationError 7576: (107-108='b'): Undeclared identifier.
+// DeclarationError 7576: (118-119='b'): Undeclared identifier.
+// DeclarationError 7576: (129-130='b'): Undeclared identifier.
+// DeclarationError 7576: (140-141='b'): Undeclared identifier.
+// DeclarationError 7576: (151-152='b'): Undeclared identifier.
+// DeclarationError 7576: (162-163='b'): Undeclared identifier.
+// DeclarationError 7576: (173-174='b'): Undeclared identifier.
+// DeclarationError 7576: (184-185='b'): Undeclared identifier.
+// DeclarationError 7576: (195-196='b'): Undeclared identifier.
+// DeclarationError 7576: (206-207='b'): Undeclared identifier.
+// DeclarationError 7576: (217-218='b'): Undeclared identifier.
+// DeclarationError 7576: (228-229='b'): Undeclared identifier.
+// DeclarationError 7576: (239-240='b'): Undeclared identifier.
+// DeclarationError 7576: (250-251='b'): Undeclared identifier.
+// DeclarationError 7576: (261-262='b'): Undeclared identifier.
+// DeclarationError 7576: (272-273='b'): Undeclared identifier.
+// DeclarationError 7576: (283-284='b'): Undeclared identifier.
+// DeclarationError 7576: (294-295='b'): Undeclared identifier.
+// DeclarationError 7576: (305-306='b'): Undeclared identifier.
+// DeclarationError 7576: (316-317='b'): Undeclared identifier.
+// DeclarationError 7576: (327-328='b'): Undeclared identifier.
+// DeclarationError 7576: (338-339='b'): Undeclared identifier.
+// DeclarationError 7576: (349-350='b'): Undeclared identifier.
+// DeclarationError 7576: (360-361='b'): Undeclared identifier.
+// DeclarationError 7576: (371-372='b'): Undeclared identifier.
+// DeclarationError 7576: (382-383='b'): Undeclared identifier.
+// DeclarationError 7576: (393-394='b'): Undeclared identifier.
+// DeclarationError 7576: (404-405='b'): Undeclared identifier.
+// DeclarationError 7576: (415-416='b'): Undeclared identifier.
+// DeclarationError 7576: (426-427='b'): Undeclared identifier.
+// DeclarationError 7576: (437-438='b'): Undeclared identifier.
+// DeclarationError 7576: (448-449='b'): Undeclared identifier.
+// DeclarationError 7576: (459-460='b'): Undeclared identifier.
+// DeclarationError 7576: (470-471='b'): Undeclared identifier.
+// DeclarationError 7576: (481-482='b'): Undeclared identifier.
+// DeclarationError 7576: (492-493='b'): Undeclared identifier.
+// DeclarationError 7576: (503-504='b'): Undeclared identifier.
+// DeclarationError 7576: (514-515='b'): Undeclared identifier.
+// DeclarationError 7576: (525-526='b'): Undeclared identifier.
+// DeclarationError 7576: (536-537='b'): Undeclared identifier.
+// DeclarationError 7576: (547-548='b'): Undeclared identifier.
+// DeclarationError 7576: (558-559='b'): Undeclared identifier.
+// DeclarationError 7576: (569-570='b'): Undeclared identifier.
+// DeclarationError 7576: (580-581='b'): Undeclared identifier.
+// DeclarationError 7576: (591-592='b'): Undeclared identifier.
+// DeclarationError 7576: (602-603='b'): Undeclared identifier.
+// DeclarationError 7576: (613-614='b'): Undeclared identifier.
+// DeclarationError 7576: (624-625='b'): Undeclared identifier.
+// DeclarationError 7576: (635-636='b'): Undeclared identifier.
+// DeclarationError 7576: (646-647='b'): Undeclared identifier.
+// DeclarationError 7576: (657-658='b'): Undeclared identifier.
+// DeclarationError 7576: (668-669='b'): Undeclared identifier.
+// DeclarationError 7576: (679-680='b'): Undeclared identifier.
+// DeclarationError 7576: (690-691='b'): Undeclared identifier.
+// DeclarationError 7576: (701-702='b'): Undeclared identifier.
+// DeclarationError 7576: (712-713='b'): Undeclared identifier.
+// DeclarationError 7576: (723-724='b'): Undeclared identifier.
+// DeclarationError 7576: (734-735='b'): Undeclared identifier.
+// DeclarationError 7576: (745-746='b'): Undeclared identifier.
+// DeclarationError 7576: (756-757='b'): Undeclared identifier.
+// DeclarationError 7576: (767-768='b'): Undeclared identifier.
+// DeclarationError 7576: (778-779='b'): Undeclared identifier.
+// DeclarationError 7576: (789-790='b'): Undeclared identifier.
+// DeclarationError 7576: (800-801='b'): Undeclared identifier.
+// DeclarationError 7576: (811-812='b'): Undeclared identifier.
+// DeclarationError 7576: (822-823='b'): Undeclared identifier.
+// DeclarationError 7576: (833-834='b'): Undeclared identifier.
+// DeclarationError 7576: (844-845='b'): Undeclared identifier.
+// DeclarationError 7576: (855-856='b'): Undeclared identifier.
+// DeclarationError 7576: (866-867='b'): Undeclared identifier.
+// DeclarationError 7576: (877-878='b'): Undeclared identifier.
+// DeclarationError 7576: (888-889='b'): Undeclared identifier.
+// DeclarationError 7576: (899-900='b'): Undeclared identifier.
+// DeclarationError 7576: (910-911='b'): Undeclared identifier.
+// DeclarationError 7576: (921-922='b'): Undeclared identifier.
+// DeclarationError 7576: (932-933='b'): Undeclared identifier.
+// DeclarationError 7576: (943-944='b'): Undeclared identifier.
+// DeclarationError 7576: (954-955='b'): Undeclared identifier.
+// DeclarationError 7576: (965-966='b'): Undeclared identifier.
+// DeclarationError 7576: (976-977='b'): Undeclared identifier.
+// DeclarationError 7576: (987-988='b'): Undeclared identifier.
+// DeclarationError 7576: (998-999='b'): Undeclared identifier.
+// DeclarationError 7576: (1009-1010='b'): Undeclared identifier.
+// DeclarationError 7576: (1020-1021='b'): Undeclared identifier.
+// DeclarationError 7576: (1031-1032='b'): Undeclared identifier.
+// DeclarationError 7576: (1042-1043='b'): Undeclared identifier.
+// DeclarationError 7576: (1053-1054='b'): Undeclared identifier.
+// DeclarationError 7576: (1064-1065='b'): Undeclared identifier.
+// DeclarationError 7576: (1075-1076='b'): Undeclared identifier.
+// DeclarationError 7576: (1086-1087='b'): Undeclared identifier.
+// DeclarationError 7576: (1097-1098='b'): Undeclared identifier.
+// DeclarationError 7576: (1108-1109='b'): Undeclared identifier.
+// DeclarationError 7576: (1119-1120='b'): Undeclared identifier.
+// DeclarationError 7576: (1130-1131='b'): Undeclared identifier.
+// DeclarationError 7576: (1141-1142='b'): Undeclared identifier.
+// DeclarationError 7576: (1152-1153='b'): Undeclared identifier.
+// DeclarationError 7576: (1163-1164='b'): Undeclared identifier.
+// DeclarationError 7576: (1174-1175='b'): Undeclared identifier.
+// DeclarationError 7576: (1185-1186='b'): Undeclared identifier.
+// DeclarationError 7576: (1196-1197='b'): Undeclared identifier.
+// DeclarationError 7576: (1207-1208='b'): Undeclared identifier.
+// DeclarationError 7576: (1218-1219='b'): Undeclared identifier.
+// DeclarationError 7576: (1229-1230='b'): Undeclared identifier.
+// DeclarationError 7576: (1240-1241='b'): Undeclared identifier.
+// DeclarationError 7576: (1251-1252='b'): Undeclared identifier.
+// DeclarationError 7576: (1262-1263='b'): Undeclared identifier.
+// DeclarationError 7576: (1273-1274='b'): Undeclared identifier.
+// DeclarationError 7576: (1284-1285='b'): Undeclared identifier.
+// DeclarationError 7576: (1295-1296='b'): Undeclared identifier.
+// DeclarationError 7576: (1306-1307='b'): Undeclared identifier.
+// DeclarationError 7576: (1317-1318='b'): Undeclared identifier.
+// DeclarationError 7576: (1328-1329='b'): Undeclared identifier.
+// DeclarationError 7576: (1339-1340='b'): Undeclared identifier.
+// DeclarationError 7576: (1350-1351='b'): Undeclared identifier.
+// DeclarationError 7576: (1361-1362='b'): Undeclared identifier.
+// DeclarationError 7576: (1372-1373='b'): Undeclared identifier.
+// DeclarationError 7576: (1383-1384='b'): Undeclared identifier.
+// DeclarationError 7576: (1394-1395='b'): Undeclared identifier.
+// DeclarationError 7576: (1405-1406='b'): Undeclared identifier.
+// DeclarationError 7576: (1416-1417='b'): Undeclared identifier.
+// DeclarationError 7576: (1427-1428='b'): Undeclared identifier.
+// DeclarationError 7576: (1438-1439='b'): Undeclared identifier.
+// DeclarationError 7576: (1449-1450='b'): Undeclared identifier.
+// DeclarationError 7576: (1460-1461='b'): Undeclared identifier.
+// DeclarationError 7576: (1471-1472='b'): Undeclared identifier.
+// DeclarationError 7576: (1482-1483='b'): Undeclared identifier.
+// DeclarationError 7576: (1493-1494='b'): Undeclared identifier.
+// DeclarationError 7576: (1504-1505='b'): Undeclared identifier.
+// DeclarationError 7576: (1515-1516='b'): Undeclared identifier.
+// DeclarationError 7576: (1526-1527='b'): Undeclared identifier.
+// DeclarationError 7576: (1537-1538='b'): Undeclared identifier.
+// DeclarationError 7576: (1548-1549='b'): Undeclared identifier.
+// DeclarationError 7576: (1559-1560='b'): Undeclared identifier.
+// DeclarationError 7576: (1570-1571='b'): Undeclared identifier.
+// DeclarationError 7576: (1581-1582='b'): Undeclared identifier.
+// DeclarationError 7576: (1592-1593='b'): Undeclared identifier.
+// DeclarationError 7576: (1603-1604='b'): Undeclared identifier.
+// DeclarationError 7576: (1614-1615='b'): Undeclared identifier.
+// DeclarationError 7576: (1625-1626='b'): Undeclared identifier.
+// DeclarationError 7576: (1636-1637='b'): Undeclared identifier.
+// DeclarationError 7576: (1647-1648='b'): Undeclared identifier.
+// DeclarationError 7576: (1658-1659='b'): Undeclared identifier.
+// DeclarationError 7576: (1669-1670='b'): Undeclared identifier.
+// DeclarationError 7576: (1680-1681='b'): Undeclared identifier.
+// DeclarationError 7576: (1691-1692='b'): Undeclared identifier.
+// DeclarationError 7576: (1702-1703='b'): Undeclared identifier.
+// DeclarationError 7576: (1713-1714='b'): Undeclared identifier.
+// DeclarationError 7576: (1724-1725='b'): Undeclared identifier.
+// DeclarationError 7576: (1735-1736='b'): Undeclared identifier.
+// DeclarationError 7576: (1746-1747='b'): Undeclared identifier.
+// DeclarationError 7576: (1757-1758='b'): Undeclared identifier.
+// DeclarationError 7576: (1768-1769='b'): Undeclared identifier.
+// DeclarationError 7576: (1779-1780='b'): Undeclared identifier.
+// DeclarationError 7576: (1790-1791='b'): Undeclared identifier.
+// DeclarationError 7576: (1801-1802='b'): Undeclared identifier.
+// DeclarationError 7576: (1812-1813='b'): Undeclared identifier.
+// DeclarationError 7576: (1823-1824='b'): Undeclared identifier.
+// DeclarationError 7576: (1834-1835='b'): Undeclared identifier.
+// DeclarationError 7576: (1845-1846='b'): Undeclared identifier.
+// DeclarationError 7576: (1856-1857='b'): Undeclared identifier.
+// DeclarationError 7576: (1867-1868='b'): Undeclared identifier.
+// DeclarationError 7576: (1878-1879='b'): Undeclared identifier.
+// DeclarationError 7576: (1889-1890='b'): Undeclared identifier.
+// DeclarationError 7576: (1900-1901='b'): Undeclared identifier.
+// DeclarationError 7576: (1911-1912='b'): Undeclared identifier.
+// DeclarationError 7576: (1922-1923='b'): Undeclared identifier.
+// DeclarationError 7576: (1933-1934='b'): Undeclared identifier.
+// DeclarationError 7576: (1944-1945='b'): Undeclared identifier.
+// DeclarationError 7576: (1955-1956='b'): Undeclared identifier.
+// DeclarationError 7576: (1966-1967='b'): Undeclared identifier.
+// DeclarationError 7576: (1977-1978='b'): Undeclared identifier.
+// DeclarationError 7576: (1988-1989='b'): Undeclared identifier.
+// DeclarationError 7576: (1999-2000='b'): Undeclared identifier.
+// DeclarationError 7576: (2010-2011='b'): Undeclared identifier.
+// DeclarationError 7576: (2021-2022='b'): Undeclared identifier.
+// DeclarationError 7576: (2032-2033='b'): Undeclared identifier.
+// DeclarationError 7576: (2043-2044='b'): Undeclared identifier.
+// DeclarationError 7576: (2054-2055='b'): Undeclared identifier.
+// DeclarationError 7576: (2065-2066='b'): Undeclared identifier.
+// DeclarationError 7576: (2076-2077='b'): Undeclared identifier.
+// DeclarationError 7576: (2087-2088='b'): Undeclared identifier.
+// DeclarationError 7576: (2098-2099='b'): Undeclared identifier.
+// DeclarationError 7576: (2109-2110='b'): Undeclared identifier.
+// DeclarationError 7576: (2120-2121='b'): Undeclared identifier.
+// DeclarationError 7576: (2131-2132='b'): Undeclared identifier.
+// DeclarationError 7576: (2142-2143='b'): Undeclared identifier.
+// DeclarationError 7576: (2153-2154='b'): Undeclared identifier.
+// DeclarationError 7576: (2164-2165='b'): Undeclared identifier.
+// DeclarationError 7576: (2175-2176='b'): Undeclared identifier.
+// DeclarationError 7576: (2186-2187='b'): Undeclared identifier.
+// DeclarationError 7576: (2197-2198='b'): Undeclared identifier.
+// DeclarationError 7576: (2208-2209='b'): Undeclared identifier.
+// DeclarationError 7576: (2219-2220='b'): Undeclared identifier.
+// DeclarationError 7576: (2230-2231='b'): Undeclared identifier.
+// DeclarationError 7576: (2241-2242='b'): Undeclared identifier.
+// DeclarationError 7576: (2252-2253='b'): Undeclared identifier.
+// DeclarationError 7576: (2263-2264='b'): Undeclared identifier.
+// DeclarationError 7576: (2274-2275='b'): Undeclared identifier.
+// DeclarationError 7576: (2285-2286='b'): Undeclared identifier.
+// DeclarationError 7576: (2296-2297='b'): Undeclared identifier.
+// DeclarationError 7576: (2307-2308='b'): Undeclared identifier.
+// DeclarationError 7576: (2318-2319='b'): Undeclared identifier.
+// DeclarationError 7576: (2329-2330='b'): Undeclared identifier.
+// DeclarationError 7576: (2340-2341='b'): Undeclared identifier.
+// DeclarationError 7576: (2351-2352='b'): Undeclared identifier.
+// DeclarationError 7576: (2362-2363='b'): Undeclared identifier.
+// DeclarationError 7576: (2373-2374='b'): Undeclared identifier.
+// DeclarationError 7576: (2384-2385='b'): Undeclared identifier.
+// DeclarationError 7576: (2395-2396='b'): Undeclared identifier.
+// DeclarationError 7576: (2406-2407='b'): Undeclared identifier.
+// DeclarationError 7576: (2417-2418='b'): Undeclared identifier.
+// DeclarationError 7576: (2428-2429='b'): Undeclared identifier.
+// DeclarationError 7576: (2439-2440='b'): Undeclared identifier.
+// DeclarationError 7576: (2450-2451='b'): Undeclared identifier.
+// DeclarationError 7576: (2461-2462='b'): Undeclared identifier.
+// DeclarationError 7576: (2472-2473='b'): Undeclared identifier.
+// DeclarationError 7576: (2483-2484='b'): Undeclared identifier.
+// DeclarationError 7576: (2494-2495='b'): Undeclared identifier.
+// DeclarationError 7576: (2505-2506='b'): Undeclared identifier.
+// DeclarationError 7576: (2516-2517='b'): Undeclared identifier.
+// DeclarationError 7576: (2527-2528='b'): Undeclared identifier.
+// DeclarationError 7576: (2538-2539='b'): Undeclared identifier.
+// DeclarationError 7576: (2549-2550='b'): Undeclared identifier.
+// DeclarationError 7576: (2560-2561='b'): Undeclared identifier.
+// DeclarationError 7576: (2571-2572='b'): Undeclared identifier.
+// DeclarationError 7576: (2582-2583='b'): Undeclared identifier.
+// DeclarationError 7576: (2593-2594='b'): Undeclared identifier.
+// DeclarationError 7576: (2604-2605='b'): Undeclared identifier.
+// DeclarationError 7576: (2615-2616='b'): Undeclared identifier.
+// DeclarationError 7576: (2626-2627='b'): Undeclared identifier.
+// DeclarationError 7576: (2637-2638='b'): Undeclared identifier.
+// DeclarationError 7576: (2648-2649='b'): Undeclared identifier.
+// DeclarationError 7576: (2659-2660='b'): Undeclared identifier.
+// DeclarationError 7576: (2670-2671='b'): Undeclared identifier.
+// DeclarationError 7576: (2681-2682='b'): Undeclared identifier.
+// DeclarationError 7576: (2692-2693='b'): Undeclared identifier.
+// DeclarationError 7576: (2703-2704='b'): Undeclared identifier.
+// DeclarationError 7576: (2714-2715='b'): Undeclared identifier.
+// DeclarationError 7576: (2725-2726='b'): Undeclared identifier.
+// DeclarationError 7576: (2736-2737='b'): Undeclared identifier.
+// DeclarationError 7576: (2747-2748='b'): Undeclared identifier.
+// DeclarationError 7576: (2758-2759='b'): Undeclared identifier.
+// DeclarationError 7576: (2769-2770='b'): Undeclared identifier.
+// DeclarationError 7576: (2780-2781='b'): Undeclared identifier.
+// DeclarationError 7576: (2791-2792='b'): Undeclared identifier.
+// DeclarationError 7576: (2802-2803='b'): Undeclared identifier.
+// DeclarationError 7576: (2813-2814='b'): Undeclared identifier.
+// DeclarationError 7576: (2824-2825='b'): Undeclared identifier.
+// DeclarationError 7576: (2835-2836='b'): Undeclared identifier.
+// DeclarationError 7576: (2846-2847='b'): Undeclared identifier.
 // Warning 4013: There are more than 256 errors. Aborting.
diff --git a/test/libsolidity/syntaxTests/more_than_256_importerrors.sol b/test/libsolidity/syntaxTests/more_than_256_importerrors.sol
index d4a412119..e0b767da2 100644
--- a/test/libsolidity/syntaxTests/more_than_256_importerrors.sol
+++ b/test/libsolidity/syntaxTests/more_than_256_importerrors.sol
@@ -262,260 +262,260 @@ contract C {
   }
 }
 // ----
-// ParserError 6275: (0-15): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (16-31): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (32-47): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (48-63): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (64-79): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (80-95): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (96-111): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (112-127): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (128-143): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (144-159): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (160-175): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (176-191): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (192-207): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (208-223): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (224-239): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (240-255): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (256-271): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (272-287): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (288-303): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (304-319): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (320-335): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (336-351): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (352-367): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (368-383): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (384-399): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (400-415): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (416-431): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (432-447): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (448-463): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (464-479): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (480-495): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (496-511): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (512-527): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (528-543): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (544-559): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (560-575): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (576-591): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (592-607): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (608-623): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (624-639): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (640-655): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (656-671): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (672-687): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (688-703): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (704-719): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (720-735): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (736-751): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (752-767): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (768-783): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (784-799): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (800-815): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (816-831): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (832-847): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (848-863): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (864-879): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (880-895): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (896-911): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (912-927): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (928-943): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (944-959): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (960-975): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (976-991): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (992-1007): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1008-1023): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1024-1039): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1040-1055): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1056-1071): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1072-1087): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1088-1103): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1104-1119): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1120-1135): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1136-1151): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1152-1167): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1168-1183): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1184-1199): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1200-1215): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1216-1231): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1232-1247): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1248-1263): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1264-1279): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1280-1295): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1296-1311): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1312-1327): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1328-1343): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1344-1359): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1360-1375): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1376-1391): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1392-1407): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1408-1423): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1424-1439): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1440-1455): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1456-1471): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1472-1487): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1488-1503): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1504-1519): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1520-1535): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1536-1551): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1552-1567): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1568-1583): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1584-1599): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1600-1615): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1616-1631): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1632-1647): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1648-1663): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1664-1679): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1680-1695): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1696-1711): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1712-1727): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1728-1743): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1744-1759): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1760-1775): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1776-1791): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1792-1807): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1808-1823): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1824-1839): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1840-1855): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1856-1871): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1872-1887): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1888-1903): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1904-1919): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1920-1935): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1936-1951): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1952-1967): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1968-1983): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (1984-1999): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2000-2015): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2016-2031): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2032-2047): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2048-2063): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2064-2079): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2080-2095): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2096-2111): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2112-2127): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2128-2143): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2144-2159): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2160-2175): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2176-2191): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2192-2207): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2208-2223): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2224-2239): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2240-2255): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2256-2271): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2272-2287): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2288-2303): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2304-2319): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2320-2335): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2336-2351): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2352-2367): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2368-2383): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2384-2399): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2400-2415): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2416-2431): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2432-2447): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2448-2463): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2464-2479): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2480-2495): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2496-2511): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2512-2527): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2528-2543): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2544-2559): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2560-2575): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2576-2591): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2592-2607): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2608-2623): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2624-2639): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2640-2655): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2656-2671): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2672-2687): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2688-2703): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2704-2719): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2720-2735): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2736-2751): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2752-2767): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2768-2783): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2784-2799): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2800-2815): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2816-2831): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2832-2847): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2848-2863): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2864-2879): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2880-2895): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2896-2911): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2912-2927): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2928-2943): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2944-2959): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2960-2975): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2976-2991): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (2992-3007): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3008-3023): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3024-3039): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3040-3055): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3056-3071): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3072-3087): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3088-3103): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3104-3119): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3120-3135): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3136-3151): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3152-3167): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3168-3183): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3184-3199): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3200-3215): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3216-3231): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3232-3247): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3248-3263): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3264-3279): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3280-3295): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3296-3311): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3312-3327): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3328-3343): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3344-3359): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3360-3375): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3376-3391): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3392-3407): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3408-3423): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3424-3439): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3440-3455): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3456-3471): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3472-3487): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3488-3503): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3504-3519): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3520-3535): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3536-3551): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3552-3567): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3568-3583): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3584-3599): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3600-3615): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3616-3631): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3632-3647): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3648-3663): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3664-3679): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3680-3695): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3696-3711): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3712-3727): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3728-3743): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3744-3759): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3760-3775): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3776-3791): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3792-3807): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3808-3823): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3824-3839): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3840-3855): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3856-3871): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3872-3887): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3888-3903): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3904-3919): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3920-3935): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3936-3951): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3952-3967): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3968-3983): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (3984-3999): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4000-4015): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4016-4031): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4032-4047): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4048-4063): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4064-4079): Source "a.sol" not found: File not supplied initially.
-// ParserError 6275: (4080-4095): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (0-15='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (16-31='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (32-47='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (48-63='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (64-79='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (80-95='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (96-111='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (112-127='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (128-143='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (144-159='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (160-175='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (176-191='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (192-207='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (208-223='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (224-239='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (240-255='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (256-271='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (272-287='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (288-303='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (304-319='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (320-335='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (336-351='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (352-367='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (368-383='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (384-399='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (400-415='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (416-431='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (432-447='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (448-463='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (464-479='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (480-495='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (496-511='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (512-527='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (528-543='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (544-559='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (560-575='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (576-591='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (592-607='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (608-623='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (624-639='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (640-655='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (656-671='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (672-687='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (688-703='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (704-719='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (720-735='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (736-751='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (752-767='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (768-783='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (784-799='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (800-815='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (816-831='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (832-847='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (848-863='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (864-879='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (880-895='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (896-911='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (912-927='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (928-943='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (944-959='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (960-975='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (976-991='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (992-1007='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1008-1023='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1024-1039='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1040-1055='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1056-1071='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1072-1087='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1088-1103='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1104-1119='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1120-1135='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1136-1151='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1152-1167='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1168-1183='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1184-1199='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1200-1215='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1216-1231='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1232-1247='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1248-1263='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1264-1279='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1280-1295='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1296-1311='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1312-1327='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1328-1343='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1344-1359='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1360-1375='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1376-1391='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1392-1407='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1408-1423='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1424-1439='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1440-1455='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1456-1471='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1472-1487='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1488-1503='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1504-1519='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1520-1535='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1536-1551='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1552-1567='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1568-1583='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1584-1599='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1600-1615='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1616-1631='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1632-1647='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1648-1663='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1664-1679='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1680-1695='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1696-1711='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1712-1727='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1728-1743='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1744-1759='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1760-1775='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1776-1791='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1792-1807='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1808-1823='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1824-1839='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1840-1855='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1856-1871='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1872-1887='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1888-1903='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1904-1919='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1920-1935='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1936-1951='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1952-1967='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1968-1983='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (1984-1999='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2000-2015='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2016-2031='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2032-2047='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2048-2063='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2064-2079='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2080-2095='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2096-2111='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2112-2127='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2128-2143='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2144-2159='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2160-2175='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2176-2191='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2192-2207='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2208-2223='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2224-2239='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2240-2255='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2256-2271='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2272-2287='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2288-2303='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2304-2319='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2320-2335='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2336-2351='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2352-2367='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2368-2383='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2384-2399='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2400-2415='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2416-2431='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2432-2447='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2448-2463='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2464-2479='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2480-2495='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2496-2511='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2512-2527='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2528-2543='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2544-2559='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2560-2575='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2576-2591='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2592-2607='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2608-2623='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2624-2639='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2640-2655='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2656-2671='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2672-2687='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2688-2703='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2704-2719='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2720-2735='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2736-2751='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2752-2767='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2768-2783='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2784-2799='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2800-2815='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2816-2831='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2832-2847='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2848-2863='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2864-2879='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2880-2895='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2896-2911='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2912-2927='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2928-2943='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2944-2959='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2960-2975='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2976-2991='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (2992-3007='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3008-3023='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3024-3039='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3040-3055='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3056-3071='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3072-3087='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3088-3103='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3104-3119='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3120-3135='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3136-3151='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3152-3167='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3168-3183='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3184-3199='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3200-3215='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3216-3231='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3232-3247='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3248-3263='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3264-3279='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3280-3295='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3296-3311='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3312-3327='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3328-3343='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3344-3359='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3360-3375='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3376-3391='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3392-3407='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3408-3423='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3424-3439='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3440-3455='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3456-3471='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3472-3487='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3488-3503='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3504-3519='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3520-3535='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3536-3551='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3552-3567='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3568-3583='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3584-3599='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3600-3615='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3616-3631='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3632-3647='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3648-3663='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3664-3679='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3680-3695='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3696-3711='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3712-3727='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3728-3743='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3744-3759='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3760-3775='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3776-3791='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3792-3807='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3808-3823='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3824-3839='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3840-3855='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3856-3871='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3872-3887='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3888-3903='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3904-3919='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3920-3935='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3936-3951='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3952-3967='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3968-3983='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (3984-3999='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (4000-4015='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (4016-4031='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (4032-4047='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (4048-4063='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (4064-4079='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
+// ParserError 6275: (4080-4095='import "a.sol";'): Source "a.sol" not found: File not supplied initially.
 // Warning 4013: There are more than 256 errors. Aborting.
diff --git a/test/libsolidity/syntaxTests/more_than_256_syntaxerrors.sol b/test/libsolidity/syntaxTests/more_than_256_syntaxerrors.sol
index b3b569121..d97327131 100644
--- a/test/libsolidity/syntaxTests/more_than_256_syntaxerrors.sol
+++ b/test/libsolidity/syntaxTests/more_than_256_syntaxerrors.sol
@@ -265,260 +265,260 @@ contract C {
   }
 }
 // ----
-// SyntaxError 4123: (41-49): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (55-63): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (69-77): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (83-91): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (97-105): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (111-119): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (125-133): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (139-147): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (153-161): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (167-175): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (181-189): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (195-203): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (209-217): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (223-231): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (237-245): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (251-259): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (265-273): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (279-287): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (293-301): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (307-315): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (321-329): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (335-343): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (349-357): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (363-371): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (377-385): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (391-399): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (405-413): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (419-427): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (433-441): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (447-455): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (461-469): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (475-483): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (489-497): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (503-511): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (517-525): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (531-539): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (545-553): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (559-567): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (573-581): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (587-595): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (601-609): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (615-623): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (629-637): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (643-651): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (657-665): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (671-679): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (685-693): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (699-707): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (713-721): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (727-735): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (741-749): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (755-763): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (769-777): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (783-791): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (797-805): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (811-819): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (825-833): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (839-847): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (853-861): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (867-875): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (881-889): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (895-903): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (909-917): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (923-931): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (937-945): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (951-959): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (965-973): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (979-987): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (993-1001): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1007-1015): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1021-1029): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1035-1043): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1049-1057): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1063-1071): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1077-1085): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1091-1099): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1105-1113): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1119-1127): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1133-1141): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1147-1155): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1161-1169): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1175-1183): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1189-1197): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1203-1211): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1217-1225): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1231-1239): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1245-1253): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1259-1267): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1273-1281): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1287-1295): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1301-1309): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1315-1323): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1329-1337): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1343-1351): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1357-1365): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1371-1379): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1385-1393): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1399-1407): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1413-1421): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1427-1435): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1441-1449): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1455-1463): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1469-1477): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1483-1491): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1497-1505): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1511-1519): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1525-1533): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1539-1547): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1553-1561): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1567-1575): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1581-1589): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1595-1603): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1609-1617): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1623-1631): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1637-1645): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1651-1659): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1665-1673): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1679-1687): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1693-1701): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1707-1715): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1721-1729): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1735-1743): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1749-1757): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1763-1771): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1777-1785): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1791-1799): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1805-1813): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1819-1827): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1833-1841): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1847-1855): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1861-1869): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1875-1883): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1889-1897): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1903-1911): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1917-1925): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1931-1939): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1945-1953): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1959-1967): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1973-1981): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (1987-1995): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2001-2009): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2015-2023): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2029-2037): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2043-2051): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2057-2065): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2071-2079): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2085-2093): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2099-2107): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2113-2121): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2127-2135): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2141-2149): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2155-2163): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2169-2177): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2183-2191): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2197-2205): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2211-2219): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2225-2233): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2239-2247): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2253-2261): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2267-2275): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2281-2289): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2295-2303): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2309-2317): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2323-2331): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2337-2345): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2351-2359): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2365-2373): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2379-2387): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2393-2401): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2407-2415): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2421-2429): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2435-2443): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2449-2457): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2463-2471): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2477-2485): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2491-2499): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2505-2513): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2519-2527): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2533-2541): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2547-2555): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2561-2569): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2575-2583): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2589-2597): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2603-2611): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2617-2625): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2631-2639): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2645-2653): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2659-2667): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2673-2681): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2687-2695): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2701-2709): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2715-2723): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2729-2737): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2743-2751): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2757-2765): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2771-2779): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2785-2793): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2799-2807): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2813-2821): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2827-2835): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2841-2849): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2855-2863): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2869-2877): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2883-2891): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2897-2905): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2911-2919): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2925-2933): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2939-2947): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2953-2961): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2967-2975): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2981-2989): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (2995-3003): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3009-3017): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3023-3031): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3037-3045): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3051-3059): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3065-3073): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3079-3087): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3093-3101): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3107-3115): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3121-3129): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3135-3143): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3149-3157): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3163-3171): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3177-3185): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3191-3199): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3205-3213): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3219-3227): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3233-3241): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3247-3255): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3261-3269): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3275-3283): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3289-3297): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3303-3311): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3317-3325): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3331-3339): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3345-3353): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3359-3367): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3373-3381): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3387-3395): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3401-3409): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3415-3423): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3429-3437): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3443-3451): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3457-3465): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3471-3479): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3485-3493): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3499-3507): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3513-3521): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3527-3535): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3541-3549): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3555-3563): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3569-3577): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3583-3591): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3597-3605): "continue" has to be in a "for" or "while" loop.
-// SyntaxError 4123: (3611-3619): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (41-49='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (55-63='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (69-77='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (83-91='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (97-105='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (111-119='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (125-133='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (139-147='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (153-161='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (167-175='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (181-189='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (195-203='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (209-217='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (223-231='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (237-245='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (251-259='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (265-273='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (279-287='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (293-301='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (307-315='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (321-329='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (335-343='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (349-357='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (363-371='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (377-385='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (391-399='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (405-413='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (419-427='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (433-441='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (447-455='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (461-469='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (475-483='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (489-497='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (503-511='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (517-525='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (531-539='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (545-553='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (559-567='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (573-581='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (587-595='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (601-609='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (615-623='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (629-637='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (643-651='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (657-665='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (671-679='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (685-693='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (699-707='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (713-721='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (727-735='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (741-749='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (755-763='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (769-777='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (783-791='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (797-805='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (811-819='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (825-833='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (839-847='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (853-861='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (867-875='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (881-889='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (895-903='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (909-917='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (923-931='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (937-945='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (951-959='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (965-973='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (979-987='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (993-1001='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1007-1015='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1021-1029='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1035-1043='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1049-1057='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1063-1071='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1077-1085='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1091-1099='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1105-1113='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1119-1127='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1133-1141='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1147-1155='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1161-1169='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1175-1183='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1189-1197='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1203-1211='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1217-1225='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1231-1239='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1245-1253='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1259-1267='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1273-1281='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1287-1295='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1301-1309='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1315-1323='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1329-1337='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1343-1351='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1357-1365='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1371-1379='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1385-1393='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1399-1407='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1413-1421='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1427-1435='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1441-1449='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1455-1463='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1469-1477='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1483-1491='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1497-1505='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1511-1519='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1525-1533='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1539-1547='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1553-1561='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1567-1575='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1581-1589='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1595-1603='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1609-1617='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1623-1631='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1637-1645='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1651-1659='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1665-1673='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1679-1687='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1693-1701='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1707-1715='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1721-1729='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1735-1743='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1749-1757='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1763-1771='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1777-1785='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1791-1799='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1805-1813='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1819-1827='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1833-1841='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1847-1855='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1861-1869='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1875-1883='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1889-1897='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1903-1911='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1917-1925='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1931-1939='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1945-1953='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1959-1967='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1973-1981='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (1987-1995='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2001-2009='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2015-2023='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2029-2037='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2043-2051='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2057-2065='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2071-2079='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2085-2093='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2099-2107='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2113-2121='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2127-2135='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2141-2149='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2155-2163='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2169-2177='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2183-2191='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2197-2205='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2211-2219='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2225-2233='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2239-2247='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2253-2261='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2267-2275='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2281-2289='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2295-2303='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2309-2317='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2323-2331='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2337-2345='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2351-2359='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2365-2373='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2379-2387='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2393-2401='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2407-2415='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2421-2429='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2435-2443='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2449-2457='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2463-2471='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2477-2485='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2491-2499='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2505-2513='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2519-2527='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2533-2541='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2547-2555='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2561-2569='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2575-2583='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2589-2597='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2603-2611='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2617-2625='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2631-2639='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2645-2653='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2659-2667='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2673-2681='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2687-2695='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2701-2709='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2715-2723='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2729-2737='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2743-2751='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2757-2765='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2771-2779='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2785-2793='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2799-2807='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2813-2821='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2827-2835='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2841-2849='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2855-2863='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2869-2877='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2883-2891='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2897-2905='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2911-2919='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2925-2933='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2939-2947='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2953-2961='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2967-2975='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2981-2989='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (2995-3003='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3009-3017='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3023-3031='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3037-3045='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3051-3059='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3065-3073='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3079-3087='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3093-3101='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3107-3115='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3121-3129='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3135-3143='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3149-3157='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3163-3171='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3177-3185='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3191-3199='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3205-3213='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3219-3227='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3233-3241='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3247-3255='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3261-3269='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3275-3283='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3289-3297='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3303-3311='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3317-3325='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3331-3339='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3345-3353='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3359-3367='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3373-3381='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3387-3395='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3401-3409='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3415-3423='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3429-3437='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3443-3451='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3457-3465='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3471-3479='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3485-3493='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3499-3507='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3513-3521='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3527-3535='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3541-3549='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3555-3563='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3569-3577='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3583-3591='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3597-3605='continue'): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (3611-3619='continue'): "continue" has to be in a "for" or "while" loop.
 // Warning 4013: There are more than 256 errors. Aborting.
diff --git a/test/libsolidity/syntaxTests/multiSource/error_in_first.sol b/test/libsolidity/syntaxTests/multiSource/error_in_first.sol
index 2c21da402..fe05c52a3 100644
--- a/test/libsolidity/syntaxTests/multiSource/error_in_first.sol
+++ b/test/libsolidity/syntaxTests/multiSource/error_in_first.sol
@@ -7,4 +7,4 @@ contract B {
 	function f() public { }
 }
 // ----
-// DeclarationError 7576: (A:36-37): Undeclared identifier.
+// DeclarationError 7576: (A:36-37='x'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/multiSource/free_function_control_flow_analysis.sol b/test/libsolidity/syntaxTests/multiSource/free_function_control_flow_analysis.sol
index 63268475a..b0d622bd5 100644
--- a/test/libsolidity/syntaxTests/multiSource/free_function_control_flow_analysis.sol
+++ b/test/libsolidity/syntaxTests/multiSource/free_function_control_flow_analysis.sol
@@ -9,4 +9,4 @@ contract C
 	function bar() public pure returns (uint) { reverting(); }
 }
 // ----
-// Warning 6321: (s2.sol:67-71): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (s2.sol:67-71='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiSource/import_alias_mismatch.sol b/test/libsolidity/syntaxTests/multiSource/import_alias_mismatch.sol
index 311ca3e43..2d6b9f53a 100644
--- a/test/libsolidity/syntaxTests/multiSource/import_alias_mismatch.sol
+++ b/test/libsolidity/syntaxTests/multiSource/import_alias_mismatch.sol
@@ -7,4 +7,4 @@ contract C {
   function f() public pure returns (int) { return M.a; }
 }
 // ----
-// TypeError 9582: (s2.sol:116-119): Member "a" not found or not visible after argument-dependent lookup in module "s2.sol".
+// TypeError 9582: (s2.sol:116-119='M.a'): Member "a" not found or not visible after argument-dependent lookup in module "s2.sol".
diff --git a/test/libsolidity/syntaxTests/multiSource/import_contract_function_error.sol b/test/libsolidity/syntaxTests/multiSource/import_contract_function_error.sol
index c7b5601e3..92f9fecfe 100644
--- a/test/libsolidity/syntaxTests/multiSource/import_contract_function_error.sol
+++ b/test/libsolidity/syntaxTests/multiSource/import_contract_function_error.sol
@@ -7,4 +7,4 @@ contract C {
 ==== Source: s2.sol ====
 import {C.f as g} from "s1.sol";
 // ----
-// ParserError 2314: (s2.sol:9-10): Expected '}' but got '.'
+// ParserError 2314: (s2.sol:9-10='.'): Expected '}' but got '.'
diff --git a/test/libsolidity/syntaxTests/multiSource/import_not_found.sol b/test/libsolidity/syntaxTests/multiSource/import_not_found.sol
index f3042ecea..0bb31c1fe 100644
--- a/test/libsolidity/syntaxTests/multiSource/import_not_found.sol
+++ b/test/libsolidity/syntaxTests/multiSource/import_not_found.sol
@@ -2,4 +2,4 @@
 import "b";
 contract C {}
 // ----
-// ParserError 6275: (a:0-11): Source "b" not found: File not supplied initially.
+// ParserError 6275: (a:0-11='import "b";'): Source "b" not found: File not supplied initially.
diff --git a/test/libsolidity/syntaxTests/multiSource/libraries_control_flow_analysis.sol b/test/libsolidity/syntaxTests/multiSource/libraries_control_flow_analysis.sol
index e8908625b..25d9534dd 100644
--- a/test/libsolidity/syntaxTests/multiSource/libraries_control_flow_analysis.sol
+++ b/test/libsolidity/syntaxTests/multiSource/libraries_control_flow_analysis.sol
@@ -12,5 +12,5 @@ contract C
 	function bar() public pure returns (uint) { L.reverting(); }
 }
 // ----
-// Warning 6321: (s2.sol:67-71): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (s2.sol:126-130): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (s2.sol:67-71='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (s2.sol:126-130='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiSource/no_import.sol b/test/libsolidity/syntaxTests/multiSource/no_import.sol
index 25b10ce11..028141182 100644
--- a/test/libsolidity/syntaxTests/multiSource/no_import.sol
+++ b/test/libsolidity/syntaxTests/multiSource/no_import.sol
@@ -7,4 +7,4 @@ contract B is A {
 	function f(uint256 x) public view returns(uint256) { return x; }
 }
 // ----
-// DeclarationError 7920: (B:14-15): Identifier not found or not unique.
+// DeclarationError 7920: (B:14-15='A'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/multiSource/one_source.sol b/test/libsolidity/syntaxTests/multiSource/one_source.sol
index 9c1d92eb5..222b9dbbf 100644
--- a/test/libsolidity/syntaxTests/multiSource/one_source.sol
+++ b/test/libsolidity/syntaxTests/multiSource/one_source.sol
@@ -4,4 +4,4 @@ contract A {
 	function f() public pure { x = 42; }
 }
 // ----
-// TypeError 8961: (SourceName:53-54): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (SourceName:53-54='x'): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis.sol b/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis.sol
index 94271585d..94c73fce1 100644
--- a/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis.sol
+++ b/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis.sol
@@ -12,4 +12,4 @@ contract D is C
 	function bar() public pure returns (uint) { reverting(); }
 }
 // ----
-// Warning 6321: (s2.sol:72-76): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (s2.sol:72-76='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis_complex.sol b/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis_complex.sol
index d7e569542..8d24311ab 100644
--- a/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis_complex.sol
+++ b/test/libsolidity/syntaxTests/multiSource/split_contract_hierarchy_control_flow_analysis_complex.sol
@@ -21,4 +21,4 @@ contract D is C
 	function xxx() public override pure returns(uint) { revert(); }
 }
 // ----
-// Warning 6321: (s1.sol:215-219): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (s1.sol:215-219='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponents.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponents.sol
index 791e50784..9ce73991f 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponents.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponents.sol
@@ -15,11 +15,11 @@ contract C {
     }
 }
 // ----
-// TypeError 7364: (47-61): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 7364: (71-87): Different number of components on the left hand side (1) than on the right hand side (3).
-// TypeError 7364: (97-115): Different number of components on the left hand side (1) than on the right hand side (4).
+// TypeError 7364: (47-61='uint a = (1,2)'): Different number of components on the left hand side (1) than on the right hand side (2).
+// TypeError 7364: (71-87='uint b = (1,2,3)'): Different number of components on the left hand side (1) than on the right hand side (3).
+// TypeError 7364: (97-115='uint c = (1,2,3,4)'): Different number of components on the left hand side (1) than on the right hand side (4).
 // TypeError 7364: (157-197): Different number of components on the left hand side (4) than on the right hand side (1).
-// TypeError 7364: (207-238): Different number of components on the left hand side (3) than on the right hand side (1).
-// TypeError 7364: (248-270): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError 7364: (207-238='(uint a2, uint b2, uint c2) = 1'): Different number of components on the left hand side (3) than on the right hand side (1).
+// TypeError 7364: (248-270='(uint a3, uint b3) = 1'): Different number of components on the left hand side (2) than on the right hand side (1).
 // TypeError 7364: (312-358): Different number of components on the left hand side (4) than on the right hand side (3).
 // TypeError 7364: (368-407): Different number of components on the left hand side (3) than on the right hand side (4).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponentsFromReturn.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponentsFromReturn.sol
index 1cd676ef8..dd34fa51e 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponentsFromReturn.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/differentNumberOfComponentsFromReturn.sol
@@ -19,11 +19,11 @@ contract C {
     function four() public pure returns (uint, uint, uint, uint) {}
 }
 // ----
-// TypeError 7364: (47-61): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 7364: (71-87): Different number of components on the left hand side (1) than on the right hand side (3).
-// TypeError 7364: (97-112): Different number of components on the left hand side (1) than on the right hand side (4).
+// TypeError 7364: (47-61='uint a = two()'): Different number of components on the left hand side (1) than on the right hand side (2).
+// TypeError 7364: (71-87='uint b = three()'): Different number of components on the left hand side (1) than on the right hand side (3).
+// TypeError 7364: (97-112='uint c = four()'): Different number of components on the left hand side (1) than on the right hand side (4).
 // TypeError 7364: (154-198): Different number of components on the left hand side (4) than on the right hand side (1).
 // TypeError 7364: (208-243): Different number of components on the left hand side (3) than on the right hand side (1).
-// TypeError 7364: (253-279): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError 7364: (253-279='(uint a3, uint b3) = one()'): Different number of components on the left hand side (2) than on the right hand side (1).
 // TypeError 7364: (321-367): Different number of components on the left hand side (4) than on the right hand side (3).
 // TypeError 7364: (377-413): Different number of components on the left hand side (3) than on the right hand side (4).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcards.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcards.sol
index 6942a99ea..dec7a7019 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcards.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcards.sol
@@ -13,12 +13,12 @@ contract C {
     }
 }
 // ----
-// TypeError 7364: (53-72): Different number of components on the left hand side (2) than on the right hand side (3).
-// TypeError 7364: (82-101): Different number of components on the left hand side (2) than on the right hand side (3).
-// TypeError 7364: (111-135): Different number of components on the left hand side (3) than on the right hand side (5).
-// TypeError 7364: (145-174): Different number of components on the left hand side (3) than on the right hand side (4).
-// TypeError 7364: (184-213): Different number of components on the left hand side (3) than on the right hand side (4).
-// TypeError 7364: (223-251): Different number of components on the left hand side (4) than on the right hand side (3).
-// TypeError 7364: (261-274): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (284-297): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (307-321): Different number of components on the left hand side (3) than on the right hand side (1).
+// TypeError 7364: (53-72='(uint a,) = (1,2,3)'): Different number of components on the left hand side (2) than on the right hand side (3).
+// TypeError 7364: (82-101='(,uint b) = (1,2,3)'): Different number of components on the left hand side (2) than on the right hand side (3).
+// TypeError 7364: (111-135='(,uint c,) = (1,2,3,4,5)'): Different number of components on the left hand side (3) than on the right hand side (5).
+// TypeError 7364: (145-174='(uint d, uint e,) = (1,2,3,4)'): Different number of components on the left hand side (3) than on the right hand side (4).
+// TypeError 7364: (184-213='(,uint f, uint g) = (1,2,3,4)'): Different number of components on the left hand side (3) than on the right hand side (4).
+// TypeError 7364: (223-251='(,uint h, uint i,) = (1,2,3)'): Different number of components on the left hand side (4) than on the right hand side (3).
+// TypeError 7364: (261-274='(uint j,) = 1'): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError 7364: (284-297='(,uint k) = 1'): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError 7364: (307-321='(,uint l,) = 1'): Different number of components on the left hand side (3) than on the right hand side (1).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcardsFromReturn.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcardsFromReturn.sol
index 26055d41f..6f691aacb 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcardsFromReturn.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/disallowWildcardsFromReturn.sol
@@ -19,13 +19,13 @@ abstract contract C {
     function five() public pure returns (uint, uint, uint, uint, uint) {}
 }
 // ----
-// TypeError 7364: (62-81): Different number of components on the left hand side (2) than on the right hand side (3).
-// TypeError 7364: (91-110): Different number of components on the left hand side (2) than on the right hand side (3).
-// TypeError 7364: (120-139): Different number of components on the left hand side (3) than on the right hand side (5).
-// TypeError 7364: (149-175): Different number of components on the left hand side (3) than on the right hand side (4).
-// TypeError 7364: (185-211): Different number of components on the left hand side (3) than on the right hand side (4).
-// TypeError 7364: (221-249): Different number of components on the left hand side (4) than on the right hand side (3).
-// TypeError 7364: (259-276): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (286-303): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (313-331): Different number of components on the left hand side (3) than on the right hand side (1).
-// TypeError 7364: (341-368): Different number of components on the left hand side (4) than on the right hand side (5).
+// TypeError 7364: (62-81='(uint a,) = three()'): Different number of components on the left hand side (2) than on the right hand side (3).
+// TypeError 7364: (91-110='(,uint b) = three()'): Different number of components on the left hand side (2) than on the right hand side (3).
+// TypeError 7364: (120-139='(,uint c,) = five()'): Different number of components on the left hand side (3) than on the right hand side (5).
+// TypeError 7364: (149-175='(uint d, uint e,) = four()'): Different number of components on the left hand side (3) than on the right hand side (4).
+// TypeError 7364: (185-211='(,uint f, uint g) = four()'): Different number of components on the left hand side (3) than on the right hand side (4).
+// TypeError 7364: (221-249='(,uint h, uint i,) = three()'): Different number of components on the left hand side (4) than on the right hand side (3).
+// TypeError 7364: (259-276='(uint j,) = one()'): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError 7364: (286-303='(,uint k) = one()'): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError 7364: (313-331='(,uint l,) = one()'): Different number of components on the left hand side (3) than on the right hand side (1).
+// TypeError 7364: (341-368='(,uint m, uint n,) = five()'): Different number of components on the left hand side (4) than on the right hand side (5).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiSingleVariableDeclaration.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiSingleVariableDeclaration.sol
index b08ca8fc0..0e603a6ad 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiSingleVariableDeclaration.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiSingleVariableDeclaration.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// Warning 5740: (78-79): Unreachable code.
+// Warning 5740: (78-79='a'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
index b1ec065ac..3fefd2097 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationComplex.sol
@@ -9,7 +9,7 @@ contract C {
   function g() internal pure returns (uint, uint, uint, D.S[20] storage x, uint) { x = x; }
 }
 // ----
-// Warning 6321: (176-180): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (182-186): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (188-192): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (213-217): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (176-180='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (182-186='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (188-192='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (213-217='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationEmpty.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationEmpty.sol
index 05ae8b440..6f06d43db 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationEmpty.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationEmpty.sol
@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ----
-// TypeError 7364: (52-74): Different number of components on the left hand side (2) than on the right hand side (0).
-// TypeError 7364: (84-98): Different number of components on the left hand side (1) than on the right hand side (0).
-// TypeError 7364: (108-120): Different number of components on the left hand side (1) than on the right hand side (0).
+// TypeError 7364: (52-74='(uint a, uint b) = f()'): Different number of components on the left hand side (2) than on the right hand side (0).
+// TypeError 7364: (84-98='(uint c) = f()'): Different number of components on the left hand side (1) than on the right hand side (0).
+// TypeError 7364: (108-120='uint d = f()'): Different number of components on the left hand side (1) than on the right hand side (0).
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping.sol
index 9b07ac8fb..305796ba2 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping.sol
@@ -7,4 +7,4 @@ contract C {
   }
 }
 // ----
-// DeclarationError 7576: (99-100): Undeclared identifier.
+// DeclarationError 7576: (99-100='a'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping2.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping2.sol
index 8a37f42f5..609e59b02 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping2.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationScoping2.sol
@@ -6,6 +6,6 @@ contract C {
   }
 }
 // ----
-// DeclarationError 7576: (79-80): Undeclared identifier. "a" is not (or not yet) visible at this point.
-// DeclarationError 7576: (82-83): Undeclared identifier. "b" is not (or not yet) visible at this point.
-// DeclarationError 7576: (85-86): Undeclared identifier. "c" is not (or not yet) visible at this point.
+// DeclarationError 7576: (79-80='a'): Undeclared identifier. "a" is not (or not yet) visible at this point.
+// DeclarationError 7576: (82-83='b'): Undeclared identifier. "b" is not (or not yet) visible at this point.
+// DeclarationError 7576: (85-86='c'): Undeclared identifier. "c" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
index 742ae5a0d..0556edd35 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationSimple.sol
@@ -10,5 +10,5 @@ contract C {
   function h() internal pure returns (bytes memory, string storage s) { s = s; }
 }
 // ----
-// Warning 5740: (111-115): Unreachable code.
-// Warning 6321: (250-262): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 5740: (111-115='a; b'): Unreachable code.
+// Warning 6321: (250-262='bytes memory'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationThatIsExpression.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationThatIsExpression.sol
index eb313eadd..ba9de0a08 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationThatIsExpression.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/multiVariableDeclarationThatIsExpression.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// TypeError 4247: (160-168): Expression has to be an lvalue.
+// TypeError 4247: (160-168='s.x[2]()'): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/multiVariableDeclaration/oneElementTuple.sol b/test/libsolidity/syntaxTests/multiVariableDeclaration/oneElementTuple.sol
index b3b365fed..47863c25b 100644
--- a/test/libsolidity/syntaxTests/multiVariableDeclaration/oneElementTuple.sol
+++ b/test/libsolidity/syntaxTests/multiVariableDeclaration/oneElementTuple.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 8381: (59-63): Tuple component cannot be empty.
+// TypeError 8381: (59-63='(1,)'): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/001_name_references.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/001_name_references.sol
index cfbf9365e..3cea434db 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/001_name_references.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/001_name_references.sol
@@ -3,5 +3,5 @@ contract test {
     function f(uint256) public returns (uint out) { f(variable); test; out; }
 }
 // ----
-// Warning 5740: (103-112): Unreachable code.
-// Warning 6133: (103-107): Statement has no effect.
+// Warning 5740: (103-112='test; out'): Unreachable code.
+// Warning 6133: (103-107='test'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/002_undeclared_name.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/002_undeclared_name.sol
index 10f733fd2..566664aa7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/002_undeclared_name.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/002_undeclared_name.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7576: (85-93): Undeclared identifier.
+// DeclarationError 7576: (85-93='notfound'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/003_undeclared_name_is_not_fatal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/003_undeclared_name_is_not_fatal.sol
index a3590ba01..f49bc3b37 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/003_undeclared_name_is_not_fatal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/003_undeclared_name_is_not_fatal.sol
@@ -6,5 +6,5 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7576: (85-93): Undeclared identifier.
-// DeclarationError 7576: (106-114): Undeclared identifier.
+// DeclarationError 7576: (85-93='notfound'): Undeclared identifier.
+// DeclarationError 7576: (106-114='notfound'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/010_type_conversion_for_comparison.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/010_type_conversion_for_comparison.sol
index 2dcd2ab69..e217bacb0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/010_type_conversion_for_comparison.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/010_type_conversion_for_comparison.sol
@@ -2,5 +2,5 @@ contract test {
     function f() public { uint32(2) == uint64(2); }
 }
 // ----
-// Warning 6133: (42-64): Statement has no effect.
+// Warning 6133: (42-64='uint32(2) == uint64(2)'): Statement has no effect.
 // Warning 2018: (20-67): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
index ea30647df..96435a9a2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
@@ -2,4 +2,4 @@ contract test {
     function f() public { int32(2) == uint64(2); }
 }
 // ----
-// TypeError 2271: (42-63): Operator == not compatible with types int32 and uint64
+// TypeError 2271: (42-63='int32(2) == uint64(2)'): Operator == not compatible with types int32 and uint64
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/013_large_string_literal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/013_large_string_literal.sol
index 354b6ed0e..0c32a8ec6 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/013_large_string_literal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/013_large_string_literal.sol
@@ -2,5 +2,5 @@ contract test {
     function f() public { string memory x = "123456789012345678901234567890123"; }
 }
 // ----
-// Warning 2072: (42-57): Unused local variable.
+// Warning 2072: (42-57='string memory x'): Unused local variable.
 // Warning 2018: (20-98): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/014_balance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/014_balance.sol
index 8a8945ebb..12d344210 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/014_balance.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/014_balance.sol
@@ -4,5 +4,5 @@ contract test {
     }
 }
 // ----
-// Warning 2072: (52-61): Unused local variable.
+// Warning 2072: (52-61='uint256 x'): Unused local variable.
 // Warning 2018: (20-89): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/015_balance_invalid.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/015_balance_invalid.sol
index dcd2be341..0b602fbda 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/015_balance_invalid.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/015_balance_invalid.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4247: (52-70): Expression has to be an lvalue.
+// TypeError 4247: (52-70='address(0).balance'): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/017_assignment_to_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/017_assignment_to_struct.sol
index a1fed9967..a91a53a4b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/017_assignment_to_struct.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/017_assignment_to_struct.sol
@@ -9,4 +9,4 @@ contract test {
     }
 }
 // ----
-// TypeError 9214: (152-156): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (152-156='data'): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/018_forward_function_reference.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/018_forward_function_reference.sol
index d4c9a1882..d7a24aa82 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/018_forward_function_reference.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/018_forward_function_reference.sol
@@ -9,4 +9,4 @@ contract Second {
     }
 }
 // ----
-// Warning 6321: (192-196): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (192-196='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
index 9f50403cb..06ff533ca 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (147-153): Operator == not compatible with types mapping(uint256 => uint256) and mapping(uint256 => uint256)
+// TypeError 2271: (147-153='x == y'): Operator == not compatible with types mapping(uint256 => uint256) and mapping(uint256 => uint256)
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol
index c9075a4cd..3f1bebc8c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/045_returning_multi_dimensional_arrays.sol
@@ -3,4 +3,4 @@ contract C {
     function f() public pure returns (string[][] memory) {}
 }
 // ----
-// TypeError 4957: (71-88): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (71-88='string[][] memory'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol
index ee8c7f18d..b945bb833 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/046_returning_multi_dimensional_static_arrays.sol
@@ -3,4 +3,4 @@ contract C {
     function f() public pure returns (uint[][2] memory) {}
 }
 // ----
-// TypeError 4957: (71-87): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (71-87='uint[][2] memory'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol
index 77c77831e..188babf78 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/048_returning_arrays_in_structs_arrays.sol
@@ -4,4 +4,4 @@ contract C {
     function f() public pure returns (S memory x) {}
 }
 // ----
-// TypeError 4957: (100-110): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 4957: (100-110='S memory x'): This type is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/050_function_external_call_not_allowed_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/050_function_external_call_not_allowed_conversion.sol
index e4e02269b..fbe786e95 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/050_function_external_call_not_allowed_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/050_function_external_call_not_allowed_conversion.sol
@@ -7,4 +7,4 @@ contract Test {
     function g (C c) external {}
 }
 // ----
-// TypeError 9553: (103-106): Invalid type for argument in function call. Invalid implicit conversion from address to contract C requested.
+// TypeError 9553: (103-106='arg'): Invalid type for argument in function call. Invalid implicit conversion from address to contract C requested.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/052_function_internal_not_allowed_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/052_function_internal_not_allowed_conversion.sol
index cc23fdf6e..0fca4dbe0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/052_function_internal_not_allowed_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/052_function_internal_not_allowed_conversion.sol
@@ -9,4 +9,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 9553: (136-137): Invalid type for argument in function call. Invalid implicit conversion from address to contract C requested.
+// TypeError 9553: (136-137='a'): Invalid type for argument in function call. Invalid implicit conversion from address to contract C requested.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/056_cyclic_inheritance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/056_cyclic_inheritance.sol
index 287aa93dc..e45c1463b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/056_cyclic_inheritance.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/056_cyclic_inheritance.sol
@@ -1,4 +1,4 @@
 contract A is B { }
 contract B is A { }
 // ----
-// TypeError 2449: (14-15): Definition of base has to precede definition of derived contract
+// TypeError 2449: (14-15='B'): Definition of base has to precede definition of derived contract
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/059_illegal_override_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/059_illegal_override_visibility.sol
index c7bcad6e3..8aa73f761 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/059_illegal_override_visibility.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/059_illegal_override_visibility.sol
@@ -1,5 +1,5 @@
 contract B { function f() virtual internal {} }
 contract C is B { function f() public {} }
 // ----
-// TypeError 9456: (66-88): Overriding function is missing "override" specifier.
-// TypeError 9098: (66-88): Overriding function visibility differs.
+// TypeError 9456: (66-88='function f() public {}'): Overriding function is missing "override" specifier.
+// TypeError 9098: (66-88='function f() public {}'): Overriding function visibility differs.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/060_complex_inheritance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/060_complex_inheritance.sol
index f817fe286..2a7825110 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/060_complex_inheritance.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/060_complex_inheritance.sol
@@ -2,4 +2,4 @@ contract A { function f() public virtual { uint8 x = C(address(0)).g(); } }
 contract B { function f() public virtual {} function g() public returns (uint8) {} }
 contract C is A, B { function f() public override (A, B) { A.f(); } }
 // ----
-// Warning 2072: (43-50): Unused local variable.
+// Warning 2072: (43-50='uint8 x'): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol
index 0e123ae23..16eb28230 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol
@@ -1,4 +1,4 @@
 contract A { constructor(uint a) { } }
 contract B is A { }
 // ----
-// TypeError 3656: (39-58): Contract "B" should be marked as abstract.
+// TypeError 3656: (39-58='contract B is A { }'): Contract "B" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
index 0e123ae23..16eb28230 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
@@ -1,4 +1,4 @@
 contract A { constructor(uint a) { } }
 contract B is A { }
 // ----
-// TypeError 3656: (39-58): Contract "B" should be marked as abstract.
+// TypeError 3656: (39-58='contract B is A { }'): Contract "B" should be marked as abstract.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/063_implicit_derived_to_base_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/063_implicit_derived_to_base_conversion.sol
index d055b56ad..955578ebe 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/063_implicit_derived_to_base_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/063_implicit_derived_to_base_conversion.sol
@@ -3,5 +3,5 @@ contract B is A {
     function f() public { A a = B(address(1)); }
 }
 // ----
-// Warning 2072: (59-62): Unused local variable.
+// Warning 2072: (59-62='A a'): Unused local variable.
 // Warning 2018: (37-81): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/064_implicit_base_to_derived_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/064_implicit_base_to_derived_conversion.sol
index 3ef4ca3c1..73c2d702b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/064_implicit_base_to_derived_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/064_implicit_base_to_derived_conversion.sol
@@ -3,4 +3,4 @@ contract B is A {
     function f() public { B b = A(address(1)); }
 }
 // ----
-// TypeError 9574: (59-78): Type contract A is not implicitly convertible to expected type contract B.
+// TypeError 9574: (59-78='B b = A(address(1))'): Type contract A is not implicitly convertible to expected type contract B.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/065_super_excludes_current_contract.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/065_super_excludes_current_contract.sol
index d94f5bcc6..2c23f417c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/065_super_excludes_current_contract.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/065_super_excludes_current_contract.sol
@@ -8,4 +8,4 @@ contract B is A {
     }
 }
 // ----
-// TypeError 9582: (95-102): Member "f" not found or not visible after argument-dependent lookup in type(contract super B).
+// TypeError 9582: (95-102='super.f'): Member "f" not found or not visible after argument-dependent lookup in type(contract super B).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/067_function_clash_with_state_variable_accessor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/067_function_clash_with_state_variable_accessor.sol
index 67726f6d7..b3a3a03e5 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/067_function_clash_with_state_variable_accessor.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/067_function_clash_with_state_variable_accessor.sol
@@ -6,4 +6,4 @@ contract test {
     function foo() public {}
 }
 // ----
-// DeclarationError 2333: (90-114): Identifier already declared.
+// DeclarationError 2333: (90-114='function foo() public {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol
index 79e7f17fc..f110d89c9 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol
@@ -3,4 +3,4 @@ contract test {
     Data public data;
 }
 // ----
-// TypeError 5359: (58-74): The struct has all its members omitted, therefore the getter cannot return any values.
+// TypeError 5359: (58-74='Data public data'): The struct has all its members omitted, therefore the getter cannot return any values.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/072_state_variable_member_of_wrong_class1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/072_state_variable_member_of_wrong_class1.sol
index 40d86ebf8..838365374 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/072_state_variable_member_of_wrong_class1.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/072_state_variable_member_of_wrong_class1.sol
@@ -8,4 +8,4 @@ contract Child is Parent2 {
     function foo() public returns (uint256) { return Parent2.m_aMember1; }
 }
 // ----
-// TypeError 9582: (200-218): Member "m_aMember1" not found or not visible after argument-dependent lookup in type(contract Parent2).
+// TypeError 9582: (200-218='Parent2.m_aMember1'): Member "m_aMember1" not found or not visible after argument-dependent lookup in type(contract Parent2).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/073_state_variable_member_of_wrong_class2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/073_state_variable_member_of_wrong_class2.sol
index f56084bda..3442080ba 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/073_state_variable_member_of_wrong_class2.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/073_state_variable_member_of_wrong_class2.sol
@@ -9,4 +9,4 @@ contract Child is Parent2 {
     uint256 public m_aMember3;
 }
 // ----
-// TypeError 9582: (200-216): Member "m_aMember2" not found or not visible after argument-dependent lookup in type(contract Child).
+// TypeError 9582: (200-216='Child.m_aMember2'): Member "m_aMember2" not found or not visible after argument-dependent lookup in type(contract Child).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/076_fallback_function_in_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/076_fallback_function_in_library.sol
index 0f4123175..b6d12fed2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/076_fallback_function_in_library.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/076_fallback_function_in_library.sol
@@ -2,4 +2,4 @@ library C {
     fallback() external {}
 }
 // ----
-// TypeError 5982: (16-38): Libraries cannot have fallback functions.
+// TypeError 5982: (16-38='fallback() external {}'): Libraries cannot have fallback functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/076_receive_function_in_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/076_receive_function_in_library.sol
index f9ed07692..251b5e60f 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/076_receive_function_in_library.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/076_receive_function_in_library.sol
@@ -2,5 +2,5 @@ library C {
     receive() external payable {}
 }
 // ----
-// DeclarationError 4549: (16-45): Libraries cannot have receive ether functions.
-// TypeError 7708: (16-45): Library functions cannot be payable.
+// DeclarationError 4549: (16-45='receive() external payable {}'): Libraries cannot have receive ether functions.
+// TypeError 7708: (16-45='receive() external payable {}'): Library functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/077_fallback_function_with_return_parameters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/077_fallback_function_with_return_parameters.sol
index 268a7e69b..131fca82d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/077_fallback_function_with_return_parameters.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/077_fallback_function_with_return_parameters.sol
@@ -2,4 +2,4 @@ contract C {
     fallback() external returns (uint) { }
 }
 // ----
-// TypeError 5570: (45-51): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
+// TypeError 5570: (45-51='(uint)'): Fallback function either has to have the signature "fallback()" or "fallback(bytes calldata) returns (bytes memory)".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/097_access_to_internal_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/097_access_to_internal_function.sol
index 028947d63..5878c2e60 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/097_access_to_internal_function.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/097_access_to_internal_function.sol
@@ -5,4 +5,4 @@ contract d {
     function g() public { c(address(0)).f(); }
 }
 // ----
-// TypeError 9582: (83-98): Member "f" not found or not visible after argument-dependent lookup in contract c.
+// TypeError 9582: (83-98='c(address(0)).f'): Member "f" not found or not visible after argument-dependent lookup in contract c.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/098_access_to_default_state_variable_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/098_access_to_default_state_variable_visibility.sol
index efdedc4f1..4e911d146 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/098_access_to_default_state_variable_visibility.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/098_access_to_default_state_variable_visibility.sol
@@ -5,4 +5,4 @@ contract d {
     function g() public { c(address(0)).a(); }
 }
 // ----
-// TypeError 9582: (66-81): Member "a" not found or not visible after argument-dependent lookup in contract c.
+// TypeError 9582: (66-81='c(address(0)).a'): Member "a" not found or not visible after argument-dependent lookup in contract c.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
index e2ef8518d..cefbee43f 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
@@ -2,5 +2,5 @@ contract test {
     function f(uint[] memory constant a) public { }
 }
 // ----
-// DeclarationError 1788: (31-55): The "constant" keyword can only be used for state variables or variables at file level.
-// TypeError 9259: (31-55): Only constants of value type and byte array type are implemented.
+// DeclarationError 1788: (31-55='uint[] memory constant a'): The "constant" keyword can only be used for state variables or variables at file level.
+// TypeError 9259: (31-55='uint[] memory constant a'): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/108_empty_name_return_parameter_with_named_one.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/108_empty_name_return_parameter_with_named_one.sol
index 241d15f10..2a254277f 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/108_empty_name_return_parameter_with_named_one.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/108_empty_name_return_parameter_with_named_one.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 8863: (77-85): Different number of arguments in return statement than in returns declaration.
+// TypeError 8863: (77-85='return 5'): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
index 49f9877e2..252187341 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
@@ -2,4 +2,4 @@ contract test {
     function f() public returns (uint d) { return 2 ** 10000000000; }
 }
 // ----
-// TypeError 2271: (66-82): Operator ** not compatible with types int_const 2 and int_const 10000000000
+// TypeError 2271: (66-82='2 ** 10000000000'): Operator ** not compatible with types int_const 2 and int_const 10000000000
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/127_enum_invalid_direct_member_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/127_enum_invalid_direct_member_access.sol
index 9dc9fb449..df2eb551b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/127_enum_invalid_direct_member_access.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/127_enum_invalid_direct_member_access.sol
@@ -6,4 +6,4 @@ contract test {
     ActionChoices choices;
 }
 // ----
-// DeclarationError 7576: (114-117): Undeclared identifier.
+// DeclarationError 7576: (114-117='Sit'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/130_enum_implicit_conversion_is_not_okay_256.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/130_enum_implicit_conversion_is_not_okay_256.sol
index 79e45f82c..346c4e6ab 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/130_enum_implicit_conversion_is_not_okay_256.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/130_enum_implicit_conversion_is_not_okay_256.sol
@@ -6,4 +6,4 @@ contract test {
     uint256 a;
 }
 // ----
-// TypeError 7407: (108-132): Type enum test.ActionChoices is not implicitly convertible to expected type uint256.
+// TypeError 7407: (108-132='ActionChoices.GoStraight'): Type enum test.ActionChoices is not implicitly convertible to expected type uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/131_enum_implicit_conversion_is_not_okay_64.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/131_enum_implicit_conversion_is_not_okay_64.sol
index f57df6707..0479d3eea 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/131_enum_implicit_conversion_is_not_okay_64.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/131_enum_implicit_conversion_is_not_okay_64.sol
@@ -6,4 +6,4 @@ contract test {
     uint64 b;
 }
 // ----
-// TypeError 7407: (108-125): Type enum test.ActionChoices is not implicitly convertible to expected type uint64.
+// TypeError 7407: (108-125='ActionChoices.Sit'): Type enum test.ActionChoices is not implicitly convertible to expected type uint64.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/132_enum_to_enum_conversion_is_not_okay.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/132_enum_to_enum_conversion_is_not_okay.sol
index 73588a5bc..0d84b80c7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/132_enum_to_enum_conversion_is_not_okay.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/132_enum_to_enum_conversion_is_not_okay.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// TypeError 9640: (130-146): Explicit type conversion not allowed from "enum test.Paper" to "enum test.Ground".
+// TypeError 9640: (130-146='Ground(Paper.Up)'): Explicit type conversion not allowed from "enum test.Paper" to "enum test.Ground".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/133_enum_duplicate_values.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/133_enum_duplicate_values.sol
index bcd1ad52b..8fcc49ddc 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/133_enum_duplicate_values.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/133_enum_duplicate_values.sol
@@ -2,4 +2,4 @@
         enum ActionChoices { GoLeft, GoRight, GoLeft, Sit }
     }
 // ----
-// DeclarationError 2333: (66-72): Identifier already declared.
+// DeclarationError 2333: (66-72='GoLeft'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/135_private_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/135_private_visibility.sol
index 160ceaec7..1605bf927 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/135_private_visibility.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/135_private_visibility.sol
@@ -5,4 +5,4 @@ contract derived is base {
     function g() public { f(); }
 }
 // ----
-// DeclarationError 7576: (99-100): Undeclared identifier.
+// DeclarationError 7576: (99-100='f'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/136_private_visibility_via_explicit_base_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/136_private_visibility_via_explicit_base_access.sol
index 64fd5fdf1..67fc5655f 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/136_private_visibility_via_explicit_base_access.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/136_private_visibility_via_explicit_base_access.sol
@@ -5,4 +5,4 @@ contract derived is base {
     function g() public { base.f(); }
 }
 // ----
-// TypeError 9582: (99-105): Member "f" not found or not visible after argument-dependent lookup in type(contract base).
+// TypeError 9582: (99-105='base.f'): Member "f" not found or not visible after argument-dependent lookup in type(contract base).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/137_external_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/137_external_visibility.sol
index d8090e1e0..18eac48bd 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/137_external_visibility.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/137_external_visibility.sol
@@ -3,4 +3,4 @@ contract c {
     function g() public { f(); }
 }
 // ----
-// DeclarationError 7576: (68-69): Undeclared identifier. "f" is not (or not yet) visible at this point.
+// DeclarationError 7576: (68-69='f'): Undeclared identifier. "f" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/138_similar_name_suggestions_expected.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/138_similar_name_suggestions_expected.sol
index 5c0508f1f..3f6b3939b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/138_similar_name_suggestions_expected.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/138_similar_name_suggestions_expected.sol
@@ -3,4 +3,4 @@ contract c {
     function g() public { fun(); }
 }
 // ----
-// DeclarationError 7576: (69-72): Undeclared identifier. Did you mean "func"?
+// DeclarationError 7576: (69-72='fun'): Undeclared identifier. Did you mean "func"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/139_no_name_suggestion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/139_no_name_suggestion.sol
index c3619934e..21e16d38c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/139_no_name_suggestion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/139_no_name_suggestion.sol
@@ -2,4 +2,4 @@ contract c {
     function g() public { fun(); }
 }
 // ----
-// DeclarationError 7576: (39-42): Undeclared identifier.
+// DeclarationError 7576: (39-42='fun'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/140_multiple_similar_suggestions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/140_multiple_similar_suggestions.sol
index aa7bc7b5d..cc59ba5d6 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/140_multiple_similar_suggestions.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/140_multiple_similar_suggestions.sol
@@ -8,4 +8,4 @@ contract c {
     }
 }
 // ----
-// DeclarationError 7576: (151-155): Undeclared identifier. Did you mean "var1", "var2", "var3", "var4" or "var5"?
+// DeclarationError 7576: (151-155='varx'): Undeclared identifier. Did you mean "var1", "var2", "var3", "var4" or "var5"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/141_multiple_scopes_suggestions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/141_multiple_scopes_suggestions.sol
index db870e19c..2f459c825 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/141_multiple_scopes_suggestions.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/141_multiple_scopes_suggestions.sol
@@ -6,4 +6,4 @@ contract c {
     }
 }
 // ----
-// DeclarationError 7576: (101-105): Undeclared identifier. Did you mean "log8" or "log9"?
+// DeclarationError 7576: (101-105='lgox'): Undeclared identifier. Did you mean "log8" or "log9"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/142_inheritence_suggestions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/142_inheritence_suggestions.sol
index a7533abbe..7fd84070b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/142_inheritence_suggestions.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/142_inheritence_suggestions.sol
@@ -5,4 +5,4 @@ contract c is a {
     }
 }
 // ----
-// DeclarationError 7576: (105-108): Undeclared identifier. Did you mean "func"?
+// DeclarationError 7576: (105-108='fun'): Undeclared identifier. Did you mean "func"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/143_no_spurious_identifier_suggestions_with_submatch.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/143_no_spurious_identifier_suggestions_with_submatch.sol
index 4a97864cd..a99f6851d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/143_no_spurious_identifier_suggestions_with_submatch.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/143_no_spurious_identifier_suggestions_with_submatch.sol
@@ -5,4 +5,4 @@ contract c {
      }
 }
 // ----
-// DeclarationError 7576: (78-83): Undeclared identifier.
+// DeclarationError 7576: (78-83='vaxyz'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/144_no_spurious_identifier_suggestions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/144_no_spurious_identifier_suggestions.sol
index f2e440665..9893b0cea 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/144_no_spurious_identifier_suggestions.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/144_no_spurious_identifier_suggestions.sol
@@ -5,4 +5,4 @@ contract c {
      }
 }
 // ----
-// DeclarationError 7576: (78-79): Undeclared identifier.
+// DeclarationError 7576: (78-79='x'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/145_external_base_visibility.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/145_external_base_visibility.sol
index 3892fd8ad..161923167 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/145_external_base_visibility.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/145_external_base_visibility.sol
@@ -5,4 +5,4 @@ contract derived is base {
     function g() public { base.f(); }
 }
 // ----
-// TypeError 3419: (100-108): Cannot call function via contract type name.
+// TypeError 3419: (100-108='base.f()'): Cannot call function via contract type name.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol
index 779c4a002..7fa3ddb6b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/150_array_with_nonconstant_length.sol
@@ -2,5 +2,5 @@ contract c {
     function f(uint a) public { uint8[a] x; }
 }
 // ----
-// TypeError 5462: (51-52): Invalid array length, expected integer literal or constant expression.
-// TypeError 6651: (45-55): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
+// TypeError 5462: (51-52='a'): Invalid array length, expected integer literal or constant expression.
+// TypeError 6651: (45-55='uint8[a] x'): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol
index 627f188fd..62fa8129f 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/151_array_with_negative_length.sol
@@ -2,5 +2,5 @@ contract c {
     function f(uint a) public { uint8[-1] x; }
 }
 // ----
-// TypeError 3658: (51-53): Array with negative length specified.
-// TypeError 6651: (45-56): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
+// TypeError 3658: (51-53='-1'): Array with negative length specified.
+// TypeError 6651: (45-56='uint8[-1] x'): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/152_array_copy_with_different_types1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/152_array_copy_with_different_types1.sol
index 1a5036d05..898fd876e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/152_array_copy_with_different_types1.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/152_array_copy_with_different_types1.sol
@@ -4,4 +4,4 @@ contract c {
     function f() public { b = a; }
 }
 // ----
-// TypeError 7407: (70-71): Type bytes storage ref is not implicitly convertible to expected type uint256[] storage ref.
+// TypeError 7407: (70-71='a'): Type bytes storage ref is not implicitly convertible to expected type uint256[] storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/153_array_copy_with_different_types2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/153_array_copy_with_different_types2.sol
index 7e4cc6f40..a3ada80af 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/153_array_copy_with_different_types2.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/153_array_copy_with_different_types2.sol
@@ -4,4 +4,4 @@ contract c {
     function f() public { b = a; }
 }
 // ----
-// TypeError 7407: (74-75): Type uint32[] storage ref is not implicitly convertible to expected type uint8[] storage ref.
+// TypeError 7407: (74-75='a'): Type uint32[] storage ref is not implicitly convertible to expected type uint8[] storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/156_array_copy_with_different_types_dynamic_static.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/156_array_copy_with_different_types_dynamic_static.sol
index ee26931cf..686838fd0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/156_array_copy_with_different_types_dynamic_static.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/156_array_copy_with_different_types_dynamic_static.sol
@@ -4,4 +4,4 @@ contract c {
     function f() public { b = a; }
 }
 // ----
-// TypeError 7407: (73-74): Type uint256[] storage ref is not implicitly convertible to expected type uint256[80] storage ref.
+// TypeError 7407: (73-74='a'): Type uint256[] storage ref is not implicitly convertible to expected type uint256[80] storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/157_array_of_undeclared_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/157_array_of_undeclared_type.sol
index 09c7654d1..3b036c5a0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/157_array_of_undeclared_type.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/157_array_of_undeclared_type.sol
@@ -2,4 +2,4 @@ contract c {
     a[] public foo;
 }
 // ----
-// DeclarationError 7920: (17-18): Identifier not found or not unique.
+// DeclarationError 7920: (17-18='a'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/158_storage_variable_initialization_with_incorrect_type_int.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/158_storage_variable_initialization_with_incorrect_type_int.sol
index 0d0baf400..7596136fb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/158_storage_variable_initialization_with_incorrect_type_int.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/158_storage_variable_initialization_with_incorrect_type_int.sol
@@ -2,4 +2,4 @@ contract c {
     uint8 a = 1000;
 }
 // ----
-// TypeError 7407: (27-31): Type int_const 1000 is not implicitly convertible to expected type uint8. Literal is too large to fit in uint8.
+// TypeError 7407: (27-31='1000'): Type int_const 1000 is not implicitly convertible to expected type uint8. Literal is too large to fit in uint8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/159_storage_variable_initialization_with_incorrect_type_string.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/159_storage_variable_initialization_with_incorrect_type_string.sol
index d907273f4..580853a78 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/159_storage_variable_initialization_with_incorrect_type_string.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/159_storage_variable_initialization_with_incorrect_type_string.sol
@@ -2,4 +2,4 @@ contract c {
     uint a = "abc";
 }
 // ----
-// TypeError 7407: (26-31): Type literal_string "abc" is not implicitly convertible to expected type uint256.
+// TypeError 7407: (26-31='"abc"'): Type literal_string "abc" is not implicitly convertible to expected type uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/160_test_byte_is_alias_of_byte1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/160_test_byte_is_alias_of_byte1.sol
index 4ab89a3a2..372a4b045 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/160_test_byte_is_alias_of_byte1.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/160_test_byte_is_alias_of_byte1.sol
@@ -3,5 +3,5 @@ contract c {
     function f() public { bytes1 a = arr[0];}
 }
 // ----
-// Warning 2072: (54-62): Unused local variable.
+// Warning 2072: (54-62='bytes1 a'): Unused local variable.
 // Warning 2018: (32-73): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/164_assigning_value_to_const_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/164_assigning_value_to_const_variable.sol
index cd71f3287..8a8ecc453 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/164_assigning_value_to_const_variable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/164_assigning_value_to_const_variable.sol
@@ -3,4 +3,4 @@ contract Foo {
     uint constant x = 56;
 }
 // ----
-// TypeError 6520: (48-49): Cannot assign to a constant variable.
+// TypeError 6520: (48-49='x'): Cannot assign to a constant variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/165_assigning_state_to_const_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/165_assigning_state_to_const_variable.sol
index 247b08bcf..ea60063ce 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/165_assigning_state_to_const_variable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/165_assigning_state_to_const_variable.sol
@@ -2,4 +2,4 @@ contract C {
     address constant x = msg.sender;
 }
 // ----
-// TypeError 8349: (38-48): Initial value for constant variable has to be compile-time constant.
+// TypeError 8349: (38-48='msg.sender'): Initial value for constant variable has to be compile-time constant.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/167_constant_string_literal_disallows_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/167_constant_string_literal_disallows_assignment.sol
index 4926c394a..3c9ab9c27 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/167_constant_string_literal_disallows_assignment.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/167_constant_string_literal_disallows_assignment.sol
@@ -7,4 +7,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 9961: (261-265): Index access for string is not possible.
+// TypeError 9961: (261-265='x[0]'): Index access for string is not possible.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/175_uninitialized_const_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/175_uninitialized_const_variable.sol
index 6fba36420..8965439f2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/175_uninitialized_const_variable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/175_uninitialized_const_variable.sol
@@ -2,4 +2,4 @@ contract Foo {
     uint constant y;
 }
 // ----
-// TypeError 4266: (19-34): Uninitialized "constant" variable.
+// TypeError 4266: (19-34='uint constant y'): Uninitialized "constant" variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/176_overloaded_function_cannot_resolve.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/176_overloaded_function_cannot_resolve.sol
index 1d10d3e78..b0ea03d3a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/176_overloaded_function_cannot_resolve.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/176_overloaded_function_cannot_resolve.sol
@@ -4,4 +4,4 @@ contract test {
     function g() public returns (uint) { return f(3, 5); }
 }
 // ----
-// TypeError 9322: (176-177): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (176-177='f'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/177_ambiguous_overloaded_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/177_ambiguous_overloaded_function.sol
index 52cdf1737..ec59f2bf3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/177_ambiguous_overloaded_function.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/177_ambiguous_overloaded_function.sol
@@ -5,4 +5,4 @@ contract test {
     function g() public returns (uint) { return f(1); }
 }
 // ----
-// TypeError 4487: (271-272): No unique declaration found after argument-dependent lookup.
+// TypeError 4487: (271-272='f'): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/179_assignment_of_overloaded_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/179_assignment_of_overloaded_function.sol
index ab57704b5..69a02fb0c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/179_assignment_of_overloaded_function.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/179_assignment_of_overloaded_function.sol
@@ -4,4 +4,4 @@ contract test {
     function g() public returns (uint) { function (uint) returns (uint) x = f; return x(7); }
 }
 // ----
-// TypeError 2144: (208-209): No matching declaration found after variable lookup.
+// TypeError 2144: (208-209='f'): No matching declaration found after variable lookup.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/180_external_types_clash.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/180_external_types_clash.sol
index c4d650a2b..fc42be4f9 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/180_external_types_clash.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/180_external_types_clash.sol
@@ -6,4 +6,4 @@ contract test is base {
     function f(uint8 a) public { }
 }
 // ----
-// TypeError 9914: (37-61): Function overload clash during conversion to external types for arguments.
+// TypeError 9914: (37-61='function f(a) public { }'): Function overload clash during conversion to external types for arguments.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/188_string_index.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/188_string_index.sol
index e71f53b7f..06f0d085d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/188_string_index.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/188_string_index.sol
@@ -3,4 +3,4 @@ contract C {
     function f() public { bytes1 a = s[2]; }
 }
 // ----
-// TypeError 9961: (64-68): Index access for string is not possible.
+// TypeError 9961: (64-68='s[2]'): Index access for string is not possible.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/189_string_length.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/189_string_length.sol
index 041b3fd6c..bfaac95a5 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/189_string_length.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/189_string_length.sol
@@ -3,4 +3,4 @@ contract C {
     function f() public { uint a = s.length; }
 }
 // ----
-// TypeError 9582: (62-70): Member "length" not found or not visible after argument-dependent lookup in string storage ref.
+// TypeError 9582: (62-70='s.length'): Member "length" not found or not visible after argument-dependent lookup in string storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/190_negative_integers_to_signed_out_of_bound.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/190_negative_integers_to_signed_out_of_bound.sol
index a4d84f2da..93030a70b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/190_negative_integers_to_signed_out_of_bound.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/190_negative_integers_to_signed_out_of_bound.sol
@@ -2,4 +2,4 @@ contract test {
     int8 public i = -129;
 }
 // ----
-// TypeError 7407: (36-40): Type int_const -129 is not implicitly convertible to expected type int8. Literal is too large to fit in int8.
+// TypeError 7407: (36-40='-129'): Type int_const -129 is not implicitly convertible to expected type int8. Literal is too large to fit in int8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/192_positive_integers_to_signed_out_of_bound.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/192_positive_integers_to_signed_out_of_bound.sol
index 0bc4699b3..3829489c8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/192_positive_integers_to_signed_out_of_bound.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/192_positive_integers_to_signed_out_of_bound.sol
@@ -2,4 +2,4 @@ contract test {
     int8 public j = 128;
 }
 // ----
-// TypeError 7407: (36-39): Type int_const 128 is not implicitly convertible to expected type int8. Literal is too large to fit in int8.
+// TypeError 7407: (36-39='128'): Type int_const 128 is not implicitly convertible to expected type int8. Literal is too large to fit in int8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/194_negative_integers_to_unsigned.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/194_negative_integers_to_unsigned.sol
index 0dac77a73..1496ca117 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/194_negative_integers_to_unsigned.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/194_negative_integers_to_unsigned.sol
@@ -2,4 +2,4 @@ contract test {
     uint8 public x = -1;
 }
 // ----
-// TypeError 7407: (37-39): Type int_const -1 is not implicitly convertible to expected type uint8. Cannot implicitly convert signed literal to unsigned type.
+// TypeError 7407: (37-39='-1'): Type int_const -1 is not implicitly convertible to expected type uint8. Cannot implicitly convert signed literal to unsigned type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/195_positive_integers_to_unsigned_out_of_bound.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/195_positive_integers_to_unsigned_out_of_bound.sol
index dbc43d7dd..f40df9232 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/195_positive_integers_to_unsigned_out_of_bound.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/195_positive_integers_to_unsigned_out_of_bound.sol
@@ -2,4 +2,4 @@ contract test {
     uint8 public x = 700;
 }
 // ----
-// TypeError 7407: (37-40): Type int_const 700 is not implicitly convertible to expected type uint8. Literal is too large to fit in uint8.
+// TypeError 7407: (37-40='700'): Type int_const 700 is not implicitly convertible to expected type uint8. Literal is too large to fit in uint8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
index 5b19505f0..c8a7368cd 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 1; uint y = 2; x || y; } }
 // ----
-// TypeError 2271: (62-68): Operator || not compatible with types uint256 and uint256
+// TypeError 2271: (62-68='x || y'): Operator || not compatible with types uint256 and uint256
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
index 8981af1b1..0ba65bcfb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 1; uint y = 2; x && y; } }
 // ----
-// TypeError 2271: (62-68): Operator && not compatible with types uint256 and uint256
+// TypeError 2271: (62-68='x && y'): Operator && not compatible with types uint256 and uint256
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
index 3c8fd4fc2..7b98a45f2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 1; !x; } }
 // ----
-// TypeError 4907: (50-52): Unary operator ! cannot be applied to type uint256
+// TypeError 4907: (50-52='!x'): Unary operator ! cannot be applied to type uint256
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol
index cabe9aa13..83b4db2fb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 3; int y = -4; x ** y; } }
 // ----
-// TypeError 2271: (62-68): Operator ** not compatible with types uint256 and int256. Exponentiation power is not allowed to be a signed integer type.
+// TypeError 2271: (62-68='x ** y'): Operator ** not compatible with types uint256 and int256. Exponentiation power is not allowed to be a signed integer type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol
index 188dda39c..0bb6e9388 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol
@@ -4,7 +4,7 @@ contract test {
     function i() public { int16 x = 4; x ** -3; }
 }
 // ----
-// TypeError 2271: (64-70): Operator ** not compatible with types int256 and int256. Exponentiation power is not allowed to be a signed integer type.
-// TypeError 2271: (126-132): Operator ** not compatible with types uint8 and int16. Exponentiation power is not allowed to be a signed integer type.
-// Warning 3149: (126-132): The result type of the exponentiation operation is equal to the type of the first operand (uint8) ignoring the (larger) type of the second operand (int16) which might be unexpected. Silence this warning by either converting the first or the second operand to the type of the other.
-// TypeError 2271: (175-182): Operator ** not compatible with types int16 and int_const -3. Exponentiation power is not allowed to be a negative integer literal.
+// TypeError 2271: (64-70='x ** y'): Operator ** not compatible with types int256 and int256. Exponentiation power is not allowed to be a signed integer type.
+// TypeError 2271: (126-132='x ** y'): Operator ** not compatible with types uint8 and int16. Exponentiation power is not allowed to be a signed integer type.
+// Warning 3149: (126-132='x ** y'): The result type of the exponentiation operation is equal to the type of the first operand (uint8) ignoring the (larger) type of the second operand (int16) which might be unexpected. Silence this warning by either converting the first or the second operand to the type of the other.
+// TypeError 2271: (175-182='x ** -3'): Operator ** not compatible with types int16 and int_const -3. Exponentiation power is not allowed to be a negative integer literal.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
index b1f63003f..04348444b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
@@ -1,3 +1,3 @@
 contract test { bytes a; bytes b; fallback() external { a == b; } }
 // ----
-// TypeError 2271: (56-62): Operator == not compatible with types bytes storage ref and bytes storage ref
+// TypeError 2271: (56-62='a == b'): Operator == not compatible with types bytes storage ref and bytes storage ref
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
index cdb7aeb01..4c8308bb3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
@@ -7,4 +7,4 @@ contract test {
   }
 }
 // ----
-// TypeError 2271: (79-85): Operator == not compatible with types struct test.s storage ref and struct test.s storage ref
+// TypeError 2271: (79-85='x == y'): Operator == not compatible with types struct test.s storage ref and struct test.s storage ref
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol
index f0e0f8b39..67a30cd3b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/205_overwrite_storage_location_external.sol
@@ -2,4 +2,4 @@ contract C {
     function f(uint[] storage a) external {}
 }
 // ----
-// TypeError 6651: (28-44): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
+// TypeError 6651: (28-44='uint[] storage a'): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol
index d9e929da2..5fc973289 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4061: (47-77): Type mapping(uint256 => uint256)[] is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (47-77='mapping(uint=>uint)[] memory x'): Type mapping(uint256 => uint256)[] is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/208_assignment_mem_to_local_storage_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/208_assignment_mem_to_local_storage_variable.sol
index 3d89796c4..0411c31a8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/208_assignment_mem_to_local_storage_variable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/208_assignment_mem_to_local_storage_variable.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (128-129): Type uint256[] memory is not implicitly convertible to expected type uint256[] storage pointer.
+// TypeError 7407: (128-129='x'): Type uint256[] memory is not implicitly convertible to expected type uint256[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/209_storage_assign_to_different_local_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/209_storage_assign_to_different_local_variable.sol
index aa6d55916..75ceff591 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/209_storage_assign_to_different_local_variable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/209_storage_assign_to_different_local_variable.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (163-164): Type uint8[] storage pointer is not implicitly convertible to expected type uint256[] storage pointer.
+// TypeError 7407: (163-164='x'): Type uint8[] storage pointer is not implicitly convertible to expected type uint256[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/210_uninitialized_mapping_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/210_uninitialized_mapping_variable.sol
index bfa56208c..31f1c0a26 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/210_uninitialized_mapping_variable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/210_uninitialized_mapping_variable.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4182: (47-78): Uninitialized mapping. Mappings cannot be created dynamically, you have to assign them from a state variable.
+// TypeError 4182: (47-78='mapping(uint => uint) storage x'): Uninitialized mapping. Mappings cannot be created dynamically, you have to assign them from a state variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol
index 16ac9ac1c..c5da7a3f3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/211_uninitialized_mapping_array_variable.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (95-96): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (95-96='x'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
index b1b43c631..6c21fb913 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9767: (97-105): Unary operator delete cannot be applied to type uint256[] storage pointer
+// TypeError 9767: (97-105='delete x'): Unary operator delete cannot be applied to type uint256[] storage pointer
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/215_function_argument_mem_to_storage.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/215_function_argument_mem_to_storage.sol
index 140ae8888..50c842e36 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/215_function_argument_mem_to_storage.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/215_function_argument_mem_to_storage.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9553: (113-114): Invalid type for argument in function call. Invalid implicit conversion from uint256[] memory to uint256[] storage pointer requested.
+// TypeError 9553: (113-114='x'): Invalid type for argument in function call. Invalid implicit conversion from uint256[] memory to uint256[] storage pointer requested.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/217_mem_array_assignment_changes_base_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/217_mem_array_assignment_changes_base_type.sol
index e9a1b9b48..85544a885 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/217_mem_array_assignment_changes_base_type.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/217_mem_array_assignment_changes_base_type.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (256-275): Type uint8[] memory is not implicitly convertible to expected type uint256[] memory.
+// TypeError 9574: (256-275='uint[] memory y = x'): Type uint8[] memory is not implicitly convertible to expected type uint256[] memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/219_memory_arrays_not_resizeable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/219_memory_arrays_not_resizeable.sol
index c4ab822d3..705d3ef13 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/219_memory_arrays_not_resizeable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/219_memory_arrays_not_resizeable.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7567: (72-80): Member "length" is read-only and cannot be used to resize arrays.
+// TypeError 7567: (72-80='x.length'): Member "length" is read-only and cannot be used to resize arrays.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/220_struct_constructor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/220_struct_constructor.sol
index 16c8b3cb5..28313f10c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/220_struct_constructor.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/220_struct_constructor.sol
@@ -5,5 +5,5 @@ contract C {
     }
 }
 // ----
-// Warning 2072: (80-90): Unused local variable.
+// Warning 2072: (80-90='S memory s'): Unused local variable.
 // Warning 2018: (50-110): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/221_struct_constructor_nested.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/221_struct_constructor_nested.sol
index 9f6a11586..a6cb094da 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/221_struct_constructor_nested.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/221_struct_constructor_nested.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// Warning 2072: (153-163): Unused local variable.
+// Warning 2072: (153-163='S memory s'): Unused local variable.
 // Warning 2018: (96-190): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/222_struct_named_constructor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/222_struct_named_constructor.sol
index a854664e3..de3e17be8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/222_struct_named_constructor.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/222_struct_named_constructor.sol
@@ -5,5 +5,5 @@ contract C {
     }
 }
 // ----
-// Warning 2072: (80-90): Unused local variable.
+// Warning 2072: (80-90='S memory s'): Unused local variable.
 // Warning 2018: (50-118): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/225_inheriting_from_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/225_inheriting_from_library.sol
index ed555b3c4..251be405e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/225_inheriting_from_library.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/225_inheriting_from_library.sol
@@ -1,4 +1,4 @@
 library Lib {}
 contract Test is Lib {}
 // ----
-// TypeError 2571: (32-35): Libraries cannot be inherited from.
+// TypeError 2571: (32-35='Lib'): Libraries cannot be inherited from.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/226_inheriting_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/226_inheriting_library.sol
index 964c22ad8..8108bb8fb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/226_inheriting_library.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/226_inheriting_library.sol
@@ -1,4 +1,4 @@
 contract Test {}
 library Lib is Test {}
 // ----
-// TypeError 9469: (17-39): Library is not allowed to inherit.
+// TypeError 9469: (17-39='library Lib is Test {}'): Library is not allowed to inherit.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/227_library_having_variables.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/227_library_having_variables.sol
index b59e0d68b..8fd94afa3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/227_library_having_variables.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/227_library_having_variables.sol
@@ -1,3 +1,3 @@
 library Lib { uint x; }
 // ----
-// TypeError 9957: (14-20): Library cannot have non-constant state variables
+// TypeError 9957: (14-20='uint x'): Library cannot have non-constant state variables
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/230_creating_contract_within_the_contract.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/230_creating_contract_within_the_contract.sol
index 738031b0c..5505a5f01 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/230_creating_contract_within_the_contract.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/230_creating_contract_within_the_contract.sol
@@ -2,4 +2,4 @@ contract Test {
     function f() public { Test x = new Test(); }
 }
 // ----
-// TypeError 7813: (51-59): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (51-59='new Test'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/231_array_out_of_bound_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/231_array_out_of_bound_access.sol
index d2ce419ba..a5d06dbf2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/231_array_out_of_bound_access.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/231_array_out_of_bound_access.sol
@@ -6,4 +6,4 @@ contract c {
     }
 }
 // ----
-// TypeError 3383: (90-102): Out of bounds array access.
+// TypeError 3383: (90-102='dataArray[5]'): Out of bounds array access.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol
index 077d09cbd..704dc6926 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/232_literal_string_to_storage_pointer.sol
@@ -2,4 +2,4 @@ contract C {
     function f() public { string storage x = "abc"; }
 }
 // ----
-// TypeError 9574: (39-63): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
+// TypeError 9574: (39-63='string storage x = "abc"'): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol
index a092c643d..d368a9356 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/233_non_initialized_references.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3464: (105-106): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (105-106='x'): This variable is of storage pointer type and can be accessed without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/235_abi_encode_with_large_integer_constant.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/235_abi_encode_with_large_integer_constant.sol
index 545b8cf27..4cb850885 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/235_abi_encode_with_large_integer_constant.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/235_abi_encode_with_large_integer_constant.sol
@@ -2,4 +2,4 @@ contract C {
     function f() pure public { abi.encode(2**500); }
 }
 // ----
-// TypeError 8009: (55-61): Invalid rational number (too large or division by zero).
+// TypeError 8009: (55-61='2**500'): Invalid rational number (too large or division by zero).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/236_cyclic_binary_dependency.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/236_cyclic_binary_dependency.sol
index 1686a9f07..56966e02a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/236_cyclic_binary_dependency.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/236_cyclic_binary_dependency.sol
@@ -2,6 +2,6 @@ contract A { function f() public { new B(); } }
 contract B { function f() public { new C(); } }
 contract C { function f() public { new A(); } }
 // ----
-// TypeError 7813: (35-40): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (83-88): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
-// TypeError 7813: (131-136): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (35-40='new B'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (83-88='new C'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
+// TypeError 7813: (131-136='new A'): Circular reference to contract bytecode either via "new" or "type(...).creationCode" / "type(...).runtimeCode".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/237_cyclic_binary_dependency_via_inheritance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/237_cyclic_binary_dependency_via_inheritance.sol
index 9851f1a74..f62c48e0b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/237_cyclic_binary_dependency_via_inheritance.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/237_cyclic_binary_dependency_via_inheritance.sol
@@ -2,4 +2,4 @@ contract A is B { }
 contract B { function f() public { new C(); } }
 contract C { function f() public { new A(); } }
 // ----
-// TypeError 2449: (14-15): Definition of base has to precede definition of derived contract
+// TypeError 2449: (14-15='B'): Definition of base has to precede definition of derived contract
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/245_tuples_empty_components.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/245_tuples_empty_components.sol
index 02bc66fa6..42d21e848 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/245_tuples_empty_components.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/245_tuples_empty_components.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 8381: (47-53): Tuple component cannot be empty.
+// TypeError 8381: (47-53='(1,,2)'): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol
index 42de5ba41..d1252e6dd 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol
@@ -3,4 +3,4 @@ contract C {
     using D for uint;
 }
 // ----
-// TypeError 4357: (38-39): Library name expected. If you want to attach a function, use '{...}'.
+// TypeError 4357: (38-39='D'): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/258_using_for_mismatch.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/258_using_for_mismatch.sol
index 87b7f3452..8662623c6 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/258_using_for_mismatch.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/258_using_for_mismatch.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (177-185): Member "double" not found or not visible after argument-dependent lookup in uint256.
+// TypeError 9582: (177-185='a.double'): Member "double" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol
index abda74579..02075a691 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (305-313): Member "double" not found or not visible after argument-dependent lookup in uint16.
+// TypeError 9582: (305-313='a.double'): Member "double" not found or not visible after argument-dependent lookup in uint16.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol
index 99aef98a8..f5a646f41 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (227-235): Member "double" not found or not visible after argument-dependent lookup in uint256.
+// TypeError 9582: (227-235='a.double'): Member "double" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol
index 2463bee5e..6ef577069 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol
@@ -10,4 +10,4 @@ contract C {
 }
 // ----
 // TypeError 9574: (218-271): Type function (struct D.s storage pointer,uint256) returns (uint256) is not implicitly convertible to expected type function (struct D.s storage pointer,uint256) returns (uint256). Bound functions can not be converted to non-bound functions.
-// TypeError 6160: (298-302): Wrong argument count for function call: 1 arguments given but expected 2.
+// TypeError 6160: (298-302='g(a)'): Wrong argument count for function call: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/264_mapping_in_memory_array.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/264_mapping_in_memory_array.sol
index d561bd29e..b71cb8d48 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/264_mapping_in_memory_array.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/264_mapping_in_memory_array.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1164: (94-117): Array containing a (nested) mapping cannot be constructed in memory.
+// TypeError 1164: (94-117='mapping(uint => uint)[]'): Array containing a (nested) mapping cannot be constructed in memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/265_new_for_non_array.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/265_new_for_non_array.sol
index b7ab47d6e..2ec76d5d1 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/265_new_for_non_array.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/265_new_for_non_array.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 8807: (65-73): Contract or array type expected.
+// TypeError 8807: (65-73='new uint'): Contract or array type expected.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/275_inline_struct_declaration_arrays.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/275_inline_struct_declaration_arrays.sol
index f5e15e220..246bbbfe6 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/275_inline_struct_declaration_arrays.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/275_inline_struct_declaration_arrays.sol
@@ -8,5 +8,5 @@ contract C {
     }
 }
 // ----
-// Warning 2072: (102-115): Unused local variable.
+// Warning 2072: (102-115='S[2] memory x'): Unused local variable.
 // Warning 2018: (72-169): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/279_break_not_in_loop.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/279_break_not_in_loop.sol
index 76385a1d0..1bde0d4c1 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/279_break_not_in_loop.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/279_break_not_in_loop.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// SyntaxError 6102: (69-74): "break" has to be in a "for" or "while" loop.
+// SyntaxError 6102: (69-74='break'): "break" has to be in a "for" or "while" loop.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/280_continue_not_in_loop.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/280_continue_not_in_loop.sol
index 8da1f34c5..48024e820 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/280_continue_not_in_loop.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/280_continue_not_in_loop.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// SyntaxError 4123: (69-77): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (69-77='continue'): "continue" has to be in a "for" or "while" loop.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/281_continue_not_in_loop_2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/281_continue_not_in_loop_2.sol
index 289e882a6..88f83b19b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/281_continue_not_in_loop_2.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/281_continue_not_in_loop_2.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// SyntaxError 4123: (88-96): "continue" has to be in a "for" or "while" loop.
+// SyntaxError 4123: (88-96='continue'): "continue" has to be in a "for" or "while" loop.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/282_invalid_different_types_for_conditional_expression.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/282_invalid_different_types_for_conditional_expression.sol
index da2ae63ae..9596e9a05 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/282_invalid_different_types_for_conditional_expression.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/282_invalid_different_types_for_conditional_expression.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1080: (47-62): True expression's type bool does not match false expression's type uint8.
+// TypeError 1080: (47-62='true ? true : 2'): True expression's type bool does not match false expression's type uint8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/283_left_value_in_conditional_expression_not_supported_yet.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/283_left_value_in_conditional_expression_not_supported_yet.sol
index 2acc4e1f4..7d4988a25 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/283_left_value_in_conditional_expression_not_supported_yet.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/283_left_value_in_conditional_expression_not_supported_yet.sol
@@ -6,5 +6,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2212: (80-92): Conditional expression as left value is not supported yet.
-// TypeError 4247: (80-92): Expression has to be an lvalue.
+// TypeError 2212: (80-92='true ? x : y'): Conditional expression as left value is not supported yet.
+// TypeError 4247: (80-92='true ? x : y'): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/284_conditional_expression_with_different_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/284_conditional_expression_with_different_struct.sol
index 1141ff084..703d11351 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/284_conditional_expression_with_different_struct.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/284_conditional_expression_with_different_struct.sol
@@ -12,4 +12,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1080: (165-177): True expression's type struct C.s1 memory does not match false expression's type struct C.s2 memory.
+// TypeError 1080: (165-177='true ? x : y'): True expression's type struct C.s1 memory does not match false expression's type struct C.s2 memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/285_conditional_expression_with_different_function_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/285_conditional_expression_with_different_function_type.sol
index 7d55d61ef..c0a8c263e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/285_conditional_expression_with_different_function_type.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/285_conditional_expression_with_different_function_type.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1080: (106-118): True expression's type function (bool) does not match false expression's type function ().
+// TypeError 1080: (106-118='true ? x : y'): True expression's type function (bool) does not match false expression's type function ().
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/286_conditional_expression_with_different_enum.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/286_conditional_expression_with_different_enum.sol
index c0cb69db6..9d362179b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/286_conditional_expression_with_different_enum.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/286_conditional_expression_with_different_enum.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1080: (139-151): True expression's type enum C.small does not match false expression's type enum C.big.
+// TypeError 1080: (139-151='true ? x : y'): True expression's type enum C.small does not match false expression's type enum C.big.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/287_conditional_expression_with_different_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/287_conditional_expression_with_different_mapping.sol
index 8bf1268c0..4429636a8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/287_conditional_expression_with_different_mapping.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/287_conditional_expression_with_different_mapping.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1080: (121-143): True expression's type mapping(uint8 => uint8) does not match false expression's type mapping(uint32 => uint8).
+// TypeError 1080: (121-143='true ? table1 : table2'): True expression's type mapping(uint8 => uint8) does not match false expression's type mapping(uint32 => uint8).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/288_conditional_with_all_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/288_conditional_with_all_types.sol
index 19920b50c..7caac6ff3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/288_conditional_with_all_types.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/288_conditional_with_all_types.sol
@@ -84,6 +84,6 @@ contract C {
     }
 }
 // ----
-// Warning 2519: (1013-1027): This declaration shadows an existing declaration.
+// Warning 2519: (1013-1027='bytes memory f'): This declaration shadows an existing declaration.
 // Warning 2018: (257-642): Function state mutability can be restricted to pure
 // Warning 2018: (647-1237): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_1.sol
index 8954a77fe..fc898dee3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_1.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_1.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7920: (50-55): Identifier not found or not unique.
+// DeclarationError 7920: (50-55='uintM'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_2.sol
index 2c441c696..1897a1aaf 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_2.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_2.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7920: (50-54): Identifier not found or not unique.
+// DeclarationError 7920: (50-54='intM'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_3.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_3.sol
index 4deb9db9e..5eda4a530 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_3.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/290_varM_disqualified_as_keyword_3.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7920: (50-56): Identifier not found or not unique.
+// DeclarationError 7920: (50-56='bytesM'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol
index 0c7b80e03..05d3461e5 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// TypeError 5172: (77-80): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (77-80='mod'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol
index 589772a9d..7913364a0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 5172: (77-80): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (77-80='mod'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol
index c1cb83e47..7d16f93ef 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 5172: (85-88): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (85-88='foo'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/294_long_uint_variable_fails.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/294_long_uint_variable_fails.sol
index 4bb9542a2..483102db6 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/294_long_uint_variable_fails.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/294_long_uint_variable_fails.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7920: (50-80): Identifier not found or not unique.
+// DeclarationError 7920: (50-80='uint99999999999999999999999999'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/295_bytes10abc_is_identifier.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/295_bytes10abc_is_identifier.sol
index 33ab20b93..35d6ca728 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/295_bytes10abc_is_identifier.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/295_bytes10abc_is_identifier.sol
@@ -4,5 +4,5 @@ contract test {
     }
 }
 // ----
-// Warning 2072: (50-68): Unused local variable.
+// Warning 2072: (50-68='bytes32 bytes10abc'): Unused local variable.
 // Warning 2018: (20-83): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/297_library_functions_do_not_have_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/297_library_functions_do_not_have_value.sol
index 5819fb61b..fa3b38a80 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/297_library_functions_do_not_have_value.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/297_library_functions_do_not_have_value.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// TypeError 8477: (87-96): Member "value" is not allowed in delegated calls due to "msg.value" persisting.
+// TypeError 8477: (87-96='L.l.value'): Member "value" is not allowed in delegated calls due to "msg.value" persisting.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/298_invalid_fixed_types_0x7_mxn.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/298_invalid_fixed_types_0x7_mxn.sol
index 73b2bf8ab..45d1c1293 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/298_invalid_fixed_types_0x7_mxn.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/298_invalid_fixed_types_0x7_mxn.sol
@@ -2,4 +2,4 @@ contract test {
     fixed0x7 a = .3;
 }
 // ----
-// DeclarationError 7920: (20-28): Identifier not found or not unique.
+// DeclarationError 7920: (20-28='fixed0x7'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/300_invalid_fixed_types_7x8_mxn.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/300_invalid_fixed_types_7x8_mxn.sol
index 57b4aad20..7ee1853ba 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/300_invalid_fixed_types_7x8_mxn.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/300_invalid_fixed_types_7x8_mxn.sol
@@ -2,4 +2,4 @@ contract test {
     fixed7x8 c = 3.12345678;
 }
 // ----
-// DeclarationError 7920: (20-28): Identifier not found or not unique.
+// DeclarationError 7920: (20-28='fixed7x8'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/301_library_instances_cannot_be_used.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/301_library_instances_cannot_be_used.sol
index cea40fc4c..0ffdd0f56 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/301_library_instances_cannot_be_used.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/301_library_instances_cannot_be_used.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// TypeError 1130: (87-88): Invalid use of a library name.
+// TypeError 1130: (87-88='L'): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/306_invalid_int_implicit_conversion_from_fixed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/306_invalid_int_implicit_conversion_from_fixed.sol
index f4d847945..de25168cb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/306_invalid_int_implicit_conversion_from_fixed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/306_invalid_int_implicit_conversion_from_fixed.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// TypeError 9574: (73-82): Type fixed128x18 is not implicitly convertible to expected type int256.
+// TypeError 9574: (73-82='int b = a'): Type fixed128x18 is not implicitly convertible to expected type int256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
index 276c6533d..1fc1b9116 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
@@ -6,5 +6,5 @@ contract test {
     }
 }
 // ----
-// SyntaxError 9636: (70-75): Use of unary + is disallowed.
-// TypeError 4907: (70-75): Unary operator + cannot be applied to type rational_const 13 / 4
+// SyntaxError 9636: (70-75='+3.25'): Use of unary + is disallowed.
+// TypeError 4907: (70-75='+3.25'): Unary operator + cannot be applied to type rational_const 13 / 4
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/315_fixed_type_invalid_implicit_conversion_size.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/315_fixed_type_invalid_implicit_conversion_size.sol
index 3a4923563..38f46893b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/315_fixed_type_invalid_implicit_conversion_size.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/315_fixed_type_invalid_implicit_conversion_size.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// TypeError 9574: (75-92): Type ufixed128x18 is not implicitly convertible to expected type ufixed248x8. Too many fractional digits.
+// TypeError 9574: (75-92='ufixed248x8 b = a'): Type ufixed128x18 is not implicitly convertible to expected type ufixed248x8. Too many fractional digits.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/316_fixed_type_invalid_implicit_conversion_lost_data.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/316_fixed_type_invalid_implicit_conversion_lost_data.sol
index 169363c13..4e0837dc8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/316_fixed_type_invalid_implicit_conversion_lost_data.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/316_fixed_type_invalid_implicit_conversion_lost_data.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4486: (50-69): Type rational_const 1 / 3 is not implicitly convertible to expected type ufixed256x1. Try converting to type ufixed256x77 or use an explicit conversion.
+// TypeError 4486: (50-69='ufixed256x1 a = 1/3'): Type rational_const 1 / 3 is not implicitly convertible to expected type ufixed256x1. Try converting to type ufixed256x77 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol
index 88aad0b8b..c81ed2116 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/318_invalid_array_declaration_with_rational.sol
@@ -4,5 +4,5 @@ contract test {
     }
 }
 // ----
-// TypeError 3208: (55-58): Array with fractional length specified.
-// TypeError 6651: (50-61): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
+// TypeError 3208: (55-58='3.5'): Array with fractional length specified.
+// TypeError 6651: (50-61='uint[3.5] a'): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol
index 321c43008..e23daa2aa 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/319_invalid_array_declaration_with_signed_fixed_type.sol
@@ -4,5 +4,5 @@ contract test {
     }
 }
 // ----
-// TypeError 5462: (55-65): Invalid array length, expected integer literal or constant expression.
-// TypeError 6651: (50-68): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
+// TypeError 5462: (55-65='fixed(3.5)'): Invalid array length, expected integer literal or constant expression.
+// TypeError 6651: (50-68='uint[fixed(3.5)] a'): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol
index 779b6a66e..ab842b569 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/320_invalid_array_declaration_with_unsigned_fixed_type.sol
@@ -4,5 +4,5 @@ contract test {
     }
 }
 // ----
-// TypeError 5462: (55-66): Invalid array length, expected integer literal or constant expression.
-// TypeError 6651: (50-69): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
+// TypeError 5462: (55-66='ufixed(3.5)'): Invalid array length, expected integer literal or constant expression.
+// TypeError 6651: (50-69='uint[ufixed(3.5)] a'): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/321_rational_to_bytes_implicit_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/321_rational_to_bytes_implicit_conversion.sol
index 294ab1877..fa798dc35 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/321_rational_to_bytes_implicit_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/321_rational_to_bytes_implicit_conversion.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4486: (50-65): Type rational_const 16 / 5 is not implicitly convertible to expected type bytes32. Try converting to type ufixed8x1 or use an explicit conversion.
+// TypeError 4486: (50-65='bytes32 c = 3.2'): Type rational_const 16 / 5 is not implicitly convertible to expected type bytes32. Try converting to type ufixed8x1 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/322_fixed_to_bytes_implicit_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/322_fixed_to_bytes_implicit_conversion.sol
index fa401dd42..722763641 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/322_fixed_to_bytes_implicit_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/322_fixed_to_bytes_implicit_conversion.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// TypeError 9574: (74-87): Type fixed128x18 is not implicitly convertible to expected type bytes32.
+// TypeError 9574: (74-87='bytes32 c = a'): Type fixed128x18 is not implicitly convertible to expected type bytes32.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/327_rational_index_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/327_rational_index_access.sol
index 635d20392..dab2fc0de 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/327_rational_index_access.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/327_rational_index_access.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2326: (77-79): Type rational_const 1 / 2 is not implicitly convertible to expected type uint256. Try converting to type ufixed8x1 or use an explicit conversion.
+// TypeError 2326: (77-79='.5'): Type rational_const 1 / 2 is not implicitly convertible to expected type uint256. Try converting to type ufixed8x1 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol
index 4dbcb3f20..d7332b5af 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/328_rational_to_fixed_literal_expression.sol
@@ -12,5 +12,5 @@ contract test {
 }
 // ----
 // UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2519: (238-252): This declaration shadows an existing declaration.
+// Warning 2519: (238-252='ufixed256x80 f'): This declaration shadows an existing declaration.
 // Warning 2018: (20-339): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
index 8aa826009..2c06e9716 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (60-69): Operator ** not compatible with types int_const 2 and rational_const -11 / 5
+// TypeError 2271: (60-69='2 ** -2.2'): Operator ** not compatible with types int_const 2 and rational_const -11 / 5
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
index 29b6f088d..fee705ccb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (61-69): Operator ** not compatible with types int_const 3 and rational_const 5 / 2
+// TypeError 2271: (61-69='3 ** 2.5'): Operator ** not compatible with types int_const 3 and rational_const 5 / 2
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
index 95a8120ba..481ab35f2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-60): Operator ** not compatible with types int_const 2 and rational_const 1 / 2
+// TypeError 2271: (50-60='2 ** (1/2)'): Operator ** not compatible with types int_const 2 and rational_const 1 / 2
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
index 15d1f18d6..e1bae286c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-62): Operator ** not compatible with types int_const 42 and rational_const -1 / 4
+// TypeError 2271: (50-62='42 ** (-1/4)'): Operator ** not compatible with types int_const 42 and rational_const -1 / 4
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
index f988745ea..7debba3d8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (61-77): Operator ** not compatible with types int_const 3 and ufixed128x18. Exponent is fractional.
+// TypeError 2271: (61-77='3 ** ufixed(1.5)'): Operator ** not compatible with types int_const 3 and ufixed128x18. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
index 68e80e635..e9291ec34 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (61-78): Operator ** not compatible with types int_const 42 and fixed128x18. Exponent is fractional.
+// TypeError 2271: (61-78='42 ** fixed(-1/4)'): Operator ** not compatible with types int_const 42 and fixed128x18. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
index a084756e6..969c800c0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4907: (50-61): Unary operator ~ cannot be applied to type fixed128x18
+// TypeError 4907: (50-61='~fixed(3.5)'): Unary operator ~ cannot be applied to type fixed128x18
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
index 5d5cd6a9b..d94645da1 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-64): Operator | not compatible with types fixed128x18 and int_const 3
+// TypeError 2271: (50-64='fixed(1.5) | 3'): Operator | not compatible with types fixed128x18 and int_const 3
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
index ee96badae..b8b48a1af 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-65): Operator ^ not compatible with types fixed128x18 and int_const 3
+// TypeError 2271: (50-65='fixed(1.75) ^ 3'): Operator ^ not compatible with types fixed128x18 and int_const 3
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
index da836f31a..165cd2b5f 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-65): Operator & not compatible with types fixed128x18 and int_const 3
+// TypeError 2271: (50-65='fixed(1.75) & 3'): Operator & not compatible with types fixed128x18 and int_const 3
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol
index ad7b34fd7..6c4e3d7d7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/343_integer_and_fixed_interaction.sol
@@ -5,5 +5,5 @@ contract test {
 }
 // ----
 // UnimplementedFeatureError: Not yet implemented - FixedPointType.
-// Warning 2072: (50-58): Unused local variable.
+// Warning 2072: (50-58='ufixed a'): Unused local variable.
 // Warning 2018: (20-89): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/344_one_divided_by_three_integer_conversion.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/344_one_divided_by_three_integer_conversion.sol
index 8a4213299..712ffd661 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/344_one_divided_by_three_integer_conversion.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/344_one_divided_by_three_integer_conversion.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4486: (50-62): Type rational_const 1 / 3 is not implicitly convertible to expected type uint256. Try converting to type ufixed256x77 or use an explicit conversion.
+// TypeError 4486: (50-62='uint a = 1/3'): Type rational_const 1 / 3 is not implicitly convertible to expected type uint256. Try converting to type ufixed256x77 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/346_unused_return_value_send.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/346_unused_return_value_send.sol
index 80787c10c..d7f5a4fad 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/346_unused_return_value_send.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/346_unused_return_value_send.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// Warning 5878: (50-80): Failure condition of 'send' ignored. Consider using 'transfer' instead.
+// Warning 5878: (50-80='payable(address(0x12)).send(1)'): Failure condition of 'send' ignored. Consider using 'transfer' instead.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/347_unused_return_value_call.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/347_unused_return_value_call.sol
index 9eee174cc..ca2a98ae4 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/347_unused_return_value_call.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/347_unused_return_value_call.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// Warning 9302: (50-75): Return value of low-level calls not used.
+// Warning 9302: (50-75='address(0x12).call("abc")'): Return value of low-level calls not used.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/351_callcode_deprecated.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/351_callcode_deprecated.sol
index dbf81c237..4e0713bcd 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/351_callcode_deprecated.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/351_callcode_deprecated.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2256: (55-77): "callcode" has been deprecated in favour of "delegatecall".
+// TypeError 2256: (55-77='address(0x12).callcode'): "callcode" has been deprecated in favour of "delegatecall".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/354_payable_in_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/354_payable_in_library.sol
index 119bae111..fe0677000 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/354_payable_in_library.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/354_payable_in_library.sol
@@ -2,4 +2,4 @@ library test {
     function f() payable public {}
 }
 // ----
-// TypeError 7708: (19-49): Library functions cannot be payable.
+// TypeError 7708: (19-49='function f() payable public {}'): Library functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/356_payable_internal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/356_payable_internal.sol
index a21a18d9c..b0c0993d7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/356_payable_internal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/356_payable_internal.sol
@@ -2,4 +2,4 @@ contract test {
     function f() payable internal {}
 }
 // ----
-// TypeError 5587: (20-52): "internal" and "private" functions cannot be payable.
+// TypeError 5587: (20-52='function f() payable internal {}'): "internal" and "private" functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/357_payable_private.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/357_payable_private.sol
index 3436ce76f..14c25fa34 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/357_payable_private.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/357_payable_private.sol
@@ -2,4 +2,4 @@ contract test {
     function f() payable private {}
 }
 // ----
-// TypeError 5587: (20-51): "internal" and "private" functions cannot be payable.
+// TypeError 5587: (20-51='function f() payable private {}'): "internal" and "private" functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/358_illegal_override_payable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/358_illegal_override_payable.sol
index 60b0a90ed..5d2793a50 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/358_illegal_override_payable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/358_illegal_override_payable.sol
@@ -1,5 +1,5 @@
 contract B { function f() payable virtual public {} }
 contract C is B { function f() public {} }
 // ----
-// TypeError 9456: (72-94): Overriding function is missing "override" specifier.
-// TypeError 6959: (72-94): Overriding function changes state mutability from "payable" to "nonpayable".
+// TypeError 9456: (72-94='function f() public {}'): Overriding function is missing "override" specifier.
+// TypeError 6959: (72-94='function f() public {}'): Overriding function changes state mutability from "payable" to "nonpayable".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/359_illegal_override_payable_nonpayable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/359_illegal_override_payable_nonpayable.sol
index c2a5857b7..2a8fb60d2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/359_illegal_override_payable_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/359_illegal_override_payable_nonpayable.sol
@@ -1,5 +1,5 @@
 contract B { function f() virtual public {} }
 contract C is B { function f() payable public {} }
 // ----
-// TypeError 9456: (64-94): Overriding function is missing "override" specifier.
-// TypeError 6959: (64-94): Overriding function changes state mutability from "nonpayable" to "payable".
+// TypeError 9456: (64-94='function f() payable public {}'): Overriding function is missing "override" specifier.
+// TypeError 6959: (64-94='function f() payable public {}'): Overriding function changes state mutability from "nonpayable" to "payable".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol
index 20f0c6566..fc4e3f4c9 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/362_calling_nonpayable.sol
@@ -5,4 +5,4 @@ contract test {
 }
 // ----
 // TypeError 7006: (91-124): Cannot set option "value" on a non-payable function type.
-// TypeError 8820: (156-184): Member "value" is only available for payable functions.
+// TypeError 8820: (156-184='(new receiver()).nopay.value'): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol
index fe0224b4d..cefcc337d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/363_non_payable_constructor.sol
@@ -8,4 +8,4 @@ contract D {
     }
 }
 // ----
-// TypeError 7006: (99-116): Cannot set option "value", since the constructor of contract C is not payable.
+// TypeError 7006: (99-116='(new C){value: 2}'): Cannot set option "value", since the constructor of contract C is not payable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/366_invalid_array_as_statement.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/366_invalid_array_as_statement.sol
index 2eaff9c0c..788410266 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/366_invalid_array_as_statement.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/366_invalid_array_as_statement.sol
@@ -3,4 +3,4 @@ contract test {
     constructor(uint k) { S[k]; }
 }
 // ----
-// TypeError 3940: (69-70): Integer constant expected.
+// TypeError 3940: (69-70='k'): Integer constant expected.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/367_using_directive_for_missing_selftype.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/367_using_directive_for_missing_selftype.sol
index 1a2c2969b..ea2402cdf 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/367_using_directive_for_missing_selftype.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/367_using_directive_for_missing_selftype.sol
@@ -11,4 +11,4 @@ contract A {
     }
 }
 // ----
-// TypeError 9582: (137-140): Member "b" not found or not visible after argument-dependent lookup in bytes memory.
+// TypeError 9582: (137-140='x.b'): Member "b" not found or not visible after argument-dependent lookup in bytes memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
index fcd56bc0d..df397c563 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 << -8;
 }
 // ----
-// TypeError 2271: (33-43): Operator << not compatible with types int_const 66 and int_const -8
+// TypeError 2271: (33-43='0x42 << -8'): Operator << not compatible with types int_const 66 and int_const -8
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
index 344dce513..90f32bc78 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 >> -8;
 }
 // ----
-// TypeError 2271: (33-43): Operator >> not compatible with types int_const 66 and int_const -8
+// TypeError 2271: (33-43='0x42 >> -8'): Operator >> not compatible with types int_const 66 and int_const -8
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
index 1809a677b..055bd9288 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 << 0x100000000;
 }
 // ----
-// TypeError 2271: (33-52): Operator << not compatible with types int_const 66 and int_const 4294967296
+// TypeError 2271: (33-52='0x42 << 0x100000000'): Operator << not compatible with types int_const 66 and int_const 4294967296
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
index 858f547dd..0fd1c3db7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 >> 0x100000000;
 }
 // ----
-// TypeError 2271: (33-52): Operator >> not compatible with types int_const 66 and int_const 4294967296
+// TypeError 2271: (33-52='0x42 >> 0x100000000'): Operator >> not compatible with types int_const 66 and int_const 4294967296
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
index d377c315a..5667a9f04 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 >> (1 / 2);
 }
 // ----
-// TypeError 2271: (33-48): Operator >> not compatible with types int_const 66 and rational_const 1 / 2
+// TypeError 2271: (33-48='0x42 >> (1 / 2)'): Operator >> not compatible with types int_const 66 and rational_const 1 / 2
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/397_warns_msg_value_in_non_payable_public_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/397_warns_msg_value_in_non_payable_public_function.sol
index 008b9fc1b..7336d6a3c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/397_warns_msg_value_in_non_payable_public_function.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/397_warns_msg_value_in_non_payable_public_function.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5887: (52-61): "msg.value" and "callvalue()" can only be used in payable public functions. Make the function "payable" or use an internal function to avoid this error.
+// TypeError 5887: (52-61='msg.value'): "msg.value" and "callvalue()" can only be used in payable public functions. Make the function "payable" or use an internal function to avoid this error.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/402_assignment_to_constant.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/402_assignment_to_constant.sol
index 84b9d5454..4cae7f346 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/402_assignment_to_constant.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/402_assignment_to_constant.sol
@@ -3,4 +3,4 @@ contract c {
     function f() public { a = 2; }
 }
 // ----
-// TypeError 6520: (64-65): Cannot assign to a constant variable.
+// TypeError 6520: (64-65='a'): Cannot assign to a constant variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/412_early_exit_on_fatal_errors.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/412_early_exit_on_fatal_errors.sol
index 44cc9a3b0..3c5adad4b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/412_early_exit_on_fatal_errors.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/412_early_exit_on_fatal_errors.sol
@@ -8,5 +8,5 @@ contract C {
     }
 }
 // ----
-// DeclarationError 2333: (150-179): Identifier already declared.
-// DeclarationError 7920: (114-120): Identifier not found or not unique.
+// DeclarationError 2333: (150-179='function s() public s {     }'): Identifier already declared.
+// DeclarationError 7920: (114-120='ftring'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/420_interface_variables.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/420_interface_variables.sol
index adb8ee69f..1f47fe1f4 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/420_interface_variables.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/420_interface_variables.sol
@@ -2,4 +2,4 @@ interface I {
     uint a;
 }
 // ----
-// TypeError 8274: (18-24): Variables cannot be declared in interfaces.
+// TypeError 8274: (18-24='uint a'): Variables cannot be declared in interfaces.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/426_throw_is_deprecated.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/426_throw_is_deprecated.sol
index 1f36e4d7d..7cceeeedd 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/426_throw_is_deprecated.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/426_throw_is_deprecated.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// SyntaxError 4538: (52-57): "throw" is deprecated in favour of "revert()", "require()" and "assert()".
+// SyntaxError 4538: (52-57='throw'): "throw" is deprecated in favour of "revert()", "require()" and "assert()".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/428_bare_revert.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/428_bare_revert.sol
index 9cd58e3da..a934066b8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/428_bare_revert.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/428_bare_revert.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2144: (81-87): No matching declaration found after variable lookup.
+// TypeError 2144: (81-87='revert'): No matching declaration found after variable lookup.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol
index b770b6044..27b75c1c8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol
@@ -2,4 +2,4 @@ contract C {
     function f() pure public { selfdestruct; }
 }
 // ----
-// Warning 6133: (44-56): Statement has no effect.
+// Warning 6133: (44-56='selfdestruct'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/431_bare_assert.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/431_bare_assert.sol
index 5e007aa22..1a40f3611 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/431_bare_assert.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/431_bare_assert.sol
@@ -2,4 +2,4 @@ contract C {
     function f() pure public { assert; }
 }
 // ----
-// Warning 6133: (44-50): Statement has no effect.
+// Warning 6133: (44-50='assert'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/432_bare_require.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/432_bare_require.sol
index a67f5180f..bdbf98421 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/432_bare_require.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/432_bare_require.sol
@@ -3,4 +3,4 @@ contract C {
     function f() pure public { require; }
 }
 // ----
-// TypeError 2144: (101-108): No matching declaration found after variable lookup.
+// TypeError 2144: (101-108='require'): No matching declaration found after variable lookup.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/433_pure_statement_in_for_loop.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/433_pure_statement_in_for_loop.sol
index 5e4084885..c4b53eeed 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/433_pure_statement_in_for_loop.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/433_pure_statement_in_for_loop.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// Warning 6133: (77-81): Statement has no effect.
+// Warning 6133: (77-81='true'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
index 05239fa1b..11a2c6eaa 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (90-108): Type is not callable
+// TypeError 5704: (90-108='3({a: 1, x: true})'): Type is not callable
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol
index 54caa2b38..ca3a90fca 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/471_unspecified_storage_fail.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (104-107): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
-// TypeError 6651: (123-131): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
+// TypeError 6651: (104-107='S x'): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
+// TypeError 6651: (123-131='uint[] y'): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/473_storage_location_non_array_or_struct_disallowed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/473_storage_location_non_array_or_struct_disallowed.sol
index 937874b61..2fc7df1b1 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/473_storage_location_non_array_or_struct_disallowed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/473_storage_location_non_array_or_struct_disallowed.sol
@@ -2,4 +2,4 @@ contract C {
     function f(uint storage a) public { }
 }
 // ----
-// TypeError 6651: (28-42): Data location can only be specified for array, struct or mapping types, but "storage" was given.
+// TypeError 6651: (28-42='uint storage a'): Data location can only be specified for array, struct or mapping types, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/474_storage_location_non_array_or_struct_disallowed_is_not_fatal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/474_storage_location_non_array_or_struct_disallowed_is_not_fatal.sol
index 48ed1e63b..e464d6e0b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/474_storage_location_non_array_or_struct_disallowed_is_not_fatal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/474_storage_location_non_array_or_struct_disallowed_is_not_fatal.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (28-42): Data location can only be specified for array, struct or mapping types, but "storage" was given.
+// TypeError 6651: (28-42='uint storage a'): Data location can only be specified for array, struct or mapping types, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/475_implicit_conversion_disallowed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/475_implicit_conversion_disallowed.sol
index aeb91eedb..1a9af4fab 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/475_implicit_conversion_disallowed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/475_implicit_conversion_disallowed.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6359: (95-98): Return argument type uint32 is not implicitly convertible to expected type (type of first return variable) bytes4.
+// TypeError 6359: (95-98='tmp'): Return argument type uint32 is not implicitly convertible to expected type (type of first return variable) bytes4.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/476_too_large_arrays_for_calldata_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/476_too_large_arrays_for_calldata_external.sol
index b319bd56c..ee57afa8d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/476_too_large_arrays_for_calldata_external.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/476_too_large_arrays_for_calldata_external.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1534: (28-56): Type too large for calldata.
+// TypeError 1534: (28-56='uint[85678901234] calldata a'): Type too large for calldata.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/477_too_large_arrays_for_calldata_internal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/477_too_large_arrays_for_calldata_internal.sol
index 0447f5e01..a5ab8e0b3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/477_too_large_arrays_for_calldata_internal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/477_too_large_arrays_for_calldata_internal.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1534: (28-54): Type too large for memory.
+// TypeError 1534: (28-54='uint[85678901234] memory a'): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/478_too_large_arrays_for_calldata_public.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/478_too_large_arrays_for_calldata_public.sol
index bf65519d1..e64213129 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/478_too_large_arrays_for_calldata_public.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/478_too_large_arrays_for_calldata_public.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1534: (28-54): Type too large for memory.
+// TypeError 1534: (28-54='uint[85678901234] memory a'): Type too large for memory.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/480_explicit_literal_to_storage_string_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/480_explicit_literal_to_storage_string_assignment.sol
index 25485451b..2363fb243 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/480_explicit_literal_to_storage_string_assignment.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/480_explicit_literal_to_storage_string_assignment.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (52-76): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
+// TypeError 9574: (52-76='string storage x = "abc"'): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol
index 25485451b..2363fb243 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/481_explicit_literal_to_unspecified_string_assignment.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (52-76): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
+// TypeError 9574: (52-76='string storage x = "abc"'): Type literal_string "abc" is not implicitly convertible to expected type string storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/482_explicit_literal_to_unspecified_string.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/482_explicit_literal_to_unspecified_string.sol
index 70eaebb28..f624a8a7f 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/482_explicit_literal_to_unspecified_string.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/482_explicit_literal_to_unspecified_string.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// Warning 6133: (52-65): Statement has no effect.
+// Warning 6133: (52-65='string("abc")'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/484_function_types_selector_1.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/484_function_types_selector_1.sol
index 46f6479fb..77ae3be59 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/484_function_types_selector_1.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/484_function_types_selector_1.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (76-86): Member "selector" not found or not visible after argument-dependent lookup in function () view returns (bytes4).
+// TypeError 9582: (76-86='f.selector'): Member "selector" not found or not visible after argument-dependent lookup in function () view returns (bytes4).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/485_function_types_selector_2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/485_function_types_selector_2.sol
index fae30bbec..a2482571e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/485_function_types_selector_2.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/485_function_types_selector_2.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (115-125): Member "selector" not found or not visible after argument-dependent lookup in function () pure.
+// TypeError 9582: (115-125='g.selector'): Member "selector" not found or not visible after argument-dependent lookup in function () pure.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/486_function_types_selector_3.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/486_function_types_selector_3.sol
index 66cb6d6fd..d4ebad7df 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/486_function_types_selector_3.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/486_function_types_selector_3.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (99-109): Member "selector" not found or not visible after argument-dependent lookup in function ().
+// TypeError 9582: (99-109='g.selector'): Member "selector" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/491_using_this_in_constructor.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/491_using_this_in_constructor.sol
index 114046584..96881bf1c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/491_using_this_in_constructor.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/491_using_this_in_constructor.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// Warning 5805: (41-45): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
+// Warning 5805: (41-45='this'): "this" used in constructor. Note that external functions of a contract cannot be called while it is being constructed.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
index 392d02e9f..adee64e6d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (153-157): Type is not callable
+// TypeError 5704: (153-157='m(1)'): Type is not callable
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/493_builtin_keccak256_reject_gas.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/493_builtin_keccak256_reject_gas.sol
index 75a6ff5a9..9f2ee70e0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/493_builtin_keccak256_reject_gas.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/493_builtin_keccak256_reject_gas.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (47-60): Member "gas" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes32).
+// TypeError 9582: (47-60='keccak256.gas'): Member "gas" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes32).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/494_builtin_sha256_reject_gas.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/494_builtin_sha256_reject_gas.sol
index a418ef207..b799ed605 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/494_builtin_sha256_reject_gas.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/494_builtin_sha256_reject_gas.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (47-57): Member "gas" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes32).
+// TypeError 9582: (47-57='sha256.gas'): Member "gas" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes32).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/495_builtin_ripemd160_reject_gas.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/495_builtin_ripemd160_reject_gas.sol
index 17b0fc490..08cdb65a6 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/495_builtin_ripemd160_reject_gas.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/495_builtin_ripemd160_reject_gas.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (47-60): Member "gas" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes20).
+// TypeError 9582: (47-60='ripemd160.gas'): Member "gas" not found or not visible after argument-dependent lookup in function (bytes memory) pure returns (bytes20).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/496_builtin_ecrecover_reject_gas.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/496_builtin_ecrecover_reject_gas.sol
index 007cb316a..b3e8e1a98 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/496_builtin_ecrecover_reject_gas.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/496_builtin_ecrecover_reject_gas.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (47-60): Member "gas" not found or not visible after argument-dependent lookup in function (bytes32,uint8,bytes32,bytes32) pure returns (address).
+// TypeError 9582: (47-60='ecrecover.gas'): Member "gas" not found or not visible after argument-dependent lookup in function (bytes32,uint8,bytes32,bytes32) pure returns (address).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/498_msg_gas_deprecated.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/498_msg_gas_deprecated.sol
index afd3f2d91..b573df120 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/498_msg_gas_deprecated.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/498_msg_gas_deprecated.sol
@@ -2,4 +2,4 @@ contract C {
     function f() public view returns (uint256 val) { return msg.gas; }
 }
 // ----
-// TypeError 1400: (73-80): "msg.gas" has been deprecated in favor of "gasleft()"
+// TypeError 1400: (73-80='msg.gas'): "msg.gas" has been deprecated in favor of "gasleft()"
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/501_gasleft_shadowing_2.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/501_gasleft_shadowing_2.sol
index ea6149313..f6b4085d5 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/501_gasleft_shadowing_2.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/501_gasleft_shadowing_2.sol
@@ -3,4 +3,4 @@ contract C {
     function f() public { gasleft = 42; }
 }
 // ----
-// Warning 2319: (17-29): This declaration shadows a builtin symbol.
+// Warning 2319: (17-29='uint gasleft'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/502_builtin_keccak256_reject_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/502_builtin_keccak256_reject_value.sol
index 7763535ef..6821a0f3c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/502_builtin_keccak256_reject_value.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/502_builtin_keccak256_reject_value.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 8820: (47-62): Member "value" is only available for payable functions.
+// TypeError 8820: (47-62='keccak256.value'): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/503_builtin_sha256_reject_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/503_builtin_sha256_reject_value.sol
index aaccfad42..bef29c4e8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/503_builtin_sha256_reject_value.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/503_builtin_sha256_reject_value.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 8820: (47-59): Member "value" is only available for payable functions.
+// TypeError 8820: (47-59='sha256.value'): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/504_builtin_ripemd160_reject_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/504_builtin_ripemd160_reject_value.sol
index 57c5c0456..fff347006 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/504_builtin_ripemd160_reject_value.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/504_builtin_ripemd160_reject_value.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 8820: (47-62): Member "value" is only available for payable functions.
+// TypeError 8820: (47-62='ripemd160.value'): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/505_builtin_ecrecover_reject_value.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/505_builtin_ecrecover_reject_value.sol
index 88713331e..6659c1605 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/505_builtin_ecrecover_reject_value.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/505_builtin_ecrecover_reject_value.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 8820: (47-62): Member "value" is only available for payable functions.
+// TypeError 8820: (47-62='ecrecover.value'): Member "value" is only available for payable functions.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/511_library_function_without_implementation_public.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/511_library_function_without_implementation_public.sol
index f77845b47..8ec3b6469 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/511_library_function_without_implementation_public.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/511_library_function_without_implementation_public.sol
@@ -4,4 +4,4 @@ library L {
     function f() public;
 }
 // ----
-// TypeError 9231: (112-132): Library functions must be implemented if declared.
+// TypeError 9231: (112-132='function f() public;'): Library functions must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/512_library_function_without_implementation_internal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/512_library_function_without_implementation_internal.sol
index 46025690a..75b6ccb3a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/512_library_function_without_implementation_internal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/512_library_function_without_implementation_internal.sol
@@ -2,4 +2,4 @@ library L {
     function f() internal;
 }
 // ----
-// TypeError 9231: (16-38): Library functions must be implemented if declared.
+// TypeError 9231: (16-38='function f() internal;'): Library functions must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/513_library_function_without_implementation_private.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/513_library_function_without_implementation_private.sol
index ad7683d65..7dc36bd1a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/513_library_function_without_implementation_private.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/513_library_function_without_implementation_private.sol
@@ -2,4 +2,4 @@ library L {
     function f() private;
 }
 // ----
-// TypeError 9231: (16-37): Library functions must be implemented if declared.
+// TypeError 9231: (16-37='function f() private;'): Library functions must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol
index 940a3b071..c5cf21428 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol
@@ -7,4 +7,4 @@ library L {
     }
 }
 // ----
-// TypeError 4357: (120-121): Library name expected. If you want to attach a function, use '{...}'.
+// TypeError 4357: (120-121='S'): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/523_reject_interface_creation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/523_reject_interface_creation.sol
index 54ca8f694..5f6cc1823 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/523_reject_interface_creation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/523_reject_interface_creation.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2971: (62-67): Cannot instantiate an interface.
+// TypeError 2971: (62-67='new I'): Cannot instantiate an interface.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol
index f1ffa651f..21ab55e54 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol
@@ -1,4 +1,4 @@
 interface I {}
 contract C is I(2) {}
 // ----
-// TypeError 7927: (29-33): Wrong argument count for constructor call: 1 arguments given but expected 0. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (29-33='I(2)'): Wrong argument count for constructor call: 1 arguments given but expected 0. Remove parentheses if you do not want to provide arguments here.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/527_fallback_marked_internal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/527_fallback_marked_internal.sol
index 1589d58c9..94db5f960 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/527_fallback_marked_internal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/527_fallback_marked_internal.sol
@@ -2,4 +2,4 @@ contract C {
     fallback () internal { }
 }
 // ----
-// TypeError 1159: (17-41): Fallback function must be defined as "external".
+// TypeError 1159: (17-41='fallback () internal { }'): Fallback function must be defined as "external".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/528_fallback_marked_private.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/528_fallback_marked_private.sol
index 3d3020bfa..e76babeeb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/528_fallback_marked_private.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/528_fallback_marked_private.sol
@@ -2,4 +2,4 @@ contract C {
     fallback () private { }
 }
 // ----
-// TypeError 1159: (17-40): Fallback function must be defined as "external".
+// TypeError 1159: (17-40='fallback () private { }'): Fallback function must be defined as "external".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/529_fallback_marked_public.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/529_fallback_marked_public.sol
index ce8f3e018..3da5d8756 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/529_fallback_marked_public.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/529_fallback_marked_public.sol
@@ -2,4 +2,4 @@ contract C {
     fallback () public { }
 }
 // ----
-// TypeError 1159: (17-39): Fallback function must be defined as "external".
+// TypeError 1159: (17-39='fallback () public { }'): Fallback function must be defined as "external".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/530_tuple_invalid_literal_too_large_for_uint.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/530_tuple_invalid_literal_too_large_for_uint.sol
index 0c92397cf..91d6e8c93 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/530_tuple_invalid_literal_too_large_for_uint.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/530_tuple_invalid_literal_too_large_for_uint.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (76-83): Type int_const 1000...(104 digits omitted)...0000 is not implicitly convertible to expected type tuple(uint256,).
+// TypeError 7407: (76-83='(1E111)'): Type int_const 1000...(104 digits omitted)...0000 is not implicitly convertible to expected type tuple(uint256,).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/531_tuple_invalid_literal_too_large_unassigned.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/531_tuple_invalid_literal_too_large_unassigned.sol
index 0739c9e83..804dd379e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/531_tuple_invalid_literal_too_large_unassigned.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/531_tuple_invalid_literal_too_large_unassigned.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3390: (80-85): Invalid rational number.
+// TypeError 3390: (80-85='1E111'): Invalid rational number.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/532_tuple_invalid_literal_too_large_for_uint_multi.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/532_tuple_invalid_literal_too_large_for_uint_multi.sol
index 53979ab5f..bad406311 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/532_tuple_invalid_literal_too_large_for_uint_multi.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/532_tuple_invalid_literal_too_large_for_uint_multi.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3390: (77-82): Invalid rational number.
+// TypeError 3390: (77-82='1E111'): Invalid rational number.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/533_tuple_invalid_literal_too_large_exp.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/533_tuple_invalid_literal_too_large_exp.sol
index 2010aac68..7f1081f78 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/533_tuple_invalid_literal_too_large_exp.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/533_tuple_invalid_literal_too_large_exp.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3390: (53-59): Invalid rational number.
+// TypeError 3390: (53-59='2**270'): Invalid rational number.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/534_tuple_invalid_literal_too_large_expression.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/534_tuple_invalid_literal_too_large_expression.sol
index ab239f2a4..4acb25a73 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/534_tuple_invalid_literal_too_large_expression.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/534_tuple_invalid_literal_too_large_expression.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// Warning 6133: (52-74): Statement has no effect.
+// Warning 6133: (52-74='((2**270) / 2**100, 1)'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/536_array_length_invalid_expression_negative_bool.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/536_array_length_invalid_expression_negative_bool.sol
index 14fc21ac1..ec89eb818 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/536_array_length_invalid_expression_negative_bool.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/536_array_length_invalid_expression_negative_bool.sol
@@ -2,4 +2,4 @@ contract C {
     uint[-true] ids;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-27='-true'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/537_array_length_invalid_expression_int_divides_bool.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/537_array_length_invalid_expression_int_divides_bool.sol
index 5cb91b942..53322f2a9 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/537_array_length_invalid_expression_int_divides_bool.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/537_array_length_invalid_expression_int_divides_bool.sol
@@ -2,4 +2,4 @@ contract C {
     uint[true/1] ids;
 }
 // ----
-// TypeError 5462: (22-28): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-28='true/1'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/538_array_length_invalid_expression_bool_divides_int.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/538_array_length_invalid_expression_bool_divides_int.sol
index dbedaaa3b..2a672a3a2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/538_array_length_invalid_expression_bool_divides_int.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/538_array_length_invalid_expression_bool_divides_int.sol
@@ -2,4 +2,4 @@ contract C {
     uint[1/true] ids;
 }
 // ----
-// TypeError 5462: (22-28): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-28='1/true'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/539_array_length_invalid_expression_scientific_literal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/539_array_length_invalid_expression_scientific_literal.sol
index dc588eb4b..2bed106ab 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/539_array_length_invalid_expression_scientific_literal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/539_array_length_invalid_expression_scientific_literal.sol
@@ -2,4 +2,4 @@ contract C {
     uint[1.111111E1111111111111] ids;
 }
 // ----
-// TypeError 5462: (22-44): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (22-44='1.111111E1111111111111'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/540_array_length_invalid_expression_division_by_zero.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/540_array_length_invalid_expression_division_by_zero.sol
index 4e8b76d71..d0c7a7775 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/540_array_length_invalid_expression_division_by_zero.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/540_array_length_invalid_expression_division_by_zero.sol
@@ -2,4 +2,4 @@ contract C {
     uint[3/0] ids;
 }
 // ----
-// TypeError 6020: (22-25): Operator / not compatible with types int_const 3 and int_const 0
+// TypeError 6020: (22-25='3/0'): Operator / not compatible with types int_const 3 and int_const 0
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/541_warn_about_address_members_on_contract_balance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/541_warn_about_address_members_on_contract_balance.sol
index 38c3c80ca..5513cf953 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/541_warn_about_address_members_on_contract_balance.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/541_warn_about_address_members_on_contract_balance.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (52-64): Member "balance" not found or not visible after argument-dependent lookup in contract C. Use "address(this).balance" to access this address member.
+// TypeError 3125: (52-64='this.balance'): Member "balance" not found or not visible after argument-dependent lookup in contract C. Use "address(this).balance" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/542_warn_about_address_members_on_contract_transfer.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/542_warn_about_address_members_on_contract_transfer.sol
index 7eb41976e..d4ff83d6a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/542_warn_about_address_members_on_contract_transfer.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/542_warn_about_address_members_on_contract_transfer.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (52-65): Member "transfer" not found or not visible after argument-dependent lookup in contract C. Use "address(this).transfer" to access this address member.
+// TypeError 3125: (52-65='this.transfer'): Member "transfer" not found or not visible after argument-dependent lookup in contract C. Use "address(this).transfer" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/543_warn_about_address_members_on_contract_send.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/543_warn_about_address_members_on_contract_send.sol
index a889c26c3..eb92448bc 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/543_warn_about_address_members_on_contract_send.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/543_warn_about_address_members_on_contract_send.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (52-61): Member "send" not found or not visible after argument-dependent lookup in contract C. Use "address(this).send" to access this address member.
+// TypeError 3125: (52-61='this.send'): Member "send" not found or not visible after argument-dependent lookup in contract C. Use "address(this).send" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/544_warn_about_address_members_on_contract_call.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/544_warn_about_address_members_on_contract_call.sol
index 94a1aa3b1..cf4b0b7a0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/544_warn_about_address_members_on_contract_call.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/544_warn_about_address_members_on_contract_call.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (52-61): Member "call" not found or not visible after argument-dependent lookup in contract C. Use "address(this).call" to access this address member.
+// TypeError 3125: (52-61='this.call'): Member "call" not found or not visible after argument-dependent lookup in contract C. Use "address(this).call" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/545_warn_about_address_members_on_contract_callcode.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/545_warn_about_address_members_on_contract_callcode.sol
index e2e59e566..6268c7fbf 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/545_warn_about_address_members_on_contract_callcode.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/545_warn_about_address_members_on_contract_callcode.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (52-65): Member "callcode" not found or not visible after argument-dependent lookup in contract C. Use "address(this).callcode" to access this address member.
+// TypeError 3125: (52-65='this.callcode'): Member "callcode" not found or not visible after argument-dependent lookup in contract C. Use "address(this).callcode" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/546_warn_about_address_members_on_contract_delegatecall.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/546_warn_about_address_members_on_contract_delegatecall.sol
index f12d3cf97..a090bcda5 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/546_warn_about_address_members_on_contract_delegatecall.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/546_warn_about_address_members_on_contract_delegatecall.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (52-69): Member "delegatecall" not found or not visible after argument-dependent lookup in contract C. Use "address(this).delegatecall" to access this address member.
+// TypeError 3125: (52-69='this.delegatecall'): Member "delegatecall" not found or not visible after argument-dependent lookup in contract C. Use "address(this).delegatecall" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/547_warn_about_address_members_on_non_this_contract_balance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/547_warn_about_address_members_on_non_this_contract_balance.sol
index 91e7404b0..823d43a7a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/547_warn_about_address_members_on_non_this_contract_balance.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/547_warn_about_address_members_on_non_this_contract_balance.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (65-74): Member "balance" not found or not visible after argument-dependent lookup in contract C. Use "address(c).balance" to access this address member.
+// TypeError 3125: (65-74='c.balance'): Member "balance" not found or not visible after argument-dependent lookup in contract C. Use "address(c).balance" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/548_warn_about_address_members_on_non_this_contract_transfer.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/548_warn_about_address_members_on_non_this_contract_transfer.sol
index 192a89892..66c1615cc 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/548_warn_about_address_members_on_non_this_contract_transfer.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/548_warn_about_address_members_on_non_this_contract_transfer.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (65-75): Member "transfer" not found or not visible after argument-dependent lookup in contract C. Use "address(c).transfer" to access this address member.
+// TypeError 3125: (65-75='c.transfer'): Member "transfer" not found or not visible after argument-dependent lookup in contract C. Use "address(c).transfer" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/549_warn_about_address_members_on_non_this_contract_send.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/549_warn_about_address_members_on_non_this_contract_send.sol
index ba614226a..17b8f1ad8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/549_warn_about_address_members_on_non_this_contract_send.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/549_warn_about_address_members_on_non_this_contract_send.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (65-71): Member "send" not found or not visible after argument-dependent lookup in contract C. Use "address(c).send" to access this address member.
+// TypeError 3125: (65-71='c.send'): Member "send" not found or not visible after argument-dependent lookup in contract C. Use "address(c).send" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/550_warn_about_address_members_on_non_this_contract_call.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/550_warn_about_address_members_on_non_this_contract_call.sol
index 7d2eb2af8..07b60b05b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/550_warn_about_address_members_on_non_this_contract_call.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/550_warn_about_address_members_on_non_this_contract_call.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (65-71): Member "call" not found or not visible after argument-dependent lookup in contract C. Use "address(c).call" to access this address member.
+// TypeError 3125: (65-71='c.call'): Member "call" not found or not visible after argument-dependent lookup in contract C. Use "address(c).call" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/551_warn_about_address_members_on_non_this_contract_callcode.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/551_warn_about_address_members_on_non_this_contract_callcode.sol
index 971af8632..ac3def7fa 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/551_warn_about_address_members_on_non_this_contract_callcode.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/551_warn_about_address_members_on_non_this_contract_callcode.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (65-75): Member "callcode" not found or not visible after argument-dependent lookup in contract C. Use "address(c).callcode" to access this address member.
+// TypeError 3125: (65-75='c.callcode'): Member "callcode" not found or not visible after argument-dependent lookup in contract C. Use "address(c).callcode" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/552_warn_about_address_members_on_non_this_contract_delegatecall.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/552_warn_about_address_members_on_non_this_contract_delegatecall.sol
index ff933142f..7ab6dcbbb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/552_warn_about_address_members_on_non_this_contract_delegatecall.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/552_warn_about_address_members_on_non_this_contract_delegatecall.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 3125: (65-79): Member "delegatecall" not found or not visible after argument-dependent lookup in contract C. Use "address(c).delegatecall" to access this address member.
+// TypeError 3125: (65-79='c.delegatecall'): Member "delegatecall" not found or not visible after argument-dependent lookup in contract C. Use "address(c).delegatecall" to access this address member.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/569_block_blockhash_deprecated.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/569_block_blockhash_deprecated.sol
index 69c53894d..9f5cb4588 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/569_block_blockhash_deprecated.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/569_block_blockhash_deprecated.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 8113: (77-92): "block.blockhash()" has been deprecated in favor of "blockhash()"
+// TypeError 8113: (77-92='block.blockhash'): "block.blockhash()" has been deprecated in favor of "blockhash()"
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/570_function_type_undeclared_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/570_function_type_undeclared_type.sol
index a9509ce40..bbccd61bb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/570_function_type_undeclared_type.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/570_function_type_undeclared_type.sol
@@ -2,4 +2,4 @@ contract C {
     function a(function(Nested)) external pure {}
 }
 // ----
-// DeclarationError 7920: (37-43): Identifier not found or not unique.
+// DeclarationError 7920: (37-43='Nested'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/571_function_type_undeclared_type_external.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/571_function_type_undeclared_type_external.sol
index 90bd43665..065f0fc86 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/571_function_type_undeclared_type_external.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/571_function_type_undeclared_type_external.sol
@@ -2,4 +2,4 @@ contract C {
     function a(function(Nested) external) external pure {}
 }
 // ----
-// DeclarationError 7920: (37-43): Identifier not found or not unique.
+// DeclarationError 7920: (37-43='Nested'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/572_function_type_undeclared_type_multi_nested.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/572_function_type_undeclared_type_multi_nested.sol
index 8b08c29e7..835e6015c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/572_function_type_undeclared_type_multi_nested.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/572_function_type_undeclared_type_multi_nested.sol
@@ -2,4 +2,4 @@ contract C {
     function a(function(function(function(Nested)))) external pure {}
 }
 // ----
-// DeclarationError 7920: (55-61): Identifier not found or not unique.
+// DeclarationError 7920: (55-61='Nested'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/575_member_member_getter_call_without_parentheses.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/575_member_member_getter_call_without_parentheses.sol
index f7a5f3242..0aed183d6 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/575_member_member_getter_call_without_parentheses.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/575_member_member_getter_call_without_parentheses.sol
@@ -16,4 +16,4 @@ contract D{
     }
 }
 // ----
-// TypeError 6005: (170-175): Member "a" not found or not visible after argument-dependent lookup in function () view external returns (contract B). Did you intend to call the function?
+// TypeError 6005: (170-175='c.b.a'): Member "a" not found or not visible after argument-dependent lookup in function () view external returns (contract B). Did you intend to call the function?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/576_member_getter_call_without_parentheses.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/576_member_getter_call_without_parentheses.sol
index e96d0189b..b81cd1016 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/576_member_getter_call_without_parentheses.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/576_member_getter_call_without_parentheses.sol
@@ -14,4 +14,4 @@ contract C{
 }
 
 // ----
-// TypeError 6005: (140-145): Member "f" not found or not visible after argument-dependent lookup in function () view external returns (contract A). Did you intend to call the function?
+// TypeError 6005: (140-145='b.a.f'): Member "f" not found or not visible after argument-dependent lookup in function () view external returns (contract A). Did you intend to call the function?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/577_member_getter_call_without_parentheses_missing_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/577_member_getter_call_without_parentheses_missing_function.sol
index 11814b81f..a46619d80 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/577_member_getter_call_without_parentheses_missing_function.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/577_member_getter_call_without_parentheses_missing_function.sol
@@ -12,4 +12,4 @@ contract C{
 }
 
 // ----
-// TypeError 6005: (104-109): Member "f" not found or not visible after argument-dependent lookup in function () view external returns (contract A). Did you intend to call the function?
+// TypeError 6005: (104-109='b.a.f'): Member "f" not found or not visible after argument-dependent lookup in function () view external returns (contract A). Did you intend to call the function?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/578_private_member_getter_call_without_parentheses.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/578_private_member_getter_call_without_parentheses.sol
index fceadad8d..c9bbd4162 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/578_private_member_getter_call_without_parentheses.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/578_private_member_getter_call_without_parentheses.sol
@@ -14,4 +14,4 @@ contract C{
 }
 
 // ----
-// TypeError 9582: (141-144): Member "a" not found or not visible after argument-dependent lookup in contract B.
+// TypeError 9582: (141-144='b.a'): Member "a" not found or not visible after argument-dependent lookup in contract B.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/579_member_getter_call_without_parentheses_private_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/579_member_getter_call_without_parentheses_private_function.sol
index 328693437..9ba5d8762 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/579_member_getter_call_without_parentheses_private_function.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/579_member_getter_call_without_parentheses_private_function.sol
@@ -14,4 +14,4 @@ contract C{
 }
 
 // ----
-// TypeError 6005: (141-146): Member "f" not found or not visible after argument-dependent lookup in function () view external returns (contract A). Did you intend to call the function?
+// TypeError 6005: (141-146='b.a.f'): Member "f" not found or not visible after argument-dependent lookup in function () view external returns (contract A). Did you intend to call the function?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/580_improve_name_suggestion_one_and_two_letters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/580_improve_name_suggestion_one_and_two_letters.sol
index 832cf3ae8..4bc5c024c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/580_improve_name_suggestion_one_and_two_letters.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/580_improve_name_suggestion_one_and_two_letters.sol
@@ -9,6 +9,6 @@ contract c {
     uint256 ab;
 }
 // ----
-// DeclarationError 7576: (56-58): Undeclared identifier. Did you mean "ab"?
-// DeclarationError 7576: (72-74): Undeclared identifier.
-// DeclarationError 7576: (88-89): Undeclared identifier.
+// DeclarationError 7576: (56-58='ac'): Undeclared identifier. Did you mean "ab"?
+// DeclarationError 7576: (72-74='cd'): Undeclared identifier.
+// DeclarationError 7576: (88-89='b'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/581_improve_name_suggestion_three_letters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/581_improve_name_suggestion_three_letters.sol
index 6070ff353..4a03c43e4 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/581_improve_name_suggestion_three_letters.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/581_improve_name_suggestion_three_letters.sol
@@ -8,5 +8,5 @@ contract c {
     uint256 abc;
 }
 // ----
-// DeclarationError 7576: (56-59): Undeclared identifier. Did you mean "abc" or "abi"?
-// DeclarationError 7576: (73-76): Undeclared identifier.
+// DeclarationError 7576: (56-59='abd'): Undeclared identifier. Did you mean "abc" or "abi"?
+// DeclarationError 7576: (73-76='ade'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/582_improve_name_suggestion_four_letters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/582_improve_name_suggestion_four_letters.sol
index 4da28a5e9..e68cd2e20 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/582_improve_name_suggestion_four_letters.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/582_improve_name_suggestion_four_letters.sol
@@ -9,9 +9,9 @@ contract c {
     uint256 abc;
 }
 // ----
-// DeclarationError 7576: (52-53): Undeclared identifier.
-// DeclarationError 7576: (56-60): Undeclared identifier. Did you mean "long"?
-// DeclarationError 7576: (70-71): Undeclared identifier.
-// DeclarationError 7576: (74-78): Undeclared identifier. Did you mean "long"?
-// DeclarationError 7576: (88-89): Undeclared identifier.
-// DeclarationError 7576: (92-96): Undeclared identifier. Did you mean "long"?
+// DeclarationError 7576: (52-53='a'): Undeclared identifier.
+// DeclarationError 7576: (56-60='land'): Undeclared identifier. Did you mean "long"?
+// DeclarationError 7576: (70-71='a'): Undeclared identifier.
+// DeclarationError 7576: (74-78='lost'): Undeclared identifier. Did you mean "long"?
+// DeclarationError 7576: (88-89='a'): Undeclared identifier.
+// DeclarationError 7576: (92-96='lang'): Undeclared identifier. Did you mean "long"?
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/583_abi_encode_packed_with_rational_number_constant.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/583_abi_encode_packed_with_rational_number_constant.sol
index a2864ed8e..3ef4514d9 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/583_abi_encode_packed_with_rational_number_constant.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/583_abi_encode_packed_with_rational_number_constant.sol
@@ -2,4 +2,4 @@ contract C {
     function f() pure public { abi.encodePacked(0/1); }
 }
 // ----
-// TypeError 7279: (61-64): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
+// TypeError 7279: (61-64='0/1'): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/584_abi_decode_with_tuple_of_other_than_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/584_abi_decode_with_tuple_of_other_than_types.sol
index 0d5fadcc8..f819b29b1 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/584_abi_decode_with_tuple_of_other_than_types.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/584_abi_decode_with_tuple_of_other_than_types.sol
@@ -2,4 +2,4 @@ contract C {
     function f() pure public { abi.decode("", (0)); }
 }
 // ----
-// TypeError 1039: (60-61): Argument has to be a type name.
+// TypeError 1039: (60-61='0'): Argument has to be a type name.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol
index abbf76182..1a82978f7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/585_abi_decode_with_unsupported_types.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9611: (118-119): Decoding type struct C.s memory not supported.
+// TypeError 9611: (118-119='s'): Decoding type struct C.s memory not supported.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/array_length_fractional_computed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/array_length_fractional_computed.sol
index dd4c8cb83..b4ab01203 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/array_length_fractional_computed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/array_length_fractional_computed.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 3208: (141-146): Array with fractional length specified.
+// TypeError 3208: (141-146='7 / 3'): Array with fractional length specified.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/call_option_value_on_library_function.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/call_option_value_on_library_function.sol
index a5b57253a..c8f85411a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/call_option_value_on_library_function.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/call_option_value_on_library_function.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2193: (87-100): Function call options can only be set on external function calls or contract creations.
+// TypeError 2193: (87-100='L.l{value: 1}'): Function call options can only be set on external function calls or contract creations.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol
index 7b58b870f..52c824fd8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7366: (72-83): Operator += not compatible with types uint256 and tuple(int_const 1,int_const 1)
+// TypeError 7366: (72-83='a += (1, 1)'): Operator += not compatible with types uint256 and tuple(int_const 1,int_const 1)
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple.sol
index 7171a9aba..c3a28090a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4289: (72-88): Compound assignment is not allowed for tuple types.
+// TypeError 4289: (72-88='(a, b) += (1, 1)'): Compound assignment is not allowed for tuple types.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple_invalid_inline_array_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple_invalid_inline_array_type.sol
index 8d2d38d22..2a102f54e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple_invalid_inline_array_type.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/tuple_invalid_inline_array_type.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9563: (78-85): Invalid mobile type.
+// TypeError 9563: (78-85='100e100'): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol
index d845e735c..57cb47de1 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol
@@ -1,4 +1,4 @@
 S constant x;
 struct S { int y; }
 // ----
-// TypeError 9259: (0-12): Only constants of value type and byte array type are implemented.
+// TypeError 9259: (0-12='S constant x'): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
index 803cdad53..85a1452fb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
@@ -2,4 +2,4 @@ contract C {
     mapping(uint => uint) constant x;
 }
 // ----
-// TypeError 9259: (17-49): Only constants of value type and byte array type are implemented.
+// TypeError 9259: (17-49='mapping(uint => uint) constant x'): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
index 2fed9d631..3cfb9e20a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
@@ -5,4 +5,4 @@ contract C {
     S public constant c;
 }
 // ----
-// TypeError 9259: (71-90): Only constants of value type and byte array type are implemented.
+// TypeError 9259: (71-90='S public constant c'): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/free_and_constant.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/free_and_constant.sol
index ceb172bad..e3ec8c409 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/free_and_constant.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/free_and_constant.sol
@@ -1,4 +1,4 @@
 uint constant c = 7;
 function c() returns (uint) {}
 // ----
-// DeclarationError 2333: (21-51): Identifier already declared.
+// DeclarationError 2333: (21-51='function c() returns (uint) {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_memory_array.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_memory_array.sol
index 16bcbf447..aff2aa115 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_memory_array.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_memory_array.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6160: (74-86): Wrong argument count for function call: 0 arguments given but expected 1.
+// TypeError 6160: (74-86='new uint[]()'): Wrong argument count for function call: 0 arguments given but expected 1.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct.sol
index 3ff9d9ed1..d35cabe8f 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9755: (94-103): Wrong argument count for struct constructor: 1 arguments given but expected 2.
+// TypeError 9755: (94-103='S({a: 1})'): Wrong argument count for struct constructor: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct_members_skipped.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct_members_skipped.sol
index cbcb02f6f..4c44c354c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct_members_skipped.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/creating_struct_members_skipped.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9515: (104-113): Struct containing a (nested) mapping cannot be constructed.
+// TypeError 9515: (104-113='S({a: 1})'): Struct containing a (nested) mapping cannot be constructed.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/explicit_conversions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/explicit_conversions.sol
index aac750153..c408fe1fb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/explicit_conversions.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidArgs/explicit_conversions.sol
@@ -5,5 +5,5 @@ contract test {
     }
 }
 // ----
-// TypeError 2558: (50-60): Exactly one argument expected for explicit type conversion.
-// TypeError 5153: (70-83): Type conversion cannot allow named arguments.
+// TypeError 2558: (50-60='uint(1, 1)'): Exactly one argument expected for explicit type conversion.
+// TypeError 5153: (70-83='uint({arg:1})'): Type conversion cannot allow named arguments.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/conditional_expression.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/conditional_expression.sol
index e7abd890d..6b3142d3c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/conditional_expression.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/conditional_expression.sol
@@ -8,9 +8,9 @@ contract C {
     }
 }
 // ----
-// TypeError 9717: (94-100): Invalid mobile type in true expression.
-// TypeError 9553: (87-105): Invalid type for argument in function call. Invalid implicit conversion from uint8 to bytes1 requested.
-// TypeError 3703: (130-136): Invalid mobile type in false expression.
-// TypeError 9553: (118-136): Invalid type for argument in function call. Invalid implicit conversion from uint8 to bytes1 requested.
-// TypeError 9717: (157-163): Invalid mobile type in true expression.
-// TypeError 3703: (166-172): Invalid mobile type in false expression.
+// TypeError 9717: (94-100='99**99'): Invalid mobile type in true expression.
+// TypeError 9553: (87-105='true ? 99**99 : 99'): Invalid type for argument in function call. Invalid implicit conversion from uint8 to bytes1 requested.
+// TypeError 3703: (130-136='99**99'): Invalid mobile type in false expression.
+// TypeError 9553: (118-136='true ? 99 : 99**99'): Invalid type for argument in function call. Invalid implicit conversion from uint8 to bytes1 requested.
+// TypeError 9717: (157-163='99**99'): Invalid mobile type in true expression.
+// TypeError 3703: (166-172='99**99'): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/constructor_call.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/constructor_call.sol
index 58d9f8ce6..23f5b36cd 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/constructor_call.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/invalidTypes/constructor_call.sol
@@ -9,4 +9,4 @@ contract A {
     }
 }
 // ----
-// TypeError 9553: (108-114): Invalid type for argument in function call. Invalid implicit conversion from int_const 1234 to bytes32 requested.
+// TypeError 9553: (108-114='(1234)'): Invalid type for argument in function call. Invalid implicit conversion from int_const 1234 to bytes32 requested.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/no_effect_statements.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/no_effect_statements.sol
index 5f5b9a130..38d0fb8f5 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/no_effect_statements.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/no_effect_statements.sol
@@ -9,9 +9,9 @@ contract test {
     }
 }
 // ----
-// Warning 6321: (83-89): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6133: (95-96): Statement has no effect.
-// Warning 6133: (100-106): Statement has no effect.
-// Warning 6133: (110-114): Statement has no effect.
-// Warning 6133: (118-122): Statement has no effect.
-// Warning 6133: (126-133): Statement has no effect.
+// Warning 6321: (83-89='bytes1'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6133: (95-96='s'): Statement has no effect.
+// Warning 6133: (100-106='s(1,2)'): Statement has no effect.
+// Warning 6133: (110-114='s[7]'): Statement has no effect.
+// Warning 6133: (118-122='uint'): Statement has no effect.
+// Warning 6133: (126-133='uint[7]'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/events.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/events.sol
index a09ab31b9..8efc61b60 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/events.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/events.sol
@@ -2,4 +2,4 @@ contract C {
     event keccak256();
 }
 // ----
-// Warning 2319: (17-35): This declaration shadows a builtin symbol.
+// Warning 2319: (17-35='event keccak256();'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/global_scope.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/global_scope.sol
index 76fb2ff83..60bd10253 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/global_scope.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/global_scope.sol
@@ -1,4 +1,4 @@
 contract msg {
 }
 // ----
-// Warning 2319: (0-16): This declaration shadows a builtin symbol.
+// Warning 2319: (0-16='contract msg { }'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_functions.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_functions.sol
index cb1f793b2..f49d7718e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_functions.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_functions.sol
@@ -11,6 +11,6 @@ contract C {
     }
 }
 // ----
-// DeclarationError 4113: (75-106): The identifier name "this" is reserved.
-// DeclarationError 4113: (119-151): The identifier name "super" is reserved.
-// DeclarationError 4113: (164-192): The identifier name "_" is reserved.
+// DeclarationError 4113: (75-106='function this() {             }'): The identifier name "this" is reserved.
+// DeclarationError 4113: (119-151='function super() {             }'): The identifier name "super" is reserved.
+// DeclarationError 4113: (164-192='function _() {             }'): The identifier name "_" is reserved.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_identifier.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_identifier.sol
index 4fc9b245b..1a6615725 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_identifier.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_assembly_identifier.sol
@@ -8,8 +8,8 @@ contract C {
     }
 }
 // ----
-// DeclarationError 4113: (74-79): The identifier name "super" is reserved.
-// DeclarationError 3859: (74-79): This declaration shadows a declaration outside the inline assembly block.
-// DeclarationError 4113: (101-105): The identifier name "this" is reserved.
-// DeclarationError 3859: (101-105): This declaration shadows a declaration outside the inline assembly block.
-// DeclarationError 4113: (127-128): The identifier name "_" is reserved.
+// DeclarationError 4113: (74-79='super'): The identifier name "super" is reserved.
+// DeclarationError 3859: (74-79='super'): This declaration shadows a declaration outside the inline assembly block.
+// DeclarationError 4113: (101-105='this'): The identifier name "this" is reserved.
+// DeclarationError 3859: (101-105='this'): This declaration shadows a declaration outside the inline assembly block.
+// DeclarationError 4113: (127-128='_'): The identifier name "_" is reserved.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_function_parameters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_function_parameters.sol
index 6b5c7c99b..ea950c503 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_function_parameters.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_function_parameters.sol
@@ -16,13 +16,13 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3726: (28-38): The name "super" is reserved.
-// DeclarationError 3726: (70-79): The name "this" is reserved.
-// DeclarationError 3726: (111-117): The name "_" is reserved.
-// DeclarationError 3726: (167-177): The name "super" is reserved.
-// DeclarationError 3726: (238-247): The name "this" is reserved.
-// DeclarationError 3726: (308-314): The name "_" is reserved.
-// Warning 2319: (28-38): This declaration shadows a builtin symbol.
-// Warning 2319: (70-79): This declaration shadows a builtin symbol.
-// Warning 2319: (167-177): This declaration shadows a builtin symbol.
-// Warning 2319: (238-247): This declaration shadows a builtin symbol.
+// DeclarationError 3726: (28-38='uint super'): The name "super" is reserved.
+// DeclarationError 3726: (70-79='uint this'): The name "this" is reserved.
+// DeclarationError 3726: (111-117='uint _'): The name "_" is reserved.
+// DeclarationError 3726: (167-177='uint super'): The name "super" is reserved.
+// DeclarationError 3726: (238-247='uint this'): The name "this" is reserved.
+// DeclarationError 3726: (308-314='uint _'): The name "_" is reserved.
+// Warning 2319: (28-38='uint super'): This declaration shadows a builtin symbol.
+// Warning 2319: (70-79='uint this'): This declaration shadows a builtin symbol.
+// Warning 2319: (167-177='uint super'): This declaration shadows a builtin symbol.
+// Warning 2319: (238-247='uint this'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_using_for.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_using_for.sol
index bf995ba2f..6de3d16f3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_using_for.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/illegal_names_using_for.sol
@@ -25,8 +25,8 @@ contract C {
     using L for this;
 }
 // ----
-// DeclarationError 3726: (56-84): The name "super" is reserved.
-// DeclarationError 3726: (95-122): The name "this" is reserved.
-// DeclarationError 3726: (133-157): The name "_" is reserved.
-// Warning 2319: (56-84): This declaration shadows a builtin symbol.
-// Warning 2319: (95-122): This declaration shadows a builtin symbol.
+// DeclarationError 3726: (56-84='struct super {     uint a; }'): The name "super" is reserved.
+// DeclarationError 3726: (95-122='struct this {     uint a; }'): The name "this" is reserved.
+// DeclarationError 3726: (133-157='struct _ {     uint a; }'): The name "_" is reserved.
+// Warning 2319: (56-84='struct super {     uint a; }'): This declaration shadows a builtin symbol.
+// Warning 2319: (95-122='struct this {     uint a; }'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/parameters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/parameters.sol
index 40a76dd79..efd331e77 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/parameters.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/parameters.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// Warning 2319: (28-40): This declaration shadows a builtin symbol.
+// Warning 2319: (28-40='uint require'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/return_parameters.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/return_parameters.sol
index e73670385..50bbff11c 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/return_parameters.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/return_parameters.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// Warning 2319: (51-63): This declaration shadows a builtin symbol.
+// Warning 2319: (51-63='uint require'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/storage_variables.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/storage_variables.sol
index cde3d01bf..473749604 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/storage_variables.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/storage_variables.sol
@@ -2,4 +2,4 @@ contract C {
     uint msg;
 }
 // ----
-// Warning 2319: (17-25): This declaration shadows a builtin symbol.
+// Warning 2319: (17-25='uint msg'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/this_super.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/this_super.sol
index 47970c046..bd9dbb49b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/this_super.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/this_super.sol
@@ -5,7 +5,7 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3726: (52-62): The name "super" is reserved.
-// DeclarationError 3726: (76-85): The name "this" is reserved.
-// Warning 2319: (52-62): This declaration shadows a builtin symbol.
-// Warning 2319: (76-85): This declaration shadows a builtin symbol.
+// DeclarationError 3726: (52-62='uint super'): The name "super" is reserved.
+// DeclarationError 3726: (76-85='uint this'): The name "this" is reserved.
+// Warning 2319: (52-62='uint super'): This declaration shadows a builtin symbol.
+// Warning 2319: (76-85='uint this'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/variables.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/variables.sol
index d13cfe988..4b324e52e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/variables.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/shadowsBuiltin/variables.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// Warning 2319: (52-60): This declaration shadows a builtin symbol.
+// Warning 2319: (52-60='uint msg'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/library_instances.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/library_instances.sol
index b340c2d39..237be7406 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/library_instances.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/library_instances.sol
@@ -9,6 +9,6 @@ contract Y {
 	}
 }
 // ----
-// TypeError 1130: (29-30): Invalid use of a library name.
-// TypeError 1130: (50-51): Invalid use of a library name.
-// TypeError 1130: (77-78): Invalid use of a library name.
+// TypeError 1130: (29-30='X'): Invalid use of a library name.
+// TypeError 1130: (50-51='X'): Invalid use of a library name.
+// TypeError 1130: (77-78='X'): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_tuple_not_convertible.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_tuple_not_convertible.sol
index a6160b322..1241ff699 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_tuple_not_convertible.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_tuple_not_convertible.sol
@@ -2,4 +2,4 @@ contract test {
     function f() public returns (uint256 r, uint8) { return ((12, "")); }
 }
 // ----
-// TypeError 5992: (76-86): Return argument type tuple(int_const 12,literal_string "") is not implicitly convertible to expected type tuple(uint256,uint8).
+// TypeError 5992: (76-86='((12, ""))'): Return argument type tuple(int_const 12,literal_string "") is not implicitly convertible to expected type tuple(uint256,uint8).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_number.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_number.sol
index 8ad9de470..61e6575da 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_number.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_number.sol
@@ -2,4 +2,4 @@ contract test {
     function f() public returns (bool r1, bool r2) { return 1 >= 2; }
 }
 // ----
-// TypeError 8863: (69-82): Different number of arguments in return statement than in returns declaration.
+// TypeError 8863: (69-82='return 1 >= 2'): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_type.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_type.sol
index f3d27491e..d8abdf1cc 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_type.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/typeChecking/return_wrong_type.sol
@@ -2,4 +2,4 @@ contract test {
     function f() public returns (uint256 r) { return 1 >= 2; }
 }
 // ----
-// TypeError 6359: (69-75): Return argument type bool is not implicitly convertible to expected type (type of first return variable) uint256.
+// TypeError 6359: (69-75='1 >= 2'): Return argument type bool is not implicitly convertible to expected type (type of first return variable) uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local.sol
index b36061080..aa69c88e0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// Warning 2072: (52-58): Unused local variable.
+// Warning 2072: (52-58='uint a'): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local_assignment.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local_assignment.sol
index 943de5dd0..ad524fdae 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local_assignment.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/warnUnused/local_assignment.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// Warning 2072: (52-58): Unused local variable.
+// Warning 2072: (52-58='uint a'): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_author_function.sol b/test/libsolidity/syntaxTests/natspec/docstring_author_function.sol
index 71db9907b..4cf849fba 100644
--- a/test/libsolidity/syntaxTests/natspec/docstring_author_function.sol
+++ b/test/libsolidity/syntaxTests/natspec/docstring_author_function.sol
@@ -3,4 +3,4 @@ contract C {
     function iHaveAuthor() public pure {}
 }
 // ----
-// DocstringParsingError 6546: (17-35): Documentation tag @author not valid for functions.
+// DocstringParsingError 6546: (17-35='/// @author author'): Documentation tag @author not valid for functions.
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_empty_description.sol b/test/libsolidity/syntaxTests/natspec/docstring_empty_description.sol
index e77e42c42..8a84399c4 100644
--- a/test/libsolidity/syntaxTests/natspec/docstring_empty_description.sol
+++ b/test/libsolidity/syntaxTests/natspec/docstring_empty_description.sol
@@ -3,4 +3,4 @@ contract C {
     function vote(uint id) public {}
 }
 // ----
-// DocstringParsingError 9942: (17-30): No description given for param id
+// DocstringParsingError 9942: (17-30='/// @param id'): No description given for param id
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_empty_tag.sol b/test/libsolidity/syntaxTests/natspec/docstring_empty_tag.sol
index 56c3d59aa..c65baeabb 100644
--- a/test/libsolidity/syntaxTests/natspec/docstring_empty_tag.sol
+++ b/test/libsolidity/syntaxTests/natspec/docstring_empty_tag.sol
@@ -3,4 +3,4 @@ abstract contract C {
     function vote(uint id) public {}
 }
 // ----
-// DocstringParsingError 3335: (26-36): No param name given
+// DocstringParsingError 3335: (26-36='/// @param'): No param name given
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_non_public_state_variable_with_return.sol b/test/libsolidity/syntaxTests/natspec/docstring_non_public_state_variable_with_return.sol
index da2d75fe8..2cade5635 100644
--- a/test/libsolidity/syntaxTests/natspec/docstring_non_public_state_variable_with_return.sol
+++ b/test/libsolidity/syntaxTests/natspec/docstring_non_public_state_variable_with_return.sol
@@ -3,4 +3,4 @@ contract test {
   uint private state;
 }
 // ----
-// DocstringParsingError 6546: (18-47): Documentation tag @return not valid for non-public state variables.
+// DocstringParsingError 6546: (18-47='/// @return returns something'): Documentation tag @return not valid for non-public state variables.
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return.sol
index 2517ff381..594b1bfc5 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return.sol
@@ -7,4 +7,4 @@ contract D is C {
 	modifier m22 override { _; }
 }
 // ----
-// DocstringParsingError 6546: (14-24): Documentation tag @return not valid for modifiers.
+// DocstringParsingError 6546: (14-24='///@return'): Documentation tag @return not valid for modifiers.
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return2.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return2.sol
index 5b81a4660..8860d8315 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return2.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return2.sol
@@ -7,6 +7,6 @@ contract B is A {
 	function g(int x) public pure override returns (int b) { return 2; }
 }
 // ----
-// DocstringParsingError 2604: (14-27): Documentation tag "@return a" exceeds the number of return parameters.
+// DocstringParsingError 2604: (14-27='/// @return a'): Documentation tag "@return a" exceeds the number of return parameters.
 // TypeError 4822: (98-166): Overriding function return types differ.
-// TypeError 8863: (64-72): Different number of arguments in return statement than in returns declaration.
+// TypeError 8863: (64-72='return 2'): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc.sol
index 678872d7a..13d18153d 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// DocstringParsingError 9397: (17-34): Documentation tag @inheritdoc references inexistent contract "X".
+// DocstringParsingError 9397: (17-34='/// @inheritdoc X'): Documentation tag @inheritdoc references inexistent contract "X".
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc2.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc2.sol
index 4d97ff93d..863427698 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc2.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc2.sol
@@ -7,4 +7,4 @@ contract C is D {
     }
 }
 // ----
-// DocstringParsingError 4682: (38-55): Documentation tag @inheritdoc references contract "D", but the contract does not contain a function that is overridden by this function.
+// DocstringParsingError 4682: (38-55='/// @inheritdoc D'): Documentation tag @inheritdoc references contract "D", but the contract does not contain a function that is overridden by this function.
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc3.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc3.sol
index d00e1e7ea..2532e8e45 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc3.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc3.sol
@@ -8,4 +8,4 @@ contract C is D {
     }
 }
 // ----
-// DocstringParsingError 1430: (63-82): Documentation tag @inheritdoc reference "D.S" is not a contract.
+// DocstringParsingError 1430: (63-82='/// @inheritdoc D.S'): Documentation tag @inheritdoc reference "D.S" is not a contract.
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_emptys.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_emptys.sol
index d2c41cd2c..18e6288f5 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_emptys.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_emptys.sol
@@ -13,7 +13,7 @@ contract C {
     }
 }
 // ----
-// DocstringParsingError 1933: (17-32): Expected contract name following documentation tag @inheritdoc.
-// DocstringParsingError 5967: (71-88): Documentation tag @inheritdoc reference "." is malformed.
-// DocstringParsingError 5967: (127-147): Documentation tag @inheritdoc reference "C..f" is malformed.
-// DocstringParsingError 5967: (186-204): Documentation tag @inheritdoc reference "C." is malformed.
+// DocstringParsingError 1933: (17-32='/// @inheritdoc'): Expected contract name following documentation tag @inheritdoc.
+// DocstringParsingError 5967: (71-88='/// @inheritdoc .'): Documentation tag @inheritdoc reference "." is malformed.
+// DocstringParsingError 5967: (127-147='/// @inheritdoc C..f'): Documentation tag @inheritdoc reference "C..f" is malformed.
+// DocstringParsingError 5967: (186-204='/// @inheritdoc C.'): Documentation tag @inheritdoc reference "C." is malformed.
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_wrong_type.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_wrong_type.sol
index 510f6622f..6d70baced 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_wrong_type.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_wrong_type.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// DocstringParsingError 1430: (42-59): Documentation tag @inheritdoc reference "S" is not a contract.
+// DocstringParsingError 1430: (42-59='/// @inheritdoc S'): Documentation tag @inheritdoc reference "S" is not a contract.
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_return_size_mismatch.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_return_size_mismatch.sol
index e060a5436..230c46a84 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/docstring_return_size_mismatch.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/docstring_return_size_mismatch.sol
@@ -8,4 +8,4 @@ abstract contract C {
 }
 // ----
 // DocstringParsingError 5856: (26-89): Documentation tag "@return No value returned" does not contain the name of its return parameter.
-// DocstringParsingError 5856: (159-188): Documentation tag "@return No value returned" does not contain the name of its return parameter.
+// DocstringParsingError 5856: (159-188='/// @return No value returned'): Documentation tag "@return No value returned" does not contain the name of its return parameter.
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/inherit_doc_events.sol b/test/libsolidity/syntaxTests/natspec/invalid/inherit_doc_events.sol
index e7fb1a822..027f8402c 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/inherit_doc_events.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/inherit_doc_events.sol
@@ -14,4 +14,4 @@ contract A is ERC20 {
 
 
 // ----
-// DocstringParsingError 6546: (305-326): Documentation tag @inheritdoc not valid for events.
+// DocstringParsingError 6546: (305-326='/// @inheritdoc ERC20'): Documentation tag @inheritdoc not valid for events.
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/invalid_tag.sol b/test/libsolidity/syntaxTests/natspec/invalid/invalid_tag.sol
index 741dc4407..de55ca5e4 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/invalid_tag.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/invalid_tag.sol
@@ -12,8 +12,8 @@ contract C {
 	function j() public pure {}
 }
 // ----
-// DocstringParsingError 6546: (0-14): Documentation tag @a&b not valid for contracts.
-// DocstringParsingError 2968: (28-49): Invalid character in custom tag @custom:x^y. Only lowercase letters and "-" are permitted.
-// DocstringParsingError 6564: (80-92): Custom documentation tag must contain a chosen name, i.e. @custom:mytag.
-// DocstringParsingError 2968: (123-141): Invalid character in custom tag @custom:abcDEF. Only lowercase letters and "-" are permitted.
-// DocstringParsingError 6564: (222-233): Custom documentation tag must contain a chosen name, i.e. @custom:mytag.
+// DocstringParsingError 6546: (0-14='/// @a&b test'): Documentation tag @a&b not valid for contracts.
+// DocstringParsingError 2968: (28-49='/// @custom:x^y test2'): Invalid character in custom tag @custom:x^y. Only lowercase letters and "-" are permitted.
+// DocstringParsingError 6564: (80-92='/// @custom:'): Custom documentation tag must contain a chosen name, i.e. @custom:mytag.
+// DocstringParsingError 2968: (123-141='/// @custom:abcDEF'): Invalid character in custom tag @custom:abcDEF. Only lowercase letters and "-" are permitted.
+// DocstringParsingError 6564: (222-233='/// @custom'): Custom documentation tag must contain a chosen name, i.e. @custom:mytag.
diff --git a/test/libsolidity/syntaxTests/negation.sol b/test/libsolidity/syntaxTests/negation.sol
index f79920954..d99200e56 100644
--- a/test/libsolidity/syntaxTests/negation.sol
+++ b/test/libsolidity/syntaxTests/negation.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4907: (97-99): Unary operator - cannot be applied to type uint256
+// TypeError 4907: (97-99='-y'): Unary operator - cannot be applied to type uint256
diff --git a/test/libsolidity/syntaxTests/parsing/address_constant_payable.sol b/test/libsolidity/syntaxTests/parsing/address_constant_payable.sol
index 6426da1e5..73d6b9608 100644
--- a/test/libsolidity/syntaxTests/parsing/address_constant_payable.sol
+++ b/test/libsolidity/syntaxTests/parsing/address_constant_payable.sol
@@ -2,4 +2,4 @@ contract C {
     address constant payable b = address(0);
 }
 // ----
-// ParserError 2314: (34-41): Expected identifier but got 'payable'
+// ParserError 2314: (34-41='payable'): Expected identifier but got 'payable'
diff --git a/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol b/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol
index 90968ebc6..687dcb1a0 100644
--- a/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol
+++ b/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol
@@ -14,13 +14,13 @@ contract C {
 	function j() public pure returns (address pure) {}
 }
 // ----
-// TypeError 2311: (14-26): Address types can only be payable or non-payable.
-// TypeError 2311: (33-45): Address types can only be payable or non-payable.
-// TypeError 2311: (52-64): Address types can only be payable or non-payable.
-// TypeError 2311: (89-101): Address types can only be payable or non-payable.
-// TypeError 2311: (138-150): Address types can only be payable or non-payable.
-// TypeError 2311: (156-168): Address types can only be payable or non-payable.
-// TypeError 2311: (195-207): Address types can only be payable or non-payable.
-// TypeError 2311: (236-248): Address types can only be payable or non-payable.
-// TypeError 2311: (300-312): Address types can only be payable or non-payable.
-// TypeError 2311: (352-364): Address types can only be payable or non-payable.
+// TypeError 2311: (14-26='address view'): Address types can only be payable or non-payable.
+// TypeError 2311: (33-45='address pure'): Address types can only be payable or non-payable.
+// TypeError 2311: (52-64='address view'): Address types can only be payable or non-payable.
+// TypeError 2311: (89-101='address view'): Address types can only be payable or non-payable.
+// TypeError 2311: (138-150='address view'): Address types can only be payable or non-payable.
+// TypeError 2311: (156-168='address pure'): Address types can only be payable or non-payable.
+// TypeError 2311: (195-207='address view'): Address types can only be payable or non-payable.
+// TypeError 2311: (236-248='address pure'): Address types can only be payable or non-payable.
+// TypeError 2311: (300-312='address view'): Address types can only be payable or non-payable.
+// TypeError 2311: (352-364='address pure'): Address types can only be payable or non-payable.
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable_conversion.sol b/test/libsolidity/syntaxTests/parsing/address_payable_conversion.sol
index 7e7841565..512d03f30 100644
--- a/test/libsolidity/syntaxTests/parsing/address_payable_conversion.sol
+++ b/test/libsolidity/syntaxTests/parsing/address_payable_conversion.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (80-87): Expected ';' but got 'payable'
+// ParserError 2314: (80-87='payable'): Expected ';' but got 'payable'
diff --git a/test/libsolidity/syntaxTests/parsing/address_payable_type_expression.sol b/test/libsolidity/syntaxTests/parsing/address_payable_type_expression.sol
index b09f1ed13..a9bd80784 100644
--- a/test/libsolidity/syntaxTests/parsing/address_payable_type_expression.sol
+++ b/test/libsolidity/syntaxTests/parsing/address_payable_type_expression.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (67-68): Expected identifier but got ';'
+// ParserError 2314: (67-68=';'): Expected identifier but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/address_public_payable_error.sol b/test/libsolidity/syntaxTests/parsing/address_public_payable_error.sol
index 8f27f2922..20a27d3a0 100644
--- a/test/libsolidity/syntaxTests/parsing/address_public_payable_error.sol
+++ b/test/libsolidity/syntaxTests/parsing/address_public_payable_error.sol
@@ -2,4 +2,4 @@ contract C {
     address public payable a;
 }
 // ----
-// ParserError 2314: (32-39): Expected identifier but got 'payable'
+// ParserError 2314: (32-39='payable'): Expected identifier but got 'payable'
diff --git a/test/libsolidity/syntaxTests/parsing/array_range_conversion.sol b/test/libsolidity/syntaxTests/parsing/array_range_conversion.sol
index 785d8e732..4aa5c13d4 100644
--- a/test/libsolidity/syntaxTests/parsing/array_range_conversion.sol
+++ b/test/libsolidity/syntaxTests/parsing/array_range_conversion.sol
@@ -7,8 +7,8 @@ contract C {
     }
 }
 // ----
-// TypeError 1760: (77-85): Types cannot be sliced.
-// TypeError 9640: (77-88): Explicit type conversion not allowed from "uint256[] memory" to "uint256".
-// TypeError 1760: (98-107): Types cannot be sliced.
-// TypeError 9640: (98-110): Explicit type conversion not allowed from "uint256[] memory" to "uint256".
-// TypeError 1760: (120-130): Types cannot be sliced.
+// TypeError 1760: (77-85='uint[1:]'): Types cannot be sliced.
+// TypeError 9640: (77-88='uint[1:](x)'): Explicit type conversion not allowed from "uint256[] memory" to "uint256".
+// TypeError 1760: (98-107='uint[1:2]'): Types cannot be sliced.
+// TypeError 9640: (98-110='uint[1:2](x)'): Explicit type conversion not allowed from "uint256[] memory" to "uint256".
+// TypeError 1760: (120-130='uint[][1:]'): Types cannot be sliced.
diff --git a/test/libsolidity/syntaxTests/parsing/array_range_nested_invalid.sol b/test/libsolidity/syntaxTests/parsing/array_range_nested_invalid.sol
index 700f3e1ff..f084c954d 100644
--- a/test/libsolidity/syntaxTests/parsing/array_range_nested_invalid.sol
+++ b/test/libsolidity/syntaxTests/parsing/array_range_nested_invalid.sol
@@ -8,7 +8,7 @@ contract C {
     }
 }
 // ----
-// TypeError 2148: (110-116): Index range access is not supported for arrays with dynamically encoded base types.
-// TypeError 2148: (126-130): Index range access is not supported for arrays with dynamically encoded base types.
-// TypeError 2148: (140-145): Index range access is not supported for arrays with dynamically encoded base types.
-// TypeError 2148: (155-160): Index range access is not supported for arrays with dynamically encoded base types.
+// TypeError 2148: (110-116='x[1:2]'): Index range access is not supported for arrays with dynamically encoded base types.
+// TypeError 2148: (126-130='x[:]'): Index range access is not supported for arrays with dynamically encoded base types.
+// TypeError 2148: (140-145='x[1:]'): Index range access is not supported for arrays with dynamically encoded base types.
+// TypeError 2148: (155-160='x[:2]'): Index range access is not supported for arrays with dynamically encoded base types.
diff --git a/test/libsolidity/syntaxTests/parsing/array_type_range.sol b/test/libsolidity/syntaxTests/parsing/array_type_range.sol
index 0e4a155b2..d5f6b2a61 100644
--- a/test/libsolidity/syntaxTests/parsing/array_type_range.sol
+++ b/test/libsolidity/syntaxTests/parsing/array_type_range.sol
@@ -8,7 +8,7 @@ contract C {
 }
 
 // ----
-// ParserError 5464: (52-62): Expected array length expression.
-// ParserError 5464: (81-92): Expected array length expression.
-// ParserError 5464: (111-119): Expected array length expression.
-// ParserError 5464: (138-147): Expected array length expression.
+// ParserError 5464: (52-62='uint[][1:]'): Expected array length expression.
+// ParserError 5464: (81-92='uint[][1:2]'): Expected array length expression.
+// ParserError 5464: (111-119='uint[1:]'): Expected array length expression.
+// ParserError 5464: (138-147='uint[1:2]'): Expected array length expression.
diff --git a/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol b/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
index 44fcd2d3a..253bd28e7 100644
--- a/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
+++ b/test/libsolidity/syntaxTests/parsing/arrays_in_expressions.sol
@@ -2,4 +2,4 @@ contract c {
     function f() public { c[10] storage a = 7; uint8[10 * 2] storage x; }
 }
 // ----
-// TypeError 9574: (39-58): Type int_const 7 is not implicitly convertible to expected type contract c[10] storage pointer.
+// TypeError 9574: (39-58='c[10] storage a = 7'): Type int_const 7 is not implicitly convertible to expected type contract c[10] storage pointer.
diff --git a/test/libsolidity/syntaxTests/parsing/assembly_invalid_type.sol b/test/libsolidity/syntaxTests/parsing/assembly_invalid_type.sol
index eb40db05e..031c0da6c 100644
--- a/test/libsolidity/syntaxTests/parsing/assembly_invalid_type.sol
+++ b/test/libsolidity/syntaxTests/parsing/assembly_invalid_type.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// ParserError 4531: (55-64): Only "evmasm" supported.
+// ParserError 4531: (55-64='"failasm"'): Only "evmasm" supported.
diff --git a/test/libsolidity/syntaxTests/parsing/conditional_multiple.sol b/test/libsolidity/syntaxTests/parsing/conditional_multiple.sol
index d7c1299ff..3cc0f18e6 100644
--- a/test/libsolidity/syntaxTests/parsing/conditional_multiple.sol
+++ b/test/libsolidity/syntaxTests/parsing/conditional_multiple.sol
@@ -4,5 +4,5 @@ contract A {
     }
 }
 // ----
-// Warning 2072: (47-53): Unused local variable.
+// Warning 2072: (47-53='uint x'): Unused local variable.
 // Warning 2018: (17-100): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/conditional_true_false_literal.sol b/test/libsolidity/syntaxTests/parsing/conditional_true_false_literal.sol
index e63a4fba0..781a83d35 100644
--- a/test/libsolidity/syntaxTests/parsing/conditional_true_false_literal.sol
+++ b/test/libsolidity/syntaxTests/parsing/conditional_true_false_literal.sol
@@ -5,6 +5,6 @@ contract A {
     }
 }
 // ----
-// Warning 2072: (47-53): Unused local variable.
-// Warning 2072: (78-84): Unused local variable.
+// Warning 2072: (47-53='uint x'): Unused local variable.
+// Warning 2072: (78-84='uint y'): Unused local variable.
 // Warning 2018: (17-107): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/conditional_with_constants.sol b/test/libsolidity/syntaxTests/parsing/conditional_with_constants.sol
index 1aa092298..c3d0d2dc7 100644
--- a/test/libsolidity/syntaxTests/parsing/conditional_with_constants.sol
+++ b/test/libsolidity/syntaxTests/parsing/conditional_with_constants.sol
@@ -5,6 +5,6 @@ contract A {
     }
 }
 // ----
-// Warning 2072: (47-53): Unused local variable.
-// Warning 2072: (79-85): Unused local variable.
+// Warning 2072: (47-53='uint x'): Unused local variable.
+// Warning 2072: (79-85='uint y'): Unused local variable.
 // Warning 2018: (17-110): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/conditional_with_variables.sol b/test/libsolidity/syntaxTests/parsing/conditional_with_variables.sol
index d475d8efc..d2f409d39 100644
--- a/test/libsolidity/syntaxTests/parsing/conditional_with_variables.sol
+++ b/test/libsolidity/syntaxTests/parsing/conditional_with_variables.sol
@@ -7,6 +7,6 @@ contract A {
     }
 }
 // ----
-// Warning 2072: (87-93): Unused local variable.
-// Warning 2072: (121-127): Unused local variable.
+// Warning 2072: (87-93='uint z'): Unused local variable.
+// Warning 2072: (121-127='uint w'): Unused local variable.
 // Warning 2018: (17-150): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol b/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol
index a8dbd391d..0e2392917 100644
--- a/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol
+++ b/test/libsolidity/syntaxTests/parsing/constant_is_keyword.sol
@@ -2,4 +2,4 @@ contract Foo {
 	uint constant = 4;
 }
 // ----
-// ParserError 2314: (30-31): Expected identifier but got '='
+// ParserError 2314: (30-31='='): Expected identifier but got '='
diff --git a/test/libsolidity/syntaxTests/parsing/constant_state_modifier.sol b/test/libsolidity/syntaxTests/parsing/constant_state_modifier.sol
index ea3b7abd8..1dbe07317 100644
--- a/test/libsolidity/syntaxTests/parsing/constant_state_modifier.sol
+++ b/test/libsolidity/syntaxTests/parsing/constant_state_modifier.sol
@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// ParserError 2314: (43-51): Expected '{' but got 'constant'
+// ParserError 2314: (43-51='constant'): Expected '{' but got 'constant'
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_internal_internal.sol b/test/libsolidity/syntaxTests/parsing/constructor_internal_internal.sol
index 8b84de055..a51daa1a7 100644
--- a/test/libsolidity/syntaxTests/parsing/constructor_internal_internal.sol
+++ b/test/libsolidity/syntaxTests/parsing/constructor_internal_internal.sol
@@ -2,4 +2,4 @@ contract C {
   constructor() internal internal {}
 }
 // ----
-// ParserError 9439: (38-46): Visibility already specified as "internal".
+// ParserError 9439: (38-46='internal'): Visibility already specified as "internal".
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_internal_public.sol b/test/libsolidity/syntaxTests/parsing/constructor_internal_public.sol
index 15d60c392..caf0d8442 100644
--- a/test/libsolidity/syntaxTests/parsing/constructor_internal_public.sol
+++ b/test/libsolidity/syntaxTests/parsing/constructor_internal_public.sol
@@ -2,4 +2,4 @@ contract C {
   constructor() internal public {}
 }
 // ----
-// ParserError 9439: (38-44): Visibility already specified as "internal".
+// ParserError 9439: (38-44='public'): Visibility already specified as "internal".
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_payable_payable.sol b/test/libsolidity/syntaxTests/parsing/constructor_payable_payable.sol
index 495e3759c..a17d75999 100644
--- a/test/libsolidity/syntaxTests/parsing/constructor_payable_payable.sol
+++ b/test/libsolidity/syntaxTests/parsing/constructor_payable_payable.sol
@@ -2,4 +2,4 @@ contract C {
   constructor() payable payable {}
 }
 // ----
-// ParserError 9680: (37-44): State mutability already specified as "payable".
+// ParserError 9680: (37-44='payable'): State mutability already specified as "payable".
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_public_internal.sol b/test/libsolidity/syntaxTests/parsing/constructor_public_internal.sol
index 7d58520e5..6526f0149 100644
--- a/test/libsolidity/syntaxTests/parsing/constructor_public_internal.sol
+++ b/test/libsolidity/syntaxTests/parsing/constructor_public_internal.sol
@@ -2,4 +2,4 @@ contract C {
   constructor() public internal {}
 }
 // ----
-// ParserError 9439: (36-44): Visibility already specified as "public".
+// ParserError 9439: (36-44='internal'): Visibility already specified as "public".
diff --git a/test/libsolidity/syntaxTests/parsing/constructor_public_public.sol b/test/libsolidity/syntaxTests/parsing/constructor_public_public.sol
index c0674f2e5..535d1046b 100644
--- a/test/libsolidity/syntaxTests/parsing/constructor_public_public.sol
+++ b/test/libsolidity/syntaxTests/parsing/constructor_public_public.sol
@@ -2,4 +2,4 @@ contract C {
   constructor() public public {}
 }
 // ----
-// ParserError 9439: (36-42): Visibility already specified as "public".
+// ParserError 9439: (36-42='public'): Visibility already specified as "public".
diff --git a/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol b/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
index e34522540..0ee8d45e9 100644
--- a/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
+++ b/test/libsolidity/syntaxTests/parsing/declaring_fixed_and_ufixed_variables.sol
@@ -7,8 +7,8 @@ contract A {
 }
 // ----
 // UnimplementedFeatureError: Fixed point types not implemented.
-// Warning 5667: (52-60): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 5667: (62-74): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2072: (93-104): Unused local variable.
-// Warning 2072: (114-121): Unused local variable.
+// Warning 5667: (52-60='ufixed x'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (62-74='fixed32x32 y'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 2072: (93-104='ufixed8x8 a'): Unused local variable.
+// Warning 2072: (114-121='fixed b'): Unused local variable.
 // Warning 2018: (41-128): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/declaring_fixed_literal_variables.sol b/test/libsolidity/syntaxTests/parsing/declaring_fixed_literal_variables.sol
index a9675f3f1..0f19db48d 100644
--- a/test/libsolidity/syntaxTests/parsing/declaring_fixed_literal_variables.sol
+++ b/test/libsolidity/syntaxTests/parsing/declaring_fixed_literal_variables.sol
@@ -2,4 +2,4 @@ contract A {
     fixed40x40 pi = 3.14;
 }
 // ----
-// TypeError 2326: (33-37): Type rational_const 157 / 50 is not implicitly convertible to expected type fixed40x40. Try converting to type ufixed16x2 or use an explicit conversion.
+// TypeError 2326: (33-37='3.14'): Type rational_const 157 / 50 is not implicitly convertible to expected type fixed40x40. Try converting to type ufixed16x2 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/parsing/elemantary_non_address_payable_state_variable.sol b/test/libsolidity/syntaxTests/parsing/elemantary_non_address_payable_state_variable.sol
index bc5db10ba..990da2cc3 100644
--- a/test/libsolidity/syntaxTests/parsing/elemantary_non_address_payable_state_variable.sol
+++ b/test/libsolidity/syntaxTests/parsing/elemantary_non_address_payable_state_variable.sol
@@ -14,16 +14,16 @@ contract C {
     ufixed80x80 payable m;
 }
 // ----
-// ParserError 9106: (22-29): State mutability can only be specified for address types.
-// ParserError 9106: (44-51): State mutability can only be specified for address types.
-// ParserError 9106: (63-70): State mutability can only be specified for address types.
-// ParserError 9106: (85-92): State mutability can only be specified for address types.
-// ParserError 9106: (105-112): State mutability can only be specified for address types.
-// ParserError 9106: (128-135): State mutability can only be specified for address types.
-// ParserError 9106: (150-157): State mutability can only be specified for address types.
-// ParserError 9106: (171-178): State mutability can only be specified for address types.
-// ParserError 9106: (194-201): State mutability can only be specified for address types.
-// ParserError 9106: (215-222): State mutability can only be specified for address types.
-// ParserError 9106: (241-248): State mutability can only be specified for address types.
-// ParserError 9106: (263-270): State mutability can only be specified for address types.
-// ParserError 9106: (290-297): State mutability can only be specified for address types.
+// ParserError 9106: (22-29='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (44-51='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (63-70='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (85-92='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (105-112='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (128-135='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (150-157='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (171-178='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (194-201='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (215-222='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (241-248='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (263-270='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (290-297='payable'): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_argument.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_argument.sol
index 7d26f74c0..4465f3aad 100644
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_argument.sol
+++ b/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_argument.sol
@@ -14,16 +14,16 @@ contract C {
     function m(ufixed80x80 payable) public pure {}
 }
 // ----
-// ParserError 9106: (33-40): State mutability can only be specified for address types.
-// ParserError 9106: (79-86): State mutability can only be specified for address types.
-// ParserError 9106: (122-129): State mutability can only be specified for address types.
-// ParserError 9106: (168-175): State mutability can only be specified for address types.
-// ParserError 9106: (212-219): State mutability can only be specified for address types.
-// ParserError 9106: (259-266): State mutability can only be specified for address types.
-// ParserError 9106: (305-312): State mutability can only be specified for address types.
-// ParserError 9106: (350-357): State mutability can only be specified for address types.
-// ParserError 9106: (397-404): State mutability can only be specified for address types.
-// ParserError 9106: (442-449): State mutability can only be specified for address types.
-// ParserError 9106: (492-499): State mutability can only be specified for address types.
-// ParserError 9106: (538-545): State mutability can only be specified for address types.
-// ParserError 9106: (589-596): State mutability can only be specified for address types.
+// ParserError 9106: (33-40='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (79-86='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (122-129='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (168-175='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (212-219='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (259-266='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (305-312='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (350-357='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (397-404='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (442-449='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (492-499='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (538-545='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (589-596='payable'): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_local.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_local.sol
index 2aad9cd04..162be5f50 100644
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_local.sol
+++ b/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_local.sol
@@ -16,16 +16,16 @@ contract C {
     }
 }
 // ----
-// ParserError 9106: (57-64): State mutability can only be specified for address types.
-// ParserError 9106: (83-90): State mutability can only be specified for address types.
-// ParserError 9106: (106-113): State mutability can only be specified for address types.
-// ParserError 9106: (132-139): State mutability can only be specified for address types.
-// ParserError 9106: (156-163): State mutability can only be specified for address types.
-// ParserError 9106: (183-190): State mutability can only be specified for address types.
-// ParserError 9106: (209-216): State mutability can only be specified for address types.
-// ParserError 9106: (234-241): State mutability can only be specified for address types.
-// ParserError 9106: (261-268): State mutability can only be specified for address types.
-// ParserError 9106: (286-293): State mutability can only be specified for address types.
-// ParserError 9106: (316-323): State mutability can only be specified for address types.
-// ParserError 9106: (342-349): State mutability can only be specified for address types.
-// ParserError 9106: (373-380): State mutability can only be specified for address types.
+// ParserError 9106: (57-64='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (83-90='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (106-113='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (132-139='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (156-163='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (183-190='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (209-216='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (234-241='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (261-268='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (286-293='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (316-323='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (342-349='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (373-380='payable'): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_return.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_return.sol
index 026138cde..503231cdb 100644
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_return.sol
+++ b/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_return.sol
@@ -14,16 +14,16 @@ contract C {
     function m() public pure returns (ufixed80x80 payable) {}
 }
 // ----
-// ParserError 9106: (56-63): State mutability can only be specified for address types.
-// ParserError 9106: (113-120): State mutability can only be specified for address types.
-// ParserError 9106: (167-174): State mutability can only be specified for address types.
-// ParserError 9106: (224-231): State mutability can only be specified for address types.
-// ParserError 9106: (279-286): State mutability can only be specified for address types.
-// ParserError 9106: (337-344): State mutability can only be specified for address types.
-// ParserError 9106: (394-401): State mutability can only be specified for address types.
-// ParserError 9106: (450-457): State mutability can only be specified for address types.
-// ParserError 9106: (508-515): State mutability can only be specified for address types.
-// ParserError 9106: (564-571): State mutability can only be specified for address types.
-// ParserError 9106: (625-632): State mutability can only be specified for address types.
-// ParserError 9106: (682-689): State mutability can only be specified for address types.
-// ParserError 9106: (744-751): State mutability can only be specified for address types.
+// ParserError 9106: (56-63='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (113-120='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (167-174='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (224-231='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (279-286='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (337-344='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (394-401='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (450-457='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (508-515='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (564-571='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (625-632='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (682-689='payable'): State mutability can only be specified for address types.
+// ParserError 9106: (744-751='payable'): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/emit_without_event.sol b/test/libsolidity/syntaxTests/parsing/emit_without_event.sol
index 3e1f733fa..1bf8531c9 100644
--- a/test/libsolidity/syntaxTests/parsing/emit_without_event.sol
+++ b/test/libsolidity/syntaxTests/parsing/emit_without_event.sol
@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// ParserError 2314: (49-50): Expected '(' but got ';'
+// ParserError 2314: (49-50=';'): Expected '(' but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/empty_enum.sol b/test/libsolidity/syntaxTests/parsing/empty_enum.sol
index 1dc04d914..af2fcf9b4 100644
--- a/test/libsolidity/syntaxTests/parsing/empty_enum.sol
+++ b/test/libsolidity/syntaxTests/parsing/empty_enum.sol
@@ -2,4 +2,4 @@ contract c {
 	enum foo { }
 }
 // ----
-// ParserError 3147: (25-26): Enum with no members is not allowed.
+// ParserError 3147: (25-26='}'): Enum with no members is not allowed.
diff --git a/test/libsolidity/syntaxTests/parsing/event_with_no_argument_list.sol b/test/libsolidity/syntaxTests/parsing/event_with_no_argument_list.sol
index 2e294fde9..99947ec28 100644
--- a/test/libsolidity/syntaxTests/parsing/event_with_no_argument_list.sol
+++ b/test/libsolidity/syntaxTests/parsing/event_with_no_argument_list.sol
@@ -2,4 +2,4 @@ contract c {
 	event e;
 }
 // ----
-// ParserError 2314: (21-22): Expected '(' but got ';'
+// ParserError 2314: (21-22=';'): Expected '(' but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/exp_expression.sol b/test/libsolidity/syntaxTests/parsing/exp_expression.sol
index 17e3deadb..b7118a7e8 100644
--- a/test/libsolidity/syntaxTests/parsing/exp_expression.sol
+++ b/test/libsolidity/syntaxTests/parsing/exp_expression.sol
@@ -4,5 +4,5 @@ contract test {
     }
 }
 // ----
-// Warning 2072: (61-70): Unused local variable.
+// Warning 2072: (61-70='uint256 x'): Unused local variable.
 // Warning 2018: (20-86): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/external_variable.sol b/test/libsolidity/syntaxTests/parsing/external_variable.sol
index 8935d4c5a..b2f7172b7 100644
--- a/test/libsolidity/syntaxTests/parsing/external_variable.sol
+++ b/test/libsolidity/syntaxTests/parsing/external_variable.sol
@@ -2,4 +2,4 @@ contract c {
 	uint external x;
 }
 // ----
-// ParserError 2314: (19-27): Expected identifier but got 'external'
+// ParserError 2314: (19-27='external'): Expected identifier but got 'external'
diff --git a/test/libsolidity/syntaxTests/parsing/fixed_literal_with_double_radix.sol b/test/libsolidity/syntaxTests/parsing/fixed_literal_with_double_radix.sol
index e85f9a54c..fc1d146f8 100644
--- a/test/libsolidity/syntaxTests/parsing/fixed_literal_with_double_radix.sol
+++ b/test/libsolidity/syntaxTests/parsing/fixed_literal_with_double_radix.sol
@@ -2,4 +2,4 @@ contract A {
 	fixed40x40 pi = 3.14.15;
 }
 // ----
-// ParserError 2314: (34-37): Expected ';' but got 'Number'
+// ParserError 2314: (34-37='.15'): Expected ';' but got 'Number'
diff --git a/test/libsolidity/syntaxTests/parsing/for_loop_simple_initexpr.sol b/test/libsolidity/syntaxTests/parsing/for_loop_simple_initexpr.sol
index 53cfe1a4f..9aa636618 100644
--- a/test/libsolidity/syntaxTests/parsing/for_loop_simple_initexpr.sol
+++ b/test/libsolidity/syntaxTests/parsing/for_loop_simple_initexpr.sol
@@ -7,8 +7,8 @@ contract test {
     }
 }
 // ----
-// Warning 5740: (103-106): Unreachable code.
-// Warning 5740: (144-152): Unreachable code.
-// Warning 5667: (33-42): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2072: (122-131): Unused local variable.
+// Warning 5740: (103-106='i++'): Unreachable code.
+// Warning 5740: (144-152='continue'): Unreachable code.
+// Warning 5667: (33-42='uint256 a'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 2072: (122-131='uint256 x'): Unused local variable.
 // Warning 2018: (20-169): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/for_loop_simple_noexpr.sol b/test/libsolidity/syntaxTests/parsing/for_loop_simple_noexpr.sol
index 6c0e4b0e3..43d173708 100644
--- a/test/libsolidity/syntaxTests/parsing/for_loop_simple_noexpr.sol
+++ b/test/libsolidity/syntaxTests/parsing/for_loop_simple_noexpr.sol
@@ -7,7 +7,7 @@ contract test {
         }
     }
 // ----
-// Warning 5740: (144-152): Unreachable code.
-// Warning 5667: (37-46): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2072: (122-131): Unused local variable.
+// Warning 5740: (144-152='continue'): Unreachable code.
+// Warning 5667: (37-46='uint256 a'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 2072: (122-131='uint256 x'): Unused local variable.
 // Warning 2018: (24-177): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/for_loop_single_stmt_body.sol b/test/libsolidity/syntaxTests/parsing/for_loop_single_stmt_body.sol
index 838692382..ef24672a6 100644
--- a/test/libsolidity/syntaxTests/parsing/for_loop_single_stmt_body.sol
+++ b/test/libsolidity/syntaxTests/parsing/for_loop_single_stmt_body.sol
@@ -6,5 +6,5 @@ contract test {
     }
 }
 // ----
-// Warning 5667: (33-42): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (33-42='uint256 a'): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Warning 2018: (20-136): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/for_loop_vardef_initexpr.sol b/test/libsolidity/syntaxTests/parsing/for_loop_vardef_initexpr.sol
index 220c120cd..2578e3243 100644
--- a/test/libsolidity/syntaxTests/parsing/for_loop_vardef_initexpr.sol
+++ b/test/libsolidity/syntaxTests/parsing/for_loop_vardef_initexpr.sol
@@ -6,8 +6,8 @@ contract test {
     }
 }
 // ----
-// Warning 5740: (89-92): Unreachable code.
-// Warning 5740: (130-138): Unreachable code.
-// Warning 5667: (33-42): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 2072: (108-117): Unused local variable.
+// Warning 5740: (89-92='i++'): Unreachable code.
+// Warning 5740: (130-138='continue'): Unreachable code.
+// Warning 5667: (33-42='uint256 a'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 2072: (108-117='uint256 x'): Unused local variable.
 // Warning 2018: (20-155): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable_with_modifiers.sol b/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable_with_modifiers.sol
index 35e9997c9..6cb91dd5e 100644
--- a/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable_with_modifiers.sol
+++ b/test/libsolidity/syntaxTests/parsing/function_type_as_storage_variable_with_modifiers.sol
@@ -2,4 +2,4 @@ contract test {
 	function (uint, uint) modifier1() returns (uint) f1;
 }
 // ----
-// ParserError 2314: (48-49): Expected ';' but got '('
+// ParserError 2314: (48-49='('): Expected ';' but got '('
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_in_struct.sol b/test/libsolidity/syntaxTests/parsing/function_type_in_struct.sol
index 5bd6c8dcf..a846817b0 100644
--- a/test/libsolidity/syntaxTests/parsing/function_type_in_struct.sol
+++ b/test/libsolidity/syntaxTests/parsing/function_type_in_struct.sol
@@ -6,5 +6,5 @@ contract test {
     }
 }
 // ----
-// Warning 6162: (49-55): Naming function type parameters is deprecated.
-// Warning 6162: (57-63): Naming function type parameters is deprecated.
+// Warning 6162: (49-55='uint x'): Naming function type parameters is deprecated.
+// Warning 6162: (57-63='uint y'): Naming function type parameters is deprecated.
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_multiple_mutability.sol b/test/libsolidity/syntaxTests/parsing/function_type_multiple_mutability.sol
index 8d67db095..c34918757 100644
--- a/test/libsolidity/syntaxTests/parsing/function_type_multiple_mutability.sol
+++ b/test/libsolidity/syntaxTests/parsing/function_type_multiple_mutability.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// ParserError 9680: (62-66): State mutability already specified as "pure".
+// ParserError 9680: (62-66='pure'): State mutability already specified as "pure".
diff --git a/test/libsolidity/syntaxTests/parsing/function_type_multiple_visibility.sol b/test/libsolidity/syntaxTests/parsing/function_type_multiple_visibility.sol
index c9b035864..25eec51ee 100644
--- a/test/libsolidity/syntaxTests/parsing/function_type_multiple_visibility.sol
+++ b/test/libsolidity/syntaxTests/parsing/function_type_multiple_visibility.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// ParserError 9439: (64-70): Visibility already specified as "public".
+// ParserError 9439: (64-70='public'): Visibility already specified as "public".
diff --git a/test/libsolidity/syntaxTests/parsing/if_statement.sol b/test/libsolidity/syntaxTests/parsing/if_statement.sol
index 580a0f557..5f4933619 100644
--- a/test/libsolidity/syntaxTests/parsing/if_statement.sol
+++ b/test/libsolidity/syntaxTests/parsing/if_statement.sol
@@ -4,6 +4,6 @@ contract test {
     }
 }
 // ----
-// Warning 6321: (60-64): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 2072: (109-115): Unused local variable.
+// Warning 6321: (60-64='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 2072: (109-115='uint b'): Unused local variable.
 // Warning 2018: (20-128): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/parsing/import_complex_invalid_from.sol b/test/libsolidity/syntaxTests/parsing/import_complex_invalid_from.sol
index 6709260b0..99b36238c 100644
--- a/test/libsolidity/syntaxTests/parsing/import_complex_invalid_from.sol
+++ b/test/libsolidity/syntaxTests/parsing/import_complex_invalid_from.sol
@@ -1,3 +1,3 @@
 import {hello, world} from function;
 // ----
-// ParserError 6845: (27-35): Expected import path.
+// ParserError 6845: (27-35='function'): Expected import path.
diff --git a/test/libsolidity/syntaxTests/parsing/import_complex_without_from.sol b/test/libsolidity/syntaxTests/parsing/import_complex_without_from.sol
index 34d5433db..45f90b44b 100644
--- a/test/libsolidity/syntaxTests/parsing/import_complex_without_from.sol
+++ b/test/libsolidity/syntaxTests/parsing/import_complex_without_from.sol
@@ -1,3 +1,3 @@
 import {hello, world};
 // ----
-// ParserError 8208: (21-22): Expected "from".
+// ParserError 8208: (21-22=';'): Expected "from".
diff --git a/test/libsolidity/syntaxTests/parsing/import_empty.sol b/test/libsolidity/syntaxTests/parsing/import_empty.sol
index 74931d4dd..4c0b14361 100644
--- a/test/libsolidity/syntaxTests/parsing/import_empty.sol
+++ b/test/libsolidity/syntaxTests/parsing/import_empty.sol
@@ -1,3 +1,3 @@
 import "";
 // ----
-// ParserError 6326: (9-10): Import path cannot be empty.
+// ParserError 6326: (9-10=';'): Import path cannot be empty.
diff --git a/test/libsolidity/syntaxTests/parsing/import_invalid_token.sol b/test/libsolidity/syntaxTests/parsing/import_invalid_token.sol
index 24150e76d..9ce8a99f9 100644
--- a/test/libsolidity/syntaxTests/parsing/import_invalid_token.sol
+++ b/test/libsolidity/syntaxTests/parsing/import_invalid_token.sol
@@ -1,3 +1,3 @@
 import function;
 // ----
-// ParserError 9478: (7-15): Expected string literal (path), "*" or alias list.
+// ParserError 9478: (7-15='function'): Expected string literal (path), "*" or alias list.
diff --git a/test/libsolidity/syntaxTests/parsing/import_simple.sol b/test/libsolidity/syntaxTests/parsing/import_simple.sol
index e4ee0ce1b..00dfe5323 100644
--- a/test/libsolidity/syntaxTests/parsing/import_simple.sol
+++ b/test/libsolidity/syntaxTests/parsing/import_simple.sol
@@ -1,3 +1,3 @@
 import "hello";
 // ----
-// ParserError 6275: (0-15): Source "hello" not found: File not supplied initially.
+// ParserError 6275: (0-15='import "hello";'): Source "hello" not found: File not supplied initially.
diff --git a/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_lvalue.sol b/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_lvalue.sol
index 05496b9b2..ac4998523 100644
--- a/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_lvalue.sol
+++ b/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_lvalue.sol
@@ -6,4 +6,4 @@ contract c {
 	}
 }
 // ----
-// ParserError 4799: (62-63): Expected expression (inline array elements cannot be omitted).
+// ParserError 4799: (62-63=','): Expected expression (inline array elements cannot be omitted).
diff --git a/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_without_lvalue.sol b/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_without_lvalue.sol
index 1837fe650..6e556aec4 100644
--- a/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_without_lvalue.sol
+++ b/test/libsolidity/syntaxTests/parsing/inline_array_empty_cells_check_without_lvalue.sol
@@ -5,4 +5,4 @@ contract c {
 	}
 }
 // ----
-// ParserError 4799: (75-76): Expected expression (inline array elements cannot be omitted).
+// ParserError 4799: (75-76=','): Expected expression (inline array elements cannot be omitted).
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_fixed_conversion_leading_zeroes_check.sol b/test/libsolidity/syntaxTests/parsing/invalid_fixed_conversion_leading_zeroes_check.sol
index fa079ae4b..0fe71a17b 100644
--- a/test/libsolidity/syntaxTests/parsing/invalid_fixed_conversion_leading_zeroes_check.sol
+++ b/test/libsolidity/syntaxTests/parsing/invalid_fixed_conversion_leading_zeroes_check.sol
@@ -4,4 +4,4 @@ contract test {
 	}
 }
 // ----
-// ParserError 8936: (44-47): Identifier-start is not allowed at end of a number.
+// ParserError 8936: (44-47='1.0'): Identifier-start is not allowed at end of a number.
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol
index 6cbeb217c..eac4079f6 100644
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol
+++ b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_decimal_fail.sol
@@ -7,7 +7,7 @@ contract C {
   }
 }
 // ----
-// SyntaxError 2090: (56-61): Invalid use of underscores in number literal. No trailing underscores allowed.
-// SyntaxError 2990: (77-83): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
-// SyntaxError 6415: (99-105): Invalid use of underscores in number literal. No underscore at the end of the mantissa allowed.
-// SyntaxError 6165: (121-127): Invalid use of underscores in number literal. No underscore in front of exponent allowed.
+// SyntaxError 2090: (56-61='1234_'): Invalid use of underscores in number literal. No trailing underscores allowed.
+// SyntaxError 2990: (77-83='12__34'): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
+// SyntaxError 6415: (99-105='12_e34'): Invalid use of underscores in number literal. No underscore at the end of the mantissa allowed.
+// SyntaxError 6165: (121-127='12e_34'): Invalid use of underscores in number literal. No underscore in front of exponent allowed.
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol
index 49bf042cd..35c6666d6 100644
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol
+++ b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_fixed_fail.sol
@@ -9,9 +9,9 @@ contract C {
   }
 }
 // ----
-// SyntaxError 2090: (57-64): Invalid use of underscores in number literal. No trailing underscores allowed.
-// SyntaxError 2990: (81-91): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
-// SyntaxError 1023: (108-112): Invalid use of underscores in number literal. No underscores in front of the fraction part allowed.
-// SyntaxError 3891: (129-133): Invalid use of underscores in number literal. No underscores in front of the fraction part allowed.
-// SyntaxError 6165: (150-157): Invalid use of underscores in number literal. No underscore in front of exponent allowed.
-// SyntaxError 2090: (174-177): Invalid use of underscores in number literal. No trailing underscores allowed.
+// SyntaxError 2090: (57-64='3.1415_'): Invalid use of underscores in number literal. No trailing underscores allowed.
+// SyntaxError 2990: (81-91='3__1.4__15'): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
+// SyntaxError 1023: (108-112='1_.2'): Invalid use of underscores in number literal. No underscores in front of the fraction part allowed.
+// SyntaxError 3891: (129-133='1._2'): Invalid use of underscores in number literal. No underscores in front of the fraction part allowed.
+// SyntaxError 6165: (150-157='1.2e_12'): Invalid use of underscores in number literal. No underscore in front of exponent allowed.
+// SyntaxError 2090: (174-177='1._'): Invalid use of underscores in number literal. No trailing underscores allowed.
diff --git a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol
index 5a2e2f5c1..96da289de 100644
--- a/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol
+++ b/test/libsolidity/syntaxTests/parsing/lexer_numbers_with_underscores_hex_fail.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// SyntaxError 2990: (56-79): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
+// SyntaxError 2990: (56-79='0x1234__1234__1234__123'): Invalid use of underscores in number literal. Only one consecutive underscores between digits allowed.
diff --git a/test/libsolidity/syntaxTests/parsing/local_const_variable.sol b/test/libsolidity/syntaxTests/parsing/local_const_variable.sol
index 6a4427361..f4526a249 100644
--- a/test/libsolidity/syntaxTests/parsing/local_const_variable.sol
+++ b/test/libsolidity/syntaxTests/parsing/local_const_variable.sol
@@ -6,4 +6,4 @@ contract Foo {
 	}
 }
 // ----
-// ParserError 2314: (67-75): Expected ';' but got 'constant'
+// ParserError 2314: (67-75='constant'): Expected ';' but got 'constant'
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol
index f660c0953..4ca1c9c4f 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol
@@ -7,6 +7,6 @@ contract Foo {
     }
 }
 // ----
-// ParserError 3548: (85-91): Location already specified.
-// ParserError 3548: (123-130): Location already specified.
-// ParserError 3548: (131-139): Location already specified.
+// ParserError 3548: (85-91='memory'): Location already specified.
+// ParserError 3548: (123-130='storage'): Location already specified.
+// ParserError 3548: (131-139='calldata'): Location already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
index c5761a944..5aa82d9f7 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
@@ -2,5 +2,5 @@ contract Foo {
     function f(uint[] storage constant x, uint[] memory y) internal { }
 }
 // ----
-// DeclarationError 1788: (30-55): The "constant" keyword can only be used for state variables or variables at file level.
-// TypeError 9259: (30-55): Only constants of value type and byte array type are implemented.
+// DeclarationError 1788: (30-55='uint[] storage constant x'): The "constant" keyword can only be used for state variables or variables at file level.
+// TypeError 9259: (30-55='uint[] storage constant x'): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol
index 25d1e02d3..8f5a1d47f 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol
@@ -2,5 +2,5 @@ contract Foo {
     function f(uint[] storage memory constant x, uint[] memory calldata y) internal { }
 }
 // ----
-// ParserError 3548: (45-51): Location already specified.
-// ParserError 3548: (78-86): Location already specified.
+// ParserError 3548: (45-51='memory'): Location already specified.
+// ParserError 3548: (78-86='calldata'): Location already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol
index 53d7c2771..681cdd709 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables.sol
@@ -2,4 +2,4 @@ contract Foo {
 	uint[] memory x;
 }
 // ----
-// ParserError 2314: (23-29): Expected identifier but got 'memory'
+// ParserError 2314: (23-29='memory'): Expected identifier but got 'memory'
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol
index 134397fec..911266888 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol
@@ -2,4 +2,4 @@ contract Foo {
 	uint[] memory storage calldata x;
 }
 // ----
-// ParserError 2314: (23-29): Expected identifier but got 'memory'
+// ParserError 2314: (23-29='memory'): Expected identifier but got 'memory'
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_with_var.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_with_var.sol
index 19af8c2c7..5f8663f1b 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_with_var.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_with_var.sol
@@ -2,4 +2,4 @@ contract Foo {
 	function f() { var memory x; }
 }
 // ----
-// ParserError 6933: (31-34): Expected primary expression.
+// ParserError 6933: (31-34='var'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/parsing/malformed_enum_declaration.sol b/test/libsolidity/syntaxTests/parsing/malformed_enum_declaration.sol
index fd00ac497..052b7e29a 100644
--- a/test/libsolidity/syntaxTests/parsing/malformed_enum_declaration.sol
+++ b/test/libsolidity/syntaxTests/parsing/malformed_enum_declaration.sol
@@ -2,4 +2,4 @@ contract c {
 	enum foo { WARNING,}
 }
 // ----
-// ParserError 1612: (33-34): Expected identifier after ','
+// ParserError 1612: (33-34='}'): Expected identifier after ','
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_from_address_payable.sol b/test/libsolidity/syntaxTests/parsing/mapping_from_address_payable.sol
index e83761a09..2fd6cb1b3 100644
--- a/test/libsolidity/syntaxTests/parsing/mapping_from_address_payable.sol
+++ b/test/libsolidity/syntaxTests/parsing/mapping_from_address_payable.sol
@@ -2,4 +2,4 @@ contract C {
     mapping(address payable => uint) m;
 }
 // ----
-// ParserError 2314: (33-40): Expected '=>' but got 'payable'
+// ParserError 2314: (33-40='payable'): Expected '=>' but got 'payable'
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_1.sol
index b27befba1..7db1c4a54 100644
--- a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_1.sol
+++ b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_1.sol
@@ -2,4 +2,4 @@ contract c {
 	mapping(uint[] => uint) data;
 }
 // ----
-// ParserError 2314: (26-27): Expected '=>' but got '['
+// ParserError 2314: (26-27='['): Expected '=>' but got '['
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_2.sol
index 68aa61a41..b833ed6d3 100644
--- a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_2.sol
+++ b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_2.sol
@@ -5,4 +5,4 @@ contract c {
 	mapping(S => uint) data;
 }
 // ----
-// TypeError 7804: (47-48): Only elementary types, user defined value types, contract types or enums are allowed as mapping keys.
+// TypeError 7804: (47-48='S'): Only elementary types, user defined value types, contract types or enums are allowed as mapping keys.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_3.sol
index 991f2b622..8a0bdf247 100644
--- a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_3.sol
+++ b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_3.sol
@@ -5,4 +5,4 @@ contract c {
 	mapping(S => uint) data;
 }
 // ----
-// TypeError 7804: (49-50): Only elementary types, user defined value types, contract types or enums are allowed as mapping keys.
+// TypeError 7804: (49-50='S'): Only elementary types, user defined value types, contract types or enums are allowed as mapping keys.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_4.sol
index 551d41b38..ef8166494 100644
--- a/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_4.sol
+++ b/test/libsolidity/syntaxTests/parsing/mapping_nonelementary_key_4.sol
@@ -2,4 +2,4 @@ contract c {
 	mapping(string[] => uint) data;
 }
 // ----
-// ParserError 2314: (28-29): Expected '=>' but got '['
+// ParserError 2314: (28-29='['): Expected '=>' but got '['
diff --git a/test/libsolidity/syntaxTests/parsing/max_depth_reached_1.sol b/test/libsolidity/syntaxTests/parsing/max_depth_reached_1.sol
index b193b3c42..1e3a44b31 100644
--- a/test/libsolidity/syntaxTests/parsing/max_depth_reached_1.sol
+++ b/test/libsolidity/syntaxTests/parsing/max_depth_reached_1.sol
@@ -5,4 +5,4 @@ contract C {
     [[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[ [
 ....
 // ----
-// ParserError 7319: (287-288): Maximum recursion depth reached during parsing.
+// ParserError 7319: (287-288='['): Maximum recursion depth reached during parsing.
diff --git a/test/libsolidity/syntaxTests/parsing/max_depth_reached_2.sol b/test/libsolidity/syntaxTests/parsing/max_depth_reached_2.sol
index d57f24055..2489ddef0 100644
--- a/test/libsolidity/syntaxTests/parsing/max_depth_reached_2.sol
+++ b/test/libsolidity/syntaxTests/parsing/max_depth_reached_2.sol
@@ -8,4 +8,4 @@ contract C {
         {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ {
 ....
 // ----
-// ParserError 7319: (693-694): Maximum recursion depth reached during parsing.
+// ParserError 7319: (693-694='{'): Maximum recursion depth reached during parsing.
diff --git a/test/libsolidity/syntaxTests/parsing/max_depth_reached_3.sol b/test/libsolidity/syntaxTests/parsing/max_depth_reached_3.sol
index d5dfa4af5..f74fb80e1 100644
--- a/test/libsolidity/syntaxTests/parsing/max_depth_reached_3.sol
+++ b/test/libsolidity/syntaxTests/parsing/max_depth_reached_3.sol
@@ -6,4 +6,4 @@ contract C {
         (((((((((((((((((((((((((((((((((((((( (
 ....
 // ----
-// ParserError 7319: (325-326): Maximum recursion depth reached during parsing.
+// ParserError 7319: (325-326='('): Maximum recursion depth reached during parsing.
diff --git a/test/libsolidity/syntaxTests/parsing/max_depth_reached_4.sol b/test/libsolidity/syntaxTests/parsing/max_depth_reached_4.sol
index dc9b31034..9aecac93f 100644
--- a/test/libsolidity/syntaxTests/parsing/max_depth_reached_4.sol
+++ b/test/libsolidity/syntaxTests/parsing/max_depth_reached_4.sol
@@ -25,4 +25,4 @@ contract C {
     }
 }
 // ----
-// ParserError 7319: (1305-1308): Maximum recursion depth reached during parsing.
+// ParserError 7319: (1305-1308='nok'): Maximum recursion depth reached during parsing.
diff --git a/test/libsolidity/syntaxTests/parsing/missing_argument_in_named_args.sol b/test/libsolidity/syntaxTests/parsing/missing_argument_in_named_args.sol
index a54df516f..cb51eefc8 100644
--- a/test/libsolidity/syntaxTests/parsing/missing_argument_in_named_args.sol
+++ b/test/libsolidity/syntaxTests/parsing/missing_argument_in_named_args.sol
@@ -3,4 +3,4 @@ contract test {
 	function b() returns (uint r) { r = a({a: , b: , c: }); }
 }
 // ----
-// ParserError 6933: (146-147): Expected primary expression.
+// ParserError 6933: (146-147=','): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol b/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol
index 799144cfb..afb1d1d5f 100644
--- a/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol
+++ b/test/libsolidity/syntaxTests/parsing/missing_parameter_name_in_named_args.sol
@@ -3,4 +3,4 @@ contract test {
 	function b() returns (uint r) { r = a({: 1, : 2, : 3}); }
 }
 // ----
-// ParserError 2314: (143-144): Expected identifier but got ':'
+// ParserError 2314: (143-144=':'): Expected identifier but got ':'
diff --git a/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol b/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol
index cd4025405..779094739 100644
--- a/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol
+++ b/test/libsolidity/syntaxTests/parsing/missing_variable_name_in_declaration.sol
@@ -2,4 +2,4 @@ contract test {
     uint256 ;
 }
 // ----
-// ParserError 2314: (28-29): Expected identifier but got ';'
+// ParserError 2314: (28-29=';'): Expected identifier but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/modifier_without_semicolon.sol b/test/libsolidity/syntaxTests/parsing/modifier_without_semicolon.sol
index 6b3a1de56..e6160933f 100644
--- a/test/libsolidity/syntaxTests/parsing/modifier_without_semicolon.sol
+++ b/test/libsolidity/syntaxTests/parsing/modifier_without_semicolon.sol
@@ -2,4 +2,4 @@ contract c {
 	modifier mod { if (msg.sender == 0) _ }
 }
 // ----
-// ParserError 2314: (52-53): Expected ';' but got '}'
+// ParserError 2314: (52-53='}'): Expected ';' but got '}'
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_event_arg_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/multiple_event_arg_trailing_comma.sol
index a1d4872be..32107fe4e 100644
--- a/test/libsolidity/syntaxTests/parsing/multiple_event_arg_trailing_comma.sol
+++ b/test/libsolidity/syntaxTests/parsing/multiple_event_arg_trailing_comma.sol
@@ -3,4 +3,4 @@ contract test {
     function(uint a) {}
 }
 // ----
-// ParserError 7591: (45-46): Unexpected trailing comma in parameter list.
+// ParserError 7591: (45-46=','): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_function_param_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/multiple_function_param_trailing_comma.sol
index ae73c7954..ebdfd0eab 100644
--- a/test/libsolidity/syntaxTests/parsing/multiple_function_param_trailing_comma.sol
+++ b/test/libsolidity/syntaxTests/parsing/multiple_function_param_trailing_comma.sol
@@ -2,4 +2,4 @@ contract test {
 	function(uint a, uint b,) {}
 }
 // ----
-// ParserError 7591: (40-41): Unexpected trailing comma in parameter list.
+// ParserError 7591: (40-41=','): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_modifier_arg_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/multiple_modifier_arg_trailing_comma.sol
index 7f6dcbd93..5f1d39e14 100644
--- a/test/libsolidity/syntaxTests/parsing/multiple_modifier_arg_trailing_comma.sol
+++ b/test/libsolidity/syntaxTests/parsing/multiple_modifier_arg_trailing_comma.sol
@@ -3,4 +3,4 @@ contract test {
     function(uint a) {}
 }
 // ----
-// ParserError 7591: (51-52): Unexpected trailing comma in parameter list.
+// ParserError 7591: (51-52=','): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_modifier_overrides.sol b/test/libsolidity/syntaxTests/parsing/multiple_modifier_overrides.sol
index 8dbe4ac67..9003c2269 100644
--- a/test/libsolidity/syntaxTests/parsing/multiple_modifier_overrides.sol
+++ b/test/libsolidity/syntaxTests/parsing/multiple_modifier_overrides.sol
@@ -2,4 +2,4 @@ contract C {
     modifier f() override override {}
 }
 // ----
-// ParserError 9102: (39-47): Override already specified.
+// ParserError 9102: (39-47='override'): Override already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_return_param_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/multiple_return_param_trailing_comma.sol
index 001993f21..83bee1dd1 100644
--- a/test/libsolidity/syntaxTests/parsing/multiple_return_param_trailing_comma.sol
+++ b/test/libsolidity/syntaxTests/parsing/multiple_return_param_trailing_comma.sol
@@ -2,4 +2,4 @@ contract test {
     function() returns (uint a, uint b,) {}
 }
 // ----
-// ParserError 7591: (54-55): Unexpected trailing comma in parameter list.
+// ParserError 7591: (54-55=','): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_statemutability_specifiers.sol b/test/libsolidity/syntaxTests/parsing/multiple_statemutability_specifiers.sol
index e2c56ae57..894e386f4 100644
--- a/test/libsolidity/syntaxTests/parsing/multiple_statemutability_specifiers.sol
+++ b/test/libsolidity/syntaxTests/parsing/multiple_statemutability_specifiers.sol
@@ -20,10 +20,10 @@ contract c7 {
     function f() view payable {}
 }
 // ----
-// ParserError 9680: (39-46): State mutability already specified as "payable".
-// ParserError 9680: (88-92): State mutability already specified as "view".
-// ParserError 9680: (134-138): State mutability already specified as "pure".
-// ParserError 9680: (180-184): State mutability already specified as "pure".
-// ParserError 9680: (229-233): State mutability already specified as "payable".
-// ParserError 9680: (275-282): State mutability already specified as "pure".
-// ParserError 9680: (324-331): State mutability already specified as "view".
+// ParserError 9680: (39-46='payable'): State mutability already specified as "payable".
+// ParserError 9680: (88-92='view'): State mutability already specified as "view".
+// ParserError 9680: (134-138='pure'): State mutability already specified as "pure".
+// ParserError 9680: (180-184='view'): State mutability already specified as "pure".
+// ParserError 9680: (229-233='view'): State mutability already specified as "payable".
+// ParserError 9680: (275-282='payable'): State mutability already specified as "pure".
+// ParserError 9680: (324-331='payable'): State mutability already specified as "view".
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_visibility_specifiers.sol b/test/libsolidity/syntaxTests/parsing/multiple_visibility_specifiers.sol
index c04558171..17048a555 100644
--- a/test/libsolidity/syntaxTests/parsing/multiple_visibility_specifiers.sol
+++ b/test/libsolidity/syntaxTests/parsing/multiple_visibility_specifiers.sol
@@ -3,5 +3,5 @@ contract C {
     function f() private external {}
 }
 // ----
-// ParserError 4110: (30-38): Visibility already specified as "private".
-// ParserError 9439: (67-75): Visibility already specified as "private".
+// ParserError 4110: (30-38='internal'): Visibility already specified as "private".
+// ParserError 9439: (67-75='external'): Visibility already specified as "private".
diff --git a/test/libsolidity/syntaxTests/parsing/new_invalid_type_name.sol b/test/libsolidity/syntaxTests/parsing/new_invalid_type_name.sol
index fb3855c88..1fa9912fe 100644
--- a/test/libsolidity/syntaxTests/parsing/new_invalid_type_name.sol
+++ b/test/libsolidity/syntaxTests/parsing/new_invalid_type_name.sol
@@ -4,4 +4,4 @@ contract C {
 	}
 }
 // ----
-// ParserError 3546: (35-38): Expected type name
+// ParserError 3546: (35-38='var'): Expected type name
diff --git a/test/libsolidity/syntaxTests/parsing/payable_accessor.sol b/test/libsolidity/syntaxTests/parsing/payable_accessor.sol
index 4df1b18df..a64722983 100644
--- a/test/libsolidity/syntaxTests/parsing/payable_accessor.sol
+++ b/test/libsolidity/syntaxTests/parsing/payable_accessor.sol
@@ -2,4 +2,4 @@ contract test {
 	uint payable x;
 }
 // ----
-// ParserError 9106: (22-29): State mutability can only be specified for address types.
+// ParserError 9106: (22-29='payable'): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/payable_without_arguments.sol b/test/libsolidity/syntaxTests/parsing/payable_without_arguments.sol
index 0e9dd7c3c..47a8eb131 100644
--- a/test/libsolidity/syntaxTests/parsing/payable_without_arguments.sol
+++ b/test/libsolidity/syntaxTests/parsing/payable_without_arguments.sol
@@ -4,4 +4,4 @@ contract C {
 	}
 }
 // ----
-// ParserError 2314: (70-71): Expected '(' but got ';'
+// ParserError 2314: (70-71=';'): Expected '(' but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/placeholder_in_function_context.sol b/test/libsolidity/syntaxTests/parsing/placeholder_in_function_context.sol
index 5b16ad02c..aa506633d 100644
--- a/test/libsolidity/syntaxTests/parsing/placeholder_in_function_context.sol
+++ b/test/libsolidity/syntaxTests/parsing/placeholder_in_function_context.sol
@@ -5,4 +5,4 @@ contract c {
     }
 }
 // ----
-// DeclarationError 3726: (66-72): The name "_" is reserved.
+// DeclarationError 3726: (66-72='uint _'): The name "_" is reserved.
diff --git a/test/libsolidity/syntaxTests/parsing/pragma_illegal.sol b/test/libsolidity/syntaxTests/parsing/pragma_illegal.sol
index f9c714080..a0b8329f2 100644
--- a/test/libsolidity/syntaxTests/parsing/pragma_illegal.sol
+++ b/test/libsolidity/syntaxTests/parsing/pragma_illegal.sol
@@ -1,4 +1,4 @@
 pragma ``;
 // ----
-// ParserError 6281: (7-8): Token incompatible with Solidity parser as part of pragma directive.
-// ParserError 6281: (8-9): Token incompatible with Solidity parser as part of pragma directive.
+// ParserError 6281: (7-8='`'): Token incompatible with Solidity parser as part of pragma directive.
+// ParserError 6281: (8-9='`'): Token incompatible with Solidity parser as part of pragma directive.
diff --git a/test/libsolidity/syntaxTests/parsing/single_event_arg_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/single_event_arg_trailing_comma.sol
index 8169b78c3..5788d4d79 100644
--- a/test/libsolidity/syntaxTests/parsing/single_event_arg_trailing_comma.sol
+++ b/test/libsolidity/syntaxTests/parsing/single_event_arg_trailing_comma.sol
@@ -3,4 +3,4 @@ contract test {
 	function(uint a) {}
 }
 // ----
-// ParserError 7591: (34-35): Unexpected trailing comma in parameter list.
+// ParserError 7591: (34-35=','): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/single_function_param_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/single_function_param_trailing_comma.sol
index 20bfc5cb9..248262661 100644
--- a/test/libsolidity/syntaxTests/parsing/single_function_param_trailing_comma.sol
+++ b/test/libsolidity/syntaxTests/parsing/single_function_param_trailing_comma.sol
@@ -2,4 +2,4 @@ contract test {
 	function(uint a,) {}
 }
 // ----
-// ParserError 7591: (32-33): Unexpected trailing comma in parameter list.
+// ParserError 7591: (32-33=','): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/single_modifier_arg_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/single_modifier_arg_trailing_comma.sol
index f88cf1ae8..6dc2f2df3 100644
--- a/test/libsolidity/syntaxTests/parsing/single_modifier_arg_trailing_comma.sol
+++ b/test/libsolidity/syntaxTests/parsing/single_modifier_arg_trailing_comma.sol
@@ -3,4 +3,4 @@ contract test {
 	function(uint a) {}
 }
 // ----
-// ParserError 7591: (40-41): Unexpected trailing comma in parameter list.
+// ParserError 7591: (40-41=','): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/single_return_param_trailing_comma.sol b/test/libsolidity/syntaxTests/parsing/single_return_param_trailing_comma.sol
index d199981a4..80c16ec6b 100644
--- a/test/libsolidity/syntaxTests/parsing/single_return_param_trailing_comma.sol
+++ b/test/libsolidity/syntaxTests/parsing/single_return_param_trailing_comma.sol
@@ -2,4 +2,4 @@ contract test {
 	function() returns (uint a,) {}
 }
 // ----
-// ParserError 7591: (43-44): Unexpected trailing comma in parameter list.
+// ParserError 7591: (43-44=','): Unexpected trailing comma in parameter list.
diff --git a/test/libsolidity/syntaxTests/parsing/trailing_comma_in_named_args.sol b/test/libsolidity/syntaxTests/parsing/trailing_comma_in_named_args.sol
index f791509c9..94f0f4213 100644
--- a/test/libsolidity/syntaxTests/parsing/trailing_comma_in_named_args.sol
+++ b/test/libsolidity/syntaxTests/parsing/trailing_comma_in_named_args.sol
@@ -3,4 +3,4 @@ contract test {
 	function b() returns (uint r) { r = a({a: 1, b: 2, c: 3, }); }
 }
 // ----
-// ParserError 2074: (159-160): Unexpected trailing comma.
+// ParserError 2074: (159-160=','): Unexpected trailing comma.
diff --git a/test/libsolidity/syntaxTests/parsing/trailing_dot1.sol b/test/libsolidity/syntaxTests/parsing/trailing_dot1.sol
index fd7b83359..29d1708db 100644
--- a/test/libsolidity/syntaxTests/parsing/trailing_dot1.sol
+++ b/test/libsolidity/syntaxTests/parsing/trailing_dot1.sol
@@ -4,4 +4,4 @@ contract test {
 	uint256 c = 4.e-2;
 }
 // ----
-// TypeError 9582: (70-73): Member "e" not found or not visible after argument-dependent lookup in int_const 4.
+// TypeError 9582: (70-73='4.e'): Member "e" not found or not visible after argument-dependent lookup in int_const 4.
diff --git a/test/libsolidity/syntaxTests/parsing/trailing_dot2.sol b/test/libsolidity/syntaxTests/parsing/trailing_dot2.sol
index 7e4d6cb37..9822c220d 100644
--- a/test/libsolidity/syntaxTests/parsing/trailing_dot2.sol
+++ b/test/libsolidity/syntaxTests/parsing/trailing_dot2.sol
@@ -4,4 +4,4 @@ contract test {
 	uint256 c = 2 + 2.;
 }
 // ----
-// ParserError 2314: (76-77): Expected identifier but got ';'
+// ParserError 2314: (76-77=';'): Expected identifier but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/tuples_decl_without_rhs.sol b/test/libsolidity/syntaxTests/parsing/tuples_decl_without_rhs.sol
index 4d2919211..64633669e 100644
--- a/test/libsolidity/syntaxTests/parsing/tuples_decl_without_rhs.sol
+++ b/test/libsolidity/syntaxTests/parsing/tuples_decl_without_rhs.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (76-77): Expected '=' but got ';'
+// ParserError 2314: (76-77=';'): Expected '=' but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/tuples_without_commas.sol b/test/libsolidity/syntaxTests/parsing/tuples_without_commas.sol
index 45c529a77..39c741935 100644
--- a/test/libsolidity/syntaxTests/parsing/tuples_without_commas.sol
+++ b/test/libsolidity/syntaxTests/parsing/tuples_without_commas.sol
@@ -4,4 +4,4 @@ contract C {
 	}
 }
 // ----
-// ParserError 2314: (43-44): Expected ',' but got 'Number'
+// ParserError 2314: (43-44='2'): Expected ',' but got 'Number'
diff --git a/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol b/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
index 4d1afd7af..4dd506bef 100644
--- a/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
+++ b/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
@@ -5,5 +5,5 @@ contract test {
     }
 }
 // ----
-// SyntaxError 9636: (70-72): Use of unary + is disallowed.
-// TypeError 4907: (70-72): Unary operator + cannot be applied to type uint256
+// SyntaxError 9636: (70-72='+x'): Use of unary + is disallowed.
+// TypeError 4907: (70-72='+x'): Unary operator + cannot be applied to type uint256
diff --git a/test/libsolidity/syntaxTests/parsing/user_defined_value_type_err.sol b/test/libsolidity/syntaxTests/parsing/user_defined_value_type_err.sol
index dc1208bfd..d9c263270 100644
--- a/test/libsolidity/syntaxTests/parsing/user_defined_value_type_err.sol
+++ b/test/libsolidity/syntaxTests/parsing/user_defined_value_type_err.sol
@@ -1,3 +1,3 @@
 type(MyInt) is uint256;
 // ----
-// ParserError 2314: (4-5): Expected identifier but got '('
+// ParserError 2314: (4-5='('): Expected identifier but got '('
diff --git a/test/libsolidity/syntaxTests/parsing/user_defined_value_type_in_function_err.sol b/test/libsolidity/syntaxTests/parsing/user_defined_value_type_in_function_err.sol
index 6e31db226..4fc0282d6 100644
--- a/test/libsolidity/syntaxTests/parsing/user_defined_value_type_in_function_err.sol
+++ b/test/libsolidity/syntaxTests/parsing/user_defined_value_type_in_function_err.sol
@@ -3,4 +3,4 @@ function f() {
     type MyInt is int;
 }
 // ----
-// ParserError 2314: (44-49): Expected ';' but got identifier
+// ParserError 2314: (44-49='MyInt'): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/parsing/var_array.sol b/test/libsolidity/syntaxTests/parsing/var_array.sol
index 160b073a4..9aa6476f7 100644
--- a/test/libsolidity/syntaxTests/parsing/var_array.sol
+++ b/test/libsolidity/syntaxTests/parsing/var_array.sol
@@ -2,4 +2,4 @@ contract Foo {
 	function f() { var[] a; }
 }
 // ----
-// ParserError 6933: (31-34): Expected primary expression.
+// ParserError 6933: (31-34='var'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/parsing/var_storage_var.sol b/test/libsolidity/syntaxTests/parsing/var_storage_var.sol
index 5cbbd4599..08ba63bf9 100644
--- a/test/libsolidity/syntaxTests/parsing/var_storage_var.sol
+++ b/test/libsolidity/syntaxTests/parsing/var_storage_var.sol
@@ -2,4 +2,4 @@ contract C {
     var a;
 }
 // ----
-// ParserError 9182: (17-20): Function, variable, struct or modifier declaration expected.
+// ParserError 9182: (17-20='var'): Function, variable, struct or modifier declaration expected.
diff --git a/test/libsolidity/syntaxTests/parsing/variable_definition_in_mapping.sol b/test/libsolidity/syntaxTests/parsing/variable_definition_in_mapping.sol
index bd5165b89..574335c5c 100644
--- a/test/libsolidity/syntaxTests/parsing/variable_definition_in_mapping.sol
+++ b/test/libsolidity/syntaxTests/parsing/variable_definition_in_mapping.sol
@@ -4,4 +4,4 @@ contract test {
 	}
 }
 // ----
-// ParserError 1005: (44-47): Expected elementary type name or identifier for mapping key type
+// ParserError 1005: (44-47='var'): Expected elementary type name or identifier for mapping key type
diff --git a/test/libsolidity/syntaxTests/parsing/visibility_specifiers.sol b/test/libsolidity/syntaxTests/parsing/visibility_specifiers.sol
index 3ecadd381..40a644f31 100644
--- a/test/libsolidity/syntaxTests/parsing/visibility_specifiers.sol
+++ b/test/libsolidity/syntaxTests/parsing/visibility_specifiers.sol
@@ -8,4 +8,4 @@ contract c {
     function f_internal() internal {}
 }
 // ----
-// Warning 2519: (58-71): This declaration shadows an existing declaration.
+// Warning 2519: (58-71='uint public c'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/parsing/while_loop.sol b/test/libsolidity/syntaxTests/parsing/while_loop.sol
index 2f1477f83..8b0fb2f06 100644
--- a/test/libsolidity/syntaxTests/parsing/while_loop.sol
+++ b/test/libsolidity/syntaxTests/parsing/while_loop.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// Warning 5740: (105-113): Unreachable code.
+// Warning 5740: (105-113='continue'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/parsing/wrong_compiler_1.sol b/test/libsolidity/syntaxTests/parsing/wrong_compiler_1.sol
index ea05513de..108cb26b0 100644
--- a/test/libsolidity/syntaxTests/parsing/wrong_compiler_1.sol
+++ b/test/libsolidity/syntaxTests/parsing/wrong_compiler_1.sol
@@ -1,3 +1,3 @@
 pragma solidity ^99.99.0;
 // ----
-// ParserError 5333: (0-25): Source file requires different compiler version (current compiler is ....
+// ParserError 5333: (0-25='pragma solidity ^99.99.0;'): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/parsing/wrong_compiler_2.sol b/test/libsolidity/syntaxTests/parsing/wrong_compiler_2.sol
index 6e97cd06c..a1b1a5336 100644
--- a/test/libsolidity/syntaxTests/parsing/wrong_compiler_2.sol
+++ b/test/libsolidity/syntaxTests/parsing/wrong_compiler_2.sol
@@ -1,4 +1,4 @@
 pragma solidity ^99.99.0;
 this is surely invalid
 // ----
-// ParserError 5333: (0-25): Source file requires different compiler version (current compiler is ....
+// ParserError 5333: (0-25='pragma solidity ^99.99.0;'): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/parsing/wrong_compiler_3.sol b/test/libsolidity/syntaxTests/parsing/wrong_compiler_3.sol
index 06d7c4dda..b90f5c3a0 100644
--- a/test/libsolidity/syntaxTests/parsing/wrong_compiler_3.sol
+++ b/test/libsolidity/syntaxTests/parsing/wrong_compiler_3.sol
@@ -3,4 +3,4 @@ contract C {
     uint ;
 }
 // ----
-// ParserError 5333: (0-25): Source file requires different compiler version (current compiler is ....
+// ParserError 5333: (0-25='pragma solidity ^99.99.0;'): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/parsing/wrong_compiler_4.sol b/test/libsolidity/syntaxTests/parsing/wrong_compiler_4.sol
index 0d052123e..638688012 100644
--- a/test/libsolidity/syntaxTests/parsing/wrong_compiler_4.sol
+++ b/test/libsolidity/syntaxTests/parsing/wrong_compiler_4.sol
@@ -3,4 +3,4 @@ contract C {
     function f() {}
 }
 // ----
-// ParserError 5333: (0-25): Source file requires different compiler version (current compiler is ....
+// ParserError 5333: (0-25='pragma solidity ^99.99.0;'): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_1.sol b/test/libsolidity/syntaxTests/pragma/broken_version_1.sol
index 7b23fdfb5..a4ba59459 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_1.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_1.sol
@@ -1,3 +1,3 @@
 pragma solidity ^0^1;
 // ----
-// ParserError 5333: (0-21): Source file requires different compiler version (current compiler is ....
+// ParserError 5333: (0-21='pragma solidity ^0^1;'): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_2.sol b/test/libsolidity/syntaxTests/pragma/broken_version_2.sol
index 903ac4cd3..4009f0ffe 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_2.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_2.sol
@@ -1,3 +1,3 @@
 pragma solidity pragma;
 // ----
-// ParserError 1684: (0-23): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-23='pragma solidity pragma;'): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_3.sol b/test/libsolidity/syntaxTests/pragma/broken_version_3.sol
index fd8a0f1a7..015447e2b 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_3.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_3.sol
@@ -1,4 +1,4 @@
 pragma solidity #8.0.0;
 // ----
-// ParserError 6281: (16-17): Token incompatible with Solidity parser as part of pragma directive.
-// ParserError 5333: (0-23): Source file requires different compiler version (current compiler is ....
+// ParserError 6281: (16-17='#'): Token incompatible with Solidity parser as part of pragma directive.
+// ParserError 5333: (0-23='pragma solidity #8.0.0;'): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_4.sol b/test/libsolidity/syntaxTests/pragma/broken_version_4.sol
index 76560fac6..f8e02ecce 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_4.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_4.sol
@@ -1,3 +1,3 @@
 pragma solidity (8.0.0);
 // ----
-// ParserError 1684: (0-24): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-24='pragma solidity (8.0.0);'): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_5.sol b/test/libsolidity/syntaxTests/pragma/broken_version_5.sol
index 3c284be74..e83d5603c 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_5.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_5.sol
@@ -1,3 +1,3 @@
 pragma solidity 88_;
 // ----
-// ParserError 1684: (0-20): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-20='pragma solidity 88_;'): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_6.sol b/test/libsolidity/syntaxTests/pragma/broken_version_6.sol
index ab98e4f2a..22a9d336e 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_6.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_6.sol
@@ -1,3 +1,3 @@
 pragma solidity v1.2.3;
 // ----
-// ParserError 1684: (0-23): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-23='pragma solidity v1.2.3;'): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_7.sol b/test/libsolidity/syntaxTests/pragma/broken_version_7.sol
index b4b6fea7a..84bcac72e 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_7.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_7.sol
@@ -1,3 +1,3 @@
 pragma solidity >0.5.0<;
 // ----
-// ParserError 1684: (0-24): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-24='pragma solidity >0.5.0<;'): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/empty_version.sol b/test/libsolidity/syntaxTests/pragma/empty_version.sol
index cb8cc47d3..96397dc97 100644
--- a/test/libsolidity/syntaxTests/pragma/empty_version.sol
+++ b/test/libsolidity/syntaxTests/pragma/empty_version.sol
@@ -1,3 +1,3 @@
 pragma solidity;
 // ----
-// ParserError 1684: (0-16): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-16='pragma solidity;'): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_empty_string_literal.sol b/test/libsolidity/syntaxTests/pragma/experimental_empty_string_literal.sol
index 963ef5884..55d4db40e 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_empty_string_literal.sol
+++ b/test/libsolidity/syntaxTests/pragma/experimental_empty_string_literal.sol
@@ -1,3 +1,3 @@
 pragma experimental "";
 // ----
-// SyntaxError 3250: (0-23): Empty experimental feature name is invalid.
+// SyntaxError 3250: (0-23='pragma experimental "";'): Empty experimental feature name is invalid.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_pragma_duplicate.sol b/test/libsolidity/syntaxTests/pragma/experimental_pragma_duplicate.sol
index 042b5464c..ed8fd0dc5 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_pragma_duplicate.sol
+++ b/test/libsolidity/syntaxTests/pragma/experimental_pragma_duplicate.sol
@@ -1,5 +1,5 @@
 pragma experimental __test;
 pragma experimental __test;
 // ----
-// Warning 2264: (0-27): Experimental features are turned on. Do not use experimental features on live deployments.
-// SyntaxError 1231: (28-55): Duplicate experimental feature name.
+// Warning 2264: (0-27='pragma experimental __test;'): Experimental features are turned on. Do not use experimental features on live deployments.
+// SyntaxError 1231: (28-55='pragma experimental __test;'): Duplicate experimental feature name.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_pragma_empty.sol b/test/libsolidity/syntaxTests/pragma/experimental_pragma_empty.sol
index d45e7e6af..c68a6098b 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_pragma_empty.sol
+++ b/test/libsolidity/syntaxTests/pragma/experimental_pragma_empty.sol
@@ -1,3 +1,3 @@
 pragma experimental;
 // ----
-// SyntaxError 9679: (0-20): Experimental feature name is missing.
+// SyntaxError 9679: (0-20='pragma experimental;'): Experimental feature name is missing.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_test_warning.sol b/test/libsolidity/syntaxTests/pragma/experimental_test_warning.sol
index 31f46fbb8..2a29b0411 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_test_warning.sol
+++ b/test/libsolidity/syntaxTests/pragma/experimental_test_warning.sol
@@ -1,3 +1,3 @@
 pragma experimental __test;
 // ----
-// Warning 2264: (0-27): Experimental features are turned on. Do not use experimental features on live deployments.
+// Warning 2264: (0-27='pragma experimental __test;'): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_unknown_number_literal.sol b/test/libsolidity/syntaxTests/pragma/experimental_unknown_number_literal.sol
index f8e8267a0..f3fdfb8da 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_unknown_number_literal.sol
+++ b/test/libsolidity/syntaxTests/pragma/experimental_unknown_number_literal.sol
@@ -1,3 +1,3 @@
 pragma experimental 123;
 // ----
-// SyntaxError 8491: (0-24): Unsupported experimental feature name.
+// SyntaxError 8491: (0-24='pragma experimental 123;'): Unsupported experimental feature name.
diff --git a/test/libsolidity/syntaxTests/pragma/invalid_pragma.sol b/test/libsolidity/syntaxTests/pragma/invalid_pragma.sol
index 950492dd6..0c76203c6 100644
--- a/test/libsolidity/syntaxTests/pragma/invalid_pragma.sol
+++ b/test/libsolidity/syntaxTests/pragma/invalid_pragma.sol
@@ -1,3 +1,3 @@
 pragma 0;
 // ----
-// SyntaxError 5226: (0-9): Invalid pragma "0"
+// SyntaxError 5226: (0-9='pragma 0;'): Invalid pragma "0"
diff --git a/test/libsolidity/syntaxTests/pragma/unknown_pragma.sol b/test/libsolidity/syntaxTests/pragma/unknown_pragma.sol
index 8c263965e..525c60704 100644
--- a/test/libsolidity/syntaxTests/pragma/unknown_pragma.sol
+++ b/test/libsolidity/syntaxTests/pragma/unknown_pragma.sol
@@ -1,3 +1,3 @@
 pragma thisdoesntexist;
 // ----
-// SyntaxError 4936: (0-23): Unknown pragma "thisdoesntexist"
+// SyntaxError 4936: (0-23='pragma thisdoesntexist;'): Unknown pragma "thisdoesntexist"
diff --git a/test/libsolidity/syntaxTests/receiveEther/arguments.sol b/test/libsolidity/syntaxTests/receiveEther/arguments.sol
index e05ed43a4..a8d6c3e72 100644
--- a/test/libsolidity/syntaxTests/receiveEther/arguments.sol
+++ b/test/libsolidity/syntaxTests/receiveEther/arguments.sol
@@ -2,4 +2,4 @@ contract C {
     receive(uint256) external payable {}
 }
 // ----
-// DeclarationError 6857: (24-33): Receive ether function cannot take parameters.
+// DeclarationError 6857: (24-33='(uint256)'): Receive ether function cannot take parameters.
diff --git a/test/libsolidity/syntaxTests/receiveEther/default_visibility.sol b/test/libsolidity/syntaxTests/receiveEther/default_visibility.sol
index 1db63cbdc..fc9b5c994 100644
--- a/test/libsolidity/syntaxTests/receiveEther/default_visibility.sol
+++ b/test/libsolidity/syntaxTests/receiveEther/default_visibility.sol
@@ -3,6 +3,6 @@ contract C {
     receive() {}
 }
 // ----
-// SyntaxError 4937: (95-107): No visibility specified. Did you intend to add "external"?
-// DeclarationError 7793: (95-107): Receive ether function must be payable, but is "nonpayable".
-// DeclarationError 4095: (95-107): Receive ether function must be defined as "external".
+// SyntaxError 4937: (95-107='receive() {}'): No visibility specified. Did you intend to add "external"?
+// DeclarationError 7793: (95-107='receive() {}'): Receive ether function must be payable, but is "nonpayable".
+// DeclarationError 4095: (95-107='receive() {}'): Receive ether function must be defined as "external".
diff --git a/test/libsolidity/syntaxTests/receiveEther/msg_data_in_receive.sol b/test/libsolidity/syntaxTests/receiveEther/msg_data_in_receive.sol
index 20e0dbdf2..00e4f3bcf 100644
--- a/test/libsolidity/syntaxTests/receiveEther/msg_data_in_receive.sol
+++ b/test/libsolidity/syntaxTests/receiveEther/msg_data_in_receive.sol
@@ -2,4 +2,4 @@ contract C {
     receive() external payable { msg.data; }
 }
 // ----
-// TypeError 7139: (46-54): "msg.data" cannot be used inside of "receive" function.
+// TypeError 7139: (46-54='msg.data'): "msg.data" cannot be used inside of "receive" function.
diff --git a/test/libsolidity/syntaxTests/receiveEther/old_syntax.sol b/test/libsolidity/syntaxTests/receiveEther/old_syntax.sol
index b3c000234..4779aa3c2 100644
--- a/test/libsolidity/syntaxTests/receiveEther/old_syntax.sol
+++ b/test/libsolidity/syntaxTests/receiveEther/old_syntax.sol
@@ -2,4 +2,4 @@ contract C {
     function() external payable {}
 }
 // ----
-// ParserError 2915: (45-46): Expected a state variable declaration. If you intended this as a fallback function or a function to handle plain ether transactions, use the "fallback" keyword or the "receive" keyword instead.
+// ParserError 2915: (45-46='{'): Expected a state variable declaration. If you intended this as a fallback function or a function to handle plain ether transactions, use the "fallback" keyword or the "receive" keyword instead.
diff --git a/test/libsolidity/syntaxTests/receiveEther/receive_as_function_name.sol b/test/libsolidity/syntaxTests/receiveEther/receive_as_function_name.sol
index 03372b73b..4cb021638 100644
--- a/test/libsolidity/syntaxTests/receiveEther/receive_as_function_name.sol
+++ b/test/libsolidity/syntaxTests/receiveEther/receive_as_function_name.sol
@@ -2,4 +2,4 @@ contract C {
     function receive() external pure {}
 }
 // ----
-// Warning 3445: (26-33): This function is named "receive" but is not the receive function of the contract. If you intend this to be a receive function, use "receive(...) { ... }" without the "function" keyword to define it.
+// Warning 3445: (26-33='receive'): This function is named "receive" but is not the receive function of the contract. If you intend this to be a receive function, use "receive(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/receiveEther/return_value.sol b/test/libsolidity/syntaxTests/receiveEther/return_value.sol
index 8d4c58872..04b79640a 100644
--- a/test/libsolidity/syntaxTests/receiveEther/return_value.sol
+++ b/test/libsolidity/syntaxTests/receiveEther/return_value.sol
@@ -3,4 +3,4 @@ contract C {
 }
 // ----
 // DeclarationError 7793: (17-56): Receive ether function must be payable, but is "nonpayable".
-// DeclarationError 6899: (44-53): Receive ether function cannot return values.
+// DeclarationError 6899: (44-53='(uint256)'): Receive ether function cannot return values.
diff --git a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number.sol b/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number.sol
index 34ceafa74..8e7164781 100644
--- a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number.sol
+++ b/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number.sol
@@ -10,5 +10,5 @@ contract C
     }
 }
 // ----
-// TypeError 6777: (71-78): Return arguments required.
-// TypeError 5132: (143-156): Different number of arguments in return statement than in returns declaration.
+// TypeError 6777: (71-78='return;'): Return arguments required.
+// TypeError 5132: (143-156='return (1, 2)'): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number_named.sol b/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number_named.sol
index d7d44778d..687ce245c 100644
--- a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number_named.sol
+++ b/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_number_named.sol
@@ -10,5 +10,5 @@ contract C
     }
 }
 // ----
-// TypeError 6777: (73-80): Return arguments required.
-// TypeError 5132: (147-160): Different number of arguments in return statement than in returns declaration.
+// TypeError 6777: (73-80='return;'): Return arguments required.
+// TypeError 5132: (147-160='return (1, 2)'): Different number of arguments in return statement than in returns declaration.
diff --git a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_type.sol b/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_type.sol
index 6cc56dc00..9cc4bd89c 100644
--- a/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_type.sol
+++ b/test/libsolidity/syntaxTests/returnExpressions/single_return_mismatching_type.sol
@@ -6,4 +6,4 @@ contract C
     }
 }
 // ----
-// TypeError 6359: (78-86): Return argument type literal_string "string" is not implicitly convertible to expected type (type of first return variable) uint256.
+// TypeError 6359: (78-86='"string"'): Return argument type literal_string "string" is not implicitly convertible to expected type (type of first return variable) uint256.
diff --git a/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number.sol b/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number.sol
index 918ff29bf..eb03f1030 100644
--- a/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number.sol
+++ b/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number.sol
@@ -14,6 +14,6 @@ contract C
     }
 }
 // ----
-// TypeError 8863: (77-85): Different number of arguments in return statement than in returns declaration.
-// TypeError 5132: (157-173): Different number of arguments in return statement than in returns declaration.
-// TypeError 6777: (245-252): Return arguments required.
+// TypeError 8863: (77-85='return 1'): Different number of arguments in return statement than in returns declaration.
+// TypeError 5132: (157-173='return (1, 2, 3)'): Different number of arguments in return statement than in returns declaration.
+// TypeError 6777: (245-252='return;'): Return arguments required.
diff --git a/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number_named.sol b/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number_named.sol
index 9fce879ae..872e4b45a 100644
--- a/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number_named.sol
+++ b/test/libsolidity/syntaxTests/returnExpressions/tuple_return_mismatching_number_named.sol
@@ -14,6 +14,6 @@ contract C
     }
 }
 // ----
-// TypeError 8863: (81-89): Different number of arguments in return statement than in returns declaration.
-// TypeError 5132: (165-181): Different number of arguments in return statement than in returns declaration.
-// TypeError 6777: (257-264): Return arguments required.
+// TypeError 8863: (81-89='return 1'): Different number of arguments in return statement than in returns declaration.
+// TypeError 5132: (165-181='return (1, 2, 3)'): Different number of arguments in return statement than in returns declaration.
+// TypeError 6777: (257-264='return;'): Return arguments required.
diff --git a/test/libsolidity/syntaxTests/revertStatement/at_file_level.sol b/test/libsolidity/syntaxTests/revertStatement/at_file_level.sol
index b2d53bd8b..5d10adef5 100644
--- a/test/libsolidity/syntaxTests/revertStatement/at_file_level.sol
+++ b/test/libsolidity/syntaxTests/revertStatement/at_file_level.sol
@@ -1,3 +1,3 @@
 revert X();
 // ----
-// ParserError 2314: (8-9): Expected ';' but got '('
+// ParserError 2314: (8-9='('): Expected ';' but got '('
diff --git a/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol b/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol
index 208a7326b..bc6c0ad45 100644
--- a/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol
+++ b/test/libsolidity/syntaxTests/revertStatement/error_used_elsewhere.sol
@@ -3,4 +3,4 @@ function f() pure {
     E();
 }
 // ----
-// TypeError 7757: (35-38): Errors can only be used with revert statements: "revert MyError();".
+// TypeError 7757: (35-38='E()'): Errors can only be used with revert statements: "revert MyError();".
diff --git a/test/libsolidity/syntaxTests/revertStatement/non_called.sol b/test/libsolidity/syntaxTests/revertStatement/non_called.sol
index 63ecfbc6e..3e37e5ace 100644
--- a/test/libsolidity/syntaxTests/revertStatement/non_called.sol
+++ b/test/libsolidity/syntaxTests/revertStatement/non_called.sol
@@ -3,4 +3,4 @@ function f() public pure {
     revert E;
 }
 // ----
-// ParserError 2314: (50-51): Expected '(' but got ';'
+// ParserError 2314: (50-51=';'): Expected '(' but got ';'
diff --git a/test/libsolidity/syntaxTests/revertStatement/non_error.sol b/test/libsolidity/syntaxTests/revertStatement/non_error.sol
index 329b68f93..2943a22e9 100644
--- a/test/libsolidity/syntaxTests/revertStatement/non_error.sol
+++ b/test/libsolidity/syntaxTests/revertStatement/non_error.sol
@@ -2,4 +2,4 @@ function f() public pure {
     revert 1;
 }
 // ----
-// ParserError 2314: (38-39): Expected ';' but got 'Number'
+// ParserError 2314: (38-39='1'): Expected ';' but got 'Number'
diff --git a/test/libsolidity/syntaxTests/revertStatement/revert_event.sol b/test/libsolidity/syntaxTests/revertStatement/revert_event.sol
index 6b2832c87..0074464db 100644
--- a/test/libsolidity/syntaxTests/revertStatement/revert_event.sol
+++ b/test/libsolidity/syntaxTests/revertStatement/revert_event.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1885: (74-75): Expression has to be an error.
+// TypeError 1885: (74-75='E'): Expression has to be an error.
diff --git a/test/libsolidity/syntaxTests/revertStatement/revert_revert.sol b/test/libsolidity/syntaxTests/revertStatement/revert_revert.sol
index f3b1e0805..e7f410532 100644
--- a/test/libsolidity/syntaxTests/revertStatement/revert_revert.sol
+++ b/test/libsolidity/syntaxTests/revertStatement/revert_revert.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// Warning 2319: (0-15): This declaration shadows a builtin symbol.
+// Warning 2319: (0-15='error revert();'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/revertStatement/using_function.sol b/test/libsolidity/syntaxTests/revertStatement/using_function.sol
index e10384cd7..2fc712b92 100644
--- a/test/libsolidity/syntaxTests/revertStatement/using_function.sol
+++ b/test/libsolidity/syntaxTests/revertStatement/using_function.sol
@@ -6,4 +6,4 @@ contract C {
 }
 // ----
 // Warning 2519: (38-91): This declaration shadows an existing declaration.
-// TypeError 1885: (79-80): Expression has to be an error.
+// TypeError 1885: (79-80='f'): Expression has to be an error.
diff --git a/test/libsolidity/syntaxTests/revertStatement/using_struct.sol b/test/libsolidity/syntaxTests/revertStatement/using_struct.sol
index f04b0d598..5615e3acf 100644
--- a/test/libsolidity/syntaxTests/revertStatement/using_struct.sol
+++ b/test/libsolidity/syntaxTests/revertStatement/using_struct.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1885: (75-76): Expression has to be an error.
+// TypeError 1885: (75-76='S'): Expression has to be an error.
diff --git a/test/libsolidity/syntaxTests/scoping/access_in_assignment_dynamic_array.sol b/test/libsolidity/syntaxTests/scoping/access_in_assignment_dynamic_array.sol
index 12454b740..96d786151 100644
--- a/test/libsolidity/syntaxTests/scoping/access_in_assignment_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/scoping/access_in_assignment_dynamic_array.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 7576: (70-71): Undeclared identifier. "x" is not (or not yet) visible at this point.
+// DeclarationError 7576: (70-71='x'): Undeclared identifier. "x" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/access_in_assignment_struct.sol b/test/libsolidity/syntaxTests/scoping/access_in_assignment_struct.sol
index 152ee038e..ca979d24d 100644
--- a/test/libsolidity/syntaxTests/scoping/access_in_assignment_struct.sol
+++ b/test/libsolidity/syntaxTests/scoping/access_in_assignment_struct.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 7576: (90-91): Undeclared identifier. "x" is not (or not yet) visible at this point.
+// DeclarationError 7576: (90-91='x'): Undeclared identifier. "x" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/double_function_declaration.sol b/test/libsolidity/syntaxTests/scoping/double_function_declaration.sol
index b8904d594..73717ee97 100644
--- a/test/libsolidity/syntaxTests/scoping/double_function_declaration.sol
+++ b/test/libsolidity/syntaxTests/scoping/double_function_declaration.sol
@@ -3,4 +3,4 @@ contract test {
     function fun() public { }
 }
 // ----
-// DeclarationError 1686: (20-45): Function with same name and parameter types defined twice.
+// DeclarationError 1686: (20-45='function fun() public { }'): Function with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope.sol b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope.sol
index b29b5ae04..8a1df43d7 100644
--- a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope.sol
+++ b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope.sol
@@ -5,5 +5,5 @@ contract test {
     }
 }
 // ----
-// Warning 2072: (57-63): Unused local variable.
-// Warning 2072: (77-83): Unused local variable.
+// Warning 2072: (57-63='uint x'): Unused local variable.
+// Warning 2072: (77-83='uint x'): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope_activation.sol b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope_activation.sol
index e6beef51a..a931d75ec 100644
--- a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope_activation.sol
+++ b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_disjoint_scope_activation.sol
@@ -5,6 +5,6 @@ contract test {
     }
 }
 // ----
-// Warning 2519: (57-63): This declaration shadows an existing declaration.
-// Warning 2072: (57-63): Unused local variable.
-// Warning 2072: (75-81): Unused local variable.
+// Warning 2519: (57-63='uint x'): This declaration shadows an existing declaration.
+// Warning 2072: (57-63='uint x'): Unused local variable.
+// Warning 2072: (75-81='uint x'): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_and_disjoint_scope.sol b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_and_disjoint_scope.sol
index f457b183f..ea6729a5c 100644
--- a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_and_disjoint_scope.sol
+++ b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_and_disjoint_scope.sol
@@ -6,5 +6,5 @@ contract test {
     }
 }
 // ----
-// DeclarationError 2333: (91-97): Identifier already declared.
-// Warning 2519: (73-79): This declaration shadows an existing declaration.
+// DeclarationError 2333: (91-97='uint x'): Identifier already declared.
+// Warning 2519: (73-79='uint x'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_scope.sol b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_scope.sol
index 1113c4de8..eee87c949 100644
--- a/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_scope.sol
+++ b/test/libsolidity/syntaxTests/scoping/double_variable_declaration_same_scope.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 2333: (71-77): Identifier already declared.
+// DeclarationError 2333: (71-77='uint x'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/scoping/function_state_variable_conflict.sol b/test/libsolidity/syntaxTests/scoping/function_state_variable_conflict.sol
index 4b558ec68..26d5e5f83 100644
--- a/test/libsolidity/syntaxTests/scoping/function_state_variable_conflict.sol
+++ b/test/libsolidity/syntaxTests/scoping/function_state_variable_conflict.sol
@@ -3,4 +3,4 @@ contract C {
     uint public f = 0;
 }
 // ----
-// DeclarationError 2333: (53-70): Identifier already declared.
+// DeclarationError 2333: (53-70='uint public f = 0'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/scoping/library_inherited.sol b/test/libsolidity/syntaxTests/scoping/library_inherited.sol
index 60c16d7c4..4429ca252 100644
--- a/test/libsolidity/syntaxTests/scoping/library_inherited.sol
+++ b/test/libsolidity/syntaxTests/scoping/library_inherited.sol
@@ -14,4 +14,4 @@ contract B is A {
     }
 }
 // ----
-// TypeError 9582: (246-255): Member "foo" not found or not visible after argument-dependent lookup in uint256.
+// TypeError 9582: (246-255='value.foo'): Member "foo" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing.sol b/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing.sol
index d2a191eeb..2f5bc9430 100644
--- a/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing.sol
@@ -3,4 +3,4 @@ contract test {
     function f() public pure { uint e; e = 0; }
 }
 // ----
-// Warning 8760: (77-83): This declaration has the same name as another declaration.
+// Warning 8760: (77-83='uint e'): This declaration has the same name as another declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing2.sol b/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing2.sol
index 88a59cc16..be5c1faf7 100644
--- a/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing2.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_pseudo_shadowing2.sol
@@ -4,4 +4,4 @@ contract test {
     function e(int) external { }
 }
 // ----
-// Warning 8760: (77-83): This declaration has the same name as another declaration.
+// Warning 8760: (77-83='uint e'): This declaration has the same name as another declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_name_vs_contract.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_name_vs_contract.sol
index 1ae8ed754..e795b33f3 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_name_vs_contract.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_name_vs_contract.sol
@@ -15,6 +15,6 @@ contract C {
     function f(uint C) public pure {}    // warning
 }
 // ----
-// Warning 2519: (91-97): This declaration shadows an existing declaration.
-// Warning 2519: (168-174): This declaration shadows an existing declaration.
-// Warning 2519: (283-289): This declaration shadows an existing declaration.
+// Warning 2519: (91-97='uint L'): This declaration shadows an existing declaration.
+// Warning 2519: (168-174='uint A'): This declaration shadows an existing declaration.
+// Warning 2519: (283-289='uint C'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_its_function.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_its_function.sol
index a17a74353..37b47840f 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_its_function.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_its_function.sol
@@ -2,4 +2,4 @@ contract C {
     function f(uint f) pure public {}
 }
 // ----
-// Warning 2519: (28-34): This declaration shadows an existing declaration.
+// Warning 2519: (28-34='uint f'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol
index 61441ece6..29267f873 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol
@@ -12,9 +12,9 @@ contract C {
     function z(EnumType e) external returns (uint EnumType) {}
 }
 // ----
-// Warning 2519: (104-132): This declaration shadows an existing declaration.
-// Warning 2519: (161-178): This declaration shadows an existing declaration.
-// Warning 2519: (207-226): This declaration shadows an existing declaration.
-// Warning 2519: (228-254): This declaration shadows an existing declaration.
-// Warning 2519: (314-327): This declaration shadows an existing declaration.
-// TypeError 5172: (104-114): Name has to refer to a struct, enum or contract.
+// Warning 2519: (104-132='StructType memory StructType'): This declaration shadows an existing declaration.
+// Warning 2519: (161-178='EnumType EnumType'): This declaration shadows an existing declaration.
+// Warning 2519: (207-226='EnumType StructType'): This declaration shadows an existing declaration.
+// Warning 2519: (228-254='StructType memory EnumType'): This declaration shadows an existing declaration.
+// Warning 2519: (314-327='uint EnumType'): This declaration shadows an existing declaration.
+// TypeError 5172: (104-114='StructType'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameters_parameter_vs_struct_enum.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameters_parameter_vs_struct_enum.sol
index fcba51e57..0a4aa5075 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameters_parameter_vs_struct_enum.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameters_parameter_vs_struct_enum.sol
@@ -10,11 +10,11 @@ library C {
     function f3(function (EnumType StructType, StructType memory EnumType) external f) external {}
 }
 // ----
-// Warning 6162: (114-142): Naming function type parameters is deprecated.
-// Warning 6162: (194-211): Naming function type parameters is deprecated.
-// Warning 6162: (263-282): Naming function type parameters is deprecated.
-// Warning 6162: (284-310): Naming function type parameters is deprecated.
-// Warning 2519: (114-142): This declaration shadows an existing declaration.
-// Warning 2519: (194-211): This declaration shadows an existing declaration.
-// Warning 2519: (263-282): This declaration shadows an existing declaration.
-// Warning 2519: (284-310): This declaration shadows an existing declaration.
+// Warning 6162: (114-142='StructType memory StructType'): Naming function type parameters is deprecated.
+// Warning 6162: (194-211='EnumType EnumType'): Naming function type parameters is deprecated.
+// Warning 6162: (263-282='EnumType StructType'): Naming function type parameters is deprecated.
+// Warning 6162: (284-310='StructType memory EnumType'): Naming function type parameters is deprecated.
+// Warning 2519: (114-142='StructType memory StructType'): This declaration shadows an existing declaration.
+// Warning 2519: (194-211='EnumType EnumType'): This declaration shadows an existing declaration.
+// Warning 2519: (263-282='EnumType StructType'): This declaration shadows an existing declaration.
+// Warning 2519: (284-310='StructType memory EnumType'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol
index ed4b2e0d2..848275e13 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol
@@ -12,9 +12,9 @@ contract C {
     function z(uint EnumType) external returns (EnumType e) {}
 }
 // ----
-// Warning 2519: (124-152): This declaration shadows an existing declaration.
-// Warning 2519: (192-209): This declaration shadows an existing declaration.
-// Warning 2519: (249-268): This declaration shadows an existing declaration.
-// Warning 2519: (270-296): This declaration shadows an existing declaration.
-// Warning 2519: (317-330): This declaration shadows an existing declaration.
-// TypeError 5172: (124-134): Name has to refer to a struct, enum or contract.
+// Warning 2519: (124-152='StructType memory StructType'): This declaration shadows an existing declaration.
+// Warning 2519: (192-209='EnumType EnumType'): This declaration shadows an existing declaration.
+// Warning 2519: (249-268='EnumType StructType'): This declaration shadows an existing declaration.
+// Warning 2519: (270-296='StructType memory EnumType'): This declaration shadows an existing declaration.
+// Warning 2519: (317-330='uint EnumType'): This declaration shadows an existing declaration.
+// TypeError 5172: (124-134='StructType'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_parameter.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_parameter.sol
index a82f054e5..8b39201b0 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_parameter.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_parameter.sol
@@ -10,11 +10,11 @@ contract C {
     function (EnumType StructType, StructType memory EnumType) external ext3;
 }
 // ----
-// Warning 6162: (103-131): Naming function type parameters is deprecated.
-// Warning 6162: (162-179): Naming function type parameters is deprecated.
-// Warning 6162: (210-229): Naming function type parameters is deprecated.
-// Warning 6162: (231-257): Naming function type parameters is deprecated.
-// Warning 2519: (103-131): This declaration shadows an existing declaration.
-// Warning 2519: (162-179): This declaration shadows an existing declaration.
-// Warning 2519: (210-229): This declaration shadows an existing declaration.
-// Warning 2519: (231-257): This declaration shadows an existing declaration.
+// Warning 6162: (103-131='StructType memory StructType'): Naming function type parameters is deprecated.
+// Warning 6162: (162-179='EnumType EnumType'): Naming function type parameters is deprecated.
+// Warning 6162: (210-229='EnumType StructType'): Naming function type parameters is deprecated.
+// Warning 6162: (231-257='StructType memory EnumType'): Naming function type parameters is deprecated.
+// Warning 2519: (103-131='StructType memory StructType'): This declaration shadows an existing declaration.
+// Warning 2519: (162-179='EnumType EnumType'): This declaration shadows an existing declaration.
+// Warning 2519: (210-229='EnumType StructType'): This declaration shadows an existing declaration.
+// Warning 2519: (231-257='StructType memory EnumType'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_return_parameter.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_return_parameter.sol
index 5c260ceae..7ed86e113 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_return_parameter.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_type_return_parameter.sol
@@ -10,11 +10,11 @@ contract C {
     function () external returns (EnumType StructType, StructType memory EnumType) ext3;
 }
 // ----
-// SyntaxError 7304: (123-151): Return parameters in function types may not be named.
-// SyntaxError 7304: (193-210): Return parameters in function types may not be named.
-// SyntaxError 7304: (252-271): Return parameters in function types may not be named.
-// SyntaxError 7304: (273-299): Return parameters in function types may not be named.
-// Warning 2519: (123-151): This declaration shadows an existing declaration.
-// Warning 2519: (193-210): This declaration shadows an existing declaration.
-// Warning 2519: (252-271): This declaration shadows an existing declaration.
-// Warning 2519: (273-299): This declaration shadows an existing declaration.
+// SyntaxError 7304: (123-151='StructType memory StructType'): Return parameters in function types may not be named.
+// SyntaxError 7304: (193-210='EnumType EnumType'): Return parameters in function types may not be named.
+// SyntaxError 7304: (252-271='EnumType StructType'): Return parameters in function types may not be named.
+// SyntaxError 7304: (273-299='StructType memory EnumType'): Return parameters in function types may not be named.
+// Warning 2519: (123-151='StructType memory StructType'): This declaration shadows an existing declaration.
+// Warning 2519: (193-210='EnumType EnumType'): This declaration shadows an existing declaration.
+// Warning 2519: (252-271='EnumType StructType'): This declaration shadows an existing declaration.
+// Warning 2519: (273-299='StructType memory EnumType'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_free_function.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_free_function.sol
index b78184109..12cbbb268 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_free_function.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_free_function.sol
@@ -3,4 +3,4 @@ contract test {
     function f() pure public { uint e; e = 0; }
 }
 // ----
-// Warning 2519: (63-69): This declaration shadows an existing declaration.
+// Warning 2519: (63-69='uint e'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_functions.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_functions.sol
index 43f7c86b3..af6171db9 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_functions.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_functions.sol
@@ -5,6 +5,6 @@ contract test {
 }
 function h() {}
 // ----
-// Warning 2519: (63-69): This declaration shadows an existing declaration.
-// Warning 2519: (71-77): This declaration shadows an existing declaration.
-// Warning 2519: (79-85): This declaration shadows an existing declaration.
+// Warning 2519: (63-69='uint e'): This declaration shadows an existing declaration.
+// Warning 2519: (71-77='uint g'): This declaration shadows an existing declaration.
+// Warning 2519: (79-85='uint h'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_state_variable.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_state_variable.sol
index 1e70c9181..70f89479b 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_state_variable.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_local_variable_vs_state_variable.sol
@@ -3,4 +3,4 @@ contract test {
     function f() pure public { uint32 variable; variable = 2; }
 }
 // ----
-// Warning 2519: (69-84): This declaration shadows an existing declaration.
+// Warning 2519: (69-84='uint32 variable'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/scoping/poly_variable_declaration_same_scope.sol b/test/libsolidity/syntaxTests/scoping/poly_variable_declaration_same_scope.sol
index f0500ede0..43b22feeb 100644
--- a/test/libsolidity/syntaxTests/scoping/poly_variable_declaration_same_scope.sol
+++ b/test/libsolidity/syntaxTests/scoping/poly_variable_declaration_same_scope.sol
@@ -9,8 +9,8 @@ contract test {
     }
 }
 // ----
-// DeclarationError 2333: (71-77): Identifier already declared.
-// DeclarationError 2333: (87-93): Identifier already declared.
-// DeclarationError 2333: (103-109): Identifier already declared.
-// DeclarationError 2333: (119-125): Identifier already declared.
-// DeclarationError 2333: (135-141): Identifier already declared.
+// DeclarationError 2333: (71-77='uint x'): Identifier already declared.
+// DeclarationError 2333: (87-93='uint x'): Identifier already declared.
+// DeclarationError 2333: (103-109='uint x'): Identifier already declared.
+// DeclarationError 2333: (119-125='uint x'): Identifier already declared.
+// DeclarationError 2333: (135-141='uint x'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping.sol b/test/libsolidity/syntaxTests/scoping/scoping.sol
index bfd1c0b09..891cad6df 100644
--- a/test/libsolidity/syntaxTests/scoping/scoping.sol
+++ b/test/libsolidity/syntaxTests/scoping/scoping.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7576: (93-94): Undeclared identifier.
+// DeclarationError 7576: (93-94='x'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_activation.sol b/test/libsolidity/syntaxTests/scoping/scoping_activation.sol
index cdc3c7655..383d45851 100644
--- a/test/libsolidity/syntaxTests/scoping/scoping_activation.sol
+++ b/test/libsolidity/syntaxTests/scoping/scoping_activation.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7576: (55-56): Undeclared identifier. "x" is not (or not yet) visible at this point.
+// DeclarationError 7576: (55-56='x'): Undeclared identifier. "x" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_activation_old.sol b/test/libsolidity/syntaxTests/scoping/scoping_activation_old.sol
index cdc3c7655..383d45851 100644
--- a/test/libsolidity/syntaxTests/scoping/scoping_activation_old.sol
+++ b/test/libsolidity/syntaxTests/scoping/scoping_activation_old.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7576: (55-56): Undeclared identifier. "x" is not (or not yet) visible at this point.
+// DeclarationError 7576: (55-56='x'): Undeclared identifier. "x" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_for3.sol b/test/libsolidity/syntaxTests/scoping/scoping_for3.sol
index 29bf0ae84..99d2d4444 100644
--- a/test/libsolidity/syntaxTests/scoping/scoping_for3.sol
+++ b/test/libsolidity/syntaxTests/scoping/scoping_for3.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7576: (124-125): Undeclared identifier.
+// DeclarationError 7576: (124-125='x'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_for_decl_in_body.sol b/test/libsolidity/syntaxTests/scoping/scoping_for_decl_in_body.sol
index 102d7bf01..02afc845d 100644
--- a/test/libsolidity/syntaxTests/scoping/scoping_for_decl_in_body.sol
+++ b/test/libsolidity/syntaxTests/scoping/scoping_for_decl_in_body.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7576: (63-64): Undeclared identifier.
+// DeclarationError 7576: (63-64='y'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_old.sol b/test/libsolidity/syntaxTests/scoping/scoping_old.sol
index 6ac3162a6..38cb2acb6 100644
--- a/test/libsolidity/syntaxTests/scoping/scoping_old.sol
+++ b/test/libsolidity/syntaxTests/scoping/scoping_old.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7576: (55-56): Undeclared identifier. "x" is not (or not yet) visible at this point.
+// DeclarationError 7576: (55-56='x'): Undeclared identifier. "x" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/scoping_self_use.sol b/test/libsolidity/syntaxTests/scoping/scoping_self_use.sol
index be77c6465..67d44ab9e 100644
--- a/test/libsolidity/syntaxTests/scoping/scoping_self_use.sol
+++ b/test/libsolidity/syntaxTests/scoping/scoping_self_use.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// DeclarationError 7576: (64-65): Undeclared identifier. "a" is not (or not yet) visible at this point.
+// DeclarationError 7576: (64-65='a'): Undeclared identifier. "a" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict.sol b/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict.sol
index 52ca438c9..cee6aed85 100644
--- a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict.sol
+++ b/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict.sol
@@ -3,4 +3,4 @@ contract C {
     function f(uint) public pure {}
 }
 // ----
-// DeclarationError 2333: (40-71): Identifier already declared.
+// DeclarationError 2333: (40-71='function f(uint) public pure {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol b/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
index 049fca274..00333b0f0 100644
--- a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
+++ b/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
@@ -11,4 +11,4 @@ contract SomeContract {
 }
 // ----
 // DeclarationError 2333: (106-145): Identifier already declared.
-// TypeError 5704: (185-195): Type is not callable
+// TypeError 5704: (185-195='balance(3)'): Type is not callable
diff --git a/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol b/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
index adca80cc4..fb6a7a53e 100644
--- a/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
+++ b/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (89-95): Operator >> not compatible with types int256 and int256
-// TypeError 2271: (179-193): Operator >> not compatible with types int256 and int256
+// TypeError 2271: (89-95='a >> b'): Operator >> not compatible with types int256 and int256
+// TypeError 2271: (179-193='a >> (256 - b)'): Operator >> not compatible with types int256 and int256
diff --git a/test/libsolidity/syntaxTests/signed_rational_modulus.sol b/test/libsolidity/syntaxTests/signed_rational_modulus.sol
index 999086ae1..a693c3ba3 100644
--- a/test/libsolidity/syntaxTests/signed_rational_modulus.sol
+++ b/test/libsolidity/syntaxTests/signed_rational_modulus.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (117-123): Operator % not compatible with types rational_const 1 / 2 and fixed128x18. Fractional literals not supported.
+// TypeError 2271: (117-123='.5 % a'): Operator % not compatible with types rational_const 1 / 2 and fixed128x18. Fractional literals not supported.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol
index c10dc10f2..8a981b5a0 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9578: (89-119): Type not supported in packed mode.
+// TypeError 9578: (89-119='[new uint[](5), new uint[](7)]'): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array_v2.sol
index 150ac68e3..8b5443eb5 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array_v2.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_nested_dynamic_array_v2.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9578: (104-134): Type not supported in packed mode.
+// TypeError 9578: (104-134='[new uint[](5), new uint[](7)]'): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_structs_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_structs_v2.sol
index f03c27a1b..189403a9c 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_structs_v2.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_structs_v2.sol
@@ -11,5 +11,5 @@ contract C {
     }
 }
 // ----
-// TypeError 9578: (191-192): Type not supported in packed mode.
-// TypeError 9578: (194-195): Type not supported in packed mode.
+// TypeError 9578: (191-192='s'): Type not supported in packed mode.
+// TypeError 9578: (194-195='t'): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol
index 8c679258c..a239537ac 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_nested_dynamic_array.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2056: (86-116): This type cannot be encoded.
+// TypeError 2056: (86-116='[new uint[](5), new uint[](7)]'): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol
index a7d0e3dbe..1ee3f3be1 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs.sol
@@ -12,7 +12,7 @@ contract C {
     }
 }
 // ----
-// TypeError 2056: (151-152): This type cannot be encoded.
-// TypeError 2056: (154-155): This type cannot be encoded.
-// TypeError 9578: (220-221): Type not supported in packed mode.
-// TypeError 9578: (223-224): Type not supported in packed mode.
+// TypeError 2056: (151-152='s'): This type cannot be encoded.
+// TypeError 2056: (154-155='t'): This type cannot be encoded.
+// TypeError 9578: (220-221='s'): Type not supported in packed mode.
+// TypeError 9578: (223-224='t'): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs_abiv2.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs_abiv2.sol
index e7117f2b1..88244716c 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs_abiv2.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_structs_abiv2.sol
@@ -17,6 +17,6 @@ contract C {
     }
 }
 // ----
-// TypeError 9578: (193-195): Type not supported in packed mode.
-// TypeError 9578: (323-324): Type not supported in packed mode.
-// TypeError 9578: (326-327): Type not supported in packed mode.
+// TypeError 9578: (193-195='st'): Type not supported in packed mode.
+// TypeError 9578: (323-324='s'): Type not supported in packed mode.
+// TypeError 9578: (326-327='t'): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_functions_member_access.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_functions_member_access.sol
index 47dedc375..a8667c51c 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abi_functions_member_access.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_functions_member_access.sol
@@ -8,8 +8,8 @@ contract C {
     }
 }
 // ----
-// Warning 6133: (52-62): Statement has no effect.
-// Warning 6133: (72-88): Statement has no effect.
-// Warning 6133: (98-120): Statement has no effect.
-// Warning 6133: (130-153): Statement has no effect.
-// Warning 6133: (163-173): Statement has no effect.
+// Warning 6133: (52-62='abi.encode'): Statement has no effect.
+// Warning 6133: (72-88='abi.encodePacked'): Statement has no effect.
+// Warning 6133: (98-120='abi.encodeWithSelector'): Statement has no effect.
+// Warning 6133: (130-153='abi.encodeWithSignature'): Statement has no effect.
+// Warning 6133: (163-173='abi.decode'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_calldata.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_calldata.sol
index 7c0e35a21..bb59a3016 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_calldata.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_calldata.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// ParserError 2314: (121-129): Expected ',' but got 'calldata'
+// ParserError 2314: (121-129='calldata'): Expected ',' but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_empty.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_empty.sol
index 73d46b5aa..b041270ee 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_empty.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_empty.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// Warning 6133: (52-73): Statement has no effect.
+// Warning 6133: (52-73='abi.decode("abc", ())'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_count.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_count.sol
index e18088989..d51a47b7e 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_count.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_count.sol
@@ -6,7 +6,7 @@ contract C {
   }
 }
 // ----
-// TypeError 5782: (46-58): This function takes two arguments, but 0 were provided.
-// TypeError 5782: (64-84): This function takes two arguments, but 1 were provided.
-// TypeError 5782: (90-122): This function takes two arguments, but 3 were provided.
-// TypeError 6444: (111-115): The second argument to "abi.decode" has to be a tuple of types.
+// TypeError 5782: (46-58='abi.decode()'): This function takes two arguments, but 0 were provided.
+// TypeError 5782: (64-84='abi.decode(msg.data)'): This function takes two arguments, but 1 were provided.
+// TypeError 5782: (90-122='abi.decode(msg.data, uint, uint)'): This function takes two arguments, but 3 were provided.
+// TypeError 6444: (111-115='uint'): The second argument to "abi.decode" has to be a tuple of types.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_type.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_type.sol
index 4c0795d94..64bf4eb40 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_type.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_arg_type.sol
@@ -4,5 +4,5 @@ contract C {
   }
 }
 // ----
-// TypeError 1956: (57-61): The first argument to "abi.decode" must be implicitly convertible to bytes memory or bytes calldata, but is of type type(uint256).
-// TypeError 6444: (63-67): The second argument to "abi.decode" has to be a tuple of types.
+// TypeError 1956: (57-61='uint'): The first argument to "abi.decode" must be implicitly convertible to bytes memory or bytes calldata, but is of type type(uint256).
+// TypeError 6444: (63-67='uint'): The second argument to "abi.decode" has to be a tuple of types.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory.sol
index 4e8cb93f6..6c92246e9 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_memory.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// ParserError 2314: (71-77): Expected ',' but got 'memory'
+// ParserError 2314: (71-77='memory'): Expected ',' but got 'memory'
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
index c705ab2ec..944258717 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9611: (92-101): Decoding type uint256[] memory[3] memory not supported.
+// TypeError 9611: (92-101='uint[][3]'): Decoding type uint256[] memory[3] memory not supported.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array_v2.sol
index 54f1d5a6e..ec9063584 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array_v2.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array_v2.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// Warning 6133: (87-118): Statement has no effect.
+// Warning 6133: (87-118='abi.decode("1234", (uint[][3]))'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nontuple.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nontuple.sol
index 973ad3dbb..c1437571b 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nontuple.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nontuple.sol
@@ -6,6 +6,6 @@ contract C {
   }
 }
 // ----
-// TypeError 6444: (64-68): The second argument to "abi.decode" has to be a tuple of types.
-// TypeError 6444: (93-97): The second argument to "abi.decode" has to be a tuple of types.
-// TypeError 6444: (122-125): The second argument to "abi.decode" has to be a tuple of types.
+// TypeError 6444: (64-68='uint'): The second argument to "abi.decode" has to be a tuple of types.
+// TypeError 6444: (93-97='this'): The second argument to "abi.decode" has to be a tuple of types.
+// TypeError 6444: (122-125='f()'): The second argument to "abi.decode" has to be a tuple of types.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_storage.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_storage.sol
index e2f938483..7f27e8fff 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_storage.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_storage.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// ParserError 2314: (109-116): Expected ',' but got 'storage'
+// ParserError 2314: (109-116='storage'): Expected ',' but got 'storage'
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol
index dd981b54c..fc6673c78 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9611: (118-119): Decoding type struct S memory not supported.
+// TypeError 9611: (118-119='S'): Decoding type struct S memory not supported.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct_v2.sol
index 824f723ed..442c1921e 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct_v2.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_struct_v2.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// Warning 6133: (113-136): Statement has no effect.
+// Warning 6133: (113-136='abi.decode("1234", (S))'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
index 48372263f..7d270d708 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
@@ -19,9 +19,9 @@ contract C {
 	}
 }
 // ----
-// TypeError 5407: (181-189): Cannot implicitly convert component at position 0 from "literal_string "test"" to "int256".
-// TypeError 7788: (271-301): Expected 1 instead of 2 components for the tuple parameter.
-// TypeError 7788: (382-408): Expected 1 instead of 0 components for the tuple parameter.
-// TypeError 6219: (489-511): Expected two arguments: a function pointer followed by a tuple.
-// TypeError 7515: (597-628): Expected a tuple with 2 components instead of a single non-tuple parameter.
-// TypeError 5407: (621-627): Cannot implicitly convert component at position 0 from "uint8[2] memory" to "int256".
+// TypeError 5407: (181-189='("test")'): Cannot implicitly convert component at position 0 from "literal_string "test"" to "int256".
+// TypeError 7788: (271-301='abi.encodeCall(this.f, (1, 2))'): Expected 1 instead of 2 components for the tuple parameter.
+// TypeError 7788: (382-408='abi.encodeCall(this.f, ())'): Expected 1 instead of 0 components for the tuple parameter.
+// TypeError 6219: (489-511='abi.encodeCall(this.f)'): Expected two arguments: a function pointer followed by a tuple.
+// TypeError 7515: (597-628='abi.encodeCall(this.f3, [1, 2])'): Expected a tuple with 2 components instead of a single non-tuple parameter.
+// TypeError 5407: (621-627='[1, 2]'): Cannot implicitly convert component at position 0 from "uint8[2] memory" to "int256".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol
index e2de48387..b3955cea0 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol
@@ -64,15 +64,15 @@ contract C is Base {
 	}
 }
 // ----
-// TypeError 5511: (742-743): Expected first argument to be a function pointer, not "int_const 1".
-// TypeError 3509: (855-869): Expected regular external function type, or external view on public function. Cannot use special function.
-// TypeError 3509: (982-991): Expected regular external function type, or external view on public function. Provided internal function.
-// TypeError 3509: (1187-1207): Expected regular external function type, or external view on public function. Provided internal function.
-// TypeError 3509: (1286-1297): Expected regular external function type, or external view on public function. Provided internal function.
-// TypeError 3509: (1329-1340): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
-// TypeError 3509: (1471-1482): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
-// TypeError 3509: (1592-1601): Expected regular external function type, or external view on public function. Provided internal function. Did you forget to prefix "this."?
-// TypeError 3509: (1722-1745): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
-// TypeError 3509: (1771-1796): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
-// TypeError 3509: (1902-1911): Expected regular external function type, or external view on public function. Provided internal function.
-// TypeError 3509: (2010-2019): Expected regular external function type, or external view on public function. Provided creation function.
+// TypeError 5511: (742-743='1'): Expected first argument to be a function pointer, not "int_const 1".
+// TypeError 3509: (855-869='abi.encodeCall'): Expected regular external function type, or external view on public function. Cannot use special function.
+// TypeError 3509: (982-991='fInternal'): Expected regular external function type, or external view on public function. Provided internal function.
+// TypeError 3509: (1187-1207='localFunctionPointer'): Expected regular external function type, or external view on public function. Provided internal function.
+// TypeError 3509: (1286-1297='L.fInternal'): Expected regular external function type, or external view on public function. Provided internal function.
+// TypeError 3509: (1329-1340='L.fExternal'): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
+// TypeError 3509: (1471-1482='x.fExternal'): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
+// TypeError 3509: (1592-1601='C.fPublic'): Expected regular external function type, or external view on public function. Provided internal function. Did you forget to prefix "this."?
+// TypeError 3509: (1722-1745='Base.baseFunctionPublic'): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
+// TypeError 3509: (1771-1796='Base.baseFunctionInternal'): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
+// TypeError 3509: (1902-1911='fileLevel'): Expected regular external function type, or external view on public function. Provided internal function.
+// TypeError 3509: (2010-2019='new Other'): Expected regular external function type, or external view on public function. Provided creation function.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol
index c27f61d68..3c8aac779 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol
@@ -5,5 +5,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 7788: (139-170): Expected 2 instead of 1 components for the tuple parameter.
-// TypeError 5407: (163-168): Cannot implicitly convert component at position 0 from "tuple(int_const 1,int_const 2)" to "int256".
+// TypeError 7788: (139-170='abi.encodeCall(this.f, ((1,2)))'): Expected 2 instead of 1 components for the tuple parameter.
+// TypeError 5407: (163-168='(1,2)'): Cannot implicitly convert component at position 0 from "tuple(int_const 1,int_const 2)" to "int256".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol
index 7f69995d5..820003d8c 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol
@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 8381: (149-153): Tuple component cannot be empty.
+// TypeError 8381: (149-153='(1,)'): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodePacked_array_of_structs.sol b/test/libsolidity/syntaxTests/specialFunctions/encodePacked_array_of_structs.sol
index a120331d3..ddc5c7f2d 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/encodePacked_array_of_structs.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodePacked_array_of_structs.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9578: (116-117): Type not supported in packed mode.
+// TypeError 9578: (116-117='s'): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodePacked_dynamic_string_array_v2.sol b/test/libsolidity/syntaxTests/specialFunctions/encodePacked_dynamic_string_array_v2.sol
index 342e76bf5..9a53c7ec6 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/encodePacked_dynamic_string_array_v2.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodePacked_dynamic_string_array_v2.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError 9578: (112-113): Type not supported in packed mode.
-// TypeError 9578: (178-179): Type not supported in packed mode.
+// TypeError 9578: (112-113='m'): Type not supported in packed mode.
+// TypeError 9578: (178-179='s'): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/functionCallOptions_err.sol b/test/libsolidity/syntaxTests/specialFunctions/functionCallOptions_err.sol
index 071859e53..0b35054cb 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/functionCallOptions_err.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/functionCallOptions_err.sol
@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ----
-// TypeError 2056: (60-76): This type cannot be encoded.
-// TypeError 2056: (92-106): This type cannot be encoded.
-// TypeError 2056: (122-146): This type cannot be encoded.
+// TypeError 2056: (60-76='this.f{value: 2}'): This type cannot be encoded.
+// TypeError 2056: (92-106='this.f{gas: 2}'): This type cannot be encoded.
+// TypeError 2056: (122-146='this.f{value: 2, gas: 1}'): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/single_non_bytes_arg.sol b/test/libsolidity/syntaxTests/specialFunctions/single_non_bytes_arg.sol
index c30bd99dc..50df32ffb 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/single_non_bytes_arg.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/single_non_bytes_arg.sol
@@ -7,6 +7,6 @@ contract C {
     function g(bytes32) pure internal {}
 }
 // ----
-// TypeError 7556: (64-71): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 7556: (92-99): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
-// TypeError 7556: (123-130): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 7556: (64-71='uint(2)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 7556: (92-99='uint(2)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
+// TypeError 7556: (123-130='uint(2)'): Invalid type for argument in function call. Invalid implicit conversion from uint256 to bytes memory requested. This function requires a single bytes argument. Use abi.encodePacked(...) to obtain the pre-0.5.0 behaviour or abi.encode(...) to use ABI encoding.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol
index 6ecb4e4ff..4fb540bfc 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_internal_functions.sol
@@ -5,7 +5,7 @@ contract C {
     }
 }
 // ----
-// TypeError 2056: (91-100): This type cannot be encoded.
-// TypeError 2056: (102-103): This type cannot be encoded.
-// TypeError 2056: (105-119): This type cannot be encoded.
-// TypeError 2056: (121-130): This type cannot be encoded.
+// TypeError 2056: (91-100='keccak256'): This type cannot be encoded.
+// TypeError 2056: (102-103='f'): This type cannot be encoded.
+// TypeError 2056: (105-119='this.f{gas: 2}'): This type cannot be encoded.
+// TypeError 2056: (121-130='blockhash'): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_special_types.sol b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_special_types.sol
index e83498b6c..7ce253b58 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_special_types.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_special_types.sol
@@ -6,8 +6,8 @@ contract C {
     }
 }
 // ----
-// TypeError 2056: (94-120): This type cannot be encoded.
-// TypeError 2056: (122-127): This type cannot be encoded.
-// TypeError 2056: (184-189): This type cannot be encoded.
-// TypeError 2056: (191-193): This type cannot be encoded.
-// TypeError 2056: (195-201): This type cannot be encoded.
+// TypeError 2056: (94-120='address(this).delegatecall'): This type cannot be encoded.
+// TypeError 2056: (122-127='super'): This type cannot be encoded.
+// TypeError 2056: (184-189='block'): This type cannot be encoded.
+// TypeError 2056: (191-193='tx'): This type cannot be encoded.
+// TypeError 2056: (195-201='mulmod'): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_structs.sol b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_structs.sol
index 02777da1e..6f8c887fd 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_structs.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_structs.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError 9578: (156-157): Type not supported in packed mode.
-// TypeError 9578: (159-160): Type not supported in packed mode.
+// TypeError 9578: (156-157='s'): Type not supported in packed mode.
+// TypeError 9578: (159-160='t'): Type not supported in packed mode.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_types.sol b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_types.sol
index c427565d3..17aeb8868 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_types.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/types_with_unspecified_encoding_types.sol
@@ -10,8 +10,8 @@ contract C {
     }
 }
 // ----
-// TypeError 2056: (174-175): This type cannot be encoded.
-// TypeError 2056: (177-178): This type cannot be encoded.
-// TypeError 2056: (185-186): This type cannot be encoded.
-// TypeError 2056: (188-192): This type cannot be encoded.
-// TypeError 2056: (194-200): This type cannot be encoded.
+// TypeError 2056: (174-175='S'): This type cannot be encoded.
+// TypeError 2056: (177-178='A'): This type cannot be encoded.
+// TypeError 2056: (185-186='T'): This type cannot be encoded.
+// TypeError 2056: (188-192='uint'): This type cannot be encoded.
+// TypeError 2056: (194-200='uint[]'): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol
index f38a3267e..23feecd6a 100644
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6359: (83-96): Return argument type function () pure returns (string memory) is not implicitly convertible to expected type (type of first return variable) string memory.
+// TypeError 6359: (83-96='string.concat'): Return argument type function () pure returns (string memory) is not implicitly convertible to expected type (type of first return variable) string memory.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol
index dcf3057da..8466b8ccc 100644
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol
@@ -8,6 +8,6 @@ contract C {
     }
 }
 // ----
-// TypeError 9977: (153-161): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr provided.
-// TypeError 9977: (163-171): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr provided.
-// TypeError 9977: (217-218): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (153-161='bytes(a)'): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr provided.
+// TypeError 9977: (163-171='bytes(b)'): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr provided.
+// TypeError 9977: (217-218='0'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol
index 49b8a465a..136f5bbb3 100644
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol
@@ -9,7 +9,7 @@ contract C {
     }
 }
 // ----
-// TypeError 9977: (232-233): Invalid type for argument in the string.concat function call. string type is required, but t_bytes16 provided.
-// TypeError 9977: (238-241): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$dyn_memory_ptr provided.
-// TypeError 9977: (253-254): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_bytes1_$dyn_memory_ptr provided.
-// TypeError 9977: (260-269): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_calldata_ptr provided.
+// TypeError 9977: (232-233='b'): Invalid type for argument in the string.concat function call. string type is required, but t_bytes16 provided.
+// TypeError 9977: (238-241='num'): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$dyn_memory_ptr provided.
+// TypeError 9977: (253-254='m'): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_bytes1_$dyn_memory_ptr provided.
+// TypeError 9977: (260-269='bytes(c1)'): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_calldata_ptr provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol
index 8c204ffca..b1eefdb56 100644
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6378: (61-63): Unable to deduce common type for array elements.
+// TypeError 6378: (61-63='[]'): Unable to deduce common type for array elements.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol
index 3c4639363..c4643b3e3 100644
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol
@@ -25,16 +25,16 @@ contract C {
     }
 }
 // ----
-// TypeError 9977: (426-427): Invalid type for argument in the string.concat function call. string type is required, but t_bool provided.
-// TypeError 9977: (429-430): Invalid type for argument in the string.concat function call. string type is required, but t_uint256 provided.
-// TypeError 9977: (432-434): Invalid type for argument in the string.concat function call. string type is required, but t_uint8 provided.
-// TypeError 9977: (436-437): Invalid type for argument in the string.concat function call. string type is required, but t_address provided.
-// TypeError 9977: (439-441): Invalid type for argument in the string.concat function call. string type is required, but t_address_payable provided.
-// TypeError 9977: (443-447): Invalid type for argument in the string.concat function call. string type is required, but t_function_external_nonpayable$__$returns$__$ provided.
-// TypeError 9977: (449-453): Invalid type for argument in the string.concat function call. string type is required, but t_function_internal_nonpayable$__$returns$__$ provided.
-// TypeError 9977: (455-463): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint256_$dyn_memory_ptr provided.
-// TypeError 9977: (465-472): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint256_$2_memory_ptr provided.
-// TypeError 9977: (474-475): Invalid type for argument in the string.concat function call. string type is required, but t_contract$_C_$86 provided.
-// TypeError 9977: (477-478): Invalid type for argument in the string.concat function call. string type is required, but t_struct$_S_$4_memory_ptr provided.
-// TypeError 9977: (480-481): Invalid type for argument in the string.concat function call. string type is required, but t_enum$_E_$8 provided.
-// TypeError 9977: (483-484): Invalid type for argument in the string.concat function call. string type is required, but t_mapping$_t_uint256_$_t_enum$_E_$8_$ provided.
+// TypeError 9977: (426-427='b'): Invalid type for argument in the string.concat function call. string type is required, but t_bool provided.
+// TypeError 9977: (429-430='u'): Invalid type for argument in the string.concat function call. string type is required, but t_uint256 provided.
+// TypeError 9977: (432-434='u8'): Invalid type for argument in the string.concat function call. string type is required, but t_uint8 provided.
+// TypeError 9977: (436-437='a'): Invalid type for argument in the string.concat function call. string type is required, but t_address provided.
+// TypeError 9977: (439-441='ap'): Invalid type for argument in the string.concat function call. string type is required, but t_address_payable provided.
+// TypeError 9977: (443-447='fext'): Invalid type for argument in the string.concat function call. string type is required, but t_function_external_nonpayable$__$returns$__$ provided.
+// TypeError 9977: (449-453='fint'): Invalid type for argument in the string.concat function call. string type is required, but t_function_internal_nonpayable$__$returns$__$ provided.
+// TypeError 9977: (455-463='uDynamic'): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint256_$dyn_memory_ptr provided.
+// TypeError 9977: (465-472='uStatic'): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint256_$2_memory_ptr provided.
+// TypeError 9977: (474-475='c'): Invalid type for argument in the string.concat function call. string type is required, but t_contract$_C_$86 provided.
+// TypeError 9977: (477-478='s'): Invalid type for argument in the string.concat function call. string type is required, but t_struct$_S_$4_memory_ptr provided.
+// TypeError 9977: (480-481='e'): Invalid type for argument in the string.concat function call. string type is required, but t_enum$_E_$8 provided.
+// TypeError 9977: (483-484='m'): Invalid type for argument in the string.concat function call. string type is required, but t_mapping$_t_uint256_$_t_enum$_E_$8_$ provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol
index f8e62b49e..267c77cad 100644
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol
@@ -34,25 +34,25 @@ contract C {
 // ----
 // TypeError 9640: (698-780): Explicit type conversion not allowed from "bytes32" to "bytes memory".
 // TypeError 1227: (698-783): Index range access is only supported for dynamic calldata arrays.
-// TypeError 1227: (865-871): Index range access is only supported for dynamic calldata arrays.
-// TypeError 9977: (134-139): Invalid type for argument in the string.concat function call. string type is required, but t_bool provided.
-// TypeError 9977: (153-154): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_1 provided.
-// TypeError 9977: (168-172): Invalid type for argument in the string.concat function call. string type is required, but t_rational_10000000000_by_1 provided.
-// TypeError 9977: (186-191): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_10000000000 provided.
-// TypeError 9977: (205-208): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_10 provided.
-// TypeError 9977: (222-231): Invalid type for argument in the string.concat function call. string type is required, but t_rational_19088743_by_1 provided.
+// TypeError 1227: (865-871='[0][:]'): Index range access is only supported for dynamic calldata arrays.
+// TypeError 9977: (134-139='false'): Invalid type for argument in the string.concat function call. string type is required, but t_bool provided.
+// TypeError 9977: (153-154='1'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_1 provided.
+// TypeError 9977: (168-172='1e10'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_10000000000_by_1 provided.
+// TypeError 9977: (186-191='1e-10'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_10000000000 provided.
+// TypeError 9977: (205-208='0.1'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_10 provided.
+// TypeError 9977: (222-231='0x1234567'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_19088743_by_1 provided.
 // TypeError 9977: (245-285): Invalid type for argument in the string.concat function call. string type is required, but t_rational_380605192295934637532253317235440047844071680_by_1 provided.
 // TypeError 9977: (336-378): Invalid type for argument in the string.concat function call. string type is required, but t_address provided.
 // TypeError 9977: (405-449): Invalid type for argument in the string.concat function call. string type is required, but t_rational_24943341882306372405313753398341798975509081620497_by_1 provided.
 // TypeError 9977: (496-562): Invalid type for argument in the string.concat function call. string type is required, but t_rational_30272441630670900764332283662402067049651745785153368133042924362431065855_by_1 provided.
 // TypeError 9977: (597-664): Invalid type for argument in the string.concat function call. string type is required, but t_rational_minus_1_by_1 provided.
 // TypeError 9977: (698-783): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr_slice provided.
-// TypeError 9977: (797-798): Invalid type for argument in the string.concat function call. string type is required, but t_function_internal_nonpayable$__$returns$__$ provided.
-// TypeError 9977: (812-814): Invalid type for argument in the string.concat function call. string type is required, but t_tuple$__$ provided.
-// TypeError 9977: (828-834): Invalid type for argument in the string.concat function call. string type is required, but t_tuple$_t_rational_0_by_1_$_t_rational_0_by_1_$ provided.
-// TypeError 9977: (848-851): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$1_memory_ptr provided.
-// TypeError 9977: (865-871): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$1_memory_ptr_slice provided.
-// TypeError 9977: (885-891): Invalid type for argument in the string.concat function call. string type is required, but t_uint8 provided.
-// TypeError 9977: (905-912): Invalid type for argument in the string.concat function call. string type is required, but t_contract$_C_$61 provided.
-// TypeError 9977: (926-930): Invalid type for argument in the string.concat function call. string type is required, but t_struct$_S_$4_memory_ptr provided.
-// TypeError 9977: (944-947): Invalid type for argument in the string.concat function call. string type is required, but t_enum$_E_$8 provided.
+// TypeError 9977: (797-798='f'): Invalid type for argument in the string.concat function call. string type is required, but t_function_internal_nonpayable$__$returns$__$ provided.
+// TypeError 9977: (812-814='()'): Invalid type for argument in the string.concat function call. string type is required, but t_tuple$__$ provided.
+// TypeError 9977: (828-834='(0, 0)'): Invalid type for argument in the string.concat function call. string type is required, but t_tuple$_t_rational_0_by_1_$_t_rational_0_by_1_$ provided.
+// TypeError 9977: (848-851='[0]'): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$1_memory_ptr provided.
+// TypeError 9977: (865-871='[0][:]'): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$1_memory_ptr_slice provided.
+// TypeError 9977: (885-891='[0][0]'): Invalid type for argument in the string.concat function call. string type is required, but t_uint8 provided.
+// TypeError 9977: (905-912='new C()'): Invalid type for argument in the string.concat function call. string type is required, but t_contract$_C_$61 provided.
+// TypeError 9977: (926-930='S(0)'): Invalid type for argument in the string.concat function call. string type is required, but t_struct$_S_$4_memory_ptr provided.
+// TypeError 9977: (944-947='E.A'): Invalid type for argument in the string.concat function call. string type is required, but t_enum$_E_$8 provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol
index c1b2b4513..97f7905c1 100644
--- a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol
@@ -18,16 +18,16 @@ contract C {
     }
 }
 // ----
-// TypeError 9977: (79-80): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (94-96): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (110-113): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (127-131): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (145-149): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (163-168): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (182-187): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (201-207): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (221-224): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (238-242): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
-// TypeError 9977: (256-261): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (79-80='0'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (94-96='-0'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (110-113='0.0'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (127-131='-0.0'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (145-149='0e10'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (163-168='-0e10'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (182-187='0e-10'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (201-207='-0e-10'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (221-224='(0)'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (238-242='0x00'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (256-261='-0x00'): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
 // TypeError 9977: (275-341): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
 // TypeError 9977: (375-442): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
diff --git a/test/libsolidity/syntaxTests/string/hex_as_identifier.sol b/test/libsolidity/syntaxTests/string/hex_as_identifier.sol
index 063b52b89..6c4eebb4f 100644
--- a/test/libsolidity/syntaxTests/string/hex_as_identifier.sol
+++ b/test/libsolidity/syntaxTests/string/hex_as_identifier.sol
@@ -2,4 +2,4 @@ function g() pure {
     assembly { let hex := 1 }
 }
 // ----
-// ParserError 2314: (39-42): Expected identifier but got 'ILLEGAL'
+// ParserError 2314: (39-42='hex'): Expected identifier but got 'ILLEGAL'
diff --git a/test/libsolidity/syntaxTests/string/invalid_legacy_escape.sol b/test/libsolidity/syntaxTests/string/invalid_legacy_escape.sol
index 1972990ef..abcf6334f 100644
--- a/test/libsolidity/syntaxTests/string/invalid_legacy_escape.sol
+++ b/test/libsolidity/syntaxTests/string/invalid_legacy_escape.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// ParserError 8936: (100-105): Invalid escape sequence.
+// ParserError 8936: (100-105='"\t\b'): Invalid escape sequence.
diff --git a/test/libsolidity/syntaxTests/string/invalid_utf8_explicit_string.sol b/test/libsolidity/syntaxTests/string/invalid_utf8_explicit_string.sol
index 3ad1c4b56..ecc48c8cf 100644
--- a/test/libsolidity/syntaxTests/string/invalid_utf8_explicit_string.sol
+++ b/test/libsolidity/syntaxTests/string/invalid_utf8_explicit_string.sol
@@ -2,4 +2,4 @@ contract C {
     string s = string("\xa0\x00");
 }
 // ----
-// TypeError 9640: (28-46): Explicit type conversion not allowed from "literal_string hex"a000"" to "string memory". Contains invalid UTF-8 sequence at position 0.
+// TypeError 9640: (28-46='string("\xa0\x00")'): Explicit type conversion not allowed from "literal_string hex"a000"" to "string memory". Contains invalid UTF-8 sequence at position 0.
diff --git a/test/libsolidity/syntaxTests/string/invalid_utf8_hex_string.sol b/test/libsolidity/syntaxTests/string/invalid_utf8_hex_string.sol
index a089137dc..8c43d11d1 100644
--- a/test/libsolidity/syntaxTests/string/invalid_utf8_hex_string.sol
+++ b/test/libsolidity/syntaxTests/string/invalid_utf8_hex_string.sol
@@ -2,4 +2,4 @@ contract C {
     string s = hex"a000";
 }
 // ----
-// TypeError 7407: (28-37): Type literal_string hex"a000" is not implicitly convertible to expected type string storage ref. Contains invalid UTF-8 sequence at position 0.
+// TypeError 7407: (28-37='hex"a000"'): Type literal_string hex"a000" is not implicitly convertible to expected type string storage ref. Contains invalid UTF-8 sequence at position 0.
diff --git a/test/libsolidity/syntaxTests/string/invalid_utf8_implicit_string.sol b/test/libsolidity/syntaxTests/string/invalid_utf8_implicit_string.sol
index 98d83e1d4..c6c50cec5 100644
--- a/test/libsolidity/syntaxTests/string/invalid_utf8_implicit_string.sol
+++ b/test/libsolidity/syntaxTests/string/invalid_utf8_implicit_string.sol
@@ -2,4 +2,4 @@ contract C {
     string s = "\xa0\x00";
 }
 // ----
-// TypeError 7407: (28-38): Type literal_string hex"a000" is not implicitly convertible to expected type string storage ref. Contains invalid UTF-8 sequence at position 0.
+// TypeError 7407: (28-38='"\xa0\x00"'): Type literal_string hex"a000" is not implicitly convertible to expected type string storage ref. Contains invalid UTF-8 sequence at position 0.
diff --git a/test/libsolidity/syntaxTests/string/invalid_utf8_sequence.sol b/test/libsolidity/syntaxTests/string/invalid_utf8_sequence.sol
index f8df14ca5..d28e011d0 100644
--- a/test/libsolidity/syntaxTests/string/invalid_utf8_sequence.sol
+++ b/test/libsolidity/syntaxTests/string/invalid_utf8_sequence.sol
@@ -2,5 +2,5 @@ contract C {
     string s = unicode"À";
 }
 // ----
-// SyntaxError 8452: (28-38): Contains invalid UTF-8 sequence at position 0.
-// TypeError 7407: (28-38): Type literal_string hex"c0" is not implicitly convertible to expected type string storage ref. Contains invalid UTF-8 sequence at position 0.
+// SyntaxError 8452: (28-38='unicode"À"'): Contains invalid UTF-8 sequence at position 0.
+// TypeError 7407: (28-38='unicode"À"'): Type literal_string hex"c0" is not implicitly convertible to expected type string storage ref. Contains invalid UTF-8 sequence at position 0.
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_hex_valid_parts.sol b/test/libsolidity/syntaxTests/string/string_multipart_hex_valid_parts.sol
index 54cccbcc5..97c15589c 100644
--- a/test/libsolidity/syntaxTests/string/string_multipart_hex_valid_parts.sol
+++ b/test/libsolidity/syntaxTests/string/string_multipart_hex_valid_parts.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// ParserError 5428: (108-112): Expected even number of hex-nibbles.
+// ParserError 5428: (108-112='hex"'): Expected even number of hex-nibbles.
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_newline_without_hex_prefix.sol b/test/libsolidity/syntaxTests/string/string_multipart_newline_without_hex_prefix.sol
index cf46d536e..c02844d01 100644
--- a/test/libsolidity/syntaxTests/string/string_multipart_newline_without_hex_prefix.sol
+++ b/test/libsolidity/syntaxTests/string/string_multipart_newline_without_hex_prefix.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// ParserError 2314: (118-124): Expected ';' but got 'StringLiteral'
+// ParserError 2314: (118-124='"deaf"'): Expected ';' but got 'StringLiteral'
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_only_hex.sol b/test/libsolidity/syntaxTests/string/string_multipart_only_hex.sol
index ff54daa1e..8ab5bbe82 100644
--- a/test/libsolidity/syntaxTests/string/string_multipart_only_hex.sol
+++ b/test/libsolidity/syntaxTests/string/string_multipart_only_hex.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// ParserError 2314: (116-120): Expected ';' but got 'StringLiteral'
+// ParserError 2314: (116-120='"cc"'): Expected ';' but got 'StringLiteral'
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_only_regular.sol b/test/libsolidity/syntaxTests/string/string_multipart_only_regular.sol
index 6d0c29e0e..866bc1d4d 100644
--- a/test/libsolidity/syntaxTests/string/string_multipart_only_regular.sol
+++ b/test/libsolidity/syntaxTests/string/string_multipart_only_regular.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// ParserError 2314: (112-119): Expected ';' but got 'HexStringLiteral'
+// ParserError 2314: (112-119='hex"aa"'): Expected ';' but got 'HexStringLiteral'
diff --git a/test/libsolidity/syntaxTests/string/string_multipart_unicode_mixed.sol b/test/libsolidity/syntaxTests/string/string_multipart_unicode_mixed.sol
index 6264799bd..220cac737 100644
--- a/test/libsolidity/syntaxTests/string/string_multipart_unicode_mixed.sol
+++ b/test/libsolidity/syntaxTests/string/string_multipart_unicode_mixed.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// ParserError 2314: (106-113): Expected ';' but got 'HexStringLiteral'
+// ParserError 2314: (106-113='hex"aa"'): Expected ';' but got 'HexStringLiteral'
diff --git a/test/libsolidity/syntaxTests/string/string_new_line.sol b/test/libsolidity/syntaxTests/string/string_new_line.sol
index b7d28c526..a91f33075 100644
--- a/test/libsolidity/syntaxTests/string/string_new_line.sol
+++ b/test/libsolidity/syntaxTests/string/string_new_line.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// ParserError 8936: (100-112): Expected string end-quote.
+// ParserError 8936: (100-112='"This a test'): Expected string end-quote.
diff --git a/test/libsolidity/syntaxTests/string/string_terminated_by_backslash.sol b/test/libsolidity/syntaxTests/string/string_terminated_by_backslash.sol
index 715630fea..5b6d00a83 100644
--- a/test/libsolidity/syntaxTests/string/string_terminated_by_backslash.sol
+++ b/test/libsolidity/syntaxTests/string/string_terminated_by_backslash.sol
@@ -5,4 +5,4 @@ contract test {
     }
 }
 // ----
-// ParserError 8936: (100-109): Expected string end-quote.
+// ParserError 8936: (100-109='"text \";'): Expected string end-quote.
diff --git a/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol b/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol
index a204e84e5..2beb55dff 100644
--- a/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol
+++ b/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// ParserError 8936: (86-88): Invalid character in string.
+// ParserError 8936: (86-88='"ð'): Invalid character in string.
diff --git a/test/libsolidity/syntaxTests/string/string_unterminated.sol b/test/libsolidity/syntaxTests/string/string_unterminated.sol
index 9142fdea4..4ed118d6d 100644
--- a/test/libsolidity/syntaxTests/string/string_unterminated.sol
+++ b/test/libsolidity/syntaxTests/string/string_unterminated.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// ParserError 8936: (100-112): Expected string end-quote.
+// ParserError 8936: (100-112='"This a test'): Expected string end-quote.
diff --git a/test/libsolidity/syntaxTests/string/string_unterminated_no_new_line.sol b/test/libsolidity/syntaxTests/string/string_unterminated_no_new_line.sol
index 85a822b92..0cf4b386b 100644
--- a/test/libsolidity/syntaxTests/string/string_unterminated_no_new_line.sol
+++ b/test/libsolidity/syntaxTests/string/string_unterminated_no_new_line.sol
@@ -1,4 +1,4 @@
 contract test {
     function f() pure public { "abc\
 // ----
-// ParserError 8936: (47-53): Expected string end-quote.
+// ParserError 8936: (47-53='"abc\'): Expected string end-quote.
diff --git a/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_codepoint.sol b/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_codepoint.sol
index 975c5ac39..e5c255cf3 100644
--- a/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_codepoint.sol
+++ b/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_codepoint.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 6359: (86-92): Return argument type literal_string hex"c1" is not implicitly convertible to expected type (type of first return variable) string memory. Contains invalid UTF-8 sequence at position 0.
+// TypeError 6359: (86-92='"\xc1"'): Return argument type literal_string hex"c1" is not implicitly convertible to expected type (type of first return variable) string memory. Contains invalid UTF-8 sequence at position 0.
diff --git a/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_format.sol b/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_format.sol
index 6afcd94af..ec8b60a05 100644
--- a/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_format.sol
+++ b/test/libsolidity/syntaxTests/string/unicode_escape_literals_invalid_format.sol
@@ -7,4 +7,4 @@ contract test {
 
 }
 // ----
-// ParserError 8936: (162-165): Invalid escape sequence.
+// ParserError 8936: (162-165='"\u'): Invalid escape sequence.
diff --git a/test/libsolidity/syntaxTests/structs/address_member_access.sol b/test/libsolidity/syntaxTests/structs/address_member_access.sol
index 5d8c219dd..649b38395 100644
--- a/test/libsolidity/syntaxTests/structs/address_member_access.sol
+++ b/test/libsolidity/syntaxTests/structs/address_member_access.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (129-138): Member "address" not found or not visible after argument-dependent lookup in struct C.S memory.
+// TypeError 9582: (129-138='s.address'): Member "address" not found or not visible after argument-dependent lookup in struct C.S memory.
diff --git a/test/libsolidity/syntaxTests/structs/address_member_declaration.sol b/test/libsolidity/syntaxTests/structs/address_member_declaration.sol
index 575c0fe73..ac19fcfeb 100644
--- a/test/libsolidity/syntaxTests/structs/address_member_declaration.sol
+++ b/test/libsolidity/syntaxTests/structs/address_member_declaration.sol
@@ -2,4 +2,4 @@ contract C {
     struct S { uint address; }
 }
 // ----
-// ParserError 2314: (33-40): Expected identifier but got 'address'
+// ParserError 2314: (33-40='address'): Expected identifier but got 'address'
diff --git a/test/libsolidity/syntaxTests/structs/calldata_array_assign.sol b/test/libsolidity/syntaxTests/structs/calldata_array_assign.sol
index 33b10f5f5..2cab03f3e 100644
--- a/test/libsolidity/syntaxTests/structs/calldata_array_assign.sol
+++ b/test/libsolidity/syntaxTests/structs/calldata_array_assign.sol
@@ -6,4 +6,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 4156: (144-147): Calldata structs are read-only.
+// TypeError 4156: (144-147='s.a'): Calldata structs are read-only.
diff --git a/test/libsolidity/syntaxTests/structs/calldata_assign.sol b/test/libsolidity/syntaxTests/structs/calldata_assign.sol
index 798e6dd60..4ad2759ee 100644
--- a/test/libsolidity/syntaxTests/structs/calldata_assign.sol
+++ b/test/libsolidity/syntaxTests/structs/calldata_assign.sol
@@ -4,4 +4,4 @@ contract Test {
     function f(S calldata s) external { s.a = 4; }
 }
 // ----
-// TypeError 4156: (114-117): Calldata structs are read-only.
+// TypeError 4156: (114-117='s.a'): Calldata structs are read-only.
diff --git a/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol b/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol
index 9ff30c6ec..5e3be4865 100644
--- a/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol
+++ b/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol
@@ -11,4 +11,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4103: (155-167): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (155-167='S calldata b'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/structs/contract_global_struct_name_clash.sol b/test/libsolidity/syntaxTests/structs/contract_global_struct_name_clash.sol
index 7f178ed98..dc881d97b 100644
--- a/test/libsolidity/syntaxTests/structs/contract_global_struct_name_clash.sol
+++ b/test/libsolidity/syntaxTests/structs/contract_global_struct_name_clash.sol
@@ -1,4 +1,4 @@
 contract S {}
 struct S { uint256 a; }
 // ----
-// DeclarationError 2333: (14-37): Identifier already declared.
+// DeclarationError 2333: (14-37='struct S { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/structs/global_struct_contract_name_clash.sol b/test/libsolidity/syntaxTests/structs/global_struct_contract_name_clash.sol
index bf13b2db7..404e3ac02 100644
--- a/test/libsolidity/syntaxTests/structs/global_struct_contract_name_clash.sol
+++ b/test/libsolidity/syntaxTests/structs/global_struct_contract_name_clash.sol
@@ -1,4 +1,4 @@
 struct S { uint256 a; }
 contract S {}
 // ----
-// DeclarationError 2333: (24-37): Identifier already declared.
+// DeclarationError 2333: (24-37='contract S {}'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/structs/global_struct_shadowing.sol b/test/libsolidity/syntaxTests/structs/global_struct_shadowing.sol
index 53615fb42..47b3adc06 100644
--- a/test/libsolidity/syntaxTests/structs/global_struct_shadowing.sol
+++ b/test/libsolidity/syntaxTests/structs/global_struct_shadowing.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// Warning 2519: (38-61): This declaration shadows an existing declaration.
+// Warning 2519: (38-61='struct S { address x; }'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/structs/global_structs_name_clash.sol b/test/libsolidity/syntaxTests/structs/global_structs_name_clash.sol
index 1590f7ad1..08cbfd0e1 100644
--- a/test/libsolidity/syntaxTests/structs/global_structs_name_clash.sol
+++ b/test/libsolidity/syntaxTests/structs/global_structs_name_clash.sol
@@ -1,4 +1,4 @@
 struct S { uint256 a; }
 struct S { uint256 a; }
 // ----
-// DeclarationError 2333: (24-47): Identifier already declared.
+// DeclarationError 2333: (24-47='struct S { uint256 a; }'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/structs/illegal_names.sol b/test/libsolidity/syntaxTests/structs/illegal_names.sol
index 48e7d93a9..d8cf61486 100644
--- a/test/libsolidity/syntaxTests/structs/illegal_names.sol
+++ b/test/libsolidity/syntaxTests/structs/illegal_names.sol
@@ -8,8 +8,8 @@ contract C {
 	_ c;
 }
 // ----
-// DeclarationError 3726: (0-23): The name "this" is reserved.
-// DeclarationError 3726: (24-48): The name "super" is reserved.
-// DeclarationError 3726: (49-69): The name "_" is reserved.
-// Warning 2319: (0-23): This declaration shadows a builtin symbol.
-// Warning 2319: (24-48): This declaration shadows a builtin symbol.
+// DeclarationError 3726: (0-23='struct this { uint a; }'): The name "this" is reserved.
+// DeclarationError 3726: (24-48='struct super { uint b; }'): The name "super" is reserved.
+// DeclarationError 3726: (49-69='struct _ { uint c; }'): The name "_" is reserved.
+// Warning 2319: (0-23='struct this { uint a; }'): This declaration shadows a builtin symbol.
+// Warning 2319: (24-48='struct super { uint b; }'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/structs/member_type_eq_name.sol b/test/libsolidity/syntaxTests/structs/member_type_eq_name.sol
index 8871e3f82..964438118 100644
--- a/test/libsolidity/syntaxTests/structs/member_type_eq_name.sol
+++ b/test/libsolidity/syntaxTests/structs/member_type_eq_name.sol
@@ -3,4 +3,4 @@ contract C {
   function f(function(S memory) external) public {}
 }
 // ----
-// DeclarationError 7920: (25-26): Identifier not found or not unique.
+// DeclarationError 7920: (25-26='t'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/structs/member_type_eq_name_3.sol b/test/libsolidity/syntaxTests/structs/member_type_eq_name_3.sol
index cd09c1d74..069e41260 100644
--- a/test/libsolidity/syntaxTests/structs/member_type_eq_name_3.sol
+++ b/test/libsolidity/syntaxTests/structs/member_type_eq_name_3.sol
@@ -5,8 +5,8 @@ contract C {
     struct U {function (E E) external f;}
 }
 // ----
-// Warning 6162: (58-61): Naming function type parameters is deprecated.
-// Warning 6162: (108-111): Naming function type parameters is deprecated.
-// Warning 6162: (158-161): Naming function type parameters is deprecated.
-// Warning 2519: (108-111): This declaration shadows an existing declaration.
-// Warning 2519: (158-161): This declaration shadows an existing declaration.
+// Warning 6162: (58-61='E X'): Naming function type parameters is deprecated.
+// Warning 6162: (108-111='E T'): Naming function type parameters is deprecated.
+// Warning 6162: (158-161='E E'): Naming function type parameters is deprecated.
+// Warning 2519: (108-111='E T'): This declaration shadows an existing declaration.
+// Warning 2519: (158-161='E E'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/structs/member_type_func.sol b/test/libsolidity/syntaxTests/structs/member_type_func.sol
index 1200fa7af..cefedf795 100644
--- a/test/libsolidity/syntaxTests/structs/member_type_func.sol
+++ b/test/libsolidity/syntaxTests/structs/member_type_func.sol
@@ -4,4 +4,4 @@ contract C {
   function g(function(S memory) external) public {}
 }
 // ----
-// TypeError 5172: (50-51): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (50-51='f'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/structs/memory_to_calldata.sol b/test/libsolidity/syntaxTests/structs/memory_to_calldata.sol
index 56d26a27a..65eff504a 100644
--- a/test/libsolidity/syntaxTests/structs/memory_to_calldata.sol
+++ b/test/libsolidity/syntaxTests/structs/memory_to_calldata.sol
@@ -5,5 +5,5 @@ contract Test {
     function g(S calldata s) external { S memory m; s = m; }
 }
 // ----
-// TypeError 7407: (118-122): Type struct Test.S memory is not implicitly convertible to expected type struct Test.S calldata.
-// TypeError 7407: (182-183): Type struct Test.S memory is not implicitly convertible to expected type struct Test.S calldata.
+// TypeError 7407: (118-122='S(2)'): Type struct Test.S memory is not implicitly convertible to expected type struct Test.S calldata.
+// TypeError 7407: (182-183='m'): Type struct Test.S memory is not implicitly convertible to expected type struct Test.S calldata.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_contract_function_parameter.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_contract_function_parameter.sol
index 2f29d3d44..2d813d5d6 100644
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_contract_function_parameter.sol
+++ b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_contract_function_parameter.sol
@@ -9,4 +9,4 @@ contract Test {
     function f(MyStructName memory s) public {}
 }
 // ----
-// TypeError 4103: (147-168): Recursive type not allowed for public or external contract functions.
+// TypeError 4103: (147-168='MyStructName memory s'): Recursive type not allowed for public or external contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_memory_library_function_parameter.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_memory_library_function_parameter.sol
index 6739a8985..d8019308b 100644
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_memory_library_function_parameter.sol
+++ b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_as_memory_library_function_parameter.sol
@@ -10,4 +10,4 @@ library Test {
     }
 }
 // ----
-// TypeError 4103: (146-168): Recursive structs can only be passed as storage pointers to libraries, not as memory objects to contract functions.
+// TypeError 4103: (146-168='MyStructName memory _x'): Recursive structs can only be passed as storage pointers to libraries, not as memory objects to contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_forward_reference.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_forward_reference.sol
index 3e429d5b3..99c2c52b6 100644
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_forward_reference.sol
+++ b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_forward_reference.sol
@@ -7,4 +7,4 @@ contract Data {
     struct S { S[] x; }
 }
 // ----
-// TypeError 4103: (63-78): Recursive type not allowed for public or external contract functions.
+// TypeError 4103: (63-78='Data.S memory a'): Recursive type not allowed for public or external contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol
index c8708e3e0..ee1bffb6f 100644
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol
+++ b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol
@@ -6,4 +6,4 @@ library a {
     function d(b memory) public {}
 }
 // ----
-// TypeError 4103: (149-157): Recursive structs can only be passed as storage pointers to libraries, not as memory objects to contract functions.
+// TypeError 4103: (149-157='b memory'): Recursive structs can only be passed as storage pointers to libraries, not as memory objects to contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_with_internal_function_as_library_function_parameter.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_with_internal_function_as_library_function_parameter.sol
index 22f026ee8..144e3d483 100644
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_with_internal_function_as_library_function_parameter.sol
+++ b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_with_internal_function_as_library_function_parameter.sol
@@ -8,4 +8,4 @@ library Test {
     function f(MyStructName storage s) public {}
 }
 // ----
-// TypeError 4103: (142-164): Internal type is not allowed for public or external functions.
+// TypeError 4103: (142-164='MyStructName storage s'): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs.sol b/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs.sol
index 043dcd658..ea3567ae7 100644
--- a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs.sol
+++ b/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4103: (126-134): Recursive type not allowed for public or external contract functions.
+// TypeError 4103: (126-134='S memory'): Recursive type not allowed for public or external contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs2.sol b/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs2.sol
index 05a53a71b..c6ad38319 100644
--- a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs2.sol
+++ b/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs2.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4103: (129-137): Recursive type not allowed for public or external contract functions.
+// TypeError 4103: (129-137='S memory'): Recursive type not allowed for public or external contract functions.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs3.sol b/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs3.sol
index 118dc1973..4c2868aa4 100644
--- a/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs3.sol
+++ b/test/libsolidity/syntaxTests/structs/recursion/return_recursive_structs3.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4103: (154-164): Recursive type not allowed for public or external contract functions.
+// TypeError 4103: (154-164='T memory t'): Recursive type not allowed for public or external contract functions.
diff --git a/test/libsolidity/syntaxTests/super/super_in_function.sol b/test/libsolidity/syntaxTests/super/super_in_function.sol
index 5156ddd35..cc604fd6e 100644
--- a/test/libsolidity/syntaxTests/super/super_in_function.sol
+++ b/test/libsolidity/syntaxTests/super/super_in_function.sol
@@ -4,4 +4,4 @@ function f() pure {
     super;
 }
 // ----
-// DeclarationError 7576: (39-44): Undeclared identifier. "super" is not (or not yet) visible at this point.
+// DeclarationError 7576: (39-44='super'): Undeclared identifier. "super" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/super/super_in_library.sol b/test/libsolidity/syntaxTests/super/super_in_library.sol
index 299df290c..e1a899531 100644
--- a/test/libsolidity/syntaxTests/super/super_in_library.sol
+++ b/test/libsolidity/syntaxTests/super/super_in_library.sol
@@ -4,4 +4,4 @@ library L {
   }
 }
 // ----
-// DeclarationError 7576: (41-46): Undeclared identifier. "super" is not (or not yet) visible at this point.
+// DeclarationError 7576: (41-46='super'): Undeclared identifier. "super" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/tight_packing_literals.sol b/test/libsolidity/syntaxTests/tight_packing_literals.sol
index 45211452f..e23f2c738 100644
--- a/test/libsolidity/syntaxTests/tight_packing_literals.sol
+++ b/test/libsolidity/syntaxTests/tight_packing_literals.sol
@@ -5,4 +5,4 @@ contract C {
 }
 
 // ----
-// TypeError 7279: (99-100): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
+// TypeError 7279: (99-100='1'): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
diff --git a/test/libsolidity/syntaxTests/tryCatch/almost_call_options.sol b/test/libsolidity/syntaxTests/tryCatch/almost_call_options.sol
index 49ee9ad5e..81a5fcfba 100644
--- a/test/libsolidity/syntaxTests/tryCatch/almost_call_options.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/almost_call_options.sol
@@ -11,6 +11,6 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// Warning 6321: (73-77): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (79-83): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 2072: (122-134): Unused local variable.
+// Warning 6321: (73-77='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (79-83='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 2072: (122-134='gas memory x'): Unused local variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/catch_error.sol b/test/libsolidity/syntaxTests/tryCatch/catch_error.sol
index ccdfac28b..a3a453d5e 100644
--- a/test/libsolidity/syntaxTests/tryCatch/catch_error.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/catch_error.sol
@@ -10,5 +10,5 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (46-50='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (52-56='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/catch_error_named.sol b/test/libsolidity/syntaxTests/tryCatch/catch_error_named.sol
index 590c6cbba..f1cf577d9 100644
--- a/test/libsolidity/syntaxTests/tryCatch/catch_error_named.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/catch_error_named.sol
@@ -10,5 +10,5 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (46-50='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (52-56='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/catch_low_level.sol b/test/libsolidity/syntaxTests/tryCatch/catch_low_level.sol
index 68e7cc32f..ba020f92b 100644
--- a/test/libsolidity/syntaxTests/tryCatch/catch_low_level.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/catch_low_level.sol
@@ -10,5 +10,5 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (46-50='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (52-56='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/data_location_error_message.sol b/test/libsolidity/syntaxTests/tryCatch/data_location_error_message.sol
index eb8e45e8a..a373faa86 100644
--- a/test/libsolidity/syntaxTests/tryCatch/data_location_error_message.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/data_location_error_message.sol
@@ -8,4 +8,4 @@ contract Foo {
     }
 }
 // ----
-// TypeError 6651: (88-101): Data location must be "memory" for parameter in function, but none was given.
+// TypeError 6651: (88-101='string reason'): Data location must be "memory" for parameter in function, but none was given.
diff --git a/test/libsolidity/syntaxTests/tryCatch/double_panic.sol b/test/libsolidity/syntaxTests/tryCatch/double_panic.sol
index 27ce26330..4bfc19b24 100644
--- a/test/libsolidity/syntaxTests/tryCatch/double_panic.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/double_panic.sol
@@ -10,4 +10,4 @@ contract C {
 // EVMVersion: >=byzantium
 // ----
 // TypeError 1271: (72-109): Expected `catch Panic(uint ...) { ... }`.
-// TypeError 6732: (110-139): This try statement already has a "Panic" catch clause.
+// TypeError 6732: (110-139='catch Panic(uint) {         }'): This try statement already has a "Panic" catch clause.
diff --git a/test/libsolidity/syntaxTests/tryCatch/double_panic_correct.sol b/test/libsolidity/syntaxTests/tryCatch/double_panic_correct.sol
index 926e944df..d29b94bc3 100644
--- a/test/libsolidity/syntaxTests/tryCatch/double_panic_correct.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/double_panic_correct.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// TypeError 6732: (102-131): This try statement already has a "Panic" catch clause.
+// TypeError 6732: (102-131='catch Panic(uint) {         }'): This try statement already has a "Panic" catch clause.
diff --git a/test/libsolidity/syntaxTests/tryCatch/empty_catch.sol b/test/libsolidity/syntaxTests/tryCatch/empty_catch.sol
index d1ae8c52d..5bf0f75b8 100644
--- a/test/libsolidity/syntaxTests/tryCatch/empty_catch.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/empty_catch.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// ParserError 3546: (101-102): Expected type name
+// ParserError 3546: (101-102=')'): Expected type name
diff --git a/test/libsolidity/syntaxTests/tryCatch/empty_returns.sol b/test/libsolidity/syntaxTests/tryCatch/empty_returns.sol
index aea3d6bcd..b55168dc1 100644
--- a/test/libsolidity/syntaxTests/tryCatch/empty_returns.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/empty_returns.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// ParserError 3546: (69-70): Expected type name
+// ParserError 3546: (69-70=')'): Expected type name
diff --git a/test/libsolidity/syntaxTests/tryCatch/error_with_wrong_type.sol b/test/libsolidity/syntaxTests/tryCatch/error_with_wrong_type.sol
index d7c1de93a..70f512c65 100644
--- a/test/libsolidity/syntaxTests/tryCatch/error_with_wrong_type.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/error_with_wrong_type.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// TypeError 2943: (94-123): Expected `catch Error(string memory ...) { ... }`.
+// TypeError 2943: (94-123='catch Error(uint) {         }'): Expected `catch Error(string memory ...) { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_error_name.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_error_name.sol
index d777065e6..d52f87843 100644
--- a/test/libsolidity/syntaxTests/tryCatch/invalid_error_name.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/invalid_error_name.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// TypeError 3542: (93-119): Invalid catch clause name. Expected either `catch (...)`, `catch Error(...)`, or `catch Panic(...)`.
-// TypeError 3542: (120-143): Invalid catch clause name. Expected either `catch (...)`, `catch Error(...)`, or `catch Panic(...)`.
+// TypeError 3542: (93-119='catch Error2() {         }'): Invalid catch clause name. Expected either `catch (...)`, `catch Error(...)`, or `catch Panic(...)`.
+// TypeError 3542: (120-143='catch abc() {         }'): Invalid catch clause name. Expected either `catch (...)`, `catch Error(...)`, or `catch Panic(...)`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_returns.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_returns.sol
index b68ab1cb1..ad90385cc 100644
--- a/test/libsolidity/syntaxTests/tryCatch/invalid_returns.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/invalid_returns.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError 6509: (157-161): Invalid type, expected uint8 but got uint256.
-// TypeError 6509: (163-168): Invalid type, expected uint256 but got int256.
+// TypeError 6509: (157-161='uint'): Invalid type, expected uint8 but got uint256.
+// TypeError 6509: (163-168='int x'): Invalid type, expected uint256 but got int256.
diff --git a/test/libsolidity/syntaxTests/tryCatch/low_level_with_wrong_type.sol b/test/libsolidity/syntaxTests/tryCatch/low_level_with_wrong_type.sol
index 10c6d3851..895ae32a2 100644
--- a/test/libsolidity/syntaxTests/tryCatch/low_level_with_wrong_type.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/low_level_with_wrong_type.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// TypeError 6231: (94-118): Expected `catch (bytes memory ...) { ... }` or `catch { ... }`.
+// TypeError 6231: (94-118='catch (uint) {         }'): Expected `catch (bytes memory ...) { ... }` or `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/no_catch.sol b/test/libsolidity/syntaxTests/tryCatch/no_catch.sol
index 1563b227d..8490a8d23 100644
--- a/test/libsolidity/syntaxTests/tryCatch/no_catch.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/no_catch.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (97-98): Expected 'catch' but got '}'
+// ParserError 2314: (97-98='}'): Expected 'catch' but got '}'
diff --git a/test/libsolidity/syntaxTests/tryCatch/no_external_call.sol b/test/libsolidity/syntaxTests/tryCatch/no_external_call.sol
index 724ed81e8..9b2d99029 100644
--- a/test/libsolidity/syntaxTests/tryCatch/no_external_call.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/no_external_call.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2536: (72-75): Try can only be used with external function calls and contract creation calls.
+// TypeError 2536: (72-75='f()'): Try can only be used with external function calls and contract creation calls.
diff --git a/test/libsolidity/syntaxTests/tryCatch/no_returns.sol b/test/libsolidity/syntaxTests/tryCatch/no_returns.sol
index a32853053..22c1ddfa4 100644
--- a/test/libsolidity/syntaxTests/tryCatch/no_returns.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/no_returns.sol
@@ -8,5 +8,5 @@ contract C {
     }
 }
 // ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (46-50='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (52-56='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/no_special.sol b/test/libsolidity/syntaxTests/tryCatch/no_special.sol
index d760e6ee3..c81c34ac2 100644
--- a/test/libsolidity/syntaxTests/tryCatch/no_special.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/no_special.sol
@@ -12,6 +12,6 @@ contract C {
     }
 }
 // ----
-// TypeError 5347: (72-76): Try can only be used with external function calls and contract creation calls.
-// TypeError 2536: (119-128): Try can only be used with external function calls and contract creation calls.
-// TypeError 4259: (176-183): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(address) provided.
+// TypeError 5347: (72-76='this'): Try can only be used with external function calls and contract creation calls.
+// TypeError 2536: (119-128='gasleft()'): Try can only be used with external function calls and contract creation calls.
+// TypeError 4259: (176-183='address'): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(address) provided.
diff --git a/test/libsolidity/syntaxTests/tryCatch/returns.sol b/test/libsolidity/syntaxTests/tryCatch/returns.sol
index 335270b0b..f5a0d2951 100644
--- a/test/libsolidity/syntaxTests/tryCatch/returns.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/returns.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (46-50='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (52-56='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/returns_memory.sol b/test/libsolidity/syntaxTests/tryCatch/returns_memory.sol
index d575e455e..b532627c2 100644
--- a/test/libsolidity/syntaxTests/tryCatch/returns_memory.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/returns_memory.sol
@@ -10,5 +10,5 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// Warning 6321: (46-59): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (61-65): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (46-59='uint[] memory'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (61-65='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/returns_memory_anonymous.sol b/test/libsolidity/syntaxTests/tryCatch/returns_memory_anonymous.sol
index 4647e762e..229e13ef1 100644
--- a/test/libsolidity/syntaxTests/tryCatch/returns_memory_anonymous.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/returns_memory_anonymous.sol
@@ -10,5 +10,5 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// Warning 6321: (46-59): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (61-65): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (46-59='uint[] memory'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (61-65='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/two_catch_clauses.sol b/test/libsolidity/syntaxTests/tryCatch/two_catch_clauses.sol
index 7ca4376fe..fe5bcbd43 100644
--- a/test/libsolidity/syntaxTests/tryCatch/two_catch_clauses.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/two_catch_clauses.sol
@@ -13,5 +13,5 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// Warning 6321: (46-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (52-56): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (46-50='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (52-56='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tryCatch/wrong_panic.sol b/test/libsolidity/syntaxTests/tryCatch/wrong_panic.sol
index 379a2c7c5..f6d4b92d2 100644
--- a/test/libsolidity/syntaxTests/tryCatch/wrong_panic.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/wrong_panic.sol
@@ -8,4 +8,4 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// TypeError 1271: (72-97): Expected `catch Panic(uint ...) { ... }`.
+// TypeError 1271: (72-97='catch Panic() {         }'): Expected `catch Panic(uint ...) { ... }`.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol b/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
index a251b3a9b..ebcd82bd1 100644
--- a/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
+++ b/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
@@ -7,4 +7,4 @@ contract CrashContract {
        }
 }
 // ----
-// TypeError 5704: (170-177): Type is not callable
+// TypeError 5704: (170-177='1(x, x)'): Type is not callable
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/empty_tuples_lhs.sol b/test/libsolidity/syntaxTests/tupleAssignments/empty_tuples_lhs.sol
index fac7ec57a..3788ba150 100644
--- a/test/libsolidity/syntaxTests/tupleAssignments/empty_tuples_lhs.sol
+++ b/test/libsolidity/syntaxTests/tupleAssignments/empty_tuples_lhs.sol
@@ -16,14 +16,14 @@ contract C {
     }
 }
 // ----
-// TypeError 5547: (41-43): Empty tuple on the left hand side.
-// TypeError 7407: (47-48): Type int_const 2 is not implicitly convertible to expected type tuple().
-// TypeError 5547: (86-88): Empty tuple on the left hand side.
-// TypeError 5547: (173-175): Empty tuple on the left hand side.
-// TypeError 7407: (178-182): Type tuple(uint256,uint256) is not implicitly convertible to expected type tuple().
-// TypeError 5132: (166-182): Different number of arguments in return statement than in returns declaration.
-// TypeError 5547: (229-231): Empty tuple on the left hand side.
-// TypeError 5547: (401-404): Empty tuple on the left hand side.
+// TypeError 5547: (41-43='()'): Empty tuple on the left hand side.
+// TypeError 7407: (47-48='2'): Type int_const 2 is not implicitly convertible to expected type tuple().
+// TypeError 5547: (86-88='()'): Empty tuple on the left hand side.
+// TypeError 5547: (173-175='()'): Empty tuple on the left hand side.
+// TypeError 7407: (178-182='f2()'): Type tuple(uint256,uint256) is not implicitly convertible to expected type tuple().
+// TypeError 5132: (166-182='return () = f2()'): Different number of arguments in return statement than in returns declaration.
+// TypeError 5547: (229-231='()'): Empty tuple on the left hand side.
+// TypeError 5547: (401-404='( )'): Empty tuple on the left hand side.
 // TypeError 4289: (399-466): Compound assignment is not allowed for tuple types.
 // TypeError 7407: (410-466): Type bytes32 is not implicitly convertible to expected type tuple().
-// TypeError 9322: (389-396): No matching declaration found after argument-dependent lookup.
+// TypeError 9322: (389-396='require'): No matching declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/err_fill_assignment.sol b/test/libsolidity/syntaxTests/tupleAssignments/err_fill_assignment.sol
index 14b981857..b62ff533d 100644
--- a/test/libsolidity/syntaxTests/tupleAssignments/err_fill_assignment.sol
+++ b/test/libsolidity/syntaxTests/tupleAssignments/err_fill_assignment.sol
@@ -7,5 +7,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 7407: (103-106): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(uint256,).
-// TypeError 7407: (117-120): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(,bytes32).
+// TypeError 7407: (103-106='f()'): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(uint256,).
+// TypeError 7407: (117-120='f()'): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(,bytes32).
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/error_fill.sol b/test/libsolidity/syntaxTests/tupleAssignments/error_fill.sol
index 14b981857..b62ff533d 100644
--- a/test/libsolidity/syntaxTests/tupleAssignments/error_fill.sol
+++ b/test/libsolidity/syntaxTests/tupleAssignments/error_fill.sol
@@ -7,5 +7,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 7407: (103-106): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(uint256,).
-// TypeError 7407: (117-120): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(,bytes32).
+// TypeError 7407: (103-106='f()'): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(uint256,).
+// TypeError 7407: (117-120='f()'): Type tuple(uint256,uint256,bytes32) is not implicitly convertible to expected type tuple(,bytes32).
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/large_component_count.sol b/test/libsolidity/syntaxTests/tupleAssignments/large_component_count.sol
index e941a0eb1..7576a6ba3 100644
--- a/test/libsolidity/syntaxTests/tupleAssignments/large_component_count.sol
+++ b/test/libsolidity/syntaxTests/tupleAssignments/large_component_count.sol
@@ -21,6 +21,6 @@ contract C {
 	}
 }
 // ----
-// Warning 6321: (194-198): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (200-204): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6321: (206-213): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (194-198='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (200-204='uint'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (206-213='bytes32'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/tuple_in_tuple_long.sol b/test/libsolidity/syntaxTests/tupleAssignments/tuple_in_tuple_long.sol
index 1c3a62c13..76970376c 100644
--- a/test/libsolidity/syntaxTests/tupleAssignments/tuple_in_tuple_long.sol
+++ b/test/libsolidity/syntaxTests/tupleAssignments/tuple_in_tuple_long.sol
@@ -4,8 +4,8 @@ contract C {
   }
 }
 // ----
-// TypeError 4247: (53-54): Expression has to be an lvalue.
-// TypeError 7407: (67-68): Type int_const 4 is not implicitly convertible to expected type tuple(tuple(tuple(tuple(tuple(,int_const 2),),),),).
-// TypeError 6473: (44-68): Tuple component cannot be empty.
-// TypeError 6473: (43-69): Tuple component cannot be empty.
-// TypeError 6473: (42-70): Tuple component cannot be empty.
+// TypeError 4247: (53-54='2'): Expression has to be an lvalue.
+// TypeError 7407: (67-68='4'): Type int_const 4 is not implicitly convertible to expected type tuple(tuple(tuple(tuple(tuple(,int_const 2),),),),).
+// TypeError 6473: (44-68='((((((((,2),)),)),),))=4'): Tuple component cannot be empty.
+// TypeError 6473: (43-69='(((((((((,2),)),)),),))=4)'): Tuple component cannot be empty.
+// TypeError 6473: (42-70='((((((((((,2),)),)),),))=4))'): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol b/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol
index 102bbea68..06916d25b 100644
--- a/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol
+++ b/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol
@@ -6,4 +6,4 @@ contract C {
 	}
 }
 // ----
-// Warning 7238: (79-94): This assignment performs two copies to storage. Since storage copies do not first copy to a temporary location, one of them might be overwritten before the second is executed and thus may have unexpected effects. It is safer to perform the copies separately or assign to storage pointers first.
+// Warning 7238: (79-94='(x, y) = (y, x)'): This assignment performs two copies to storage. Since storage copies do not first copy to a temporary location, one of them might be overwritten before the second is executed and thus may have unexpected effects. It is safer to perform the copies separately or assign to storage pointers first.
diff --git a/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol b/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol
index f26eed18a..b7862d427 100644
--- a/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol
@@ -9,7 +9,7 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (85-108): Operator + not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
-// TypeError 2271: (122-145): Operator - not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
-// TypeError 2271: (159-182): Operator * not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
-// TypeError 2271: (196-219): Operator / not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
+// TypeError 2271: (85-108='address(0) + address(0)'): Operator + not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
+// TypeError 2271: (122-145='address(0) - address(0)'): Operator - not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
+// TypeError 2271: (159-182='address(0) * address(0)'): Operator * not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
+// TypeError 2271: (196-219='address(0) / address(0)'): Operator / not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
diff --git a/test/libsolidity/syntaxTests/types/address/address_constant_assignment.sol b/test/libsolidity/syntaxTests/types/address/address_constant_assignment.sol
index 76df63cdd..9844f53e5 100644
--- a/test/libsolidity/syntaxTests/types/address/address_constant_assignment.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_constant_assignment.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// TypeError 6520: (129-130): Cannot assign to a constant variable.
-// TypeError 6520: (153-154): Cannot assign to a constant variable.
+// TypeError 6520: (129-130='a'): Cannot assign to a constant variable.
+// TypeError 6520: (153-154='b'): Cannot assign to a constant variable.
diff --git a/test/libsolidity/syntaxTests/types/address/address_in_struct_fail.sol b/test/libsolidity/syntaxTests/types/address/address_in_struct_fail.sol
index 6d4a01d96..52a13de49 100644
--- a/test/libsolidity/syntaxTests/types/address/address_in_struct_fail.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_in_struct_fail.sol
@@ -8,4 +8,4 @@ contract A {
     }
 }
 // ----
-// TypeError 7407: (110-123): Type address is not implicitly convertible to expected type address payable.
+// TypeError 7407: (110-123='address(this)'): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/address_members_in_contract.sol b/test/libsolidity/syntaxTests/types/address/address_members_in_contract.sol
index d34882575..e825fd88f 100644
--- a/test/libsolidity/syntaxTests/types/address/address_members_in_contract.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_members_in_contract.sol
@@ -3,4 +3,4 @@ contract C {
     function g() public returns (uint) { return f().balance; }
 }
 // ----
-// TypeError 3125: (114-125): Member "balance" not found or not visible after argument-dependent lookup in contract C. Use "address(...).balance" to access this address member.
+// TypeError 3125: (114-125='f().balance'): Member "balance" not found or not visible after argument-dependent lookup in contract C. Use "address(...).balance" to access this address member.
diff --git a/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol b/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
index 812258711..c985da36e 100644
--- a/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9553: (69-70): Invalid type for argument in function call. Invalid implicit conversion from address to address payable requested.
+// TypeError 9553: (69-70='a'): Invalid type for argument in function call. Invalid implicit conversion from address to address payable requested.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_internal_overload_payable.sol b/test/libsolidity/syntaxTests/types/address/address_payable_internal_overload_payable.sol
index c07dd81f6..c368b8edc 100644
--- a/test/libsolidity/syntaxTests/types/address/address_payable_internal_overload_payable.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_payable_internal_overload_payable.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4487: (184-185): No unique declaration found after argument-dependent lookup.
+// TypeError 4487: (184-185='f'): No unique declaration found after argument-dependent lookup.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_memory_array_conversion.sol b/test/libsolidity/syntaxTests/types/address/address_payable_memory_array_conversion.sol
index cf58555da..05bad22d6 100644
--- a/test/libsolidity/syntaxTests/types/address/address_payable_memory_array_conversion.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_payable_memory_array_conversion.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (166-167): Type address[] memory is not implicitly convertible to expected type address payable[] memory.
-// TypeError 7407: (181-182): Type address payable[] memory is not implicitly convertible to expected type address[] memory.
+// TypeError 7407: (166-167='b'): Type address[] memory is not implicitly convertible to expected type address payable[] memory.
+// TypeError 7407: (181-182='a'): Type address payable[] memory is not implicitly convertible to expected type address[] memory.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion.sol b/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion.sol
index 49d92cafe..1177dc00e 100644
--- a/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (172-173): Type address payable[] storage pointer is not implicitly convertible to expected type address[] storage pointer.
+// TypeError 7407: (172-173='c'): Type address payable[] storage pointer is not implicitly convertible to expected type address[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion_fail.sol b/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion_fail.sol
index 7793040a9..6732bd0b0 100644
--- a/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion_fail.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_payable_storage_array_conversion_fail.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (172-173): Type address[] storage pointer is not implicitly convertible to expected type address payable[] storage pointer.
+// TypeError 7407: (172-173='d'): Type address[] storage pointer is not implicitly convertible to expected type address payable[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/types/address/address_to_contract_implicitly.sol b/test/libsolidity/syntaxTests/types/address/address_to_contract_implicitly.sol
index 2aa032e0e..9bbc4ee95 100644
--- a/test/libsolidity/syntaxTests/types/address/address_to_contract_implicitly.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_to_contract_implicitly.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// TypeError 9574: (46-62): Type address is not implicitly convertible to expected type contract C.
+// TypeError 9574: (46-62='C c = address(2)'): Type address is not implicitly convertible to expected type contract C.
diff --git a/test/libsolidity/syntaxTests/types/address/address_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/address_to_payable_address.sol
index e82371efd..2354dc0bc 100644
--- a/test/libsolidity/syntaxTests/types/address/address_to_payable_address.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_to_payable_address.sol
@@ -6,5 +6,5 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (80-101): Type address is not implicitly convertible to expected type address payable.
-// TypeError 7407: (115-116): Type address is not implicitly convertible to expected type address payable.
+// TypeError 9574: (80-101='address payable c = a'): Type address is not implicitly convertible to expected type address payable.
+// TypeError 7407: (115-116='b'): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/address_to_payable_address_double.sol b/test/libsolidity/syntaxTests/types/address/address_to_payable_address_double.sol
index 48645fb36..65eed69cf 100644
--- a/test/libsolidity/syntaxTests/types/address/address_to_payable_address_double.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_to_payable_address_double.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6359: (94-113): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
+// TypeError 6359: (94-113='address(address(a))'): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/address_tuple_fail.sol b/test/libsolidity/syntaxTests/types/address/address_tuple_fail.sol
index 727be3404..2b73f2d92 100644
--- a/test/libsolidity/syntaxTests/types/address/address_tuple_fail.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_tuple_fail.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (169-174): Type tuple(address,address payable) is not implicitly convertible to expected type tuple(address payable,address).
+// TypeError 7407: (169-174='(c,d)'): Type tuple(address,address payable) is not implicitly convertible to expected type tuple(address payable,address).
diff --git a/test/libsolidity/syntaxTests/types/address/address_zero_to_payable_err.sol b/test/libsolidity/syntaxTests/types/address/address_zero_to_payable_err.sol
index d72f7483f..5ae99d12f 100644
--- a/test/libsolidity/syntaxTests/types/address/address_zero_to_payable_err.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_zero_to_payable_err.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (52-82): Type address is not implicitly convertible to expected type address payable.
+// TypeError 9574: (52-82='address payable a = address(0)'): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/bytes_long_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/bytes_long_to_payable_address.sol
index c185cab80..a26371953 100644
--- a/test/libsolidity/syntaxTests/types/address/bytes_long_to_payable_address.sol
+++ b/test/libsolidity/syntaxTests/types/address/bytes_long_to_payable_address.sol
@@ -4,5 +4,5 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (94-104): Explicit type conversion not allowed from "bytes32" to "address".
-// TypeError 6359: (94-104): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
+// TypeError 9640: (94-104='address(x)'): Explicit type conversion not allowed from "bytes32" to "address".
+// TypeError 6359: (94-104='address(x)'): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/bytes_short_to_payable_address.sol b/test/libsolidity/syntaxTests/types/address/bytes_short_to_payable_address.sol
index f7f1f42cb..7fd1ffa98 100644
--- a/test/libsolidity/syntaxTests/types/address/bytes_short_to_payable_address.sol
+++ b/test/libsolidity/syntaxTests/types/address/bytes_short_to_payable_address.sol
@@ -4,5 +4,5 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (94-104): Explicit type conversion not allowed from "bytes10" to "address".
-// TypeError 6359: (94-104): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
+// TypeError 9640: (94-104='address(x)'): Explicit type conversion not allowed from "bytes10" to "address".
+// TypeError 6359: (94-104='address(x)'): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_payable_fallback_to_payable_address_implicitly.sol b/test/libsolidity/syntaxTests/types/address/contract_payable_fallback_to_payable_address_implicitly.sol
index e22db0c3a..76a14f858 100644
--- a/test/libsolidity/syntaxTests/types/address/contract_payable_fallback_to_payable_address_implicitly.sol
+++ b/test/libsolidity/syntaxTests/types/address/contract_payable_fallback_to_payable_address_implicitly.sol
@@ -8,4 +8,4 @@ contract C {
 }
 // ----
 // Warning 3628: (0-120): This contract has a payable fallback function, but no receive ether function. Consider adding a receive ether function.
-// TypeError 9574: (46-70): Type contract C is not implicitly convertible to expected type address payable.
+// TypeError 9574: (46-70='address payable a = this'): Type contract C is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_receive_to_payable_address_implicitly.sol b/test/libsolidity/syntaxTests/types/address/contract_receive_to_payable_address_implicitly.sol
index 23caa8847..b14aa24a3 100644
--- a/test/libsolidity/syntaxTests/types/address/contract_receive_to_payable_address_implicitly.sol
+++ b/test/libsolidity/syntaxTests/types/address/contract_receive_to_payable_address_implicitly.sol
@@ -7,4 +7,4 @@ contract C {
   }
 }
 // ----
-// TypeError 9574: (46-70): Type contract C is not implicitly convertible to expected type address payable.
+// TypeError 9574: (46-70='address payable a = this'): Type contract C is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_to_address_implicitly.sol b/test/libsolidity/syntaxTests/types/address/contract_to_address_implicitly.sol
index b689f7a2a..f506cdf99 100644
--- a/test/libsolidity/syntaxTests/types/address/contract_to_address_implicitly.sol
+++ b/test/libsolidity/syntaxTests/types/address/contract_to_address_implicitly.sol
@@ -5,4 +5,4 @@ contract C {
   }
 }
 // ----
-// TypeError 9574: (46-62): Type contract C is not implicitly convertible to expected type address.
+// TypeError 9574: (46-62='address a = this'): Type contract C is not implicitly convertible to expected type address.
diff --git a/test/libsolidity/syntaxTests/types/address/contract_type_to_address.sol b/test/libsolidity/syntaxTests/types/address/contract_type_to_address.sol
index 62b34a294..565161fd9 100644
--- a/test/libsolidity/syntaxTests/types/address/contract_type_to_address.sol
+++ b/test/libsolidity/syntaxTests/types/address/contract_type_to_address.sol
@@ -14,8 +14,8 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (82-92): Explicit type conversion not allowed from "type(contract C)" to "address".
-// TypeError 9640: (102-112): Explicit type conversion not allowed from "type(contract I)" to "address".
-// TypeError 9640: (166-182): Explicit type conversion not allowed from "type(contract C)" to "address".
-// TypeError 9640: (192-208): Explicit type conversion not allowed from "type(contract I)" to "address".
-// TypeError 9640: (218-234): Explicit type conversion not allowed from "type(library L)" to "address".
+// TypeError 9640: (82-92='address(C)'): Explicit type conversion not allowed from "type(contract C)" to "address".
+// TypeError 9640: (102-112='address(I)'): Explicit type conversion not allowed from "type(contract I)" to "address".
+// TypeError 9640: (166-182='address(type(C))'): Explicit type conversion not allowed from "type(contract C)" to "address".
+// TypeError 9640: (192-208='address(type(I))'): Explicit type conversion not allowed from "type(contract I)" to "address".
+// TypeError 9640: (218-234='address(type(L))'): Explicit type conversion not allowed from "type(library L)" to "address".
diff --git a/test/libsolidity/syntaxTests/types/address/conversion_error.sol b/test/libsolidity/syntaxTests/types/address/conversion_error.sol
index 99155ae47..59f32e394 100644
--- a/test/libsolidity/syntaxTests/types/address/conversion_error.sol
+++ b/test/libsolidity/syntaxTests/types/address/conversion_error.sol
@@ -10,6 +10,6 @@ contract C {
 	}
 }
 // ----
-// TypeError 9640: (77-88): Explicit type conversion not allowed from "int_const -1" to "address".
-// TypeError 6359: (160-162): Return argument type int_const -1 is not implicitly convertible to expected type (type of first return variable) address.
-// TypeError 9640: (225-240): Explicit type conversion not allowed from "int_const 1461...(41 digits omitted)...2976" to "address".
+// TypeError 9640: (77-88='address(-1)'): Explicit type conversion not allowed from "int_const -1" to "address".
+// TypeError 6359: (160-162='-1'): Return argument type int_const -1 is not implicitly convertible to expected type (type of first return variable) address.
+// TypeError 9640: (225-240='address(2**160)'): Explicit type conversion not allowed from "int_const 1461...(41 digits omitted)...2976" to "address".
diff --git a/test/libsolidity/syntaxTests/types/address/literal_to_payable_address_err.sol b/test/libsolidity/syntaxTests/types/address/literal_to_payable_address_err.sol
index d72f7483f..5ae99d12f 100644
--- a/test/libsolidity/syntaxTests/types/address/literal_to_payable_address_err.sol
+++ b/test/libsolidity/syntaxTests/types/address/literal_to_payable_address_err.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (52-82): Type address is not implicitly convertible to expected type address payable.
+// TypeError 9574: (52-82='address payable a = address(0)'): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_payable_fallback.sol b/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_payable_fallback.sol
index b0e54a4c8..6c9eac60e 100644
--- a/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_payable_fallback.sol
+++ b/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_payable_fallback.sol
@@ -8,4 +8,4 @@ contract C {
 }
 // ----
 // Warning 3628: (0-139): This contract has a payable fallback function, but no receive ether function. Consider adding a receive ether function.
-// TypeError 7398: (92-96): Explicit type conversion not allowed from non-payable "address" to "contract C", which has a payable fallback function.
+// TypeError 7398: (92-96='C(a)'): Explicit type conversion not allowed from non-payable "address" to "contract C", which has a payable fallback function.
diff --git a/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_receive.sol b/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_receive.sol
index 0f11d6bea..87ad24092 100644
--- a/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_receive.sol
+++ b/test/libsolidity/syntaxTests/types/address/nonpayable_address_to_contract_receive.sol
@@ -7,4 +7,4 @@ contract C {
   }
 }
 // ----
-// TypeError 7398: (92-96): Explicit type conversion not allowed from non-payable "address" to "contract C", which has a payable fallback function.
+// TypeError 7398: (92-96='C(a)'): Explicit type conversion not allowed from non-payable "address" to "contract C", which has a payable fallback function.
diff --git a/test/libsolidity/syntaxTests/types/address/payable_conversion_err.sol b/test/libsolidity/syntaxTests/types/address/payable_conversion_err.sol
index 28bb52e23..3035ca77a 100644
--- a/test/libsolidity/syntaxTests/types/address/payable_conversion_err.sol
+++ b/test/libsolidity/syntaxTests/types/address/payable_conversion_err.sol
@@ -13,5 +13,5 @@ contract D {
 }
 // ----
 // TypeError 9574: (47-83): Type address is not implicitly convertible to expected type address payable.
-// TypeError 9640: (164-174): Explicit type conversion not allowed from "type(contract D)" to "address".
-// TypeError 9574: (144-174): Type address is not implicitly convertible to expected type address payable.
+// TypeError 9640: (164-174='address(D)'): Explicit type conversion not allowed from "type(contract D)" to "address".
+// TypeError 9574: (144-174='address payable b = address(D)'): Type address is not implicitly convertible to expected type address payable.
diff --git a/test/libsolidity/syntaxTests/types/address/payable_conversion_strict_err.sol b/test/libsolidity/syntaxTests/types/address/payable_conversion_strict_err.sol
index b653dc7c5..d4891c9fd 100644
--- a/test/libsolidity/syntaxTests/types/address/payable_conversion_strict_err.sol
+++ b/test/libsolidity/syntaxTests/types/address/payable_conversion_strict_err.sol
@@ -12,9 +12,9 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (72-91): Explicit type conversion not allowed from "uint160" to "address payable".
-// TypeError 9640: (121-140): Explicit type conversion not allowed from "bytes20" to "address payable".
-// TypeError 9640: (170-180): Explicit type conversion not allowed from "int_const 2" to "address payable".
+// TypeError 9640: (72-91='payable(uint160(0))'): Explicit type conversion not allowed from "uint160" to "address payable".
+// TypeError 9640: (121-140='payable(bytes20(0))'): Explicit type conversion not allowed from "bytes20" to "address payable".
+// TypeError 9640: (170-180='payable(2)'): Explicit type conversion not allowed from "int_const 2" to "address payable".
 // TypeError 9640: (260-301): Explicit type conversion not allowed from "int_const 6807...(25 digits omitted)...4970" to "address payable".
-// TypeError 9640: (375-394): Explicit type conversion not allowed from "address payable" to "uint160".
-// TypeError 9640: (417-436): Explicit type conversion not allowed from "address payable" to "bytes20".
+// TypeError 9640: (375-394='uint160(payable(0))'): Explicit type conversion not allowed from "address payable" to "uint160".
+// TypeError 9640: (417-436='bytes20(payable(0))'): Explicit type conversion not allowed from "address payable" to "bytes20".
diff --git a/test/libsolidity/syntaxTests/types/address/super_to_address.sol b/test/libsolidity/syntaxTests/types/address/super_to_address.sol
index e3308081c..61edb4cad 100644
--- a/test/libsolidity/syntaxTests/types/address/super_to_address.sol
+++ b/test/libsolidity/syntaxTests/types/address/super_to_address.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (52-66): Explicit type conversion not allowed from "type(contract super C)" to "address".
+// TypeError 9640: (52-66='address(super)'): Explicit type conversion not allowed from "type(contract super C)" to "address".
diff --git a/test/libsolidity/syntaxTests/types/address/type_type_to_address.sol b/test/libsolidity/syntaxTests/types/address/type_type_to_address.sol
index 7f4666a54..9aa01b17a 100644
--- a/test/libsolidity/syntaxTests/types/address/type_type_to_address.sol
+++ b/test/libsolidity/syntaxTests/types/address/type_type_to_address.sol
@@ -28,19 +28,19 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (96-109): Explicit type conversion not allowed from "type(uint256)" to "address".
-// TypeError 9640: (119-135): Explicit type conversion not allowed from "type(bytes16)" to "address".
-// TypeError 9640: (145-158): Explicit type conversion not allowed from "type(bool)" to "address".
-// TypeError 9640: (168-184): Explicit type conversion not allowed from "type(address)" to "address".
-// TypeError 9640: (194-208): Explicit type conversion not allowed from "type(fixed128x18)" to "address".
-// TypeError 9640: (219-229): Explicit type conversion not allowed from "type(struct S storage pointer)" to "address".
-// TypeError 9640: (239-249): Explicit type conversion not allowed from "type(enum E)" to "address".
-// TypeError 9640: (260-275): Explicit type conversion not allowed from "type(uint256[] memory)" to "address".
-// TypeError 9640: (285-302): Explicit type conversion not allowed from "type(uint256[] memory[] memory)" to "address".
-// TypeError 9640: (312-328): Explicit type conversion not allowed from "type(uint256[5] memory)" to "address".
-// TypeError 9640: (338-353): Explicit type conversion not allowed from "type(string storage pointer)" to "address".
-// TypeError 9640: (363-377): Explicit type conversion not allowed from "type(bytes storage pointer)" to "address".
-// TypeError 9640: (387-399): Explicit type conversion not allowed from "type(struct S memory[] memory)" to "address".
-// TypeError 9640: (409-421): Explicit type conversion not allowed from "type(enum E[] memory)" to "address".
-// TypeError 9640: (431-452): Explicit type conversion not allowed from "tuple(type(uint256),type(uint256))" to "address".
-// TypeError 9640: (463-482): Explicit type conversion not allowed from "type(uint256)" to "address".
+// TypeError 9640: (96-109='address(uint)'): Explicit type conversion not allowed from "type(uint256)" to "address".
+// TypeError 9640: (119-135='address(bytes16)'): Explicit type conversion not allowed from "type(bytes16)" to "address".
+// TypeError 9640: (145-158='address(bool)'): Explicit type conversion not allowed from "type(bool)" to "address".
+// TypeError 9640: (168-184='address(address)'): Explicit type conversion not allowed from "type(address)" to "address".
+// TypeError 9640: (194-208='address(fixed)'): Explicit type conversion not allowed from "type(fixed128x18)" to "address".
+// TypeError 9640: (219-229='address(S)'): Explicit type conversion not allowed from "type(struct S storage pointer)" to "address".
+// TypeError 9640: (239-249='address(E)'): Explicit type conversion not allowed from "type(enum E)" to "address".
+// TypeError 9640: (260-275='address(uint[])'): Explicit type conversion not allowed from "type(uint256[] memory)" to "address".
+// TypeError 9640: (285-302='address(uint[][])'): Explicit type conversion not allowed from "type(uint256[] memory[] memory)" to "address".
+// TypeError 9640: (312-328='address(uint[5])'): Explicit type conversion not allowed from "type(uint256[5] memory)" to "address".
+// TypeError 9640: (338-353='address(string)'): Explicit type conversion not allowed from "type(string storage pointer)" to "address".
+// TypeError 9640: (363-377='address(bytes)'): Explicit type conversion not allowed from "type(bytes storage pointer)" to "address".
+// TypeError 9640: (387-399='address(S[])'): Explicit type conversion not allowed from "type(struct S memory[] memory)" to "address".
+// TypeError 9640: (409-421='address(E[])'): Explicit type conversion not allowed from "type(enum E[] memory)" to "address".
+// TypeError 9640: (431-452='address((uint, uint))'): Explicit type conversion not allowed from "tuple(type(uint256),type(uint256))" to "address".
+// TypeError 9640: (463-482='address(type(uint))'): Explicit type conversion not allowed from "type(uint256)" to "address".
diff --git a/test/libsolidity/syntaxTests/types/bool_ops.sol b/test/libsolidity/syntaxTests/types/bool_ops.sol
index 7aac8729b..56ef315de 100644
--- a/test/libsolidity/syntaxTests/types/bool_ops.sol
+++ b/test/libsolidity/syntaxTests/types/bool_ops.sol
@@ -32,22 +32,22 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (231-236): Operator > not compatible with types bool and bool
-// TypeError 2271: (250-255): Operator < not compatible with types bool and bool
-// TypeError 2271: (269-275): Operator >= not compatible with types bool and bool
-// TypeError 2271: (289-295): Operator <= not compatible with types bool and bool
-// TypeError 2271: (309-314): Operator & not compatible with types bool and bool
-// TypeError 2271: (328-333): Operator | not compatible with types bool and bool
-// TypeError 2271: (347-352): Operator ^ not compatible with types bool and bool
-// TypeError 4907: (366-368): Unary operator ~ cannot be applied to type bool
-// TypeError 4907: (382-384): Unary operator ~ cannot be applied to type bool
-// TypeError 2271: (398-403): Operator + not compatible with types bool and bool
-// TypeError 2271: (417-422): Operator - not compatible with types bool and bool
-// TypeError 4907: (436-438): Unary operator - cannot be applied to type bool
-// TypeError 4907: (452-454): Unary operator - cannot be applied to type bool
-// TypeError 2271: (468-473): Operator * not compatible with types bool and bool
-// TypeError 2271: (487-492): Operator / not compatible with types bool and bool
-// TypeError 2271: (506-512): Operator ** not compatible with types bool and bool
-// TypeError 2271: (526-531): Operator % not compatible with types bool and bool
-// TypeError 2271: (545-551): Operator << not compatible with types bool and bool
-// TypeError 2271: (565-571): Operator >> not compatible with types bool and bool
+// TypeError 2271: (231-236='a > b'): Operator > not compatible with types bool and bool
+// TypeError 2271: (250-255='a < b'): Operator < not compatible with types bool and bool
+// TypeError 2271: (269-275='a >= b'): Operator >= not compatible with types bool and bool
+// TypeError 2271: (289-295='a <= b'): Operator <= not compatible with types bool and bool
+// TypeError 2271: (309-314='a & b'): Operator & not compatible with types bool and bool
+// TypeError 2271: (328-333='a | b'): Operator | not compatible with types bool and bool
+// TypeError 2271: (347-352='a ^ b'): Operator ^ not compatible with types bool and bool
+// TypeError 4907: (366-368='~a'): Unary operator ~ cannot be applied to type bool
+// TypeError 4907: (382-384='~b'): Unary operator ~ cannot be applied to type bool
+// TypeError 2271: (398-403='a + b'): Operator + not compatible with types bool and bool
+// TypeError 2271: (417-422='a - b'): Operator - not compatible with types bool and bool
+// TypeError 4907: (436-438='-a'): Unary operator - cannot be applied to type bool
+// TypeError 4907: (452-454='-b'): Unary operator - cannot be applied to type bool
+// TypeError 2271: (468-473='a * b'): Operator * not compatible with types bool and bool
+// TypeError 2271: (487-492='a / b'): Operator / not compatible with types bool and bool
+// TypeError 2271: (506-512='a ** b'): Operator ** not compatible with types bool and bool
+// TypeError 2271: (526-531='a % b'): Operator % not compatible with types bool and bool
+// TypeError 2271: (545-551='a << b'): Operator << not compatible with types bool and bool
+// TypeError 2271: (565-571='a >> b'): Operator >> not compatible with types bool and bool
diff --git a/test/libsolidity/syntaxTests/types/byte.sol b/test/libsolidity/syntaxTests/types/byte.sol
index 3945eda04..57915dbde 100644
--- a/test/libsolidity/syntaxTests/types/byte.sol
+++ b/test/libsolidity/syntaxTests/types/byte.sol
@@ -2,4 +2,4 @@ contract C {
     byte public a;
 }
 // ----
-// ParserError 9182: (17-21): Function, variable, struct or modifier declaration expected.
+// ParserError 9182: (17-21='byte'): Function, variable, struct or modifier declaration expected.
diff --git a/test/libsolidity/syntaxTests/types/bytes0.sol b/test/libsolidity/syntaxTests/types/bytes0.sol
index 13a6c54de..f27892151 100644
--- a/test/libsolidity/syntaxTests/types/bytes0.sol
+++ b/test/libsolidity/syntaxTests/types/bytes0.sol
@@ -2,4 +2,4 @@ contract C {
   bytes0 b0 = 1;
 }
 // ----
-// DeclarationError 7920: (15-21): Identifier not found or not unique.
+// DeclarationError 7920: (15-21='bytes0'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/types/bytes1_to_uint256.sol b/test/libsolidity/syntaxTests/types/bytes1_to_uint256.sol
index 2d0a7d326..4c240aec3 100644
--- a/test/libsolidity/syntaxTests/types/bytes1_to_uint256.sol
+++ b/test/libsolidity/syntaxTests/types/bytes1_to_uint256.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (76-95): Explicit type conversion not allowed from "bytes1" to "uint256".
+// TypeError 9640: (76-95='uint256(bytes1(''))'): Explicit type conversion not allowed from "bytes1" to "uint256".
diff --git a/test/libsolidity/syntaxTests/types/bytes256.sol b/test/libsolidity/syntaxTests/types/bytes256.sol
index 4f477c4c7..e41e0e1aa 100644
--- a/test/libsolidity/syntaxTests/types/bytes256.sol
+++ b/test/libsolidity/syntaxTests/types/bytes256.sol
@@ -2,4 +2,4 @@ contract C {
   bytes256 b256 = 1;
 }
 // ----
-// DeclarationError 7920: (15-23): Identifier not found or not unique.
+// DeclarationError 7920: (15-23='bytes256'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/types/bytes32_to_uint32.sol b/test/libsolidity/syntaxTests/types/bytes32_to_uint32.sol
index 1370e0093..3db8ded2c 100644
--- a/test/libsolidity/syntaxTests/types/bytes32_to_uint32.sol
+++ b/test/libsolidity/syntaxTests/types/bytes32_to_uint32.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (75-94): Explicit type conversion not allowed from "bytes32" to "uint32".
+// TypeError 9640: (75-94='uint32(bytes32(''))'): Explicit type conversion not allowed from "bytes32" to "uint32".
diff --git a/test/libsolidity/syntaxTests/types/bytes33.sol b/test/libsolidity/syntaxTests/types/bytes33.sol
index 2ec7f530a..c0a6536a2 100644
--- a/test/libsolidity/syntaxTests/types/bytes33.sol
+++ b/test/libsolidity/syntaxTests/types/bytes33.sol
@@ -2,4 +2,4 @@ contract C {
   bytes33 b33 = 1;
 }
 // ----
-// DeclarationError 7920: (15-22): Identifier not found or not unique.
+// DeclarationError 7920: (15-22='bytes33'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/types/bytesNN_index_assign.sol b/test/libsolidity/syntaxTests/types/bytesNN_index_assign.sol
index d8de853a7..8cecccda0 100644
--- a/test/libsolidity/syntaxTests/types/bytesNN_index_assign.sol
+++ b/test/libsolidity/syntaxTests/types/bytesNN_index_assign.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4360: (71-75): Single bytes in fixed bytes arrays cannot be modified.
+// TypeError 4360: (71-75='x[0]'): Single bytes in fixed bytes arrays cannot be modified.
diff --git a/test/libsolidity/syntaxTests/types/bytesNN_to_contract.sol b/test/libsolidity/syntaxTests/types/bytesNN_to_contract.sol
index 61492eaa9..df099a5bd 100644
--- a/test/libsolidity/syntaxTests/types/bytesNN_to_contract.sol
+++ b/test/libsolidity/syntaxTests/types/bytesNN_to_contract.sol
@@ -4,4 +4,4 @@ contract C {
         }
 }
 // ----
-// TypeError 9640: (64-91): Explicit type conversion not allowed from "bytes20" to "contract C".
+// TypeError 9640: (64-91='C(bytes20(uint160(0x1234)))'): Explicit type conversion not allowed from "bytes20" to "contract C".
diff --git a/test/libsolidity/syntaxTests/types/bytesNN_with_oversized_hex_string.sol b/test/libsolidity/syntaxTests/types/bytesNN_with_oversized_hex_string.sol
index 9412a7882..55fb7bf0e 100644
--- a/test/libsolidity/syntaxTests/types/bytesNN_with_oversized_hex_string.sol
+++ b/test/libsolidity/syntaxTests/types/bytesNN_with_oversized_hex_string.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (76-95): Explicit type conversion not allowed from "literal_string hex"123456"" to "bytes2". Literal is larger than the type.
+// TypeError 9640: (76-95='bytes2(hex"123456")'): Explicit type conversion not allowed from "literal_string hex"123456"" to "bytes2". Literal is larger than the type.
diff --git a/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol b/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol
index a371cb13b..b5d5bf85e 100644
--- a/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol
+++ b/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol
@@ -4,4 +4,4 @@ contract C {
 
 }
 // ----
-// TypeError 5172: (77-78): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (77-78='x'): Name has to refer to a struct, enum or contract.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol
index 9b988bb6e..f2b8fbcb9 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol
@@ -10,5 +10,5 @@ contract B is A {
     }
 }
 // ----
-// TypeError 9574: (133-160): Type function A.f() is not implicitly convertible to expected type function () external. Special functions can not be converted to function types.
-// TypeError 9574: (170-202): Type function A.g() pure is not implicitly convertible to expected type function () pure external. Special functions can not be converted to function types.
+// TypeError 9574: (133-160='function() external f = A.f'): Type function A.f() is not implicitly convertible to expected type function () external. Special functions can not be converted to function types.
+// TypeError 9574: (170-202='function() external pure g = A.g'): Type function A.g() pure is not implicitly convertible to expected type function () pure external. Special functions can not be converted to function types.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol
index 682a7a110..4d2f72ac0 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol
@@ -10,5 +10,5 @@ contract B {
     }
 }
 // ----
-// TypeError 9574: (128-155): Type function A.f() is not implicitly convertible to expected type function () external. Special functions can not be converted to function types.
-// TypeError 9574: (165-197): Type function A.g() pure is not implicitly convertible to expected type function () pure external. Special functions can not be converted to function types.
+// TypeError 9574: (128-155='function() external f = A.f'): Type function A.f() is not implicitly convertible to expected type function () external. Special functions can not be converted to function types.
+// TypeError 9574: (165-197='function() external pure g = A.g'): Type function A.g() pure is not implicitly convertible to expected type function () pure external. Special functions can not be converted to function types.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/base_contract_invalid.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/base_contract_invalid.sol
index 893b79101..a6a7586e1 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/base_contract_invalid.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/base_contract_invalid.sol
@@ -9,5 +9,5 @@ contract C is B {
     }
 }
 // ----
-// TypeError 3419: (125-130): Cannot call function via contract type name.
-// TypeError 9582: (140-152): Member "selector" not found or not visible after argument-dependent lookup in function ().
+// TypeError 3419: (125-130='B.f()'): Cannot call function via contract type name.
+// TypeError 9582: (140-152='B.g.selector'): Member "selector" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/call_function_via_contract_name.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/call_function_via_contract_name.sol
index 7680eac5c..66249a732 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/call_function_via_contract_name.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/call_function_via_contract_name.sol
@@ -12,6 +12,6 @@ contract B {
     }
 }
 // ----
-// TypeError 3419: (160-165): Cannot call function via contract type name.
-// TypeError 3419: (175-180): Cannot call function via contract type name.
-// TypeError 3419: (190-195): Cannot call function via contract type name.
+// TypeError 3419: (160-165='A.f()'): Cannot call function via contract type name.
+// TypeError 3419: (175-180='A.g()'): Cannot call function via contract type name.
+// TypeError 3419: (190-195='A.h()'): Cannot call function via contract type name.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/call_unimplemented_base.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/call_unimplemented_base.sol
index f351bc547..abd4c4f59 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/call_unimplemented_base.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/call_unimplemented_base.sol
@@ -7,4 +7,4 @@ contract C is B {
     }
 }
 // ----
-// TypeError 7501: (118-123): Cannot call unimplemented base function.
+// TypeError 7501: (118-123='B.f()'): Cannot call unimplemented base function.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_internal.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_internal.sol
index ef785b036..b40826f21 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_internal.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_internal.sol
@@ -8,4 +8,4 @@ contract B {
     }
 }
 // ----
-// TypeError 9582: (94-97): Member "f" not found or not visible after argument-dependent lookup in type(contract A).
+// TypeError 9582: (94-97='A.f'): Member "f" not found or not visible after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_overloaded.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_overloaded.sol
index 672af71fd..464b5ddba 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_overloaded.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_overloaded.sol
@@ -9,4 +9,4 @@ contract B {
     }
 }
 // ----
-// TypeError 6675: (130-133): Member "f" not unique after argument-dependent lookup in type(contract A).
+// TypeError 6675: (130-133='A.f'): Member "f" not unique after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_private.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_private.sol
index 229d20d2e..a45d4d95f 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_private.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/function_via_contract_name_private.sol
@@ -8,4 +8,4 @@ contract B {
     }
 }
 // ----
-// TypeError 9582: (93-96): Member "f" not found or not visible after argument-dependent lookup in type(contract A).
+// TypeError 9582: (93-96='A.f'): Member "f" not found or not visible after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier.sol
index fab24ba80..a09628a19 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier.sol
@@ -7,4 +7,4 @@ contract B {
     }
 }
 // ----
-// TypeError 9582: (88-93): Member "mod" not found or not visible after argument-dependent lookup in type(contract A).
+// TypeError 9582: (88-93='A.mod'): Member "mod" not found or not visible after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier_base.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier_base.sol
index 42e8445c6..67afc626c 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier_base.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/modifier_base.sol
@@ -7,4 +7,4 @@ contract B is A {
     }
 }
 // ----
-// TypeError 9582: (93-98): Member "mod" not found or not visible after argument-dependent lookup in type(contract A).
+// TypeError 9582: (93-98='A.mod'): Member "mod" not found or not visible after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/contract_to_derived.sol b/test/libsolidity/syntaxTests/types/contract_to_derived.sol
index e45f86c42..04e8c16d3 100644
--- a/test/libsolidity/syntaxTests/types/contract_to_derived.sol
+++ b/test/libsolidity/syntaxTests/types/contract_to_derived.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// TypeError 9640: (85-95): Explicit type conversion not allowed from "contract B" to "contract A".
+// TypeError 9640: (85-95='A(new B())'): Explicit type conversion not allowed from "contract B" to "contract A".
diff --git a/test/libsolidity/syntaxTests/types/contract_to_unrelated_contract.sol b/test/libsolidity/syntaxTests/types/contract_to_unrelated_contract.sol
index cbc48df52..2b4352f89 100644
--- a/test/libsolidity/syntaxTests/types/contract_to_unrelated_contract.sol
+++ b/test/libsolidity/syntaxTests/types/contract_to_unrelated_contract.sol
@@ -6,4 +6,4 @@ contract C {
   }
 }
 // ----
-// TypeError 9640: (80-90): Explicit type conversion not allowed from "contract A" to "contract B".
+// TypeError 9640: (80-90='B(new A())'): Explicit type conversion not allowed from "contract A" to "contract B".
diff --git a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_consts_exhausted.sol b/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_consts_exhausted.sol
index 40d3ce529..f43cc6f24 100644
--- a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_consts_exhausted.sol
+++ b/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_consts_exhausted.sol
@@ -259,4 +259,4 @@ contract Main {
     A constant JX = A(address(0x00));
 }
 // ----
-// DeclarationError 7380: (6105-6123): Variable definition exhausting cyclic dependency validator.
+// DeclarationError 7380: (6105-6123='A constant JW = JX'): Variable definition exhausting cyclic dependency validator.
diff --git a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_struct_exhausted.sol b/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_struct_exhausted.sol
index 2dab25f1f..90ee6bd57 100644
--- a/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_struct_exhausted.sol
+++ b/test/libsolidity/syntaxTests/types/cyclic_dependency_check_on_struct_exhausted.sol
@@ -257,4 +257,4 @@ contract Main {
     struct JW { int i; }
 }
 // ----
-// DeclarationError 5651: (6091-6111): Struct definition exhausts cyclic dependency validator.
+// DeclarationError 5651: (6091-6111='struct JW { int i; }'): Struct definition exhausts cyclic dependency validator.
diff --git a/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_explicit.sol b/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_explicit.sol
index 920c8991b..8c2a01755 100644
--- a/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_explicit.sol
+++ b/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_explicit.sol
@@ -12,12 +12,12 @@ contract C {
    }
 }
 // ----
-// TypeError 9640: (60-69): Explicit type conversion not allowed from "int_const 1" to "bytes1".
-// TypeError 9640: (88-97): Explicit type conversion not allowed from "int_const 1" to "bytes2".
-// TypeError 9640: (116-127): Explicit type conversion not allowed from "int_const 256" to "bytes2".
-// TypeError 9640: (146-155): Explicit type conversion not allowed from "int_const 1" to "bytes3".
-// TypeError 9640: (174-187): Explicit type conversion not allowed from "int_const 65536" to "bytes3".
-// TypeError 9640: (206-215): Explicit type conversion not allowed from "int_const 1" to "bytes4".
-// TypeError 9640: (234-250): Explicit type conversion not allowed from "int_const 16777216" to "bytes4".
-// TypeError 9640: (270-280): Explicit type conversion not allowed from "int_const 1" to "bytes16".
-// TypeError 9640: (300-310): Explicit type conversion not allowed from "int_const 1" to "bytes32".
+// TypeError 9640: (60-69='bytes1(1)'): Explicit type conversion not allowed from "int_const 1" to "bytes1".
+// TypeError 9640: (88-97='bytes2(1)'): Explicit type conversion not allowed from "int_const 1" to "bytes2".
+// TypeError 9640: (116-127='bytes2(256)'): Explicit type conversion not allowed from "int_const 256" to "bytes2".
+// TypeError 9640: (146-155='bytes3(1)'): Explicit type conversion not allowed from "int_const 1" to "bytes3".
+// TypeError 9640: (174-187='bytes3(65536)'): Explicit type conversion not allowed from "int_const 65536" to "bytes3".
+// TypeError 9640: (206-215='bytes4(1)'): Explicit type conversion not allowed from "int_const 1" to "bytes4".
+// TypeError 9640: (234-250='bytes4(16777216)'): Explicit type conversion not allowed from "int_const 16777216" to "bytes4".
+// TypeError 9640: (270-280='bytes16(1)'): Explicit type conversion not allowed from "int_const 1" to "bytes16".
+// TypeError 9640: (300-310='bytes32(1)'): Explicit type conversion not allowed from "int_const 1" to "bytes32".
diff --git a/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_implicit.sol b/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_implicit.sol
index 9f7002a8d..2b70c52a8 100644
--- a/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_implicit.sol
+++ b/test/libsolidity/syntaxTests/types/decimal_literal_to_bytesNN_implicit.sol
@@ -12,12 +12,12 @@ contract C {
    }
 }
 // ----
-// TypeError 9574: (48-61): Type int_const 1 is not implicitly convertible to expected type bytes1.
-// TypeError 9574: (68-81): Type int_const 1 is not implicitly convertible to expected type bytes2.
-// TypeError 9574: (88-103): Type int_const 256 is not implicitly convertible to expected type bytes2.
-// TypeError 9574: (110-123): Type int_const 1 is not implicitly convertible to expected type bytes3.
-// TypeError 9574: (130-147): Type int_const 65536 is not implicitly convertible to expected type bytes3.
-// TypeError 9574: (154-167): Type int_const 1 is not implicitly convertible to expected type bytes4.
-// TypeError 9574: (174-194): Type int_const 16777216 is not implicitly convertible to expected type bytes4.
-// TypeError 9574: (201-215): Type int_const 1 is not implicitly convertible to expected type bytes16.
-// TypeError 9574: (222-236): Type int_const 1 is not implicitly convertible to expected type bytes32.
+// TypeError 9574: (48-61='bytes1 b1 = 1'): Type int_const 1 is not implicitly convertible to expected type bytes1.
+// TypeError 9574: (68-81='bytes2 b2 = 1'): Type int_const 1 is not implicitly convertible to expected type bytes2.
+// TypeError 9574: (88-103='bytes2 b3 = 256'): Type int_const 256 is not implicitly convertible to expected type bytes2.
+// TypeError 9574: (110-123='bytes3 b4 = 1'): Type int_const 1 is not implicitly convertible to expected type bytes3.
+// TypeError 9574: (130-147='bytes3 b5 = 65536'): Type int_const 65536 is not implicitly convertible to expected type bytes3.
+// TypeError 9574: (154-167='bytes4 b6 = 1'): Type int_const 1 is not implicitly convertible to expected type bytes4.
+// TypeError 9574: (174-194='bytes4 b7 = 16777216'): Type int_const 16777216 is not implicitly convertible to expected type bytes4.
+// TypeError 9574: (201-215='bytes16 b8 = 1'): Type int_const 1 is not implicitly convertible to expected type bytes16.
+// TypeError 9574: (222-236='bytes32 b9 = 1'): Type int_const 1 is not implicitly convertible to expected type bytes32.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_event.sol b/test/libsolidity/syntaxTests/types/empty_tuple_event.sol
index a83e6ec1e..d73a44ffc 100644
--- a/test/libsolidity/syntaxTests/types/empty_tuple_event.sol
+++ b/test/libsolidity/syntaxTests/types/empty_tuple_event.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6933: (71-75): Expected primary expression.
+// ParserError 6933: (71-75='emit'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_function.sol b/test/libsolidity/syntaxTests/types/empty_tuple_function.sol
index f60fe87a1..86e3c5c88 100644
--- a/test/libsolidity/syntaxTests/types/empty_tuple_function.sol
+++ b/test/libsolidity/syntaxTests/types/empty_tuple_function.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// TypeError 6473: (138-141): Tuple component cannot be empty.
-// TypeError 6473: (157-160): Tuple component cannot be empty.
+// TypeError 6473: (138-141='f()'): Tuple component cannot be empty.
+// TypeError 6473: (157-160='f()'): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_lvalue.sol b/test/libsolidity/syntaxTests/types/empty_tuple_lvalue.sol
index 9d2ed7b24..d7ea58f22 100644
--- a/test/libsolidity/syntaxTests/types/empty_tuple_lvalue.sol
+++ b/test/libsolidity/syntaxTests/types/empty_tuple_lvalue.sol
@@ -7,6 +7,6 @@ contract C {
     }
 }
 // ----
-// TypeError 6473: (122-125): Tuple component cannot be empty.
-// TypeError 6473: (127-130): Tuple component cannot be empty.
-// TypeError 7407: (121-131): Type tuple(tuple(),tuple()) is not implicitly convertible to expected type tuple(uint256,uint256).
+// TypeError 6473: (122-125='f()'): Tuple component cannot be empty.
+// TypeError 6473: (127-130='f()'): Tuple component cannot be empty.
+// TypeError 7407: (121-131='(f(), f())'): Type tuple(tuple(),tuple()) is not implicitly convertible to expected type tuple(uint256,uint256).
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_lvalue_array.sol b/test/libsolidity/syntaxTests/types/empty_tuple_lvalue_array.sol
index 538460c68..b75b11997 100644
--- a/test/libsolidity/syntaxTests/types/empty_tuple_lvalue_array.sol
+++ b/test/libsolidity/syntaxTests/types/empty_tuple_lvalue_array.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5604: (122-125): Array component cannot be empty.
+// TypeError 5604: (122-125='f()'): Array component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/types/encoding_fractional.sol b/test/libsolidity/syntaxTests/types/encoding_fractional.sol
index 2202e7a82..d7efa93d1 100644
--- a/test/libsolidity/syntaxTests/types/encoding_fractional.sol
+++ b/test/libsolidity/syntaxTests/types/encoding_fractional.sol
@@ -4,4 +4,4 @@ contract C {
    }
 }
 // ----
-// TypeError 6090: (92-95): Fractional numbers cannot yet be encoded.
+// TypeError 6090: (92-95='0.1'): Fractional numbers cannot yet be encoded.
diff --git a/test/libsolidity/syntaxTests/types/encoding_fractional_abiencoderv2.sol b/test/libsolidity/syntaxTests/types/encoding_fractional_abiencoderv2.sol
index 6c818fa76..a6d651ddb 100644
--- a/test/libsolidity/syntaxTests/types/encoding_fractional_abiencoderv2.sol
+++ b/test/libsolidity/syntaxTests/types/encoding_fractional_abiencoderv2.sol
@@ -5,4 +5,4 @@ contract C {
    }
 }
 // ----
-// TypeError 6090: (126-129): Fractional numbers cannot yet be encoded.
+// TypeError 6090: (126-129='0.1'): Fractional numbers cannot yet be encoded.
diff --git a/test/libsolidity/syntaxTests/types/encoding_packed_fractional.sol b/test/libsolidity/syntaxTests/types/encoding_packed_fractional.sol
index f3e2863f0..da152c172 100644
--- a/test/libsolidity/syntaxTests/types/encoding_packed_fractional.sol
+++ b/test/libsolidity/syntaxTests/types/encoding_packed_fractional.sol
@@ -4,5 +4,5 @@ contract C {
    }
 }
 // ----
-// TypeError 6090: (98-101): Fractional numbers cannot yet be encoded.
-// TypeError 7279: (103-104): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
+// TypeError 6090: (98-101='0.1'): Fractional numbers cannot yet be encoded.
+// TypeError 7279: (103-104='1'): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
diff --git a/test/libsolidity/syntaxTests/types/encoding_packed_fractional_abiencoderv2.sol b/test/libsolidity/syntaxTests/types/encoding_packed_fractional_abiencoderv2.sol
index c227caa40..1b76754a6 100644
--- a/test/libsolidity/syntaxTests/types/encoding_packed_fractional_abiencoderv2.sol
+++ b/test/libsolidity/syntaxTests/types/encoding_packed_fractional_abiencoderv2.sol
@@ -5,5 +5,5 @@ contract C {
    }
 }
 // ----
-// TypeError 6090: (132-135): Fractional numbers cannot yet be encoded.
-// TypeError 7279: (137-138): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
+// TypeError 6090: (132-135='0.1'): Fractional numbers cannot yet be encoded.
+// TypeError 7279: (137-138='1'): Cannot perform packed encoding for a literal. Please convert it to an explicit type first.
diff --git a/test/libsolidity/syntaxTests/types/function_call_fail.sol b/test/libsolidity/syntaxTests/types/function_call_fail.sol
index 7e2d0b230..84284309b 100644
--- a/test/libsolidity/syntaxTests/types/function_call_fail.sol
+++ b/test/libsolidity/syntaxTests/types/function_call_fail.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (59-63): Type is not callable
+// TypeError 5704: (59-63='4(y)'): Type is not callable
diff --git a/test/libsolidity/syntaxTests/types/function_call_fail2.sol b/test/libsolidity/syntaxTests/types/function_call_fail2.sol
index 97b751919..9b3ea2eaf 100644
--- a/test/libsolidity/syntaxTests/types/function_call_fail2.sol
+++ b/test/libsolidity/syntaxTests/types/function_call_fail2.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4247: (74-78): Expression has to be an lvalue.
+// TypeError 4247: (74-78='f(y)'): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/types/function_types/function_definition_expression.sol b/test/libsolidity/syntaxTests/types/function_types/function_definition_expression.sol
index b514e1ce1..a03f004f3 100644
--- a/test/libsolidity/syntaxTests/types/function_types/function_definition_expression.sol
+++ b/test/libsolidity/syntaxTests/types/function_types/function_definition_expression.sol
@@ -8,4 +8,4 @@ contract Apple {
     }
 }
 // ----
-// Warning 6133: (141-156): Statement has no effect.
+// Warning 6133: (141-156='Banana.transfer'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/types/function_types/function_state_mutability_fail.sol b/test/libsolidity/syntaxTests/types/function_types/function_state_mutability_fail.sol
index b393ed119..ee000acbc 100644
--- a/test/libsolidity/syntaxTests/types/function_types/function_state_mutability_fail.sol
+++ b/test/libsolidity/syntaxTests/types/function_types/function_state_mutability_fail.sol
@@ -38,14 +38,14 @@ contract Test
   }
 }
 // ----
-// TypeError 9553: (1580-1596): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) view returns (uint256) to function (uint256) pure returns (uint256) requested.
-// TypeError 9553: (1653-1672): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) pure returns (uint256) requested.
-// TypeError 9553: (1733-1752): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) view returns (uint256) requested.
-// TypeError 9553: (1813-1834): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) view external returns (uint256) to function (uint256) pure external returns (uint256) requested.
-// TypeError 9553: (1891-1915): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) payable external returns (uint256) to function (uint256) pure external returns (uint256) requested.
-// TypeError 9553: (1975-1999): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) external returns (uint256) to function (uint256) pure external returns (uint256) requested.
-// TypeError 9553: (2060-2084): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) payable external returns (uint256) to function (uint256) view external returns (uint256) requested.
-// TypeError 9553: (2144-2168): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) external returns (uint256) to function (uint256) view external returns (uint256) requested.
-// TypeError 9553: (2232-2253): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) pure external returns (uint256) to function (uint256) payable external returns (uint256) requested.
-// TypeError 9553: (2316-2337): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) view external returns (uint256) to function (uint256) payable external returns (uint256) requested.
-// TypeError 9553: (2400-2424): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) external returns (uint256) to function (uint256) payable external returns (uint256) requested.
+// TypeError 9553: (1580-1596='internalViewFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) view returns (uint256) to function (uint256) pure returns (uint256) requested.
+// TypeError 9553: (1653-1672='internalMutableFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) pure returns (uint256) requested.
+// TypeError 9553: (1733-1752='internalMutableFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) view returns (uint256) requested.
+// TypeError 9553: (1813-1834='this.externalViewFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) view external returns (uint256) to function (uint256) pure external returns (uint256) requested.
+// TypeError 9553: (1891-1915='this.externalPayableFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) payable external returns (uint256) to function (uint256) pure external returns (uint256) requested.
+// TypeError 9553: (1975-1999='this.externalMutableFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) external returns (uint256) to function (uint256) pure external returns (uint256) requested.
+// TypeError 9553: (2060-2084='this.externalPayableFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) payable external returns (uint256) to function (uint256) view external returns (uint256) requested.
+// TypeError 9553: (2144-2168='this.externalMutableFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) external returns (uint256) to function (uint256) view external returns (uint256) requested.
+// TypeError 9553: (2232-2253='this.externalPureFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) pure external returns (uint256) to function (uint256) payable external returns (uint256) requested.
+// TypeError 9553: (2316-2337='this.externalViewFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) view external returns (uint256) to function (uint256) payable external returns (uint256) requested.
+// TypeError 9553: (2400-2424='this.externalMutableFunc'): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) external returns (uint256) to function (uint256) payable external returns (uint256) requested.
diff --git a/test/libsolidity/syntaxTests/types/function_types/selector/local_variable_selector_not_pure.sol b/test/libsolidity/syntaxTests/types/function_types/selector/local_variable_selector_not_pure.sol
index aeb2f6cd8..1eb1c9e5e 100644
--- a/test/libsolidity/syntaxTests/types/function_types/selector/local_variable_selector_not_pure.sol
+++ b/test/libsolidity/syntaxTests/types/function_types/selector/local_variable_selector_not_pure.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 6321: (51-57='bytes4'): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
diff --git a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_contract_name.sol b/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_contract_name.sol
index bccc6fb76..92802e24c 100644
--- a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_contract_name.sol
+++ b/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_contract_name.sol
@@ -6,4 +6,4 @@ contract C {
     bytes4 constant s4 = A.f.selector;
 }
 // ----
-// TypeError 9582: (88-91): Member "f" not found or not visible after argument-dependent lookup in type(contract A).
+// TypeError 9582: (88-91='A.f'): Member "f" not found or not visible after argument-dependent lookup in type(contract A).
diff --git a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_not_pure.sol b/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_not_pure.sol
index 90ff1488f..c3b4bd0bf 100644
--- a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_not_pure.sol
+++ b/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_not_pure.sol
@@ -12,6 +12,6 @@ contract C is B {
     bytes4 constant s3 = this.h.selector;
 }
 // ----
-// TypeError 8349: (176-186): Initial value for constant variable has to be compile-time constant.
-// TypeError 8349: (213-225): Initial value for constant variable has to be compile-time constant.
-// TypeError 8349: (252-267): Initial value for constant variable has to be compile-time constant.
+// TypeError 8349: (176-186='h.selector'): Initial value for constant variable has to be compile-time constant.
+// TypeError 8349: (213-225='B.g.selector'): Initial value for constant variable has to be compile-time constant.
+// TypeError 8349: (252-267='this.h.selector'): Initial value for constant variable has to be compile-time constant.
diff --git a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_super.sol b/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_super.sol
index 0aab02207..14a296977 100644
--- a/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_super.sol
+++ b/test/libsolidity/syntaxTests/types/function_types/selector/state_variable_selector_super.sol
@@ -6,4 +6,4 @@ contract C is B {
     bytes4 constant s4 = super.g.selector;
 }
 // ----
-// TypeError 9582: (93-100): Member "g" not found or not visible after argument-dependent lookup in type(contract super C).
+// TypeError 9582: (93-100='super.g'): Member "g" not found or not visible after argument-dependent lookup in type(contract super C).
diff --git a/test/libsolidity/syntaxTests/types/global_struct_recursive.sol b/test/libsolidity/syntaxTests/types/global_struct_recursive.sol
index a3f6976d8..33f6ed0c9 100644
--- a/test/libsolidity/syntaxTests/types/global_struct_recursive.sol
+++ b/test/libsolidity/syntaxTests/types/global_struct_recursive.sol
@@ -5,4 +5,4 @@ contract C {
     // whatever
 }
 // ----
-// TypeError 2046: (0-19): Recursive struct definition.
+// TypeError 2046: (0-19='struct s1 { s2 x; }'): Recursive struct definition.
diff --git a/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol b/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
index 5fbfa919a..b8064fc3c 100644
--- a/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
+++ b/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
@@ -2,4 +2,4 @@ contract C {
     bytes32 b = ~hex"00ff11";
 }
 // ----
-// TypeError 4907: (29-41): Unary operator ~ cannot be applied to type literal_string hex"00ff11"
+// TypeError 4907: (29-41='~hex"00ff11"'): Unary operator ~ cannot be applied to type literal_string hex"00ff11"
diff --git a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_explicit.sol b/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_explicit.sol
index 7e10fff50..0076f3438 100644
--- a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_explicit.sol
+++ b/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_explicit.sol
@@ -16,16 +16,16 @@ contract C {
    }
 }
 // ----
-// TypeError 9640: (60-71): Explicit type conversion not allowed from "int_const 1" to "bytes1".
-// TypeError 9640: (90-103): Explicit type conversion not allowed from "int_const 256" to "bytes1".
-// TypeError 9640: (122-134): Explicit type conversion not allowed from "int_const 255" to "bytes2".
-// TypeError 9640: (153-166): Explicit type conversion not allowed from "int_const 256" to "bytes2".
-// TypeError 9640: (185-200): Explicit type conversion not allowed from "int_const 65536" to "bytes2".
-// TypeError 9640: (219-233): Explicit type conversion not allowed from "int_const 65535" to "bytes3".
-// TypeError 9640: (252-267): Explicit type conversion not allowed from "int_const 65536" to "bytes3".
-// TypeError 9640: (286-303): Explicit type conversion not allowed from "int_const 16777216" to "bytes3".
-// TypeError 9640: (322-338): Explicit type conversion not allowed from "int_const 16777215" to "bytes4".
-// TypeError 9640: (358-375): Explicit type conversion not allowed from "int_const 16777216" to "bytes4".
-// TypeError 9640: (395-414): Explicit type conversion not allowed from "int_const 4294967296" to "bytes4".
-// TypeError 9640: (435-447): Explicit type conversion not allowed from "int_const 1" to "bytes16".
-// TypeError 9640: (468-480): Explicit type conversion not allowed from "int_const 1" to "bytes32".
+// TypeError 9640: (60-71='bytes1(0x1)'): Explicit type conversion not allowed from "int_const 1" to "bytes1".
+// TypeError 9640: (90-103='bytes1(0x100)'): Explicit type conversion not allowed from "int_const 256" to "bytes1".
+// TypeError 9640: (122-134='bytes2(0xFF)'): Explicit type conversion not allowed from "int_const 255" to "bytes2".
+// TypeError 9640: (153-166='bytes2(0x100)'): Explicit type conversion not allowed from "int_const 256" to "bytes2".
+// TypeError 9640: (185-200='bytes2(0x10000)'): Explicit type conversion not allowed from "int_const 65536" to "bytes2".
+// TypeError 9640: (219-233='bytes3(0xFFFF)'): Explicit type conversion not allowed from "int_const 65535" to "bytes3".
+// TypeError 9640: (252-267='bytes3(0x10000)'): Explicit type conversion not allowed from "int_const 65536" to "bytes3".
+// TypeError 9640: (286-303='bytes3(0x1000000)'): Explicit type conversion not allowed from "int_const 16777216" to "bytes3".
+// TypeError 9640: (322-338='bytes4(0xFFFFFF)'): Explicit type conversion not allowed from "int_const 16777215" to "bytes4".
+// TypeError 9640: (358-375='bytes4(0x1000000)'): Explicit type conversion not allowed from "int_const 16777216" to "bytes4".
+// TypeError 9640: (395-414='bytes4(0x100000000)'): Explicit type conversion not allowed from "int_const 4294967296" to "bytes4".
+// TypeError 9640: (435-447='bytes16(0x1)'): Explicit type conversion not allowed from "int_const 1" to "bytes16".
+// TypeError 9640: (468-480='bytes32(0x1)'): Explicit type conversion not allowed from "int_const 1" to "bytes32".
diff --git a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_implicit.sol b/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_implicit.sol
index 6df3337f6..00461d020 100644
--- a/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_implicit.sol
+++ b/test/libsolidity/syntaxTests/types/hex_literal_to_bytesNN_different_size_implicit.sol
@@ -16,16 +16,16 @@ contract C {
    }
 }
 // ----
-// TypeError 9574: (48-63): Type int_const 1 is not implicitly convertible to expected type bytes1.
-// TypeError 9574: (70-87): Type int_const 256 is not implicitly convertible to expected type bytes1.
-// TypeError 9574: (94-110): Type int_const 255 is not implicitly convertible to expected type bytes2.
-// TypeError 9574: (117-134): Type int_const 256 is not implicitly convertible to expected type bytes2.
-// TypeError 9574: (141-160): Type int_const 65536 is not implicitly convertible to expected type bytes2.
-// TypeError 9574: (167-185): Type int_const 65535 is not implicitly convertible to expected type bytes3.
-// TypeError 9574: (192-211): Type int_const 65536 is not implicitly convertible to expected type bytes3.
-// TypeError 9574: (218-239): Type int_const 16777216 is not implicitly convertible to expected type bytes3.
-// TypeError 9574: (246-266): Type int_const 16777215 is not implicitly convertible to expected type bytes4.
-// TypeError 9574: (273-295): Type int_const 16777216 is not implicitly convertible to expected type bytes4.
-// TypeError 9574: (302-326): Type int_const 4294967296 is not implicitly convertible to expected type bytes4.
-// TypeError 9574: (333-350): Type int_const 1 is not implicitly convertible to expected type bytes16.
-// TypeError 9574: (357-374): Type int_const 1 is not implicitly convertible to expected type bytes32.
+// TypeError 9574: (48-63='bytes1 b1 = 0x1'): Type int_const 1 is not implicitly convertible to expected type bytes1.
+// TypeError 9574: (70-87='bytes1 b2 = 0x100'): Type int_const 256 is not implicitly convertible to expected type bytes1.
+// TypeError 9574: (94-110='bytes2 b3 = 0xFF'): Type int_const 255 is not implicitly convertible to expected type bytes2.
+// TypeError 9574: (117-134='bytes2 b4 = 0x100'): Type int_const 256 is not implicitly convertible to expected type bytes2.
+// TypeError 9574: (141-160='bytes2 b5 = 0x10000'): Type int_const 65536 is not implicitly convertible to expected type bytes2.
+// TypeError 9574: (167-185='bytes3 b6 = 0xFFFF'): Type int_const 65535 is not implicitly convertible to expected type bytes3.
+// TypeError 9574: (192-211='bytes3 b7 = 0x10000'): Type int_const 65536 is not implicitly convertible to expected type bytes3.
+// TypeError 9574: (218-239='bytes3 b8 = 0x1000000'): Type int_const 16777216 is not implicitly convertible to expected type bytes3.
+// TypeError 9574: (246-266='bytes4 b9 = 0xFFFFFF'): Type int_const 16777215 is not implicitly convertible to expected type bytes4.
+// TypeError 9574: (273-295='bytes4 b10 = 0x1000000'): Type int_const 16777216 is not implicitly convertible to expected type bytes4.
+// TypeError 9574: (302-326='bytes4 b11 = 0x100000000'): Type int_const 4294967296 is not implicitly convertible to expected type bytes4.
+// TypeError 9574: (333-350='bytes16 b12 = 0x1'): Type int_const 1 is not implicitly convertible to expected type bytes16.
+// TypeError 9574: (357-374='bytes32 b13 = 0x1'): Type int_const 1 is not implicitly convertible to expected type bytes32.
diff --git a/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_explicit.sol b/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_explicit.sol
index 18b628cb6..a8c81c438 100644
--- a/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_explicit.sol
+++ b/test/libsolidity/syntaxTests/types/hex_string_to_bytesNN_different_size_explicit.sol
@@ -14,7 +14,7 @@ contract C {
    }
 }
 // ----
-// TypeError 9640: (92-109): Explicit type conversion not allowed from "literal_string hex"1234"" to "bytes1". Literal is larger than the type.
-// TypeError 9640: (198-217): Explicit type conversion not allowed from "literal_string hex"123456"" to "bytes2". Literal is larger than the type.
-// TypeError 9640: (310-331): Explicit type conversion not allowed from "literal_string hex"12345678"" to "bytes3". Literal is larger than the type.
-// TypeError 9640: (430-453): Explicit type conversion not allowed from "literal_string hex"1234567890"" to "bytes4". Literal is larger than the type.
+// TypeError 9640: (92-109='bytes1(hex"1234")'): Explicit type conversion not allowed from "literal_string hex"1234"" to "bytes1". Literal is larger than the type.
+// TypeError 9640: (198-217='bytes2(hex"123456")'): Explicit type conversion not allowed from "literal_string hex"123456"" to "bytes2". Literal is larger than the type.
+// TypeError 9640: (310-331='bytes3(hex"12345678")'): Explicit type conversion not allowed from "literal_string hex"12345678"" to "bytes3". Literal is larger than the type.
+// TypeError 9640: (430-453='bytes4(hex"1234567890")'): Explicit type conversion not allowed from "literal_string hex"1234567890"" to "bytes4". Literal is larger than the type.
diff --git a/test/libsolidity/syntaxTests/types/integer_implicit_err.sol b/test/libsolidity/syntaxTests/types/integer_implicit_err.sol
index 5b99005c4..76f618aa4 100644
--- a/test/libsolidity/syntaxTests/types/integer_implicit_err.sol
+++ b/test/libsolidity/syntaxTests/types/integer_implicit_err.sol
@@ -9,5 +9,5 @@ contract C
     }
 }
 // ----
-// TypeError 9574: (74-85): Type uint16 is not implicitly convertible to expected type int32.
-// TypeError 9574: (120-130): Type uint256 is not implicitly convertible to expected type int8.
+// TypeError 9574: (74-85='int32 b = a'): Type uint16 is not implicitly convertible to expected type int32.
+// TypeError 9574: (120-130='int8 d = c'): Type uint256 is not implicitly convertible to expected type int8.
diff --git a/test/libsolidity/syntaxTests/types/library_function_selector_internal.sol b/test/libsolidity/syntaxTests/types/library_function_selector_internal.sol
index 96ed05854..4c44cb126 100644
--- a/test/libsolidity/syntaxTests/types/library_function_selector_internal.sol
+++ b/test/libsolidity/syntaxTests/types/library_function_selector_internal.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (126-138): Member "selector" not found or not visible after argument-dependent lookup in function (uint256).
+// TypeError 9582: (126-138='L.f.selector'): Member "selector" not found or not visible after argument-dependent lookup in function (uint256).
diff --git a/test/libsolidity/syntaxTests/types/library_function_selector_private_inside.sol b/test/libsolidity/syntaxTests/types/library_function_selector_private_inside.sol
index 36d43f0fa..0febd4ba4 100644
--- a/test/libsolidity/syntaxTests/types/library_function_selector_private_inside.sol
+++ b/test/libsolidity/syntaxTests/types/library_function_selector_private_inside.sol
@@ -5,4 +5,4 @@ library L {
     }
 }
 // ----
-// TypeError 9582: (113-123): Member "selector" not found or not visible after argument-dependent lookup in function (uint256).
+// TypeError 9582: (113-123='f.selector'): Member "selector" not found or not visible after argument-dependent lookup in function (uint256).
diff --git a/test/libsolidity/syntaxTests/types/library_function_selector_private_outside.sol b/test/libsolidity/syntaxTests/types/library_function_selector_private_outside.sol
index 000cfec15..5f3f73507 100644
--- a/test/libsolidity/syntaxTests/types/library_function_selector_private_outside.sol
+++ b/test/libsolidity/syntaxTests/types/library_function_selector_private_outside.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (125-128): Member "f" not found or not visible after argument-dependent lookup in type(library L).
+// TypeError 9582: (125-128='L.f'): Member "f" not found or not visible after argument-dependent lookup in type(library L).
diff --git a/test/libsolidity/syntaxTests/types/library_to_address_payable.sol b/test/libsolidity/syntaxTests/types/library_to_address_payable.sol
index 50950b27e..8af4d8018 100644
--- a/test/libsolidity/syntaxTests/types/library_to_address_payable.sol
+++ b/test/libsolidity/syntaxTests/types/library_to_address_payable.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6359: (99-109): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
+// TypeError 6359: (99-109='address(L)'): Return argument type address is not implicitly convertible to expected type (type of first return variable) address payable.
diff --git a/test/libsolidity/syntaxTests/types/mapping/access_index_omitted.sol b/test/libsolidity/syntaxTests/types/mapping/access_index_omitted.sol
index 5f2d4330d..f34744f36 100644
--- a/test/libsolidity/syntaxTests/types/mapping/access_index_omitted.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/access_index_omitted.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 1267: (76-79): Index expression cannot be omitted.
+// TypeError 1267: (76-79='m[]'): Index expression cannot be omitted.
diff --git a/test/libsolidity/syntaxTests/types/mapping/argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/argument_external.sol
index 4b391e72b..02d88153b 100644
--- a/test/libsolidity/syntaxTests/types/mapping/argument_external.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/argument_external.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (28-57): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
+// TypeError 6651: (28-57='mapping(uint => uint) storage'): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/argument_public.sol b/test/libsolidity/syntaxTests/types/mapping/argument_public.sol
index ce7635e31..1875e316f 100644
--- a/test/libsolidity/syntaxTests/types/mapping/argument_public.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/argument_public.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (28-57): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
+// TypeError 6651: (28-57='mapping(uint => uint) storage'): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol
index 91900619e..470ab3289 100644
--- a/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/array_argument_external.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (28-59): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
+// TypeError 6651: (28-59='mapping(uint => uint)[] storage'): Data location must be "memory" or "calldata" for parameter in external function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol b/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol
index 4316457b0..1ae7ad5ec 100644
--- a/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/array_argument_public.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (28-59): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
+// TypeError 6651: (28-59='mapping(uint => uint)[] storage'): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/assignment_local_err.sol b/test/libsolidity/syntaxTests/types/mapping/assignment_local_err.sol
index 1d75c53b9..cdaeabf6d 100644
--- a/test/libsolidity/syntaxTests/types/mapping/assignment_local_err.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/assignment_local_err.sol
@@ -7,4 +7,4 @@ contract D {
     }
 }
 // ----
-// TypeError 9214: (160-161): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (160-161='b'): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/types/mapping/assignment_map.sol b/test/libsolidity/syntaxTests/types/mapping/assignment_map.sol
index fda9abf3d..c1af8d6ae 100644
--- a/test/libsolidity/syntaxTests/types/mapping/assignment_map.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/assignment_map.sol
@@ -30,8 +30,8 @@ contract H {
 }
 // ----
 // TypeError 6280: (17-67): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 6280: (120-148): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (263-264): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 6280: (312-340): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 6280: (407-414): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 6280: (417-424): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 6280: (120-148='mapping (uint => uint) b = a'): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (263-264='a'): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 6280: (312-340='mapping (uint => uint) b = x'): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 6280: (407-414='S y = x'): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 6280: (417-424='S z = z'): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/types/mapping/assignment_state_variable.sol b/test/libsolidity/syntaxTests/types/mapping/assignment_state_variable.sol
index bcf0c7e7b..7d089440a 100644
--- a/test/libsolidity/syntaxTests/types/mapping/assignment_state_variable.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/assignment_state_variable.sol
@@ -8,7 +8,7 @@ contract test {
     }
 }
 // ----
-// TypeError 9214: (126-129): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (144-147): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (163-166): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (168-171): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (126-129='map'): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (144-147='map'): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (163-166='map'): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (168-171='map'): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/types/mapping/assignment_struct.sol b/test/libsolidity/syntaxTests/types/mapping/assignment_struct.sol
index c1051f25a..0e5aca7cb 100644
--- a/test/libsolidity/syntaxTests/types/mapping/assignment_struct.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/assignment_struct.sol
@@ -11,7 +11,7 @@ contract test {
     }
 }
 // ----
-// TypeError 9214: (172-180): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (195-203): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (219-227): Types in storage containing (nested) mappings cannot be assigned to.
-// TypeError 9214: (229-237): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (172-180='data.map'): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (195-203='data.map'): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (219-227='data.map'): Types in storage containing (nested) mappings cannot be assigned to.
+// TypeError 9214: (229-237='data.map'): Types in storage containing (nested) mappings cannot be assigned to.
diff --git a/test/libsolidity/syntaxTests/types/mapping/contract_mapping_invalid.sol b/test/libsolidity/syntaxTests/types/mapping/contract_mapping_invalid.sol
index 10e127f4e..866860209 100644
--- a/test/libsolidity/syntaxTests/types/mapping/contract_mapping_invalid.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/contract_mapping_invalid.sol
@@ -8,6 +8,6 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (189-190): Type contract J is not implicitly convertible to expected type contract I.
-// TypeError 7407: (195-196): Type contract I is not implicitly convertible to expected type contract J.
-// TypeError 7407: (201-202): Type address is not implicitly convertible to expected type contract I.
+// TypeError 7407: (189-190='y'): Type contract J is not implicitly convertible to expected type contract I.
+// TypeError 7407: (195-196='x'): Type contract I is not implicitly convertible to expected type contract J.
+// TypeError 7407: (201-202='z'): Type address is not implicitly convertible to expected type contract I.
diff --git a/test/libsolidity/syntaxTests/types/mapping/contract_storage_parameter_with_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/contract_storage_parameter_with_mapping.sol
index 5e33008ba..ff678f492 100644
--- a/test/libsolidity/syntaxTests/types/mapping/contract_storage_parameter_with_mapping.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/contract_storage_parameter_with_mapping.sol
@@ -3,4 +3,4 @@ contract C {
     function f(S storage s) public {}
 }
 // ----
-// TypeError 6651: (69-80): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
+// TypeError 6651: (69-80='S storage s'): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/enum_mapping_invalid.sol b/test/libsolidity/syntaxTests/types/mapping/enum_mapping_invalid.sol
index 9b0815bf0..794d91d99 100644
--- a/test/libsolidity/syntaxTests/types/mapping/enum_mapping_invalid.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/enum_mapping_invalid.sol
@@ -6,5 +6,5 @@ contract C {
     }
 }
 // ----
-// TypeError 7407: (146-147): Type uint256 is not implicitly convertible to expected type enum E.
-// TypeError 7407: (152-153): Type uint8 is not implicitly convertible to expected type enum E.
+// TypeError 7407: (146-147='a'): Type uint256 is not implicitly convertible to expected type enum E.
+// TypeError 7407: (152-153='b'): Type uint8 is not implicitly convertible to expected type enum E.
diff --git a/test/libsolidity/syntaxTests/types/mapping/error_parameter.sol b/test/libsolidity/syntaxTests/types/mapping/error_parameter.sol
index d836e7bf2..225e090c7 100644
--- a/test/libsolidity/syntaxTests/types/mapping/error_parameter.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/error_parameter.sol
@@ -1,3 +1,3 @@
 error E (mapping (uint => uint));
 // ----
-// TypeError 3448: (9-31): Type containing a (nested) mapping is not allowed as error parameter type.
+// TypeError 3448: (9-31='mapping (uint => uint)'): Type containing a (nested) mapping is not allowed as error parameter type.
diff --git a/test/libsolidity/syntaxTests/types/mapping/event_parameter.sol b/test/libsolidity/syntaxTests/types/mapping/event_parameter.sol
index c21d1b8e3..9317e04a4 100644
--- a/test/libsolidity/syntaxTests/types/mapping/event_parameter.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/event_parameter.sol
@@ -2,4 +2,4 @@ contract C {
     event E (mapping (uint => uint) [2]);
 }
 // ----
-// TypeError 3448: (26-52): Type containing a (nested) mapping is not allowed as event parameter type.
+// TypeError 3448: (26-52='mapping (uint => uint) [2]'): Type containing a (nested) mapping is not allowed as event parameter type.
diff --git a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol b/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol
index 368aaaf0c..98005a8f4 100644
--- a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/function_type_argument_external.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (37-64): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
+// TypeError 6651: (37-64='mapping(uint=>uint) storage'): Data location must be "memory" or "calldata" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol b/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol
index 7e00f15e7..e8bbd0703 100644
--- a/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/function_type_return_external.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (57-84): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
+// TypeError 6651: (57-84='mapping(uint=>uint) storage'): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/int_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/int_mapping.sol
index c041271e1..ca4b28728 100644
--- a/test/libsolidity/syntaxTests/types/mapping/int_mapping.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/int_mapping.sol
@@ -2,4 +2,4 @@ library L {
   function f(mapping(uint=>uint) memory) public {}
 }
 // ----
-// TypeError 4061: (25-51): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (25-51='mapping(uint=>uint) memory'): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/library_mapping.sol
index 1456565db..b5d155bcb 100644
--- a/test/libsolidity/syntaxTests/types/mapping/library_mapping.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/library_mapping.sol
@@ -5,5 +5,5 @@ contract C
   mapping(L => bool) i;
 }
 // ----
-// TypeError 1130: (44-45): Invalid use of a library name.
-// TypeError 1130: (60-61): Invalid use of a library name.
+// TypeError 1130: (44-45='L'): Invalid use of a library name.
+// TypeError 1130: (60-61='L'): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol
index 5eb22d833..728ed915a 100644
--- a/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol
@@ -4,4 +4,4 @@ library L {
     function f(S memory a) external pure returns (S memory) {}
 }
 // ----
-// TypeError 4061: (103-113): Type struct L.S is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (103-113='S memory a'): Type struct L.S is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol
index f959394d1..3be908f64 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol
@@ -2,4 +2,4 @@ contract c {
     function f1(mapping(uint => uint)[] calldata) pure external {}
 }
 // ----
-// TypeError 4103: (29-61): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (29-61='mapping(uint => uint)[] calldata'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol
index 976dacee9..be025bb03 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_external.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (53-84): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
+// TypeError 6651: (53-84='mapping(uint=>uint)[] storage m'): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol
index c6e94c542..0e379312b 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_array_return_public.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (51-82): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
+// TypeError 6651: (51-82='mapping(uint=>uint)[] storage m'): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_calldata.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_calldata.sol
index 86f971d38..2c09f31c0 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_calldata.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_calldata.sol
@@ -6,4 +6,4 @@ contract c {
     }
 }
 // ----
-// TypeError 4061: (81-113): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (81-113='mapping(uint => uint) calldata x'): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_default.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_default.sol
index 6874deb88..14cf43070 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_default.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_default.sol
@@ -6,4 +6,4 @@ contract c {
     }
 }
 // ----
-// TypeError 6651: (81-104): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
+// TypeError 6651: (81-104='mapping(uint => uint) x'): Data location must be "storage", "memory" or "calldata" for variable, but none was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol
index 1281e4b51..3b6c73daf 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol
@@ -2,4 +2,4 @@ contract c {
     function f1(mapping(uint => uint) calldata) pure external returns (mapping(uint => uint) memory) {}
 }
 // ----
-// TypeError 4103: (29-59): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (29-59='mapping(uint => uint) calldata'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_internal.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_internal.sol
index 95ca53279..0781fd67a 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_internal.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_internal.sol
@@ -3,4 +3,4 @@ contract c {
     function f5(mapping(uint => uint) memory) pure internal {}
 }
 // ----
-// TypeError 4061: (93-121): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (93-121='mapping(uint => uint) memory'): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol
index 667c0b101..e82ad0d1c 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol
@@ -2,4 +2,4 @@ contract c {
     function f3(mapping(uint => uint) memory) view public {}
 }
 // ----
-// TypeError 4103: (29-57): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (29-57='mapping(uint => uint) memory'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_memory.sol
index f31c79315..837db606d 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_memory.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_memory.sol
@@ -6,4 +6,4 @@ contract c {
     }
 }
 // ----
-// TypeError 4061: (81-111): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (81-111='mapping(uint => uint) memory x'): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol
index 8b780ea8d..4363175d7 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol
@@ -8,4 +8,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4103: (121-133): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (121-133='S calldata b'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol
index e09e52ae3..f6cff2a2f 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_return_external.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (53-82): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
+// TypeError 6651: (53-82='mapping(uint=>uint) storage m'): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol
index df3f1c993..abecce82c 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_return_public.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6651: (51-80): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
+// TypeError 6651: (51-80='mapping(uint=>uint) storage m'): Data location must be "memory" or "calldata" for return parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol
index 6594401c6..e07761b34 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol
@@ -3,4 +3,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4103: (51-79): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (51-79='mapping(uint=>uint) memory m'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol
index 399f7c6ae..58a7e98da 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol
@@ -4,4 +4,4 @@ contract C {
     function f(S memory) public {}
 }
 // ----
-// TypeError 4103: (104-112): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (104-112='S memory'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol
index 49cf31487..2a1a8cdb1 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol
@@ -6,4 +6,4 @@ contract C {
     function f(U memory) public {}
 }
 // ----
-// TypeError 4103: (148-156): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
+// TypeError 4103: (148-156='U memory'): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
diff --git a/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol b/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol
index c6f8f48f3..d75e88aa5 100644
--- a/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol
@@ -17,4 +17,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError 4061: (143-153): Type struct Test.S is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (143-153='S memory s'): Type struct Test.S is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol b/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol
index f583b4314..96fdcf792 100644
--- a/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol
@@ -12,4 +12,4 @@ contract Test {
 }
 
 // ----
-// TypeError 4061: (172-182): Type struct Test.S is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (172-182='S memory x'): Type struct Test.S is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/user_defined_types_mapping_memory.sol b/test/libsolidity/syntaxTests/types/mapping/user_defined_types_mapping_memory.sol
index 51b3c0388..fd492164e 100644
--- a/test/libsolidity/syntaxTests/types/mapping/user_defined_types_mapping_memory.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/user_defined_types_mapping_memory.sol
@@ -3,4 +3,4 @@ library L {
   function f(mapping(T=>T) memory) public {}
 }
 // ----
-// TypeError 4061: (41-61): Type mapping(T => T) is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (41-61='mapping(T=>T) memory'): Type mapping(T => T) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/no_singleton_tuple.sol b/test/libsolidity/syntaxTests/types/no_singleton_tuple.sol
index 18e086a2e..241829522 100644
--- a/test/libsolidity/syntaxTests/types/no_singleton_tuple.sol
+++ b/test/libsolidity/syntaxTests/types/no_singleton_tuple.sol
@@ -5,4 +5,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 8381: (60-70): Tuple component cannot be empty.
+// TypeError 8381: (60-70='(uint(1),)'): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_array_index_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_array_index_limit.sol
index f41eb8b7a..6807a4378 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_array_index_limit.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_array_index_limit.sol
@@ -2,4 +2,4 @@ contract c {
     uint[2**253] data;
 }
 // ----
-// Warning 7325: (17-29): Type uint256[14474011154664524427946373126085988481658748083205070504932198000989141204992] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
+// Warning 7325: (17-29='uint[2**253]'): Type uint256[14474011154664524427946373126085988481658748083205070504932198000989141204992] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
index 9c59b015c..4e2bff73b 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
@@ -7,7 +7,7 @@ contract c {
     }
 }
 // ----
-// TypeError 7407: (71-80): Type int_const 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (133-142): Operator << not compatible with types int_const 1 and int_const 4096
-// TypeError 2271: (169-182): Operator << not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 2
-// TypeError 7407: (169-182): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 7407: (71-80='1 << 4095'): Type int_const 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 2271: (133-142='1 << 4096'): Operator << not compatible with types int_const 1 and int_const 4096
+// TypeError 2271: (169-182='(1E1233) << 2'): Operator << not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 2
+// TypeError 7407: (169-182='(1E1233) << 2'): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol
index 388e9d398..259e5ec51 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol
@@ -5,5 +5,5 @@ contract c {
     }
 }
 // ----
-// TypeError 2271: (71-92): Operator / not compatible with types rational_const 1 / 5221...(1225 digits omitted)...5168 and int_const 5221...(1225 digits omitted)...5168. Precision of rational constants is limited to 4096 bits.
-// TypeError 2326: (71-92): Type rational_const 1 / 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Try converting to type ufixed8x80 or use an explicit conversion.
+// TypeError 2271: (71-92='1/(2<<4094)/(2<<4094)'): Operator / not compatible with types rational_const 1 / 5221...(1225 digits omitted)...5168 and int_const 5221...(1225 digits omitted)...5168. Precision of rational constants is limited to 4096 bits.
+// TypeError 2326: (71-92='1/(2<<4094)/(2<<4094)'): Type rational_const 1 / 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Try converting to type ufixed8x80 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol b/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
index 2d7fbdfad..11faaca6e 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
@@ -21,27 +21,27 @@ contract c {
 // ----
 // TypeError 2271: (71-112): Operator ** not compatible with types int_const 1797...(301 digits omitted)...7216 and int_const 4
 // TypeError 7407: (71-112): Type int_const 1797...(301 digits omitted)...7216 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (135-151): Operator ** not compatible with types int_const 4 and int_const 1157...(70 digits omitted)...9936
+// TypeError 2271: (135-151='4 ** 2 ** 4 ** 4'): Operator ** not compatible with types int_const 4 and int_const 1157...(70 digits omitted)...9936
 // TypeError 7407: (126-169): Type int_const 1340...(147 digits omitted)...4096 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (201-217): Operator ** not compatible with types int_const 4 and int_const 1340...(147 digits omitted)...4096
+// TypeError 2271: (201-217='4 ** 4 ** 4 ** 4'): Operator ** not compatible with types int_const 4 and int_const 1340...(147 digits omitted)...4096
 // TypeError 2271: (183-219): Operator ** not compatible with types int_const 4 and int_const -115...(71 digits omitted)...9936
-// TypeError 2271: (233-244): Operator ** not compatible with types int_const 2 and int_const 1000...(1226 digits omitted)...0000
-// TypeError 2271: (258-270): Operator ** not compatible with types int_const -2 and int_const 1000...(1226 digits omitted)...0000
-// TypeError 2271: (284-296): Operator ** not compatible with types int_const 2 and int_const -100...(1227 digits omitted)...0000
-// TypeError 2271: (310-323): Operator ** not compatible with types int_const -2 and int_const -100...(1227 digits omitted)...0000
-// TypeError 2271: (337-348): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 2
-// TypeError 7407: (337-348): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (362-374): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const 2
-// TypeError 7407: (362-374): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (388-400): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const -2
-// TypeError 7407: (388-400): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (414-427): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const -2
-// TypeError 7407: (414-427): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (441-457): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000
-// TypeError 7407: (441-457): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (471-488): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000
-// TypeError 7407: (471-488): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (502-519): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000
-// TypeError 7407: (502-519): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (533-551): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000
-// TypeError 7407: (533-551): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 2271: (233-244='2 ** 1E1233'): Operator ** not compatible with types int_const 2 and int_const 1000...(1226 digits omitted)...0000
+// TypeError 2271: (258-270='-2 ** 1E1233'): Operator ** not compatible with types int_const -2 and int_const 1000...(1226 digits omitted)...0000
+// TypeError 2271: (284-296='2 ** -1E1233'): Operator ** not compatible with types int_const 2 and int_const -100...(1227 digits omitted)...0000
+// TypeError 2271: (310-323='-2 ** -1E1233'): Operator ** not compatible with types int_const -2 and int_const -100...(1227 digits omitted)...0000
+// TypeError 2271: (337-348='1E1233 ** 2'): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 2
+// TypeError 7407: (337-348='1E1233 ** 2'): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 2271: (362-374='-1E1233 ** 2'): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const 2
+// TypeError 7407: (362-374='-1E1233 ** 2'): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 2271: (388-400='1E1233 ** -2'): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const -2
+// TypeError 7407: (388-400='1E1233 ** -2'): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 2271: (414-427='-1E1233 ** -2'): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const -2
+// TypeError 7407: (414-427='-1E1233 ** -2'): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 2271: (441-457='1E1233 ** 1E1233'): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000
+// TypeError 7407: (441-457='1E1233 ** 1E1233'): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 2271: (471-488='1E1233 ** -1E1233'): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000
+// TypeError 7407: (471-488='1E1233 ** -1E1233'): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 2271: (502-519='-1E1233 ** 1E1233'): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000
+// TypeError 7407: (502-519='-1E1233 ** 1E1233'): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 2271: (533-551='-1E1233 ** -1E1233'): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000
+// TypeError 7407: (533-551='-1E1233 ** -1E1233'): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_literal_limit_1.sol b/test/libsolidity/syntaxTests/types/rational_number_literal_limit_1.sol
index 7ef2ff829..ce97d80f7 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_literal_limit_1.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_literal_limit_1.sol
@@ -6,4 +6,4 @@ contract c {
     }
 }
 // ----
-// TypeError 2826: (128-134): Invalid literal value.
+// TypeError 2826: (128-134='1e1234'): Invalid literal value.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol
index a02578453..36a778bd7 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol
@@ -5,5 +5,5 @@ contract c {
     }
 }
 // ----
-// TypeError 2271: (71-90): Operator * not compatible with types int_const 5221...(1225 digits omitted)...5168 and int_const 5221...(1225 digits omitted)...5168. Precision of rational constants is limited to 4096 bits.
-// TypeError 7407: (71-90): Type int_const 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
+// TypeError 2271: (71-90='(1<<4095)*(1<<4095)'): Operator * not compatible with types int_const 5221...(1225 digits omitted)...5168 and int_const 5221...(1225 digits omitted)...5168. Precision of rational constants is limited to 4096 bits.
+// TypeError 7407: (71-90='(1<<4095)*(1<<4095)'): Type int_const 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_signed_to_unsigned.sol b/test/libsolidity/syntaxTests/types/rational_number_signed_to_unsigned.sol
index 944290347..60a032adc 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_signed_to_unsigned.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_signed_to_unsigned.sol
@@ -5,5 +5,5 @@ contract c {
     }
 }
 // ----
-// TypeError 9574: (52-63): Type int_const -1 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
-// TypeError 9640: (82-90): Explicit type conversion not allowed from "int_const -1" to "uint256".
+// TypeError 9574: (52-63='uint a = -1'): Type int_const -1 is not implicitly convertible to expected type uint256. Cannot implicitly convert signed literal to unsigned type.
+// TypeError 9640: (82-90='uint(-1)'): Explicit type conversion not allowed from "int_const -1" to "uint256".
diff --git a/test/libsolidity/syntaxTests/types/rational_number_too_large.sol b/test/libsolidity/syntaxTests/types/rational_number_too_large.sol
index b3c065f1e..151e442d7 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_too_large.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_too_large.sol
@@ -6,6 +6,6 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (52-65): Type int_const 256 is not implicitly convertible to expected type uint8. Literal is too large to fit in uint8.
-// TypeError 9640: (85-95): Explicit type conversion not allowed from "int_const 256" to "uint8".
-// TypeError 9640: (114-124): Explicit type conversion not allowed from "int_const -129" to "int8".
+// TypeError 9574: (52-65='uint8 a = 256'): Type int_const 256 is not implicitly convertible to expected type uint8. Literal is too large to fit in uint8.
+// TypeError 9640: (85-95='uint8(256)'): Explicit type conversion not allowed from "int_const 256" to "uint8".
+// TypeError 9640: (114-124='int8(-129)'): Explicit type conversion not allowed from "int_const -129" to "int8".
diff --git a/test/libsolidity/syntaxTests/types/strict_explicit.sol b/test/libsolidity/syntaxTests/types/strict_explicit.sol
index 8bfebb13d..96692ceb0 100644
--- a/test/libsolidity/syntaxTests/types/strict_explicit.sol
+++ b/test/libsolidity/syntaxTests/types/strict_explicit.sol
@@ -43,4 +43,4 @@ contract C
     }
 }
 // ----
-// TypeError 9640: (801-809): Explicit type conversion not allowed from "uint8" to "int16".
+// TypeError 9640: (801-809='int16(o)'): Explicit type conversion not allowed from "uint8" to "int16".
diff --git a/test/libsolidity/syntaxTests/types/strict_explicit_err.sol b/test/libsolidity/syntaxTests/types/strict_explicit_err.sol
index 2f0c9a080..e36d48f7b 100644
--- a/test/libsolidity/syntaxTests/types/strict_explicit_err.sol
+++ b/test/libsolidity/syntaxTests/types/strict_explicit_err.sol
@@ -36,17 +36,17 @@ contract C
     }
 }
 // ----
-// TypeError 9640: (95-111): Explicit type conversion not allowed from "int8" to "uint16".
-// TypeError 9640: (154-163): Explicit type conversion not allowed from "int8" to "uint16".
-// TypeError 9640: (183-213): Explicit type conversion not allowed from "uint16" to "int8".
-// TypeError 9640: (270-277): Explicit type conversion not allowed from "uint16" to "int8".
-// TypeError 9640: (300-329): Explicit type conversion not allowed from "uint256" to "address".
-// TypeError 9640: (349-365): Explicit type conversion not allowed from "address" to "uint256".
-// TypeError 9640: (421-431): Explicit type conversion not allowed from "uint256" to "address".
-// TypeError 9640: (452-471): Explicit type conversion not allowed from "bytes10" to "int80".
-// TypeError 9640: (493-511): Explicit type conversion not allowed from "int80" to "bytes10".
-// TypeError 9640: (528-539): Explicit type conversion not allowed from "int256" to "contract B".
-// TypeError 9640: (557-569): Explicit type conversion not allowed from "contract B" to "int256".
-// TypeError 9640: (586-593): Explicit type conversion not allowed from "int_const 0" to "contract B".
-// TypeError 9640: (612-621): Explicit type conversion not allowed from "enum E" to "int256".
-// TypeError 9640: (639-650): Explicit type conversion not allowed from "enum E" to "int256".
+// TypeError 9640: (95-111='uint16(int8(-1))'): Explicit type conversion not allowed from "int8" to "uint16".
+// TypeError 9640: (154-163='uint16(b)'): Explicit type conversion not allowed from "int8" to "uint16".
+// TypeError 9640: (183-213='int8(uint16(type(uint16).max))'): Explicit type conversion not allowed from "uint16" to "int8".
+// TypeError 9640: (270-277='int8(e)'): Explicit type conversion not allowed from "uint16" to "int8".
+// TypeError 9640: (300-329='address(uint(type(uint).max))'): Explicit type conversion not allowed from "uint256" to "address".
+// TypeError 9640: (349-365='uint(address(0))'): Explicit type conversion not allowed from "address" to "uint256".
+// TypeError 9640: (421-431='address(j)'): Explicit type conversion not allowed from "uint256" to "address".
+// TypeError 9640: (452-471='int80(bytes10("h"))'): Explicit type conversion not allowed from "bytes10" to "int80".
+// TypeError 9640: (493-511='bytes10(int80(-1))'): Explicit type conversion not allowed from "int80" to "bytes10".
+// TypeError 9640: (528-539='B(int(100))'): Explicit type conversion not allowed from "int256" to "contract B".
+// TypeError 9640: (557-569='int(new B())'): Explicit type conversion not allowed from "contract B" to "int256".
+// TypeError 9640: (586-593='B(0x00)'): Explicit type conversion not allowed from "int_const 0" to "contract B".
+// TypeError 9640: (612-621='int(E(0))'): Explicit type conversion not allowed from "enum E" to "int256".
+// TypeError 9640: (639-650='int(E.Zero)'): Explicit type conversion not allowed from "enum E" to "int256".
diff --git a/test/libsolidity/syntaxTests/types/struct_mapping_recursion.sol b/test/libsolidity/syntaxTests/types/struct_mapping_recursion.sol
index be4e1dde0..021ac351d 100644
--- a/test/libsolidity/syntaxTests/types/struct_mapping_recursion.sol
+++ b/test/libsolidity/syntaxTests/types/struct_mapping_recursion.sol
@@ -6,4 +6,4 @@ contract C {
 	function g (S calldata) external view {}
  }
 // ----
-// TypeError 7804: (56-57): Only elementary types, user defined value types, contract types or enums are allowed as mapping keys.
+// TypeError 7804: (56-57='S'): Only elementary types, user defined value types, contract types or enums are allowed as mapping keys.
diff --git a/test/libsolidity/syntaxTests/types/too_small_negative_numbers.sol b/test/libsolidity/syntaxTests/types/too_small_negative_numbers.sol
index fa0ceac11..00c1d4edb 100644
--- a/test/libsolidity/syntaxTests/types/too_small_negative_numbers.sol
+++ b/test/libsolidity/syntaxTests/types/too_small_negative_numbers.sol
@@ -2,4 +2,4 @@ contract C {
   fixed8x80 a = -1e-100;
 }
 // ----
-// TypeError 4426: (29-36): Type rational_const -1 / 1000...(93 digits omitted)...0000 is not implicitly convertible to expected type fixed8x80, but it can be explicitly converted.
+// TypeError 4426: (29-36='-1e-100'): Type rational_const -1 / 1000...(93 digits omitted)...0000 is not implicitly convertible to expected type fixed8x80, but it can be explicitly converted.
diff --git a/test/libsolidity/syntaxTests/types/uint256_to_bytes1.sol b/test/libsolidity/syntaxTests/types/uint256_to_bytes1.sol
index b9709b9ae..6cd2b030a 100644
--- a/test/libsolidity/syntaxTests/types/uint256_to_bytes1.sol
+++ b/test/libsolidity/syntaxTests/types/uint256_to_bytes1.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (75-93): Explicit type conversion not allowed from "uint256" to "bytes1".
+// TypeError 9640: (75-93='bytes1(uint256(0))'): Explicit type conversion not allowed from "uint256" to "bytes1".
diff --git a/test/libsolidity/syntaxTests/types/uint32_to_bytes32.sol b/test/libsolidity/syntaxTests/types/uint32_to_bytes32.sol
index 6b6550b9f..acb7357b9 100644
--- a/test/libsolidity/syntaxTests/types/uint32_to_bytes32.sol
+++ b/test/libsolidity/syntaxTests/types/uint32_to_bytes32.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9640: (76-94): Explicit type conversion not allowed from "uint32" to "bytes32".
+// TypeError 9640: (76-94='bytes32(uint32(0))'): Explicit type conversion not allowed from "uint32" to "bytes32".
diff --git a/test/libsolidity/syntaxTests/types/unnamed_tuple_decl.sol b/test/libsolidity/syntaxTests/types/unnamed_tuple_decl.sol
index 00301cde0..3ec3604ed 100644
--- a/test/libsolidity/syntaxTests/types/unnamed_tuple_decl.sol
+++ b/test/libsolidity/syntaxTests/types/unnamed_tuple_decl.sol
@@ -11,4 +11,4 @@ contract C {
 }
 
 // ----
-// ParserError 6933: (224-225): Expected primary expression.
+// ParserError 6933: (224-225=')'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/types/var_decl_val_mismatch.sol b/test/libsolidity/syntaxTests/types/var_decl_val_mismatch.sol
index 314d2bb73..237ca2765 100644
--- a/test/libsolidity/syntaxTests/types/var_decl_val_mismatch.sol
+++ b/test/libsolidity/syntaxTests/types/var_decl_val_mismatch.sol
@@ -12,5 +12,5 @@ contract n
 	}
 }
 // ----
-// TypeError 7364: (69-85): Different number of components on the left hand side (2) than on the right hand side (1).
-// TypeError 7364: (89-102): Different number of components on the left hand side (1) than on the right hand side (0).
+// TypeError 7364: (69-85='(uint x, ) = (1)'): Different number of components on the left hand side (2) than on the right hand side (1).
+// TypeError 7364: (89-102='(uint z) = ()'): Different number of components on the left hand side (1) than on the right hand side (0).
diff --git a/test/libsolidity/syntaxTests/types/var_empty_decl_1.sol b/test/libsolidity/syntaxTests/types/var_empty_decl_1.sol
index 7f55029c2..a6ab7faa8 100644
--- a/test/libsolidity/syntaxTests/types/var_empty_decl_1.sol
+++ b/test/libsolidity/syntaxTests/types/var_empty_decl_1.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6933: (52-55): Expected primary expression.
+// ParserError 6933: (52-55='var'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/types/var_empty_decl_2.sol b/test/libsolidity/syntaxTests/types/var_empty_decl_2.sol
index dad288d79..573b39416 100644
--- a/test/libsolidity/syntaxTests/types/var_empty_decl_2.sol
+++ b/test/libsolidity/syntaxTests/types/var_empty_decl_2.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6933: (52-55): Expected primary expression.
+// ParserError 6933: (52-55='var'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/types/var_empty_decl_3.sol b/test/libsolidity/syntaxTests/types/var_empty_decl_3.sol
index caf178761..344f15a63 100644
--- a/test/libsolidity/syntaxTests/types/var_empty_decl_3.sol
+++ b/test/libsolidity/syntaxTests/types/var_empty_decl_3.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6933: (52-55): Expected primary expression.
+// ParserError 6933: (52-55='var'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_for_header.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_for_header.sol
index a5b4ecbdc..30579d363 100644
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_for_header.sol
+++ b/test/libsolidity/syntaxTests/unchecked/unchecked_for_header.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6933: (57-66): Expected primary expression.
+// ParserError 6933: (57-66='unchecked'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_function_body.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_function_body.sol
index ef45a8e2b..30e90d17a 100644
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_function_body.sol
+++ b/test/libsolidity/syntaxTests/unchecked/unchecked_function_body.sol
@@ -1,3 +1,3 @@
 function f() pure returns (uint) unchecked {}
 // ----
-// ParserError 5296: (33-42): "unchecked" blocks can only be used inside regular blocks.
+// ParserError 5296: (33-42='unchecked'): "unchecked" blocks can only be used inside regular blocks.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_modifier.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_modifier.sol
index 2d4242369..7ee5fd8ad 100644
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_modifier.sol
+++ b/test/libsolidity/syntaxTests/unchecked/unchecked_modifier.sol
@@ -2,4 +2,4 @@ contract C {
     modifier m() { unchecked { _; } }
 }
 // ----
-// SyntaxError 2573: (44-45): The placeholder statement "_" cannot be used inside an "unchecked" block.
+// SyntaxError 2573: (44-45='_'): The placeholder statement "_" cannot be used inside an "unchecked" block.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_post_for.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_post_for.sol
index 2b77920dc..64ed6912f 100644
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_post_for.sol
+++ b/test/libsolidity/syntaxTests/unchecked/unchecked_post_for.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6933: (76-85): Expected primary expression.
+// ParserError 6933: (76-85='unchecked'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_vardecl.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_vardecl.sol
index b49112f5e..c6244221e 100644
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_vardecl.sol
+++ b/test/libsolidity/syntaxTests/unchecked/unchecked_vardecl.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// ParserError 6933: (26-35): Expected primary expression.
+// ParserError 6933: (26-35='unchecked'): Expected primary expression.
diff --git a/test/libsolidity/syntaxTests/unchecked/unchecked_while_body.sol b/test/libsolidity/syntaxTests/unchecked/unchecked_while_body.sol
index 4b7c6f2ab..15753f277 100644
--- a/test/libsolidity/syntaxTests/unchecked/unchecked_while_body.sol
+++ b/test/libsolidity/syntaxTests/unchecked/unchecked_while_body.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// ParserError 5296: (65-74): "unchecked" blocks can only be used inside regular blocks.
+// ParserError 5296: (65-74='unchecked'): "unchecked" blocks can only be used inside regular blocks.
diff --git a/test/libsolidity/syntaxTests/underscore/in_function.sol b/test/libsolidity/syntaxTests/underscore/in_function.sol
index 5b41e889a..9b43d61f8 100644
--- a/test/libsolidity/syntaxTests/underscore/in_function.sol
+++ b/test/libsolidity/syntaxTests/underscore/in_function.sol
@@ -14,6 +14,6 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3726: (67-73): The name "_" is reserved.
-// DeclarationError 3726: (154-160): The name "_" is reserved.
-// DeclarationError 7576: (230-231): Undeclared identifier.
+// DeclarationError 3726: (67-73='uint _'): The name "_" is reserved.
+// DeclarationError 3726: (154-160='uint _'): The name "_" is reserved.
+// DeclarationError 7576: (230-231='_'): Undeclared identifier.
diff --git a/test/libsolidity/syntaxTests/underscore/in_modifier.sol b/test/libsolidity/syntaxTests/underscore/in_modifier.sol
index 5e330d010..915bd696c 100644
--- a/test/libsolidity/syntaxTests/underscore/in_modifier.sol
+++ b/test/libsolidity/syntaxTests/underscore/in_modifier.sol
@@ -16,4 +16,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 3726: (77-92): The name "_" is reserved.
+// DeclarationError 3726: (77-92='string memory _'): The name "_" is reserved.
diff --git a/test/libsolidity/syntaxTests/unexpected.sol b/test/libsolidity/syntaxTests/unexpected.sol
index 1ffa40c21..afe4baa24 100644
--- a/test/libsolidity/syntaxTests/unexpected.sol
+++ b/test/libsolidity/syntaxTests/unexpected.sol
@@ -1,3 +1,3 @@
 unexpected
 // ----
-// ParserError 7858: (0-10): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
+// ParserError 7858: (0-10='unexpected'): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
diff --git a/test/libsolidity/syntaxTests/unimplemented_super_function.sol b/test/libsolidity/syntaxTests/unimplemented_super_function.sol
index 22b98df02..94a271131 100644
--- a/test/libsolidity/syntaxTests/unimplemented_super_function.sol
+++ b/test/libsolidity/syntaxTests/unimplemented_super_function.sol
@@ -5,4 +5,4 @@ contract b is a {
     function f() public override { super.f(); }
 }
 // ----
-// TypeError 9582: (110-117): Member "f" not found or not visible after argument-dependent lookup in type(contract super b).
+// TypeError 9582: (110-117='super.f'): Member "f" not found or not visible after argument-dependent lookup in type(contract super b).
diff --git a/test/libsolidity/syntaxTests/unimplemented_super_function_derived.sol b/test/libsolidity/syntaxTests/unimplemented_super_function_derived.sol
index 6a683b461..b8cd3a581 100644
--- a/test/libsolidity/syntaxTests/unimplemented_super_function_derived.sol
+++ b/test/libsolidity/syntaxTests/unimplemented_super_function_derived.sol
@@ -9,4 +9,4 @@ contract c is a,b {
     function f() public override(a, b) { super.f(); }
 }
 // ----
-// TypeError 9582: (118-125): Member "f" not found or not visible after argument-dependent lookup in type(contract super b).
+// TypeError 9582: (118-125='super.f'): Member "f" not found or not visible after argument-dependent lookup in type(contract super b).
diff --git a/test/libsolidity/syntaxTests/unterminatedBlocks/one_dot_x.sol b/test/libsolidity/syntaxTests/unterminatedBlocks/one_dot_x.sol
index 12c20b150..1d78913e7 100644
--- a/test/libsolidity/syntaxTests/unterminatedBlocks/one_dot_x.sol
+++ b/test/libsolidity/syntaxTests/unterminatedBlocks/one_dot_x.sol
@@ -2,4 +2,4 @@ contract test {
     function f() pure public { 1.x; }
 }
 // ----
-// TypeError 9582: (47-50): Member "x" not found or not visible after argument-dependent lookup in int_const 1.
+// TypeError 9582: (47-50='1.x'): Member "x" not found or not visible after argument-dependent lookup in int_const 1.
diff --git a/test/libsolidity/syntaxTests/unterminatedBlocks/zero_dot_x.sol b/test/libsolidity/syntaxTests/unterminatedBlocks/zero_dot_x.sol
index de53fcc5d..beca58685 100644
--- a/test/libsolidity/syntaxTests/unterminatedBlocks/zero_dot_x.sol
+++ b/test/libsolidity/syntaxTests/unterminatedBlocks/zero_dot_x.sol
@@ -2,4 +2,4 @@ contract test {
     function f() pure public { 0.x; }
 }
 // ----
-// TypeError 9582: (47-50): Member "x" not found or not visible after argument-dependent lookup in int_const 0.
+// TypeError 9582: (47-50='0.x'): Member "x" not found or not visible after argument-dependent lookup in int_const 0.
diff --git a/test/libsolidity/syntaxTests/unusedVariables/try_catch.sol b/test/libsolidity/syntaxTests/unusedVariables/try_catch.sol
index 0376c3e13..81d1bfb08 100644
--- a/test/libsolidity/syntaxTests/unusedVariables/try_catch.sol
+++ b/test/libsolidity/syntaxTests/unusedVariables/try_catch.sol
@@ -12,7 +12,7 @@ contract test {
 // ====
 // EVMVersion: >=byzantium
 // ----
-// Warning 5667: (49-55): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 5667: (89-95): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 5667: (122-143): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 5667: (165-183): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (49-55='uint b'): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (89-95='uint a'): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (122-143='string memory message'): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
+// Warning 5667: (165-183='bytes memory error'): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/constant.sol b/test/libsolidity/syntaxTests/userDefinedValueType/constant.sol
index febe08193..39dcb6af0 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/constant.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/constant.sol
@@ -5,4 +5,4 @@ contract C {
     uint[MyInt.unwrap(mi)] arr;
 }
 // ----
-// TypeError 5462: (122-138): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (122-138='MyInt.unwrap(mi)'): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/conversion_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/conversion_err.sol
index 33c81aee5..137190008 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/conversion_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/conversion_err.sol
@@ -3,4 +3,4 @@ function f() {
     MyAddress a = MyAddress(5, 2);
 }
 // ----
-// TypeError 2558: (60-75): Exactly one argument expected for explicit type conversion.
+// TypeError 2558: (60-75='MyAddress(5, 2)'): Exactly one argument expected for explicit type conversion.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_err.sol
index 24a7a071e..aaa2bc189 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_err.sol
@@ -14,11 +14,11 @@ function f() pure {
     MyUInt.unwrap(AnotherUInt.wrap(10));
 }
 // ----
-// TypeError 9640: (99-109): Explicit type conversion not allowed from "int_const -1" to "MyUInt".
-// TypeError 9640: (115-128): Explicit type conversion not allowed from "int_const -1" to "MyAddress".
-// TypeError 9640: (134-143): Explicit type conversion not allowed from "int_const 5" to "MyUInt".
-// TypeError 9640: (149-170): Explicit type conversion not allowed from "address" to "MyAddress".
-// TypeError 9640: (177-204): Explicit type conversion not allowed from "MyUInt" to "AnotherUInt".
-// TypeError 9640: (210-238): Explicit type conversion not allowed from "AnotherUInt" to "MyUInt".
-// TypeError 9553: (263-277): Invalid type for argument in function call. Invalid implicit conversion from MyUInt to AnotherUInt requested.
-// TypeError 9553: (298-318): Invalid type for argument in function call. Invalid implicit conversion from AnotherUInt to MyUInt requested.
+// TypeError 9640: (99-109='MyUInt(-1)'): Explicit type conversion not allowed from "int_const -1" to "MyUInt".
+// TypeError 9640: (115-128='MyAddress(-1)'): Explicit type conversion not allowed from "int_const -1" to "MyAddress".
+// TypeError 9640: (134-143='MyUInt(5)'): Explicit type conversion not allowed from "int_const 5" to "MyUInt".
+// TypeError 9640: (149-170='MyAddress(address(5))'): Explicit type conversion not allowed from "address" to "MyAddress".
+// TypeError 9640: (177-204='AnotherUInt(MyUInt.wrap(5))'): Explicit type conversion not allowed from "MyUInt" to "AnotherUInt".
+// TypeError 9640: (210-238='MyUInt(AnotherUInt.wrap(10))'): Explicit type conversion not allowed from "AnotherUInt" to "MyUInt".
+// TypeError 9553: (263-277='MyUInt.wrap(5)'): Invalid type for argument in function call. Invalid implicit conversion from MyUInt to AnotherUInt requested.
+// TypeError 9553: (298-318='AnotherUInt.wrap(10)'): Invalid type for argument in function call. Invalid implicit conversion from AnotherUInt to MyUInt requested.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_wrap.sol b/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_wrap.sol
index 6d10e8b20..33ce6e930 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_wrap.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/explicit_conversions_wrap.sol
@@ -6,5 +6,5 @@ function f() pure {
     MyAddress.wrap(address(5));
 }
 // ----
-// Warning 6133: (73-87): Statement has no effect.
-// Warning 6133: (93-119): Statement has no effect.
+// Warning 6133: (73-87='MyUint.wrap(5)'): Statement has no effect.
+// Warning 6133: (93-119='MyAddress.wrap(address(5))'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_literal_conversion_wrap.sol b/test/libsolidity/syntaxTests/userDefinedValueType/explicit_literal_conversion_wrap.sol
index 0fb851196..f3b94d29d 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/explicit_literal_conversion_wrap.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/explicit_literal_conversion_wrap.sol
@@ -7,6 +7,6 @@ function f() pure {
     MyUInt8.wrap(50);
 }
 // ----
-// Warning 6133: (75-101): Statement has no effect.
-// Warning 6133: (107-122): Statement has no effect.
-// Warning 6133: (128-144): Statement has no effect.
+// Warning 6133: (75-101='MyAddress.wrap(address(5))'): Statement has no effect.
+// Warning 6133: (107-122='MyUInt8.wrap(5)'): Statement has no effect.
+// Warning 6133: (128-144='MyUInt8.wrap(50)'): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_err.sol
index 9ea93cb09..1d69740ad 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_err.sol
@@ -1,4 +1,4 @@
 function f(MyIntB x) pure {}
 type MyIntB is MyIntB;
 // ----
-// TypeError 8657: (44-50): The underlying type for a user defined value type has to be an elementary value type.
+// TypeError 8657: (44-50='MyIntB'): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/implicit_conversion_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/implicit_conversion_err.sol
index 3b6179845..3085dca20 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/implicit_conversion_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/implicit_conversion_err.sol
@@ -14,9 +14,9 @@ function f(int a) pure returns (int) {
     return e;
 }
 // ----
-// TypeError 9574: (62-73): Type int256 is not implicitly convertible to expected type MyInt.
-// TypeError 9574: (80-89): Type MyInt is not implicitly convertible to expected type int256.
-// TypeError 9574: (96-109): Type MyInt is not implicitly convertible to expected type address.
-// TypeError 9574: (116-127): Type address is not implicitly convertible to expected type MyInt.
-// TypeError 9640: (160-168): Explicit type conversion not allowed from "uint256" to "MyInt".
-// TypeError 6359: (182-183): Return argument type MyInt is not implicitly convertible to expected type (type of first return variable) int256.
+// TypeError 9574: (62-73='MyInt b = a'): Type int256 is not implicitly convertible to expected type MyInt.
+// TypeError 9574: (80-89='int c = b'): Type MyInt is not implicitly convertible to expected type int256.
+// TypeError 9574: (96-109='address d = b'): Type MyInt is not implicitly convertible to expected type address.
+// TypeError 9574: (116-127='MyInt e = d'): Type address is not implicitly convertible to expected type MyInt.
+// TypeError 9640: (160-168='MyInt(x)'): Explicit type conversion not allowed from "uint256" to "MyInt".
+// TypeError 6359: (182-183='e'): Return argument type MyInt is not implicitly convertible to expected type (type of first return variable) int256.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/multisource1.sol b/test/libsolidity/syntaxTests/userDefinedValueType/multisource1.sol
index b6a7b5bcc..33eec55a0 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/multisource1.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/multisource1.sol
@@ -7,4 +7,4 @@ contract A {
     function f(int x) external view returns(MyInt) { return MyInt.wrap(x); }
 }
 // ----
-// DeclarationError 7920: (B:100-105): Identifier not found or not unique.
+// DeclarationError 7920: (B:100-105='MyInt'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/multisource2.sol b/test/libsolidity/syntaxTests/userDefinedValueType/multisource2.sol
index a0e7f9ec0..32425fe07 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/multisource2.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/multisource2.sol
@@ -7,4 +7,4 @@ contract A {
     function f(address x) external view returns(MyAddress) { return MyAddress.wrap(x); }
 }
 // ----
-// DeclarationError 7920: (B:104-113): Identifier not found or not unique.
+// DeclarationError 7920: (B:104-113='MyAddress'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/multisource4.sol b/test/libsolidity/syntaxTests/userDefinedValueType/multisource4.sol
index 92a1e54f1..a91921645 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/multisource4.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/multisource4.sol
@@ -6,4 +6,4 @@ contract C {
   function f(int x) public pure returns (MyInt) { return MyInt.wrap(x); }
 }
 // ----
-// DeclarationError 7920: (s2.sol:76-81): Identifier not found or not unique.
+// DeclarationError 7920: (s2.sol:76-81='MyInt'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_contract_warning.sol b/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_contract_warning.sol
index 8c5306bc4..47e730951 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_contract_warning.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_contract_warning.sol
@@ -3,4 +3,4 @@ contract C {
     type MyAddress is address;
 }
 // ----
-// Warning 2519: (44-70): This declaration shadows an existing declaration.
+// Warning 2519: (44-70='type MyAddress is address;'): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_err.sol
index 6573111ea..6a9f820d4 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/name_conflict_err.sol
@@ -5,5 +5,5 @@ contract C {
     type MyAddress is address;
 }
 // ----
-// DeclarationError 2333: (19-41): Identifier already declared.
-// DeclarationError 2333: (90-116): Identifier already declared.
+// DeclarationError 2333: (19-41='type MyInt is address;'): Identifier already declared.
+// DeclarationError 2333: (90-116='type MyAddress is address;'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_bytes.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_bytes.sol
index 2bb6c5809..be38caf88 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_bytes.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_bytes.sol
@@ -1,3 +1,3 @@
 type MyBytes is bytes;
 // ----
-// TypeError 8129: (0-22): The underlying type of the user defined value type "MyBytes" is not a value type.
+// TypeError 8129: (0-22='type MyBytes is bytes;'): The underlying type of the user defined value type "MyBytes" is not a value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_contract_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_contract_err.sol
index 5a86e92f9..dee818d0c 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_contract_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_contract_err.sol
@@ -1,4 +1,4 @@
 contract C {}
 type MyContract is C;
 // ----
-// TypeError 8657: (33-34): The underlying type for a user defined value type has to be an elementary value type.
+// TypeError 8657: (33-34='C'): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_function_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_function_err.sol
index 78d9c7043..99281bb20 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_function_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_function_err.sol
@@ -1,3 +1,3 @@
 type MyFunction is function(uint) returns (uint);
 // ----
-// TypeError 8657: (19-49): The underlying type for a user defined value type has to be an elementary value type.
+// TypeError 8657: (19-49='function(uint) returns (uint);'): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_mapping_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_mapping_err.sol
index 9f894c521..b905382a6 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_mapping_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_mapping_err.sol
@@ -1,3 +1,3 @@
 type MyInt is mapping(uint => uint);
 // ----
-// TypeError 8657: (14-35): The underlying type for a user defined value type has to be an elementary value type.
+// TypeError 8657: (14-35='mapping(uint => uint)'): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_string_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_string_err.sol
index b44b23bdb..5d79784a3 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_string_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_string_err.sol
@@ -1,3 +1,3 @@
 type MyString is string;
 // ----
-// TypeError 8129: (0-24): The underlying type of the user defined value type "MyString" is not a value type.
+// TypeError 8129: (0-24='type MyString is string;'): The underlying type of the user defined value type "MyString" is not a value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_struct_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_struct_err.sol
index 3a713a887..19d733808 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_struct_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_struct_err.sol
@@ -4,4 +4,4 @@ contract C {
     type MyType is S;
 }
 // ----
-// TypeError 8657: (52-53): The underlying type for a user defined value type has to be an elementary value type.
+// TypeError 8657: (52-53='S'): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/recursive_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/recursive_err.sol
index 4130edde5..84fca0b62 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/recursive_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/recursive_err.sol
@@ -1,4 +1,4 @@
 type MyInt1 is MyInt2;
 type MyInt2 is MyInt1;
 // ----
-// TypeError 8657: (15-21): The underlying type for a user defined value type has to be an elementary value type.
+// TypeError 8657: (15-21='MyInt2'): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/repetition_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/repetition_err.sol
index d9fc18d7f..93eac01aa 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/repetition_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/repetition_err.sol
@@ -3,5 +3,5 @@ type MyInt is int;
 type MyAddress is address;
 type MyAddress is uint;
 // ----
-// DeclarationError 2333: (19-37): Identifier already declared.
-// DeclarationError 2333: (65-88): Identifier already declared.
+// DeclarationError 2333: (19-37='type MyInt is int;'): Identifier already declared.
+// DeclarationError 2333: (65-88='type MyAddress is uint;'): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/self_reference_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/self_reference_err.sol
index 20c657c73..89eb4e0da 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/self_reference_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/self_reference_err.sol
@@ -1,3 +1,3 @@
 type MyInt is MyInt;
 // ----
-// TypeError 8657: (14-19): The underlying type for a user defined value type has to be an elementary value type.
+// TypeError 8657: (14-19='MyInt'): The underlying type for a user defined value type has to be an elementary value type.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_calls_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_calls_err.sol
index d4ee407fd..00e4969aa 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_calls_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_calls_err.sol
@@ -8,9 +8,9 @@ function f() {
     MyInt.unwrap(MyInt.wrap(1), MyInt.wrap(2));
 }
 // ----
-// TypeError 6160: (38-57): Wrong argument count for function call: 3 arguments given but expected 1.
-// TypeError 4974: (63-84): Named argument "test" does not match function declaration.
-// TypeError 6160: (90-102): Wrong argument count for function call: 0 arguments given but expected 1.
-// TypeError 9553: (121-122): Invalid type for argument in function call. Invalid implicit conversion from int_const 5 to MyInt requested.
-// TypeError 4974: (129-152): Named argument "test" does not match function declaration.
+// TypeError 6160: (38-57='MyInt.wrap(5, 6, 7)'): Wrong argument count for function call: 3 arguments given but expected 1.
+// TypeError 4974: (63-84='MyInt.wrap({test: 5})'): Named argument "test" does not match function declaration.
+// TypeError 6160: (90-102='MyInt.wrap()'): Wrong argument count for function call: 0 arguments given but expected 1.
+// TypeError 9553: (121-122='5'): Invalid type for argument in function call. Invalid implicit conversion from int_const 5 to MyInt requested.
+// TypeError 4974: (129-152='MyInt.unwrap({test: 5})'): Named argument "test" does not match function declaration.
 // TypeError 6160: (158-200): Wrong argument count for function call: 2 arguments given but expected 1.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_via_contract_name_different.sol b/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_via_contract_name_different.sol
index 334cb9fb0..4769ea8c4 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_via_contract_name_different.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_via_contract_name_different.sol
@@ -5,4 +5,4 @@ contract D
     C.T x = L.T.wrap(uint(1));
 }
 // ----
-// TypeError 7407: (86-103): Type L.T is not implicitly convertible to expected type C.T.
+// TypeError 7407: (86-103='L.T.wrap(uint(1))'): Type L.T is not implicitly convertible to expected type C.T.
diff --git a/test/libsolidity/syntaxTests/using/double_asterisk.sol b/test/libsolidity/syntaxTests/using/double_asterisk.sol
index 44cee5479..3f663708e 100644
--- a/test/libsolidity/syntaxTests/using/double_asterisk.sol
+++ b/test/libsolidity/syntaxTests/using/double_asterisk.sol
@@ -16,4 +16,4 @@ contract C {
     }
 }
 // ----
-// ParserError 2314: (156-157): Expected identifier but got '*'
+// ParserError 2314: (156-157='*'): Expected identifier but got '*'
diff --git a/test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol b/test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol
index 219954238..1f3e19e8e 100644
--- a/test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol
+++ b/test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol
@@ -19,4 +19,4 @@ function f() pure {
     y = y.id();
 }
 // ----
-// TypeError 9582: (B:57-61): Member "id" not found or not visible after argument-dependent lookup in uint256.
+// TypeError 9582: (B:57-61='y.id'): Member "id" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
index 36f3f3032..e1569327d 100644
--- a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
+++ b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
@@ -5,4 +5,4 @@ contract C {
     using {id} for uint256;
 }
 // ----
-// TypeError 3100: (85-87): The function "id" cannot be bound to the type "uint256" because the type cannot be implicitly converted to the first argument of the function ("uint16").
+// TypeError 3100: (85-87='id'): The function "id" cannot be bound to the type "uint256" because the type cannot be implicitly converted to the first argument of the function ("uint16").
diff --git a/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol b/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
index 7536dff07..40acc9ea8 100644
--- a/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
+++ b/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
@@ -9,4 +9,4 @@ contract C {
     using {id} for uint256;
 }
 // ----
-// DeclarationError 7920: (145-147): Identifier not found or not unique.
+// DeclarationError 7920: (145-147='id'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_overloads.sol b/test/libsolidity/syntaxTests/using/free_overloads.sol
index 28a8e69ed..4f11072ff 100644
--- a/test/libsolidity/syntaxTests/using/free_overloads.sol
+++ b/test/libsolidity/syntaxTests/using/free_overloads.sol
@@ -7,4 +7,4 @@ function f(int8 storage x) pure returns (int) {
 using {f} for uint8;
 using {f} for int;
 // ----
-// DeclarationError 7920: (132-133): Identifier not found or not unique.
+// DeclarationError 7920: (132-133='f'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_overloads_array.sol b/test/libsolidity/syntaxTests/using/free_overloads_array.sol
index 91b807397..09716b6ae 100644
--- a/test/libsolidity/syntaxTests/using/free_overloads_array.sol
+++ b/test/libsolidity/syntaxTests/using/free_overloads_array.sol
@@ -6,4 +6,4 @@ function f(uint x, uint y) pure returns (int) {
 }
 using {f} for uint;
 // ----
-// DeclarationError 7920: (138-139): Identifier not found or not unique.
+// DeclarationError 7920: (138-139='f'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/using/global_for_asterisk.sol b/test/libsolidity/syntaxTests/using/global_for_asterisk.sol
index b5f6d8827..d7d73f93b 100644
--- a/test/libsolidity/syntaxTests/using/global_for_asterisk.sol
+++ b/test/libsolidity/syntaxTests/using/global_for_asterisk.sol
@@ -1,5 +1,5 @@
 using {f} for * global;
 function f(uint) pure{}
 // ----
-// SyntaxError 8118: (0-23): The type has to be specified explicitly at file level (cannot use '*').
-// SyntaxError 2854: (0-23): Can only globally bind functions to specific types.
+// SyntaxError 8118: (0-23='using {f} for * global;'): The type has to be specified explicitly at file level (cannot use '*').
+// SyntaxError 2854: (0-23='using {f} for * global;'): Can only globally bind functions to specific types.
diff --git a/test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol b/test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol
index 051874abc..670300716 100644
--- a/test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol
+++ b/test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol
@@ -1,4 +1,4 @@
 using {f} for uint global;
 function f(uint) pure{}
 // ----
-// TypeError 8841: (0-26): Can only use "global" with user-defined types.
+// TypeError 8841: (0-26='using {f} for uint global;'): Can only use "global" with user-defined types.
diff --git a/test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol b/test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol
index 232ffafad..04a86639a 100644
--- a/test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol
+++ b/test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol
@@ -4,4 +4,4 @@ library L {
     struct S { uint x; }
 }
 // ----
-// TypeError 4117: (0-25): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 4117: (0-25='using {f} for L.S global;'): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol b/test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol
index 458a644e9..ce1db1fca 100644
--- a/test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol
+++ b/test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol
@@ -10,5 +10,5 @@ function f(S memory) pure{}
 import {S} from "A";
 import "A" as A;
 // ----
-// TypeError 4117: (B:1-24): Can only use "global" with types defined in the same source unit at file level.
-// TypeError 4117: (B:25-50): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 4117: (B:1-24='using {f} for S global;'): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 4117: (B:25-50='using {f} for A.S global;'): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_inside_contract.sol b/test/libsolidity/syntaxTests/using/global_inside_contract.sol
index edaeea922..38543af8a 100644
--- a/test/libsolidity/syntaxTests/using/global_inside_contract.sol
+++ b/test/libsolidity/syntaxTests/using/global_inside_contract.sol
@@ -3,5 +3,5 @@ contract C {
 }
 function f(uint) pure{}
 // ----
-// SyntaxError 3367: (17-43): "global" can only be used at file level.
-// TypeError 8841: (17-43): Can only use "global" with user-defined types.
+// SyntaxError 3367: (17-43='using {f} for uint global;'): "global" can only be used at file level.
+// TypeError 8841: (17-43='using {f} for uint global;'): Can only use "global" with user-defined types.
diff --git a/test/libsolidity/syntaxTests/using/global_local_clash.sol b/test/libsolidity/syntaxTests/using/global_local_clash.sol
index 1d149417f..1acf19708 100644
--- a/test/libsolidity/syntaxTests/using/global_local_clash.sol
+++ b/test/libsolidity/syntaxTests/using/global_local_clash.sol
@@ -18,4 +18,4 @@ contract C {
 import {gen as g, f1 as f, S} from "A";
 import "A" as A;
 // ----
-// TypeError 6675: (B:181-186): Member "f" not unique after argument-dependent lookup in struct S memory.
+// TypeError 6675: (B:181-186='g().f'): Member "f" not unique after argument-dependent lookup in struct S memory.
diff --git a/test/libsolidity/syntaxTests/using/global_nonglobal.sol b/test/libsolidity/syntaxTests/using/global_nonglobal.sol
index 972a34a8d..6f6609342 100644
--- a/test/libsolidity/syntaxTests/using/global_nonglobal.sol
+++ b/test/libsolidity/syntaxTests/using/global_nonglobal.sol
@@ -14,4 +14,4 @@ function test() pure
 }
 
 // ----
-// TypeError 9582: (B:54-61): Member "g" not found or not visible after argument-dependent lookup in struct S memory.
+// TypeError 9582: (B:54-61='gen().g'): Member "g" not found or not visible after argument-dependent lookup in struct S memory.
diff --git a/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol b/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
index 76d53cf90..016be4f98 100644
--- a/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
+++ b/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
@@ -11,4 +11,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 7920: (115-123): Identifier not found or not unique.
+// DeclarationError 7920: (115-123='L.id_ext'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/using/module_1.sol b/test/libsolidity/syntaxTests/using/module_1.sol
index a2d3b9f99..fbc965894 100644
--- a/test/libsolidity/syntaxTests/using/module_1.sol
+++ b/test/libsolidity/syntaxTests/using/module_1.sol
@@ -9,4 +9,4 @@ contract C {
     using M for uint;
 }
 // ----
-// TypeError 4357: (B:40-41): Library name expected. If you want to attach a function, use '{...}'.
+// TypeError 4357: (B:40-41='M'): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol b/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
index ef1688b22..95a2beaae 100644
--- a/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
+++ b/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
@@ -10,4 +10,4 @@ contract C {
     using { id } for uint;
 }
 // ----
-// DeclarationError 7920: (B:43-45): Identifier not found or not unique.
+// DeclarationError 7920: (B:43-45='id'): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/using/using_contract_err.sol b/test/libsolidity/syntaxTests/using/using_contract_err.sol
index e216e4cfc..9bcff6484 100644
--- a/test/libsolidity/syntaxTests/using/using_contract_err.sol
+++ b/test/libsolidity/syntaxTests/using/using_contract_err.sol
@@ -10,4 +10,4 @@ contract Test {
     using C for uint;
 }
 // ----
-// TypeError 4357: (127-128): Library name expected. If you want to attach a function, use '{...}'.
+// TypeError 4357: (127-128='C'): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/using_empty_list_err.sol b/test/libsolidity/syntaxTests/using/using_empty_list_err.sol
index b8b9cb9a7..00137bebf 100644
--- a/test/libsolidity/syntaxTests/using/using_empty_list_err.sol
+++ b/test/libsolidity/syntaxTests/using/using_empty_list_err.sol
@@ -2,4 +2,4 @@ contract C {
     using {} for uint;
 }
 // ----
-// ParserError 2314: (24-25): Expected identifier but got '}'
+// ParserError 2314: (24-25='}'): Expected identifier but got '}'
diff --git a/test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol b/test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol
index b1dc8b706..5726aa97e 100644
--- a/test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol
+++ b/test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol
@@ -1,3 +1,3 @@
 using {} for uint;
 // ----
-// ParserError 2314: (7-8): Expected identifier but got '}'
+// ParserError 2314: (7-8='}'): Expected identifier but got '}'
diff --git a/test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol b/test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol
index 2b5d6a0dd..b1c533a41 100644
--- a/test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol
+++ b/test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol
@@ -4,4 +4,4 @@ function id(uint x) pure returns (uint) {
 
 using {id} for *;
 // ----
-// SyntaxError 8118: (59-76): The type has to be specified explicitly at file level (cannot use '*').
+// SyntaxError 8118: (59-76='using {id} for *;'): The type has to be specified explicitly at file level (cannot use '*').
diff --git a/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol b/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
index e03ba5d10..7df503a21 100644
--- a/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
+++ b/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
@@ -4,4 +4,4 @@ function one() pure returns(uint) {
 
 using {one} for uint;
 // ----
-// TypeError 4731: (60-63): The function "one" does not have any parameters, and therefore cannot be bound to the type "uint256".
+// TypeError 4731: (60-63='one'): The function "one" does not have any parameters, and therefore cannot be bound to the type "uint256".
diff --git a/test/libsolidity/syntaxTests/using/using_functions_with_ast.sol b/test/libsolidity/syntaxTests/using/using_functions_with_ast.sol
index 62f8e4736..2230d45a5 100644
--- a/test/libsolidity/syntaxTests/using/using_functions_with_ast.sol
+++ b/test/libsolidity/syntaxTests/using/using_functions_with_ast.sol
@@ -4,4 +4,4 @@ contract C {
     using {f} for *;
 }
 // ----
-// SyntaxError 3349: (38-54): The type has to be specified explicitly when attaching specific functions.
+// SyntaxError 3349: (38-54='using {f} for *;'): The type has to be specified explicitly when attaching specific functions.
diff --git a/test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol b/test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol
index 07b607004..f4a17279a 100644
--- a/test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol
+++ b/test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol
@@ -1,3 +1,3 @@
 using * for uint;
 // ----
-// ParserError 2314: (6-7): Expected identifier but got '*'
+// ParserError 2314: (6-7='*'): Expected identifier but got '*'
diff --git a/test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol b/test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol
index 67eee5862..6f4c615c4 100644
--- a/test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol
+++ b/test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol
@@ -2,4 +2,4 @@ contract C {
     using * for uint;
 }
 // ----
-// ParserError 2314: (23-24): Expected identifier but got '*'
+// ParserError 2314: (23-24='*'): Expected identifier but got '*'
diff --git a/test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol b/test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol
index dfc0b916e..995339921 100644
--- a/test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol
+++ b/test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol
@@ -1,4 +1,4 @@
 library L { }
 using L for *;
 // ----
-// SyntaxError 8118: (14-28): The type has to be specified explicitly at file level (cannot use '*').
+// SyntaxError 8118: (14-28='using L for *;'): The type has to be specified explicitly at file level (cannot use '*').
diff --git a/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol b/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
index df3b3f65f..75acd9e89 100644
--- a/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
+++ b/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
@@ -5,5 +5,5 @@ contract C {
     function g(uint) public { }
 }
 // ----
-// TypeError 4167: (24-25): Only file-level functions and library functions can be bound to a type in a "using" statement
-// TypeError 4167: (27-28): Only file-level functions and library functions can be bound to a type in a "using" statement
+// TypeError 4167: (24-25='f'): Only file-level functions and library functions can be bound to a type in a "using" statement
+// TypeError 4167: (27-28='g'): Only file-level functions and library functions can be bound to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/using/using_non_function.sol b/test/libsolidity/syntaxTests/using/using_non_function.sol
index 32d97345b..02ff40a1b 100644
--- a/test/libsolidity/syntaxTests/using/using_non_function.sol
+++ b/test/libsolidity/syntaxTests/using/using_non_function.sol
@@ -3,4 +3,4 @@ contract C {
     using {x} for uint;
 }
 // ----
-// TypeError 8187: (56-57): Expected function name.
+// TypeError 8187: (56-57='x'): Expected function name.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/do_while.sol b/test/libsolidity/syntaxTests/variableDeclaration/do_while.sol
index 3692b12f7..2d3dbf2ff 100644
--- a/test/libsolidity/syntaxTests/variableDeclaration/do_while.sol
+++ b/test/libsolidity/syntaxTests/variableDeclaration/do_while.sol
@@ -9,4 +9,4 @@ contract C
 	}
 }
 // ----
-// SyntaxError 9079: (81-87): Variable declarations can only be used inside blocks.
+// SyntaxError 9079: (81-87='uint y'): Variable declarations can only be used inside blocks.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/else.sol b/test/libsolidity/syntaxTests/variableDeclaration/else.sol
index ca9d94462..4605e3a04 100644
--- a/test/libsolidity/syntaxTests/variableDeclaration/else.sol
+++ b/test/libsolidity/syntaxTests/variableDeclaration/else.sol
@@ -10,4 +10,4 @@ contract C
 	}
 }
 // ----
-// SyntaxError 9079: (109-115): Variable declarations can only be used inside blocks.
+// SyntaxError 9079: (109-115='uint z'): Variable declarations can only be used inside blocks.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/for.sol b/test/libsolidity/syntaxTests/variableDeclaration/for.sol
index 75fe0eb55..e1c6c39fa 100644
--- a/test/libsolidity/syntaxTests/variableDeclaration/for.sol
+++ b/test/libsolidity/syntaxTests/variableDeclaration/for.sol
@@ -8,4 +8,4 @@ contract C
 	}
 }
 // ----
-// SyntaxError 9079: (107-113): Variable declarations can only be used inside blocks.
+// SyntaxError 9079: (107-113='uint y'): Variable declarations can only be used inside blocks.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/if.sol b/test/libsolidity/syntaxTests/variableDeclaration/if.sol
index 6f65ae1a9..85f15d2b9 100644
--- a/test/libsolidity/syntaxTests/variableDeclaration/if.sol
+++ b/test/libsolidity/syntaxTests/variableDeclaration/if.sol
@@ -8,4 +8,4 @@ contract C
 	}
 }
 // ----
-// SyntaxError 9079: (89-95): Variable declarations can only be used inside blocks.
+// SyntaxError 9079: (89-95='uint y'): Variable declarations can only be used inside blocks.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/illegal_names.sol b/test/libsolidity/syntaxTests/variableDeclaration/illegal_names.sol
index 24d1d98d6..24de5b4f7 100644
--- a/test/libsolidity/syntaxTests/variableDeclaration/illegal_names.sol
+++ b/test/libsolidity/syntaxTests/variableDeclaration/illegal_names.sol
@@ -12,19 +12,19 @@ contract D {
 	struct _ { uint super; }
 }
 // ----
-// DeclarationError 3726: (0-22): The name "this" is reserved.
-// DeclarationError 3726: (24-47): The name "super" is reserved.
-// DeclarationError 3726: (49-68): The name "_" is reserved.
-// DeclarationError 3726: (84-96): The name "this" is reserved.
-// DeclarationError 3726: (99-108): The name "super" is reserved.
-// DeclarationError 3726: (111-141): The name "_" is reserved.
-// DeclarationError 3726: (160-174): The name "this" is reserved.
-// DeclarationError 3726: (177-201): The name "_" is reserved.
-// DeclarationError 3726: (188-198): The name "super" is reserved.
-// Warning 2519: (84-96): This declaration shadows an existing declaration.
-// Warning 2519: (99-108): This declaration shadows an existing declaration.
-// Warning 2519: (111-141): This declaration shadows an existing declaration.
-// Warning 2519: (160-174): This declaration shadows an existing declaration.
-// Warning 2519: (177-201): This declaration shadows an existing declaration.
-// Warning 2319: (0-22): This declaration shadows a builtin symbol.
-// Warning 2319: (24-47): This declaration shadows a builtin symbol.
+// DeclarationError 3726: (0-22='uint constant this = 1'): The name "this" is reserved.
+// DeclarationError 3726: (24-47='uint constant super = 2'): The name "super" is reserved.
+// DeclarationError 3726: (49-68='uint constant _ = 3'): The name "_" is reserved.
+// DeclarationError 3726: (84-96='address this'): The name "this" is reserved.
+// DeclarationError 3726: (99-108='int super'): The name "super" is reserved.
+// DeclarationError 3726: (111-141='mapping (address => address) _'): The name "_" is reserved.
+// DeclarationError 3726: (160-174='address[] this'): The name "this" is reserved.
+// DeclarationError 3726: (177-201='struct _ { uint super; }'): The name "_" is reserved.
+// DeclarationError 3726: (188-198='uint super'): The name "super" is reserved.
+// Warning 2519: (84-96='address this'): This declaration shadows an existing declaration.
+// Warning 2519: (99-108='int super'): This declaration shadows an existing declaration.
+// Warning 2519: (111-141='mapping (address => address) _'): This declaration shadows an existing declaration.
+// Warning 2519: (160-174='address[] this'): This declaration shadows an existing declaration.
+// Warning 2519: (177-201='struct _ { uint super; }'): This declaration shadows an existing declaration.
+// Warning 2319: (0-22='uint constant this = 1'): This declaration shadows a builtin symbol.
+// Warning 2319: (24-47='uint constant super = 2'): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/variableDeclaration/while.sol b/test/libsolidity/syntaxTests/variableDeclaration/while.sol
index e4664b3db..e8c8c2a99 100644
--- a/test/libsolidity/syntaxTests/variableDeclaration/while.sol
+++ b/test/libsolidity/syntaxTests/variableDeclaration/while.sol
@@ -8,4 +8,4 @@ contract C
 	}
 }
 // ----
-// SyntaxError 9079: (92-98): Variable declarations can only be used inside blocks.
+// SyntaxError 9079: (92-98='uint y'): Variable declarations can only be used inside blocks.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol
index 0f434c743..7d9495f01 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol
@@ -8,4 +8,4 @@ contract B is A {
     }
 }
 // ----
-// TypeError 8961: (100-105): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (100-105='A.x()'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol
index 13d0ed913..e5ee21199 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol
@@ -15,7 +15,7 @@ contract B is A {
     }
 }
 // ----
-// TypeError 8961: (107-110): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (166-171): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 2527: (244-247): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (244-249): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (107-110='A.s'): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (166-171='A.s.x'): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 2527: (244-247='A.s'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (244-249='A.s.x'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol
index 1203d2c67..bc5799677 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol
@@ -11,5 +11,5 @@ contract B is A {
     }
 }
 // ----
-// TypeError 2527: (107-110): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (157-160): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 2527: (107-110='A.x'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (157-160='A.x'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol
index 27ba16eaf..3599cbdd4 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol
@@ -5,4 +5,4 @@ contract A {
     }
 }
 // ----
-// TypeError 8961: (88-96): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (88-96='x.push()'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_base_member_array.sol b/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_base_member_array.sol
index 365e07bc7..c238f706d 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_base_member_array.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_base_member_array.sol
@@ -11,7 +11,7 @@ contract B is A {
     }
 }
 // ----
-// TypeError 2527: (109-112): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (109-119): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (188-191): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (188-194): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (109-112='A.x'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (109-119='A.x.length'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (188-191='A.x'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (188-194='A.x[2]'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/assembly_chainid_not_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/assembly_chainid_not_pure.sol
index 2f681ed57..e233a5774 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/assembly_chainid_not_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/assembly_chainid_not_pure.sol
@@ -9,5 +9,5 @@ contract C {
 // ====
 // EVMVersion: >=istanbul
 // ----
-// TypeError 2527: (67-76): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (147-160): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (67-76='chainid()'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (147-160='block.chainid'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/basefee_not_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/basefee_not_pure.sol
index 0d7c19086..2c9490100 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/basefee_not_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/basefee_not_pure.sol
@@ -9,5 +9,5 @@ contract C {
 // ====
 // EVMVersion: >=london
 // ----
-// TypeError 2527: (67-76): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (147-160): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (67-76='basefee()'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (147-160='block.basefee'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
index 76a05d8be..8083e8ae9 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
@@ -20,8 +20,8 @@ contract C {
     }
 }
 // ----
-// TypeError 8961: (52-77): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (132-153): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (201-228): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (293-323): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (414-436): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (52-77='payable(this).transfer(1)'): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (132-153='payable(this).send(2)'): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (201-228='selfdestruct(payable(this))'): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (293-323='address(this).delegatecall("")'): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (414-436='address(this).call("")'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol
index 38762a34a..91aa882ce 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol
@@ -6,5 +6,5 @@ contract C {
     function i() public { x = 2; }
 }
 // ----
-// TypeError 2527: (56-59): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (130-133): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 2527: (56-59='g()'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (130-133='i()'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_success.sol b/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_success.sol
index 858f5d7da..92277db2b 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_success.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_success.sol
@@ -5,9 +5,9 @@ contract C {
     function i() payable public { i(); h(); g(); f(); }
 }
 // ----
-// Warning 5740: (102-105): Unreachable code.
-// Warning 5740: (140-143): Unreachable code.
-// Warning 5740: (145-148): Unreachable code.
-// Warning 5740: (191-194): Unreachable code.
-// Warning 5740: (196-199): Unreachable code.
-// Warning 5740: (201-204): Unreachable code.
+// Warning 5740: (102-105='g()'): Unreachable code.
+// Warning 5740: (140-143='g()'): Unreachable code.
+// Warning 5740: (145-148='f()'): Unreachable code.
+// Warning 5740: (191-194='h()'): Unreachable code.
+// Warning 5740: (196-199='g()'): Unreachable code.
+// Warning 5740: (201-204='f()'): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol
index c934c9093..f6cd50f0d 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol
@@ -3,4 +3,4 @@ contract C {
     function f() public view { new D(); }
 }
 // ----
-// TypeError 8961: (58-65): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (58-65='new D()'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol
index f0ad5efcc..6cbaacb27 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol
@@ -13,6 +13,6 @@ contract C {
     }
 }
 // ----
-// TypeError 8961: (92-103): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 2527: (193-202): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (289-300): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (92-103='nonpayFun()'): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 2527: (193-202='viewFun()'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (289-300='nonpayFun()'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol b/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
index 65030cb30..7968e1e67 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
@@ -8,5 +8,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 8961: (90-109): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (180-197): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (90-109='a.call{gas: 42}("")'): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (180-197='this.h{gas: 42}()'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol
index 3b9054c41..527cf33b5 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol
@@ -11,5 +11,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2527: (100-101): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (184-187): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 2527: (100-101='s'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (184-187='x.a'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol
index ad24e1827..cb4f86797 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol
@@ -8,5 +8,5 @@ contract C is D {
     function g() nonpayablem(0) view public {}
 }
 // ----
-// TypeError 2527: (154-162): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (195-209): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 2527: (154-162='viewm(0)'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (195-209='nonpayablem(0)'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier.sol b/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier.sol
index 9803a04b8..e3be04861 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier.sol
@@ -3,4 +3,4 @@ contract C {
     function f() m(1 ether, msg.value) public pure {}
 }
 // ----
-// TypeError 2527: (118-127): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (118-127='msg.value'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier_view.sol
index ad1ee3d4e..bd0978284 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier_view.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/msg_value_modifier_view.sol
@@ -3,4 +3,4 @@ contract C {
     function f() m(1 ether, msg.value) public view {}
 }
 // ----
-// TypeError 5887: (118-127): "msg.value" and "callvalue()" can only be used in payable public functions. Make the function "payable" or use an internal function to avoid this error.
+// TypeError 5887: (118-127='msg.value'): "msg.value" and "callvalue()" can only be used in payable public functions. Make the function "payable" or use an internal function to avoid this error.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/overriding_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/overriding_fail.sol
index 6ddd708ab..554442c72 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/overriding_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/overriding_fail.sol
@@ -11,6 +11,6 @@ contract C2 is D {
     function g() public override {}
 }
 // ----
-// TypeError 6959: (134-165): Overriding function changes state mutability from "view" to "nonpayable".
+// TypeError 6959: (134-165='function f() public override {}'): Overriding function changes state mutability from "view" to "nonpayable".
 // TypeError 6959: (170-214): Overriding function changes state mutability from "pure" to "view".
-// TypeError 6959: (240-271): Overriding function changes state mutability from "pure" to "nonpayable".
+// TypeError 6959: (240-271='function g() public override {}'): Overriding function changes state mutability from "pure" to "nonpayable".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/read_storage_pure_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/read_storage_pure_fail.sol
index 849ac0a62..50efb1d79 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/read_storage_pure_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/read_storage_pure_fail.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2527: (86-87): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (86-87='x'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/returning_structs_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/returning_structs_fail.sol
index 6acb874d1..d96d48c82 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/returning_structs_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/returning_structs_fail.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2527: (115-116): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (163-168): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (115-116='s'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (163-168='f().x'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/selector_complex.sol b/test/libsolidity/syntaxTests/viewPureChecker/selector_complex.sol
index c071ebadf..5da9f6a5c 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/selector_complex.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/selector_complex.sol
@@ -8,4 +8,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2527: (228-232): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (228-232='this'): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol b/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
index cfb41d320..85e4838e0 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
@@ -8,5 +8,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 8961: (90-111): Function cannot be declared as view because this expression (potentially) modifies the state.
-// TypeError 8961: (182-201): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (90-111='a.call{value: 42}("")'): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (182-201='this.h{value: 42}()'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol
index c3875f411..b4a9dfc0d 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol
@@ -3,4 +3,4 @@ contract C {
     function f() view public { x = 2; }
 }
 // ----
-// TypeError 8961: (56-57): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (56-57='x'): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/visibility/function_no_visibility.sol b/test/libsolidity/syntaxTests/visibility/function_no_visibility.sol
index 75efcc964..644740727 100644
--- a/test/libsolidity/syntaxTests/visibility/function_no_visibility.sol
+++ b/test/libsolidity/syntaxTests/visibility/function_no_visibility.sol
@@ -2,4 +2,4 @@ contract C {
     function f() pure { }
 }
 // ----
-// SyntaxError 4937: (17-38): No visibility specified. Did you intend to add "public"?
+// SyntaxError 4937: (17-38='function f() pure { }'): No visibility specified. Did you intend to add "public"?
diff --git a/test/libsolidity/syntaxTests/visibility/interface/function_default.sol b/test/libsolidity/syntaxTests/visibility/interface/function_default.sol
index 7800b28a8..e8758fa7f 100644
--- a/test/libsolidity/syntaxTests/visibility/interface/function_default.sol
+++ b/test/libsolidity/syntaxTests/visibility/interface/function_default.sol
@@ -2,5 +2,5 @@ interface I {
 	function f();
 }
 // ----
-// SyntaxError 4937: (15-28): No visibility specified. Did you intend to add "external"?
-// TypeError 1560: (15-28): Functions in interfaces must be declared external.
+// SyntaxError 4937: (15-28='function f();'): No visibility specified. Did you intend to add "external"?
+// TypeError 1560: (15-28='function f();'): Functions in interfaces must be declared external.
diff --git a/test/libsolidity/syntaxTests/visibility/interface/function_internal.sol b/test/libsolidity/syntaxTests/visibility/interface/function_internal.sol
index c666cb65f..7244e8e51 100644
--- a/test/libsolidity/syntaxTests/visibility/interface/function_internal.sol
+++ b/test/libsolidity/syntaxTests/visibility/interface/function_internal.sol
@@ -2,4 +2,4 @@ interface I {
 	function f() internal;
 }
 // ----
-// TypeError 1560: (15-37): Functions in interfaces must be declared external.
+// TypeError 1560: (15-37='function f() internal;'): Functions in interfaces must be declared external.
diff --git a/test/libsolidity/syntaxTests/visibility/interface/function_private.sol b/test/libsolidity/syntaxTests/visibility/interface/function_private.sol
index 0cfebdb4a..c88bee605 100644
--- a/test/libsolidity/syntaxTests/visibility/interface/function_private.sol
+++ b/test/libsolidity/syntaxTests/visibility/interface/function_private.sol
@@ -2,4 +2,4 @@ interface I {
 	function f() private;
 }
 // ----
-// TypeError 1560: (15-36): Functions in interfaces must be declared external.
+// TypeError 1560: (15-36='function f() private;'): Functions in interfaces must be declared external.
diff --git a/test/libsolidity/syntaxTests/visibility/interface/function_public.sol b/test/libsolidity/syntaxTests/visibility/interface/function_public.sol
index bf93473e3..6e3f57b3d 100644
--- a/test/libsolidity/syntaxTests/visibility/interface/function_public.sol
+++ b/test/libsolidity/syntaxTests/visibility/interface/function_public.sol
@@ -2,4 +2,4 @@ interface I {
 	function f() public;
 }
 // ----
-// TypeError 1560: (15-35): Functions in interfaces must be declared external.
+// TypeError 1560: (15-35='function f() public;'): Functions in interfaces must be declared external.
diff --git a/test/libsolidity/syntaxTests/visibility/interface/interface_contract_function_default.sol b/test/libsolidity/syntaxTests/visibility/interface/interface_contract_function_default.sol
index 04626df0f..b3cb9d5b2 100644
--- a/test/libsolidity/syntaxTests/visibility/interface/interface_contract_function_default.sol
+++ b/test/libsolidity/syntaxTests/visibility/interface/interface_contract_function_default.sol
@@ -7,6 +7,6 @@ abstract contract C {
     function g() {}
 }
 // ----
-// SyntaxError 4937: (158-171): No visibility specified. Did you intend to add "external"?
-// SyntaxError 4937: (200-215): No visibility specified. Did you intend to add "public"?
-// TypeError 1560: (158-171): Functions in interfaces must be declared external.
+// SyntaxError 4937: (158-171='function f();'): No visibility specified. Did you intend to add "external"?
+// SyntaxError 4937: (200-215='function g() {}'): No visibility specified. Did you intend to add "public"?
+// TypeError 1560: (158-171='function f();'): Functions in interfaces must be declared external.
diff --git a/test/libsolidity/syntaxTests/visibility/library_self_delegatecall.sol b/test/libsolidity/syntaxTests/visibility/library_self_delegatecall.sol
index bc10e1fdb..1abbfd0b8 100644
--- a/test/libsolidity/syntaxTests/visibility/library_self_delegatecall.sol
+++ b/test/libsolidity/syntaxTests/visibility/library_self_delegatecall.sol
@@ -10,4 +10,4 @@ library L2 {
     function g(uint) public pure returns (uint) { return 2; }
 }
 // ----
-// TypeError 6700: (88-93): Libraries cannot call their own functions externally.
+// TypeError 6700: (88-93='r.g()'): Libraries cannot call their own functions externally.
diff --git a/test/libyul/yulSyntaxTests/are_we_perl_yet.yul b/test/libyul/yulSyntaxTests/are_we_perl_yet.yul
index 7a79436b4..a1c521b52 100644
--- a/test/libyul/yulSyntaxTests/are_we_perl_yet.yul
+++ b/test/libyul/yulSyntaxTests/are_we_perl_yet.yul
@@ -4,9 +4,9 @@
     _...(a...)
 }
 // ----
-// SyntaxError 3384: (6-27): "_..." is not a valid identifier (ends with a dot).
-// SyntaxError 7771: (6-27): "_..." is not a valid identifier (contains consecutive dots).
-// SyntaxError 3384: (20-23): "$.." is not a valid identifier (ends with a dot).
-// SyntaxError 7771: (20-23): "$.." is not a valid identifier (contains consecutive dots).
-// SyntaxError 3384: (36-40): "a..." is not a valid identifier (ends with a dot).
-// SyntaxError 7771: (36-40): "a..." is not a valid identifier (contains consecutive dots).
+// SyntaxError 3384: (6-27='function _...($..) {}'): "_..." is not a valid identifier (ends with a dot).
+// SyntaxError 7771: (6-27='function _...($..) {}'): "_..." is not a valid identifier (contains consecutive dots).
+// SyntaxError 3384: (20-23='$..'): "$.." is not a valid identifier (ends with a dot).
+// SyntaxError 7771: (20-23='$..'): "$.." is not a valid identifier (contains consecutive dots).
+// SyntaxError 3384: (36-40='a...'): "a..." is not a valid identifier (ends with a dot).
+// SyntaxError 7771: (36-40='a...'): "a..." is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/assign_from_stack.yul b/test/libyul/yulSyntaxTests/assign_from_stack.yul
index 44f50ab5e..a95b7f817 100644
--- a/test/libyul/yulSyntaxTests/assign_from_stack.yul
+++ b/test/libyul/yulSyntaxTests/assign_from_stack.yul
@@ -1,3 +1,3 @@
 { =: x:u256 }
 // ----
-// ParserError 1856: (2-3): Literal or identifier expected.
+// ParserError 1856: (2-3='='): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/assignment_duplicate_vars.yul b/test/libyul/yulSyntaxTests/assignment_duplicate_vars.yul
index 9bb725fd6..7bdfb2c4d 100644
--- a/test/libyul/yulSyntaxTests/assignment_duplicate_vars.yul
+++ b/test/libyul/yulSyntaxTests/assignment_duplicate_vars.yul
@@ -6,5 +6,5 @@
   y, x, y := g()
 }
 // ----
-// DeclarationError 9005: (70-81): Variable x occurs multiple times on the left-hand side of the assignment.
-// DeclarationError 9005: (84-98): Variable y occurs multiple times on the left-hand side of the assignment.
+// DeclarationError 9005: (70-81='x, x := f()'): Variable x occurs multiple times on the left-hand side of the assignment.
+// DeclarationError 9005: (84-98='y, x, y := g()'): Variable y occurs multiple times on the left-hand side of the assignment.
diff --git a/test/libyul/yulSyntaxTests/assignment_fail.yul b/test/libyul/yulSyntaxTests/assignment_fail.yul
index 1bcf3fbb3..26e1ba401 100644
--- a/test/libyul/yulSyntaxTests/assignment_fail.yul
+++ b/test/libyul/yulSyntaxTests/assignment_fail.yul
@@ -8,5 +8,5 @@
 // ====
 // dialect: evmTyped
 // ----
-// TypeError 9547: (51-52): Assigning a value of type "u256" to a variable of type "bool".
-// TypeError 9547: (62-63): Assigning a value of type "bool" to a variable of type "u256".
+// TypeError 9547: (51-52='z'): Assigning a value of type "u256" to a variable of type "bool".
+// TypeError 9547: (62-63='y'): Assigning a value of type "bool" to a variable of type "u256".
diff --git a/test/libyul/yulSyntaxTests/assignment_of_function.yul b/test/libyul/yulSyntaxTests/assignment_of_function.yul
index e1ddfd604..09e4dbe50 100644
--- a/test/libyul/yulSyntaxTests/assignment_of_function.yul
+++ b/test/libyul/yulSyntaxTests/assignment_of_function.yul
@@ -3,4 +3,4 @@
     let x := f
 }
 // ----
-// TypeError 6041: (35-36): Function f used without being called.
+// TypeError 6041: (35-36='f'): Function f used without being called.
diff --git a/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul b/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul
index 1d0f997e6..1ed2195d8 100644
--- a/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul
+++ b/test/libyul/yulSyntaxTests/break_outside_of_for_loop.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError 2592: (22-27): Keyword "break" needs to be inside a for-loop body.
+// SyntaxError 2592: (22-27='break'): Keyword "break" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/builtin_function_literal.yul b/test/libyul/yulSyntaxTests/builtin_function_literal.yul
index 22f721614..3f7e9716f 100644
--- a/test/libyul/yulSyntaxTests/builtin_function_literal.yul
+++ b/test/libyul/yulSyntaxTests/builtin_function_literal.yul
@@ -2,6 +2,6 @@
   datasize(x,1)
 }
 // ----
-// TypeError 7000: (4-12): Function "datasize" expects 1 arguments but got 2.
-// TypeError 9114: (4-12): Function expects direct literals as arguments.
-// DeclarationError 8198: (13-14): Identifier "x" not found.
+// TypeError 7000: (4-12='datasize'): Function "datasize" expects 1 arguments but got 2.
+// TypeError 9114: (4-12='datasize'): Function expects direct literals as arguments.
+// DeclarationError 8198: (13-14='x'): Identifier "x" not found.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_1.yul b/test/libyul/yulSyntaxTests/builtin_identifier_1.yul
index 3fbe25c08..69b75c0a3 100644
--- a/test/libyul/yulSyntaxTests/builtin_identifier_1.yul
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_1.yul
@@ -2,4 +2,4 @@
 	let add := 6
 }
 // ----
-// ParserError 5568: (7-10): Cannot use builtin function name "add" as identifier name.
+// ParserError 5568: (7-10='add'): Cannot use builtin function name "add" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_2.yul b/test/libyul/yulSyntaxTests/builtin_identifier_2.yul
index 3c9f60955..9f2ef4cd3 100644
--- a/test/libyul/yulSyntaxTests/builtin_identifier_2.yul
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_2.yul
@@ -2,4 +2,4 @@
 	function add() {}
 }
 // ----
-// ParserError 5568: (12-15): Cannot use builtin function name "add" as identifier name.
+// ParserError 5568: (12-15='add'): Cannot use builtin function name "add" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_3.yul b/test/libyul/yulSyntaxTests/builtin_identifier_3.yul
index c7969b8ef..4a792bf01 100644
--- a/test/libyul/yulSyntaxTests/builtin_identifier_3.yul
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_3.yul
@@ -2,4 +2,4 @@
 	function f(x) { f(add) }
 }
 // ----
-// ParserError 7104: (21-24): Builtin function "add" must be called.
+// ParserError 7104: (21-24='add'): Builtin function "add" must be called.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_4.yul b/test/libyul/yulSyntaxTests/builtin_identifier_4.yul
index 4e1bcc080..f3dbf88cc 100644
--- a/test/libyul/yulSyntaxTests/builtin_identifier_4.yul
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_4.yul
@@ -2,4 +2,4 @@
 	function f(add) {}
 }
 // ----
-// ParserError 5568: (14-17): Cannot use builtin function name "add" as identifier name.
+// ParserError 5568: (14-17='add'): Cannot use builtin function name "add" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_5.yul b/test/libyul/yulSyntaxTests/builtin_identifier_5.yul
index 314cc8bbb..ce7a86d94 100644
--- a/test/libyul/yulSyntaxTests/builtin_identifier_5.yul
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_5.yul
@@ -2,4 +2,4 @@
 	function f() -> add {}
 }
 // ----
-// ParserError 5568: (19-22): Cannot use builtin function name "add" as identifier name.
+// ParserError 5568: (19-22='add'): Cannot use builtin function name "add" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_6.yul b/test/libyul/yulSyntaxTests/builtin_identifier_6.yul
index e261354fc..a4458acad 100644
--- a/test/libyul/yulSyntaxTests/builtin_identifier_6.yul
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_6.yul
@@ -2,4 +2,4 @@
 	add := 1
 }
 // ----
-// ParserError 6272: (7-9): Cannot assign to builtin function "add".
+// ParserError 6272: (7-9=':='): Cannot assign to builtin function "add".
diff --git a/test/libyul/yulSyntaxTests/builtin_identifier_7.yul b/test/libyul/yulSyntaxTests/builtin_identifier_7.yul
index c34da0363..a6ad3867a 100644
--- a/test/libyul/yulSyntaxTests/builtin_identifier_7.yul
+++ b/test/libyul/yulSyntaxTests/builtin_identifier_7.yul
@@ -3,4 +3,4 @@
 	add, mul := f()
 }
 // ----
-// ParserError 6272: (31-32): Cannot assign to builtin function "add".
+// ParserError 6272: (31-32=','): Cannot assign to builtin function "add".
diff --git a/test/libyul/yulSyntaxTests/call_literal.yul b/test/libyul/yulSyntaxTests/call_literal.yul
index d1516f0ec..c8b2cacba 100644
--- a/test/libyul/yulSyntaxTests/call_literal.yul
+++ b/test/libyul/yulSyntaxTests/call_literal.yul
@@ -2,4 +2,4 @@
     1()
 }
 // ----
-// ParserError 9980: (7-8): Function name expected.
+// ParserError 9980: (7-8='('): Function name expected.
diff --git a/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul b/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul
index c12f7945d..0653551df 100644
--- a/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul
+++ b/test/libyul/yulSyntaxTests/continue_outside_of_for_loop.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError 2592: (22-30): Keyword "continue" needs to be inside a for-loop body.
+// SyntaxError 2592: (22-30='continue'): Keyword "continue" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/datacopy_shadowing.yul b/test/libyul/yulSyntaxTests/datacopy_shadowing.yul
index 3f14f4722..715bcce9d 100644
--- a/test/libyul/yulSyntaxTests/datacopy_shadowing.yul
+++ b/test/libyul/yulSyntaxTests/datacopy_shadowing.yul
@@ -2,4 +2,4 @@
     function datacopy(a, b, c) {}
 }
 // ----
-// ParserError 5568: (15-23): Cannot use builtin function name "datacopy" as identifier name.
+// ParserError 5568: (15-23='datacopy'): Cannot use builtin function name "datacopy" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/dataoffset_shadowing.yul b/test/libyul/yulSyntaxTests/dataoffset_shadowing.yul
index fb32fb61c..1e9ea19ff 100644
--- a/test/libyul/yulSyntaxTests/dataoffset_shadowing.yul
+++ b/test/libyul/yulSyntaxTests/dataoffset_shadowing.yul
@@ -2,4 +2,4 @@
     function dataoffset(a) -> b {}
 }
 // ----
-// ParserError 5568: (15-25): Cannot use builtin function name "dataoffset" as identifier name.
+// ParserError 5568: (15-25='dataoffset'): Cannot use builtin function name "dataoffset" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/datasize_shadowing.yul b/test/libyul/yulSyntaxTests/datasize_shadowing.yul
index 379401754..806dc1e9a 100644
--- a/test/libyul/yulSyntaxTests/datasize_shadowing.yul
+++ b/test/libyul/yulSyntaxTests/datasize_shadowing.yul
@@ -2,4 +2,4 @@
     function datasize(a) -> b {}
 }
 // ----
-// ParserError 5568: (15-23): Cannot use builtin function name "datasize" as identifier name.
+// ParserError 5568: (15-23='datasize'): Cannot use builtin function name "datasize" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/declaration_duplicate_vars.yul b/test/libyul/yulSyntaxTests/declaration_duplicate_vars.yul
index 7f786ac9a..55cf7f2df 100644
--- a/test/libyul/yulSyntaxTests/declaration_duplicate_vars.yul
+++ b/test/libyul/yulSyntaxTests/declaration_duplicate_vars.yul
@@ -3,4 +3,4 @@
   let x, x := f()
 }
 // ----
-// DeclarationError 1395: (30-45): Variable name x already taken in this scope.
+// DeclarationError 1395: (30-45='let x, x := f()'): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/dot_consecutive_function.yul b/test/libyul/yulSyntaxTests/dot_consecutive_function.yul
index 3d58fd47d..3eea9c1b7 100644
--- a/test/libyul/yulSyntaxTests/dot_consecutive_function.yul
+++ b/test/libyul/yulSyntaxTests/dot_consecutive_function.yul
@@ -2,4 +2,4 @@
     function x..y() {}
 }
 // ----
-// SyntaxError 7771: (6-24): "x..y" is not a valid identifier (contains consecutive dots).
+// SyntaxError 7771: (6-24='function x..y() {}'): "x..y" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_consecutive_function_arg.yul b/test/libyul/yulSyntaxTests/dot_consecutive_function_arg.yul
index 150b81405..1da02501f 100644
--- a/test/libyul/yulSyntaxTests/dot_consecutive_function_arg.yul
+++ b/test/libyul/yulSyntaxTests/dot_consecutive_function_arg.yul
@@ -2,4 +2,4 @@
     function x(a..b) {}
 }
 // ----
-// SyntaxError 7771: (17-21): "a..b" is not a valid identifier (contains consecutive dots).
+// SyntaxError 7771: (17-21='a..b'): "a..b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_consecutive_function_ret.yul b/test/libyul/yulSyntaxTests/dot_consecutive_function_ret.yul
index 0d3a7be3f..d0593510b 100644
--- a/test/libyul/yulSyntaxTests/dot_consecutive_function_ret.yul
+++ b/test/libyul/yulSyntaxTests/dot_consecutive_function_ret.yul
@@ -2,4 +2,4 @@
     function x() -> a..b {}
 }
 // ----
-// SyntaxError 7771: (22-26): "a..b" is not a valid identifier (contains consecutive dots).
+// SyntaxError 7771: (22-26='a..b'): "a..b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_consecutive_variabledeclaration.yul b/test/libyul/yulSyntaxTests/dot_consecutive_variabledeclaration.yul
index d426a7b7d..27010cc1f 100644
--- a/test/libyul/yulSyntaxTests/dot_consecutive_variabledeclaration.yul
+++ b/test/libyul/yulSyntaxTests/dot_consecutive_variabledeclaration.yul
@@ -2,4 +2,4 @@
     let a..b := 1
 }
 // ----
-// SyntaxError 7771: (10-14): "a..b" is not a valid identifier (contains consecutive dots).
+// SyntaxError 7771: (10-14='a..b'): "a..b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_ellipse_function.yul b/test/libyul/yulSyntaxTests/dot_ellipse_function.yul
index ebfa0f579..a3877cd69 100644
--- a/test/libyul/yulSyntaxTests/dot_ellipse_function.yul
+++ b/test/libyul/yulSyntaxTests/dot_ellipse_function.yul
@@ -2,4 +2,4 @@
     function x...y() {}
 }
 // ----
-// SyntaxError 7771: (6-25): "x...y" is not a valid identifier (contains consecutive dots).
+// SyntaxError 7771: (6-25='function x...y() {}'): "x...y" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_ellipse_function_arg.yul b/test/libyul/yulSyntaxTests/dot_ellipse_function_arg.yul
index 75298aa0e..21d9dd06c 100644
--- a/test/libyul/yulSyntaxTests/dot_ellipse_function_arg.yul
+++ b/test/libyul/yulSyntaxTests/dot_ellipse_function_arg.yul
@@ -2,4 +2,4 @@
     function x(a...b) {}
 }
 // ----
-// SyntaxError 7771: (17-22): "a...b" is not a valid identifier (contains consecutive dots).
+// SyntaxError 7771: (17-22='a...b'): "a...b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_ellipse_function_ret.yul b/test/libyul/yulSyntaxTests/dot_ellipse_function_ret.yul
index 7d1b95155..c370d41ec 100644
--- a/test/libyul/yulSyntaxTests/dot_ellipse_function_ret.yul
+++ b/test/libyul/yulSyntaxTests/dot_ellipse_function_ret.yul
@@ -2,4 +2,4 @@
     function x() -> a...b {}
 }
 // ----
-// SyntaxError 7771: (22-27): "a...b" is not a valid identifier (contains consecutive dots).
+// SyntaxError 7771: (22-27='a...b'): "a...b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_ellipse_variabledeclaration.yul b/test/libyul/yulSyntaxTests/dot_ellipse_variabledeclaration.yul
index c772073cd..e76b26931 100644
--- a/test/libyul/yulSyntaxTests/dot_ellipse_variabledeclaration.yul
+++ b/test/libyul/yulSyntaxTests/dot_ellipse_variabledeclaration.yul
@@ -2,4 +2,4 @@
     let a...b := 1
 }
 // ----
-// SyntaxError 7771: (10-15): "a...b" is not a valid identifier (contains consecutive dots).
+// SyntaxError 7771: (10-15='a...b'): "a...b" is not a valid identifier (contains consecutive dots).
diff --git a/test/libyul/yulSyntaxTests/dot_leading_function.yul b/test/libyul/yulSyntaxTests/dot_leading_function.yul
index 0c9581ec4..73cab4690 100644
--- a/test/libyul/yulSyntaxTests/dot_leading_function.yul
+++ b/test/libyul/yulSyntaxTests/dot_leading_function.yul
@@ -2,4 +2,4 @@
     function .x() {}
 }
 // ----
-// ParserError 2314: (15-16): Expected identifier but got '.'
+// ParserError 2314: (15-16='.'): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/dot_leading_function_arg.yul b/test/libyul/yulSyntaxTests/dot_leading_function_arg.yul
index 93c8afa6f..ef865313a 100644
--- a/test/libyul/yulSyntaxTests/dot_leading_function_arg.yul
+++ b/test/libyul/yulSyntaxTests/dot_leading_function_arg.yul
@@ -2,4 +2,4 @@
     function x(.a) {}
 }
 // ----
-// ParserError 2314: (17-18): Expected identifier but got '.'
+// ParserError 2314: (17-18='.'): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/dot_leading_function_ret.yul b/test/libyul/yulSyntaxTests/dot_leading_function_ret.yul
index c516fd647..2430b8738 100644
--- a/test/libyul/yulSyntaxTests/dot_leading_function_ret.yul
+++ b/test/libyul/yulSyntaxTests/dot_leading_function_ret.yul
@@ -2,4 +2,4 @@
     function x() -> .a {}
 }
 // ----
-// ParserError 2314: (22-23): Expected identifier but got '.'
+// ParserError 2314: (22-23='.'): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/dot_leading_variabledeclaration.yul b/test/libyul/yulSyntaxTests/dot_leading_variabledeclaration.yul
index b0f86d36d..b6d4ed69a 100644
--- a/test/libyul/yulSyntaxTests/dot_leading_variabledeclaration.yul
+++ b/test/libyul/yulSyntaxTests/dot_leading_variabledeclaration.yul
@@ -2,4 +2,4 @@
     let .a := 1
 }
 // ----
-// ParserError 2314: (10-11): Expected identifier but got '.'
+// ParserError 2314: (10-11='.'): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/dot_trailing_function.yul b/test/libyul/yulSyntaxTests/dot_trailing_function.yul
index c3b151e89..69b34ac0a 100644
--- a/test/libyul/yulSyntaxTests/dot_trailing_function.yul
+++ b/test/libyul/yulSyntaxTests/dot_trailing_function.yul
@@ -2,4 +2,4 @@
     function x.() {}
 }
 // ----
-// SyntaxError 3384: (6-22): "x." is not a valid identifier (ends with a dot).
+// SyntaxError 3384: (6-22='function x.() {}'): "x." is not a valid identifier (ends with a dot).
diff --git a/test/libyul/yulSyntaxTests/dot_trailing_function_arg.yul b/test/libyul/yulSyntaxTests/dot_trailing_function_arg.yul
index c81c18446..bad0e6ebe 100644
--- a/test/libyul/yulSyntaxTests/dot_trailing_function_arg.yul
+++ b/test/libyul/yulSyntaxTests/dot_trailing_function_arg.yul
@@ -2,4 +2,4 @@
     function x(a.) {}
 }
 // ----
-// SyntaxError 3384: (17-19): "a." is not a valid identifier (ends with a dot).
+// SyntaxError 3384: (17-19='a.'): "a." is not a valid identifier (ends with a dot).
diff --git a/test/libyul/yulSyntaxTests/dot_trailing_function_ret.yul b/test/libyul/yulSyntaxTests/dot_trailing_function_ret.yul
index adfa02410..5c39af101 100644
--- a/test/libyul/yulSyntaxTests/dot_trailing_function_ret.yul
+++ b/test/libyul/yulSyntaxTests/dot_trailing_function_ret.yul
@@ -2,4 +2,4 @@
     function x() -> a. {}
 }
 // ----
-// SyntaxError 3384: (22-24): "a." is not a valid identifier (ends with a dot).
+// SyntaxError 3384: (22-24='a.'): "a." is not a valid identifier (ends with a dot).
diff --git a/test/libyul/yulSyntaxTests/dot_trailing_variabledeclaration.yul b/test/libyul/yulSyntaxTests/dot_trailing_variabledeclaration.yul
index cc86ca23e..24beaf88b 100644
--- a/test/libyul/yulSyntaxTests/dot_trailing_variabledeclaration.yul
+++ b/test/libyul/yulSyntaxTests/dot_trailing_variabledeclaration.yul
@@ -2,4 +2,4 @@
     let a. := 1
 }
 // ----
-// SyntaxError 3384: (10-12): "a." is not a valid identifier (ends with a dot).
+// SyntaxError 3384: (10-12='a.'): "a." is not a valid identifier (ends with a dot).
diff --git a/test/libyul/yulSyntaxTests/empty_call.yul b/test/libyul/yulSyntaxTests/empty_call.yul
index 30491c114..0c9188068 100644
--- a/test/libyul/yulSyntaxTests/empty_call.yul
+++ b/test/libyul/yulSyntaxTests/empty_call.yul
@@ -1,3 +1,3 @@
 { () }
 // ----
-// ParserError 1856: (2-3): Literal or identifier expected.
+// ParserError 1856: (2-3='('): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_1.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_1.yul
index 00f0a4d58..9934ae296 100644
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_1.yul
+++ b/test/libyul/yulSyntaxTests/for_expr_invalid_1.yul
@@ -2,4 +2,4 @@
 	for {} {} {} {}
 }
 // ----
-// ParserError 1856: (10-11): Literal or identifier expected.
+// ParserError 1856: (10-11='{'): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_2.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_2.yul
index d4d801204..504cfbb0e 100644
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_2.yul
+++ b/test/libyul/yulSyntaxTests/for_expr_invalid_2.yul
@@ -2,4 +2,4 @@
 	for 1 1 {} {}
 }
 // ----
-// ParserError 2314: (7-8): Expected '{' but got 'Number'
+// ParserError 2314: (7-8='1'): Expected '{' but got 'Number'
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_3.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_3.yul
index 8f8268659..8bb615335 100644
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_3.yul
+++ b/test/libyul/yulSyntaxTests/for_expr_invalid_3.yul
@@ -2,4 +2,4 @@
 	for {} 1 1 {}
 }
 // ----
-// ParserError 2314: (12-13): Expected '{' but got 'Number'
+// ParserError 2314: (12-13='1'): Expected '{' but got 'Number'
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_4.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_4.yul
index abd2260d7..ffc2d859a 100644
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_4.yul
+++ b/test/libyul/yulSyntaxTests/for_expr_invalid_4.yul
@@ -2,4 +2,4 @@
 	for {} 1 {} 1
 }
 // ----
-// ParserError 2314: (15-16): Expected '{' but got 'Number'
+// ParserError 2314: (15-16='1'): Expected '{' but got 'Number'
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul
index 5d739e81e..58ad8b4e1 100644
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul
+++ b/test/libyul/yulSyntaxTests/for_expr_invalid_5.yul
@@ -2,4 +2,4 @@
 	for {} mload {} {}
 }
 // ----
-// ParserError 7104: (10-15): Builtin function "mload" must be called.
+// ParserError 7104: (10-15='mload'): Builtin function "mload" must be called.
diff --git a/test/libyul/yulSyntaxTests/for_expr_invalid_6.yul b/test/libyul/yulSyntaxTests/for_expr_invalid_6.yul
index 42883052e..9d6888148 100644
--- a/test/libyul/yulSyntaxTests/for_expr_invalid_6.yul
+++ b/test/libyul/yulSyntaxTests/for_expr_invalid_6.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// TypeError 3950: (10-22): Expected expression to evaluate to one value, but got 0 values instead.
+// TypeError 3950: (10-22='mstore(1, 1)'): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libyul/yulSyntaxTests/for_loop_condition_fail.yul b/test/libyul/yulSyntaxTests/for_loop_condition_fail.yul
index 98a52bf24..86c60a7dd 100644
--- a/test/libyul/yulSyntaxTests/for_loop_condition_fail.yul
+++ b/test/libyul/yulSyntaxTests/for_loop_condition_fail.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// TypeError 1733: (23-24): Expected a value of boolean type "bool" but got "u256"
+// TypeError 1733: (23-24='x'): Expected a value of boolean type "bool" but got "u256"
diff --git a/test/libyul/yulSyntaxTests/for_loop_condition_fail_ewasm.yul b/test/libyul/yulSyntaxTests/for_loop_condition_fail_ewasm.yul
index ec7a162dc..d31840bce 100644
--- a/test/libyul/yulSyntaxTests/for_loop_condition_fail_ewasm.yul
+++ b/test/libyul/yulSyntaxTests/for_loop_condition_fail_ewasm.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: ewasm
 // ----
-// TypeError 1733: (23-24): Expected a value of boolean type "i32" but got "i64"
+// TypeError 1733: (23-24='x'): Expected a value of boolean type "i32" but got "i64"
diff --git a/test/libyul/yulSyntaxTests/for_statement_break_init.yul b/test/libyul/yulSyntaxTests/for_statement_break_init.yul
index 7fb15faf0..115948324 100644
--- a/test/libyul/yulSyntaxTests/for_statement_break_init.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_break_init.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError 9615: (31-36): Keyword "break" in for-loop init block is not allowed.
+// SyntaxError 9615: (31-36='break'): Keyword "break" in for-loop init block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_break_post.yul b/test/libyul/yulSyntaxTests/for_statement_break_post.yul
index 93d1475d0..82b002f68 100644
--- a/test/libyul/yulSyntaxTests/for_statement_break_post.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_break_post.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError 2461: (51-56): Keyword "break" in for-loop post block is not allowed.
+// SyntaxError 2461: (51-56='break'): Keyword "break" in for-loop post block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul b/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul
index eca0d4692..b5e30bd30 100644
--- a/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_continue_fail_init.yul
@@ -7,4 +7,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError 9615: (31-39): Keyword "continue" in for-loop init block is not allowed.
+// SyntaxError 9615: (31-39='continue'): Keyword "continue" in for-loop init block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul b/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul
index 7362b38b2..34763b2af 100644
--- a/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_continue_fail_post.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError 2461: (50-58): Keyword "continue" in for-loop post block is not allowed.
+// SyntaxError 2461: (50-58='continue'): Keyword "continue" in for-loop post block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul b/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul
index 1ff20943f..05567e022 100644
--- a/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_continue_nested_init_in_body.yul
@@ -8,4 +8,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError 9615: (39-47): Keyword "continue" in for-loop init block is not allowed.
+// SyntaxError 9615: (39-47='continue'): Keyword "continue" in for-loop init block is not allowed.
diff --git a/test/libyul/yulSyntaxTests/for_statement_nested_break.yul b/test/libyul/yulSyntaxTests/for_statement_nested_break.yul
index ae3fd9da4..c7db9c106 100644
--- a/test/libyul/yulSyntaxTests/for_statement_nested_break.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_nested_break.yul
@@ -8,4 +8,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError 2592: (57-62): Keyword "break" needs to be inside a for-loop body.
+// SyntaxError 2592: (57-62='break'): Keyword "break" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul b/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul
index 8e7eca428..05c58c6c2 100644
--- a/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul
+++ b/test/libyul/yulSyntaxTests/for_statement_nested_continue.yul
@@ -7,4 +7,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError 2592: (61-69): Keyword "continue" needs to be inside a for-loop body.
+// SyntaxError 2592: (61-69='continue'): Keyword "continue" needs to be inside a for-loop body.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_2.yul b/test/libyul/yulSyntaxTests/for_visibility_2.yul
index 2cf365bac..96e13d1e8 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_2.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_2.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// DeclarationError 8198: (10-11): Identifier "i" not found.
+// DeclarationError 8198: (10-11='i'): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_3.yul b/test/libyul/yulSyntaxTests/for_visibility_3.yul
index 5886e5336..441e9972d 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_3.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_3.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// DeclarationError 8198: (33-34): Identifier "i" not found.
+// DeclarationError 8198: (33-34='i'): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_4.yul b/test/libyul/yulSyntaxTests/for_visibility_4.yul
index 38edc270f..be252c648 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_4.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_4.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// DeclarationError 8198: (18-19): Identifier "i" not found.
+// DeclarationError 8198: (18-19='i'): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_5.yul b/test/libyul/yulSyntaxTests/for_visibility_5.yul
index af5b35952..a49b9d3be 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_5.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_5.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// DeclarationError 8198: (13-14): Identifier "i" not found.
+// DeclarationError 8198: (13-14='i'): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_6.yul b/test/libyul/yulSyntaxTests/for_visibility_6.yul
index ccec08c19..64d4272e1 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_6.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_6.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// DeclarationError 8198: (13-14): Identifier "i" not found.
+// DeclarationError 8198: (13-14='i'): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_7.yul b/test/libyul/yulSyntaxTests/for_visibility_7.yul
index e08e8bb74..5dbcf8bb9 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_7.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_7.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// DeclarationError 8198: (10-11): Identifier "i" not found.
+// DeclarationError 8198: (10-11='i'): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_8.yul b/test/libyul/yulSyntaxTests/for_visibility_8.yul
index 38edc270f..be252c648 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_8.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_8.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// DeclarationError 8198: (18-19): Identifier "i" not found.
+// DeclarationError 8198: (18-19='i'): Identifier "i" not found.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_9.yul b/test/libyul/yulSyntaxTests/for_visibility_9.yul
index 4cda1b165..10ed23155 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_9.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_9.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: yul
 // ----
-// DeclarationError 1395: (26-36): Variable name x already taken in this scope.
+// DeclarationError 1395: (26-36='let x := 1'): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_A.yul b/test/libyul/yulSyntaxTests/for_visibility_A.yul
index a5761f52a..c53bb557c 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_A.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_A.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: yul
 // ----
-// DeclarationError 1395: (29-39): Variable name x already taken in this scope.
+// DeclarationError 1395: (29-39='let x := 1'): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_B.yul b/test/libyul/yulSyntaxTests/for_visibility_B.yul
index d315a611d..a06ec725b 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_B.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_B.yul
@@ -2,4 +2,4 @@
 	let x := 1 for { let x := 1 } 1 {} {}
 }
 // ----
-// DeclarationError 1395: (20-30): Variable name x already taken in this scope.
+// DeclarationError 1395: (20-30='let x := 1'): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_C.yul b/test/libyul/yulSyntaxTests/for_visibility_C.yul
index 81741fe7b..5620cf141 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_C.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_C.yul
@@ -2,4 +2,4 @@
 	let x := 1 for {} 1 { let x := 1 } {}
 }
 // ----
-// DeclarationError 1395: (25-35): Variable name x already taken in this scope.
+// DeclarationError 1395: (25-35='let x := 1'): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/for_visibility_D.yul b/test/libyul/yulSyntaxTests/for_visibility_D.yul
index 409b10399..660fe27e0 100644
--- a/test/libyul/yulSyntaxTests/for_visibility_D.yul
+++ b/test/libyul/yulSyntaxTests/for_visibility_D.yul
@@ -2,4 +2,4 @@
 	let x := 1 for {} 1 {} { let x := 1 }
 }
 // ----
-// DeclarationError 1395: (28-38): Variable name x already taken in this scope.
+// DeclarationError 1395: (28-38='let x := 1'): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul
index 6e616630a..bf7b2e2f5 100644
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul
+++ b/test/libyul/yulSyntaxTests/function_defined_in_init_block_3.yul
@@ -2,4 +2,4 @@
 	for { function f() {} } 1:bool {} {}
 }
 // ----
-// SyntaxError 3441: (9-17): Functions cannot be defined inside a for-loop init block.
+// SyntaxError 3441: (9-17='function'): Functions cannot be defined inside a for-loop init block.
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul
index f5f3accd2..9821bfab7 100644
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul
+++ b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_2.yul
@@ -2,4 +2,4 @@
 	for { for {function foo() {}} 1:bool {} {} } 1:bool {} {}
 }
 // ----
-// SyntaxError 3441: (14-22): Functions cannot be defined inside a for-loop init block.
+// SyntaxError 3441: (14-22='function'): Functions cannot be defined inside a for-loop init block.
diff --git a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul
index d3a794c0a..d3202fa5b 100644
--- a/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul
+++ b/test/libyul/yulSyntaxTests/function_defined_in_init_nested_3.yul
@@ -5,4 +5,4 @@
 	{}
 }
 // ----
-// SyntaxError 3441: (27-35): Functions cannot be defined inside a for-loop init block.
+// SyntaxError 3441: (27-35='function'): Functions cannot be defined inside a for-loop init block.
diff --git a/test/libyul/yulSyntaxTests/function_definition_whitespace.yul b/test/libyul/yulSyntaxTests/function_definition_whitespace.yul
index 1c397982b..0601c170e 100644
--- a/test/libyul/yulSyntaxTests/function_definition_whitespace.yul
+++ b/test/libyul/yulSyntaxTests/function_definition_whitespace.yul
@@ -3,4 +3,4 @@
     }
 }
 // ----
-// ParserError 2314: (30-31): Expected '{' but got '-'
+// ParserError 2314: (30-31='-'): Expected '{' but got '-'
diff --git a/test/libyul/yulSyntaxTests/function_literal.yul b/test/libyul/yulSyntaxTests/function_literal.yul
index 80037dabf..4c85be8aa 100644
--- a/test/libyul/yulSyntaxTests/function_literal.yul
+++ b/test/libyul/yulSyntaxTests/function_literal.yul
@@ -3,4 +3,4 @@
   f(x,1)
 }
 // ----
-// DeclarationError 8198: (27-28): Identifier "x" not found.
+// DeclarationError 8198: (27-28='x'): Identifier "x" not found.
diff --git a/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul b/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul
index f7fb87278..9bdee7278 100644
--- a/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul
+++ b/test/libyul/yulSyntaxTests/function_shadowing_outside_vars_2.yul
@@ -3,4 +3,4 @@
 	function f() -> x:u256 {}
 }
 // ----
-// DeclarationError 1395: (15-40): Variable name x already taken in this scope.
+// DeclarationError 1395: (15-40='function f() -> x:u256 {}'): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/functional_partial.yul b/test/libyul/yulSyntaxTests/functional_partial.yul
index ea28283d4..6d0b4cedc 100644
--- a/test/libyul/yulSyntaxTests/functional_partial.yul
+++ b/test/libyul/yulSyntaxTests/functional_partial.yul
@@ -2,4 +2,4 @@
     let x := byte
 }
 // ----
-// ParserError 7104: (15-19): Builtin function "byte" must be called.
+// ParserError 7104: (15-19='byte'): Builtin function "byte" must be called.
diff --git a/test/libyul/yulSyntaxTests/hex_string_literal_odd.yul b/test/libyul/yulSyntaxTests/hex_string_literal_odd.yul
index e21bf6c59..d7771e690 100644
--- a/test/libyul/yulSyntaxTests/hex_string_literal_odd.yul
+++ b/test/libyul/yulSyntaxTests/hex_string_literal_odd.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// ParserError 1465: (18-24): Illegal token: Expected even number of hex-nibbles.
+// ParserError 1465: (18-24='hex"ab'): Illegal token: Expected even number of hex-nibbles.
diff --git a/test/libyul/yulSyntaxTests/if_statement_fail_1.yul b/test/libyul/yulSyntaxTests/if_statement_fail_1.yul
index 6fc409ce3..e98cd5977 100644
--- a/test/libyul/yulSyntaxTests/if_statement_fail_1.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_fail_1.yul
@@ -2,4 +2,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// ParserError 1856: (5-8): Literal or identifier expected.
+// ParserError 1856: (5-8='let'): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/if_statement_fail_2.yul b/test/libyul/yulSyntaxTests/if_statement_fail_2.yul
index 97ce0e9f9..a014260cb 100644
--- a/test/libyul/yulSyntaxTests/if_statement_fail_2.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_fail_2.yul
@@ -2,4 +2,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// ParserError 2314: (15-18): Expected '{' but got reserved keyword 'let'
+// ParserError 2314: (15-18='let'): Expected '{' but got reserved keyword 'let'
diff --git a/test/libyul/yulSyntaxTests/if_statement_fail_3.yul b/test/libyul/yulSyntaxTests/if_statement_fail_3.yul
index 51e36790b..e44818da1 100644
--- a/test/libyul/yulSyntaxTests/if_statement_fail_3.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_fail_3.yul
@@ -2,4 +2,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// TypeError 1733: (5-12): Expected a value of boolean type "bool" but got "u256"
+// TypeError 1733: (5-12='42:u256'): Expected a value of boolean type "bool" but got "u256"
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul
index 0a4f33844..4047d86ed 100644
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_invalid_1.yul
@@ -2,4 +2,4 @@
     if mload {}
 }
 // ----
-// ParserError 7104: (9-14): Builtin function "mload" must be called.
+// ParserError 7104: (9-14='mload'): Builtin function "mload" must be called.
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_2.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_2.yul
index 4e7970490..511d93d8c 100644
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_2.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_invalid_2.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// TypeError 3950: (6-18): Expected expression to evaluate to one value, but got 0 values instead.
+// TypeError 3950: (6-18='mstore(1, 1)'): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul
index fa396456f..fd8c35bf5 100644
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_invalid_3.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: yul
 // ----
-// ParserError 2314: (12-15): Expected '{' but got reserved keyword 'let'
+// ParserError 2314: (12-15='let'): Expected '{' but got reserved keyword 'let'
diff --git a/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul b/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul
index b84004a8d..1daf3c5f9 100644
--- a/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_invalid_4.yul
@@ -2,4 +2,4 @@
     if calldatasize {}
 }
 // ----
-// ParserError 7104: (9-21): Builtin function "calldatasize" must be called.
+// ParserError 7104: (9-21='calldatasize'): Builtin function "calldatasize" must be called.
diff --git a/test/libyul/yulSyntaxTests/if_statement_scope_2.yul b/test/libyul/yulSyntaxTests/if_statement_scope_2.yul
index e86578812..015121684 100644
--- a/test/libyul/yulSyntaxTests/if_statement_scope_2.yul
+++ b/test/libyul/yulSyntaxTests/if_statement_scope_2.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: evm
 // ----
-// DeclarationError 4634: (25-26): Variable not found or variable not lvalue.
+// DeclarationError 4634: (25-26='x'): Variable not found or variable not lvalue.
diff --git a/test/libyul/yulSyntaxTests/instructions.yul b/test/libyul/yulSyntaxTests/instructions.yul
index 3d600812f..e837a7942 100644
--- a/test/libyul/yulSyntaxTests/instructions.yul
+++ b/test/libyul/yulSyntaxTests/instructions.yul
@@ -2,4 +2,4 @@
 // ====
 // dialect: yul
 // ----
-// ParserError 6913: (6-7): Call or assignment expected.
+// ParserError 6913: (6-7='}'): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/instructions_too_few_args_1.yul b/test/libyul/yulSyntaxTests/instructions_too_few_args_1.yul
index db482b6f4..6092f2e87 100644
--- a/test/libyul/yulSyntaxTests/instructions_too_few_args_1.yul
+++ b/test/libyul/yulSyntaxTests/instructions_too_few_args_1.yul
@@ -2,4 +2,4 @@
 	pop(mul())
 }
 // ----
-// TypeError 7000: (7-10): Function "mul" expects 2 arguments but got 0.
+// TypeError 7000: (7-10='mul'): Function "mul" expects 2 arguments but got 0.
diff --git a/test/libyul/yulSyntaxTests/instructions_too_few_args_2.yul b/test/libyul/yulSyntaxTests/instructions_too_few_args_2.yul
index f6239a95e..3bdd47f42 100644
--- a/test/libyul/yulSyntaxTests/instructions_too_few_args_2.yul
+++ b/test/libyul/yulSyntaxTests/instructions_too_few_args_2.yul
@@ -2,4 +2,4 @@
 	pop(mul(1))
 }
 // ----
-// TypeError 7000: (7-10): Function "mul" expects 2 arguments but got 1.
+// TypeError 7000: (7-10='mul'): Function "mul" expects 2 arguments but got 1.
diff --git a/test/libyul/yulSyntaxTests/instructions_too_many_args.yul b/test/libyul/yulSyntaxTests/instructions_too_many_args.yul
index ae4f1ae9d..7d59c7f61 100644
--- a/test/libyul/yulSyntaxTests/instructions_too_many_args.yul
+++ b/test/libyul/yulSyntaxTests/instructions_too_many_args.yul
@@ -2,4 +2,4 @@
 	pop(mul(1, 2, 3))
 }
 // ----
-// TypeError 7000: (7-10): Function "mul" expects 2 arguments but got 3.
+// TypeError 7000: (7-10='mul'): Function "mul" expects 2 arguments but got 3.
diff --git a/test/libyul/yulSyntaxTests/invalid/dup_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/dup_disallowed.yul
index 6fe9171d6..4c7576404 100644
--- a/test/libyul/yulSyntaxTests/invalid/dup_disallowed.yul
+++ b/test/libyul/yulSyntaxTests/invalid/dup_disallowed.yul
@@ -19,21 +19,21 @@
     dup32()
 }
 // ----
-// DeclarationError 4619: (6-10): Function "dup0" not found.
-// DeclarationError 4619: (17-21): Function "dup1" not found.
-// DeclarationError 4619: (28-32): Function "dup2" not found.
-// DeclarationError 4619: (39-43): Function "dup3" not found.
-// DeclarationError 4619: (50-54): Function "dup4" not found.
-// DeclarationError 4619: (61-65): Function "dup5" not found.
-// DeclarationError 4619: (72-76): Function "dup6" not found.
-// DeclarationError 4619: (83-87): Function "dup7" not found.
-// DeclarationError 4619: (94-98): Function "dup8" not found.
-// DeclarationError 4619: (105-109): Function "dup9" not found.
-// DeclarationError 4619: (116-121): Function "dup10" not found.
-// DeclarationError 4619: (128-133): Function "dup11" not found.
-// DeclarationError 4619: (140-145): Function "dup12" not found.
-// DeclarationError 4619: (152-157): Function "dup13" not found.
-// DeclarationError 4619: (164-169): Function "dup14" not found.
-// DeclarationError 4619: (176-181): Function "dup15" not found.
-// DeclarationError 4619: (188-193): Function "dup16" not found.
-// DeclarationError 4619: (200-205): Function "dup32" not found.
+// DeclarationError 4619: (6-10='dup0'): Function "dup0" not found.
+// DeclarationError 4619: (17-21='dup1'): Function "dup1" not found.
+// DeclarationError 4619: (28-32='dup2'): Function "dup2" not found.
+// DeclarationError 4619: (39-43='dup3'): Function "dup3" not found.
+// DeclarationError 4619: (50-54='dup4'): Function "dup4" not found.
+// DeclarationError 4619: (61-65='dup5'): Function "dup5" not found.
+// DeclarationError 4619: (72-76='dup6'): Function "dup6" not found.
+// DeclarationError 4619: (83-87='dup7'): Function "dup7" not found.
+// DeclarationError 4619: (94-98='dup8'): Function "dup8" not found.
+// DeclarationError 4619: (105-109='dup9'): Function "dup9" not found.
+// DeclarationError 4619: (116-121='dup10'): Function "dup10" not found.
+// DeclarationError 4619: (128-133='dup11'): Function "dup11" not found.
+// DeclarationError 4619: (140-145='dup12'): Function "dup12" not found.
+// DeclarationError 4619: (152-157='dup13'): Function "dup13" not found.
+// DeclarationError 4619: (164-169='dup14'): Function "dup14" not found.
+// DeclarationError 4619: (176-181='dup15'): Function "dup15" not found.
+// DeclarationError 4619: (188-193='dup16'): Function "dup16" not found.
+// DeclarationError 4619: (200-205='dup32'): Function "dup32" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/invalid_octal_number.yul b/test/libyul/yulSyntaxTests/invalid/invalid_octal_number.yul
index 446c29315..600dcef33 100644
--- a/test/libyul/yulSyntaxTests/invalid/invalid_octal_number.yul
+++ b/test/libyul/yulSyntaxTests/invalid/invalid_octal_number.yul
@@ -2,4 +2,4 @@
     let x := 0100
 }
 // ----
-// ParserError 1465: (15-16): Illegal token: Octal numbers not allowed.
+// ParserError 1465: (15-16='0'): Illegal token: Octal numbers not allowed.
diff --git a/test/libyul/yulSyntaxTests/invalid/jump_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/jump_disallowed.yul
index f1b94af9e..213c4aeb7 100644
--- a/test/libyul/yulSyntaxTests/invalid/jump_disallowed.yul
+++ b/test/libyul/yulSyntaxTests/invalid/jump_disallowed.yul
@@ -2,4 +2,4 @@
     jump(2)
 }
 // ----
-// DeclarationError 4619: (6-10): Function "jump" not found.
+// DeclarationError 4619: (6-10='jump'): Function "jump" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/jumpdest_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/jumpdest_disallowed.yul
index 03c168692..8ed22bdcd 100644
--- a/test/libyul/yulSyntaxTests/invalid/jumpdest_disallowed.yul
+++ b/test/libyul/yulSyntaxTests/invalid/jumpdest_disallowed.yul
@@ -2,4 +2,4 @@
     jumpdest()
 }
 // ----
-// DeclarationError 4619: (6-14): Function "jumpdest" not found.
+// DeclarationError 4619: (6-14='jumpdest'): Function "jumpdest" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/jumpi_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/jumpi_disallowed.yul
index b5b7d8bdb..3a688be44 100644
--- a/test/libyul/yulSyntaxTests/invalid/jumpi_disallowed.yul
+++ b/test/libyul/yulSyntaxTests/invalid/jumpi_disallowed.yul
@@ -2,4 +2,4 @@
     jumpi(2, 1)
 }
 // ----
-// DeclarationError 4619: (6-11): Function "jumpi" not found.
+// DeclarationError 4619: (6-11='jumpi'): Function "jumpi" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/label_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/label_disallowed.yul
index 63762bd31..9f76f47a9 100644
--- a/test/libyul/yulSyntaxTests/invalid/label_disallowed.yul
+++ b/test/libyul/yulSyntaxTests/invalid/label_disallowed.yul
@@ -2,4 +2,4 @@
     label:
 }
 // ----
-// ParserError 6913: (11-12): Call or assignment expected.
+// ParserError 6913: (11-12=':'): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack.yul b/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack.yul
index dca68b7a0..704142529 100644
--- a/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack.yul
+++ b/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack.yul
@@ -2,4 +2,4 @@
     mload(0)
 }
 // ----
-// TypeError 3083: (6-14): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
+// TypeError 3083: (6-14='mload(0)'): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
diff --git a/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack_with_debug_info.yul b/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack_with_debug_info.yul
index ce93dd922..3357a7689 100644
--- a/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack_with_debug_info.yul
+++ b/test/libyul/yulSyntaxTests/invalid/leave_items_on_stack_with_debug_info.yul
@@ -6,4 +6,4 @@ object "C" {
     }
 }
 // ----
-// TypeError 3083: (82-97): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
+// TypeError 3083: (82-97='calldataload(0)'): Top-level expressions are not supposed to return values (this expression returns 1 value). Use ``pop()`` or assign them.
diff --git a/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed.yul
index f57faf32a..632508187 100644
--- a/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed.yul
+++ b/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed.yul
@@ -2,4 +2,4 @@
     1
 }
 // ----
-// ParserError 6913: (8-9): Call or assignment expected.
+// ParserError 6913: (8-9='}'): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed_with_debug_info.yul b/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed_with_debug_info.yul
index 79ba4f83d..264b8f1a1 100644
--- a/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed_with_debug_info.yul
+++ b/test/libyul/yulSyntaxTests/invalid/literals_on_stack_disallowed_with_debug_info.yul
@@ -5,5 +5,5 @@ object "C" {
     }
 }
 // ----
-// ParserError 6913: (65-66): Call or assignment expected.
-// ParserError 2314: (67-68): Expected end of source but got '}'
+// ParserError 6913: (65-66='}'): Call or assignment expected.
+// ParserError 2314: (67-68='}'): Expected end of source but got '}'
diff --git a/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul
index e43d7a141..d2919cf90 100644
--- a/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul
+++ b/test/libyul/yulSyntaxTests/invalid/pc_disallowed.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// SyntaxError 2450: (10-12): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
+// SyntaxError 2450: (10-12='pc'): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
diff --git a/test/libyul/yulSyntaxTests/invalid/push_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/push_disallowed.yul
index cbb406aaf..a48caa55b 100644
--- a/test/libyul/yulSyntaxTests/invalid/push_disallowed.yul
+++ b/test/libyul/yulSyntaxTests/invalid/push_disallowed.yul
@@ -34,36 +34,36 @@
     push32()
 }
 // ----
-// DeclarationError 4619: (6-11): Function "push0" not found.
-// DeclarationError 4619: (18-23): Function "push1" not found.
-// DeclarationError 4619: (30-35): Function "push2" not found.
-// DeclarationError 4619: (42-47): Function "push3" not found.
-// DeclarationError 4619: (54-59): Function "push4" not found.
-// DeclarationError 4619: (66-71): Function "push5" not found.
-// DeclarationError 4619: (78-83): Function "push6" not found.
-// DeclarationError 4619: (90-95): Function "push7" not found.
-// DeclarationError 4619: (102-107): Function "push8" not found.
-// DeclarationError 4619: (114-119): Function "push9" not found.
-// DeclarationError 4619: (126-132): Function "push10" not found.
-// DeclarationError 4619: (139-145): Function "push11" not found.
-// DeclarationError 4619: (152-158): Function "push12" not found.
-// DeclarationError 4619: (165-171): Function "push13" not found.
-// DeclarationError 4619: (178-184): Function "push14" not found.
-// DeclarationError 4619: (191-197): Function "push15" not found.
-// DeclarationError 4619: (204-210): Function "push16" not found.
-// DeclarationError 4619: (217-223): Function "push17" not found.
-// DeclarationError 4619: (230-236): Function "push18" not found.
-// DeclarationError 4619: (243-249): Function "push19" not found.
-// DeclarationError 4619: (256-262): Function "push20" not found.
-// DeclarationError 4619: (269-275): Function "push21" not found.
-// DeclarationError 4619: (282-288): Function "push22" not found.
-// DeclarationError 4619: (295-301): Function "push23" not found.
-// DeclarationError 4619: (308-314): Function "push24" not found.
-// DeclarationError 4619: (321-327): Function "push25" not found.
-// DeclarationError 4619: (334-340): Function "push26" not found.
-// DeclarationError 4619: (347-353): Function "push27" not found.
-// DeclarationError 4619: (360-366): Function "push28" not found.
-// DeclarationError 4619: (373-379): Function "push29" not found.
-// DeclarationError 4619: (386-392): Function "push30" not found.
-// DeclarationError 4619: (399-405): Function "push31" not found.
-// DeclarationError 4619: (412-418): Function "push32" not found.
+// DeclarationError 4619: (6-11='push0'): Function "push0" not found.
+// DeclarationError 4619: (18-23='push1'): Function "push1" not found.
+// DeclarationError 4619: (30-35='push2'): Function "push2" not found.
+// DeclarationError 4619: (42-47='push3'): Function "push3" not found.
+// DeclarationError 4619: (54-59='push4'): Function "push4" not found.
+// DeclarationError 4619: (66-71='push5'): Function "push5" not found.
+// DeclarationError 4619: (78-83='push6'): Function "push6" not found.
+// DeclarationError 4619: (90-95='push7'): Function "push7" not found.
+// DeclarationError 4619: (102-107='push8'): Function "push8" not found.
+// DeclarationError 4619: (114-119='push9'): Function "push9" not found.
+// DeclarationError 4619: (126-132='push10'): Function "push10" not found.
+// DeclarationError 4619: (139-145='push11'): Function "push11" not found.
+// DeclarationError 4619: (152-158='push12'): Function "push12" not found.
+// DeclarationError 4619: (165-171='push13'): Function "push13" not found.
+// DeclarationError 4619: (178-184='push14'): Function "push14" not found.
+// DeclarationError 4619: (191-197='push15'): Function "push15" not found.
+// DeclarationError 4619: (204-210='push16'): Function "push16" not found.
+// DeclarationError 4619: (217-223='push17'): Function "push17" not found.
+// DeclarationError 4619: (230-236='push18'): Function "push18" not found.
+// DeclarationError 4619: (243-249='push19'): Function "push19" not found.
+// DeclarationError 4619: (256-262='push20'): Function "push20" not found.
+// DeclarationError 4619: (269-275='push21'): Function "push21" not found.
+// DeclarationError 4619: (282-288='push22'): Function "push22" not found.
+// DeclarationError 4619: (295-301='push23'): Function "push23" not found.
+// DeclarationError 4619: (308-314='push24'): Function "push24" not found.
+// DeclarationError 4619: (321-327='push25'): Function "push25" not found.
+// DeclarationError 4619: (334-340='push26'): Function "push26" not found.
+// DeclarationError 4619: (347-353='push27'): Function "push27" not found.
+// DeclarationError 4619: (360-366='push28'): Function "push28" not found.
+// DeclarationError 4619: (373-379='push29'): Function "push29" not found.
+// DeclarationError 4619: (386-392='push30'): Function "push30" not found.
+// DeclarationError 4619: (399-405='push31'): Function "push31" not found.
+// DeclarationError 4619: (412-418='push32'): Function "push32" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/swap_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/swap_disallowed.yul
index 0d86cfef2..661de8a10 100644
--- a/test/libyul/yulSyntaxTests/invalid/swap_disallowed.yul
+++ b/test/libyul/yulSyntaxTests/invalid/swap_disallowed.yul
@@ -19,21 +19,21 @@
     swap32()
 }
 // ----
-// DeclarationError 4619: (6-11): Function "swap0" not found.
-// DeclarationError 4619: (18-23): Function "swap1" not found.
-// DeclarationError 4619: (30-35): Function "swap2" not found.
-// DeclarationError 4619: (42-47): Function "swap3" not found.
-// DeclarationError 4619: (54-59): Function "swap4" not found.
-// DeclarationError 4619: (66-71): Function "swap5" not found.
-// DeclarationError 4619: (78-83): Function "swap6" not found.
-// DeclarationError 4619: (90-95): Function "swap7" not found.
-// DeclarationError 4619: (102-107): Function "swap8" not found.
-// DeclarationError 4619: (114-119): Function "swap9" not found.
-// DeclarationError 4619: (126-132): Function "swap10" not found.
-// DeclarationError 4619: (139-145): Function "swap11" not found.
-// DeclarationError 4619: (152-158): Function "swap12" not found.
-// DeclarationError 4619: (165-171): Function "swap13" not found.
-// DeclarationError 4619: (178-184): Function "swap14" not found.
-// DeclarationError 4619: (191-197): Function "swap15" not found.
-// DeclarationError 4619: (204-210): Function "swap16" not found.
-// DeclarationError 4619: (217-223): Function "swap32" not found.
+// DeclarationError 4619: (6-11='swap0'): Function "swap0" not found.
+// DeclarationError 4619: (18-23='swap1'): Function "swap1" not found.
+// DeclarationError 4619: (30-35='swap2'): Function "swap2" not found.
+// DeclarationError 4619: (42-47='swap3'): Function "swap3" not found.
+// DeclarationError 4619: (54-59='swap4'): Function "swap4" not found.
+// DeclarationError 4619: (66-71='swap5'): Function "swap5" not found.
+// DeclarationError 4619: (78-83='swap6'): Function "swap6" not found.
+// DeclarationError 4619: (90-95='swap7'): Function "swap7" not found.
+// DeclarationError 4619: (102-107='swap8'): Function "swap8" not found.
+// DeclarationError 4619: (114-119='swap9'): Function "swap9" not found.
+// DeclarationError 4619: (126-132='swap10'): Function "swap10" not found.
+// DeclarationError 4619: (139-145='swap11'): Function "swap11" not found.
+// DeclarationError 4619: (152-158='swap12'): Function "swap12" not found.
+// DeclarationError 4619: (165-171='swap13'): Function "swap13" not found.
+// DeclarationError 4619: (178-184='swap14'): Function "swap14" not found.
+// DeclarationError 4619: (191-197='swap15'): Function "swap15" not found.
+// DeclarationError 4619: (204-210='swap16'): Function "swap16" not found.
+// DeclarationError 4619: (217-223='swap32'): Function "swap32" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/unicode_comment_direction_override.sol b/test/libyul/yulSyntaxTests/invalid/unicode_comment_direction_override.sol
index 7fb5547f7..884e59c07 100644
--- a/test/libyul/yulSyntaxTests/invalid/unicode_comment_direction_override.sol
+++ b/test/libyul/yulSyntaxTests/invalid/unicode_comment_direction_override.sol
@@ -3,4 +3,4 @@
     // underflow ‬
 }
 // ----
-// ParserError 1465: (19-32): Illegal token: Unicode direction override underflow in comment or string literal.
+// ParserError 1465: (19-32='// underflow'): Illegal token: Unicode direction override underflow in comment or string literal.
diff --git a/test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.sol b/test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.sol
index 2dba69450..8e3b45851 100644
--- a/test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.sol
+++ b/test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.sol
@@ -3,4 +3,4 @@
     let s := unicode"underflow ‬";
 }
 // ----
-// ParserError 1465: (35-47): Illegal token: Invalid character in string.
+// ParserError 1465: (35-47='"underflow â'): Illegal token: Invalid character in string.
diff --git a/test/libyul/yulSyntaxTests/invalid/verbatim_empty_string.yul b/test/libyul/yulSyntaxTests/invalid/verbatim_empty_string.yul
index 89f155d9b..e428d27c1 100644
--- a/test/libyul/yulSyntaxTests/invalid/verbatim_empty_string.yul
+++ b/test/libyul/yulSyntaxTests/invalid/verbatim_empty_string.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// TypeError 1844: (21-26): The "verbatim_*" builtins cannot be used with empty bytecode.
+// TypeError 1844: (21-26='hex""'): The "verbatim_*" builtins cannot be used with empty bytecode.
diff --git a/test/libyul/yulSyntaxTests/invalid/verbatim_leading_zero.yul b/test/libyul/yulSyntaxTests/invalid/verbatim_leading_zero.yul
index 777e2eb58..98a110088 100644
--- a/test/libyul/yulSyntaxTests/invalid/verbatim_leading_zero.yul
+++ b/test/libyul/yulSyntaxTests/invalid/verbatim_leading_zero.yul
@@ -2,5 +2,5 @@
     let x := verbatim_01i_1o(hex"aa", 0)
 }
 // ----
-// DeclarationError 4619: (15-30): Function "verbatim_01i_1o" not found.
+// DeclarationError 4619: (15-30='verbatim_01i_1o'): Function "verbatim_01i_1o" not found.
 // DeclarationError 3812: (6-42): Variable count mismatch for declaration of "x": 1 variables and 0 values.
diff --git a/test/libyul/yulSyntaxTests/invalid/verbatim_reserved.yul b/test/libyul/yulSyntaxTests/invalid/verbatim_reserved.yul
index fd2f66571..d73365c7c 100644
--- a/test/libyul/yulSyntaxTests/invalid/verbatim_reserved.yul
+++ b/test/libyul/yulSyntaxTests/invalid/verbatim_reserved.yul
@@ -3,4 +3,4 @@
     let verbatim_1i_2o := 3
 }
 // ----
-// ParserError 5568: (32-46): Cannot use builtin function name "verbatim_1i_2o" as identifier name.
+// ParserError 5568: (32-46='verbatim_1i_2o'): Cannot use builtin function name "verbatim_1i_2o" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/invalid/verbatim_reserved2.yul b/test/libyul/yulSyntaxTests/invalid/verbatim_reserved2.yul
index 3d86dda12..166c735b9 100644
--- a/test/libyul/yulSyntaxTests/invalid/verbatim_reserved2.yul
+++ b/test/libyul/yulSyntaxTests/invalid/verbatim_reserved2.yul
@@ -4,6 +4,6 @@
     function verbatim_fun() {}
 }
 // ----
-// DeclarationError 5017: (10-18): The identifier "verbatim" is reserved and can not be used.
-// DeclarationError 5017: (32-44): The identifier "verbatim_abc" is reserved and can not be used.
-// DeclarationError 5017: (54-80): The identifier "verbatim_fun" is reserved and can not be used.
+// DeclarationError 5017: (10-18='verbatim'): The identifier "verbatim" is reserved and can not be used.
+// DeclarationError 5017: (32-44='verbatim_abc'): The identifier "verbatim_abc" is reserved and can not be used.
+// DeclarationError 5017: (54-80='function verbatim_fun() {}'): The identifier "verbatim_fun" is reserved and can not be used.
diff --git a/test/libyul/yulSyntaxTests/invalid_tuple_assignment.yul b/test/libyul/yulSyntaxTests/invalid_tuple_assignment.yul
index 8a2768b65..59f4deeff 100644
--- a/test/libyul/yulSyntaxTests/invalid_tuple_assignment.yul
+++ b/test/libyul/yulSyntaxTests/invalid_tuple_assignment.yul
@@ -2,4 +2,4 @@
 	let x, y := 1
 }
 // ----
-// DeclarationError 3812: (3-16): Variable count mismatch for declaration of "x, y": 2 variables and 1 values.
+// DeclarationError 3812: (3-16='let x, y := 1'): Variable count mismatch for declaration of "x, y": 2 variables and 1 values.
diff --git a/test/libyul/yulSyntaxTests/invalid_tuple_assignment_with_debug_info.yul b/test/libyul/yulSyntaxTests/invalid_tuple_assignment_with_debug_info.yul
index 8ea0302eb..ded7dc950 100644
--- a/test/libyul/yulSyntaxTests/invalid_tuple_assignment_with_debug_info.yul
+++ b/test/libyul/yulSyntaxTests/invalid_tuple_assignment_with_debug_info.yul
@@ -5,4 +5,4 @@ object "C" {
     }
 }
 // ----
-// DeclarationError 3812: (59-72): Variable count mismatch for declaration of "x, y": 2 variables and 1 values.
+// DeclarationError 3812: (59-72='let x, y := 1'): Variable count mismatch for declaration of "x, y": 2 variables and 1 values.
diff --git a/test/libyul/yulSyntaxTests/invalid_type.yul b/test/libyul/yulSyntaxTests/invalid_type.yul
index 99ed4c43b..b1e18bcaa 100644
--- a/test/libyul/yulSyntaxTests/invalid_type.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// TypeError 5473: (10-24): "invalidType" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (10-24='x: invalidType'): "invalidType" is not a valid type (user defined types are not yet supported).
diff --git a/test/libyul/yulSyntaxTests/invalid_type2.yul b/test/libyul/yulSyntaxTests/invalid_type2.yul
index 2ad035dcf..92e59cd2a 100644
--- a/test/libyul/yulSyntaxTests/invalid_type2.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type2.yul
@@ -4,5 +4,5 @@
 // ====
 // dialect: evmTyped
 // ----
-// TypeError 5473: (15-28): "invalidType" is not a valid type (user defined types are not yet supported).
-// TypeError 3947: (10-11): Assigning value of type "invalidType" to variable of type "u256".
+// TypeError 5473: (15-28='1:invalidType'): "invalidType" is not a valid type (user defined types are not yet supported).
+// TypeError 3947: (10-11='x'): Assigning value of type "invalidType" to variable of type "u256".
diff --git a/test/libyul/yulSyntaxTests/invalid_type3.yul b/test/libyul/yulSyntaxTests/invalid_type3.yul
index 1ce7092fe..2558b1617 100644
--- a/test/libyul/yulSyntaxTests/invalid_type3.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type3.yul
@@ -4,5 +4,5 @@
 // ====
 // dialect: evmTyped
 // ----
-// TypeError 5473: (17-31): "invalidType" is not a valid type (user defined types are not yet supported).
-// TypeError 5473: (36-50): "invalidType" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (17-31='a: invalidType'): "invalidType" is not a valid type (user defined types are not yet supported).
+// TypeError 5473: (36-50='b: invalidType'): "invalidType" is not a valid type (user defined types are not yet supported).
diff --git a/test/libyul/yulSyntaxTests/invalid_type4.yul b/test/libyul/yulSyntaxTests/invalid_type4.yul
index 8195fcf90..df835a283 100644
--- a/test/libyul/yulSyntaxTests/invalid_type4.yul
+++ b/test/libyul/yulSyntaxTests/invalid_type4.yul
@@ -5,5 +5,5 @@
 // ====
 // dialect: evmTyped
 // ----
-// TypeError 3781: (24-38): Expected a value of type "u256" but got "invalidType".
-// TypeError 5473: (24-38): "invalidType" is not a valid type (user defined types are not yet supported).
+// TypeError 3781: (24-38='8: invalidType'): Expected a value of type "u256" but got "invalidType".
+// TypeError 5473: (24-38='8: invalidType'): "invalidType" is not a valid type (user defined types are not yet supported).
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_bad_literal.yul b/test/libyul/yulSyntaxTests/linkersymbol_bad_literal.yul
index 15ac5dccb..544c754ce 100644
--- a/test/libyul/yulSyntaxTests/linkersymbol_bad_literal.yul
+++ b/test/libyul/yulSyntaxTests/linkersymbol_bad_literal.yul
@@ -6,6 +6,6 @@
 // ====
 // dialect: evm
 // ----
-// TypeError 5859: (23-24): Function expects string literal.
-// TypeError 5859: (48-52): Function expects string literal.
-// TypeError 5859: (76-81): Function expects string literal.
+// TypeError 5859: (23-24='0'): Function expects string literal.
+// TypeError 5859: (48-52='true'): Function expects string literal.
+// TypeError 5859: (76-81='false'): Function expects string literal.
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul b/test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul
index aa9cc3adb..6e31890a0 100644
--- a/test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul
+++ b/test/libyul/yulSyntaxTests/linkersymbol_evmtyped.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// ParserError 5568: (75-87): Cannot use builtin function name "linkersymbol" as identifier name.
+// ParserError 5568: (75-87='linkersymbol'): Cannot use builtin function name "linkersymbol" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_ewasm.yul b/test/libyul/yulSyntaxTests/linkersymbol_ewasm.yul
index 051359c07..cea085b63 100644
--- a/test/libyul/yulSyntaxTests/linkersymbol_ewasm.yul
+++ b/test/libyul/yulSyntaxTests/linkersymbol_ewasm.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: ewasm
 // ----
-// DeclarationError 4619: (6-18): Function "linkersymbol" not found.
+// DeclarationError 4619: (6-18='linkersymbol'): Function "linkersymbol" not found.
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_non_literal_args.yul b/test/libyul/yulSyntaxTests/linkersymbol_non_literal_args.yul
index e8b860a01..5e5a51ae9 100644
--- a/test/libyul/yulSyntaxTests/linkersymbol_non_literal_args.yul
+++ b/test/libyul/yulSyntaxTests/linkersymbol_non_literal_args.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: evm
 // ----
-// TypeError 9114: (67-79): Function expects direct literals as arguments.
+// TypeError 9114: (67-79='linkersymbol'): Function expects direct literals as arguments.
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_shadowing.yul b/test/libyul/yulSyntaxTests/linkersymbol_shadowing.yul
index 68ce920e1..ec04439df 100644
--- a/test/libyul/yulSyntaxTests/linkersymbol_shadowing.yul
+++ b/test/libyul/yulSyntaxTests/linkersymbol_shadowing.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// ParserError 5568: (15-27): Cannot use builtin function name "linkersymbol" as identifier name.
+// ParserError 5568: (15-27='linkersymbol'): Cannot use builtin function name "linkersymbol" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/literal_invalid_type.yul b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
index 07a51eb88..15ecf1a2c 100644
--- a/test/libyul/yulSyntaxTests/literal_invalid_type.yul
+++ b/test/libyul/yulSyntaxTests/literal_invalid_type.yul
@@ -2,6 +2,6 @@
     let x:bool := true:unhappy
 }
 // ----
-// TypeError 5473: (20-32): "unhappy" is not a valid type (user defined types are not yet supported).
-// TypeError 5170: (20-32): Invalid type "unhappy" for literal "true".
-// TypeError 3947: (10-16): Assigning value of type "unhappy" to variable of type "bool".
+// TypeError 5473: (20-32='true:unhappy'): "unhappy" is not a valid type (user defined types are not yet supported).
+// TypeError 5170: (20-32='true:unhappy'): Invalid type "unhappy" for literal "true".
+// TypeError 3947: (10-16='x:bool'): Assigning value of type "unhappy" to variable of type "bool".
diff --git a/test/libyul/yulSyntaxTests/loadimmutable_bad_literal.yul b/test/libyul/yulSyntaxTests/loadimmutable_bad_literal.yul
index 2aadd2f20..a478e6d81 100644
--- a/test/libyul/yulSyntaxTests/loadimmutable_bad_literal.yul
+++ b/test/libyul/yulSyntaxTests/loadimmutable_bad_literal.yul
@@ -6,6 +6,6 @@
 // ====
 // dialect: evm
 // ----
-// TypeError 5859: (24-25): Function expects string literal.
-// TypeError 5859: (50-54): Function expects string literal.
-// TypeError 5859: (79-84): Function expects string literal.
+// TypeError 5859: (24-25='0'): Function expects string literal.
+// TypeError 5859: (50-54='true'): Function expects string literal.
+// TypeError 5859: (79-84='false'): Function expects string literal.
diff --git a/test/libyul/yulSyntaxTests/loadimmutable_shadowing.yul b/test/libyul/yulSyntaxTests/loadimmutable_shadowing.yul
index 8711d0b17..efb68f9ed 100644
--- a/test/libyul/yulSyntaxTests/loadimmutable_shadowing.yul
+++ b/test/libyul/yulSyntaxTests/loadimmutable_shadowing.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// ParserError 5568: (15-28): Cannot use builtin function name "loadimmutable" as identifier name.
+// ParserError 5568: (15-28='loadimmutable'): Cannot use builtin function name "loadimmutable" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/metadata_access.yul b/test/libyul/yulSyntaxTests/metadata_access.yul
index 63aeb4760..aab596f3e 100644
--- a/test/libyul/yulSyntaxTests/metadata_access.yul
+++ b/test/libyul/yulSyntaxTests/metadata_access.yul
@@ -22,11 +22,11 @@ object "A" {
   data ".other" "Hello, World2!"
 }
 // ----
-// TypeError 3517: (41-49): Unknown data object ".other".
-// TypeError 3517: (69-77): Unknown data object ".other".
-// TypeError 3517: (97-107): Unknown data object "B..other".
-// TypeError 3517: (160-169): Unknown data object "B.other".
-// TypeError 3517: (242-253): Unknown data object ".metadata".
-// TypeError 3517: (273-284): Unknown data object ".metadata".
-// TypeError 3517: (306-319): Unknown data object "B..metadata".
-// TypeError 3517: (339-352): Unknown data object "B..metadata".
+// TypeError 3517: (41-49='".other"'): Unknown data object ".other".
+// TypeError 3517: (69-77='".other"'): Unknown data object ".other".
+// TypeError 3517: (97-107='"B..other"'): Unknown data object "B..other".
+// TypeError 3517: (160-169='"B.other"'): Unknown data object "B.other".
+// TypeError 3517: (242-253='".metadata"'): Unknown data object ".metadata".
+// TypeError 3517: (273-284='".metadata"'): Unknown data object ".metadata".
+// TypeError 3517: (306-319='"B..metadata"'): Unknown data object "B..metadata".
+// TypeError 3517: (339-352='"B..metadata"'): Unknown data object "B..metadata".
diff --git a/test/libyul/yulSyntaxTests/metadata_access_2.yul b/test/libyul/yulSyntaxTests/metadata_access_2.yul
index a4b013e85..db5815d10 100644
--- a/test/libyul/yulSyntaxTests/metadata_access_2.yul
+++ b/test/libyul/yulSyntaxTests/metadata_access_2.yul
@@ -10,4 +10,4 @@ object "A" {
   data ".mightbereservedinthefuture" "TRS"
 }
 // ----
-// TypeError 3517: (90-119): Unknown data object ".mightbereservedinthefuture".
+// TypeError 3517: (90-119='".mightbereservedinthefuture"'): Unknown data object ".mightbereservedinthefuture".
diff --git a/test/libyul/yulSyntaxTests/metadata_access_subobject.yul b/test/libyul/yulSyntaxTests/metadata_access_subobject.yul
index 216b56ac6..e94f8047d 100644
--- a/test/libyul/yulSyntaxTests/metadata_access_subobject.yul
+++ b/test/libyul/yulSyntaxTests/metadata_access_subobject.yul
@@ -9,4 +9,4 @@ object "A" {
 	}
 }
 // ----
-// TypeError 3517: (41-54): Unknown data object ".metadata.x".
+// TypeError 3517: (41-54='".metadata.x"'): Unknown data object ".metadata.x".
diff --git a/test/libyul/yulSyntaxTests/multiple_assignment_1.yul b/test/libyul/yulSyntaxTests/multiple_assignment_1.yul
index b619007a5..2a47c2daa 100644
--- a/test/libyul/yulSyntaxTests/multiple_assignment_1.yul
+++ b/test/libyul/yulSyntaxTests/multiple_assignment_1.yul
@@ -6,4 +6,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// ParserError 2856: (58-59): Variable name must precede "," in multiple assignment.
+// ParserError 2856: (58-59=','): Variable name must precede "," in multiple assignment.
diff --git a/test/libyul/yulSyntaxTests/multiple_assignment_2.yul b/test/libyul/yulSyntaxTests/multiple_assignment_2.yul
index 852502447..ed6c941dd 100644
--- a/test/libyul/yulSyntaxTests/multiple_assignment_2.yul
+++ b/test/libyul/yulSyntaxTests/multiple_assignment_2.yul
@@ -6,4 +6,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// ParserError 2856: (62-64): Variable name must precede ":=" in assignment.
+// ParserError 2856: (62-64=':='): Variable name must precede ":=" in assignment.
diff --git a/test/libyul/yulSyntaxTests/name_clash_function_var_subscope.yul b/test/libyul/yulSyntaxTests/name_clash_function_var_subscope.yul
index f35913215..b04ada190 100644
--- a/test/libyul/yulSyntaxTests/name_clash_function_var_subscope.yul
+++ b/test/libyul/yulSyntaxTests/name_clash_function_var_subscope.yul
@@ -4,4 +4,4 @@
 	}
 }
 // ----
-// DeclarationError 1395: (20-30): Variable name g already taken in this scope.
+// DeclarationError 1395: (20-30='let g := 0'): Variable name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/name_clash_function_var_subscope_reverse.yul b/test/libyul/yulSyntaxTests/name_clash_function_var_subscope_reverse.yul
index 548c72d31..b660360c6 100644
--- a/test/libyul/yulSyntaxTests/name_clash_function_var_subscope_reverse.yul
+++ b/test/libyul/yulSyntaxTests/name_clash_function_var_subscope_reverse.yul
@@ -3,4 +3,4 @@
 	function g() {}
 }
 // ----
-// DeclarationError 1395: (5-15): Variable name g already taken in this scope.
+// DeclarationError 1395: (5-15='let g := 0'): Variable name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/name_clash_sub_scope.yul b/test/libyul/yulSyntaxTests/name_clash_sub_scope.yul
index f671d0348..14edfa126 100644
--- a/test/libyul/yulSyntaxTests/name_clash_sub_scope.yul
+++ b/test/libyul/yulSyntaxTests/name_clash_sub_scope.yul
@@ -4,4 +4,4 @@
 	}
 }
 // ----
-// DeclarationError 6052: (20-35): Function name g already taken in this scope.
+// DeclarationError 6052: (20-35='function g() {}'): Function name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/name_clash_sub_scope_reverse.yul b/test/libyul/yulSyntaxTests/name_clash_sub_scope_reverse.yul
index 3fd2015a4..a8bcf340b 100644
--- a/test/libyul/yulSyntaxTests/name_clash_sub_scope_reverse.yul
+++ b/test/libyul/yulSyntaxTests/name_clash_sub_scope_reverse.yul
@@ -5,4 +5,4 @@
 	function g() {}
 }
 // ----
-// DeclarationError 6052: (7-22): Function name g already taken in this scope.
+// DeclarationError 6052: (7-22='function g() {}'): Function name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/name_clash_sub_scope_with_debug_info.yul b/test/libyul/yulSyntaxTests/name_clash_sub_scope_with_debug_info.yul
index b6c2ab66c..26917c68f 100644
--- a/test/libyul/yulSyntaxTests/name_clash_sub_scope_with_debug_info.yul
+++ b/test/libyul/yulSyntaxTests/name_clash_sub_scope_with_debug_info.yul
@@ -8,4 +8,4 @@ object "C" {
     }
 }
 // ----
-// DeclarationError 6052: (109-124): Function name g already taken in this scope.
+// DeclarationError 6052: (109-124='function g() {}'): Function name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/name_clashes.yul b/test/libyul/yulSyntaxTests/name_clashes.yul
index 19c5c9549..ec05311be 100644
--- a/test/libyul/yulSyntaxTests/name_clashes.yul
+++ b/test/libyul/yulSyntaxTests/name_clashes.yul
@@ -3,4 +3,4 @@
     function g() { }
 }
 // ----
-// DeclarationError 1395: (6-16): Variable name g already taken in this scope.
+// DeclarationError 1395: (6-16='let g := 2'): Variable name g already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/number_literal_2.yul b/test/libyul/yulSyntaxTests/number_literal_2.yul
index 94c5929b5..e15465091 100644
--- a/test/libyul/yulSyntaxTests/number_literal_2.yul
+++ b/test/libyul/yulSyntaxTests/number_literal_2.yul
@@ -1,3 +1,3 @@
 { let x:u256 := .1:u256 }
 // ----
-// ParserError 4828: (16-18): Invalid number literal.
+// ParserError 4828: (16-18='.1'): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literal_3.yul b/test/libyul/yulSyntaxTests/number_literal_3.yul
index 4dbb6879a..9118b41e8 100644
--- a/test/libyul/yulSyntaxTests/number_literal_3.yul
+++ b/test/libyul/yulSyntaxTests/number_literal_3.yul
@@ -1,3 +1,3 @@
 { let x:u256 := 1e5:u256 }
 // ----
-// ParserError 4828: (16-19): Invalid number literal.
+// ParserError 4828: (16-19='1e5'): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literal_4.yul b/test/libyul/yulSyntaxTests/number_literal_4.yul
index 7de784e88..811c0b529 100644
--- a/test/libyul/yulSyntaxTests/number_literal_4.yul
+++ b/test/libyul/yulSyntaxTests/number_literal_4.yul
@@ -1,3 +1,3 @@
 { let x:u256 := 67.235:u256 }
 // ----
-// ParserError 4828: (16-22): Invalid number literal.
+// ParserError 4828: (16-22='67.235'): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literals_2.yul b/test/libyul/yulSyntaxTests/number_literals_2.yul
index 7b054f0d3..202504157 100644
--- a/test/libyul/yulSyntaxTests/number_literals_2.yul
+++ b/test/libyul/yulSyntaxTests/number_literals_2.yul
@@ -2,4 +2,4 @@
 	let x := .1
 }
 // ----
-// ParserError 4828: (12-14): Invalid number literal.
+// ParserError 4828: (12-14='.1'): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literals_3.yul b/test/libyul/yulSyntaxTests/number_literals_3.yul
index acdffda51..a08e7dc3e 100644
--- a/test/libyul/yulSyntaxTests/number_literals_3.yul
+++ b/test/libyul/yulSyntaxTests/number_literals_3.yul
@@ -2,4 +2,4 @@
 	let x := 1e5
 }
 // ----
-// ParserError 4828: (12-15): Invalid number literal.
+// ParserError 4828: (12-15='1e5'): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/number_literals_4.yul b/test/libyul/yulSyntaxTests/number_literals_4.yul
index 58b25bf57..f2d19afa5 100644
--- a/test/libyul/yulSyntaxTests/number_literals_4.yul
+++ b/test/libyul/yulSyntaxTests/number_literals_4.yul
@@ -2,4 +2,4 @@
 	let x := 67.235
 }
 // ----
-// ParserError 4828: (12-18): Invalid number literal.
+// ParserError 4828: (12-18='67.235'): Invalid number literal.
diff --git a/test/libyul/yulSyntaxTests/objects/code.yul b/test/libyul/yulSyntaxTests/objects/code.yul
index 89caa8e50..432e852f2 100644
--- a/test/libyul/yulSyntaxTests/objects/code.yul
+++ b/test/libyul/yulSyntaxTests/objects/code.yul
@@ -15,4 +15,4 @@ object "A" {
   }
 }
 // ----
-// ParserError 8794: (226-233): Object name "hello" already exists inside the containing object.
+// ParserError 8794: (226-233='"hello"'): Object name "hello" already exists inside the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/code_without_object.yul b/test/libyul/yulSyntaxTests/objects/code_without_object.yul
index e67c5c36d..b19a8df32 100644
--- a/test/libyul/yulSyntaxTests/objects/code_without_object.yul
+++ b/test/libyul/yulSyntaxTests/objects/code_without_object.yul
@@ -1,4 +1,4 @@
 code {
 }
 // ----
-// ParserError 4294: (0-4): Expected keyword "object".
+// ParserError 4294: (0-4='code'): Expected keyword "object".
diff --git a/test/libyul/yulSyntaxTests/objects/conflict_data_data.yul b/test/libyul/yulSyntaxTests/objects/conflict_data_data.yul
index e09bd8b37..9e058d8db 100644
--- a/test/libyul/yulSyntaxTests/objects/conflict_data_data.yul
+++ b/test/libyul/yulSyntaxTests/objects/conflict_data_data.yul
@@ -5,4 +5,4 @@ object "A" {
   data "B" hex"00"
 }
 // ----
-// ParserError 8794: (45-48): Object name "B" already exists inside the containing object.
+// ParserError 8794: (45-48='"B"'): Object name "B" already exists inside the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/conflict_data_parent.yul b/test/libyul/yulSyntaxTests/objects/conflict_data_parent.yul
index 5edb1bd3a..9b9122cb0 100644
--- a/test/libyul/yulSyntaxTests/objects/conflict_data_parent.yul
+++ b/test/libyul/yulSyntaxTests/objects/conflict_data_parent.yul
@@ -6,4 +6,4 @@ object "A" {
   }
 }
 // ----
-// ParserError 8311: (33-36): Object name cannot be the same as the name of the containing object.
+// ParserError 8311: (33-36='"A"'): Object name cannot be the same as the name of the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/conflict_object_data.yul b/test/libyul/yulSyntaxTests/objects/conflict_object_data.yul
index fd64093ad..50ab07b33 100644
--- a/test/libyul/yulSyntaxTests/objects/conflict_object_data.yul
+++ b/test/libyul/yulSyntaxTests/objects/conflict_object_data.yul
@@ -7,4 +7,4 @@ object "A" {
   }
 }
 // ----
-// ParserError 8794: (47-50): Object name "B" already exists inside the containing object.
+// ParserError 8794: (47-50='"B"'): Object name "B" already exists inside the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/conflict_object_object.yul b/test/libyul/yulSyntaxTests/objects/conflict_object_object.yul
index 1b83be4f7..5b9fb70b8 100644
--- a/test/libyul/yulSyntaxTests/objects/conflict_object_object.yul
+++ b/test/libyul/yulSyntaxTests/objects/conflict_object_object.yul
@@ -9,4 +9,4 @@ object "A" {
   }
 }
 // ----
-// ParserError 8794: (64-67): Object name "B" already exists inside the containing object.
+// ParserError 8794: (64-67='"B"'): Object name "B" already exists inside the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/conflict_object_parent.yul b/test/libyul/yulSyntaxTests/objects/conflict_object_parent.yul
index 44a3d3a2d..2a5cc0088 100644
--- a/test/libyul/yulSyntaxTests/objects/conflict_object_parent.yul
+++ b/test/libyul/yulSyntaxTests/objects/conflict_object_parent.yul
@@ -4,4 +4,4 @@ object "A" {
   data "A" ""
 }
 // ----
-// ParserError 8311: (31-34): Object name cannot be the same as the name of the containing object.
+// ParserError 8311: (31-34='"A"'): Object name cannot be the same as the name of the containing object.
diff --git a/test/libyul/yulSyntaxTests/objects/data_first.yul b/test/libyul/yulSyntaxTests/objects/data_first.yul
index 018674765..362d11096 100644
--- a/test/libyul/yulSyntaxTests/objects/data_first.yul
+++ b/test/libyul/yulSyntaxTests/objects/data_first.yul
@@ -3,4 +3,4 @@ object "A" {
   code {}
 }
 // ----
-// ParserError 4846: (15-19): Expected keyword "code".
+// ParserError 4846: (15-19='data'): Expected keyword "code".
diff --git a/test/libyul/yulSyntaxTests/objects/data_hex_name.yul b/test/libyul/yulSyntaxTests/objects/data_hex_name.yul
index 28f7282d7..4551df0d7 100644
--- a/test/libyul/yulSyntaxTests/objects/data_hex_name.yul
+++ b/test/libyul/yulSyntaxTests/objects/data_hex_name.yul
@@ -3,4 +3,4 @@ object "A" {
   data hex"11" ""
 }
 // ----
-// ParserError 2314: (30-37): Expected 'StringLiteral' but got 'HexStringLiteral'
+// ParserError 2314: (30-37='hex"11"'): Expected 'StringLiteral' but got 'HexStringLiteral'
diff --git a/test/libyul/yulSyntaxTests/objects/data_invalid_hex1.yul b/test/libyul/yulSyntaxTests/objects/data_invalid_hex1.yul
index c80f82c20..79939320d 100644
--- a/test/libyul/yulSyntaxTests/objects/data_invalid_hex1.yul
+++ b/test/libyul/yulSyntaxTests/objects/data_invalid_hex1.yul
@@ -5,4 +5,4 @@ object "A" {
   data "1" hex"wronghexencoding"
 }
 // ----
-// ParserError 2314: (37-41): Expected 'StringLiteral' but got 'ILLEGAL'
+// ParserError 2314: (37-41='hex"'): Expected 'StringLiteral' but got 'ILLEGAL'
diff --git a/test/libyul/yulSyntaxTests/objects/data_invalid_hex2.yul b/test/libyul/yulSyntaxTests/objects/data_invalid_hex2.yul
index 17029e4f7..f2470cef4 100644
--- a/test/libyul/yulSyntaxTests/objects/data_invalid_hex2.yul
+++ b/test/libyul/yulSyntaxTests/objects/data_invalid_hex2.yul
@@ -5,4 +5,4 @@ object "A" {
   data "2" hex"0"
 }
 // ----
-// ParserError 2314: (37-41): Expected 'StringLiteral' but got 'ILLEGAL'
+// ParserError 2314: (37-41='hex"'): Expected 'StringLiteral' but got 'ILLEGAL'
diff --git a/test/libyul/yulSyntaxTests/objects/dataoffset_nonliteral.yul b/test/libyul/yulSyntaxTests/objects/dataoffset_nonliteral.yul
index d53e26281..b0ed6a58b 100644
--- a/test/libyul/yulSyntaxTests/objects/dataoffset_nonliteral.yul
+++ b/test/libyul/yulSyntaxTests/objects/dataoffset_nonliteral.yul
@@ -7,4 +7,4 @@ object "A" {
   data "B" hex"00"
 }
 // ----
-// TypeError 9114: (47-57): Function expects direct literals as arguments.
+// TypeError 9114: (47-57='dataoffset'): Function expects direct literals as arguments.
diff --git a/test/libyul/yulSyntaxTests/objects/dataoffset_nonstring.yul b/test/libyul/yulSyntaxTests/objects/dataoffset_nonstring.yul
index 93a981d92..6ee91fcf1 100644
--- a/test/libyul/yulSyntaxTests/objects/dataoffset_nonstring.yul
+++ b/test/libyul/yulSyntaxTests/objects/dataoffset_nonstring.yul
@@ -4,4 +4,4 @@ object "A" {
   }
 }
 // ----
-// TypeError 5859: (41-42): Function expects string literal.
+// TypeError 5859: (41-42='0'): Function expects string literal.
diff --git a/test/libyul/yulSyntaxTests/objects/dataoffset_notfound.yul b/test/libyul/yulSyntaxTests/objects/dataoffset_notfound.yul
index 14df40201..9694153b1 100644
--- a/test/libyul/yulSyntaxTests/objects/dataoffset_notfound.yul
+++ b/test/libyul/yulSyntaxTests/objects/dataoffset_notfound.yul
@@ -5,4 +5,4 @@ object "A" {
   data "B" ""
 }
 // ----
-// TypeError 3517: (41-44): Unknown data object "C".
+// TypeError 3517: (41-44='"C"'): Unknown data object "C".
diff --git a/test/libyul/yulSyntaxTests/objects/datasize_nonliteral.yul b/test/libyul/yulSyntaxTests/objects/datasize_nonliteral.yul
index 837408b9a..846278f83 100644
--- a/test/libyul/yulSyntaxTests/objects/datasize_nonliteral.yul
+++ b/test/libyul/yulSyntaxTests/objects/datasize_nonliteral.yul
@@ -7,4 +7,4 @@ object "A" {
   data "B" hex"00"
 }
 // ----
-// TypeError 9114: (47-55): Function expects direct literals as arguments.
+// TypeError 9114: (47-55='datasize'): Function expects direct literals as arguments.
diff --git a/test/libyul/yulSyntaxTests/objects/datasize_nonstring.yul b/test/libyul/yulSyntaxTests/objects/datasize_nonstring.yul
index 19042a2df..f813ffef0 100644
--- a/test/libyul/yulSyntaxTests/objects/datasize_nonstring.yul
+++ b/test/libyul/yulSyntaxTests/objects/datasize_nonstring.yul
@@ -4,4 +4,4 @@ object "A" {
   }
 }
 // ----
-// TypeError 5859: (39-40): Function expects string literal.
+// TypeError 5859: (39-40='0'): Function expects string literal.
diff --git a/test/libyul/yulSyntaxTests/objects/datasize_notfound.yul b/test/libyul/yulSyntaxTests/objects/datasize_notfound.yul
index 48a2c268e..c7a353326 100644
--- a/test/libyul/yulSyntaxTests/objects/datasize_notfound.yul
+++ b/test/libyul/yulSyntaxTests/objects/datasize_notfound.yul
@@ -5,4 +5,4 @@ object "A" {
   data "B" ""
 }
 // ----
-// TypeError 3517: (39-42): Unknown data object "C".
+// TypeError 3517: (39-42='"C"'): Unknown data object "C".
diff --git a/test/libyul/yulSyntaxTests/objects/empty_data.yul b/test/libyul/yulSyntaxTests/objects/empty_data.yul
index b2456a7ae..11b774938 100644
--- a/test/libyul/yulSyntaxTests/objects/empty_data.yul
+++ b/test/libyul/yulSyntaxTests/objects/empty_data.yul
@@ -2,4 +2,4 @@ object "A" {
   data "tmp" ""
 }
 // ----
-// ParserError 4846: (15-19): Expected keyword "code".
+// ParserError 4846: (15-19='data'): Expected keyword "code".
diff --git a/test/libyul/yulSyntaxTests/objects/empty_object.yul b/test/libyul/yulSyntaxTests/objects/empty_object.yul
index cc9019e55..787698b99 100644
--- a/test/libyul/yulSyntaxTests/objects/empty_object.yul
+++ b/test/libyul/yulSyntaxTests/objects/empty_object.yul
@@ -1,4 +1,4 @@
 object "A" {
 }
 // ----
-// ParserError 4846: (13-14): Expected keyword "code".
+// ParserError 4846: (13-14='}'): Expected keyword "code".
diff --git a/test/libyul/yulSyntaxTests/objects/empty_object_name.yul b/test/libyul/yulSyntaxTests/objects/empty_object_name.yul
index 653bf4a0f..bafca5726 100644
--- a/test/libyul/yulSyntaxTests/objects/empty_object_name.yul
+++ b/test/libyul/yulSyntaxTests/objects/empty_object_name.yul
@@ -1,5 +1,5 @@
 object "" {
 }
 // ----
-// ParserError 3287: (7-9): Object name cannot be empty.
-// ParserError 4846: (12-13): Expected keyword "code".
+// ParserError 3287: (7-9='""'): Object name cannot be empty.
+// ParserError 4846: (12-13='}'): Expected keyword "code".
diff --git a/test/libyul/yulSyntaxTests/objects/incomplete1.yul b/test/libyul/yulSyntaxTests/objects/incomplete1.yul
index 6698f45a2..a1460f5a9 100644
--- a/test/libyul/yulSyntaxTests/objects/incomplete1.yul
+++ b/test/libyul/yulSyntaxTests/objects/incomplete1.yul
@@ -1,3 +1,3 @@
 object {
 // ----
-// ParserError 2314: (7-8): Expected 'StringLiteral' but got '{'
+// ParserError 2314: (7-8='{'): Expected 'StringLiteral' but got '{'
diff --git a/test/libyul/yulSyntaxTests/objects/incomplete2.yul b/test/libyul/yulSyntaxTests/objects/incomplete2.yul
index f421074f5..b083c9d3e 100644
--- a/test/libyul/yulSyntaxTests/objects/incomplete2.yul
+++ b/test/libyul/yulSyntaxTests/objects/incomplete2.yul
@@ -4,4 +4,4 @@ object "A" {
 
 object
 // ----
-// ParserError 2314: (26-32): Expected end of source but got identifier
+// ParserError 2314: (26-32='object'): Expected end of source but got identifier
diff --git a/test/libyul/yulSyntaxTests/objects/multiple_code.yul b/test/libyul/yulSyntaxTests/objects/multiple_code.yul
index fd3347600..5fe810b81 100644
--- a/test/libyul/yulSyntaxTests/objects/multiple_code.yul
+++ b/test/libyul/yulSyntaxTests/objects/multiple_code.yul
@@ -3,4 +3,4 @@ object "A" {
   code { }
 }
 // ----
-// ParserError 8143: (26-30): Expected keyword "data" or "object" or "}".
+// ParserError 8143: (26-30='code'): Expected keyword "data" or "object" or "}".
diff --git a/test/libyul/yulSyntaxTests/objects/multiple_root_object.yul b/test/libyul/yulSyntaxTests/objects/multiple_root_object.yul
index 842cfcfb5..7a70a2c6c 100644
--- a/test/libyul/yulSyntaxTests/objects/multiple_root_object.yul
+++ b/test/libyul/yulSyntaxTests/objects/multiple_root_object.yul
@@ -5,4 +5,4 @@ object "B" {
   code { }
 }
 // ----
-// ParserError 2314: (26-32): Expected end of source but got identifier
+// ParserError 2314: (26-32='object'): Expected end of source but got identifier
diff --git a/test/libyul/yulSyntaxTests/objects/object_hex_name.yul b/test/libyul/yulSyntaxTests/objects/object_hex_name.yul
index c58b5fd19..748c547c8 100644
--- a/test/libyul/yulSyntaxTests/objects/object_hex_name.yul
+++ b/test/libyul/yulSyntaxTests/objects/object_hex_name.yul
@@ -2,4 +2,4 @@ object hex"11" {
   code {}
 }
 // ----
-// ParserError 2314: (7-14): Expected 'StringLiteral' but got 'HexStringLiteral'
+// ParserError 2314: (7-14='hex"11"'): Expected 'StringLiteral' but got 'HexStringLiteral'
diff --git a/test/libyul/yulSyntaxTests/objects/subobject_first.yul b/test/libyul/yulSyntaxTests/objects/subobject_first.yul
index 369e7180e..018e56505 100644
--- a/test/libyul/yulSyntaxTests/objects/subobject_first.yul
+++ b/test/libyul/yulSyntaxTests/objects/subobject_first.yul
@@ -6,4 +6,4 @@ object "A" {
   code {}
 }
 // ----
-// ParserError 4846: (15-21): Expected keyword "code".
+// ParserError 4846: (15-21='object'): Expected keyword "code".
diff --git a/test/libyul/yulSyntaxTests/objects/subobject_hex_name.yul b/test/libyul/yulSyntaxTests/objects/subobject_hex_name.yul
index af0581067..4f6b1f7d1 100644
--- a/test/libyul/yulSyntaxTests/objects/subobject_hex_name.yul
+++ b/test/libyul/yulSyntaxTests/objects/subobject_hex_name.yul
@@ -5,4 +5,4 @@ object "A" {
   }
 }
 // ----
-// ParserError 2314: (32-39): Expected 'StringLiteral' but got 'HexStringLiteral'
+// ParserError 2314: (32-39='hex"11"'): Expected 'StringLiteral' but got 'HexStringLiteral'
diff --git a/test/libyul/yulSyntaxTests/opcode_for_function_args_1.yul b/test/libyul/yulSyntaxTests/opcode_for_function_args_1.yul
index 00c357bb4..e310ba9b9 100644
--- a/test/libyul/yulSyntaxTests/opcode_for_function_args_1.yul
+++ b/test/libyul/yulSyntaxTests/opcode_for_function_args_1.yul
@@ -2,4 +2,4 @@
 	function f(gas) {}
 }
 // ----
-// ParserError 5568: (14-17): Cannot use builtin function name "gas" as identifier name.
+// ParserError 5568: (14-17='gas'): Cannot use builtin function name "gas" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/opcode_for_function_args_2.yul b/test/libyul/yulSyntaxTests/opcode_for_function_args_2.yul
index 989cfce9e..e195e3f23 100644
--- a/test/libyul/yulSyntaxTests/opcode_for_function_args_2.yul
+++ b/test/libyul/yulSyntaxTests/opcode_for_function_args_2.yul
@@ -2,4 +2,4 @@
 	function f() -> gas {}
 }
 // ----
-// ParserError 5568: (19-22): Cannot use builtin function name "gas" as identifier name.
+// ParserError 5568: (19-22='gas'): Cannot use builtin function name "gas" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/opcode_for_functions.yul b/test/libyul/yulSyntaxTests/opcode_for_functions.yul
index 0efc7cbcc..b45e20c8c 100644
--- a/test/libyul/yulSyntaxTests/opcode_for_functions.yul
+++ b/test/libyul/yulSyntaxTests/opcode_for_functions.yul
@@ -2,4 +2,4 @@
 	function gas() {}
 }
 // ----
-// ParserError 5568: (12-15): Cannot use builtin function name "gas" as identifier name.
+// ParserError 5568: (12-15='gas'): Cannot use builtin function name "gas" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/passing_builtin_with_literal_argument_into_literal_argument.yul b/test/libyul/yulSyntaxTests/passing_builtin_with_literal_argument_into_literal_argument.yul
index 433d36683..481a898be 100644
--- a/test/libyul/yulSyntaxTests/passing_builtin_with_literal_argument_into_literal_argument.yul
+++ b/test/libyul/yulSyntaxTests/passing_builtin_with_literal_argument_into_literal_argument.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// TypeError 9114: (6-18): Function expects direct literals as arguments.
+// TypeError 9114: (6-18='setimmutable'): Function expects direct literals as arguments.
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul
index dc889a2fb..9ed09041d 100644
--- a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul
+++ b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_1.yul
@@ -1,3 +1,3 @@
 { let x. y:u256 }
 // ----
-// ParserError 6913: (10-11): Call or assignment expected.
+// ParserError 6913: (10-11=':'): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul
index 5602cbceb..031b939d7 100644
--- a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul
+++ b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_2.yul
@@ -1,3 +1,3 @@
 { let x .y:u256 }
 // ----
-// ParserError 1856: (8-9): Literal or identifier expected.
+// ParserError 1856: (8-9='.'): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul
index 003341b33..c6182764b 100644
--- a/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul
+++ b/test/libyul/yulSyntaxTests/period_in_identifier_spaced_3.yul
@@ -1,3 +1,3 @@
 { let x . y:u256 }
 // ----
-// ParserError 1856: (8-9): Literal or identifier expected.
+// ParserError 1856: (8-9='.'): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul b/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul
index 0002b76fd..8df4fad24 100644
--- a/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul
+++ b/test/libyul/yulSyntaxTests/period_not_as_identifier_start.yul
@@ -1,3 +1,3 @@
 { let .y:u256 }
 // ----
-// ParserError 2314: (6-7): Expected identifier but got '.'
+// ParserError 2314: (6-7='.'): Expected identifier but got '.'
diff --git a/test/libyul/yulSyntaxTests/push.yul b/test/libyul/yulSyntaxTests/push.yul
index f3dab144d..4c4a491a3 100644
--- a/test/libyul/yulSyntaxTests/push.yul
+++ b/test/libyul/yulSyntaxTests/push.yul
@@ -1,3 +1,3 @@
 { 0x42:u256 }
 // ----
-// ParserError 6913: (12-13): Call or assignment expected.
+// ParserError 6913: (12-13='}'): Call or assignment expected.
diff --git a/test/libyul/yulSyntaxTests/recursion_depth.yul b/test/libyul/yulSyntaxTests/recursion_depth.yul
index 9c6501391..e87d6b236 100644
--- a/test/libyul/yulSyntaxTests/recursion_depth.yul
+++ b/test/libyul/yulSyntaxTests/recursion_depth.yul
@@ -4,4 +4,4 @@ let x:u256 := 0:u256
 // ====
 // dialect: evmTyped
 // ----
-// ParserError 7319: (600-601): Maximum recursion depth reached during parsing.
+// ParserError 7319: (600-601='{'): Maximum recursion depth reached during parsing.
diff --git a/test/libyul/yulSyntaxTests/setimmutable_bad_literal.yul b/test/libyul/yulSyntaxTests/setimmutable_bad_literal.yul
index 9e4bc8032..12df4af4a 100644
--- a/test/libyul/yulSyntaxTests/setimmutable_bad_literal.yul
+++ b/test/libyul/yulSyntaxTests/setimmutable_bad_literal.yul
@@ -6,6 +6,6 @@
 // ====
 // dialect: evm
 // ----
-// TypeError 5859: (22-23): Function expects string literal.
-// TypeError 5859: (89-93): Function expects string literal.
-// TypeError 5859: (159-164): Function expects string literal.
+// TypeError 5859: (22-23='0'): Function expects string literal.
+// TypeError 5859: (89-93='true'): Function expects string literal.
+// TypeError 5859: (159-164='false'): Function expects string literal.
diff --git a/test/libyul/yulSyntaxTests/setimmutable_shadowing.yul b/test/libyul/yulSyntaxTests/setimmutable_shadowing.yul
index b76a5de9b..c7e493f31 100644
--- a/test/libyul/yulSyntaxTests/setimmutable_shadowing.yul
+++ b/test/libyul/yulSyntaxTests/setimmutable_shadowing.yul
@@ -4,4 +4,4 @@
 // ====
 // dialect: evm
 // ----
-// ParserError 5568: (15-27): Cannot use builtin function name "setimmutable" as identifier name.
+// ParserError 5568: (15-27='setimmutable'): Cannot use builtin function name "setimmutable" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/surplus_input.yul b/test/libyul/yulSyntaxTests/surplus_input.yul
index 3db8feec9..c5f86c58e 100644
--- a/test/libyul/yulSyntaxTests/surplus_input.yul
+++ b/test/libyul/yulSyntaxTests/surplus_input.yul
@@ -1,4 +1,4 @@
 {}
 {}
 // ----
-// ParserError 2314: (3-4): Expected end of source but got '{'
+// ParserError 2314: (3-4='{'): Expected end of source but got '{'
diff --git a/test/libyul/yulSyntaxTests/switch_default_before_case.yul b/test/libyul/yulSyntaxTests/switch_default_before_case.yul
index 14434b7ac..18b4c3e6a 100644
--- a/test/libyul/yulSyntaxTests/switch_default_before_case.yul
+++ b/test/libyul/yulSyntaxTests/switch_default_before_case.yul
@@ -4,4 +4,4 @@
     case 1 {}
 }
 // ----
-// ParserError 4904: (35-39): Case not allowed after default case.
+// ParserError 4904: (35-39='case'): Case not allowed after default case.
diff --git a/test/libyul/yulSyntaxTests/switch_duplicate_case.yul b/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
index 861f721ac..ec67fedff 100644
--- a/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
+++ b/test/libyul/yulSyntaxTests/switch_duplicate_case.yul
@@ -6,4 +6,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// DeclarationError 6792: (34-50): Duplicate case "0" defined.
+// DeclarationError 6792: (34-50='case 0x0:u256 {}'): Duplicate case "0" defined.
diff --git a/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul b/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
index e3367b175..8d05568fc 100644
--- a/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
+++ b/test/libyul/yulSyntaxTests/switch_duplicate_case_different_literal.yul
@@ -6,4 +6,4 @@
 // ====
 // dialect: evmTyped
 // ----
-// DeclarationError 6792: (34-49): Duplicate case "0" defined.
+// DeclarationError 6792: (34-49='case "":u256 {}'): Duplicate case "0" defined.
diff --git a/test/libyul/yulSyntaxTests/switch_duplicate_default.yul b/test/libyul/yulSyntaxTests/switch_duplicate_default.yul
index 4b73953fe..a5135cc6f 100644
--- a/test/libyul/yulSyntaxTests/switch_duplicate_default.yul
+++ b/test/libyul/yulSyntaxTests/switch_duplicate_default.yul
@@ -4,4 +4,4 @@
     default {}
 }
 // ----
-// ParserError 6931: (35-42): Only one default case allowed.
+// ParserError 6931: (35-42='default'): Only one default case allowed.
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_body.yul b/test/libyul/yulSyntaxTests/switch_invalid_body.yul
index b6c4816fb..f7fd98363 100644
--- a/test/libyul/yulSyntaxTests/switch_invalid_body.yul
+++ b/test/libyul/yulSyntaxTests/switch_invalid_body.yul
@@ -5,4 +5,4 @@
     default {}
 }
 // ----
-// ParserError 2314: (27-30): Expected '{' but got identifier
+// ParserError 2314: (27-30='mul'): Expected '{' but got identifier
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_case.yul b/test/libyul/yulSyntaxTests/switch_invalid_case.yul
index 0aa52d371..571b4d7bf 100644
--- a/test/libyul/yulSyntaxTests/switch_invalid_case.yul
+++ b/test/libyul/yulSyntaxTests/switch_invalid_case.yul
@@ -5,4 +5,4 @@
     default {}
 }
 // ----
-// ParserError 4805: (28-29): Literal expected.
+// ParserError 4805: (28-29='('): Literal expected.
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_expr_1.yul b/test/libyul/yulSyntaxTests/switch_invalid_expr_1.yul
index 6609a9ef3..5a9e85330 100644
--- a/test/libyul/yulSyntaxTests/switch_invalid_expr_1.yul
+++ b/test/libyul/yulSyntaxTests/switch_invalid_expr_1.yul
@@ -4,4 +4,4 @@
     default {}
 }
 // ----
-// ParserError 1856: (13-14): Literal or identifier expected.
+// ParserError 1856: (13-14='{'): Literal or identifier expected.
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul b/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul
index 9378297ca..9f5b8e9bc 100644
--- a/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul
+++ b/test/libyul/yulSyntaxTests/switch_invalid_expr_2.yul
@@ -4,4 +4,4 @@
     default {}
 }
 // ----
-// ParserError 7104: (13-18): Builtin function "mload" must be called.
+// ParserError 7104: (13-18='mload'): Builtin function "mload" must be called.
diff --git a/test/libyul/yulSyntaxTests/switch_invalid_expr_3.yul b/test/libyul/yulSyntaxTests/switch_invalid_expr_3.yul
index 6ab68d7ea..f294eaf8b 100644
--- a/test/libyul/yulSyntaxTests/switch_invalid_expr_3.yul
+++ b/test/libyul/yulSyntaxTests/switch_invalid_expr_3.yul
@@ -6,4 +6,4 @@
 // ====
 // dialect: evm
 // ----
-// TypeError 3950: (10-22): Expected expression to evaluate to one value, but got 0 values instead.
+// TypeError 3950: (10-22='mstore(1, 1)'): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libyul/yulSyntaxTests/switch_statement_1.yul b/test/libyul/yulSyntaxTests/switch_statement_1.yul
index 13115a922..6d81f7aee 100644
--- a/test/libyul/yulSyntaxTests/switch_statement_1.yul
+++ b/test/libyul/yulSyntaxTests/switch_statement_1.yul
@@ -1,3 +1,3 @@
 { switch 42 default {} }
 // ----
-// Warning 9592: (2-22): "switch" statement with only a default case.
+// Warning 9592: (2-22='switch 42 default {}'): "switch" statement with only a default case.
diff --git a/test/libyul/yulSyntaxTests/switch_statement_duplicate_case.yul b/test/libyul/yulSyntaxTests/switch_statement_duplicate_case.yul
index 4ba258c2b..4c6690eae 100644
--- a/test/libyul/yulSyntaxTests/switch_statement_duplicate_case.yul
+++ b/test/libyul/yulSyntaxTests/switch_statement_duplicate_case.yul
@@ -7,4 +7,4 @@
 // ====
 // dialect: evm
 // ----
-// DeclarationError 6792: (25-34): Duplicate case "1" defined.
+// DeclarationError 6792: (25-34='case 1 {}'): Duplicate case "1" defined.
diff --git a/test/libyul/yulSyntaxTests/switch_statement_no_access.yul b/test/libyul/yulSyntaxTests/switch_statement_no_access.yul
index 4f40f2640..7c73b968b 100644
--- a/test/libyul/yulSyntaxTests/switch_statement_no_access.yul
+++ b/test/libyul/yulSyntaxTests/switch_statement_no_access.yul
@@ -2,4 +2,4 @@
     switch 42
 }
 // ----
-// ParserError 2418: (16-17): Switch statement without any cases.
+// ParserError 2418: (16-17='}'): Switch statement without any cases.
diff --git a/test/libyul/yulSyntaxTests/type_check_cases_fail.yul b/test/libyul/yulSyntaxTests/type_check_cases_fail.yul
index d9b4c0204..83c9f6d82 100644
--- a/test/libyul/yulSyntaxTests/type_check_cases_fail.yul
+++ b/test/libyul/yulSyntaxTests/type_check_cases_fail.yul
@@ -6,5 +6,5 @@
 // ====
 // dialect: ewasm
 // ----
-// TypeError 3781: (28-33): Expected a value of type "i32" but got "i64".
-// TypeError 3781: (46-51): Expected a value of type "i32" but got "i64".
+// TypeError 3781: (28-33='0:i64'): Expected a value of type "i32" but got "i64".
+// TypeError 3781: (46-51='2:i64'): Expected a value of type "i32" but got "i64".
diff --git a/test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul b/test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul
index 35926ccb2..5e414eecb 100644
--- a/test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul
+++ b/test/libyul/yulSyntaxTests/type_check_cases_fail_evmtyped.yul
@@ -6,5 +6,5 @@
 // ====
 // dialect: evmTyped
 // ----
-// TypeError 3781: (24-33): Expected a value of type "u256" but got "bool".
-// TypeError 3781: (46-55): Expected a value of type "u256" but got "bool".
+// TypeError 3781: (24-33='true:bool'): Expected a value of type "u256" but got "bool".
+// TypeError 3781: (46-55='true:bool'): Expected a value of type "u256" but got "bool".
diff --git a/test/libyul/yulSyntaxTests/type_check_if_condition_fail.yul b/test/libyul/yulSyntaxTests/type_check_if_condition_fail.yul
index c8711338f..4261eddda 100644
--- a/test/libyul/yulSyntaxTests/type_check_if_condition_fail.yul
+++ b/test/libyul/yulSyntaxTests/type_check_if_condition_fail.yul
@@ -5,4 +5,4 @@
 // ====
 // dialect: ewasm
 // ----
-// TypeError 1733: (23-24): Expected a value of boolean type "i32" but got "i64"
+// TypeError 1733: (23-24='x'): Expected a value of boolean type "i32" but got "i64"
diff --git a/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul b/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul
index 7b8d012bb..7bf6436f5 100644
--- a/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul
+++ b/test/libyul/yulSyntaxTests/user_defined_functions_fail.yul
@@ -8,5 +8,5 @@
 // ====
 // dialect: evmTyped
 // ----
-// TypeError 3947: (126-127): Assigning value of type "bool" to variable of type "u256".
-// TypeError 3947: (129-136): Assigning value of type "u256" to variable of type "bool".
+// TypeError 3947: (126-127='x'): Assigning value of type "bool" to variable of type "u256".
+// TypeError 3947: (129-136='y: bool'): Assigning value of type "u256" to variable of type "bool".
diff --git a/test/libyul/yulSyntaxTests/vardecl_multi_conflict.yul b/test/libyul/yulSyntaxTests/vardecl_multi_conflict.yul
index c40c79740..c768c0b69 100644
--- a/test/libyul/yulSyntaxTests/vardecl_multi_conflict.yul
+++ b/test/libyul/yulSyntaxTests/vardecl_multi_conflict.yul
@@ -3,4 +3,4 @@
 	let x, x := f()
 }
 // ----
-// DeclarationError 1395: (28-43): Variable name x already taken in this scope.
+// DeclarationError 1395: (28-43='let x, x := f()'): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/vardecl_name_clashes.yul b/test/libyul/yulSyntaxTests/vardecl_name_clashes.yul
index 2906078cf..888265333 100644
--- a/test/libyul/yulSyntaxTests/vardecl_name_clashes.yul
+++ b/test/libyul/yulSyntaxTests/vardecl_name_clashes.yul
@@ -3,4 +3,4 @@
 	let x := 2
 }
 // ----
-// DeclarationError 1395: (15-25): Variable name x already taken in this scope.
+// DeclarationError 1395: (15-25='let x := 2'): Variable name x already taken in this scope.
diff --git a/test/libyul/yulSyntaxTests/variable_access_cross_funcs.yul b/test/libyul/yulSyntaxTests/variable_access_cross_funcs.yul
index 0f0e9e827..5999c5346 100644
--- a/test/libyul/yulSyntaxTests/variable_access_cross_funcs.yul
+++ b/test/libyul/yulSyntaxTests/variable_access_cross_funcs.yul
@@ -5,4 +5,4 @@
 	}
 }
 // ----
-// DeclarationError 8198: (36-37): Identifier "x" not found.
+// DeclarationError 8198: (36-37='x'): Identifier "x" not found.
diff --git a/test/libyul/yulSyntaxTests/variable_use_before_decl_1.yul b/test/libyul/yulSyntaxTests/variable_use_before_decl_1.yul
index 76bcd1d0d..4a6d9f25b 100644
--- a/test/libyul/yulSyntaxTests/variable_use_before_decl_1.yul
+++ b/test/libyul/yulSyntaxTests/variable_use_before_decl_1.yul
@@ -3,4 +3,4 @@
 	let x := 3
 }
 // ----
-// DeclarationError 1133: (3-4): Variable x used before it was declared.
+// DeclarationError 1133: (3-4='x'): Variable x used before it was declared.
diff --git a/test/libyul/yulSyntaxTests/variable_use_before_decl_2.yul b/test/libyul/yulSyntaxTests/variable_use_before_decl_2.yul
index c6612fd8c..fd50b49c7 100644
--- a/test/libyul/yulSyntaxTests/variable_use_before_decl_2.yul
+++ b/test/libyul/yulSyntaxTests/variable_use_before_decl_2.yul
@@ -3,4 +3,4 @@
 }
 
 // ----
-// DeclarationError 4990: (19-20): Variable x used before it was declared.
+// DeclarationError 4990: (19-20='x'): Variable x used before it was declared.
diff --git a/test/libyul/yulSyntaxTests/verbatim_leading_zero.yul b/test/libyul/yulSyntaxTests/verbatim_leading_zero.yul
index 2b061dd02..71d82caa6 100644
--- a/test/libyul/yulSyntaxTests/verbatim_leading_zero.yul
+++ b/test/libyul/yulSyntaxTests/verbatim_leading_zero.yul
@@ -2,4 +2,4 @@
     let verbatim_01i_02o := 2
 }
 // ----
-// DeclarationError 5017: (10-26): The identifier "verbatim_01i_02o" is reserved and can not be used.
+// DeclarationError 5017: (10-26='verbatim_01i_02o'): The identifier "verbatim_01i_02o" is reserved and can not be used.